From 0aecdb638322c81ce30f201f12e1f268acd1a64c Mon Sep 17 00:00:00 2001
From: Kenneth Graunke <kenneth@whitecape.org>
Date: Thu, 18 Feb 2010 23:50:51 -0800
Subject: Remove _mesa_strstr in favor of plain strstr.

---
 src/mesa/main/debug.c   | 6 +++---
 src/mesa/main/imports.c | 9 +--------
 src/mesa/main/imports.h | 3 ---
 3 files changed, 4 insertions(+), 14 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/debug.c b/src/mesa/main/debug.c
index 9bad83487f..f2182c0577 100644
--- a/src/mesa/main/debug.c
+++ b/src/mesa/main/debug.c
@@ -206,17 +206,17 @@ static void add_debug_flags( const char *debug )
 
    MESA_VERBOSE = 0x0;
    for (i = 0; i < Elements(debug_opt); i++) {
-      if (_mesa_strstr(debug, debug_opt[i].name))
+      if (strstr(debug, debug_opt[i].name))
          MESA_VERBOSE |= debug_opt[i].flag;
    }
 
    /* Debug flag:
     */
-   if (_mesa_strstr(debug, "flush")) 
+   if (strstr(debug, "flush"))
       MESA_DEBUG_FLAGS |= DEBUG_ALWAYS_FLUSH;
 
 #if defined(_FPU_GETCW) && defined(_FPU_SETCW)
-   if (_mesa_strstr(debug, "fpexceptions")) {
+   if (strstr(debug, "fpexceptions")) {
       /* raise FP exceptions */
       fpu_control_t mask;
       _FPU_GETCW(mask);
diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index def045269c..cd19373fc5 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -841,13 +841,6 @@ _mesa_getenv( const char *var )
 /** \name String */
 /*@{*/
 
-/** Wrapper around strstr() */
-char *
-_mesa_strstr( const char *haystack, const char *needle )
-{
-   return strstr(haystack, needle);
-}
-
 /** Wrapper around strncat() */
 char *
 _mesa_strncat( char *dest, const char *src, size_t n )
@@ -1177,7 +1170,7 @@ _mesa_error( GLcontext *ctx, GLenum error, const char *fmtString, ... )
       const char *debugEnv = _mesa_getenv("MESA_DEBUG");
 
 #ifdef DEBUG
-      if (debugEnv && _mesa_strstr(debugEnv, "silent"))
+      if (debugEnv && strstr(debugEnv, "silent"))
          debug = GL_FALSE;
       else
          debug = GL_TRUE;
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index e3d2ac9b42..c487f1dab6 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -611,9 +611,6 @@ _mesa_bsearch( const void *key, const void *base, size_t nmemb, size_t size,
 extern char *
 _mesa_getenv( const char *var );
 
-extern char *
-_mesa_strstr( const char *haystack, const char *needle );
-
 extern char *
 _mesa_strncat( char *dest, const char *src, size_t n );
 
-- 
cgit v1.2.3


From 8ff7624653f0e119865cc6c283775832f1bc2903 Mon Sep 17 00:00:00 2001
From: Kenneth Graunke <kenneth@whitecape.org>
Date: Thu, 18 Feb 2010 23:50:52 -0800
Subject: Remove _mesa_strncat in favor of plain strncat.

---
 src/mesa/main/imports.c         |  7 -------
 src/mesa/main/imports.h         |  3 ---
 src/mesa/shader/atifragshader.c | 16 ++++++++--------
 3 files changed, 8 insertions(+), 18 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index cd19373fc5..1a7535d89e 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -841,13 +841,6 @@ _mesa_getenv( const char *var )
 /** \name String */
 /*@{*/
 
-/** Wrapper around strncat() */
-char *
-_mesa_strncat( char *dest, const char *src, size_t n )
-{
-   return strncat(dest, src, n);
-}
-
 /** Wrapper around strcpy() */
 char *
 _mesa_strcpy( char *dest, const char *src )
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index c487f1dab6..a3ec0c2ed9 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -611,9 +611,6 @@ _mesa_bsearch( const void *key, const void *base, size_t nmemb, size_t size,
 extern char *
 _mesa_getenv( const char *var );
 
-extern char *
-_mesa_strncat( char *dest, const char *src, size_t n );
-
 extern char *
 _mesa_strcpy( char *dest, const char *src );
 
diff --git a/src/mesa/shader/atifragshader.c b/src/mesa/shader/atifragshader.c
index ab7b2030d1..28dbf77b66 100644
--- a/src/mesa/shader/atifragshader.c
+++ b/src/mesa/shader/atifragshader.c
@@ -98,25 +98,25 @@ create_dst_mod_str(GLuint mod)
 
    _mesa_memset(ret_str, 0, 1024);
    if (mod & GL_2X_BIT_ATI)
-      _mesa_strncat(ret_str, "|2X", 1024);
+      strncat(ret_str, "|2X", 1024);
 
    if (mod & GL_4X_BIT_ATI)
-      _mesa_strncat(ret_str, "|4X", 1024);
+      strncat(ret_str, "|4X", 1024);
 
    if (mod & GL_8X_BIT_ATI)
-      _mesa_strncat(ret_str, "|8X", 1024);
+      strncat(ret_str, "|8X", 1024);
    if (mod & GL_HALF_BIT_ATI)
-      _mesa_strncat(ret_str, "|HA", 1024);
+      strncat(ret_str, "|HA", 1024);
    if (mod & GL_QUARTER_BIT_ATI)
-      _mesa_strncat(ret_str, "|QU", 1024);
+      strncat(ret_str, "|QU", 1024);
    if (mod & GL_EIGHTH_BIT_ATI)
-      _mesa_strncat(ret_str, "|EI", 1024);
+      strncat(ret_str, "|EI", 1024);
 
    if (mod & GL_SATURATE_BIT_ATI)
-      _mesa_strncat(ret_str, "|SAT", 1024);
+      strncat(ret_str, "|SAT", 1024);
 
    if (_mesa_strlen(ret_str) == 0)
-      _mesa_strncat(ret_str, "NONE", 1024);
+      strncat(ret_str, "NONE", 1024);
    return ret_str;
 }
 
-- 
cgit v1.2.3


From 5fcaa78912bc78a5db410200c5987e2c57fad570 Mon Sep 17 00:00:00 2001
From: Kenneth Graunke <kenneth@whitecape.org>
Date: Thu, 18 Feb 2010 23:50:53 -0800
Subject: Remove _mesa_strcpy in favor of plain strcpy.

---
 src/mesa/main/imports.c               | 11 ++---------
 src/mesa/main/imports.h               |  3 ---
 src/mesa/shader/slang/slang_mem.c     |  2 +-
 src/mesa/shader/slang/slang_utility.c |  2 +-
 src/mesa/shader/slang/slang_utility.h |  2 +-
 5 files changed, 5 insertions(+), 15 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index 1a7535d89e..19deef5767 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -841,13 +841,6 @@ _mesa_getenv( const char *var )
 /** \name String */
 /*@{*/
 
-/** Wrapper around strcpy() */
-char *
-_mesa_strcpy( char *dest, const char *src )
-{
-   return strcpy(dest, src);
-}
-
 /** Wrapper around strncpy() */
 char *
 _mesa_strncpy( char *dest, const char *src, size_t n )
@@ -877,7 +870,7 @@ _mesa_strncmp( const char *s1, const char *s2, size_t n )
 }
 
 /**
- * Implemented using _mesa_malloc() and _mesa_strcpy.
+ * Implemented using _mesa_malloc() and strcpy.
  * Note that NULL is handled accordingly.
  */
 char *
@@ -887,7 +880,7 @@ _mesa_strdup( const char *s )
       size_t l = _mesa_strlen(s);
       char *s2 = (char *) _mesa_malloc(l + 1);
       if (s2)
-         _mesa_strcpy(s2, s);
+         strcpy(s2, s);
       return s2;
    }
    else {
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index a3ec0c2ed9..0143be3ced 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -611,9 +611,6 @@ _mesa_bsearch( const void *key, const void *base, size_t nmemb, size_t size,
 extern char *
 _mesa_getenv( const char *var );
 
-extern char *
-_mesa_strcpy( char *dest, const char *src );
-
 extern char *
 _mesa_strncpy( char *dest, const char *src, size_t n );
 
diff --git a/src/mesa/shader/slang/slang_mem.c b/src/mesa/shader/slang/slang_mem.c
index 9224578edb..dc5707a39b 100644
--- a/src/mesa/shader/slang/slang_mem.c
+++ b/src/mesa/shader/slang/slang_mem.c
@@ -215,7 +215,7 @@ _slang_strdup(const char *s)
       size_t l = _mesa_strlen(s);
       char *s2 = (char *) _slang_alloc(l + 1);
       if (s2)
-         _mesa_strcpy(s2, s);
+         strcpy(s2, s);
       return s2;
    }
    else {
diff --git a/src/mesa/shader/slang/slang_utility.c b/src/mesa/shader/slang/slang_utility.c
index 3631e32b3c..950fba5611 100644
--- a/src/mesa/shader/slang/slang_utility.c
+++ b/src/mesa/shader/slang/slang_utility.c
@@ -35,7 +35,7 @@
 char *
 slang_string_concat (char *dst, const char *src)
 {
-   return _mesa_strcpy (dst + _mesa_strlen (dst), src);
+   return strcpy (dst + _mesa_strlen (dst), src);
 }
 
 
diff --git a/src/mesa/shader/slang/slang_utility.h b/src/mesa/shader/slang/slang_utility.h
index 032c561810..3762cc9679 100644
--- a/src/mesa/shader/slang/slang_utility.h
+++ b/src/mesa/shader/slang/slang_utility.h
@@ -33,7 +33,7 @@
 
 
 #define slang_string_compare(str1, str2) _mesa_strcmp (str1, str2)
-#define slang_string_copy(dst, src) _mesa_strcpy (dst, src)
+#define slang_string_copy(dst, src) strcpy (dst, src)
 #define slang_string_length(str) _mesa_strlen (str)
 
 char *slang_string_concat (char *, const char *);
-- 
cgit v1.2.3


From f69d1d1438361f10fd8db78d2d38f26e33db9747 Mon Sep 17 00:00:00 2001
From: Kenneth Graunke <kenneth@whitecape.org>
Date: Thu, 18 Feb 2010 23:50:54 -0800
Subject: Remove _mesa_strncpy in favor of plain strncpy.

---
 src/gallium/state_trackers/glx/xlib/glx_api.c | 2 +-
 src/mesa/drivers/x11/fakeglx.c                | 2 +-
 src/mesa/main/dlopen.c                        | 2 +-
 src/mesa/main/imports.c                       | 7 -------
 src/mesa/main/imports.h                       | 3 ---
 5 files changed, 3 insertions(+), 13 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/gallium/state_trackers/glx/xlib/glx_api.c b/src/gallium/state_trackers/glx/xlib/glx_api.c
index 3caf56e924..7e86e68b68 100644
--- a/src/gallium/state_trackers/glx/xlib/glx_api.c
+++ b/src/gallium/state_trackers/glx/xlib/glx_api.c
@@ -442,7 +442,7 @@ get_env_visual(Display *dpy, int scr, const char *varname)
       return NULL;
    }
 
-   _mesa_strncpy( value, _mesa_getenv(varname), 100 );
+   strncpy( value, _mesa_getenv(varname), 100 );
    value[99] = 0;
 
    sscanf( value, "%s %d", type, &depth );
diff --git a/src/mesa/drivers/x11/fakeglx.c b/src/mesa/drivers/x11/fakeglx.c
index 5c0084f37a..3b8c41b918 100644
--- a/src/mesa/drivers/x11/fakeglx.c
+++ b/src/mesa/drivers/x11/fakeglx.c
@@ -616,7 +616,7 @@ get_env_visual(Display *dpy, int scr, const char *varname)
       return NULL;
    }
 
-   _mesa_strncpy( value, _mesa_getenv(varname), 100 );
+   strncpy( value, _mesa_getenv(varname), 100 );
    value[99] = 0;
 
    sscanf( value, "%s %d", type, &depth );
diff --git a/src/mesa/main/dlopen.c b/src/mesa/main/dlopen.c
index 81e032081d..658ac9e40c 100644
--- a/src/mesa/main/dlopen.c
+++ b/src/mesa/main/dlopen.c
@@ -73,7 +73,7 @@ _mesa_dlsym(void *handle, const char *fname)
    /* need '_' prefix on symbol names */
    char fname2[1000];
    fname2[0] = '_';
-   _mesa_strncpy(fname2 + 1, fname, 998);
+   strncpy(fname2 + 1, fname, 998);
    fname2[999] = 0;
    return (GenericFunc) dlsym(handle, fname2);
 #elif defined(_GNU_SOURCE)
diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index 19deef5767..78c5cada75 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -841,13 +841,6 @@ _mesa_getenv( const char *var )
 /** \name String */
 /*@{*/
 
-/** Wrapper around strncpy() */
-char *
-_mesa_strncpy( char *dest, const char *src, size_t n )
-{
-   return strncpy(dest, src, n);
-}
-
 /** Wrapper around strlen() */
 size_t
 _mesa_strlen( const char *s )
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index 0143be3ced..192dffe8c6 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -611,9 +611,6 @@ _mesa_bsearch( const void *key, const void *base, size_t nmemb, size_t size,
 extern char *
 _mesa_getenv( const char *var );
 
-extern char *
-_mesa_strncpy( char *dest, const char *src, size_t n );
-
 extern size_t
 _mesa_strlen( const char *s );
 
-- 
cgit v1.2.3


From 21d0c70b4b1c18dc1c3ac7d0fbd8a903d60f8be7 Mon Sep 17 00:00:00 2001
From: Kenneth Graunke <kenneth@whitecape.org>
Date: Thu, 18 Feb 2010 23:50:55 -0800
Subject: Remove _mesa_strlen in favor of plain strlen.

---
 src/mesa/main/cpuinfo.c               |  2 +-
 src/mesa/main/extensions.c            | 10 +++++-----
 src/mesa/main/imports.c               |  9 +--------
 src/mesa/main/imports.h               |  3 ---
 src/mesa/main/shaders.c               |  2 +-
 src/mesa/shader/arbprogram.c          |  4 ++--
 src/mesa/shader/atifragshader.c       |  2 +-
 src/mesa/shader/nvfragparse.c         |  2 +-
 src/mesa/shader/nvprogram.c           |  4 ++--
 src/mesa/shader/nvvertparse.c         |  2 +-
 src/mesa/shader/prog_parameter.c      |  4 ++--
 src/mesa/shader/prog_uniform.c        |  2 +-
 src/mesa/shader/slang/slang_compile.c | 10 +++++-----
 src/mesa/shader/slang/slang_emit.c    |  2 +-
 src/mesa/shader/slang/slang_label.c   |  2 +-
 src/mesa/shader/slang/slang_link.c    |  2 +-
 src/mesa/shader/slang/slang_mem.c     |  2 +-
 src/mesa/shader/slang/slang_utility.c |  2 +-
 src/mesa/shader/slang/slang_utility.h |  2 +-
 19 files changed, 29 insertions(+), 39 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/cpuinfo.c b/src/mesa/main/cpuinfo.c
index b4bfb40eb1..79fcbc71c2 100644
--- a/src/mesa/main/cpuinfo.c
+++ b/src/mesa/main/cpuinfo.c
@@ -103,7 +103,7 @@ _mesa_get_cpu_string(void)
 
 #endif
 
-   assert(_mesa_strlen(buffer) < MAX_STRING);
+   assert(strlen(buffer) < MAX_STRING);
 
    return buffer;
 }
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 87c1fac28a..6449f39c7f 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -574,8 +574,8 @@ _mesa_extension_is_enabled( GLcontext *ctx, const char *name )
 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;
+   const GLuint aLen = a ? strlen(a) : 0;
+   const GLuint bLen = b ? strlen(b) : 0;
    char *s = _mesa_calloc(aLen + bLen + 1);
    if (s) {
       if (a)
@@ -677,12 +677,12 @@ _mesa_make_extension_string( GLcontext *ctx )
    /* first, compute length of the extension string */
    for (i = 0 ; i < Elements(default_extensions) ; i++) {
       if (extension_enabled(ctx, i)) {
-         extStrLen += (GLuint)_mesa_strlen(default_extensions[i].name) + 1;
+         extStrLen += (GLuint) strlen(default_extensions[i].name) + 1;
       }
    }
 
    if (extraExt)
-      extStrLen += _mesa_strlen(extraExt) + 1; /* +1 for space */
+      extStrLen += strlen(extraExt) + 1; /* +1 for space */
 
    /* allocate the extension string */
    s = (char *) _mesa_malloc(extStrLen);
@@ -693,7 +693,7 @@ _mesa_make_extension_string( GLcontext *ctx )
    extStrLen = 0;
    for (i = 0 ; i < Elements(default_extensions) ; i++) {
       if (extension_enabled(ctx, i)) {
-         GLuint len = (GLuint)_mesa_strlen(default_extensions[i].name);
+         GLuint len = (GLuint) strlen(default_extensions[i].name);
          _mesa_memcpy(s + extStrLen, default_extensions[i].name, len);
          extStrLen += len;
          s[extStrLen] = ' ';
diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index 78c5cada75..dc24ea0740 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -841,13 +841,6 @@ _mesa_getenv( const char *var )
 /** \name String */
 /*@{*/
 
-/** Wrapper around strlen() */
-size_t
-_mesa_strlen( const char *s )
-{
-   return strlen(s);
-}
-
 /** Wrapper around strcmp() */
 int
 _mesa_strcmp( const char *s1, const char *s2 )
@@ -870,7 +863,7 @@ char *
 _mesa_strdup( const char *s )
 {
    if (s) {
-      size_t l = _mesa_strlen(s);
+      size_t l = strlen(s);
       char *s2 = (char *) _mesa_malloc(l + 1);
       if (s2)
          strcpy(s2, s);
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index 192dffe8c6..f66cf0d6f9 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -611,9 +611,6 @@ _mesa_bsearch( const void *key, const void *base, size_t nmemb, size_t size,
 extern char *
 _mesa_getenv( const char *var );
 
-extern size_t
-_mesa_strlen( const char *s );
-
 extern int
 _mesa_strcmp( const char *s1, const char *s2 );
 
diff --git a/src/mesa/main/shaders.c b/src/mesa/main/shaders.c
index d0dc7e551c..b9c84eb792 100644
--- a/src/mesa/main/shaders.c
+++ b/src/mesa/main/shaders.c
@@ -447,7 +447,7 @@ _mesa_ShaderSourceARB(GLhandleARB shaderObj, GLsizei count,
          return;
       }
       if (length == NULL || length[i] < 0)
-         offsets[i] = _mesa_strlen(string[i]);
+         offsets[i] = strlen(string[i]);
       else
          offsets[i] = length[i];
       /* accumulate string lengths */
diff --git a/src/mesa/shader/arbprogram.c b/src/mesa/shader/arbprogram.c
index 7e3040a6ef..a77ff7c5b1 100644
--- a/src/mesa/shader/arbprogram.c
+++ b/src/mesa/shader/arbprogram.c
@@ -910,7 +910,7 @@ _mesa_GetProgramivARB(GLenum target, GLenum pname, GLint *params)
    switch (pname) {
       case GL_PROGRAM_LENGTH_ARB:
          *params
-            = prog->String ? (GLint) _mesa_strlen((char *) prog->String) : 0;
+            = prog->String ? (GLint) strlen((char *) prog->String) : 0;
          return;
       case GL_PROGRAM_FORMAT_ARB:
          *params = prog->Format;
@@ -1091,7 +1091,7 @@ _mesa_GetProgramStringARB(GLenum target, GLenum pname, GLvoid *string)
    }
 
    if (prog->String)
-      _mesa_memcpy(dst, prog->String, _mesa_strlen((char *) prog->String));
+      _mesa_memcpy(dst, prog->String, strlen((char *) prog->String));
    else
       *dst = '\0';
 }
diff --git a/src/mesa/shader/atifragshader.c b/src/mesa/shader/atifragshader.c
index 28dbf77b66..3e26c43c48 100644
--- a/src/mesa/shader/atifragshader.c
+++ b/src/mesa/shader/atifragshader.c
@@ -115,7 +115,7 @@ create_dst_mod_str(GLuint mod)
    if (mod & GL_SATURATE_BIT_ATI)
       strncat(ret_str, "|SAT", 1024);
 
-   if (_mesa_strlen(ret_str) == 0)
+   if (strlen(ret_str) == 0)
       strncat(ret_str, "NONE", 1024);
    return ret_str;
 }
diff --git a/src/mesa/shader/nvfragparse.c b/src/mesa/shader/nvfragparse.c
index 8ee7c93062..b219dfa6e7 100644
--- a/src/mesa/shader/nvfragparse.c
+++ b/src/mesa/shader/nvfragparse.c
@@ -378,7 +378,7 @@ Peek_Token(struct parse_state *parseState, GLubyte *token)
       parseState->pos += (-i);
       return GL_FALSE;
    }
-   len = (GLint)_mesa_strlen((const char *) token);
+   len = (GLint) strlen((const char *) token);
    parseState->pos += (i - len);
    return GL_TRUE;
 }
diff --git a/src/mesa/shader/nvprogram.c b/src/mesa/shader/nvprogram.c
index c3b10f5d9b..394b6a42d7 100644
--- a/src/mesa/shader/nvprogram.c
+++ b/src/mesa/shader/nvprogram.c
@@ -260,7 +260,7 @@ _mesa_GetProgramivNV(GLuint id, GLenum pname, GLint *params)
          *params = prog->Target;
          return;
       case GL_PROGRAM_LENGTH_NV:
-         *params = prog->String ?(GLint)_mesa_strlen((char *) prog->String) : 0;
+         *params = prog->String ?(GLint) strlen((char *) prog->String) : 0;
          return;
       case GL_PROGRAM_RESIDENT_NV:
          *params = prog->Resident;
@@ -297,7 +297,7 @@ _mesa_GetProgramStringNV(GLuint id, GLenum pname, GLubyte *program)
    }
 
    if (prog->String) {
-      MEMCPY(program, prog->String, _mesa_strlen((char *) prog->String));
+      MEMCPY(program, prog->String, strlen((char *) prog->String));
    }
    else {
       program[0] = 0;
diff --git a/src/mesa/shader/nvvertparse.c b/src/mesa/shader/nvvertparse.c
index baff7658d1..90f795ab16 100644
--- a/src/mesa/shader/nvvertparse.c
+++ b/src/mesa/shader/nvvertparse.c
@@ -232,7 +232,7 @@ Peek_Token(struct parse_state *parseState, GLubyte *token)
       parseState->pos += (-i);
       return GL_FALSE;
    }
-   len = (GLint)_mesa_strlen((const char *) token);
+   len = (GLint) strlen((const char *) token);
    parseState->pos += (i - len);
    return GL_TRUE;
 }
diff --git a/src/mesa/shader/prog_parameter.c b/src/mesa/shader/prog_parameter.c
index d4970c4e44..0c52c254b5 100644
--- a/src/mesa/shader/prog_parameter.c
+++ b/src/mesa/shader/prog_parameter.c
@@ -538,7 +538,7 @@ _mesa_lookup_parameter_index(const struct gl_program_parameter_list *paramList,
       for (i = 0; i < (GLint) paramList->NumParameters; i++) {
          if (paramList->Parameters[i].Name &&
 	     _mesa_strncmp(paramList->Parameters[i].Name, name, nameLen) == 0
-             && _mesa_strlen(paramList->Parameters[i].Name) == (size_t)nameLen)
+             && strlen(paramList->Parameters[i].Name) == (size_t)nameLen)
             return i;
       }
    }
@@ -723,7 +723,7 @@ _mesa_longest_parameter_name(const struct gl_program_parameter_list *list,
       return 0;
    for (i = 0; i < list->NumParameters; i++) {
       if (list->Parameters[i].Type == type) {
-         GLuint len = _mesa_strlen(list->Parameters[i].Name);
+         GLuint len = strlen(list->Parameters[i].Name);
          if (len > maxLen)
             maxLen = len;
       }
diff --git a/src/mesa/shader/prog_uniform.c b/src/mesa/shader/prog_uniform.c
index 0642713148..cdfe158deb 100644
--- a/src/mesa/shader/prog_uniform.c
+++ b/src/mesa/shader/prog_uniform.c
@@ -142,7 +142,7 @@ _mesa_longest_uniform_name(const struct gl_uniform_list *list)
    GLint max = 0;
    GLuint i;
    for (i = 0; list && i < list->NumUniforms; i++) {
-      GLint len = (GLint)_mesa_strlen(list->Uniforms[i].Name);
+      GLint len = (GLint) strlen(list->Uniforms[i].Name);
       if (len > max)
          max = len;
    }
diff --git a/src/mesa/shader/slang/slang_compile.c b/src/mesa/shader/slang/slang_compile.c
index 33964e0c3b..65842ac0c8 100644
--- a/src/mesa/shader/slang/slang_compile.c
+++ b/src/mesa/shader/slang/slang_compile.c
@@ -167,7 +167,7 @@ static void
 parse_identifier_str(slang_parse_ctx * C, char **id)
 {
    *id = (char *) C->I;
-   C->I += _mesa_strlen(*id) + 1;
+   C->I += strlen(*id) + 1;
 }
 
 static slang_atom
@@ -176,7 +176,7 @@ parse_identifier(slang_parse_ctx * C)
    const char *id;
 
    id = (const char *) C->I;
-   C->I += _mesa_strlen(id) + 1;
+   C->I += strlen(id) + 1;
    return slang_atom_pool_atom(C->atoms, id);
 }
 
@@ -298,9 +298,9 @@ parse_float(slang_parse_ctx * C, float *number)
       parse_identifier_str(C, &fractional);
       parse_identifier_str(C, &exponent);
 
-      whole = (char *) _slang_alloc((_mesa_strlen(integral) +
-                                     _mesa_strlen(fractional) +
-                                     _mesa_strlen(exponent) + 3) * sizeof(char));
+      whole = (char *) _slang_alloc((strlen(integral) +
+                                     strlen(fractional) +
+                                     strlen(exponent) + 3) * sizeof(char));
       if (whole == NULL) {
          slang_info_log_memory(C->L);
          RETURN0;
diff --git a/src/mesa/shader/slang/slang_emit.c b/src/mesa/shader/slang/slang_emit.c
index 0f670360ee..fa3a63ea4b 100644
--- a/src/mesa/shader/slang/slang_emit.c
+++ b/src/mesa/shader/slang/slang_emit.c
@@ -754,7 +754,7 @@ instruction_annotation(gl_inst_opcode opcode, char *dstAnnot,
    s = (char *) malloc(len);
    sprintf(s, "%s = %s %s %s %s", dstAnnot,
            srcAnnot0, operator, srcAnnot1, srcAnnot2);
-   assert(_mesa_strlen(s) < len);
+   assert(strlen(s) < len);
 
    free(dstAnnot);
    free(srcAnnot0);
diff --git a/src/mesa/shader/slang/slang_label.c b/src/mesa/shader/slang/slang_label.c
index 1ca1ef0c7c..1240621365 100644
--- a/src/mesa/shader/slang/slang_label.c
+++ b/src/mesa/shader/slang/slang_label.c
@@ -32,7 +32,7 @@ _slang_label_new_unique(const char *name)
    static int id = 1;
    slang_label *l = (slang_label *) _slang_alloc(sizeof(slang_label));
    if (l) {
-      l->Name = (char *) _slang_alloc(_mesa_strlen(name) + 10);
+      l->Name = (char *) _slang_alloc(strlen(name) + 10);
       if (!l->Name) {
          _mesa_free(l);
          return NULL;
diff --git a/src/mesa/shader/slang/slang_link.c b/src/mesa/shader/slang/slang_link.c
index 9c90d5c531..2906cb17c4 100644
--- a/src/mesa/shader/slang/slang_link.c
+++ b/src/mesa/shader/slang/slang_link.c
@@ -603,7 +603,7 @@ concat_shaders(struct gl_shader_program *shProg, GLenum shaderType)
    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);
+         shaderLengths[i] = strlen(shader->Source);
          totalLen += shaderLengths[i];
          if (!firstShader)
             firstShader = shader;
diff --git a/src/mesa/shader/slang/slang_mem.c b/src/mesa/shader/slang/slang_mem.c
index dc5707a39b..c37e12fb7f 100644
--- a/src/mesa/shader/slang/slang_mem.c
+++ b/src/mesa/shader/slang/slang_mem.c
@@ -212,7 +212,7 @@ char *
 _slang_strdup(const char *s)
 {
    if (s) {
-      size_t l = _mesa_strlen(s);
+      size_t l = strlen(s);
       char *s2 = (char *) _slang_alloc(l + 1);
       if (s2)
          strcpy(s2, s);
diff --git a/src/mesa/shader/slang/slang_utility.c b/src/mesa/shader/slang/slang_utility.c
index 950fba5611..e3b0491d97 100644
--- a/src/mesa/shader/slang/slang_utility.c
+++ b/src/mesa/shader/slang/slang_utility.c
@@ -35,7 +35,7 @@
 char *
 slang_string_concat (char *dst, const char *src)
 {
-   return strcpy (dst + _mesa_strlen (dst), src);
+   return strcpy (dst + strlen (dst), src);
 }
 
 
diff --git a/src/mesa/shader/slang/slang_utility.h b/src/mesa/shader/slang/slang_utility.h
index 3762cc9679..10071f2c17 100644
--- a/src/mesa/shader/slang/slang_utility.h
+++ b/src/mesa/shader/slang/slang_utility.h
@@ -34,7 +34,7 @@
 
 #define slang_string_compare(str1, str2) _mesa_strcmp (str1, str2)
 #define slang_string_copy(dst, src) strcpy (dst, src)
-#define slang_string_length(str) _mesa_strlen (str)
+#define slang_string_length(str) strlen (str)
 
 char *slang_string_concat (char *, const char *);
 
-- 
cgit v1.2.3


From 8d73aa6d1ae6e89bb2cd8f52f5586d569a4b6eeb Mon Sep 17 00:00:00 2001
From: Kenneth Graunke <kenneth@whitecape.org>
Date: Thu, 18 Feb 2010 23:50:56 -0800
Subject: Remove _mesa_strcmp in favor of plain strcmp.

---
 src/gallium/state_trackers/glx/xlib/glx_api.c | 12 ++++++------
 src/mesa/drivers/fbdev/glfbdev.c              |  2 +-
 src/mesa/drivers/osmesa/osmesa.c              |  2 +-
 src/mesa/drivers/windows/gdi/mesa.def         |  3 +--
 src/mesa/drivers/windows/icd/mesa.def         |  1 -
 src/mesa/drivers/x11/fakeglx.c                | 12 ++++++------
 src/mesa/glapi/gl_enums.py                    |  2 +-
 src/mesa/glapi/mesadef.py                     |  1 -
 src/mesa/main/enums.c                         |  2 +-
 src/mesa/main/extensions.c                    |  4 ++--
 src/mesa/main/imports.c                       |  7 -------
 src/mesa/main/imports.h                       |  3 ---
 src/mesa/shader/nvfragparse.c                 | 12 ++++++------
 src/mesa/shader/nvvertparse.c                 |  6 +++---
 src/mesa/shader/prog_parameter.c              |  6 +++---
 src/mesa/shader/prog_uniform.c                |  2 +-
 src/mesa/shader/slang/slang_codegen.c         |  8 ++++----
 src/mesa/shader/slang/slang_compile.c         |  3 +--
 src/mesa/shader/slang/slang_print.c           |  2 +-
 src/mesa/shader/slang/slang_utility.h         |  2 +-
 20 files changed, 39 insertions(+), 53 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/gallium/state_trackers/glx/xlib/glx_api.c b/src/gallium/state_trackers/glx/xlib/glx_api.c
index 7e86e68b68..971b6e71cb 100644
--- a/src/gallium/state_trackers/glx/xlib/glx_api.c
+++ b/src/gallium/state_trackers/glx/xlib/glx_api.c
@@ -447,12 +447,12 @@ get_env_visual(Display *dpy, int scr, const char *varname)
 
    sscanf( value, "%s %d", type, &depth );
 
-   if (_mesa_strcmp(type,"TrueColor")==0)          xclass = TrueColor;
-   else if (_mesa_strcmp(type,"DirectColor")==0)   xclass = DirectColor;
-   else if (_mesa_strcmp(type,"PseudoColor")==0)   xclass = PseudoColor;
-   else if (_mesa_strcmp(type,"StaticColor")==0)   xclass = StaticColor;
-   else if (_mesa_strcmp(type,"GrayScale")==0)     xclass = GrayScale;
-   else if (_mesa_strcmp(type,"StaticGray")==0)    xclass = StaticGray;
+   if (strcmp(type,"TrueColor")==0)          xclass = TrueColor;
+   else if (strcmp(type,"DirectColor")==0)   xclass = DirectColor;
+   else if (strcmp(type,"PseudoColor")==0)   xclass = PseudoColor;
+   else if (strcmp(type,"StaticColor")==0)   xclass = StaticColor;
+   else if (strcmp(type,"GrayScale")==0)     xclass = GrayScale;
+   else if (strcmp(type,"StaticGray")==0)    xclass = StaticGray;
 
    if (xclass>-1 && depth>0) {
       vis = get_visual( dpy, scr, depth, xclass );
diff --git a/src/mesa/drivers/fbdev/glfbdev.c b/src/mesa/drivers/fbdev/glfbdev.c
index 1a56b2395f..51bd23575f 100644
--- a/src/mesa/drivers/fbdev/glfbdev.c
+++ b/src/mesa/drivers/fbdev/glfbdev.c
@@ -330,7 +330,7 @@ glFBDevGetProcAddress( const char *procName )
    };
    const struct name_address *entry;
    for (entry = functions; entry->name; entry++) {
-      if (_mesa_strcmp(entry->name, procName) == 0) {
+      if (strcmp(entry->name, procName) == 0) {
          return entry->func;
       }
    }
diff --git a/src/mesa/drivers/osmesa/osmesa.c b/src/mesa/drivers/osmesa/osmesa.c
index bac8a9ef14..1c469b15bf 100644
--- a/src/mesa/drivers/osmesa/osmesa.c
+++ b/src/mesa/drivers/osmesa/osmesa.c
@@ -1579,7 +1579,7 @@ OSMesaGetProcAddress( const char *funcName )
 {
    int i;
    for (i = 0; functions[i].Name; i++) {
-      if (_mesa_strcmp(functions[i].Name, funcName) == 0)
+      if (strcmp(functions[i].Name, funcName) == 0)
          return functions[i].Function;
    }
    return _glapi_get_proc_address(funcName);
diff --git a/src/mesa/drivers/windows/gdi/mesa.def b/src/mesa/drivers/windows/gdi/mesa.def
index a31dc55e3f..10e4c4a9c7 100644
--- a/src/mesa/drivers/windows/gdi/mesa.def
+++ b/src/mesa/drivers/windows/gdi/mesa.def
@@ -926,7 +926,6 @@ EXPORTS
 	_mesa_store_texsubimage1d
 	_mesa_store_texsubimage2d
 	_mesa_store_texsubimage3d
-	_mesa_strcmp
 	_mesa_test_proxy_teximage
 	_mesa_reference_framebuffer
 	_mesa_update_framebuffer_visual
@@ -966,4 +965,4 @@ EXPORTS
 	_tnl_InvalidateState
 	_tnl_run_pipeline
 	_tnl_program_string
-	_tnl_RasterPos
\ No newline at end of file
+	_tnl_RasterPos
diff --git a/src/mesa/drivers/windows/icd/mesa.def b/src/mesa/drivers/windows/icd/mesa.def
index 25ac08a2f0..c4b9bff30d 100644
--- a/src/mesa/drivers/windows/icd/mesa.def
+++ b/src/mesa/drivers/windows/icd/mesa.def
@@ -72,7 +72,6 @@ EXPORTS
 	_mesa_store_texsubimage1d
 	_mesa_store_texsubimage2d
 	_mesa_store_texsubimage3d
-	_mesa_strcmp
 	_mesa_test_proxy_teximage
 	_mesa_Viewport
 	_mesa_meta_CopyColorSubTable
diff --git a/src/mesa/drivers/x11/fakeglx.c b/src/mesa/drivers/x11/fakeglx.c
index 3b8c41b918..fd6d71317b 100644
--- a/src/mesa/drivers/x11/fakeglx.c
+++ b/src/mesa/drivers/x11/fakeglx.c
@@ -621,12 +621,12 @@ get_env_visual(Display *dpy, int scr, const char *varname)
 
    sscanf( value, "%s %d", type, &depth );
 
-   if (_mesa_strcmp(type,"TrueColor")==0)          xclass = TrueColor;
-   else if (_mesa_strcmp(type,"DirectColor")==0)   xclass = DirectColor;
-   else if (_mesa_strcmp(type,"PseudoColor")==0)   xclass = PseudoColor;
-   else if (_mesa_strcmp(type,"StaticColor")==0)   xclass = StaticColor;
-   else if (_mesa_strcmp(type,"GrayScale")==0)     xclass = GrayScale;
-   else if (_mesa_strcmp(type,"StaticGray")==0)    xclass = StaticGray;
+   if (strcmp(type,"TrueColor")==0)          xclass = TrueColor;
+   else if (strcmp(type,"DirectColor")==0)   xclass = DirectColor;
+   else if (strcmp(type,"PseudoColor")==0)   xclass = PseudoColor;
+   else if (strcmp(type,"StaticColor")==0)   xclass = StaticColor;
+   else if (strcmp(type,"GrayScale")==0)     xclass = GrayScale;
+   else if (strcmp(type,"StaticGray")==0)    xclass = StaticGray;
 
    if (xclass>-1 && depth>0) {
       vis = get_visual( dpy, scr, depth, xclass );
diff --git a/src/mesa/glapi/gl_enums.py b/src/mesa/glapi/gl_enums.py
index acaa06ab37..adb0ca526c 100644
--- a/src/mesa/glapi/gl_enums.py
+++ b/src/mesa/glapi/gl_enums.py
@@ -70,7 +70,7 @@ typedef int (*cfunc)(const void *, const void *);
  */
 static int compar_name( const char *a, const enum_elt *b )
 {
-   return _mesa_strcmp( a, & enum_string_table[ b->offset ] );
+   return strcmp( a, & enum_string_table[ b->offset ] );
 }
 
 /**
diff --git a/src/mesa/glapi/mesadef.py b/src/mesa/glapi/mesadef.py
index 342c9cde46..8df04143f3 100644
--- a/src/mesa/glapi/mesadef.py
+++ b/src/mesa/glapi/mesadef.py
@@ -152,7 +152,6 @@ def PrintTail():
 	print '\t_mesa_store_texsubimage1d'
 	print '\t_mesa_store_texsubimage2d'
 	print '\t_mesa_store_texsubimage3d'
-	print '\t_mesa_strcmp'
 	print '\t_mesa_test_proxy_teximage'
 	print '\t_mesa_Viewport'
 	print '\t_mesa_meta_CopyColorSubTable'
diff --git a/src/mesa/main/enums.c b/src/mesa/main/enums.c
index 1d495b7ae5..fc7f8beb50 100644
--- a/src/mesa/main/enums.c
+++ b/src/mesa/main/enums.c
@@ -5181,7 +5181,7 @@ typedef int (*cfunc)(const void *, const void *);
  */
 static int compar_name( const char *a, const enum_elt *b )
 {
-   return _mesa_strcmp( a, & enum_string_table[ b->offset ] );
+   return strcmp( a, & enum_string_table[ b->offset ] );
 }
 
 /**
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 6449f39c7f..9b0b5f06fc 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -498,7 +498,7 @@ set_extension( GLcontext *ctx, const char *name, GLboolean state )
    }
 
    for (i = 0 ; i < Elements(default_extensions) ; i++) {
-      if (_mesa_strcmp(default_extensions[i].name, name) == 0) {
+      if (strcmp(default_extensions[i].name, name) == 0) {
          if (default_extensions[i].flag_offset) {
             GLboolean *enabled = base + default_extensions[i].flag_offset;
             *enabled = state;
@@ -560,7 +560,7 @@ _mesa_extension_is_enabled( GLcontext *ctx, const char *name )
    GLuint i;
 
    for (i = 0 ; i < Elements(default_extensions) ; i++) {
-      if (_mesa_strcmp(default_extensions[i].name, name) == 0) {
+      if (strcmp(default_extensions[i].name, name) == 0) {
          return extension_enabled(ctx, i);
       }
    }
diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index dc24ea0740..a48f05c536 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -841,13 +841,6 @@ _mesa_getenv( const char *var )
 /** \name String */
 /*@{*/
 
-/** Wrapper around strcmp() */
-int
-_mesa_strcmp( const char *s1, const char *s2 )
-{
-   return strcmp(s1, s2);
-}
-
 /** Wrapper around strncmp() */
 int
 _mesa_strncmp( const char *s1, const char *s2, size_t n )
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index f66cf0d6f9..867bce763c 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -611,9 +611,6 @@ _mesa_bsearch( const void *key, const void *base, size_t nmemb, size_t size,
 extern char *
 _mesa_getenv( const char *var );
 
-extern int
-_mesa_strcmp( const char *s1, const char *s2 );
-
 extern int
 _mesa_strncmp( const char *s1, const char *s2, size_t n );
 
diff --git a/src/mesa/shader/nvfragparse.c b/src/mesa/shader/nvfragparse.c
index b219dfa6e7..661e7a2a7e 100644
--- a/src/mesa/shader/nvfragparse.c
+++ b/src/mesa/shader/nvfragparse.c
@@ -802,7 +802,7 @@ Parse_FragReg(struct parse_state *parseState, GLint *tempRegNum)
       RETURN_ERROR;
    }
    for (j = 0; InputRegisters[j]; j++) {
-      if (_mesa_strcmp((const char *) token, InputRegisters[j]) == 0) {
+      if (strcmp((const char *) token, InputRegisters[j]) == 0) {
          *tempRegNum = j;
          parseState->inputsRead |= (1 << j);
          break;
@@ -835,13 +835,13 @@ Parse_OutputReg(struct parse_state *parseState, GLint *outputRegNum)
       RETURN_ERROR;
 
    /* try to match an output register name */
-   if (_mesa_strcmp((char *) token, "COLR") == 0 ||
-       _mesa_strcmp((char *) token, "COLH") == 0) {
+   if (strcmp((char *) token, "COLR") == 0 ||
+       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);
    }
-   else if (_mesa_strcmp((char *) token, "DEPR") == 0) {
+   else if (strcmp((char *) token, "DEPR") == 0) {
       *outputRegNum = FRAG_RESULT_DEPTH;
       parseState->outputsWritten |= (1 << FRAG_RESULT_DEPTH);
    }
@@ -868,8 +868,8 @@ Parse_MaskedDstReg(struct parse_state *parseState,
    if (!Peek_Token(parseState, token))
       RETURN_ERROR;
 
-   if (_mesa_strcmp((const char *) token, "RC") == 0 ||
-       _mesa_strcmp((const char *) token, "HC") == 0) {
+   if (strcmp((const char *) token, "RC") == 0 ||
+       strcmp((const char *) token, "HC") == 0) {
       /* a write-only register */
       dstReg->File = PROGRAM_WRITE_ONLY;
       if (!Parse_DummyReg(parseState, &idx))
diff --git a/src/mesa/shader/nvvertparse.c b/src/mesa/shader/nvvertparse.c
index 90f795ab16..a983c3ddcf 100644
--- a/src/mesa/shader/nvvertparse.c
+++ b/src/mesa/shader/nvvertparse.c
@@ -403,7 +403,7 @@ Parse_ParamReg(struct parse_state *parseState, struct prog_src_register *srcReg)
       srcReg->File = PROGRAM_ENV_PARAM;
       srcReg->Index = reg;
    }
-   else if (_mesa_strcmp((const char *) token, "A0") == 0) {
+   else if (strcmp((const char *) token, "A0") == 0) {
       /* address register "A0.x" */
       if (!Parse_AddrReg(parseState))
          RETURN_ERROR;
@@ -487,7 +487,7 @@ Parse_AttribReg(struct parse_state *parseState, GLint *tempRegNum)
    }
    else {
       for (j = 0; InputRegisters[j]; j++) {
-         if (_mesa_strcmp((const char *) token, InputRegisters[j]) == 0) {
+         if (strcmp((const char *) token, InputRegisters[j]) == 0) {
             *tempRegNum = j;
             break;
          }
@@ -531,7 +531,7 @@ Parse_OutputReg(struct parse_state *parseState, GLint *outputRegNum)
 
    /* try to match an output register name */
    for (j = start; OutputRegisters[j]; j++) {
-      if (_mesa_strcmp((const char *) token, OutputRegisters[j]) == 0) {
+      if (strcmp((const char *) token, OutputRegisters[j]) == 0) {
          *outputRegNum = j;
          break;
       }
diff --git a/src/mesa/shader/prog_parameter.c b/src/mesa/shader/prog_parameter.c
index 0c52c254b5..b0ccf7bd8a 100644
--- a/src/mesa/shader/prog_parameter.c
+++ b/src/mesa/shader/prog_parameter.c
@@ -215,7 +215,7 @@ _mesa_add_named_constant(struct gl_program_parameter_list *paramList,
           pvals[1] == values[1] &&
           pvals[2] == values[2] &&
           pvals[3] == values[3] &&
-          _mesa_strcmp(paramList->Parameters[pos].Name, name) == 0) {
+          strcmp(paramList->Parameters[pos].Name, name) == 0) {
          /* Same name and value is already in the param list - reuse it */
          return pos;
       }
@@ -325,7 +325,7 @@ _mesa_use_uniform(struct gl_program_parameter_list *paramList,
    for (i = 0; i < paramList->NumParameters; i++) {
       struct gl_program_parameter *p = paramList->Parameters + i;
       if ((p->Type == PROGRAM_UNIFORM || p->Type == PROGRAM_SAMPLER) &&
-          _mesa_strcmp(p->Name, name) == 0) {
+          strcmp(p->Name, name) == 0) {
          p->Used = GL_TRUE;
          /* Note that large uniforms may occupy several slots so we're
           * not done searching yet.
@@ -529,7 +529,7 @@ _mesa_lookup_parameter_index(const struct gl_program_parameter_list *paramList,
       /* name is null-terminated */
       for (i = 0; i < (GLint) paramList->NumParameters; i++) {
          if (paramList->Parameters[i].Name &&
-	     _mesa_strcmp(paramList->Parameters[i].Name, name) == 0)
+	     strcmp(paramList->Parameters[i].Name, name) == 0)
             return i;
       }
    }
diff --git a/src/mesa/shader/prog_uniform.c b/src/mesa/shader/prog_uniform.c
index cdfe158deb..a831ce8cb6 100644
--- a/src/mesa/shader/prog_uniform.c
+++ b/src/mesa/shader/prog_uniform.c
@@ -128,7 +128,7 @@ _mesa_lookup_uniform(const struct gl_uniform_list *list, const char *name)
 {
    GLuint i;
    for (i = 0; list && i < list->NumUniforms; i++) {
-      if (!_mesa_strcmp(list->Uniforms[i].Name, name)) {
+      if (!strcmp(list->Uniforms[i].Name, name)) {
          return i;
       }
    }
diff --git a/src/mesa/shader/slang/slang_codegen.c b/src/mesa/shader/slang/slang_codegen.c
index fe4bddf9ad..2280ceb9ee 100644
--- a/src/mesa/shader/slang/slang_codegen.c
+++ b/src/mesa/shader/slang/slang_codegen.c
@@ -1020,7 +1020,7 @@ slang_substitute(slang_assemble_ctx *A, slang_operation *oper,
 	 GLuint i;
          v = _slang_variable_locate(oper->locals, id, GL_TRUE);
 	 if (!v) {
-            if (_mesa_strcmp((char *) oper->a_id, "__notRetFlag"))
+            if (strcmp((char *) oper->a_id, "__notRetFlag"))
                _mesa_problem(NULL, "var %s not found!\n", (char *) oper->a_id);
             return;
 	 }
@@ -1658,7 +1658,7 @@ slang_find_asm_info(const char *name)
 {
    GLuint i;
    for (i = 0; AsmInfo[i].Name; i++) {
-      if (_mesa_strcmp(AsmInfo[i].Name, name) == 0) {
+      if (strcmp(AsmInfo[i].Name, name) == 0) {
          return AsmInfo + i;
       }
    }
@@ -2317,7 +2317,7 @@ _slang_is_vec_mat_type(const char *name)
    };
    int i;
    for (i = 0; vecmat_types[i]; i++)
-      if (_mesa_strcmp(name, vecmat_types[i]) == 0)
+      if (strcmp(name, vecmat_types[i]) == 0)
          return GL_TRUE;
    return GL_FALSE;
 }
@@ -5224,7 +5224,7 @@ _slang_codegen_function(slang_assemble_ctx * A, slang_function * fun)
    slang_ir_node *n;
    GLboolean success = GL_TRUE;
 
-   if (_mesa_strcmp((char *) fun->header.a_name, "main") != 0) {
+   if (strcmp((char *) fun->header.a_name, "main") != 0) {
       /* we only really generate code for main, all other functions get
        * inlined or codegen'd upon an actual call.
        */
diff --git a/src/mesa/shader/slang/slang_compile.c b/src/mesa/shader/slang/slang_compile.c
index 65842ac0c8..1a2c39104b 100644
--- a/src/mesa/shader/slang/slang_compile.c
+++ b/src/mesa/shader/slang/slang_compile.c
@@ -2563,8 +2563,7 @@ parse_code_unit(slang_parse_ctx * C, slang_code_unit * unit,
          {
             slang_function *func;
             success = parse_function(C, &o, 1, &func);
-            if (success &&
-                _mesa_strcmp((char *) func->header.a_name, "main") == 0) {
+            if (success && strcmp((char *) func->header.a_name, "main") == 0) {
                /* found main() */
                mainFunc = func;
             }
diff --git a/src/mesa/shader/slang/slang_print.c b/src/mesa/shader/slang/slang_print.c
index 98c7877534..6efc5b7826 100644
--- a/src/mesa/shader/slang/slang_print.c
+++ b/src/mesa/shader/slang/slang_print.c
@@ -698,7 +698,7 @@ slang_print_function(const slang_function *f, GLboolean body)
    GLuint i;
 
 #if 0
-   if (_mesa_strcmp((char *) f->header.a_name, "main") != 0)
+   if (strcmp((char *) f->header.a_name, "main") != 0)
      return;
 #endif
 
diff --git a/src/mesa/shader/slang/slang_utility.h b/src/mesa/shader/slang/slang_utility.h
index 10071f2c17..2c0d0bcbb2 100644
--- a/src/mesa/shader/slang/slang_utility.h
+++ b/src/mesa/shader/slang/slang_utility.h
@@ -32,7 +32,7 @@
 #define static_assert(expr) do { int _array[(expr) ? 1 : -1]; (void) _array[0]; } while (0)
 
 
-#define slang_string_compare(str1, str2) _mesa_strcmp (str1, str2)
+#define slang_string_compare(str1, str2) strcmp (str1, str2)
 #define slang_string_copy(dst, src) strcpy (dst, src)
 #define slang_string_length(str) strlen (str)
 
-- 
cgit v1.2.3


From 9d9afe9393fde99858ddf40e478bc16cf44e60dc Mon Sep 17 00:00:00 2001
From: Kenneth Graunke <kenneth@whitecape.org>
Date: Thu, 18 Feb 2010 23:50:57 -0800
Subject: Remove _mesa_strncmp in favor of plain strncmp.

---
 src/mesa/main/imports.c               | 7 -------
 src/mesa/main/imports.h               | 3 ---
 src/mesa/shader/nvfragparse.c         | 6 +++---
 src/mesa/shader/nvvertparse.c         | 6 +++---
 src/mesa/shader/prog_parameter.c      | 2 +-
 src/mesa/shader/slang/slang_compile.c | 2 +-
 6 files changed, 8 insertions(+), 18 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index a48f05c536..4c5e99fbbe 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -841,13 +841,6 @@ _mesa_getenv( const char *var )
 /** \name String */
 /*@{*/
 
-/** Wrapper around strncmp() */
-int
-_mesa_strncmp( const char *s1, const char *s2, size_t n )
-{
-   return strncmp(s1, s2, n);
-}
-
 /**
  * Implemented using _mesa_malloc() and strcpy.
  * Note that NULL is handled accordingly.
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index 867bce763c..3c8f734e36 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -611,9 +611,6 @@ _mesa_bsearch( const void *key, const void *base, size_t nmemb, size_t size,
 extern char *
 _mesa_getenv( const char *var );
 
-extern int
-_mesa_strncmp( const char *s1, const char *s2, size_t n );
-
 extern char *
 _mesa_strdup( const char *s );
 
diff --git a/src/mesa/shader/nvfragparse.c b/src/mesa/shader/nvfragparse.c
index 661e7a2a7e..79b2e5989c 100644
--- a/src/mesa/shader/nvfragparse.c
+++ b/src/mesa/shader/nvfragparse.c
@@ -224,7 +224,7 @@ MatchInstruction(const GLubyte *token)
    result.suffixes = 0;
 
    for (inst = Instructions; inst->name; inst++) {
-      if (_mesa_strncmp((const char *) token, inst->name, 3) == 0) {
+      if (strncmp((const char *) token, inst->name, 3) == 0) {
          /* matched! */
          int i = 3;
          result = *inst;
@@ -1495,11 +1495,11 @@ _mesa_parse_nv_fragment_program(GLcontext *ctx, GLenum dstTarget,
    _mesa_set_program_error(ctx, -1, NULL);
 
    /* check the program header */
-   if (_mesa_strncmp((const char *) programString, "!!FP1.0", 7) == 0) {
+   if (strncmp((const char *) programString, "!!FP1.0", 7) == 0) {
       target = GL_FRAGMENT_PROGRAM_NV;
       parseState.pos = programString + 7;
    }
-   else if (_mesa_strncmp((const char *) programString, "!!FCP1.0", 8) == 0) {
+   else if (strncmp((const char *) programString, "!!FCP1.0", 8) == 0) {
       /* fragment / register combiner program - not supported */
       _mesa_set_program_error(ctx, 0, "Invalid fragment program header");
       _mesa_error(ctx, GL_INVALID_OPERATION, "glLoadProgramNV(bad header)");
diff --git a/src/mesa/shader/nvvertparse.c b/src/mesa/shader/nvvertparse.c
index a983c3ddcf..cd5b57ff74 100644
--- a/src/mesa/shader/nvvertparse.c
+++ b/src/mesa/shader/nvvertparse.c
@@ -1313,18 +1313,18 @@ _mesa_parse_nv_vertex_program(GLcontext *ctx, GLenum dstTarget,
    _mesa_set_program_error(ctx, -1, NULL);
 
    /* check the program header */
-   if (_mesa_strncmp((const char *) programString, "!!VP1.0", 7) == 0) {
+   if (strncmp((const char *) programString, "!!VP1.0", 7) == 0) {
       target = GL_VERTEX_PROGRAM_NV;
       parseState.pos = programString + 7;
       parseState.isStateProgram = GL_FALSE;
    }
-   else if (_mesa_strncmp((const char *) programString, "!!VP1.1", 7) == 0) {
+   else if (strncmp((const char *) programString, "!!VP1.1", 7) == 0) {
       target = GL_VERTEX_PROGRAM_NV;
       parseState.pos = programString + 7;
       parseState.isStateProgram = GL_FALSE;
       parseState.isVersion1_1 = GL_TRUE;
    }
-   else if (_mesa_strncmp((const char *) programString, "!!VSP1.0", 8) == 0) {
+   else if (strncmp((const char *) programString, "!!VSP1.0", 8) == 0) {
       target = GL_VERTEX_STATE_PROGRAM_NV;
       parseState.pos = programString + 8;
       parseState.isStateProgram = GL_TRUE;
diff --git a/src/mesa/shader/prog_parameter.c b/src/mesa/shader/prog_parameter.c
index b0ccf7bd8a..435e6ceb09 100644
--- a/src/mesa/shader/prog_parameter.c
+++ b/src/mesa/shader/prog_parameter.c
@@ -537,7 +537,7 @@ _mesa_lookup_parameter_index(const struct gl_program_parameter_list *paramList,
       /* name is not null-terminated, use nameLen */
       for (i = 0; i < (GLint) paramList->NumParameters; i++) {
          if (paramList->Parameters[i].Name &&
-	     _mesa_strncmp(paramList->Parameters[i].Name, name, nameLen) == 0
+	     strncmp(paramList->Parameters[i].Name, name, nameLen) == 0
              && strlen(paramList->Parameters[i].Name) == (size_t)nameLen)
             return i;
       }
diff --git a/src/mesa/shader/slang/slang_compile.c b/src/mesa/shader/slang/slang_compile.c
index 1a2c39104b..41d51cd98a 100644
--- a/src/mesa/shader/slang/slang_compile.c
+++ b/src/mesa/shader/slang/slang_compile.c
@@ -65,7 +65,7 @@ static GLboolean
 legal_identifier(slang_atom name)
 {
    /* "gl_" is a reserved prefix */
-   if (_mesa_strncmp((char *) name, "gl_", 3) == 0) {
+   if (strncmp((char *) name, "gl_", 3) == 0) {
       return GL_FALSE;
    }
    return GL_TRUE;
-- 
cgit v1.2.3


From 60b0cae412029e53654f38d0de151908f1feb310 Mon Sep 17 00:00:00 2001
From: Kenneth Graunke <kenneth@whitecape.org>
Date: Thu, 18 Feb 2010 23:50:58 -0800
Subject: Remove _mesa_atoi in favor of plain atoi.

---
 src/gallium/state_trackers/glx/xlib/glx_api.c |  4 ++--
 src/mesa/drivers/x11/fakeglx.c                |  4 ++--
 src/mesa/main/imports.c                       |  9 +--------
 src/mesa/main/imports.h                       |  3 ---
 src/mesa/shader/nvfragparse.c                 |  6 +++---
 src/mesa/shader/nvvertparse.c                 | 10 +++++-----
 src/mesa/shader/shader_api.c                  |  2 +-
 7 files changed, 14 insertions(+), 24 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/gallium/state_trackers/glx/xlib/glx_api.c b/src/gallium/state_trackers/glx/xlib/glx_api.c
index 971b6e71cb..e3b52f521b 100644
--- a/src/gallium/state_trackers/glx/xlib/glx_api.c
+++ b/src/gallium/state_trackers/glx/xlib/glx_api.c
@@ -280,7 +280,7 @@ default_depth_bits(void)
    int zBits;
    const char *zEnv = _mesa_getenv("MESA_GLX_DEPTH_BITS");
    if (zEnv)
-      zBits = _mesa_atoi(zEnv);
+      zBits = atoi(zEnv);
    else
       zBits = DEFAULT_SOFTWARE_DEPTH_BITS;
    return zBits;
@@ -292,7 +292,7 @@ default_alpha_bits(void)
    int aBits;
    const char *aEnv = _mesa_getenv("MESA_GLX_ALPHA_BITS");
    if (aEnv)
-      aBits = _mesa_atoi(aEnv);
+      aBits = atoi(aEnv);
    else
       aBits = 0;
    return aBits;
diff --git a/src/mesa/drivers/x11/fakeglx.c b/src/mesa/drivers/x11/fakeglx.c
index fd6d71317b..075b9a1e5f 100644
--- a/src/mesa/drivers/x11/fakeglx.c
+++ b/src/mesa/drivers/x11/fakeglx.c
@@ -378,7 +378,7 @@ default_depth_bits(void)
    int zBits;
    const char *zEnv = _mesa_getenv("MESA_GLX_DEPTH_BITS");
    if (zEnv)
-      zBits = _mesa_atoi(zEnv);
+      zBits = atoi(zEnv);
    else
       zBits = DEFAULT_SOFTWARE_DEPTH_BITS;
    return zBits;
@@ -390,7 +390,7 @@ default_alpha_bits(void)
    int aBits;
    const char *aEnv = _mesa_getenv("MESA_GLX_ALPHA_BITS");
    if (aEnv)
-      aBits = _mesa_atoi(aEnv);
+      aBits = atoi(aEnv);
    else
       aBits = 0;
    return aBits;
diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index 4c5e99fbbe..2a0952c7af 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -860,13 +860,6 @@ _mesa_strdup( const char *s )
    }
 }
 
-/** Wrapper around atoi() */
-int
-_mesa_atoi(const char *s)
-{
-   return atoi(s);
-}
-
 /** Wrapper around strtod() */
 double
 _mesa_strtod( const char *s, char **end )
@@ -982,7 +975,7 @@ output_if_debug(const char *prefixString, const char *outputString,
        * set *to any value*.
        */
 #ifdef DEBUG
-      debug = (env != NULL && _mesa_atoi(env) == 0) ? 0 : 1;
+      debug = (env != NULL && atoi(env) == 0) ? 0 : 1;
 #else
       debug = (env != NULL) ? 1 : 0;
 #endif
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index 3c8f734e36..124642178c 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -614,9 +614,6 @@ _mesa_getenv( const char *var );
 extern char *
 _mesa_strdup( const char *s );
 
-extern int
-_mesa_atoi( const char *s );
-
 extern double
 _mesa_strtod( const char *s, char **end );
 
diff --git a/src/mesa/shader/nvfragparse.c b/src/mesa/shader/nvfragparse.c
index 79b2e5989c..ff3a921777 100644
--- a/src/mesa/shader/nvfragparse.c
+++ b/src/mesa/shader/nvfragparse.c
@@ -580,7 +580,7 @@ Parse_TextureImageId(struct parse_state *parseState,
        imageSrc[2] != 'X') {
       RETURN_ERROR1("Expected TEX# source");
    }
-   unit = _mesa_atoi((const char *) imageSrc + 3);
+   unit = atoi((const char *) imageSrc + 3);
    if ((unit < 0 || unit > MAX_TEXTURE_IMAGE_UNITS) ||
        (unit == 0 && (imageSrc[3] != '0' || imageSrc[4] != 0))) {
       RETURN_ERROR1("Invalied TEX# source index");
@@ -717,7 +717,7 @@ Parse_TempReg(struct parse_state *parseState, GLint *tempRegNum)
       RETURN_ERROR1("Expected R## or H##");
 
    if (IsDigit(token[1])) {
-      GLint reg = _mesa_atoi((const char *) (token + 1));
+      GLint reg = atoi((const char *) (token + 1));
       if (token[0] == 'H')
          reg += 32;
       if (reg >= MAX_NV_FRAGMENT_PROGRAM_TEMPS)
@@ -768,7 +768,7 @@ Parse_ProgramParamReg(struct parse_state *parseState, GLint *regNum)
 
    if (IsDigit(token[0])) {
       /* a numbered program parameter register */
-      GLint reg = _mesa_atoi((const char *) token);
+      GLint reg = atoi((const char *) token);
       if (reg >= MAX_NV_FRAGMENT_PROGRAM_PARAMS)
          RETURN_ERROR1("Invalid constant program number");
       *regNum = reg;
diff --git a/src/mesa/shader/nvvertparse.c b/src/mesa/shader/nvvertparse.c
index cd5b57ff74..630de7c2d7 100644
--- a/src/mesa/shader/nvvertparse.c
+++ b/src/mesa/shader/nvvertparse.c
@@ -309,7 +309,7 @@ Parse_TempReg(struct parse_state *parseState, GLint *tempRegNum)
       RETURN_ERROR1("Expected R##");
 
    if (IsDigit(token[1])) {
-      GLint reg = _mesa_atoi((char *) (token + 1));
+      GLint reg = atoi((char *) (token + 1));
       if (reg >= MAX_NV_VERTEX_PROGRAM_TEMPS)
          RETURN_ERROR1("Bad temporary register name");
       *tempRegNum = reg;
@@ -363,7 +363,7 @@ Parse_AbsParamReg(struct parse_state *parseState, GLint *regNum)
 
    if (IsDigit(token[0])) {
       /* a numbered program parameter register */
-      GLint reg = _mesa_atoi((char *) token);
+      GLint reg = atoi((char *) token);
       if (reg >= MAX_NV_VERTEX_PROGRAM_PARAMS)
          RETURN_ERROR1("Bad program parameter number");
       *regNum = reg;
@@ -397,7 +397,7 @@ Parse_ParamReg(struct parse_state *parseState, struct prog_src_register *srcReg)
       /* a numbered program parameter register */
       GLint reg;
       (void) Parse_Token(parseState, token);
-      reg = _mesa_atoi((char *) token);
+      reg = atoi((char *) token);
       if (reg >= MAX_NV_VERTEX_PROGRAM_PARAMS)
          RETURN_ERROR1("Bad program parameter number");
       srcReg->File = PROGRAM_ENV_PARAM;
@@ -423,7 +423,7 @@ Parse_ParamReg(struct parse_state *parseState, struct prog_src_register *srcReg)
             RETURN_ERROR;
 
          if (IsDigit(token[0])) {
-            const GLint k = _mesa_atoi((char *) token);
+            const GLint k = atoi((char *) token);
             if (sign == '-') {
                if (k > 64)
                   RETURN_ERROR1("Bad address offset");
@@ -480,7 +480,7 @@ Parse_AttribReg(struct parse_state *parseState, GLint *tempRegNum)
       RETURN_ERROR1("Only v[0] accessible in vertex state programs");
 
    if (IsDigit(token[0])) {
-      GLint reg = _mesa_atoi((char *) token);
+      GLint reg = atoi((char *) token);
       if (reg >= MAX_NV_VERTEX_PROGRAM_INPUTS)
          RETURN_ERROR1("Bad vertex attribute register name");
       *tempRegNum = reg;
diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index c3b49ed4d4..44310d2e61 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -1385,7 +1385,7 @@ _mesa_get_uniform_location(GLcontext *ctx, GLuint program, const GLchar *name)
 
          location = _mesa_lookup_uniform(shProg->Uniforms, newName);
          if (location >= 0) {
-            const GLint element = _mesa_atoi(c + 1);
+            const GLint element = atoi(c + 1);
             if (element > 0) {
                /* get type of the uniform array element */
                struct gl_program_parameter *p;
-- 
cgit v1.2.3


From c7ac486261ad30ef654f6d0b1608da4e8483cd40 Mon Sep 17 00:00:00 2001
From: Kenneth Graunke <kenneth@whitecape.org>
Date: Thu, 18 Feb 2010 23:50:59 -0800
Subject: Remove _mesa_memcpy in favor of plain memcpy.

This may break the SUNOS4 build, but it's no longer relevant.
---
 src/gallium/state_trackers/glx/xlib/glx_api.c      |  4 +-
 src/mesa/drivers/common/driverfuncs.c              |  2 +-
 src/mesa/drivers/common/meta.c                     | 12 +++---
 src/mesa/drivers/dri/fb/fb_dri.c                   |  6 +--
 src/mesa/drivers/dri/nouveau/nouveau_bufferobj.c   |  6 +--
 src/mesa/drivers/dri/r300/r300_draw.c              |  4 +-
 src/mesa/drivers/dri/r300/r300_vertprog.c          |  2 +-
 src/mesa/drivers/dri/r600/r700_render.c            |  4 +-
 .../drivers/dri/radeon/radeon_buffer_objects.c     |  6 +--
 src/mesa/drivers/dri/unichrome/via_tex.c           |  4 +-
 src/mesa/drivers/fbdev/glfbdev.c                   |  2 +-
 src/mesa/drivers/windows/gdi/mesa.def              |  1 -
 src/mesa/drivers/windows/icd/mesa.def              |  1 -
 src/mesa/drivers/x11/fakeglx.c                     |  4 +-
 src/mesa/glapi/mesadef.py                          |  1 -
 src/mesa/main/attrib.c                             |  2 +-
 src/mesa/main/bitset.h                             |  2 +-
 src/mesa/main/bufferobj.c                          |  8 ++--
 src/mesa/main/colortab.c                           |  2 +-
 src/mesa/main/dlist.c                              | 10 ++---
 src/mesa/main/extensions.c                         |  6 +--
 src/mesa/main/image.c                              | 48 +++++++++++-----------
 src/mesa/main/imports.c                            | 15 +------
 src/mesa/main/imports.h                            |  5 +--
 src/mesa/main/macros.h                             |  2 +-
 src/mesa/main/renderbuffer.c                       | 24 +++++------
 src/mesa/main/shaders.c                            |  4 +-
 src/mesa/main/syncobj.c                            |  2 +-
 src/mesa/main/texgetimage.c                        |  6 +--
 src/mesa/main/texstore.c                           |  2 +-
 src/mesa/shader/arbprogram.c                       |  2 +-
 src/mesa/shader/nvfragparse.c                      |  2 +-
 src/mesa/shader/nvvertparse.c                      |  2 +-
 src/mesa/shader/prog_instruction.c                 |  2 +-
 src/mesa/shader/program.c                          |  2 +-
 src/mesa/shader/program_parse.tab.c                |  2 +-
 src/mesa/shader/program_parse.y                    |  2 +-
 src/mesa/shader/shader_api.c                       |  2 +-
 src/mesa/shader/slang/slang_compile_operation.c    |  6 +--
 src/mesa/shader/slang/slang_link.c                 |  2 +-
 src/mesa/shader/slang/slang_mem.c                  |  2 +-
 src/mesa/shader/slang/slang_utility.c              |  4 +-
 src/mesa/state_tracker/st_cb_bufferobjects.c       |  2 +-
 src/mesa/swrast/s_blend.c                          |  2 +-
 src/mesa/swrast/s_copypix.c                        | 14 +++----
 src/mesa/swrast/s_drawpix.c                        |  2 +-
 src/mesa/swrast/s_span.c                           | 16 ++++----
 src/mesa/swrast/s_stencil.c                        |  8 ++--
 src/mesa/tnl/t_vertex.c                            |  2 +-
 src/mesa/tnl/t_vertex_generic.c                    |  6 +--
 src/mesa/vbo/vbo_exec_api.c                        | 20 ++++-----
 src/mesa/vbo/vbo_exec_draw.c                       | 16 ++++----
 src/mesa/vbo/vbo_save_api.c                        | 20 ++++-----
 src/mesa/vf/vf.c                                   |  2 +-
 54 files changed, 159 insertions(+), 178 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/gallium/state_trackers/glx/xlib/glx_api.c b/src/gallium/state_trackers/glx/xlib/glx_api.c
index e3b52f521b..9093a0eae9 100644
--- a/src/gallium/state_trackers/glx/xlib/glx_api.c
+++ b/src/gallium/state_trackers/glx/xlib/glx_api.c
@@ -1020,7 +1020,7 @@ glXChooseVisual( Display *dpy, int screen, int *list )
       /* create a new vishandle - the cached one may be stale */
       xmvis->vishandle = (XVisualInfo *) _mesa_malloc(sizeof(XVisualInfo));
       if (xmvis->vishandle) {
-         _mesa_memcpy(xmvis->vishandle, xmvis->visinfo, sizeof(XVisualInfo));
+         memcpy(xmvis->vishandle, xmvis->visinfo, sizeof(XVisualInfo));
       }
       return xmvis->vishandle;
    }
@@ -1809,7 +1809,7 @@ glXGetVisualFromFBConfig( Display *dpy, GLXFBConfig config )
       /* create a new vishandle - the cached one may be stale */
       xmvis->vishandle = (XVisualInfo *) _mesa_malloc(sizeof(XVisualInfo));
       if (xmvis->vishandle) {
-         _mesa_memcpy(xmvis->vishandle, xmvis->visinfo, sizeof(XVisualInfo));
+         memcpy(xmvis->vishandle, xmvis->visinfo, sizeof(XVisualInfo));
       }
       return xmvis->vishandle;
 #endif
diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c
index 49d4aaedb0..4f6f083677 100644
--- a/src/mesa/drivers/common/driverfuncs.c
+++ b/src/mesa/drivers/common/driverfuncs.c
@@ -120,7 +120,7 @@ _mesa_init_driver_functions(struct dd_function_table *driver)
    driver->FreeTexImageData = _mesa_free_texture_image_data; 
    driver->MapTexture = NULL;
    driver->UnmapTexture = NULL;
-   driver->TextureMemCpy = _mesa_memcpy; 
+   driver->TextureMemCpy = memcpy;
    driver->IsTextureResident = NULL;
    driver->UpdateTexturePalette = NULL;
 
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index 7116d920f7..4dd2293b24 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -493,12 +493,12 @@ _mesa_meta_begin(GLcontext *ctx, GLbitfield state)
 
    if (state & META_TRANSFORM) {
       GLuint activeTexture = ctx->Texture.CurrentUnit;
-      _mesa_memcpy(save->ModelviewMatrix, ctx->ModelviewMatrixStack.Top->m,
-                   16 * sizeof(GLfloat));
-      _mesa_memcpy(save->ProjectionMatrix, ctx->ProjectionMatrixStack.Top->m,
-                   16 * sizeof(GLfloat));
-      _mesa_memcpy(save->TextureMatrix, ctx->TextureMatrixStack[0].Top->m,
-                   16 * sizeof(GLfloat));
+      memcpy(save->ModelviewMatrix, ctx->ModelviewMatrixStack.Top->m,
+             16 * sizeof(GLfloat));
+      memcpy(save->ProjectionMatrix, ctx->ProjectionMatrixStack.Top->m,
+             16 * sizeof(GLfloat));
+      memcpy(save->TextureMatrix, ctx->TextureMatrixStack[0].Top->m,
+             16 * sizeof(GLfloat));
       save->MatrixMode = ctx->Transform.MatrixMode;
       /* set 1:1 vertex:pixel coordinate transform */
       _mesa_ActiveTextureARB(GL_TEXTURE0);
diff --git a/src/mesa/drivers/dri/fb/fb_dri.c b/src/mesa/drivers/dri/fb/fb_dri.c
index f37241dd69..0675bb9894 100644
--- a/src/mesa/drivers/dri/fb/fb_dri.c
+++ b/src/mesa/drivers/dri/fb/fb_dri.c
@@ -511,10 +511,8 @@ fbSwapBuffers( __DRIdrawable *dPriv )
          ASSERT(backBuffer);
 
 	 for (i = 0; i < dPriv->h; i++) {
-            _mesa_memcpy(tmp, (char *) backBuffer + offset,
-                         currentPitch);
-            _mesa_memcpy((char *) frontBuffer + offset, tmp,
-                          currentPitch);
+            memcpy(tmp, (char *) backBuffer + offset, currentPitch);
+            memcpy((char *) frontBuffer + offset, tmp, currentPitch);
             offset += currentPitch;
 	 }
 	    
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_bufferobj.c b/src/mesa/drivers/dri/nouveau/nouveau_bufferobj.c
index 1118b96de1..5906ad6d39 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_bufferobj.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_bufferobj.c
@@ -72,7 +72,7 @@ nouveau_bufferobj_data(GLcontext *ctx, GLenum target, GLsizeiptrARB size,
 
 	if (data) {
 		nouveau_bo_map(nbo->bo, NOUVEAU_BO_WR);
-		_mesa_memcpy(nbo->bo->map, data, size);
+		memcpy(nbo->bo->map, data, size);
 		nouveau_bo_unmap(nbo->bo);
 	}
 
@@ -87,7 +87,7 @@ nouveau_bufferobj_subdata(GLcontext *ctx, GLenum target, GLintptrARB offset,
 	struct nouveau_bufferobj *nbo = to_nouveau_bufferobj(obj);
 
 	nouveau_bo_map(nbo->bo, NOUVEAU_BO_WR);
-	_mesa_memcpy(nbo->bo->map + offset, data, size);
+	memcpy(nbo->bo->map + offset, data, size);
 	nouveau_bo_unmap(nbo->bo);
 }
 
@@ -99,7 +99,7 @@ nouveau_bufferobj_get_subdata(GLcontext *ctx, GLenum target, GLintptrARB offset,
 	struct nouveau_bufferobj *nbo = to_nouveau_bufferobj(obj);
 
 	nouveau_bo_map(nbo->bo, NOUVEAU_BO_RD);
-	_mesa_memcpy(data, nbo->bo->map + offset, size);
+	memcpy(data, nbo->bo->map + offset, size);
 	nouveau_bo_unmap(nbo->bo);
 }
 
diff --git a/src/mesa/drivers/dri/r300/r300_draw.c b/src/mesa/drivers/dri/r300/r300_draw.c
index 3efa0e3a16..282c0e18bc 100644
--- a/src/mesa/drivers/dri/r300/r300_draw.c
+++ b/src/mesa/drivers/dri/r300/r300_draw.c
@@ -177,7 +177,7 @@ static void r300SetupIndexBuffer(GLcontext *ctx, const struct _mesa_index_buffer
 		radeon_bo_map(r300->ind_buf.bo, 1);
 		assert(r300->ind_buf.bo->ptr != NULL);
 		dst_ptr = ADD_POINTERS(r300->ind_buf.bo->ptr, r300->ind_buf.bo_offset);
-		_mesa_memcpy(dst_ptr, src_ptr, size);
+		memcpy(dst_ptr, src_ptr, size);
 
 		radeon_bo_unmap(r300->ind_buf.bo);
 		r300->ind_buf.is_32bit = (mesa_ind_buf->type == GL_UNSIGNED_INT);
@@ -314,7 +314,7 @@ static void r300AlignDataToDword(GLcontext *ctx, const struct gl_client_array *i
 		int i;
 
 		for (i = 0; i < count; ++i) {
-			_mesa_memcpy(dst_ptr, src_ptr, input->StrideB);
+			memcpy(dst_ptr, src_ptr, input->StrideB);
 			src_ptr += input->StrideB;
 			dst_ptr += dst_stride;
 		}
diff --git a/src/mesa/drivers/dri/r300/r300_vertprog.c b/src/mesa/drivers/dri/r300/r300_vertprog.c
index 3a8d5fb745..efdcdb7848 100644
--- a/src/mesa/drivers/dri/r300/r300_vertprog.c
+++ b/src/mesa/drivers/dri/r300/r300_vertprog.c
@@ -235,7 +235,7 @@ static struct r300_vertex_program *build_program(GLcontext *ctx,
 
 	vp = _mesa_calloc(sizeof(*vp));
 	vp->Base = _mesa_clone_vertex_program(ctx, mesa_vp);
-	_mesa_memcpy(&vp->key, wanted_key, sizeof(vp->key));
+	memcpy(&vp->key, wanted_key, sizeof(vp->key));
 
 	rc_init(&compiler.Base);
 	compiler.Base.Debug = (RADEON_DEBUG & RADEON_VERTS) ? GL_TRUE : GL_FALSE;
diff --git a/src/mesa/drivers/dri/r600/r700_render.c b/src/mesa/drivers/dri/r600/r700_render.c
index 8f14af7472..fdd02fac23 100644
--- a/src/mesa/drivers/dri/r600/r700_render.c
+++ b/src/mesa/drivers/dri/r600/r700_render.c
@@ -594,7 +594,7 @@ static void r700AlignDataToDword(GLcontext *ctx,
 
         for (i = 0; i < count; ++i) 
         {
-            _mesa_memcpy(dst_ptr, src_ptr, input->StrideB);
+            memcpy(dst_ptr, src_ptr, input->StrideB);
             src_ptr += input->StrideB;
             dst_ptr += dst_stride;
         }
@@ -855,7 +855,7 @@ static void r700SetupIndexBuffer(GLcontext *ctx, const struct _mesa_index_buffer
 	assert(context->ind_buf.bo->ptr != NULL);
 	dst_ptr = ADD_POINTERS(context->ind_buf.bo->ptr, context->ind_buf.bo_offset);
 
-        _mesa_memcpy(dst_ptr, src_ptr, size);
+        memcpy(dst_ptr, src_ptr, size);
 
 	radeon_bo_unmap(context->ind_buf.bo);
         context->ind_buf.is_32bit = (mesa_ind_buf->type == GL_UNSIGNED_INT);
diff --git a/src/mesa/drivers/dri/radeon/radeon_buffer_objects.c b/src/mesa/drivers/dri/radeon/radeon_buffer_objects.c
index 99d3ec7005..bc5915d3e4 100644
--- a/src/mesa/drivers/dri/radeon/radeon_buffer_objects.c
+++ b/src/mesa/drivers/dri/radeon/radeon_buffer_objects.c
@@ -114,7 +114,7 @@ radeonBufferData(GLcontext * ctx,
         if (data != NULL) {
             radeon_bo_map(radeon_obj->bo, GL_TRUE);
 
-            _mesa_memcpy(radeon_obj->bo->ptr, data, size);
+            memcpy(radeon_obj->bo->ptr, data, size);
 
             radeon_bo_unmap(radeon_obj->bo);
         }
@@ -145,7 +145,7 @@ radeonBufferSubData(GLcontext * ctx,
 
     radeon_bo_map(radeon_obj->bo, GL_TRUE);
 
-    _mesa_memcpy(radeon_obj->bo->ptr + offset, data, size);
+    memcpy(radeon_obj->bo->ptr + offset, data, size);
 
     radeon_bo_unmap(radeon_obj->bo);
 }
@@ -165,7 +165,7 @@ radeonGetBufferSubData(GLcontext * ctx,
 
     radeon_bo_map(radeon_obj->bo, GL_FALSE);
 
-    _mesa_memcpy(data, radeon_obj->bo->ptr + offset, size);
+    memcpy(data, radeon_obj->bo->ptr + offset, size);
 
     radeon_bo_unmap(radeon_obj->bo);
 }
diff --git a/src/mesa/drivers/dri/unichrome/via_tex.c b/src/mesa/drivers/dri/unichrome/via_tex.c
index 917f975466..a64f093326 100644
--- a/src/mesa/drivers/dri/unichrome/via_tex.c
+++ b/src/mesa/drivers/dri/unichrome/via_tex.c
@@ -951,11 +951,11 @@ void viaInitTextureFuncs(struct dd_function_table * functions)
     * Note that this function is currently disabled in via_tris.c too.
     */
    if (getenv("VIA_NO_SSE"))
-      functions->TextureMemCpy = _mesa_memcpy;
+      functions->TextureMemCpy = memcpy;
    else
       functions->TextureMemCpy = via_sse_memcpy;
 #else
-   functions->TextureMemCpy = _mesa_memcpy;
+   functions->TextureMemCpy = memcpy;
 #endif
 
    functions->UpdateTexturePalette = 0;
diff --git a/src/mesa/drivers/fbdev/glfbdev.c b/src/mesa/drivers/fbdev/glfbdev.c
index 51bd23575f..49002512aa 100644
--- a/src/mesa/drivers/fbdev/glfbdev.c
+++ b/src/mesa/drivers/fbdev/glfbdev.c
@@ -742,7 +742,7 @@ glFBDevSwapBuffers( GLFBDevBufferPtr buffer )
 
    ASSERT(frontrb->Base.Data);
    ASSERT(backrb->Base.Data);
-   _mesa_memcpy(frontrb->Base.Data, backrb->Base.Data, buffer->size);
+   memcpy(frontrb->Base.Data, backrb->Base.Data, buffer->size);
 }
 
 
diff --git a/src/mesa/drivers/windows/gdi/mesa.def b/src/mesa/drivers/windows/gdi/mesa.def
index 10e4c4a9c7..f82db88bc5 100644
--- a/src/mesa/drivers/windows/gdi/mesa.def
+++ b/src/mesa/drivers/windows/gdi/mesa.def
@@ -899,7 +899,6 @@ EXPORTS
 	_mesa_init_renderbuffer
 	_mesa_initialize_context
 	_mesa_make_current
-	_mesa_memcpy
 	_mesa_memset
 	_mesa_new_array_object
 	_mesa_new_framebuffer
diff --git a/src/mesa/drivers/windows/icd/mesa.def b/src/mesa/drivers/windows/icd/mesa.def
index c4b9bff30d..06c384d8b0 100644
--- a/src/mesa/drivers/windows/icd/mesa.def
+++ b/src/mesa/drivers/windows/icd/mesa.def
@@ -54,7 +54,6 @@ EXPORTS
 	_mesa_init_driver_functions
 	_mesa_initialize_context
 	_mesa_make_current
-	_mesa_memcpy
 	_mesa_memset
 	_mesa_new_buffer_object
 	_mesa_new_texture_object
diff --git a/src/mesa/drivers/x11/fakeglx.c b/src/mesa/drivers/x11/fakeglx.c
index 075b9a1e5f..291e90c822 100644
--- a/src/mesa/drivers/x11/fakeglx.c
+++ b/src/mesa/drivers/x11/fakeglx.c
@@ -1383,7 +1383,7 @@ Fake_glXChooseVisual( Display *dpy, int screen, int *list )
       /* create a new vishandle - the cached one may be stale */
       xmvis->vishandle = (XVisualInfo *) _mesa_malloc(sizeof(XVisualInfo));
       if (xmvis->vishandle) {
-         _mesa_memcpy(xmvis->vishandle, xmvis->visinfo, sizeof(XVisualInfo));
+         memcpy(xmvis->vishandle, xmvis->visinfo, sizeof(XVisualInfo));
       }
       return xmvis->vishandle;
 #endif
@@ -2162,7 +2162,7 @@ Fake_glXGetVisualFromFBConfig( Display *dpy, GLXFBConfig config )
       /* create a new vishandle - the cached one may be stale */
       xmvis->vishandle = (XVisualInfo *) _mesa_malloc(sizeof(XVisualInfo));
       if (xmvis->vishandle) {
-         _mesa_memcpy(xmvis->vishandle, xmvis->visinfo, sizeof(XVisualInfo));
+         memcpy(xmvis->vishandle, xmvis->visinfo, sizeof(XVisualInfo));
       }
       return xmvis->vishandle;
 #endif
diff --git a/src/mesa/glapi/mesadef.py b/src/mesa/glapi/mesadef.py
index 8df04143f3..c7e2c086f7 100644
--- a/src/mesa/glapi/mesadef.py
+++ b/src/mesa/glapi/mesadef.py
@@ -134,7 +134,6 @@ def PrintTail():
 	print '\t_mesa_init_default_imports'
 	print '\t_mesa_initialize_context'
 	print '\t_mesa_make_current'
-	print '\t_mesa_memcpy'
 	print '\t_mesa_memset'
 	print '\t_mesa_new_buffer_object'
 	print '\t_mesa_new_texture_object'
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 3fbdba2b3f..881644cdaf 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -432,7 +432,7 @@ _mesa_PushAttrib(GLbitfield mask)
       _mesa_lock_context_textures(ctx);
 
       /* copy/save the bulk of texture state here */
-      _mesa_memcpy(&texstate->Texture, &ctx->Texture, sizeof(ctx->Texture));
+      memcpy(&texstate->Texture, &ctx->Texture, sizeof(ctx->Texture));
 
       /* Save references to the currently bound texture objects so they don't
        * accidentally get deleted while referenced in the attribute stack.
diff --git a/src/mesa/main/bitset.h b/src/mesa/main/bitset.h
index f2709abc9f..5463c0a3c9 100644
--- a/src/mesa/main/bitset.h
+++ b/src/mesa/main/bitset.h
@@ -47,7 +47,7 @@
 
 /* bitset operations
  */
-#define BITSET_COPY(x, y) _mesa_memcpy( (x), (y), sizeof (x) )
+#define BITSET_COPY(x, y) memcpy( (x), (y), sizeof (x) )
 #define BITSET_EQUAL(x, y) (_mesa_memcmp( (x), (y), sizeof (x) ) == 0)
 #define BITSET_ZERO(x) _mesa_memset( (x), 0, sizeof (x) )
 #define BITSET_ONES(x) _mesa_memset( (x), 0xff, sizeof (x) )
diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index dabb1386ca..c735661dc2 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -339,7 +339,7 @@ _mesa_buffer_data( GLcontext *ctx, GLenum target, GLsizeiptrARB size,
       bufObj->Usage = usage;
 
       if (data) {
-	 _mesa_memcpy( bufObj->Data, data, size );
+	 memcpy( bufObj->Data, data, size );
       }
 
       return GL_TRUE;
@@ -378,7 +378,7 @@ _mesa_buffer_subdata( GLcontext *ctx, GLenum target, GLintptrARB offset,
    ASSERT(size + offset <= bufObj->Size);
 
    if (bufObj->Data) {
-      _mesa_memcpy( (GLubyte *) bufObj->Data + offset, data, size );
+      memcpy( (GLubyte *) bufObj->Data + offset, data, size );
    }
 }
 
@@ -408,7 +408,7 @@ _mesa_buffer_get_subdata( GLcontext *ctx, GLenum target, GLintptrARB offset,
    (void) ctx; (void) target;
 
    if (bufObj->Data && ((GLsizeiptrARB) (size + offset) <= bufObj->Size)) {
-      _mesa_memcpy( data, (GLubyte *) bufObj->Data + offset, size );
+      memcpy( data, (GLubyte *) bufObj->Data + offset, size );
    }
 }
 
@@ -530,7 +530,7 @@ _mesa_copy_buffer_subdata(GLcontext *ctx,
                                               GL_WRITE_ONLY, dst);
 
    if (srcPtr && dstPtr)
-      _mesa_memcpy(dstPtr + writeOffset, srcPtr + readOffset, size);
+      memcpy(dstPtr + writeOffset, srcPtr + readOffset, size);
 
    ctx->Driver.UnmapBuffer(ctx, GL_COPY_READ_BUFFER, src);
    ctx->Driver.UnmapBuffer(ctx, GL_COPY_WRITE_BUFFER, dst);
diff --git a/src/mesa/main/colortab.c b/src/mesa/main/colortab.c
index 5ede76c1fb..1c12fb00fa 100644
--- a/src/mesa/main/colortab.c
+++ b/src/mesa/main/colortab.c
@@ -684,7 +684,7 @@ _mesa_GetColorTable( GLenum target, GLenum format,
       }
       break;
    case GL_RGBA:
-      _mesa_memcpy(rgba, table->TableF, 4 * table->Size * sizeof(GLfloat));
+      memcpy(rgba, table->TableF, 4 * table->Size * sizeof(GLfloat));
       break;
    default:
       _mesa_problem(ctx, "bad table format in glGetColorTable");
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 683d062bb9..ea0d13b890 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -4793,7 +4793,7 @@ save_LoadProgramNV(GLenum target, GLuint id, GLsizei len,
          _mesa_error(ctx, GL_OUT_OF_MEMORY, "glLoadProgramNV");
          return;
       }
-      _mesa_memcpy(programCopy, program, len);
+      memcpy(programCopy, program, len);
       n[1].e = target;
       n[2].ui = id;
       n[3].i = len;
@@ -4820,7 +4820,7 @@ save_RequestResidentProgramsNV(GLsizei num, const GLuint * ids)
          _mesa_error(ctx, GL_OUT_OF_MEMORY, "glRequestResidentProgramsNV");
          return;
       }
-      _mesa_memcpy(idCopy, ids, num * sizeof(GLuint));
+      memcpy(idCopy, ids, num * sizeof(GLuint));
       n[1].i = num;
       n[2].data = idCopy;
    }
@@ -4991,7 +4991,7 @@ save_ProgramNamedParameter4fNV(GLuint id, GLsizei len, const GLubyte * name,
          _mesa_error(ctx, GL_OUT_OF_MEMORY, "glProgramNamedParameter4fNV");
          return;
       }
-      _mesa_memcpy(nameCopy, name, len);
+      memcpy(nameCopy, name, len);
       n[1].ui = id;
       n[2].i = len;
       n[3].data = nameCopy;
@@ -5090,7 +5090,7 @@ save_ProgramStringARB(GLenum target, GLenum format, GLsizei len,
          _mesa_error(ctx, GL_OUT_OF_MEMORY, "glProgramStringARB");
          return;
       }
-      _mesa_memcpy(programCopy, string, len);
+      memcpy(programCopy, string, len);
       n[1].e = target;
       n[2].e = format;
       n[3].i = len;
@@ -6201,7 +6201,7 @@ memdup(const void *src, GLsizei bytes)
 {
    void *b = bytes >= 0 ? _mesa_malloc(bytes) : NULL;
    if (b)
-      _mesa_memcpy(b, src, bytes);
+      memcpy(b, src, bytes);
    return b;
 }
 
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 9b0b5f06fc..f24baf5acd 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -579,9 +579,9 @@ append(const char *a, const char *b)
    char *s = _mesa_calloc(aLen + bLen + 1);
    if (s) {
       if (a)
-         _mesa_memcpy(s, a, aLen);
+         memcpy(s, a, aLen);
       if (b)
-         _mesa_memcpy(s + aLen, b, bLen);
+         memcpy(s + aLen, b, bLen);
       s[aLen + bLen] = '\0';
    }
    if (a)
@@ -694,7 +694,7 @@ _mesa_make_extension_string( GLcontext *ctx )
    for (i = 0 ; i < Elements(default_extensions) ; i++) {
       if (extension_enabled(ctx, i)) {
          GLuint len = (GLuint) strlen(default_extensions[i].name);
-         _mesa_memcpy(s + extStrLen, default_extensions[i].name, len);
+         memcpy(s + extStrLen, default_extensions[i].name, len);
          extStrLen += len;
          s[extStrLen] = ' ';
          extStrLen++;
diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index 468f2a9b21..bd03217e2a 100644
--- a/src/mesa/main/image.c
+++ b/src/mesa/main/image.c
@@ -1099,7 +1099,7 @@ _mesa_unpack_bitmap( GLint width, GLint height, const GLubyte *pixels,
       }
 
       if ((packing->SkipPixels & 7) == 0) {
-         _mesa_memcpy( dst, src, width_in_bytes );
+         memcpy( dst, src, width_in_bytes );
          if (packing->LsbFirst) {
             flip_bytes( dst, width_in_bytes );
          }
@@ -1191,7 +1191,7 @@ _mesa_pack_bitmap( GLint width, GLint height, const GLubyte *source,
          return;
 
       if ((packing->SkipPixels & 7) == 0) {
-         _mesa_memcpy( dst, src, width_in_bytes );
+         memcpy( dst, src, width_in_bytes );
          if (packing->LsbFirst) {
             flip_bytes( dst, width_in_bytes );
          }
@@ -3794,7 +3794,7 @@ _mesa_unpack_color_span_chan( GLcontext *ctx,
       if (srcType == CHAN_TYPE) {
          if (dstFormat == GL_RGBA) {
             if (srcFormat == GL_RGBA) {
-               _mesa_memcpy( dest, source, n * 4 * sizeof(GLchan) );
+               memcpy( dest, source, n * 4 * sizeof(GLchan) );
                return;
             }
             else if (srcFormat == GL_RGB) {
@@ -3814,7 +3814,7 @@ _mesa_unpack_color_span_chan( GLcontext *ctx,
          }
          else if (dstFormat == GL_RGB) {
             if (srcFormat == GL_RGB) {
-               _mesa_memcpy( dest, source, n * 3 * sizeof(GLchan) );
+               memcpy( dest, source, n * 3 * sizeof(GLchan) );
                return;
             }
             else if (srcFormat == GL_RGBA) {
@@ -3834,7 +3834,7 @@ _mesa_unpack_color_span_chan( GLcontext *ctx,
          else if (dstFormat == srcFormat) {
             GLint comps = _mesa_components_in_format(srcFormat);
             assert(comps > 0);
-            _mesa_memcpy( dest, source, n * comps * sizeof(GLchan) );
+            memcpy( dest, source, n * comps * sizeof(GLchan) );
             return;
          }
       }
@@ -4381,11 +4381,11 @@ _mesa_unpack_index_span( const GLcontext *ctx, GLuint n,
     */
    if (transferOps == 0 && srcType == GL_UNSIGNED_BYTE
        && dstType == GL_UNSIGNED_BYTE) {
-      _mesa_memcpy(dest, source, n * sizeof(GLubyte));
+      memcpy(dest, source, n * sizeof(GLubyte));
    }
    else if (transferOps == 0 && srcType == GL_UNSIGNED_INT
             && dstType == GL_UNSIGNED_INT && !srcPacking->SwapBytes) {
-      _mesa_memcpy(dest, source, n * sizeof(GLuint));
+      memcpy(dest, source, n * sizeof(GLuint));
    }
    else {
       /*
@@ -4421,7 +4421,7 @@ _mesa_unpack_index_span( const GLcontext *ctx, GLuint n,
             }
             break;
          case GL_UNSIGNED_INT:
-            _mesa_memcpy(dest, indexes, n * sizeof(GLuint));
+            memcpy(dest, indexes, n * sizeof(GLuint));
             break;
          default:
             _mesa_problem(ctx, "bad dstType in _mesa_unpack_index_span");
@@ -4444,7 +4444,7 @@ _mesa_pack_index_span( const GLcontext *ctx, GLuint n,
 
    if (transferOps & (IMAGE_MAP_COLOR_BIT | IMAGE_SHIFT_OFFSET_BIT)) {
       /* make a copy of input */
-      _mesa_memcpy(indexes, source, n * sizeof(GLuint));
+      memcpy(indexes, source, n * sizeof(GLuint));
       _mesa_apply_ci_transfer_ops(ctx, transferOps, n, indexes);
       source = indexes;
    }
@@ -4592,14 +4592,14 @@ _mesa_unpack_stencil_span( const GLcontext *ctx, GLuint n,
        !ctx->Pixel.MapStencilFlag &&
        srcType == GL_UNSIGNED_BYTE &&
        dstType == GL_UNSIGNED_BYTE) {
-      _mesa_memcpy(dest, source, n * sizeof(GLubyte));
+      memcpy(dest, source, n * sizeof(GLubyte));
    }
    else if (transferOps == 0 &&
             !ctx->Pixel.MapStencilFlag &&
             srcType == GL_UNSIGNED_INT &&
             dstType == GL_UNSIGNED_INT &&
             !srcPacking->SwapBytes) {
-      _mesa_memcpy(dest, source, n * sizeof(GLuint));
+      memcpy(dest, source, n * sizeof(GLuint));
    }
    else {
       /*
@@ -4646,7 +4646,7 @@ _mesa_unpack_stencil_span( const GLcontext *ctx, GLuint n,
             }
             break;
          case GL_UNSIGNED_INT:
-            _mesa_memcpy(dest, indexes, n * sizeof(GLuint));
+            memcpy(dest, indexes, n * sizeof(GLuint));
             break;
          default:
             _mesa_problem(ctx, "bad dstType in _mesa_unpack_stencil_span");
@@ -4667,7 +4667,7 @@ _mesa_pack_stencil_span( const GLcontext *ctx, GLuint n,
    if (ctx->Pixel.IndexShift || ctx->Pixel.IndexOffset ||
        ctx->Pixel.MapStencilFlag) {
       /* make a copy of input */
-      _mesa_memcpy(stencil, source, n * sizeof(GLstencil));
+      memcpy(stencil, source, n * sizeof(GLstencil));
       _mesa_apply_stencil_transfer_ops(ctx, n, stencil);
       source = stencil;
    }
@@ -4675,7 +4675,7 @@ _mesa_pack_stencil_span( const GLcontext *ctx, GLuint n,
    switch (dstType) {
    case GL_UNSIGNED_BYTE:
       if (sizeof(GLstencil) == 1) {
-         _mesa_memcpy( dest, source, n );
+         memcpy( dest, source, n );
       }
       else {
          GLubyte *dst = (GLubyte *) dest;
@@ -5039,7 +5039,7 @@ _mesa_pack_depth_span( const GLcontext *ctx, GLuint n, GLvoid *dest,
    ASSERT(n <= MAX_WIDTH);
 
    if (ctx->Pixel.DepthScale != 1.0 || ctx->Pixel.DepthBias != 0.0) {
-      _mesa_memcpy(depthCopy, depthSpan, n * sizeof(GLfloat));
+      memcpy(depthCopy, depthSpan, n * sizeof(GLfloat));
       _mesa_scale_and_bias_depth(ctx, n, depthCopy);
       depthSpan = depthCopy;
    }
@@ -5158,7 +5158,7 @@ _mesa_pack_depth_stencil_span(const GLcontext *ctx, GLuint n, GLuint *dest,
    ASSERT(n <= MAX_WIDTH);
 
    if (ctx->Pixel.DepthScale != 1.0 || ctx->Pixel.DepthBias != 0.0) {
-      _mesa_memcpy(depthCopy, depthVals, n * sizeof(GLfloat));
+      memcpy(depthCopy, depthVals, n * sizeof(GLfloat));
       _mesa_scale_and_bias_depth(ctx, n, depthCopy);
       depthVals = depthCopy;
    }
@@ -5166,7 +5166,7 @@ _mesa_pack_depth_stencil_span(const GLcontext *ctx, GLuint n, GLuint *dest,
    if (ctx->Pixel.IndexShift ||
        ctx->Pixel.IndexOffset ||
        ctx->Pixel.MapStencilFlag) {
-      _mesa_memcpy(stencilCopy, stencilVals, n * sizeof(GLstencil));
+      memcpy(stencilCopy, stencilVals, n * sizeof(GLstencil));
       _mesa_apply_stencil_transfer_ops(ctx, n, stencilCopy);
       stencilVals = stencilCopy;
    }
@@ -5303,7 +5303,7 @@ _mesa_unpack_image( GLuint dimensions,
                }
             }
             else {
-               _mesa_memcpy(dst, src, bytesPerRow);
+               memcpy(dst, src, bytesPerRow);
             }
 
             /* byte flipping/swapping */
@@ -5356,7 +5356,7 @@ _mesa_convert_colors(GLenum srcType, const GLvoid *src,
             }
          }
          if (useTemp)
-            _mesa_memcpy(dst, tempBuffer, count * 4 * sizeof(GLushort));
+            memcpy(dst, tempBuffer, count * 4 * sizeof(GLushort));
       }
       else {
          const GLubyte (*src1)[4] = (const GLubyte (*)[4]) src;
@@ -5372,7 +5372,7 @@ _mesa_convert_colors(GLenum srcType, const GLvoid *src,
             }
          }
          if (useTemp)
-            _mesa_memcpy(dst, tempBuffer, count * 4 * sizeof(GLfloat));
+            memcpy(dst, tempBuffer, count * 4 * sizeof(GLfloat));
       }
       break;
    case GL_UNSIGNED_SHORT:
@@ -5389,7 +5389,7 @@ _mesa_convert_colors(GLenum srcType, const GLvoid *src,
             }
          }
          if (useTemp)
-            _mesa_memcpy(dst, tempBuffer, count * 4 * sizeof(GLubyte));
+            memcpy(dst, tempBuffer, count * 4 * sizeof(GLubyte));
       }
       else {
          const GLushort (*src2)[4] = (const GLushort (*)[4]) src;
@@ -5405,7 +5405,7 @@ _mesa_convert_colors(GLenum srcType, const GLvoid *src,
             }
          }
          if (useTemp)
-            _mesa_memcpy(dst, tempBuffer, count * 4 * sizeof(GLfloat));
+            memcpy(dst, tempBuffer, count * 4 * sizeof(GLfloat));
       }
       break;
    case GL_FLOAT:
@@ -5422,7 +5422,7 @@ _mesa_convert_colors(GLenum srcType, const GLvoid *src,
             }
          }
          if (useTemp)
-            _mesa_memcpy(dst, tempBuffer, count * 4 * sizeof(GLubyte));
+            memcpy(dst, tempBuffer, count * 4 * sizeof(GLubyte));
       }
       else {
          const GLfloat (*src4)[4] = (const GLfloat (*)[4]) src;
@@ -5438,7 +5438,7 @@ _mesa_convert_colors(GLenum srcType, const GLvoid *src,
             }
          }
          if (useTemp)
-            _mesa_memcpy(dst, tempBuffer, count * 4 * sizeof(GLushort));
+            memcpy(dst, tempBuffer, count * 4 * sizeof(GLushort));
       }
       break;
    default:
diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index 2a0952c7af..0abdfca381 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -221,7 +221,7 @@ _mesa_align_realloc(void *oldBuffer, size_t oldSize, size_t newSize,
    const size_t copySize = (oldSize < newSize) ? oldSize : newSize;
    void *newBuf = _mesa_align_malloc(newSize, alignment);
    if (newBuf && oldBuffer && copySize > 0) {
-      _mesa_memcpy(newBuf, oldBuffer, copySize);
+      memcpy(newBuf, oldBuffer, copySize);
    }
    if (oldBuffer)
       _mesa_align_free(oldBuffer);
@@ -238,23 +238,12 @@ _mesa_realloc(void *oldBuffer, size_t oldSize, size_t newSize)
    const size_t copySize = (oldSize < newSize) ? oldSize : newSize;
    void *newBuffer = _mesa_malloc(newSize);
    if (newBuffer && oldBuffer && copySize > 0)
-      _mesa_memcpy(newBuffer, oldBuffer, copySize);
+      memcpy(newBuffer, oldBuffer, copySize);
    if (oldBuffer)
       _mesa_free(oldBuffer);
    return newBuffer;
 }
 
-/** memcpy wrapper */
-void *
-_mesa_memcpy(void *dest, const void *src, size_t n)
-{
-#if defined(SUNOS4)
-   return memcpy((char *) dest, (char *) src, (int) n);
-#else
-   return memcpy(dest, src, n);
-#endif
-}
-
 /** Wrapper around memset() */
 void
 _mesa_memset( void *dst, int val, size_t n )
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index 124642178c..8f13d518ea 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -72,7 +72,7 @@ extern "C" {
 #define ALIGN_FREE(PTR)            _mesa_align_free(PTR)
 
 /** Copy \p BYTES bytes from \p SRC into \p DST */
-#define MEMCPY( DST, SRC, BYTES)   _mesa_memcpy(DST, SRC, BYTES)
+#define MEMCPY( DST, SRC, BYTES)   memcpy(DST, SRC, BYTES)
 /** Set \p N bytes in \p DST to \p VAL */
 #define MEMSET( DST, VAL, N )      _mesa_memset(DST, VAL, N)
 
@@ -543,9 +543,6 @@ _mesa_exec_free( void *addr );
 extern void *
 _mesa_realloc( void *oldBuffer, size_t oldSize, size_t newSize );
 
-extern void *
-_mesa_memcpy( void *dest, const void *src, size_t n );
-
 extern void
 _mesa_memset( void *dst, int val, size_t n );
 
diff --git a/src/mesa/main/macros.h b/src/mesa/main/macros.h
index 38a97fdb18..a8624574de 100644
--- a/src/mesa/main/macros.h
+++ b/src/mesa/main/macros.h
@@ -207,7 +207,7 @@ do {                                \
  */
 #define COPY_4FV( DST, SRC )                  \
 do {                                          \
-   _mesa_memcpy(DST, SRC, sizeof(GLfloat) * 4);       \
+   memcpy(DST, SRC, sizeof(GLfloat) * 4);     \
 } while (0)
 
 /** Copy \p SZ elements into a 4-element vector */
diff --git a/src/mesa/main/renderbuffer.c b/src/mesa/main/renderbuffer.c
index 3bb062bae2..4ae5843662 100644
--- a/src/mesa/main/renderbuffer.c
+++ b/src/mesa/main/renderbuffer.c
@@ -87,7 +87,7 @@ get_row_ubyte(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
 {
    const GLubyte *src = (const GLubyte *) rb->Data + y * rb->Width + x;
    ASSERT(rb->DataType == GL_UNSIGNED_BYTE);
-   _mesa_memcpy(values, src, count * sizeof(GLubyte));
+   memcpy(values, src, count * sizeof(GLubyte));
 }
 
 
@@ -121,7 +121,7 @@ put_row_ubyte(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
       }
    }
    else {
-      _mesa_memcpy(dst, values, count * sizeof(GLubyte));
+      memcpy(dst, values, count * sizeof(GLubyte));
    }
 }
 
@@ -207,7 +207,7 @@ get_row_ushort(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
 {
    const void *src = rb->GetPointer(ctx, rb, x, y);
    ASSERT(rb->DataType == GL_UNSIGNED_SHORT);
-   _mesa_memcpy(values, src, count * sizeof(GLushort));
+   memcpy(values, src, count * sizeof(GLushort));
 }
 
 
@@ -241,7 +241,7 @@ put_row_ushort(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
       }
    }
    else {
-      _mesa_memcpy(dst, src, count * sizeof(GLushort));
+      memcpy(dst, src, count * sizeof(GLushort));
    }
 }
 
@@ -337,7 +337,7 @@ get_row_uint(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
    const void *src = rb->GetPointer(ctx, rb, x, y);
    ASSERT(rb->DataType == GL_UNSIGNED_INT ||
           rb->DataType == GL_UNSIGNED_INT_24_8_EXT);
-   _mesa_memcpy(values, src, count * sizeof(GLuint));
+   memcpy(values, src, count * sizeof(GLuint));
 }
 
 
@@ -373,7 +373,7 @@ put_row_uint(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
       }
    }
    else {
-      _mesa_memcpy(dst, src, count * sizeof(GLuint));
+      memcpy(dst, src, count * sizeof(GLuint));
    }
 }
 
@@ -631,7 +631,7 @@ get_row_ubyte4(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
    const GLubyte *src = (const GLubyte *) rb->Data + 4 * (y * rb->Width + x);
    ASSERT(rb->DataType == GL_UNSIGNED_BYTE);
    ASSERT(rb->Format == MESA_FORMAT_RGBA8888);
-   _mesa_memcpy(values, src, 4 * count * sizeof(GLubyte));
+   memcpy(values, src, 4 * count * sizeof(GLubyte));
 }
 
 
@@ -669,7 +669,7 @@ put_row_ubyte4(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
       }
    }
    else {
-      _mesa_memcpy(dst, src, 4 * count * sizeof(GLubyte));
+      memcpy(dst, src, 4 * count * sizeof(GLubyte));
    }
 }
 
@@ -788,7 +788,7 @@ get_row_ushort4(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
 {
    const GLshort *src = (const GLshort *) rb->Data + 4 * (y * rb->Width + x);
    ASSERT(rb->DataType == GL_UNSIGNED_SHORT || rb->DataType == GL_SHORT);
-   _mesa_memcpy(values, src, 4 * count * sizeof(GLshort));
+   memcpy(values, src, 4 * count * sizeof(GLshort));
 }
 
 
@@ -826,7 +826,7 @@ put_row_ushort4(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
       }
    }
    else {
-      _mesa_memcpy(dst, src, 4 * count * sizeof(GLushort));
+      memcpy(dst, src, 4 * count * sizeof(GLushort));
    }
 }
 
@@ -851,7 +851,7 @@ put_row_rgb_ushort4(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
       }
    }
    else {
-      _mesa_memcpy(dst, src, 4 * count * sizeof(GLushort));
+      memcpy(dst, src, 4 * count * sizeof(GLushort));
    }
 }
 
@@ -1374,7 +1374,7 @@ copy_buffer_alpha8(struct gl_renderbuffer* dst, struct gl_renderbuffer* src)
    ASSERT(dst->Width == src->Width);
    ASSERT(dst->Height == src->Height);
 
-   _mesa_memcpy(dst->Data, src->Data, dst->Width * dst->Height * sizeof(GLubyte));
+   memcpy(dst->Data, src->Data, dst->Width * dst->Height * sizeof(GLubyte));
 }
 
 
diff --git a/src/mesa/main/shaders.c b/src/mesa/main/shaders.c
index b9c84eb792..91f2a7a7bf 100644
--- a/src/mesa/main/shaders.c
+++ b/src/mesa/main/shaders.c
@@ -469,8 +469,8 @@ _mesa_ShaderSourceARB(GLhandleARB shaderObj, GLsizei count,
 
    for (i = 0; i < count; i++) {
       GLint start = (i > 0) ? offsets[i - 1] : 0;
-      _mesa_memcpy(source + start, string[i],
-                   (offsets[i] - start) * sizeof(GLcharARB));
+      memcpy(source + start, string[i],
+             (offsets[i] - start) * sizeof(GLcharARB));
    }
    source[totalLength - 1] = '\0';
    source[totalLength - 2] = '\0';
diff --git a/src/mesa/main/syncobj.c b/src/mesa/main/syncobj.c
index ac3f9eb175..36b48fd9f2 100644
--- a/src/mesa/main/syncobj.c
+++ b/src/mesa/main/syncobj.c
@@ -398,7 +398,7 @@ _mesa_GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length,
    if (size > 0) {
       const GLsizei copy_count = MIN2(size, bufSize);
 
-      _mesa_memcpy(values, v, sizeof(GLint) * copy_count);
+      memcpy(values, v, sizeof(GLint) * copy_count);
    }
 
    if (length != NULL) {
diff --git a/src/mesa/main/texgetimage.c b/src/mesa/main/texgetimage.c
index 6b3355a7ec..7ad91805bc 100644
--- a/src/mesa/main/texgetimage.c
+++ b/src/mesa/main/texgetimage.c
@@ -156,7 +156,7 @@ get_tex_depth_stencil(GLcontext *ctx, GLuint dimensions,
          void *dest = _mesa_image_address(dimensions, &ctx->Pack, pixels,
                                           width, height, format, type,
                                           img, row, 0);
-         _mesa_memcpy(dest, src, width * sizeof(GLuint));
+         memcpy(dest, src, width * sizeof(GLuint));
          if (ctx->Pack.SwapBytes) {
             _mesa_swap4((GLuint *) dest, width);
          }
@@ -187,7 +187,7 @@ get_tex_ycbcr(GLcontext *ctx, GLuint dimensions,
          void *dest = _mesa_image_address(dimensions, &ctx->Pack, pixels,
                                           width, height, format, type,
                                           img, row, 0);
-         _mesa_memcpy(dest, src, width * sizeof(GLushort));
+         memcpy(dest, src, width * sizeof(GLushort));
 
          /* check for byte swapping */
          if ((texImage->TexFormat == MESA_FORMAT_YCBCR
@@ -560,7 +560,7 @@ _mesa_get_compressed_teximage(GLcontext *ctx, GLenum target, GLint level,
                                                   texImage->Width,
                                                   texImage->Height,
                                                   texImage->Depth);
-      _mesa_memcpy(img, texImage->Data, size);
+      memcpy(img, texImage->Data, size);
    }
    else {
       GLuint bw, bh;
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index 78612b0856..c1418e0967 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -2919,7 +2919,7 @@ _mesa_texstore_rgba_float32(TEXSTORE_PARAMS)
             + dstYoffset * dstRowStride
             + dstXoffset * texelBytes;
          for (row = 0; row < srcHeight; row++) {
-            _mesa_memcpy(dstRow, srcRow, bytesPerRow);
+            memcpy(dstRow, srcRow, bytesPerRow);
             dstRow += dstRowStride;
             srcRow += srcWidth * components;
          }
diff --git a/src/mesa/shader/arbprogram.c b/src/mesa/shader/arbprogram.c
index a77ff7c5b1..75b4274bfd 100644
--- a/src/mesa/shader/arbprogram.c
+++ b/src/mesa/shader/arbprogram.c
@@ -1091,7 +1091,7 @@ _mesa_GetProgramStringARB(GLenum target, GLenum pname, GLvoid *string)
    }
 
    if (prog->String)
-      _mesa_memcpy(dst, prog->String, strlen((char *) prog->String));
+      memcpy(dst, prog->String, strlen((char *) prog->String));
    else
       *dst = '\0';
 }
diff --git a/src/mesa/shader/nvfragparse.c b/src/mesa/shader/nvfragparse.c
index ff3a921777..e226973c53 100644
--- a/src/mesa/shader/nvfragparse.c
+++ b/src/mesa/shader/nvfragparse.c
@@ -1233,7 +1233,7 @@ Parse_PrintInstruction(struct parse_state *parseState,
    parseState->pos += len + 1;
    msg = (GLubyte*) _mesa_malloc(len + 1);
 
-   _mesa_memcpy(msg, str, len);
+   memcpy(msg, str, len);
    msg[len] = 0;
    inst->Data = msg;
 
diff --git a/src/mesa/shader/nvvertparse.c b/src/mesa/shader/nvvertparse.c
index 630de7c2d7..1a840a3a92 100644
--- a/src/mesa/shader/nvvertparse.c
+++ b/src/mesa/shader/nvvertparse.c
@@ -1050,7 +1050,7 @@ Parse_PrintInstruction(struct parse_state *parseState, struct prog_instruction *
    parseState->pos += len + 1;
    msg = (GLubyte*) _mesa_malloc(len + 1);
 
-   _mesa_memcpy(msg, str, len);
+   memcpy(msg, str, len);
    msg[len] = 0;
    inst->Data = msg;
 
diff --git a/src/mesa/shader/prog_instruction.c b/src/mesa/shader/prog_instruction.c
index 44c961927a..dcf834f52d 100644
--- a/src/mesa/shader/prog_instruction.c
+++ b/src/mesa/shader/prog_instruction.c
@@ -110,7 +110,7 @@ _mesa_copy_instructions(struct prog_instruction *dest,
                         const struct prog_instruction *src, GLuint n)
 {
    GLuint i;
-   _mesa_memcpy(dest, src, n * sizeof(struct prog_instruction));
+   memcpy(dest, src, n * sizeof(struct prog_instruction));
    for (i = 0; i < n; i++) {
       if (src[i].Comment)
          dest[i].Comment = _mesa_strdup(src[i].Comment);
diff --git a/src/mesa/shader/program.c b/src/mesa/shader/program.c
index 18ef6d5ccf..3bf9a65905 100644
--- a/src/mesa/shader/program.c
+++ b/src/mesa/shader/program.c
@@ -223,7 +223,7 @@ _mesa_find_line_column(const GLubyte *string, const GLubyte *pos,
       p++;
    len = p - lineStart;
    s = (GLubyte *) _mesa_malloc(len + 1);
-   _mesa_memcpy(s, lineStart, len);
+   memcpy(s, lineStart, len);
    s[len] = 0;
 
    return s;
diff --git a/src/mesa/shader/program_parse.tab.c b/src/mesa/shader/program_parse.tab.c
index 2adfb40973..182ef4c26d 100644
--- a/src/mesa/shader/program_parse.tab.c
+++ b/src/mesa/shader/program_parse.tab.c
@@ -5623,7 +5623,7 @@ _mesa_parse_arb_program(GLcontext *ctx, GLenum target, const GLubyte *str,
       _mesa_error(ctx, GL_OUT_OF_MEMORY, "glProgramStringARB");
       return GL_FALSE;
    }
-   _mesa_memcpy (strz, str, len);
+   memcpy (strz, str, len);
    strz[len] = '\0';
 
    state->prog->String = strz;
diff --git a/src/mesa/shader/program_parse.y b/src/mesa/shader/program_parse.y
index 3880d54917..577bd2c38d 100644
--- a/src/mesa/shader/program_parse.y
+++ b/src/mesa/shader/program_parse.y
@@ -2662,7 +2662,7 @@ _mesa_parse_arb_program(GLcontext *ctx, GLenum target, const GLubyte *str,
       _mesa_error(ctx, GL_OUT_OF_MEMORY, "glProgramStringARB");
       return GL_FALSE;
    }
-   _mesa_memcpy (strz, str, len);
+   memcpy (strz, str, len);
    strz[len] = '\0';
 
    state->prog->String = strz;
diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index 44310d2e61..7e2a60f74b 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -1380,7 +1380,7 @@ _mesa_get_uniform_location(GLcontext *ctx, GLuint program, const GLchar *name)
          GLchar *newName = _mesa_malloc(len + 1);
          if (!newName)
             return -1; /* out of mem */
-         _mesa_memcpy(newName, name, len);
+         memcpy(newName, name, len);
          newName[len] = 0;
 
          location = _mesa_lookup_uniform(shProg->Uniforms, newName);
diff --git a/src/mesa/shader/slang/slang_compile_operation.c b/src/mesa/shader/slang/slang_compile_operation.c
index 3a15d9d3ab..5441d60df5 100644
--- a/src/mesa/shader/slang/slang_compile_operation.c
+++ b/src/mesa/shader/slang/slang_compile_operation.c
@@ -269,10 +269,10 @@ slang_operation_insert(GLuint *numElements, slang_operation **array,
       slang_operation *newOp;
       newOp = ops + pos;
       if (pos > 0)
-         _mesa_memcpy(ops, *array, pos * sizeof(slang_operation));
+         memcpy(ops, *array, pos * sizeof(slang_operation));
       if (pos < *numElements)
-         _mesa_memcpy(newOp + 1, (*array) + pos,
-                      (*numElements - pos) * sizeof(slang_operation));
+         memcpy(newOp + 1, (*array) + pos,
+                (*numElements - pos) * sizeof(slang_operation));
 
       if (!slang_operation_construct(newOp)) {
          _slang_free(ops);
diff --git a/src/mesa/shader/slang/slang_link.c b/src/mesa/shader/slang/slang_link.c
index 2906cb17c4..68129d4c5a 100644
--- a/src/mesa/shader/slang/slang_link.c
+++ b/src/mesa/shader/slang/slang_link.c
@@ -625,7 +625,7 @@ concat_shaders(struct gl_shader_program *shProg, GLenum shaderType)
    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]);
+         memcpy(source + len, shader->Source, shaderLengths[i]);
          len += shaderLengths[i];
       }
    }
diff --git a/src/mesa/shader/slang/slang_mem.c b/src/mesa/shader/slang/slang_mem.c
index c37e12fb7f..54f5196617 100644
--- a/src/mesa/shader/slang/slang_mem.c
+++ b/src/mesa/shader/slang/slang_mem.c
@@ -197,7 +197,7 @@ _slang_realloc(void *oldBuffer, GLuint oldSize, GLuint newSize)
          ASSERT(is_valid_address(pool, oldBuffer));
 
       if (newBuffer && oldBuffer && copySize > 0)
-         _mesa_memcpy(newBuffer, oldBuffer, copySize);
+         memcpy(newBuffer, oldBuffer, copySize);
 
       return newBuffer;
    }
diff --git a/src/mesa/shader/slang/slang_utility.c b/src/mesa/shader/slang/slang_utility.c
index e3b0491d97..56a33e6f6b 100644
--- a/src/mesa/shader/slang/slang_utility.c
+++ b/src/mesa/shader/slang/slang_utility.c
@@ -92,7 +92,7 @@ slang_string_push (slang_string *self, const slang_string *str)
       return;
    }
    if (grow (self, self->length + str->length)) {
-      _mesa_memcpy (&self->data[self->length], str->data, str->length);
+      memcpy (&self->data[self->length], str->data, str->length);
       self->length += str->length;
    }
 }
@@ -110,7 +110,7 @@ GLvoid
 slang_string_pushs (slang_string *self, const char *cstr, GLuint len)
 {
    if (grow (self, self->length + len)) {
-      _mesa_memcpy (&self->data[self->length], cstr, len);
+      memcpy (&self->data[self->length], cstr, len);
       self->length += len;
    }
 }
diff --git a/src/mesa/state_tracker/st_cb_bufferobjects.c b/src/mesa/state_tracker/st_cb_bufferobjects.c
index f1b4f11c05..c92af34378 100644
--- a/src/mesa/state_tracker/st_cb_bufferobjects.c
+++ b/src/mesa/state_tracker/st_cb_bufferobjects.c
@@ -377,7 +377,7 @@ st_copy_buffer_subdata(GLcontext *ctx,
                                             PIPE_BUFFER_USAGE_CPU_WRITE);
 
    if (srcPtr && dstPtr)
-      _mesa_memcpy(dstPtr + writeOffset, srcPtr + readOffset, size);
+      memcpy(dstPtr + writeOffset, srcPtr + readOffset, size);
 
    pipe_buffer_unmap(pipe->screen, srcObj->buffer);
    pipe_buffer_unmap(pipe->screen, dstObj->buffer);
diff --git a/src/mesa/swrast/s_blend.c b/src/mesa/swrast/s_blend.c
index 95c83432a9..5b090c72c7 100644
--- a/src/mesa/swrast/s_blend.c
+++ b/src/mesa/swrast/s_blend.c
@@ -89,7 +89,7 @@ blend_noop(GLcontext *ctx, GLuint n, const GLubyte mask[],
    else
       bytes = 4 * n * sizeof(GLfloat);
 
-   _mesa_memcpy(src, dst, bytes);
+   memcpy(src, dst, bytes);
 }
 
 
diff --git a/src/mesa/swrast/s_copypix.c b/src/mesa/swrast/s_copypix.c
index e881d1be30..b69be50f51 100644
--- a/src/mesa/swrast/s_copypix.c
+++ b/src/mesa/swrast/s_copypix.c
@@ -167,7 +167,7 @@ copy_conv_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
          GLfloat *rgba = (GLfloat *) span.array->attribs[FRAG_ATTRIB_COL0];
 
          /* copy convolved colors into span array */
-         _mesa_memcpy(rgba, src, width * 4 * sizeof(GLfloat));
+         memcpy(rgba, src, width * 4 * sizeof(GLfloat));
 
          /* write span */
          span.x = destx;
@@ -273,7 +273,7 @@ copy_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
       /* Get row/span of source pixels */
       if (overlapping) {
          /* get from buffered image */
-         _mesa_memcpy(rgba, p, width * sizeof(GLfloat) * 4);
+         memcpy(rgba, p, width * sizeof(GLfloat) * 4);
          p += width * 4;
       }
       else {
@@ -374,7 +374,7 @@ copy_ci_pixels( GLcontext *ctx, GLint srcx, GLint srcy,
    for (j = 0; j < height; j++, sy += stepy, dy += stepy) {
       /* Get color indexes */
       if (overlapping) {
-         _mesa_memcpy(span.array->index, p, width * sizeof(GLuint));
+         memcpy(span.array->index, p, width * sizeof(GLuint));
          p += width;
       }
       else {
@@ -508,7 +508,7 @@ copy_depth_pixels( GLcontext *ctx, GLint srcx, GLint srcy,
       GLfloat depth[MAX_WIDTH];
       /* get depth values */
       if (overlapping) {
-         _mesa_memcpy(depth, p, width * sizeof(GLfloat));
+         memcpy(depth, p, width * sizeof(GLfloat));
          p += width;
       }
       else {
@@ -606,7 +606,7 @@ copy_stencil_pixels( GLcontext *ctx, GLint srcx, GLint srcy,
 
       /* Get stencil values */
       if (overlapping) {
-         _mesa_memcpy(stencil, p, width * sizeof(GLstencil));
+         memcpy(stencil, p, width * sizeof(GLstencil));
          p += width;
       }
       else {
@@ -730,7 +730,7 @@ copy_depth_stencil_pixels(GLcontext *ctx,
 
          /* Get stencil values */
          if (overlapping) {
-            _mesa_memcpy(stencil, stencilPtr, width * sizeof(GLstencil));
+            memcpy(stencil, stencilPtr, width * sizeof(GLstencil));
             stencilPtr += width;
          }
          else {
@@ -759,7 +759,7 @@ copy_depth_stencil_pixels(GLcontext *ctx,
 
          /* get depth values */
          if (overlapping) {
-            _mesa_memcpy(depth, depthPtr, width * sizeof(GLfloat));
+            memcpy(depth, depthPtr, width * sizeof(GLfloat));
             depthPtr += width;
          }
          else {
diff --git a/src/mesa/swrast/s_drawpix.c b/src/mesa/swrast/s_drawpix.c
index 248d6cc1c0..136c296e98 100644
--- a/src/mesa/swrast/s_drawpix.c
+++ b/src/mesa/swrast/s_drawpix.c
@@ -473,7 +473,7 @@ draw_depth_pixels( GLcontext *ctx, GLint x, GLint y,
             _mesa_image_address2d(unpack, pixels, width, height,
                                   GL_DEPTH_COMPONENT, type, row, 0);
          if (shift == 0) {
-            _mesa_memcpy(span.array->z, zSrc, width * sizeof(GLuint));
+            memcpy(span.array->z, zSrc, width * sizeof(GLuint));
          }
          else {
             GLint col;
diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c
index 85d30cc929..63a8d4e350 100644
--- a/src/mesa/swrast/s_span.c
+++ b/src/mesa/swrast/s_span.c
@@ -993,8 +993,8 @@ _swrast_write_index_span( GLcontext *ctx, SWspan *span)
 
          if (numBuffers > 1) {
             /* save indexes for second, third renderbuffer writes */
-            _mesa_memcpy(indexSave, span->array->index,
-                         span->end * sizeof(indexSave[0]));
+            memcpy(indexSave, span->array->index,
+                   span->end * sizeof(indexSave[0]));
          }
 
          if (ctx->Color.IndexLogicOpEnabled) {
@@ -1073,8 +1073,8 @@ _swrast_write_index_span( GLcontext *ctx, SWspan *span)
 
          if (buf + 1 < numBuffers) {
             /* restore original span values */
-            _mesa_memcpy(span->array->index, indexSave,
-                         span->end * sizeof(indexSave[0]));
+            memcpy(span->array->index, indexSave,
+                   span->end * sizeof(indexSave[0]));
          }
       } /* for buf */
    }
@@ -1510,8 +1510,8 @@ _swrast_write_rgba_span( GLcontext *ctx, SWspan *span)
 
             if (!multiFragOutputs && numBuffers > 1) {
                /* save colors for second, third renderbuffer writes */
-               _mesa_memcpy(rgbaSave, span->array->rgba,
-                            4 * span->end * sizeof(GLchan));
+               memcpy(rgbaSave, span->array->rgba,
+                      4 * span->end * sizeof(GLchan));
             }
 
             ASSERT(rb->_BaseFormat == GL_RGBA || rb->_BaseFormat == GL_RGB);
@@ -1544,8 +1544,8 @@ _swrast_write_rgba_span( GLcontext *ctx, SWspan *span)
 
             if (!multiFragOutputs && numBuffers > 1) {
                /* restore original span values */
-               _mesa_memcpy(span->array->rgba, rgbaSave,
-                            4 * span->end * sizeof(GLchan));
+               memcpy(span->array->rgba, rgbaSave,
+                      4 * span->end * sizeof(GLchan));
             }
 
          } /* if rb */
diff --git a/src/mesa/swrast/s_stencil.c b/src/mesa/swrast/s_stencil.c
index e9e9d3a4f1..5e9a4e37c7 100644
--- a/src/mesa/swrast/s_stencil.c
+++ b/src/mesa/swrast/s_stencil.c
@@ -475,7 +475,7 @@ stencil_and_ztest_span(GLcontext *ctx, SWspan *span, GLuint face)
       GLubyte passMask[MAX_WIDTH], failMask[MAX_WIDTH], origMask[MAX_WIDTH];
 
       /* save the current mask bits */
-      _mesa_memcpy(origMask, mask, n * sizeof(GLubyte));
+      memcpy(origMask, mask, n * sizeof(GLubyte));
 
       /* apply the depth test */
       _swrast_depth_test_span(ctx, span);
@@ -918,7 +918,7 @@ stencil_and_ztest_pixels( GLcontext *ctx, SWspan *span, GLuint face )
       ASSERT(rb->DataType == GL_UNSIGNED_BYTE);
       _swrast_get_values(ctx, rb, n, x, y, stencil, sizeof(GLubyte));
 
-      _mesa_memcpy(origMask, mask, n * sizeof(GLubyte));          
+      memcpy(origMask, mask, n * sizeof(GLubyte));          
 
       (void) do_stencil_test(ctx, face, n, stencil, mask);
 
@@ -928,7 +928,7 @@ stencil_and_ztest_pixels( GLcontext *ctx, SWspan *span, GLuint face )
       }
       else {
          GLubyte tmpMask[MAX_WIDTH]; 
-         _mesa_memcpy(tmpMask, mask, n * sizeof(GLubyte));
+         memcpy(tmpMask, mask, n * sizeof(GLubyte));
 
          _swrast_depth_test_span(ctx, span);
 
@@ -962,7 +962,7 @@ stencil_and_ztest_pixels( GLcontext *ctx, SWspan *span, GLuint face )
                                     ctx->Stencil.ZPassFunc[face], face, mask);
       }
       else {
-         _mesa_memcpy(origMask, mask, n * sizeof(GLubyte));
+         memcpy(origMask, mask, n * sizeof(GLubyte));
 
          _swrast_depth_test_span(ctx, span);
 
diff --git a/src/mesa/tnl/t_vertex.c b/src/mesa/tnl/t_vertex.c
index d3955873dc..2b8c962f06 100644
--- a/src/mesa/tnl/t_vertex.c
+++ b/src/mesa/tnl/t_vertex.c
@@ -236,7 +236,7 @@ void _tnl_get_attr( GLcontext *ctx, const void *vin,
       dest[0] = ctx->Point.Size;
    }
    else {
-      _mesa_memcpy( dest, ctx->Current.Attrib[attr], 4*sizeof(GLfloat));
+      memcpy( dest, ctx->Current.Attrib[attr], 4*sizeof(GLfloat));
    }
 }
 
diff --git a/src/mesa/tnl/t_vertex_generic.c b/src/mesa/tnl/t_vertex_generic.c
index 99ddace73d..b1ea142464 100644
--- a/src/mesa/tnl/t_vertex_generic.c
+++ b/src/mesa/tnl/t_vertex_generic.c
@@ -1074,9 +1074,9 @@ void _tnl_generic_copy_pv( GLcontext *ctx, GLuint edst, GLuint esrc )
       if (a[j].attrib == VERT_ATTRIB_COLOR0 ||
 	  a[j].attrib == VERT_ATTRIB_COLOR1) {
 
-	 _mesa_memcpy( vdst + a[j].vertoffset,
-                       vsrc + a[j].vertoffset,
-                       a[j].vertattrsize );
+	 memcpy( vdst + a[j].vertoffset,
+                 vsrc + a[j].vertoffset,
+                 a[j].vertattrsize );
       }
    }
 }
diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c
index 8ee14be261..b10ee2105a 100644
--- a/src/mesa/vbo/vbo_exec_api.c
+++ b/src/mesa/vbo/vbo_exec_api.c
@@ -126,8 +126,8 @@ void vbo_exec_vtx_wrap( struct vbo_exec_context *exec )
    assert(exec->vtx.max_vert - exec->vtx.vert_count > exec->vtx.copied.nr);
 
    for (i = 0 ; i < exec->vtx.copied.nr ; i++) {
-      _mesa_memcpy( exec->vtx.buffer_ptr, data, 
-		    exec->vtx.vertex_size * sizeof(GLfloat));
+      memcpy( exec->vtx.buffer_ptr, data, 
+	      exec->vtx.vertex_size * sizeof(GLfloat));
       exec->vtx.buffer_ptr += exec->vtx.vertex_size;
       data += exec->vtx.vertex_size;
       exec->vtx.vert_count++;
@@ -414,13 +414,13 @@ static void GLAPIENTRY vbo_exec_EvalCoord1f( GLfloat u )
    }
 
 
-   _mesa_memcpy( exec->vtx.copied.buffer, exec->vtx.vertex, 
-                 exec->vtx.vertex_size * sizeof(GLfloat));
+   memcpy( exec->vtx.copied.buffer, exec->vtx.vertex, 
+           exec->vtx.vertex_size * sizeof(GLfloat));
 
    vbo_exec_do_EvalCoord1f( exec, u );
 
-   _mesa_memcpy( exec->vtx.vertex, exec->vtx.copied.buffer,
-                 exec->vtx.vertex_size * sizeof(GLfloat));
+   memcpy( exec->vtx.vertex, exec->vtx.copied.buffer,
+           exec->vtx.vertex_size * sizeof(GLfloat));
 }
 
 static void GLAPIENTRY vbo_exec_EvalCoord2f( GLfloat u, GLfloat v )
@@ -444,13 +444,13 @@ static void GLAPIENTRY vbo_exec_EvalCoord2f( GLfloat u, GLfloat v )
 	    vbo_exec_fixup_vertex( ctx, VBO_ATTRIB_NORMAL, 3 );
    }
 
-   _mesa_memcpy( exec->vtx.copied.buffer, exec->vtx.vertex, 
-                 exec->vtx.vertex_size * sizeof(GLfloat));
+   memcpy( exec->vtx.copied.buffer, exec->vtx.vertex, 
+           exec->vtx.vertex_size * sizeof(GLfloat));
 
    vbo_exec_do_EvalCoord2f( exec, u, v );
 
-   _mesa_memcpy( exec->vtx.vertex, exec->vtx.copied.buffer, 
-                 exec->vtx.vertex_size * sizeof(GLfloat));
+   memcpy( exec->vtx.vertex, exec->vtx.copied.buffer, 
+           exec->vtx.vertex_size * sizeof(GLfloat));
 }
 
 static void GLAPIENTRY vbo_exec_EvalCoord1fv( const GLfloat *u )
diff --git a/src/mesa/vbo/vbo_exec_draw.c b/src/mesa/vbo/vbo_exec_draw.c
index d7dbbceb1b..526bf7ae79 100644
--- a/src/mesa/vbo/vbo_exec_draw.c
+++ b/src/mesa/vbo/vbo_exec_draw.c
@@ -85,24 +85,24 @@ vbo_copy_vertices( struct vbo_exec_context *exec )
    case GL_LINES:
       ovf = nr&1;
       for (i = 0 ; i < ovf ; i++)
-	 _mesa_memcpy( dst+i*sz, src+(nr-ovf+i)*sz, sz * sizeof(GLfloat) );
+	 memcpy( dst+i*sz, src+(nr-ovf+i)*sz, sz * sizeof(GLfloat) );
       return i;
    case GL_TRIANGLES:
       ovf = nr%3;
       for (i = 0 ; i < ovf ; i++)
-	 _mesa_memcpy( dst+i*sz, src+(nr-ovf+i)*sz, sz * sizeof(GLfloat) );
+	 memcpy( dst+i*sz, src+(nr-ovf+i)*sz, sz * sizeof(GLfloat) );
       return i;
    case GL_QUADS:
       ovf = nr&3;
       for (i = 0 ; i < ovf ; i++)
-	 _mesa_memcpy( dst+i*sz, src+(nr-ovf+i)*sz, sz * sizeof(GLfloat) );
+	 memcpy( dst+i*sz, src+(nr-ovf+i)*sz, sz * sizeof(GLfloat) );
       return i;
    case GL_LINE_STRIP:
       if (nr == 0) {
 	 return 0;
       }
       else {
-	 _mesa_memcpy( dst, src+(nr-1)*sz, sz * sizeof(GLfloat) );
+	 memcpy( dst, src+(nr-1)*sz, sz * sizeof(GLfloat) );
 	 return 1;
       }
    case GL_LINE_LOOP:
@@ -112,12 +112,12 @@ vbo_copy_vertices( struct vbo_exec_context *exec )
 	 return 0;
       }
       else if (nr == 1) {
-	 _mesa_memcpy( dst, src+0, sz * sizeof(GLfloat) );
+	 memcpy( dst, src+0, sz * sizeof(GLfloat) );
 	 return 1;
       }
       else {
-	 _mesa_memcpy( dst, src+0, sz * sizeof(GLfloat) );
-	 _mesa_memcpy( dst+sz, src+(nr-1)*sz, sz * sizeof(GLfloat) );
+	 memcpy( dst, src+0, sz * sizeof(GLfloat) );
+	 memcpy( dst+sz, src+(nr-1)*sz, sz * sizeof(GLfloat) );
 	 return 2;
       }
    case GL_TRIANGLE_STRIP:
@@ -139,7 +139,7 @@ vbo_copy_vertices( struct vbo_exec_context *exec )
          break;
       }
       for (i = 0 ; i < ovf ; i++)
-	 _mesa_memcpy( dst+i*sz, src+(nr-ovf+i)*sz, sz * sizeof(GLfloat) );
+	 memcpy( dst+i*sz, src+(nr-ovf+i)*sz, sz * sizeof(GLfloat) );
       return i;
    case PRIM_OUTSIDE_BEGIN_END:
       return 0;
diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c
index 3f86c68b24..e1caa6f8c5 100644
--- a/src/mesa/vbo/vbo_save_api.c
+++ b/src/mesa/vbo/vbo_save_api.c
@@ -118,23 +118,23 @@ static GLuint _save_copy_vertices( GLcontext *ctx,
    case GL_LINES:
       ovf = nr&1;
       for (i = 0 ; i < ovf ; i++)
-	 _mesa_memcpy( dst+i*sz, src+(nr-ovf+i)*sz, sz*sizeof(GLfloat) );
+	 memcpy( dst+i*sz, src+(nr-ovf+i)*sz, sz*sizeof(GLfloat) );
       return i;
    case GL_TRIANGLES:
       ovf = nr%3;
       for (i = 0 ; i < ovf ; i++)
-	 _mesa_memcpy( dst+i*sz, src+(nr-ovf+i)*sz, sz*sizeof(GLfloat) );
+	 memcpy( dst+i*sz, src+(nr-ovf+i)*sz, sz*sizeof(GLfloat) );
       return i;
    case GL_QUADS:
       ovf = nr&3;
       for (i = 0 ; i < ovf ; i++)
-	 _mesa_memcpy( dst+i*sz, src+(nr-ovf+i)*sz, sz*sizeof(GLfloat) );
+	 memcpy( dst+i*sz, src+(nr-ovf+i)*sz, sz*sizeof(GLfloat) );
       return i;
    case GL_LINE_STRIP:
       if (nr == 0) 
 	 return 0;
       else {
-	 _mesa_memcpy( dst, src+(nr-1)*sz, sz*sizeof(GLfloat) );
+	 memcpy( dst, src+(nr-1)*sz, sz*sizeof(GLfloat) );
 	 return 1;
       }
    case GL_LINE_LOOP:
@@ -143,11 +143,11 @@ static GLuint _save_copy_vertices( GLcontext *ctx,
       if (nr == 0) 
 	 return 0;
       else if (nr == 1) {
-	 _mesa_memcpy( dst, src+0, sz*sizeof(GLfloat) );
+	 memcpy( dst, src+0, sz*sizeof(GLfloat) );
 	 return 1;
       } else {
-	 _mesa_memcpy( dst, src+0, sz*sizeof(GLfloat) );
-	 _mesa_memcpy( dst+sz, src+(nr-1)*sz, sz*sizeof(GLfloat) );
+	 memcpy( dst, src+0, sz*sizeof(GLfloat) );
+	 memcpy( dst+sz, src+(nr-1)*sz, sz*sizeof(GLfloat) );
 	 return 2;
       }
    case GL_TRIANGLE_STRIP:
@@ -158,7 +158,7 @@ static GLuint _save_copy_vertices( GLcontext *ctx,
       default: ovf = 2 + (nr&1); break;
       }
       for (i = 0 ; i < ovf ; i++)
-	 _mesa_memcpy( dst+i*sz, src+(nr-ovf+i)*sz, sz*sizeof(GLfloat) );
+	 memcpy( dst+i*sz, src+(nr-ovf+i)*sz, sz*sizeof(GLfloat) );
       return i;
    default:
       assert(0);
@@ -277,7 +277,7 @@ static void _save_compile_vertex_list( GLcontext *ctx )
 
    /* Duplicate our template, increment refcounts to the storage structs:
     */
-   _mesa_memcpy(node->attrsz, save->attrsz, sizeof(node->attrsz)); 
+   memcpy(node->attrsz, save->attrsz, sizeof(node->attrsz));
    node->vertex_size = save->vertex_size;
    node->buffer_offset = (save->buffer - save->vertex_store->buffer) * sizeof(GLfloat); 
    node->count = save->vert_count;
@@ -441,7 +441,7 @@ static void _save_wrap_filled_vertex( GLcontext *ctx )
    assert(save->max_vert - save->vert_count > save->copied.nr);
 
    for (i = 0 ; i < save->copied.nr ; i++) {
-      _mesa_memcpy( save->buffer_ptr, data, save->vertex_size * sizeof(GLfloat));
+      memcpy( save->buffer_ptr, data, save->vertex_size * sizeof(GLfloat));
       data += save->vertex_size;
       save->buffer_ptr += save->vertex_size;
       save->vert_count++;
diff --git a/src/mesa/vf/vf.c b/src/mesa/vf/vf.c
index 82f3d2b641..15a78c4c0a 100644
--- a/src/mesa/vf/vf.c
+++ b/src/mesa/vf/vf.c
@@ -296,7 +296,7 @@ void vf_get_attr( struct vertex_fetch *vf,
 
    /* Else return the value from ctx->Current.
     */
-   _mesa_memcpy( dest, dflt, 4*sizeof(GLfloat));
+   memcpy( dest, dflt, 4*sizeof(GLfloat));
 }
 
 
-- 
cgit v1.2.3


From 26f8fad1456fdc2b352cea9d3b4c32cb5f6ae947 Mon Sep 17 00:00:00 2001
From: Kenneth Graunke <kenneth@whitecape.org>
Date: Thu, 18 Feb 2010 23:51:00 -0800
Subject: Remove _mesa_memset in favor of plain memset.

This may break the SUNOS4 build, but it's no longer relevant.
---
 src/glx/glcontextmodes.c                         |  7 ++-----
 src/mesa/drivers/dri/i965/brw_state_upload.c     |  2 +-
 src/mesa/drivers/dri/i965/brw_wm_sampler_state.c |  2 +-
 src/mesa/drivers/windows/gdi/mesa.def            |  1 -
 src/mesa/drivers/windows/icd/mesa.def            |  1 -
 src/mesa/drivers/x11/xm_dd.c                     |  2 +-
 src/mesa/glapi/mesadef.py                        |  1 -
 src/mesa/main/bitset.h                           |  4 ++--
 src/mesa/main/ffvertex_prog.c                    |  2 +-
 src/mesa/main/imports.c                          | 11 -----------
 src/mesa/main/imports.h                          |  5 +----
 src/mesa/main/renderbuffer.c                     |  4 ++--
 src/mesa/main/texcompress_fxt1.c                 |  4 ++--
 src/mesa/main/texenvprogram.c                    |  2 +-
 src/mesa/shader/atifragshader.c                  |  2 +-
 src/mesa/shader/prog_cache.c                     |  2 +-
 src/mesa/shader/prog_parameter.c                 |  4 ++--
 src/mesa/shader/program.c                        |  2 +-
 src/mesa/swrast/s_depth.c                        |  2 +-
 src/mesa/swrast/s_span.c                         |  4 ++--
 src/mesa/swrast/s_stencil.c                      |  4 ++--
 src/mesa/tnl/t_vertex_sse.c                      |  2 +-
 src/mesa/vf/vf_sse.c                             |  2 +-
 23 files changed, 26 insertions(+), 46 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/glx/glcontextmodes.c b/src/glx/glcontextmodes.c
index 232031c2ca..257087a802 100644
--- a/src/glx/glcontextmodes.c
+++ b/src/glx/glcontextmodes.c
@@ -48,17 +48,14 @@
 # include <string.h>
 # define _mesa_malloc(b) malloc(b)
 # define _mesa_free(m) free(m)
-# define _mesa_memset  memset
 #else
 # ifdef XFree86Server
 # include <os.h>
 # include <string.h>
 #  define _mesa_malloc(b) xalloc(b)
 #  define _mesa_free(m)   xfree(m)
-#  define _mesa_memset   memset
 # else
 #  include <X11/Xlibint.h>
-#  define _mesa_memset memset
 #  define _mesa_malloc(b) Xmalloc(b)
 #  define _mesa_free(m) Xfree(m)
 # endif /* XFree86Server */
@@ -133,7 +130,7 @@ _gl_copy_visual_to_context_mode(__GLcontextModes * mode,
 {
    __GLcontextModes *const next = mode->next;
 
-   (void) _mesa_memset(mode, 0, sizeof(__GLcontextModes));
+   (void) memset(mode, 0, sizeof(__GLcontextModes));
    mode->next = next;
 
    mode->visualID = config->vid;
@@ -402,7 +399,7 @@ _gl_context_modes_create(unsigned count, size_t minimum_size)
          break;
       }
 
-      (void) _mesa_memset(*next, 0, size);
+      (void) memset(*next, 0, size);
       (*next)->visualID = GLX_DONT_CARE;
       (*next)->visualType = GLX_DONT_CARE;
       (*next)->visualRating = GLX_NONE;
diff --git a/src/mesa/drivers/dri/i965/brw_state_upload.c b/src/mesa/drivers/dri/i965/brw_state_upload.c
index 0ecbef1ef9..4f477cfc6b 100644
--- a/src/mesa/drivers/dri/i965/brw_state_upload.c
+++ b/src/mesa/drivers/dri/i965/brw_state_upload.c
@@ -349,7 +349,7 @@ void brw_upload_state(struct brw_context *brw)
        * state atoms are ordered correctly in the list.
        */
       struct brw_state_flags examined, prev;      
-      _mesa_memset(&examined, 0, sizeof(examined));
+      memset(&examined, 0, sizeof(examined));
       prev = *state;
 
       for (i = 0; i < Elements(atoms); i++) {	 
diff --git a/src/mesa/drivers/dri/i965/brw_wm_sampler_state.c b/src/mesa/drivers/dri/i965/brw_wm_sampler_state.c
index 87387b1e2d..c232cd2791 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_sampler_state.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_sampler_state.c
@@ -105,7 +105,7 @@ static void brw_update_sampler_state(struct wm_sampler_entry *key,
 				     dri_bo *sdc_bo,
 				     struct brw_sampler_state *sampler)
 {
-   _mesa_memset(sampler, 0, sizeof(*sampler));
+   memset(sampler, 0, sizeof(*sampler));
 
    switch (key->minfilter) {
    case GL_NEAREST:
diff --git a/src/mesa/drivers/windows/gdi/mesa.def b/src/mesa/drivers/windows/gdi/mesa.def
index f82db88bc5..d7d6cfa4e2 100644
--- a/src/mesa/drivers/windows/gdi/mesa.def
+++ b/src/mesa/drivers/windows/gdi/mesa.def
@@ -899,7 +899,6 @@ EXPORTS
 	_mesa_init_renderbuffer
 	_mesa_initialize_context
 	_mesa_make_current
-	_mesa_memset
 	_mesa_new_array_object
 	_mesa_new_framebuffer
 	_mesa_new_program
diff --git a/src/mesa/drivers/windows/icd/mesa.def b/src/mesa/drivers/windows/icd/mesa.def
index 06c384d8b0..f6bd2aa68b 100644
--- a/src/mesa/drivers/windows/icd/mesa.def
+++ b/src/mesa/drivers/windows/icd/mesa.def
@@ -54,7 +54,6 @@ EXPORTS
 	_mesa_init_driver_functions
 	_mesa_initialize_context
 	_mesa_make_current
-	_mesa_memset
 	_mesa_new_buffer_object
 	_mesa_new_texture_object
 	_mesa_problem
diff --git a/src/mesa/drivers/x11/xm_dd.c b/src/mesa/drivers/x11/xm_dd.c
index df04e3a101..d70236c2a0 100644
--- a/src/mesa/drivers/x11/xm_dd.c
+++ b/src/mesa/drivers/x11/xm_dd.c
@@ -336,7 +336,7 @@ clear_32bit_ximage(GLcontext *ctx, struct xmesa_renderbuffer *xrb,
       GLuint *ptr4 = (GLuint *) xrb->ximage->data;
       if (pixel == 0) {
          /* common case */
-         _mesa_memset(ptr4, pixel, 4 * n);
+         memset(ptr4, pixel, 4 * n);
       }
       else {
          GLuint i;
diff --git a/src/mesa/glapi/mesadef.py b/src/mesa/glapi/mesadef.py
index c7e2c086f7..59cea59ac2 100644
--- a/src/mesa/glapi/mesadef.py
+++ b/src/mesa/glapi/mesadef.py
@@ -134,7 +134,6 @@ def PrintTail():
 	print '\t_mesa_init_default_imports'
 	print '\t_mesa_initialize_context'
 	print '\t_mesa_make_current'
-	print '\t_mesa_memset'
 	print '\t_mesa_new_buffer_object'
 	print '\t_mesa_new_texture_object'
 	print '\t_mesa_problem'
diff --git a/src/mesa/main/bitset.h b/src/mesa/main/bitset.h
index 5463c0a3c9..29468e8486 100644
--- a/src/mesa/main/bitset.h
+++ b/src/mesa/main/bitset.h
@@ -49,8 +49,8 @@
  */
 #define BITSET_COPY(x, y) memcpy( (x), (y), sizeof (x) )
 #define BITSET_EQUAL(x, y) (_mesa_memcmp( (x), (y), sizeof (x) ) == 0)
-#define BITSET_ZERO(x) _mesa_memset( (x), 0, sizeof (x) )
-#define BITSET_ONES(x) _mesa_memset( (x), 0xff, sizeof (x) )
+#define BITSET_ZERO(x) memset( (x), 0, sizeof (x) )
+#define BITSET_ONES(x) memset( (x), 0xff, sizeof (x) )
 
 #define BITSET_BITWORD(b) ((b) / BITSET_WORDBITS)
 #define BITSET_BIT(b) (1 << ((b) % BITSET_WORDBITS))
diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index 867a55242c..48edec657b 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -1590,7 +1590,7 @@ create_new_program( const struct state_key *key,
 {
    struct tnl_program p;
 
-   _mesa_memset(&p, 0, sizeof(p));
+   memset(&p, 0, sizeof(p));
    p.state = key;
    p.program = program;
    p.eye_position = undef;
diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index 0abdfca381..d8375bf572 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -244,17 +244,6 @@ _mesa_realloc(void *oldBuffer, size_t oldSize, size_t newSize)
    return newBuffer;
 }
 
-/** Wrapper around memset() */
-void
-_mesa_memset( void *dst, int val, size_t n )
-{
-#if defined(SUNOS4)
-   memset( (char *) dst, (int) val, (int) n );
-#else
-   memset(dst, val, n);
-#endif
-}
-
 /**
  * Fill memory with a constant 16bit word.
  * \param dst destination pointer.
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index 8f13d518ea..68d2043c91 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -74,7 +74,7 @@ extern "C" {
 /** Copy \p BYTES bytes from \p SRC into \p DST */
 #define MEMCPY( DST, SRC, BYTES)   memcpy(DST, SRC, BYTES)
 /** Set \p N bytes in \p DST to \p VAL */
-#define MEMSET( DST, VAL, N )      _mesa_memset(DST, VAL, N)
+#define MEMSET( DST, VAL, N )      memset(DST, VAL, N)
 
 /*@}*/
 
@@ -543,9 +543,6 @@ _mesa_exec_free( void *addr );
 extern void *
 _mesa_realloc( void *oldBuffer, size_t oldSize, size_t newSize );
 
-extern void
-_mesa_memset( void *dst, int val, size_t n );
-
 extern void
 _mesa_memset16( unsigned short *dst, unsigned short val, size_t n );
 
diff --git a/src/mesa/main/renderbuffer.c b/src/mesa/main/renderbuffer.c
index 4ae5843662..bb0c78382c 100644
--- a/src/mesa/main/renderbuffer.c
+++ b/src/mesa/main/renderbuffer.c
@@ -548,7 +548,7 @@ put_mono_row_ubyte3(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
    ASSERT(rb->DataType == GL_UNSIGNED_BYTE);
    if (!mask && val0 == val1 && val1 == val2) {
       /* optimized case */
-      _mesa_memset(dst, val0, 3 * count);
+      memset(dst, val0, 3 * count);
    }
    else {
       GLuint i;
@@ -1319,7 +1319,7 @@ put_mono_row_alpha8(GLcontext *ctx, struct gl_renderbuffer *arb, GLuint count,
       }
    }
    else {
-      _mesa_memset(dst, val, count);
+      memset(dst, val, count);
    }
 }
 
diff --git a/src/mesa/main/texcompress_fxt1.c b/src/mesa/main/texcompress_fxt1.c
index 85becb80d2..73a31a17ec 100644
--- a/src/mesa/main/texcompress_fxt1.c
+++ b/src/mesa/main/texcompress_fxt1.c
@@ -406,7 +406,7 @@ fxt1_choose (GLfloat vec[][MAX_COMP], GLint nv,
    } hist[N_TEXELS];
    GLint lenh = 0;
 
-   _mesa_memset(hist, 0, sizeof(hist));
+   memset(hist, 0, sizeof(hist));
 
    for (k = 0; k < n; k++) {
       GLint l;
@@ -1211,7 +1211,7 @@ fxt1_quantize (GLuint *cc, const GLubyte *lines[], GLint comps)
 
    if (comps == 3) {
       /* make the whole block opaque */
-      _mesa_memset(input, -1, sizeof(input));
+      memset(input, -1, sizeof(input));
    }
 
    /* 8 texels each line */
diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 5cc5fdaebd..35a2cebab8 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -1416,7 +1416,7 @@ create_new_program(GLcontext *ctx, struct state_key *key,
    GLuint unit;
    struct ureg cf, out;
 
-   _mesa_memset(&p, 0, sizeof(p));
+   memset(&p, 0, sizeof(p));
    p.state = key;
    p.program = program;
 
diff --git a/src/mesa/shader/atifragshader.c b/src/mesa/shader/atifragshader.c
index 3e26c43c48..fb2fa4b95f 100644
--- a/src/mesa/shader/atifragshader.c
+++ b/src/mesa/shader/atifragshader.c
@@ -96,7 +96,7 @@ create_dst_mod_str(GLuint mod)
 {
    static char ret_str[1024];
 
-   _mesa_memset(ret_str, 0, 1024);
+   memset(ret_str, 0, 1024);
    if (mod & GL_2X_BIT_ATI)
       strncat(ret_str, "|2X", 1024);
 
diff --git a/src/mesa/shader/prog_cache.c b/src/mesa/shader/prog_cache.c
index 9437e59613..8e54f3a5a0 100644
--- a/src/mesa/shader/prog_cache.c
+++ b/src/mesa/shader/prog_cache.c
@@ -88,7 +88,7 @@ rehash(struct gl_program_cache *cache)
 
    size = cache->size * 3;
    items = (struct cache_item**) _mesa_malloc(size * sizeof(*items));
-   _mesa_memset(items, 0, size * sizeof(*items));
+   memset(items, 0, size * sizeof(*items));
 
    for (i = 0; i < cache->size; i++)
       for (c = cache->items[i]; c; c = next) {
diff --git a/src/mesa/shader/prog_parameter.c b/src/mesa/shader/prog_parameter.c
index 435e6ceb09..1feb7bd71d 100644
--- a/src/mesa/shader/prog_parameter.c
+++ b/src/mesa/shader/prog_parameter.c
@@ -146,8 +146,8 @@ _mesa_add_parameter(struct gl_program_parameter_list *paramList,
 
       paramList->NumParameters = oldNum + sz4;
 
-      _mesa_memset(&paramList->Parameters[oldNum], 0, 
-		   sz4 * sizeof(struct gl_program_parameter));
+      memset(&paramList->Parameters[oldNum], 0,
+             sz4 * sizeof(struct gl_program_parameter));
 
       for (i = 0; i < sz4; i++) {
          struct gl_program_parameter *p = paramList->Parameters + oldNum + i;
diff --git a/src/mesa/shader/program.c b/src/mesa/shader/program.c
index 3bf9a65905..2410ccb047 100644
--- a/src/mesa/shader/program.c
+++ b/src/mesa/shader/program.c
@@ -809,7 +809,7 @@ _mesa_find_used_registers(const struct gl_program *prog,
 {
    GLuint i, j;
 
-   _mesa_memset(used, 0, usedSize);
+   memset(used, 0, usedSize);
 
    for (i = 0; i < prog->NumInstructions; i++) {
       const struct prog_instruction *inst = prog->Instructions + i;
diff --git a/src/mesa/swrast/s_depth.c b/src/mesa/swrast/s_depth.c
index ac5dae2148..36c8db2107 100644
--- a/src/mesa/swrast/s_depth.c
+++ b/src/mesa/swrast/s_depth.c
@@ -1438,7 +1438,7 @@ _swrast_clear_depth_buffer( GLcontext *ctx, struct gl_renderbuffer *rb )
             /* optimized case */
             GLushort *dst = (GLushort *) rb->GetPointer(ctx, rb, x, y);
             GLuint len = width * height * sizeof(GLushort);
-            _mesa_memset(dst, (clearValue & 0xff), len);
+            memset(dst, (clearValue & 0xff), len);
          }
          else {
             /* general case */
diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c
index 63a8d4e350..7087f25d27 100644
--- a/src/mesa/swrast/s_span.c
+++ b/src/mesa/swrast/s_span.c
@@ -869,7 +869,7 @@ _swrast_write_index_span( GLcontext *ctx, SWspan *span)
       span->writeAll = GL_FALSE;
    }
    else {
-      _mesa_memset(span->array->mask, 1, span->end);
+      memset(span->array->mask, 1, span->end);
       span->writeAll = GL_TRUE;
    }
 
@@ -1338,7 +1338,7 @@ _swrast_write_rgba_span( GLcontext *ctx, SWspan *span)
       span->writeAll = GL_FALSE;
    }
    else {
-      _mesa_memset(span->array->mask, 1, span->end);
+      memset(span->array->mask, 1, span->end);
       span->writeAll = GL_TRUE;
    }
 
diff --git a/src/mesa/swrast/s_stencil.c b/src/mesa/swrast/s_stencil.c
index 5e9a4e37c7..aa74b21ee8 100644
--- a/src/mesa/swrast/s_stencil.c
+++ b/src/mesa/swrast/s_stencil.c
@@ -1181,7 +1181,7 @@ _swrast_clear_stencil_buffer( GLcontext *ctx, struct gl_renderbuffer *rb )
             /* Note: bottom-to-top raster assumed! */
             GLubyte *stencil = (GLubyte *) rb->GetPointer(ctx, rb, x, y);
             GLuint len = width * height * sizeof(GLubyte);
-            _mesa_memset(stencil, clearVal, len);
+            memset(stencil, clearVal, len);
          }
          else {
             /* general case */
@@ -1189,7 +1189,7 @@ _swrast_clear_stencil_buffer( GLcontext *ctx, struct gl_renderbuffer *rb )
             for (i = 0; i < height; i++) {
                GLvoid *stencil = rb->GetPointer(ctx, rb, x, y + i);
                if (rb->DataType == GL_UNSIGNED_BYTE) {
-                  _mesa_memset(stencil, clearVal, width);
+                  memset(stencil, clearVal, width);
                }
                else {
                   _mesa_memset16((short unsigned int*) stencil, clearVal, width);
diff --git a/src/mesa/tnl/t_vertex_sse.c b/src/mesa/tnl/t_vertex_sse.c
index 7a255d680a..6436cbfc6e 100644
--- a/src/mesa/tnl/t_vertex_sse.c
+++ b/src/mesa/tnl/t_vertex_sse.c
@@ -648,7 +648,7 @@ void _tnl_generate_sse_emit( GLcontext *ctx )
       return;
    }
 
-   _mesa_memset(&p, 0, sizeof(p));
+   memset(&p, 0, sizeof(p));
 
    p.ctx = ctx;
    p.inputs_safe = 0;		/* for now */
diff --git a/src/mesa/vf/vf_sse.c b/src/mesa/vf/vf_sse.c
index 4d70196ffe..04275903c9 100644
--- a/src/mesa/vf/vf_sse.c
+++ b/src/mesa/vf/vf_sse.c
@@ -629,7 +629,7 @@ void vf_generate_sse_emit( struct vertex_fetch *vf )
       return;
    }
 
-   _mesa_memset(&p, 0, sizeof(p));
+   memset(&p, 0, sizeof(p));
 
    p.vf = vf;
    p.inputs_safe = 0;		/* for now */
-- 
cgit v1.2.3


From 2efa86ea3040c37965987160733b22e2a0541a3e Mon Sep 17 00:00:00 2001
From: Kenneth Graunke <kenneth@whitecape.org>
Date: Thu, 18 Feb 2010 23:51:01 -0800
Subject: Remove _mesa_memcmp in favor of plain memcmp.

This may break the SUNOS4 build, but it's no longer relevant.
---
 src/mesa/drivers/dri/r300/r300_fragprog_common.c |  2 +-
 src/mesa/drivers/dri/r300/r300_vertprog.c        |  3 +--
 src/mesa/main/bitset.h                           |  2 +-
 src/mesa/main/imports.c                          | 11 -----------
 src/mesa/main/imports.h                          |  3 ---
 src/mesa/main/texenvprogram.c                    |  4 ++--
 6 files changed, 5 insertions(+), 20 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/dri/r300/r300_fragprog_common.c b/src/mesa/drivers/dri/r300/r300_fragprog_common.c
index a0e2dd3c09..f3d8f2f424 100644
--- a/src/mesa/drivers/dri/r300/r300_fragprog_common.c
+++ b/src/mesa/drivers/dri/r300/r300_fragprog_common.c
@@ -271,7 +271,7 @@ struct r300_fragment_program *r300SelectAndTranslateFragmentShader(GLcontext *ct
 
 	fp = fp_list->progs;
 	while (fp) {
-		if (_mesa_memcmp(&fp->state, &state, sizeof(state)) == 0) {
+		if (memcmp(&fp->state, &state, sizeof(state)) == 0) {
 			return r300->selected_fp = fp;
 		}
 		fp = fp->next;
diff --git a/src/mesa/drivers/dri/r300/r300_vertprog.c b/src/mesa/drivers/dri/r300/r300_vertprog.c
index efdcdb7848..a74b7001dd 100644
--- a/src/mesa/drivers/dri/r300/r300_vertprog.c
+++ b/src/mesa/drivers/dri/r300/r300_vertprog.c
@@ -316,8 +316,7 @@ struct r300_vertex_program * r300SelectAndTranslateVertexShader(GLcontext *ctx)
 	wanted_key.WPosAttr = r300->selected_fp->wpos_attr;
 
 	for (vp = vpc->progs; vp; vp = vp->next) {
-		if (_mesa_memcmp(&vp->key, &wanted_key, sizeof(wanted_key))
-		    == 0) {
+		if (memcmp(&vp->key, &wanted_key, sizeof(wanted_key)) == 0) {
 			return r300->selected_vp = vp;
 		}
 	}
diff --git a/src/mesa/main/bitset.h b/src/mesa/main/bitset.h
index 29468e8486..9f48b3ccea 100644
--- a/src/mesa/main/bitset.h
+++ b/src/mesa/main/bitset.h
@@ -48,7 +48,7 @@
 /* bitset operations
  */
 #define BITSET_COPY(x, y) memcpy( (x), (y), sizeof (x) )
-#define BITSET_EQUAL(x, y) (_mesa_memcmp( (x), (y), sizeof (x) ) == 0)
+#define BITSET_EQUAL(x, y) (memcmp( (x), (y), sizeof (x) ) == 0)
 #define BITSET_ZERO(x) memset( (x), 0, sizeof (x) )
 #define BITSET_ONES(x) memset( (x), 0xff, sizeof (x) )
 
diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index d8375bf572..6730500225 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -268,17 +268,6 @@ _mesa_bzero( void *dst, size_t n )
 #endif
 }
 
-/** Wrapper around memcmp() */
-int
-_mesa_memcmp( const void *s1, const void *s2, size_t n )
-{
-#if defined(SUNOS4)
-   return memcmp( (char *) s1, (char *) s2, (int) n );
-#else
-   return memcmp(s1, s2, n);
-#endif
-}
-
 /*@}*/
 
 
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index 68d2043c91..d5ab7cdc20 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -549,9 +549,6 @@ _mesa_memset16( unsigned short *dst, unsigned short val, size_t n );
 extern void
 _mesa_bzero( void *dst, size_t n );
 
-extern int
-_mesa_memcmp( const void *s1, const void *s2, size_t n );
-
 extern double
 _mesa_sin(double a);
 
diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index 35a2cebab8..f790fd6562 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -1095,7 +1095,7 @@ static struct ureg emit_combine( struct texenv_fragment_program *p,
       emit_arith( p, OPCODE_MAD, tmp0, WRITEMASK_XYZW, 0, 
 		  two, src[0], neg1);
 
-      if (_mesa_memcmp(&src[0], &src[1], sizeof(struct ureg)) == 0)
+      if (memcmp(&src[0], &src[1], sizeof(struct ureg)) == 0)
 	 tmp1 = tmp0;
       else
 	 emit_arith( p, OPCODE_MAD, tmp1, WRITEMASK_XYZW, 0, 
@@ -1494,7 +1494,7 @@ create_new_program(GLcontext *ctx, struct state_key *key,
       emit_arith( &p, OPCODE_ADD, out, WRITEMASK_XYZ, 0, cf, s, undef );
       emit_arith( &p, OPCODE_MOV, out, WRITEMASK_W, 0, cf, undef, undef );
    }
-   else if (_mesa_memcmp(&cf, &out, sizeof(cf)) != 0) {
+   else if (memcmp(&cf, &out, sizeof(cf)) != 0) {
       /* Will wind up in here if no texture enabled or a couple of
        * other scenarios (GL_REPLACE for instance).
        */
-- 
cgit v1.2.3


From e197de56cdb86835f1437688a9161cd909792d80 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 19 Feb 2010 08:09:01 -0700
Subject: mesa: replace old MEMCPY macro with memcpy

---
 src/gallium/state_trackers/glx/xlib/xm_api.c |  2 +-
 src/mesa/drivers/dri/mga/mgapixel.c          |  2 +-
 src/mesa/drivers/dri/tdfx/tdfx_pixels.c      |  6 +--
 src/mesa/drivers/dri/tdfx/tdfx_tex.c         |  4 +-
 src/mesa/drivers/glide/fxdd.c                |  6 +--
 src/mesa/drivers/glide/fxddtex.c             |  4 +-
 src/mesa/drivers/x11/xm_api.c                | 12 +++---
 src/mesa/main/attrib.c                       | 60 ++++++++++++++--------------
 src/mesa/main/context.c                      |  2 +-
 src/mesa/main/dlist.c                        | 14 +++----
 src/mesa/main/imports.h                      |  2 -
 src/mesa/main/mipmap.c                       | 40 +++++++++----------
 src/mesa/main/pixel.c                        |  4 +-
 src/mesa/main/texstore.c                     |  4 +-
 src/mesa/math/m_matrix.c                     | 28 ++++++-------
 src/mesa/shader/nvfragparse.c                |  2 +-
 src/mesa/shader/nvprogram.c                  |  2 +-
 src/mesa/shader/nvvertparse.c                |  2 +-
 src/mesa/shader/prog_statevars.c             |  2 +-
 src/mesa/swrast/s_zoom.c                     |  8 ++--
 src/mesa/tnl/t_pipeline.c                    |  2 +-
 src/mesa/tnl/t_vb_program.c                  |  2 +-
 22 files changed, 104 insertions(+), 106 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/gallium/state_trackers/glx/xlib/xm_api.c b/src/gallium/state_trackers/glx/xlib/xm_api.c
index fb314f3b52..2e678c8f1e 100644
--- a/src/gallium/state_trackers/glx/xlib/xm_api.c
+++ b/src/gallium/state_trackers/glx/xlib/xm_api.c
@@ -678,7 +678,7 @@ XMesaVisual XMesaCreateVisual( Display *display,
       _mesa_free(v);
       return NULL;
    }
-   MEMCPY(v->visinfo, visinfo, sizeof(*visinfo));
+   memcpy(v->visinfo, visinfo, sizeof(*visinfo));
 
    v->ximage_flag = ximage_flag;
 
diff --git a/src/mesa/drivers/dri/mga/mgapixel.c b/src/mesa/drivers/dri/mga/mgapixel.c
index 69415f8a83..664f7c77c2 100644
--- a/src/mesa/drivers/dri/mga/mgapixel.c
+++ b/src/mesa/drivers/dri/mga/mgapixel.c
@@ -600,7 +600,7 @@ mgaTryDrawPixels( GLcontext *ctx,
 	    }
 	 }
 #else
-	 MEMCPY( address, pixels, rows*bufferpitch );
+	 memcpy( address, pixels, rows*bufferpitch );
 #endif
 
 	 do_draw_pix( ctx, x, y, width, rows,
diff --git a/src/mesa/drivers/dri/tdfx/tdfx_pixels.c b/src/mesa/drivers/dri/tdfx/tdfx_pixels.c
index 4449627418..5a7184056d 100644
--- a/src/mesa/drivers/dri/tdfx/tdfx_pixels.c
+++ b/src/mesa/drivers/dri/tdfx/tdfx_pixels.c
@@ -519,7 +519,7 @@ tdfx_readpixels_R5G6B5(GLcontext * ctx, GLint x, GLint y,
 	 const GLint widthInBytes = width * 2;
 	 GLint row;
 	 for (row = 0; row < height; row++) {
-	    MEMCPY(dst, src, widthInBytes);
+	    memcpy(dst, src, widthInBytes);
 	    dst += dstStride;
 	    src -= srcStride;
 	 }
@@ -578,7 +578,7 @@ tdfx_readpixels_R8G8B8A8(GLcontext * ctx, GLint x, GLint y,
 	 {
             GLint row;
             for (row = 0; row < height; row++) {
-               MEMCPY(dst, src, widthInBytes);
+               memcpy(dst, src, widthInBytes);
                dst += dstStride;
                src -= srcStride;
             }
@@ -672,7 +672,7 @@ tdfx_drawpixels_R8G8B8A8(GLcontext * ctx, GLint x, GLint y,
              (format == GL_BGRA && type == GL_UNSIGNED_BYTE)) {
             GLint row;
             for (row = 0; row < height; row++) {
-               MEMCPY(dst, src, widthInBytes);
+               memcpy(dst, src, widthInBytes);
                dst -= dstStride;
                src += srcStride;
             }
diff --git a/src/mesa/drivers/dri/tdfx/tdfx_tex.c b/src/mesa/drivers/dri/tdfx/tdfx_tex.c
index e31ae97b02..1c51452c10 100644
--- a/src/mesa/drivers/dri/tdfx/tdfx_tex.c
+++ b/src/mesa/drivers/dri/tdfx/tdfx_tex.c
@@ -1660,7 +1660,7 @@ tdfxCompressedTexImage2D (GLcontext *ctx, GLenum target,
                                 texImage->Data);
        ti->padded = GL_TRUE;
     } else {
-       MEMCPY(texImage->Data, data, compressedSize);
+       memcpy(texImage->Data, data, compressedSize);
     }
 
     RevalidateTexture(ctx, texObj);
@@ -1707,7 +1707,7 @@ tdfxCompressedTexSubImage2D( GLcontext *ctx, GLenum target,
     rows = height / 4; /* [dBorca] hardcoded 4, but works for FXT1/DXTC */
 
     for (i = 0; i < rows; i++) {
-       MEMCPY(dest, data, srcRowStride);
+       memcpy(dest, data, srcRowStride);
        dest += destRowStride;
        data = (GLvoid *)((intptr_t)data + (intptr_t)srcRowStride);
     }
diff --git a/src/mesa/drivers/glide/fxdd.c b/src/mesa/drivers/glide/fxdd.c
index 2bc60399ea..d94bf08a88 100644
--- a/src/mesa/drivers/glide/fxdd.c
+++ b/src/mesa/drivers/glide/fxdd.c
@@ -840,7 +840,7 @@ fxDDReadPixels565 (GLcontext * ctx,
 	    const GLint widthInBytes = width * 2;
 	    GLint row;
 	    for (row = 0; row < height; row++) {
-	       MEMCPY(dst, src, widthInBytes);
+	       memcpy(dst, src, widthInBytes);
 	       dst += dstStride;
 	       src -= srcStride;
 	    }
@@ -953,7 +953,7 @@ fxDDReadPixels555 (GLcontext * ctx,
 	    const GLint widthInBytes = width * 2;
 	    GLint row;
 	    for (row = 0; row < height; row++) {
-	       MEMCPY(dst, src, widthInBytes);
+	       memcpy(dst, src, widthInBytes);
 	       dst += dstStride;
 	       src -= srcStride;
 	    }
@@ -1572,7 +1572,7 @@ fxDDDrawPixels8888 (GLcontext * ctx, GLint x, GLint y,
          for (row = 0; row < height; row++) {
 	     GLubyte *src = (GLubyte *) _mesa_image_address2d(finalUnpack,
                                   pixels, width, height, format, type, row, 0);
-             MEMCPY(dst, src, widthInBytes);
+             memcpy(dst, src, widthInBytes);
              dst += dstStride;
          }
       }
diff --git a/src/mesa/drivers/glide/fxddtex.c b/src/mesa/drivers/glide/fxddtex.c
index 9dd4f1e9c3..a87a28ac3e 100644
--- a/src/mesa/drivers/glide/fxddtex.c
+++ b/src/mesa/drivers/glide/fxddtex.c
@@ -1688,7 +1688,7 @@ fxDDCompressedTexImage2D (GLcontext *ctx, GLenum target,
                                texImage->Data);
       ti->padded = GL_TRUE;
    } else {
-      MEMCPY(texImage->Data, data, texImage->CompressedSize);
+      memcpy(texImage->Data, data, texImage->CompressedSize);
    }
 
    ti->info.format = mml->glideFormat;
@@ -1739,7 +1739,7 @@ fxDDCompressedTexSubImage2D( GLcontext *ctx, GLenum target,
    rows = height / 4; /* hardcoded 4, but works for FXT1/DXTC */
 
    for (i = 0; i < rows; i++) {
-      MEMCPY(dest, data, srcRowStride);
+      memcpy(dest, data, srcRowStride);
       dest += destRowStride;
       data = (GLvoid *)((GLuint)data + (GLuint)srcRowStride);
    }
diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c
index 1a5456e1be..98ce6c5831 100644
--- a/src/mesa/drivers/x11/xm_api.c
+++ b/src/mesa/drivers/x11/xm_api.c
@@ -511,12 +511,12 @@ xmesa_free_buffer(XMesaBuffer buffer)
 static void
 copy_colortable_info(XMesaBuffer dst, const XMesaBuffer src)
 {
-   MEMCPY(dst->color_table, src->color_table, sizeof(src->color_table));
-   MEMCPY(dst->pixel_to_r, src->pixel_to_r, sizeof(src->pixel_to_r));
-   MEMCPY(dst->pixel_to_g, src->pixel_to_g, sizeof(src->pixel_to_g));
-   MEMCPY(dst->pixel_to_b, src->pixel_to_b, sizeof(src->pixel_to_b));
+   memcpy(dst->color_table, src->color_table, sizeof(src->color_table));
+   memcpy(dst->pixel_to_r, src->pixel_to_r, sizeof(src->pixel_to_r));
+   memcpy(dst->pixel_to_g, src->pixel_to_g, sizeof(src->pixel_to_g));
+   memcpy(dst->pixel_to_b, src->pixel_to_b, sizeof(src->pixel_to_b));
    dst->num_alloced = src->num_alloced;
-   MEMCPY(dst->alloced_colors, src->alloced_colors,
+   memcpy(dst->alloced_colors, src->alloced_colors,
           sizeof(src->alloced_colors));
 }
 
@@ -1376,7 +1376,7 @@ XMesaVisual XMesaCreateVisual( XMesaDisplay *display,
       _mesa_free(v);
       return NULL;
    }
-   MEMCPY(v->visinfo, visinfo, sizeof(*visinfo));
+   memcpy(v->visinfo, visinfo, sizeof(*visinfo));
 #endif
 
    /* check for MESA_GAMMA environment variable */
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 881644cdaf..44dc3b871e 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -222,7 +222,7 @@ _mesa_PushAttrib(GLbitfield mask)
    if (mask & GL_ACCUM_BUFFER_BIT) {
       struct gl_accum_attrib *attr;
       attr = MALLOC_STRUCT( gl_accum_attrib );
-      MEMCPY( attr, &ctx->Accum, sizeof(struct gl_accum_attrib) );
+      memcpy( attr, &ctx->Accum, sizeof(struct gl_accum_attrib) );
       save_attrib_data(&head, GL_ACCUM_BUFFER_BIT, attr);
    }
 
@@ -230,7 +230,7 @@ _mesa_PushAttrib(GLbitfield mask)
       GLuint i;
       struct gl_colorbuffer_attrib *attr;
       attr = MALLOC_STRUCT( gl_colorbuffer_attrib );
-      MEMCPY( attr, &ctx->Color, sizeof(struct gl_colorbuffer_attrib) );
+      memcpy( attr, &ctx->Color, sizeof(struct gl_colorbuffer_attrib) );
       /* 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];
@@ -241,14 +241,14 @@ _mesa_PushAttrib(GLbitfield mask)
       struct gl_current_attrib *attr;
       FLUSH_CURRENT( ctx, 0 );
       attr = MALLOC_STRUCT( gl_current_attrib );
-      MEMCPY( attr, &ctx->Current, sizeof(struct gl_current_attrib) );
+      memcpy( attr, &ctx->Current, sizeof(struct gl_current_attrib) );
       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) );
+      memcpy( attr, &ctx->Depth, sizeof(struct gl_depthbuffer_attrib) );
       save_attrib_data(&head, GL_DEPTH_BUFFER_BIT, attr);
    }
 
@@ -292,7 +292,7 @@ _mesa_PushAttrib(GLbitfield mask)
       attr->Map1TextureCoord4 = ctx->Eval.Map1TextureCoord4;
       attr->Map1Vertex3 = ctx->Eval.Map1Vertex3;
       attr->Map1Vertex4 = ctx->Eval.Map1Vertex4;
-      MEMCPY(attr->Map1Attrib, ctx->Eval.Map1Attrib, sizeof(ctx->Eval.Map1Attrib));
+      memcpy(attr->Map1Attrib, ctx->Eval.Map1Attrib, sizeof(ctx->Eval.Map1Attrib));
       attr->Map2Color4 = ctx->Eval.Map2Color4;
       attr->Map2Index = ctx->Eval.Map2Index;
       attr->Map2Normal = ctx->Eval.Map2Normal;
@@ -302,7 +302,7 @@ _mesa_PushAttrib(GLbitfield mask)
       attr->Map2TextureCoord4 = ctx->Eval.Map2TextureCoord4;
       attr->Map2Vertex3 = ctx->Eval.Map2Vertex3;
       attr->Map2Vertex4 = ctx->Eval.Map2Vertex4;
-      MEMCPY(attr->Map2Attrib, ctx->Eval.Map2Attrib, sizeof(ctx->Eval.Map2Attrib));
+      memcpy(attr->Map2Attrib, ctx->Eval.Map2Attrib, sizeof(ctx->Eval.Map2Attrib));
       attr->Normalize = ctx->Transform.Normalize;
       attr->RasterPositionUnclipped = ctx->Transform.RasterPositionUnclipped;
       attr->PointSmooth = ctx->Point.SmoothFlag;
@@ -336,21 +336,21 @@ _mesa_PushAttrib(GLbitfield mask)
    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) );
+      memcpy( attr, &ctx->Eval, sizeof(struct gl_eval_attrib) );
       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) );
+      memcpy( attr, &ctx->Fog, sizeof(struct gl_fog_attrib) );
       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) );
+      memcpy( attr, &ctx->Hint, sizeof(struct gl_hint_attrib) );
       save_attrib_data(&head, GL_HINT_BIT, attr);
    }
 
@@ -358,28 +358,28 @@ _mesa_PushAttrib(GLbitfield mask)
       struct gl_light_attrib *attr;
       FLUSH_CURRENT(ctx, 0);	/* flush material changes */
       attr = MALLOC_STRUCT( gl_light_attrib );
-      MEMCPY( attr, &ctx->Light, sizeof(struct gl_light_attrib) );
+      memcpy( attr, &ctx->Light, sizeof(struct gl_light_attrib) );
       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) );
+      memcpy( attr, &ctx->Line, sizeof(struct gl_line_attrib) );
       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) );
+      memcpy( attr, &ctx->List, sizeof(struct gl_list_attrib) );
       save_attrib_data(&head, GL_LIST_BIT, attr);
    }
 
    if (mask & GL_PIXEL_MODE_BIT) {
       struct gl_pixel_attrib *attr;
       attr = MALLOC_STRUCT( gl_pixel_attrib );
-      MEMCPY( attr, &ctx->Pixel, sizeof(struct gl_pixel_attrib) );
+      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;
       save_attrib_data(&head, GL_PIXEL_MODE_BIT, attr);
@@ -388,35 +388,35 @@ _mesa_PushAttrib(GLbitfield mask)
    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) );
+      memcpy( attr, &ctx->Point, sizeof(struct gl_point_attrib) );
       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) );
+      memcpy( attr, &ctx->Polygon, sizeof(struct gl_polygon_attrib) );
       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) );
+      memcpy( stipple, ctx->PolygonStipple, 32*sizeof(GLuint) );
       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) );
+      memcpy( attr, &ctx->Scissor, sizeof(struct gl_scissor_attrib) );
       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) );
+      memcpy( attr, &ctx->Stencil, sizeof(struct gl_stencil_attrib) );
       save_attrib_data(&head, GL_STENCIL_BUFFER_BIT, attr);
    }
 
@@ -460,14 +460,14 @@ _mesa_PushAttrib(GLbitfield mask)
    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) );
+      memcpy( attr, &ctx->Transform, sizeof(struct gl_transform_attrib) );
       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) );
+      memcpy( attr, &ctx->Viewport, sizeof(struct gl_viewport_attrib) );
       save_attrib_data(&head, GL_VIEWPORT_BIT, attr);
    }
 
@@ -475,7 +475,7 @@ _mesa_PushAttrib(GLbitfield mask)
    if (mask & GL_MULTISAMPLE_BIT_ARB) {
       struct gl_multisample_attrib *attr;
       attr = MALLOC_STRUCT( gl_multisample_attrib );
-      MEMCPY( attr, &ctx->Multisample, sizeof(struct gl_multisample_attrib) );
+      memcpy( attr, &ctx->Multisample, sizeof(struct gl_multisample_attrib) );
       save_attrib_data(&head, GL_MULTISAMPLE_BIT_ARB, attr);
    }
 
@@ -1010,7 +1010,7 @@ _mesa_PopAttrib(void)
             break;
          case GL_CURRENT_BIT:
 	    FLUSH_CURRENT( ctx, 0 );
-            MEMCPY( &ctx->Current, attr->data,
+            memcpy( &ctx->Current, attr->data,
 		    sizeof(struct gl_current_attrib) );
             break;
          case GL_DEPTH_BUFFER_BIT:
@@ -1032,7 +1032,7 @@ _mesa_PopAttrib(void)
             }
             break;
          case GL_EVAL_BIT:
-            MEMCPY( &ctx->Eval, attr->data, sizeof(struct gl_eval_attrib) );
+            memcpy( &ctx->Eval, attr->data, sizeof(struct gl_eval_attrib) );
 	    ctx->NewState |= _NEW_EVAL;
             break;
          case GL_FOG_BIT:
@@ -1126,7 +1126,7 @@ _mesa_PopAttrib(void)
                _mesa_set_enable(ctx, GL_COLOR_MATERIAL,
                                 light->ColorMaterialEnabled);
                /* materials */
-               MEMCPY(&ctx->Light.Material, &light->Material,
+               memcpy(&ctx->Light.Material, &light->Material,
                       sizeof(struct gl_material));
             }
             break;
@@ -1141,10 +1141,10 @@ _mesa_PopAttrib(void)
             }
             break;
          case GL_LIST_BIT:
-            MEMCPY( &ctx->List, attr->data, sizeof(struct gl_list_attrib) );
+            memcpy( &ctx->List, attr->data, sizeof(struct gl_list_attrib) );
             break;
          case GL_PIXEL_MODE_BIT:
-            MEMCPY( &ctx->Pixel, attr->data, sizeof(struct gl_pixel_attrib) );
+            memcpy( &ctx->Pixel, attr->data, sizeof(struct gl_pixel_attrib) );
             /* XXX what other pixel state needs to be set by function calls? */
             _mesa_ReadBuffer(ctx->Pixel.ReadBuffer);
 	    ctx->NewState |= _NEW_PIXEL;
@@ -1203,7 +1203,7 @@ _mesa_PopAttrib(void)
             }
             break;
 	 case GL_POLYGON_STIPPLE_BIT:
-	    MEMCPY( ctx->PolygonStipple, attr->data, 32*sizeof(GLuint) );
+	    memcpy( ctx->PolygonStipple, attr->data, 32*sizeof(GLuint) );
 	    ctx->NewState |= _NEW_POLYGONSTIPPLE;
 	    if (ctx->Driver.PolygonStipple)
 	       ctx->Driver.PolygonStipple( ctx, (const GLubyte *) attr->data );
@@ -1417,8 +1417,8 @@ _mesa_PushClientAttrib(GLbitfield mask)
       ctx->Array.ElementArrayBufferObj->RefCount++;
 #endif
 
-      MEMCPY( attr, &ctx->Array, sizeof(struct gl_array_attrib) );
-      MEMCPY( obj, ctx->Array.ArrayObj, sizeof(struct gl_array_object) );
+      memcpy( attr, &ctx->Array, sizeof(struct gl_array_attrib) );
+      memcpy( obj, ctx->Array.ArrayObj, sizeof(struct gl_array_object) );
 
       attr->ArrayObj = obj;
 
@@ -1492,7 +1492,7 @@ _mesa_PopClientAttrib(void)
                                 data->ElementArrayBufferObj->Name);
 #endif
 
-	    MEMCPY( ctx->Array.ArrayObj, data->ArrayObj,
+	    memcpy( ctx->Array.ArrayObj, data->ArrayObj,
 		    sizeof( struct gl_array_object ) );
 
 	    FREE( data->ArrayObj );
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index c292d1fea5..f315f0b212 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1108,7 +1108,7 @@ _mesa_copy_context( const GLcontext *src, GLcontext *dst, GLuint mask )
       dst->Polygon = src->Polygon;
    }
    if (mask & GL_POLYGON_STIPPLE_BIT) {
-      /* Use loop instead of MEMCPY due to problem with Portland Group's
+      /* Use loop instead of memcpy due to problem with Portland Group's
        * C compiler.  Reported by John Stone.
        */
       GLuint i;
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index ea0d13b890..9c472d85e3 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -2913,7 +2913,7 @@ save_PixelMapfv(GLenum map, GLint mapsize, const GLfloat *values)
       n[1].e = map;
       n[2].i = mapsize;
       n[3].data = (void *) _mesa_malloc(mapsize * sizeof(GLfloat));
-      MEMCPY(n[3].data, (void *) values, mapsize * sizeof(GLfloat));
+      memcpy(n[3].data, (void *) values, mapsize * sizeof(GLfloat));
    }
    if (ctx->ExecuteFlag) {
       CALL_PixelMapfv(ctx->Exec, (map, mapsize, values));
@@ -4365,7 +4365,7 @@ save_CompressedTexImage1DARB(GLenum target, GLint level,
          _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexImage1DARB");
          return;
       }
-      MEMCPY(image, data, imageSize);
+      memcpy(image, data, imageSize);
       n = alloc_instruction(ctx, OPCODE_COMPRESSED_TEX_IMAGE_1D, 7);
       if (n) {
          n[1].e = target;
@@ -4411,7 +4411,7 @@ save_CompressedTexImage2DARB(GLenum target, GLint level,
          _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexImage2DARB");
          return;
       }
-      MEMCPY(image, data, imageSize);
+      memcpy(image, data, imageSize);
       n = alloc_instruction(ctx, OPCODE_COMPRESSED_TEX_IMAGE_2D, 8);
       if (n) {
          n[1].e = target;
@@ -4458,7 +4458,7 @@ save_CompressedTexImage3DARB(GLenum target, GLint level,
          _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexImage3DARB");
          return;
       }
-      MEMCPY(image, data, imageSize);
+      memcpy(image, data, imageSize);
       n = alloc_instruction(ctx, OPCODE_COMPRESSED_TEX_IMAGE_3D, 9);
       if (n) {
          n[1].e = target;
@@ -4501,7 +4501,7 @@ save_CompressedTexSubImage1DARB(GLenum target, GLint level, GLint xoffset,
       _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexSubImage1DARB");
       return;
    }
-   MEMCPY(image, data, imageSize);
+   memcpy(image, data, imageSize);
    n = alloc_instruction(ctx, OPCODE_COMPRESSED_TEX_SUB_IMAGE_1D, 7);
    if (n) {
       n[1].e = target;
@@ -4541,7 +4541,7 @@ save_CompressedTexSubImage2DARB(GLenum target, GLint level, GLint xoffset,
       _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexSubImage2DARB");
       return;
    }
-   MEMCPY(image, data, imageSize);
+   memcpy(image, data, imageSize);
    n = alloc_instruction(ctx, OPCODE_COMPRESSED_TEX_SUB_IMAGE_2D, 9);
    if (n) {
       n[1].e = target;
@@ -4583,7 +4583,7 @@ save_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset,
       _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexSubImage3DARB");
       return;
    }
-   MEMCPY(image, data, imageSize);
+   memcpy(image, data, imageSize);
    n = alloc_instruction(ctx, OPCODE_COMPRESSED_TEX_SUB_IMAGE_3D, 11);
    if (n) {
       n[1].e = target;
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index d5ab7cdc20..c4e28df051 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -71,8 +71,6 @@ extern "C" {
 /** Free aligned memory */
 #define ALIGN_FREE(PTR)            _mesa_align_free(PTR)
 
-/** Copy \p BYTES bytes from \p SRC into \p DST */
-#define MEMCPY( DST, SRC, BYTES)   memcpy(DST, SRC, BYTES)
 /** Set \p N bytes in \p DST to \p VAL */
 #define MEMSET( DST, VAL, N )      memset(DST, VAL, N)
 
diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c
index 77cd1d4159..1da576337f 100644
--- a/src/mesa/main/mipmap.c
+++ b/src/mesa/main/mipmap.c
@@ -979,9 +979,9 @@ make_1d_mipmap(GLenum datatype, GLuint comps, GLint border,
 
    if (border) {
       /* copy left-most pixel from source */
-      MEMCPY(dstPtr, srcPtr, bpt);
+      memcpy(dstPtr, srcPtr, bpt);
       /* copy right-most pixel from source */
-      MEMCPY(dstPtr + (dstWidth - 1) * bpt,
+      memcpy(dstPtr + (dstWidth - 1) * bpt,
              srcPtr + (srcWidth - 1) * bpt,
              bpt);
    }
@@ -1025,15 +1025,15 @@ make_2d_mipmap(GLenum datatype, GLuint comps, GLint border,
    if (border > 0) {
       /* fill in dest border */
       /* lower-left border pixel */
-      MEMCPY(dstPtr, srcPtr, bpt);
+      memcpy(dstPtr, srcPtr, bpt);
       /* lower-right border pixel */
-      MEMCPY(dstPtr + (dstWidth - 1) * bpt,
+      memcpy(dstPtr + (dstWidth - 1) * bpt,
              srcPtr + (srcWidth - 1) * bpt, bpt);
       /* upper-left border pixel */
-      MEMCPY(dstPtr + dstWidth * (dstHeight - 1) * bpt,
+      memcpy(dstPtr + dstWidth * (dstHeight - 1) * bpt,
              srcPtr + srcWidth * (srcHeight - 1) * bpt, bpt);
       /* upper-right border pixel */
-      MEMCPY(dstPtr + (dstWidth * dstHeight - 1) * bpt,
+      memcpy(dstPtr + (dstWidth * dstHeight - 1) * bpt,
              srcPtr + (srcWidth * srcHeight - 1) * bpt, bpt);
       /* lower border */
       do_row(datatype, comps, srcWidthNB,
@@ -1050,9 +1050,9 @@ make_2d_mipmap(GLenum datatype, GLuint comps, GLint border,
       if (srcHeight == dstHeight) {
          /* copy border pixel from src to dst */
          for (row = 1; row < srcHeight; row++) {
-            MEMCPY(dstPtr + dstWidth * row * bpt,
+            memcpy(dstPtr + dstWidth * row * bpt,
                    srcPtr + srcWidth * row * bpt, bpt);
-            MEMCPY(dstPtr + (dstWidth * row + dstWidth - 1) * bpt,
+            memcpy(dstPtr + (dstWidth * row + dstWidth - 1) * bpt,
                    srcPtr + (srcWidth * row + srcWidth - 1) * bpt, bpt);
          }
       }
@@ -1174,28 +1174,28 @@ make_3d_mipmap(GLenum datatype, GLuint comps, GLint border,
             /* do border along [img][row=0][col=0] */
             src = srcPtr + (img + 1) * bytesPerSrcImage;
             dst = dstPtr + (img + 1) * bytesPerDstImage;
-            MEMCPY(dst, src, bpt);
+            memcpy(dst, src, bpt);
 
             /* 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;
-            MEMCPY(dst, src, bpt);
+            memcpy(dst, src, bpt);
 
             /* 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;
-            MEMCPY(dst, src, bpt);
+            memcpy(dst, src, bpt);
 
             /* 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);
-            MEMCPY(dst, src, bpt);
+            memcpy(dst, src, bpt);
          }
       }
       else {
@@ -1265,9 +1265,9 @@ make_1d_stack_mipmap(GLenum datatype, GLuint comps, GLint border,
 
    if (border) {
       /* copy left-most pixel from source */
-      MEMCPY(dstPtr, srcPtr, bpt);
+      memcpy(dstPtr, srcPtr, bpt);
       /* copy right-most pixel from source */
-      MEMCPY(dstPtr + (dstWidth - 1) * bpt,
+      memcpy(dstPtr + (dstWidth - 1) * bpt,
              srcPtr + (srcWidth - 1) * bpt,
              bpt);
    }
@@ -1319,15 +1319,15 @@ make_2d_stack_mipmap(GLenum datatype, GLuint comps, GLint border,
       if (border > 0) {
          /* fill in dest border */
          /* lower-left border pixel */
-         MEMCPY(dstPtr, srcPtr, bpt);
+         memcpy(dstPtr, srcPtr, bpt);
          /* lower-right border pixel */
-         MEMCPY(dstPtr + (dstWidth - 1) * bpt,
+         memcpy(dstPtr + (dstWidth - 1) * bpt,
                 srcPtr + (srcWidth - 1) * bpt, bpt);
          /* upper-left border pixel */
-         MEMCPY(dstPtr + dstWidth * (dstHeight - 1) * bpt,
+         memcpy(dstPtr + dstWidth * (dstHeight - 1) * bpt,
                 srcPtr + srcWidth * (srcHeight - 1) * bpt, bpt);
          /* upper-right border pixel */
-         MEMCPY(dstPtr + (dstWidth * dstHeight - 1) * bpt,
+         memcpy(dstPtr + (dstWidth * dstHeight - 1) * bpt,
                 srcPtr + (srcWidth * srcHeight - 1) * bpt, bpt);
          /* lower border */
          do_row(datatype, comps, srcWidthNB,
@@ -1344,9 +1344,9 @@ make_2d_stack_mipmap(GLenum datatype, GLuint comps, GLint border,
          if (srcHeight == dstHeight) {
             /* copy border pixel from src to dst */
             for (row = 1; row < srcHeight; row++) {
-               MEMCPY(dstPtr + dstWidth * row * bpt,
+               memcpy(dstPtr + dstWidth * row * bpt,
                       srcPtr + srcWidth * row * bpt, bpt);
-               MEMCPY(dstPtr + (dstWidth * row + dstWidth - 1) * bpt,
+               memcpy(dstPtr + (dstWidth * row + dstWidth - 1) * bpt,
                       srcPtr + (srcWidth * row + srcWidth - 1) * bpt, bpt);
             }
          }
diff --git a/src/mesa/main/pixel.c b/src/mesa/main/pixel.c
index ca6ecd7bfb..f6c316a580 100644
--- a/src/mesa/main/pixel.c
+++ b/src/mesa/main/pixel.c
@@ -362,7 +362,7 @@ _mesa_GetPixelMapfv( GLenum map, GLfloat *values )
       }
    }
    else {
-      MEMCPY(values, pm->Map, mapsize * sizeof(GLfloat));
+      memcpy(values, pm->Map, mapsize * sizeof(GLfloat));
    }
 
    _mesa_unmap_pbo_dest(ctx, &ctx->Pack);
@@ -401,7 +401,7 @@ _mesa_GetPixelMapuiv( GLenum map, GLuint *values )
 
    if (map == GL_PIXEL_MAP_S_TO_S) {
       /* special case */
-      MEMCPY(values, ctx->PixelMaps.StoS.Map, mapsize * sizeof(GLint));
+      memcpy(values, ctx->PixelMaps.StoS.Map, mapsize * sizeof(GLint));
    }
    else {
       for (i = 0; i < mapsize; i++) {
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index c1418e0967..ab572a13ed 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -3716,7 +3716,7 @@ _mesa_store_compressed_teximage2d(GLcontext *ctx, GLenum target, GLint level,
       return;
 
    /* copy the data */
-   MEMCPY(texImage->Data, data, imageSize);
+   memcpy(texImage->Data, data, imageSize);
 
    _mesa_unmap_teximage_pbo(ctx, &ctx->Unpack);
 }
@@ -3823,7 +3823,7 @@ _mesa_store_compressed_texsubimage2d(GLcontext *ctx, GLenum target,
 
    /* copy rows of blocks */
    for (i = 0; i < rows; i++) {
-      MEMCPY(dest, src, bytesPerRow);
+      memcpy(dest, src, bytesPerRow);
       dest += destRowStride;
       src += srcRowStride;
    }
diff --git a/src/mesa/math/m_matrix.c b/src/mesa/math/m_matrix.c
index da6956efed..e810d6deb8 100644
--- a/src/mesa/math/m_matrix.c
+++ b/src/mesa/math/m_matrix.c
@@ -599,7 +599,7 @@ static GLboolean invert_matrix_3d( GLmatrix *mat )
    }
    else {
       /* pure translation */
-      MEMCPY( out, Identity, sizeof(Identity) );
+      memcpy( out, Identity, sizeof(Identity) );
       MAT(out,0,3) = - MAT(in,0,3);
       MAT(out,1,3) = - MAT(in,1,3);
       MAT(out,2,3) = - MAT(in,2,3);
@@ -637,7 +637,7 @@ static GLboolean invert_matrix_3d( GLmatrix *mat )
  */
 static GLboolean invert_matrix_identity( GLmatrix *mat )
 {
-   MEMCPY( mat->inv, Identity, sizeof(Identity) );
+   memcpy( mat->inv, Identity, sizeof(Identity) );
    return GL_TRUE;
 }
 
@@ -659,7 +659,7 @@ static GLboolean invert_matrix_3d_no_rot( GLmatrix *mat )
    if (MAT(in,0,0) == 0 || MAT(in,1,1) == 0 || MAT(in,2,2) == 0 )
       return GL_FALSE;
 
-   MEMCPY( out, Identity, 16 * sizeof(GLfloat) );
+   memcpy( out, Identity, 16 * sizeof(GLfloat) );
    MAT(out,0,0) = 1.0F / MAT(in,0,0);
    MAT(out,1,1) = 1.0F / MAT(in,1,1);
    MAT(out,2,2) = 1.0F / MAT(in,2,2);
@@ -692,7 +692,7 @@ static GLboolean invert_matrix_2d_no_rot( GLmatrix *mat )
    if (MAT(in,0,0) == 0 || MAT(in,1,1) == 0)
       return GL_FALSE;
 
-   MEMCPY( out, Identity, 16 * sizeof(GLfloat) );
+   memcpy( out, Identity, 16 * sizeof(GLfloat) );
    MAT(out,0,0) = 1.0F / MAT(in,0,0);
    MAT(out,1,1) = 1.0F / MAT(in,1,1);
 
@@ -714,7 +714,7 @@ static GLboolean invert_matrix_perspective( GLmatrix *mat )
    if (MAT(in,2,3) == 0)
       return GL_FALSE;
 
-   MEMCPY( out, Identity, 16 * sizeof(GLfloat) );
+   memcpy( out, Identity, 16 * sizeof(GLfloat) );
 
    MAT(out,0,0) = 1.0F / MAT(in,0,0);
    MAT(out,1,1) = 1.0F / MAT(in,1,1);
@@ -776,7 +776,7 @@ static GLboolean matrix_invert( GLmatrix *mat )
       return GL_TRUE;
    } else {
       mat->flags |= MAT_FLAG_SINGULAR;
-      MEMCPY( mat->inv, Identity, sizeof(Identity) );
+      memcpy( mat->inv, Identity, sizeof(Identity) );
       return GL_FALSE;
    }
 }
@@ -807,7 +807,7 @@ _math_matrix_rotate( GLmatrix *mat,
    s = (GLfloat) _mesa_sin( angle * DEG2RAD );
    c = (GLfloat) _mesa_cos( angle * DEG2RAD );
 
-   MEMCPY(m, Identity, sizeof(GLfloat)*16);
+   memcpy(m, Identity, sizeof(GLfloat)*16);
    optimized = GL_FALSE;
 
 #define M(row,col)  m[col*4+row]
@@ -1141,10 +1141,10 @@ _math_matrix_viewport(GLmatrix *m, GLint x, GLint y, GLint width, GLint height,
 void
 _math_matrix_set_identity( GLmatrix *mat )
 {
-   MEMCPY( mat->m, Identity, 16*sizeof(GLfloat) );
+   memcpy( mat->m, Identity, 16*sizeof(GLfloat) );
 
    if (mat->inv)
-      MEMCPY( mat->inv, Identity, 16*sizeof(GLfloat) );
+      memcpy( mat->inv, Identity, 16*sizeof(GLfloat) );
 
    mat->type = MATRIX_IDENTITY;
    mat->flags &= ~(MAT_DIRTY_FLAGS|
@@ -1444,7 +1444,7 @@ _math_matrix_is_dirty( const GLmatrix *m )
 void
 _math_matrix_copy( GLmatrix *to, const GLmatrix *from )
 {
-   MEMCPY( to->m, from->m, sizeof(Identity) );
+   memcpy( to->m, from->m, sizeof(Identity) );
    to->flags = from->flags;
    to->type = from->type;
 
@@ -1453,7 +1453,7 @@ _math_matrix_copy( GLmatrix *to, const GLmatrix *from )
 	 matrix_invert( to );
       }
       else {
-	 MEMCPY(to->inv, from->inv, sizeof(GLfloat)*16);
+	 memcpy(to->inv, from->inv, sizeof(GLfloat)*16);
       }
    }
 }
@@ -1470,7 +1470,7 @@ _math_matrix_copy( GLmatrix *to, const GLmatrix *from )
 void
 _math_matrix_loadf( GLmatrix *mat, const GLfloat *m )
 {
-   MEMCPY( mat->m, m, 16*sizeof(GLfloat) );
+   memcpy( mat->m, m, 16*sizeof(GLfloat) );
    mat->flags = (MAT_FLAG_GENERAL | MAT_DIRTY);
 }
 
@@ -1486,7 +1486,7 @@ _math_matrix_ctr( GLmatrix *m )
 {
    m->m = (GLfloat *) ALIGN_MALLOC( 16 * sizeof(GLfloat), 16 );
    if (m->m)
-      MEMCPY( m->m, Identity, sizeof(Identity) );
+      memcpy( m->m, Identity, sizeof(Identity) );
    m->inv = NULL;
    m->type = MATRIX_IDENTITY;
    m->flags = 0;
@@ -1525,7 +1525,7 @@ _math_matrix_alloc_inv( GLmatrix *m )
    if (!m->inv) {
       m->inv = (GLfloat *) ALIGN_MALLOC( 16 * sizeof(GLfloat), 16 );
       if (m->inv)
-         MEMCPY( m->inv, Identity, 16 * sizeof(GLfloat) );
+         memcpy( m->inv, Identity, 16 * sizeof(GLfloat) );
    }
 }
 
diff --git a/src/mesa/shader/nvfragparse.c b/src/mesa/shader/nvfragparse.c
index e226973c53..35f18aa2fb 100644
--- a/src/mesa/shader/nvfragparse.c
+++ b/src/mesa/shader/nvfragparse.c
@@ -1479,7 +1479,7 @@ _mesa_parse_nv_fragment_program(GLcontext *ctx, GLenum dstTarget,
       _mesa_error(ctx, GL_OUT_OF_MEMORY, "glLoadProgramNV");
       return;
    }
-   MEMCPY(programString, str, len);
+   memcpy(programString, str, len);
    programString[len] = 0;
 
    /* Get ready to parse */
diff --git a/src/mesa/shader/nvprogram.c b/src/mesa/shader/nvprogram.c
index 394b6a42d7..19020be42c 100644
--- a/src/mesa/shader/nvprogram.c
+++ b/src/mesa/shader/nvprogram.c
@@ -297,7 +297,7 @@ _mesa_GetProgramStringNV(GLuint id, GLenum pname, GLubyte *program)
    }
 
    if (prog->String) {
-      MEMCPY(program, prog->String, strlen((char *) prog->String));
+      memcpy(program, prog->String, strlen((char *) prog->String));
    }
    else {
       program[0] = 0;
diff --git a/src/mesa/shader/nvvertparse.c b/src/mesa/shader/nvvertparse.c
index 1a840a3a92..3656438d42 100644
--- a/src/mesa/shader/nvvertparse.c
+++ b/src/mesa/shader/nvvertparse.c
@@ -1296,7 +1296,7 @@ _mesa_parse_nv_vertex_program(GLcontext *ctx, GLenum dstTarget,
       _mesa_error(ctx, GL_OUT_OF_MEMORY, "glLoadProgramNV");
       return;
    }
-   MEMCPY(programString, str, len);
+   memcpy(programString, str, len);
    programString[len] = 0;
 
    /* Get ready to parse */
diff --git a/src/mesa/shader/prog_statevars.c b/src/mesa/shader/prog_statevars.c
index a0be1acfca..f5264fa918 100644
--- a/src/mesa/shader/prog_statevars.c
+++ b/src/mesa/shader/prog_statevars.c
@@ -1117,7 +1117,7 @@ static void
 load_transpose_matrix(GLfloat registers[][4], GLuint pos,
                       const GLfloat mat[16])
 {
-   MEMCPY(registers[pos], mat, 16 * sizeof(GLfloat));
+   memcpy(registers[pos], mat, 16 * sizeof(GLfloat));
 }
 
 
diff --git a/src/mesa/swrast/s_zoom.c b/src/mesa/swrast/s_zoom.c
index a48eae1925..bec16208e3 100644
--- a/src/mesa/swrast/s_zoom.c
+++ b/src/mesa/swrast/s_zoom.c
@@ -324,14 +324,14 @@ zoom_span( GLcontext *ctx, GLint imgX, GLint imgY, const SWspan *span,
          ((zoomed.array->ChanType == GL_UNSIGNED_SHORT) ? 4 * sizeof(GLushort)
           : 4 * sizeof(GLfloat));
       if (y1 - y0 > 1) {
-         MEMCPY(rgbaSave, zoomed.array->rgba, zoomed.end * pixelSize);
+         memcpy(rgbaSave, zoomed.array->rgba, zoomed.end * pixelSize);
       }
       for (zoomed.y = y0; zoomed.y < y1; zoomed.y++) {
          _swrast_write_rgba_span(ctx, &zoomed);
          zoomed.end = end;  /* restore */
          if (y1 - y0 > 1) {
             /* restore the colors */
-            MEMCPY(zoomed.array->rgba, rgbaSave, zoomed.end * pixelSize);
+            memcpy(zoomed.array->rgba, rgbaSave, zoomed.end * pixelSize);
          }
       }
    }
@@ -340,14 +340,14 @@ zoom_span( GLcontext *ctx, GLint imgX, GLint imgY, const SWspan *span,
       GLuint *indexSave = (GLuint *) zoomed.array->attribs[FRAG_ATTRIB_FOGC];
       const GLint end = zoomed.end; /* save */
       if (y1 - y0 > 1) {
-         MEMCPY(indexSave, zoomed.array->index, zoomed.end * sizeof(GLuint));
+         memcpy(indexSave, zoomed.array->index, zoomed.end * sizeof(GLuint));
       }
       for (zoomed.y = y0; zoomed.y < y1; zoomed.y++) {
          _swrast_write_index_span(ctx, &zoomed);
          zoomed.end = end;  /* restore */
          if (y1 - y0 > 1) {
             /* restore the colors */
-            MEMCPY(zoomed.array->index, indexSave, zoomed.end * sizeof(GLuint));
+            memcpy(zoomed.array->index, indexSave, zoomed.end * sizeof(GLuint));
          }
       }
    }
diff --git a/src/mesa/tnl/t_pipeline.c b/src/mesa/tnl/t_pipeline.c
index 946b29e250..36fcd074cd 100644
--- a/src/mesa/tnl/t_pipeline.c
+++ b/src/mesa/tnl/t_pipeline.c
@@ -47,7 +47,7 @@ void _tnl_install_pipeline( GLcontext *ctx,
     */
    for (i = 0 ; i < MAX_PIPELINE_STAGES && stages[i] ; i++) {
       struct tnl_pipeline_stage *s = &tnl->pipeline.stages[i];
-      MEMCPY(s, stages[i], sizeof(*s));
+      memcpy(s, stages[i], sizeof(*s));
       if (s->create)
 	 s->create(ctx, s);
    }
diff --git a/src/mesa/tnl/t_vb_program.c b/src/mesa/tnl/t_vb_program.c
index 44b64b17d1..5351b5fe41 100644
--- a/src/mesa/tnl/t_vb_program.c
+++ b/src/mesa/tnl/t_vb_program.c
@@ -221,7 +221,7 @@ static void
 init_machine(GLcontext *ctx, struct gl_program_machine *machine)
 {
    /* Input registers get initialized from the current vertex attribs */
-   MEMCPY(machine->VertAttribs, ctx->Current.Attrib,
+   memcpy(machine->VertAttribs, ctx->Current.Attrib,
           MAX_VERTEX_GENERIC_ATTRIBS * 4 * sizeof(GLfloat));
 
    if (ctx->VertexProgram._Current->IsNVProgram) {
-- 
cgit v1.2.3


From 2240ba10f30315410bcff77e372ee71664ac4453 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 19 Feb 2010 08:12:31 -0700
Subject: mesa: replace old MEMSET macro with memset

---
 src/gallium/state_trackers/glx/xlib/glx_usefont.c |  2 +-
 src/mesa/drivers/dri/tdfx/tdfx_span.c             |  6 +++---
 src/mesa/drivers/x11/xfonts.c                     |  2 +-
 src/mesa/drivers/x11/xm_dd.c                      | 10 +++++-----
 src/mesa/main/eval.c                              |  4 ++--
 src/mesa/main/imports.h                           |  3 ---
 src/mesa/main/polygon.c                           |  2 +-
 src/mesa/math/m_translate.c                       | 14 +++++++-------
 8 files changed, 20 insertions(+), 23 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/gallium/state_trackers/glx/xlib/glx_usefont.c b/src/gallium/state_trackers/glx/xlib/glx_usefont.c
index e502198b20..8903b0e6cb 100644
--- a/src/gallium/state_trackers/glx/xlib/glx_usefont.c
+++ b/src/gallium/state_trackers/glx/xlib/glx_usefont.c
@@ -343,7 +343,7 @@ glXUseXFont(Font font, int first, int count, int listbase)
       glNewList(list, GL_COMPILE);
       if (valid && (bm_width > 0) && (bm_height > 0)) {
 
-	 MEMSET(bm, '\0', bm_width * bm_height);
+	 memset(bm, '\0', bm_width * bm_height);
 	 fill_bitmap(dpy, win, gc, bm_width, bm_height, x, y, c, bm);
 
 	 glBitmap(width, height, x0, y0, dx, dy, bm);
diff --git a/src/mesa/drivers/dri/tdfx/tdfx_span.c b/src/mesa/drivers/dri/tdfx/tdfx_span.c
index a17bcd952a..3879d506ee 100644
--- a/src/mesa/drivers/dri/tdfx/tdfx_span.c
+++ b/src/mesa/drivers/dri/tdfx/tdfx_span.c
@@ -264,7 +264,7 @@ generate_vismask(const tdfxContextPtr fxMesa, GLint x, GLint y, GLint n,
    GLint i, j;
 
    /* Ensure we clear the visual mask */
-   MEMSET(vismask, 0, n);
+   memset(vismask, 0, n);
 
    /* turn on flags for all visible pixels */
    for (i = 0; i < fxMesa->numClipRects; i++) {
@@ -273,14 +273,14 @@ generate_vismask(const tdfxContextPtr fxMesa, GLint x, GLint y, GLint n,
       if (y >= rect->y1 && y < rect->y2) {
 	 if (x >= rect->x1 && x + n <= rect->x2) {
 	    /* common case, whole span inside cliprect */
-	    MEMSET(vismask, 1, n);
+	    memset(vismask, 1, n);
 	    return;
 	 }
 	 if (x < rect->x2 && x + n >= rect->x1) {
 	    /* some of the span is inside the rect */
 	    GLint start, end;
 	    if (!initialized) {
-	       MEMSET(vismask, 0, n);
+	       memset(vismask, 0, n);
 	       initialized = GL_TRUE;
 	    }
 	    if (x < rect->x1)
diff --git a/src/mesa/drivers/x11/xfonts.c b/src/mesa/drivers/x11/xfonts.c
index f732c94586..91f819b8df 100644
--- a/src/mesa/drivers/x11/xfonts.c
+++ b/src/mesa/drivers/x11/xfonts.c
@@ -345,7 +345,7 @@ Fake_glXUseXFont(Font font, int first, int count, int listbase)
       glNewList(list, GL_COMPILE);
       if (valid && (bm_width > 0) && (bm_height > 0)) {
 
-	 MEMSET(bm, '\0', bm_width * bm_height);
+	 memset(bm, '\0', bm_width * bm_height);
 	 fill_bitmap(dpy, win, gc, bm_width, bm_height, x, y, c, bm);
 
 	 glBitmap(width, height, x0, y0, dx, dy, bm);
diff --git a/src/mesa/drivers/x11/xm_dd.c b/src/mesa/drivers/x11/xm_dd.c
index d70236c2a0..d304192f4c 100644
--- a/src/mesa/drivers/x11/xm_dd.c
+++ b/src/mesa/drivers/x11/xm_dd.c
@@ -232,7 +232,7 @@ clear_8bit_ximage( GLcontext *ctx, struct xmesa_renderbuffer *xrb,
    GLint i;
    for (i = 0; i < height; i++) {
       GLubyte *ptr = PIXEL_ADDR1(xrb, x, y + i);
-      MEMSET( ptr, xmesa->clearpixel, width );
+      memset( ptr, xmesa->clearpixel, width );
    }
 }
 
@@ -294,7 +294,7 @@ clear_24bit_ximage(GLcontext *ctx, struct xmesa_renderbuffer *xrb,
       GLint j;
       for (j = 0; j < height; j++) {
          bgr_t *ptr3 = PIXEL_ADDR3(xrb, x, y + j);
-         MEMSET(ptr3, r, 3 * width);
+         memset(ptr3, r, 3 * width);
       }
    }
    else {
@@ -524,7 +524,7 @@ xmesa_DrawPixels_8R8G8B( GLcontext *ctx,
           * been in the OpenGL bottom-to-top orientation.  X is top-to-bottom
           * so we have to carefully compute the Y coordinates/addresses here.
           */
-         MEMSET(&ximage, 0, sizeof(XMesaImage));
+         memset(&ximage, 0, sizeof(XMesaImage));
          ximage.width = width;
          ximage.height = height;
          ximage.format = ZPixmap;
@@ -658,7 +658,7 @@ xmesa_DrawPixels_5R6G5B( GLcontext *ctx,
           * been in the OpenGL bottom-to-top orientation.  X is top-to-bottom
           * so we have to carefully compute the Y coordinates/addresses here.
           */
-         MEMSET(&ximage, 0, sizeof(XMesaImage));
+         memset(&ximage, 0, sizeof(XMesaImage));
          ximage.width = width;
          ximage.height = height;
          ximage.format = ZPixmap;
@@ -829,7 +829,7 @@ clear_color_HPCR_ximage( GLcontext *ctx, const GLfloat color[4] )
 
    if (color[0] == 0.0 && color[1] == 0.0 && color[2] == 0.0) {
       /* black is black */
-      MEMSET( xmesa->xm_visual->hpcr_clear_ximage_pattern, 0x0 ,
+      memset( xmesa->xm_visual->hpcr_clear_ximage_pattern, 0x0 ,
               sizeof(xmesa->xm_visual->hpcr_clear_ximage_pattern));
    }
    else {
diff --git a/src/mesa/main/eval.c b/src/mesa/main/eval.c
index 95d6e23187..58eb59b13c 100644
--- a/src/mesa/main/eval.c
+++ b/src/mesa/main/eval.c
@@ -894,7 +894,7 @@ void _mesa_init_eval( GLcontext *ctx )
    ctx->Eval.Map1TextureCoord4 = GL_FALSE;
    ctx->Eval.Map1Vertex3 = GL_FALSE;
    ctx->Eval.Map1Vertex4 = GL_FALSE;
-   MEMSET(ctx->Eval.Map1Attrib, 0, sizeof(ctx->Eval.Map1Attrib));
+   memset(ctx->Eval.Map1Attrib, 0, sizeof(ctx->Eval.Map1Attrib));
    ctx->Eval.Map2Color4 = GL_FALSE;
    ctx->Eval.Map2Index = GL_FALSE;
    ctx->Eval.Map2Normal = GL_FALSE;
@@ -904,7 +904,7 @@ void _mesa_init_eval( GLcontext *ctx )
    ctx->Eval.Map2TextureCoord4 = GL_FALSE;
    ctx->Eval.Map2Vertex3 = GL_FALSE;
    ctx->Eval.Map2Vertex4 = GL_FALSE;
-   MEMSET(ctx->Eval.Map2Attrib, 0, sizeof(ctx->Eval.Map2Attrib));
+   memset(ctx->Eval.Map2Attrib, 0, sizeof(ctx->Eval.Map2Attrib));
    ctx->Eval.AutoNormal = GL_FALSE;
    ctx->Eval.MapGrid1un = 1;
    ctx->Eval.MapGrid1u1 = 0.0;
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index c4e28df051..048ae912c9 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -71,9 +71,6 @@ extern "C" {
 /** Free aligned memory */
 #define ALIGN_FREE(PTR)            _mesa_align_free(PTR)
 
-/** Set \p N bytes in \p DST to \p VAL */
-#define MEMSET( DST, VAL, N )      memset(DST, VAL, N)
-
 /*@}*/
 
 
diff --git a/src/mesa/main/polygon.c b/src/mesa/main/polygon.c
index dcde6758c3..30e4a606bb 100644
--- a/src/mesa/main/polygon.c
+++ b/src/mesa/main/polygon.c
@@ -315,7 +315,7 @@ void _mesa_init_polygon( GLcontext * ctx )
 
 
    /* Polygon Stipple group */
-   MEMSET( ctx->PolygonStipple, 0xff, 32*sizeof(GLuint) );
+   memset( ctx->PolygonStipple, 0xff, 32*sizeof(GLuint) );
 }
 
 /*@}*/
diff --git a/src/mesa/math/m_translate.c b/src/mesa/math/m_translate.c
index 4a20f45ee4..b12b07957c 100644
--- a/src/mesa/math/m_translate.c
+++ b/src/mesa/math/m_translate.c
@@ -556,13 +556,13 @@ static void trans_4_GLubyte_4ub_raw(GLubyte (*t)[4],
 
 static void init_translate_raw(void)
 {
-   MEMSET( TAB(_1ui), 0, sizeof(TAB(_1ui)) );
-   MEMSET( TAB(_1ub), 0, sizeof(TAB(_1ub)) );
-   MEMSET( TAB(_3fn),  0, sizeof(TAB(_3fn)) );
-   MEMSET( TAB(_4ub), 0, sizeof(TAB(_4ub)) );
-   MEMSET( TAB(_4us), 0, sizeof(TAB(_4us)) );
-   MEMSET( TAB(_4f),  0, sizeof(TAB(_4f)) );
-   MEMSET( TAB(_4fn),  0, sizeof(TAB(_4fn)) );
+   memset( TAB(_1ui), 0, sizeof(TAB(_1ui)) );
+   memset( TAB(_1ub), 0, sizeof(TAB(_1ub)) );
+   memset( TAB(_3fn),  0, sizeof(TAB(_3fn)) );
+   memset( TAB(_4ub), 0, sizeof(TAB(_4ub)) );
+   memset( TAB(_4us), 0, sizeof(TAB(_4us)) );
+   memset( TAB(_4f),  0, sizeof(TAB(_4f)) );
+   memset( TAB(_4fn),  0, sizeof(TAB(_4fn)) );
 
    init_trans_4_GLbyte_raw();
    init_trans_3_GLbyte_raw();
-- 
cgit v1.2.3


From 6bf1ea897fa470af58fe8916dff45e2da79634a3 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 19 Feb 2010 08:32:36 -0700
Subject: mesa: replace _mesa_bzero() with memset()

---
 src/mesa/drivers/common/driverfuncs.c            |  2 +-
 src/mesa/drivers/dri/r300/r300_fragprog_common.c |  2 +-
 src/mesa/main/bufferobj.c                        |  2 +-
 src/mesa/main/dlist.c                            |  2 +-
 src/mesa/main/framebuffer.c                      |  6 +++---
 src/mesa/main/imports.c                          | 11 -----------
 src/mesa/main/imports.h                          |  3 ---
 src/mesa/main/renderbuffer.c                     |  4 ++--
 src/mesa/main/texobj.c                           |  2 +-
 src/mesa/shader/nvfragparse.c                    |  2 +-
 src/mesa/shader/prog_instruction.c               |  2 +-
 src/mesa/shader/program.c                        |  2 +-
 src/mesa/shader/slang/slang_emit.c               |  4 ++--
 src/mesa/shader/slang/slang_typeinfo.c           |  2 +-
 src/mesa/swrast/s_depth.c                        | 16 ++++++++--------
 src/mesa/swrast/s_fragprog.c                     |  3 +--
 src/mesa/swrast/s_span.c                         |  4 ++--
 17 files changed, 27 insertions(+), 42 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c
index 4f6f083677..87163e6505 100644
--- a/src/mesa/drivers/common/driverfuncs.c
+++ b/src/mesa/drivers/common/driverfuncs.c
@@ -70,7 +70,7 @@
 void
 _mesa_init_driver_functions(struct dd_function_table *driver)
 {
-   _mesa_bzero(driver, sizeof(*driver));
+   memset(driver, 0, sizeof(*driver));
 
    driver->GetString = NULL;  /* REQUIRED! */
    driver->UpdateState = NULL;  /* REQUIRED! */
diff --git a/src/mesa/drivers/dri/r300/r300_fragprog_common.c b/src/mesa/drivers/dri/r300/r300_fragprog_common.c
index f3d8f2f424..acc66e0ae0 100644
--- a/src/mesa/drivers/dri/r300/r300_fragprog_common.c
+++ b/src/mesa/drivers/dri/r300/r300_fragprog_common.c
@@ -72,7 +72,7 @@ static void build_state(
 {
 	int unit;
 
-	_mesa_bzero(state, sizeof(*state));
+	memset(state, 0, sizeof(*state));
 
 	for(unit = 0; unit < 16; ++unit) {
 		if (fp->Base.ShadowSamplers & (1 << unit)) {
diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index c735661dc2..2e9793ea0e 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -295,7 +295,7 @@ _mesa_initialize_buffer_object( struct gl_buffer_object *obj,
 {
    (void) target;
 
-   _mesa_bzero(obj, sizeof(struct gl_buffer_object));
+   memset(obj, 0, sizeof(struct gl_buffer_object));
    _glthread_INIT_MUTEX(obj->Mutex);
    obj->RefCount = 1;
    obj->Name = name;
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 9c472d85e3..740ebfe17a 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -9711,7 +9711,7 @@ _mesa_init_display_list(GLcontext *ctx)
 
    /* zero-out the instruction size table, just once */
    if (!tableInitialized) {
-      _mesa_bzero(InstSize, sizeof(InstSize));
+      memset(InstSize, 0, sizeof(InstSize));
       tableInitialized = GL_TRUE;
    }
 
diff --git a/src/mesa/main/framebuffer.c b/src/mesa/main/framebuffer.c
index 96e5344383..41b5420943 100644
--- a/src/mesa/main/framebuffer.c
+++ b/src/mesa/main/framebuffer.c
@@ -127,7 +127,7 @@ _mesa_initialize_window_framebuffer(struct gl_framebuffer *fb,
    assert(fb);
    assert(visual);
 
-   _mesa_bzero(fb, sizeof(struct gl_framebuffer));
+   memset(fb, 0, sizeof(struct gl_framebuffer));
 
    _glthread_INIT_MUTEX(fb->Mutex);
 
@@ -169,7 +169,7 @@ _mesa_initialize_user_framebuffer(struct gl_framebuffer *fb, GLuint name)
    assert(fb);
    assert(name);
 
-   _mesa_bzero(fb, sizeof(struct gl_framebuffer));
+   memset(fb, 0, sizeof(struct gl_framebuffer));
 
    fb->Name = name;
    fb->RefCount = 1;
@@ -526,7 +526,7 @@ _mesa_update_framebuffer_visual(struct gl_framebuffer *fb)
 {
    GLuint i;
 
-   _mesa_bzero(&fb->Visual, sizeof(fb->Visual));
+   memset(&fb->Visual, 0, sizeof(fb->Visual));
    fb->Visual.rgbMode = GL_TRUE; /* assume this */
 
 #if 0 /* this _might_ be needed */
diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index 6730500225..5c2c863f97 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -257,17 +257,6 @@ _mesa_memset16( unsigned short *dst, unsigned short val, size_t n )
       *dst++ = val;
 }
 
-/** Wrapper around either memset() or bzero() */
-void
-_mesa_bzero( void *dst, size_t n )
-{
-#if defined(__FreeBSD__)
-   bzero( dst, n );
-#else
-   memset( dst, 0, n );
-#endif
-}
-
 /*@}*/
 
 
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index 048ae912c9..106dd021a1 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -541,9 +541,6 @@ _mesa_realloc( void *oldBuffer, size_t oldSize, size_t newSize );
 extern void
 _mesa_memset16( unsigned short *dst, unsigned short val, size_t n );
 
-extern void
-_mesa_bzero( void *dst, size_t n );
-
 extern double
 _mesa_sin(double a);
 
diff --git a/src/mesa/main/renderbuffer.c b/src/mesa/main/renderbuffer.c
index bb0c78382c..aec22d9d14 100644
--- a/src/mesa/main/renderbuffer.c
+++ b/src/mesa/main/renderbuffer.c
@@ -706,7 +706,7 @@ put_mono_row_ubyte4(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
    ASSERT(rb->Format == MESA_FORMAT_RGBA8888);
    if (!mask && val == 0) {
       /* common case */
-      _mesa_bzero(dst, count * 4 * sizeof(GLubyte));
+      memset(dst, 0, count * 4 * sizeof(GLubyte));
    }
    else {
       /* general case */
@@ -868,7 +868,7 @@ put_mono_row_ushort4(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
    ASSERT(rb->DataType == GL_UNSIGNED_SHORT || rb->DataType == GL_SHORT);
    if (!mask && val0 == 0 && val1 == 0 && val2 == 0 && val3 == 0) {
       /* common case for clearing accum buffer */
-      _mesa_bzero(dst, count * 4 * sizeof(GLushort));
+      memset(dst, 0, count * 4 * sizeof(GLushort));
    }
    else {
       GLuint i;
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index 9db95814d0..649f3587cb 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -106,7 +106,7 @@ _mesa_initialize_texture_object( struct gl_texture_object *obj,
           target == GL_TEXTURE_1D_ARRAY_EXT ||
           target == GL_TEXTURE_2D_ARRAY_EXT);
 
-   _mesa_bzero(obj, sizeof(*obj));
+   memset(obj, 0, sizeof(*obj));
    /* init the non-zero fields */
    _glthread_INIT_MUTEX(obj->Mutex);
    obj->RefCount = 1;
diff --git a/src/mesa/shader/nvfragparse.c b/src/mesa/shader/nvfragparse.c
index 35f18aa2fb..639408d82a 100644
--- a/src/mesa/shader/nvfragparse.c
+++ b/src/mesa/shader/nvfragparse.c
@@ -1483,7 +1483,7 @@ _mesa_parse_nv_fragment_program(GLcontext *ctx, GLenum dstTarget,
    programString[len] = 0;
 
    /* Get ready to parse */
-   _mesa_bzero(&parseState, sizeof(struct parse_state));
+   memset(&parseState, 0, sizeof(struct parse_state));
    parseState.ctx = ctx;
    parseState.start = programString;
    parseState.program = program;
diff --git a/src/mesa/shader/prog_instruction.c b/src/mesa/shader/prog_instruction.c
index dcf834f52d..0c4da4d107 100644
--- a/src/mesa/shader/prog_instruction.c
+++ b/src/mesa/shader/prog_instruction.c
@@ -40,7 +40,7 @@ _mesa_init_instructions(struct prog_instruction *inst, GLuint count)
 {
    GLuint i;
 
-   _mesa_bzero(inst, count * sizeof(struct prog_instruction));
+   memset(inst, 0, count * sizeof(struct prog_instruction));
 
    for (i = 0; i < count; i++) {
       inst[i].SrcReg[0].File = PROGRAM_UNDEFINED;
diff --git a/src/mesa/shader/program.c b/src/mesa/shader/program.c
index 2410ccb047..0c3c5ffbd5 100644
--- a/src/mesa/shader/program.c
+++ b/src/mesa/shader/program.c
@@ -240,7 +240,7 @@ _mesa_init_program_struct( GLcontext *ctx, struct gl_program *prog,
    (void) ctx;
    if (prog) {
       GLuint i;
-      _mesa_bzero(prog, sizeof(*prog));
+      memset(prog, 0, sizeof(*prog));
       prog->Id = id;
       prog->Target = target;
       prog->Resident = GL_TRUE;
diff --git a/src/mesa/shader/slang/slang_emit.c b/src/mesa/shader/slang/slang_emit.c
index fa3a63ea4b..b621e892c3 100644
--- a/src/mesa/shader/slang/slang_emit.c
+++ b/src/mesa/shader/slang/slang_emit.c
@@ -241,7 +241,7 @@ alloc_local_temp(slang_emit_info *emitInfo, slang_ir_storage *temp, GLint size)
 {
    assert(size >= 1);
    assert(size <= 4);
-   _mesa_bzero(temp, sizeof(*temp));
+   memset(temp, 0, sizeof(*temp));
    temp->Size = size;
    temp->File = PROGRAM_TEMPORARY;
    temp->Index = -1;
@@ -1136,7 +1136,7 @@ emit_clamp(slang_emit_info *emitInfo, slang_ir_node *n)
     * dest for this clamp() is an output reg, we can't use that reg for
     * the intermediate result.  Use a temp register instead.
     */
-   _mesa_bzero(&tmpNode, sizeof(tmpNode));
+   memset(&tmpNode, 0, sizeof(tmpNode));
    if (!alloc_node_storage(emitInfo, &tmpNode, n->Store->Size)) {
       return NULL;
    }
diff --git a/src/mesa/shader/slang/slang_typeinfo.c b/src/mesa/shader/slang/slang_typeinfo.c
index a96f2fb4c2..01e2bc4a22 100644
--- a/src/mesa/shader/slang/slang_typeinfo.c
+++ b/src/mesa/shader/slang/slang_typeinfo.c
@@ -419,7 +419,7 @@ slang_type_specifier_compatible(const slang_type_specifier * x,
 GLboolean
 slang_typeinfo_construct(slang_typeinfo * ti)
 {
-   _mesa_bzero(ti, sizeof(*ti));
+   memset(ti, 0, sizeof(*ti));
    slang_type_specifier_ctr(&ti->spec);
    ti->array_len = 0;
    return GL_TRUE;
diff --git a/src/mesa/swrast/s_depth.c b/src/mesa/swrast/s_depth.c
index 36c8db2107..3e36cf9a7e 100644
--- a/src/mesa/swrast/s_depth.c
+++ b/src/mesa/swrast/s_depth.c
@@ -259,7 +259,7 @@ depth_test_span16( GLcontext *ctx, GLuint n,
 	 }
 	 break;
       case GL_NEVER:
-         _mesa_bzero(mask, n * sizeof(GLubyte));
+         memset(mask, 0, n * sizeof(GLubyte));
 	 break;
       default:
          _mesa_problem(ctx, "Bad depth func in depth_test_span16");
@@ -488,7 +488,7 @@ depth_test_span32( GLcontext *ctx, GLuint n,
 	 }
 	 break;
       case GL_NEVER:
-         _mesa_bzero(mask, n * sizeof(GLubyte));
+         memset(mask, 0, n * sizeof(GLubyte));
 	 break;
       default:
          _mesa_problem(ctx, "Bad depth func in depth_test_span32");
@@ -844,7 +844,7 @@ direct_depth_test_pixels16(GLcontext *ctx, GLushort *zStart, GLuint stride,
 	 break;
       case GL_NEVER:
 	 /* depth test never passes */
-         _mesa_bzero(mask, n * sizeof(GLubyte));
+         memset(mask, 0, n * sizeof(GLubyte));
 	 break;
       default:
          _mesa_problem(ctx, "Bad depth func in direct_depth_test_pixels");
@@ -1090,7 +1090,7 @@ direct_depth_test_pixels32(GLcontext *ctx, GLuint *zStart, GLuint stride,
 	 break;
       case GL_NEVER:
 	 /* depth test never passes */
-         _mesa_bzero(mask, n * sizeof(GLubyte));
+         memset(mask, 0, n * sizeof(GLubyte));
 	 break;
       default:
          _mesa_problem(ctx, "Bad depth func in direct_depth_test_pixels");
@@ -1260,7 +1260,7 @@ _swrast_read_depth_span_float( GLcontext *ctx, struct gl_renderbuffer *rb,
 
    if (!rb) {
       /* really only doing this to prevent FP exceptions later */
-      _mesa_bzero(depth, n * sizeof(GLfloat));
+      memset(depth, 0, n * sizeof(GLfloat));
       return;
    }
 
@@ -1269,7 +1269,7 @@ _swrast_read_depth_span_float( GLcontext *ctx, struct gl_renderbuffer *rb,
    if (y < 0 || y >= (GLint) rb->Height ||
        x + n <= 0 || x >= (GLint) rb->Width) {
       /* span is completely outside framebuffer */
-      _mesa_bzero(depth, n * sizeof(GLfloat));
+      memset(depth, 0, n * sizeof(GLfloat));
       return;
    }
 
@@ -1326,7 +1326,7 @@ _swrast_read_depth_span_uint( GLcontext *ctx, struct gl_renderbuffer *rb,
 
    if (!rb) {
       /* really only doing this to prevent FP exceptions later */
-      _mesa_bzero(depth, n * sizeof(GLuint));
+      memset(depth, 0, n * sizeof(GLuint));
       return;
    }
 
@@ -1337,7 +1337,7 @@ _swrast_read_depth_span_uint( GLcontext *ctx, struct gl_renderbuffer *rb,
    if (y < 0 || y >= (GLint) rb->Height ||
        x + n <= 0 || x >= (GLint) rb->Width) {
       /* span is completely outside framebuffer */
-      _mesa_bzero(depth, n * sizeof(GLfloat));
+      memset(depth, 0, n * sizeof(GLfloat));
       return;
    }
 
diff --git a/src/mesa/swrast/s_fragprog.c b/src/mesa/swrast/s_fragprog.c
index d31da4c402..7c1de62e87 100644
--- a/src/mesa/swrast/s_fragprog.c
+++ b/src/mesa/swrast/s_fragprog.c
@@ -148,8 +148,7 @@ init_machine(GLcontext *ctx, struct gl_program_machine *machine,
 
    if (program->Base.Target == GL_FRAGMENT_PROGRAM_NV) {
       /* Clear temporary registers (undefined for ARB_f_p) */
-      _mesa_bzero(machine->Temporaries,
-                  MAX_PROGRAM_TEMPS * 4 * sizeof(GLfloat));
+      memset(machine->Temporaries, 0, MAX_PROGRAM_TEMPS * 4 * sizeof(GLfloat));
    }
 
    /* ARB_fragment_coord_conventions */
diff --git a/src/mesa/swrast/s_span.c b/src/mesa/swrast/s_span.c
index 7087f25d27..dada364360 100644
--- a/src/mesa/swrast/s_span.c
+++ b/src/mesa/swrast/s_span.c
@@ -1579,7 +1579,7 @@ _swrast_read_rgba_span( GLcontext *ctx, struct gl_renderbuffer *rb,
    if (y < 0 || y >= bufHeight || x + (GLint) n < 0 || x >= bufWidth) {
       /* completely above, below, or right */
       /* XXX maybe leave rgba values undefined? */
-      _mesa_bzero(rgba, 4 * n * sizeof(GLchan));
+      memset(rgba, 0, 4 * n * sizeof(GLchan));
    }
    else {
       GLint skip, length;
@@ -1642,7 +1642,7 @@ _swrast_read_index_span( GLcontext *ctx, struct gl_renderbuffer *rb,
 
    if (y < 0 || y >= bufHeight || x + (GLint) n < 0 || x >= bufWidth) {
       /* completely above, below, or right */
-      _mesa_bzero(index, n * sizeof(GLuint));
+      memset(index, 0, n * sizeof(GLuint));
    }
    else {
       GLint skip, length;
-- 
cgit v1.2.3


From 32f2fd1c5d6088692551c80352b7d6fa35b0cd09 Mon Sep 17 00:00:00 2001
From: Kristian Høgsberg <krh@bitplanet.net>
Date: Fri, 19 Feb 2010 11:58:49 -0500
Subject: Replace _mesa_malloc, _mesa_calloc and _mesa_free with plain libc
 versions

---
 src/egl/drivers/dri/egldri.c                       |   2 +-
 src/gallium/state_trackers/glx/xlib/glx_api.c      |  18 ++--
 src/gallium/state_trackers/glx/xlib/xm_api.c       |  14 +--
 src/glx/glcontextmodes.c                           |  35 +-------
 src/glx/glcontextmodes.h                           |   2 -
 src/mesa/drivers/common/meta.c                     |  34 +++----
 src/mesa/drivers/dri/common/dri_util.c             |  34 +++----
 src/mesa/drivers/dri/common/drirenderbuffer.c      |   4 +-
 src/mesa/drivers/dri/common/utils.c                |  12 +--
 src/mesa/drivers/dri/fb/fb_dri.c                   |  12 +--
 src/mesa/drivers/dri/i965/brw_curbe.c              |   6 +-
 src/mesa/drivers/dri/i965/brw_draw_upload.c        |   4 +-
 src/mesa/drivers/dri/i965/brw_eu.c                 |   4 +-
 src/mesa/drivers/dri/i965/brw_queryobj.c           |   4 +-
 src/mesa/drivers/dri/i965/brw_state_batch.c        |   6 +-
 src/mesa/drivers/dri/i965/brw_state_cache.c        |  10 +--
 src/mesa/drivers/dri/i965/brw_vtbl.c               |  10 +--
 src/mesa/drivers/dri/i965/brw_wm.c                 |   8 +-
 src/mesa/drivers/dri/intel/intel_buffer_objects.c  |  12 +--
 src/mesa/drivers/dri/intel/intel_fbo.c             |   8 +-
 src/mesa/drivers/dri/intel/intel_pixel_bitmap.c    |   4 +-
 src/mesa/drivers/dri/intel/intel_pixel_draw.c      |   4 +-
 src/mesa/drivers/dri/intel/intel_span.c            |   2 +-
 src/mesa/drivers/dri/intel/intel_syncobj.c         |   4 +-
 src/mesa/drivers/dri/r300/r300_fragprog_common.c   |   2 +-
 src/mesa/drivers/dri/r300/r300_shader.c            |   4 +-
 src/mesa/drivers/dri/r300/r300_vertprog.c          |   2 +-
 src/mesa/drivers/dri/r600/r700_oglprog.c           |   2 +-
 src/mesa/drivers/dri/r600/r700_vertprog.c          |   2 +-
 .../drivers/dri/radeon/radeon_buffer_objects.c     |   2 +-
 src/mesa/drivers/dri/radeon/radeon_fbo.c           |   4 +-
 src/mesa/drivers/dri/radeon/radeon_queryobj.c      |   4 +-
 src/mesa/drivers/dri/radeon/radeon_texture.c       |   4 +-
 src/mesa/drivers/dri/savage/savage_xmesa.c         |  16 ++--
 src/mesa/drivers/dri/savage/savagetex.c            |   4 +-
 src/mesa/drivers/dri/swrast/swrast.c               |  24 ++---
 src/mesa/drivers/dri/unichrome/via_fb.c            |   6 +-
 src/mesa/drivers/fbdev/glfbdev.c                   |  22 ++---
 src/mesa/drivers/glide/fxdd.c                      |   4 +-
 src/mesa/drivers/glide/fxddtex.c                   |   6 +-
 src/mesa/drivers/glide/fxsetup.c                   |   4 +-
 src/mesa/drivers/glslcompiler/glslcompiler.c       |   4 +-
 src/mesa/drivers/osmesa/osmesa.c                   |  12 +--
 src/mesa/drivers/windows/gdi/mesa.def              |   2 -
 src/mesa/drivers/windows/gdi/wmesa.c               |   8 +-
 src/mesa/drivers/windows/icd/mesa.def              |   3 -
 src/mesa/drivers/x11/fakeglx.c                     |  18 ++--
 src/mesa/drivers/x11/xm_api.c                      |  26 +++---
 src/mesa/drivers/x11/xm_buffer.c                   |   6 +-
 src/mesa/es/main/specials_es1.c                    |   2 +-
 src/mesa/es/main/specials_es2.c                    |   2 +-
 src/mesa/glapi/mesadef.py                          |   3 -
 src/mesa/main/arrayobj.c                           |   2 +-
 src/mesa/main/attrib.c                             |   4 +-
 src/mesa/main/bufferobj.c                          |   4 +-
 src/mesa/main/colortab.c                           |   8 +-
 src/mesa/main/context.c                            |  24 ++---
 src/mesa/main/cpuinfo.c                            |   4 +-
 src/mesa/main/debug.c                              |  28 +++---
 src/mesa/main/depthstencil.c                       |   4 +-
 src/mesa/main/dlist.c                              | 100 ++++++++++-----------
 src/mesa/main/execmem.c                            |   4 +-
 src/mesa/main/extensions.c                         |   6 +-
 src/mesa/main/framebuffer.c                        |   2 +-
 src/mesa/main/hash.c                               |   8 +-
 src/mesa/main/image.c                              |   8 +-
 src/mesa/main/imports.c                            |  39 ++------
 src/mesa/main/imports.h                            |  19 ++--
 src/mesa/main/light.c                              |   4 +-
 src/mesa/main/mipmap.c                             |  10 +--
 src/mesa/main/mm.c                                 |  16 ++--
 src/mesa/main/queryobj.c                           |   2 +-
 src/mesa/main/renderbuffer.c                       |  14 +--
 src/mesa/main/shaders.c                            |  12 +--
 src/mesa/main/shared.c                             |   2 +-
 src/mesa/main/syncobj.c                            |   2 +-
 src/mesa/main/texcompress_fxt1.c                   |  12 +--
 src/mesa/main/texcompress_s3tc.c                   |   8 +-
 src/mesa/main/teximage.c                           |  10 +--
 src/mesa/main/texobj.c                             |   2 +-
 src/mesa/main/texrender.c                          |   2 +-
 src/mesa/main/texstore.c                           |  62 ++++++-------
 src/mesa/main/version.c                            |   2 +-
 src/mesa/shader/arbprogparse.c                     |   8 +-
 src/mesa/shader/atifragshader.c                    |  16 ++--
 src/mesa/shader/hash_table.c                       |   8 +-
 src/mesa/shader/nvfragparse.c                      |   6 +-
 src/mesa/shader/nvvertparse.c                      |  10 +--
 src/mesa/shader/prog_cache.c                       |  18 ++--
 src/mesa/shader/prog_instruction.c                 |   8 +-
 src/mesa/shader/prog_optimize.c                    |   8 +-
 src/mesa/shader/prog_parameter.c                   |  14 +--
 src/mesa/shader/prog_print.c                       |   2 +-
 src/mesa/shader/prog_statevars.c                   |   2 +-
 src/mesa/shader/prog_uniform.c                     |   6 +-
 src/mesa/shader/program.c                          |  16 ++--
 src/mesa/shader/program_parse.tab.c                |  22 ++---
 src/mesa/shader/program_parse.y                    |  22 ++---
 src/mesa/shader/shader_api.c                       |  24 ++---
 src/mesa/shader/slang/slang_codegen.c              |   6 +-
 src/mesa/shader/slang/slang_compile.c              |   2 +-
 src/mesa/shader/slang/slang_compile_variable.c     |   2 +-
 src/mesa/shader/slang/slang_emit.c                 |   6 +-
 src/mesa/shader/slang/slang_label.c                |   2 +-
 src/mesa/shader/slang/slang_link.c                 |  26 +++---
 src/mesa/shader/slang/slang_log.c                  |   4 +-
 src/mesa/shader/slang/slang_mem.c                  |  14 +--
 src/mesa/shader/slang/slang_utility.c              |   2 +-
 src/mesa/shader/symbol_table.c                     |   2 +-
 src/mesa/state_tracker/st_cb_accum.c               |  12 +--
 src/mesa/state_tracker/st_cb_bitmap.c              |   2 +-
 src/mesa/state_tracker/st_cb_bufferobjects.c       |   2 +-
 src/mesa/state_tracker/st_cb_drawpixels.c          |  12 +--
 src/mesa/state_tracker/st_cb_fbo.c                 |  10 +--
 src/mesa/state_tracker/st_cb_queryobj.c            |   2 +-
 src/mesa/state_tracker/st_cb_rasterpos.c           |   2 +-
 src/mesa/state_tracker/st_cb_texture.c             |   4 +-
 src/mesa/state_tracker/st_context.c                |   4 +-
 src/mesa/state_tracker/st_context.h                |   2 +-
 src/mesa/state_tracker/st_mesa_to_tgsi.c           |   2 +-
 src/mesa/swrast/s_blit.c                           |  32 +++----
 src/mesa/swrast/s_copypix.c                        |  36 ++++----
 src/mesa/swrast/s_drawpix.c                        |  10 +--
 src/mesa/swrast/s_readpix.c                        |  10 +--
 src/mesa/tnl/t_draw.c                              |   4 +-
 src/mesa/tnl/t_vb_normals.c                        |   4 +-
 src/mesa/tnl/t_vb_points.c                         |   4 +-
 src/mesa/tnl/t_vertex.c                            |   2 +-
 src/mesa/vbo/vbo_exec_array.c                      |   4 +-
 src/mesa/vbo/vbo_rebase.c                          |   8 +-
 src/mesa/vbo/vbo_split_copy.c                      |  14 +--
 src/mesa/vf/vf.c                                   |   2 +-
 132 files changed, 624 insertions(+), 691 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/egl/drivers/dri/egldri.c b/src/egl/drivers/dri/egldri.c
index ca6821dad0..6a8bf89985 100644
--- a/src/egl/drivers/dri/egldri.c
+++ b/src/egl/drivers/dri/egldri.c
@@ -812,7 +812,7 @@ __eglGetDrawableInfo(__DRInativeDisplay * ndpy, int screen, __DRIid drawable,
         return GL_FALSE;
     }
 
-    cliprect = (drm_clip_rect_t*) _mesa_malloc(sizeof(drm_clip_rect_t));
+    cliprect = (drm_clip_rect_t*) malloc(sizeof(drm_clip_rect_t));
     cliprect->x1 = drawable->x;
     cliprect->y1 = drawable->y;
     cliprect->x2 = drawable->x + drawable->w;
diff --git a/src/gallium/state_trackers/glx/xlib/glx_api.c b/src/gallium/state_trackers/glx/xlib/glx_api.c
index 9093a0eae9..0932569bd3 100644
--- a/src/gallium/state_trackers/glx/xlib/glx_api.c
+++ b/src/gallium/state_trackers/glx/xlib/glx_api.c
@@ -1018,7 +1018,7 @@ glXChooseVisual( Display *dpy, int screen, int *list )
    xmvis = choose_visual(dpy, screen, list, GL_FALSE);
    if (xmvis) {
       /* create a new vishandle - the cached one may be stale */
-      xmvis->vishandle = (XVisualInfo *) _mesa_malloc(sizeof(XVisualInfo));
+      xmvis->vishandle = (XVisualInfo *) malloc(sizeof(XVisualInfo));
       if (xmvis->vishandle) {
          memcpy(xmvis->vishandle, xmvis->visinfo, sizeof(XVisualInfo));
       }
@@ -1055,7 +1055,7 @@ glXCreateContext( Display *dpy, XVisualInfo *visinfo,
       xmvis = create_glx_visual( dpy, visinfo );
       if (!xmvis) {
          /* unusable visual */
-         _mesa_free(glxCtx);
+         free(glxCtx);
          return NULL;
       }
    }
@@ -1063,7 +1063,7 @@ glXCreateContext( Display *dpy, XVisualInfo *visinfo,
    glxCtx->xmesaContext = XMesaCreateContext(xmvis,
                                    shareCtx ? shareCtx->xmesaContext : NULL);
    if (!glxCtx->xmesaContext) {
-      _mesa_free(glxCtx);
+      free(glxCtx);
       return NULL;
    }
 
@@ -1336,7 +1336,7 @@ glXDestroyContext( Display *dpy, GLXContext ctx )
    MakeCurrent_PrevReadBuffer = 0;
    XMesaDestroyContext( glxCtx->xmesaContext );
    XMesaGarbageCollect();
-   _mesa_free(glxCtx);
+   free(glxCtx);
 }
 
 
@@ -1755,7 +1755,7 @@ glXGetFBConfigs( Display *dpy, int screen, int *nelements )
    visuals = XGetVisualInfo(dpy, visMask, &visTemplate, nelements);
    if (*nelements > 0) {
       XMesaVisual *results;
-      results = (XMesaVisual *) _mesa_malloc(*nelements * sizeof(XMesaVisual));
+      results = (XMesaVisual *) malloc(*nelements * sizeof(XMesaVisual));
       if (!results) {
          *nelements = 0;
          return NULL;
@@ -1782,7 +1782,7 @@ glXChooseFBConfig( Display *dpy, int screen,
 
    xmvis = choose_visual(dpy, screen, attribList, GL_TRUE);
    if (xmvis) {
-      GLXFBConfig *config = (GLXFBConfig *) _mesa_malloc(sizeof(XMesaVisual));
+      GLXFBConfig *config = (GLXFBConfig *) malloc(sizeof(XMesaVisual));
       if (!config) {
          *nitems = 0;
          return NULL;
@@ -1807,7 +1807,7 @@ glXGetVisualFromFBConfig( Display *dpy, GLXFBConfig config )
       return xmvis->vishandle;
 #else
       /* create a new vishandle - the cached one may be stale */
-      xmvis->vishandle = (XVisualInfo *) _mesa_malloc(sizeof(XVisualInfo));
+      xmvis->vishandle = (XVisualInfo *) malloc(sizeof(XVisualInfo));
       if (xmvis->vishandle) {
          memcpy(xmvis->vishandle, xmvis->visinfo, sizeof(XVisualInfo));
       }
@@ -2112,7 +2112,7 @@ glXCreateNewContext( Display *dpy, GLXFBConfig config,
    glxCtx->xmesaContext = XMesaCreateContext(xmvis,
                                    shareCtx ? shareCtx->xmesaContext : NULL);
    if (!glxCtx->xmesaContext) {
-      _mesa_free(glxCtx);
+      free(glxCtx);
       return NULL;
    }
 
@@ -2332,7 +2332,7 @@ glXCreateContextWithConfigSGIX(Display *dpy, GLXFBConfigSGIX config, int render_
    glxCtx->xmesaContext = XMesaCreateContext(xmvis,
                                    shareCtx ? shareCtx->xmesaContext : NULL);
    if (!glxCtx->xmesaContext) {
-      _mesa_free(glxCtx);
+      free(glxCtx);
       return NULL;
    }
 
diff --git a/src/gallium/state_trackers/glx/xlib/xm_api.c b/src/gallium/state_trackers/glx/xlib/xm_api.c
index 2e678c8f1e..61af663436 100644
--- a/src/gallium/state_trackers/glx/xlib/xm_api.c
+++ b/src/gallium/state_trackers/glx/xlib/xm_api.c
@@ -175,7 +175,7 @@ bits_per_pixel( XMesaVisual xmv )
    /* grab the bits/pixel value */
    bitsPerPixel = img->bits_per_pixel;
    /* free the XImage */
-   _mesa_free( img->data );
+   free( img->data );
    img->data = NULL;
    XDestroyImage( img );
    return bitsPerPixel;
@@ -669,13 +669,13 @@ XMesaVisual XMesaCreateVisual( Display *display,
 
    v->display = display;
 
-   /* Save a copy of the XVisualInfo struct because the user may X_mesa_free()
+   /* Save a copy of the XVisualInfo struct because the user may Xfree()
     * the struct but we may need some of the information contained in it
     * at a later time.
     */
    v->visinfo = (XVisualInfo *) MALLOC(sizeof(*visinfo));
    if (!v->visinfo) {
-      _mesa_free(v);
+      free(v);
       return NULL;
    }
    memcpy(v->visinfo, visinfo, sizeof(*visinfo));
@@ -743,8 +743,8 @@ XMesaVisual XMesaCreateVisual( Display *display,
 PUBLIC
 void XMesaDestroyVisual( XMesaVisual v )
 {
-   _mesa_free(v->visinfo);
-   _mesa_free(v);
+   free(v->visinfo);
+   free(v);
 }
 
 
@@ -811,7 +811,7 @@ fail:
    else if (pipe)
       pipe->destroy(pipe);
 
-   _mesa_free(c);
+   free(c);
    return NULL;
 }
 
@@ -828,7 +828,7 @@ void XMesaDestroyContext( XMesaContext c )
    screen->destroy(screen);
    */
 
-   _mesa_free(c);
+   free(c);
 }
 
 
diff --git a/src/glx/glcontextmodes.c b/src/glx/glcontextmodes.c
index 257087a802..eb9037907f 100644
--- a/src/glx/glcontextmodes.c
+++ b/src/glx/glcontextmodes.c
@@ -31,39 +31,13 @@
  * \author Ian Romanick <idr@us.ibm.com>
  */
 
-#if defined(IN_MINI_GLX)
-#include <GL/gl.h>
-#else
-#if defined(HAVE_DIX_CONFIG_H)
-# include <dix-config.h>
-#endif
-#include <X11/X.h>
 #include <GL/glx.h>
 #include "GL/glxint.h"
-#endif
-
-/* Memory macros */
-#if defined(IN_MINI_GLX)
-# include <stdlib.h>
-# include <string.h>
-# define _mesa_malloc(b) malloc(b)
-# define _mesa_free(m) free(m)
-#else
-# ifdef XFree86Server
-# include <os.h>
-# include <string.h>
-#  define _mesa_malloc(b) xalloc(b)
-#  define _mesa_free(m)   xfree(m)
-# else
-#  include <X11/Xlibint.h>
-#  define _mesa_malloc(b) Xmalloc(b)
-#  define _mesa_free(m) Xfree(m)
-# endif /* XFree86Server */
-#endif /* !defined(IN_MINI_GLX) */
+#include <stdlib.h>
+#include <string.h>
 
 #include "glcontextmodes.h"
 
-#if !defined(IN_MINI_GLX)
 #define NUM_VISUAL_TYPES   6
 
 /**
@@ -352,7 +326,6 @@ _gl_get_context_mode_data(const __GLcontextModes * mode, int attribute,
       return GLX_BAD_ATTRIBUTE;
    }
 }
-#endif /* !defined(IN_MINI_GLX) */
 
 
 /**
@@ -392,7 +365,7 @@ _gl_context_modes_create(unsigned count, size_t minimum_size)
 
    next = &base;
    for (i = 0; i < count; i++) {
-      *next = (__GLcontextModes *) _mesa_malloc(size);
+      *next = (__GLcontextModes *) malloc(size);
       if (*next == NULL) {
          _gl_context_modes_destroy(base);
          base = NULL;
@@ -438,7 +411,7 @@ _gl_context_modes_destroy(__GLcontextModes * modes)
    while (modes != NULL) {
       __GLcontextModes *const next = modes->next;
 
-      _mesa_free(modes);
+      free(modes);
       modes = next;
    }
 }
diff --git a/src/glx/glcontextmodes.h b/src/glx/glcontextmodes.h
index 6676ae306c..ecf0280cba 100644
--- a/src/glx/glcontextmodes.h
+++ b/src/glx/glcontextmodes.h
@@ -32,14 +32,12 @@
 
 #include "GL/internal/glcore.h"
 
-#if !defined(IN_MINI_GLX)
 extern GLint _gl_convert_from_x_visual_type(int visualType);
 extern GLint _gl_convert_to_x_visual_type(int visualType);
 extern void _gl_copy_visual_to_context_mode(__GLcontextModes * mode,
                                             const __GLXvisualConfig * config);
 extern int _gl_get_context_mode_data(const __GLcontextModes * mode,
                                      int attribute, int *value_return);
-#endif /* !defined(IN_MINI_GLX) */
 
 extern __GLcontextModes *_gl_context_modes_create(unsigned count,
                                                   size_t minimum_size);
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index 4dd2293b24..42ab7d4ed6 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -307,7 +307,7 @@ _mesa_meta_free(GLcontext *ctx)
     * freed by the normal context destruction code.  But this would be
     * the place to free other meta data someday.
     */
-   _mesa_free(ctx->Meta);
+   free(ctx->Meta);
    ctx->Meta = NULL;
 }
 
@@ -1304,7 +1304,7 @@ _mesa_meta_BlitFramebuffer(GLcontext *ctx,
    }
 
    if (mask & GL_DEPTH_BUFFER_BIT) {
-      GLuint *tmp = (GLuint *) _mesa_malloc(srcW * srcH * sizeof(GLuint));
+      GLuint *tmp = (GLuint *) malloc(srcW * srcH * sizeof(GLuint));
       if (tmp) {
          if (!blit->DepthFP)
             init_blit_depth_pixels(ctx);
@@ -1328,7 +1328,7 @@ _mesa_meta_BlitFramebuffer(GLcontext *ctx,
          _mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4);
          mask &= ~GL_DEPTH_BUFFER_BIT;
 
-         _mesa_free(tmp);
+         free(tmp);
       }
    }
 
@@ -2065,7 +2065,7 @@ _mesa_meta_Bitmap(GLcontext *ctx,
    if (!bitmap1)
       return;
 
-   bitmap8 = (GLubyte *) _mesa_calloc(width * height);
+   bitmap8 = (GLubyte *) calloc(1, width * height);
    if (bitmap8) {
       _mesa_expand_bitmap(width, height, &unpackSave, bitmap1,
                           bitmap8, width, 0xff);
@@ -2082,7 +2082,7 @@ _mesa_meta_Bitmap(GLcontext *ctx,
 
       _mesa_set_enable(ctx, tex->Target, GL_FALSE);
 
-      _mesa_free(bitmap8);
+      free(bitmap8);
    }
 
    _mesa_unmap_pbo_source(ctx, &unpackSave);
@@ -2531,7 +2531,7 @@ copy_tex_image(GLcontext *ctx, GLuint dims, GLenum target, GLint level,
    /*
     * Alloc image buffer (XXX could use a PBO)
     */
-   buf = _mesa_malloc(width * height * bpp);
+   buf = malloc(width * height * bpp);
    if (!buf) {
       _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyTexImage%uD", dims);
       return;
@@ -2592,7 +2592,7 @@ copy_tex_image(GLcontext *ctx, GLuint dims, GLenum target, GLint level,
 
    _mesa_lock_texture(ctx, texObj); /* re-lock */
 
-   _mesa_free(buf);
+   free(buf);
 }
 
 
@@ -2647,7 +2647,7 @@ copy_tex_sub_image(GLcontext *ctx, GLuint dims, GLenum target, GLint level,
    /*
     * Alloc image buffer (XXX could use a PBO)
     */
-   buf = _mesa_malloc(width * height * bpp);
+   buf = malloc(width * height * bpp);
    if (!buf) {
       _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyTexSubImage%uD", dims);
       return;
@@ -2688,7 +2688,7 @@ copy_tex_sub_image(GLcontext *ctx, GLuint dims, GLenum target, GLint level,
 
    _mesa_lock_texture(ctx, texObj); /* re-lock */
 
-   _mesa_free(buf);
+   free(buf);
 }
 
 
@@ -2731,7 +2731,7 @@ _mesa_meta_CopyColorTable(GLcontext *ctx,
 {
    GLfloat *buf;
 
-   buf = (GLfloat *) _mesa_malloc(width * 4 * sizeof(GLfloat));
+   buf = (GLfloat *) malloc(width * 4 * sizeof(GLfloat));
    if (!buf) {
       _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyColorTable");
       return;
@@ -2748,7 +2748,7 @@ _mesa_meta_CopyColorTable(GLcontext *ctx,
 
    _mesa_meta_end(ctx);
 
-   _mesa_free(buf);
+   free(buf);
 }
 
 
@@ -2758,7 +2758,7 @@ _mesa_meta_CopyColorSubTable(GLcontext *ctx,GLenum target, GLsizei start,
 {
    GLfloat *buf;
 
-   buf = (GLfloat *) _mesa_malloc(width * 4 * sizeof(GLfloat));
+   buf = (GLfloat *) malloc(width * 4 * sizeof(GLfloat));
    if (!buf) {
       _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyColorSubTable");
       return;
@@ -2775,7 +2775,7 @@ _mesa_meta_CopyColorSubTable(GLcontext *ctx,GLenum target, GLsizei start,
 
    _mesa_meta_end(ctx);
 
-   _mesa_free(buf);
+   free(buf);
 }
 
 
@@ -2786,7 +2786,7 @@ _mesa_meta_CopyConvolutionFilter1D(GLcontext *ctx, GLenum target,
 {
    GLfloat *buf;
 
-   buf = (GLfloat *) _mesa_malloc(width * 4 * sizeof(GLfloat));
+   buf = (GLfloat *) malloc(width * 4 * sizeof(GLfloat));
    if (!buf) {
       _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyConvolutionFilter2D");
       return;
@@ -2805,7 +2805,7 @@ _mesa_meta_CopyConvolutionFilter1D(GLcontext *ctx, GLenum target,
 
    _mesa_meta_end(ctx);
 
-   _mesa_free(buf);
+   free(buf);
 }
 
 
@@ -2816,7 +2816,7 @@ _mesa_meta_CopyConvolutionFilter2D(GLcontext *ctx, GLenum target,
 {
    GLfloat *buf;
 
-   buf = (GLfloat *) _mesa_malloc(width * height * 4 * sizeof(GLfloat));
+   buf = (GLfloat *) malloc(width * height * 4 * sizeof(GLfloat));
    if (!buf) {
       _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyConvolutionFilter2D");
       return;
@@ -2836,5 +2836,5 @@ _mesa_meta_CopyConvolutionFilter2D(GLcontext *ctx, GLenum target,
 
    _mesa_meta_end(ctx);
 
-   _mesa_free(buf);
+   free(buf);
 }
diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c
index 58a94b5868..9142dd72f5 100644
--- a/src/mesa/drivers/dri/common/dri_util.c
+++ b/src/mesa/drivers/dri/common/dri_util.c
@@ -242,12 +242,12 @@ __driUtilUpdateDrawableInfo(__DRIdrawable *pdp)
     }
 
     if (pdp->pClipRects) {
-	_mesa_free(pdp->pClipRects); 
+	free(pdp->pClipRects); 
 	pdp->pClipRects = NULL;
     }
 
     if (pdp->pBackClipRects) {
-	_mesa_free(pdp->pBackClipRects); 
+	free(pdp->pBackClipRects); 
 	pdp->pBackClipRects = NULL;
     }
 
@@ -324,7 +324,7 @@ static void driSwapBuffers(__DRIdrawable *dPriv)
     if (!dPriv->numClipRects)
         return;
 
-    rects = _mesa_malloc(sizeof(*rects) * dPriv->numClipRects);
+    rects = malloc(sizeof(*rects) * dPriv->numClipRects);
 
     if (!rects)
         return;
@@ -337,7 +337,7 @@ static void driSwapBuffers(__DRIdrawable *dPriv)
     }
 
     driReportDamage(dPriv, rects, dPriv->numClipRects);
-    _mesa_free(rects);
+    free(rects);
 }
 
 static int driDrawableGetMSC( __DRIscreen *sPriv, __DRIdrawable *dPriv,
@@ -430,7 +430,7 @@ driCreateNewDrawable(__DRIscreen *psp, const __DRIconfig *config,
      */
     (void) attrs;
 
-    pdp = _mesa_malloc(sizeof *pdp);
+    pdp = malloc(sizeof *pdp);
     if (!pdp) {
 	return NULL;
     }
@@ -457,7 +457,7 @@ driCreateNewDrawable(__DRIscreen *psp, const __DRIconfig *config,
 
     if (!(*psp->DriverAPI.CreateBuffer)(psp, pdp, &config->modes,
 					renderType == GLX_PIXMAP_BIT)) {
-       _mesa_free(pdp);
+       free(pdp);
        return NULL;
     }
 
@@ -510,14 +510,14 @@ static void dri_put_drawable(__DRIdrawable *pdp)
 	psp = pdp->driScreenPriv;
         (*psp->DriverAPI.DestroyBuffer)(pdp);
 	if (pdp->pClipRects && pdp->pClipRects != &pdp->dri2.clipRect) {
-	    _mesa_free(pdp->pClipRects);
+	    free(pdp->pClipRects);
 	    pdp->pClipRects = NULL;
 	}
 	if (pdp->pBackClipRects && pdp->pClipRects != &pdp->dri2.clipRect) {
-	    _mesa_free(pdp->pBackClipRects);
+	    free(pdp->pBackClipRects);
 	    pdp->pBackClipRects = NULL;
 	}
-	_mesa_free(pdp);
+	free(pdp);
     }
 }
 
@@ -547,7 +547,7 @@ driDestroyContext(__DRIcontext *pcp)
 {
     if (pcp) {
 	(*pcp->driScreenPriv->DriverAPI.DestroyContext)(pcp);
-	_mesa_free(pcp);
+	free(pcp);
     }
 }
 
@@ -577,7 +577,7 @@ driCreateNewContext(__DRIscreen *psp, const __DRIconfig *config,
     __DRIcontext *pcp;
     void * const shareCtx = (shared != NULL) ? shared->driverPrivate : NULL;
 
-    pcp = _mesa_malloc(sizeof *pcp);
+    pcp = malloc(sizeof *pcp);
     if (!pcp)
 	return NULL;
 
@@ -602,7 +602,7 @@ driCreateNewContext(__DRIscreen *psp, const __DRIconfig *config,
     pcp->hHWContext = hwContext;
 
     if ( !(*psp->DriverAPI.CreateContext)(&config->modes, pcp, shareCtx) ) {
-        _mesa_free(pcp);
+        free(pcp);
         return NULL;
     }
 
@@ -656,7 +656,7 @@ static void driDestroyScreen(__DRIscreen *psp)
 	   (void)drmCloseOnce(psp->fd);
 	}
 
-	_mesa_free(psp);
+	free(psp);
     }
 }
 
@@ -718,7 +718,7 @@ driCreateNewScreen(int scrn,
     static const __DRIextension *emptyExtensionList[] = { NULL };
     __DRIscreen *psp;
 
-    psp = _mesa_calloc(sizeof *psp);
+    psp = calloc(1, sizeof *psp);
     if (!psp)
 	return NULL;
 
@@ -763,7 +763,7 @@ driCreateNewScreen(int scrn,
 
     *driver_modes = driDriverAPI.InitScreen(psp);
     if (*driver_modes == NULL) {
-	_mesa_free(psp);
+	free(psp);
 	return NULL;
     }
 
@@ -785,7 +785,7 @@ dri2CreateNewScreen(int scrn, int fd,
     if (driDriverAPI.InitScreen2 == NULL)
         return NULL;
 
-    psp = _mesa_calloc(sizeof(*psp));
+    psp = calloc(1, sizeof(*psp));
     if (!psp)
 	return NULL;
 
@@ -807,7 +807,7 @@ dri2CreateNewScreen(int scrn, int fd,
     psp->DriverAPI = driDriverAPI;
     *driver_configs = driDriverAPI.InitScreen2(psp);
     if (*driver_configs == NULL) {
-	_mesa_free(psp);
+	free(psp);
 	return NULL;
     }
 
diff --git a/src/mesa/drivers/dri/common/drirenderbuffer.c b/src/mesa/drivers/dri/common/drirenderbuffer.c
index fe38f608a9..48a2c66229 100644
--- a/src/mesa/drivers/dri/common/drirenderbuffer.c
+++ b/src/mesa/drivers/dri/common/drirenderbuffer.c
@@ -32,7 +32,7 @@ driDeleteRenderbuffer(struct gl_renderbuffer *rb)
    /* don't free rb->Data  Chances are it's a memory mapped region for
     * the dri drivers.
     */
-   _mesa_free(rb);
+   free(rb);
 }
 
 
@@ -70,7 +70,7 @@ driNewRenderbuffer(gl_format format, GLvoid *addr,
    assert(cpp > 0);
    assert(pitch > 0);
 
-   drb = _mesa_calloc(sizeof(driRenderbuffer));
+   drb = calloc(1, sizeof(driRenderbuffer));
    if (drb) {
       const GLuint name = 0;
 
diff --git a/src/mesa/drivers/dri/common/utils.c b/src/mesa/drivers/dri/common/utils.c
index 833f9ad232..8c15cbbf73 100644
--- a/src/mesa/drivers/dri/common/utils.c
+++ b/src/mesa/drivers/dri/common/utils.c
@@ -108,7 +108,7 @@ driGetRendererString( char * buffer, const char * hardware_name,
    cpu = _mesa_get_cpu_string();
    if (cpu) {
       offset += sprintf(buffer + offset, " %s", cpu);
-      _mesa_free(cpu);
+      free(cpu);
    }
 
    return offset;
@@ -559,7 +559,7 @@ driCreateConfigs(GLenum fb_format, GLenum fb_type,
    }
 
    num_modes = num_depth_stencil_bits * num_db_modes * num_accum_bits * num_msaa_modes;
-   configs = _mesa_calloc((num_modes + 1) * sizeof *configs);
+   configs = calloc(1, (num_modes + 1) * sizeof *configs);
    if (configs == NULL)
        return NULL;
 
@@ -568,7 +568,7 @@ driCreateConfigs(GLenum fb_format, GLenum fb_type,
 	for ( i = 0 ; i < num_db_modes ; i++ ) {
 	    for ( h = 0 ; h < num_msaa_modes; h++ ) {
 	    	for ( j = 0 ; j < num_accum_bits ; j++ ) {
-		    *c = _mesa_malloc (sizeof **c);
+		    *c = malloc (sizeof **c);
 		    modes = &(*c)->modes;
 		    c++;
 
@@ -653,7 +653,7 @@ __DRIconfig **driConcatConfigs(__DRIconfig **a,
     while (b[j] != NULL)
 	j++;
    
-    all = _mesa_malloc((i + j + 1) * sizeof *all);
+    all = malloc((i + j + 1) * sizeof *all);
     index = 0;
     for (i = 0; a[i] != NULL; i++)
 	all[index++] = a[i];
@@ -661,8 +661,8 @@ __DRIconfig **driConcatConfigs(__DRIconfig **a,
 	all[index++] = b[j];
     all[index++] = NULL;
 
-    _mesa_free(a);
-    _mesa_free(b);
+    free(a);
+    free(b);
 
     return all;
 }
diff --git a/src/mesa/drivers/dri/fb/fb_dri.c b/src/mesa/drivers/dri/fb/fb_dri.c
index 0675bb9894..ac07e57db1 100644
--- a/src/mesa/drivers/dri/fb/fb_dri.c
+++ b/src/mesa/drivers/dri/fb/fb_dri.c
@@ -340,7 +340,7 @@ fbCreateContext( const __GLcontextModes *glVisual,
    assert(driContextPriv);
 
    /* Allocate the Fb context */
-   fbmesa = (fbContextPtr) _mesa_calloc( sizeof(*fbmesa) );
+   fbmesa = (fbContextPtr) calloc(1,  sizeof(*fbmesa) );
    if ( !fbmesa )
       return GL_FALSE;
 
@@ -358,7 +358,7 @@ fbCreateContext( const __GLcontextModes *glVisual,
    ctx = fbmesa->glCtx = _mesa_create_context(glVisual, shareCtx, 
 					      &functions, (void *) fbmesa);
    if (!fbmesa->glCtx) {
-      _mesa_free(fbmesa);
+      free(fbmesa);
       return GL_FALSE;
    }
    driContextPriv->driverPrivate = fbmesa;
@@ -406,7 +406,7 @@ fbDestroyContext( __DRIcontext *driContextPriv )
       fbmesa->glCtx->DriverCtx = NULL;
       _mesa_destroy_context( fbmesa->glCtx );
 
-      _mesa_free( fbmesa );
+      free( fbmesa );
    }
 }
 
@@ -449,7 +449,7 @@ fbCreateBuffer( __DRIscreen *driScrnPriv,
       }
       if (mesaVis->doubleBufferMode) {
          /* XXX what are the correct origin/stride values? */
-         GLvoid *backBuf = _mesa_malloc(driScrnPriv->fbStride
+         GLvoid *backBuf = malloc(driScrnPriv->fbStride
                                         * driScrnPriv->fbHeight);
          driRenderbuffer *drb = driNewRenderbuffer(MESA_FORMAT_ARGB8888,
                                                    backBuf,
@@ -503,7 +503,7 @@ fbSwapBuffers( __DRIdrawable *dPriv )
       if (ctx->Visual.doubleBufferMode) {
 	 int i;
 	 int offset = 0;
-         char *tmp = _mesa_malloc(currentPitch);
+         char *tmp = malloc(currentPitch);
 
          _mesa_notifySwapBuffers( ctx );  /* flush pending rendering comands */
 
@@ -516,7 +516,7 @@ fbSwapBuffers( __DRIdrawable *dPriv )
             offset += currentPitch;
 	 }
 	    
-	 _mesa_free(tmp);
+	 free(tmp);
       }
    }
    else {
diff --git a/src/mesa/drivers/dri/i965/brw_curbe.c b/src/mesa/drivers/dri/i965/brw_curbe.c
index 6cb8edb611..cb9cd836a0 100644
--- a/src/mesa/drivers/dri/i965/brw_curbe.c
+++ b/src/mesa/drivers/dri/i965/brw_curbe.c
@@ -199,7 +199,7 @@ static void prepare_constant_buffer(struct brw_context *brw)
       return;
    }
 
-   buf = (GLfloat *) _mesa_calloc(bufsz);
+   buf = (GLfloat *) calloc(1, bufsz);
 
    /* fragment shader constants */
    if (brw->curbe.wm_size) {
@@ -294,12 +294,12 @@ static void prepare_constant_buffer(struct brw_context *brw)
        bufsz == brw->curbe.last_bufsz &&
        memcmp(buf, brw->curbe.last_buf, bufsz) == 0) {
       /* constants have not changed */
-      _mesa_free(buf);
+      free(buf);
    } 
    else {
       /* constants have changed */
       if (brw->curbe.last_buf)
-	 _mesa_free(brw->curbe.last_buf);
+	 free(brw->curbe.last_buf);
 
       brw->curbe.last_buf = buf;
       brw->curbe.last_bufsz = bufsz;
diff --git a/src/mesa/drivers/dri/i965/brw_draw_upload.c b/src/mesa/drivers/dri/i965/brw_draw_upload.c
index c46b9ba89c..ceaeb923b0 100644
--- a/src/mesa/drivers/dri/i965/brw_draw_upload.c
+++ b/src/mesa/drivers/dri/i965/brw_draw_upload.c
@@ -320,7 +320,7 @@ copy_array_to_vbo_array( struct brw_context *brw,
       } else {
 	 void *data;
 
-	 data = _mesa_malloc(dst_stride * element->count);
+	 data = malloc(dst_stride * element->count);
 	 dest = data;
 	 for (i = 0; i < element->count; i++) {
 	    memcpy(dest, src, dst_stride);
@@ -333,7 +333,7 @@ copy_array_to_vbo_array( struct brw_context *brw,
 			size,
 			data);
 
-	 _mesa_free(data);
+	 free(data);
       }
    }
 }
diff --git a/src/mesa/drivers/dri/i965/brw_eu.c b/src/mesa/drivers/dri/i965/brw_eu.c
index 1df561386e..4e7c1226ad 100644
--- a/src/mesa/drivers/dri/i965/brw_eu.c
+++ b/src/mesa/drivers/dri/i965/brw_eu.c
@@ -237,7 +237,7 @@ brw_resolve_cals(struct brw_compile *c)
         struct brw_glsl_call *call, *next;
         for (call = c->first_call; call; call = next) {
 	    next = call->next;
-	    _mesa_free(call);
+	    free(call);
 	}
 	c->first_call = NULL;
     }
@@ -247,7 +247,7 @@ brw_resolve_cals(struct brw_compile *c)
         struct brw_glsl_label *label, *next;
 	for (label = c->first_label; label; label = next) {
 	    next = label->next;
-	    _mesa_free(label);
+	    free(label);
 	}
 	c->first_label = NULL;
     }
diff --git a/src/mesa/drivers/dri/i965/brw_queryobj.c b/src/mesa/drivers/dri/i965/brw_queryobj.c
index 5399a74244..6cce7e5089 100644
--- a/src/mesa/drivers/dri/i965/brw_queryobj.c
+++ b/src/mesa/drivers/dri/i965/brw_queryobj.c
@@ -73,7 +73,7 @@ brw_new_query_object(GLcontext *ctx, GLuint id)
 {
    struct brw_query_object *query;
 
-   query = _mesa_calloc(sizeof(struct brw_query_object));
+   query = calloc(1, sizeof(struct brw_query_object));
 
    query->Base.Id = id;
    query->Base.Result = 0;
@@ -89,7 +89,7 @@ brw_delete_query(GLcontext *ctx, struct gl_query_object *q)
    struct brw_query_object *query = (struct brw_query_object *)q;
 
    dri_bo_unreference(query->bo);
-   _mesa_free(query);
+   free(query);
 }
 
 static void
diff --git a/src/mesa/drivers/dri/i965/brw_state_batch.c b/src/mesa/drivers/dri/i965/brw_state_batch.c
index ed8120d617..39019412fd 100644
--- a/src/mesa/drivers/dri/i965/brw_state_batch.c
+++ b/src/mesa/drivers/dri/i965/brw_state_batch.c
@@ -57,8 +57,8 @@ GLboolean brw_cached_batch_struct( struct brw_context *brw,
 	 if (item->sz == sz && memcmp(item->header, newheader, sz) == 0)
 	    return GL_FALSE;
 	 if (item->sz != sz) {
-	    _mesa_free(item->header);
-	    item->header = _mesa_malloc(sz);
+	    free(item->header);
+	    item->header = malloc(sz);
 	    item->sz = sz;
 	 }
 	 goto emit;
@@ -68,7 +68,7 @@ GLboolean brw_cached_batch_struct( struct brw_context *brw,
 
    assert(!item);
    item = CALLOC_STRUCT(brw_cached_batch_item);
-   item->header = _mesa_malloc(sz);
+   item->header = malloc(sz);
    item->sz = sz;
    item->next = brw->cached_batch_items;
    brw->cached_batch_items = item;
diff --git a/src/mesa/drivers/dri/i965/brw_state_cache.c b/src/mesa/drivers/dri/i965/brw_state_cache.c
index 1369d97e21..dd9894d681 100644
--- a/src/mesa/drivers/dri/i965/brw_state_cache.c
+++ b/src/mesa/drivers/dri/i965/brw_state_cache.c
@@ -150,7 +150,7 @@ rehash(struct brw_cache *cache)
    GLuint size, i;
 
    size = cache->size * 3;
-   items = (struct brw_cache_item**) _mesa_calloc(size * sizeof(*items));
+   items = (struct brw_cache_item**) calloc(1, size * sizeof(*items));
 
    for (i = 0; i < cache->size; i++)
       for (c = cache->items[i]; c; c = next) {
@@ -237,7 +237,7 @@ brw_upload_cache_with_auxdata(struct brw_cache *cache,
 
 
    /* Set up the memory containing the key, aux_data, and reloc_bufs */
-   tmp = _mesa_malloc(key_size + aux_size + relocs_size);
+   tmp = malloc(key_size + aux_size + relocs_size);
 
    memcpy(tmp, key, key_size);
    memcpy(tmp + key_size, aux, aux_size);
@@ -366,7 +366,7 @@ brw_init_non_surface_cache(struct brw_context *brw)
    cache->size = 7;
    cache->n_items = 0;
    cache->items = (struct brw_cache_item **)
-      _mesa_calloc(cache->size * sizeof(struct brw_cache_item));
+      calloc(1, cache->size * sizeof(struct brw_cache_item));
 
    brw_init_cache_id(cache, "CC_VP", BRW_CC_VP);
    brw_init_cache_id(cache, "CC_UNIT", BRW_CC_UNIT);
@@ -403,7 +403,7 @@ brw_init_surface_cache(struct brw_context *brw)
    cache->size = 7;
    cache->n_items = 0;
    cache->items = (struct brw_cache_item **)
-      _mesa_calloc(cache->size * sizeof(struct brw_cache_item));
+      calloc(1, cache->size * sizeof(struct brw_cache_item));
 
    brw_init_cache_id(cache, "SS_SURFACE", BRW_SS_SURFACE);
    brw_init_cache_id(cache, "SS_SURF_BIND", BRW_SS_SURF_BIND);
@@ -444,7 +444,7 @@ brw_clear_cache(struct brw_context *brw, struct brw_cache *cache)
    cache->n_items = 0;
 
    if (brw->curbe.last_buf) {
-      _mesa_free(brw->curbe.last_buf);
+      free(brw->curbe.last_buf);
       brw->curbe.last_buf = NULL;
    }
 
diff --git a/src/mesa/drivers/dri/i965/brw_vtbl.c b/src/mesa/drivers/dri/i965/brw_vtbl.c
index 681319dedf..0b0be02dd2 100644
--- a/src/mesa/drivers/dri/i965/brw_vtbl.c
+++ b/src/mesa/drivers/dri/i965/brw_vtbl.c
@@ -67,11 +67,11 @@ static void brw_destroy_context( struct intel_context *intel )
    brw_draw_destroy( brw );
    brw_clear_validated_bos(brw);
    if (brw->wm.compile_data) {
-      _mesa_free(brw->wm.compile_data->instruction);
-      _mesa_free(brw->wm.compile_data->vreg);
-      _mesa_free(brw->wm.compile_data->refs);
-      _mesa_free(brw->wm.compile_data->prog_instructions);
-      _mesa_free(brw->wm.compile_data);
+      free(brw->wm.compile_data->instruction);
+      free(brw->wm.compile_data->vreg);
+      free(brw->wm.compile_data->refs);
+      free(brw->wm.compile_data->prog_instructions);
+      free(brw->wm.compile_data);
    }
 
    for (i = 0; i < brw->state.nr_color_regions; i++)
diff --git a/src/mesa/drivers/dri/i965/brw_wm.c b/src/mesa/drivers/dri/i965/brw_wm.c
index 9191c81755..991e1b964b 100644
--- a/src/mesa/drivers/dri/i965/brw_wm.c
+++ b/src/mesa/drivers/dri/i965/brw_wm.c
@@ -151,11 +151,11 @@ static void do_wm_prog( struct brw_context *brw,
           */
          return;
       }
-      c->instruction = _mesa_calloc(BRW_WM_MAX_INSN * sizeof(*c->instruction));
-      c->prog_instructions = _mesa_calloc(BRW_WM_MAX_INSN *
+      c->instruction = calloc(1, BRW_WM_MAX_INSN * sizeof(*c->instruction));
+      c->prog_instructions = calloc(1, BRW_WM_MAX_INSN *
 					  sizeof(*c->prog_instructions));
-      c->vreg = _mesa_calloc(BRW_WM_MAX_VREG * sizeof(*c->vreg));
-      c->refs = _mesa_calloc(BRW_WM_MAX_REF * sizeof(*c->refs));
+      c->vreg = calloc(1, BRW_WM_MAX_VREG * sizeof(*c->vreg));
+      c->refs = calloc(1, BRW_WM_MAX_REF * sizeof(*c->refs));
    } else {
       void *instruction = c->instruction;
       void *prog_instructions = c->prog_instructions;
diff --git a/src/mesa/drivers/dri/intel/intel_buffer_objects.c b/src/mesa/drivers/dri/intel/intel_buffer_objects.c
index 3b7015b5ad..312866d865 100644
--- a/src/mesa/drivers/dri/intel/intel_buffer_objects.c
+++ b/src/mesa/drivers/dri/intel/intel_buffer_objects.c
@@ -113,7 +113,7 @@ intel_bufferobj_free(GLcontext * ctx, struct gl_buffer_object *obj)
    if (obj->Pointer)
       intel_bufferobj_unmap(ctx, 0, obj);
 
-   _mesa_free(intel_obj->sys_buffer);
+   free(intel_obj->sys_buffer);
    if (intel_obj->region) {
       intel_bufferobj_release_region(intel, intel_obj);
    }
@@ -121,7 +121,7 @@ intel_bufferobj_free(GLcontext * ctx, struct gl_buffer_object *obj)
       dri_bo_unreference(intel_obj->buffer);
    }
 
-   _mesa_free(intel_obj);
+   free(intel_obj);
 }
 
 
@@ -155,7 +155,7 @@ intel_bufferobj_data(GLcontext * ctx,
       dri_bo_unreference(intel_obj->buffer);
       intel_obj->buffer = NULL;
    }
-   _mesa_free(intel_obj->sys_buffer);
+   free(intel_obj->sys_buffer);
    intel_obj->sys_buffer = NULL;
 
    if (size != 0) {
@@ -164,7 +164,7 @@ intel_bufferobj_data(GLcontext * ctx,
        * with their contents anyway.
        */
       if (target == GL_ARRAY_BUFFER || target == GL_ELEMENT_ARRAY_BUFFER) {
-	 intel_obj->sys_buffer = _mesa_malloc(size);
+	 intel_obj->sys_buffer = malloc(size);
 	 if (intel_obj->sys_buffer != NULL) {
 	    if (data != NULL)
 	       memcpy(intel_obj->sys_buffer, data, size);
@@ -373,7 +373,7 @@ intel_bufferobj_map_range(GLcontext * ctx,
    if ((access & GL_MAP_INVALIDATE_RANGE_BIT) &&
        drm_intel_bo_busy(intel_obj->buffer)) {
       if (access & GL_MAP_FLUSH_EXPLICIT_BIT) {
-	 intel_obj->range_map_buffer = _mesa_malloc(length);
+	 intel_obj->range_map_buffer = malloc(length);
 	 obj->Pointer = intel_obj->range_map_buffer;
       } else {
 	 intel_obj->range_map_bo = drm_intel_bo_alloc(intel->bufmgr,
@@ -523,7 +523,7 @@ intel_bufferobj_buffer(struct intel_context *intel,
 			      intel_obj->Base.Size,
 			      sys_buffer,
 			      &intel_obj->Base);
-      _mesa_free(sys_buffer);
+      free(sys_buffer);
       intel_obj->sys_buffer = NULL;
    }
 
diff --git a/src/mesa/drivers/dri/intel/intel_fbo.c b/src/mesa/drivers/dri/intel/intel_fbo.c
index d58ffd95fa..40b867971d 100644
--- a/src/mesa/drivers/dri/intel/intel_fbo.c
+++ b/src/mesa/drivers/dri/intel/intel_fbo.c
@@ -71,13 +71,13 @@ intel_delete_renderbuffer(struct gl_renderbuffer *rb)
    ASSERT(irb);
 
    if (irb->span_cache != NULL)
-      _mesa_free(irb->span_cache);
+      free(irb->span_cache);
 
    if (intel && irb->region) {
       intel_region_release(&irb->region);
    }
 
-   _mesa_free(irb);
+   free(irb);
 }
 
 
@@ -316,7 +316,7 @@ intel_create_renderbuffer(gl_format format)
    default:
       _mesa_problem(NULL,
                     "Unexpected intFormat in intel_create_renderbuffer");
-      _mesa_free(irb);
+      free(irb);
       return NULL;
    }
 
@@ -468,7 +468,7 @@ intel_wrap_texture(GLcontext * ctx, struct gl_texture_image *texImage)
    irb->Base.ClassID = INTEL_RB_CLASS;
 
    if (!intel_update_wrapper(ctx, irb, texImage)) {
-      _mesa_free(irb);
+      free(irb);
       return NULL;
    }
 
diff --git a/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c b/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c
index eabfbf4af9..54998a63f6 100644
--- a/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c
+++ b/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c
@@ -395,7 +395,7 @@ intel_texture_bitmap(GLcontext * ctx,
    }
 
    /* Convert the A1 bitmap to an A8 format suitable for glTexImage */
-   a8_bitmap = _mesa_calloc(width * height);
+   a8_bitmap = calloc(1, width * height);
    _mesa_expand_bitmap(width, height, unpack, bitmap, a8_bitmap, width, 0xff);
 
    if (_mesa_is_bufferobj(unpack->BufferObj)) {
@@ -430,7 +430,7 @@ intel_texture_bitmap(GLcontext * ctx,
    _mesa_PixelStorei(GL_UNPACK_ALIGNMENT, 1);
    _mesa_TexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, width, height, 0,
 		    GL_ALPHA, GL_UNSIGNED_BYTE, a8_bitmap);
-   _mesa_free(a8_bitmap);
+   free(a8_bitmap);
 
    meta_set_fragment_program(&intel->meta, &intel->meta.bitmap_fp, fp);
    _mesa_ProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, 0,
diff --git a/src/mesa/drivers/dri/intel/intel_pixel_draw.c b/src/mesa/drivers/dri/intel/intel_pixel_draw.c
index 10177228bd..bd1dd13fb7 100644
--- a/src/mesa/drivers/dri/intel/intel_pixel_draw.c
+++ b/src/mesa/drivers/dri/intel/intel_pixel_draw.c
@@ -147,7 +147,7 @@ intel_stencil_drawpixels(GLcontext * ctx,
 
    /* Unpack the supplied stencil values into a ubyte buffer. */
    assert(sizeof(GLstencil) == sizeof(GLubyte));
-   stencil_pixels = _mesa_malloc(width * height * sizeof(GLstencil));
+   stencil_pixels = malloc(width * height * sizeof(GLstencil));
    for (row = 0; row < height; row++) {
       GLvoid *source = _mesa_image_address2d(unpack, pixels,
 					     width, height,
@@ -201,7 +201,7 @@ intel_stencil_drawpixels(GLcontext * ctx,
    _mesa_TexImage2D(GL_TEXTURE_2D, 0, GL_INTENSITY, width, height, 0,
 		    GL_RED, GL_UNSIGNED_BYTE, stencil_pixels);
    ctx->Unpack = old_unpack;
-   _mesa_free(stencil_pixels);
+   free(stencil_pixels);
 
    meta_set_passthrough_transform(&intel->meta);
 
diff --git a/src/mesa/drivers/dri/intel/intel_span.c b/src/mesa/drivers/dri/intel/intel_span.c
index 97bb97265f..0072bb15fc 100644
--- a/src/mesa/drivers/dri/intel/intel_span.c
+++ b/src/mesa/drivers/dri/intel/intel_span.c
@@ -49,7 +49,7 @@ static void
 get_span_cache(struct intel_renderbuffer *irb, uint32_t offset)
 {
    if (irb->span_cache == NULL) {
-      irb->span_cache = _mesa_malloc(SPAN_CACHE_SIZE);
+      irb->span_cache = malloc(SPAN_CACHE_SIZE);
       irb->span_cache_offset = -1;
    }
 
diff --git a/src/mesa/drivers/dri/intel/intel_syncobj.c b/src/mesa/drivers/dri/intel/intel_syncobj.c
index 0d7889d3c2..d67f0cb4a6 100644
--- a/src/mesa/drivers/dri/intel/intel_syncobj.c
+++ b/src/mesa/drivers/dri/intel/intel_syncobj.c
@@ -50,7 +50,7 @@ intel_new_sync_object(GLcontext *ctx, GLuint id)
 {
    struct intel_sync_object *sync;
 
-   sync = _mesa_calloc(sizeof(struct intel_sync_object));
+   sync = calloc(1, sizeof(struct intel_sync_object));
 
    return &sync->Base;
 }
@@ -61,7 +61,7 @@ intel_delete_sync_object(GLcontext *ctx, struct gl_sync_object *s)
    struct intel_sync_object *sync = (struct intel_sync_object *)s;
 
    drm_intel_bo_unreference(sync->bo);
-   _mesa_free(sync);
+   free(sync);
 }
 
 static void
diff --git a/src/mesa/drivers/dri/r300/r300_fragprog_common.c b/src/mesa/drivers/dri/r300/r300_fragprog_common.c
index acc66e0ae0..a5810ee500 100644
--- a/src/mesa/drivers/dri/r300/r300_fragprog_common.c
+++ b/src/mesa/drivers/dri/r300/r300_fragprog_common.c
@@ -277,7 +277,7 @@ struct r300_fragment_program *r300SelectAndTranslateFragmentShader(GLcontext *ct
 		fp = fp->next;
 	}
 
-	fp = _mesa_calloc(sizeof(struct r300_fragment_program));
+	fp = calloc(1, sizeof(struct r300_fragment_program));
 
 	fp->state = state;
 
diff --git a/src/mesa/drivers/dri/r300/r300_shader.c b/src/mesa/drivers/dri/r300/r300_shader.c
index 3638010e48..9c24166ec5 100644
--- a/src/mesa/drivers/dri/r300/r300_shader.c
+++ b/src/mesa/drivers/dri/r300/r300_shader.c
@@ -39,7 +39,7 @@ static void freeFragProgCache(GLcontext *ctx, struct r300_fragment_program_cont
 	while (fp) {
 		tmp = fp->next;
 		rc_constants_destroy(&fp->code.constants);
-		_mesa_free(fp);
+		free(fp);
 		fp = tmp;
 	}
 }
@@ -52,7 +52,7 @@ static void freeVertProgCache(GLcontext *ctx, struct r300_vertex_program_cont *c
 		tmp = vp->next;
 		rc_constants_destroy(&vp->code.constants);
 		_mesa_reference_vertprog(ctx, &vp->Base, NULL);
-		_mesa_free(vp);
+		free(vp);
 		vp = tmp;
 	}
 }
diff --git a/src/mesa/drivers/dri/r300/r300_vertprog.c b/src/mesa/drivers/dri/r300/r300_vertprog.c
index a74b7001dd..6a366b438b 100644
--- a/src/mesa/drivers/dri/r300/r300_vertprog.c
+++ b/src/mesa/drivers/dri/r300/r300_vertprog.c
@@ -233,7 +233,7 @@ static struct r300_vertex_program *build_program(GLcontext *ctx,
 	struct r300_vertex_program *vp;
 	struct r300_vertex_program_compiler compiler;
 
-	vp = _mesa_calloc(sizeof(*vp));
+	vp = calloc(1, sizeof(*vp));
 	vp->Base = _mesa_clone_vertex_program(ctx, mesa_vp);
 	memcpy(&vp->key, wanted_key, sizeof(vp->key));
 
diff --git a/src/mesa/drivers/dri/r600/r700_oglprog.c b/src/mesa/drivers/dri/r600/r700_oglprog.c
index 2a50361199..b7124e644a 100644
--- a/src/mesa/drivers/dri/r600/r700_oglprog.c
+++ b/src/mesa/drivers/dri/r600/r700_oglprog.c
@@ -53,7 +53,7 @@ static void freeVertProgCache(GLcontext *ctx, struct r700_vertex_program_cont *c
 		Clean_Up_Shader(&(vp->r700Shader));
 		
 		_mesa_reference_vertprog(ctx, &vp->mesa_program, NULL);
-		_mesa_free(vp);
+		free(vp);
 		vp = tmp;
 	}
 }
diff --git a/src/mesa/drivers/dri/r600/r700_vertprog.c b/src/mesa/drivers/dri/r600/r700_vertprog.c
index 46481cdff4..07e0adc890 100644
--- a/src/mesa/drivers/dri/r600/r700_vertprog.c
+++ b/src/mesa/drivers/dri/r600/r700_vertprog.c
@@ -307,7 +307,7 @@ struct r700_vertex_program* r700TranslateVertexShader(GLcontext *ctx,
 	struct r700_vertex_program *vp;
 	unsigned int i;
 
-	vp = _mesa_calloc(sizeof(*vp));
+	vp = calloc(1, sizeof(*vp));
 	vp->mesa_program = _mesa_clone_vertex_program(ctx, mesa_vp);
 
 	if (mesa_vp->IsPositionInvariant)
diff --git a/src/mesa/drivers/dri/radeon/radeon_buffer_objects.c b/src/mesa/drivers/dri/radeon/radeon_buffer_objects.c
index bc5915d3e4..0897dafbd8 100644
--- a/src/mesa/drivers/dri/radeon/radeon_buffer_objects.c
+++ b/src/mesa/drivers/dri/radeon/radeon_buffer_objects.c
@@ -70,7 +70,7 @@ radeonDeleteBufferObject(GLcontext * ctx,
         radeon_bo_unref(radeon_obj->bo);
     }
 
-    _mesa_free(radeon_obj);
+    free(radeon_obj);
 }
 
 
diff --git a/src/mesa/drivers/dri/radeon/radeon_fbo.c b/src/mesa/drivers/dri/radeon/radeon_fbo.c
index 56dcc50785..a8931e8478 100644
--- a/src/mesa/drivers/dri/radeon/radeon_fbo.c
+++ b/src/mesa/drivers/dri/radeon/radeon_fbo.c
@@ -66,7 +66,7 @@ radeon_delete_renderbuffer(struct gl_renderbuffer *rb)
   if (rrb && rrb->bo) {
     radeon_bo_unref(rrb->bo);
   }
-  _mesa_free(rrb);
+  free(rrb);
 }
 
 static void *
@@ -511,7 +511,7 @@ radeon_wrap_texture(GLcontext * ctx, struct gl_texture_image *texImage)
    rrb->base.ClassID = RADEON_RB_CLASS;
 
    if (!radeon_update_wrapper(ctx, rrb, texImage)) {
-      _mesa_free(rrb);
+      free(rrb);
       return NULL;
    }
 
diff --git a/src/mesa/drivers/dri/radeon/radeon_queryobj.c b/src/mesa/drivers/dri/radeon/radeon_queryobj.c
index d0dcf0e431..04ce12493e 100644
--- a/src/mesa/drivers/dri/radeon/radeon_queryobj.c
+++ b/src/mesa/drivers/dri/radeon/radeon_queryobj.c
@@ -81,7 +81,7 @@ static struct gl_query_object * radeonNewQueryObject(GLcontext *ctx, GLuint id)
 {
 	struct radeon_query_object *query;
 
-	query = _mesa_calloc(sizeof(struct radeon_query_object));
+	query = calloc(1, sizeof(struct radeon_query_object));
 
 	query->Base.Id = id;
 	query->Base.Result = 0;
@@ -103,7 +103,7 @@ static void radeonDeleteQuery(GLcontext *ctx, struct gl_query_object *q)
 		radeon_bo_unref(query->bo);
 	}
 
-	_mesa_free(query);
+	free(query);
 }
 
 static void radeonWaitQuery(GLcontext *ctx, struct gl_query_object *q)
diff --git a/src/mesa/drivers/dri/radeon/radeon_texture.c b/src/mesa/drivers/dri/radeon/radeon_texture.c
index 9b9d90bdd0..ff37fd3e86 100644
--- a/src/mesa/drivers/dri/radeon/radeon_texture.c
+++ b/src/mesa/drivers/dri/radeon/radeon_texture.c
@@ -637,7 +637,7 @@ static GLuint * allocate_image_offsets(GLcontext *ctx,
 	int i;
 	GLuint *offsets;
 
-	offsets = _mesa_malloc(depth * sizeof(GLuint)) ;
+	offsets = malloc(depth * sizeof(GLuint)) ;
 	if (!offsets) {
 		_mesa_error(ctx, GL_OUT_OF_MEMORY, "glTex[Sub]Image");
 		return NULL;
@@ -736,7 +736,7 @@ static void radeon_store_teximage(GLcontext* ctx, int dims,
 	}
 
 	if (dims == 3) {
-		_mesa_free(dstImageOffsets);
+		free(dstImageOffsets);
 	}
 
 	radeon_teximage_unmap(image);
diff --git a/src/mesa/drivers/dri/savage/savage_xmesa.c b/src/mesa/drivers/dri/savage/savage_xmesa.c
index 74a001b789..6f07ac275e 100644
--- a/src/mesa/drivers/dri/savage/savage_xmesa.c
+++ b/src/mesa/drivers/dri/savage/savage_xmesa.c
@@ -179,7 +179,7 @@ savageInitDriver(__DRIscreen *sPriv)
    }
 
    /* Allocate the private area */
-   savageScreen = (savageScreenPrivate *)_mesa_malloc(sizeof(savageScreenPrivate));
+   savageScreen = (savageScreenPrivate *)malloc(sizeof(savageScreenPrivate));
    if (!savageScreen)
       return GL_FALSE;
 
@@ -226,7 +226,7 @@ savageInitDriver(__DRIscreen *sPriv)
 		  savageScreen->agpTextures.handle,
 		  savageScreen->agpTextures.size,
 		  (drmAddress *)&(savageScreen->agpTextures.map)) != 0) {
-	   _mesa_free(savageScreen);
+	   free(savageScreen);
 	   sPriv->private = NULL;
 	   return GL_FALSE;
        }
@@ -246,7 +246,7 @@ savageInitDriver(__DRIscreen *sPriv)
 	      savageScreen->aperture.size, 
 	      (drmAddress *)&savageScreen->aperture.map) != 0) 
    {
-      _mesa_free(savageScreen);
+      free(savageScreen);
       sPriv->private = NULL;
       return GL_FALSE;
    }
@@ -282,7 +282,7 @@ savageDestroyScreen(__DRIscreen *sPriv)
    /* free all option information */
    driDestroyOptionInfo (&savageScreen->optionCache);
 
-   _mesa_free(savageScreen);
+   free(savageScreen);
    sPriv->private = NULL;
 }
 
@@ -300,7 +300,7 @@ savageCreateContext( const __GLcontextModes *mesaVis,
 						 savageScreen->sarea_priv_offset);
    int textureSize[SAVAGE_NR_TEX_HEAPS];
    int i;
-   imesa = (savageContextPtr)_mesa_calloc(sizeof(savageContext));
+   imesa = (savageContextPtr)calloc(1, sizeof(savageContext));
    if (!imesa) {
       return GL_FALSE;
    }
@@ -317,7 +317,7 @@ savageCreateContext( const __GLcontextModes *mesaVis,
       shareCtx = NULL;
    ctx = _mesa_create_context(mesaVis, shareCtx, &functions, imesa);
    if (!ctx) {
-      _mesa_free(imesa);
+      free(imesa);
       return GL_FALSE;
    }
    driContextPriv->driverPrivate = imesa;
@@ -436,7 +436,7 @@ savageCreateContext( const __GLcontextModes *mesaVis,
    if (ctx->Const.MaxTextureLevels <= 6) { /*spec requires at least 64x64*/
        __driUtilMessage("Not enough texture memory. "
 			"Falling back to indirect rendering.");
-       _mesa_free(imesa);
+       free(imesa);
        return GL_FALSE;
    }
 
@@ -574,7 +574,7 @@ savageDestroyContext(__DRIcontext *driContextPriv)
       _mesa_destroy_context(imesa->glCtx);
 
       /* no longer use vertex_dma_buf*/
-      _mesa_free(imesa);
+      free(imesa);
    }
 }
 
diff --git a/src/mesa/drivers/dri/savage/savagetex.c b/src/mesa/drivers/dri/savage/savagetex.c
index 394be44eac..1a748ee126 100644
--- a/src/mesa/drivers/dri/savage/savagetex.c
+++ b/src/mesa/drivers/dri/savage/savagetex.c
@@ -603,7 +603,7 @@ _savage_texstore_a1114444(TEXSTORE_PARAMS)
             dstRow += dstRowStride;
 	}
     }
-    _mesa_free((void *) tempImage);
+    free((void *) tempImage);
 
     return GL_TRUE;
 }
@@ -643,7 +643,7 @@ _savage_texstore_a1118888(TEXSTORE_PARAMS)
             dstRow += dstRowStride;
 	}
     }
-    _mesa_free((void *) tempImage);
+    free((void *) tempImage);
 
     return GL_TRUE;
 }
diff --git a/src/mesa/drivers/dri/swrast/swrast.c b/src/mesa/drivers/dri/swrast/swrast.c
index 40535b03b9..b2e7df34e8 100644
--- a/src/mesa/drivers/dri/swrast/swrast.c
+++ b/src/mesa/drivers/dri/swrast/swrast.c
@@ -155,7 +155,7 @@ driCreateNewScreen(int scrn, const __DRIextension **extensions,
 
     TRACE;
 
-    psp = _mesa_calloc(sizeof(*psp));
+    psp = calloc(1, sizeof(*psp));
     if (!psp)
 	return NULL;
 
@@ -184,7 +184,7 @@ static void driDestroyScreen(__DRIscreen *psp)
     TRACE;
 
     if (psp) {
-	_mesa_free(psp);
+	free(psp);
     }
 }
 
@@ -241,8 +241,8 @@ swrast_delete_renderbuffer(struct gl_renderbuffer *rb)
 {
     TRACE;
 
-    _mesa_free(rb->Data);
-    _mesa_free(rb);
+    free(rb->Data);
+    free(rb);
 }
 
 static GLboolean
@@ -272,11 +272,11 @@ swrast_alloc_back_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
 
     TRACE;
 
-    _mesa_free(rb->Data);
+    free(rb->Data);
 
     swrast_alloc_front_storage(ctx, rb, internalFormat, width, height);
 
-    rb->Data = _mesa_malloc(height * xrb->pitch);
+    rb->Data = malloc(height * xrb->pitch);
 
     return GL_TRUE;
 }
@@ -284,7 +284,7 @@ swrast_alloc_back_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
 static struct swrast_renderbuffer *
 swrast_new_renderbuffer(const GLvisual *visual, GLboolean front)
 {
-    struct swrast_renderbuffer *xrb = _mesa_calloc(sizeof *xrb);
+    struct swrast_renderbuffer *xrb = calloc(1, sizeof *xrb);
     GLuint pixel_format;
 
     TRACE;
@@ -358,7 +358,7 @@ driCreateNewDrawable(__DRIscreen *screen,
 
     TRACE;
 
-    buf = _mesa_calloc(sizeof *buf);
+    buf = calloc(1, sizeof *buf);
     if (!buf)
 	return NULL;
 
@@ -366,7 +366,7 @@ driCreateNewDrawable(__DRIscreen *screen,
 
     buf->driScreenPriv = screen;
 
-    buf->row = _mesa_malloc(MAX_WIDTH * 4);
+    buf->row = malloc(MAX_WIDTH * 4);
 
     /* basic framebuffer setup */
     _mesa_initialize_window_framebuffer(&buf->Base, &config->modes);
@@ -401,7 +401,7 @@ driDestroyDrawable(__DRIdrawable *buf)
     if (buf) {
 	struct gl_framebuffer *fb = &buf->Base;
 
-	_mesa_free(buf->row);
+	free(buf->row);
 
 	fb->DeletePending = GL_TRUE;
 	_mesa_reference_framebuffer(&fb, NULL);
@@ -525,7 +525,7 @@ driCreateNewContext(__DRIscreen *screen, const __DRIconfig *config,
 
     TRACE;
 
-    ctx = _mesa_calloc(sizeof *ctx);
+    ctx = calloc(1, sizeof *ctx);
     if (!ctx)
 	return NULL;
 
@@ -540,7 +540,7 @@ driCreateNewContext(__DRIscreen *screen, const __DRIconfig *config,
     if (!_mesa_initialize_context(&ctx->Base, &config->modes,
 				  shared ? &shared->Base : NULL,
 				  &functions, (void *) ctx)) {
-      _mesa_free(ctx);
+      free(ctx);
       return NULL;
     }
 
diff --git a/src/mesa/drivers/dri/unichrome/via_fb.c b/src/mesa/drivers/dri/unichrome/via_fb.c
index e4fb29f6c6..bebf0619d0 100644
--- a/src/mesa/drivers/dri/unichrome/via_fb.c
+++ b/src/mesa/drivers/dri/unichrome/via_fb.c
@@ -156,7 +156,7 @@ via_alloc_texture(struct via_context *vmesa,
    }
    else if (t->memType == VIA_MEM_SYSTEM) {
       
-      t->bufAddr = _mesa_malloc(t->size);      
+      t->bufAddr = malloc(t->size);      
       if (!t->bufAddr)
 	 goto cleanup;
 
@@ -226,8 +226,8 @@ via_free_texture(struct via_context *vmesa, struct via_tex_buffer *t)
    else if (t->memType == VIA_MEM_SYSTEM) {
       remove_from_list(t);
       vmesa->total_alloc[t->memType] -= t->size;
-      _mesa_free(t->bufAddr);
-      _mesa_free(t);
+      free(t->bufAddr);
+      free(t);
    }
    else if (t->index && viaCheckBreadcrumb(vmesa, t->lastUsed)) {
       via_do_free_texture( vmesa, t );
diff --git a/src/mesa/drivers/fbdev/glfbdev.c b/src/mesa/drivers/fbdev/glfbdev.c
index 49002512aa..4e369ceac4 100644
--- a/src/mesa/drivers/fbdev/glfbdev.c
+++ b/src/mesa/drivers/fbdev/glfbdev.c
@@ -392,7 +392,7 @@ glFBDevCreateVisual( const struct fb_fix_screeninfo *fixInfo,
          break;
       default:
          /* unexpected token */
-         _mesa_free(vis);
+         free(vis);
          return NULL;
       }
    }
@@ -431,7 +431,7 @@ glFBDevCreateVisual( const struct fb_fix_screeninfo *fixInfo,
          }
          else {
             _mesa_problem(NULL, "Unsupported fbdev RGB visual/bitdepth!\n");
-            _mesa_free(vis);
+            free(vis);
             return NULL;
          }
       }
@@ -445,7 +445,7 @@ glFBDevCreateVisual( const struct fb_fix_screeninfo *fixInfo,
       }
       else {
          _mesa_problem(NULL, "Unsupported fbdev CI visual/bitdepth!\n");
-         _mesa_free(vis);
+         free(vis);
          return NULL;
       }
    }
@@ -457,7 +457,7 @@ glFBDevCreateVisual( const struct fb_fix_screeninfo *fixInfo,
                                 accumBlueBits, accumAlphaBits,
                                 numSamples)) {
       /* something was invalid */
-      _mesa_free(vis);
+      free(vis);
       return NULL;
    }
 
@@ -469,7 +469,7 @@ void
 glFBDevDestroyVisual( GLFBDevVisualPtr visual )
 {
    if (visual)
-      _mesa_free(visual);
+      free(visual);
 }
 
 
@@ -488,9 +488,9 @@ delete_renderbuffer(struct gl_renderbuffer *rb)
 {
    struct GLFBDevRenderbufferRec *frb = (struct GLFBDevRenderbufferRec *) rb;
    if (frb->mallocedBuffer) {
-      _mesa_free(frb->Base.Data);
+      free(frb->Base.Data);
    }
-   _mesa_free(frb);
+   free(frb);
 }
 
 
@@ -636,10 +636,10 @@ glFBDevCreateBuffer( const struct fb_fix_screeninfo *fixInfo,
       const int malloced = !backBuffer;
       if (malloced) {
          /* malloc a back buffer */
-         backBuffer = _mesa_malloc(size);
+         backBuffer = malloc(size);
          if (!backBuffer) {
             _mesa_free_framebuffer_data(&buf->glframebuffer);
-            _mesa_free(buf);
+            free(buf);
             return NULL;
          }
       }
@@ -769,7 +769,7 @@ glFBDevCreateContext( const GLFBDevVisualPtr visual, GLFBDevContextPtr share )
    if (!_mesa_initialize_context(&ctx->glcontext, &visual->glvisual,
                                  share ? &share->glcontext : NULL,
                                  &functions, (void *) ctx)) {
-      _mesa_free(ctx);
+      free(ctx);
       return NULL;
    }
 
@@ -818,7 +818,7 @@ glFBDevDestroyContext( GLFBDevContextPtr context )
          _mesa_make_current(NULL, NULL, NULL);
       }
       _mesa_free_context_data(&context->glcontext);
-      _mesa_free(context);
+      free(context);
    }
 }
 
diff --git a/src/mesa/drivers/glide/fxdd.c b/src/mesa/drivers/glide/fxdd.c
index d94bf08a88..b78b101240 100644
--- a/src/mesa/drivers/glide/fxdd.c
+++ b/src/mesa/drivers/glide/fxdd.c
@@ -1628,7 +1628,7 @@ fxDDGetString(GLcontext * ctx, GLenum name)
              if (ctx->Extensions.String == NULL) {
                 GLubyte *ext = _mesa_make_extension_string(ctx);
                 if (ext != NULL) {
-                   ctx->Extensions.String = _mesa_malloc(strlen((char *)ext) + 256);
+                   ctx->Extensions.String = malloc(strlen((char *)ext) + 256);
                    if (ctx->Extensions.String != NULL) {
                       strcpy((char *)ctx->Extensions.String, (char *)ext);
                       /* put any additional extension names here */
@@ -1641,7 +1641,7 @@ fxDDGetString(GLcontext * ctx, GLenum name)
                       strcat((char *)ctx->Extensions.String, " WGL_EXT_extensions_string WGL_ARB_extensions_string");
 #endif
                       /* put any additional extension names here */
-                      _mesa_free(ext);
+                      free(ext);
                    } else {
                       ctx->Extensions.String = ext;
                    }
diff --git a/src/mesa/drivers/glide/fxddtex.c b/src/mesa/drivers/glide/fxddtex.c
index a87a28ac3e..b35874fffc 100644
--- a/src/mesa/drivers/glide/fxddtex.c
+++ b/src/mesa/drivers/glide/fxddtex.c
@@ -1397,10 +1397,10 @@ fxDDTexImage2D(GLcontext * ctx, GLenum target, GLint level,
                                                          mml->width,
                                                          mml->height, 1);
       dstRowStride = _mesa_format_row_stride(texImage->TexFormat, mml->width);
-      texImage->Data = _mesa_malloc(texImage->CompressedSize);
+      texImage->Data = malloc(texImage->CompressedSize);
    } else {
       dstRowStride = mml->width * texelBytes;
-      texImage->Data = _mesa_malloc(mml->width * mml->height * texelBytes);
+      texImage->Data = malloc(mml->width * mml->height * texelBytes);
    }
    if (!texImage->Data) {
       _mesa_error(ctx, GL_OUT_OF_MEMORY, "glTexImage2D");
@@ -1654,7 +1654,7 @@ fxDDCompressedTexImage2D (GLcontext *ctx, GLenum target,
       texImage->CompressedSize = _mesa_format_image_size(texImage->TexFormat,
                                                          mml->width,
                                                          mml->height, 1);
-      texImage->Data = _mesa_malloc(texImage->CompressedSize);
+      texImage->Data = malloc(texImage->CompressedSize);
       if (!texImage->Data) {
          _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexImage2D");
          return;
diff --git a/src/mesa/drivers/glide/fxsetup.c b/src/mesa/drivers/glide/fxsetup.c
index 9bf37967cd..9bb352fcb8 100644
--- a/src/mesa/drivers/glide/fxsetup.c
+++ b/src/mesa/drivers/glide/fxsetup.c
@@ -107,14 +107,14 @@ fxTexValidate(GLcontext * ctx, struct gl_texture_object *tObj)
                       &(mml->wScale), &(mml->hScale));
          _w *= mml->wScale;
          _h *= mml->hScale;
-         texImage->Data = _mesa_malloc(_w * _h * texelBytes);
+         texImage->Data = malloc(_w * _h * texelBytes);
          _mesa_rescale_teximage2d(texelBytes,
                                   mml->width,
                                   _w * texelBytes, /* dst stride */
                                   mml->width, mml->height, /* src */
                                   _w, _h, /* dst */
                                   texImage_Data /*src*/, texImage->Data /*dst*/ );
-         _mesa_free(texImage_Data);
+         free(texImage_Data);
          mml->width = _w;
          mml->height = _h;
          /* (!) ... and set mml->wScale = _w / texImage->Width */
diff --git a/src/mesa/drivers/glslcompiler/glslcompiler.c b/src/mesa/drivers/glslcompiler/glslcompiler.c
index e4527abdec..448029dace 100644
--- a/src/mesa/drivers/glslcompiler/glslcompiler.c
+++ b/src/mesa/drivers/glslcompiler/glslcompiler.c
@@ -119,7 +119,7 @@ CreateContext(void)
                              0, 0, 0, 0, 1);  /* accum */
    buf = _mesa_create_framebuffer(vis);
 
-   cc = _mesa_calloc(sizeof(*cc));
+   cc = calloc(1, sizeof(*cc));
    if (!vis || !buf || !cc) {
       if (vis)
          _mesa_destroy_visual(vis);
@@ -143,7 +143,7 @@ CreateContext(void)
        !_swsetup_CreateContext( ctx )) {
       _mesa_destroy_visual(vis);
       _mesa_free_context_data(ctx);
-      _mesa_free(cc);
+      free(cc);
       return GL_FALSE;
    }
    TNL_CONTEXT(ctx)->Driver.RunPipeline = _tnl_run_pipeline;
diff --git a/src/mesa/drivers/osmesa/osmesa.c b/src/mesa/drivers/osmesa/osmesa.c
index 1c469b15bf..f9672d888e 100644
--- a/src/mesa/drivers/osmesa/osmesa.c
+++ b/src/mesa/drivers/osmesa/osmesa.c
@@ -818,7 +818,7 @@ compute_row_addresses( OSMesaContext osmesa )
 static void
 osmesa_delete_renderbuffer(struct gl_renderbuffer *rb)
 {
-   _mesa_free(rb);
+   free(rb);
 }
 
 
@@ -1189,7 +1189,7 @@ OSMesaCreateContextExt( GLenum format, GLint depthBits, GLint stencilBits,
                                                1            /* num samples */
                                                );
       if (!osmesa->gl_visual) {
-         _mesa_free(osmesa);
+         free(osmesa);
          return NULL;
       }
 
@@ -1206,7 +1206,7 @@ OSMesaCreateContextExt( GLenum format, GLint depthBits, GLint stencilBits,
                                               : (GLcontext *) NULL,
                                     &functions, (void *) osmesa)) {
          _mesa_destroy_visual( osmesa->gl_visual );
-         _mesa_free(osmesa);
+         free(osmesa);
          return NULL;
       }
 
@@ -1221,7 +1221,7 @@ OSMesaCreateContextExt( GLenum format, GLint depthBits, GLint stencilBits,
       if (!osmesa->gl_buffer) {
          _mesa_destroy_visual( osmesa->gl_visual );
          _mesa_free_context_data( &osmesa->mesa );
-         _mesa_free(osmesa);
+         free(osmesa);
          return NULL;
       }
 
@@ -1260,7 +1260,7 @@ OSMesaCreateContextExt( GLenum format, GLint depthBits, GLint stencilBits,
              !_swsetup_CreateContext( ctx )) {
             _mesa_destroy_visual(osmesa->gl_visual);
             _mesa_free_context_data(ctx);
-            _mesa_free(osmesa);
+            free(osmesa);
             return NULL;
          }
 	
@@ -1305,7 +1305,7 @@ OSMesaDestroyContext( OSMesaContext osmesa )
       _mesa_reference_framebuffer( &osmesa->gl_buffer, NULL );
 
       _mesa_free_context_data( &osmesa->mesa );
-      _mesa_free( osmesa );
+      free( osmesa );
    }
 }
 
diff --git a/src/mesa/drivers/windows/gdi/mesa.def b/src/mesa/drivers/windows/gdi/mesa.def
index d7d6cfa4e2..baa592f136 100644
--- a/src/mesa/drivers/windows/gdi/mesa.def
+++ b/src/mesa/drivers/windows/gdi/mesa.def
@@ -868,7 +868,6 @@ EXPORTS
 	_mesa_add_soft_renderbuffers
 	_mesa_add_renderbuffer
 	_mesa_bzero
-	_mesa_calloc
 	_mesa_check_conditional_render
 	_mesa_choose_tex_format
 	_mesa_create_framebuffer
@@ -887,7 +886,6 @@ EXPORTS
 	_mesa_error
 	_mesa_finish_render_texture
 	_mesa_framebuffer_renderbuffer
-	_mesa_free
 	_mesa_free_context_data
 	_mesa_free_texture_image_data
 	_mesa_generate_mipmap
diff --git a/src/mesa/drivers/windows/gdi/wmesa.c b/src/mesa/drivers/windows/gdi/wmesa.c
index b24b758cfb..2fdcb387be 100644
--- a/src/mesa/drivers/windows/gdi/wmesa.c
+++ b/src/mesa/drivers/windows/gdi/wmesa.c
@@ -1245,7 +1245,7 @@ static void read_rgba_pixels_16(const GLcontext *ctx,
 static void
 wmesa_delete_renderbuffer(struct gl_renderbuffer *rb)
 {
-    _mesa_free(rb);
+    free(rb);
 }
 
 
@@ -1474,7 +1474,7 @@ WMesaContext WMesaCreateContext(HDC hDC,
                                  1);         /* num samples */
     
     if (!visual) {
-	_mesa_free(c);
+	free(c);
 	return NULL;
     }
 
@@ -1512,7 +1512,7 @@ WMesaContext WMesaCreateContext(HDC hDC,
         !_tnl_CreateContext(ctx) ||
 	!_swsetup_CreateContext(ctx)) {
 	_mesa_free_context_data(ctx);
-	_mesa_free(c);
+	free(c);
 	return NULL;
     }
     _swsetup_Wakeup(ctx);
@@ -1557,7 +1557,7 @@ void WMesaDestroyContext( WMesaContext pwc )
     _swrast_DestroyContext(ctx);
     
     _mesa_free_context_data(ctx);
-    _mesa_free(pwc);
+    free(pwc);
 }
 
 
diff --git a/src/mesa/drivers/windows/icd/mesa.def b/src/mesa/drivers/windows/icd/mesa.def
index f6bd2aa68b..6f33d170ff 100644
--- a/src/mesa/drivers/windows/icd/mesa.def
+++ b/src/mesa/drivers/windows/icd/mesa.def
@@ -32,8 +32,6 @@ EXPORTS
 	_mesa_buffer_data
 	_mesa_buffer_map
 	_mesa_buffer_subdata
-	_mesa_bzero
-	_mesa_calloc
 	_mesa_choose_tex_format
 	_mesa_compressed_texture_size
 	_mesa_create_framebuffer
@@ -47,7 +45,6 @@ EXPORTS
 	_mesa_enable_1_5_extensions
 	_mesa_enable_sw_extensions
 	_mesa_error
-	_mesa_free
 	_mesa_free_context_data
 	_mesa_get_current_context
 	_mesa_init_default_imports
diff --git a/src/mesa/drivers/x11/fakeglx.c b/src/mesa/drivers/x11/fakeglx.c
index 291e90c822..f097d93a71 100644
--- a/src/mesa/drivers/x11/fakeglx.c
+++ b/src/mesa/drivers/x11/fakeglx.c
@@ -1381,7 +1381,7 @@ Fake_glXChooseVisual( Display *dpy, int screen, int *list )
       return xmvis->vishandle;
 #else
       /* create a new vishandle - the cached one may be stale */
-      xmvis->vishandle = (XVisualInfo *) _mesa_malloc(sizeof(XVisualInfo));
+      xmvis->vishandle = (XVisualInfo *) malloc(sizeof(XVisualInfo));
       if (xmvis->vishandle) {
          memcpy(xmvis->vishandle, xmvis->visinfo, sizeof(XVisualInfo));
       }
@@ -1438,7 +1438,7 @@ Fake_glXCreateContext( Display *dpy, XVisualInfo *visinfo,
       xmvis = create_glx_visual( dpy, visinfo );
       if (!xmvis) {
          /* unusable visual */
-         _mesa_free(glxCtx);
+         free(glxCtx);
          return NULL;
       }
    }
@@ -1446,7 +1446,7 @@ Fake_glXCreateContext( Display *dpy, XVisualInfo *visinfo,
    glxCtx->xmesaContext = XMesaCreateContext(xmvis,
                                    shareCtx ? shareCtx->xmesaContext : NULL);
    if (!glxCtx->xmesaContext) {
-      _mesa_free(glxCtx);
+      free(glxCtx);
       return NULL;
    }
 
@@ -1671,7 +1671,7 @@ Fake_glXDestroyContext( Display *dpy, GLXContext ctx )
    MakeCurrent_PrevReadBuffer = 0;
    XMesaDestroyContext( glxCtx->xmesaContext );
    XMesaGarbageCollect();
-   _mesa_free(glxCtx);
+   free(glxCtx);
 }
 
 
@@ -2108,7 +2108,7 @@ Fake_glXGetFBConfigs( Display *dpy, int screen, int *nelements )
    visuals = XGetVisualInfo(dpy, visMask, &visTemplate, nelements);
    if (*nelements > 0) {
       XMesaVisual *results;
-      results = (XMesaVisual *) _mesa_malloc(*nelements * sizeof(XMesaVisual));
+      results = (XMesaVisual *) malloc(*nelements * sizeof(XMesaVisual));
       if (!results) {
          *nelements = 0;
          return NULL;
@@ -2135,7 +2135,7 @@ Fake_glXChooseFBConfig( Display *dpy, int screen,
 
    xmvis = choose_visual(dpy, screen, attribList, GL_TRUE);
    if (xmvis) {
-      GLXFBConfig *config = (GLXFBConfig *) _mesa_malloc(sizeof(XMesaVisual));
+      GLXFBConfig *config = (GLXFBConfig *) malloc(sizeof(XMesaVisual));
       if (!config) {
          *nitems = 0;
          return NULL;
@@ -2160,7 +2160,7 @@ Fake_glXGetVisualFromFBConfig( Display *dpy, GLXFBConfig config )
       return xmvis->vishandle;
 #else
       /* create a new vishandle - the cached one may be stale */
-      xmvis->vishandle = (XVisualInfo *) _mesa_malloc(sizeof(XVisualInfo));
+      xmvis->vishandle = (XVisualInfo *) malloc(sizeof(XVisualInfo));
       if (xmvis->vishandle) {
          memcpy(xmvis->vishandle, xmvis->visinfo, sizeof(XVisualInfo));
       }
@@ -2469,7 +2469,7 @@ Fake_glXCreateNewContext( Display *dpy, GLXFBConfig config,
    glxCtx->xmesaContext = XMesaCreateContext(xmvis,
                                    shareCtx ? shareCtx->xmesaContext : NULL);
    if (!glxCtx->xmesaContext) {
-      _mesa_free(glxCtx);
+      free(glxCtx);
       return NULL;
    }
 
@@ -2687,7 +2687,7 @@ Fake_glXCreateContextWithConfigSGIX(Display *dpy, GLXFBConfigSGIX config, int re
    glxCtx->xmesaContext = XMesaCreateContext(xmvis,
                                    shareCtx ? shareCtx->xmesaContext : NULL);
    if (!glxCtx->xmesaContext) {
-      _mesa_free(glxCtx);
+      free(glxCtx);
       return NULL;
    }
 
diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c
index 98ce6c5831..ed945023cf 100644
--- a/src/mesa/drivers/x11/xm_api.c
+++ b/src/mesa/drivers/x11/xm_api.c
@@ -253,7 +253,7 @@ bits_per_pixel( XMesaVisual xmv )
    /* grab the bits/pixel value */
    bitsPerPixel = img->bits_per_pixel;
    /* free the XImage */
-   _mesa_free( img->data );
+   free( img->data );
    img->data = NULL;
    XMesaDestroyImage( img );
    return bitsPerPixel;
@@ -383,7 +383,7 @@ create_xmesa_buffer(XMesaDrawable d, BufferType type,
     */
    b->frontxrb = xmesa_new_renderbuffer(NULL, 0, &vis->mesa_visual, GL_FALSE);
    if (!b->frontxrb) {
-      _mesa_free(b);
+      free(b);
       return NULL;
    }
    b->frontxrb->Parent = b;
@@ -399,7 +399,7 @@ create_xmesa_buffer(XMesaDrawable d, BufferType type,
       b->backxrb = xmesa_new_renderbuffer(NULL, 0, &vis->mesa_visual, GL_TRUE);
       if (!b->backxrb) {
          /* XXX free front xrb too */
-         _mesa_free(b);
+         free(b);
          return NULL;
       }
       b->backxrb->Parent = b;
@@ -596,7 +596,7 @@ noFaultXAllocColor( int client,
        || prevCmapSize != cmapSize || !ctable) {
       /* free previously cached color table */
       if (ctable)
-         _mesa_free(ctable);
+         free(ctable);
       /* Get the color table from X */
       ctable = (XMesaColor *) MALLOC(cmapSize * sizeof(XMesaColor));
       assert(ctable);
@@ -652,8 +652,8 @@ noFaultXAllocColor( int client,
       *alloced = 0;
    }
 #ifdef XFree86Server
-   _mesa_free(ppixIn);
-   _mesa_free(ctable);
+   free(ppixIn);
+   free(ctable);
 #else
    /* don't free table, save it for next time */
 #endif
@@ -1366,14 +1366,14 @@ XMesaVisual XMesaCreateVisual( XMesaDisplay *display,
 
    v->display = display;
 
-   /* Save a copy of the XVisualInfo struct because the user may X_mesa_free()
+   /* Save a copy of the XVisualInfo struct because the user may Xfree()
     * the struct but we may need some of the information contained in it
     * at a later time.
     */
 #ifndef XFree86Server
    v->visinfo = (XVisualInfo *) MALLOC(sizeof(*visinfo));
    if(!v->visinfo) {
-      _mesa_free(v);
+      free(v);
       return NULL;
    }
    memcpy(v->visinfo, visinfo, sizeof(*visinfo));
@@ -1473,9 +1473,9 @@ PUBLIC
 void XMesaDestroyVisual( XMesaVisual v )
 {
 #ifndef XFree86Server
-   _mesa_free(v->visinfo);
+   free(v->visinfo);
 #endif
-   _mesa_free(v);
+   free(v);
 }
 
 
@@ -1514,7 +1514,7 @@ XMesaContext XMesaCreateContext( XMesaVisual v, XMesaContext share_list )
    if (!_mesa_initialize_context(mesaCtx, &v->mesa_visual,
                       share_list ? &(share_list->mesa) : (GLcontext *) NULL,
                       &functions, (void *) c)) {
-      _mesa_free(c);
+      free(c);
       return NULL;
    }
 
@@ -1564,7 +1564,7 @@ XMesaContext XMesaCreateContext( XMesaVisual v, XMesaContext share_list )
        !_tnl_CreateContext( mesaCtx ) ||
        !_swsetup_CreateContext( mesaCtx )) {
       _mesa_free_context_data(&c->mesa);
-      _mesa_free(c);
+      free(c);
       return NULL;
    }
 
@@ -1598,7 +1598,7 @@ void XMesaDestroyContext( XMesaContext c )
    _tnl_DestroyContext( mesaCtx );
    _vbo_DestroyContext( mesaCtx );
    _mesa_free_context_data( mesaCtx );
-   _mesa_free( c );
+   free( c );
 }
 
 
diff --git a/src/mesa/drivers/x11/xm_buffer.c b/src/mesa/drivers/x11/xm_buffer.c
index bf38629289..5ffe110484 100644
--- a/src/mesa/drivers/x11/xm_buffer.c
+++ b/src/mesa/drivers/x11/xm_buffer.c
@@ -242,7 +242,7 @@ xmesa_delete_renderbuffer(struct gl_renderbuffer *rb)
     * should probably get freed here, but that's currently done in
     * XMesaDestroyBuffer().
     */
-   _mesa_free(rb);
+   free(rb);
 }
 
 
@@ -412,11 +412,11 @@ xmesa_delete_framebuffer(struct gl_framebuffer *fb)
    }
 
    if (b->rowimage) {
-      _mesa_free( b->rowimage->data );
+      free( b->rowimage->data );
       b->rowimage->data = NULL;
       XMesaDestroyImage( b->rowimage );
    }
 
    _mesa_free_framebuffer_data(fb);
-   _mesa_free(fb);
+   free(fb);
 }
diff --git a/src/mesa/es/main/specials_es1.c b/src/mesa/es/main/specials_es1.c
index a4f14490f3..c842007c22 100644
--- a/src/mesa/es/main/specials_es1.c
+++ b/src/mesa/es/main/specials_es1.c
@@ -167,7 +167,7 @@ compute_es_extensions(void)
       unsigned int len;
 
       len = make_extension_string(ctx, NULL);
-      s = (char *) _mesa_malloc(len + 1);
+      s = (char *) malloc(len + 1);
       if (!s)
          return NULL;
       make_extension_string(ctx, s);
diff --git a/src/mesa/es/main/specials_es2.c b/src/mesa/es/main/specials_es2.c
index e11ade9b94..10b4f25e0f 100644
--- a/src/mesa/es/main/specials_es2.c
+++ b/src/mesa/es/main/specials_es2.c
@@ -138,7 +138,7 @@ compute_es_extensions(void)
       unsigned int len;
 
       len = make_extension_string(ctx, NULL);
-      s = (char *) _mesa_malloc(len + 1);
+      s = (char *) malloc(len + 1);
       if (!s)
          return NULL;
       make_extension_string(ctx, s);
diff --git a/src/mesa/glapi/mesadef.py b/src/mesa/glapi/mesadef.py
index 59cea59ac2..38b0246ba5 100644
--- a/src/mesa/glapi/mesadef.py
+++ b/src/mesa/glapi/mesadef.py
@@ -113,8 +113,6 @@ def PrintTail():
 	print '\t_mesa_buffer_data'
 	print '\t_mesa_buffer_map'
 	print '\t_mesa_buffer_subdata'
-	print '\t_mesa_bzero'
-	print '\t_mesa_calloc'
 	print '\t_mesa_choose_tex_format'
 	print '\t_mesa_compressed_texture_size'
 	print '\t_mesa_create_framebuffer'
@@ -128,7 +126,6 @@ def PrintTail():
 	print '\t_mesa_enable_1_5_extensions'
 	print '\t_mesa_enable_sw_extensions'
 	print '\t_mesa_error'
-	print '\t_mesa_free'
 	print '\t_mesa_free_context_data'
 	print '\t_mesa_get_current_context'
 	print '\t_mesa_init_default_imports'
diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c
index e36137d378..3a1fd37324 100644
--- a/src/mesa/main/arrayobj.c
+++ b/src/mesa/main/arrayobj.c
@@ -130,7 +130,7 @@ _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);
+   free(obj);
 }
 
 
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 44dc3b871e..9a32bc335d 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -1559,8 +1559,8 @@ _mesa_free_attrib_data(GLcontext *ctx)
          }
 
          next = attr->next;
-         _mesa_free(attr->data);
-         _mesa_free(attr);
+         free(attr->data);
+         free(attr);
          attr = next;
       }
    }
diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 2e9793ea0e..816465cea1 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -208,14 +208,14 @@ _mesa_delete_buffer_object( GLcontext *ctx, struct gl_buffer_object *bufObj )
    (void) ctx;
 
    if (bufObj->Data)
-      _mesa_free(bufObj->Data);
+      free(bufObj->Data);
 
    /* assign strange values here to help w/ debugging */
    bufObj->RefCount = -1000;
    bufObj->Name = ~0;
 
    _glthread_DESTROY_MUTEX(bufObj->Mutex);
-   _mesa_free(bufObj);
+   free(bufObj);
 }
 
 
diff --git a/src/mesa/main/colortab.c b/src/mesa/main/colortab.c
index 1c12fb00fa..785813166c 100644
--- a/src/mesa/main/colortab.c
+++ b/src/mesa/main/colortab.c
@@ -407,8 +407,8 @@ _mesa_ColorTable( GLenum target, GLenum internalFormat,
       _mesa_free_colortable_data(table);
 
       if (width > 0) {
-         table->TableF = (GLfloat *) _mesa_malloc(comps * width * sizeof(GLfloat));
-         table->TableUB = (GLubyte *) _mesa_malloc(comps * width * sizeof(GLubyte));
+         table->TableF = (GLfloat *) malloc(comps * width * sizeof(GLfloat));
+         table->TableUB = (GLubyte *) malloc(comps * width * sizeof(GLubyte));
 
 	 if (!table->TableF || !table->TableUB) {
 	    _mesa_error(ctx, GL_OUT_OF_MEMORY, "glColorTable");
@@ -1095,11 +1095,11 @@ void
 _mesa_free_colortable_data( struct gl_color_table *p )
 {
    if (p->TableF) {
-      _mesa_free(p->TableF);
+      free(p->TableF);
       p->TableF = NULL;
    }
    if (p->TableUB) {
-      _mesa_free(p->TableUB);
+      free(p->TableUB);
       p->TableUB = NULL;
    }
 }
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index f315f0b212..4ecbb5ecf6 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -222,7 +222,7 @@ _mesa_create_visual( GLboolean rgbFlag,
                      GLint accumAlphaBits,
                      GLint numSamples )
 {
-   GLvisual *vis = (GLvisual *) _mesa_calloc(sizeof(GLvisual));
+   GLvisual *vis = (GLvisual *) calloc(1, sizeof(GLvisual));
    if (vis) {
       if (!_mesa_initialize_visual(vis, rgbFlag, dbFlag, stereoFlag,
                                    redBits, greenBits, blueBits, alphaBits,
@@ -230,7 +230,7 @@ _mesa_create_visual( GLboolean rgbFlag,
                                    accumRedBits, accumGreenBits,
                                    accumBlueBits, accumAlphaBits,
                                    numSamples)) {
-         _mesa_free(vis);
+         free(vis);
          return NULL;
       }
    }
@@ -320,7 +320,7 @@ _mesa_initialize_visual( GLvisual *vis,
 void
 _mesa_destroy_visual( GLvisual *vis )
 {
-   _mesa_free(vis);
+   free(vis);
 }
 
 /*@}*/
@@ -755,7 +755,7 @@ alloc_dispatch_table(void)
    GLint numEntries = MAX2(_glapi_get_dispatch_table_size(),
                            sizeof(struct _glapi_table) / sizeof(_glapi_proc));
    struct _glapi_table *table =
-      (struct _glapi_table *) _mesa_malloc(numEntries * sizeof(_glapi_proc));
+      (struct _glapi_table *) malloc(numEntries * sizeof(_glapi_proc));
    if (table) {
       _glapi_proc *entry = (_glapi_proc *) table;
       GLint i;
@@ -850,7 +850,7 @@ _mesa_initialize_context(GLcontext *ctx,
    if (!ctx->Exec || !ctx->Save) {
       _mesa_release_shared_state(ctx, ctx->Shared);
       if (ctx->Exec)
-         _mesa_free(ctx->Exec);
+         free(ctx->Exec);
       return GL_FALSE;
    }
 #if FEATURE_dispatch
@@ -913,7 +913,7 @@ _mesa_create_context(const GLvisual *visual,
    ASSERT(visual);
    /*ASSERT(driverContext);*/
 
-   ctx = (GLcontext *) _mesa_calloc(sizeof(GLcontext));
+   ctx = (GLcontext *) calloc(1, sizeof(GLcontext));
    if (!ctx)
       return NULL;
 
@@ -922,7 +922,7 @@ _mesa_create_context(const GLvisual *visual,
       return ctx;
    }
    else {
-      _mesa_free(ctx);
+      free(ctx);
       return NULL;
    }
 }
@@ -989,8 +989,8 @@ _mesa_free_context_data( GLcontext *ctx )
 #endif
 
    /* free dispatch tables */
-   _mesa_free(ctx->Exec);
-   _mesa_free(ctx->Save);
+   free(ctx->Exec);
+   free(ctx->Save);
 
    /* Shared context state (display lists, textures, etc) */
    _mesa_release_shared_state( ctx, ctx->Shared );
@@ -999,10 +999,10 @@ _mesa_free_context_data( GLcontext *ctx )
    _mesa_free_display_list_data(ctx);
 
    if (ctx->Extensions.String)
-      _mesa_free((void *) ctx->Extensions.String);
+      free((void *) ctx->Extensions.String);
 
    if (ctx->VersionString)
-      _mesa_free(ctx->VersionString);
+      free(ctx->VersionString);
 
    /* unbind the context if it's currently bound */
    if (ctx == _mesa_get_current_context()) {
@@ -1023,7 +1023,7 @@ _mesa_destroy_context( GLcontext *ctx )
 {
    if (ctx) {
       _mesa_free_context_data(ctx);
-      _mesa_free( (void *) ctx );
+      free( (void *) ctx );
    }
 }
 
diff --git a/src/mesa/main/cpuinfo.c b/src/mesa/main/cpuinfo.c
index 79fcbc71c2..35de69b180 100644
--- a/src/mesa/main/cpuinfo.c
+++ b/src/mesa/main/cpuinfo.c
@@ -43,7 +43,7 @@ _mesa_get_cpu_features(void)
 /**
  * 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()
+ * \return information string, free it with free()
  */
 char *
 _mesa_get_cpu_string(void)
@@ -51,7 +51,7 @@ _mesa_get_cpu_string(void)
 #define MAX_STRING 50
    char *buffer;
 
-   buffer = (char *) _mesa_malloc(MAX_STRING);
+   buffer = (char *) malloc(MAX_STRING);
    if (!buffer)
       return NULL;
 
diff --git a/src/mesa/main/debug.c b/src/mesa/main/debug.c
index f2182c0577..79b63e940f 100644
--- a/src/mesa/main/debug.c
+++ b/src/mesa/main/debug.c
@@ -303,7 +303,7 @@ write_texture_image(struct gl_texture_object *texObj,
       GLubyte *buffer;
       char s[100];
 
-      buffer = (GLubyte *) _mesa_malloc(img->Width * img->Height
+      buffer = (GLubyte *) malloc(img->Width * img->Height
                                         * img->Depth * 4);
 
       store = ctx->Pack; /* save */
@@ -321,7 +321,7 @@ write_texture_image(struct gl_texture_object *texObj,
 
       ctx->Pack = store; /* restore */
 
-      _mesa_free(buffer);
+      free(buffer);
    }
 }
 
@@ -350,7 +350,7 @@ write_renderbuffer_image(const struct gl_renderbuffer *rb)
       return;
    }
 
-   buffer = (GLubyte *) _mesa_malloc(rb->Width * rb->Height * 4);
+   buffer = (GLubyte *) malloc(rb->Width * rb->Height * 4);
 
    ctx->Driver.ReadPixels(ctx, 0, 0, rb->Width, rb->Height,
                           format, type, &ctx->DefaultPacking, buffer);
@@ -361,7 +361,7 @@ write_renderbuffer_image(const struct gl_renderbuffer *rb)
    _mesa_printf("  Writing renderbuffer image to %s\n", s);
    write_ppm(s, buffer, rb->Width, rb->Height, 4, 0, 1, 2, GL_TRUE);
 
-   _mesa_free(buffer);
+   free(buffer);
 }
 
 
@@ -481,7 +481,7 @@ _mesa_dump_color_buffer(const char *filename)
    const GLuint h = ctx->DrawBuffer->Height;
    GLubyte *buf;
 
-   buf = (GLubyte *) _mesa_malloc(w * h * 4);
+   buf = (GLubyte *) malloc(w * h * 4);
 
    _mesa_PushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT);
    _mesa_PixelStorei(GL_PACK_ALIGNMENT, 1);
@@ -499,7 +499,7 @@ _mesa_dump_color_buffer(const char *filename)
 
    _mesa_PopClientAttrib();
 
-   _mesa_free(buf);
+   free(buf);
 }
 
 
@@ -513,8 +513,8 @@ _mesa_dump_depth_buffer(const char *filename)
    GLubyte *buf2;
    GLuint i;
 
-   buf = (GLuint *) _mesa_malloc(w * h * 4);  /* 4 bpp */
-   buf2 = (GLubyte *) _mesa_malloc(w * h * 3); /* 3 bpp */
+   buf = (GLuint *) malloc(w * h * 4);  /* 4 bpp */
+   buf2 = (GLubyte *) malloc(w * h * 3); /* 3 bpp */
 
    _mesa_PushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT);
    _mesa_PixelStorei(GL_PACK_ALIGNMENT, 1);
@@ -534,8 +534,8 @@ _mesa_dump_depth_buffer(const char *filename)
 
    _mesa_PopClientAttrib();
 
-   _mesa_free(buf);
-   _mesa_free(buf2);
+   free(buf);
+   free(buf2);
 }
 
 
@@ -549,8 +549,8 @@ _mesa_dump_stencil_buffer(const char *filename)
    GLubyte *buf2;
    GLuint i;
 
-   buf = (GLubyte *) _mesa_malloc(w * h);  /* 1 bpp */
-   buf2 = (GLubyte *) _mesa_malloc(w * h * 3); /* 3 bpp */
+   buf = (GLubyte *) malloc(w * h);  /* 1 bpp */
+   buf2 = (GLubyte *) malloc(w * h * 3); /* 3 bpp */
 
    _mesa_PushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT);
    _mesa_PixelStorei(GL_PACK_ALIGNMENT, 1);
@@ -569,8 +569,8 @@ _mesa_dump_stencil_buffer(const char *filename)
 
    _mesa_PopClientAttrib();
 
-   _mesa_free(buf);
-   _mesa_free(buf2);
+   free(buf);
+   free(buf2);
 }
 
 
diff --git a/src/mesa/main/depthstencil.c b/src/mesa/main/depthstencil.c
index 49946a6506..892520b695 100644
--- a/src/mesa/main/depthstencil.c
+++ b/src/mesa/main/depthstencil.c
@@ -65,7 +65,7 @@ delete_wrapper(struct gl_renderbuffer *rb)
    ASSERT(rb->Format == MESA_FORMAT_Z24_S8 ||
           rb->Format == MESA_FORMAT_S8_Z24);
    _mesa_reference_renderbuffer(&rb->Wrapped, NULL);
-   _mesa_free(rb);
+   free(rb);
 }
 
 
@@ -818,5 +818,5 @@ _mesa_promote_stencil(GLcontext *ctx, struct gl_renderbuffer *stencilRb)
       }
       stencilRb->PutRow(ctx, stencilRb, width, 0, i, depthStencil, NULL);
    }
-   _mesa_free(data);
+   free(data);
 }
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 740ebfe17a..87b8ddacc2 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -472,7 +472,7 @@ make_list(GLuint name, GLuint count)
 {
    struct gl_display_list *dlist = CALLOC_STRUCT(gl_display_list);
    dlist->Name = name;
-   dlist->Head = (Node *) _mesa_malloc(sizeof(Node) * count);
+   dlist->Head = (Node *) malloc(sizeof(Node) * count);
    dlist->Head[0].opcode = OPCODE_END_OF_LIST;
    return dlist;
 }
@@ -557,108 +557,108 @@ _mesa_delete_list(GLcontext *ctx, struct gl_display_list *dlist)
          switch (opcode) {
             /* for some commands, we need to free malloc'd memory */
          case OPCODE_MAP1:
-            _mesa_free(n[6].data);
+            free(n[6].data);
             n += InstSize[n[0].opcode];
             break;
          case OPCODE_MAP2:
-            _mesa_free(n[10].data);
+            free(n[10].data);
             n += InstSize[n[0].opcode];
             break;
          case OPCODE_DRAW_PIXELS:
-            _mesa_free(n[5].data);
+            free(n[5].data);
             n += InstSize[n[0].opcode];
             break;
          case OPCODE_BITMAP:
-            _mesa_free(n[7].data);
+            free(n[7].data);
             n += InstSize[n[0].opcode];
             break;
          case OPCODE_COLOR_TABLE:
-            _mesa_free(n[6].data);
+            free(n[6].data);
             n += InstSize[n[0].opcode];
             break;
          case OPCODE_COLOR_SUB_TABLE:
-            _mesa_free(n[6].data);
+            free(n[6].data);
             n += InstSize[n[0].opcode];
             break;
          case OPCODE_CONVOLUTION_FILTER_1D:
-            _mesa_free(n[6].data);
+            free(n[6].data);
             n += InstSize[n[0].opcode];
             break;
          case OPCODE_CONVOLUTION_FILTER_2D:
-            _mesa_free(n[7].data);
+            free(n[7].data);
             n += InstSize[n[0].opcode];
             break;
          case OPCODE_POLYGON_STIPPLE:
-            _mesa_free(n[1].data);
+            free(n[1].data);
             n += InstSize[n[0].opcode];
             break;
          case OPCODE_TEX_IMAGE1D:
-            _mesa_free(n[8].data);
+            free(n[8].data);
             n += InstSize[n[0].opcode];
             break;
          case OPCODE_TEX_IMAGE2D:
-            _mesa_free(n[9].data);
+            free(n[9].data);
             n += InstSize[n[0].opcode];
             break;
          case OPCODE_TEX_IMAGE3D:
-            _mesa_free(n[10].data);
+            free(n[10].data);
             n += InstSize[n[0].opcode];
             break;
          case OPCODE_TEX_SUB_IMAGE1D:
-            _mesa_free(n[7].data);
+            free(n[7].data);
             n += InstSize[n[0].opcode];
             break;
          case OPCODE_TEX_SUB_IMAGE2D:
-            _mesa_free(n[9].data);
+            free(n[9].data);
             n += InstSize[n[0].opcode];
             break;
          case OPCODE_TEX_SUB_IMAGE3D:
-            _mesa_free(n[11].data);
+            free(n[11].data);
             n += InstSize[n[0].opcode];
             break;
          case OPCODE_COMPRESSED_TEX_IMAGE_1D:
-            _mesa_free(n[7].data);
+            free(n[7].data);
             n += InstSize[n[0].opcode];
             break;
          case OPCODE_COMPRESSED_TEX_IMAGE_2D:
-            _mesa_free(n[8].data);
+            free(n[8].data);
             n += InstSize[n[0].opcode];
             break;
          case OPCODE_COMPRESSED_TEX_IMAGE_3D:
-            _mesa_free(n[9].data);
+            free(n[9].data);
             n += InstSize[n[0].opcode];
             break;
          case OPCODE_COMPRESSED_TEX_SUB_IMAGE_1D:
-            _mesa_free(n[7].data);
+            free(n[7].data);
             n += InstSize[n[0].opcode];
             break;
          case OPCODE_COMPRESSED_TEX_SUB_IMAGE_2D:
-            _mesa_free(n[9].data);
+            free(n[9].data);
             n += InstSize[n[0].opcode];
             break;
          case OPCODE_COMPRESSED_TEX_SUB_IMAGE_3D:
-            _mesa_free(n[11].data);
+            free(n[11].data);
             n += InstSize[n[0].opcode];
             break;
 #if FEATURE_NV_vertex_program
          case OPCODE_LOAD_PROGRAM_NV:
-            _mesa_free(n[4].data);      /* program string */
+            free(n[4].data);      /* program string */
             n += InstSize[n[0].opcode];
             break;
          case OPCODE_REQUEST_RESIDENT_PROGRAMS_NV:
-            _mesa_free(n[2].data);      /* array of program ids */
+            free(n[2].data);      /* array of program ids */
             n += InstSize[n[0].opcode];
             break;
 #endif
 #if FEATURE_NV_fragment_program
          case OPCODE_PROGRAM_NAMED_PARAMETER_NV:
-            _mesa_free(n[3].data);      /* parameter name */
+            free(n[3].data);      /* parameter name */
             n += InstSize[n[0].opcode];
             break;
 #endif
 #if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
          case OPCODE_PROGRAM_STRING_ARB:
-            _mesa_free(n[4].data);      /* program string */
+            free(n[4].data);      /* program string */
             n += InstSize[n[0].opcode];
             break;
 #endif
@@ -670,7 +670,7 @@ _mesa_delete_list(GLcontext *ctx, struct gl_display_list *dlist)
          case OPCODE_UNIFORM_2IV:
          case OPCODE_UNIFORM_3IV:
          case OPCODE_UNIFORM_4IV:
-            _mesa_free(n[3].data);
+            free(n[3].data);
             n += InstSize[n[0].opcode];
             break;
          case OPCODE_UNIFORM_MATRIX22:
@@ -682,17 +682,17 @@ _mesa_delete_list(GLcontext *ctx, struct gl_display_list *dlist)
          case OPCODE_UNIFORM_MATRIX32:
          case OPCODE_UNIFORM_MATRIX34:
          case OPCODE_UNIFORM_MATRIX43:
-            _mesa_free(n[4].data);
+            free(n[4].data);
             n += InstSize[n[0].opcode];
             break;
 
          case OPCODE_CONTINUE:
             n = (Node *) n[1].next;
-            _mesa_free(block);
+            free(block);
             block = n;
             break;
          case OPCODE_END_OF_LIST:
-            _mesa_free(block);
+            free(block);
             done = GL_TRUE;
             break;
          default:
@@ -703,7 +703,7 @@ _mesa_delete_list(GLcontext *ctx, struct gl_display_list *dlist)
       }
    }
 
-   _mesa_free(dlist);
+   free(dlist);
 }
 
 
@@ -869,7 +869,7 @@ dlist_alloc(GLcontext *ctx, OpCode opcode, GLuint bytes)
       Node *newblock;
       n = ctx->ListState.CurrentBlock + ctx->ListState.CurrentPos;
       n[0].opcode = OPCODE_CONTINUE;
-      newblock = (Node *) _mesa_malloc(sizeof(Node) * BLOCK_SIZE);
+      newblock = (Node *) malloc(sizeof(Node) * BLOCK_SIZE);
       if (!newblock) {
          _mesa_error(ctx, GL_OUT_OF_MEMORY, "Building display list");
          return NULL;
@@ -2912,7 +2912,7 @@ save_PixelMapfv(GLenum map, GLint mapsize, const GLfloat *values)
    if (n) {
       n[1].e = map;
       n[2].i = mapsize;
-      n[3].data = (void *) _mesa_malloc(mapsize * sizeof(GLfloat));
+      n[3].data = (void *) malloc(mapsize * sizeof(GLfloat));
       memcpy(n[3].data, (void *) values, mapsize * sizeof(GLfloat));
    }
    if (ctx->ExecuteFlag) {
@@ -4360,7 +4360,7 @@ save_CompressedTexImage1DARB(GLenum target, GLint level,
       GLvoid *image;
       ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
       /* make copy of image */
-      image = _mesa_malloc(imageSize);
+      image = malloc(imageSize);
       if (!image) {
          _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexImage1DARB");
          return;
@@ -4377,7 +4377,7 @@ save_CompressedTexImage1DARB(GLenum target, GLint level,
          n[7].data = image;
       }
       else if (image) {
-         _mesa_free(image);
+         free(image);
       }
       if (ctx->ExecuteFlag) {
          CALL_CompressedTexImage1DARB(ctx->Exec,
@@ -4406,7 +4406,7 @@ save_CompressedTexImage2DARB(GLenum target, GLint level,
       GLvoid *image;
       ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
       /* make copy of image */
-      image = _mesa_malloc(imageSize);
+      image = malloc(imageSize);
       if (!image) {
          _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexImage2DARB");
          return;
@@ -4424,7 +4424,7 @@ save_CompressedTexImage2DARB(GLenum target, GLint level,
          n[8].data = image;
       }
       else if (image) {
-         _mesa_free(image);
+         free(image);
       }
       if (ctx->ExecuteFlag) {
          CALL_CompressedTexImage2DARB(ctx->Exec,
@@ -4453,7 +4453,7 @@ save_CompressedTexImage3DARB(GLenum target, GLint level,
       GLvoid *image;
       ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
       /* make copy of image */
-      image = _mesa_malloc(imageSize);
+      image = malloc(imageSize);
       if (!image) {
          _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexImage3DARB");
          return;
@@ -4472,7 +4472,7 @@ save_CompressedTexImage3DARB(GLenum target, GLint level,
          n[9].data = image;
       }
       else if (image) {
-         _mesa_free(image);
+         free(image);
       }
       if (ctx->ExecuteFlag) {
          CALL_CompressedTexImage3DARB(ctx->Exec,
@@ -4496,7 +4496,7 @@ save_CompressedTexSubImage1DARB(GLenum target, GLint level, GLint xoffset,
    ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
 
    /* make copy of image */
-   image = _mesa_malloc(imageSize);
+   image = malloc(imageSize);
    if (!image) {
       _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexSubImage1DARB");
       return;
@@ -4513,7 +4513,7 @@ save_CompressedTexSubImage1DARB(GLenum target, GLint level, GLint xoffset,
       n[7].data = image;
    }
    else if (image) {
-      _mesa_free(image);
+      free(image);
    }
    if (ctx->ExecuteFlag) {
       CALL_CompressedTexSubImage1DARB(ctx->Exec, (target, level, xoffset,
@@ -4536,7 +4536,7 @@ save_CompressedTexSubImage2DARB(GLenum target, GLint level, GLint xoffset,
    ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
 
    /* make copy of image */
-   image = _mesa_malloc(imageSize);
+   image = malloc(imageSize);
    if (!image) {
       _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexSubImage2DARB");
       return;
@@ -4555,7 +4555,7 @@ save_CompressedTexSubImage2DARB(GLenum target, GLint level, GLint xoffset,
       n[9].data = image;
    }
    else if (image) {
-      _mesa_free(image);
+      free(image);
    }
    if (ctx->ExecuteFlag) {
       CALL_CompressedTexSubImage2DARB(ctx->Exec,
@@ -4578,7 +4578,7 @@ save_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset,
    ASSERT_OUTSIDE_SAVE_BEGIN_END_AND_FLUSH(ctx);
 
    /* make copy of image */
-   image = _mesa_malloc(imageSize);
+   image = malloc(imageSize);
    if (!image) {
       _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCompressedTexSubImage3DARB");
       return;
@@ -4599,7 +4599,7 @@ save_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset,
       n[11].data = image;
    }
    else if (image) {
-      _mesa_free(image);
+      free(image);
    }
    if (ctx->ExecuteFlag) {
       CALL_CompressedTexSubImage3DARB(ctx->Exec,
@@ -4788,7 +4788,7 @@ save_LoadProgramNV(GLenum target, GLuint id, GLsizei len,
 
    n = alloc_instruction(ctx, OPCODE_LOAD_PROGRAM_NV, 4);
    if (n) {
-      GLubyte *programCopy = (GLubyte *) _mesa_malloc(len);
+      GLubyte *programCopy = (GLubyte *) malloc(len);
       if (!programCopy) {
          _mesa_error(ctx, GL_OUT_OF_MEMORY, "glLoadProgramNV");
          return;
@@ -4815,7 +4815,7 @@ save_RequestResidentProgramsNV(GLsizei num, const GLuint * ids)
 
    n = alloc_instruction(ctx, OPCODE_TRACK_MATRIX_NV, 2);
    if (n) {
-      GLuint *idCopy = (GLuint *) _mesa_malloc(num * sizeof(GLuint));
+      GLuint *idCopy = (GLuint *) malloc(num * sizeof(GLuint));
       if (!idCopy) {
          _mesa_error(ctx, GL_OUT_OF_MEMORY, "glRequestResidentProgramsNV");
          return;
@@ -4986,7 +4986,7 @@ save_ProgramNamedParameter4fNV(GLuint id, GLsizei len, const GLubyte * name,
 
    n = alloc_instruction(ctx, OPCODE_PROGRAM_NAMED_PARAMETER_NV, 6);
    if (n) {
-      GLubyte *nameCopy = (GLubyte *) _mesa_malloc(len);
+      GLubyte *nameCopy = (GLubyte *) malloc(len);
       if (!nameCopy) {
          _mesa_error(ctx, GL_OUT_OF_MEMORY, "glProgramNamedParameter4fNV");
          return;
@@ -5085,7 +5085,7 @@ save_ProgramStringARB(GLenum target, GLenum format, GLsizei len,
 
    n = alloc_instruction(ctx, OPCODE_PROGRAM_STRING_ARB, 4);
    if (n) {
-      GLubyte *programCopy = (GLubyte *) _mesa_malloc(len);
+      GLubyte *programCopy = (GLubyte *) malloc(len);
       if (!programCopy) {
          _mesa_error(ctx, GL_OUT_OF_MEMORY, "glProgramStringARB");
          return;
@@ -6199,7 +6199,7 @@ save_Uniform4fARB(GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 static void *
 memdup(const void *src, GLsizei bytes)
 {
-   void *b = bytes >= 0 ? _mesa_malloc(bytes) : NULL;
+   void *b = bytes >= 0 ? malloc(bytes) : NULL;
    if (b)
       memcpy(b, src, bytes);
    return b;
diff --git a/src/mesa/main/execmem.c b/src/mesa/main/execmem.c
index 4c6139985f..07a7f9fed8 100644
--- a/src/mesa/main/execmem.c
+++ b/src/mesa/main/execmem.c
@@ -140,14 +140,14 @@ _mesa_exec_free(void *addr)
 void *
 _mesa_exec_malloc(GLuint size)
 {
-   return _mesa_malloc( size );
+   return malloc( size );
 }
 
  
 void 
 _mesa_exec_free(void *addr)
 {
-   _mesa_free(addr);
+   free(addr);
 }
 
 
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index f24baf5acd..2c1120e19f 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -576,7 +576,7 @@ append(const char *a, const char *b)
 {
    const GLuint aLen = a ? strlen(a) : 0;
    const GLuint bLen = b ? strlen(b) : 0;
-   char *s = _mesa_calloc(aLen + bLen + 1);
+   char *s = calloc(1, aLen + bLen + 1);
    if (s) {
       if (a)
          memcpy(s, a, aLen);
@@ -585,7 +585,7 @@ append(const char *a, const char *b)
       s[aLen + bLen] = '\0';
    }
    if (a)
-      _mesa_free((void *) a);
+      free((void *) a);
    return s;
 }
 
@@ -685,7 +685,7 @@ _mesa_make_extension_string( GLcontext *ctx )
       extStrLen += strlen(extraExt) + 1; /* +1 for space */
 
    /* allocate the extension string */
-   s = (char *) _mesa_malloc(extStrLen);
+   s = (char *) malloc(extStrLen);
    if (!s)
       return NULL;
 
diff --git a/src/mesa/main/framebuffer.c b/src/mesa/main/framebuffer.c
index 41b5420943..065e25fd33 100644
--- a/src/mesa/main/framebuffer.c
+++ b/src/mesa/main/framebuffer.c
@@ -192,7 +192,7 @@ _mesa_destroy_framebuffer(struct gl_framebuffer *fb)
 {
    if (fb) {
       _mesa_free_framebuffer_data(fb);
-      _mesa_free(fb);
+      free(fb);
    }
 }
 
diff --git a/src/mesa/main/hash.c b/src/mesa/main/hash.c
index fdfbe6b4f4..975775469d 100644
--- a/src/mesa/main/hash.c
+++ b/src/mesa/main/hash.c
@@ -108,13 +108,13 @@ _mesa_DeleteHashTable(struct _mesa_HashTable *table)
             _mesa_problem(NULL,
                           "In _mesa_DeleteHashTable, found non-freed data");
          }
-	 _mesa_free(entry);
+	 free(entry);
 	 entry = next;
       }
    }
    _glthread_DESTROY_MUTEX(table->Mutex);
    _glthread_DESTROY_MUTEX(table->WalkMutex);
-   _mesa_free(table);
+   free(table);
 }
 
 
@@ -245,7 +245,7 @@ _mesa_HashRemove(struct _mesa_HashTable *table, GLuint key)
          else {
             table->Table[pos] = entry->Next;
          }
-         _mesa_free(entry);
+         free(entry);
          _glthread_UNLOCK_MUTEX(table->Mutex);
 	 return;
       }
@@ -282,7 +282,7 @@ _mesa_HashDeleteAll(struct _mesa_HashTable *table,
       for (entry = table->Table[pos]; entry; entry = next) {
          callback(entry->Key, entry->Data, userData);
          next = entry->Next;
-         _mesa_free(entry);
+         free(entry);
       }
       table->Table[pos] = NULL;
    }
diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index bd03217e2a..dc8d97728b 100644
--- a/src/mesa/main/image.c
+++ b/src/mesa/main/image.c
@@ -1038,7 +1038,7 @@ _mesa_unpack_polygon_stipple( const GLubyte *pattern, GLuint dest[32],
                  | (p[3]      );
          p += 4;
       }
-      _mesa_free(ptrn);
+      free(ptrn);
    }
 }
 
@@ -1083,7 +1083,7 @@ _mesa_unpack_bitmap( GLint width, GLint height, const GLubyte *pixels,
 
    /* Alloc dest storage */
    bytes = ((width + 7) / 8 * height);
-   buffer = (GLubyte *) _mesa_malloc( bytes );
+   buffer = (GLubyte *) malloc( bytes );
    if (!buffer)
       return NULL;
 
@@ -1094,7 +1094,7 @@ _mesa_unpack_bitmap( GLint width, GLint height, const GLubyte *pixels,
          _mesa_image_address2d(packing, pixels, width, height,
                                GL_COLOR_INDEX, GL_BITMAP, row, 0);
       if (!src) {
-         _mesa_free(buffer);
+         free(buffer);
          return NULL;
       }
 
@@ -5232,7 +5232,7 @@ _mesa_unpack_image( GLuint dimensions,
 
    {
       GLubyte *destBuffer
-         = (GLubyte *) _mesa_malloc(bytesPerRow * height * depth);
+         = (GLubyte *) malloc(bytesPerRow * height * depth);
       GLubyte *dst;
       GLint img, row;
       if (!destBuffer)
diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index 5c2c863f97..10224f7888 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -71,27 +71,6 @@ extern int vsnprintf(char *str, size_t count, const char *fmt, va_list arg);
 /** \name Memory */
 /*@{*/
 
-/** Wrapper around malloc() */
-void *
-_mesa_malloc(size_t bytes)
-{
-   return malloc(bytes);
-}
-
-/** Wrapper around calloc() */
-void *
-_mesa_calloc(size_t bytes)
-{
-   return calloc(1, bytes);
-}
-
-/** Wrapper around free() */
-void
-_mesa_free(void *ptr)
-{
-   free(ptr);
-}
-
 /**
  * Allocate aligned memory.
  *
@@ -118,7 +97,7 @@ _mesa_align_malloc(size_t bytes, unsigned long alignment)
 
    ASSERT( alignment > 0 );
 
-   ptr = (uintptr_t) _mesa_malloc(bytes + alignment + sizeof(void *));
+   ptr = (uintptr_t) malloc(bytes + alignment + sizeof(void *));
    if (!ptr)
       return NULL;
 
@@ -138,8 +117,8 @@ _mesa_align_malloc(size_t bytes, unsigned long alignment)
 }
 
 /**
- * Same as _mesa_align_malloc(), but using _mesa_calloc() instead of
- * _mesa_malloc()
+ * Same as _mesa_align_malloc(), but using calloc(1, ) instead of
+ * malloc()
  */
 void *
 _mesa_align_calloc(size_t bytes, unsigned long alignment)
@@ -167,7 +146,7 @@ _mesa_align_calloc(size_t bytes, unsigned long alignment)
 
    ASSERT( alignment > 0 );
 
-   ptr = (uintptr_t) _mesa_calloc(bytes + alignment + sizeof(void *));
+   ptr = (uintptr_t) calloc(1, bytes + alignment + sizeof(void *));
    if (!ptr)
       return NULL;
 
@@ -203,7 +182,7 @@ _mesa_align_free(void *ptr)
 #else
    void **cubbyHole = (void **) ((char *) ptr - sizeof(void *));
    void *realAddr = *cubbyHole;
-   _mesa_free(realAddr);
+   free(realAddr);
 #endif /* defined(HAVE_POSIX_MEMALIGN) */
 }
 
@@ -236,11 +215,11 @@ void *
 _mesa_realloc(void *oldBuffer, size_t oldSize, size_t newSize)
 {
    const size_t copySize = (oldSize < newSize) ? oldSize : newSize;
-   void *newBuffer = _mesa_malloc(newSize);
+   void *newBuffer = malloc(newSize);
    if (newBuffer && oldBuffer && copySize > 0)
       memcpy(newBuffer, oldBuffer, copySize);
    if (oldBuffer)
-      _mesa_free(oldBuffer);
+      free(oldBuffer);
    return newBuffer;
 }
 
@@ -798,7 +777,7 @@ _mesa_getenv( const char *var )
 /*@{*/
 
 /**
- * Implemented using _mesa_malloc() and strcpy.
+ * Implemented using malloc() and strcpy.
  * Note that NULL is handled accordingly.
  */
 char *
@@ -806,7 +785,7 @@ _mesa_strdup( const char *s )
 {
    if (s) {
       size_t l = strlen(s);
-      char *s2 = (char *) _mesa_malloc(l + 1);
+      char *s2 = (char *) malloc(l + 1);
       if (s2)
          strcpy(s2, s);
       return s2;
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index 106dd021a1..4eabdfdb0d 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -50,15 +50,15 @@ extern "C" {
 /*@{*/
 
 /** Allocate \p BYTES bytes */
-#define MALLOC(BYTES)      _mesa_malloc(BYTES)
+#define MALLOC(BYTES)      malloc(BYTES)
 /** Allocate and zero \p BYTES bytes */
-#define CALLOC(BYTES)      _mesa_calloc(BYTES)
+#define CALLOC(BYTES)      calloc(1, BYTES)
 /** Allocate a structure of type \p T */
-#define MALLOC_STRUCT(T)   (struct T *) _mesa_malloc(sizeof(struct T))
+#define MALLOC_STRUCT(T)   (struct T *) malloc(sizeof(struct T))
 /** Allocate and zero a structure of type \p T */
-#define CALLOC_STRUCT(T)   (struct T *) _mesa_calloc(sizeof(struct T))
+#define CALLOC_STRUCT(T)   (struct T *) calloc(1, sizeof(struct T))
 /** Free memory */
-#define FREE(PTR)          _mesa_free(PTR)
+#define FREE(PTR)          free(PTR)
 
 /** Allocate \p BYTES aligned at \p N bytes */
 #define ALIGN_MALLOC(BYTES, N)     _mesa_align_malloc(BYTES, N)
@@ -507,15 +507,6 @@ _mesa_little_endian(void)
  * Functions
  */
 
-extern void *
-_mesa_malloc( size_t bytes );
-
-extern void *
-_mesa_calloc( size_t bytes );
-
-extern void
-_mesa_free( void *ptr );
-
 extern void *
 _mesa_align_malloc( size_t bytes, unsigned long alignment );
 
diff --git a/src/mesa/main/light.c b/src/mesa/main/light.c
index 654faa5c77..6899ed0ddf 100644
--- a/src/mesa/main/light.c
+++ b/src/mesa/main/light.c
@@ -1433,7 +1433,7 @@ _mesa_free_lighting_data( GLcontext *ctx )
 
    /* Free lighting shininess exponentiation table */
    foreach_s( s, tmps, ctx->_ShineTabList ) {
-      _mesa_free( s );
+      free( s );
    }
-   _mesa_free( ctx->_ShineTabList );
+   free( ctx->_ShineTabList );
 }
diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c
index 1da576337f..415abcdfa1 100644
--- a/src/mesa/main/mipmap.c
+++ b/src/mesa/main/mipmap.c
@@ -1537,15 +1537,15 @@ _mesa_generate_mipmap(GLcontext *ctx, GLenum target,
       size = _mesa_bytes_per_pixel(srcImage->_BaseFormat, CHAN_TYPE)
          * srcImage->Width * srcImage->Height * srcImage->Depth + 20;
       /* 20 extra bytes, just be safe when calling last FetchTexel */
-      srcData = (GLubyte *) _mesa_malloc(size);
+      srcData = (GLubyte *) malloc(size);
       if (!srcData) {
          _mesa_error(ctx, GL_OUT_OF_MEMORY, "generate mipmaps");
          return;
       }
-      dstData = (GLubyte *) _mesa_malloc(size / 2);  /* 1/4 would probably be OK */
+      dstData = (GLubyte *) malloc(size / 2);  /* 1/4 would probably be OK */
       if (!dstData) {
          _mesa_error(ctx, GL_OUT_OF_MEMORY, "generate mipmaps");
-         _mesa_free((void *) srcData);
+         free((void *) srcData);
          return;
       }
 
@@ -1590,8 +1590,8 @@ _mesa_generate_mipmap(GLcontext *ctx, GLenum target,
       if (!nextLevel) {
          /* all done */
          if (_mesa_is_format_compressed(srcImage->TexFormat)) {
-            _mesa_free((void *) srcData);
-            _mesa_free(dstData);
+            free((void *) srcData);
+            free(dstData);
          }
          return;
       }
diff --git a/src/mesa/main/mm.c b/src/mesa/main/mm.c
index d430bcdb84..3ef38e94be 100644
--- a/src/mesa/main/mm.c
+++ b/src/mesa/main/mm.c
@@ -60,13 +60,13 @@ mmInit(unsigned ofs, unsigned size)
    if (!size) 
       return NULL;
 
-   heap = (struct mem_block *) _mesa_calloc(sizeof(struct mem_block));
+   heap = (struct mem_block *) calloc(1, sizeof(struct mem_block));
    if (!heap) 
       return NULL;
    
-   block = (struct mem_block *) _mesa_calloc(sizeof(struct mem_block));
+   block = (struct mem_block *) calloc(1, sizeof(struct mem_block));
    if (!block) {
-      _mesa_free(heap);
+      free(heap);
       return NULL;
    }
 
@@ -98,7 +98,7 @@ SliceBlock(struct mem_block *p,
 
    /* break left  [p, newblock, p->next], then p = newblock */
    if (startofs > p->ofs) {
-      newblock = (struct mem_block*) _mesa_calloc(sizeof(struct mem_block));
+      newblock = (struct mem_block*) calloc(1, sizeof(struct mem_block));
       if (!newblock)
 	 return NULL;
       newblock->ofs = startofs;
@@ -122,7 +122,7 @@ SliceBlock(struct mem_block *p,
 
    /* break right, also [p, newblock, p->next] */
    if (size < p->size) {
-      newblock = (struct mem_block*) _mesa_calloc(sizeof(struct mem_block));
+      newblock = (struct mem_block*) calloc(1, sizeof(struct mem_block));
       if (!newblock)
 	 return NULL;
       newblock->ofs = startofs + size;
@@ -225,7 +225,7 @@ Join2Blocks(struct mem_block *p)
       q->next_free->prev_free = q->prev_free; 
       q->prev_free->next_free = q->next_free;
      
-      _mesa_free(q);
+      free(q);
       return 1;
    }
    return 0;
@@ -270,9 +270,9 @@ mmDestroy(struct mem_block *heap)
 
    for (p = heap->next; p != heap; ) {
       struct mem_block *next = p->next;
-      _mesa_free(p);
+      free(p);
       p = next;
    }
 
-   _mesa_free(heap);
+   free(heap);
 }
diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c
index 387a82fc9d..471352f472 100644
--- a/src/mesa/main/queryobj.c
+++ b/src/mesa/main/queryobj.c
@@ -114,7 +114,7 @@ _mesa_check_query(GLcontext *ctx, struct gl_query_object *q)
 static void
 _mesa_delete_query(GLcontext *ctx, struct gl_query_object *q)
 {
-   _mesa_free(q);
+   free(q);
 }
 
 
diff --git a/src/mesa/main/renderbuffer.c b/src/mesa/main/renderbuffer.c
index aec22d9d14..c44db255d6 100644
--- a/src/mesa/main/renderbuffer.c
+++ b/src/mesa/main/renderbuffer.c
@@ -1122,7 +1122,7 @@ _mesa_soft_renderbuffer_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
 
    /* free old buffer storage */
    if (rb->Data) {
-      _mesa_free(rb->Data);
+      free(rb->Data);
       rb->Data = NULL;
    }
 
@@ -1179,10 +1179,10 @@ alloc_storage_alpha8(GLcontext *ctx, struct gl_renderbuffer *arb,
 
    /* next, resize my alpha buffer */
    if (arb->Data) {
-      _mesa_free(arb->Data);
+      free(arb->Data);
    }
 
-   arb->Data = _mesa_malloc(width * height * sizeof(GLubyte));
+   arb->Data = malloc(width * height * sizeof(GLubyte));
    if (arb->Data == NULL) {
       arb->Width = 0;
       arb->Height = 0;
@@ -1204,13 +1204,13 @@ static void
 delete_renderbuffer_alpha8(struct gl_renderbuffer *arb)
 {
    if (arb->Data) {
-      _mesa_free(arb->Data);
+      free(arb->Data);
    }
    ASSERT(arb->Wrapped);
    ASSERT(arb != arb->Wrapped);
    arb->Wrapped->Delete(arb->Wrapped);
    arb->Wrapped = NULL;
-   _mesa_free(arb);
+   free(arb);
 }
 
 
@@ -1460,9 +1460,9 @@ void
 _mesa_delete_renderbuffer(struct gl_renderbuffer *rb)
 {
    if (rb->Data) {
-      _mesa_free(rb->Data);
+      free(rb->Data);
    }
-   _mesa_free(rb);
+   free(rb);
 }
 
 
diff --git a/src/mesa/main/shaders.c b/src/mesa/main/shaders.c
index 91f2a7a7bf..e6f6add768 100644
--- a/src/mesa/main/shaders.c
+++ b/src/mesa/main/shaders.c
@@ -434,7 +434,7 @@ _mesa_ShaderSourceARB(GLhandleARB shaderObj, GLsizei count,
     * This array holds offsets of where the appropriate string ends, thus the
     * last element will be set to the total length of the source code.
     */
-   offsets = (GLint *) _mesa_malloc(count * sizeof(GLint));
+   offsets = (GLint *) malloc(count * sizeof(GLint));
    if (offsets == NULL) {
       _mesa_error(ctx, GL_OUT_OF_MEMORY, "glShaderSourceARB");
       return;
@@ -442,7 +442,7 @@ _mesa_ShaderSourceARB(GLhandleARB shaderObj, GLsizei count,
 
    for (i = 0; i < count; i++) {
       if (string[i] == NULL) {
-         _mesa_free((GLvoid *) offsets);
+         free((GLvoid *) offsets);
          _mesa_error(ctx, GL_INVALID_OPERATION, "glShaderSourceARB(null string)");
          return;
       }
@@ -460,9 +460,9 @@ _mesa_ShaderSourceARB(GLhandleARB shaderObj, GLsizei count,
     * valgrind warnings in the parser/grammer code.
     */
    totalLength = offsets[count - 1] + 2;
-   source = (GLcharARB *) _mesa_malloc(totalLength * sizeof(GLcharARB));
+   source = (GLcharARB *) malloc(totalLength * sizeof(GLcharARB));
    if (source == NULL) {
-      _mesa_free((GLvoid *) offsets);
+      free((GLvoid *) offsets);
       _mesa_error(ctx, GL_OUT_OF_MEMORY, "glShaderSourceARB");
       return;
    }
@@ -491,7 +491,7 @@ _mesa_ShaderSourceARB(GLhandleARB shaderObj, GLsizei count,
       if (newSource) {
          _mesa_fprintf(stderr, "Mesa: Replacing shader %u chksum=%d with %s\n",
                        shaderObj, checksum, filename);
-         _mesa_free(source);
+         free(source);
          source = newSource;
       }
    }      
@@ -504,7 +504,7 @@ _mesa_ShaderSourceARB(GLhandleARB shaderObj, GLsizei count,
          sh->SourceChecksum = checksum; /* save original checksum */
    }
 
-   _mesa_free(offsets);
+   free(offsets);
 }
 
 
diff --git a/src/mesa/main/shared.c b/src/mesa/main/shared.c
index b889364f0d..e364e24048 100644
--- a/src/mesa/main/shared.c
+++ b/src/mesa/main/shared.c
@@ -362,7 +362,7 @@ free_shared_state(GLcontext *ctx, struct gl_shared_state *shared)
    _glthread_DESTROY_MUTEX(shared->Mutex);
    _glthread_DESTROY_MUTEX(shared->TexMutex);
 
-   _mesa_free(shared);
+   free(shared);
 }
 
 
diff --git a/src/mesa/main/syncobj.c b/src/mesa/main/syncobj.c
index 36b48fd9f2..1bff308177 100644
--- a/src/mesa/main/syncobj.c
+++ b/src/mesa/main/syncobj.c
@@ -78,7 +78,7 @@ static void
 _mesa_delete_sync_object(GLcontext *ctx, struct gl_sync_object *syncObj)
 {
    (void) ctx;
-   _mesa_free(syncObj);
+   free(syncObj);
 }
 
 
diff --git a/src/mesa/main/texcompress_fxt1.c b/src/mesa/main/texcompress_fxt1.c
index 73a31a17ec..71e40dd3e9 100644
--- a/src/mesa/main/texcompress_fxt1.c
+++ b/src/mesa/main/texcompress_fxt1.c
@@ -105,7 +105,7 @@ _mesa_texstore_rgb_fxt1(TEXSTORE_PARAMS)
                dst, dstRowStride);
 
    if (tempImage)
-      _mesa_free((void*) tempImage);
+      free((void*) tempImage);
 
    return GL_TRUE;
 }
@@ -162,7 +162,7 @@ _mesa_texstore_rgba_fxt1(TEXSTORE_PARAMS)
                dst, dstRowStride);
 
    if (tempImage)
-      _mesa_free((void*) tempImage);
+      free((void*) tempImage);
 
    return GL_TRUE;
 }
@@ -1305,7 +1305,7 @@ fxt1_encode (GLuint width, GLuint height, GLint comps,
    if ((width & 7) | (height & 3)) {
       GLint newWidth = (width + 7) & ~7;
       GLint newHeight = (height + 3) & ~3;
-      newSource = _mesa_malloc(comps * newWidth * newHeight * sizeof(GLchan));
+      newSource = malloc(comps * newWidth * newHeight * sizeof(GLchan));
       if (!newSource) {
          GET_CURRENT_CONTEXT(ctx);
          _mesa_error(ctx, GL_OUT_OF_MEMORY, "texture compression");
@@ -1324,7 +1324,7 @@ fxt1_encode (GLuint width, GLuint height, GLint comps,
    if (CHAN_TYPE != GL_UNSIGNED_BYTE) {
       const GLuint n = width * height * comps;
       const GLchan *src = (const GLchan *) source;
-      GLubyte *dest = (GLubyte *) _mesa_malloc(n * sizeof(GLubyte));
+      GLubyte *dest = (GLubyte *) malloc(n * sizeof(GLubyte));
       GLuint i;
       if (!dest) {
          GET_CURRENT_CONTEXT(ctx);
@@ -1335,7 +1335,7 @@ fxt1_encode (GLuint width, GLuint height, GLint comps,
          dest[i] = CHAN_TO_UBYTE(src[i]);
       }
       if (newSource != NULL) {
-         _mesa_free(newSource);
+         free(newSource);
       }
       newSource = dest;  /* we'll free this buffer before returning */
       source = dest;  /* the new, GLubyte incoming image */
@@ -1361,7 +1361,7 @@ fxt1_encode (GLuint width, GLuint height, GLint comps,
 
  cleanUp:
    if (newSource != NULL) {
-      _mesa_free(newSource);
+      free(newSource);
    }
 }
 
diff --git a/src/mesa/main/texcompress_s3tc.c b/src/mesa/main/texcompress_s3tc.c
index b271a539a7..fcd28a4b4e 100644
--- a/src/mesa/main/texcompress_s3tc.c
+++ b/src/mesa/main/texcompress_s3tc.c
@@ -213,7 +213,7 @@ _mesa_texstore_rgb_dxt1(TEXSTORE_PARAMS)
    }
 
    if (tempImage)
-      _mesa_free((void *) tempImage);
+      free((void *) tempImage);
 
    return GL_TRUE;
 }
@@ -275,7 +275,7 @@ _mesa_texstore_rgba_dxt1(TEXSTORE_PARAMS)
    }
 
    if (tempImage)
-      _mesa_free((void*) tempImage);
+      free((void*) tempImage);
 
    return GL_TRUE;
 }
@@ -336,7 +336,7 @@ _mesa_texstore_rgba_dxt3(TEXSTORE_PARAMS)
    }
 
    if (tempImage)
-      _mesa_free((void *) tempImage);
+      free((void *) tempImage);
 
    return GL_TRUE;
 }
@@ -397,7 +397,7 @@ _mesa_texstore_rgba_dxt5(TEXSTORE_PARAMS)
    }
 
    if (tempImage)
-      _mesa_free((void *) tempImage);
+      free((void *) tempImage);
 
    return GL_TRUE;
 }
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index da3c6f9841..11e37dc34e 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -488,8 +488,8 @@ _mesa_delete_texture_image( GLcontext *ctx, struct gl_texture_image *texImage )
 
    ASSERT(texImage->Data == NULL);
    if (texImage->ImageOffsets)
-      _mesa_free(texImage->ImageOffsets);
-   _mesa_free(texImage);
+      free(texImage->ImageOffsets);
+   free(texImage);
 }
 
 
@@ -843,7 +843,7 @@ clear_teximage_fields(struct gl_texture_image *img)
    img->Depth = 0;
    img->RowStride = 0;
    if (img->ImageOffsets) {
-      _mesa_free(img->ImageOffsets);
+      free(img->ImageOffsets);
       img->ImageOffsets = NULL;
    }
    img->Width2 = 0;
@@ -932,8 +932,8 @@ _mesa_init_teximage_fields(GLcontext *ctx, GLenum target,
     * case code in the texstore routines.
     */
    if (img->ImageOffsets)
-      _mesa_free(img->ImageOffsets);
-   img->ImageOffsets = (GLuint *) _mesa_malloc(depth * sizeof(GLuint));
+      free(img->ImageOffsets);
+   img->ImageOffsets = (GLuint *) malloc(depth * sizeof(GLuint));
    for (i = 0; i < depth; i++) {
       img->ImageOffsets[i] = i * width * height;
    }
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index 649f3587cb..feba6e95b6 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -207,7 +207,7 @@ _mesa_delete_texture_object( GLcontext *ctx, struct gl_texture_object *texObj )
    _glthread_DESTROY_MUTEX(texObj->Mutex);
 
    /* free this object */
-   _mesa_free(texObj);
+   free(texObj);
 }
 
 
diff --git a/src/mesa/main/texrender.c b/src/mesa/main/texrender.c
index cf603d46d8..dbed51a77f 100644
--- a/src/mesa/main/texrender.c
+++ b/src/mesa/main/texrender.c
@@ -414,7 +414,7 @@ static void
 delete_texture_wrapper(struct gl_renderbuffer *rb)
 {
    ASSERT(rb->RefCount == 0);
-   _mesa_free(rb);
+   free(rb);
 }
 
 
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index ab572a13ed..bd63c77a39 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -347,16 +347,16 @@ make_temp_float_image(GLcontext *ctx, GLuint dims,
       GLfloat *convImage;
 
       /* pre-convolution image buffer (3D) */
-      tempImage = (GLfloat *) _mesa_malloc(srcWidth * srcHeight * srcDepth
+      tempImage = (GLfloat *) malloc(srcWidth * srcHeight * srcDepth
                                            * 4 * sizeof(GLfloat));
       if (!tempImage)
          return NULL;
 
       /* post-convolution image buffer (2D) */
-      convImage = (GLfloat *) _mesa_malloc(srcWidth * srcHeight
+      convImage = (GLfloat *) malloc(srcWidth * srcHeight
                                            * 4 * sizeof(GLfloat));
       if (!convImage) {
-         _mesa_free(tempImage);
+         free(tempImage);
          return NULL;
       }
 
@@ -419,7 +419,7 @@ make_temp_float_image(GLcontext *ctx, GLuint dims,
          }
       } /* loop over 3D image slices */
 
-      _mesa_free(convImage);
+      free(convImage);
 
       /* might need these below */
       srcWidth = convWidth;
@@ -433,7 +433,7 @@ make_temp_float_image(GLcontext *ctx, GLuint dims,
       GLfloat *dst;
       GLint img, row;
 
-      tempImage = (GLfloat *) _mesa_malloc(srcWidth * srcHeight * srcDepth
+      tempImage = (GLfloat *) malloc(srcWidth * srcHeight * srcDepth
                                            * components * sizeof(GLfloat));
       if (!tempImage)
          return NULL;
@@ -472,10 +472,10 @@ make_temp_float_image(GLcontext *ctx, GLuint dims,
        */
       ASSERT(texComponents >= logComponents);
 
-      newImage = (GLfloat *) _mesa_malloc(srcWidth * srcHeight * srcDepth
+      newImage = (GLfloat *) malloc(srcWidth * srcHeight * srcDepth
                                           * texComponents * sizeof(GLfloat));
       if (!newImage) {
-         _mesa_free(tempImage);
+         free(tempImage);
          return NULL;
       }
 
@@ -495,7 +495,7 @@ make_temp_float_image(GLcontext *ctx, GLuint dims,
          }
       }
 
-      _mesa_free(tempImage);
+      free(tempImage);
       tempImage = newImage;
    }
 
@@ -582,11 +582,11 @@ _mesa_make_temp_chan_image(GLcontext *ctx, GLuint dims,
 #endif
 
    /* unpack and transfer the source image */
-   tempImage = (GLchan *) _mesa_malloc(srcWidth * srcHeight * srcDepth
+   tempImage = (GLchan *) malloc(srcWidth * srcHeight * srcDepth
                                        * components * sizeof(GLchan));
    if (!tempImage) {
       if (freeSrcImage) {
-         _mesa_free((void *) srcAddr);
+         free((void *) srcAddr);
       }
       return NULL;
    }
@@ -611,7 +611,7 @@ _mesa_make_temp_chan_image(GLcontext *ctx, GLuint dims,
 
    /* If we made a temporary image for convolution, free it here */
    if (freeSrcImage) {
-      _mesa_free((void *) srcAddr);
+      free((void *) srcAddr);
    }
 
    if (logicalBaseFormat != textureBaseFormat) {
@@ -631,10 +631,10 @@ _mesa_make_temp_chan_image(GLcontext *ctx, GLuint dims,
        */
       ASSERT(texComponents >= logComponents);
 
-      newImage = (GLchan *) _mesa_malloc(srcWidth * srcHeight * srcDepth
+      newImage = (GLchan *) malloc(srcWidth * srcHeight * srcDepth
                                          * texComponents * sizeof(GLchan));
       if (!newImage) {
-         _mesa_free(tempImage);
+         free(tempImage);
          return NULL;
       }
 
@@ -654,7 +654,7 @@ _mesa_make_temp_chan_image(GLcontext *ctx, GLuint dims,
          }
       }
 
-      _mesa_free(tempImage);
+      free(tempImage);
       tempImage = newImage;
    }
 
@@ -1267,7 +1267,7 @@ _mesa_texstore_rgb565(TEXSTORE_PARAMS)
             dstRow += dstRowStride;
          }
       }
-      _mesa_free((void *) tempImage);
+      free((void *) tempImage);
    }
    return GL_TRUE;
 }
@@ -1395,7 +1395,7 @@ _mesa_texstore_rgba8888(TEXSTORE_PARAMS)
             dstRow += dstRowStride;
          }
       }
-      _mesa_free((void *) tempImage);
+      free((void *) tempImage);
    }
    return GL_TRUE;
 }
@@ -1606,7 +1606,7 @@ _mesa_texstore_argb8888(TEXSTORE_PARAMS)
             dstRow += dstRowStride;
          }
       }
-      _mesa_free((void *) tempImage);
+      free((void *) tempImage);
    }
    return GL_TRUE;
 }
@@ -1733,7 +1733,7 @@ _mesa_texstore_rgb888(TEXSTORE_PARAMS)
             dstRow += dstRowStride;
          }
       }
-      _mesa_free((void *) tempImage);
+      free((void *) tempImage);
    }
    return GL_TRUE;
 }
@@ -1841,7 +1841,7 @@ _mesa_texstore_bgr888(TEXSTORE_PARAMS)
             dstRow += dstRowStride;
          }
       }
-      _mesa_free((void *) tempImage);
+      free((void *) tempImage);
    }
    return GL_TRUE;
 }
@@ -1912,7 +1912,7 @@ _mesa_texstore_argb4444(TEXSTORE_PARAMS)
             dstRow += dstRowStride;
          }
       }
-      _mesa_free((void *) tempImage);
+      free((void *) tempImage);
    }
    return GL_TRUE;
 }
@@ -1970,7 +1970,7 @@ _mesa_texstore_rgba5551(TEXSTORE_PARAMS)
             dstRow += dstRowStride;
          }
       }
-      _mesa_free((void *) tempImage);
+      free((void *) tempImage);
    }
    return GL_TRUE;
 }
@@ -2040,7 +2040,7 @@ _mesa_texstore_argb1555(TEXSTORE_PARAMS)
             dstRow += dstRowStride;
          }
       }
-      _mesa_free((void *) tempImage);
+      free((void *) tempImage);
    }
    return GL_TRUE;
 }
@@ -2143,7 +2143,7 @@ _mesa_texstore_al88(TEXSTORE_PARAMS)
             dstRow += dstRowStride;
          }
       }
-      _mesa_free((void *) tempImage);
+      free((void *) tempImage);
    }
    return GL_TRUE;
 }
@@ -2218,7 +2218,7 @@ _mesa_texstore_al1616(TEXSTORE_PARAMS)
             dstRow += dstRowStride;
          }
       }
-      _mesa_free((void *) tempImage);
+      free((void *) tempImage);
    }
    return GL_TRUE;
 }
@@ -2273,7 +2273,7 @@ _mesa_texstore_rgb332(TEXSTORE_PARAMS)
             dstRow += dstRowStride;
          }
       }
-      _mesa_free((void *) tempImage);
+      free((void *) tempImage);
    }
    return GL_TRUE;
 }
@@ -2360,7 +2360,7 @@ _mesa_texstore_a8(TEXSTORE_PARAMS)
             src += srcWidth;
          }
       }
-      _mesa_free((void *) tempImage);
+      free((void *) tempImage);
    }
    return GL_TRUE;
 }
@@ -2518,7 +2518,7 @@ _mesa_texstore_dudv8(TEXSTORE_PARAMS)
       GLbyte *tempImage, *dst, *src;
       GLint row;
 
-      tempImage = (GLbyte *) _mesa_malloc(srcWidth * srcHeight * srcDepth
+      tempImage = (GLbyte *) malloc(srcWidth * srcHeight * srcDepth
                                           * components * sizeof(GLbyte));
       if (!tempImage)
          return GL_FALSE;
@@ -2546,7 +2546,7 @@ _mesa_texstore_dudv8(TEXSTORE_PARAMS)
          dst += dstRowStride;
          src += srcWidth * texelBytes;
       }
-      _mesa_free((void *) tempImage);
+      free((void *) tempImage);
    }
    return GL_TRUE;
 }
@@ -2667,7 +2667,7 @@ _mesa_texstore_signed_rgba8888(TEXSTORE_PARAMS)
             dstRow += dstRowStride;
          }
       }
-      _mesa_free((void *) tempImage);
+      free((void *) tempImage);
    }
    return GL_TRUE;
 }
@@ -2925,7 +2925,7 @@ _mesa_texstore_rgba_float32(TEXSTORE_PARAMS)
          }
       }
 
-      _mesa_free((void *) tempImage);
+      free((void *) tempImage);
    }
    return GL_TRUE;
 }
@@ -2996,7 +2996,7 @@ _mesa_texstore_rgba_float16(TEXSTORE_PARAMS)
          }
       }
 
-      _mesa_free((void *) tempImage);
+      free((void *) tempImage);
    }
    return GL_TRUE;
 }
diff --git a/src/mesa/main/version.c b/src/mesa/main/version.c
index 9d23c577bd..e474fe7fa5 100644
--- a/src/mesa/main/version.c
+++ b/src/mesa/main/version.c
@@ -122,7 +122,7 @@ _mesa_compute_version(GLcontext *ctx)
 
    compute_version(ctx, &ctx->VersionMajor, &ctx->VersionMinor);
    
-   ctx->VersionString = (char *) _mesa_malloc(max);
+   ctx->VersionString = (char *) malloc(max);
    if (ctx->VersionString) {
       _mesa_snprintf(ctx->VersionString, max, "%u.%u Mesa " MESA_VERSION_STRING,
                      ctx->VersionMajor, ctx->VersionMinor);
diff --git a/src/mesa/shader/arbprogparse.c b/src/mesa/shader/arbprogparse.c
index bdd26b7f3a..03ff30a239 100644
--- a/src/mesa/shader/arbprogparse.c
+++ b/src/mesa/shader/arbprogparse.c
@@ -85,7 +85,7 @@ _mesa_parse_arb_fragment_program(GLcontext* ctx, GLenum target,
    }
 
    if (program->Base.String != NULL)
-      _mesa_free(program->Base.String);
+      free(program->Base.String);
 
    /* Copy the relevant contents of the arb_program struct into the
     * fragment_program struct.
@@ -130,7 +130,7 @@ _mesa_parse_arb_fragment_program(GLcontext* ctx, GLenum target,
       program->Base.InputsRead |= FRAG_BIT_FOGC;
 
    if (program->Base.Instructions)
-      _mesa_free(program->Base.Instructions);
+      free(program->Base.Instructions);
    program->Base.Instructions = prog.Instructions;
 
    if (program->Base.Parameters)
@@ -181,7 +181,7 @@ _mesa_parse_arb_vertex_program(GLcontext *ctx, GLenum target,
    }
 
    if (program->Base.String != NULL)
-      _mesa_free(program->Base.String);
+      free(program->Base.String);
 
    /* Copy the relevant contents of the arb_program struct into the 
     * vertex_program struct.
@@ -203,7 +203,7 @@ _mesa_parse_arb_vertex_program(GLcontext *ctx, GLenum target,
       ? GL_TRUE : GL_FALSE;
 
    if (program->Base.Instructions)
-      _mesa_free(program->Base.Instructions);
+      free(program->Base.Instructions);
    program->Base.Instructions = prog.Instructions;
 
    if (program->Base.Parameters)
diff --git a/src/mesa/shader/atifragshader.c b/src/mesa/shader/atifragshader.c
index fb2fa4b95f..870f77e30d 100644
--- a/src/mesa/shader/atifragshader.c
+++ b/src/mesa/shader/atifragshader.c
@@ -60,11 +60,11 @@ _mesa_delete_ati_fragment_shader(GLcontext *ctx, struct ati_fragment_shader *s)
    GLuint i;
    for (i = 0; i < MAX_NUM_PASSES_ATI; i++) {
       if (s->Instructions[i])
-         _mesa_free(s->Instructions[i]);
+         free(s->Instructions[i]);
       if (s->SetupInst[i])
-         _mesa_free(s->SetupInst[i]);
+         free(s->SetupInst[i]);
    }
-   _mesa_free(s);
+   free(s);
 }
 
 
@@ -293,7 +293,7 @@ _mesa_DeleteFragmentShaderATI(GLuint id)
       if (prog) {
 	 prog->RefCount--;
 	 if (prog->RefCount <= 0) {
-	    _mesa_free(prog);
+	    free(prog);
 	 }
       }
    }
@@ -318,9 +318,9 @@ _mesa_BeginFragmentShaderATI(void)
    /* no idea if it's allowed to redefine a shader */
    for (i = 0; i < MAX_NUM_PASSES_ATI; i++) {
          if (ctx->ATIFragmentShader.Current->Instructions[i])
-            _mesa_free(ctx->ATIFragmentShader.Current->Instructions[i]);
+            free(ctx->ATIFragmentShader.Current->Instructions[i]);
          if (ctx->ATIFragmentShader.Current->SetupInst[i])
-            _mesa_free(ctx->ATIFragmentShader.Current->SetupInst[i]);
+            free(ctx->ATIFragmentShader.Current->SetupInst[i]);
    }
 
    /* malloc the instructions here - not sure if the best place but its
@@ -328,11 +328,11 @@ _mesa_BeginFragmentShaderATI(void)
    for (i = 0; i < MAX_NUM_PASSES_ATI; i++) {
       ctx->ATIFragmentShader.Current->Instructions[i] =
 	 (struct atifs_instruction *)
-	 _mesa_calloc(sizeof(struct atifs_instruction) *
+	 calloc(1, sizeof(struct atifs_instruction) *
 		   (MAX_NUM_INSTRUCTIONS_PER_PASS_ATI));
       ctx->ATIFragmentShader.Current->SetupInst[i] =
 	 (struct atifs_setupinst *)
-	 _mesa_calloc(sizeof(struct atifs_setupinst) *
+	 calloc(1, sizeof(struct atifs_setupinst) *
 		   (MAX_NUM_FRAGMENT_REGISTERS_ATI));
    }
 
diff --git a/src/mesa/shader/hash_table.c b/src/mesa/shader/hash_table.c
index e89a2564d7..fa6ba2bfdf 100644
--- a/src/mesa/shader/hash_table.c
+++ b/src/mesa/shader/hash_table.c
@@ -65,7 +65,7 @@ hash_table_ctor(unsigned num_buckets, hash_func_t hash,
         num_buckets = 16;
     }
 
-    ht = _mesa_malloc(sizeof(*ht) + ((num_buckets - 1) 
+    ht = malloc(sizeof(*ht) + ((num_buckets - 1) 
 				     * sizeof(ht->buckets[0])));
     if (ht != NULL) {
         ht->hash = hash;
@@ -85,7 +85,7 @@ void
 hash_table_dtor(struct hash_table *ht)
 {
    hash_table_clear(ht);
-   _mesa_free(ht);
+   free(ht);
 }
 
 
@@ -100,7 +100,7 @@ hash_table_clear(struct hash_table *ht)
    for (i = 0; i < ht->num_buckets; i++) {
       foreach_s(node, temp, & ht->buckets[i]) {
 	 remove_from_list(node);
-	 _mesa_free(node);
+	 free(node);
       }
 
       assert(is_empty_list(& ht->buckets[i]));
@@ -134,7 +134,7 @@ hash_table_insert(struct hash_table *ht, void *data, const void *key)
     const unsigned bucket = hash_value % ht->num_buckets;
     struct hash_node *node;
 
-    node = _mesa_calloc(sizeof(*node));
+    node = calloc(1, sizeof(*node));
 
     node->data = data;
     node->key = key;
diff --git a/src/mesa/shader/nvfragparse.c b/src/mesa/shader/nvfragparse.c
index 639408d82a..4f02703619 100644
--- a/src/mesa/shader/nvfragparse.c
+++ b/src/mesa/shader/nvfragparse.c
@@ -171,7 +171,7 @@ record_error(struct parse_state *parseState, const char *msg, int lineNo)
    _mesa_debug(parseState->ctx,
                "nvfragparse.c(%d): line %d, column %d:%s (%s)\n",
                lineNo, line, column, (char *) lineStr, msg);
-   _mesa_free((void *) lineStr);
+   free((void *) lineStr);
 #else
    (void) lineNo;
 #endif
@@ -1231,7 +1231,7 @@ Parse_PrintInstruction(struct parse_state *parseState,
    for (len = 0; str[len] != '\''; len++) /* find closing quote */
       ;
    parseState->pos += len + 1;
-   msg = (GLubyte*) _mesa_malloc(len + 1);
+   msg = (GLubyte*) malloc(len + 1);
 
    memcpy(msg, str, len);
    msg[len] = 0;
@@ -1548,7 +1548,7 @@ _mesa_parse_nv_fragment_program(GLcontext *ctx, GLenum dstTarget,
       program->Base.String = programString;
       program->Base.Format = GL_PROGRAM_FORMAT_ASCII_ARB;
       if (program->Base.Instructions) {
-         _mesa_free(program->Base.Instructions);
+         free(program->Base.Instructions);
       }
       program->Base.Instructions = newInst;
       program->Base.NumInstructions = parseState.numInst;
diff --git a/src/mesa/shader/nvvertparse.c b/src/mesa/shader/nvvertparse.c
index 3656438d42..fb36303bb9 100644
--- a/src/mesa/shader/nvvertparse.c
+++ b/src/mesa/shader/nvvertparse.c
@@ -82,7 +82,7 @@ record_error(struct parse_state *parseState, const char *msg, int lineNo)
    _mesa_debug(parseState->ctx,
                "nvfragparse.c(%d): line %d, column %d:%s (%s)\n",
                lineNo, line, column, (char *) lineStr, msg);
-   _mesa_free((void *) lineStr);
+   free((void *) lineStr);
 #else
    (void) lineNo;
 #endif
@@ -1048,7 +1048,7 @@ Parse_PrintInstruction(struct parse_state *parseState, struct prog_instruction *
    for (len = 0; str[len] != '\''; len++) /* find closing quote */
       ;
    parseState->pos += len + 1;
-   msg = (GLubyte*) _mesa_malloc(len + 1);
+   msg = (GLubyte*) malloc(len + 1);
 
    memcpy(msg, str, len);
    msg[len] = 0;
@@ -1372,7 +1372,7 @@ _mesa_parse_nv_vertex_program(GLcontext *ctx, GLenum dstTarget,
       newInst = _mesa_alloc_instructions(parseState.numInst);
       if (!newInst) {
          _mesa_error(ctx, GL_OUT_OF_MEMORY, "glLoadProgramNV");
-         _mesa_free(programString);
+         free(programString);
          return;  /* out of memory */
       }
       _mesa_copy_instructions(newInst, instBuffer, parseState.numInst);
@@ -1380,12 +1380,12 @@ _mesa_parse_nv_vertex_program(GLcontext *ctx, GLenum dstTarget,
       /* install the program */
       program->Base.Target = target;
       if (program->Base.String) {
-         _mesa_free(program->Base.String);
+         free(program->Base.String);
       }
       program->Base.String = programString;
       program->Base.Format = GL_PROGRAM_FORMAT_ASCII_ARB;
       if (program->Base.Instructions) {
-         _mesa_free(program->Base.Instructions);
+         free(program->Base.Instructions);
       }
       program->Base.Instructions = newInst;
       program->Base.InputsRead = parseState.inputsRead;
diff --git a/src/mesa/shader/prog_cache.c b/src/mesa/shader/prog_cache.c
index 8e54f3a5a0..e5b602fc09 100644
--- a/src/mesa/shader/prog_cache.c
+++ b/src/mesa/shader/prog_cache.c
@@ -87,7 +87,7 @@ rehash(struct gl_program_cache *cache)
    cache->last = NULL;
 
    size = cache->size * 3;
-   items = (struct cache_item**) _mesa_malloc(size * sizeof(*items));
+   items = (struct cache_item**) malloc(size * sizeof(*items));
    memset(items, 0, size * sizeof(*items));
 
    for (i = 0; i < cache->size; i++)
@@ -97,7 +97,7 @@ rehash(struct gl_program_cache *cache)
 	 items[c->hash % size] = c;
       }
 
-   _mesa_free(cache->items);
+   free(cache->items);
    cache->items = items;
    cache->size = size;
 }
@@ -114,9 +114,9 @@ clear_cache(GLcontext *ctx, struct gl_program_cache *cache)
    for (i = 0; i < cache->size; i++) {
       for (c = cache->items[i]; c; c = next) {
 	 next = c->next;
-	 _mesa_free(c->key);
+	 free(c->key);
          _mesa_reference_program(ctx, &c->program, NULL);
-	 _mesa_free(c);
+	 free(c);
       }
       cache->items[i] = NULL;
    }
@@ -134,9 +134,9 @@ _mesa_new_program_cache(void)
    if (cache) {
       cache->size = 17;
       cache->items = (struct cache_item **)
-         _mesa_calloc(cache->size * sizeof(struct cache_item));
+         calloc(1, cache->size * sizeof(struct cache_item));
       if (!cache->items) {
-         _mesa_free(cache);
+         free(cache);
          return NULL;
       }
    }
@@ -148,8 +148,8 @@ void
 _mesa_delete_program_cache(GLcontext *ctx, struct gl_program_cache *cache)
 {
    clear_cache(ctx, cache);
-   _mesa_free(cache->items);
-   _mesa_free(cache);
+   free(cache->items);
+   free(cache);
 }
 
 
@@ -188,7 +188,7 @@ _mesa_program_cache_insert(GLcontext *ctx,
 
    c->hash = hash;
 
-   c->key = _mesa_malloc(keysize);
+   c->key = malloc(keysize);
    memcpy(c->key, key, keysize);
 
    c->program = program;  /* no refcount change */
diff --git a/src/mesa/shader/prog_instruction.c b/src/mesa/shader/prog_instruction.c
index 0c4da4d107..81099cb99c 100644
--- a/src/mesa/shader/prog_instruction.c
+++ b/src/mesa/shader/prog_instruction.c
@@ -70,7 +70,7 @@ struct prog_instruction *
 _mesa_alloc_instructions(GLuint numInst)
 {
    return (struct prog_instruction *)
-      _mesa_calloc(numInst * sizeof(struct prog_instruction));
+      calloc(1, numInst * sizeof(struct prog_instruction));
 }
 
 
@@ -128,11 +128,11 @@ _mesa_free_instructions(struct prog_instruction *inst, GLuint count)
    GLuint i;
    for (i = 0; i < count; i++) {
       if (inst[i].Data)
-         _mesa_free(inst[i].Data);
+         free(inst[i].Data);
       if (inst[i].Comment)
-         _mesa_free((char *) inst[i].Comment);
+         free((char *) inst[i].Comment);
    }
-   _mesa_free(inst);
+   free(inst);
 }
 
 
diff --git a/src/mesa/shader/prog_optimize.c b/src/mesa/shader/prog_optimize.c
index e1ec52254c..09816d5044 100644
--- a/src/mesa/shader/prog_optimize.c
+++ b/src/mesa/shader/prog_optimize.c
@@ -237,7 +237,7 @@ _mesa_remove_dead_code(struct gl_program *prog)
    }
 
    removeInst = (GLboolean *)
-      _mesa_calloc(prog->NumInstructions * sizeof(GLboolean));
+      calloc(1, prog->NumInstructions * sizeof(GLboolean));
 
    /* Determine which temps are read and written */
    for (i = 0; i < prog->NumInstructions; i++) {
@@ -347,7 +347,7 @@ _mesa_remove_dead_code(struct gl_program *prog)
    }
 
 done:
-   _mesa_free(removeInst);
+   free(removeInst);
 }
 
 
@@ -538,7 +538,7 @@ _mesa_remove_extra_moves(struct gl_program *prog)
    }
 
    removeInst = (GLboolean *)
-      _mesa_calloc(prog->NumInstructions * sizeof(GLboolean));
+      calloc(1, prog->NumInstructions * sizeof(GLboolean));
 
    /*
     * Look for sequences such as this:
@@ -621,7 +621,7 @@ _mesa_remove_extra_moves(struct gl_program *prog)
    /* now remove the instructions which aren't needed */
    rem = remove_instructions(prog, removeInst);
 
-   _mesa_free(removeInst);
+   free(removeInst);
 
    if (dbg) {
       _mesa_printf("Optimize: End remove extra moves.  %u instructions removed\n", rem);
diff --git a/src/mesa/shader/prog_parameter.c b/src/mesa/shader/prog_parameter.c
index 1feb7bd71d..25bb4f3d44 100644
--- a/src/mesa/shader/prog_parameter.c
+++ b/src/mesa/shader/prog_parameter.c
@@ -54,16 +54,16 @@ _mesa_new_parameter_list_sized(unsigned size)
 
       /* alloc arrays */
       p->Parameters = (struct gl_program_parameter *)
-	 _mesa_calloc(size * sizeof(struct gl_program_parameter));
+	 calloc(1, size * sizeof(struct gl_program_parameter));
 
       p->ParameterValues = (GLfloat (*)[4])
          _mesa_align_malloc(size * 4 *sizeof(GLfloat), 16);
 
 
       if ((p->Parameters == NULL) || (p->ParameterValues == NULL)) {
-	 _mesa_free(p->Parameters);
+	 free(p->Parameters);
 	 _mesa_align_free(p->ParameterValues);
-	 _mesa_free(p);
+	 free(p);
 	 p = NULL;
       }
    }
@@ -81,12 +81,12 @@ _mesa_free_parameter_list(struct gl_program_parameter_list *paramList)
    GLuint i;
    for (i = 0; i < paramList->NumParameters; i++) {
       if (paramList->Parameters[i].Name)
-	 _mesa_free((void *) paramList->Parameters[i].Name);
+	 free((void *) paramList->Parameters[i].Name);
    }
-   _mesa_free(paramList->Parameters);
+   free(paramList->Parameters);
    if (paramList->ParameterValues)
       _mesa_align_free(paramList->ParameterValues);
-   _mesa_free(paramList);
+   free(paramList);
 }
 
 
@@ -486,7 +486,7 @@ _mesa_add_state_reference(struct gl_program_parameter_list *paramList,
    paramList->StateFlags |= _mesa_program_state_flags(stateTokens);
 
    /* free name string here since we duplicated it in add_parameter() */
-   _mesa_free(name);
+   free(name);
 
    return index;
 }
diff --git a/src/mesa/shader/prog_print.c b/src/mesa/shader/prog_print.c
index 54fd88ad4f..b238537673 100644
--- a/src/mesa/shader/prog_print.c
+++ b/src/mesa/shader/prog_print.c
@@ -309,7 +309,7 @@ reg_string(gl_register_file f, GLint index, gl_prog_print_mode mode,
                = prog->Parameters->Parameters + index;
             char *state = _mesa_program_state_string(param->StateIndexes);
             _mesa_sprintf(str, state);
-            _mesa_free(state);
+            free(state);
          }
          break;
       case PROGRAM_ADDRESS:
diff --git a/src/mesa/shader/prog_statevars.c b/src/mesa/shader/prog_statevars.c
index f5264fa918..2c844490dd 100644
--- a/src/mesa/shader/prog_statevars.c
+++ b/src/mesa/shader/prog_statevars.c
@@ -957,7 +957,7 @@ append_index(char *dst, GLint index)
 /**
  * Make a string from the given state vector.
  * For example, return "state.matrix.texture[2].inverse".
- * Use _mesa_free() to deallocate the string.
+ * Use free() to deallocate the string.
  */
 char *
 _mesa_program_state_string(const gl_state_index state[STATE_LENGTH])
diff --git a/src/mesa/shader/prog_uniform.c b/src/mesa/shader/prog_uniform.c
index a831ce8cb6..c408a8492c 100644
--- a/src/mesa/shader/prog_uniform.c
+++ b/src/mesa/shader/prog_uniform.c
@@ -45,10 +45,10 @@ _mesa_free_uniform_list(struct gl_uniform_list *list)
 {
    GLuint i;
    for (i = 0; i < list->NumUniforms; i++) {
-      _mesa_free((void *) list->Uniforms[i].Name);
+      free((void *) list->Uniforms[i].Name);
    }
-   _mesa_free(list->Uniforms);
-   _mesa_free(list);
+   free(list->Uniforms);
+   free(list);
 }
 
 
diff --git a/src/mesa/shader/program.c b/src/mesa/shader/program.c
index 0c3c5ffbd5..f4f701b546 100644
--- a/src/mesa/shader/program.c
+++ b/src/mesa/shader/program.c
@@ -127,11 +127,11 @@ _mesa_free_program_data(GLcontext *ctx)
    if (ctx->ATIFragmentShader.Current) {
       ctx->ATIFragmentShader.Current->RefCount--;
       if (ctx->ATIFragmentShader.Current->RefCount <= 0) {
-         _mesa_free(ctx->ATIFragmentShader.Current);
+         free(ctx->ATIFragmentShader.Current);
       }
    }
 #endif
-   _mesa_free((void *) ctx->Program.ErrorString);
+   free((void *) ctx->Program.ErrorString);
 }
 
 
@@ -162,7 +162,7 @@ _mesa_update_default_objects_program(GLcontext *ctx)
    if (ctx->ATIFragmentShader.Current) {
       ctx->ATIFragmentShader.Current->RefCount--;
       if (ctx->ATIFragmentShader.Current->RefCount <= 0) {
-         _mesa_free(ctx->ATIFragmentShader.Current);
+         free(ctx->ATIFragmentShader.Current);
       }
    }
    ctx->ATIFragmentShader.Current = (struct ati_fragment_shader *) ctx->Shared->DefaultFragmentShader;
@@ -180,7 +180,7 @@ void
 _mesa_set_program_error(GLcontext *ctx, GLint pos, const char *string)
 {
    ctx->Program.ErrorPos = pos;
-   _mesa_free((void *) ctx->Program.ErrorString);
+   free((void *) ctx->Program.ErrorString);
    if (!string)
       string = "";
    ctx->Program.ErrorString = _mesa_strdup(string);
@@ -190,7 +190,7 @@ _mesa_set_program_error(GLcontext *ctx, GLint pos, const char *string)
 /**
  * Find the line number and column for 'pos' within 'string'.
  * Return a copy of the line which contains 'pos'.  Free the line with
- * _mesa_free().
+ * free().
  * \param string  the program string
  * \param pos     the position within the string
  * \param line    returns the line number corresponding to 'pos'.
@@ -222,7 +222,7 @@ _mesa_find_line_column(const GLubyte *string, const GLubyte *pos,
    while (*p != 0 && *p != '\n')
       p++;
    len = p - lineStart;
-   s = (GLubyte *) _mesa_malloc(len + 1);
+   s = (GLubyte *) malloc(len + 1);
    memcpy(s, lineStart, len);
    s[len] = 0;
 
@@ -337,7 +337,7 @@ _mesa_delete_program(GLcontext *ctx, struct gl_program *prog)
       return;
 
    if (prog->String)
-      _mesa_free(prog->String);
+      free(prog->String);
 
    _mesa_free_instructions(prog->Instructions, prog->NumInstructions);
 
@@ -351,7 +351,7 @@ _mesa_delete_program(GLcontext *ctx, struct gl_program *prog)
       _mesa_free_parameter_list(prog->Attributes);
    }
 
-   _mesa_free(prog);
+   free(prog);
 }
 
 
diff --git a/src/mesa/shader/program_parse.tab.c b/src/mesa/shader/program_parse.tab.c
index 182ef4c26d..e5ef25ec38 100644
--- a/src/mesa/shader/program_parse.tab.c
+++ b/src/mesa/shader/program_parse.tab.c
@@ -3140,7 +3140,7 @@ yyreduce:
 		      ? err_str : "invalid condition code");
 
 	      if (err_str != NULL) {
-		 _mesa_free(err_str);
+		 free(err_str);
 	      }
 
 	      YYERROR;
@@ -3166,7 +3166,7 @@ yyreduce:
 		      ? err_str : "invalid condition code");
 
 	      if (err_str != NULL) {
-		 _mesa_free(err_str);
+		 free(err_str);
 	      }
 
 	      YYERROR;
@@ -4547,7 +4547,7 @@ yyreduce:
 		      ? err_str : "invalid storage size specifier");
 
 	      if (err_str != NULL) {
-		 _mesa_free(err_str);
+		 free(err_str);
 	      }
 
 	      YYERROR;
@@ -5403,7 +5403,7 @@ int add_state_reference(struct gl_program_parameter_list *param_list,
    param_list->StateFlags |= _mesa_program_state_flags(tokens);
 
    /* free name string here since we duplicated it in add_parameter() */
-   _mesa_free(name);
+   free(name);
 
    return index;
 }
@@ -5568,7 +5568,7 @@ make_error_string(const char *fmt, ...)
     */
    length = 1 + vsnprintf(NULL, 0, fmt, args);
 
-   str = _mesa_malloc(length);
+   str = malloc(length);
    if (str) {
       vsnprintf(str, length, fmt, args);
    }
@@ -5588,7 +5588,7 @@ yyerror(YYLTYPE *locp, struct asm_parser_state *state, const char *s)
    err_str = make_error_string("glProgramStringARB(%s)\n", s);
    if (err_str) {
       _mesa_error(state->ctx, GL_INVALID_OPERATION, err_str);
-      _mesa_free(err_str);
+      free(err_str);
    }
 
    err_str = make_error_string("line %u, char %u: error: %s\n",
@@ -5596,7 +5596,7 @@ yyerror(YYLTYPE *locp, struct asm_parser_state *state, const char *s)
    _mesa_set_program_error(state->ctx, locp->position, err_str);
 
    if (err_str) {
-      _mesa_free(err_str);
+      free(err_str);
    }
 }
 
@@ -5618,7 +5618,7 @@ _mesa_parse_arb_program(GLcontext *ctx, GLenum target, const GLubyte *str,
 
    /* Make a copy of the program string and force it to be NUL-terminated.
     */
-   strz = (GLubyte *) _mesa_malloc(len + 1);
+   strz = (GLubyte *) malloc(len + 1);
    if (strz == NULL) {
       _mesa_error(ctx, GL_OUT_OF_MEMORY, "glProgramStringARB");
       return GL_FALSE;
@@ -5706,7 +5706,7 @@ _mesa_parse_arb_program(GLcontext *ctx, GLenum target, const GLubyte *str,
 error:
    for (inst = state->inst_head; inst != NULL; inst = temp) {
       temp = inst->next;
-      _mesa_free(inst);
+      free(inst);
    }
 
    state->inst_head = NULL;
@@ -5715,8 +5715,8 @@ error:
    for (sym = state->sym; sym != NULL; sym = temp) {
       temp = sym->next;
 
-      _mesa_free((void *) sym->name);
-      _mesa_free(sym);
+      free((void *) sym->name);
+      free(sym);
    }
    state->sym = NULL;
 
diff --git a/src/mesa/shader/program_parse.y b/src/mesa/shader/program_parse.y
index 577bd2c38d..299e2477e4 100644
--- a/src/mesa/shader/program_parse.y
+++ b/src/mesa/shader/program_parse.y
@@ -1056,7 +1056,7 @@ ccMaskRule: IDENTIFIER
 		      ? err_str : "invalid condition code");
 
 	      if (err_str != NULL) {
-		 _mesa_free(err_str);
+		 free(err_str);
 	      }
 
 	      YYERROR;
@@ -1079,7 +1079,7 @@ ccMaskRule2: USED_IDENTIFIER
 		      ? err_str : "invalid condition code");
 
 	      if (err_str != NULL) {
-		 _mesa_free(err_str);
+		 free(err_str);
 	      }
 
 	      YYERROR;
@@ -1956,7 +1956,7 @@ optVarSize: string
 		      ? err_str : "invalid storage size specifier");
 
 	      if (err_str != NULL) {
-		 _mesa_free(err_str);
+		 free(err_str);
 	      }
 
 	      YYERROR;
@@ -2442,7 +2442,7 @@ int add_state_reference(struct gl_program_parameter_list *param_list,
    param_list->StateFlags |= _mesa_program_state_flags(tokens);
 
    /* free name string here since we duplicated it in add_parameter() */
-   _mesa_free(name);
+   free(name);
 
    return index;
 }
@@ -2607,7 +2607,7 @@ make_error_string(const char *fmt, ...)
     */
    length = 1 + vsnprintf(NULL, 0, fmt, args);
 
-   str = _mesa_malloc(length);
+   str = malloc(length);
    if (str) {
       vsnprintf(str, length, fmt, args);
    }
@@ -2627,7 +2627,7 @@ yyerror(YYLTYPE *locp, struct asm_parser_state *state, const char *s)
    err_str = make_error_string("glProgramStringARB(%s)\n", s);
    if (err_str) {
       _mesa_error(state->ctx, GL_INVALID_OPERATION, err_str);
-      _mesa_free(err_str);
+      free(err_str);
    }
 
    err_str = make_error_string("line %u, char %u: error: %s\n",
@@ -2635,7 +2635,7 @@ yyerror(YYLTYPE *locp, struct asm_parser_state *state, const char *s)
    _mesa_set_program_error(state->ctx, locp->position, err_str);
 
    if (err_str) {
-      _mesa_free(err_str);
+      free(err_str);
    }
 }
 
@@ -2657,7 +2657,7 @@ _mesa_parse_arb_program(GLcontext *ctx, GLenum target, const GLubyte *str,
 
    /* Make a copy of the program string and force it to be NUL-terminated.
     */
-   strz = (GLubyte *) _mesa_malloc(len + 1);
+   strz = (GLubyte *) malloc(len + 1);
    if (strz == NULL) {
       _mesa_error(ctx, GL_OUT_OF_MEMORY, "glProgramStringARB");
       return GL_FALSE;
@@ -2745,7 +2745,7 @@ _mesa_parse_arb_program(GLcontext *ctx, GLenum target, const GLubyte *str,
 error:
    for (inst = state->inst_head; inst != NULL; inst = temp) {
       temp = inst->next;
-      _mesa_free(inst);
+      free(inst);
    }
 
    state->inst_head = NULL;
@@ -2754,8 +2754,8 @@ error:
    for (sym = state->sym; sym != NULL; sym = temp) {
       temp = sym->next;
 
-      _mesa_free((void *) sym->name);
-      _mesa_free(sym);
+      free((void *) sym->name);
+      free(sym);
    }
    state->sym = NULL;
 
diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index 7e2a60f74b..ad3ff26c58 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -115,12 +115,12 @@ _mesa_free_shader_program_data(GLcontext *ctx,
    shProg->NumShaders = 0;
 
    if (shProg->Shaders) {
-      _mesa_free(shProg->Shaders);
+      free(shProg->Shaders);
       shProg->Shaders = NULL;
    }
 
    if (shProg->InfoLog) {
-      _mesa_free(shProg->InfoLog);
+      free(shProg->InfoLog);
       shProg->InfoLog = NULL;
    }
 }
@@ -134,7 +134,7 @@ _mesa_free_shader_program(GLcontext *ctx, struct gl_shader_program *shProg)
 {
    _mesa_free_shader_program_data(ctx, shProg);
 
-   _mesa_free(shProg);
+   free(shProg);
 }
 
 
@@ -262,11 +262,11 @@ void
 _mesa_free_shader(GLcontext *ctx, struct gl_shader *sh)
 {
    if (sh->Source)
-      _mesa_free((void *) sh->Source);
+      free((void *) sh->Source);
    if (sh->InfoLog)
-      _mesa_free(sh->InfoLog);
+      free(sh->InfoLog);
    _mesa_reference_program(ctx, &sh->Program, NULL);
-   _mesa_free(sh);
+   free(sh);
 }
 
 
@@ -709,7 +709,7 @@ _mesa_detach_shader(GLcontext *ctx, GLuint program, GLuint shader)
 
          /* alloc new, smaller array */
          newList = (struct gl_shader **)
-            _mesa_malloc((n - 1) * sizeof(struct gl_shader *));
+            malloc((n - 1) * sizeof(struct gl_shader *));
          if (!newList) {
             _mesa_error(ctx, GL_OUT_OF_MEMORY, "glDetachShader");
             return;
@@ -719,7 +719,7 @@ _mesa_detach_shader(GLcontext *ctx, GLuint program, GLuint shader)
          }
          while (++i < n)
             newList[j++] = shProg->Shaders[i];
-         _mesa_free(shProg->Shaders);
+         free(shProg->Shaders);
 
          shProg->Shaders = newList;
          shProg->NumShaders = n - 1;
@@ -1377,7 +1377,7 @@ _mesa_get_uniform_location(GLcontext *ctx, GLuint program, const GLchar *name)
       if (c) {
          /* truncate name at [ */
          const GLint len = c - name;
-         GLchar *newName = _mesa_malloc(len + 1);
+         GLchar *newName = malloc(len + 1);
          if (!newName)
             return -1; /* out of mem */
          memcpy(newName, name, len);
@@ -1400,7 +1400,7 @@ _mesa_get_uniform_location(GLcontext *ctx, GLuint program, const GLchar *name)
             }
          }
 
-         _mesa_free(newName);
+         free(newName);
       }
    }
 
@@ -1431,7 +1431,7 @@ _mesa_shader_source(GLcontext *ctx, GLuint shader, const GLchar *source)
 
    /* free old shader source string and install new one */
    if (sh->Source) {
-      _mesa_free((void *) sh->Source);
+      free((void *) sh->Source);
    }
    sh->Source = source;
    sh->CompileStatus = GL_FALSE;
@@ -2155,7 +2155,7 @@ _mesa_validate_program(GLcontext *ctx, GLuint program)
    if (!shProg->Validated) {
       /* update info log */
       if (shProg->InfoLog) {
-         _mesa_free(shProg->InfoLog);
+         free(shProg->InfoLog);
       }
       shProg->InfoLog = _mesa_strdup(errMsg);
    }
diff --git a/src/mesa/shader/slang/slang_codegen.c b/src/mesa/shader/slang/slang_codegen.c
index 2280ceb9ee..6901b93d5d 100644
--- a/src/mesa/shader/slang/slang_codegen.c
+++ b/src/mesa/shader/slang/slang_codegen.c
@@ -3639,7 +3639,7 @@ make_constant_array(slang_assemble_ctx *A,
    assert(initializer->type == SLANG_OPER_CALL);
    assert(initializer->array_constructor);
 
-   values = (GLfloat *) _mesa_malloc(numElements * 4 * sizeof(GLfloat));
+   values = (GLfloat *) malloc(numElements * 4 * sizeof(GLfloat));
 
    /* convert constructor params into ordinary floats */
    for (i = 0; i < numElements; i++) {
@@ -3670,7 +3670,7 @@ make_constant_array(slang_assemble_ctx *A,
    }
    assert(var->store->Size == size);
 
-   _mesa_free(values);
+   free(values);
 
    return GL_TRUE;
 }
@@ -5321,7 +5321,7 @@ _slang_codegen_function(slang_assemble_ctx * A, slang_function * fun)
 
    /* free codegen context */
    /*
-   _mesa_free(A->codegen);
+   free(A->codegen);
    */
 
    return success;
diff --git a/src/mesa/shader/slang/slang_compile.c b/src/mesa/shader/slang/slang_compile.c
index 41d51cd98a..4280698cc9 100644
--- a/src/mesa/shader/slang/slang_compile.c
+++ b/src/mesa/shader/slang/slang_compile.c
@@ -2948,7 +2948,7 @@ _slang_compile(GLcontext *ctx, struct gl_shader *shader)
 
    /* free shader's prev info log */
    if (shader->InfoLog) {
-      _mesa_free(shader->InfoLog);
+      free(shader->InfoLog);
       shader->InfoLog = NULL;
    }
 
diff --git a/src/mesa/shader/slang/slang_compile_variable.c b/src/mesa/shader/slang/slang_compile_variable.c
index eab912710e..23c08a9039 100644
--- a/src/mesa/shader/slang/slang_compile_variable.c
+++ b/src/mesa/shader/slang/slang_compile_variable.c
@@ -182,7 +182,7 @@ slang_variable_destruct(slang_variable * var)
    }
 #if 0
    if (var->aux) {
-      _mesa_free(var->aux);
+      free(var->aux);
    }
 #endif
 }
diff --git a/src/mesa/shader/slang/slang_emit.c b/src/mesa/shader/slang/slang_emit.c
index b621e892c3..8bd699ff9d 100644
--- a/src/mesa/shader/slang/slang_emit.c
+++ b/src/mesa/shader/slang/slang_emit.c
@@ -2528,7 +2528,7 @@ _slang_resolve_subroutines(slang_emit_info *emitInfo)
    GLuint *subroutineLoc, i, total;
 
    subroutineLoc
-      = (GLuint *) _mesa_malloc(emitInfo->NumSubroutines * sizeof(GLuint));
+      = (GLuint *) malloc(emitInfo->NumSubroutines * sizeof(GLuint));
 
    /* total number of instructions */
    total = mainP->NumInstructions;
@@ -2566,7 +2566,7 @@ _slang_resolve_subroutines(slang_emit_info *emitInfo)
 
    /* free subroutine list */
    if (emitInfo->Subroutines) {
-      _mesa_free(emitInfo->Subroutines);
+      free(emitInfo->Subroutines);
       emitInfo->Subroutines = NULL;
    }
    emitInfo->NumSubroutines = 0;
@@ -2585,7 +2585,7 @@ _slang_resolve_subroutines(slang_emit_info *emitInfo)
       }
    }
 
-   _mesa_free(subroutineLoc);
+   free(subroutineLoc);
 }
 
 
diff --git a/src/mesa/shader/slang/slang_label.c b/src/mesa/shader/slang/slang_label.c
index 1240621365..7e00b5787f 100644
--- a/src/mesa/shader/slang/slang_label.c
+++ b/src/mesa/shader/slang/slang_label.c
@@ -34,7 +34,7 @@ _slang_label_new_unique(const char *name)
    if (l) {
       l->Name = (char *) _slang_alloc(strlen(name) + 10);
       if (!l->Name) {
-         _mesa_free(l);
+         free(l);
          return NULL;
       }
       _mesa_sprintf(l->Name, "%s_%d", name, id);
diff --git a/src/mesa/shader/slang/slang_link.c b/src/mesa/shader/slang/slang_link.c
index 68129d4c5a..89658c1a39 100644
--- a/src/mesa/shader/slang/slang_link.c
+++ b/src/mesa/shader/slang/slang_link.c
@@ -68,7 +68,7 @@ static void
 link_error(struct gl_shader_program *shProg, const char *msg)
 {
    if (shProg->InfoLog) {
-      _mesa_free(shProg->InfoLog);
+      free(shProg->InfoLog);
    }
    shProg->InfoLog = _mesa_strdup(msg);
    shProg->LinkStatus = GL_FALSE;
@@ -103,7 +103,7 @@ link_varying_vars(GLcontext *ctx,
    GLuint *map, i, firstVarying, newFile;
    GLbitfield *inOutFlags;
 
-   map = (GLuint *) _mesa_malloc(prog->Varying->NumParameters * sizeof(GLuint));
+   map = (GLuint *) malloc(prog->Varying->NumParameters * sizeof(GLuint));
    if (!map)
       return GL_FALSE;
 
@@ -134,7 +134,7 @@ link_varying_vars(GLcontext *ctx,
             &shProg->Varying->Parameters[j];
          if (var->Size != v->Size) {
             link_error(shProg, "mismatched varying variable types");
-            _mesa_free(map);
+            free(map);
             return GL_FALSE;
          }
          if (!bits_agree(var->Flags, v->Flags, PROG_PARAM_BIT_CENTROID)) {
@@ -142,7 +142,7 @@ link_varying_vars(GLcontext *ctx,
             _mesa_snprintf(msg, sizeof(msg),
                            "centroid modifier mismatch for '%s'", var->Name);
             link_error(shProg, msg);
-            _mesa_free(map);
+            free(map);
             return GL_FALSE;
          }
          if (!bits_agree(var->Flags, v->Flags, PROG_PARAM_BIT_INVARIANT)) {
@@ -150,7 +150,7 @@ link_varying_vars(GLcontext *ctx,
             _mesa_snprintf(msg, sizeof(msg),
                            "invariant modifier mismatch for '%s'", var->Name);
             link_error(shProg, msg);
-            _mesa_free(map);
+            free(map);
             return GL_FALSE;
          }
       }
@@ -162,7 +162,7 @@ link_varying_vars(GLcontext *ctx,
 
       if (shProg->Varying->NumParameters > ctx->Const.MaxVarying) {
          link_error(shProg, "Too many varying variables");
-         _mesa_free(map);
+         free(map);
          return GL_FALSE;
       }
 
@@ -202,7 +202,7 @@ link_varying_vars(GLcontext *ctx,
       }
    }
 
-   _mesa_free(map);
+   free(map);
 
    /* these will get recomputed before linking is completed */
    prog->InputsRead = 0x0;
@@ -594,7 +594,7 @@ concat_shaders(struct gl_shader_program *shProg, GLenum shaderType)
    GLuint totalLen = 0, len = 0;
    GLuint i;
 
-   shaderLengths = (GLuint *)_mesa_malloc(shProg->NumShaders * sizeof(GLuint));
+   shaderLengths = (GLuint *)malloc(shProg->NumShaders * sizeof(GLuint));
    if (!shaderLengths) {
       return NULL;
    }
@@ -611,13 +611,13 @@ concat_shaders(struct gl_shader_program *shProg, GLenum shaderType)
    }
 
    if (totalLen == 0) {
-      _mesa_free(shaderLengths);
+      free(shaderLengths);
       return NULL;
    }
 
-   source = (GLchar *) _mesa_malloc(totalLen + 1);
+   source = (GLchar *) malloc(totalLen + 1);
    if (!source) {
-      _mesa_free(shaderLengths);
+      free(shaderLengths);
       return NULL;
    }
 
@@ -634,13 +634,13 @@ concat_shaders(struct gl_shader_program *shProg, GLenum shaderType)
    _mesa_printf("---NEW CONCATENATED SHADER---:\n%s\n------------\n", source);
    */
 
-   _mesa_free(shaderLengths);
+   free(shaderLengths);
 
    remove_extra_version_directives(source);
 
    newShader = CALLOC_STRUCT(gl_shader);
    if (!newShader) {
-      _mesa_free(source);
+      free(source);
       return NULL;
    }
 
diff --git a/src/mesa/shader/slang/slang_log.c b/src/mesa/shader/slang/slang_log.c
index 4f6b8541c5..23917fbd2c 100644
--- a/src/mesa/shader/slang/slang_log.c
+++ b/src/mesa/shader/slang/slang_log.c
@@ -43,7 +43,7 @@ void
 slang_info_log_destruct(slang_info_log * log)
 {
    if (!log->dont_free_text)
-      _mesa_free(log->text);
+      free(log->text);
 }
 
 static int
@@ -63,7 +63,7 @@ slang_info_log_message(slang_info_log * log, const char *prefix,
 	 _mesa_realloc(log->text, old_len + 1, old_len + size);
    }
    else {
-      log->text = (char *) (_mesa_malloc(size));
+      log->text = (char *) (malloc(size));
       if (log->text != NULL)
          log->text[0] = '\0';
    }
diff --git a/src/mesa/shader/slang/slang_mem.c b/src/mesa/shader/slang/slang_mem.c
index 54f5196617..5eaa7c4427 100644
--- a/src/mesa/shader/slang/slang_mem.c
+++ b/src/mesa/shader/slang/slang_mem.c
@@ -56,12 +56,12 @@ struct slang_mempool_
 slang_mempool *
 _slang_new_mempool(GLuint initialSize)
 {
-   slang_mempool *pool = (slang_mempool *) _mesa_calloc(sizeof(slang_mempool));
+   slang_mempool *pool = (slang_mempool *) calloc(1, sizeof(slang_mempool));
    if (pool) {
-      pool->Data = (char *) _mesa_calloc(initialSize);
+      pool->Data = (char *) calloc(1, initialSize);
       /*printf("ALLOC MEMPOOL %d at %p\n", initialSize, pool->Data);*/
       if (!pool->Data) {
-         _mesa_free(pool);
+         free(pool);
          return NULL;
       }
       pool->Size = initialSize;
@@ -82,8 +82,8 @@ _slang_delete_mempool(slang_mempool *pool)
              pool->Used, pool->Size, pool->Count, pool->Largest);
       */
       total += pool->Used;
-      _mesa_free(pool->Data);
-      _mesa_free(pool);
+      free(pool->Data);
+      free(pool);
       pool = next;
    }
    /*printf("TOTAL ALLOCATED: %u\n", total);*/
@@ -125,7 +125,7 @@ void *
 _slang_alloc(GLuint bytes)
 {
 #if USE_MALLOC_FREE
-   return _mesa_calloc(bytes);
+   return calloc(1, bytes);
 #else
    slang_mempool *pool;
    GET_CURRENT_CONTEXT(ctx);
@@ -231,7 +231,7 @@ void
 _slang_free(void *addr)
 {
 #if USE_MALLOC_FREE
-   _mesa_free(addr);
+   free(addr);
 #else
    if (addr) {
       GET_CURRENT_CONTEXT(ctx);
diff --git a/src/mesa/shader/slang/slang_utility.c b/src/mesa/shader/slang/slang_utility.c
index 56a33e6f6b..dc1e196bde 100644
--- a/src/mesa/shader/slang/slang_utility.c
+++ b/src/mesa/shader/slang/slang_utility.c
@@ -54,7 +54,7 @@ GLvoid
 slang_string_free (slang_string *self)
 {
    if (self->data != NULL)
-      _mesa_free (self->data);
+      free(self->data);
 }
 
 GLvoid
diff --git a/src/mesa/shader/symbol_table.c b/src/mesa/shader/symbol_table.c
index 1f6d9b844d..6a5d686897 100644
--- a/src/mesa/shader/symbol_table.c
+++ b/src/mesa/shader/symbol_table.c
@@ -354,7 +354,7 @@ _mesa_symbol_table_dtor(struct _mesa_symbol_table *table)
 
    for (hdr = table->hdr; hdr != NULL; hdr = next) {
        next = hdr->next;
-       _mesa_free(hdr);
+       free(hdr);
    }
 
    hash_table_dtor(table->ht);
diff --git a/src/mesa/state_tracker/st_cb_accum.c b/src/mesa/state_tracker/st_cb_accum.c
index 1be72e729e..33e43ddcc4 100644
--- a/src/mesa/state_tracker/st_cb_accum.c
+++ b/src/mesa/state_tracker/st_cb_accum.c
@@ -143,7 +143,7 @@ accum_accum(struct st_context *st, GLfloat value,
 						PIPE_TRANSFER_READ, xpos, ypos,
 						width, height);
 
-   buf = (GLfloat *) _mesa_malloc(width * height * 4 * sizeof(GLfloat));
+   buf = (GLfloat *) malloc(width * height * 4 * sizeof(GLfloat));
 
    pipe_get_tile_rgba(color_trans, 0, 0, width, height, buf);
 
@@ -165,7 +165,7 @@ accum_accum(struct st_context *st, GLfloat value,
       _mesa_problem(NULL, "unexpected format in st_clear_accum_buffer()");
    }
 
-   _mesa_free(buf);
+   free(buf);
    screen->tex_transfer_destroy(color_trans);
 }
 
@@ -192,7 +192,7 @@ accum_load(struct st_context *st, GLfloat value,
 						PIPE_TRANSFER_READ, xpos, ypos,
 						width, height);
 
-   buf = (GLfloat *) _mesa_malloc(width * height * 4 * sizeof(GLfloat));
+   buf = (GLfloat *) malloc(width * height * 4 * sizeof(GLfloat));
 
    pipe_get_tile_rgba(color_trans, 0, 0, width, height, buf);
 
@@ -214,7 +214,7 @@ accum_load(struct st_context *st, GLfloat value,
       _mesa_problem(NULL, "unexpected format in st_clear_accum_buffer()");
    }
 
-   _mesa_free(buf);
+   free(buf);
    screen->tex_transfer_destroy(color_trans);
 }
 
@@ -237,7 +237,7 @@ accum_return(GLcontext *ctx, GLfloat value,
    if (ST_DEBUG & DEBUG_FALLBACK)
       debug_printf("%s: fallback processing\n", __FUNCTION__);
 
-   buf = (GLfloat *) _mesa_malloc(width * height * 4 * sizeof(GLfloat));
+   buf = (GLfloat *) malloc(width * height * 4 * sizeof(GLfloat));
 
    if (!colormask[0] || !colormask[1] || !colormask[2] || !colormask[3])
       usage = PIPE_TRANSFER_READ_WRITE;
@@ -282,7 +282,7 @@ accum_return(GLcontext *ctx, GLfloat value,
 
    pipe_put_tile_rgba(color_trans, 0, 0, width, height, buf);
 
-   _mesa_free(buf);
+   free(buf);
    screen->tex_transfer_destroy(color_trans);
 }
 
diff --git a/src/mesa/state_tracker/st_cb_bitmap.c b/src/mesa/state_tracker/st_cb_bitmap.c
index e029ea7ffc..5968426a1d 100644
--- a/src/mesa/state_tracker/st_cb_bitmap.c
+++ b/src/mesa/state_tracker/st_cb_bitmap.c
@@ -837,7 +837,7 @@ st_destroy_bitmap(struct st_context *st)
          screen->tex_transfer_destroy(cache->trans);
       }
       pipe_texture_reference(&st->bitmap.cache->texture, NULL);
-      _mesa_free(st->bitmap.cache);
+      free(st->bitmap.cache);
       st->bitmap.cache = NULL;
    }
 }
diff --git a/src/mesa/state_tracker/st_cb_bufferobjects.c b/src/mesa/state_tracker/st_cb_bufferobjects.c
index c92af34378..b55a085cc7 100644
--- a/src/mesa/state_tracker/st_cb_bufferobjects.c
+++ b/src/mesa/state_tracker/st_cb_bufferobjects.c
@@ -80,7 +80,7 @@ st_bufferobj_free(GLcontext *ctx, struct gl_buffer_object *obj)
    if (st_obj->buffer) 
       pipe_buffer_reference(&st_obj->buffer, NULL);
 
-   _mesa_free(st_obj);
+   free(st_obj);
 }
 
 
diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c
index 36c0a2b0e1..4e86450edf 100644
--- a/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -828,7 +828,7 @@ copy_stencil_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
    ubyte *buffer;
    int i;
 
-   buffer = _mesa_malloc(width * height * sizeof(ubyte));
+   buffer = malloc(width * height * sizeof(ubyte));
    if (!buffer) {
       _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyPixels(stencil)");
       return;
@@ -907,7 +907,7 @@ copy_stencil_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
       }
    }
 
-   _mesa_free(buffer);
+   free(buffer);
 
    /* unmap the stencil buffer */
    screen->transfer_unmap(screen, ptDraw);
@@ -1089,19 +1089,19 @@ st_CopyPixels(GLcontext *ctx, GLint srcx, GLint srcy,
 
       if (type == GL_COLOR) {
          /* alternate path using get/put_tile() */
-         GLfloat *buf = (GLfloat *) _mesa_malloc(width * height * 4 * sizeof(GLfloat));
+         GLfloat *buf = (GLfloat *) malloc(width * height * 4 * sizeof(GLfloat));
 
          pipe_get_tile_rgba(ptRead, 0, 0, width, height, buf);
          pipe_put_tile_rgba(ptTex, 0, 0, width, height, buf);
 
-         _mesa_free(buf);
+         free(buf);
       }
       else {
          /* GL_DEPTH */
-         GLuint *buf = (GLuint *) _mesa_malloc(width * height * sizeof(GLuint));
+         GLuint *buf = (GLuint *) malloc(width * height * sizeof(GLuint));
          pipe_get_tile_z(ptRead, 0, 0, width, height, buf);
          pipe_put_tile_z(ptTex, 0, 0, width, height, buf);
-         _mesa_free(buf);
+         free(buf);
       }
 
       screen->tex_transfer_destroy(ptRead);
diff --git a/src/mesa/state_tracker/st_cb_fbo.c b/src/mesa/state_tracker/st_cb_fbo.c
index 4638879fc2..bfa8e21095 100644
--- a/src/mesa/state_tracker/st_cb_fbo.c
+++ b/src/mesa/state_tracker/st_cb_fbo.c
@@ -102,14 +102,14 @@ st_renderbuffer_alloc_storage(GLcontext * ctx, struct gl_renderbuffer *rb,
    if(strb->software) {
       size_t size;
       
-      _mesa_free(strb->data);
+      free(strb->data);
 
       assert(strb->format != PIPE_FORMAT_NONE);
       
       strb->stride = util_format_get_stride(strb->format, width);
       size = util_format_get_2d_size(strb->format, strb->stride, height);
       
-      strb->data = _mesa_malloc(size);
+      strb->data = malloc(size);
       
       return strb->data != NULL;
    }
@@ -181,8 +181,8 @@ st_renderbuffer_delete(struct gl_renderbuffer *rb)
    ASSERT(strb);
    pipe_surface_reference(&strb->surface, NULL);
    pipe_texture_reference(&strb->texture, NULL);
-   _mesa_free(strb->data);
-   _mesa_free(strb);
+   free(strb->data);
+   free(strb);
 }
 
 
@@ -286,7 +286,7 @@ st_new_renderbuffer_fb(enum pipe_format format, int samples, boolean sw)
    default:
       _mesa_problem(NULL,
 		    "Unexpected format in st_new_renderbuffer_fb");
-      _mesa_free(strb);
+      free(strb);
       return NULL;
    }
 
diff --git a/src/mesa/state_tracker/st_cb_queryobj.c b/src/mesa/state_tracker/st_cb_queryobj.c
index dc40c5d269..c66729b124 100644
--- a/src/mesa/state_tracker/st_cb_queryobj.c
+++ b/src/mesa/state_tracker/st_cb_queryobj.c
@@ -69,7 +69,7 @@ st_DeleteQuery(GLcontext *ctx, struct gl_query_object *q)
       stq->pq = NULL;
    }
 
-   _mesa_free(stq);
+   free(stq);
 }
 
 
diff --git a/src/mesa/state_tracker/st_cb_rasterpos.c b/src/mesa/state_tracker/st_cb_rasterpos.c
index 4692891c8a..752b411b5f 100644
--- a/src/mesa/state_tracker/st_cb_rasterpos.c
+++ b/src/mesa/state_tracker/st_cb_rasterpos.c
@@ -101,7 +101,7 @@ rastpos_line( struct draw_stage *stage, struct prim_header *prim )
 static void
 rastpos_destroy(struct draw_stage *stage)
 {
-   _mesa_free(stage);
+   free(stage);
 }
 
 
diff --git a/src/mesa/state_tracker/st_cb_texture.c b/src/mesa/state_tracker/st_cb_texture.c
index 13f050900a..7e50e2ab2d 100644
--- a/src/mesa/state_tracker/st_cb_texture.c
+++ b/src/mesa/state_tracker/st_cb_texture.c
@@ -1319,7 +1319,7 @@ fallback_copy_texsubimage(GLcontext *ctx, GLenum target, GLint level,
    else {
       /* RGBA format */
       GLfloat *tempSrc =
-         (GLfloat *) _mesa_malloc(width * height * 4 * sizeof(GLfloat));
+         (GLfloat *) malloc(width * height * 4 * sizeof(GLfloat));
 
       if (tempSrc && texDest) {
          const GLint dims = 2;
@@ -1359,7 +1359,7 @@ fallback_copy_texsubimage(GLcontext *ctx, GLenum target, GLint level,
       }
 
       if (tempSrc)
-         _mesa_free(tempSrc);
+         free(tempSrc);
    }
 
    st_texture_image_unmap(ctx->st, stImage);
diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c
index 5b3987d73a..de8beaf5e2 100644
--- a/src/mesa/state_tracker/st_context.c
+++ b/src/mesa/state_tracker/st_context.c
@@ -222,7 +222,7 @@ static void st_destroy_context_priv( struct st_context *st )
       st->default_texture = NULL;
    }
 
-   _mesa_free( st );
+   free( st );
 }
 
  
@@ -257,7 +257,7 @@ void st_destroy_context( struct st_context *st )
 
    pipe->destroy( pipe );
 
-   _mesa_free(ctx);
+   free(ctx);
 }
 
 
diff --git a/src/mesa/state_tracker/st_context.h b/src/mesa/state_tracker/st_context.h
index 50e98d7146..13b7b0e22d 100644
--- a/src/mesa/state_tracker/st_context.h
+++ b/src/mesa/state_tracker/st_context.h
@@ -239,7 +239,7 @@ st_fb_orientation(const struct gl_framebuffer *fb)
 
 
 /** clear-alloc a struct-sized object, with casting */
-#define ST_CALLOC_STRUCT(T)   (struct T *) _mesa_calloc(sizeof(struct T))
+#define ST_CALLOC_STRUCT(T)   (struct T *) calloc(1, sizeof(struct T))
 
 
 extern int
diff --git a/src/mesa/state_tracker/st_mesa_to_tgsi.c b/src/mesa/state_tracker/st_mesa_to_tgsi.c
index 537a6a8648..807d21a719 100644
--- a/src/mesa/state_tracker/st_mesa_to_tgsi.c
+++ b/src/mesa/state_tracker/st_mesa_to_tgsi.c
@@ -1055,7 +1055,7 @@ out:
 
 
 /**
- * Tokens cannot be free with _mesa_free otherwise the builtin gallium
+ * Tokens cannot be free with free otherwise the builtin gallium
  * malloc debugging will get confused.
  */
 void
diff --git a/src/mesa/swrast/s_blit.c b/src/mesa/swrast/s_blit.c
index f73ac78ae2..753f3136f5 100644
--- a/src/mesa/swrast/s_blit.c
+++ b/src/mesa/swrast/s_blit.c
@@ -198,14 +198,14 @@ blit_nearest(GLcontext *ctx,
    }
 
    /* allocate the src/dst row buffers */
-   srcBuffer = _mesa_malloc(pixelSize * srcWidth);
+   srcBuffer = malloc(pixelSize * srcWidth);
    if (!srcBuffer) {
       _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBlitFrameBufferEXT");
       return;
    }
-   dstBuffer = _mesa_malloc(pixelSize * dstWidth);
+   dstBuffer = malloc(pixelSize * dstWidth);
    if (!dstBuffer) {
-      _mesa_free(srcBuffer);
+      free(srcBuffer);
       _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBlitFrameBufferEXT");
       return;
    }
@@ -235,8 +235,8 @@ blit_nearest(GLcontext *ctx,
       drawRb->PutRow(ctx, drawRb, dstWidth, dstXpos, dstY, dstBuffer, NULL);
    }
 
-   _mesa_free(srcBuffer);
-   _mesa_free(dstBuffer);
+   free(srcBuffer);
+   free(dstBuffer);
 }
 
 
@@ -366,21 +366,21 @@ blit_linear(GLcontext *ctx,
    /* Allocate the src/dst row buffers.
     * Keep two adjacent src rows around for bilinear sampling.
     */
-   srcBuffer0 = _mesa_malloc(pixelSize * srcWidth);
+   srcBuffer0 = malloc(pixelSize * srcWidth);
    if (!srcBuffer0) {
       _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBlitFrameBufferEXT");
       return;
    }
-   srcBuffer1 = _mesa_malloc(pixelSize * srcWidth);
+   srcBuffer1 = malloc(pixelSize * srcWidth);
    if (!srcBuffer1) {
-      _mesa_free(srcBuffer0);
+      free(srcBuffer0);
       _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBlitFrameBufferEXT");
       return;
    }
-   dstBuffer = _mesa_malloc(pixelSize * dstWidth);
+   dstBuffer = malloc(pixelSize * dstWidth);
    if (!dstBuffer) {
-      _mesa_free(srcBuffer0);
-      _mesa_free(srcBuffer1);
+      free(srcBuffer0);
+      free(srcBuffer1);
       _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBlitFrameBufferEXT");
       return;
    }
@@ -444,9 +444,9 @@ blit_linear(GLcontext *ctx,
       drawRb->PutRow(ctx, drawRb, dstWidth, dstXpos, dstY, dstBuffer, NULL);
    }
 
-   _mesa_free(srcBuffer0);
-   _mesa_free(srcBuffer1);
-   _mesa_free(dstBuffer);
+   free(srcBuffer0);
+   free(srcBuffer1);
+   free(dstBuffer);
 }
 
 
@@ -535,7 +535,7 @@ simple_blit(GLcontext *ctx,
    }
 
    /* allocate the row buffer */
-   rowBuffer = _mesa_malloc(bytesPerRow);
+   rowBuffer = malloc(bytesPerRow);
    if (!rowBuffer) {
       _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBlitFrameBufferEXT");
       return;
@@ -548,7 +548,7 @@ simple_blit(GLcontext *ctx,
       dstY += yStep;
    }
 
-   _mesa_free(rowBuffer);
+   free(rowBuffer);
 }
 
 
diff --git a/src/mesa/swrast/s_copypix.c b/src/mesa/swrast/s_copypix.c
index b69be50f51..3f37c027e4 100644
--- a/src/mesa/swrast/s_copypix.c
+++ b/src/mesa/swrast/s_copypix.c
@@ -114,14 +114,14 @@ copy_conv_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
    span.arrayAttribs = FRAG_BIT_COL0;
 
    /* allocate space for GLfloat image */
-   tmpImage = (GLfloat *) _mesa_malloc(width * height * 4 * sizeof(GLfloat));
+   tmpImage = (GLfloat *) malloc(width * height * 4 * sizeof(GLfloat));
    if (!tmpImage) {
       _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyPixels");
       return;
    }
-   convImage = (GLfloat *) _mesa_malloc(width * height * 4 * sizeof(GLfloat));
+   convImage = (GLfloat *) malloc(width * height * 4 * sizeof(GLfloat));
    if (!convImage) {
-      _mesa_free(tmpImage);
+      free(tmpImage);
       _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyPixels");
       return;
    }
@@ -150,7 +150,7 @@ copy_conv_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
       ASSERT(ctx->Pixel.Separable2DEnabled);
       _mesa_convolve_sep_image(ctx, &width, &height, tmpImage, convImage);
    }
-   _mesa_free(tmpImage);
+   free(tmpImage);
 
    /* do remaining post-convolution image transfer ops */
    for (row = 0; row < height; row++) {
@@ -185,7 +185,7 @@ copy_conv_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
       span.array->ChanType = CHAN_TYPE;
    }
 
-   _mesa_free(convImage);
+   free(convImage);
 }
 
 
@@ -246,7 +246,7 @@ copy_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
    span.arrayAttribs = FRAG_BIT_COL0; /* we'll fill in COL0 attrib values */
 
    if (overlapping) {
-      tmpImage = (GLfloat *) _mesa_malloc(width * height * sizeof(GLfloat) * 4);
+      tmpImage = (GLfloat *) malloc(width * height * sizeof(GLfloat) * 4);
       if (!tmpImage) {
          _mesa_error( ctx, GL_OUT_OF_MEMORY, "glCopyPixels" );
          return;
@@ -303,7 +303,7 @@ copy_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
    span.array->ChanType = CHAN_TYPE; /* restore */
 
    if (overlapping)
-      _mesa_free(tmpImage);
+      free(tmpImage);
 }
 
 
@@ -352,7 +352,7 @@ copy_ci_pixels( GLcontext *ctx, GLint srcx, GLint srcy,
 
    if (overlapping) {
       GLint ssy = sy;
-      tmpImage = (GLuint *) _mesa_malloc(width * height * sizeof(GLuint));
+      tmpImage = (GLuint *) malloc(width * height * sizeof(GLuint));
       if (!tmpImage) {
          _mesa_error( ctx, GL_OUT_OF_MEMORY, "glCopyPixels" );
          return;
@@ -397,7 +397,7 @@ copy_ci_pixels( GLcontext *ctx, GLint srcx, GLint srcy,
    }
 
    if (overlapping)
-      _mesa_free(tmpImage);
+      free(tmpImage);
 }
 
 
@@ -487,7 +487,7 @@ copy_depth_pixels( GLcontext *ctx, GLint srcx, GLint srcy,
 
    if (overlapping) {
       GLint ssy = sy;
-      tmpImage = (GLfloat *) _mesa_malloc(width * height * sizeof(GLfloat));
+      tmpImage = (GLfloat *) malloc(width * height * sizeof(GLfloat));
       if (!tmpImage) {
          _mesa_error( ctx, GL_OUT_OF_MEMORY, "glCopyPixels" );
          return;
@@ -537,7 +537,7 @@ copy_depth_pixels( GLcontext *ctx, GLint srcx, GLint srcy,
    }
 
    if (overlapping)
-      _mesa_free(tmpImage);
+      free(tmpImage);
 }
 
 
@@ -584,7 +584,7 @@ copy_stencil_pixels( GLcontext *ctx, GLint srcx, GLint srcy,
 
    if (overlapping) {
       GLint ssy = sy;
-      tmpImage = (GLstencil *) _mesa_malloc(width * height * sizeof(GLstencil));
+      tmpImage = (GLstencil *) malloc(width * height * sizeof(GLstencil));
       if (!tmpImage) {
          _mesa_error( ctx, GL_OUT_OF_MEMORY, "glCopyPixels" );
          return;
@@ -626,7 +626,7 @@ copy_stencil_pixels( GLcontext *ctx, GLint srcx, GLint srcy,
    }
 
    if (overlapping)
-      _mesa_free(tmpImage);
+      free(tmpImage);
 }
 
 
@@ -688,7 +688,7 @@ copy_depth_stencil_pixels(GLcontext *ctx,
 
       if (stencilMask != 0x0) {
          tempStencilImage
-            = (GLstencil *) _mesa_malloc(width * height * sizeof(GLstencil));
+            = (GLstencil *) malloc(width * height * sizeof(GLstencil));
          if (!tempStencilImage) {
             _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyPixels");
             return;
@@ -706,10 +706,10 @@ copy_depth_stencil_pixels(GLcontext *ctx,
 
       if (ctx->Depth.Mask) {
          tempDepthImage
-            = (GLfloat *) _mesa_malloc(width * height * sizeof(GLfloat));
+            = (GLfloat *) malloc(width * height * sizeof(GLfloat));
          if (!tempDepthImage) {
             _mesa_error(ctx, GL_OUT_OF_MEMORY, "glCopyPixels");
-            _mesa_free(tempStencilImage);
+            free(tempStencilImage);
             return;
          }
 
@@ -799,10 +799,10 @@ copy_depth_stencil_pixels(GLcontext *ctx,
    }
 
    if (tempStencilImage)
-      _mesa_free(tempStencilImage);
+      free(tempStencilImage);
 
    if (tempDepthImage)
-      _mesa_free(tempDepthImage);
+      free(tempDepthImage);
 }
 
 
diff --git a/src/mesa/swrast/s_drawpix.c b/src/mesa/swrast/s_drawpix.c
index 136c296e98..7571d5b8c0 100644
--- a/src/mesa/swrast/s_drawpix.c
+++ b/src/mesa/swrast/s_drawpix.c
@@ -566,14 +566,14 @@ draw_rgba_pixels( GLcontext *ctx, GLint x, GLint y,
       GLint row;
       GLfloat *dest, *tmpImage;
 
-      tmpImage = (GLfloat *) _mesa_malloc(width * height * 4 * sizeof(GLfloat));
+      tmpImage = (GLfloat *) malloc(width * height * 4 * sizeof(GLfloat));
       if (!tmpImage) {
          _mesa_error(ctx, GL_OUT_OF_MEMORY, "glDrawPixels");
          return;
       }
-      convImage = (GLfloat *) _mesa_malloc(width * height * 4 * sizeof(GLfloat));
+      convImage = (GLfloat *) malloc(width * height * 4 * sizeof(GLfloat));
       if (!convImage) {
-         _mesa_free(tmpImage);
+         free(tmpImage);
          _mesa_error(ctx, GL_OUT_OF_MEMORY, "glDrawPixels");
          return;
       }
@@ -597,7 +597,7 @@ draw_rgba_pixels( GLcontext *ctx, GLint x, GLint y,
          ASSERT(ctx->Pixel.Separable2DEnabled);
          _mesa_convolve_sep_image(ctx, &width, &height, tmpImage, convImage);
       }
-      _mesa_free(tmpImage);
+      free(tmpImage);
 
       /* continue transfer ops and draw the convolved image */
       unpack = &ctx->DefaultPacking;
@@ -677,7 +677,7 @@ draw_rgba_pixels( GLcontext *ctx, GLint x, GLint y,
    }
 
    if (convImage) {
-      _mesa_free(convImage);
+      free(convImage);
    }
 }
 
diff --git a/src/mesa/swrast/s_readpix.c b/src/mesa/swrast/s_readpix.c
index 94fb974eab..41911337b8 100644
--- a/src/mesa/swrast/s_readpix.c
+++ b/src/mesa/swrast/s_readpix.c
@@ -358,14 +358,14 @@ read_rgba_pixels( GLcontext *ctx,
       GLfloat *dest, *src, *tmpImage, *convImage;
       GLint row;
 
-      tmpImage = (GLfloat *) _mesa_malloc(width * height * 4 * sizeof(GLfloat));
+      tmpImage = (GLfloat *) malloc(width * height * 4 * sizeof(GLfloat));
       if (!tmpImage) {
          _mesa_error(ctx, GL_OUT_OF_MEMORY, "glReadPixels");
          return;
       }
-      convImage = (GLfloat *) _mesa_malloc(width * height * 4 * sizeof(GLfloat));
+      convImage = (GLfloat *) malloc(width * height * 4 * sizeof(GLfloat));
       if (!convImage) {
-         _mesa_free(tmpImage);
+         free(tmpImage);
          _mesa_error(ctx, GL_OUT_OF_MEMORY, "glReadPixels");
          return;
       }
@@ -399,7 +399,7 @@ read_rgba_pixels( GLcontext *ctx,
          ASSERT(ctx->Pixel.Separable2DEnabled);
          _mesa_convolve_sep_image(ctx, &width, &height, tmpImage, convImage);
       }
-      _mesa_free(tmpImage);
+      free(tmpImage);
 
       /* finish transfer ops and pack the resulting image */
       src = convImage;
@@ -412,7 +412,7 @@ read_rgba_pixels( GLcontext *ctx,
                                     transferOps & IMAGE_POST_CONVOLUTION_BITS);
          src += width * 4;
       }
-      _mesa_free(convImage);
+      free(convImage);
    }
    else {
       /* no convolution */
diff --git a/src/mesa/tnl/t_draw.c b/src/mesa/tnl/t_draw.c
index 149f693711..8a2787a139 100644
--- a/src/mesa/tnl/t_draw.c
+++ b/src/mesa/tnl/t_draw.c
@@ -41,7 +41,7 @@
 static GLubyte *get_space(GLcontext *ctx, GLuint bytes)
 {
    TNLcontext *tnl = TNL_CONTEXT(ctx);
-   GLubyte *space = _mesa_malloc(bytes);
+   GLubyte *space = malloc(bytes);
    
    tnl->block[tnl->nr_blocks++] = space;
    return space;
@@ -53,7 +53,7 @@ static void free_space(GLcontext *ctx)
    TNLcontext *tnl = TNL_CONTEXT(ctx);
    GLuint i;
    for (i = 0; i < tnl->nr_blocks; i++)
-      _mesa_free(tnl->block[i]);
+      free(tnl->block[i]);
    tnl->nr_blocks = 0;
 }
 
diff --git a/src/mesa/tnl/t_vb_normals.c b/src/mesa/tnl/t_vb_normals.c
index 693d3dc118..61ac409573 100644
--- a/src/mesa/tnl/t_vb_normals.c
+++ b/src/mesa/tnl/t_vb_normals.c
@@ -152,7 +152,7 @@ alloc_normal_data(GLcontext *ctx, struct tnl_pipeline_stage *stage)
    TNLcontext *tnl = TNL_CONTEXT(ctx);
    struct normal_stage_data *store;
 
-   stage->privatePtr = _mesa_malloc(sizeof(*store));
+   stage->privatePtr = malloc(sizeof(*store));
    store = NORMAL_STAGE_DATA(stage);
    if (!store)
       return GL_FALSE;
@@ -171,7 +171,7 @@ free_normal_data(struct tnl_pipeline_stage *stage)
    struct normal_stage_data *store = NORMAL_STAGE_DATA(stage);
    if (store) {
       _mesa_vector4f_free( &store->normal );
-      _mesa_free( store );
+      free( store );
       stage->privatePtr = NULL;
    }
 }
diff --git a/src/mesa/tnl/t_vb_points.c b/src/mesa/tnl/t_vb_points.c
index ab8ea60cf2..20634c80d1 100644
--- a/src/mesa/tnl/t_vb_points.c
+++ b/src/mesa/tnl/t_vb_points.c
@@ -81,7 +81,7 @@ alloc_point_data(GLcontext *ctx, struct tnl_pipeline_stage *stage)
 {
    struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
    struct point_stage_data *store;
-   stage->privatePtr = _mesa_malloc(sizeof(*store));
+   stage->privatePtr = malloc(sizeof(*store));
    store = POINT_STAGE_DATA(stage);
    if (!store)
       return GL_FALSE;
@@ -97,7 +97,7 @@ free_point_data(struct tnl_pipeline_stage *stage)
    struct point_stage_data *store = POINT_STAGE_DATA(stage);
    if (store) {
       _mesa_vector4f_free( &store->PointSize );
-      _mesa_free( store );
+      free( store );
       stage->privatePtr = NULL;
    }
 }
diff --git a/src/mesa/tnl/t_vertex.c b/src/mesa/tnl/t_vertex.c
index 2b8c962f06..ed66c35be7 100644
--- a/src/mesa/tnl/t_vertex.c
+++ b/src/mesa/tnl/t_vertex.c
@@ -88,7 +88,7 @@ void _tnl_register_fastpath( struct tnl_clipspace *vtx,
    fastpath->match_strides = match_strides;
    fastpath->func = vtx->emit;
    fastpath->attr = (struct tnl_attr_type *)
-      _mesa_malloc(vtx->attr_count * sizeof(fastpath->attr[0]));
+      malloc(vtx->attr_count * sizeof(fastpath->attr[0]));
 
    for (i = 0; i < vtx->attr_count; i++) {
       fastpath->attr[i].format = vtx->attr[i].format;
diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c
index a284e4047f..f2f1674b6a 100644
--- a/src/mesa/vbo/vbo_exec_array.c
+++ b/src/mesa/vbo/vbo_exec_array.c
@@ -854,7 +854,7 @@ vbo_validated_multidrawelements(GLcontext *ctx, GLenum mode,
       return;
    }
 
-   prim = _mesa_calloc(primcount * sizeof(*prim));
+   prim = calloc(1, primcount * sizeof(*prim));
    if (prim == NULL) {
       _mesa_error(ctx, GL_OUT_OF_MEMORY, "glMultiDrawElements");
       return;
@@ -960,7 +960,7 @@ vbo_validated_multidrawelements(GLcontext *ctx, GLenum mode,
       }
    }
 
-   _mesa_free(prim);
+   free(prim);
 }
 
 
diff --git a/src/mesa/vbo/vbo_rebase.c b/src/mesa/vbo/vbo_rebase.c
index 55a82ee369..1db36de3de 100644
--- a/src/mesa/vbo/vbo_rebase.c
+++ b/src/mesa/vbo/vbo_rebase.c
@@ -134,7 +134,7 @@ void vbo_rebase_prims( GLcontext *ctx,
       /* 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);
+      tmp_prims = (struct _mesa_prim *)malloc(sizeof(*prim) * nr_prims);
 
       for (i = 0; i < nr_prims; i++) {
 	 tmp_prims[i] = prim[i];
@@ -187,7 +187,7 @@ void vbo_rebase_prims( GLcontext *ctx,
    else {
       /* Otherwise the primitives need adjustment.
        */
-      tmp_prims = (struct _mesa_prim *)_mesa_malloc(sizeof(*prim) * nr_prims);
+      tmp_prims = (struct _mesa_prim *)malloc(sizeof(*prim) * nr_prims);
 
       for (i = 0; i < nr_prims; i++) {
 	 /* If this fails, it could indicate an application error:
@@ -229,10 +229,10 @@ void vbo_rebase_prims( GLcontext *ctx,
 	 max_index - min_index );
    
    if (tmp_indices)
-      _mesa_free(tmp_indices);
+      free(tmp_indices);
    
    if (tmp_prims)
-      _mesa_free(tmp_prims);
+      free(tmp_prims);
 }
 
 
diff --git a/src/mesa/vbo/vbo_split_copy.c b/src/mesa/vbo/vbo_split_copy.c
index 2ca111217c..2fae267ff5 100644
--- a/src/mesa/vbo/vbo_split_copy.c
+++ b/src/mesa/vbo/vbo_split_copy.c
@@ -466,7 +466,7 @@ replay_init( struct copy_context *copy )
 
    switch (copy->ib->type) {
    case GL_UNSIGNED_BYTE:
-      copy->translated_elt_buf = _mesa_malloc(sizeof(GLuint) * copy->ib->count);
+      copy->translated_elt_buf = malloc(sizeof(GLuint) * copy->ib->count);
       copy->srcelt = copy->translated_elt_buf;
 
       for (i = 0; i < copy->ib->count; i++)
@@ -474,7 +474,7 @@ replay_init( struct copy_context *copy )
       break;
 
    case GL_UNSIGNED_SHORT:
-      copy->translated_elt_buf = _mesa_malloc(sizeof(GLuint) * copy->ib->count);
+      copy->translated_elt_buf = malloc(sizeof(GLuint) * copy->ib->count);
       copy->srcelt = copy->translated_elt_buf;
 
       for (i = 0; i < copy->ib->count; i++)
@@ -500,7 +500,7 @@ replay_init( struct copy_context *copy )
     *
     * XXX:  This should be a VBO!
     */
-   copy->dstbuf = _mesa_malloc(copy->dstbuf_size * copy->vertex_size);   
+   copy->dstbuf = malloc(copy->dstbuf_size * copy->vertex_size);   
    copy->dstptr = copy->dstbuf;
 
    /* Setup new vertex arrays to point into the output buffer: 
@@ -529,7 +529,7 @@ replay_init( struct copy_context *copy )
 			    copy->ib->count * 2 + 3);
    copy->dstelt_size = MIN2(copy->dstelt_size,
 			    copy->limits->max_indices);
-   copy->dstelt = _mesa_malloc(sizeof(GLuint) * copy->dstelt_size);
+   copy->dstelt = malloc(sizeof(GLuint) * copy->dstelt_size);
    copy->dstelt_nr = 0;
 
    /* Setup the new index buffer to point to the allocated element
@@ -553,9 +553,9 @@ replay_finish( struct copy_context *copy )
 
    /* Free our vertex and index buffers: 
     */
-   _mesa_free(copy->translated_elt_buf);
-   _mesa_free(copy->dstbuf);
-   _mesa_free(copy->dstelt);
+   free(copy->translated_elt_buf);
+   free(copy->dstbuf);
+   free(copy->dstelt);
 
    /* Unmap VBO's 
     */
diff --git a/src/mesa/vf/vf.c b/src/mesa/vf/vf.c
index 15a78c4c0a..dab436e2ab 100644
--- a/src/mesa/vf/vf.c
+++ b/src/mesa/vf/vf.c
@@ -86,7 +86,7 @@ void vf_register_fastpath( struct vertex_fetch *vf,
    fastpath->match_strides = match_strides;
    fastpath->func = vf->emit;
    fastpath->attr = (struct vf_attr_type *)
-      _mesa_malloc(vf->attr_count * sizeof(fastpath->attr[0]));
+      malloc(vf->attr_count * sizeof(fastpath->attr[0]));
 
    for (i = 0; i < vf->attr_count; i++) {
       fastpath->attr[i].format = vf->attr[i].format;
-- 
cgit v1.2.3


From 298be2b028263b2c343a707662c6fbfa18293cb2 Mon Sep 17 00:00:00 2001
From: Kristian Høgsberg <krh@bitplanet.net>
Date: Fri, 19 Feb 2010 12:32:24 -0500
Subject: Replace the _mesa_*printf() wrappers with the plain libc versions

---
 src/gallium/auxiliary/util/u_gen_mipmap.c        |   2 +-
 src/gallium/drivers/cell/spu/spu_tri.c           |   2 +-
 src/gallium/state_trackers/glx/xlib/glx_api.c    |   8 +-
 src/gallium/state_trackers/glx/xlib/xm_api.c     |   8 +-
 src/mesa/drivers/common/meta.c                   |   6 +-
 src/mesa/drivers/dri/i915/i915_context.c         |   2 +-
 src/mesa/drivers/dri/i915/i915_debug.c           | 178 ++++++------
 src/mesa/drivers/dri/i915/i915_debug_fp.c        |  80 +++---
 src/mesa/drivers/dri/i915/i915_tex_layout.c      |   4 +-
 src/mesa/drivers/dri/i915/intel_tris.c           |   8 +-
 src/mesa/drivers/dri/i965/brw_context.c          |   4 +-
 src/mesa/drivers/dri/i965/brw_curbe.c            |  26 +-
 src/mesa/drivers/dri/i965/brw_draw.c             |   4 +-
 src/mesa/drivers/dri/i965/brw_draw_upload.c      |   4 +-
 src/mesa/drivers/dri/i965/brw_eu_debug.c         |  14 +-
 src/mesa/drivers/dri/i965/brw_eu_emit.c          |   4 +-
 src/mesa/drivers/dri/i965/brw_state_cache.c      |  10 +-
 src/mesa/drivers/dri/i965/brw_urb.c              |   6 +-
 src/mesa/drivers/dri/i965/brw_vs_emit.c          |  14 +-
 src/mesa/drivers/dri/i965/brw_wm_debug.c         |  68 ++---
 src/mesa/drivers/dri/i965/brw_wm_emit.c          |  12 +-
 src/mesa/drivers/dri/i965/brw_wm_fp.c            |  14 +-
 src/mesa/drivers/dri/i965/brw_wm_glsl.c          |  10 +-
 src/mesa/drivers/dri/i965/brw_wm_pass0.c         |   4 +-
 src/mesa/drivers/dri/intel/intel_batchbuffer.c   |   4 +-
 src/mesa/drivers/dri/intel/intel_context.c       |   2 +-
 src/mesa/drivers/dri/intel/intel_context.h       |   2 +-
 src/mesa/drivers/dri/intel/intel_pixel_bitmap.c  |   4 +-
 src/mesa/drivers/dri/intel/intel_pixel_read.c    |  14 +-
 src/mesa/drivers/dri/intel/intel_tex.c           |   4 +-
 src/mesa/drivers/dri/nouveau/nouveau_driver.h    |   2 +-
 src/mesa/drivers/dri/r300/r300_fragprog_common.c |   2 +-
 src/mesa/drivers/dri/r300/r300_render.c          |   2 +-
 src/mesa/drivers/dri/r300/r300_state.c           |   2 +-
 src/mesa/drivers/dri/r600/r700_state.c           |   2 +-
 src/mesa/drivers/dri/radeon/radeon_fbo.c         |   2 +-
 src/mesa/drivers/dri/swrast/swrast_priv.h        |   4 +-
 src/mesa/drivers/x11/fakeglx.c                   |  10 +-
 src/mesa/drivers/x11/xm_api.c                    |  12 +-
 src/mesa/drivers/x11/xm_tri.c                    |  92 +++----
 src/mesa/glapi/gl_enums.py                       |   2 +-
 src/mesa/main/arrayobj.c                         |  10 +-
 src/mesa/main/bufferobj.c                        |   8 +-
 src/mesa/main/debug.c                            |  56 ++--
 src/mesa/main/dlist.c                            | 130 ++++-----
 src/mesa/main/enums.c                            |   2 +-
 src/mesa/main/execmem.c                          |   2 +-
 src/mesa/main/fbobject.c                         |  50 ++--
 src/mesa/main/ffvertex_prog.c                    |   8 +-
 src/mesa/main/imports.c                          |  67 +----
 src/mesa/main/imports.h                          |  16 --
 src/mesa/main/mipmap.c                           |   2 +-
 src/mesa/main/shaders.c                          |   2 +-
 src/mesa/main/state.c                            |   2 +-
 src/mesa/main/texenvprogram.c                    |   2 +-
 src/mesa/main/teximage.c                         |   4 +-
 src/mesa/main/texobj.c                           |   6 +-
 src/mesa/main/texstate.c                         |  38 +--
 src/mesa/main/texstore.c                         |  20 +-
 src/mesa/main/varray.c                           |  18 +-
 src/mesa/main/version.c                          |   4 +-
 src/mesa/math/m_debug_clip.c                     |  44 +--
 src/mesa/math/m_debug_norm.c                     |  34 +--
 src/mesa/math/m_debug_xform.c                    |  32 +--
 src/mesa/math/m_vector.c                         |  16 +-
 src/mesa/shader/arbprogparse.c                   |   4 +-
 src/mesa/shader/nvfragparse.c                    |   6 +-
 src/mesa/shader/nvvertparse.c                    |   6 +-
 src/mesa/shader/prog_execute.c                   |   4 +-
 src/mesa/shader/prog_instruction.c               |   2 +-
 src/mesa/shader/prog_optimize.c                  |  62 ++---
 src/mesa/shader/prog_print.c                     | 330 +++++++++++------------
 src/mesa/shader/prog_statevars.c                 |   6 +-
 src/mesa/shader/program_parse.tab.c              |   6 +-
 src/mesa/shader/program_parse.y                  |   6 +-
 src/mesa/shader/shader_api.c                     |  36 +--
 src/mesa/shader/slang/slang_codegen.c            |   4 +-
 src/mesa/shader/slang/slang_emit.c               |   4 +-
 src/mesa/shader/slang/slang_label.c              |   2 +-
 src/mesa/shader/slang/slang_link.c               |  26 +-
 src/mesa/shader/slang/slang_log.c                |   6 +-
 src/mesa/shader/slang/slang_utility.c            |   2 +-
 src/mesa/state_tracker/st_atom.c                 |  10 +-
 src/mesa/swrast/s_lines.c                        |   2 +-
 src/mesa/tnl/t_draw.c                            |  10 +-
 src/mesa/tnl/t_vb_cliptmp.h                      |  16 +-
 src/mesa/tnl/t_vertex.c                          |  10 +-
 src/mesa/tnl/t_vertex_sse.c                      |   8 +-
 src/mesa/vbo/vbo_exec_api.c                      |   6 +-
 src/mesa/vbo/vbo_exec_array.c                    |  70 ++---
 src/mesa/vbo/vbo_exec_draw.c                     |  32 +--
 src/mesa/vbo/vbo_rebase.c                        |   2 +-
 src/mesa/vbo/vbo_save_api.c                      |   8 +-
 src/mesa/vbo/vbo_save_draw.c                     |   2 +-
 src/mesa/vbo/vbo_save_loopback.c                 |  12 +-
 src/mesa/vbo/vbo_split_copy.c                    |  36 +--
 src/mesa/vf/vf.c                                 |  10 +-
 src/mesa/vf/vf_sse.c                             |   8 +-
 src/mesa/x86/rtasm/x86sse.c                      |   2 +-
 99 files changed, 951 insertions(+), 1032 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/gallium/auxiliary/util/u_gen_mipmap.c b/src/gallium/auxiliary/util/u_gen_mipmap.c
index 4e358d3938..1d7329d422 100644
--- a/src/gallium/auxiliary/util/u_gen_mipmap.c
+++ b/src/gallium/auxiliary/util/u_gen_mipmap.c
@@ -1069,7 +1069,7 @@ reduce_3d(enum pipe_format pformat,
     */
 
    /*
-   _mesa_printf("mip3d %d x %d x %d  ->  %d x %d x %d\n",
+   printf("mip3d %d x %d x %d  ->  %d x %d x %d\n",
           srcWidth, srcHeight, srcDepth, dstWidth, dstHeight, dstDepth);
    */
 
diff --git a/src/gallium/drivers/cell/spu/spu_tri.c b/src/gallium/drivers/cell/spu/spu_tri.c
index 58be001be4..f619380d80 100644
--- a/src/gallium/drivers/cell/spu/spu_tri.c
+++ b/src/gallium/drivers/cell/spu/spu_tri.c
@@ -752,7 +752,7 @@ subtriangle(struct edge *eleft, struct edge *eright, unsigned lines)
    finish_y -= sy;
 
    /*
-   _mesa_printf("%s %d %d\n", __FUNCTION__, start_y, finish_y);  
+   printf("%s %d %d\n", __FUNCTION__, start_y, finish_y);  
    */
 
    for (y = start_y; y < finish_y; y++) {
diff --git a/src/gallium/state_trackers/glx/xlib/glx_api.c b/src/gallium/state_trackers/glx/xlib/glx_api.c
index 0932569bd3..656a69131e 100644
--- a/src/gallium/state_trackers/glx/xlib/glx_api.c
+++ b/src/gallium/state_trackers/glx/xlib/glx_api.c
@@ -1679,8 +1679,8 @@ PUBLIC const char *
 glXQueryServerString( Display *dpy, int screen, int name )
 {
    static char version[1000];
-   _mesa_sprintf(version, "%d.%d %s",
-                 SERVER_MAJOR_VERSION, SERVER_MINOR_VERSION, MESA_GLX_VERSION);
+   sprintf(version, "%d.%d %s",
+	   SERVER_MAJOR_VERSION, SERVER_MINOR_VERSION, MESA_GLX_VERSION);
 
    (void) dpy;
    (void) screen;
@@ -1704,8 +1704,8 @@ PUBLIC const char *
 glXGetClientString( Display *dpy, int name )
 {
    static char version[1000];
-   _mesa_sprintf(version, "%d.%d %s", CLIENT_MAJOR_VERSION,
-                 CLIENT_MINOR_VERSION, MESA_GLX_VERSION);
+   sprintf(version, "%d.%d %s", CLIENT_MAJOR_VERSION,
+	   CLIENT_MINOR_VERSION, MESA_GLX_VERSION);
 
    (void) dpy;
 
diff --git a/src/gallium/state_trackers/glx/xlib/xm_api.c b/src/gallium/state_trackers/glx/xlib/xm_api.c
index 61af663436..a274da0c62 100644
--- a/src/gallium/state_trackers/glx/xlib/xm_api.c
+++ b/src/gallium/state_trackers/glx/xlib/xm_api.c
@@ -550,10 +550,10 @@ initialize_visual_and_buffer(XMesaVisual v, XMesaBuffer b,
     * reports bugs.
     */
    if (_mesa_getenv("MESA_INFO")) {
-      _mesa_printf("X/Mesa visual = %p\n", (void *) v);
-      _mesa_printf("X/Mesa level = %d\n", v->mesa_visual.level);
-      _mesa_printf("X/Mesa depth = %d\n", v->visinfo->depth);
-      _mesa_printf("X/Mesa bits per pixel = %d\n", v->BitsPerPixel);
+      printf("X/Mesa visual = %p\n", (void *) v);
+      printf("X/Mesa level = %d\n", v->mesa_visual.level);
+      printf("X/Mesa depth = %d\n", v->visinfo->depth);
+      printf("X/Mesa bits per pixel = %d\n", v->BitsPerPixel);
    }
 
    if (b && window) {
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index 42ab7d4ed6..3aa70ddbf0 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -1047,7 +1047,7 @@ init_blit_depth_pixels(GLcontext *ctx)
       texTarget = "RECT";
    else
       texTarget = "2D";
-   _mesa_snprintf(program2, sizeof(program2), program, texTarget);
+   snprintf(program2, sizeof(program2), program, texTarget);
 
    _mesa_GenPrograms(1, &blit->DepthFP);
    _mesa_BindProgram(GL_FRAGMENT_PROGRAM_ARB, blit->DepthFP);
@@ -1670,7 +1670,7 @@ init_draw_stencil_pixels(GLcontext *ctx)
       texTarget = "RECT";
    else
       texTarget = "2D";
-   _mesa_snprintf(program2, sizeof(program2), program, texTarget);
+   snprintf(program2, sizeof(program2), program, texTarget);
 
    _mesa_GenPrograms(1, &drawpix->StencilFP);
    _mesa_BindProgram(GL_FRAGMENT_PROGRAM_ARB, drawpix->StencilFP);
@@ -1704,7 +1704,7 @@ init_draw_depth_pixels(GLcontext *ctx)
       texTarget = "RECT";
    else
       texTarget = "2D";
-   _mesa_snprintf(program2, sizeof(program2), program, texTarget);
+   snprintf(program2, sizeof(program2), program, texTarget);
 
    _mesa_GenPrograms(1, &drawpix->DepthFP);
    _mesa_BindProgram(GL_FRAGMENT_PROGRAM_ARB, drawpix->DepthFP);
diff --git a/src/mesa/drivers/dri/i915/i915_context.c b/src/mesa/drivers/dri/i915/i915_context.c
index ed9a44ff24..4d86aae87d 100644
--- a/src/mesa/drivers/dri/i915/i915_context.c
+++ b/src/mesa/drivers/dri/i915/i915_context.c
@@ -108,7 +108,7 @@ i915CreateContext(const __GLcontextModes * mesaVis,
       return GL_FALSE;
 
    if (0)
-      _mesa_printf("\ntexmem-0-3 branch\n\n");
+      printf("\ntexmem-0-3 branch\n\n");
 
    i915InitVtbl(i915);
 
diff --git a/src/mesa/drivers/dri/i915/i915_debug.c b/src/mesa/drivers/dri/i915/i915_debug.c
index fecfac3033..4569fb918e 100644
--- a/src/mesa/drivers/dri/i915/i915_debug.c
+++ b/src/mesa/drivers/dri/i915/i915_debug.c
@@ -31,27 +31,25 @@
 #include "i915_context.h"
 #include "i915_debug.h"
 
-#define PRINTF( ... ) _mesa_printf( __VA_ARGS__ )
-
 static GLboolean debug( struct debug_stream *stream, const char *name, GLuint len )
 {
    GLuint i;
    GLuint *ptr = (GLuint *)(stream->ptr + stream->offset);
    
    if (len == 0) {
-      PRINTF("Error - zero length packet (0x%08x)\n", stream->ptr[0]);
+      printf("Error - zero length packet (0x%08x)\n", stream->ptr[0]);
       assert(0);
       return GL_FALSE;
    }
 
    if (stream->print_addresses)
-      PRINTF("%08x:  ", stream->offset);
+      printf("%08x:  ", stream->offset);
 
 
-   PRINTF("%s (%d dwords):\n", name, len);
+   printf("%s (%d dwords):\n", name, len);
    for (i = 0; i < len; i++)
-      PRINTF("\t0x%08x\n",  ptr[i]);   
-   PRINTF("\n");
+      printf("\t0x%08x\n",  ptr[i]);   
+   printf("\n");
 
    stream->offset += len * sizeof(GLuint);
    
@@ -88,17 +86,17 @@ static GLboolean debug_prim( struct debug_stream *stream, const char *name,
    
 
 
-   PRINTF("%s %s (%d dwords):\n", name, prim, len);
-   PRINTF("\t0x%08x\n",  ptr[0]);   
+   printf("%s %s (%d dwords):\n", name, prim, len);
+   printf("\t0x%08x\n",  ptr[0]);   
    for (i = 1; i < len; i++) {
       if (dump_floats)
-	 PRINTF("\t0x%08x // %f\n",  ptr[i], *(GLfloat *)&ptr[i]);   
+	 printf("\t0x%08x // %f\n",  ptr[i], *(GLfloat *)&ptr[i]);   
       else
-	 PRINTF("\t0x%08x\n",  ptr[i]);   
+	 printf("\t0x%08x\n",  ptr[i]);   
    }
 
       
-   PRINTF("\n");
+   printf("\n");
 
    stream->offset += len * sizeof(GLuint);
    
@@ -113,15 +111,15 @@ static GLboolean debug_program( struct debug_stream *stream, const char *name, G
    GLuint *ptr = (GLuint *)(stream->ptr + stream->offset);
 
    if (len == 0) {
-      PRINTF("Error - zero length packet (0x%08x)\n", stream->ptr[0]);
+      printf("Error - zero length packet (0x%08x)\n", stream->ptr[0]);
       assert(0);
       return GL_FALSE;
    }
 
    if (stream->print_addresses)
-      PRINTF("%08x:  ", stream->offset);
+      printf("%08x:  ", stream->offset);
 
-   PRINTF("%s (%d dwords):\n", name, len);
+   printf("%s (%d dwords):\n", name, len);
    i915_disassemble_program( ptr, len );
 
    stream->offset += len * sizeof(GLuint);
@@ -135,17 +133,17 @@ static GLboolean debug_chain( struct debug_stream *stream, const char *name, GLu
    GLuint old_offset = stream->offset + len * sizeof(GLuint);
    GLuint i;
 
-   PRINTF("%s (%d dwords):\n", name, len);
+   printf("%s (%d dwords):\n", name, len);
    for (i = 0; i < len; i++)
-      PRINTF("\t0x%08x\n",  ptr[i]);
+      printf("\t0x%08x\n",  ptr[i]);
 
    stream->offset = ptr[1] & ~0x3;
    
    if (stream->offset < old_offset)
-      PRINTF("\n... skipping backwards from 0x%x --> 0x%x ...\n\n", 
+      printf("\n... skipping backwards from 0x%x --> 0x%x ...\n\n", 
 		   old_offset, stream->offset );
    else
-      PRINTF("\n... skipping from 0x%x --> 0x%x ...\n\n", 
+      printf("\n... skipping from 0x%x --> 0x%x ...\n\n", 
 		   old_offset, stream->offset );
 
 
@@ -165,10 +163,10 @@ static GLboolean debug_variable_length_prim( struct debug_stream *stream )
 
    len = 1+(i+2)/2;
 
-   PRINTF("3DPRIM, %s variable length %d indicies (%d dwords):\n", prim, i, len);
+   printf("3DPRIM, %s variable length %d indicies (%d dwords):\n", prim, i, len);
    for (i = 0; i < len; i++)
-      PRINTF("\t0x%08x\n",  ptr[i]);
-   PRINTF("\n");
+      printf("\t0x%08x\n",  ptr[i]);
+   printf("\n");
 
    stream->offset += len * sizeof(GLuint);
    return GL_TRUE;
@@ -178,9 +176,9 @@ static GLboolean debug_variable_length_prim( struct debug_stream *stream )
 #define BITS( dw, hi, lo, ... )				\
 do {							\
    unsigned himask = 0xffffffffU >> (31 - (hi));		\
-   PRINTF("\t\t ");				\
-   PRINTF(__VA_ARGS__);			\
-   PRINTF(": 0x%x\n", ((dw) & himask) >> (lo));	\
+   printf("\t\t ");				\
+   printf(__VA_ARGS__);			\
+   printf(": 0x%x\n", ((dw) & himask) >> (lo));	\
 } while (0)
 
 #define MBZ( dw, hi, lo) do {							\
@@ -194,9 +192,9 @@ do {							\
 #define FLAG( dw, bit, ... )			\
 do {							\
    if (((dw) >> (bit)) & 1) {				\
-      PRINTF("\t\t ");				\
-      PRINTF(__VA_ARGS__);			\
-      PRINTF("\n");				\
+      printf("\t\t ");				\
+      printf(__VA_ARGS__);			\
+      printf("\n");				\
    }							\
 } while (0)
 
@@ -208,17 +206,17 @@ static GLboolean debug_load_immediate( struct debug_stream *stream,
    GLuint bits = (ptr[0] >> 4) & 0xff;
    GLuint j = 0;
    
-   PRINTF("%s (%d dwords, flags: %x):\n", name, len, bits);
-   PRINTF("\t0x%08x\n",  ptr[j++]);
+   printf("%s (%d dwords, flags: %x):\n", name, len, bits);
+   printf("\t0x%08x\n",  ptr[j++]);
 
    if (bits & (1<<0)) {
-      PRINTF("\t  LIS0: 0x%08x\n", ptr[j]);
-      PRINTF("\t vb address: 0x%08x\n", (ptr[j] & ~0x3));
+      printf("\t  LIS0: 0x%08x\n", ptr[j]);
+      printf("\t vb address: 0x%08x\n", (ptr[j] & ~0x3));
       BITS(ptr[j], 0, 0, "vb invalidate disable");
       j++;
    }
    if (bits & (1<<1)) {
-      PRINTF("\t  LIS1: 0x%08x\n", ptr[j]);
+      printf("\t  LIS1: 0x%08x\n", ptr[j]);
       BITS(ptr[j], 29, 24, "vb dword width");
       BITS(ptr[j], 21, 16, "vb dword pitch");
       BITS(ptr[j], 15, 0, "vb max index");
@@ -226,7 +224,7 @@ static GLboolean debug_load_immediate( struct debug_stream *stream,
    }
    if (bits & (1<<2)) {
       int i;
-      PRINTF("\t  LIS2: 0x%08x\n", ptr[j]);
+      printf("\t  LIS2: 0x%08x\n", ptr[j]);
       for (i = 0; i < 8; i++) {
 	 unsigned tc = (ptr[j] >> (i * 4)) & 0xf;
 	 if (tc != 0xf)
@@ -235,11 +233,11 @@ static GLboolean debug_load_immediate( struct debug_stream *stream,
       j++;
    }
    if (bits & (1<<3)) {
-      PRINTF("\t  LIS3: 0x%08x\n", ptr[j]);
+      printf("\t  LIS3: 0x%08x\n", ptr[j]);
       j++;
    }
    if (bits & (1<<4)) {
-      PRINTF("\t  LIS4: 0x%08x\n", ptr[j]);
+      printf("\t  LIS4: 0x%08x\n", ptr[j]);
       BITS(ptr[j], 31, 23, "point width");
       BITS(ptr[j], 22, 19, "line width");
       FLAG(ptr[j], 18, "alpha flatshade");
@@ -261,7 +259,7 @@ static GLboolean debug_load_immediate( struct debug_stream *stream,
       j++;
    }
    if (bits & (1<<5)) {
-      PRINTF("\t  LIS5: 0x%08x\n", ptr[j]);
+      printf("\t  LIS5: 0x%08x\n", ptr[j]);
       BITS(ptr[j], 31, 28, "rgba write disables");
       FLAG(ptr[j], 27,     "force dflt point width");
       FLAG(ptr[j], 26,     "last pixel enable");
@@ -279,7 +277,7 @@ static GLboolean debug_load_immediate( struct debug_stream *stream,
       j++;
    }
    if (bits & (1<<6)) {
-      PRINTF("\t  LIS6: 0x%08x\n", ptr[j]);
+      printf("\t  LIS6: 0x%08x\n", ptr[j]);
       FLAG(ptr[j], 31,      "alpha test enable");
       BITS(ptr[j], 30, 28,  "alpha func");
       BITS(ptr[j], 27, 20,  "alpha ref");
@@ -296,7 +294,7 @@ static GLboolean debug_load_immediate( struct debug_stream *stream,
    }
 
 
-   PRINTF("\n");
+   printf("\n");
 
    assert(j == len);
 
@@ -315,34 +313,34 @@ static GLboolean debug_load_indirect( struct debug_stream *stream,
    GLuint bits = (ptr[0] >> 8) & 0x3f;
    GLuint i, j = 0;
    
-   PRINTF("%s (%d dwords):\n", name, len);
-   PRINTF("\t0x%08x\n",  ptr[j++]);
+   printf("%s (%d dwords):\n", name, len);
+   printf("\t0x%08x\n",  ptr[j++]);
 
    for (i = 0; i < 6; i++) {
       if (bits & (1<<i)) {
 	 switch (1<<(8+i)) {
 	 case LI0_STATE_STATIC_INDIRECT:
-	    PRINTF("        STATIC: 0x%08x | %x\n", ptr[j]&~3, ptr[j]&3); j++;
-	    PRINTF("                0x%08x\n", ptr[j++]);
+	    printf("        STATIC: 0x%08x | %x\n", ptr[j]&~3, ptr[j]&3); j++;
+	    printf("                0x%08x\n", ptr[j++]);
 	    break;
 	 case LI0_STATE_DYNAMIC_INDIRECT:
-	    PRINTF("       DYNAMIC: 0x%08x | %x\n", ptr[j]&~3, ptr[j]&3); j++;
+	    printf("       DYNAMIC: 0x%08x | %x\n", ptr[j]&~3, ptr[j]&3); j++;
 	    break;
 	 case LI0_STATE_SAMPLER:
-	    PRINTF("       SAMPLER: 0x%08x | %x\n", ptr[j]&~3, ptr[j]&3); j++;
-	    PRINTF("                0x%08x\n", ptr[j++]);
+	    printf("       SAMPLER: 0x%08x | %x\n", ptr[j]&~3, ptr[j]&3); j++;
+	    printf("                0x%08x\n", ptr[j++]);
 	    break;
 	 case LI0_STATE_MAP:
-	    PRINTF("           MAP: 0x%08x | %x\n", ptr[j]&~3, ptr[j]&3); j++;
-	    PRINTF("                0x%08x\n", ptr[j++]);
+	    printf("           MAP: 0x%08x | %x\n", ptr[j]&~3, ptr[j]&3); j++;
+	    printf("                0x%08x\n", ptr[j++]);
 	    break;
 	 case LI0_STATE_PROGRAM:
-	    PRINTF("       PROGRAM: 0x%08x | %x\n", ptr[j]&~3, ptr[j]&3); j++;
-	    PRINTF("                0x%08x\n", ptr[j++]);
+	    printf("       PROGRAM: 0x%08x | %x\n", ptr[j]&~3, ptr[j]&3); j++;
+	    printf("                0x%08x\n", ptr[j++]);
 	    break;
 	 case LI0_STATE_CONSTANTS:
-	    PRINTF("     CONSTANTS: 0x%08x | %x\n", ptr[j]&~3, ptr[j]&3); j++;
-	    PRINTF("                0x%08x\n", ptr[j++]);
+	    printf("     CONSTANTS: 0x%08x | %x\n", ptr[j]&~3, ptr[j]&3); j++;
+	    printf("                0x%08x\n", ptr[j++]);
 	    break;
 	 default:
 	    assert(0);
@@ -352,10 +350,10 @@ static GLboolean debug_load_indirect( struct debug_stream *stream,
    }
 
    if (bits == 0) {
-      PRINTF("\t  DUMMY: 0x%08x\n", ptr[j++]);
+      printf("\t  DUMMY: 0x%08x\n", ptr[j++]);
    }
 
-   PRINTF("\n");
+   printf("\n");
 
 
    assert(j == len);
@@ -368,7 +366,7 @@ static GLboolean debug_load_indirect( struct debug_stream *stream,
 static void BR13( struct debug_stream *stream,
 		  GLuint val )
 {
-   PRINTF("\t0x%08x\n",  val);
+   printf("\t0x%08x\n",  val);
    FLAG(val, 30, "clipping enable");
    BITS(val, 25, 24, "color depth (3==32bpp)");
    BITS(val, 23, 16, "raster op");
@@ -384,11 +382,11 @@ static void BR2223( struct debug_stream *stream,
    BR22.val = val22;
    BR23.val = val23;
 
-   PRINTF("\t0x%08x\n",  val22);
+   printf("\t0x%08x\n",  val22);
    BITS(val22, 31, 16, "dest y1");
    BITS(val22, 15, 0,  "dest x1");
 
-   PRINTF("\t0x%08x\n",  val23);
+   printf("\t0x%08x\n",  val23);
    BITS(val23, 31, 16, "dest y2");
    BITS(val23, 15, 0,  "dest x2");
 
@@ -400,13 +398,13 @@ static void BR2223( struct debug_stream *stream,
 static void BR09( struct debug_stream *stream,
 		  GLuint val )
 {
-   PRINTF("\t0x%08x -- dest address\n",  val);
+   printf("\t0x%08x -- dest address\n",  val);
 }
 
 static void BR26( struct debug_stream *stream,
 		  GLuint val )
 {
-   PRINTF("\t0x%08x\n",  val);
+   printf("\t0x%08x\n",  val);
    BITS(val, 31, 16, "src y1");
    BITS(val, 15, 0,  "src x1");
 }
@@ -414,20 +412,20 @@ static void BR26( struct debug_stream *stream,
 static void BR11( struct debug_stream *stream,
 		  GLuint val )
 {
-   PRINTF("\t0x%08x\n",  val);
+   printf("\t0x%08x\n",  val);
    BITS(val, 15, 0,  "src pitch");
 }
 
 static void BR12( struct debug_stream *stream,
 		  GLuint val )
 {
-   PRINTF("\t0x%08x -- src address\n",  val);
+   printf("\t0x%08x -- src address\n",  val);
 }
 
 static void BR16( struct debug_stream *stream,
 		  GLuint val )
 {
-   PRINTF("\t0x%08x -- color\n",  val);
+   printf("\t0x%08x -- color\n",  val);
 }
    
 static GLboolean debug_copy_blit( struct debug_stream *stream,
@@ -437,8 +435,8 @@ static GLboolean debug_copy_blit( struct debug_stream *stream,
    GLuint *ptr = (GLuint *)(stream->ptr + stream->offset);
    int j = 0;
 
-   PRINTF("%s (%d dwords):\n", name, len);
-   PRINTF("\t0x%08x\n",  ptr[j++]);
+   printf("%s (%d dwords):\n", name, len);
+   printf("\t0x%08x\n",  ptr[j++]);
    
    BR13(stream, ptr[j++]);
    BR2223(stream, ptr[j], ptr[j+1]);
@@ -460,8 +458,8 @@ static GLboolean debug_color_blit( struct debug_stream *stream,
    GLuint *ptr = (GLuint *)(stream->ptr + stream->offset);
    int j = 0;
 
-   PRINTF("%s (%d dwords):\n", name, len);
-   PRINTF("\t0x%08x\n",  ptr[j++]);
+   printf("%s (%d dwords):\n", name, len);
+   printf("\t0x%08x\n",  ptr[j++]);
 
    BR13(stream, ptr[j++]);
    BR2223(stream, ptr[j], ptr[j+1]);
@@ -481,8 +479,8 @@ static GLboolean debug_modes4( struct debug_stream *stream,
    GLuint *ptr = (GLuint *)(stream->ptr + stream->offset);
    int j = 0;
 
-   PRINTF("%s (%d dwords):\n", name, len);
-   PRINTF("\t0x%08x\n",  ptr[j]);
+   printf("%s (%d dwords):\n", name, len);
+   printf("\t0x%08x\n",  ptr[j]);
    BITS(ptr[j], 21, 18, "logicop func");
    FLAG(ptr[j], 17, "stencil test mask modify-enable");
    FLAG(ptr[j], 16, "stencil write mask modify-enable");
@@ -502,26 +500,26 @@ static GLboolean debug_map_state( struct debug_stream *stream,
    GLuint *ptr = (GLuint *)(stream->ptr + stream->offset);
    int j = 0;
 
-   PRINTF("%s (%d dwords):\n", name, len);
-   PRINTF("\t0x%08x\n",  ptr[j++]);
+   printf("%s (%d dwords):\n", name, len);
+   printf("\t0x%08x\n",  ptr[j++]);
    
    {
-      PRINTF("\t0x%08x\n",  ptr[j]);
+      printf("\t0x%08x\n",  ptr[j]);
       BITS(ptr[j], 15, 0,   "map mask");
       j++;
    }
 
    while (j < len) {
       {
-	 PRINTF("\t  TMn.0: 0x%08x\n", ptr[j]);
-	 PRINTF("\t map address: 0x%08x\n", (ptr[j] & ~0x3));
+	 printf("\t  TMn.0: 0x%08x\n", ptr[j]);
+	 printf("\t map address: 0x%08x\n", (ptr[j] & ~0x3));
 	 FLAG(ptr[j], 1, "vertical line stride");
 	 FLAG(ptr[j], 0, "vertical line stride offset");
 	 j++;
       }
 
       {
-	 PRINTF("\t  TMn.1: 0x%08x\n", ptr[j]);
+	 printf("\t  TMn.1: 0x%08x\n", ptr[j]);
 	 BITS(ptr[j], 31, 21, "height");
 	 BITS(ptr[j], 20, 10, "width");
 	 BITS(ptr[j], 9, 7, "surface format");
@@ -532,7 +530,7 @@ static GLboolean debug_map_state( struct debug_stream *stream,
 	 j++;
       }
       {
-	 PRINTF("\t  TMn.2: 0x%08x\n", ptr[j]);
+	 printf("\t  TMn.2: 0x%08x\n", ptr[j]);
 	 BITS(ptr[j], 31, 21, "dword pitch");
 	 BITS(ptr[j], 20, 15, "cube face enables");
 	 BITS(ptr[j], 14, 9, "max lod");
@@ -554,18 +552,18 @@ static GLboolean debug_sampler_state( struct debug_stream *stream,
    GLuint *ptr = (GLuint *)(stream->ptr + stream->offset);
    int j = 0;
 
-   PRINTF("%s (%d dwords):\n", name, len);
-   PRINTF("\t0x%08x\n",  ptr[j++]);
+   printf("%s (%d dwords):\n", name, len);
+   printf("\t0x%08x\n",  ptr[j++]);
    
    {
-      PRINTF("\t0x%08x\n",  ptr[j]);
+      printf("\t0x%08x\n",  ptr[j]);
       BITS(ptr[j], 15, 0,   "sampler mask");
       j++;
    }
 
    while (j < len) {
       {
-	 PRINTF("\t  TSn.0: 0x%08x\n", ptr[j]);
+	 printf("\t  TSn.0: 0x%08x\n", ptr[j]);
 	 FLAG(ptr[j], 31, "reverse gamma");
 	 FLAG(ptr[j], 30, "planar to packed");
 	 FLAG(ptr[j], 29, "yuv->rgb");
@@ -582,7 +580,7 @@ static GLboolean debug_sampler_state( struct debug_stream *stream,
       }
 
       {
-	 PRINTF("\t  TSn.1: 0x%08x\n", ptr[j]);
+	 printf("\t  TSn.1: 0x%08x\n", ptr[j]);
 	 BITS(ptr[j], 31, 24, "min lod");
 	 MBZ( ptr[j], 23, 18 );
 	 FLAG(ptr[j], 17,     "kill pixel enable");
@@ -597,7 +595,7 @@ static GLboolean debug_sampler_state( struct debug_stream *stream,
 	 j++;
       }
       {
-	 PRINTF("\t  TSn.2: 0x%08x  (default color)\n", ptr[j]);
+	 printf("\t  TSn.2: 0x%08x  (default color)\n", ptr[j]);
 	 j++;
       }
    }
@@ -614,11 +612,11 @@ static GLboolean debug_dest_vars( struct debug_stream *stream,
    GLuint *ptr = (GLuint *)(stream->ptr + stream->offset);
    int j = 0;
 
-   PRINTF("%s (%d dwords):\n", name, len);
-   PRINTF("\t0x%08x\n",  ptr[j++]);
+   printf("%s (%d dwords):\n", name, len);
+   printf("\t0x%08x\n",  ptr[j++]);
 
    {
-      PRINTF("\t0x%08x\n",  ptr[j]);
+      printf("\t0x%08x\n",  ptr[j]);
       FLAG(ptr[j], 31,     "early classic ztest");
       FLAG(ptr[j], 30,     "opengl tex default color");
       FLAG(ptr[j], 29,     "bypass iz");
@@ -649,11 +647,11 @@ static GLboolean debug_buf_info( struct debug_stream *stream,
    GLuint *ptr = (GLuint *)(stream->ptr + stream->offset);
    int j = 0;
 
-   PRINTF("%s (%d dwords):\n", name, len);
-   PRINTF("\t0x%08x\n",  ptr[j++]);
+   printf("%s (%d dwords):\n", name, len);
+   printf("\t0x%08x\n",  ptr[j++]);
 
    {
-      PRINTF("\t0x%08x\n",  ptr[j]);
+      printf("\t0x%08x\n",  ptr[j]);
       BITS(ptr[j], 28, 28, "aux buffer id");
       BITS(ptr[j], 27, 24, "buffer id (7=depth, 3=back)");
       FLAG(ptr[j], 23,     "use fence regs");
@@ -665,7 +663,7 @@ static GLboolean debug_buf_info( struct debug_stream *stream,
       j++;
    }
    
-   PRINTF("\t0x%08x -- buffer base address\n",  ptr[j++]);
+   printf("\t0x%08x -- buffer base address\n",  ptr[j++]);
 
    stream->offset += len * sizeof(GLuint);
    assert(j == len);
@@ -826,7 +824,7 @@ i915_dump_batchbuffer( GLuint *start,
    GLuint bytes = (end - start) * 4;
    GLboolean done = GL_FALSE;
 
-   PRINTF("\n\nBATCH: (%d)\n", bytes / 4);
+   printf("\n\nBATCH: (%d)\n", bytes / 4);
 
    stream.offset = 0;
    stream.ptr = (char *)start;
@@ -843,7 +841,7 @@ i915_dump_batchbuffer( GLuint *start,
 	     stream.offset >= 0);
    }
 
-   PRINTF("END-BATCH\n\n\n");
+   printf("END-BATCH\n\n\n");
 }
 
 
diff --git a/src/mesa/drivers/dri/i915/i915_debug_fp.c b/src/mesa/drivers/dri/i915/i915_debug_fp.c
index bf500e54fa..adfc9e8945 100644
--- a/src/mesa/drivers/dri/i915/i915_debug_fp.c
+++ b/src/mesa/drivers/dri/i915/i915_debug_fp.c
@@ -31,8 +31,6 @@
 #include "i915_debug.h"
 #include "main/imports.h"
 
-#define PRINTF( ... ) _mesa_printf( __VA_ARGS__ )
-
 static const char *opcodes[0x20] = {
    "NOP",
    "ADD",
@@ -123,27 +121,27 @@ print_reg_type_nr(GLuint type, GLuint nr)
    case REG_TYPE_T:
       switch (nr) {
       case T_DIFFUSE:
-         PRINTF("T_DIFFUSE");
+         printf("T_DIFFUSE");
          return;
       case T_SPECULAR:
-         PRINTF("T_SPECULAR");
+         printf("T_SPECULAR");
          return;
       case T_FOG_W:
-         PRINTF("T_FOG_W");
+         printf("T_FOG_W");
          return;
       default:
-         PRINTF("T_TEX%d", nr);
+         printf("T_TEX%d", nr);
          return;
       }
    case REG_TYPE_OC:
       if (nr == 0) {
-         PRINTF("oC");
+         printf("oC");
          return;
       }
       break;
    case REG_TYPE_OD:
       if (nr == 0) {
-         PRINTF("oD");
+         printf("oD");
          return;
       }
       break;
@@ -151,7 +149,7 @@ print_reg_type_nr(GLuint type, GLuint nr)
       break;
    }
 
-   PRINTF("%s[%d]", regname[type], nr);
+   printf("%s[%d]", regname[type], nr);
 }
 
 #define REG_SWIZZLE_MASK 0x7777
@@ -172,33 +170,33 @@ print_reg_neg_swizzle(GLuint reg)
        (reg & REG_NEGATE_MASK) == 0)
       return;
 
-   PRINTF(".");
+   printf(".");
 
    for (i = 3; i >= 0; i--) {
       if (reg & (1 << ((i * 4) + 3)))
-         PRINTF("-");
+         printf("-");
 
       switch ((reg >> (i * 4)) & 0x7) {
       case 0:
-         PRINTF("x");
+         printf("x");
          break;
       case 1:
-         PRINTF("y");
+         printf("y");
          break;
       case 2:
-         PRINTF("z");
+         printf("z");
          break;
       case 3:
-         PRINTF("w");
+         printf("w");
          break;
       case 4:
-         PRINTF("0");
+         printf("0");
          break;
       case 5:
-         PRINTF("1");
+         printf("1");
          break;
       default:
-         PRINTF("?");
+         printf("?");
          break;
       }
    }
@@ -223,15 +221,15 @@ print_dest_reg(GLuint dword)
    print_reg_type_nr(type, nr);
    if ((dword & A0_DEST_CHANNEL_ALL) == A0_DEST_CHANNEL_ALL)
       return;
-   PRINTF(".");
+   printf(".");
    if (dword & A0_DEST_CHANNEL_X)
-      PRINTF("x");
+      printf("x");
    if (dword & A0_DEST_CHANNEL_Y)
-      PRINTF("y");
+      printf("y");
    if (dword & A0_DEST_CHANNEL_Z)
-      PRINTF("z");
+      printf("z");
    if (dword & A0_DEST_CHANNEL_W)
-      PRINTF("w");
+      printf("w");
 }
 
 
@@ -246,29 +244,29 @@ print_arith_op(GLuint opcode, const GLuint * program)
    if (opcode != A0_NOP) {
       print_dest_reg(program[0]);
       if (program[0] & A0_DEST_SATURATE)
-         PRINTF(" = SATURATE ");
+         printf(" = SATURATE ");
       else
-         PRINTF(" = ");
+         printf(" = ");
    }
 
-   PRINTF("%s ", opcodes[opcode]);
+   printf("%s ", opcodes[opcode]);
 
    print_src_reg(GET_SRC0_REG(program[0], program[1]));
    if (args[opcode] == 1) {
-      PRINTF("\n");
+      printf("\n");
       return;
    }
 
-   PRINTF(", ");
+   printf(", ");
    print_src_reg(GET_SRC1_REG(program[1], program[2]));
    if (args[opcode] == 2) {
-      PRINTF("\n");
+      printf("\n");
       return;
    }
 
-   PRINTF(", ");
+   printf(", ");
    print_src_reg(GET_SRC2_REG(program[2]));
-   PRINTF("\n");
+   printf("\n");
    return;
 }
 
@@ -277,24 +275,24 @@ static void
 print_tex_op(GLuint opcode, const GLuint * program)
 {
    print_dest_reg(program[0] | A0_DEST_CHANNEL_ALL);
-   PRINTF(" = ");
+   printf(" = ");
 
-   PRINTF("%s ", opcodes[opcode]);
+   printf("%s ", opcodes[opcode]);
 
-   PRINTF("S[%d],", program[0] & T0_SAMPLER_NR_MASK);
+   printf("S[%d],", program[0] & T0_SAMPLER_NR_MASK);
 
    print_reg_type_nr((program[1] >> T1_ADDRESS_REG_TYPE_SHIFT) &
                      REG_TYPE_MASK,
                      (program[1] >> T1_ADDRESS_REG_NR_SHIFT) & REG_NR_MASK);
-   PRINTF("\n");
+   printf("\n");
 }
 
 static void
 print_dcl_op(GLuint opcode, const GLuint * program)
 {
-   PRINTF("%s ", opcodes[opcode]);
+   printf("%s ", opcodes[opcode]);
    print_dest_reg(program[0] | A0_DEST_CHANNEL_ALL);
-   PRINTF("\n");
+   printf("\n");
 }
 
 
@@ -304,7 +302,7 @@ i915_disassemble_program(const GLuint * program, GLuint sz)
    GLuint size = program[0] & 0x1ff;
    GLint i;
 
-   PRINTF("\t\tBEGIN\n");
+   printf("\t\tBEGIN\n");
 
    assert(size + 2 == sz);
 
@@ -312,7 +310,7 @@ i915_disassemble_program(const GLuint * program, GLuint sz)
    for (i = 1; i < sz; i += 3, program += 3) {
       GLuint opcode = program[0] & (0x1f << 24);
 
-      PRINTF("\t\t");
+      printf("\t\t");
 
       if ((GLint) opcode >= A0_NOP && opcode <= A0_SLT)
          print_arith_op(opcode >> 24, program);
@@ -321,10 +319,10 @@ i915_disassemble_program(const GLuint * program, GLuint sz)
       else if (opcode == D0_DCL)
          print_dcl_op(opcode >> 24, program);
       else
-         PRINTF("Unknown opcode 0x%x\n", opcode);
+         printf("Unknown opcode 0x%x\n", opcode);
    }
 
-   PRINTF("\t\tEND\n\n");
+   printf("\t\tEND\n\n");
 }
 
 
diff --git a/src/mesa/drivers/dri/i915/i915_tex_layout.c b/src/mesa/drivers/dri/i915/i915_tex_layout.c
index d9588e5b56..fe3908f580 100644
--- a/src/mesa/drivers/dri/i915/i915_tex_layout.c
+++ b/src/mesa/drivers/dri/i915/i915_tex_layout.c
@@ -145,8 +145,8 @@ i915_miptree_layout_cube(struct intel_context *intel,
 	 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);
+	    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;
diff --git a/src/mesa/drivers/dri/i915/intel_tris.c b/src/mesa/drivers/dri/i915/intel_tris.c
index 6d498c5654..3816adae94 100644
--- a/src/mesa/drivers/dri/i915/intel_tris.c
+++ b/src/mesa/drivers/dri/i915/intel_tris.c
@@ -66,7 +66,7 @@ intel_flush_inline_primitive(struct intel_context *intel)
 
    assert(intel->prim.primitive != ~0);
 
-/*    _mesa_printf("/\n"); */
+/*    printf("/\n"); */
 
    if (used < 8)
       goto do_discard;
@@ -93,7 +93,7 @@ static void intel_start_inline(struct intel_context *intel, uint32_t prim)
 
    intel->no_batch_wrap = GL_TRUE;
 
-   /*_mesa_printf("%s *", __progname);*/
+   /*printf("%s *", __progname);*/
 
    /* Emit a slot which will be filled with the inline primitive
     * command later.
@@ -111,7 +111,7 @@ static void intel_start_inline(struct intel_context *intel, uint32_t prim)
    ADVANCE_BATCH();
 
    intel->no_batch_wrap = GL_FALSE;
-/*    _mesa_printf(">"); */
+/*    printf(">"); */
 }
 
 static void intel_wrap_inline(struct intel_context *intel)
@@ -133,7 +133,7 @@ static GLuint *intel_extend_inline(struct intel_context *intel, GLuint dwords)
    if (intel_batchbuffer_space(intel->batch) < sz)
       intel_wrap_inline(intel);
 
-/*    _mesa_printf("."); */
+/*    printf("."); */
 
    intel->vtbl.assert_not_dirty(intel);
 
diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
index 65f51be341..2ca29b7ae1 100644
--- a/src/mesa/drivers/dri/i965/brw_context.c
+++ b/src/mesa/drivers/dri/i965/brw_context.c
@@ -78,7 +78,7 @@ GLboolean brwCreateContext( const __GLcontextModes *mesaVis,
    GLcontext *ctx = &intel->ctx;
 
    if (!brw) {
-      _mesa_printf("%s: failed to alloc context\n", __FUNCTION__);
+      printf("%s: failed to alloc context\n", __FUNCTION__);
       return GL_FALSE;
    }
 
@@ -87,7 +87,7 @@ GLboolean brwCreateContext( const __GLcontextModes *mesaVis,
 
    if (!intelInitContext( intel, mesaVis, driContextPriv,
 			  sharedContextPrivate, &functions )) {
-      _mesa_printf("%s: failed to init intel context\n", __FUNCTION__);
+      printf("%s: failed to init intel context\n", __FUNCTION__);
       FREE(brw);
       return GL_FALSE;
    }
diff --git a/src/mesa/drivers/dri/i965/brw_curbe.c b/src/mesa/drivers/dri/i965/brw_curbe.c
index cb9cd836a0..6f2ead793d 100644
--- a/src/mesa/drivers/dri/i965/brw_curbe.c
+++ b/src/mesa/drivers/dri/i965/brw_curbe.c
@@ -114,13 +114,13 @@ static void calculate_curbe_offsets( struct brw_context *brw )
       brw->curbe.total_size = reg;
 
       if (0)
-	 _mesa_printf("curbe wm %d+%d clip %d+%d vs %d+%d\n",
-		      brw->curbe.wm_start,
-		      brw->curbe.wm_size,
-		      brw->curbe.clip_start,
-		      brw->curbe.clip_size,
-		      brw->curbe.vs_start,
-		      brw->curbe.vs_size );
+	 printf("curbe wm %d+%d clip %d+%d vs %d+%d\n",
+		brw->curbe.wm_start,
+		brw->curbe.wm_size,
+		brw->curbe.clip_start,
+		brw->curbe.clip_size,
+		brw->curbe.vs_start,
+		brw->curbe.vs_size );
 
       brw->state.dirty.brw |= BRW_NEW_CURBE_OFFSETS;
    }
@@ -280,13 +280,13 @@ static void prepare_constant_buffer(struct brw_context *brw)
 
    if (0) {
       for (i = 0; i < sz*16; i+=4) 
-	 _mesa_printf("curbe %d.%d: %f %f %f %f\n", i/8, i&4,
-		      buf[i+0], buf[i+1], buf[i+2], buf[i+3]);
+	 printf("curbe %d.%d: %f %f %f %f\n", i/8, i&4,
+		buf[i+0], buf[i+1], buf[i+2], buf[i+3]);
 
-      _mesa_printf("last_buf %p buf %p sz %d/%d cmp %d\n",
-		   brw->curbe.last_buf, buf,
-		   bufsz, brw->curbe.last_bufsz,
-		   brw->curbe.last_buf ? memcmp(buf, brw->curbe.last_buf, bufsz) : -1);
+      printf("last_buf %p buf %p sz %d/%d cmp %d\n",
+	     brw->curbe.last_buf, buf,
+	     bufsz, brw->curbe.last_bufsz,
+	     brw->curbe.last_buf ? memcmp(buf, brw->curbe.last_buf, bufsz) : -1);
    }
 
    if (brw->curbe.curbe_bo != NULL &&
diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c
index 976249091e..e348d4686b 100644
--- a/src/mesa/drivers/dri/i965/brw_draw.c
+++ b/src/mesa/drivers/dri/i965/brw_draw.c
@@ -82,7 +82,7 @@ static GLuint brw_set_prim(struct brw_context *brw, GLenum prim)
    GLcontext *ctx = &brw->intel.ctx;
 
    if (INTEL_DEBUG & DEBUG_PRIMS)
-      _mesa_printf("PRIM: %s\n", _mesa_lookup_enum_by_nr(prim));
+      printf("PRIM: %s\n", _mesa_lookup_enum_by_nr(prim));
    
    /* Slight optimization to avoid the GS program when not needed:
     */
@@ -125,7 +125,7 @@ static void brw_emit_prim(struct brw_context *brw,
    struct intel_context *intel = &brw->intel;
 
    if (INTEL_DEBUG & DEBUG_PRIMS)
-      _mesa_printf("PRIM: %s %d %d\n", _mesa_lookup_enum_by_nr(prim->mode), 
+      printf("PRIM: %s %d %d\n", _mesa_lookup_enum_by_nr(prim->mode), 
 		   prim->start, prim->count);
 
    prim_packet.header.opcode = CMD_3D_PRIM;
diff --git a/src/mesa/drivers/dri/i965/brw_draw_upload.c b/src/mesa/drivers/dri/i965/brw_draw_upload.c
index ceaeb923b0..106454de4a 100644
--- a/src/mesa/drivers/dri/i965/brw_draw_upload.c
+++ b/src/mesa/drivers/dri/i965/brw_draw_upload.c
@@ -169,7 +169,7 @@ static GLuint get_surface_type( GLenum type, GLuint size,
                                 GLenum format, GLboolean normalized )
 {
    if (INTEL_DEBUG & DEBUG_VERTS)
-      _mesa_printf("type %s size %d normalized %d\n", 
+      printf("type %s size %d normalized %d\n", 
 		   _mesa_lookup_enum_by_nr(type), size, normalized);
 
    if (normalized) {
@@ -355,7 +355,7 @@ static void brw_prepare_vertices(struct brw_context *brw)
    /* First build an array of pointers to ve's in vb.inputs_read
     */
    if (0)
-      _mesa_printf("%s %d..%d\n", __FUNCTION__, min_index, max_index);
+      printf("%s %d..%d\n", __FUNCTION__, min_index, max_index);
 
    /* Accumulate the list of enabled arrays. */
    brw->vb.nr_enabled = 0;
diff --git a/src/mesa/drivers/dri/i965/brw_eu_debug.c b/src/mesa/drivers/dri/i965/brw_eu_debug.c
index 29f3f6d02f..99453afdca 100644
--- a/src/mesa/drivers/dri/i965/brw_eu_debug.c
+++ b/src/mesa/drivers/dri/i965/brw_eu_debug.c
@@ -54,9 +54,9 @@ void brw_print_reg( struct brw_reg hwreg )
       "f"
    };
 
-   _mesa_printf("%s%s", 
-		hwreg.abs ? "abs/" : "",
-		hwreg.negate ? "-" : "");
+   printf("%s%s", 
+	  hwreg.abs ? "abs/" : "",
+	  hwreg.negate ? "-" : "");
      
    if (hwreg.file == BRW_GENERAL_REGISTER_FILE &&
        hwreg.nr % 2 == 0 &&
@@ -66,7 +66,7 @@ void brw_print_reg( struct brw_reg hwreg )
        hwreg.hstride == BRW_HORIZONTAL_STRIDE_1 &&
        hwreg.type == BRW_REGISTER_TYPE_F) {
       /* vector register */
-      _mesa_printf("vec%d", hwreg.nr);
+      printf("vec%d", hwreg.nr);
    }
    else if (hwreg.file == BRW_GENERAL_REGISTER_FILE &&
 	    hwreg.vstride == BRW_VERTICAL_STRIDE_0 &&
@@ -74,13 +74,13 @@ void brw_print_reg( struct brw_reg hwreg )
 	    hwreg.hstride == BRW_HORIZONTAL_STRIDE_0 &&
 	    hwreg.type == BRW_REGISTER_TYPE_F) {      
       /* "scalar" register */
-      _mesa_printf("scl%d.%d", hwreg.nr, hwreg.subnr / 4);
+      printf("scl%d.%d", hwreg.nr, hwreg.subnr / 4);
    }
    else if (hwreg.file == BRW_IMMEDIATE_VALUE) {
-      _mesa_printf("imm %f", hwreg.dw1.f);
+      printf("imm %f", hwreg.dw1.f);
    }
    else {
-      _mesa_printf("%s%d.%d<%d;%d,%d>:%s", 
+      printf("%s%d.%d<%d;%d,%d>:%s", 
 		   file[hwreg.file],
 		   hwreg.nr,
 		   hwreg.subnr / type_sz(hwreg.type),
diff --git a/src/mesa/drivers/dri/i965/brw_eu_emit.c b/src/mesa/drivers/dri/i965/brw_eu_emit.c
index 8d6ac00839..b832c7165d 100644
--- a/src/mesa/drivers/dri/i965/brw_eu_emit.c
+++ b/src/mesa/drivers/dri/i965/brw_eu_emit.c
@@ -1272,7 +1272,7 @@ void brw_SAMPLE(struct brw_compile *p,
    GLboolean need_stall = 0;
    
    if (writemask == 0) {
-      /*_mesa_printf("%s: zero writemask??\n", __FUNCTION__); */
+      /*printf("%s: zero writemask??\n", __FUNCTION__); */
       return;
    }
    
@@ -1304,7 +1304,7 @@ void brw_SAMPLE(struct brw_compile *p,
 
       if (newmask != writemask) {
 	 need_stall = 1;
-         /* _mesa_printf("need stall %x %x\n", newmask , writemask); */
+         /* printf("need stall %x %x\n", newmask , writemask); */
       }
       else {
 	 struct brw_reg m1 = brw_message_reg(msg_reg_nr);
diff --git a/src/mesa/drivers/dri/i965/brw_state_cache.c b/src/mesa/drivers/dri/i965/brw_state_cache.c
index dd9894d681..4bb98d8d5d 100644
--- a/src/mesa/drivers/dri/i965/brw_state_cache.c
+++ b/src/mesa/drivers/dri/i965/brw_state_cache.c
@@ -266,7 +266,7 @@ brw_upload_cache_with_auxdata(struct brw_cache *cache,
    }
 
    if (INTEL_DEBUG & DEBUG_STATE)
-      _mesa_printf("upload %s: %d bytes to cache id %d\n",
+      printf("upload %s: %d bytes to cache id %d\n",
 		   cache->name[cache_id],
 		   data_size, cache_id);
 
@@ -425,7 +425,7 @@ brw_clear_cache(struct brw_context *brw, struct brw_cache *cache)
    GLuint i;
 
    if (INTEL_DEBUG & DEBUG_STATE)
-      _mesa_printf("%s\n", __FUNCTION__);
+      printf("%s\n", __FUNCTION__);
 
    for (i = 0; i < cache->size; i++) {
       for (c = cache->items[i]; c; c = next) {
@@ -465,7 +465,7 @@ brw_state_cache_bo_delete(struct brw_cache *cache, dri_bo *bo)
    GLuint i;
 
    if (INTEL_DEBUG & DEBUG_STATE)
-      _mesa_printf("%s\n", __FUNCTION__);
+      printf("%s\n", __FUNCTION__);
 
    for (i = 0; i < cache->size; i++) {
       for (prev = &cache->items[i]; *prev;) {
@@ -493,7 +493,7 @@ void
 brw_state_cache_check_size(struct brw_context *brw)
 {
    if (INTEL_DEBUG & DEBUG_STATE)
-      _mesa_printf("%s (n_items=%d)\n", __FUNCTION__, brw->cache.n_items);
+      printf("%s (n_items=%d)\n", __FUNCTION__, brw->cache.n_items);
 
    /* un-tuned guess.  We've got around 20 state objects for a total of around
     * 32k, so 1000 of them is around 1.5MB.
@@ -512,7 +512,7 @@ brw_destroy_cache(struct brw_context *brw, struct brw_cache *cache)
    GLuint i;
 
    if (INTEL_DEBUG & DEBUG_STATE)
-      _mesa_printf("%s\n", __FUNCTION__);
+      printf("%s\n", __FUNCTION__);
 
    brw_clear_cache(brw, cache);
    for (i = 0; i < BRW_MAX_CACHE; i++) {
diff --git a/src/mesa/drivers/dri/i965/brw_urb.c b/src/mesa/drivers/dri/i965/brw_urb.c
index f2cdb203b8..4f6b9002ad 100644
--- a/src/mesa/drivers/dri/i965/brw_urb.c
+++ b/src/mesa/drivers/dri/i965/brw_urb.c
@@ -186,17 +186,17 @@ static void recalculate_urb_fence( struct brw_context *brw )
 	     * entries and the values for minimum nr of entries
 	     * provided above.
 	     */
-	    _mesa_printf("couldn't calculate URB layout!\n");
+	    printf("couldn't calculate URB layout!\n");
 	    exit(1);
 	 }
 	 
 	 if (INTEL_DEBUG & (DEBUG_URB|DEBUG_FALLBACKS))
-	    _mesa_printf("URB CONSTRAINED\n");
+	    printf("URB CONSTRAINED\n");
       }
 
 done:
       if (INTEL_DEBUG & DEBUG_URB)
-	 _mesa_printf("URB fence: %d ..VS.. %d ..GS.. %d ..CLP.. %d ..SF.. %d ..CS.. %d\n",
+	 printf("URB fence: %d ..VS.. %d ..GS.. %d ..CLP.. %d ..SF.. %d ..CS.. %d\n",
 		      brw->urb.vs_start,
 		      brw->urb.gs_start,
 		      brw->urb.clip_start,
diff --git a/src/mesa/drivers/dri/i965/brw_vs_emit.c b/src/mesa/drivers/dri/i965/brw_vs_emit.c
index 4f4eef85e8..88327d9927 100644
--- a/src/mesa/drivers/dri/i965/brw_vs_emit.c
+++ b/src/mesa/drivers/dri/i965/brw_vs_emit.c
@@ -287,9 +287,9 @@ static void brw_vs_alloc_regs( struct brw_vs_compile *c )
    c->prog_data.total_grf = reg;
 
    if (INTEL_DEBUG & DEBUG_VS) {
-      _mesa_printf("%s NumAddrRegs %d\n", __FUNCTION__, c->vp->program.Base.NumAddressRegs);
-      _mesa_printf("%s NumTemps %d\n", __FUNCTION__, c->vp->program.Base.NumTemporaries);
-      _mesa_printf("%s reg = %d\n", __FUNCTION__, reg);
+      printf("%s NumAddrRegs %d\n", __FUNCTION__, c->vp->program.Base.NumAddressRegs);
+      printf("%s NumTemps %d\n", __FUNCTION__, c->vp->program.Base.NumTemporaries);
+      printf("%s reg = %d\n", __FUNCTION__, reg);
    }
 }
 
@@ -1444,9 +1444,9 @@ void brw_vs_emit(struct brw_vs_compile *c )
    GLuint file;
 
    if (INTEL_DEBUG & DEBUG_VS) {
-      _mesa_printf("vs-mesa:\n");
+      printf("vs-mesa:\n");
       _mesa_print_program(&c->vp->program.Base); 
-      _mesa_printf("\n");
+      printf("\n");
    }
 
    brw_set_compression_control(p, BRW_COMPRESSION_NONE);
@@ -1796,9 +1796,9 @@ void brw_vs_emit(struct brw_vs_compile *c )
    if (INTEL_DEBUG & DEBUG_VS) {
       int i;
 
-      _mesa_printf("vs-native:\n");
+      printf("vs-native:\n");
       for (i = 0; i < p->nr_insn; i++)
 	 brw_disasm(stderr, &p->store[i]);
-      _mesa_printf("\n");
+      printf("\n");
    }
 }
diff --git a/src/mesa/drivers/dri/i965/brw_wm_debug.c b/src/mesa/drivers/dri/i965/brw_wm_debug.c
index 220821087c..a78cc8b54e 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_debug.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_debug.c
@@ -41,21 +41,21 @@ void brw_wm_print_value( struct brw_wm_compile *c,
    if (c->state >= PASS2_DONE) 
       brw_print_reg(value->hw_reg);
    else if( value == &c->undef_value )
-      _mesa_printf("undef");
+      printf("undef");
    else if( value - c->vreg >= 0 &&
 	    value - c->vreg < BRW_WM_MAX_VREG)
-      _mesa_printf("r%d", value - c->vreg);
+      printf("r%d", value - c->vreg);
    else if (value - c->creg >= 0 &&
 	    value - c->creg < BRW_WM_MAX_PARAM)
-      _mesa_printf("c%d", value - c->creg);
+      printf("c%d", value - c->creg);
    else if (value - c->payload.input_interp >= 0 &&
 	    value - c->payload.input_interp < FRAG_ATTRIB_MAX)
-      _mesa_printf("i%d", value - c->payload.input_interp);
+      printf("i%d", value - c->payload.input_interp);
    else if (value - c->payload.depth >= 0 &&
 	    value - c->payload.depth < FRAG_ATTRIB_MAX)
-      _mesa_printf("d%d", value - c->payload.depth);
+      printf("d%d", value - c->payload.depth);
    else 
-      _mesa_printf("?");
+      printf("?");
 }
 
 void brw_wm_print_ref( struct brw_wm_compile *c,
@@ -64,16 +64,16 @@ void brw_wm_print_ref( struct brw_wm_compile *c,
    struct brw_reg hw_reg = ref->hw_reg;
 
    if (ref->unspill_reg)
-      _mesa_printf("UNSPILL(%x)/", ref->value->spill_slot);
+      printf("UNSPILL(%x)/", ref->value->spill_slot);
 
    if (c->state >= PASS2_DONE)
       brw_print_reg(ref->hw_reg);
    else {
-      _mesa_printf("%s", hw_reg.negate ? "-" : "");
-      _mesa_printf("%s", hw_reg.abs ? "abs/" : "");
+      printf("%s", hw_reg.negate ? "-" : "");
+      printf("%s", hw_reg.abs ? "abs/" : "");
       brw_wm_print_value(c, ref->value);
       if ((hw_reg.nr&1) || hw_reg.subnr) {
-	 _mesa_printf("->%d.%d", (hw_reg.nr&1), hw_reg.subnr);
+	 printf("->%d.%d", (hw_reg.nr&1), hw_reg.subnr);
       }
    }
 }
@@ -84,22 +84,22 @@ void brw_wm_print_insn( struct brw_wm_compile *c,
    GLuint i, arg;
    GLuint nr_args = brw_wm_nr_args(inst->opcode);
 
-   _mesa_printf("[");
+   printf("[");
    for (i = 0; i < 4; i++) {
       if (inst->dst[i]) {
 	 brw_wm_print_value(c, inst->dst[i]);
 	 if (inst->dst[i]->spill_slot)
-	    _mesa_printf("/SPILL(%x)",inst->dst[i]->spill_slot);
+	    printf("/SPILL(%x)",inst->dst[i]->spill_slot);
       }
       else
-	 _mesa_printf("#");
+	 printf("#");
       if (i < 3)      
-	 _mesa_printf(",");
+	 printf(",");
    }
-   _mesa_printf("]");
+   printf("]");
 
    if (inst->writemask != WRITEMASK_XYZW)
-      _mesa_printf(".%s%s%s%s", 
+      printf(".%s%s%s%s", 
 		   GET_BIT(inst->writemask, 0) ? "x" : "",
 		   GET_BIT(inst->writemask, 1) ? "y" : "",
 		   GET_BIT(inst->writemask, 2) ? "z" : "",
@@ -107,58 +107,58 @@ void brw_wm_print_insn( struct brw_wm_compile *c,
 
    switch (inst->opcode) {
    case WM_PIXELXY:
-      _mesa_printf(" = PIXELXY");
+      printf(" = PIXELXY");
       break;
    case WM_DELTAXY:
-      _mesa_printf(" = DELTAXY");
+      printf(" = DELTAXY");
       break;
    case WM_PIXELW:
-      _mesa_printf(" = PIXELW");
+      printf(" = PIXELW");
       break;
    case WM_WPOSXY:
-      _mesa_printf(" = WPOSXY");
+      printf(" = WPOSXY");
       break;
    case WM_PINTERP:
-      _mesa_printf(" = PINTERP");
+      printf(" = PINTERP");
       break;
    case WM_LINTERP:
-      _mesa_printf(" = LINTERP");
+      printf(" = LINTERP");
       break;
    case WM_CINTERP:
-      _mesa_printf(" = CINTERP");
+      printf(" = CINTERP");
       break;
    case WM_FB_WRITE:
-      _mesa_printf(" = FB_WRITE");
+      printf(" = FB_WRITE");
       break;
    case WM_FRONTFACING:
-      _mesa_printf(" = FRONTFACING");
+      printf(" = FRONTFACING");
       break;
    default:
-      _mesa_printf(" = %s", _mesa_opcode_string(inst->opcode));
+      printf(" = %s", _mesa_opcode_string(inst->opcode));
       break;
    }
 
    if (inst->saturate)
-      _mesa_printf("_SAT");
+      printf("_SAT");
 
    for (arg = 0; arg < nr_args; arg++) {
 
-      _mesa_printf(" [");
+      printf(" [");
 
       for (i = 0; i < 4; i++) {
 	 if (inst->src[arg][i]) {
 	    brw_wm_print_ref(c, inst->src[arg][i]);
 	 }
 	 else
-	    _mesa_printf("%%");
+	    printf("%%");
 
 	 if (i < 3) 
-	    _mesa_printf(",");
+	    printf(",");
 	 else
-	    _mesa_printf("]");
+	    printf("]");
       }
    }
-   _mesa_printf("\n");
+   printf("\n");
 }
 
 void brw_wm_print_program( struct brw_wm_compile *c,
@@ -166,9 +166,9 @@ void brw_wm_print_program( struct brw_wm_compile *c,
 {
    GLuint insn;
 
-   _mesa_printf("%s:\n", stage);
+   printf("%s:\n", stage);
    for (insn = 0; insn < c->nr_insns; insn++)
       brw_wm_print_insn(c, &c->instruction[insn]);
-   _mesa_printf("\n");
+   printf("\n");
 }
 
diff --git a/src/mesa/drivers/dri/i965/brw_wm_emit.c b/src/mesa/drivers/dri/i965/brw_wm_emit.c
index fa0898c586..9315bca315 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_emit.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_emit.c
@@ -1622,10 +1622,10 @@ void brw_wm_emit( struct brw_wm_compile *c )
 	 break;
 
       default:
-	 _mesa_printf("Unsupported opcode %i (%s) in fragment shader\n",
-		      inst->opcode, inst->opcode < MAX_OPCODE ?
-				    _mesa_opcode_string(inst->opcode) :
-				    "unknown");
+	 printf("Unsupported opcode %i (%s) in fragment shader\n",
+		inst->opcode, inst->opcode < MAX_OPCODE ?
+		_mesa_opcode_string(inst->opcode) :
+		"unknown");
       }
       
       for (i = 0; i < 4; i++)
@@ -1638,9 +1638,9 @@ void brw_wm_emit( struct brw_wm_compile *c )
    if (INTEL_DEBUG & DEBUG_WM) {
       int i;
 
-      _mesa_printf("wm-native:\n");
+      printf("wm-native:\n");
       for (i = 0; i < p->nr_insn; i++)
 	 brw_disasm(stderr, &p->store[i]);
-      _mesa_printf("\n");
+      printf("\n");
    }
 }
diff --git a/src/mesa/drivers/dri/i965/brw_wm_fp.c b/src/mesa/drivers/dri/i965/brw_wm_fp.c
index 3737faf26f..d73c391582 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_fp.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_fp.c
@@ -159,7 +159,7 @@ static struct prog_dst_register get_temp( struct brw_wm_compile *c )
    int bit = _mesa_ffs( ~c->fp_temp );
 
    if (!bit) {
-      _mesa_printf("%s: out of temporaries\n", __FILE__);
+      printf("%s: out of temporaries\n", __FILE__);
       exit(1);
    }
 
@@ -1034,7 +1034,7 @@ static void print_insns( const struct prog_instruction *insn,
 {
    GLuint i;
    for (i = 0; i < nr; i++, insn++) {
-      _mesa_printf("%3d: ", i);
+      printf("%3d: ", i);
       if (insn->Opcode < MAX_OPCODE)
 	 _mesa_print_instruction(insn);
       else if (insn->Opcode < MAX_WM_OPCODE) {
@@ -1045,7 +1045,7 @@ static void print_insns( const struct prog_instruction *insn,
 				     3);
       }
       else 
-	 _mesa_printf("965 Opcode %d\n", insn->Opcode);
+	 printf("965 Opcode %d\n", insn->Opcode);
    }
 }
 
@@ -1060,9 +1060,9 @@ void brw_wm_pass_fp( struct brw_wm_compile *c )
    GLuint insn;
 
    if (INTEL_DEBUG & DEBUG_WM) {
-      _mesa_printf("pre-fp:\n");
+      printf("pre-fp:\n");
       _mesa_print_program(&fp->program.Base); 
-      _mesa_printf("\n");
+      printf("\n");
    }
 
    c->pixel_xy = src_undef();
@@ -1168,9 +1168,9 @@ void brw_wm_pass_fp( struct brw_wm_compile *c )
    }
 
    if (INTEL_DEBUG & DEBUG_WM) {
-      _mesa_printf("pass_fp:\n");
+      printf("pass_fp:\n");
       print_insns( c->prog_instructions, c->nr_fp_insns );
-      _mesa_printf("\n");
+      printf("\n");
    }
 }
 
diff --git a/src/mesa/drivers/dri/i965/brw_wm_glsl.c b/src/mesa/drivers/dri/i965/brw_wm_glsl.c
index fde83eea62..562608e2ec 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_glsl.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_glsl.c
@@ -1849,7 +1849,7 @@ static void brw_wm_emit_glsl(struct brw_context *brw, struct brw_wm_compile *c)
         c->cur_inst = i;
 
 #if 0
-        _mesa_printf("Inst %d: ", i);
+        printf("Inst %d: ", i);
         _mesa_print_instruction(inst);
 #endif
 
@@ -2115,7 +2115,7 @@ static void brw_wm_emit_glsl(struct brw_context *brw, struct brw_wm_compile *c)
                }
                break;
 	    default:
-		_mesa_printf("unsupported IR in fragment shader %d\n",
+		printf("unsupported IR in fragment shader %d\n",
 			inst->Opcode);
 	}
 
@@ -2127,10 +2127,10 @@ static void brw_wm_emit_glsl(struct brw_context *brw, struct brw_wm_compile *c)
     post_wm_emit(c);
 
     if (INTEL_DEBUG & DEBUG_WM) {
-      _mesa_printf("wm-native:\n");
+      printf("wm-native:\n");
       for (i = 0; i < p->nr_insn; i++)
 	 brw_disasm(stderr, &p->store[i]);
-      _mesa_printf("\n");
+      printf("\n");
     }
 }
 
@@ -2141,7 +2141,7 @@ static void brw_wm_emit_glsl(struct brw_context *brw, struct brw_wm_compile *c)
 void brw_wm_glsl_emit(struct brw_context *brw, struct brw_wm_compile *c)
 {
     if (INTEL_DEBUG & DEBUG_WM) {
-        _mesa_printf("brw_wm_glsl_emit:\n");
+        printf("brw_wm_glsl_emit:\n");
     }
 
     /* initial instruction translation/simplification */
diff --git a/src/mesa/drivers/dri/i965/brw_wm_pass0.c b/src/mesa/drivers/dri/i965/brw_wm_pass0.c
index ff4c082d5e..60bd92ed22 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_pass0.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_pass0.c
@@ -105,7 +105,7 @@ static const struct brw_wm_ref *get_param_ref( struct brw_wm_compile *c,
    GLuint i = c->prog_data.nr_params++;
    
    if (i >= BRW_WM_MAX_PARAM) {
-      _mesa_printf("%s: out of params\n", __FUNCTION__);
+      printf("%s: out of params\n", __FUNCTION__);
       c->prog_data.error = 1;
       return NULL;
    }
@@ -154,7 +154,7 @@ static const struct brw_wm_ref *get_const_ref( struct brw_wm_compile *c,
       return c->constref[i].ref;
    }
    else {
-      _mesa_printf("%s: out of constrefs\n", __FUNCTION__);
+      printf("%s: out of constrefs\n", __FUNCTION__);
       c->prog_data.error = 1;
       return NULL;
    }
diff --git a/src/mesa/drivers/dri/intel/intel_batchbuffer.c b/src/mesa/drivers/dri/intel/intel_batchbuffer.c
index ae0f8a16f9..c9841724ee 100644
--- a/src/mesa/drivers/dri/intel/intel_batchbuffer.c
+++ b/src/mesa/drivers/dri/intel/intel_batchbuffer.c
@@ -209,8 +209,8 @@ intel_batchbuffer_emit_reloc(struct intel_batchbuffer *batch,
    int ret;
 
    if (batch->ptr - batch->map > batch->buf->size)
-    _mesa_printf ("bad relocation ptr %p map %p offset %d size %d\n",
-		  batch->ptr, batch->map, batch->ptr - batch->map, batch->buf->size);
+    printf ("bad relocation ptr %p map %p offset %d size %d\n",
+	    batch->ptr, batch->map, batch->ptr - batch->map, batch->buf->size);
    ret = dri_bo_emit_reloc(batch->buf, read_domains, write_domain,
 			   delta, batch->ptr - batch->map, buffer);
 
diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c
index 8f37fb82c1..3a0830a85b 100644
--- a/src/mesa/drivers/dri/intel/intel_context.c
+++ b/src/mesa/drivers/dri/intel/intel_context.c
@@ -592,7 +592,7 @@ intelInitContext(struct intel_context *intel,
 
    if (!_mesa_initialize_context(&intel->ctx, mesaVis, shareCtx,
                                  functions, (void *) intel)) {
-      _mesa_printf("%s: failed to init mesa context\n", __FUNCTION__);
+      printf("%s: failed to init mesa context\n", __FUNCTION__);
       return GL_FALSE;
    }
 
diff --git a/src/mesa/drivers/dri/intel/intel_context.h b/src/mesa/drivers/dri/intel/intel_context.h
index da5d901abf..d20d44497e 100644
--- a/src/mesa/drivers/dri/intel/intel_context.h
+++ b/src/mesa/drivers/dri/intel/intel_context.h
@@ -345,7 +345,7 @@ extern int INTEL_DEBUG;
 
 #define DBG(...) do {						\
 	if (INTEL_DEBUG & FILE_DEBUG_FLAG)			\
-		_mesa_printf(__VA_ARGS__);			\
+		printf(__VA_ARGS__);			\
 } while(0)
 
 #define PCI_CHIP_845_G			0x2562
diff --git a/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c b/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c
index 54998a63f6..076fee89bd 100644
--- a/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c
+++ b/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c
@@ -123,7 +123,7 @@ static GLuint get_bitmap_rect(GLsizei width, GLsizei height,
    GLuint count = 0;
 
    if (INTEL_DEBUG & DEBUG_PIXEL)
-      _mesa_printf("%s %d,%d %dx%d bitmap %dx%d skip %d src_offset %d mask %d\n",
+      printf("%s %d,%d %dx%d bitmap %dx%d skip %d src_offset %d mask %d\n",
 		   __FUNCTION__, x,y,w,h,width,height,unpack->SkipPixels, src_offset, mask);
 
    if (invert) {
@@ -516,7 +516,7 @@ intelBitmap(GLcontext * ctx,
       return;
 
    if (INTEL_DEBUG & DEBUG_PIXEL)
-      _mesa_printf("%s: fallback to swrast\n", __FUNCTION__);
+      printf("%s: fallback to swrast\n", __FUNCTION__);
 
    _swrast_Bitmap(ctx, x, y, width, height, unpack, pixels);
 }
diff --git a/src/mesa/drivers/dri/intel/intel_pixel_read.c b/src/mesa/drivers/dri/intel/intel_pixel_read.c
index 514a17e2aa..2ac3da7f42 100644
--- a/src/mesa/drivers/dri/intel/intel_pixel_read.c
+++ b/src/mesa/drivers/dri/intel/intel_pixel_read.c
@@ -80,7 +80,7 @@ do_blit_readpixels(GLcontext * ctx,
    GLint dst_x, dst_y;
 
    if (INTEL_DEBUG & DEBUG_PIXEL)
-      _mesa_printf("%s\n", __FUNCTION__);
+      printf("%s\n", __FUNCTION__);
 
    if (!src)
       return GL_FALSE;
@@ -89,7 +89,7 @@ do_blit_readpixels(GLcontext * ctx,
       /* PBO only for now:
        */
       if (INTEL_DEBUG & DEBUG_PIXEL)
-         _mesa_printf("%s - not PBO\n", __FUNCTION__);
+         printf("%s - not PBO\n", __FUNCTION__);
       return GL_FALSE;
    }
 
@@ -97,13 +97,13 @@ do_blit_readpixels(GLcontext * ctx,
    if (ctx->_ImageTransferState ||
        !intel_check_blit_format(src, format, type)) {
       if (INTEL_DEBUG & DEBUG_PIXEL)
-         _mesa_printf("%s - bad format for blit\n", __FUNCTION__);
+         printf("%s - bad format for blit\n", __FUNCTION__);
       return GL_FALSE;
    }
 
    if (pack->Alignment != 1 || pack->SwapBytes || pack->LsbFirst) {
       if (INTEL_DEBUG & DEBUG_PIXEL)
-         _mesa_printf("%s: bad packing params\n", __FUNCTION__);
+         printf("%s: bad packing params\n", __FUNCTION__);
       return GL_FALSE;
    }
 
@@ -114,7 +114,7 @@ do_blit_readpixels(GLcontext * ctx,
 
    if (pack->Invert) {
       if (INTEL_DEBUG & DEBUG_PIXEL)
-         _mesa_printf("%s: MESA_PACK_INVERT not done yet\n", __FUNCTION__);
+         printf("%s: MESA_PACK_INVERT not done yet\n", __FUNCTION__);
       return GL_FALSE;
    }
    else {
@@ -159,7 +159,7 @@ do_blit_readpixels(GLcontext * ctx,
    }
 
    if (INTEL_DEBUG & DEBUG_PIXEL)
-      _mesa_printf("%s - DONE\n", __FUNCTION__);
+      printf("%s - DONE\n", __FUNCTION__);
 
    return GL_TRUE;
 }
@@ -181,7 +181,7 @@ intelReadPixels(GLcontext * ctx,
       return;
 
    if (INTEL_DEBUG & DEBUG_PIXEL)
-      _mesa_printf("%s: fallback to swrast\n", __FUNCTION__);
+      printf("%s: fallback to swrast\n", __FUNCTION__);
 
    /* Update Mesa state before calling down into _swrast_ReadPixels, as
     * the spans code requires the computed buffer states to be up to date,
diff --git a/src/mesa/drivers/dri/intel/intel_tex.c b/src/mesa/drivers/dri/intel/intel_tex.c
index 215a534a5c..8bb6ae99fb 100644
--- a/src/mesa/drivers/dri/intel/intel_tex.c
+++ b/src/mesa/drivers/dri/intel/intel_tex.c
@@ -146,7 +146,7 @@ timed_memcpy(void *dest, const void *src, size_t n)
    double rate;
 
    if ((((unsigned) src) & 63) || (((unsigned) dest) & 63))
-      _mesa_printf("Warning - non-aligned texture copy!\n");
+      printf("Warning - non-aligned texture copy!\n");
 
    t1 = fastrdtsc();
    ret = do_memcpy(dest, src, n);
@@ -154,7 +154,7 @@ timed_memcpy(void *dest, const void *src, size_t n)
 
    rate = time_diff(t1, t2);
    rate /= (double) n;
-   _mesa_printf("timed_memcpy: %u %u --> %f clocks/byte\n", t1, t2, rate);
+   printf("timed_memcpy: %u %u --> %f clocks/byte\n", t1, t2, rate);
    return ret;
 }
 #endif /* DO_DEBUG */
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_driver.h b/src/mesa/drivers/dri/nouveau/nouveau_driver.h
index 54bf981a0f..283f6eac2c 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_driver.h
+++ b/src/mesa/drivers/dri/nouveau/nouveau_driver.h
@@ -70,7 +70,7 @@ struct nouveau_driver {
 };
 
 #define nouveau_error(format, ...) \
-	_mesa_fprintf(stderr, "%s: " format, __func__, ## __VA_ARGS__)
+	fprintf(stderr, "%s: " format, __func__, ## __VA_ARGS__)
 
 void
 nouveau_clear(GLcontext *ctx, GLbitfield buffers);
diff --git a/src/mesa/drivers/dri/r300/r300_fragprog_common.c b/src/mesa/drivers/dri/r300/r300_fragprog_common.c
index a5810ee500..61ea5e4d9a 100644
--- a/src/mesa/drivers/dri/r300/r300_fragprog_common.c
+++ b/src/mesa/drivers/dri/r300/r300_fragprog_common.c
@@ -227,7 +227,7 @@ static void translate_fragment_program(GLcontext *ctx, struct r300_fragment_prog
 
 	if (compiler.Base.Debug) {
 		fflush(stderr);
-		_mesa_printf("Fragment Program: Initial program:\n");
+		printf("Fragment Program: Initial program:\n");
 		_mesa_print_program(&cont->Base.Base);
 		fflush(stderr);
 	}
diff --git a/src/mesa/drivers/dri/r300/r300_render.c b/src/mesa/drivers/dri/r300/r300_render.c
index e3e6285784..9596131486 100644
--- a/src/mesa/drivers/dri/r300/r300_render.c
+++ b/src/mesa/drivers/dri/r300/r300_render.c
@@ -440,7 +440,7 @@ void r300SwitchFallback(GLcontext *ctx, uint32_t bit, GLboolean mode)
 	if (mode) {
 		if ((fallback_warn & bit) == 0) {
 			if (RADEON_DEBUG & RADEON_FALLBACKS)
-				_mesa_fprintf(stderr, "WARNING! Falling back to software for %s\n", getFallbackString(bit));
+				fprintf(stderr, "WARNING! Falling back to software for %s\n", getFallbackString(bit));
 			fallback_warn |= bit;
 		}
 		rmesa->fallback |= bit;
diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c
index 017d45a503..9d1ff6e2ba 100644
--- a/src/mesa/drivers/dri/r300/r300_state.c
+++ b/src/mesa/drivers/dri/r300/r300_state.c
@@ -1970,7 +1970,7 @@ void r300UpdateShaders(r300ContextPtr rmesa)
 	/* should only happenen once, just after context is created */
 	/* TODO: shouldn't we fallback to sw here? */
 	if (!ctx->FragmentProgram._Current) {
-		_mesa_fprintf(stderr, "No ctx->FragmentProgram._Current!!\n");
+		fprintf(stderr, "No ctx->FragmentProgram._Current!!\n");
 		return;
 	}
 
diff --git a/src/mesa/drivers/dri/r600/r700_state.c b/src/mesa/drivers/dri/r600/r700_state.c
index 0240eefd5c..4ebdbbfad2 100644
--- a/src/mesa/drivers/dri/r600/r700_state.c
+++ b/src/mesa/drivers/dri/r600/r700_state.c
@@ -65,7 +65,7 @@ void r700UpdateShaders(GLcontext * ctx)
     /* should only happenen once, just after context is created */
     /* TODO: shouldn't we fallback to sw here? */
     if (!ctx->FragmentProgram._Current) {
-	    _mesa_fprintf(stderr, "No ctx->FragmentProgram._Current!!\n");
+	    fprintf(stderr, "No ctx->FragmentProgram._Current!!\n");
 	    return;
     }
 
diff --git a/src/mesa/drivers/dri/radeon/radeon_fbo.c b/src/mesa/drivers/dri/radeon/radeon_fbo.c
index a8931e8478..3b066f5eef 100644
--- a/src/mesa/drivers/dri/radeon/radeon_fbo.c
+++ b/src/mesa/drivers/dri/radeon/radeon_fbo.c
@@ -43,7 +43,7 @@
 #define FILE_DEBUG_FLAG RADEON_TEXTURE
 #define DBG(...) do {                                           \
         if (RADEON_DEBUG & FILE_DEBUG_FLAG)                      \
-                _mesa_printf(__VA_ARGS__);                      \
+                printf(__VA_ARGS__);                      \
 } while(0)
 
 static struct gl_framebuffer *
diff --git a/src/mesa/drivers/dri/swrast/swrast_priv.h b/src/mesa/drivers/dri/swrast/swrast_priv.h
index 1a5fb31d5a..59b4a6d228 100644
--- a/src/mesa/drivers/dri/swrast/swrast_priv.h
+++ b/src/mesa/drivers/dri/swrast/swrast_priv.h
@@ -43,13 +43,13 @@
 #define DEBUG_SPAN	0
 
 #if DEBUG_CORE
-#define TRACE _mesa_printf("--> %s\n", __FUNCTION__)
+#define TRACE printf("--> %s\n", __FUNCTION__)
 #else
 #define TRACE
 #endif
 
 #if DEBUG_SPAN
-#define TRACE_SPAN _mesa_printf("--> %s\n", __FUNCTION__)
+#define TRACE_SPAN printf("--> %s\n", __FUNCTION__)
 #else
 #define TRACE_SPAN
 #endif
diff --git a/src/mesa/drivers/x11/fakeglx.c b/src/mesa/drivers/x11/fakeglx.c
index f097d93a71..33a3ff6d5f 100644
--- a/src/mesa/drivers/x11/fakeglx.c
+++ b/src/mesa/drivers/x11/fakeglx.c
@@ -53,7 +53,7 @@
 #include "xmesaP.h"
 
 #ifdef __VMS
-#define _mesa_sprintf sprintf
+#define sprintf sprintf
 #endif
 
 /* This indicates the client-side GLX API and GLX encoder version. */
@@ -2032,8 +2032,8 @@ static const char *
 Fake_glXQueryServerString( Display *dpy, int screen, int name )
 {
    static char version[1000];
-   _mesa_sprintf(version, "%d.%d %s",
-                 SERVER_MAJOR_VERSION, SERVER_MINOR_VERSION, MESA_GLX_VERSION);
+   sprintf(version, "%d.%d %s",
+	   SERVER_MAJOR_VERSION, SERVER_MINOR_VERSION, MESA_GLX_VERSION);
 
    (void) dpy;
    (void) screen;
@@ -2057,8 +2057,8 @@ static const char *
 Fake_glXGetClientString( Display *dpy, int name )
 {
    static char version[1000];
-   _mesa_sprintf(version, "%d.%d %s", CLIENT_MAJOR_VERSION,
-                 CLIENT_MINOR_VERSION, MESA_GLX_VERSION);
+   sprintf(version, "%d.%d %s", CLIENT_MAJOR_VERSION,
+	   CLIENT_MINOR_VERSION, MESA_GLX_VERSION);
 
    (void) dpy;
 
diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c
index ed945023cf..3711c88148 100644
--- a/src/mesa/drivers/x11/xm_api.c
+++ b/src/mesa/drivers/x11/xm_api.c
@@ -1110,12 +1110,12 @@ initialize_visual_and_buffer(XMesaVisual v, XMesaBuffer b,
     * reports bugs.
     */
    if (_mesa_getenv("MESA_INFO")) {
-      _mesa_printf("X/Mesa visual = %p\n", (void *) v);
-      _mesa_printf("X/Mesa dithered pf = %u\n", v->dithered_pf);
-      _mesa_printf("X/Mesa undithered pf = %u\n", v->undithered_pf);
-      _mesa_printf("X/Mesa level = %d\n", v->mesa_visual.level);
-      _mesa_printf("X/Mesa depth = %d\n", GET_VISUAL_DEPTH(v));
-      _mesa_printf("X/Mesa bits per pixel = %d\n", v->BitsPerPixel);
+      printf("X/Mesa visual = %p\n", (void *) v);
+      printf("X/Mesa dithered pf = %u\n", v->dithered_pf);
+      printf("X/Mesa undithered pf = %u\n", v->undithered_pf);
+      printf("X/Mesa level = %d\n", v->mesa_visual.level);
+      printf("X/Mesa depth = %d\n", GET_VISUAL_DEPTH(v));
+      printf("X/Mesa bits per pixel = %d\n", v->BitsPerPixel);
    }
 
    if (b && window) {
diff --git a/src/mesa/drivers/x11/xm_tri.c b/src/mesa/drivers/x11/xm_tri.c
index 3a0cf80139..a6efb35e3c 100644
--- a/src/mesa/drivers/x11/xm_tri.c
+++ b/src/mesa/drivers/x11/xm_tri.c
@@ -1330,97 +1330,97 @@
 extern void _xmesa_print_triangle_func( swrast_tri_func triFunc );
 void _xmesa_print_triangle_func( swrast_tri_func triFunc )
 {
-   _mesa_printf("XMesa tri func = ");
+   printf("XMesa tri func = ");
    if (triFunc ==smooth_TRUECOLOR_z_triangle)
-      _mesa_printf("smooth_TRUECOLOR_z_triangle\n");
+      printf("smooth_TRUECOLOR_z_triangle\n");
    else if (triFunc ==smooth_8A8B8G8R_z_triangle)
-      _mesa_printf("smooth_8A8B8G8R_z_triangle\n");
+      printf("smooth_8A8B8G8R_z_triangle\n");
    else if (triFunc ==smooth_8A8R8G8B_z_triangle)
-      _mesa_printf("smooth_8A8R8G8B_z_triangle\n");
+      printf("smooth_8A8R8G8B_z_triangle\n");
    else if (triFunc ==smooth_8R8G8B_z_triangle)
-      _mesa_printf("smooth_8R8G8B_z_triangle\n");
+      printf("smooth_8R8G8B_z_triangle\n");
    else if (triFunc ==smooth_8R8G8B24_z_triangle)
-      _mesa_printf("smooth_8R8G8B24_z_triangle\n");
+      printf("smooth_8R8G8B24_z_triangle\n");
    else if (triFunc ==smooth_TRUEDITHER_z_triangle)
-      _mesa_printf("smooth_TRUEDITHER_z_triangle\n");
+      printf("smooth_TRUEDITHER_z_triangle\n");
    else if (triFunc ==smooth_5R6G5B_z_triangle)
-      _mesa_printf("smooth_5R6G5B_z_triangle\n");
+      printf("smooth_5R6G5B_z_triangle\n");
    else if (triFunc ==smooth_DITHER_5R6G5B_z_triangle)
-      _mesa_printf("smooth_DITHER_5R6G5B_z_triangle\n");
+      printf("smooth_DITHER_5R6G5B_z_triangle\n");
    else if (triFunc ==smooth_HPCR_z_triangle)
-      _mesa_printf("smooth_HPCR_z_triangle\n");
+      printf("smooth_HPCR_z_triangle\n");
    else if (triFunc ==smooth_DITHER8_z_triangle)
-      _mesa_printf("smooth_DITHER8_z_triangle\n");
+      printf("smooth_DITHER8_z_triangle\n");
    else if (triFunc ==smooth_LOOKUP8_z_triangle)
-      _mesa_printf("smooth_LOOKUP8_z_triangle\n");
+      printf("smooth_LOOKUP8_z_triangle\n");
    else if (triFunc ==flat_TRUECOLOR_z_triangle)
-      _mesa_printf("flat_TRUECOLOR_z_triangle\n");
+      printf("flat_TRUECOLOR_z_triangle\n");
    else if (triFunc ==flat_8A8B8G8R_z_triangle)
-      _mesa_printf("flat_8A8B8G8R_z_triangle\n");
+      printf("flat_8A8B8G8R_z_triangle\n");
    else if (triFunc ==flat_8A8R8G8B_z_triangle)
-      _mesa_printf("flat_8A8R8G8B_z_triangle\n");
+      printf("flat_8A8R8G8B_z_triangle\n");
    else if (triFunc ==flat_8R8G8B_z_triangle)
-      _mesa_printf("flat_8R8G8B_z_triangle\n");
+      printf("flat_8R8G8B_z_triangle\n");
    else if (triFunc ==flat_8R8G8B24_z_triangle)
-      _mesa_printf("flat_8R8G8B24_z_triangle\n");
+      printf("flat_8R8G8B24_z_triangle\n");
    else if (triFunc ==flat_TRUEDITHER_z_triangle)
-      _mesa_printf("flat_TRUEDITHER_z_triangle\n");
+      printf("flat_TRUEDITHER_z_triangle\n");
    else if (triFunc ==flat_5R6G5B_z_triangle)
-      _mesa_printf("flat_5R6G5B_z_triangle\n");
+      printf("flat_5R6G5B_z_triangle\n");
    else if (triFunc ==flat_DITHER_5R6G5B_z_triangle)
-      _mesa_printf("flat_DITHER_5R6G5B_z_triangle\n");
+      printf("flat_DITHER_5R6G5B_z_triangle\n");
    else if (triFunc ==flat_HPCR_z_triangle)
-      _mesa_printf("flat_HPCR_z_triangle\n");
+      printf("flat_HPCR_z_triangle\n");
    else if (triFunc ==flat_DITHER8_z_triangle)
-      _mesa_printf("flat_DITHER8_z_triangle\n");
+      printf("flat_DITHER8_z_triangle\n");
    else if (triFunc ==flat_LOOKUP8_z_triangle)
-      _mesa_printf("flat_LOOKUP8_z_triangle\n");
+      printf("flat_LOOKUP8_z_triangle\n");
    else if (triFunc ==smooth_TRUECOLOR_triangle)
-      _mesa_printf("smooth_TRUECOLOR_triangle\n");
+      printf("smooth_TRUECOLOR_triangle\n");
    else if (triFunc ==smooth_8A8B8G8R_triangle)
-      _mesa_printf("smooth_8A8B8G8R_triangle\n");
+      printf("smooth_8A8B8G8R_triangle\n");
    else if (triFunc ==smooth_8A8R8G8B_triangle)
-      _mesa_printf("smooth_8A8R8G8B_triangle\n");
+      printf("smooth_8A8R8G8B_triangle\n");
    else if (triFunc ==smooth_8R8G8B_triangle)
-      _mesa_printf("smooth_8R8G8B_triangle\n");
+      printf("smooth_8R8G8B_triangle\n");
    else if (triFunc ==smooth_8R8G8B24_triangle)
-      _mesa_printf("smooth_8R8G8B24_triangle\n");
+      printf("smooth_8R8G8B24_triangle\n");
    else if (triFunc ==smooth_TRUEDITHER_triangle)
-      _mesa_printf("smooth_TRUEDITHER_triangle\n");
+      printf("smooth_TRUEDITHER_triangle\n");
    else if (triFunc ==smooth_5R6G5B_triangle)
-      _mesa_printf("smooth_5R6G5B_triangle\n");
+      printf("smooth_5R6G5B_triangle\n");
    else if (triFunc ==smooth_DITHER_5R6G5B_triangle)
-      _mesa_printf("smooth_DITHER_5R6G5B_triangle\n");
+      printf("smooth_DITHER_5R6G5B_triangle\n");
    else if (triFunc ==smooth_HPCR_triangle)
-      _mesa_printf("smooth_HPCR_triangle\n");
+      printf("smooth_HPCR_triangle\n");
    else if (triFunc ==smooth_DITHER8_triangle)
-      _mesa_printf("smooth_DITHER8_triangle\n");
+      printf("smooth_DITHER8_triangle\n");
    else if (triFunc ==smooth_LOOKUP8_triangle)
-      _mesa_printf("smooth_LOOKUP8_triangle\n");
+      printf("smooth_LOOKUP8_triangle\n");
    else if (triFunc ==flat_TRUECOLOR_triangle)
-      _mesa_printf("flat_TRUECOLOR_triangle\n");
+      printf("flat_TRUECOLOR_triangle\n");
    else if (triFunc ==flat_TRUEDITHER_triangle)
-      _mesa_printf("flat_TRUEDITHER_triangle\n");
+      printf("flat_TRUEDITHER_triangle\n");
    else if (triFunc ==flat_8A8B8G8R_triangle)
-      _mesa_printf("flat_8A8B8G8R_triangle\n");
+      printf("flat_8A8B8G8R_triangle\n");
    else if (triFunc ==flat_8A8R8G8B_triangle)
-      _mesa_printf("flat_8A8R8G8B_triangle\n");
+      printf("flat_8A8R8G8B_triangle\n");
    else if (triFunc ==flat_8R8G8B_triangle)
-      _mesa_printf("flat_8R8G8B_triangle\n");
+      printf("flat_8R8G8B_triangle\n");
    else if (triFunc ==flat_8R8G8B24_triangle)
-      _mesa_printf("flat_8R8G8B24_triangle\n");
+      printf("flat_8R8G8B24_triangle\n");
    else if (triFunc ==flat_5R6G5B_triangle)
-      _mesa_printf("flat_5R6G5B_triangle\n");
+      printf("flat_5R6G5B_triangle\n");
    else if (triFunc ==flat_DITHER_5R6G5B_triangle)
-      _mesa_printf("flat_DITHER_5R6G5B_triangle\n");
+      printf("flat_DITHER_5R6G5B_triangle\n");
    else if (triFunc ==flat_HPCR_triangle)
-      _mesa_printf("flat_HPCR_triangle\n");
+      printf("flat_HPCR_triangle\n");
    else if (triFunc ==flat_DITHER8_triangle)
-      _mesa_printf("flat_DITHER8_triangle\n");
+      printf("flat_DITHER8_triangle\n");
    else if (triFunc ==flat_LOOKUP8_triangle)
-      _mesa_printf("flat_LOOKUP8_triangle\n");
+      printf("flat_LOOKUP8_triangle\n");
    else
-      _mesa_printf("???\n");
+      printf("???\n");
 }
 #endif
 
diff --git a/src/mesa/glapi/gl_enums.py b/src/mesa/glapi/gl_enums.py
index adb0ca526c..3a9ea3c86c 100644
--- a/src/mesa/glapi/gl_enums.py
+++ b/src/mesa/glapi/gl_enums.py
@@ -105,7 +105,7 @@ const char *_mesa_lookup_enum_by_nr( int nr )
    }
    else {
       /* this is not re-entrant safe, no big deal here */
-      _mesa_sprintf(token_tmp, "0x%x", nr);
+      sprintf(token_tmp, "0x%x", nr);
       return token_tmp;
    }
 }
diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c
index 3a1fd37324..7feaee316d 100644
--- a/src/mesa/main/arrayobj.c
+++ b/src/mesa/main/arrayobj.c
@@ -295,11 +295,11 @@ compute_max_element(struct gl_client_array *array)
                             - (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);
+         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 */
diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 816465cea1..971b280f3b 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -1155,7 +1155,7 @@ _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",
+   printf("glBufferDataARB(%u, sz %ld, from %p, usage 0x%x)\n",
                 bufObj->Name, size, data, usage);
 #endif
 
@@ -1272,8 +1272,8 @@ _mesa_MapBufferARB(GLenum target, GLenum access)
       bufObj->Written = GL_TRUE;
 
 #ifdef VBO_DEBUG
-   _mesa_printf("glMapBufferARB(%u, sz %ld, access 0x%x)\n",
-                bufObj->Name, bufObj->Size, access);
+   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;
@@ -1349,7 +1349,7 @@ _mesa_UnmapBufferARB(GLenum target)
          }
       }
       if (unchanged) {
-         _mesa_printf("glUnmapBufferARB(%u): %u of %ld unchanged, starting at %d\n",
+         printf("glUnmapBufferARB(%u): %u of %ld unchanged, starting at %d\n",
                       bufObj->Name, unchanged, bufObj->Size, pos);
       }
    }
diff --git a/src/mesa/main/debug.c b/src/mesa/main/debug.c
index 79b63e940f..246dbd436d 100644
--- a/src/mesa/main/debug.c
+++ b/src/mesa/main/debug.c
@@ -314,9 +314,9 @@ write_texture_image(struct gl_texture_object *texObj,
                               buffer, texObj, img);
 
       /* make filename */
-      _mesa_sprintf(s, "/tmp/tex%u.l%u.f%u.ppm", texObj->Name, level, face);
+      sprintf(s, "/tmp/tex%u.l%u.f%u.ppm", texObj->Name, level, face);
 
-      _mesa_printf("  Writing image level %u to %s\n", level, s);
+      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 */
@@ -356,9 +356,9 @@ write_renderbuffer_image(const struct gl_renderbuffer *rb)
                           format, type, &ctx->DefaultPacking, buffer);
 
    /* make filename */
-   _mesa_sprintf(s, "/tmp/renderbuffer%u.ppm", rb->Name);
+   sprintf(s, "/tmp/renderbuffer%u.ppm", rb->Name);
 
-   _mesa_printf("  Writing renderbuffer image to %s\n", s);
+   printf("  Writing renderbuffer image to %s\n", s);
    write_ppm(s, buffer, rb->Width, rb->Height, 4, 0, 1, 2, GL_TRUE);
 
    free(buffer);
@@ -380,17 +380,17 @@ dump_texture(struct gl_texture_object *texObj, GLuint writeImages)
    GLboolean written = GL_FALSE;
    GLuint i, j;
 
-   _mesa_printf("Texture %u\n", texObj->Name);
-   _mesa_printf("  Target %s\n", tex_target_name(texObj->Target));
+   printf("Texture %u\n", texObj->Name);
+   printf("  Target %s\n", tex_target_name(texObj->Target));
    for (i = 0; i < MAX_TEXTURE_LEVELS; i++) {
       for (j = 0; j < numFaces; j++) {
          struct gl_texture_image *texImg = texObj->Image[j][i];
          if (texImg) {
-            _mesa_printf("  Face %u level %u: %d x %d x %d, format %s at %p\n",
-                         j, i,
-                         texImg->Width, texImg->Height, texImg->Depth,
-                         _mesa_get_format_name(texImg->TexFormat),
-                         texImg->Data);
+            printf("  Face %u level %u: %d x %d x %d, format %s at %p\n",
+		   j, i,
+		   texImg->Width, texImg->Height, texImg->Depth,
+		   _mesa_get_format_name(texImg->TexFormat),
+		   texImg->Data);
             if (writeImages == WRITE_ALL ||
                 (writeImages == WRITE_ONE && !written)) {
                write_texture_image(texObj, j, i);
@@ -441,9 +441,9 @@ _mesa_dump_textures(GLuint writeImages)
 static void
 dump_renderbuffer(const struct gl_renderbuffer *rb, GLboolean writeImage)
 {
-   _mesa_printf("Renderbuffer %u: %u x %u  IntFormat = %s\n",
-                rb->Name, rb->Width, rb->Height,
-                _mesa_lookup_enum_by_nr(rb->InternalFormat));
+   printf("Renderbuffer %u: %u x %u  IntFormat = %s\n",
+	  rb->Name, rb->Width, rb->Height,
+	  _mesa_lookup_enum_by_nr(rb->InternalFormat));
    if (writeImage) {
       write_renderbuffer_image(rb);
    }
@@ -489,12 +489,12 @@ _mesa_dump_color_buffer(const char *filename)
 
    _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,
-                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);
+   printf("ReadBuffer %p 0x%x  DrawBuffer %p 0x%x\n",
+	  ctx->ReadBuffer->_ColorReadBuffer,
+	  ctx->ReadBuffer->ColorReadBuffer,
+	  ctx->DrawBuffer->_ColorDrawBuffers[0],
+	  ctx->DrawBuffer->ColorDrawBuffer[0]);
+   printf("Writing %d x %d color buffer to %s\n", w, h, filename);
    write_ppm(filename, buf, w, h, 4, 0, 1, 2, GL_TRUE);
 
    _mesa_PopClientAttrib();
@@ -529,7 +529,7 @@ _mesa_dump_depth_buffer(const char *filename)
       buf2[i*3+2] = (buf[i] >>  8) & 0xff;
    }
 
-   _mesa_printf("Writing %d x %d depth buffer to %s\n", w, h, filename);
+   printf("Writing %d x %d depth buffer to %s\n", w, h, filename);
    write_ppm(filename, buf2, w, h, 3, 0, 1, 2, GL_TRUE);
 
    _mesa_PopClientAttrib();
@@ -564,7 +564,7 @@ _mesa_dump_stencil_buffer(const char *filename)
       buf2[i*3+2] = (buf[i] - 128) * 2;
    }
 
-   _mesa_printf("Writing %d x %d stencil buffer to %s\n", w, h, filename);
+   printf("Writing %d x %d stencil buffer to %s\n", w, h, filename);
    write_ppm(filename, buf2, w, h, 3, 0, 1, 2, GL_TRUE);
 
    _mesa_PopClientAttrib();
@@ -587,7 +587,7 @@ _mesa_print_texture(GLcontext *ctx, const struct gl_texture_image *img)
    const GLubyte *data = (const GLubyte *) img->Data;
 
    if (!data) {
-      _mesa_printf("No texture data\n");
+      printf("No texture data\n");
       return;
    }
 
@@ -619,17 +619,17 @@ _mesa_print_texture(GLcontext *ctx, const struct gl_texture_image *img)
    for (i = 0; i < img->Height; i++) {
       for (j = 0; j < img->Width; j++) {
          if (c==1)
-            _mesa_printf("%02x  ", data[0]);
+            printf("%02x  ", data[0]);
          else if (c==2)
-            _mesa_printf("%02x%02x  ", data[0], data[1]);
+            printf("%02x%02x  ", data[0], data[1]);
          else if (c==3)
-            _mesa_printf("%02x%02x%02x  ", data[0], data[1], data[2]);
+            printf("%02x%02x%02x  ", data[0], data[1], data[2]);
          else if (c==4)
-            _mesa_printf("%02x%02x%02x%02x  ", data[0], data[1], data[2], data[3]);
+            printf("%02x%02x%02x%02x  ", data[0], data[1], data[2], data[3]);
          data += (img->RowStride - img->Width) * c;
       }
       /* XXX use img->ImageStride here */
-      _mesa_printf("\n");
+      printf("\n");
    }
 #endif
 }
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 87b8ddacc2..9ef7fcae90 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -7685,7 +7685,7 @@ execute_list(GLcontext *ctx, GLuint list)
          default:
             {
                char msg[1000];
-               _mesa_sprintf(msg, "Error in execute_list: opcode=%d",
+               sprintf(msg, "Error in execute_list: opcode=%d",
                              (int) opcode);
                _mesa_problem(ctx, msg);
             }
@@ -9320,7 +9320,7 @@ print_list(GLcontext *ctx, GLuint list)
    GLboolean done;
 
    if (!islist(ctx, list)) {
-      _mesa_printf("%u is not a display list ID\n", list);
+      printf("%u is not a display list ID\n", list);
       return;
    }
 
@@ -9330,7 +9330,7 @@ print_list(GLcontext *ctx, GLuint list)
 
    n = dlist->Head;
 
-   _mesa_printf("START-LIST %u, address %p\n", list, (void *) n);
+   printf("START-LIST %u, address %p\n", list, (void *) n);
 
    done = n ? GL_FALSE : GL_TRUE;
    while (!done) {
@@ -9342,196 +9342,196 @@ print_list(GLcontext *ctx, GLuint list)
       else {
          switch (opcode) {
          case OPCODE_ACCUM:
-            _mesa_printf("Accum %s %g\n", enum_string(n[1].e), n[2].f);
+            printf("Accum %s %g\n", enum_string(n[1].e), n[2].f);
             break;
          case OPCODE_BITMAP:
-            _mesa_printf("Bitmap %d %d %g %g %g %g %p\n", n[1].i, n[2].i,
+            printf("Bitmap %d %d %g %g %g %g %p\n", n[1].i, n[2].i,
                          n[3].f, n[4].f, n[5].f, n[6].f, (void *) n[7].data);
             break;
          case OPCODE_CALL_LIST:
-            _mesa_printf("CallList %d\n", (int) n[1].ui);
+            printf("CallList %d\n", (int) n[1].ui);
             break;
          case OPCODE_CALL_LIST_OFFSET:
-            _mesa_printf("CallList %d + offset %u = %u\n", (int) n[1].ui,
+            printf("CallList %d + offset %u = %u\n", (int) n[1].ui,
                          ctx->List.ListBase, ctx->List.ListBase + n[1].ui);
             break;
          case OPCODE_COLOR_TABLE_PARAMETER_FV:
-            _mesa_printf("ColorTableParameterfv %s %s %f %f %f %f\n",
+            printf("ColorTableParameterfv %s %s %f %f %f %f\n",
                          enum_string(n[1].e), enum_string(n[2].e),
                          n[3].f, n[4].f, n[5].f, n[6].f);
             break;
          case OPCODE_COLOR_TABLE_PARAMETER_IV:
-            _mesa_printf("ColorTableParameteriv %s %s %d %d %d %d\n",
+            printf("ColorTableParameteriv %s %s %d %d %d %d\n",
                          enum_string(n[1].e), enum_string(n[2].e),
                          n[3].i, n[4].i, n[5].i, n[6].i);
             break;
          case OPCODE_DISABLE:
-            _mesa_printf("Disable %s\n", enum_string(n[1].e));
+            printf("Disable %s\n", enum_string(n[1].e));
             break;
          case OPCODE_ENABLE:
-            _mesa_printf("Enable %s\n", enum_string(n[1].e));
+            printf("Enable %s\n", enum_string(n[1].e));
             break;
          case OPCODE_FRUSTUM:
-            _mesa_printf("Frustum %g %g %g %g %g %g\n",
+            printf("Frustum %g %g %g %g %g %g\n",
                          n[1].f, n[2].f, n[3].f, n[4].f, n[5].f, n[6].f);
             break;
          case OPCODE_LINE_STIPPLE:
-            _mesa_printf("LineStipple %d %x\n", n[1].i, (int) n[2].us);
+            printf("LineStipple %d %x\n", n[1].i, (int) n[2].us);
             break;
          case OPCODE_LOAD_IDENTITY:
-            _mesa_printf("LoadIdentity\n");
+            printf("LoadIdentity\n");
             break;
          case OPCODE_LOAD_MATRIX:
-            _mesa_printf("LoadMatrix\n");
-            _mesa_printf("  %8f %8f %8f %8f\n",
+            printf("LoadMatrix\n");
+            printf("  %8f %8f %8f %8f\n",
                          n[1].f, n[5].f, n[9].f, n[13].f);
-            _mesa_printf("  %8f %8f %8f %8f\n",
+            printf("  %8f %8f %8f %8f\n",
                          n[2].f, n[6].f, n[10].f, n[14].f);
-            _mesa_printf("  %8f %8f %8f %8f\n",
+            printf("  %8f %8f %8f %8f\n",
                          n[3].f, n[7].f, n[11].f, n[15].f);
-            _mesa_printf("  %8f %8f %8f %8f\n",
+            printf("  %8f %8f %8f %8f\n",
                          n[4].f, n[8].f, n[12].f, n[16].f);
             break;
          case OPCODE_MULT_MATRIX:
-            _mesa_printf("MultMatrix (or Rotate)\n");
-            _mesa_printf("  %8f %8f %8f %8f\n",
+            printf("MultMatrix (or Rotate)\n");
+            printf("  %8f %8f %8f %8f\n",
                          n[1].f, n[5].f, n[9].f, n[13].f);
-            _mesa_printf("  %8f %8f %8f %8f\n",
+            printf("  %8f %8f %8f %8f\n",
                          n[2].f, n[6].f, n[10].f, n[14].f);
-            _mesa_printf("  %8f %8f %8f %8f\n",
+            printf("  %8f %8f %8f %8f\n",
                          n[3].f, n[7].f, n[11].f, n[15].f);
-            _mesa_printf("  %8f %8f %8f %8f\n",
+            printf("  %8f %8f %8f %8f\n",
                          n[4].f, n[8].f, n[12].f, n[16].f);
             break;
          case OPCODE_ORTHO:
-            _mesa_printf("Ortho %g %g %g %g %g %g\n",
+            printf("Ortho %g %g %g %g %g %g\n",
                          n[1].f, n[2].f, n[3].f, n[4].f, n[5].f, n[6].f);
             break;
          case OPCODE_POP_ATTRIB:
-            _mesa_printf("PopAttrib\n");
+            printf("PopAttrib\n");
             break;
          case OPCODE_POP_MATRIX:
-            _mesa_printf("PopMatrix\n");
+            printf("PopMatrix\n");
             break;
          case OPCODE_POP_NAME:
-            _mesa_printf("PopName\n");
+            printf("PopName\n");
             break;
          case OPCODE_PUSH_ATTRIB:
-            _mesa_printf("PushAttrib %x\n", n[1].bf);
+            printf("PushAttrib %x\n", n[1].bf);
             break;
          case OPCODE_PUSH_MATRIX:
-            _mesa_printf("PushMatrix\n");
+            printf("PushMatrix\n");
             break;
          case OPCODE_PUSH_NAME:
-            _mesa_printf("PushName %d\n", (int) n[1].ui);
+            printf("PushName %d\n", (int) n[1].ui);
             break;
          case OPCODE_RASTER_POS:
-            _mesa_printf("RasterPos %g %g %g %g\n",
+            printf("RasterPos %g %g %g %g\n",
                          n[1].f, n[2].f, n[3].f, n[4].f);
             break;
          case OPCODE_ROTATE:
-            _mesa_printf("Rotate %g %g %g %g\n",
+            printf("Rotate %g %g %g %g\n",
                          n[1].f, n[2].f, n[3].f, n[4].f);
             break;
          case OPCODE_SCALE:
-            _mesa_printf("Scale %g %g %g\n", n[1].f, n[2].f, n[3].f);
+            printf("Scale %g %g %g\n", n[1].f, n[2].f, n[3].f);
             break;
          case OPCODE_TRANSLATE:
-            _mesa_printf("Translate %g %g %g\n", n[1].f, n[2].f, n[3].f);
+            printf("Translate %g %g %g\n", n[1].f, n[2].f, n[3].f);
             break;
          case OPCODE_BIND_TEXTURE:
-            _mesa_printf("BindTexture %s %d\n",
+            printf("BindTexture %s %d\n",
                          _mesa_lookup_enum_by_nr(n[1].ui), n[2].ui);
             break;
          case OPCODE_SHADE_MODEL:
-            _mesa_printf("ShadeModel %s\n", _mesa_lookup_enum_by_nr(n[1].ui));
+            printf("ShadeModel %s\n", _mesa_lookup_enum_by_nr(n[1].ui));
             break;
          case OPCODE_MAP1:
-            _mesa_printf("Map1 %s %.3f %.3f %d %d\n",
+            printf("Map1 %s %.3f %.3f %d %d\n",
                          _mesa_lookup_enum_by_nr(n[1].ui),
                          n[2].f, n[3].f, n[4].i, n[5].i);
             break;
          case OPCODE_MAP2:
-            _mesa_printf("Map2 %s %.3f %.3f %.3f %.3f %d %d %d %d\n",
+            printf("Map2 %s %.3f %.3f %.3f %.3f %d %d %d %d\n",
                          _mesa_lookup_enum_by_nr(n[1].ui),
                          n[2].f, n[3].f, n[4].f, n[5].f,
                          n[6].i, n[7].i, n[8].i, n[9].i);
             break;
          case OPCODE_MAPGRID1:
-            _mesa_printf("MapGrid1 %d %.3f %.3f\n", n[1].i, n[2].f, n[3].f);
+            printf("MapGrid1 %d %.3f %.3f\n", n[1].i, n[2].f, n[3].f);
             break;
          case OPCODE_MAPGRID2:
-            _mesa_printf("MapGrid2 %d %.3f %.3f, %d %.3f %.3f\n",
+            printf("MapGrid2 %d %.3f %.3f, %d %.3f %.3f\n",
                          n[1].i, n[2].f, n[3].f, n[4].i, n[5].f, n[6].f);
             break;
          case OPCODE_EVALMESH1:
-            _mesa_printf("EvalMesh1 %d %d\n", n[1].i, n[2].i);
+            printf("EvalMesh1 %d %d\n", n[1].i, n[2].i);
             break;
          case OPCODE_EVALMESH2:
-            _mesa_printf("EvalMesh2 %d %d %d %d\n",
+            printf("EvalMesh2 %d %d %d %d\n",
                          n[1].i, n[2].i, n[3].i, n[4].i);
             break;
 
          case OPCODE_ATTR_1F_NV:
-            _mesa_printf("ATTR_1F_NV attr %d: %f\n", n[1].i, n[2].f);
+            printf("ATTR_1F_NV attr %d: %f\n", n[1].i, n[2].f);
             break;
          case OPCODE_ATTR_2F_NV:
-            _mesa_printf("ATTR_2F_NV attr %d: %f %f\n",
+            printf("ATTR_2F_NV attr %d: %f %f\n",
                          n[1].i, n[2].f, n[3].f);
             break;
          case OPCODE_ATTR_3F_NV:
-            _mesa_printf("ATTR_3F_NV attr %d: %f %f %f\n",
+            printf("ATTR_3F_NV attr %d: %f %f %f\n",
                          n[1].i, n[2].f, n[3].f, n[4].f);
             break;
          case OPCODE_ATTR_4F_NV:
-            _mesa_printf("ATTR_4F_NV attr %d: %f %f %f %f\n",
+            printf("ATTR_4F_NV attr %d: %f %f %f %f\n",
                          n[1].i, n[2].f, n[3].f, n[4].f, n[5].f);
             break;
          case OPCODE_ATTR_1F_ARB:
-            _mesa_printf("ATTR_1F_ARB attr %d: %f\n", n[1].i, n[2].f);
+            printf("ATTR_1F_ARB attr %d: %f\n", n[1].i, n[2].f);
             break;
          case OPCODE_ATTR_2F_ARB:
-            _mesa_printf("ATTR_2F_ARB attr %d: %f %f\n",
+            printf("ATTR_2F_ARB attr %d: %f %f\n",
                          n[1].i, n[2].f, n[3].f);
             break;
          case OPCODE_ATTR_3F_ARB:
-            _mesa_printf("ATTR_3F_ARB attr %d: %f %f %f\n",
+            printf("ATTR_3F_ARB attr %d: %f %f %f\n",
                          n[1].i, n[2].f, n[3].f, n[4].f);
             break;
          case OPCODE_ATTR_4F_ARB:
-            _mesa_printf("ATTR_4F_ARB attr %d: %f %f %f %f\n",
+            printf("ATTR_4F_ARB attr %d: %f %f %f %f\n",
                          n[1].i, n[2].f, n[3].f, n[4].f, n[5].f);
             break;
 
          case OPCODE_MATERIAL:
-            _mesa_printf("MATERIAL %x %x: %f %f %f %f\n",
+            printf("MATERIAL %x %x: %f %f %f %f\n",
                          n[1].i, n[2].i, n[3].f, n[4].f, n[5].f, n[6].f);
             break;
          case OPCODE_BEGIN:
-            _mesa_printf("BEGIN %x\n", n[1].i);
+            printf("BEGIN %x\n", n[1].i);
             break;
          case OPCODE_END:
-            _mesa_printf("END\n");
+            printf("END\n");
             break;
          case OPCODE_RECTF:
-            _mesa_printf("RECTF %f %f %f %f\n", n[1].f, n[2].f, n[3].f,
+            printf("RECTF %f %f %f %f\n", n[1].f, n[2].f, n[3].f,
                          n[4].f);
             break;
          case OPCODE_EVAL_C1:
-            _mesa_printf("EVAL_C1 %f\n", n[1].f);
+            printf("EVAL_C1 %f\n", n[1].f);
             break;
          case OPCODE_EVAL_C2:
-            _mesa_printf("EVAL_C2 %f %f\n", n[1].f, n[2].f);
+            printf("EVAL_C2 %f %f\n", n[1].f, n[2].f);
             break;
          case OPCODE_EVAL_P1:
-            _mesa_printf("EVAL_P1 %d\n", n[1].i);
+            printf("EVAL_P1 %d\n", n[1].i);
             break;
          case OPCODE_EVAL_P2:
-            _mesa_printf("EVAL_P2 %d %d\n", n[1].i, n[2].i);
+            printf("EVAL_P2 %d %d\n", n[1].i, n[2].i);
             break;
 
          case OPCODE_PROVOKING_VERTEX:
-            _mesa_printf("ProvokingVertex %s\n",
+            printf("ProvokingVertex %s\n",
                          _mesa_lookup_enum_by_nr(n[1].ui));
             break;
 
@@ -9539,26 +9539,26 @@ print_list(GLcontext *ctx, GLuint list)
              * meta opcodes/commands
              */
          case OPCODE_ERROR:
-            _mesa_printf("Error: %s %s\n",
+            printf("Error: %s %s\n",
                          enum_string(n[1].e), (const char *) n[2].data);
             break;
          case OPCODE_CONTINUE:
-            _mesa_printf("DISPLAY-LIST-CONTINUE\n");
+            printf("DISPLAY-LIST-CONTINUE\n");
             n = (Node *) n[1].next;
             break;
          case OPCODE_END_OF_LIST:
-            _mesa_printf("END-LIST %u\n", list);
+            printf("END-LIST %u\n", list);
             done = GL_TRUE;
             break;
          default:
             if (opcode < 0 || opcode > OPCODE_END_OF_LIST) {
-               _mesa_printf
+               printf
                   ("ERROR IN DISPLAY LIST: opcode = %d, address = %p\n",
                    opcode, (void *) n);
                return;
             }
             else {
-               _mesa_printf("command %d, %u operands\n", opcode,
+               printf("command %d, %u operands\n", opcode,
                             InstSize[opcode]);
             }
          }
diff --git a/src/mesa/main/enums.c b/src/mesa/main/enums.c
index fc7f8beb50..140902f677 100644
--- a/src/mesa/main/enums.c
+++ b/src/mesa/main/enums.c
@@ -5216,7 +5216,7 @@ const char *_mesa_lookup_enum_by_nr( int nr )
    }
    else {
       /* this is not re-entrant safe, no big deal here */
-      _mesa_sprintf(token_tmp, "0x%x", nr);
+      sprintf(token_tmp, "0x%x", nr);
       return token_tmp;
    }
 }
diff --git a/src/mesa/main/execmem.c b/src/mesa/main/execmem.c
index 07a7f9fed8..ccd6ab43fc 100644
--- a/src/mesa/main/execmem.c
+++ b/src/mesa/main/execmem.c
@@ -106,7 +106,7 @@ _mesa_exec_malloc(GLuint size)
    if (block)
       addr = exec_mem + block->ofs;
    else 
-      _mesa_printf("_mesa_exec_malloc failed\n");
+      printf("_mesa_exec_malloc failed\n");
 
 bail:
    _glthread_UNLOCK_MUTEX(exec_mutex);
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 0e6f69f573..04ea3b4ed7 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -374,8 +374,8 @@ test_attachment_completeness(const GLcontext *ctx, GLenum format,
       }
       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);
+         printf("texobj = %u\n", texObj->Name);
+         printf("level = %d\n", att->TextureLevel);
          att->Complete = GL_FALSE;
          return;
       }
@@ -2139,39 +2139,39 @@ _mesa_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
 
    /* Debug code */
    if (DEBUG_BLIT) {
-      _mesa_printf("glBlitFramebuffer(%d, %d, %d, %d,  %d, %d, %d, %d,"
-                   " 0x%x, 0x%x)\n",
-                   srcX0, srcY0, srcX1, srcY1,
-                   dstX0, dstY0, dstX1, dstY1,
-                   mask, filter);
+      printf("glBlitFramebuffer(%d, %d, %d, %d,  %d, %d, %d, %d,"
+	     " 0x%x, 0x%x)\n",
+	     srcX0, srcY0, srcX1, srcY1,
+	     dstX0, dstY0, dstX1, dstY1,
+	     mask, filter);
       if (colorReadRb) {
          const struct gl_renderbuffer_attachment *att;
 
          att = find_attachment(readFb, colorReadRb);
-         _mesa_printf("  Src FBO %u  RB %u (%dx%d)  ",
-                      readFb->Name, colorReadRb->Name,
-                      colorReadRb->Width, colorReadRb->Height);
+         printf("  Src FBO %u  RB %u (%dx%d)  ",
+		readFb->Name, colorReadRb->Name,
+		colorReadRb->Width, colorReadRb->Height);
          if (att && att->Texture) {
-            _mesa_printf("Tex %u  tgt 0x%x  level %u  face %u",
-                         att->Texture->Name,
-                         att->Texture->Target,
-                         att->TextureLevel,
-                         att->CubeMapFace);
+            printf("Tex %u  tgt 0x%x  level %u  face %u",
+		   att->Texture->Name,
+		   att->Texture->Target,
+		   att->TextureLevel,
+		   att->CubeMapFace);
          }
-         _mesa_printf("\n");
+         printf("\n");
 
          att = find_attachment(drawFb, colorDrawRb);
-         _mesa_printf("  Dst FBO %u  RB %u (%dx%d)  ",
-                      drawFb->Name, colorDrawRb->Name,
-                      colorDrawRb->Width, colorDrawRb->Height);
+         printf("  Dst FBO %u  RB %u (%dx%d)  ",
+		drawFb->Name, colorDrawRb->Name,
+		colorDrawRb->Width, colorDrawRb->Height);
          if (att && att->Texture) {
-            _mesa_printf("Tex %u  tgt 0x%x  level %u  face %u",
-                         att->Texture->Name,
-                         att->Texture->Target,
-                         att->TextureLevel,
-                         att->CubeMapFace);
+            printf("Tex %u  tgt 0x%x  level %u  face %u",
+		   att->Texture->Name,
+		   att->Texture->Target,
+		   att->TextureLevel,
+		   att->CubeMapFace);
          }
-         _mesa_printf("\n");
+         printf("\n");
       }
    }
 
diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c
index 48edec657b..ba94a38770 100644
--- a/src/mesa/main/ffvertex_prog.c
+++ b/src/mesa/main/ffvertex_prog.c
@@ -536,10 +536,10 @@ static void debug_insn( struct prog_instruction *inst, const char *fn,
 
       if (fn != last_fn) {
 	 last_fn = fn;
-	 _mesa_printf("%s:\n", fn);
+	 printf("%s:\n", fn);
       }
 
-      _mesa_printf("%d:\t", line);
+      printf("%d:\t", line);
       _mesa_print_instruction(inst);
    }
 }
@@ -1577,7 +1577,7 @@ static void build_tnl_program( struct tnl_program *p )
    /* Disassemble:
     */
    if (DISASSEM) {
-      _mesa_printf ("\n");
+      printf ("\n");
    }
 }
 
@@ -1647,7 +1647,7 @@ _mesa_get_fixed_func_vertex_program(GLcontext *ctx)
    if (!prog) {
       /* OK, we'll have to build a new one */
       if (0)
-         _mesa_printf("Build new TNL program\n");
+         printf("Build new TNL program\n");
 
       prog = (struct gl_vertex_program *)
          ctx->Driver.NewProgram(ctx, GL_VERTEX_PROGRAM_ARB, 0);
diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index 10224f7888..112490915f 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -827,67 +827,6 @@ _mesa_str_checksum(const char *str)
 /*@}*/
 
 
-/**********************************************************************/
-/** \name I/O */
-/*@{*/
-
-/** Wrapper around vsprintf() */
-int
-_mesa_sprintf( char *str, const char *fmt, ... )
-{
-   int r;
-   va_list args;
-   va_start( args, fmt );  
-   r = vsprintf( str, fmt, args );
-   va_end( args );
-   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, ... )
-{
-   va_list args;
-   va_start( args, fmtString );  
-   vfprintf(stderr, fmtString, args);
-   va_end( args );
-}
-
-/** 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 )
-{
-   return vsprintf( str, fmt, args );
-}
-
-/*@}*/
-
-
 /**********************************************************************/
 /** \name Diagnostics */
 /*@{*/
@@ -927,7 +866,7 @@ output_if_debug(const char *prefixString, const char *outputString,
        * visible, so communicate with the debugger instead */ 
       {
          char buf[4096];
-         _mesa_snprintf(buf, sizeof(buf), "%s: %s%s", prefixString, outputString, newline ? "\n" : "");
+         snprintf(buf, sizeof(buf), "%s: %s%s", prefixString, outputString, newline ? "\n" : "");
          OutputDebugStringA(buf);
       }
 #endif
@@ -976,7 +915,7 @@ flush_delayed_errors( GLcontext *ctx )
    char s[MAXSTRING];
 
    if (ctx->ErrorDebugCount) {
-      _mesa_snprintf(s, MAXSTRING, "%d similar %s errors", 
+      snprintf(s, MAXSTRING, "%d similar %s errors", 
                      ctx->ErrorDebugCount,
                      error_string(ctx->ErrorValue));
 
@@ -1083,7 +1022,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", error_string(error), s);
+         snprintf(s2, MAXSTRING, "%s in %s", error_string(error), s);
          output_if_debug("Mesa: User error", s2, GL_TRUE);
          
          ctx->ErrorDebugFmtString = fmtString;
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index 4eabdfdb0d..a65c6a615f 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -594,22 +594,6 @@ _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, ... );
-
-extern int
-_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 );
-
-
 extern void
 _mesa_warning( __GLcontext *gc, const char *fmtString, ... );
 
diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c
index 415abcdfa1..355af56b41 100644
--- a/src/mesa/main/mipmap.c
+++ b/src/mesa/main/mipmap.c
@@ -1115,7 +1115,7 @@ make_3d_mipmap(GLenum datatype, GLuint comps, GLint border,
     */
 
    /*
-   _mesa_printf("mip3d %d x %d x %d  ->  %d x %d x %d\n",
+   printf("mip3d %d x %d x %d  ->  %d x %d x %d\n",
           srcWidth, srcHeight, srcDepth, dstWidth, dstHeight, dstDepth);
    */
 
diff --git a/src/mesa/main/shaders.c b/src/mesa/main/shaders.c
index e6f6add768..f382680b44 100644
--- a/src/mesa/main/shaders.c
+++ b/src/mesa/main/shaders.c
@@ -489,7 +489,7 @@ _mesa_ShaderSourceARB(GLhandleARB shaderObj, GLsizei count,
 
       newSource = _mesa_read_shader(filename);
       if (newSource) {
-         _mesa_fprintf(stderr, "Mesa: Replacing shader %u chksum=%d with %s\n",
+         fprintf(stderr, "Mesa: Replacing shader %u chksum=%d with %s\n",
                        shaderObj, checksum, filename);
          free(source);
          source = newSource;
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 5e07d1d2f1..589029db58 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -682,7 +682,7 @@ _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);*/
+      /*printf("%s %x\n", __FUNCTION__, varying_inputs);*/
    }
 }
 
diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index f790fd6562..7b8a8b85f2 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -1560,7 +1560,7 @@ create_new_program(GLcontext *ctx, struct state_key *key,
 
    if (DISASSEM) {
       _mesa_print_program(&p.program->Base);
-      _mesa_printf("\n");
+      printf("\n");
    }
 }
 
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 11e37dc34e..00329c755d 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -1307,7 +1307,7 @@ texture_error_check( GLcontext *ctx, GLenum target,
       if (type != GL_UNSIGNED_SHORT_8_8_MESA &&
           type != GL_UNSIGNED_SHORT_8_8_REV_MESA) {
          char message[100];
-         _mesa_sprintf(message,
+         sprintf(message,
                  "glTexImage%d(format/type YCBCR mismatch", dimensions);
          _mesa_error(ctx, GL_INVALID_ENUM, message);
          return GL_TRUE; /* error */
@@ -1323,7 +1323,7 @@ texture_error_check( GLcontext *ctx, GLenum target,
       if (border != 0) {
          if (!isProxy) {
             char message[100];
-            _mesa_sprintf(message,
+            sprintf(message,
                     "glTexImage%d(format=GL_YCBCR_MESA and border=%d)",
                     dimensions, border);
             _mesa_error(ctx, GL_INVALID_VALUE, message);
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index feba6e95b6..2753b55c36 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -383,7 +383,7 @@ _mesa_reference_texobj(struct gl_texture_object **ptr,
 static void
 incomplete(const struct gl_texture_object *t, const char *why)
 {
-   _mesa_printf("Texture Obj %d incomplete because: %s\n", t->Name, why);
+   printf("Texture Obj %d incomplete because: %s\n", t->Name, why);
 }
 #else
 #define incomplete(t, why)
@@ -416,7 +416,7 @@ _mesa_test_texobj_completeness( const GLcontext *ctx,
     */
    if ((baseLevel < 0) || (baseLevel >= MAX_TEXTURE_LEVELS)) {
       char s[100];
-      _mesa_sprintf(s, "base level = %d is invalid", baseLevel);
+      sprintf(s, "base level = %d is invalid", baseLevel);
       incomplete(t, s);
       t->_Complete = GL_FALSE;
       return;
@@ -425,7 +425,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, "Image[baseLevel=%d] == NULL", baseLevel);
+      sprintf(s, "Image[baseLevel=%d] == NULL", baseLevel);
       incomplete(t, s);
       t->_Complete = GL_FALSE;
       return;
diff --git a/src/mesa/main/texstate.c b/src/mesa/main/texstate.c
index 8c4399a430..fce17c2b66 100644
--- a/src/mesa/main/texstate.c
+++ b/src/mesa/main/texstate.c
@@ -122,25 +122,25 @@ void
 _mesa_print_texunit_state( GLcontext *ctx, GLuint unit )
 {
    const struct gl_texture_unit *texUnit = ctx->Texture.Unit + unit;
-   _mesa_printf("Texture Unit %d\n", unit);
-   _mesa_printf("  GL_TEXTURE_ENV_MODE = %s\n", _mesa_lookup_enum_by_nr(texUnit->EnvMode));
-   _mesa_printf("  GL_COMBINE_RGB = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.ModeRGB));
-   _mesa_printf("  GL_COMBINE_ALPHA = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.ModeA));
-   _mesa_printf("  GL_SOURCE0_RGB = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.SourceRGB[0]));
-   _mesa_printf("  GL_SOURCE1_RGB = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.SourceRGB[1]));
-   _mesa_printf("  GL_SOURCE2_RGB = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.SourceRGB[2]));
-   _mesa_printf("  GL_SOURCE0_ALPHA = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.SourceA[0]));
-   _mesa_printf("  GL_SOURCE1_ALPHA = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.SourceA[1]));
-   _mesa_printf("  GL_SOURCE2_ALPHA = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.SourceA[2]));
-   _mesa_printf("  GL_OPERAND0_RGB = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.OperandRGB[0]));
-   _mesa_printf("  GL_OPERAND1_RGB = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.OperandRGB[1]));
-   _mesa_printf("  GL_OPERAND2_RGB = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.OperandRGB[2]));
-   _mesa_printf("  GL_OPERAND0_ALPHA = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.OperandA[0]));
-   _mesa_printf("  GL_OPERAND1_ALPHA = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.OperandA[1]));
-   _mesa_printf("  GL_OPERAND2_ALPHA = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.OperandA[2]));
-   _mesa_printf("  GL_RGB_SCALE = %d\n", 1 << texUnit->Combine.ScaleShiftRGB);
-   _mesa_printf("  GL_ALPHA_SCALE = %d\n", 1 << texUnit->Combine.ScaleShiftA);
-   _mesa_printf("  GL_TEXTURE_ENV_COLOR = (%f, %f, %f, %f)\n", texUnit->EnvColor[0], texUnit->EnvColor[1], texUnit->EnvColor[2], texUnit->EnvColor[3]);
+   printf("Texture Unit %d\n", unit);
+   printf("  GL_TEXTURE_ENV_MODE = %s\n", _mesa_lookup_enum_by_nr(texUnit->EnvMode));
+   printf("  GL_COMBINE_RGB = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.ModeRGB));
+   printf("  GL_COMBINE_ALPHA = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.ModeA));
+   printf("  GL_SOURCE0_RGB = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.SourceRGB[0]));
+   printf("  GL_SOURCE1_RGB = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.SourceRGB[1]));
+   printf("  GL_SOURCE2_RGB = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.SourceRGB[2]));
+   printf("  GL_SOURCE0_ALPHA = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.SourceA[0]));
+   printf("  GL_SOURCE1_ALPHA = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.SourceA[1]));
+   printf("  GL_SOURCE2_ALPHA = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.SourceA[2]));
+   printf("  GL_OPERAND0_RGB = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.OperandRGB[0]));
+   printf("  GL_OPERAND1_RGB = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.OperandRGB[1]));
+   printf("  GL_OPERAND2_RGB = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.OperandRGB[2]));
+   printf("  GL_OPERAND0_ALPHA = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.OperandA[0]));
+   printf("  GL_OPERAND1_ALPHA = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.OperandA[1]));
+   printf("  GL_OPERAND2_ALPHA = %s\n", _mesa_lookup_enum_by_nr(texUnit->Combine.OperandA[2]));
+   printf("  GL_RGB_SCALE = %d\n", 1 << texUnit->Combine.ScaleShiftRGB);
+   printf("  GL_ALPHA_SCALE = %d\n", 1 << texUnit->Combine.ScaleShiftA);
+   printf("  GL_TEXTURE_ENV_COLOR = (%f, %f, %f, %f)\n", texUnit->EnvColor[0], texUnit->EnvColor[1], texUnit->EnvColor[2], texUnit->EnvColor[3]);
 }
 
 
diff --git a/src/mesa/main/texstore.c b/src/mesa/main/texstore.c
index bd63c77a39..65e3fcaa95 100644
--- a/src/mesa/main/texstore.c
+++ b/src/mesa/main/texstore.c
@@ -264,15 +264,15 @@ compute_component_mapping(GLenum inFormat, GLenum outFormat,
    map[ONE] = ONE;   
 
 #if 0
-   _mesa_printf("from %x/%s to %x/%s map %d %d %d %d %d %d\n",
-		inFormat, _mesa_lookup_enum_by_nr(inFormat),
-		outFormat, _mesa_lookup_enum_by_nr(outFormat),
-		map[0], 
-		map[1], 
-		map[2], 
-		map[3], 
-		map[4], 
-		map[5]); 
+   printf("from %x/%s to %x/%s map %d %d %d %d %d %d\n",
+	  inFormat, _mesa_lookup_enum_by_nr(inFormat),
+	  outFormat, _mesa_lookup_enum_by_nr(outFormat),
+	  map[0], 
+	  map[1], 
+	  map[2], 
+	  map[3], 
+	  map[4], 
+	  map[5]); 
 #endif
 }
 
@@ -884,7 +884,7 @@ _mesa_swizzle_ubyte_image(GLcontext *ctx,
    for (i = 0; i < 4; i++)
       map[i] = srctype2ubyte[swap[src2base[base2rgba[rgba2dst[i]]]]];
 
-/*    _mesa_printf("map %d %d %d %d\n", map[0], map[1], map[2], map[3]);  */
+/*    printf("map %d %d %d %d\n", map[0], map[1], map[2], map[3]);  */
 
    if (srcComponents == dstComponents &&
        srcRowStride == dstRowStride &&
diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index 818ed792e3..86878d6a8a 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -1083,14 +1083,14 @@ static void
 print_array(const char *name, GLint index, const struct gl_client_array *array)
 {
    if (index >= 0)
-      _mesa_printf("  %s[%d]: ", name, index);
+      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);
+      printf("  %s: ", name);
+   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);
 }
 
 
@@ -1105,7 +1105,7 @@ _mesa_print_arrays(GLcontext *ctx)
 
    _mesa_update_array_object_max_element(ctx, arrayObj);
 
-   _mesa_printf("Array Object %u\n", arrayObj->Name);
+   printf("Array Object %u\n", arrayObj->Name);
    if (arrayObj->Vertex.Enabled)
       print_array("Vertex", -1, &arrayObj->Vertex);
    if (arrayObj->Normal.Enabled)
@@ -1118,7 +1118,7 @@ _mesa_print_arrays(GLcontext *ctx)
    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);
+   printf("  _MaxElement = %u\n", arrayObj->_MaxElement);
 }
 
 
diff --git a/src/mesa/main/version.c b/src/mesa/main/version.c
index e474fe7fa5..0d01f16059 100644
--- a/src/mesa/main/version.c
+++ b/src/mesa/main/version.c
@@ -124,7 +124,7 @@ _mesa_compute_version(GLcontext *ctx)
    
    ctx->VersionString = (char *) malloc(max);
    if (ctx->VersionString) {
-      _mesa_snprintf(ctx->VersionString, max, "%u.%u Mesa " MESA_VERSION_STRING,
-                     ctx->VersionMajor, ctx->VersionMinor);
+      snprintf(ctx->VersionString, max, "%u.%u Mesa " MESA_VERSION_STRING,
+	       ctx->VersionMajor, ctx->VersionMinor);
    }
 }
diff --git a/src/mesa/math/m_debug_clip.c b/src/mesa/math/m_debug_clip.c
index 95ae5a347d..7ea5428aa2 100644
--- a/src/mesa/math/m_debug_clip.c
+++ b/src/mesa/math/m_debug_clip.c
@@ -270,20 +270,20 @@ static int test_cliptest_function( clip_func func, int np,
    }
 
    if ( dco != rco ) {
-      _mesa_printf( "\n-----------------------------\n" );
-      _mesa_printf( "dco = 0x%02x   rco = 0x%02x\n", dco, rco );
+      printf( "\n-----------------------------\n" );
+      printf( "dco = 0x%02x   rco = 0x%02x\n", dco, rco );
       return 0;
    }
    if ( dca != rca ) {
-      _mesa_printf( "\n-----------------------------\n" );
-      _mesa_printf( "dca = 0x%02x   rca = 0x%02x\n", dca, rca );
+      printf( "\n-----------------------------\n" );
+      printf( "dca = 0x%02x   rca = 0x%02x\n", dca, rca );
       return 0;
    }
    for ( i = 0 ; i < TEST_COUNT ; i++ ) {
       if ( dm[i] != rm[i] ) {
-	 _mesa_printf( "\n-----------------------------\n" );
-	 _mesa_printf( "(i = %i)\n", i );
-	 _mesa_printf( "dm = 0x%02x   rm = 0x%02x\n", dm[i], rm[i] );
+	 printf( "\n-----------------------------\n" );
+	 printf( "(i = %i)\n", i );
+	 printf( "dm = 0x%02x   rm = 0x%02x\n", dm[i], rm[i] );
 	 return 0;
       }
    }
@@ -297,19 +297,19 @@ static int test_cliptest_function( clip_func func, int np,
    for ( i = 0 ; i < TEST_COUNT ; i++ ) {
       for ( j = 0 ; j < 4 ; j++ ) {
          if ( significand_match( d[i][j], r[i][j] ) < REQUIRED_PRECISION ) {
-            _mesa_printf( "\n-----------------------------\n" );
-            _mesa_printf( "(i = %i, j = %i)  dm = 0x%02x   rm = 0x%02x\n",
+            printf( "\n-----------------------------\n" );
+            printf( "(i = %i, j = %i)  dm = 0x%02x   rm = 0x%02x\n",
 		    i, j, dm[i], rm[i] );
-            _mesa_printf( "%f \t %f \t [diff = %e - %i bit missed]\n",
+            printf( "%f \t %f \t [diff = %e - %i bit missed]\n",
 		    d[i][0], r[i][0], r[i][0]-d[i][0],
 		    MAX_PRECISION - significand_match( d[i][0], r[i][0] ) );
-            _mesa_printf( "%f \t %f \t [diff = %e - %i bit missed]\n",
+            printf( "%f \t %f \t [diff = %e - %i bit missed]\n",
 		    d[i][1], r[i][1], r[i][1]-d[i][1],
 		    MAX_PRECISION - significand_match( d[i][1], r[i][1] ) );
-            _mesa_printf( "%f \t %f \t [diff = %e - %i bit missed]\n",
+            printf( "%f \t %f \t [diff = %e - %i bit missed]\n",
 		    d[i][2], r[i][2], r[i][2]-d[i][2],
 		    MAX_PRECISION - significand_match( d[i][2], r[i][2] ) );
-            _mesa_printf( "%f \t %f \t [diff = %e - %i bit missed]\n",
+            printf( "%f \t %f \t [diff = %e - %i bit missed]\n",
 		    d[i][3], r[i][3], r[i][3]-d[i][3],
 		    MAX_PRECISION - significand_match( d[i][3], r[i][3] ) );
             return 0;
@@ -335,19 +335,19 @@ void _math_test_all_cliptest_functions( char *description )
    if ( mesa_profile ) {
       if ( !counter_overhead ) {
 	 INIT_COUNTER();
-	 _mesa_printf( "counter overhead: %ld cycles\n\n", counter_overhead );
+	 printf( "counter overhead: %ld cycles\n\n", counter_overhead );
       }
-      _mesa_printf( "cliptest results after hooking in %s functions:\n", description );
+      printf( "cliptest results after hooking in %s functions:\n", description );
    }
 #endif
 
 #ifdef RUN_DEBUG_BENCHMARK
    if ( mesa_profile ) {
-      _mesa_printf( "\n\t" );
+      printf( "\n\t" );
       for ( psize = 2 ; psize <= 4 ; psize++ ) {
-	 _mesa_printf( " p%d\t", psize );
+	 printf( " p%d\t", psize );
       }
-      _mesa_printf( "\n--------------------------------------------------------\n\t" );
+      printf( "\n--------------------------------------------------------\n\t" );
    }
 #endif
 
@@ -358,23 +358,23 @@ void _math_test_all_cliptest_functions( char *description )
 
 	 if ( test_cliptest_function( func, np, psize, cycles ) == 0 ) {
 	    char buf[100];
-	    _mesa_sprintf( buf, "%s[%d] failed test (%s)",
+	    sprintf( buf, "%s[%d] failed test (%s)",
 		     cnames[np], psize, description );
 	    _mesa_problem( NULL, buf );
 	 }
 #ifdef RUN_DEBUG_BENCHMARK
 	 if ( mesa_profile )
-	    _mesa_printf( " %li\t", benchmark_tab[np][psize-1] );
+	    printf( " %li\t", benchmark_tab[np][psize-1] );
 #endif
       }
 #ifdef RUN_DEBUG_BENCHMARK
       if ( mesa_profile )
-	 _mesa_printf( " | [%s]\n\t", cstrings[np] );
+	 printf( " | [%s]\n\t", cstrings[np] );
 #endif
    }
 #ifdef RUN_DEBUG_BENCHMARK
    if ( mesa_profile )
-      _mesa_printf( "\n" );
+      printf( "\n" );
 #endif
 }
 
diff --git a/src/mesa/math/m_debug_norm.c b/src/mesa/math/m_debug_norm.c
index f9b26d8047..546e8641da 100644
--- a/src/mesa/math/m_debug_norm.c
+++ b/src/mesa/math/m_debug_norm.c
@@ -294,15 +294,15 @@ static int test_norm_function( normal_func func, int mtype, long *cycles )
    for ( i = 0 ; i < TEST_COUNT ; i++ ) {
       for ( j = 0 ; j < 3 ; j++ ) {
          if ( significand_match( d[i][j], r[i][j] ) < REQUIRED_PRECISION ) {
-            _mesa_printf( "-----------------------------\n" );
-            _mesa_printf( "(i = %i, j = %i)\n", i, j );
-            _mesa_printf( "%f \t %f \t [ratio = %e - %i bit missed]\n",
+            printf( "-----------------------------\n" );
+            printf( "(i = %i, j = %i)\n", i, j );
+            printf( "%f \t %f \t [ratio = %e - %i bit missed]\n",
 		    d[i][0], r[i][0], r[i][0]/d[i][0],
 		    MAX_PRECISION - significand_match( d[i][0], r[i][0] ) );
-            _mesa_printf( "%f \t %f \t [ratio = %e - %i bit missed]\n",
+            printf( "%f \t %f \t [ratio = %e - %i bit missed]\n",
 		    d[i][1], r[i][1], r[i][1]/d[i][1],
 		    MAX_PRECISION - significand_match( d[i][1], r[i][1] ) );
-            _mesa_printf( "%f \t %f \t [ratio = %e - %i bit missed]\n",
+            printf( "%f \t %f \t [ratio = %e - %i bit missed]\n",
 		    d[i][2], r[i][2], r[i][2]/d[i][2],
 		    MAX_PRECISION - significand_match( d[i][2], r[i][2] ) );
             return 0;
@@ -310,15 +310,15 @@ static int test_norm_function( normal_func func, int mtype, long *cycles )
 
          if ( norm_normalize_types[mtype] != 0 ) {
             if ( significand_match( d2[i][j], r2[i][j] ) < REQUIRED_PRECISION ) {
-               _mesa_printf( "------------------- precalculated length case ------\n" );
-               _mesa_printf( "(i = %i, j = %i)\n", i, j );
-               _mesa_printf( "%f \t %f \t [ratio = %e - %i bit missed]\n",
+               printf( "------------------- precalculated length case ------\n" );
+               printf( "(i = %i, j = %i)\n", i, j );
+               printf( "%f \t %f \t [ratio = %e - %i bit missed]\n",
 		       d2[i][0], r2[i][0], r2[i][0]/d2[i][0],
 		       MAX_PRECISION - significand_match( d2[i][0], r2[i][0] ) );
-               _mesa_printf( "%f \t %f \t [ratio = %e - %i bit missed]\n",
+               printf( "%f \t %f \t [ratio = %e - %i bit missed]\n",
 		       d2[i][1], r2[i][1], r2[i][1]/d2[i][1],
 		       MAX_PRECISION - significand_match( d2[i][1], r2[i][1] ) );
-               _mesa_printf( "%f \t %f \t [ratio = %e - %i bit missed]\n",
+               printf( "%f \t %f \t [ratio = %e - %i bit missed]\n",
 		       d2[i][2], r2[i][2], r2[i][2]/d2[i][2],
 		       MAX_PRECISION - significand_match( d2[i][2], r2[i][2] ) );
                return 0;
@@ -346,11 +346,11 @@ void _math_test_all_normal_transform_functions( char *description )
    if ( mesa_profile ) {
       if ( !counter_overhead ) {
 	 INIT_COUNTER();
-	 _mesa_printf( "counter overhead: %ld cycles\n\n", counter_overhead );
+	 printf( "counter overhead: %ld cycles\n\n", counter_overhead );
       }
-      _mesa_printf( "normal transform results after hooking in %s functions:\n",
+      printf( "normal transform results after hooking in %s functions:\n",
 	      description );
-      _mesa_printf( "\n-------------------------------------------------------\n" );
+      printf( "\n-------------------------------------------------------\n" );
    }
 #endif
 
@@ -360,21 +360,21 @@ void _math_test_all_normal_transform_functions( char *description )
 
       if ( test_norm_function( func, mtype, cycles ) == 0 ) {
 	 char buf[100];
-	 _mesa_sprintf( buf, "_mesa_normal_tab[0][%s] failed test (%s)",
+	 sprintf( buf, "_mesa_normal_tab[0][%s] failed test (%s)",
 		  norm_strings[mtype], description );
 	 _mesa_problem( NULL, buf );
       }
 
 #ifdef RUN_DEBUG_BENCHMARK
       if ( mesa_profile ) {
-	 _mesa_printf( " %li\t", benchmark_tab[mtype] );
-	 _mesa_printf( " | [%s]\n", norm_strings[mtype] );
+	 printf( " %li\t", benchmark_tab[mtype] );
+	 printf( " | [%s]\n", norm_strings[mtype] );
       }
 #endif
    }
 #ifdef RUN_DEBUG_BENCHMARK
    if ( mesa_profile ) {
-      _mesa_printf( "\n" );
+      printf( "\n" );
    }
 #endif
 }
diff --git a/src/mesa/math/m_debug_xform.c b/src/mesa/math/m_debug_xform.c
index df8cc066b6..df1bc8aadf 100644
--- a/src/mesa/math/m_debug_xform.c
+++ b/src/mesa/math/m_debug_xform.c
@@ -254,18 +254,18 @@ static int test_transform_function( transform_func func, int psize,
    for ( i = 0 ; i < TEST_COUNT ; i++ ) {
       for ( j = 0 ; j < 4 ; j++ ) {
          if ( significand_match( d[i][j], r[i][j] ) < REQUIRED_PRECISION ) {
-            _mesa_printf("-----------------------------\n" );
-            _mesa_printf("(i = %i, j = %i)\n", i, j );
-            _mesa_printf("%f \t %f \t [diff = %e - %i bit missed]\n",
+            printf("-----------------------------\n" );
+            printf("(i = %i, j = %i)\n", i, j );
+            printf("%f \t %f \t [diff = %e - %i bit missed]\n",
 		    d[i][0], r[i][0], r[i][0]-d[i][0],
 		    MAX_PRECISION - significand_match( d[i][0], r[i][0] ) );
-            _mesa_printf("%f \t %f \t [diff = %e - %i bit missed]\n",
+            printf("%f \t %f \t [diff = %e - %i bit missed]\n",
 		    d[i][1], r[i][1], r[i][1]-d[i][1],
 		    MAX_PRECISION - significand_match( d[i][1], r[i][1] ) );
-            _mesa_printf("%f \t %f \t [diff = %e - %i bit missed]\n",
+            printf("%f \t %f \t [diff = %e - %i bit missed]\n",
 		    d[i][2], r[i][2], r[i][2]-d[i][2],
 		    MAX_PRECISION - significand_match( d[i][2], r[i][2] ) );
-            _mesa_printf("%f \t %f \t [diff = %e - %i bit missed]\n",
+            printf("%f \t %f \t [diff = %e - %i bit missed]\n",
 		    d[i][3], r[i][3], r[i][3]-d[i][3],
 		    MAX_PRECISION - significand_match( d[i][3], r[i][3] ) );
             return 0;
@@ -292,19 +292,19 @@ void _math_test_all_transform_functions( char *description )
    if ( mesa_profile ) {
       if ( !counter_overhead ) {
 	 INIT_COUNTER();
-	 _mesa_printf("counter overhead: %lu cycles\n\n", counter_overhead );
+	 printf("counter overhead: %lu cycles\n\n", counter_overhead );
       }
-      _mesa_printf("transform results after hooking in %s functions:\n", description );
+      printf("transform results after hooking in %s functions:\n", description );
    }
 #endif
 
 #ifdef RUN_DEBUG_BENCHMARK
    if ( mesa_profile ) {
-      _mesa_printf("\n" );
+      printf("\n" );
       for ( psize = 1 ; psize <= 4 ; psize++ ) {
-	 _mesa_printf(" p%d\t", psize );
+	 printf(" p%d\t", psize );
       }
-      _mesa_printf("\n--------------------------------------------------------\n" );
+      printf("\n--------------------------------------------------------\n" );
    }
 #endif
 
@@ -315,23 +315,23 @@ void _math_test_all_transform_functions( char *description )
 
 	 if ( test_transform_function( func, psize, mtype, cycles ) == 0 ) {
 	    char buf[100];
-	    _mesa_sprintf(buf, "_mesa_transform_tab[0][%d][%s] failed test (%s)",
-		     psize, mstrings[mtype], description );
+	    sprintf(buf, "_mesa_transform_tab[0][%d][%s] failed test (%s)",
+		    psize, mstrings[mtype], description );
 	    _mesa_problem( NULL, buf );
 	 }
 #ifdef RUN_DEBUG_BENCHMARK
 	 if ( mesa_profile )
-	    _mesa_printf(" %li\t", benchmark_tab[psize-1][mtype] );
+	    printf(" %li\t", benchmark_tab[psize-1][mtype] );
 #endif
       }
 #ifdef RUN_DEBUG_BENCHMARK
       if ( mesa_profile )
-	 _mesa_printf(" | [%s]\n", mstrings[mtype] );
+	 printf(" | [%s]\n", mstrings[mtype] );
 #endif
    }
 #ifdef RUN_DEBUG_BENCHMARK
    if ( mesa_profile )
-      _mesa_printf( "\n" );
+      printf( "\n" );
 #endif
 }
 
diff --git a/src/mesa/math/m_vector.c b/src/mesa/math/m_vector.c
index 4cbab11a35..65c381f383 100644
--- a/src/mesa/math/m_vector.c
+++ b/src/mesa/math/m_vector.c
@@ -148,27 +148,27 @@ _mesa_vector4f_print( const GLvector4f *v, const GLubyte *cullmask,
    GLfloat *d = (GLfloat *)v->data;
    GLuint j, i = 0, count;
 
-   _mesa_printf("data-start\n");
+   printf("data-start\n");
    for (; d != v->start; STRIDE_F(d, v->stride), i++)
-      _mesa_printf(t, i, d[0], d[1], d[2], d[3]);
+      printf(t, i, d[0], d[1], d[2], d[3]);
 
-   _mesa_printf("start-count(%u)\n", v->count);
+   printf("start-count(%u)\n", v->count);
    count = i + v->count;
 
    if (culling) {
       for (; i < count; STRIDE_F(d, v->stride), i++)
 	 if (cullmask[i])
-	    _mesa_printf(t, i, d[0], d[1], d[2], d[3]);
+	    printf(t, i, d[0], d[1], d[2], d[3]);
    }
    else {
       for (; i < count; STRIDE_F(d, v->stride), i++)
-	 _mesa_printf(t, i, d[0], d[1], d[2], d[3]);
+	 printf(t, i, d[0], d[1], d[2], d[3]);
    }
 
    for (j = v->size; j < 4; j++) {
       if ((v->flags & (1<<j)) == 0) {
 
-	 _mesa_printf("checking col %u is clean as advertised ", j);
+	 printf("checking col %u is clean as advertised ", j);
 
 	 for (i = 0, d = (GLfloat *) v->data;
 	      i < count && d[j] == c[j];
@@ -177,9 +177,9 @@ _mesa_vector4f_print( const GLvector4f *v, const GLubyte *cullmask,
          }
 
 	 if (i == count)
-	    _mesa_printf(" --> ok\n");
+	    printf(" --> ok\n");
 	 else
-	    _mesa_printf(" --> Failed at %u ******\n", i);
+	    printf(" --> Failed at %u ******\n", i);
       }
    }
 }
diff --git a/src/mesa/shader/arbprogparse.c b/src/mesa/shader/arbprogparse.c
index 03ff30a239..6373529e4e 100644
--- a/src/mesa/shader/arbprogparse.c
+++ b/src/mesa/shader/arbprogparse.c
@@ -148,7 +148,7 @@ _mesa_parse_arb_fragment_program(GLcontext* ctx, GLenum target,
    }
 
 #if DEBUG_FP
-   _mesa_printf("____________Fragment program %u ________\n", program->Base.Id);
+   printf("____________Fragment program %u ________\n", program->Base.Id);
    _mesa_print_program(&program->Base);
 #endif
 }
@@ -211,7 +211,7 @@ _mesa_parse_arb_vertex_program(GLcontext *ctx, GLenum target,
    program->Base.Parameters = prog.Parameters; 
 
 #if DEBUG_VP
-   _mesa_printf("____________Vertex program %u __________\n", program->Base.Id);
+   printf("____________Vertex program %u __________\n", program->Base.Id);
    _mesa_print_program(&program->Base);
 #endif
 }
diff --git a/src/mesa/shader/nvfragparse.c b/src/mesa/shader/nvfragparse.c
index 4f02703619..d03cb4e493 100644
--- a/src/mesa/shader/nvfragparse.c
+++ b/src/mesa/shader/nvfragparse.c
@@ -200,7 +200,7 @@ do {									\
 #define RETURN_ERROR2(msg1, msg2)					\
 do {									\
    char err[1000];							\
-   _mesa_sprintf(err, "%s %s", msg1, msg2);				\
+   sprintf(err, "%s %s", msg1, msg2);				\
    record_error(parseState, err, __LINE__);				\
    return GL_FALSE;							\
 } while(0)
@@ -1566,9 +1566,9 @@ _mesa_parse_nv_fragment_program(GLcontext *ctx, GLenum dstTarget,
 #endif
 
 #ifdef DEBUG_foo
-      _mesa_printf("--- glLoadProgramNV(%d) result ---\n", program->Base.Id);
+      printf("--- glLoadProgramNV(%d) result ---\n", program->Base.Id);
       _mesa_fprint_program_opt(stdout, &program->Base, PROG_PRINT_NV, 0);
-      _mesa_printf("----------------------------------\n");
+      printf("----------------------------------\n");
 #endif
    }
    else {
diff --git a/src/mesa/shader/nvvertparse.c b/src/mesa/shader/nvvertparse.c
index fb36303bb9..631b315af3 100644
--- a/src/mesa/shader/nvvertparse.c
+++ b/src/mesa/shader/nvvertparse.c
@@ -111,7 +111,7 @@ do {									\
 #define RETURN_ERROR2(msg1, msg2)					\
 do {									\
    char err[1000];							\
-   _mesa_sprintf(err, "%s %s", msg1, msg2);				\
+   sprintf(err, "%s %s", msg1, msg2);				\
    record_error(parseState, err, __LINE__);				\
    return GL_FALSE;							\
 } while(0)
@@ -1397,9 +1397,9 @@ _mesa_parse_nv_vertex_program(GLcontext *ctx, GLenum dstTarget,
       program->IsNVProgram = GL_TRUE;
 
 #ifdef DEBUG_foo
-      _mesa_printf("--- glLoadProgramNV result ---\n");
+      printf("--- glLoadProgramNV result ---\n");
       _mesa_fprint_program_opt(stdout, &program->Base, PROG_PRINT_NV, 0);
-      _mesa_printf("------------------------------\n");
+      printf("------------------------------\n");
 #endif
 
       if (program->Base.Parameters)
diff --git a/src/mesa/shader/prog_execute.c b/src/mesa/shader/prog_execute.c
index ee422e7ec8..3b51f986e8 100644
--- a/src/mesa/shader/prog_execute.c
+++ b/src/mesa/shader/prog_execute.c
@@ -1782,8 +1782,8 @@ _mesa_execute_program(GLcontext * ctx,
          {
             GLfloat a[4];
             fetch_vector4(&inst->SrcReg[0], machine, a);
-            _mesa_printf("%s%g, %g, %g, %g\n", (const char *) inst->Data,
-                         a[0], a[1], a[2], a[3]);
+            printf("%s%g, %g, %g, %g\n", (const char *) inst->Data,
+		   a[0], a[1], a[2], a[3]);
          }
          break;
       case OPCODE_END:
diff --git a/src/mesa/shader/prog_instruction.c b/src/mesa/shader/prog_instruction.c
index 81099cb99c..e5534b20e3 100644
--- a/src/mesa/shader/prog_instruction.c
+++ b/src/mesa/shader/prog_instruction.c
@@ -345,7 +345,7 @@ _mesa_opcode_string(gl_inst_opcode opcode)
       return InstInfo[opcode].Name;
    else {
       static char s[20];
-      _mesa_snprintf(s, sizeof(s), "OP%u", opcode);
+      snprintf(s, sizeof(s), "OP%u", opcode);
       return s;
    }
 }
diff --git a/src/mesa/shader/prog_optimize.c b/src/mesa/shader/prog_optimize.c
index 09816d5044..2941a17da3 100644
--- a/src/mesa/shader/prog_optimize.c
+++ b/src/mesa/shader/prog_optimize.c
@@ -159,7 +159,7 @@ _mesa_consolidate_registers(struct gl_program *prog)
    GLuint tempMax = 0, i;
 
    if (dbg) {
-      _mesa_printf("Optimize: Begin register consolidation\n");
+      printf("Optimize: Begin register consolidation\n");
    }
 
    memset(tempUsed, 0, sizeof(tempUsed));
@@ -196,7 +196,7 @@ _mesa_consolidate_registers(struct gl_program *prog)
       for (i = 0; i <= tempMax; i++) {
          if (tempUsed[i]) {
             tempMap[i] = freeTemp++;
-            /*_mesa_printf("replace %u with %u\n", i, tempMap[i]);*/
+            /*printf("replace %u with %u\n", i, tempMap[i]);*/
          }
       }
       if (freeTemp == tempMax + 1) {
@@ -204,14 +204,14 @@ _mesa_consolidate_registers(struct gl_program *prog)
          return;
       }         
       if (dbg) {
-         _mesa_printf("Replace regs 0..%u with 0..%u\n", tempMax, freeTemp-1);
+         printf("Replace regs 0..%u with 0..%u\n", tempMax, freeTemp-1);
       }
    }
 
    replace_regs(prog, PROGRAM_TEMPORARY, tempMap);
 
    if (dbg) {
-      _mesa_printf("Optimize: End register consolidation\n");
+      printf("Optimize: End register consolidation\n");
    }
 }
 
@@ -232,7 +232,7 @@ _mesa_remove_dead_code(struct gl_program *prog)
    memset(tempRead, 0, sizeof(tempRead));
 
    if (dbg) {
-      _mesa_printf("Optimize: Begin dead code removal\n");
+      printf("Optimize: Begin dead code removal\n");
       /*_mesa_print_program(prog);*/
    }
 
@@ -255,7 +255,7 @@ _mesa_remove_dead_code(struct gl_program *prog)
 
             if (inst->SrcReg[j].RelAddr) {
                if (dbg)
-                  _mesa_printf("abort remove dead code (indirect temp)\n");
+                  printf("abort remove dead code (indirect temp)\n");
                goto done;
             }
 
@@ -290,7 +290,7 @@ _mesa_remove_dead_code(struct gl_program *prog)
 
          if (inst->DstReg.RelAddr) {
             if (dbg)
-               _mesa_printf("abort remove dead code (indirect temp)\n");
+               printf("abort remove dead code (indirect temp)\n");
             goto done;
          }
 
@@ -319,7 +319,7 @@ _mesa_remove_dead_code(struct gl_program *prog)
 	    if (!tempRead[index][chan] &&
 		inst->DstReg.WriteMask & (1 << chan)) {
 	       if (dbg) {
-		  _mesa_printf("Remove writemask on %u.%c\n", i,
+		  printf("Remove writemask on %u.%c\n", i,
 			       chan == 3 ? 'w' : 'x' + chan);
 	       }
 	       inst->DstReg.WriteMask &= ~(1 << chan);
@@ -330,7 +330,7 @@ _mesa_remove_dead_code(struct gl_program *prog)
 	 if (inst->DstReg.WriteMask == 0) {
 	    /* If we cleared all writes, the instruction can be removed. */
 	    if (dbg)
-	       _mesa_printf("Remove instruction %u: \n", i);
+	       printf("Remove instruction %u: \n", i);
 	    removeInst[i] = GL_TRUE;
 	 }
       }
@@ -340,9 +340,9 @@ _mesa_remove_dead_code(struct gl_program *prog)
    rem = remove_instructions(prog, removeInst);
 
    if (dbg) {
-      _mesa_printf("Optimize: End dead code removal.\n");
-      _mesa_printf("  %u channel writes removed\n", rem);
-      _mesa_printf("  %u instructions removed\n", rem);
+      printf("Optimize: End dead code removal.\n");
+      printf("  %u channel writes removed\n", rem);
+      printf("  %u instructions removed\n", rem);
       /*_mesa_print_program(prog);*/
    }
 
@@ -427,7 +427,7 @@ _mesa_remove_extra_move_use(struct gl_program *prog)
    GLuint i, j;
 
    if (dbg) {
-      _mesa_printf("Optimize: Begin remove extra move use\n");
+      printf("Optimize: Begin remove extra move use\n");
       _mesa_print_program(prog);
    }
 
@@ -518,7 +518,7 @@ _mesa_remove_extra_move_use(struct gl_program *prog)
    }
 
    if (dbg) {
-      _mesa_printf("Optimize: End remove extra move use.\n");
+      printf("Optimize: End remove extra move use.\n");
       /*_mesa_print_program(prog);*/
    }
 }
@@ -533,7 +533,7 @@ _mesa_remove_extra_moves(struct gl_program *prog)
    GLuint i, rem, loopNesting = 0, subroutineNesting = 0;
 
    if (dbg) {
-      _mesa_printf("Optimize: Begin remove extra moves\n");
+      printf("Optimize: Begin remove extra moves\n");
       _mesa_print_program(prog);
    }
 
@@ -605,8 +605,8 @@ _mesa_remove_extra_moves(struct gl_program *prog)
                   removeInst[i] = GL_TRUE;
 
                   if (dbg) {
-                     _mesa_printf("Remove MOV at %u\n", i);
-                     _mesa_printf("new prev inst %u: ", prevI);
+                     printf("Remove MOV at %u\n", i);
+                     printf("new prev inst %u: ", prevI);
                      _mesa_print_instruction(prevInst);
                   }
                }
@@ -624,7 +624,7 @@ _mesa_remove_extra_moves(struct gl_program *prog)
    free(removeInst);
 
    if (dbg) {
-      _mesa_printf("Optimize: End remove extra moves.  %u instructions removed\n", rem);
+      printf("Optimize: End remove extra moves.  %u instructions removed\n", rem);
       /*_mesa_print_program(prog);*/
    }
 }
@@ -837,7 +837,7 @@ find_live_intervals(struct gl_program *prog,
     */
 
    if (dbg) {
-      _mesa_printf("Optimize: Begin find intervals\n");
+      printf("Optimize: Begin find intervals\n");
    }
 
    /* build intermediate arrays */
@@ -864,16 +864,16 @@ find_live_intervals(struct gl_program *prog,
       /* print interval info */
       for (i = 0; i < liveIntervals->Num; i++) {
          const struct interval *inv = liveIntervals->Intervals + i;
-         _mesa_printf("Reg[%d] live [%d, %d]:",
+         printf("Reg[%d] live [%d, %d]:",
                       inv->Reg, inv->Start, inv->End);
          if (1) {
             GLuint j;
             for (j = 0; j < inv->Start; j++)
-               _mesa_printf(" ");
+               printf(" ");
             for (j = inv->Start; j <= inv->End; j++)
-               _mesa_printf("x");
+               printf("x");
          }
-         _mesa_printf("\n");
+         printf("\n");
       }
    }
 
@@ -914,7 +914,7 @@ _mesa_reallocate_registers(struct gl_program *prog)
    GLint maxTemp = -1;
 
    if (dbg) {
-      _mesa_printf("Optimize: Begin live-interval register reallocation\n");
+      printf("Optimize: Begin live-interval register reallocation\n");
       _mesa_print_program(prog);
    }
 
@@ -925,7 +925,7 @@ _mesa_reallocate_registers(struct gl_program *prog)
 
    if (!find_live_intervals(prog, &liveIntervals)) {
       if (dbg)
-         _mesa_printf("Aborting register reallocation\n");
+         printf("Aborting register reallocation\n");
       return;
    }
 
@@ -938,7 +938,7 @@ _mesa_reallocate_registers(struct gl_program *prog)
          const struct interval *live = liveIntervals.Intervals + i;
 
          if (dbg)
-            _mesa_printf("Consider register %u\n", live->Reg);
+            printf("Consider register %u\n", live->Reg);
 
          /* Expire old intervals.  Intervals which have ended with respect
           * to the live interval can have their remapped registers freed.
@@ -959,7 +959,7 @@ _mesa_reallocate_registers(struct gl_program *prog)
                   ASSERT(regNew >= 0);
 
                   if (dbg)
-                     _mesa_printf("  expire interval for reg %u\n", inv->Reg);
+                     printf("  expire interval for reg %u\n", inv->Reg);
 
                   /* remove interval j from active list */
                   remove_interval(&activeIntervals, inv);
@@ -967,7 +967,7 @@ _mesa_reallocate_registers(struct gl_program *prog)
 
                   /* return register regNew to the free pool */
                   if (dbg)
-                     _mesa_printf("  free reg %d\n", regNew);
+                     printf("  free reg %d\n", regNew);
                   ASSERT(usedRegs[regNew] == GL_TRUE);
                   usedRegs[regNew] = GL_FALSE;
                }
@@ -984,7 +984,7 @@ _mesa_reallocate_registers(struct gl_program *prog)
             registerMap[live->Reg] = k;
             maxTemp = MAX2(maxTemp, k);
             if (dbg)
-               _mesa_printf("  remap register %u -> %d\n", live->Reg, k);
+               printf("  remap register %u -> %d\n", live->Reg, k);
          }
 
          /* Insert this live interval into the active list which is sorted
@@ -1005,8 +1005,8 @@ _mesa_reallocate_registers(struct gl_program *prog)
    }
 
    if (dbg) {
-      _mesa_printf("Optimize: End live-interval register reallocation\n");
-      _mesa_printf("Num temp regs before: %u  after: %u\n",
+      printf("Optimize: End live-interval register reallocation\n");
+      printf("Num temp regs before: %u  after: %u\n",
                    liveIntervals.Num, maxTemp + 1);
       _mesa_print_program(prog);
    }
diff --git a/src/mesa/shader/prog_print.c b/src/mesa/shader/prog_print.c
index b238537673..a933f21857 100644
--- a/src/mesa/shader/prog_print.c
+++ b/src/mesa/shader/prog_print.c
@@ -77,7 +77,7 @@ file_string(gl_register_file f, gl_prog_print_mode mode)
    default:
       {
          static char s[20];
-         _mesa_snprintf(s, sizeof(s), "FILE%u", f);
+         snprintf(s, sizeof(s), "FILE%u", f);
          return s;
       }
    }
@@ -172,12 +172,12 @@ arb_input_attrib_string(GLint index, GLenum progType)
 void
 _mesa_print_vp_inputs(GLbitfield inputs)
 {
-   _mesa_printf("VP Inputs 0x%x: \n", inputs);
+   printf("VP Inputs 0x%x: \n", inputs);
    while (inputs) {
       GLint attr = _mesa_ffs(inputs) - 1;
       const char *name = arb_input_attrib_string(attr,
                                                  GL_VERTEX_PROGRAM_ARB);
-      _mesa_printf("  %d: %s\n", attr, name);
+      printf("  %d: %s\n", attr, name);
       inputs &= ~(1 << attr);
    }
 }
@@ -190,12 +190,12 @@ _mesa_print_vp_inputs(GLbitfield inputs)
 void
 _mesa_print_fp_inputs(GLbitfield inputs)
 {
-   _mesa_printf("FP Inputs 0x%x: \n", inputs);
+   printf("FP Inputs 0x%x: \n", inputs);
    while (inputs) {
       GLint attr = _mesa_ffs(inputs) - 1;
       const char *name = arb_input_attrib_string(attr,
                                                  GL_FRAGMENT_PROGRAM_ARB);
-      _mesa_printf("  %d: %s\n", attr, name);
+      printf("  %d: %s\n", attr, name);
       inputs &= ~(1 << attr);
    }
 }
@@ -274,46 +274,46 @@ reg_string(gl_register_file f, GLint index, gl_prog_print_mode mode,
 
    switch (mode) {
    case PROG_PRINT_DEBUG:
-      _mesa_sprintf(str, "%s[%s%d]", file_string(f, mode), addr, index);
+      sprintf(str, "%s[%s%d]", file_string(f, mode), addr, index);
       break;
 
    case PROG_PRINT_ARB:
       switch (f) {
       case PROGRAM_INPUT:
-         _mesa_sprintf(str, "%s", arb_input_attrib_string(index, prog->Target));
+         sprintf(str, "%s", arb_input_attrib_string(index, prog->Target));
          break;
       case PROGRAM_OUTPUT:
-         _mesa_sprintf(str, "%s", arb_output_attrib_string(index, prog->Target));
+         sprintf(str, "%s", arb_output_attrib_string(index, prog->Target));
          break;
       case PROGRAM_TEMPORARY:
-         _mesa_sprintf(str, "temp%d", index);
+         sprintf(str, "temp%d", index);
          break;
       case PROGRAM_ENV_PARAM:
-         _mesa_sprintf(str, "program.env[%s%d]", addr, index);
+         sprintf(str, "program.env[%s%d]", addr, index);
          break;
       case PROGRAM_LOCAL_PARAM:
-         _mesa_sprintf(str, "program.local[%s%d]", addr, index);
+         sprintf(str, "program.local[%s%d]", addr, index);
          break;
       case PROGRAM_VARYING: /* extension */
-         _mesa_sprintf(str, "varying[%s%d]", addr, index);
+         sprintf(str, "varying[%s%d]", addr, index);
          break;
       case PROGRAM_CONSTANT: /* extension */
-         _mesa_sprintf(str, "constant[%s%d]", addr, index);
+         sprintf(str, "constant[%s%d]", addr, index);
          break;
       case PROGRAM_UNIFORM: /* extension */
-         _mesa_sprintf(str, "uniform[%s%d]", addr, index);
+         sprintf(str, "uniform[%s%d]", addr, index);
          break;
       case PROGRAM_STATE_VAR:
          {
             struct gl_program_parameter *param
                = prog->Parameters->Parameters + index;
             char *state = _mesa_program_state_string(param->StateIndexes);
-            _mesa_sprintf(str, state);
+            sprintf(str, state);
             free(state);
          }
          break;
       case PROGRAM_ADDRESS:
-         _mesa_sprintf(str, "A%d", index);
+         sprintf(str, "A%d", index);
          break;
       default:
          _mesa_problem(NULL, "bad file in reg_string()");
@@ -324,30 +324,30 @@ reg_string(gl_register_file f, GLint index, gl_prog_print_mode mode,
       switch (f) {
       case PROGRAM_INPUT:
          if (prog->Target == GL_VERTEX_PROGRAM_ARB)
-            _mesa_sprintf(str, "v[%d]", index);
+            sprintf(str, "v[%d]", index);
          else
-            _mesa_sprintf(str, "f[%d]", index);
+            sprintf(str, "f[%d]", index);
          break;
       case PROGRAM_OUTPUT:
-         _mesa_sprintf(str, "o[%d]", index);
+         sprintf(str, "o[%d]", index);
          break;
       case PROGRAM_TEMPORARY:
-         _mesa_sprintf(str, "R%d", index);
+         sprintf(str, "R%d", index);
          break;
       case PROGRAM_ENV_PARAM:
-         _mesa_sprintf(str, "c[%d]", index);
+         sprintf(str, "c[%d]", index);
          break;
       case PROGRAM_VARYING: /* extension */
-         _mesa_sprintf(str, "varying[%s%d]", addr, index);
+         sprintf(str, "varying[%s%d]", addr, index);
          break;
       case PROGRAM_UNIFORM: /* extension */
-         _mesa_sprintf(str, "uniform[%s%d]", addr, index);
+         sprintf(str, "uniform[%s%d]", addr, index);
          break;
       case PROGRAM_CONSTANT: /* extension */
-         _mesa_sprintf(str, "constant[%s%d]", addr, index);
+         sprintf(str, "constant[%s%d]", addr, index);
          break;
       case PROGRAM_STATE_VAR: /* extension */
-         _mesa_sprintf(str, "state[%s%d]", addr, index);
+         sprintf(str, "state[%s%d]", addr, index);
          break;
       default:
          _mesa_problem(NULL, "bad file in reg_string()");
@@ -419,11 +419,11 @@ void
 _mesa_print_swizzle(GLuint swizzle)
 {
    if (swizzle == SWIZZLE_XYZW) {
-      _mesa_printf(".xyzw\n");
+      printf(".xyzw\n");
    }
    else {
       const char *s = _mesa_swizzle_string(swizzle, 0, 0);
-      _mesa_printf("%s\n", s);
+      printf("%s\n", s);
    }
 }
 
@@ -476,23 +476,23 @@ fprint_dst_reg(FILE * f,
                gl_prog_print_mode mode,
                const struct gl_program *prog)
 {
-   _mesa_fprintf(f, "%s%s",
-                 reg_string((gl_register_file) dstReg->File,
-                            dstReg->Index, mode, dstReg->RelAddr, prog),
-                 _mesa_writemask_string(dstReg->WriteMask));
-
+   fprintf(f, "%s%s",
+	   reg_string((gl_register_file) dstReg->File,
+		      dstReg->Index, mode, dstReg->RelAddr, prog),
+	   _mesa_writemask_string(dstReg->WriteMask));
+   
    if (dstReg->CondMask != COND_TR) {
-      _mesa_fprintf(f, " (%s.%s)",
-                    _mesa_condcode_string(dstReg->CondMask),
-                    _mesa_swizzle_string(dstReg->CondSwizzle,
-                                         GL_FALSE, GL_FALSE));
+      fprintf(f, " (%s.%s)",
+	      _mesa_condcode_string(dstReg->CondMask),
+	      _mesa_swizzle_string(dstReg->CondSwizzle,
+				   GL_FALSE, GL_FALSE));
    }
 
 #if 0
-   _mesa_fprintf(f, "%s[%d]%s",
-                file_string((gl_register_file) dstReg->File, mode),
-                dstReg->Index,
-                _mesa_writemask_string(dstReg->WriteMask));
+   fprintf(f, "%s[%d]%s",
+	   file_string((gl_register_file) dstReg->File, mode),
+	   dstReg->Index,
+	   _mesa_writemask_string(dstReg->WriteMask));
 #endif
 }
 
@@ -505,19 +505,19 @@ fprint_src_reg(FILE *f,
 {
    const char *abs = srcReg->Abs ? "|" : "";
 
-   _mesa_fprintf(f, "%s%s%s%s",
-                 abs,
-                 reg_string((gl_register_file) srcReg->File,
-                            srcReg->Index, mode, srcReg->RelAddr, prog),
-                 _mesa_swizzle_string(srcReg->Swizzle,
-                                      srcReg->Negate, GL_FALSE),
-                 abs);
+   fprintf(f, "%s%s%s%s",
+	   abs,
+	   reg_string((gl_register_file) srcReg->File,
+		      srcReg->Index, mode, srcReg->RelAddr, prog),
+	   _mesa_swizzle_string(srcReg->Swizzle,
+				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->Negate, GL_FALSE));
+   fprintf(f, "%s[%d]%s",
+	   file_string((gl_register_file) srcReg->File, mode),
+	   srcReg->Index,
+	   _mesa_swizzle_string(srcReg->Swizzle,
+				srcReg->Negate, GL_FALSE));
 #endif
 }
 
@@ -526,9 +526,9 @@ static void
 fprint_comment(FILE *f, const struct prog_instruction *inst)
 {
    if (inst->Comment)
-      _mesa_fprintf(f, ";  # %s\n", inst->Comment);
+      fprintf(f, ";  # %s\n", inst->Comment);
    else
-      _mesa_fprintf(f, ";\n");
+      fprintf(f, ";\n");
 }
 
 
@@ -541,29 +541,29 @@ fprint_alu_instruction(FILE *f,
 {
    GLuint j;
 
-   _mesa_fprintf(f, "%s", opcode_string);
+   fprintf(f, "%s", opcode_string);
    if (inst->CondUpdate)
-      _mesa_fprintf(f, ".C");
+      fprintf(f, ".C");
 
    /* frag prog only */
    if (inst->SaturateMode == SATURATE_ZERO_ONE)
-      _mesa_fprintf(f, "_SAT");
+      fprintf(f, "_SAT");
 
-   _mesa_fprintf(f, " ");
+   fprintf(f, " ");
    if (inst->DstReg.File != PROGRAM_UNDEFINED) {
       fprint_dst_reg(f, &inst->DstReg, mode, prog);
    }
    else {
-      _mesa_fprintf(f, " ???");
+      fprintf(f, " ???");
    }
 
    if (numRegs > 0)
-      _mesa_fprintf(f, ", ");
+      fprintf(f, ", ");
 
    for (j = 0; j < numRegs; j++) {
       fprint_src_reg(f, inst->SrcReg + j, mode, prog);
       if (j + 1 < numRegs)
-	 _mesa_fprintf(f, ", ");
+	 fprintf(f, ", ");
    }
 
    fprint_comment(f, inst);
@@ -598,177 +598,177 @@ _mesa_fprint_instruction_opt(FILE *f,
       indent -= 3;
    }
    for (i = 0; i < indent; i++) {
-      _mesa_fprintf(f, " ");
+      fprintf(f, " ");
    }
 
    switch (inst->Opcode) {
    case OPCODE_PRINT:
-      _mesa_fprintf(f, "PRINT '%s'", inst->Data);
+      fprintf(f, "PRINT '%s'", inst->Data);
       if (inst->SrcReg[0].File != PROGRAM_UNDEFINED) {
-         _mesa_fprintf(f, ", ");
-         _mesa_fprintf(f, "%s[%d]%s",
-                      file_string((gl_register_file) inst->SrcReg[0].File,
-                                  mode),
-                      inst->SrcReg[0].Index,
-                      _mesa_swizzle_string(inst->SrcReg[0].Swizzle,
-                                           inst->SrcReg[0].Negate, GL_FALSE));
+         fprintf(f, ", ");
+         fprintf(f, "%s[%d]%s",
+		 file_string((gl_register_file) inst->SrcReg[0].File,
+			     mode),
+		 inst->SrcReg[0].Index,
+		 _mesa_swizzle_string(inst->SrcReg[0].Swizzle,
+				      inst->SrcReg[0].Negate, GL_FALSE));
       }
       if (inst->Comment)
-         _mesa_fprintf(f, "  # %s", inst->Comment);
+         fprintf(f, "  # %s", inst->Comment);
       fprint_comment(f, inst);
       break;
    case OPCODE_SWZ:
-      _mesa_fprintf(f, "SWZ");
+      fprintf(f, "SWZ");
       if (inst->SaturateMode == SATURATE_ZERO_ONE)
-         _mesa_fprintf(f, "_SAT");
-      _mesa_fprintf(f, " ");
+         fprintf(f, "_SAT");
+      fprintf(f, " ");
       fprint_dst_reg(f, &inst->DstReg, mode, prog);
-      _mesa_fprintf(f, ", %s[%d], %s",
-                   file_string((gl_register_file) inst->SrcReg[0].File,
-                               mode),
-                   inst->SrcReg[0].Index,
-                   _mesa_swizzle_string(inst->SrcReg[0].Swizzle,
-                                        inst->SrcReg[0].Negate, GL_TRUE));
+      fprintf(f, ", %s[%d], %s",
+	      file_string((gl_register_file) inst->SrcReg[0].File,
+			  mode),
+	      inst->SrcReg[0].Index,
+	      _mesa_swizzle_string(inst->SrcReg[0].Swizzle,
+				   inst->SrcReg[0].Negate, GL_TRUE));
       fprint_comment(f, inst);
       break;
    case OPCODE_TEX:
    case OPCODE_TXP:
    case OPCODE_TXL:
    case OPCODE_TXB:
-      _mesa_fprintf(f, "%s", _mesa_opcode_string(inst->Opcode));
+      fprintf(f, "%s", _mesa_opcode_string(inst->Opcode));
       if (inst->SaturateMode == SATURATE_ZERO_ONE)
-         _mesa_fprintf(f, "_SAT");
-      _mesa_fprintf(f, " ");
+         fprintf(f, "_SAT");
+      fprintf(f, " ");
       fprint_dst_reg(f, &inst->DstReg, mode, prog);
-      _mesa_fprintf(f, ", ");
+      fprintf(f, ", ");
       fprint_src_reg(f, &inst->SrcReg[0], mode, prog);
-      _mesa_fprintf(f, ", texture[%d], ", inst->TexSrcUnit);
+      fprintf(f, ", texture[%d], ", inst->TexSrcUnit);
       switch (inst->TexSrcTarget) {
-      case TEXTURE_1D_INDEX:   _mesa_fprintf(f, "1D");    break;
-      case TEXTURE_2D_INDEX:   _mesa_fprintf(f, "2D");    break;
-      case TEXTURE_3D_INDEX:   _mesa_fprintf(f, "3D");    break;
-      case TEXTURE_CUBE_INDEX: _mesa_fprintf(f, "CUBE");  break;
-      case TEXTURE_RECT_INDEX: _mesa_fprintf(f, "RECT");  break;
+      case TEXTURE_1D_INDEX:   fprintf(f, "1D");    break;
+      case TEXTURE_2D_INDEX:   fprintf(f, "2D");    break;
+      case TEXTURE_3D_INDEX:   fprintf(f, "3D");    break;
+      case TEXTURE_CUBE_INDEX: fprintf(f, "CUBE");  break;
+      case TEXTURE_RECT_INDEX: fprintf(f, "RECT");  break;
       default:
          ;
       }
       if (inst->TexShadow)
-         _mesa_fprintf(f, " SHADOW");
+         fprintf(f, " SHADOW");
       fprint_comment(f, inst);
       break;
 
    case OPCODE_KIL:
-      _mesa_fprintf(f, "%s", _mesa_opcode_string(inst->Opcode));
-      _mesa_fprintf(f, " ");
+      fprintf(f, "%s", _mesa_opcode_string(inst->Opcode));
+      fprintf(f, " ");
       fprint_src_reg(f, &inst->SrcReg[0], mode, prog);
       fprint_comment(f, inst);
       break;
    case OPCODE_KIL_NV:
-      _mesa_fprintf(f, "%s", _mesa_opcode_string(inst->Opcode));
-      _mesa_fprintf(f, " ");
-      _mesa_fprintf(f, "%s.%s",
-                   _mesa_condcode_string(inst->DstReg.CondMask),
-                   _mesa_swizzle_string(inst->DstReg.CondSwizzle,
-                                        GL_FALSE, GL_FALSE));
+      fprintf(f, "%s", _mesa_opcode_string(inst->Opcode));
+      fprintf(f, " ");
+      fprintf(f, "%s.%s",
+	      _mesa_condcode_string(inst->DstReg.CondMask),
+	      _mesa_swizzle_string(inst->DstReg.CondSwizzle,
+				   GL_FALSE, GL_FALSE));
       fprint_comment(f, inst);
       break;
 
    case OPCODE_ARL:
-      _mesa_fprintf(f, "ARL ");
+      fprintf(f, "ARL ");
       fprint_dst_reg(f, &inst->DstReg, mode, prog);
-      _mesa_fprintf(f, ", ");
+      fprintf(f, ", ");
       fprint_src_reg(f, &inst->SrcReg[0], mode, prog);
       fprint_comment(f, inst);
       break;
    case OPCODE_BRA:
-      _mesa_fprintf(f, "BRA %d (%s%s)",
-                   inst->BranchTarget,
-                   _mesa_condcode_string(inst->DstReg.CondMask),
-                   _mesa_swizzle_string(inst->DstReg.CondSwizzle, 0, GL_FALSE));
+      fprintf(f, "BRA %d (%s%s)",
+	      inst->BranchTarget,
+	      _mesa_condcode_string(inst->DstReg.CondMask),
+	      _mesa_swizzle_string(inst->DstReg.CondSwizzle, 0, GL_FALSE));
       fprint_comment(f, inst);
       break;
    case OPCODE_IF:
       if (inst->SrcReg[0].File != PROGRAM_UNDEFINED) {
          /* Use ordinary register */
-         _mesa_fprintf(f, "IF ");
+         fprintf(f, "IF ");
          fprint_src_reg(f, &inst->SrcReg[0], mode, prog);
-         _mesa_fprintf(f, "; ");
+         fprintf(f, "; ");
       }
       else {
          /* Use cond codes */
-         _mesa_fprintf(f, "IF (%s%s);",
-                      _mesa_condcode_string(inst->DstReg.CondMask),
-                      _mesa_swizzle_string(inst->DstReg.CondSwizzle,
-                                           0, GL_FALSE));
+         fprintf(f, "IF (%s%s);",
+		 _mesa_condcode_string(inst->DstReg.CondMask),
+		 _mesa_swizzle_string(inst->DstReg.CondSwizzle,
+				      0, GL_FALSE));
       }
-      _mesa_fprintf(f, " # (if false, goto %d)", inst->BranchTarget);
+      fprintf(f, " # (if false, goto %d)", inst->BranchTarget);
       fprint_comment(f, inst);
       return indent + 3;
    case OPCODE_ELSE:
-      _mesa_fprintf(f, "ELSE; # (goto %d)\n", inst->BranchTarget);
+      fprintf(f, "ELSE; # (goto %d)\n", inst->BranchTarget);
       return indent + 3;
    case OPCODE_ENDIF:
-      _mesa_fprintf(f, "ENDIF;\n");
+      fprintf(f, "ENDIF;\n");
       break;
    case OPCODE_BGNLOOP:
-      _mesa_fprintf(f, "BGNLOOP; # (end at %d)\n", inst->BranchTarget);
+      fprintf(f, "BGNLOOP; # (end at %d)\n", inst->BranchTarget);
       return indent + 3;
    case OPCODE_ENDLOOP:
-      _mesa_fprintf(f, "ENDLOOP; # (goto %d)\n", inst->BranchTarget);
+      fprintf(f, "ENDLOOP; # (goto %d)\n", inst->BranchTarget);
       break;
    case OPCODE_BRK:
    case OPCODE_CONT:
-      _mesa_fprintf(f, "%s (%s%s); # (goto %d)",
-                   _mesa_opcode_string(inst->Opcode),
-                   _mesa_condcode_string(inst->DstReg.CondMask),
-                   _mesa_swizzle_string(inst->DstReg.CondSwizzle, 0, GL_FALSE),
-                   inst->BranchTarget);
+      fprintf(f, "%s (%s%s); # (goto %d)",
+	      _mesa_opcode_string(inst->Opcode),
+	      _mesa_condcode_string(inst->DstReg.CondMask),
+	      _mesa_swizzle_string(inst->DstReg.CondSwizzle, 0, GL_FALSE),
+	      inst->BranchTarget);
       fprint_comment(f, inst);
       break;
 
    case OPCODE_BGNSUB:
       if (mode == PROG_PRINT_NV) {
-         _mesa_fprintf(f, "%s:\n", inst->Comment); /* comment is label */
+         fprintf(f, "%s:\n", inst->Comment); /* comment is label */
          return indent;
       }
       else {
-         _mesa_fprintf(f, "BGNSUB");
+         fprintf(f, "BGNSUB");
          fprint_comment(f, inst);
          return indent + 3;
       }
    case OPCODE_ENDSUB:
       if (mode == PROG_PRINT_DEBUG) {
-         _mesa_fprintf(f, "ENDSUB");
+         fprintf(f, "ENDSUB");
          fprint_comment(f, inst);
       }
       break;
    case OPCODE_CAL:
       if (mode == PROG_PRINT_NV) {
-         _mesa_fprintf(f, "CAL %s;  # (goto %d)\n", inst->Comment, inst->BranchTarget);
+         fprintf(f, "CAL %s;  # (goto %d)\n", inst->Comment, inst->BranchTarget);
       }
       else {
-         _mesa_fprintf(f, "CAL %u", inst->BranchTarget);
+         fprintf(f, "CAL %u", inst->BranchTarget);
          fprint_comment(f, inst);
       }
       break;
    case OPCODE_RET:
-      _mesa_fprintf(f, "RET (%s%s)",
-                   _mesa_condcode_string(inst->DstReg.CondMask),
-                   _mesa_swizzle_string(inst->DstReg.CondSwizzle, 0, GL_FALSE));
+      fprintf(f, "RET (%s%s)",
+	      _mesa_condcode_string(inst->DstReg.CondMask),
+	      _mesa_swizzle_string(inst->DstReg.CondSwizzle, 0, GL_FALSE));
       fprint_comment(f, inst);
       break;
 
    case OPCODE_END:
-      _mesa_fprintf(f, "END\n");
+      fprintf(f, "END\n");
       break;
    case OPCODE_NOP:
       if (mode == PROG_PRINT_DEBUG) {
-         _mesa_fprintf(f, "NOP");
+         fprintf(f, "NOP");
          fprint_comment(f, inst);
       }
       else if (inst->Comment) {
          /* ARB/NV extensions don't have NOP instruction */
-         _mesa_fprintf(f, "# %s\n", inst->Comment);
+         fprintf(f, "# %s\n", inst->Comment);
       }
       break;
    /* XXX may need other special-case instructions */
@@ -825,26 +825,26 @@ _mesa_fprint_program_opt(FILE *f,
    switch (prog->Target) {
    case GL_VERTEX_PROGRAM_ARB:
       if (mode == PROG_PRINT_ARB)
-         _mesa_fprintf(f, "!!ARBvp1.0\n");
+         fprintf(f, "!!ARBvp1.0\n");
       else if (mode == PROG_PRINT_NV)
-         _mesa_fprintf(f, "!!VP1.0\n");
+         fprintf(f, "!!VP1.0\n");
       else
-         _mesa_fprintf(f, "# Vertex Program/Shader %u\n", prog->Id);
+         fprintf(f, "# Vertex Program/Shader %u\n", prog->Id);
       break;
    case GL_FRAGMENT_PROGRAM_ARB:
    case GL_FRAGMENT_PROGRAM_NV:
       if (mode == PROG_PRINT_ARB)
-         _mesa_fprintf(f, "!!ARBfp1.0\n");
+         fprintf(f, "!!ARBfp1.0\n");
       else if (mode == PROG_PRINT_NV)
-         _mesa_fprintf(f, "!!FP1.0\n");
+         fprintf(f, "!!FP1.0\n");
       else
-         _mesa_fprintf(f, "# Fragment Program/Shader %u\n", prog->Id);
+         fprintf(f, "# Fragment Program/Shader %u\n", prog->Id);
       break;
    }
 
    for (i = 0; i < prog->NumInstructions; i++) {
       if (lineNumbers)
-         _mesa_fprintf(f, "%3d: ", i);
+         fprintf(f, "%3d: ", i);
       indent = _mesa_fprint_instruction_opt(f, prog->Instructions + i,
                                            indent, mode, prog);
    }
@@ -896,30 +896,30 @@ _mesa_fprint_program_parameters(FILE *f,
 {
    GLuint i;
 
-   _mesa_fprintf(f, "InputsRead: 0x%x (0b%s)\n",
+   fprintf(f, "InputsRead: 0x%x (0b%s)\n",
                  prog->InputsRead, binary(prog->InputsRead));
-   _mesa_fprintf(f, "OutputsWritten: 0x%llx (0b%s)\n",
+   fprintf(f, "OutputsWritten: 0x%llx (0b%s)\n",
                  prog->OutputsWritten, binary(prog->OutputsWritten));
-   _mesa_fprintf(f, "NumInstructions=%d\n", prog->NumInstructions);
-   _mesa_fprintf(f, "NumTemporaries=%d\n", prog->NumTemporaries);
-   _mesa_fprintf(f, "NumParameters=%d\n", prog->NumParameters);
-   _mesa_fprintf(f, "NumAttributes=%d\n", prog->NumAttributes);
-   _mesa_fprintf(f, "NumAddressRegs=%d\n", prog->NumAddressRegs);
-   _mesa_fprintf(f, "SamplersUsed: 0x%x (0b%s)\n",
+   fprintf(f, "NumInstructions=%d\n", prog->NumInstructions);
+   fprintf(f, "NumTemporaries=%d\n", prog->NumTemporaries);
+   fprintf(f, "NumParameters=%d\n", prog->NumParameters);
+   fprintf(f, "NumAttributes=%d\n", prog->NumAttributes);
+   fprintf(f, "NumAddressRegs=%d\n", prog->NumAddressRegs);
+   fprintf(f, "SamplersUsed: 0x%x (0b%s)\n",
                  prog->SamplersUsed, binary(prog->SamplersUsed));
-   _mesa_fprintf(f, "Samplers=[ ");
+   fprintf(f, "Samplers=[ ");
    for (i = 0; i < MAX_SAMPLERS; i++) {
-      _mesa_fprintf(f, "%d ", prog->SamplerUnits[i]);
+      fprintf(f, "%d ", prog->SamplerUnits[i]);
    }
-   _mesa_fprintf(f, "]\n");
+   fprintf(f, "]\n");
 
    _mesa_load_state_parameters(ctx, prog->Parameters);
 
 #if 0
-   _mesa_fprintf(f, "Local Params:\n");
+   fprintf(f, "Local Params:\n");
    for (i = 0; i < MAX_PROGRAM_LOCAL_PARAMS; i++){
       const GLfloat *p = prog->LocalParams[i];
-      _mesa_fprintf(f, "%2d: %f, %f, %f, %f\n", i, p[0], p[1], p[2], p[3]);
+      fprintf(f, "%2d: %f, %f, %f, %f\n", i, p[0], p[1], p[2], p[3]);
    }
 #endif	
    _mesa_print_parameter_list(prog->Parameters);
@@ -950,24 +950,24 @@ _mesa_fprint_parameter_list(FILE *f,
       return;
 
    if (0)
-      _mesa_fprintf(f, "param list %p\n", (void *) list);
-   _mesa_fprintf(f, "dirty state flags: 0x%x\n", list->StateFlags);
+      fprintf(f, "param list %p\n", (void *) list);
+   fprintf(f, "dirty state flags: 0x%x\n", list->StateFlags);
    for (i = 0; i < list->NumParameters; i++){
       struct gl_program_parameter *param = list->Parameters + i;
       const GLfloat *v = list->ParameterValues[i];
-      _mesa_fprintf(f, "param[%d] sz=%d %s %s = {%.3g, %.3g, %.3g, %.3g}",
-                   i, param->Size,
-                   file_string(list->Parameters[i].Type, mode),
-                   param->Name, v[0], v[1], v[2], v[3]);
+      fprintf(f, "param[%d] sz=%d %s %s = {%.3g, %.3g, %.3g, %.3g}",
+	      i, param->Size,
+	      file_string(list->Parameters[i].Type, mode),
+	      param->Name, v[0], v[1], v[2], v[3]);
       if (param->Flags & PROG_PARAM_BIT_CENTROID)
-         _mesa_fprintf(f, " Centroid");
+         fprintf(f, " Centroid");
       if (param->Flags & PROG_PARAM_BIT_INVARIANT)
-         _mesa_fprintf(f, " Invariant");
+         fprintf(f, " Invariant");
       if (param->Flags & PROG_PARAM_BIT_FLAT)
-         _mesa_fprintf(f, " Flat");
+         fprintf(f, " Flat");
       if (param->Flags & PROG_PARAM_BIT_LINEAR)
-         _mesa_fprintf(f, " Linear");
-      _mesa_fprintf(f, "\n");
+         fprintf(f, " Linear");
+      fprintf(f, "\n");
    }
 }
 
@@ -997,7 +997,7 @@ _mesa_write_shader_to_file(const struct gl_shader *shader)
    else
       type = "vert";
 
-   _mesa_snprintf(filename, sizeof(filename), "shader_%u.%s", shader->Name, type);
+   snprintf(filename, sizeof(filename), "shader_%u.%s", shader->Name, type);
    f = fopen(filename, "w");
    if (!f) {
       fprintf(stderr, "Unable to open %s for writing\n", filename);
@@ -1047,7 +1047,7 @@ _mesa_append_uniforms_to_file(const struct gl_shader *shader,
    else
       type = "vert";
 
-   _mesa_snprintf(filename, sizeof(filename), "shader_%u.%s", shader->Name, type);
+   snprintf(filename, sizeof(filename), "shader_%u.%s", shader->Name, type);
    f = fopen(filename, "a"); /* append */
    if (!f) {
       fprintf(stderr, "Unable to open %s for appending\n", filename);
diff --git a/src/mesa/shader/prog_statevars.c b/src/mesa/shader/prog_statevars.c
index 2c844490dd..ead3ece95d 100644
--- a/src/mesa/shader/prog_statevars.c
+++ b/src/mesa/shader/prog_statevars.c
@@ -950,7 +950,7 @@ static void
 append_index(char *dst, GLint index)
 {
    char s[20];
-   _mesa_sprintf(s, "[%d]", index);
+   sprintf(s, "[%d]", index);
    append(dst, s);
 }
 
@@ -1029,9 +1029,9 @@ _mesa_program_state_string(const gl_state_index state[STATE_LENGTH])
          if (modifier)
             append_token(str, modifier);
          if (firstRow == lastRow)
-            _mesa_sprintf(tmp, ".row[%d]", firstRow);
+            sprintf(tmp, ".row[%d]", firstRow);
          else
-            _mesa_sprintf(tmp, ".row[%d..%d]", firstRow, lastRow);
+            sprintf(tmp, ".row[%d..%d]", firstRow, lastRow);
          append(str, tmp);
       }
       break;
diff --git a/src/mesa/shader/program_parse.tab.c b/src/mesa/shader/program_parse.tab.c
index e5ef25ec38..3f26f9f84a 100644
--- a/src/mesa/shader/program_parse.tab.c
+++ b/src/mesa/shader/program_parse.tab.c
@@ -2984,7 +2984,7 @@ yyreduce:
     {
 	   if (((yyvsp[(1) - (1)].integer) < 0) || ((yyvsp[(1) - (1)].integer) > 63)) {
               char s[100];
-              _mesa_snprintf(s, sizeof(s),
+              snprintf(s, sizeof(s),
                              "relative address offset too large (%d)", (yyvsp[(1) - (1)].integer));
 	      yyerror(& (yylsp[(1) - (1)]), state, s);
 	      YYERROR;
@@ -3001,7 +3001,7 @@ yyreduce:
     {
 	   if (((yyvsp[(1) - (1)].integer) < 0) || ((yyvsp[(1) - (1)].integer) > 64)) {
               char s[100];
-              _mesa_snprintf(s, sizeof(s),
+              snprintf(s, sizeof(s),
                              "relative address offset too large (%d)", (yyvsp[(1) - (1)].integer));
 	      yyerror(& (yylsp[(1) - (1)]), state, s);
 	      YYERROR;
@@ -4915,7 +4915,7 @@ yyreduce:
 
 	   if (exist != NULL) {
 	      char m[1000];
-	      _mesa_snprintf(m, sizeof(m), "redeclared identifier: %s", (yyvsp[(2) - (4)].string));
+	      snprintf(m, sizeof(m), "redeclared identifier: %s", (yyvsp[(2) - (4)].string));
 	      free((yyvsp[(2) - (4)].string));
 	      yyerror(& (yylsp[(2) - (4)]), state, m);
 	      YYERROR;
diff --git a/src/mesa/shader/program_parse.y b/src/mesa/shader/program_parse.y
index 299e2477e4..1c856d859d 100644
--- a/src/mesa/shader/program_parse.y
+++ b/src/mesa/shader/program_parse.y
@@ -936,7 +936,7 @@ addrRegPosOffset: INTEGER
 	{
 	   if (($1 < 0) || ($1 > 63)) {
               char s[100];
-              _mesa_snprintf(s, sizeof(s),
+              snprintf(s, sizeof(s),
                              "relative address offset too large (%d)", $1);
 	      yyerror(& @1, state, s);
 	      YYERROR;
@@ -950,7 +950,7 @@ addrRegNegOffset: INTEGER
 	{
 	   if (($1 < 0) || ($1 > 64)) {
               char s[100];
-              _mesa_snprintf(s, sizeof(s),
+              snprintf(s, sizeof(s),
                              "relative address offset too large (%d)", $1);
 	      yyerror(& @1, state, s);
 	      YYERROR;
@@ -2173,7 +2173,7 @@ ALIAS_statement: ALIAS IDENTIFIER '=' USED_IDENTIFIER
 
 	   if (exist != NULL) {
 	      char m[1000];
-	      _mesa_snprintf(m, sizeof(m), "redeclared identifier: %s", $2);
+	      snprintf(m, sizeof(m), "redeclared identifier: %s", $2);
 	      free($2);
 	      yyerror(& @2, state, m);
 	      YYERROR;
diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index ad3ff26c58..8bd780b0b0 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -1483,12 +1483,12 @@ _mesa_link_program(GLcontext *ctx, GLuint program)
    if (0) {
       GLuint i;
 
-      _mesa_printf("Link %u shaders in program %u: %s\n",
+      printf("Link %u shaders in program %u: %s\n",
                    shProg->NumShaders, shProg->Name,
                    shProg->LinkStatus ? "Success" : "Failed");
 
       for (i = 0; i < shProg->NumShaders; i++) {
-         _mesa_printf(" shader %u, type 0x%x\n",
+         printf(" shader %u, type 0x%x\n",
                       shProg->Shaders[i]->Name,
                       shProg->Shaders[i]->Type);
       }
@@ -1504,7 +1504,7 @@ print_shader_info(const struct gl_shader_program *shProg)
 {
    GLuint i;
 
-   _mesa_printf("Mesa: glUseProgram(%u)\n", shProg->Name);
+   printf("Mesa: glUseProgram(%u)\n", shProg->Name);
    for (i = 0; i < shProg->NumShaders; i++) {
       const char *s;
       switch (shProg->Shaders[i]->Type) {
@@ -1520,14 +1520,14 @@ print_shader_info(const struct gl_shader_program *shProg)
       default:
          s = "";
       }
-      _mesa_printf("  %s shader %u, checksum %u\n", s, 
-                   shProg->Shaders[i]->Name,
-                   shProg->Shaders[i]->SourceChecksum);
+      printf("  %s shader %u, checksum %u\n", s, 
+	     shProg->Shaders[i]->Name,
+	     shProg->Shaders[i]->SourceChecksum);
    }
    if (shProg->VertexProgram)
-      _mesa_printf("  vert prog %u\n", shProg->VertexProgram->Base.Id);
+      printf("  vert prog %u\n", shProg->VertexProgram->Base.Id);
    if (shProg->FragmentProgram)
-      _mesa_printf("  frag prog %u\n", shProg->FragmentProgram->Base.Id);
+      printf("  frag prog %u\n", shProg->FragmentProgram->Base.Id);
 }
 
 
@@ -1697,8 +1697,8 @@ set_program_uniform(GLcontext *ctx, struct gl_program *program,
          /* This maps a sampler to a texture unit: */
          if (sampler < MAX_SAMPLERS) {
 #if 0
-            _mesa_printf("Set program %p sampler %d '%s' to unit %u\n",
-                         program, sampler, param->Name, texUnit);
+            printf("Set program %p sampler %d '%s' to unit %u\n",
+		   program, sampler, param->Name, texUnit);
 #endif
             if (program->SamplerUnits[sampler] != texUnit) {
                program->SamplerUnits[sampler] = texUnit;
@@ -1861,21 +1861,21 @@ _mesa_uniform(GLcontext *ctx, GLint location, GLsizei count,
 
    if (ctx->Shader.Flags & GLSL_UNIFORMS) {
       GLint i;
-      _mesa_printf("Mesa: set program %u uniform %s (loc %d) to: ",
-                   shProg->Name, uniform->Name, location);
+      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]);
+            printf("%d ", v[i]);
          }
       }
       else {
          const GLfloat *v = (const GLfloat *) values;
          for (i = 0; i < count * elems; i++) {
-            _mesa_printf("%g ", v[i]);
+            printf("%g ", v[i]);
          }
       }
-      _mesa_printf("\n");
+      printf("\n");
    }
 
    /* A uniform var may be used by both a vertex shader and a fragment
@@ -2076,9 +2076,9 @@ validate_samplers(GLcontext *ctx, const struct gl_program *prog, char *errMsg)
       unit = prog->SamplerUnits[sampler];
       target = prog->SamplerTargets[sampler];
       if (targetUsed[unit] != -1 && targetUsed[unit] != target) {
-         _mesa_snprintf(errMsg, 100,
-                       "Texture unit %d is accessed both as %s and %s",
-                       unit, targetName[targetUsed[unit]], targetName[target]);
+         snprintf(errMsg, 100,
+		  "Texture unit %d is accessed both as %s and %s",
+		  unit, targetName[targetUsed[unit]], targetName[target]);
          return GL_FALSE;
       }
       targetUsed[unit] = target;
diff --git a/src/mesa/shader/slang/slang_codegen.c b/src/mesa/shader/slang/slang_codegen.c
index 6901b93d5d..b17256bb1e 100644
--- a/src/mesa/shader/slang/slang_codegen.c
+++ b/src/mesa/shader/slang/slang_codegen.c
@@ -1643,7 +1643,7 @@ _slang_gen_function_call(slang_assemble_ctx *A, slang_function *fun,
 
    if (A->pragmas->Debug) {
       char s[1000];
-      _mesa_snprintf(s, sizeof(s), "Call/inline %s()", (char *) fun->header.a_name);
+      snprintf(s, sizeof(s), "Call/inline %s()", (char *) fun->header.a_name);
       n->Comment = _slang_strdup(s);
    }
 
@@ -2190,7 +2190,7 @@ _slang_make_array_constructor(slang_assemble_ctx *A, slang_operation *oper)
          */
          slang_variable *p = slang_variable_scope_grow(fun->parameters);
          char name[10];
-         _mesa_snprintf(name, sizeof(name), "p%d", i);
+         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 8bd699ff9d..52fe786890 100644
--- a/src/mesa/shader/slang/slang_emit.c
+++ b/src/mesa/shader/slang/slang_emit.c
@@ -2303,8 +2303,8 @@ emit_var_ref(slang_emit_info *emitInfo, slang_ir_node *n)
          /* 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);
+         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_label.c b/src/mesa/shader/slang/slang_label.c
index 7e00b5787f..225612a936 100644
--- a/src/mesa/shader/slang/slang_label.c
+++ b/src/mesa/shader/slang/slang_label.c
@@ -37,7 +37,7 @@ _slang_label_new_unique(const char *name)
          free(l);
          return NULL;
       }
-      _mesa_sprintf(l->Name, "%s_%d", name, id);
+      sprintf(l->Name, "%s_%d", name, id);
       id++;
       l->Location = -1;
    }
diff --git a/src/mesa/shader/slang/slang_link.c b/src/mesa/shader/slang/slang_link.c
index 89658c1a39..b59fc0a43a 100644
--- a/src/mesa/shader/slang/slang_link.c
+++ b/src/mesa/shader/slang/slang_link.c
@@ -139,16 +139,16 @@ link_varying_vars(GLcontext *ctx,
          }
          if (!bits_agree(var->Flags, v->Flags, PROG_PARAM_BIT_CENTROID)) {
             char msg[100];
-            _mesa_snprintf(msg, sizeof(msg),
-                           "centroid modifier mismatch for '%s'", var->Name);
+            snprintf(msg, sizeof(msg),
+		     "centroid modifier mismatch for '%s'", var->Name);
             link_error(shProg, msg);
             free(map);
             return GL_FALSE;
          }
          if (!bits_agree(var->Flags, v->Flags, PROG_PARAM_BIT_INVARIANT)) {
             char msg[100];
-            _mesa_snprintf(msg, sizeof(msg),
-                           "invariant modifier mismatch for '%s'", var->Name);
+            snprintf(msg, sizeof(msg),
+		     "invariant modifier mismatch for '%s'", var->Name);
             link_error(shProg, msg);
             free(map);
             return GL_FALSE;
@@ -269,8 +269,8 @@ link_uniform_vars(GLcontext *ctx,
          GLuint newSampNum = *numSamplers;
          if (newSampNum >= ctx->Const.MaxTextureImageUnits) {
             char s[100];
-            _mesa_sprintf(s, "Too many texture samplers (%u, max is %u)",
-                          newSampNum, ctx->Const.MaxTextureImageUnits);
+            sprintf(s, "Too many texture samplers (%u, max is %u)",
+		    newSampNum, ctx->Const.MaxTextureImageUnits);
             link_error(shProg, s);
             return GL_FALSE;
          }
@@ -631,7 +631,7 @@ concat_shaders(struct gl_shader_program *shProg, GLenum shaderType)
    }
    source[len] = '\0';
    /*
-   _mesa_printf("---NEW CONCATENATED SHADER---:\n%s\n------------\n", source);
+   printf("---NEW CONCATENATED SHADER---:\n%s\n------------\n", source);
    */
 
    free(shaderLengths);
@@ -875,11 +875,11 @@ _slang_link(GLcontext *ctx,
       vertNotify = ctx->Driver.ProgramStringNotify(ctx, GL_FRAGMENT_PROGRAM_ARB,
                                                  &shProg->FragmentProgram->Base);
       if (ctx->Shader.Flags & GLSL_DUMP) {
-         _mesa_printf("Mesa pre-link fragment program:\n");
+         printf("Mesa pre-link 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);
       }
@@ -893,11 +893,11 @@ _slang_link(GLcontext *ctx,
       fragNotify = ctx->Driver.ProgramStringNotify(ctx, GL_VERTEX_PROGRAM_ARB,
                                                    &shProg->VertexProgram->Base);
       if (ctx->Shader.Flags & GLSL_DUMP) {
-         _mesa_printf("Mesa pre-link vertex program:\n");
+         printf("Mesa pre-link 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);
       }
@@ -912,10 +912,10 @@ _slang_link(GLcontext *ctx,
    }
 
    if (ctx->Shader.Flags & GLSL_DUMP) {
-      _mesa_printf("Varying vars:\n");
+      printf("Varying vars:\n");
       _mesa_print_parameter_list(shProg->Varying);
       if (shProg->InfoLog) {
-         _mesa_printf("Info Log: %s\n", shProg->InfoLog);
+         printf("Info Log: %s\n", shProg->InfoLog);
       }
    }
 
diff --git a/src/mesa/shader/slang/slang_log.c b/src/mesa/shader/slang/slang_log.c
index 23917fbd2c..9ff21417bc 100644
--- a/src/mesa/shader/slang/slang_log.c
+++ b/src/mesa/shader/slang/slang_log.c
@@ -86,7 +86,7 @@ slang_info_log_print(slang_info_log * log, const char *msg, ...)
    char buf[1024];
 
    va_start(va, msg);
-   _mesa_vsprintf(buf, msg, va);
+   vsprintf(buf, msg, va);
    va_end(va);
    return slang_info_log_message(log, NULL, buf);
 }
@@ -98,7 +98,7 @@ slang_info_log_error(slang_info_log * log, const char *msg, ...)
    char buf[1024];
 
    va_start(va, msg);
-   _mesa_vsprintf(buf, msg, va);
+   vsprintf(buf, msg, va);
    va_end(va);
    log->error_flag = GL_TRUE;
    if (slang_info_log_message(log, "Error", buf))
@@ -114,7 +114,7 @@ slang_info_log_warning(slang_info_log * log, const char *msg, ...)
    char buf[1024];
 
    va_start(va, msg);
-   _mesa_vsprintf(buf, msg, va);
+   vsprintf(buf, msg, va);
    va_end(va);
    if (slang_info_log_message(log, "Warning", buf))
       return 1;
diff --git a/src/mesa/shader/slang/slang_utility.c b/src/mesa/shader/slang/slang_utility.c
index dc1e196bde..e77404f692 100644
--- a/src/mesa/shader/slang/slang_utility.c
+++ b/src/mesa/shader/slang/slang_utility.c
@@ -120,7 +120,7 @@ slang_string_pushi (slang_string *self, GLint i)
 {
    char buffer[12];
 
-   _mesa_sprintf (buffer, "%d", i);
+   sprintf (buffer, "%d", i);
    slang_string_pushs (self, buffer, strlen (buffer));
 }
 
diff --git a/src/mesa/state_tracker/st_atom.c b/src/mesa/state_tracker/st_atom.c
index 6a7ebff6ca..7806df4a53 100644
--- a/src/mesa/state_tracker/st_atom.c
+++ b/src/mesa/state_tracker/st_atom.c
@@ -143,7 +143,7 @@ void st_validate_state( struct st_context *st )
    if (state->st == 0)
       return;
 
-   /*_mesa_printf("%s %x/%x\n", __FUNCTION__, state->mesa, state->st);*/
+   /*printf("%s %x/%x\n", __FUNCTION__, state->mesa, state->st);*/
 
    if (1) {
       /* Debug version which enforces various sanity checks on the
@@ -158,17 +158,17 @@ void st_validate_state( struct st_context *st )
 	 const struct st_tracked_state *atom = atoms[i];
 	 struct st_state_flags generated;
 	 
-	 /*_mesa_printf("atom %s %x/%x\n", atom->name, atom->dirty.mesa, atom->dirty.st);*/
+	 /*printf("atom %s %x/%x\n", atom->name, atom->dirty.mesa, atom->dirty.st);*/
 
 	 if (!(atom->dirty.mesa || atom->dirty.st) ||
 	     !atom->update) {
-	    _mesa_printf("malformed atom %s\n", atom->name);
+	    printf("malformed atom %s\n", atom->name);
 	    assert(0);
 	 }
 
 	 if (check_state(state, &atom->dirty)) {
 	    atoms[i]->update( st );
-	    /*_mesa_printf("after: %x\n", atom->dirty.mesa);*/
+	    /*printf("after: %x\n", atom->dirty.mesa);*/
 	 }
 
 	 accumulate_state(&examined, &atom->dirty);
@@ -181,7 +181,7 @@ void st_validate_state( struct st_context *st )
 	 assert(!check_state(&examined, &generated));
 	 prev = *state;
       }
-      /*_mesa_printf("\n");*/
+      /*printf("\n");*/
 
    }
    else {
diff --git a/src/mesa/swrast/s_lines.c b/src/mesa/swrast/s_lines.c
index 5411229d70..cff36042cb 100644
--- a/src/mesa/swrast/s_lines.c
+++ b/src/mesa/swrast/s_lines.c
@@ -233,7 +233,7 @@ static const char *lineFuncName = NULL;
 #define USE(lineFunc)                   \
 do {                                    \
     lineFuncName = #lineFunc;           \
-    /*_mesa_printf("%s\n", lineFuncName);*/   \
+    /*printf("%s\n", lineFuncName);*/   \
     swrast->Line = lineFunc;            \
 } while (0)
 
diff --git a/src/mesa/tnl/t_draw.c b/src/mesa/tnl/t_draw.c
index 8a2787a139..fdde294257 100644
--- a/src/mesa/tnl/t_draw.c
+++ b/src/mesa/tnl/t_draw.c
@@ -413,12 +413,12 @@ void _tnl_draw_prims( GLcontext *ctx,
 
    if (0)
    {
-      _mesa_printf("%s %d..%d\n", __FUNCTION__, min_index, max_index);
+      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, 
-		      _mesa_lookup_enum_by_nr(prim[i].mode),
-		      prim[i].start,
-		      prim[i].count);
+	 printf("prim %d: %s start %d count %d\n", i, 
+		_mesa_lookup_enum_by_nr(prim[i].mode),
+		prim[i].start,
+		prim[i].count);
    }
 
    if (min_index) {
diff --git a/src/mesa/tnl/t_vb_cliptmp.h b/src/mesa/tnl/t_vb_cliptmp.h
index 618b8b3130..8cc36e666d 100644
--- a/src/mesa/tnl/t_vb_cliptmp.h
+++ b/src/mesa/tnl/t_vb_cliptmp.h
@@ -202,12 +202,12 @@ TAG(clip_tri)( GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLubyte mask )
    if (0) {
       /* print pre-clip vertex coords */
       GLuint i, j;
-      _mesa_printf("pre clip:\n");
+      printf("pre clip:\n");
       for (i = 0; i < n; i++) {
          j = inlist[i];
-         _mesa_printf("  %u: %u: %f, %f, %f, %f\n",
-                      i, j,
-                      coord[j][0], coord[j][1], coord[j][2], coord[j][3]);
+         printf("  %u: %u: %f, %f, %f, %f\n",
+		i, j,
+		coord[j][0], coord[j][1], coord[j][2], coord[j][3]);
          assert(!IS_INF_OR_NAN(coord[j][0]));
          assert(!IS_INF_OR_NAN(coord[j][1]));
          assert(!IS_INF_OR_NAN(coord[j][2]));
@@ -247,12 +247,12 @@ TAG(clip_tri)( GLcontext *ctx, GLuint v0, GLuint v1, GLuint v2, GLubyte mask )
    if (0) {
       /* print post-clip vertex coords */
       GLuint i, j;
-      _mesa_printf("post clip:\n");
+      printf("post clip:\n");
       for (i = 0; i < n; i++) {
          j = inlist[i];
-         _mesa_printf("  %u: %u: %f, %f, %f, %f\n",
-                      i, j,
-                      coord[j][0], coord[j][1], coord[j][2], coord[j][3]);
+         printf("  %u: %u: %f, %f, %f, %f\n",
+		i, j,
+		coord[j][0], coord[j][1], coord[j][2], coord[j][3]);
       }
    }
 
diff --git a/src/mesa/tnl/t_vertex.c b/src/mesa/tnl/t_vertex.c
index ed66c35be7..b35d6a284e 100644
--- a/src/mesa/tnl/t_vertex.c
+++ b/src/mesa/tnl/t_vertex.c
@@ -307,8 +307,8 @@ GLuint _tnl_install_attrs( GLcontext *ctx, const struct tnl_attr_map *map,
       const GLuint format = map[i].format;
       if (format == EMIT_PAD) {
 	 if (DBG)
-	    _mesa_printf("%d: pad %d, offset %d\n", i,  
-			 map[i].offset, offset);  
+	    printf("%d: pad %d, offset %d\n", i,  
+		   map[i].offset, offset);  
 
 	 offset += map[i].offset;
 
@@ -338,9 +338,9 @@ GLuint _tnl_install_attrs( GLcontext *ctx, const struct tnl_attr_map *map,
 
 	 
 	 if (DBG)
-	    _mesa_printf("%d: %s, vp %p, offset %d\n", i,  
-			 _tnl_format_info[format].name, (void *)vp,
-			 vtx->attr[j].vertoffset);   
+	    printf("%d: %s, vp %p, offset %d\n", i,  
+		   _tnl_format_info[format].name, (void *)vp,
+		   vtx->attr[j].vertoffset);   
 
 	 offset += _tnl_format_info[format].attrsize;
 	 j++;
diff --git a/src/mesa/tnl/t_vertex_sse.c b/src/mesa/tnl/t_vertex_sse.c
index 6436cbfc6e..98058f3bda 100644
--- a/src/mesa/tnl/t_vertex_sse.c
+++ b/src/mesa/tnl/t_vertex_sse.c
@@ -496,7 +496,7 @@ static GLboolean build_vertex_emit( struct x86_program *p )
 	    update_src_ptr(p, srcECX, vtxESI, a);
 	 }
 	 else {
-	    _mesa_printf("Can't emit 1ub %x %x %d\n", a->vertoffset, a[-1].vertoffset, a[-1].vertattrsize );
+	    printf("Can't emit 1ub %x %x %d\n", a->vertoffset, a[-1].vertoffset, a[-1].vertattrsize );
 	    return GL_FALSE;
 	 }
 	 break;
@@ -542,7 +542,7 @@ static GLboolean build_vertex_emit( struct x86_program *p )
 	    j++;		/* NOTE: two attrs consumed */
 	 }
 	 else {
-	    _mesa_printf("Can't emit 3ub\n");
+	    printf("Can't emit 3ub\n");
 	    return GL_FALSE;	/* add this later */
 	 }
 	 break;
@@ -590,12 +590,12 @@ static GLboolean build_vertex_emit( struct x86_program *p )
 	    break;
 	 case GL_UNSIGNED_SHORT:
 	 default:
-	    _mesa_printf("unknown CHAN_TYPE %s\n", _mesa_lookup_enum_by_nr(CHAN_TYPE));
+	    printf("unknown CHAN_TYPE %s\n", _mesa_lookup_enum_by_nr(CHAN_TYPE));
 	    return GL_FALSE;
 	 }
 	 break;
       default:
-	 _mesa_printf("unknown a[%d].format %d\n", j, a->format);
+	 printf("unknown a[%d].format %d\n", j, a->format);
 	 return GL_FALSE;	/* catch any new opcodes */
       }
       
diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c
index b10ee2105a..aa7f1c40b1 100644
--- a/src/mesa/vbo/vbo_exec_api.c
+++ b/src/mesa/vbo/vbo_exec_api.c
@@ -857,7 +857,7 @@ 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__);
+   if (0) printf("%s\n", __FUNCTION__);
    vbo_exec_vtx_map( exec );
 
    assert((exec->ctx->Driver.NeedFlush & FLUSH_UPDATE_CURRENT) == 0);
@@ -892,10 +892,10 @@ void vbo_exec_FlushVertices( GLcontext *ctx, GLuint flags )
    assert(exec->flush_call_depth == 1);
 #endif
 
-   if (0) _mesa_printf("%s\n", __FUNCTION__);
+   if (0) printf("%s\n", __FUNCTION__);
 
    if (exec->ctx->Driver.CurrentExecPrimitive != PRIM_OUTSIDE_BEGIN_END) {
-      if (0) _mesa_printf("%s - inside begin/end\n", __FUNCTION__);
+      if (0) printf("%s - inside begin/end\n", __FUNCTION__);
 #ifdef DEBUG
       exec->flush_call_depth--;
       assert(exec->flush_call_depth == 0);
diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c
index f2f1674b6a..90474da7c0 100644
--- a/src/mesa/vbo/vbo_exec_array.c
+++ b/src/mesa/vbo/vbo_exec_array.c
@@ -136,13 +136,13 @@ check_array_data(GLcontext *ctx, struct gl_client_array *array,
             for (k = 0; k < array->Size; k++) {
                if (IS_INF_OR_NAN(f[k]) ||
                    f[k] >= 1.0e20 || f[k] <= -1.0e10) {
-                  _mesa_printf("Bad array data:\n");
-                  _mesa_printf("  Element[%u].%u = %f\n", j, k, f[k]);
-                  _mesa_printf("  Array %u at %p\n", attrib, (void* ) array);
-                  _mesa_printf("  Type 0x%x, Size %d, Stride %d\n",
-                               array->Type, array->Size, array->Stride);
-                  _mesa_printf("  Address/offset %p in Buffer Object %u\n",
-                               array->Ptr, array->BufferObj->Name);
+                  printf("Bad array data:\n");
+                  printf("  Element[%u].%u = %f\n", j, k, f[k]);
+                  printf("  Array %u at %p\n", attrib, (void* ) array);
+                  printf("  Type 0x%x, Size %d, Stride %d\n",
+			 array->Type, array->Size, array->Stride);
+                  printf("  Address/offset %p in Buffer Object %u\n",
+			 array->Ptr, array->BufferObj->Name);
                   f[k] = 1.0; /* XXX replace the bad value! */
                }
                /*assert(!IS_INF_OR_NAN(f[k]));*/
@@ -257,21 +257,21 @@ print_draw_arrays(GLcontext *ctx, struct vbo_exec_context *exec,
 {
    int i;
 
-   _mesa_printf("vbo_exec_DrawArrays(mode 0x%x, start %d, count %d):\n",
-                mode, start, count);
+   printf("vbo_exec_DrawArrays(mode 0x%x, start %d, count %d):\n",
+	  mode, start, count);
 
    for (i = 0; i < 32; i++) {
       GLuint bufName = exec->array.inputs[i]->BufferObj->Name;
       GLint stride = exec->array.inputs[i]->Stride;
-      _mesa_printf("attr %2d: size %d stride %d  enabled %d  "
-                   "ptr %p  Bufobj %u\n",
-                   i,
-                   exec->array.inputs[i]->Size,
-                   stride,
-                   /*exec->array.inputs[i]->Enabled,*/
-                   exec->array.legacy_array[i]->Enabled,
-                   exec->array.inputs[i]->Ptr,
-                   bufName);
+      printf("attr %2d: size %d stride %d  enabled %d  "
+	     "ptr %p  Bufobj %u\n",
+	     i,
+	     exec->array.inputs[i]->Size,
+	     stride,
+	     /*exec->array.inputs[i]->Enabled,*/
+	     exec->array.legacy_array[i]->Enabled,
+	     exec->array.inputs[i]->Ptr,
+	     bufName);
 
       if (bufName) {
          struct gl_buffer_object *buf = _mesa_lookup_bufferobj(ctx, bufName);
@@ -284,9 +284,9 @@ print_draw_arrays(GLcontext *ctx, struct vbo_exec_context *exec,
          int n = (count * stride) / 4;
          if (n > 32)
             n = 32;
-         _mesa_printf("  Data at offset %d:\n", offset);
+         printf("  Data at offset %d:\n", offset);
          for (i = 0; i < n; i++) {
-            _mesa_printf("    float[%d] = 0x%08x %f\n", i, k[i], f[i]);
+            printf("    float[%d] = 0x%08x %f\n", i, k[i], f[i]);
          }
          ctx->Driver.UnmapBuffer(ctx, GL_ARRAY_BUFFER_ARB, buf);
       }
@@ -548,11 +548,11 @@ dump_element_buffer(GLcontext *ctx, GLenum type)
          const GLubyte *us = (const GLubyte *) map;
          GLint i;
          for (i = 0; i < ctx->Array.ElementArrayBufferObj->Size; i++) {
-            _mesa_printf("%02x ", us[i]);
+            printf("%02x ", us[i]);
             if (i % 32 == 31)
-               _mesa_printf("\n");
+               printf("\n");
          }
-         _mesa_printf("\n");
+         printf("\n");
       }
       break;
    case GL_UNSIGNED_SHORT:
@@ -560,11 +560,11 @@ dump_element_buffer(GLcontext *ctx, GLenum type)
          const GLushort *us = (const GLushort *) map;
          GLint i;
          for (i = 0; i < ctx->Array.ElementArrayBufferObj->Size / 2; i++) {
-            _mesa_printf("%04x ", us[i]);
+            printf("%04x ", us[i]);
             if (i % 16 == 15)
-               _mesa_printf("\n");
+               printf("\n");
          }
-         _mesa_printf("\n");
+         printf("\n");
       }
       break;
    case GL_UNSIGNED_INT:
@@ -572,11 +572,11 @@ dump_element_buffer(GLcontext *ctx, GLenum type)
          const GLuint *us = (const GLuint *) map;
          GLint i;
          for (i = 0; i < ctx->Array.ElementArrayBufferObj->Size / 4; i++) {
-            _mesa_printf("%08x ", us[i]);
+            printf("%08x ", us[i]);
             if (i % 8 == 7)
-               _mesa_printf("\n");
+               printf("\n");
          }
-         _mesa_printf("\n");
+         printf("\n");
       }
       break;
    default:
@@ -754,12 +754,12 @@ vbo_exec_DrawRangeElementsBaseVertex(GLenum mode,
       end = ctx->Array.ArrayObj->_MaxElement - 1;
    }
    else if (0) {
-      _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,
-		   basevertex);
+      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,
+	     basevertex);
    }
 
 #if 0
diff --git a/src/mesa/vbo/vbo_exec_draw.c b/src/mesa/vbo/vbo_exec_draw.c
index 526bf7ae79..045af46da8 100644
--- a/src/mesa/vbo/vbo_exec_draw.c
+++ b/src/mesa/vbo/vbo_exec_draw.c
@@ -43,22 +43,22 @@ vbo_exec_debug_verts( struct vbo_exec_context *exec )
    GLuint count = exec->vtx.vert_count;
    GLuint i;
 
-   _mesa_printf("%s: %u vertices %d primitives, %d vertsize\n",
-		__FUNCTION__,
-		count,
-		exec->vtx.prim_count,
-		exec->vtx.vertex_size);
+   printf("%s: %u vertices %d primitives, %d vertsize\n",
+	  __FUNCTION__,
+	  count,
+	  exec->vtx.prim_count,
+	  exec->vtx.vertex_size);
 
    for (i = 0 ; i < exec->vtx.prim_count ; i++) {
       struct _mesa_prim *prim = &exec->vtx.prim[i];
-      _mesa_printf("   prim %d: %s%s %d..%d %s %s\n",
-		   i, 
-		   _mesa_lookup_prim_by_nr(prim->mode),
-		   prim->weak ? " (weak)" : "",
-		   prim->start, 
-		   prim->start + prim->count,
-		   prim->begin ? "BEGIN" : "(wrap)",
-		   prim->end ? "END" : "(wrap)");
+      printf("   prim %d: %s%s %d..%d %s %s\n",
+	     i, 
+	     _mesa_lookup_prim_by_nr(prim->mode),
+	     prim->weak ? " (weak)" : "",
+	     prim->start, 
+	     prim->start + prim->count,
+	     prim->begin ? "BEGIN" : "(wrap)",
+	     prim->end ? "END" : "(wrap)");
    }
 }
 
@@ -343,7 +343,7 @@ vbo_exec_vtx_map( struct vbo_exec_context *exec )
    }
 
    if (0)
-      _mesa_printf("map %d..\n", exec->vtx.buffer_used);
+      printf("map %d..\n", exec->vtx.buffer_used);
 }
 
 
@@ -378,8 +378,8 @@ vbo_exec_vtx_flush( struct vbo_exec_context *exec, GLboolean unmap )
          }
 
          if (0)
-            _mesa_printf("%s %d %d\n", __FUNCTION__, exec->vtx.prim_count,
-                         exec->vtx.vert_count);
+            printf("%s %d %d\n", __FUNCTION__, exec->vtx.prim_count,
+		   exec->vtx.vert_count);
 
 	 vbo_context(ctx)->draw_prims( ctx, 
 				       exec->vtx.inputs, 
diff --git a/src/mesa/vbo/vbo_rebase.c b/src/mesa/vbo/vbo_rebase.c
index 1db36de3de..ff7c7a6b0d 100644
--- a/src/mesa/vbo/vbo_rebase.c
+++ b/src/mesa/vbo/vbo_rebase.c
@@ -124,7 +124,7 @@ void vbo_rebase_prims( GLcontext *ctx,
    assert(min_index != 0);
 
    if (0)
-      _mesa_printf("%s %d..%d\n", __FUNCTION__, min_index, max_index);
+      printf("%s %d..%d\n", __FUNCTION__, min_index, max_index);
 
 
    /* XXX this path is disabled for now.
diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c
index e1caa6f8c5..3a64c0cf01 100644
--- a/src/mesa/vbo/vbo_save_api.c
+++ b/src/mesa/vbo/vbo_save_api.c
@@ -1185,10 +1185,10 @@ static void vbo_print_vertex_list( GLcontext *ctx, void *data )
    GLuint i;
    (void) ctx;
 
-   _mesa_printf("VBO-VERTEX-LIST, %u vertices %d primitives, %d vertsize\n",
-		node->count,
-		node->prim_count,
-		node->vertex_size);
+   printf("VBO-VERTEX-LIST, %u vertices %d primitives, %d vertsize\n",
+	  node->count,
+	  node->prim_count,
+	  node->vertex_size);
 
    for (i = 0 ; i < node->prim_count ; i++) {
       struct _mesa_prim *prim = &node->prim[i];
diff --git a/src/mesa/vbo/vbo_save_draw.c b/src/mesa/vbo/vbo_save_draw.c
index d834fa1f2e..a7cf29acd4 100644
--- a/src/mesa/vbo/vbo_save_draw.c
+++ b/src/mesa/vbo/vbo_save_draw.c
@@ -243,7 +243,7 @@ void vbo_save_playback_vertex_list( GLcontext *ctx, void *data )
 	  * includes operations such as glBegin or glDrawArrays.
 	  */
 	 if (0)
-	    _mesa_printf("displaylist recursive begin");
+	    printf("displaylist recursive begin");
 
 	 vbo_save_loopback_vertex_list( ctx, node );
 	 return;
diff --git a/src/mesa/vbo/vbo_save_loopback.c b/src/mesa/vbo/vbo_save_loopback.c
index f13a16e3b5..8d9ae307d6 100644
--- a/src/mesa/vbo/vbo_save_loopback.c
+++ b/src/mesa/vbo/vbo_save_loopback.c
@@ -95,12 +95,12 @@ static void loopback_prim( GLcontext *ctx,
    GLuint k;
 
    if (0)
-      _mesa_printf("loopback prim %s(%s,%s) verts %d..%d\n",
-		   _mesa_lookup_prim_by_nr(prim->mode),
-		   prim->begin ? "begin" : "..",
-		   prim->end ? "end" : "..",
-		   start, 
-		   end);
+      printf("loopback prim %s(%s,%s) verts %d..%d\n",
+	     _mesa_lookup_prim_by_nr(prim->mode),
+	     prim->begin ? "begin" : "..",
+	     prim->end ? "end" : "..",
+	     start, 
+	     end);
 
    if (prim->begin) {
       CALL_Begin(GET_DISPATCH(), ( prim->mode ));
diff --git a/src/mesa/vbo/vbo_split_copy.c b/src/mesa/vbo/vbo_split_copy.c
index 2fae267ff5..bce401744d 100644
--- a/src/mesa/vbo/vbo_split_copy.c
+++ b/src/mesa/vbo/vbo_split_copy.c
@@ -147,21 +147,21 @@ dump_draw_info(GLcontext *ctx,
 {
    GLuint i, j;
 
-   _mesa_printf("VBO Draw:\n");
+   printf("VBO Draw:\n");
    for (i = 0; i < nr_prims; i++) {
-      _mesa_printf("Prim %u of %u\n", i, nr_prims);
-      _mesa_printf("  Prim mode 0x%x\n", prims[i].mode);
-      _mesa_printf("  IB: %p\n", (void*) ib);
+      printf("Prim %u of %u\n", i, nr_prims);
+      printf("  Prim mode 0x%x\n", prims[i].mode);
+      printf("  IB: %p\n", (void*) ib);
       for (j = 0; j < VERT_ATTRIB_MAX; j++) {
-         _mesa_printf("    array %d at %p:\n", j, (void*) arrays[j]);
-         _mesa_printf("      enabled %d, ptr %p, size %d, type 0x%x, stride %d\n",
-                      arrays[j]->Enabled, arrays[j]->Ptr,
-                      arrays[j]->Size, arrays[j]->Type, arrays[j]->StrideB);
+         printf("    array %d at %p:\n", j, (void*) arrays[j]);
+         printf("      enabled %d, ptr %p, size %d, type 0x%x, stride %d\n",
+		arrays[j]->Enabled, arrays[j]->Ptr,
+		arrays[j]->Size, arrays[j]->Type, arrays[j]->StrideB);
          if (0) {
             GLint k = prims[i].start + prims[i].count - 1;
             GLfloat *last = (GLfloat *) (arrays[j]->Ptr + arrays[j]->Stride * k);
-            _mesa_printf("        last: %f %f %f\n",
-                         last[0], last[1], last[2]);
+            printf("        last: %f %f %f\n",
+		   last[0], last[1], last[2]);
          }
       }
    }
@@ -235,7 +235,7 @@ elt(struct copy_context *copy, GLuint elt_idx)
    GLuint elt = copy->srcelt[elt_idx];
    GLuint slot = elt & (ELT_TABLE_SIZE-1);
 
-/*    _mesa_printf("elt %d\n", elt); */
+/*    printf("elt %d\n", elt); */
 
    /* Look up the incoming element in the vertex cache.  Re-emit if
     * necessary.   
@@ -244,7 +244,7 @@ elt(struct copy_context *copy, GLuint elt_idx)
       GLubyte *csr = copy->dstptr;
       GLuint i;
 
-/*       _mesa_printf("  --> emit to dstelt %d\n", copy->dstbuf_nr); */
+/*       printf("  --> emit to dstelt %d\n", copy->dstbuf_nr); */
 
       for (i = 0; i < copy->nr_varying; i++) {
 	 const struct gl_client_array *srcarray = copy->varying[i].array;
@@ -268,10 +268,10 @@ elt(struct copy_context *copy, GLuint elt_idx)
 	 {
 	    const GLuint *f = (const GLuint *)srcptr;
 	    GLuint j;
-	    _mesa_printf("  varying %d: ", i);
+	    printf("  varying %d: ", i);
 	    for(j = 0; j < copy->varying[i].size / 4; j++)
-	       _mesa_printf("%x ", f[j]);
-	    _mesa_printf("\n");
+	       printf("%x ", f[j]);
+	    printf("\n");
 	 }
       }
 
@@ -284,9 +284,9 @@ elt(struct copy_context *copy, GLuint elt_idx)
                               copy->dstbuf_nr * copy->vertex_size));
    }
 /*    else */
-/*       _mesa_printf("  --> reuse vertex\n"); */
+/*       printf("  --> reuse vertex\n"); */
    
-/*    _mesa_printf("  --> emit %d\n", copy->vert_cache[slot].out); */
+/*    printf("  --> emit %d\n", copy->vert_cache[slot].out); */
    copy->dstelt[copy->dstelt_nr++] = copy->vert_cache[slot].out;
    return check_flush(copy);
 }
@@ -300,7 +300,7 @@ end( struct copy_context *copy, GLboolean end_flag )
 {
    struct _mesa_prim *prim = &copy->dstprim[copy->dstprim_nr];
 
-/*    _mesa_printf("end (%d)\n", end_flag); */
+/*    printf("end (%d)\n", end_flag); */
 
    prim->end = end_flag;
    prim->count = copy->dstelt_nr - prim->start;
diff --git a/src/mesa/vf/vf.c b/src/mesa/vf/vf.c
index dab436e2ab..defb7cbe2c 100644
--- a/src/mesa/vf/vf.c
+++ b/src/mesa/vf/vf.c
@@ -162,8 +162,8 @@ GLuint vf_set_vertex_attributes( struct vertex_fetch *vf,
       const GLuint format = map[i].format;
       if (format == EMIT_PAD) {
 	 if (DBG)
-	    _mesa_printf("%d: pad %d, offset %d\n", i,  
-			 map[i].offset, offset);  
+	    printf("%d: pad %d, offset %d\n", i,  
+		   map[i].offset, offset);  
 
 	 offset += map[i].offset;
 
@@ -180,9 +180,9 @@ GLuint vf_set_vertex_attributes( struct vertex_fetch *vf,
 	 vf->attr[j].vertoffset = offset;
 	 
 	 if (DBG)
-	    _mesa_printf("%d: %s, offset %d\n", i,  
-			 vf_format_info[format].name,
-			 vf->attr[j].vertoffset);   
+	    printf("%d: %s, offset %d\n", i,  
+		   vf_format_info[format].name,
+		   vf->attr[j].vertoffset);   
 
 	 offset += vf_format_info[format].attrsize;
 	 j++;
diff --git a/src/mesa/vf/vf_sse.c b/src/mesa/vf/vf_sse.c
index 04275903c9..7b947b74a6 100644
--- a/src/mesa/vf/vf_sse.c
+++ b/src/mesa/vf/vf_sse.c
@@ -482,7 +482,7 @@ static GLboolean build_vertex_emit( struct x86_program *p )
 	    update_src_ptr(p, srcECX, vfESI, a);
 	 }
 	 else {
-	    _mesa_printf("Can't emit 1ub %x %x %d\n", a->vertoffset, a[-1].vertoffset, a[-1].vertattrsize );
+	    printf("Can't emit 1ub %x %x %d\n", a->vertoffset, a[-1].vertoffset, a[-1].vertattrsize );
 	    return GL_FALSE;
 	 }
 	 break;
@@ -527,7 +527,7 @@ static GLboolean build_vertex_emit( struct x86_program *p )
 	    j++;		/* NOTE: two attrs consumed */
 	 }
 	 else {
-	    _mesa_printf("Can't emit 3ub\n");
+	    printf("Can't emit 3ub\n");
 	 }
 	 return GL_FALSE;	/* add this later */
 	 break;
@@ -575,12 +575,12 @@ static GLboolean build_vertex_emit( struct x86_program *p )
 	    break;
 	 case GL_UNSIGNED_SHORT:
 	 default:
-	    _mesa_printf("unknown CHAN_TYPE %s\n", _mesa_lookup_enum_by_nr(CHAN_TYPE));
+	    printf("unknown CHAN_TYPE %s\n", _mesa_lookup_enum_by_nr(CHAN_TYPE));
 	    return GL_FALSE;
 	 }
 	 break;
       default:
-	 _mesa_printf("unknown a[%d].format %d\n", j, a->format);
+	 printf("unknown a[%d].format %d\n", j, a->format);
 	 return GL_FALSE;	/* catch any new opcodes */
       }
       
diff --git a/src/mesa/x86/rtasm/x86sse.c b/src/mesa/x86/rtasm/x86sse.c
index 647be995c1..c93faba792 100644
--- a/src/mesa/x86/rtasm/x86sse.c
+++ b/src/mesa/x86/rtasm/x86sse.c
@@ -1184,7 +1184,7 @@ void x86_release_func( struct x86_function *p )
 void (*x86_get_func( struct x86_function *p ))(void)
 {
    if (DISASSEM && p->store)
-      _mesa_printf("disassemble %p %p\n", p->store, p->csr);
+      printf("disassemble %p %p\n", p->store, p->csr);
    return (void (*)(void)) (unsigned long) p->store;
 }
 
-- 
cgit v1.2.3


From 99ae9e8d7d57ae37629754edd5b1e3716611827f Mon Sep 17 00:00:00 2001
From: Kristian Høgsberg <krh@bitplanet.net>
Date: Fri, 19 Feb 2010 13:16:57 -0500
Subject: Drop macro wrappers for the aligned memory functions

---
 src/mesa/drivers/dri/ffb/ffb_vb.c            |  4 ++--
 src/mesa/drivers/dri/gamma/gamma_vb.c        |  4 ++--
 src/mesa/drivers/dri/i810/i810screen.c       |  6 +++---
 src/mesa/drivers/dri/i810/i810vb.c           |  4 ++--
 src/mesa/drivers/dri/mach64/mach64_context.c |  4 ++--
 src/mesa/drivers/dri/mach64/mach64_vb.c      |  4 ++--
 src/mesa/drivers/dri/mga/mgavb.c             |  4 ++--
 src/mesa/drivers/dri/tdfx/tdfx_vb.c          |  4 ++--
 src/mesa/drivers/glide/fxvb.c                |  4 ++--
 src/mesa/main/imports.h                      | 11 -----------
 src/mesa/math/m_debug_norm.c                 |  4 ++--
 src/mesa/math/m_debug_xform.c                |  4 ++--
 src/mesa/math/m_matrix.c                     |  8 ++++----
 src/mesa/math/m_vector.c                     |  4 ++--
 src/mesa/tnl/t_vb_program.c                  |  4 ++--
 src/mesa/tnl/t_vb_vertex.c                   |  4 ++--
 src/mesa/tnl/t_vertex.c                      |  4 ++--
 src/mesa/vbo/vbo_exec_api.c                  |  4 ++--
 18 files changed, 37 insertions(+), 48 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/dri/ffb/ffb_vb.c b/src/mesa/drivers/dri/ffb/ffb_vb.c
index ca8ffb2721..a53e7c7431 100644
--- a/src/mesa/drivers/dri/ffb/ffb_vb.c
+++ b/src/mesa/drivers/dri/ffb/ffb_vb.c
@@ -185,7 +185,7 @@ void ffbInitVB( GLcontext *ctx )
 	ffbContextPtr fmesa = FFB_CONTEXT(ctx);
 	GLuint size = TNL_CONTEXT(ctx)->vb.Size;
 
-	fmesa->verts = (ffb_vertex *)ALIGN_MALLOC(size * sizeof(ffb_vertex), 32);
+	fmesa->verts = (ffb_vertex *)_mesa_align_malloc(size * sizeof(ffb_vertex), 32);
 
 	{
 		static int firsttime = 1;
@@ -201,7 +201,7 @@ void ffbFreeVB( GLcontext *ctx )
 {
 	ffbContextPtr fmesa = FFB_CONTEXT(ctx);
 	if (fmesa->verts) {
-		ALIGN_FREE(fmesa->verts);
+		_mesa_align_free(fmesa->verts);
 		fmesa->verts = 0;
 	}
 }
diff --git a/src/mesa/drivers/dri/gamma/gamma_vb.c b/src/mesa/drivers/dri/gamma/gamma_vb.c
index c11cfd281a..013f856dcd 100644
--- a/src/mesa/drivers/dri/gamma/gamma_vb.c
+++ b/src/mesa/drivers/dri/gamma/gamma_vb.c
@@ -338,7 +338,7 @@ void gammaInitVB( GLcontext *ctx )
    gammaContextPtr gmesa = GAMMA_CONTEXT(ctx);
    GLuint size = TNL_CONTEXT(ctx)->vb.Size;
 
-   gmesa->verts = (GLubyte *)ALIGN_MALLOC(size * 4 * 16, 32);
+   gmesa->verts = (GLubyte *)_mesa_align_malloc(size * 4 * 16, 32);
 
    {
       static int firsttime = 1;
@@ -355,7 +355,7 @@ void gammaFreeVB( GLcontext *ctx )
 {
    gammaContextPtr gmesa = GAMMA_CONTEXT(ctx);
    if (gmesa->verts) {
-      ALIGN_FREE(gmesa->verts);
+      _mesa_align_free(gmesa->verts);
       gmesa->verts = 0;
    }
 }
diff --git a/src/mesa/drivers/dri/i810/i810screen.c b/src/mesa/drivers/dri/i810/i810screen.c
index 1c4deef319..56708c97cb 100644
--- a/src/mesa/drivers/dri/i810/i810screen.c
+++ b/src/mesa/drivers/dri/i810/i810screen.c
@@ -131,12 +131,12 @@ static drmBufMapPtr i810_create_empty_buffers(void)
 {
    drmBufMapPtr retval;
 
-   retval = (drmBufMapPtr)ALIGN_MALLOC(sizeof(drmBufMap), 32);
+   retval = (drmBufMapPtr)_mesa_align_malloc(sizeof(drmBufMap), 32);
    if(retval == NULL) return NULL;
    memset(retval, 0, sizeof(drmBufMap));
-   retval->list = (drmBufPtr)ALIGN_MALLOC(sizeof(drmBuf) * I810_DMA_BUF_NR, 32);
+   retval->list = (drmBufPtr)_mesa_align_malloc(sizeof(drmBuf) * I810_DMA_BUF_NR, 32);
    if(retval->list == NULL) {
-      ALIGN_FREE(retval);
+      _mesa_align_free(retval);
       return NULL;
    }
    memset(retval->list, 0, sizeof(drmBuf) * I810_DMA_BUF_NR);
diff --git a/src/mesa/drivers/dri/i810/i810vb.c b/src/mesa/drivers/dri/i810/i810vb.c
index 09a772258c..70301a2d2e 100644
--- a/src/mesa/drivers/dri/i810/i810vb.c
+++ b/src/mesa/drivers/dri/i810/i810vb.c
@@ -464,7 +464,7 @@ void i810InitVB( GLcontext *ctx )
    i810ContextPtr imesa = I810_CONTEXT(ctx);
    GLuint size = TNL_CONTEXT(ctx)->vb.Size;
 
-   imesa->verts = (GLubyte *)ALIGN_MALLOC(size * 4 * 16, 32);
+   imesa->verts = (GLubyte *)_mesa_align_malloc(size * 4 * 16, 32);
 
    {
       static int firsttime = 1;
@@ -480,7 +480,7 @@ void i810FreeVB( GLcontext *ctx )
 {
    i810ContextPtr imesa = I810_CONTEXT(ctx);
    if (imesa->verts) {
-      ALIGN_FREE(imesa->verts);
+      _mesa_align_free(imesa->verts);
       imesa->verts = 0;
    }
 }
diff --git a/src/mesa/drivers/dri/mach64/mach64_context.c b/src/mesa/drivers/dri/mach64/mach64_context.c
index 11bce31b12..77e7e53ce0 100644
--- a/src/mesa/drivers/dri/mach64/mach64_context.c
+++ b/src/mesa/drivers/dri/mach64/mach64_context.c
@@ -211,7 +211,7 @@ GLboolean mach64CreateContext( const __GLcontextModes *glVisual,
 
    /* Allocate the vertex buffer
     */
-   mmesa->vert_buf = ALIGN_MALLOC(MACH64_BUFFER_SIZE, 32);
+   mmesa->vert_buf = _mesa_align_malloc(MACH64_BUFFER_SIZE, 32);
    if ( !mmesa->vert_buf )
       return GL_FALSE;
    mmesa->vert_used = 0;
@@ -291,7 +291,7 @@ void mach64DestroyContext( __DRIcontext *driContextPriv  )
 
       /* Free the vertex buffer */
       if ( mmesa->vert_buf )
-	 ALIGN_FREE( mmesa->vert_buf );
+	 _mesa_align_free( mmesa->vert_buf );
       
       /* free the Mesa context */
       mmesa->glCtx->DriverCtx = NULL;
diff --git a/src/mesa/drivers/dri/mach64/mach64_vb.c b/src/mesa/drivers/dri/mach64/mach64_vb.c
index 00da835376..046aff28a8 100644
--- a/src/mesa/drivers/dri/mach64/mach64_vb.c
+++ b/src/mesa/drivers/dri/mach64/mach64_vb.c
@@ -619,7 +619,7 @@ void mach64InitVB( GLcontext *ctx )
    mach64ContextPtr mmesa = MACH64_CONTEXT(ctx);
    GLuint size = TNL_CONTEXT(ctx)->vb.Size;
 
-   mmesa->verts = (GLubyte *)ALIGN_MALLOC(size * 4 * 16, 32);
+   mmesa->verts = (GLubyte *)_mesa_align_malloc(size * 4 * 16, 32);
 
    {
       static int firsttime = 1;
@@ -635,7 +635,7 @@ void mach64FreeVB( GLcontext *ctx )
 {
    mach64ContextPtr mmesa = MACH64_CONTEXT(ctx);
    if (mmesa->verts) {
-      ALIGN_FREE(mmesa->verts);
+      _mesa_align_free(mmesa->verts);
       mmesa->verts = 0;
    }
 }
diff --git a/src/mesa/drivers/dri/mga/mgavb.c b/src/mesa/drivers/dri/mga/mgavb.c
index def5109863..71bbf33f23 100644
--- a/src/mesa/drivers/dri/mga/mgavb.c
+++ b/src/mesa/drivers/dri/mga/mgavb.c
@@ -451,7 +451,7 @@ void mgaInitVB( GLcontext *ctx )
    mgaContextPtr mmesa = MGA_CONTEXT(ctx);
    GLuint size = TNL_CONTEXT(ctx)->vb.Size;
 
-   mmesa->verts = (GLubyte *)ALIGN_MALLOC(size * sizeof(mgaVertex), 32);
+   mmesa->verts = (GLubyte *)_mesa_align_malloc(size * sizeof(mgaVertex), 32);
 
    {
       static int firsttime = 1;
@@ -471,7 +471,7 @@ void mgaFreeVB( GLcontext *ctx )
 {
    mgaContextPtr mmesa = MGA_CONTEXT(ctx);
    if (mmesa->verts) {
-      ALIGN_FREE(mmesa->verts);
+      _mesa_align_free(mmesa->verts);
       mmesa->verts = 0;
    }
 }
diff --git a/src/mesa/drivers/dri/tdfx/tdfx_vb.c b/src/mesa/drivers/dri/tdfx/tdfx_vb.c
index 0f3c877a3e..546d89aa84 100644
--- a/src/mesa/drivers/dri/tdfx/tdfx_vb.c
+++ b/src/mesa/drivers/dri/tdfx/tdfx_vb.c
@@ -331,7 +331,7 @@ void tdfxInitVB( GLcontext *ctx )
       firsttime = 0;
    }
 
-   fxMesa->verts = ALIGN_MALLOC(size * sizeof(tdfxVertex), 32);
+   fxMesa->verts = _mesa_align_malloc(size * sizeof(tdfxVertex), 32);
    fxMesa->vertexFormat = TDFX_LAYOUT_TINY;
    fxMesa->SetupIndex = TDFX_XYZ_BIT|TDFX_RGBA_BIT;
 }
@@ -341,7 +341,7 @@ void tdfxFreeVB( GLcontext *ctx )
 {
    tdfxContextPtr fxMesa = TDFX_CONTEXT(ctx);
    if (fxMesa->verts) {
-      ALIGN_FREE(fxMesa->verts);
+      _mesa_align_free(fxMesa->verts);
       fxMesa->verts = 0;
    }
 }
diff --git a/src/mesa/drivers/glide/fxvb.c b/src/mesa/drivers/glide/fxvb.c
index cc9ad0e8b8..64453cbe4b 100644
--- a/src/mesa/drivers/glide/fxvb.c
+++ b/src/mesa/drivers/glide/fxvb.c
@@ -808,7 +808,7 @@ void fxAllocVB( GLcontext *ctx )
       firsttime = 0;
    }
 
-   fxMesa->verts = (GrVertex *)ALIGN_MALLOC(size * sizeof(GrVertex), 32);
+   fxMesa->verts = (GrVertex *)_mesa_align_malloc(size * sizeof(GrVertex), 32);
    fxMesa->SetupIndex = SETUP_XYZW|SETUP_RGBA;
 }
 
@@ -817,7 +817,7 @@ void fxFreeVB( GLcontext *ctx )
 {
    fxMesaContext fxMesa = FX_CONTEXT(ctx);
    if (fxMesa->verts) {
-      ALIGN_FREE(fxMesa->verts);
+      _mesa_align_free(fxMesa->verts);
       fxMesa->verts = 0;
    }
 }
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index a65c6a615f..269d985f1e 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -60,17 +60,6 @@ extern "C" {
 /** Free memory */
 #define FREE(PTR)          free(PTR)
 
-/** Allocate \p BYTES aligned at \p N bytes */
-#define ALIGN_MALLOC(BYTES, N)     _mesa_align_malloc(BYTES, N)
-/** Allocate and zero \p BYTES bytes aligned at \p N bytes */
-#define ALIGN_CALLOC(BYTES, N)     _mesa_align_calloc(BYTES, N)
-/** Allocate a structure of type \p T aligned at \p N bytes */
-#define ALIGN_MALLOC_STRUCT(T, N)  (struct T *) _mesa_align_malloc(sizeof(struct T), N)
-/** Allocate and zero a structure of type \p T aligned at \p N bytes */
-#define ALIGN_CALLOC_STRUCT(T, N)  (struct T *) _mesa_align_calloc(sizeof(struct T), N)
-/** Free aligned memory */
-#define ALIGN_FREE(PTR)            _mesa_align_free(PTR)
-
 /*@}*/
 
 
diff --git a/src/mesa/math/m_debug_norm.c b/src/mesa/math/m_debug_norm.c
index 546e8641da..710bad14dd 100644
--- a/src/mesa/math/m_debug_norm.c
+++ b/src/mesa/math/m_debug_norm.c
@@ -208,7 +208,7 @@ static int test_norm_function( normal_func func, int mtype, long *cycles )
 
    (void) cycles;
 
-   mat->m = (GLfloat *) ALIGN_MALLOC( 16 * sizeof(GLfloat), 16 );
+   mat->m = (GLfloat *) _mesa_align_malloc( 16 * sizeof(GLfloat), 16 );
    mat->inv = m = mat->m;
 
    init_matrix( m );
@@ -327,7 +327,7 @@ static int test_norm_function( normal_func func, int mtype, long *cycles )
       }
    }
 
-   ALIGN_FREE( mat->m );
+   _mesa_align_free( mat->m );
    return 1;
 }
 
diff --git a/src/mesa/math/m_debug_xform.c b/src/mesa/math/m_debug_xform.c
index df1bc8aadf..46bd454517 100644
--- a/src/mesa/math/m_debug_xform.c
+++ b/src/mesa/math/m_debug_xform.c
@@ -183,7 +183,7 @@ static int test_transform_function( transform_func func, int psize,
       return 0;
    }
 
-   mat->m = (GLfloat *) ALIGN_MALLOC( 16 * sizeof(GLfloat), 16 );
+   mat->m = (GLfloat *) _mesa_align_malloc( 16 * sizeof(GLfloat), 16 );
    mat->type = mtypes[mtype];
 
    m = mat->m;
@@ -273,7 +273,7 @@ static int test_transform_function( transform_func func, int psize,
       }
    }
 
-   ALIGN_FREE( mat->m );
+   _mesa_align_free( mat->m );
    return 1;
 }
 
diff --git a/src/mesa/math/m_matrix.c b/src/mesa/math/m_matrix.c
index e810d6deb8..ef8a40fbec 100644
--- a/src/mesa/math/m_matrix.c
+++ b/src/mesa/math/m_matrix.c
@@ -1484,7 +1484,7 @@ _math_matrix_loadf( GLmatrix *mat, const GLfloat *m )
 void
 _math_matrix_ctr( GLmatrix *m )
 {
-   m->m = (GLfloat *) ALIGN_MALLOC( 16 * sizeof(GLfloat), 16 );
+   m->m = (GLfloat *) _mesa_align_malloc( 16 * sizeof(GLfloat), 16 );
    if (m->m)
       memcpy( m->m, Identity, sizeof(Identity) );
    m->inv = NULL;
@@ -1503,11 +1503,11 @@ void
 _math_matrix_dtr( GLmatrix *m )
 {
    if (m->m) {
-      ALIGN_FREE( m->m );
+      _mesa_align_free( m->m );
       m->m = NULL;
    }
    if (m->inv) {
-      ALIGN_FREE( m->inv );
+      _mesa_align_free( m->inv );
       m->inv = NULL;
    }
 }
@@ -1523,7 +1523,7 @@ void
 _math_matrix_alloc_inv( GLmatrix *m )
 {
    if (!m->inv) {
-      m->inv = (GLfloat *) ALIGN_MALLOC( 16 * sizeof(GLfloat), 16 );
+      m->inv = (GLfloat *) _mesa_align_malloc( 16 * sizeof(GLfloat), 16 );
       if (m->inv)
          memcpy( m->inv, Identity, 16 * sizeof(GLfloat) );
    }
diff --git a/src/mesa/math/m_vector.c b/src/mesa/math/m_vector.c
index 65c381f383..fbd63fd923 100644
--- a/src/mesa/math/m_vector.c
+++ b/src/mesa/math/m_vector.c
@@ -101,7 +101,7 @@ _mesa_vector4f_alloc( GLvector4f *v, GLbitfield flags, GLuint count,
 {
    v->stride = 4 * sizeof(GLfloat);
    v->size = 2;
-   v->storage = ALIGN_MALLOC( count * 4 * sizeof(GLfloat), alignment );
+   v->storage = _mesa_align_malloc( count * 4 * sizeof(GLfloat), alignment );
    v->storage_count = count;
    v->start = (GLfloat *) v->storage;
    v->data = (GLfloat (*)[4]) v->storage;
@@ -119,7 +119,7 @@ void
 _mesa_vector4f_free( GLvector4f *v )
 {
    if (v->flags & VEC_MALLOC) {
-      ALIGN_FREE( v->storage );
+      _mesa_align_free( v->storage );
       v->data = NULL;
       v->start = NULL;
       v->storage = NULL;
diff --git a/src/mesa/tnl/t_vb_program.c b/src/mesa/tnl/t_vb_program.c
index 5351b5fe41..0137e52fc4 100644
--- a/src/mesa/tnl/t_vb_program.c
+++ b/src/mesa/tnl/t_vb_program.c
@@ -514,7 +514,7 @@ init_vp(GLcontext *ctx, struct tnl_pipeline_stage *stage)
 
    /* a few other misc allocations */
    _mesa_vector4f_alloc( &store->ndcCoords, 0, size, 32 );
-   store->clipmask = (GLubyte *) ALIGN_MALLOC(sizeof(GLubyte)*size, 32 );
+   store->clipmask = (GLubyte *) _mesa_align_malloc(sizeof(GLubyte)*size, 32 );
 
    return GL_TRUE;
 }
@@ -537,7 +537,7 @@ dtr(struct tnl_pipeline_stage *stage)
 
       /* free misc arrays */
       _mesa_vector4f_free( &store->ndcCoords );
-      ALIGN_FREE( store->clipmask );
+      _mesa_align_free( store->clipmask );
 
       FREE( store );
       stage->privatePtr = NULL;
diff --git a/src/mesa/tnl/t_vb_vertex.c b/src/mesa/tnl/t_vb_vertex.c
index bc7e0951ec..a275342563 100644
--- a/src/mesa/tnl/t_vb_vertex.c
+++ b/src/mesa/tnl/t_vb_vertex.c
@@ -246,7 +246,7 @@ static GLboolean init_vertex_stage( GLcontext *ctx,
    _mesa_vector4f_alloc( &store->clip, 0, size, 32 );
    _mesa_vector4f_alloc( &store->proj, 0, size, 32 );
 
-   store->clipmask = (GLubyte *) ALIGN_MALLOC(sizeof(GLubyte)*size, 32 );
+   store->clipmask = (GLubyte *) _mesa_align_malloc(sizeof(GLubyte)*size, 32 );
 
    if (!store->clipmask ||
        !store->eye.data ||
@@ -265,7 +265,7 @@ static void dtr( struct tnl_pipeline_stage *stage )
       _mesa_vector4f_free( &store->eye );
       _mesa_vector4f_free( &store->clip );
       _mesa_vector4f_free( &store->proj );
-      ALIGN_FREE( store->clipmask );
+      _mesa_align_free( store->clipmask );
       FREE(store);
       stage->privatePtr = NULL;
       stage->run = init_vertex_stage;
diff --git a/src/mesa/tnl/t_vertex.c b/src/mesa/tnl/t_vertex.c
index b35d6a284e..c1b1570232 100644
--- a/src/mesa/tnl/t_vertex.c
+++ b/src/mesa/tnl/t_vertex.c
@@ -494,7 +494,7 @@ void _tnl_init_vertices( GLcontext *ctx,
    if (max_vertex_size > vtx->max_vertex_size) {
       _tnl_free_vertices( ctx );
       vtx->max_vertex_size = max_vertex_size;
-      vtx->vertex_buf = (GLubyte *)ALIGN_CALLOC(vb_size * max_vertex_size, 32 );
+      vtx->vertex_buf = (GLubyte *)_mesa_align_calloc(vb_size * max_vertex_size, 32 );
       invalidate_funcs(vtx);
    }
 
@@ -541,7 +541,7 @@ void _tnl_free_vertices( GLcontext *ctx )
       struct tnl_clipspace_fastpath *fp, *tmp;
 
       if (vtx->vertex_buf) {
-         ALIGN_FREE(vtx->vertex_buf);
+         _mesa_align_free(vtx->vertex_buf);
          vtx->vertex_buf = NULL;
       }
 
diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c
index aa7f1c40b1..3dde982371 100644
--- a/src/mesa/vbo/vbo_exec_api.c
+++ b/src/mesa/vbo/vbo_exec_api.c
@@ -781,7 +781,7 @@ void vbo_exec_vtx_init( struct vbo_exec_context *exec )
                                  ctx->Shared->NullBufferObj);
 
    ASSERT(!exec->vtx.buffer_map);
-   exec->vtx.buffer_map = (GLfloat *)ALIGN_MALLOC(VBO_VERT_BUFFER_SIZE, 64);
+   exec->vtx.buffer_map = (GLfloat *)_mesa_align_malloc(VBO_VERT_BUFFER_SIZE, 64);
    exec->vtx.buffer_ptr = exec->vtx.buffer_map;
 
    vbo_exec_vtxfmt_init( exec );
@@ -835,7 +835,7 @@ void vbo_exec_vtx_destroy( struct vbo_exec_context *exec )
       ASSERT(exec->vtx.bufferobj->Name == 0 ||
              exec->vtx.bufferobj->Name == IMM_BUFFER_NAME);
       if (exec->vtx.bufferobj->Name == 0) {
-         ALIGN_FREE(exec->vtx.buffer_map);
+         _mesa_align_free(exec->vtx.buffer_map);
          exec->vtx.buffer_map = NULL;
          exec->vtx.buffer_ptr = NULL;
       }
-- 
cgit v1.2.3


From 8de5a292f70dba854a4bf06a2210bc38381e6bcf Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 19 Feb 2010 12:45:49 -0700
Subject: mesa: casts to silence new warnings from printf()

---
 src/mesa/main/debug.c        | 4 ++--
 src/mesa/shader/prog_print.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/debug.c b/src/mesa/main/debug.c
index 246dbd436d..33b35e03c7 100644
--- a/src/mesa/main/debug.c
+++ b/src/mesa/main/debug.c
@@ -490,9 +490,9 @@ _mesa_dump_color_buffer(const char *filename)
    _mesa_ReadPixels(0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, buf);
 
    printf("ReadBuffer %p 0x%x  DrawBuffer %p 0x%x\n",
-	  ctx->ReadBuffer->_ColorReadBuffer,
+	  (void *) ctx->ReadBuffer->_ColorReadBuffer,
 	  ctx->ReadBuffer->ColorReadBuffer,
-	  ctx->DrawBuffer->_ColorDrawBuffers[0],
+	  (void *) ctx->DrawBuffer->_ColorDrawBuffers[0],
 	  ctx->DrawBuffer->ColorDrawBuffer[0]);
    printf("Writing %d x %d color buffer to %s\n", w, h, filename);
    write_ppm(filename, buf, w, h, 4, 0, 1, 2, GL_TRUE);
diff --git a/src/mesa/shader/prog_print.c b/src/mesa/shader/prog_print.c
index a933f21857..b4905abf4c 100644
--- a/src/mesa/shader/prog_print.c
+++ b/src/mesa/shader/prog_print.c
@@ -603,7 +603,7 @@ _mesa_fprint_instruction_opt(FILE *f,
 
    switch (inst->Opcode) {
    case OPCODE_PRINT:
-      fprintf(f, "PRINT '%s'", inst->Data);
+      fprintf(f, "PRINT '%s'", (char *) inst->Data);
       if (inst->SrcReg[0].File != PROGRAM_UNDEFINED) {
          fprintf(f, ", ");
          fprintf(f, "%s[%d]%s",
-- 
cgit v1.2.3


From 78a0c353d0f87c85feaa6dcb3042fc25d424f21b Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 19 Feb 2010 12:56:49 -0700
Subject: mesa: restore _mesa_snprintf() - it's needed for Windows

This reverts part of commit 298be2b028263b2c343a707662c6fbfa18293cb2
---
 src/mesa/drivers/common/meta.c        |  6 +++---
 src/mesa/main/imports.c               | 19 ++++++++++++++++---
 src/mesa/main/imports.h               |  3 +++
 src/mesa/main/version.c               |  2 +-
 src/mesa/shader/prog_instruction.c    |  2 +-
 src/mesa/shader/prog_print.c          |  6 +++---
 src/mesa/shader/program_parse.tab.c   | 14 +++++++-------
 src/mesa/shader/program_parse.y       | 10 +++++-----
 src/mesa/shader/shader_api.c          |  2 +-
 src/mesa/shader/slang/slang_codegen.c |  4 ++--
 src/mesa/shader/slang/slang_emit.c    |  2 +-
 src/mesa/shader/slang/slang_link.c    |  4 ++--
 12 files changed, 45 insertions(+), 29 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index 3aa70ddbf0..42ab7d4ed6 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -1047,7 +1047,7 @@ init_blit_depth_pixels(GLcontext *ctx)
       texTarget = "RECT";
    else
       texTarget = "2D";
-   snprintf(program2, sizeof(program2), program, texTarget);
+   _mesa_snprintf(program2, sizeof(program2), program, texTarget);
 
    _mesa_GenPrograms(1, &blit->DepthFP);
    _mesa_BindProgram(GL_FRAGMENT_PROGRAM_ARB, blit->DepthFP);
@@ -1670,7 +1670,7 @@ init_draw_stencil_pixels(GLcontext *ctx)
       texTarget = "RECT";
    else
       texTarget = "2D";
-   snprintf(program2, sizeof(program2), program, texTarget);
+   _mesa_snprintf(program2, sizeof(program2), program, texTarget);
 
    _mesa_GenPrograms(1, &drawpix->StencilFP);
    _mesa_BindProgram(GL_FRAGMENT_PROGRAM_ARB, drawpix->StencilFP);
@@ -1704,7 +1704,7 @@ init_draw_depth_pixels(GLcontext *ctx)
       texTarget = "RECT";
    else
       texTarget = "2D";
-   snprintf(program2, sizeof(program2), program, texTarget);
+   _mesa_snprintf(program2, sizeof(program2), program, texTarget);
 
    _mesa_GenPrograms(1, &drawpix->DepthFP);
    _mesa_BindProgram(GL_FRAGMENT_PROGRAM_ARB, drawpix->DepthFP);
diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c
index 112490915f..56e8195810 100644
--- a/src/mesa/main/imports.c
+++ b/src/mesa/main/imports.c
@@ -827,6 +827,19 @@ _mesa_str_checksum(const char *str)
 /*@}*/
 
 
+/** 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;
+}
+
+
 /**********************************************************************/
 /** \name Diagnostics */
 /*@{*/
@@ -866,7 +879,7 @@ output_if_debug(const char *prefixString, const char *outputString,
        * visible, so communicate with the debugger instead */ 
       {
          char buf[4096];
-         snprintf(buf, sizeof(buf), "%s: %s%s", prefixString, outputString, newline ? "\n" : "");
+         _mesa_snprintf(buf, sizeof(buf), "%s: %s%s", prefixString, outputString, newline ? "\n" : "");
          OutputDebugStringA(buf);
       }
 #endif
@@ -915,7 +928,7 @@ flush_delayed_errors( GLcontext *ctx )
    char s[MAXSTRING];
 
    if (ctx->ErrorDebugCount) {
-      snprintf(s, MAXSTRING, "%d similar %s errors", 
+      _mesa_snprintf(s, MAXSTRING, "%d similar %s errors", 
                      ctx->ErrorDebugCount,
                      error_string(ctx->ErrorValue));
 
@@ -1022,7 +1035,7 @@ _mesa_error( GLcontext *ctx, GLenum error, const char *fmtString, ... )
          vsnprintf(s, MAXSTRING, fmtString, args);
          va_end(args);
 
-         snprintf(s2, MAXSTRING, "%s in %s", error_string(error), s);
+         _mesa_snprintf(s2, MAXSTRING, "%s in %s", error_string(error), s);
          output_if_debug("Mesa: User error", s2, GL_TRUE);
          
          ctx->ErrorDebugFmtString = fmtString;
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index 269d985f1e..ac3a7b5d61 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -583,6 +583,9 @@ _mesa_strtod( const char *s, char **end );
 extern unsigned int
 _mesa_str_checksum(const char *str);
 
+extern int
+_mesa_snprintf( char *str, size_t size, const char *fmt, ... );
+
 extern void
 _mesa_warning( __GLcontext *gc, const char *fmtString, ... );
 
diff --git a/src/mesa/main/version.c b/src/mesa/main/version.c
index 0d01f16059..a39b680650 100644
--- a/src/mesa/main/version.c
+++ b/src/mesa/main/version.c
@@ -124,7 +124,7 @@ _mesa_compute_version(GLcontext *ctx)
    
    ctx->VersionString = (char *) malloc(max);
    if (ctx->VersionString) {
-      snprintf(ctx->VersionString, max, "%u.%u Mesa " MESA_VERSION_STRING,
+      _mesa_snprintf(ctx->VersionString, max, "%u.%u Mesa " MESA_VERSION_STRING,
 	       ctx->VersionMajor, ctx->VersionMinor);
    }
 }
diff --git a/src/mesa/shader/prog_instruction.c b/src/mesa/shader/prog_instruction.c
index e5534b20e3..81099cb99c 100644
--- a/src/mesa/shader/prog_instruction.c
+++ b/src/mesa/shader/prog_instruction.c
@@ -345,7 +345,7 @@ _mesa_opcode_string(gl_inst_opcode opcode)
       return InstInfo[opcode].Name;
    else {
       static char s[20];
-      snprintf(s, sizeof(s), "OP%u", opcode);
+      _mesa_snprintf(s, sizeof(s), "OP%u", opcode);
       return s;
    }
 }
diff --git a/src/mesa/shader/prog_print.c b/src/mesa/shader/prog_print.c
index b4905abf4c..0af70af9ad 100644
--- a/src/mesa/shader/prog_print.c
+++ b/src/mesa/shader/prog_print.c
@@ -77,7 +77,7 @@ file_string(gl_register_file f, gl_prog_print_mode mode)
    default:
       {
          static char s[20];
-         snprintf(s, sizeof(s), "FILE%u", f);
+         _mesa_snprintf(s, sizeof(s), "FILE%u", f);
          return s;
       }
    }
@@ -997,7 +997,7 @@ _mesa_write_shader_to_file(const struct gl_shader *shader)
    else
       type = "vert";
 
-   snprintf(filename, sizeof(filename), "shader_%u.%s", shader->Name, type);
+   _mesa_snprintf(filename, sizeof(filename), "shader_%u.%s", shader->Name, type);
    f = fopen(filename, "w");
    if (!f) {
       fprintf(stderr, "Unable to open %s for writing\n", filename);
@@ -1047,7 +1047,7 @@ _mesa_append_uniforms_to_file(const struct gl_shader *shader,
    else
       type = "vert";
 
-   snprintf(filename, sizeof(filename), "shader_%u.%s", shader->Name, type);
+   _mesa_snprintf(filename, sizeof(filename), "shader_%u.%s", shader->Name, type);
    f = fopen(filename, "a"); /* append */
    if (!f) {
       fprintf(stderr, "Unable to open %s for appending\n", filename);
diff --git a/src/mesa/shader/program_parse.tab.c b/src/mesa/shader/program_parse.tab.c
index 3f26f9f84a..52f6084358 100644
--- a/src/mesa/shader/program_parse.tab.c
+++ b/src/mesa/shader/program_parse.tab.c
@@ -2984,7 +2984,7 @@ yyreduce:
     {
 	   if (((yyvsp[(1) - (1)].integer) < 0) || ((yyvsp[(1) - (1)].integer) > 63)) {
               char s[100];
-              snprintf(s, sizeof(s),
+              _mesa_snprintf(s, sizeof(s),
                              "relative address offset too large (%d)", (yyvsp[(1) - (1)].integer));
 	      yyerror(& (yylsp[(1) - (1)]), state, s);
 	      YYERROR;
@@ -3001,7 +3001,7 @@ yyreduce:
     {
 	   if (((yyvsp[(1) - (1)].integer) < 0) || ((yyvsp[(1) - (1)].integer) > 64)) {
               char s[100];
-              snprintf(s, sizeof(s),
+              _mesa_snprintf(s, sizeof(s),
                              "relative address offset too large (%d)", (yyvsp[(1) - (1)].integer));
 	      yyerror(& (yylsp[(1) - (1)]), state, s);
 	      YYERROR;
@@ -4915,7 +4915,7 @@ yyreduce:
 
 	   if (exist != NULL) {
 	      char m[1000];
-	      snprintf(m, sizeof(m), "redeclared identifier: %s", (yyvsp[(2) - (4)].string));
+	      _mesa_snprintf(m, sizeof(m), "redeclared identifier: %s", (yyvsp[(2) - (4)].string));
 	      free((yyvsp[(2) - (4)].string));
 	      yyerror(& (yylsp[(2) - (4)]), state, m);
 	      YYERROR;
@@ -5559,18 +5559,18 @@ make_error_string(const char *fmt, ...)
 
    va_start(args, fmt);
 
-   /* Call vsnprintf once to determine how large the final string is.  Call it
-    * again to do the actual formatting.  from the vsnprintf manual page:
+   /* Call v_mesa_snprintf once to determine how large the final string is.  Call it
+    * again to do the actual formatting.  from the v_mesa_snprintf manual page:
     *
     *    Upon successful return, these functions return the number of
     *    characters printed  (not including the trailing '\0' used to end
     *    output to strings).
     */
-   length = 1 + vsnprintf(NULL, 0, fmt, args);
+   length = 1 + v_mesa_snprintf(NULL, 0, fmt, args);
 
    str = malloc(length);
    if (str) {
-      vsnprintf(str, length, fmt, args);
+      v_mesa_snprintf(str, length, fmt, args);
    }
 
    va_end(args);
diff --git a/src/mesa/shader/program_parse.y b/src/mesa/shader/program_parse.y
index 1c856d859d..75cb4cf479 100644
--- a/src/mesa/shader/program_parse.y
+++ b/src/mesa/shader/program_parse.y
@@ -936,7 +936,7 @@ addrRegPosOffset: INTEGER
 	{
 	   if (($1 < 0) || ($1 > 63)) {
               char s[100];
-              snprintf(s, sizeof(s),
+              _mesa_snprintf(s, sizeof(s),
                              "relative address offset too large (%d)", $1);
 	      yyerror(& @1, state, s);
 	      YYERROR;
@@ -950,7 +950,7 @@ addrRegNegOffset: INTEGER
 	{
 	   if (($1 < 0) || ($1 > 64)) {
               char s[100];
-              snprintf(s, sizeof(s),
+              _mesa_snprintf(s, sizeof(s),
                              "relative address offset too large (%d)", $1);
 	      yyerror(& @1, state, s);
 	      YYERROR;
@@ -2173,7 +2173,7 @@ ALIAS_statement: ALIAS IDENTIFIER '=' USED_IDENTIFIER
 
 	   if (exist != NULL) {
 	      char m[1000];
-	      snprintf(m, sizeof(m), "redeclared identifier: %s", $2);
+	      _mesa_snprintf(m, sizeof(m), "redeclared identifier: %s", $2);
 	      free($2);
 	      yyerror(& @2, state, m);
 	      YYERROR;
@@ -2599,7 +2599,7 @@ make_error_string(const char *fmt, ...)
    va_start(args, fmt);
 
    /* Call vsnprintf once to determine how large the final string is.  Call it
-    * again to do the actual formatting.  from the vsnprintf manual page:
+    * again to do the actual formatting.  from the v_mesa_snprintf manual page:
     *
     *    Upon successful return, these functions return the number of
     *    characters printed  (not including the trailing '\0' used to end
@@ -2609,7 +2609,7 @@ make_error_string(const char *fmt, ...)
 
    str = malloc(length);
    if (str) {
-      vsnprintf(str, length, fmt, args);
+      v_mesa_snprintf(str, length, fmt, args);
    }
 
    va_end(args);
diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index 8bd780b0b0..129a973cf1 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -2076,7 +2076,7 @@ validate_samplers(GLcontext *ctx, const struct gl_program *prog, char *errMsg)
       unit = prog->SamplerUnits[sampler];
       target = prog->SamplerTargets[sampler];
       if (targetUsed[unit] != -1 && targetUsed[unit] != target) {
-         snprintf(errMsg, 100,
+         _mesa_snprintf(errMsg, 100,
 		  "Texture unit %d is accessed both as %s and %s",
 		  unit, targetName[targetUsed[unit]], targetName[target]);
          return GL_FALSE;
diff --git a/src/mesa/shader/slang/slang_codegen.c b/src/mesa/shader/slang/slang_codegen.c
index b17256bb1e..6901b93d5d 100644
--- a/src/mesa/shader/slang/slang_codegen.c
+++ b/src/mesa/shader/slang/slang_codegen.c
@@ -1643,7 +1643,7 @@ _slang_gen_function_call(slang_assemble_ctx *A, slang_function *fun,
 
    if (A->pragmas->Debug) {
       char s[1000];
-      snprintf(s, sizeof(s), "Call/inline %s()", (char *) fun->header.a_name);
+      _mesa_snprintf(s, sizeof(s), "Call/inline %s()", (char *) fun->header.a_name);
       n->Comment = _slang_strdup(s);
    }
 
@@ -2190,7 +2190,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 52fe786890..7c0ea0c114 100644
--- a/src/mesa/shader/slang/slang_emit.c
+++ b/src/mesa/shader/slang/slang_emit.c
@@ -2303,7 +2303,7 @@ emit_var_ref(slang_emit_info *emitInfo, slang_ir_node *n)
          /* error */
          char s[100];
          /* XXX isn't this really an out of memory/resources error? */
-         snprintf(s, sizeof(s), "Undefined variable '%s'",
+         _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 b59fc0a43a..7c7bfbdbc5 100644
--- a/src/mesa/shader/slang/slang_link.c
+++ b/src/mesa/shader/slang/slang_link.c
@@ -139,7 +139,7 @@ link_varying_vars(GLcontext *ctx,
          }
          if (!bits_agree(var->Flags, v->Flags, PROG_PARAM_BIT_CENTROID)) {
             char msg[100];
-            snprintf(msg, sizeof(msg),
+            _mesa_snprintf(msg, sizeof(msg),
 		     "centroid modifier mismatch for '%s'", var->Name);
             link_error(shProg, msg);
             free(map);
@@ -147,7 +147,7 @@ link_varying_vars(GLcontext *ctx,
          }
          if (!bits_agree(var->Flags, v->Flags, PROG_PARAM_BIT_INVARIANT)) {
             char msg[100];
-            snprintf(msg, sizeof(msg),
+            _mesa_snprintf(msg, sizeof(msg),
 		     "invariant modifier mismatch for '%s'", var->Name);
             link_error(shProg, msg);
             free(map);
-- 
cgit v1.2.3


From 7da9da190f44f504db13570c0cec05dffa240cae Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Sun, 21 Feb 2010 02:13:15 -0800
Subject: mesa: Add assert to check for null pointer dereference.

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

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/framebuffer.c b/src/mesa/main/framebuffer.c
index 065e25fd33..269bc9ac6c 100644
--- a/src/mesa/main/framebuffer.c
+++ b/src/mesa/main/framebuffer.c
@@ -829,8 +829,12 @@ update_framebuffer(GLcontext *ctx, struct gl_framebuffer *fb)
 void
 _mesa_update_framebuffer(GLcontext *ctx)
 {
-   struct gl_framebuffer *drawFb = ctx->DrawBuffer;
-   struct gl_framebuffer *readFb = ctx->ReadBuffer;
+   struct gl_framebuffer *drawFb;
+   struct gl_framebuffer *readFb;
+
+   assert(ctx);
+   drawFb = ctx->DrawBuffer;
+   readFb = ctx->ReadBuffer;
 
    update_framebuffer(ctx, drawFb);
    if (readFb != drawFb)
-- 
cgit v1.2.3


From abcb6b6d01c253627363a05205291630b5247018 Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Tue, 23 Feb 2010 00:19:30 -0800
Subject: mesa: Assert that array index is not negative.

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

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texcompress_fxt1.c b/src/mesa/main/texcompress_fxt1.c
index 71e40dd3e9..149853f7ac 100644
--- a/src/mesa/main/texcompress_fxt1.c
+++ b/src/mesa/main/texcompress_fxt1.c
@@ -528,6 +528,7 @@ fxt1_lloyd (GLfloat vec[][MAX_COMP], GLint nv,
 #else
          GLint best = fxt1_bestcol(vec, nv, input[k], nc, &err);
 #endif
+         assert(best >= 0);
          /* add in closest color */
          for (i = 0; i < nc; i++) {
             sum[best][i] += input[k][i];
-- 
cgit v1.2.3


From 07b07b4d723394c82f7ba915c1cba620b307013d Mon Sep 17 00:00:00 2001
From: Kristian Høgsberg <krh@bitplanet.net>
Date: Thu, 11 Feb 2010 17:37:50 -0500
Subject: glapi: GL_OES_EGL_image autogenerated files

---
 src/glx/indirect.c             |    3 +-
 src/mesa/glapi/glapidispatch.h |   16 +-
 src/mesa/glapi/glapioffsets.h  |    6 +-
 src/mesa/glapi/glapitable.h    |    2 +
 src/mesa/glapi/glapitemp.h     |   12 +
 src/mesa/glapi/glprocs.h       |  608 +++++------
 src/mesa/main/remap_helper.h   | 2317 ++++++++++++++++++++--------------------
 src/mesa/sparc/glapi_sparc.S   |    2 +
 src/mesa/x86-64/glapi_x86-64.S |   74 ++
 src/mesa/x86/glapi_x86.S       |    2 +
 10 files changed, 1586 insertions(+), 1456 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/glx/indirect.c b/src/glx/indirect.c
index 48bae1478f..262637a947 100644
--- a/src/glx/indirect.c
+++ b/src/glx/indirect.c
@@ -30,8 +30,7 @@
 #include "indirect.h"
 #include "glxclient.h"
 #include "indirect_size.h"
-#include "glapitable.h"
-#include "glapidispatch.h"
+#include "dispatch.h"
 #include "glapi.h"
 #include "glthread.h"
 #include <GL/glxproto.h>
diff --git a/src/mesa/glapi/glapidispatch.h b/src/mesa/glapi/glapidispatch.h
index 51ae7feaf6..b7f661c535 100644
--- a/src/mesa/glapi/glapidispatch.h
+++ b/src/mesa/glapi/glapidispatch.h
@@ -2470,10 +2470,16 @@
 #define CALL_GetQueryObjectui64vEXT(disp, parameters) (*((disp)->GetQueryObjectui64vEXT)) parameters
 #define GET_GetQueryObjectui64vEXT(disp) ((disp)->GetQueryObjectui64vEXT)
 #define SET_GetQueryObjectui64vEXT(disp, fn) ((disp)->GetQueryObjectui64vEXT = fn)
+#define CALL_EGLImageTargetRenderbufferStorageOES(disp, parameters) (*((disp)->EGLImageTargetRenderbufferStorageOES)) parameters
+#define GET_EGLImageTargetRenderbufferStorageOES(disp) ((disp)->EGLImageTargetRenderbufferStorageOES)
+#define SET_EGLImageTargetRenderbufferStorageOES(disp, fn) ((disp)->EGLImageTargetRenderbufferStorageOES = fn)
+#define CALL_EGLImageTargetTexture2DOES(disp, parameters) (*((disp)->EGLImageTargetTexture2DOES)) parameters
+#define GET_EGLImageTargetTexture2DOES(disp) ((disp)->EGLImageTargetTexture2DOES)
+#define SET_EGLImageTargetTexture2DOES(disp, fn) ((disp)->EGLImageTargetTexture2DOES = fn)
 
 #else
 
-#define driDispatchRemapTable_size 395
+#define driDispatchRemapTable_size 397
 extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 
 #define AttachShader_remap_index 0
@@ -2871,6 +2877,8 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define ProgramLocalParameters4fvEXT_remap_index 392
 #define GetQueryObjecti64vEXT_remap_index 393
 #define GetQueryObjectui64vEXT_remap_index 394
+#define EGLImageTargetRenderbufferStorageOES_remap_index 395
+#define EGLImageTargetTexture2DOES_remap_index 396
 
 #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])
@@ -4057,6 +4065,12 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define CALL_GetQueryObjectui64vEXT(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLuint, GLenum, GLuint64EXT *)), driDispatchRemapTable[GetQueryObjectui64vEXT_remap_index], parameters)
 #define GET_GetQueryObjectui64vEXT(disp) GET_by_offset(disp, driDispatchRemapTable[GetQueryObjectui64vEXT_remap_index])
 #define SET_GetQueryObjectui64vEXT(disp, fn) SET_by_offset(disp, driDispatchRemapTable[GetQueryObjectui64vEXT_remap_index], fn)
+#define CALL_EGLImageTargetRenderbufferStorageOES(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLvoid *)), driDispatchRemapTable[EGLImageTargetRenderbufferStorageOES_remap_index], parameters)
+#define GET_EGLImageTargetRenderbufferStorageOES(disp) GET_by_offset(disp, driDispatchRemapTable[EGLImageTargetRenderbufferStorageOES_remap_index])
+#define SET_EGLImageTargetRenderbufferStorageOES(disp, fn) SET_by_offset(disp, driDispatchRemapTable[EGLImageTargetRenderbufferStorageOES_remap_index], fn)
+#define CALL_EGLImageTargetTexture2DOES(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLvoid *)), driDispatchRemapTable[EGLImageTargetTexture2DOES_remap_index], parameters)
+#define GET_EGLImageTargetTexture2DOES(disp) GET_by_offset(disp, driDispatchRemapTable[EGLImageTargetTexture2DOES_remap_index])
+#define SET_EGLImageTargetTexture2DOES(disp, fn) SET_by_offset(disp, driDispatchRemapTable[EGLImageTargetTexture2DOES_remap_index], fn)
 
 #endif /* !defined(_GLAPI_USE_REMAP_TABLE) */
 
diff --git a/src/mesa/glapi/glapioffsets.h b/src/mesa/glapi/glapioffsets.h
index c5d367f6f2..8e16e22983 100644
--- a/src/mesa/glapi/glapioffsets.h
+++ b/src/mesa/glapi/glapioffsets.h
@@ -837,7 +837,9 @@
 #define _gloffset_ProgramLocalParameters4fvEXT 800
 #define _gloffset_GetQueryObjecti64vEXT 801
 #define _gloffset_GetQueryObjectui64vEXT 802
-#define _gloffset_FIRST_DYNAMIC 803
+#define _gloffset_EGLImageTargetRenderbufferStorageOES 803
+#define _gloffset_EGLImageTargetTexture2DOES 804
+#define _gloffset_FIRST_DYNAMIC 805
 
 #else
 
@@ -1236,6 +1238,8 @@
 #define _gloffset_ProgramLocalParameters4fvEXT driDispatchRemapTable[ProgramLocalParameters4fvEXT_remap_index]
 #define _gloffset_GetQueryObjecti64vEXT driDispatchRemapTable[GetQueryObjecti64vEXT_remap_index]
 #define _gloffset_GetQueryObjectui64vEXT driDispatchRemapTable[GetQueryObjectui64vEXT_remap_index]
+#define _gloffset_EGLImageTargetRenderbufferStorageOES driDispatchRemapTable[EGLImageTargetRenderbufferStorageOES_remap_index]
+#define _gloffset_EGLImageTargetTexture2DOES driDispatchRemapTable[EGLImageTargetTexture2DOES_remap_index]
 
 #endif /* !defined(_GLAPI_USE_REMAP_TABLE) */
 
diff --git a/src/mesa/glapi/glapitable.h b/src/mesa/glapi/glapitable.h
index 0c5b46d04b..8aeb450b99 100644
--- a/src/mesa/glapi/glapitable.h
+++ b/src/mesa/glapi/glapitable.h
@@ -843,6 +843,8 @@ struct _glapi_table
    void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 800 */
    void (GLAPIENTRYP GetQueryObjecti64vEXT)(GLuint id, GLenum pname, GLint64EXT * params); /* 801 */
    void (GLAPIENTRYP GetQueryObjectui64vEXT)(GLuint id, GLenum pname, GLuint64EXT * params); /* 802 */
+   void (GLAPIENTRYP EGLImageTargetRenderbufferStorageOES)(GLenum target, GLvoid * writeOffset); /* 803 */
+   void (GLAPIENTRYP EGLImageTargetTexture2DOES)(GLenum target, GLvoid * writeOffset); /* 804 */
 };
 
 #endif /* !defined( _GLAPI_TABLE_H_ ) */
diff --git a/src/mesa/glapi/glapitemp.h b/src/mesa/glapi/glapitemp.h
index 2540ef6465..2ef4728e09 100644
--- a/src/mesa/glapi/glapitemp.h
+++ b/src/mesa/glapi/glapitemp.h
@@ -5612,6 +5612,16 @@ KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_802)(GLuint id, GLenum pname, GLu
    DISPATCH(GetQueryObjectui64vEXT, (id, pname, params), (F, "glGetQueryObjectui64vEXT(%d, 0x%x, %p);\n", id, pname, (const void *) params));
 }
 
+KEYWORD1 void KEYWORD2 NAME(EGLImageTargetRenderbufferStorageOES)(GLenum target, GLvoid * writeOffset)
+{
+   DISPATCH(EGLImageTargetRenderbufferStorageOES, (target, writeOffset), (F, "glEGLImageTargetRenderbufferStorageOES(0x%x, %p);\n", target, (const void *) writeOffset));
+}
+
+KEYWORD1 void KEYWORD2 NAME(EGLImageTargetTexture2DOES)(GLenum target, GLvoid * writeOffset)
+{
+   DISPATCH(EGLImageTargetTexture2DOES, (target, writeOffset), (F, "glEGLImageTargetTexture2DOES(0x%x, %p);\n", target, (const void *) writeOffset));
+}
+
 
 #endif /* _GLAPI_SKIP_NORMAL_ENTRY_POINTS */
 
@@ -6568,6 +6578,8 @@ _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(_dispatch_stub_800),
    TABLE_ENTRY(_dispatch_stub_801),
    TABLE_ENTRY(_dispatch_stub_802),
+   TABLE_ENTRY(EGLImageTargetRenderbufferStorageOES),
+   TABLE_ENTRY(EGLImageTargetTexture2DOES),
    /* 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 b590a7c41d..513fa89726 100644
--- a/src/mesa/glapi/glprocs.h
+++ b/src/mesa/glapi/glprocs.h
@@ -855,6 +855,8 @@ static const char gl_string_table[] =
     "glProgramLocalParameters4fvEXT\0"
     "glGetQueryObjecti64vEXT\0"
     "glGetQueryObjectui64vEXT\0"
+    "glEGLImageTargetRenderbufferStorageOES\0"
+    "glEGLImageTargetTexture2DOES\0"
     "glArrayElementEXT\0"
     "glBindTextureEXT\0"
     "glDrawArraysEXT\0"
@@ -2071,308 +2073,310 @@ static const glprocs_table_t static_functions[] = {
     NAME_FUNC_OFFSET(14176, gl_dispatch_stub_800, gl_dispatch_stub_800, NULL, _gloffset_ProgramLocalParameters4fvEXT),
     NAME_FUNC_OFFSET(14207, gl_dispatch_stub_801, gl_dispatch_stub_801, NULL, _gloffset_GetQueryObjecti64vEXT),
     NAME_FUNC_OFFSET(14231, gl_dispatch_stub_802, gl_dispatch_stub_802, NULL, _gloffset_GetQueryObjectui64vEXT),
-    NAME_FUNC_OFFSET(14256, glArrayElement, glArrayElement, NULL, _gloffset_ArrayElement),
-    NAME_FUNC_OFFSET(14274, glBindTexture, glBindTexture, NULL, _gloffset_BindTexture),
-    NAME_FUNC_OFFSET(14291, glDrawArrays, glDrawArrays, NULL, _gloffset_DrawArrays),
-    NAME_FUNC_OFFSET(14307, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, _gloffset_AreTexturesResident),
-    NAME_FUNC_OFFSET(14332, glCopyTexImage1D, glCopyTexImage1D, NULL, _gloffset_CopyTexImage1D),
-    NAME_FUNC_OFFSET(14352, glCopyTexImage2D, glCopyTexImage2D, NULL, _gloffset_CopyTexImage2D),
-    NAME_FUNC_OFFSET(14372, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, _gloffset_CopyTexSubImage1D),
-    NAME_FUNC_OFFSET(14395, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, _gloffset_CopyTexSubImage2D),
-    NAME_FUNC_OFFSET(14418, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, _gloffset_DeleteTextures),
-    NAME_FUNC_OFFSET(14438, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, _gloffset_GenTextures),
-    NAME_FUNC_OFFSET(14455, glGetPointerv, glGetPointerv, NULL, _gloffset_GetPointerv),
-    NAME_FUNC_OFFSET(14472, glIsTexture, glIsTextureEXT, glIsTextureEXT, _gloffset_IsTexture),
-    NAME_FUNC_OFFSET(14487, glPrioritizeTextures, glPrioritizeTextures, NULL, _gloffset_PrioritizeTextures),
-    NAME_FUNC_OFFSET(14511, glTexSubImage1D, glTexSubImage1D, NULL, _gloffset_TexSubImage1D),
-    NAME_FUNC_OFFSET(14530, glTexSubImage2D, glTexSubImage2D, NULL, _gloffset_TexSubImage2D),
-    NAME_FUNC_OFFSET(14549, glBlendColor, glBlendColor, NULL, _gloffset_BlendColor),
-    NAME_FUNC_OFFSET(14565, glBlendEquation, glBlendEquation, NULL, _gloffset_BlendEquation),
-    NAME_FUNC_OFFSET(14584, glDrawRangeElements, glDrawRangeElements, NULL, _gloffset_DrawRangeElements),
-    NAME_FUNC_OFFSET(14607, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
-    NAME_FUNC_OFFSET(14623, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
-    NAME_FUNC_OFFSET(14639, glColorTableParameterfv, glColorTableParameterfv, NULL, _gloffset_ColorTableParameterfv),
-    NAME_FUNC_OFFSET(14666, glColorTableParameteriv, glColorTableParameteriv, NULL, _gloffset_ColorTableParameteriv),
-    NAME_FUNC_OFFSET(14693, glCopyColorTable, glCopyColorTable, NULL, _gloffset_CopyColorTable),
-    NAME_FUNC_OFFSET(14713, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
-    NAME_FUNC_OFFSET(14732, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
-    NAME_FUNC_OFFSET(14751, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
-    NAME_FUNC_OFFSET(14781, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
-    NAME_FUNC_OFFSET(14811, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
-    NAME_FUNC_OFFSET(14841, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
-    NAME_FUNC_OFFSET(14871, glColorSubTable, glColorSubTable, NULL, _gloffset_ColorSubTable),
-    NAME_FUNC_OFFSET(14890, glCopyColorSubTable, glCopyColorSubTable, NULL, _gloffset_CopyColorSubTable),
-    NAME_FUNC_OFFSET(14913, glConvolutionFilter1D, glConvolutionFilter1D, NULL, _gloffset_ConvolutionFilter1D),
-    NAME_FUNC_OFFSET(14938, glConvolutionFilter2D, glConvolutionFilter2D, NULL, _gloffset_ConvolutionFilter2D),
-    NAME_FUNC_OFFSET(14963, glConvolutionParameterf, glConvolutionParameterf, NULL, _gloffset_ConvolutionParameterf),
-    NAME_FUNC_OFFSET(14990, glConvolutionParameterfv, glConvolutionParameterfv, NULL, _gloffset_ConvolutionParameterfv),
-    NAME_FUNC_OFFSET(15018, glConvolutionParameteri, glConvolutionParameteri, NULL, _gloffset_ConvolutionParameteri),
-    NAME_FUNC_OFFSET(15045, glConvolutionParameteriv, glConvolutionParameteriv, NULL, _gloffset_ConvolutionParameteriv),
-    NAME_FUNC_OFFSET(15073, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, _gloffset_CopyConvolutionFilter1D),
-    NAME_FUNC_OFFSET(15102, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, _gloffset_CopyConvolutionFilter2D),
-    NAME_FUNC_OFFSET(15131, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, _gloffset_GetConvolutionFilter),
-    NAME_FUNC_OFFSET(15157, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, _gloffset_GetConvolutionParameterfv),
-    NAME_FUNC_OFFSET(15188, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, _gloffset_GetConvolutionParameteriv),
-    NAME_FUNC_OFFSET(15219, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, _gloffset_GetSeparableFilter),
-    NAME_FUNC_OFFSET(15243, glSeparableFilter2D, glSeparableFilter2D, NULL, _gloffset_SeparableFilter2D),
-    NAME_FUNC_OFFSET(15266, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, _gloffset_GetHistogram),
-    NAME_FUNC_OFFSET(15284, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, _gloffset_GetHistogramParameterfv),
-    NAME_FUNC_OFFSET(15313, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, _gloffset_GetHistogramParameteriv),
-    NAME_FUNC_OFFSET(15342, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, _gloffset_GetMinmax),
-    NAME_FUNC_OFFSET(15357, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, _gloffset_GetMinmaxParameterfv),
-    NAME_FUNC_OFFSET(15383, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, _gloffset_GetMinmaxParameteriv),
-    NAME_FUNC_OFFSET(15409, glHistogram, glHistogram, NULL, _gloffset_Histogram),
-    NAME_FUNC_OFFSET(15424, glMinmax, glMinmax, NULL, _gloffset_Minmax),
-    NAME_FUNC_OFFSET(15436, glResetHistogram, glResetHistogram, NULL, _gloffset_ResetHistogram),
-    NAME_FUNC_OFFSET(15456, glResetMinmax, glResetMinmax, NULL, _gloffset_ResetMinmax),
-    NAME_FUNC_OFFSET(15473, glTexImage3D, glTexImage3D, NULL, _gloffset_TexImage3D),
-    NAME_FUNC_OFFSET(15489, glTexSubImage3D, glTexSubImage3D, NULL, _gloffset_TexSubImage3D),
-    NAME_FUNC_OFFSET(15508, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, _gloffset_CopyTexSubImage3D),
-    NAME_FUNC_OFFSET(15531, glActiveTextureARB, glActiveTextureARB, NULL, _gloffset_ActiveTextureARB),
-    NAME_FUNC_OFFSET(15547, glClientActiveTextureARB, glClientActiveTextureARB, NULL, _gloffset_ClientActiveTextureARB),
-    NAME_FUNC_OFFSET(15569, glMultiTexCoord1dARB, glMultiTexCoord1dARB, NULL, _gloffset_MultiTexCoord1dARB),
-    NAME_FUNC_OFFSET(15587, glMultiTexCoord1dvARB, glMultiTexCoord1dvARB, NULL, _gloffset_MultiTexCoord1dvARB),
-    NAME_FUNC_OFFSET(15606, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, _gloffset_MultiTexCoord1fARB),
-    NAME_FUNC_OFFSET(15624, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, _gloffset_MultiTexCoord1fvARB),
-    NAME_FUNC_OFFSET(15643, glMultiTexCoord1iARB, glMultiTexCoord1iARB, NULL, _gloffset_MultiTexCoord1iARB),
-    NAME_FUNC_OFFSET(15661, glMultiTexCoord1ivARB, glMultiTexCoord1ivARB, NULL, _gloffset_MultiTexCoord1ivARB),
-    NAME_FUNC_OFFSET(15680, glMultiTexCoord1sARB, glMultiTexCoord1sARB, NULL, _gloffset_MultiTexCoord1sARB),
-    NAME_FUNC_OFFSET(15698, glMultiTexCoord1svARB, glMultiTexCoord1svARB, NULL, _gloffset_MultiTexCoord1svARB),
-    NAME_FUNC_OFFSET(15717, glMultiTexCoord2dARB, glMultiTexCoord2dARB, NULL, _gloffset_MultiTexCoord2dARB),
-    NAME_FUNC_OFFSET(15735, glMultiTexCoord2dvARB, glMultiTexCoord2dvARB, NULL, _gloffset_MultiTexCoord2dvARB),
-    NAME_FUNC_OFFSET(15754, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, _gloffset_MultiTexCoord2fARB),
-    NAME_FUNC_OFFSET(15772, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, _gloffset_MultiTexCoord2fvARB),
-    NAME_FUNC_OFFSET(15791, glMultiTexCoord2iARB, glMultiTexCoord2iARB, NULL, _gloffset_MultiTexCoord2iARB),
-    NAME_FUNC_OFFSET(15809, glMultiTexCoord2ivARB, glMultiTexCoord2ivARB, NULL, _gloffset_MultiTexCoord2ivARB),
-    NAME_FUNC_OFFSET(15828, glMultiTexCoord2sARB, glMultiTexCoord2sARB, NULL, _gloffset_MultiTexCoord2sARB),
-    NAME_FUNC_OFFSET(15846, glMultiTexCoord2svARB, glMultiTexCoord2svARB, NULL, _gloffset_MultiTexCoord2svARB),
-    NAME_FUNC_OFFSET(15865, glMultiTexCoord3dARB, glMultiTexCoord3dARB, NULL, _gloffset_MultiTexCoord3dARB),
-    NAME_FUNC_OFFSET(15883, glMultiTexCoord3dvARB, glMultiTexCoord3dvARB, NULL, _gloffset_MultiTexCoord3dvARB),
-    NAME_FUNC_OFFSET(15902, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, _gloffset_MultiTexCoord3fARB),
-    NAME_FUNC_OFFSET(15920, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, _gloffset_MultiTexCoord3fvARB),
-    NAME_FUNC_OFFSET(15939, glMultiTexCoord3iARB, glMultiTexCoord3iARB, NULL, _gloffset_MultiTexCoord3iARB),
-    NAME_FUNC_OFFSET(15957, glMultiTexCoord3ivARB, glMultiTexCoord3ivARB, NULL, _gloffset_MultiTexCoord3ivARB),
-    NAME_FUNC_OFFSET(15976, glMultiTexCoord3sARB, glMultiTexCoord3sARB, NULL, _gloffset_MultiTexCoord3sARB),
-    NAME_FUNC_OFFSET(15994, glMultiTexCoord3svARB, glMultiTexCoord3svARB, NULL, _gloffset_MultiTexCoord3svARB),
-    NAME_FUNC_OFFSET(16013, glMultiTexCoord4dARB, glMultiTexCoord4dARB, NULL, _gloffset_MultiTexCoord4dARB),
-    NAME_FUNC_OFFSET(16031, glMultiTexCoord4dvARB, glMultiTexCoord4dvARB, NULL, _gloffset_MultiTexCoord4dvARB),
-    NAME_FUNC_OFFSET(16050, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, _gloffset_MultiTexCoord4fARB),
-    NAME_FUNC_OFFSET(16068, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, _gloffset_MultiTexCoord4fvARB),
-    NAME_FUNC_OFFSET(16087, glMultiTexCoord4iARB, glMultiTexCoord4iARB, NULL, _gloffset_MultiTexCoord4iARB),
-    NAME_FUNC_OFFSET(16105, glMultiTexCoord4ivARB, glMultiTexCoord4ivARB, NULL, _gloffset_MultiTexCoord4ivARB),
-    NAME_FUNC_OFFSET(16124, glMultiTexCoord4sARB, glMultiTexCoord4sARB, NULL, _gloffset_MultiTexCoord4sARB),
-    NAME_FUNC_OFFSET(16142, glMultiTexCoord4svARB, glMultiTexCoord4svARB, NULL, _gloffset_MultiTexCoord4svARB),
-    NAME_FUNC_OFFSET(16161, glStencilOpSeparate, glStencilOpSeparate, NULL, _gloffset_StencilOpSeparate),
-    NAME_FUNC_OFFSET(16184, glLoadTransposeMatrixdARB, glLoadTransposeMatrixdARB, NULL, _gloffset_LoadTransposeMatrixdARB),
-    NAME_FUNC_OFFSET(16207, glLoadTransposeMatrixfARB, glLoadTransposeMatrixfARB, NULL, _gloffset_LoadTransposeMatrixfARB),
-    NAME_FUNC_OFFSET(16230, glMultTransposeMatrixdARB, glMultTransposeMatrixdARB, NULL, _gloffset_MultTransposeMatrixdARB),
-    NAME_FUNC_OFFSET(16253, glMultTransposeMatrixfARB, glMultTransposeMatrixfARB, NULL, _gloffset_MultTransposeMatrixfARB),
-    NAME_FUNC_OFFSET(16276, glSampleCoverageARB, glSampleCoverageARB, NULL, _gloffset_SampleCoverageARB),
-    NAME_FUNC_OFFSET(16293, glCompressedTexImage1DARB, glCompressedTexImage1DARB, NULL, _gloffset_CompressedTexImage1DARB),
-    NAME_FUNC_OFFSET(16316, glCompressedTexImage2DARB, glCompressedTexImage2DARB, NULL, _gloffset_CompressedTexImage2DARB),
-    NAME_FUNC_OFFSET(16339, glCompressedTexImage3DARB, glCompressedTexImage3DARB, NULL, _gloffset_CompressedTexImage3DARB),
-    NAME_FUNC_OFFSET(16362, glCompressedTexSubImage1DARB, glCompressedTexSubImage1DARB, NULL, _gloffset_CompressedTexSubImage1DARB),
-    NAME_FUNC_OFFSET(16388, glCompressedTexSubImage2DARB, glCompressedTexSubImage2DARB, NULL, _gloffset_CompressedTexSubImage2DARB),
-    NAME_FUNC_OFFSET(16414, glCompressedTexSubImage3DARB, glCompressedTexSubImage3DARB, NULL, _gloffset_CompressedTexSubImage3DARB),
-    NAME_FUNC_OFFSET(16440, glGetCompressedTexImageARB, glGetCompressedTexImageARB, NULL, _gloffset_GetCompressedTexImageARB),
-    NAME_FUNC_OFFSET(16464, glDisableVertexAttribArrayARB, glDisableVertexAttribArrayARB, NULL, _gloffset_DisableVertexAttribArrayARB),
-    NAME_FUNC_OFFSET(16491, glEnableVertexAttribArrayARB, glEnableVertexAttribArrayARB, NULL, _gloffset_EnableVertexAttribArrayARB),
-    NAME_FUNC_OFFSET(16517, glGetVertexAttribdvARB, glGetVertexAttribdvARB, NULL, _gloffset_GetVertexAttribdvARB),
-    NAME_FUNC_OFFSET(16537, glGetVertexAttribfvARB, glGetVertexAttribfvARB, NULL, _gloffset_GetVertexAttribfvARB),
-    NAME_FUNC_OFFSET(16557, glGetVertexAttribivARB, glGetVertexAttribivARB, NULL, _gloffset_GetVertexAttribivARB),
-    NAME_FUNC_OFFSET(16577, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, _gloffset_ProgramEnvParameter4dARB),
-    NAME_FUNC_OFFSET(16600, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, _gloffset_ProgramEnvParameter4dvARB),
-    NAME_FUNC_OFFSET(16624, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, _gloffset_ProgramEnvParameter4fARB),
-    NAME_FUNC_OFFSET(16647, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, _gloffset_ProgramEnvParameter4fvARB),
-    NAME_FUNC_OFFSET(16671, glVertexAttrib1dARB, glVertexAttrib1dARB, NULL, _gloffset_VertexAttrib1dARB),
-    NAME_FUNC_OFFSET(16688, glVertexAttrib1dvARB, glVertexAttrib1dvARB, NULL, _gloffset_VertexAttrib1dvARB),
-    NAME_FUNC_OFFSET(16706, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, _gloffset_VertexAttrib1fARB),
-    NAME_FUNC_OFFSET(16723, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, _gloffset_VertexAttrib1fvARB),
-    NAME_FUNC_OFFSET(16741, glVertexAttrib1sARB, glVertexAttrib1sARB, NULL, _gloffset_VertexAttrib1sARB),
-    NAME_FUNC_OFFSET(16758, glVertexAttrib1svARB, glVertexAttrib1svARB, NULL, _gloffset_VertexAttrib1svARB),
-    NAME_FUNC_OFFSET(16776, glVertexAttrib2dARB, glVertexAttrib2dARB, NULL, _gloffset_VertexAttrib2dARB),
-    NAME_FUNC_OFFSET(16793, glVertexAttrib2dvARB, glVertexAttrib2dvARB, NULL, _gloffset_VertexAttrib2dvARB),
-    NAME_FUNC_OFFSET(16811, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, _gloffset_VertexAttrib2fARB),
-    NAME_FUNC_OFFSET(16828, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, _gloffset_VertexAttrib2fvARB),
-    NAME_FUNC_OFFSET(16846, glVertexAttrib2sARB, glVertexAttrib2sARB, NULL, _gloffset_VertexAttrib2sARB),
-    NAME_FUNC_OFFSET(16863, glVertexAttrib2svARB, glVertexAttrib2svARB, NULL, _gloffset_VertexAttrib2svARB),
-    NAME_FUNC_OFFSET(16881, glVertexAttrib3dARB, glVertexAttrib3dARB, NULL, _gloffset_VertexAttrib3dARB),
-    NAME_FUNC_OFFSET(16898, glVertexAttrib3dvARB, glVertexAttrib3dvARB, NULL, _gloffset_VertexAttrib3dvARB),
-    NAME_FUNC_OFFSET(16916, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, _gloffset_VertexAttrib3fARB),
-    NAME_FUNC_OFFSET(16933, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, _gloffset_VertexAttrib3fvARB),
-    NAME_FUNC_OFFSET(16951, glVertexAttrib3sARB, glVertexAttrib3sARB, NULL, _gloffset_VertexAttrib3sARB),
-    NAME_FUNC_OFFSET(16968, glVertexAttrib3svARB, glVertexAttrib3svARB, NULL, _gloffset_VertexAttrib3svARB),
-    NAME_FUNC_OFFSET(16986, glVertexAttrib4NbvARB, glVertexAttrib4NbvARB, NULL, _gloffset_VertexAttrib4NbvARB),
-    NAME_FUNC_OFFSET(17005, glVertexAttrib4NivARB, glVertexAttrib4NivARB, NULL, _gloffset_VertexAttrib4NivARB),
-    NAME_FUNC_OFFSET(17024, glVertexAttrib4NsvARB, glVertexAttrib4NsvARB, NULL, _gloffset_VertexAttrib4NsvARB),
-    NAME_FUNC_OFFSET(17043, glVertexAttrib4NubARB, glVertexAttrib4NubARB, NULL, _gloffset_VertexAttrib4NubARB),
-    NAME_FUNC_OFFSET(17062, glVertexAttrib4NubvARB, glVertexAttrib4NubvARB, NULL, _gloffset_VertexAttrib4NubvARB),
-    NAME_FUNC_OFFSET(17082, glVertexAttrib4NuivARB, glVertexAttrib4NuivARB, NULL, _gloffset_VertexAttrib4NuivARB),
-    NAME_FUNC_OFFSET(17102, glVertexAttrib4NusvARB, glVertexAttrib4NusvARB, NULL, _gloffset_VertexAttrib4NusvARB),
-    NAME_FUNC_OFFSET(17122, glVertexAttrib4bvARB, glVertexAttrib4bvARB, NULL, _gloffset_VertexAttrib4bvARB),
-    NAME_FUNC_OFFSET(17140, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL, _gloffset_VertexAttrib4dARB),
-    NAME_FUNC_OFFSET(17157, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL, _gloffset_VertexAttrib4dvARB),
-    NAME_FUNC_OFFSET(17175, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, _gloffset_VertexAttrib4fARB),
-    NAME_FUNC_OFFSET(17192, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, _gloffset_VertexAttrib4fvARB),
-    NAME_FUNC_OFFSET(17210, glVertexAttrib4ivARB, glVertexAttrib4ivARB, NULL, _gloffset_VertexAttrib4ivARB),
-    NAME_FUNC_OFFSET(17228, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL, _gloffset_VertexAttrib4sARB),
-    NAME_FUNC_OFFSET(17245, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL, _gloffset_VertexAttrib4svARB),
-    NAME_FUNC_OFFSET(17263, glVertexAttrib4ubvARB, glVertexAttrib4ubvARB, NULL, _gloffset_VertexAttrib4ubvARB),
-    NAME_FUNC_OFFSET(17282, glVertexAttrib4uivARB, glVertexAttrib4uivARB, NULL, _gloffset_VertexAttrib4uivARB),
-    NAME_FUNC_OFFSET(17301, glVertexAttrib4usvARB, glVertexAttrib4usvARB, NULL, _gloffset_VertexAttrib4usvARB),
-    NAME_FUNC_OFFSET(17320, glVertexAttribPointerARB, glVertexAttribPointerARB, NULL, _gloffset_VertexAttribPointerARB),
-    NAME_FUNC_OFFSET(17342, glBindBufferARB, glBindBufferARB, NULL, _gloffset_BindBufferARB),
-    NAME_FUNC_OFFSET(17355, glBufferDataARB, glBufferDataARB, NULL, _gloffset_BufferDataARB),
-    NAME_FUNC_OFFSET(17368, glBufferSubDataARB, glBufferSubDataARB, NULL, _gloffset_BufferSubDataARB),
-    NAME_FUNC_OFFSET(17384, glDeleteBuffersARB, glDeleteBuffersARB, NULL, _gloffset_DeleteBuffersARB),
-    NAME_FUNC_OFFSET(17400, glGenBuffersARB, glGenBuffersARB, NULL, _gloffset_GenBuffersARB),
-    NAME_FUNC_OFFSET(17413, glGetBufferParameterivARB, glGetBufferParameterivARB, NULL, _gloffset_GetBufferParameterivARB),
-    NAME_FUNC_OFFSET(17436, glGetBufferPointervARB, glGetBufferPointervARB, NULL, _gloffset_GetBufferPointervARB),
-    NAME_FUNC_OFFSET(17456, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL, _gloffset_GetBufferSubDataARB),
-    NAME_FUNC_OFFSET(17475, glIsBufferARB, glIsBufferARB, NULL, _gloffset_IsBufferARB),
-    NAME_FUNC_OFFSET(17486, glMapBufferARB, glMapBufferARB, NULL, _gloffset_MapBufferARB),
-    NAME_FUNC_OFFSET(17498, glUnmapBufferARB, glUnmapBufferARB, NULL, _gloffset_UnmapBufferARB),
-    NAME_FUNC_OFFSET(17512, glBeginQueryARB, glBeginQueryARB, NULL, _gloffset_BeginQueryARB),
-    NAME_FUNC_OFFSET(17525, glDeleteQueriesARB, glDeleteQueriesARB, NULL, _gloffset_DeleteQueriesARB),
-    NAME_FUNC_OFFSET(17541, glEndQueryARB, glEndQueryARB, NULL, _gloffset_EndQueryARB),
-    NAME_FUNC_OFFSET(17552, glGenQueriesARB, glGenQueriesARB, NULL, _gloffset_GenQueriesARB),
-    NAME_FUNC_OFFSET(17565, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL, _gloffset_GetQueryObjectivARB),
-    NAME_FUNC_OFFSET(17584, glGetQueryObjectuivARB, glGetQueryObjectuivARB, NULL, _gloffset_GetQueryObjectuivARB),
-    NAME_FUNC_OFFSET(17604, glGetQueryivARB, glGetQueryivARB, NULL, _gloffset_GetQueryivARB),
-    NAME_FUNC_OFFSET(17617, glIsQueryARB, glIsQueryARB, NULL, _gloffset_IsQueryARB),
-    NAME_FUNC_OFFSET(17627, glCompileShaderARB, glCompileShaderARB, NULL, _gloffset_CompileShaderARB),
-    NAME_FUNC_OFFSET(17643, glGetActiveUniformARB, glGetActiveUniformARB, NULL, _gloffset_GetActiveUniformARB),
-    NAME_FUNC_OFFSET(17662, glGetShaderSourceARB, glGetShaderSourceARB, NULL, _gloffset_GetShaderSourceARB),
-    NAME_FUNC_OFFSET(17680, glGetUniformLocationARB, glGetUniformLocationARB, NULL, _gloffset_GetUniformLocationARB),
-    NAME_FUNC_OFFSET(17701, glGetUniformfvARB, glGetUniformfvARB, NULL, _gloffset_GetUniformfvARB),
-    NAME_FUNC_OFFSET(17716, glGetUniformivARB, glGetUniformivARB, NULL, _gloffset_GetUniformivARB),
-    NAME_FUNC_OFFSET(17731, glLinkProgramARB, glLinkProgramARB, NULL, _gloffset_LinkProgramARB),
-    NAME_FUNC_OFFSET(17745, glShaderSourceARB, glShaderSourceARB, NULL, _gloffset_ShaderSourceARB),
-    NAME_FUNC_OFFSET(17760, glUniform1fARB, glUniform1fARB, NULL, _gloffset_Uniform1fARB),
-    NAME_FUNC_OFFSET(17772, glUniform1fvARB, glUniform1fvARB, NULL, _gloffset_Uniform1fvARB),
-    NAME_FUNC_OFFSET(17785, glUniform1iARB, glUniform1iARB, NULL, _gloffset_Uniform1iARB),
-    NAME_FUNC_OFFSET(17797, glUniform1ivARB, glUniform1ivARB, NULL, _gloffset_Uniform1ivARB),
-    NAME_FUNC_OFFSET(17810, glUniform2fARB, glUniform2fARB, NULL, _gloffset_Uniform2fARB),
-    NAME_FUNC_OFFSET(17822, glUniform2fvARB, glUniform2fvARB, NULL, _gloffset_Uniform2fvARB),
-    NAME_FUNC_OFFSET(17835, glUniform2iARB, glUniform2iARB, NULL, _gloffset_Uniform2iARB),
-    NAME_FUNC_OFFSET(17847, glUniform2ivARB, glUniform2ivARB, NULL, _gloffset_Uniform2ivARB),
-    NAME_FUNC_OFFSET(17860, glUniform3fARB, glUniform3fARB, NULL, _gloffset_Uniform3fARB),
-    NAME_FUNC_OFFSET(17872, glUniform3fvARB, glUniform3fvARB, NULL, _gloffset_Uniform3fvARB),
-    NAME_FUNC_OFFSET(17885, glUniform3iARB, glUniform3iARB, NULL, _gloffset_Uniform3iARB),
-    NAME_FUNC_OFFSET(17897, glUniform3ivARB, glUniform3ivARB, NULL, _gloffset_Uniform3ivARB),
-    NAME_FUNC_OFFSET(17910, glUniform4fARB, glUniform4fARB, NULL, _gloffset_Uniform4fARB),
-    NAME_FUNC_OFFSET(17922, glUniform4fvARB, glUniform4fvARB, NULL, _gloffset_Uniform4fvARB),
-    NAME_FUNC_OFFSET(17935, glUniform4iARB, glUniform4iARB, NULL, _gloffset_Uniform4iARB),
-    NAME_FUNC_OFFSET(17947, glUniform4ivARB, glUniform4ivARB, NULL, _gloffset_Uniform4ivARB),
-    NAME_FUNC_OFFSET(17960, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL, _gloffset_UniformMatrix2fvARB),
-    NAME_FUNC_OFFSET(17979, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL, _gloffset_UniformMatrix3fvARB),
-    NAME_FUNC_OFFSET(17998, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL, _gloffset_UniformMatrix4fvARB),
-    NAME_FUNC_OFFSET(18017, glUseProgramObjectARB, glUseProgramObjectARB, NULL, _gloffset_UseProgramObjectARB),
-    NAME_FUNC_OFFSET(18030, glValidateProgramARB, glValidateProgramARB, NULL, _gloffset_ValidateProgramARB),
-    NAME_FUNC_OFFSET(18048, glBindAttribLocationARB, glBindAttribLocationARB, NULL, _gloffset_BindAttribLocationARB),
-    NAME_FUNC_OFFSET(18069, glGetActiveAttribARB, glGetActiveAttribARB, NULL, _gloffset_GetActiveAttribARB),
-    NAME_FUNC_OFFSET(18087, glGetAttribLocationARB, glGetAttribLocationARB, NULL, _gloffset_GetAttribLocationARB),
-    NAME_FUNC_OFFSET(18107, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
-    NAME_FUNC_OFFSET(18121, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
-    NAME_FUNC_OFFSET(18138, glRenderbufferStorageMultisample, glRenderbufferStorageMultisample, NULL, _gloffset_RenderbufferStorageMultisample),
-    NAME_FUNC_OFFSET(18174, gl_dispatch_stub_584, gl_dispatch_stub_584, NULL, _gloffset_SampleMaskSGIS),
-    NAME_FUNC_OFFSET(18190, gl_dispatch_stub_585, gl_dispatch_stub_585, NULL, _gloffset_SamplePatternSGIS),
-    NAME_FUNC_OFFSET(18209, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET(18227, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET(18248, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET(18270, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET(18289, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET(18311, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET(18334, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, _gloffset_SecondaryColor3bEXT),
-    NAME_FUNC_OFFSET(18353, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, _gloffset_SecondaryColor3bvEXT),
-    NAME_FUNC_OFFSET(18373, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, _gloffset_SecondaryColor3dEXT),
-    NAME_FUNC_OFFSET(18392, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, _gloffset_SecondaryColor3dvEXT),
-    NAME_FUNC_OFFSET(18412, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, _gloffset_SecondaryColor3fEXT),
-    NAME_FUNC_OFFSET(18431, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, _gloffset_SecondaryColor3fvEXT),
-    NAME_FUNC_OFFSET(18451, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, _gloffset_SecondaryColor3iEXT),
-    NAME_FUNC_OFFSET(18470, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, _gloffset_SecondaryColor3ivEXT),
-    NAME_FUNC_OFFSET(18490, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, _gloffset_SecondaryColor3sEXT),
-    NAME_FUNC_OFFSET(18509, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, _gloffset_SecondaryColor3svEXT),
-    NAME_FUNC_OFFSET(18529, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, _gloffset_SecondaryColor3ubEXT),
-    NAME_FUNC_OFFSET(18549, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, _gloffset_SecondaryColor3ubvEXT),
-    NAME_FUNC_OFFSET(18570, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, _gloffset_SecondaryColor3uiEXT),
-    NAME_FUNC_OFFSET(18590, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, _gloffset_SecondaryColor3uivEXT),
-    NAME_FUNC_OFFSET(18611, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, _gloffset_SecondaryColor3usEXT),
-    NAME_FUNC_OFFSET(18631, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, _gloffset_SecondaryColor3usvEXT),
-    NAME_FUNC_OFFSET(18652, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, _gloffset_SecondaryColorPointerEXT),
-    NAME_FUNC_OFFSET(18676, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, _gloffset_MultiDrawArraysEXT),
-    NAME_FUNC_OFFSET(18694, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, _gloffset_MultiDrawElementsEXT),
-    NAME_FUNC_OFFSET(18714, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, _gloffset_FogCoordPointerEXT),
-    NAME_FUNC_OFFSET(18732, glFogCoorddEXT, glFogCoorddEXT, NULL, _gloffset_FogCoorddEXT),
-    NAME_FUNC_OFFSET(18744, glFogCoorddvEXT, glFogCoorddvEXT, NULL, _gloffset_FogCoorddvEXT),
-    NAME_FUNC_OFFSET(18757, glFogCoordfEXT, glFogCoordfEXT, NULL, _gloffset_FogCoordfEXT),
-    NAME_FUNC_OFFSET(18769, glFogCoordfvEXT, glFogCoordfvEXT, NULL, _gloffset_FogCoordfvEXT),
-    NAME_FUNC_OFFSET(18782, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
-    NAME_FUNC_OFFSET(18802, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
-    NAME_FUNC_OFFSET(18826, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
-    NAME_FUNC_OFFSET(18840, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
-    NAME_FUNC_OFFSET(18857, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
-    NAME_FUNC_OFFSET(18872, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
-    NAME_FUNC_OFFSET(18890, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
-    NAME_FUNC_OFFSET(18904, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
-    NAME_FUNC_OFFSET(18921, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
-    NAME_FUNC_OFFSET(18936, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
-    NAME_FUNC_OFFSET(18954, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
-    NAME_FUNC_OFFSET(18968, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
-    NAME_FUNC_OFFSET(18985, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
-    NAME_FUNC_OFFSET(19000, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
-    NAME_FUNC_OFFSET(19018, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
-    NAME_FUNC_OFFSET(19032, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
-    NAME_FUNC_OFFSET(19049, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
-    NAME_FUNC_OFFSET(19064, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
-    NAME_FUNC_OFFSET(19082, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
-    NAME_FUNC_OFFSET(19096, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
-    NAME_FUNC_OFFSET(19113, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
-    NAME_FUNC_OFFSET(19128, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
-    NAME_FUNC_OFFSET(19146, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
-    NAME_FUNC_OFFSET(19160, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
-    NAME_FUNC_OFFSET(19177, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
-    NAME_FUNC_OFFSET(19192, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
-    NAME_FUNC_OFFSET(19210, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
-    NAME_FUNC_OFFSET(19224, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
-    NAME_FUNC_OFFSET(19241, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
-    NAME_FUNC_OFFSET(19256, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
-    NAME_FUNC_OFFSET(19274, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
-    NAME_FUNC_OFFSET(19288, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
-    NAME_FUNC_OFFSET(19305, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
-    NAME_FUNC_OFFSET(19320, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
-    NAME_FUNC_OFFSET(19338, glBindProgramNV, glBindProgramNV, NULL, _gloffset_BindProgramNV),
-    NAME_FUNC_OFFSET(19355, glDeleteProgramsNV, glDeleteProgramsNV, NULL, _gloffset_DeleteProgramsNV),
-    NAME_FUNC_OFFSET(19375, glGenProgramsNV, glGenProgramsNV, NULL, _gloffset_GenProgramsNV),
-    NAME_FUNC_OFFSET(19392, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
-    NAME_FUNC_OFFSET(19418, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
-    NAME_FUNC_OFFSET(19447, glIsProgramNV, glIsProgramNV, NULL, _gloffset_IsProgramNV),
-    NAME_FUNC_OFFSET(19462, glPointParameteriNV, glPointParameteriNV, NULL, _gloffset_PointParameteriNV),
-    NAME_FUNC_OFFSET(19480, glPointParameterivNV, glPointParameterivNV, NULL, _gloffset_PointParameterivNV),
-    NAME_FUNC_OFFSET(19499, gl_dispatch_stub_755, gl_dispatch_stub_755, NULL, _gloffset_DeleteVertexArraysAPPLE),
-    NAME_FUNC_OFFSET(19520, gl_dispatch_stub_757, gl_dispatch_stub_757, NULL, _gloffset_IsVertexArrayAPPLE),
-    NAME_FUNC_OFFSET(19536, gl_dispatch_stub_765, gl_dispatch_stub_765, NULL, _gloffset_BlendEquationSeparateEXT),
-    NAME_FUNC_OFFSET(19560, gl_dispatch_stub_765, gl_dispatch_stub_765, NULL, _gloffset_BlendEquationSeparateEXT),
-    NAME_FUNC_OFFSET(19587, glBindFramebufferEXT, glBindFramebufferEXT, NULL, _gloffset_BindFramebufferEXT),
-    NAME_FUNC_OFFSET(19605, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, _gloffset_BindRenderbufferEXT),
-    NAME_FUNC_OFFSET(19624, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, _gloffset_CheckFramebufferStatusEXT),
-    NAME_FUNC_OFFSET(19649, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, _gloffset_DeleteFramebuffersEXT),
-    NAME_FUNC_OFFSET(19670, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, _gloffset_DeleteRenderbuffersEXT),
-    NAME_FUNC_OFFSET(19692, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, _gloffset_FramebufferRenderbufferEXT),
-    NAME_FUNC_OFFSET(19718, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, _gloffset_FramebufferTexture1DEXT),
-    NAME_FUNC_OFFSET(19741, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, _gloffset_FramebufferTexture2DEXT),
-    NAME_FUNC_OFFSET(19764, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, _gloffset_FramebufferTexture3DEXT),
-    NAME_FUNC_OFFSET(19787, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, _gloffset_GenFramebuffersEXT),
-    NAME_FUNC_OFFSET(19805, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, _gloffset_GenRenderbuffersEXT),
-    NAME_FUNC_OFFSET(19824, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, _gloffset_GenerateMipmapEXT),
-    NAME_FUNC_OFFSET(19841, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, _gloffset_GetFramebufferAttachmentParameterivEXT),
-    NAME_FUNC_OFFSET(19879, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, _gloffset_GetRenderbufferParameterivEXT),
-    NAME_FUNC_OFFSET(19908, glIsFramebufferEXT, glIsFramebufferEXT, NULL, _gloffset_IsFramebufferEXT),
-    NAME_FUNC_OFFSET(19924, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, _gloffset_IsRenderbufferEXT),
-    NAME_FUNC_OFFSET(19941, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, _gloffset_RenderbufferStorageEXT),
-    NAME_FUNC_OFFSET(19963, gl_dispatch_stub_783, gl_dispatch_stub_783, NULL, _gloffset_BlitFramebufferEXT),
-    NAME_FUNC_OFFSET(19981, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, _gloffset_FramebufferTextureLayerEXT),
-    NAME_FUNC_OFFSET(20007, glProvokingVertexEXT, glProvokingVertexEXT, NULL, _gloffset_ProvokingVertexEXT),
+    NAME_FUNC_OFFSET(14256, glEGLImageTargetRenderbufferStorageOES, glEGLImageTargetRenderbufferStorageOES, NULL, _gloffset_EGLImageTargetRenderbufferStorageOES),
+    NAME_FUNC_OFFSET(14295, glEGLImageTargetTexture2DOES, glEGLImageTargetTexture2DOES, NULL, _gloffset_EGLImageTargetTexture2DOES),
+    NAME_FUNC_OFFSET(14324, glArrayElement, glArrayElement, NULL, _gloffset_ArrayElement),
+    NAME_FUNC_OFFSET(14342, glBindTexture, glBindTexture, NULL, _gloffset_BindTexture),
+    NAME_FUNC_OFFSET(14359, glDrawArrays, glDrawArrays, NULL, _gloffset_DrawArrays),
+    NAME_FUNC_OFFSET(14375, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, _gloffset_AreTexturesResident),
+    NAME_FUNC_OFFSET(14400, glCopyTexImage1D, glCopyTexImage1D, NULL, _gloffset_CopyTexImage1D),
+    NAME_FUNC_OFFSET(14420, glCopyTexImage2D, glCopyTexImage2D, NULL, _gloffset_CopyTexImage2D),
+    NAME_FUNC_OFFSET(14440, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, _gloffset_CopyTexSubImage1D),
+    NAME_FUNC_OFFSET(14463, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, _gloffset_CopyTexSubImage2D),
+    NAME_FUNC_OFFSET(14486, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, _gloffset_DeleteTextures),
+    NAME_FUNC_OFFSET(14506, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, _gloffset_GenTextures),
+    NAME_FUNC_OFFSET(14523, glGetPointerv, glGetPointerv, NULL, _gloffset_GetPointerv),
+    NAME_FUNC_OFFSET(14540, glIsTexture, glIsTextureEXT, glIsTextureEXT, _gloffset_IsTexture),
+    NAME_FUNC_OFFSET(14555, glPrioritizeTextures, glPrioritizeTextures, NULL, _gloffset_PrioritizeTextures),
+    NAME_FUNC_OFFSET(14579, glTexSubImage1D, glTexSubImage1D, NULL, _gloffset_TexSubImage1D),
+    NAME_FUNC_OFFSET(14598, glTexSubImage2D, glTexSubImage2D, NULL, _gloffset_TexSubImage2D),
+    NAME_FUNC_OFFSET(14617, glBlendColor, glBlendColor, NULL, _gloffset_BlendColor),
+    NAME_FUNC_OFFSET(14633, glBlendEquation, glBlendEquation, NULL, _gloffset_BlendEquation),
+    NAME_FUNC_OFFSET(14652, glDrawRangeElements, glDrawRangeElements, NULL, _gloffset_DrawRangeElements),
+    NAME_FUNC_OFFSET(14675, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
+    NAME_FUNC_OFFSET(14691, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
+    NAME_FUNC_OFFSET(14707, glColorTableParameterfv, glColorTableParameterfv, NULL, _gloffset_ColorTableParameterfv),
+    NAME_FUNC_OFFSET(14734, glColorTableParameteriv, glColorTableParameteriv, NULL, _gloffset_ColorTableParameteriv),
+    NAME_FUNC_OFFSET(14761, glCopyColorTable, glCopyColorTable, NULL, _gloffset_CopyColorTable),
+    NAME_FUNC_OFFSET(14781, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
+    NAME_FUNC_OFFSET(14800, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
+    NAME_FUNC_OFFSET(14819, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
+    NAME_FUNC_OFFSET(14849, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
+    NAME_FUNC_OFFSET(14879, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
+    NAME_FUNC_OFFSET(14909, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
+    NAME_FUNC_OFFSET(14939, glColorSubTable, glColorSubTable, NULL, _gloffset_ColorSubTable),
+    NAME_FUNC_OFFSET(14958, glCopyColorSubTable, glCopyColorSubTable, NULL, _gloffset_CopyColorSubTable),
+    NAME_FUNC_OFFSET(14981, glConvolutionFilter1D, glConvolutionFilter1D, NULL, _gloffset_ConvolutionFilter1D),
+    NAME_FUNC_OFFSET(15006, glConvolutionFilter2D, glConvolutionFilter2D, NULL, _gloffset_ConvolutionFilter2D),
+    NAME_FUNC_OFFSET(15031, glConvolutionParameterf, glConvolutionParameterf, NULL, _gloffset_ConvolutionParameterf),
+    NAME_FUNC_OFFSET(15058, glConvolutionParameterfv, glConvolutionParameterfv, NULL, _gloffset_ConvolutionParameterfv),
+    NAME_FUNC_OFFSET(15086, glConvolutionParameteri, glConvolutionParameteri, NULL, _gloffset_ConvolutionParameteri),
+    NAME_FUNC_OFFSET(15113, glConvolutionParameteriv, glConvolutionParameteriv, NULL, _gloffset_ConvolutionParameteriv),
+    NAME_FUNC_OFFSET(15141, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, _gloffset_CopyConvolutionFilter1D),
+    NAME_FUNC_OFFSET(15170, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, _gloffset_CopyConvolutionFilter2D),
+    NAME_FUNC_OFFSET(15199, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, _gloffset_GetConvolutionFilter),
+    NAME_FUNC_OFFSET(15225, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, _gloffset_GetConvolutionParameterfv),
+    NAME_FUNC_OFFSET(15256, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, _gloffset_GetConvolutionParameteriv),
+    NAME_FUNC_OFFSET(15287, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, _gloffset_GetSeparableFilter),
+    NAME_FUNC_OFFSET(15311, glSeparableFilter2D, glSeparableFilter2D, NULL, _gloffset_SeparableFilter2D),
+    NAME_FUNC_OFFSET(15334, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, _gloffset_GetHistogram),
+    NAME_FUNC_OFFSET(15352, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, _gloffset_GetHistogramParameterfv),
+    NAME_FUNC_OFFSET(15381, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, _gloffset_GetHistogramParameteriv),
+    NAME_FUNC_OFFSET(15410, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, _gloffset_GetMinmax),
+    NAME_FUNC_OFFSET(15425, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, _gloffset_GetMinmaxParameterfv),
+    NAME_FUNC_OFFSET(15451, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, _gloffset_GetMinmaxParameteriv),
+    NAME_FUNC_OFFSET(15477, glHistogram, glHistogram, NULL, _gloffset_Histogram),
+    NAME_FUNC_OFFSET(15492, glMinmax, glMinmax, NULL, _gloffset_Minmax),
+    NAME_FUNC_OFFSET(15504, glResetHistogram, glResetHistogram, NULL, _gloffset_ResetHistogram),
+    NAME_FUNC_OFFSET(15524, glResetMinmax, glResetMinmax, NULL, _gloffset_ResetMinmax),
+    NAME_FUNC_OFFSET(15541, glTexImage3D, glTexImage3D, NULL, _gloffset_TexImage3D),
+    NAME_FUNC_OFFSET(15557, glTexSubImage3D, glTexSubImage3D, NULL, _gloffset_TexSubImage3D),
+    NAME_FUNC_OFFSET(15576, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, _gloffset_CopyTexSubImage3D),
+    NAME_FUNC_OFFSET(15599, glActiveTextureARB, glActiveTextureARB, NULL, _gloffset_ActiveTextureARB),
+    NAME_FUNC_OFFSET(15615, glClientActiveTextureARB, glClientActiveTextureARB, NULL, _gloffset_ClientActiveTextureARB),
+    NAME_FUNC_OFFSET(15637, glMultiTexCoord1dARB, glMultiTexCoord1dARB, NULL, _gloffset_MultiTexCoord1dARB),
+    NAME_FUNC_OFFSET(15655, glMultiTexCoord1dvARB, glMultiTexCoord1dvARB, NULL, _gloffset_MultiTexCoord1dvARB),
+    NAME_FUNC_OFFSET(15674, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, _gloffset_MultiTexCoord1fARB),
+    NAME_FUNC_OFFSET(15692, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, _gloffset_MultiTexCoord1fvARB),
+    NAME_FUNC_OFFSET(15711, glMultiTexCoord1iARB, glMultiTexCoord1iARB, NULL, _gloffset_MultiTexCoord1iARB),
+    NAME_FUNC_OFFSET(15729, glMultiTexCoord1ivARB, glMultiTexCoord1ivARB, NULL, _gloffset_MultiTexCoord1ivARB),
+    NAME_FUNC_OFFSET(15748, glMultiTexCoord1sARB, glMultiTexCoord1sARB, NULL, _gloffset_MultiTexCoord1sARB),
+    NAME_FUNC_OFFSET(15766, glMultiTexCoord1svARB, glMultiTexCoord1svARB, NULL, _gloffset_MultiTexCoord1svARB),
+    NAME_FUNC_OFFSET(15785, glMultiTexCoord2dARB, glMultiTexCoord2dARB, NULL, _gloffset_MultiTexCoord2dARB),
+    NAME_FUNC_OFFSET(15803, glMultiTexCoord2dvARB, glMultiTexCoord2dvARB, NULL, _gloffset_MultiTexCoord2dvARB),
+    NAME_FUNC_OFFSET(15822, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, _gloffset_MultiTexCoord2fARB),
+    NAME_FUNC_OFFSET(15840, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, _gloffset_MultiTexCoord2fvARB),
+    NAME_FUNC_OFFSET(15859, glMultiTexCoord2iARB, glMultiTexCoord2iARB, NULL, _gloffset_MultiTexCoord2iARB),
+    NAME_FUNC_OFFSET(15877, glMultiTexCoord2ivARB, glMultiTexCoord2ivARB, NULL, _gloffset_MultiTexCoord2ivARB),
+    NAME_FUNC_OFFSET(15896, glMultiTexCoord2sARB, glMultiTexCoord2sARB, NULL, _gloffset_MultiTexCoord2sARB),
+    NAME_FUNC_OFFSET(15914, glMultiTexCoord2svARB, glMultiTexCoord2svARB, NULL, _gloffset_MultiTexCoord2svARB),
+    NAME_FUNC_OFFSET(15933, glMultiTexCoord3dARB, glMultiTexCoord3dARB, NULL, _gloffset_MultiTexCoord3dARB),
+    NAME_FUNC_OFFSET(15951, glMultiTexCoord3dvARB, glMultiTexCoord3dvARB, NULL, _gloffset_MultiTexCoord3dvARB),
+    NAME_FUNC_OFFSET(15970, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, _gloffset_MultiTexCoord3fARB),
+    NAME_FUNC_OFFSET(15988, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, _gloffset_MultiTexCoord3fvARB),
+    NAME_FUNC_OFFSET(16007, glMultiTexCoord3iARB, glMultiTexCoord3iARB, NULL, _gloffset_MultiTexCoord3iARB),
+    NAME_FUNC_OFFSET(16025, glMultiTexCoord3ivARB, glMultiTexCoord3ivARB, NULL, _gloffset_MultiTexCoord3ivARB),
+    NAME_FUNC_OFFSET(16044, glMultiTexCoord3sARB, glMultiTexCoord3sARB, NULL, _gloffset_MultiTexCoord3sARB),
+    NAME_FUNC_OFFSET(16062, glMultiTexCoord3svARB, glMultiTexCoord3svARB, NULL, _gloffset_MultiTexCoord3svARB),
+    NAME_FUNC_OFFSET(16081, glMultiTexCoord4dARB, glMultiTexCoord4dARB, NULL, _gloffset_MultiTexCoord4dARB),
+    NAME_FUNC_OFFSET(16099, glMultiTexCoord4dvARB, glMultiTexCoord4dvARB, NULL, _gloffset_MultiTexCoord4dvARB),
+    NAME_FUNC_OFFSET(16118, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, _gloffset_MultiTexCoord4fARB),
+    NAME_FUNC_OFFSET(16136, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, _gloffset_MultiTexCoord4fvARB),
+    NAME_FUNC_OFFSET(16155, glMultiTexCoord4iARB, glMultiTexCoord4iARB, NULL, _gloffset_MultiTexCoord4iARB),
+    NAME_FUNC_OFFSET(16173, glMultiTexCoord4ivARB, glMultiTexCoord4ivARB, NULL, _gloffset_MultiTexCoord4ivARB),
+    NAME_FUNC_OFFSET(16192, glMultiTexCoord4sARB, glMultiTexCoord4sARB, NULL, _gloffset_MultiTexCoord4sARB),
+    NAME_FUNC_OFFSET(16210, glMultiTexCoord4svARB, glMultiTexCoord4svARB, NULL, _gloffset_MultiTexCoord4svARB),
+    NAME_FUNC_OFFSET(16229, glStencilOpSeparate, glStencilOpSeparate, NULL, _gloffset_StencilOpSeparate),
+    NAME_FUNC_OFFSET(16252, glLoadTransposeMatrixdARB, glLoadTransposeMatrixdARB, NULL, _gloffset_LoadTransposeMatrixdARB),
+    NAME_FUNC_OFFSET(16275, glLoadTransposeMatrixfARB, glLoadTransposeMatrixfARB, NULL, _gloffset_LoadTransposeMatrixfARB),
+    NAME_FUNC_OFFSET(16298, glMultTransposeMatrixdARB, glMultTransposeMatrixdARB, NULL, _gloffset_MultTransposeMatrixdARB),
+    NAME_FUNC_OFFSET(16321, glMultTransposeMatrixfARB, glMultTransposeMatrixfARB, NULL, _gloffset_MultTransposeMatrixfARB),
+    NAME_FUNC_OFFSET(16344, glSampleCoverageARB, glSampleCoverageARB, NULL, _gloffset_SampleCoverageARB),
+    NAME_FUNC_OFFSET(16361, glCompressedTexImage1DARB, glCompressedTexImage1DARB, NULL, _gloffset_CompressedTexImage1DARB),
+    NAME_FUNC_OFFSET(16384, glCompressedTexImage2DARB, glCompressedTexImage2DARB, NULL, _gloffset_CompressedTexImage2DARB),
+    NAME_FUNC_OFFSET(16407, glCompressedTexImage3DARB, glCompressedTexImage3DARB, NULL, _gloffset_CompressedTexImage3DARB),
+    NAME_FUNC_OFFSET(16430, glCompressedTexSubImage1DARB, glCompressedTexSubImage1DARB, NULL, _gloffset_CompressedTexSubImage1DARB),
+    NAME_FUNC_OFFSET(16456, glCompressedTexSubImage2DARB, glCompressedTexSubImage2DARB, NULL, _gloffset_CompressedTexSubImage2DARB),
+    NAME_FUNC_OFFSET(16482, glCompressedTexSubImage3DARB, glCompressedTexSubImage3DARB, NULL, _gloffset_CompressedTexSubImage3DARB),
+    NAME_FUNC_OFFSET(16508, glGetCompressedTexImageARB, glGetCompressedTexImageARB, NULL, _gloffset_GetCompressedTexImageARB),
+    NAME_FUNC_OFFSET(16532, glDisableVertexAttribArrayARB, glDisableVertexAttribArrayARB, NULL, _gloffset_DisableVertexAttribArrayARB),
+    NAME_FUNC_OFFSET(16559, glEnableVertexAttribArrayARB, glEnableVertexAttribArrayARB, NULL, _gloffset_EnableVertexAttribArrayARB),
+    NAME_FUNC_OFFSET(16585, glGetVertexAttribdvARB, glGetVertexAttribdvARB, NULL, _gloffset_GetVertexAttribdvARB),
+    NAME_FUNC_OFFSET(16605, glGetVertexAttribfvARB, glGetVertexAttribfvARB, NULL, _gloffset_GetVertexAttribfvARB),
+    NAME_FUNC_OFFSET(16625, glGetVertexAttribivARB, glGetVertexAttribivARB, NULL, _gloffset_GetVertexAttribivARB),
+    NAME_FUNC_OFFSET(16645, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, _gloffset_ProgramEnvParameter4dARB),
+    NAME_FUNC_OFFSET(16668, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, _gloffset_ProgramEnvParameter4dvARB),
+    NAME_FUNC_OFFSET(16692, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, _gloffset_ProgramEnvParameter4fARB),
+    NAME_FUNC_OFFSET(16715, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, _gloffset_ProgramEnvParameter4fvARB),
+    NAME_FUNC_OFFSET(16739, glVertexAttrib1dARB, glVertexAttrib1dARB, NULL, _gloffset_VertexAttrib1dARB),
+    NAME_FUNC_OFFSET(16756, glVertexAttrib1dvARB, glVertexAttrib1dvARB, NULL, _gloffset_VertexAttrib1dvARB),
+    NAME_FUNC_OFFSET(16774, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, _gloffset_VertexAttrib1fARB),
+    NAME_FUNC_OFFSET(16791, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, _gloffset_VertexAttrib1fvARB),
+    NAME_FUNC_OFFSET(16809, glVertexAttrib1sARB, glVertexAttrib1sARB, NULL, _gloffset_VertexAttrib1sARB),
+    NAME_FUNC_OFFSET(16826, glVertexAttrib1svARB, glVertexAttrib1svARB, NULL, _gloffset_VertexAttrib1svARB),
+    NAME_FUNC_OFFSET(16844, glVertexAttrib2dARB, glVertexAttrib2dARB, NULL, _gloffset_VertexAttrib2dARB),
+    NAME_FUNC_OFFSET(16861, glVertexAttrib2dvARB, glVertexAttrib2dvARB, NULL, _gloffset_VertexAttrib2dvARB),
+    NAME_FUNC_OFFSET(16879, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, _gloffset_VertexAttrib2fARB),
+    NAME_FUNC_OFFSET(16896, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, _gloffset_VertexAttrib2fvARB),
+    NAME_FUNC_OFFSET(16914, glVertexAttrib2sARB, glVertexAttrib2sARB, NULL, _gloffset_VertexAttrib2sARB),
+    NAME_FUNC_OFFSET(16931, glVertexAttrib2svARB, glVertexAttrib2svARB, NULL, _gloffset_VertexAttrib2svARB),
+    NAME_FUNC_OFFSET(16949, glVertexAttrib3dARB, glVertexAttrib3dARB, NULL, _gloffset_VertexAttrib3dARB),
+    NAME_FUNC_OFFSET(16966, glVertexAttrib3dvARB, glVertexAttrib3dvARB, NULL, _gloffset_VertexAttrib3dvARB),
+    NAME_FUNC_OFFSET(16984, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, _gloffset_VertexAttrib3fARB),
+    NAME_FUNC_OFFSET(17001, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, _gloffset_VertexAttrib3fvARB),
+    NAME_FUNC_OFFSET(17019, glVertexAttrib3sARB, glVertexAttrib3sARB, NULL, _gloffset_VertexAttrib3sARB),
+    NAME_FUNC_OFFSET(17036, glVertexAttrib3svARB, glVertexAttrib3svARB, NULL, _gloffset_VertexAttrib3svARB),
+    NAME_FUNC_OFFSET(17054, glVertexAttrib4NbvARB, glVertexAttrib4NbvARB, NULL, _gloffset_VertexAttrib4NbvARB),
+    NAME_FUNC_OFFSET(17073, glVertexAttrib4NivARB, glVertexAttrib4NivARB, NULL, _gloffset_VertexAttrib4NivARB),
+    NAME_FUNC_OFFSET(17092, glVertexAttrib4NsvARB, glVertexAttrib4NsvARB, NULL, _gloffset_VertexAttrib4NsvARB),
+    NAME_FUNC_OFFSET(17111, glVertexAttrib4NubARB, glVertexAttrib4NubARB, NULL, _gloffset_VertexAttrib4NubARB),
+    NAME_FUNC_OFFSET(17130, glVertexAttrib4NubvARB, glVertexAttrib4NubvARB, NULL, _gloffset_VertexAttrib4NubvARB),
+    NAME_FUNC_OFFSET(17150, glVertexAttrib4NuivARB, glVertexAttrib4NuivARB, NULL, _gloffset_VertexAttrib4NuivARB),
+    NAME_FUNC_OFFSET(17170, glVertexAttrib4NusvARB, glVertexAttrib4NusvARB, NULL, _gloffset_VertexAttrib4NusvARB),
+    NAME_FUNC_OFFSET(17190, glVertexAttrib4bvARB, glVertexAttrib4bvARB, NULL, _gloffset_VertexAttrib4bvARB),
+    NAME_FUNC_OFFSET(17208, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL, _gloffset_VertexAttrib4dARB),
+    NAME_FUNC_OFFSET(17225, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL, _gloffset_VertexAttrib4dvARB),
+    NAME_FUNC_OFFSET(17243, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, _gloffset_VertexAttrib4fARB),
+    NAME_FUNC_OFFSET(17260, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, _gloffset_VertexAttrib4fvARB),
+    NAME_FUNC_OFFSET(17278, glVertexAttrib4ivARB, glVertexAttrib4ivARB, NULL, _gloffset_VertexAttrib4ivARB),
+    NAME_FUNC_OFFSET(17296, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL, _gloffset_VertexAttrib4sARB),
+    NAME_FUNC_OFFSET(17313, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL, _gloffset_VertexAttrib4svARB),
+    NAME_FUNC_OFFSET(17331, glVertexAttrib4ubvARB, glVertexAttrib4ubvARB, NULL, _gloffset_VertexAttrib4ubvARB),
+    NAME_FUNC_OFFSET(17350, glVertexAttrib4uivARB, glVertexAttrib4uivARB, NULL, _gloffset_VertexAttrib4uivARB),
+    NAME_FUNC_OFFSET(17369, glVertexAttrib4usvARB, glVertexAttrib4usvARB, NULL, _gloffset_VertexAttrib4usvARB),
+    NAME_FUNC_OFFSET(17388, glVertexAttribPointerARB, glVertexAttribPointerARB, NULL, _gloffset_VertexAttribPointerARB),
+    NAME_FUNC_OFFSET(17410, glBindBufferARB, glBindBufferARB, NULL, _gloffset_BindBufferARB),
+    NAME_FUNC_OFFSET(17423, glBufferDataARB, glBufferDataARB, NULL, _gloffset_BufferDataARB),
+    NAME_FUNC_OFFSET(17436, glBufferSubDataARB, glBufferSubDataARB, NULL, _gloffset_BufferSubDataARB),
+    NAME_FUNC_OFFSET(17452, glDeleteBuffersARB, glDeleteBuffersARB, NULL, _gloffset_DeleteBuffersARB),
+    NAME_FUNC_OFFSET(17468, glGenBuffersARB, glGenBuffersARB, NULL, _gloffset_GenBuffersARB),
+    NAME_FUNC_OFFSET(17481, glGetBufferParameterivARB, glGetBufferParameterivARB, NULL, _gloffset_GetBufferParameterivARB),
+    NAME_FUNC_OFFSET(17504, glGetBufferPointervARB, glGetBufferPointervARB, NULL, _gloffset_GetBufferPointervARB),
+    NAME_FUNC_OFFSET(17524, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL, _gloffset_GetBufferSubDataARB),
+    NAME_FUNC_OFFSET(17543, glIsBufferARB, glIsBufferARB, NULL, _gloffset_IsBufferARB),
+    NAME_FUNC_OFFSET(17554, glMapBufferARB, glMapBufferARB, NULL, _gloffset_MapBufferARB),
+    NAME_FUNC_OFFSET(17566, glUnmapBufferARB, glUnmapBufferARB, NULL, _gloffset_UnmapBufferARB),
+    NAME_FUNC_OFFSET(17580, glBeginQueryARB, glBeginQueryARB, NULL, _gloffset_BeginQueryARB),
+    NAME_FUNC_OFFSET(17593, glDeleteQueriesARB, glDeleteQueriesARB, NULL, _gloffset_DeleteQueriesARB),
+    NAME_FUNC_OFFSET(17609, glEndQueryARB, glEndQueryARB, NULL, _gloffset_EndQueryARB),
+    NAME_FUNC_OFFSET(17620, glGenQueriesARB, glGenQueriesARB, NULL, _gloffset_GenQueriesARB),
+    NAME_FUNC_OFFSET(17633, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL, _gloffset_GetQueryObjectivARB),
+    NAME_FUNC_OFFSET(17652, glGetQueryObjectuivARB, glGetQueryObjectuivARB, NULL, _gloffset_GetQueryObjectuivARB),
+    NAME_FUNC_OFFSET(17672, glGetQueryivARB, glGetQueryivARB, NULL, _gloffset_GetQueryivARB),
+    NAME_FUNC_OFFSET(17685, glIsQueryARB, glIsQueryARB, NULL, _gloffset_IsQueryARB),
+    NAME_FUNC_OFFSET(17695, glCompileShaderARB, glCompileShaderARB, NULL, _gloffset_CompileShaderARB),
+    NAME_FUNC_OFFSET(17711, glGetActiveUniformARB, glGetActiveUniformARB, NULL, _gloffset_GetActiveUniformARB),
+    NAME_FUNC_OFFSET(17730, glGetShaderSourceARB, glGetShaderSourceARB, NULL, _gloffset_GetShaderSourceARB),
+    NAME_FUNC_OFFSET(17748, glGetUniformLocationARB, glGetUniformLocationARB, NULL, _gloffset_GetUniformLocationARB),
+    NAME_FUNC_OFFSET(17769, glGetUniformfvARB, glGetUniformfvARB, NULL, _gloffset_GetUniformfvARB),
+    NAME_FUNC_OFFSET(17784, glGetUniformivARB, glGetUniformivARB, NULL, _gloffset_GetUniformivARB),
+    NAME_FUNC_OFFSET(17799, glLinkProgramARB, glLinkProgramARB, NULL, _gloffset_LinkProgramARB),
+    NAME_FUNC_OFFSET(17813, glShaderSourceARB, glShaderSourceARB, NULL, _gloffset_ShaderSourceARB),
+    NAME_FUNC_OFFSET(17828, glUniform1fARB, glUniform1fARB, NULL, _gloffset_Uniform1fARB),
+    NAME_FUNC_OFFSET(17840, glUniform1fvARB, glUniform1fvARB, NULL, _gloffset_Uniform1fvARB),
+    NAME_FUNC_OFFSET(17853, glUniform1iARB, glUniform1iARB, NULL, _gloffset_Uniform1iARB),
+    NAME_FUNC_OFFSET(17865, glUniform1ivARB, glUniform1ivARB, NULL, _gloffset_Uniform1ivARB),
+    NAME_FUNC_OFFSET(17878, glUniform2fARB, glUniform2fARB, NULL, _gloffset_Uniform2fARB),
+    NAME_FUNC_OFFSET(17890, glUniform2fvARB, glUniform2fvARB, NULL, _gloffset_Uniform2fvARB),
+    NAME_FUNC_OFFSET(17903, glUniform2iARB, glUniform2iARB, NULL, _gloffset_Uniform2iARB),
+    NAME_FUNC_OFFSET(17915, glUniform2ivARB, glUniform2ivARB, NULL, _gloffset_Uniform2ivARB),
+    NAME_FUNC_OFFSET(17928, glUniform3fARB, glUniform3fARB, NULL, _gloffset_Uniform3fARB),
+    NAME_FUNC_OFFSET(17940, glUniform3fvARB, glUniform3fvARB, NULL, _gloffset_Uniform3fvARB),
+    NAME_FUNC_OFFSET(17953, glUniform3iARB, glUniform3iARB, NULL, _gloffset_Uniform3iARB),
+    NAME_FUNC_OFFSET(17965, glUniform3ivARB, glUniform3ivARB, NULL, _gloffset_Uniform3ivARB),
+    NAME_FUNC_OFFSET(17978, glUniform4fARB, glUniform4fARB, NULL, _gloffset_Uniform4fARB),
+    NAME_FUNC_OFFSET(17990, glUniform4fvARB, glUniform4fvARB, NULL, _gloffset_Uniform4fvARB),
+    NAME_FUNC_OFFSET(18003, glUniform4iARB, glUniform4iARB, NULL, _gloffset_Uniform4iARB),
+    NAME_FUNC_OFFSET(18015, glUniform4ivARB, glUniform4ivARB, NULL, _gloffset_Uniform4ivARB),
+    NAME_FUNC_OFFSET(18028, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL, _gloffset_UniformMatrix2fvARB),
+    NAME_FUNC_OFFSET(18047, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL, _gloffset_UniformMatrix3fvARB),
+    NAME_FUNC_OFFSET(18066, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL, _gloffset_UniformMatrix4fvARB),
+    NAME_FUNC_OFFSET(18085, glUseProgramObjectARB, glUseProgramObjectARB, NULL, _gloffset_UseProgramObjectARB),
+    NAME_FUNC_OFFSET(18098, glValidateProgramARB, glValidateProgramARB, NULL, _gloffset_ValidateProgramARB),
+    NAME_FUNC_OFFSET(18116, glBindAttribLocationARB, glBindAttribLocationARB, NULL, _gloffset_BindAttribLocationARB),
+    NAME_FUNC_OFFSET(18137, glGetActiveAttribARB, glGetActiveAttribARB, NULL, _gloffset_GetActiveAttribARB),
+    NAME_FUNC_OFFSET(18155, glGetAttribLocationARB, glGetAttribLocationARB, NULL, _gloffset_GetAttribLocationARB),
+    NAME_FUNC_OFFSET(18175, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
+    NAME_FUNC_OFFSET(18189, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
+    NAME_FUNC_OFFSET(18206, glRenderbufferStorageMultisample, glRenderbufferStorageMultisample, NULL, _gloffset_RenderbufferStorageMultisample),
+    NAME_FUNC_OFFSET(18242, gl_dispatch_stub_584, gl_dispatch_stub_584, NULL, _gloffset_SampleMaskSGIS),
+    NAME_FUNC_OFFSET(18258, gl_dispatch_stub_585, gl_dispatch_stub_585, NULL, _gloffset_SamplePatternSGIS),
+    NAME_FUNC_OFFSET(18277, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET(18295, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET(18316, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET(18338, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET(18357, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET(18379, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET(18402, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, _gloffset_SecondaryColor3bEXT),
+    NAME_FUNC_OFFSET(18421, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, _gloffset_SecondaryColor3bvEXT),
+    NAME_FUNC_OFFSET(18441, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, _gloffset_SecondaryColor3dEXT),
+    NAME_FUNC_OFFSET(18460, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, _gloffset_SecondaryColor3dvEXT),
+    NAME_FUNC_OFFSET(18480, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, _gloffset_SecondaryColor3fEXT),
+    NAME_FUNC_OFFSET(18499, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, _gloffset_SecondaryColor3fvEXT),
+    NAME_FUNC_OFFSET(18519, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, _gloffset_SecondaryColor3iEXT),
+    NAME_FUNC_OFFSET(18538, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, _gloffset_SecondaryColor3ivEXT),
+    NAME_FUNC_OFFSET(18558, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, _gloffset_SecondaryColor3sEXT),
+    NAME_FUNC_OFFSET(18577, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, _gloffset_SecondaryColor3svEXT),
+    NAME_FUNC_OFFSET(18597, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, _gloffset_SecondaryColor3ubEXT),
+    NAME_FUNC_OFFSET(18617, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, _gloffset_SecondaryColor3ubvEXT),
+    NAME_FUNC_OFFSET(18638, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, _gloffset_SecondaryColor3uiEXT),
+    NAME_FUNC_OFFSET(18658, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, _gloffset_SecondaryColor3uivEXT),
+    NAME_FUNC_OFFSET(18679, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, _gloffset_SecondaryColor3usEXT),
+    NAME_FUNC_OFFSET(18699, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, _gloffset_SecondaryColor3usvEXT),
+    NAME_FUNC_OFFSET(18720, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, _gloffset_SecondaryColorPointerEXT),
+    NAME_FUNC_OFFSET(18744, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, _gloffset_MultiDrawArraysEXT),
+    NAME_FUNC_OFFSET(18762, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, _gloffset_MultiDrawElementsEXT),
+    NAME_FUNC_OFFSET(18782, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, _gloffset_FogCoordPointerEXT),
+    NAME_FUNC_OFFSET(18800, glFogCoorddEXT, glFogCoorddEXT, NULL, _gloffset_FogCoorddEXT),
+    NAME_FUNC_OFFSET(18812, glFogCoorddvEXT, glFogCoorddvEXT, NULL, _gloffset_FogCoorddvEXT),
+    NAME_FUNC_OFFSET(18825, glFogCoordfEXT, glFogCoordfEXT, NULL, _gloffset_FogCoordfEXT),
+    NAME_FUNC_OFFSET(18837, glFogCoordfvEXT, glFogCoordfvEXT, NULL, _gloffset_FogCoordfvEXT),
+    NAME_FUNC_OFFSET(18850, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
+    NAME_FUNC_OFFSET(18870, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
+    NAME_FUNC_OFFSET(18894, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
+    NAME_FUNC_OFFSET(18908, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
+    NAME_FUNC_OFFSET(18925, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
+    NAME_FUNC_OFFSET(18940, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
+    NAME_FUNC_OFFSET(18958, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
+    NAME_FUNC_OFFSET(18972, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
+    NAME_FUNC_OFFSET(18989, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
+    NAME_FUNC_OFFSET(19004, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
+    NAME_FUNC_OFFSET(19022, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
+    NAME_FUNC_OFFSET(19036, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
+    NAME_FUNC_OFFSET(19053, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
+    NAME_FUNC_OFFSET(19068, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
+    NAME_FUNC_OFFSET(19086, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
+    NAME_FUNC_OFFSET(19100, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
+    NAME_FUNC_OFFSET(19117, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
+    NAME_FUNC_OFFSET(19132, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
+    NAME_FUNC_OFFSET(19150, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
+    NAME_FUNC_OFFSET(19164, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
+    NAME_FUNC_OFFSET(19181, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
+    NAME_FUNC_OFFSET(19196, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
+    NAME_FUNC_OFFSET(19214, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
+    NAME_FUNC_OFFSET(19228, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
+    NAME_FUNC_OFFSET(19245, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
+    NAME_FUNC_OFFSET(19260, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
+    NAME_FUNC_OFFSET(19278, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
+    NAME_FUNC_OFFSET(19292, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
+    NAME_FUNC_OFFSET(19309, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
+    NAME_FUNC_OFFSET(19324, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
+    NAME_FUNC_OFFSET(19342, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
+    NAME_FUNC_OFFSET(19356, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
+    NAME_FUNC_OFFSET(19373, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
+    NAME_FUNC_OFFSET(19388, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
+    NAME_FUNC_OFFSET(19406, glBindProgramNV, glBindProgramNV, NULL, _gloffset_BindProgramNV),
+    NAME_FUNC_OFFSET(19423, glDeleteProgramsNV, glDeleteProgramsNV, NULL, _gloffset_DeleteProgramsNV),
+    NAME_FUNC_OFFSET(19443, glGenProgramsNV, glGenProgramsNV, NULL, _gloffset_GenProgramsNV),
+    NAME_FUNC_OFFSET(19460, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
+    NAME_FUNC_OFFSET(19486, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
+    NAME_FUNC_OFFSET(19515, glIsProgramNV, glIsProgramNV, NULL, _gloffset_IsProgramNV),
+    NAME_FUNC_OFFSET(19530, glPointParameteriNV, glPointParameteriNV, NULL, _gloffset_PointParameteriNV),
+    NAME_FUNC_OFFSET(19548, glPointParameterivNV, glPointParameterivNV, NULL, _gloffset_PointParameterivNV),
+    NAME_FUNC_OFFSET(19567, gl_dispatch_stub_755, gl_dispatch_stub_755, NULL, _gloffset_DeleteVertexArraysAPPLE),
+    NAME_FUNC_OFFSET(19588, gl_dispatch_stub_757, gl_dispatch_stub_757, NULL, _gloffset_IsVertexArrayAPPLE),
+    NAME_FUNC_OFFSET(19604, gl_dispatch_stub_765, gl_dispatch_stub_765, NULL, _gloffset_BlendEquationSeparateEXT),
+    NAME_FUNC_OFFSET(19628, gl_dispatch_stub_765, gl_dispatch_stub_765, NULL, _gloffset_BlendEquationSeparateEXT),
+    NAME_FUNC_OFFSET(19655, glBindFramebufferEXT, glBindFramebufferEXT, NULL, _gloffset_BindFramebufferEXT),
+    NAME_FUNC_OFFSET(19673, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, _gloffset_BindRenderbufferEXT),
+    NAME_FUNC_OFFSET(19692, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, _gloffset_CheckFramebufferStatusEXT),
+    NAME_FUNC_OFFSET(19717, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, _gloffset_DeleteFramebuffersEXT),
+    NAME_FUNC_OFFSET(19738, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, _gloffset_DeleteRenderbuffersEXT),
+    NAME_FUNC_OFFSET(19760, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, _gloffset_FramebufferRenderbufferEXT),
+    NAME_FUNC_OFFSET(19786, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, _gloffset_FramebufferTexture1DEXT),
+    NAME_FUNC_OFFSET(19809, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, _gloffset_FramebufferTexture2DEXT),
+    NAME_FUNC_OFFSET(19832, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, _gloffset_FramebufferTexture3DEXT),
+    NAME_FUNC_OFFSET(19855, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, _gloffset_GenFramebuffersEXT),
+    NAME_FUNC_OFFSET(19873, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, _gloffset_GenRenderbuffersEXT),
+    NAME_FUNC_OFFSET(19892, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, _gloffset_GenerateMipmapEXT),
+    NAME_FUNC_OFFSET(19909, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, _gloffset_GetFramebufferAttachmentParameterivEXT),
+    NAME_FUNC_OFFSET(19947, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, _gloffset_GetRenderbufferParameterivEXT),
+    NAME_FUNC_OFFSET(19976, glIsFramebufferEXT, glIsFramebufferEXT, NULL, _gloffset_IsFramebufferEXT),
+    NAME_FUNC_OFFSET(19992, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, _gloffset_IsRenderbufferEXT),
+    NAME_FUNC_OFFSET(20009, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, _gloffset_RenderbufferStorageEXT),
+    NAME_FUNC_OFFSET(20031, gl_dispatch_stub_783, gl_dispatch_stub_783, NULL, _gloffset_BlitFramebufferEXT),
+    NAME_FUNC_OFFSET(20049, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, _gloffset_FramebufferTextureLayerEXT),
+    NAME_FUNC_OFFSET(20075, glProvokingVertexEXT, glProvokingVertexEXT, NULL, _gloffset_ProvokingVertexEXT),
     NAME_FUNC_OFFSET(-1, NULL, NULL, NULL, 0)
 };
 
diff --git a/src/mesa/main/remap_helper.h b/src/mesa/main/remap_helper.h
index fe2bebd96c..2c8f0de467 100644
--- a/src/mesa/main/remap_helper.h
+++ b/src/mesa/main/remap_helper.h
@@ -1587,2772 +1587,2780 @@ static const char _mesa_function_pool[] =
    "i\0"
    "glIndexi\0"
    "\0"
-   /* _mesa_function_pool[10753]: EndQueryARB (will be remapped) */
+   /* _mesa_function_pool[10753]: EGLImageTargetTexture2DOES (will be remapped) */
+   "ip\0"
+   "glEGLImageTargetTexture2DOES\0"
+   "\0"
+   /* _mesa_function_pool[10786]: EndQueryARB (will be remapped) */
    "i\0"
    "glEndQuery\0"
    "glEndQueryARB\0"
    "\0"
-   /* _mesa_function_pool[10781]: DeleteFencesNV (will be remapped) */
+   /* _mesa_function_pool[10814]: DeleteFencesNV (will be remapped) */
    "ip\0"
    "glDeleteFencesNV\0"
    "\0"
-   /* _mesa_function_pool[10802]: DeformationMap3dSGIX (dynamic) */
+   /* _mesa_function_pool[10835]: DeformationMap3dSGIX (dynamic) */
    "iddiiddiiddiip\0"
    "glDeformationMap3dSGIX\0"
    "\0"
-   /* _mesa_function_pool[10841]: DepthMask (offset 211) */
+   /* _mesa_function_pool[10874]: DepthMask (offset 211) */
    "i\0"
    "glDepthMask\0"
    "\0"
-   /* _mesa_function_pool[10856]: IsShader (will be remapped) */
+   /* _mesa_function_pool[10889]: IsShader (will be remapped) */
    "i\0"
    "glIsShader\0"
    "\0"
-   /* _mesa_function_pool[10870]: Indexf (offset 46) */
+   /* _mesa_function_pool[10903]: Indexf (offset 46) */
    "f\0"
    "glIndexf\0"
    "\0"
-   /* _mesa_function_pool[10882]: GetImageTransformParameterivHP (dynamic) */
+   /* _mesa_function_pool[10915]: GetImageTransformParameterivHP (dynamic) */
    "iip\0"
    "glGetImageTransformParameterivHP\0"
    "\0"
-   /* _mesa_function_pool[10920]: Indexd (offset 44) */
+   /* _mesa_function_pool[10953]: Indexd (offset 44) */
    "d\0"
    "glIndexd\0"
    "\0"
-   /* _mesa_function_pool[10932]: GetMaterialiv (offset 270) */
+   /* _mesa_function_pool[10965]: GetMaterialiv (offset 270) */
    "iip\0"
    "glGetMaterialiv\0"
    "\0"
-   /* _mesa_function_pool[10953]: StencilOp (offset 244) */
+   /* _mesa_function_pool[10986]: StencilOp (offset 244) */
    "iii\0"
    "glStencilOp\0"
    "\0"
-   /* _mesa_function_pool[10970]: WindowPos4ivMESA (will be remapped) */
+   /* _mesa_function_pool[11003]: WindowPos4ivMESA (will be remapped) */
    "p\0"
    "glWindowPos4ivMESA\0"
    "\0"
-   /* _mesa_function_pool[10992]: MultiTexCoord3svARB (offset 399) */
+   /* _mesa_function_pool[11025]: MultiTexCoord3svARB (offset 399) */
    "ip\0"
    "glMultiTexCoord3sv\0"
    "glMultiTexCoord3svARB\0"
    "\0"
-   /* _mesa_function_pool[11037]: TexEnvfv (offset 185) */
+   /* _mesa_function_pool[11070]: TexEnvfv (offset 185) */
    "iip\0"
    "glTexEnvfv\0"
    "\0"
-   /* _mesa_function_pool[11053]: MultiTexCoord4iARB (offset 404) */
+   /* _mesa_function_pool[11086]: MultiTexCoord4iARB (offset 404) */
    "iiiii\0"
    "glMultiTexCoord4i\0"
    "glMultiTexCoord4iARB\0"
    "\0"
-   /* _mesa_function_pool[11099]: Indexs (offset 50) */
+   /* _mesa_function_pool[11132]: Indexs (offset 50) */
    "i\0"
    "glIndexs\0"
    "\0"
-   /* _mesa_function_pool[11111]: Binormal3ivEXT (dynamic) */
+   /* _mesa_function_pool[11144]: Binormal3ivEXT (dynamic) */
    "p\0"
    "glBinormal3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[11131]: ResizeBuffersMESA (will be remapped) */
+   /* _mesa_function_pool[11164]: ResizeBuffersMESA (will be remapped) */
    "\0"
    "glResizeBuffersMESA\0"
    "\0"
-   /* _mesa_function_pool[11153]: GetUniformivARB (will be remapped) */
+   /* _mesa_function_pool[11186]: GetUniformivARB (will be remapped) */
    "iip\0"
    "glGetUniformiv\0"
    "glGetUniformivARB\0"
    "\0"
-   /* _mesa_function_pool[11191]: PixelTexGenParameteriSGIS (will be remapped) */
+   /* _mesa_function_pool[11224]: PixelTexGenParameteriSGIS (will be remapped) */
    "ii\0"
    "glPixelTexGenParameteriSGIS\0"
    "\0"
-   /* _mesa_function_pool[11223]: VertexPointervINTEL (dynamic) */
+   /* _mesa_function_pool[11256]: VertexPointervINTEL (dynamic) */
    "iip\0"
    "glVertexPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[11250]: Vertex2i (offset 130) */
+   /* _mesa_function_pool[11283]: Vertex2i (offset 130) */
    "ii\0"
    "glVertex2i\0"
    "\0"
-   /* _mesa_function_pool[11265]: LoadMatrixf (offset 291) */
+   /* _mesa_function_pool[11298]: LoadMatrixf (offset 291) */
    "p\0"
    "glLoadMatrixf\0"
    "\0"
-   /* _mesa_function_pool[11282]: Vertex2f (offset 128) */
+   /* _mesa_function_pool[11315]: Vertex2f (offset 128) */
    "ff\0"
    "glVertex2f\0"
    "\0"
-   /* _mesa_function_pool[11297]: ReplacementCodeuiColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[11330]: ReplacementCodeuiColor4fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glReplacementCodeuiColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[11350]: Color4bv (offset 26) */
+   /* _mesa_function_pool[11383]: Color4bv (offset 26) */
    "p\0"
    "glColor4bv\0"
    "\0"
-   /* _mesa_function_pool[11364]: VertexPointer (offset 321) */
+   /* _mesa_function_pool[11397]: VertexPointer (offset 321) */
    "iiip\0"
    "glVertexPointer\0"
    "\0"
-   /* _mesa_function_pool[11386]: SecondaryColor3uiEXT (will be remapped) */
+   /* _mesa_function_pool[11419]: SecondaryColor3uiEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3ui\0"
    "glSecondaryColor3uiEXT\0"
    "\0"
-   /* _mesa_function_pool[11434]: StartInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[11467]: StartInstrumentsSGIX (dynamic) */
    "\0"
    "glStartInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[11459]: SecondaryColor3usvEXT (will be remapped) */
+   /* _mesa_function_pool[11492]: SecondaryColor3usvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3usv\0"
    "glSecondaryColor3usvEXT\0"
    "\0"
-   /* _mesa_function_pool[11507]: VertexAttrib2fvNV (will be remapped) */
+   /* _mesa_function_pool[11540]: VertexAttrib2fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2fvNV\0"
    "\0"
-   /* _mesa_function_pool[11531]: ProgramLocalParameter4dvARB (will be remapped) */
+   /* _mesa_function_pool[11564]: ProgramLocalParameter4dvARB (will be remapped) */
    "iip\0"
    "glProgramLocalParameter4dvARB\0"
    "\0"
-   /* _mesa_function_pool[11566]: DeleteLists (offset 4) */
+   /* _mesa_function_pool[11599]: DeleteLists (offset 4) */
    "ii\0"
    "glDeleteLists\0"
    "\0"
-   /* _mesa_function_pool[11584]: LogicOp (offset 242) */
+   /* _mesa_function_pool[11617]: LogicOp (offset 242) */
    "i\0"
    "glLogicOp\0"
    "\0"
-   /* _mesa_function_pool[11597]: MatrixIndexuivARB (dynamic) */
+   /* _mesa_function_pool[11630]: MatrixIndexuivARB (dynamic) */
    "ip\0"
    "glMatrixIndexuivARB\0"
    "\0"
-   /* _mesa_function_pool[11621]: Vertex2s (offset 132) */
+   /* _mesa_function_pool[11654]: Vertex2s (offset 132) */
    "ii\0"
    "glVertex2s\0"
    "\0"
-   /* _mesa_function_pool[11636]: RenderbufferStorageMultisample (will be remapped) */
+   /* _mesa_function_pool[11669]: RenderbufferStorageMultisample (will be remapped) */
    "iiiii\0"
    "glRenderbufferStorageMultisample\0"
    "glRenderbufferStorageMultisampleEXT\0"
    "\0"
-   /* _mesa_function_pool[11712]: TexCoord4fv (offset 121) */
+   /* _mesa_function_pool[11745]: TexCoord4fv (offset 121) */
    "p\0"
    "glTexCoord4fv\0"
    "\0"
-   /* _mesa_function_pool[11729]: Tangent3sEXT (dynamic) */
+   /* _mesa_function_pool[11762]: Tangent3sEXT (dynamic) */
    "iii\0"
    "glTangent3sEXT\0"
    "\0"
-   /* _mesa_function_pool[11749]: GlobalAlphaFactorfSUN (dynamic) */
+   /* _mesa_function_pool[11782]: GlobalAlphaFactorfSUN (dynamic) */
    "f\0"
    "glGlobalAlphaFactorfSUN\0"
    "\0"
-   /* _mesa_function_pool[11776]: MultiTexCoord3iARB (offset 396) */
+   /* _mesa_function_pool[11809]: MultiTexCoord3iARB (offset 396) */
    "iiii\0"
    "glMultiTexCoord3i\0"
    "glMultiTexCoord3iARB\0"
    "\0"
-   /* _mesa_function_pool[11821]: IsProgram (will be remapped) */
+   /* _mesa_function_pool[11854]: IsProgram (will be remapped) */
    "i\0"
    "glIsProgram\0"
    "\0"
-   /* _mesa_function_pool[11836]: TexCoordPointerListIBM (dynamic) */
+   /* _mesa_function_pool[11869]: TexCoordPointerListIBM (dynamic) */
    "iiipi\0"
    "glTexCoordPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[11868]: GlobalAlphaFactorusSUN (dynamic) */
+   /* _mesa_function_pool[11901]: GlobalAlphaFactorusSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorusSUN\0"
    "\0"
-   /* _mesa_function_pool[11896]: VertexAttrib2dvNV (will be remapped) */
+   /* _mesa_function_pool[11929]: VertexAttrib2dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2dvNV\0"
    "\0"
-   /* _mesa_function_pool[11920]: FramebufferRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[11953]: FramebufferRenderbufferEXT (will be remapped) */
    "iiii\0"
    "glFramebufferRenderbuffer\0"
    "glFramebufferRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[11981]: VertexAttrib1dvNV (will be remapped) */
+   /* _mesa_function_pool[12014]: VertexAttrib1dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1dvNV\0"
    "\0"
-   /* _mesa_function_pool[12005]: GenTextures (offset 328) */
+   /* _mesa_function_pool[12038]: GenTextures (offset 328) */
    "ip\0"
    "glGenTextures\0"
    "glGenTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[12040]: SetFenceNV (will be remapped) */
+   /* _mesa_function_pool[12073]: SetFenceNV (will be remapped) */
    "ii\0"
    "glSetFenceNV\0"
    "\0"
-   /* _mesa_function_pool[12057]: FramebufferTexture1DEXT (will be remapped) */
+   /* _mesa_function_pool[12090]: FramebufferTexture1DEXT (will be remapped) */
    "iiiii\0"
    "glFramebufferTexture1D\0"
    "glFramebufferTexture1DEXT\0"
    "\0"
-   /* _mesa_function_pool[12113]: GetCombinerOutputParameterivNV (will be remapped) */
+   /* _mesa_function_pool[12146]: GetCombinerOutputParameterivNV (will be remapped) */
    "iiip\0"
    "glGetCombinerOutputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[12152]: PixelTexGenParameterivSGIS (will be remapped) */
+   /* _mesa_function_pool[12185]: PixelTexGenParameterivSGIS (will be remapped) */
    "ip\0"
    "glPixelTexGenParameterivSGIS\0"
    "\0"
-   /* _mesa_function_pool[12185]: TextureNormalEXT (dynamic) */
+   /* _mesa_function_pool[12218]: TextureNormalEXT (dynamic) */
    "i\0"
    "glTextureNormalEXT\0"
    "\0"
-   /* _mesa_function_pool[12207]: IndexPointerListIBM (dynamic) */
+   /* _mesa_function_pool[12240]: IndexPointerListIBM (dynamic) */
    "iipi\0"
    "glIndexPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[12235]: WeightfvARB (dynamic) */
+   /* _mesa_function_pool[12268]: WeightfvARB (dynamic) */
    "ip\0"
    "glWeightfvARB\0"
    "\0"
-   /* _mesa_function_pool[12253]: RasterPos2sv (offset 69) */
+   /* _mesa_function_pool[12286]: RasterPos2sv (offset 69) */
    "p\0"
    "glRasterPos2sv\0"
    "\0"
-   /* _mesa_function_pool[12271]: Color4ubv (offset 36) */
+   /* _mesa_function_pool[12304]: Color4ubv (offset 36) */
    "p\0"
    "glColor4ubv\0"
    "\0"
-   /* _mesa_function_pool[12286]: DrawBuffer (offset 202) */
+   /* _mesa_function_pool[12319]: DrawBuffer (offset 202) */
    "i\0"
    "glDrawBuffer\0"
    "\0"
-   /* _mesa_function_pool[12302]: TexCoord2fv (offset 105) */
+   /* _mesa_function_pool[12335]: TexCoord2fv (offset 105) */
    "p\0"
    "glTexCoord2fv\0"
    "\0"
-   /* _mesa_function_pool[12319]: WindowPos4fMESA (will be remapped) */
+   /* _mesa_function_pool[12352]: WindowPos4fMESA (will be remapped) */
    "ffff\0"
    "glWindowPos4fMESA\0"
    "\0"
-   /* _mesa_function_pool[12343]: TexCoord1sv (offset 101) */
+   /* _mesa_function_pool[12376]: TexCoord1sv (offset 101) */
    "p\0"
    "glTexCoord1sv\0"
    "\0"
-   /* _mesa_function_pool[12360]: WindowPos3dvMESA (will be remapped) */
+   /* _mesa_function_pool[12393]: WindowPos3dvMESA (will be remapped) */
    "p\0"
    "glWindowPos3dv\0"
    "glWindowPos3dvARB\0"
    "glWindowPos3dvMESA\0"
    "\0"
-   /* _mesa_function_pool[12415]: DepthFunc (offset 245) */
+   /* _mesa_function_pool[12448]: DepthFunc (offset 245) */
    "i\0"
    "glDepthFunc\0"
    "\0"
-   /* _mesa_function_pool[12430]: PixelMapusv (offset 253) */
+   /* _mesa_function_pool[12463]: PixelMapusv (offset 253) */
    "iip\0"
    "glPixelMapusv\0"
    "\0"
-   /* _mesa_function_pool[12449]: GetQueryObjecti64vEXT (will be remapped) */
+   /* _mesa_function_pool[12482]: GetQueryObjecti64vEXT (will be remapped) */
    "iip\0"
    "glGetQueryObjecti64vEXT\0"
    "\0"
-   /* _mesa_function_pool[12478]: MultiTexCoord1dARB (offset 376) */
+   /* _mesa_function_pool[12511]: MultiTexCoord1dARB (offset 376) */
    "id\0"
    "glMultiTexCoord1d\0"
    "glMultiTexCoord1dARB\0"
    "\0"
-   /* _mesa_function_pool[12521]: PointParameterivNV (will be remapped) */
+   /* _mesa_function_pool[12554]: PointParameterivNV (will be remapped) */
    "ip\0"
    "glPointParameteriv\0"
    "glPointParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[12565]: BlendFunc (offset 241) */
+   /* _mesa_function_pool[12598]: BlendFunc (offset 241) */
    "ii\0"
    "glBlendFunc\0"
    "\0"
-   /* _mesa_function_pool[12581]: Uniform2fvARB (will be remapped) */
+   /* _mesa_function_pool[12614]: Uniform2fvARB (will be remapped) */
    "iip\0"
    "glUniform2fv\0"
    "glUniform2fvARB\0"
    "\0"
-   /* _mesa_function_pool[12615]: BufferParameteriAPPLE (will be remapped) */
+   /* _mesa_function_pool[12648]: BufferParameteriAPPLE (will be remapped) */
    "iii\0"
    "glBufferParameteriAPPLE\0"
    "\0"
-   /* _mesa_function_pool[12644]: MultiTexCoord3dvARB (offset 393) */
+   /* _mesa_function_pool[12677]: MultiTexCoord3dvARB (offset 393) */
    "ip\0"
    "glMultiTexCoord3dv\0"
    "glMultiTexCoord3dvARB\0"
    "\0"
-   /* _mesa_function_pool[12689]: ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[12722]: ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[12745]: DeleteObjectARB (will be remapped) */
+   /* _mesa_function_pool[12778]: DeleteObjectARB (will be remapped) */
    "i\0"
    "glDeleteObjectARB\0"
    "\0"
-   /* _mesa_function_pool[12766]: MatrixIndexPointerARB (dynamic) */
+   /* _mesa_function_pool[12799]: MatrixIndexPointerARB (dynamic) */
    "iiip\0"
    "glMatrixIndexPointerARB\0"
    "\0"
-   /* _mesa_function_pool[12796]: ProgramNamedParameter4dvNV (will be remapped) */
+   /* _mesa_function_pool[12829]: ProgramNamedParameter4dvNV (will be remapped) */
    "iipp\0"
    "glProgramNamedParameter4dvNV\0"
    "\0"
-   /* _mesa_function_pool[12831]: Tangent3fvEXT (dynamic) */
+   /* _mesa_function_pool[12864]: Tangent3fvEXT (dynamic) */
    "p\0"
    "glTangent3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[12850]: Flush (offset 217) */
+   /* _mesa_function_pool[12883]: Flush (offset 217) */
    "\0"
    "glFlush\0"
    "\0"
-   /* _mesa_function_pool[12860]: Color4uiv (offset 38) */
+   /* _mesa_function_pool[12893]: Color4uiv (offset 38) */
    "p\0"
    "glColor4uiv\0"
    "\0"
-   /* _mesa_function_pool[12875]: GenVertexArrays (will be remapped) */
+   /* _mesa_function_pool[12908]: GenVertexArrays (will be remapped) */
    "ip\0"
    "glGenVertexArrays\0"
    "\0"
-   /* _mesa_function_pool[12897]: RasterPos3sv (offset 77) */
+   /* _mesa_function_pool[12930]: RasterPos3sv (offset 77) */
    "p\0"
    "glRasterPos3sv\0"
    "\0"
-   /* _mesa_function_pool[12915]: BindFramebufferEXT (will be remapped) */
+   /* _mesa_function_pool[12948]: BindFramebufferEXT (will be remapped) */
    "ii\0"
    "glBindFramebuffer\0"
    "glBindFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[12958]: ReferencePlaneSGIX (dynamic) */
+   /* _mesa_function_pool[12991]: ReferencePlaneSGIX (dynamic) */
    "p\0"
    "glReferencePlaneSGIX\0"
    "\0"
-   /* _mesa_function_pool[12982]: PushAttrib (offset 219) */
+   /* _mesa_function_pool[13015]: PushAttrib (offset 219) */
    "i\0"
    "glPushAttrib\0"
    "\0"
-   /* _mesa_function_pool[12998]: RasterPos2i (offset 66) */
+   /* _mesa_function_pool[13031]: RasterPos2i (offset 66) */
    "ii\0"
    "glRasterPos2i\0"
    "\0"
-   /* _mesa_function_pool[13016]: ValidateProgramARB (will be remapped) */
+   /* _mesa_function_pool[13049]: ValidateProgramARB (will be remapped) */
    "i\0"
    "glValidateProgram\0"
    "glValidateProgramARB\0"
    "\0"
-   /* _mesa_function_pool[13058]: TexParameteriv (offset 181) */
+   /* _mesa_function_pool[13091]: TexParameteriv (offset 181) */
    "iip\0"
    "glTexParameteriv\0"
    "\0"
-   /* _mesa_function_pool[13080]: UnlockArraysEXT (will be remapped) */
+   /* _mesa_function_pool[13113]: UnlockArraysEXT (will be remapped) */
    "\0"
    "glUnlockArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[13100]: TexCoord2fColor3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[13133]: TexCoord2fColor3fVertex3fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord2fColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[13141]: WindowPos3fvMESA (will be remapped) */
+   /* _mesa_function_pool[13174]: WindowPos3fvMESA (will be remapped) */
    "p\0"
    "glWindowPos3fv\0"
    "glWindowPos3fvARB\0"
    "glWindowPos3fvMESA\0"
    "\0"
-   /* _mesa_function_pool[13196]: RasterPos2f (offset 64) */
+   /* _mesa_function_pool[13229]: RasterPos2f (offset 64) */
    "ff\0"
    "glRasterPos2f\0"
    "\0"
-   /* _mesa_function_pool[13214]: VertexAttrib1svNV (will be remapped) */
+   /* _mesa_function_pool[13247]: VertexAttrib1svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1svNV\0"
    "\0"
-   /* _mesa_function_pool[13238]: RasterPos2d (offset 62) */
+   /* _mesa_function_pool[13271]: RasterPos2d (offset 62) */
    "dd\0"
    "glRasterPos2d\0"
    "\0"
-   /* _mesa_function_pool[13256]: RasterPos3fv (offset 73) */
+   /* _mesa_function_pool[13289]: RasterPos3fv (offset 73) */
    "p\0"
    "glRasterPos3fv\0"
    "\0"
-   /* _mesa_function_pool[13274]: CopyTexSubImage3D (offset 373) */
+   /* _mesa_function_pool[13307]: CopyTexSubImage3D (offset 373) */
    "iiiiiiiii\0"
    "glCopyTexSubImage3D\0"
    "glCopyTexSubImage3DEXT\0"
    "\0"
-   /* _mesa_function_pool[13328]: VertexAttrib2dARB (will be remapped) */
+   /* _mesa_function_pool[13361]: VertexAttrib2dARB (will be remapped) */
    "idd\0"
    "glVertexAttrib2d\0"
    "glVertexAttrib2dARB\0"
    "\0"
-   /* _mesa_function_pool[13370]: Color4ub (offset 35) */
+   /* _mesa_function_pool[13403]: Color4ub (offset 35) */
    "iiii\0"
    "glColor4ub\0"
    "\0"
-   /* _mesa_function_pool[13387]: GetInteger64v (will be remapped) */
+   /* _mesa_function_pool[13420]: GetInteger64v (will be remapped) */
    "ip\0"
    "glGetInteger64v\0"
    "\0"
-   /* _mesa_function_pool[13407]: TextureColorMaskSGIS (dynamic) */
+   /* _mesa_function_pool[13440]: TextureColorMaskSGIS (dynamic) */
    "iiii\0"
    "glTextureColorMaskSGIS\0"
    "\0"
-   /* _mesa_function_pool[13436]: RasterPos2s (offset 68) */
+   /* _mesa_function_pool[13469]: RasterPos2s (offset 68) */
    "ii\0"
    "glRasterPos2s\0"
    "\0"
-   /* _mesa_function_pool[13454]: GetColorTable (offset 343) */
+   /* _mesa_function_pool[13487]: GetColorTable (offset 343) */
    "iiip\0"
    "glGetColorTable\0"
    "glGetColorTableSGI\0"
    "glGetColorTableEXT\0"
    "\0"
-   /* _mesa_function_pool[13514]: SelectBuffer (offset 195) */
+   /* _mesa_function_pool[13547]: SelectBuffer (offset 195) */
    "ip\0"
    "glSelectBuffer\0"
    "\0"
-   /* _mesa_function_pool[13533]: Indexiv (offset 49) */
+   /* _mesa_function_pool[13566]: Indexiv (offset 49) */
    "p\0"
    "glIndexiv\0"
    "\0"
-   /* _mesa_function_pool[13546]: TexCoord3i (offset 114) */
+   /* _mesa_function_pool[13579]: TexCoord3i (offset 114) */
    "iii\0"
    "glTexCoord3i\0"
    "\0"
-   /* _mesa_function_pool[13564]: CopyColorTable (offset 342) */
+   /* _mesa_function_pool[13597]: CopyColorTable (offset 342) */
    "iiiii\0"
    "glCopyColorTable\0"
    "glCopyColorTableSGI\0"
    "\0"
-   /* _mesa_function_pool[13608]: GetHistogramParameterfv (offset 362) */
+   /* _mesa_function_pool[13641]: GetHistogramParameterfv (offset 362) */
    "iip\0"
    "glGetHistogramParameterfv\0"
    "glGetHistogramParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[13668]: Frustum (offset 289) */
+   /* _mesa_function_pool[13701]: Frustum (offset 289) */
    "dddddd\0"
    "glFrustum\0"
    "\0"
-   /* _mesa_function_pool[13686]: GetString (offset 275) */
+   /* _mesa_function_pool[13719]: GetString (offset 275) */
    "i\0"
    "glGetString\0"
    "\0"
-   /* _mesa_function_pool[13701]: ColorPointervINTEL (dynamic) */
+   /* _mesa_function_pool[13734]: ColorPointervINTEL (dynamic) */
    "iip\0"
    "glColorPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[13727]: TexEnvf (offset 184) */
+   /* _mesa_function_pool[13760]: TexEnvf (offset 184) */
    "iif\0"
    "glTexEnvf\0"
    "\0"
-   /* _mesa_function_pool[13742]: TexCoord3d (offset 110) */
+   /* _mesa_function_pool[13775]: TexCoord3d (offset 110) */
    "ddd\0"
    "glTexCoord3d\0"
    "\0"
-   /* _mesa_function_pool[13760]: AlphaFragmentOp1ATI (will be remapped) */
+   /* _mesa_function_pool[13793]: AlphaFragmentOp1ATI (will be remapped) */
    "iiiiii\0"
    "glAlphaFragmentOp1ATI\0"
    "\0"
-   /* _mesa_function_pool[13790]: TexCoord3f (offset 112) */
+   /* _mesa_function_pool[13823]: TexCoord3f (offset 112) */
    "fff\0"
    "glTexCoord3f\0"
    "\0"
-   /* _mesa_function_pool[13808]: MultiTexCoord3ivARB (offset 397) */
+   /* _mesa_function_pool[13841]: MultiTexCoord3ivARB (offset 397) */
    "ip\0"
    "glMultiTexCoord3iv\0"
    "glMultiTexCoord3ivARB\0"
    "\0"
-   /* _mesa_function_pool[13853]: MultiTexCoord2sARB (offset 390) */
+   /* _mesa_function_pool[13886]: MultiTexCoord2sARB (offset 390) */
    "iii\0"
    "glMultiTexCoord2s\0"
    "glMultiTexCoord2sARB\0"
    "\0"
-   /* _mesa_function_pool[13897]: VertexAttrib1dvARB (will be remapped) */
+   /* _mesa_function_pool[13930]: VertexAttrib1dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib1dv\0"
    "glVertexAttrib1dvARB\0"
    "\0"
-   /* _mesa_function_pool[13940]: DeleteTextures (offset 327) */
+   /* _mesa_function_pool[13973]: DeleteTextures (offset 327) */
    "ip\0"
    "glDeleteTextures\0"
    "glDeleteTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[13981]: TexCoordPointerEXT (will be remapped) */
+   /* _mesa_function_pool[14014]: TexCoordPointerEXT (will be remapped) */
    "iiiip\0"
    "glTexCoordPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[14009]: TexSubImage4DSGIS (dynamic) */
+   /* _mesa_function_pool[14042]: TexSubImage4DSGIS (dynamic) */
    "iiiiiiiiiiiip\0"
    "glTexSubImage4DSGIS\0"
    "\0"
-   /* _mesa_function_pool[14044]: TexCoord3s (offset 116) */
+   /* _mesa_function_pool[14077]: TexCoord3s (offset 116) */
    "iii\0"
    "glTexCoord3s\0"
    "\0"
-   /* _mesa_function_pool[14062]: GetTexLevelParameteriv (offset 285) */
+   /* _mesa_function_pool[14095]: GetTexLevelParameteriv (offset 285) */
    "iiip\0"
    "glGetTexLevelParameteriv\0"
    "\0"
-   /* _mesa_function_pool[14093]: CombinerStageParameterfvNV (dynamic) */
+   /* _mesa_function_pool[14126]: CombinerStageParameterfvNV (dynamic) */
    "iip\0"
    "glCombinerStageParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[14127]: StopInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[14160]: StopInstrumentsSGIX (dynamic) */
    "i\0"
    "glStopInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[14152]: TexCoord4fColor4fNormal3fVertex4fSUN (dynamic) */
+   /* _mesa_function_pool[14185]: TexCoord4fColor4fNormal3fVertex4fSUN (dynamic) */
    "fffffffffffffff\0"
    "glTexCoord4fColor4fNormal3fVertex4fSUN\0"
    "\0"
-   /* _mesa_function_pool[14208]: ClearAccum (offset 204) */
+   /* _mesa_function_pool[14241]: ClearAccum (offset 204) */
    "ffff\0"
    "glClearAccum\0"
    "\0"
-   /* _mesa_function_pool[14227]: DeformSGIX (dynamic) */
+   /* _mesa_function_pool[14260]: DeformSGIX (dynamic) */
    "i\0"
    "glDeformSGIX\0"
    "\0"
-   /* _mesa_function_pool[14243]: GetVertexAttribfvARB (will be remapped) */
+   /* _mesa_function_pool[14276]: GetVertexAttribfvARB (will be remapped) */
    "iip\0"
    "glGetVertexAttribfv\0"
    "glGetVertexAttribfvARB\0"
    "\0"
-   /* _mesa_function_pool[14291]: SecondaryColor3ivEXT (will be remapped) */
+   /* _mesa_function_pool[14324]: SecondaryColor3ivEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3iv\0"
    "glSecondaryColor3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[14337]: TexCoord4iv (offset 123) */
+   /* _mesa_function_pool[14370]: TexCoord4iv (offset 123) */
    "p\0"
    "glTexCoord4iv\0"
    "\0"
-   /* _mesa_function_pool[14354]: UniformMatrix4x2fv (will be remapped) */
+   /* _mesa_function_pool[14387]: UniformMatrix4x2fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix4x2fv\0"
    "\0"
-   /* _mesa_function_pool[14381]: GetDetailTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[14414]: GetDetailTexFuncSGIS (dynamic) */
    "ip\0"
    "glGetDetailTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[14408]: GetCombinerStageParameterfvNV (dynamic) */
+   /* _mesa_function_pool[14441]: GetCombinerStageParameterfvNV (dynamic) */
    "iip\0"
    "glGetCombinerStageParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[14445]: PolygonOffset (offset 319) */
+   /* _mesa_function_pool[14478]: PolygonOffset (offset 319) */
    "ff\0"
    "glPolygonOffset\0"
    "\0"
-   /* _mesa_function_pool[14465]: BindVertexArray (will be remapped) */
+   /* _mesa_function_pool[14498]: BindVertexArray (will be remapped) */
    "i\0"
    "glBindVertexArray\0"
    "\0"
-   /* _mesa_function_pool[14486]: Color4ubVertex2fvSUN (dynamic) */
+   /* _mesa_function_pool[14519]: Color4ubVertex2fvSUN (dynamic) */
    "pp\0"
    "glColor4ubVertex2fvSUN\0"
    "\0"
-   /* _mesa_function_pool[14513]: Rectd (offset 86) */
+   /* _mesa_function_pool[14546]: Rectd (offset 86) */
    "dddd\0"
    "glRectd\0"
    "\0"
-   /* _mesa_function_pool[14527]: TexFilterFuncSGIS (dynamic) */
+   /* _mesa_function_pool[14560]: TexFilterFuncSGIS (dynamic) */
    "iiip\0"
    "glTexFilterFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[14553]: SampleMaskSGIS (will be remapped) */
+   /* _mesa_function_pool[14586]: SampleMaskSGIS (will be remapped) */
    "fi\0"
    "glSampleMaskSGIS\0"
    "glSampleMaskEXT\0"
    "\0"
-   /* _mesa_function_pool[14590]: GetAttribLocationARB (will be remapped) */
+   /* _mesa_function_pool[14623]: GetAttribLocationARB (will be remapped) */
    "ip\0"
    "glGetAttribLocation\0"
    "glGetAttribLocationARB\0"
    "\0"
-   /* _mesa_function_pool[14637]: RasterPos3i (offset 74) */
+   /* _mesa_function_pool[14670]: RasterPos3i (offset 74) */
    "iii\0"
    "glRasterPos3i\0"
    "\0"
-   /* _mesa_function_pool[14656]: VertexAttrib4ubvARB (will be remapped) */
+   /* _mesa_function_pool[14689]: VertexAttrib4ubvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4ubv\0"
    "glVertexAttrib4ubvARB\0"
    "\0"
-   /* _mesa_function_pool[14701]: DetailTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[14734]: DetailTexFuncSGIS (dynamic) */
    "iip\0"
    "glDetailTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[14726]: Normal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[14759]: Normal3fVertex3fSUN (dynamic) */
    "ffffff\0"
    "glNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[14756]: CopyTexImage2D (offset 324) */
+   /* _mesa_function_pool[14789]: CopyTexImage2D (offset 324) */
    "iiiiiiii\0"
    "glCopyTexImage2D\0"
    "glCopyTexImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[14803]: GetBufferPointervARB (will be remapped) */
+   /* _mesa_function_pool[14836]: GetBufferPointervARB (will be remapped) */
    "iip\0"
    "glGetBufferPointerv\0"
    "glGetBufferPointervARB\0"
    "\0"
-   /* _mesa_function_pool[14851]: ProgramEnvParameter4fARB (will be remapped) */
+   /* _mesa_function_pool[14884]: ProgramEnvParameter4fARB (will be remapped) */
    "iiffff\0"
    "glProgramEnvParameter4fARB\0"
    "glProgramParameter4fNV\0"
    "\0"
-   /* _mesa_function_pool[14909]: Uniform3ivARB (will be remapped) */
+   /* _mesa_function_pool[14942]: Uniform3ivARB (will be remapped) */
    "iip\0"
    "glUniform3iv\0"
    "glUniform3ivARB\0"
    "\0"
-   /* _mesa_function_pool[14943]: Lightfv (offset 160) */
+   /* _mesa_function_pool[14976]: Lightfv (offset 160) */
    "iip\0"
    "glLightfv\0"
    "\0"
-   /* _mesa_function_pool[14958]: ClearDepth (offset 208) */
+   /* _mesa_function_pool[14991]: ClearDepth (offset 208) */
    "d\0"
    "glClearDepth\0"
    "\0"
-   /* _mesa_function_pool[14974]: GetFenceivNV (will be remapped) */
+   /* _mesa_function_pool[15007]: GetFenceivNV (will be remapped) */
    "iip\0"
    "glGetFenceivNV\0"
    "\0"
-   /* _mesa_function_pool[14994]: WindowPos4dvMESA (will be remapped) */
+   /* _mesa_function_pool[15027]: WindowPos4dvMESA (will be remapped) */
    "p\0"
    "glWindowPos4dvMESA\0"
    "\0"
-   /* _mesa_function_pool[15016]: ColorSubTable (offset 346) */
+   /* _mesa_function_pool[15049]: ColorSubTable (offset 346) */
    "iiiiip\0"
    "glColorSubTable\0"
    "glColorSubTableEXT\0"
    "\0"
-   /* _mesa_function_pool[15059]: Color4fv (offset 30) */
+   /* _mesa_function_pool[15092]: Color4fv (offset 30) */
    "p\0"
    "glColor4fv\0"
    "\0"
-   /* _mesa_function_pool[15073]: MultiTexCoord4ivARB (offset 405) */
+   /* _mesa_function_pool[15106]: MultiTexCoord4ivARB (offset 405) */
    "ip\0"
    "glMultiTexCoord4iv\0"
    "glMultiTexCoord4ivARB\0"
    "\0"
-   /* _mesa_function_pool[15118]: ProgramLocalParameters4fvEXT (will be remapped) */
+   /* _mesa_function_pool[15151]: ProgramLocalParameters4fvEXT (will be remapped) */
    "iiip\0"
    "glProgramLocalParameters4fvEXT\0"
    "\0"
-   /* _mesa_function_pool[15155]: ColorPointer (offset 308) */
+   /* _mesa_function_pool[15188]: ColorPointer (offset 308) */
    "iiip\0"
    "glColorPointer\0"
    "\0"
-   /* _mesa_function_pool[15176]: Rects (offset 92) */
+   /* _mesa_function_pool[15209]: Rects (offset 92) */
    "iiii\0"
    "glRects\0"
    "\0"
-   /* _mesa_function_pool[15190]: GetMapAttribParameterfvNV (dynamic) */
+   /* _mesa_function_pool[15223]: GetMapAttribParameterfvNV (dynamic) */
    "iiip\0"
    "glGetMapAttribParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[15224]: Lightiv (offset 162) */
+   /* _mesa_function_pool[15257]: Lightiv (offset 162) */
    "iip\0"
    "glLightiv\0"
    "\0"
-   /* _mesa_function_pool[15239]: VertexAttrib4sARB (will be remapped) */
+   /* _mesa_function_pool[15272]: VertexAttrib4sARB (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4s\0"
    "glVertexAttrib4sARB\0"
    "\0"
-   /* _mesa_function_pool[15283]: GetQueryObjectuivARB (will be remapped) */
+   /* _mesa_function_pool[15316]: GetQueryObjectuivARB (will be remapped) */
    "iip\0"
    "glGetQueryObjectuiv\0"
    "glGetQueryObjectuivARB\0"
    "\0"
-   /* _mesa_function_pool[15331]: GetTexParameteriv (offset 283) */
+   /* _mesa_function_pool[15364]: GetTexParameteriv (offset 283) */
    "iip\0"
    "glGetTexParameteriv\0"
    "\0"
-   /* _mesa_function_pool[15356]: MapParameterivNV (dynamic) */
+   /* _mesa_function_pool[15389]: MapParameterivNV (dynamic) */
    "iip\0"
    "glMapParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[15380]: GenRenderbuffersEXT (will be remapped) */
+   /* _mesa_function_pool[15413]: GenRenderbuffersEXT (will be remapped) */
    "ip\0"
    "glGenRenderbuffers\0"
    "glGenRenderbuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[15425]: VertexAttrib2dvARB (will be remapped) */
+   /* _mesa_function_pool[15458]: VertexAttrib2dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2dv\0"
    "glVertexAttrib2dvARB\0"
    "\0"
-   /* _mesa_function_pool[15468]: EdgeFlagPointerEXT (will be remapped) */
+   /* _mesa_function_pool[15501]: EdgeFlagPointerEXT (will be remapped) */
    "iip\0"
    "glEdgeFlagPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[15494]: VertexAttribs2svNV (will be remapped) */
+   /* _mesa_function_pool[15527]: VertexAttribs2svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2svNV\0"
    "\0"
-   /* _mesa_function_pool[15520]: WeightbvARB (dynamic) */
+   /* _mesa_function_pool[15553]: WeightbvARB (dynamic) */
    "ip\0"
    "glWeightbvARB\0"
    "\0"
-   /* _mesa_function_pool[15538]: VertexAttrib2fvARB (will be remapped) */
+   /* _mesa_function_pool[15571]: VertexAttrib2fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2fv\0"
    "glVertexAttrib2fvARB\0"
    "\0"
-   /* _mesa_function_pool[15581]: GetBufferParameterivARB (will be remapped) */
+   /* _mesa_function_pool[15614]: GetBufferParameterivARB (will be remapped) */
    "iip\0"
    "glGetBufferParameteriv\0"
    "glGetBufferParameterivARB\0"
    "\0"
-   /* _mesa_function_pool[15635]: Rectdv (offset 87) */
+   /* _mesa_function_pool[15668]: Rectdv (offset 87) */
    "pp\0"
    "glRectdv\0"
    "\0"
-   /* _mesa_function_pool[15648]: ListParameteriSGIX (dynamic) */
+   /* _mesa_function_pool[15681]: ListParameteriSGIX (dynamic) */
    "iii\0"
    "glListParameteriSGIX\0"
    "\0"
-   /* _mesa_function_pool[15674]: ReplacementCodeuiColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[15707]: ReplacementCodeuiColor4fNormal3fVertex3fSUN (dynamic) */
    "iffffffffff\0"
    "glReplacementCodeuiColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[15733]: InstrumentsBufferSGIX (dynamic) */
+   /* _mesa_function_pool[15766]: InstrumentsBufferSGIX (dynamic) */
    "ip\0"
    "glInstrumentsBufferSGIX\0"
    "\0"
-   /* _mesa_function_pool[15761]: VertexAttrib4NivARB (will be remapped) */
+   /* _mesa_function_pool[15794]: VertexAttrib4NivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Niv\0"
    "glVertexAttrib4NivARB\0"
    "\0"
-   /* _mesa_function_pool[15806]: GetAttachedShaders (will be remapped) */
+   /* _mesa_function_pool[15839]: GetAttachedShaders (will be remapped) */
    "iipp\0"
    "glGetAttachedShaders\0"
    "\0"
-   /* _mesa_function_pool[15833]: GenVertexArraysAPPLE (will be remapped) */
+   /* _mesa_function_pool[15866]: GenVertexArraysAPPLE (will be remapped) */
    "ip\0"
    "glGenVertexArraysAPPLE\0"
    "\0"
-   /* _mesa_function_pool[15860]: Materialiv (offset 172) */
+   /* _mesa_function_pool[15893]: Materialiv (offset 172) */
    "iip\0"
    "glMaterialiv\0"
    "\0"
-   /* _mesa_function_pool[15878]: PushClientAttrib (offset 335) */
+   /* _mesa_function_pool[15911]: PushClientAttrib (offset 335) */
    "i\0"
    "glPushClientAttrib\0"
    "\0"
-   /* _mesa_function_pool[15900]: ProgramEnvParameters4fvEXT (will be remapped) */
+   /* _mesa_function_pool[15933]: ProgramEnvParameters4fvEXT (will be remapped) */
    "iiip\0"
    "glProgramEnvParameters4fvEXT\0"
    "\0"
-   /* _mesa_function_pool[15935]: TexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[15968]: TexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glTexCoord2fColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[15981]: WindowPos2iMESA (will be remapped) */
+   /* _mesa_function_pool[16014]: WindowPos2iMESA (will be remapped) */
    "ii\0"
    "glWindowPos2i\0"
    "glWindowPos2iARB\0"
    "glWindowPos2iMESA\0"
    "\0"
-   /* _mesa_function_pool[16034]: SecondaryColor3fvEXT (will be remapped) */
+   /* _mesa_function_pool[16067]: SecondaryColor3fvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3fv\0"
    "glSecondaryColor3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[16080]: PolygonMode (offset 174) */
+   /* _mesa_function_pool[16113]: PolygonMode (offset 174) */
    "ii\0"
    "glPolygonMode\0"
    "\0"
-   /* _mesa_function_pool[16098]: CompressedTexSubImage1DARB (will be remapped) */
+   /* _mesa_function_pool[16131]: CompressedTexSubImage1DARB (will be remapped) */
    "iiiiiip\0"
    "glCompressedTexSubImage1D\0"
    "glCompressedTexSubImage1DARB\0"
    "\0"
-   /* _mesa_function_pool[16162]: GetVertexAttribivNV (will be remapped) */
+   /* _mesa_function_pool[16195]: GetVertexAttribivNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribivNV\0"
    "\0"
-   /* _mesa_function_pool[16189]: GetProgramStringARB (will be remapped) */
+   /* _mesa_function_pool[16222]: GetProgramStringARB (will be remapped) */
    "iip\0"
    "glGetProgramStringARB\0"
    "\0"
-   /* _mesa_function_pool[16216]: TexBumpParameterfvATI (will be remapped) */
+   /* _mesa_function_pool[16249]: TexBumpParameterfvATI (will be remapped) */
    "ip\0"
    "glTexBumpParameterfvATI\0"
    "\0"
-   /* _mesa_function_pool[16244]: CompileShaderARB (will be remapped) */
+   /* _mesa_function_pool[16277]: CompileShaderARB (will be remapped) */
    "i\0"
    "glCompileShader\0"
    "glCompileShaderARB\0"
    "\0"
-   /* _mesa_function_pool[16282]: DeleteShader (will be remapped) */
+   /* _mesa_function_pool[16315]: DeleteShader (will be remapped) */
    "i\0"
    "glDeleteShader\0"
    "\0"
-   /* _mesa_function_pool[16300]: DisableClientState (offset 309) */
+   /* _mesa_function_pool[16333]: DisableClientState (offset 309) */
    "i\0"
    "glDisableClientState\0"
    "\0"
-   /* _mesa_function_pool[16324]: TexGeni (offset 192) */
+   /* _mesa_function_pool[16357]: TexGeni (offset 192) */
    "iii\0"
    "glTexGeni\0"
    "\0"
-   /* _mesa_function_pool[16339]: TexGenf (offset 190) */
+   /* _mesa_function_pool[16372]: TexGenf (offset 190) */
    "iif\0"
    "glTexGenf\0"
    "\0"
-   /* _mesa_function_pool[16354]: Uniform3fARB (will be remapped) */
+   /* _mesa_function_pool[16387]: Uniform3fARB (will be remapped) */
    "ifff\0"
    "glUniform3f\0"
    "glUniform3fARB\0"
    "\0"
-   /* _mesa_function_pool[16387]: TexGend (offset 188) */
+   /* _mesa_function_pool[16420]: TexGend (offset 188) */
    "iid\0"
    "glTexGend\0"
    "\0"
-   /* _mesa_function_pool[16402]: ListParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[16435]: ListParameterfvSGIX (dynamic) */
    "iip\0"
    "glListParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[16429]: GetPolygonStipple (offset 274) */
+   /* _mesa_function_pool[16462]: GetPolygonStipple (offset 274) */
    "p\0"
    "glGetPolygonStipple\0"
    "\0"
-   /* _mesa_function_pool[16452]: Tangent3dvEXT (dynamic) */
+   /* _mesa_function_pool[16485]: Tangent3dvEXT (dynamic) */
    "p\0"
    "glTangent3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[16471]: GetVertexAttribfvNV (will be remapped) */
+   /* _mesa_function_pool[16504]: GetVertexAttribfvNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribfvNV\0"
    "\0"
-   /* _mesa_function_pool[16498]: WindowPos3sMESA (will be remapped) */
+   /* _mesa_function_pool[16531]: WindowPos3sMESA (will be remapped) */
    "iii\0"
    "glWindowPos3s\0"
    "glWindowPos3sARB\0"
    "glWindowPos3sMESA\0"
    "\0"
-   /* _mesa_function_pool[16552]: VertexAttrib2svNV (will be remapped) */
+   /* _mesa_function_pool[16585]: VertexAttrib2svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2svNV\0"
    "\0"
-   /* _mesa_function_pool[16576]: VertexAttribs1fvNV (will be remapped) */
+   /* _mesa_function_pool[16609]: VertexAttribs1fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1fvNV\0"
    "\0"
-   /* _mesa_function_pool[16602]: TexCoord2fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[16635]: TexCoord2fVertex3fvSUN (dynamic) */
    "pp\0"
    "glTexCoord2fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[16631]: WindowPos4sMESA (will be remapped) */
+   /* _mesa_function_pool[16664]: WindowPos4sMESA (will be remapped) */
    "iiii\0"
    "glWindowPos4sMESA\0"
    "\0"
-   /* _mesa_function_pool[16655]: VertexAttrib4NuivARB (will be remapped) */
+   /* _mesa_function_pool[16688]: VertexAttrib4NuivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nuiv\0"
    "glVertexAttrib4NuivARB\0"
    "\0"
-   /* _mesa_function_pool[16702]: ClientActiveTextureARB (offset 375) */
+   /* _mesa_function_pool[16735]: ClientActiveTextureARB (offset 375) */
    "i\0"
    "glClientActiveTexture\0"
    "glClientActiveTextureARB\0"
    "\0"
-   /* _mesa_function_pool[16752]: PixelTexGenSGIX (will be remapped) */
+   /* _mesa_function_pool[16785]: PixelTexGenSGIX (will be remapped) */
    "i\0"
    "glPixelTexGenSGIX\0"
    "\0"
-   /* _mesa_function_pool[16773]: ReplacementCodeusvSUN (dynamic) */
+   /* _mesa_function_pool[16806]: ReplacementCodeusvSUN (dynamic) */
    "p\0"
    "glReplacementCodeusvSUN\0"
    "\0"
-   /* _mesa_function_pool[16800]: Uniform4fARB (will be remapped) */
+   /* _mesa_function_pool[16833]: Uniform4fARB (will be remapped) */
    "iffff\0"
    "glUniform4f\0"
    "glUniform4fARB\0"
    "\0"
-   /* _mesa_function_pool[16834]: Color4sv (offset 34) */
+   /* _mesa_function_pool[16867]: Color4sv (offset 34) */
    "p\0"
    "glColor4sv\0"
    "\0"
-   /* _mesa_function_pool[16848]: FlushMappedBufferRange (will be remapped) */
+   /* _mesa_function_pool[16881]: FlushMappedBufferRange (will be remapped) */
    "iii\0"
    "glFlushMappedBufferRange\0"
    "\0"
-   /* _mesa_function_pool[16878]: IsProgramNV (will be remapped) */
+   /* _mesa_function_pool[16911]: IsProgramNV (will be remapped) */
    "i\0"
    "glIsProgramARB\0"
    "glIsProgramNV\0"
    "\0"
-   /* _mesa_function_pool[16910]: FlushMappedBufferRangeAPPLE (will be remapped) */
+   /* _mesa_function_pool[16943]: FlushMappedBufferRangeAPPLE (will be remapped) */
    "iii\0"
    "glFlushMappedBufferRangeAPPLE\0"
    "\0"
-   /* _mesa_function_pool[16945]: PixelZoom (offset 246) */
+   /* _mesa_function_pool[16978]: PixelZoom (offset 246) */
    "ff\0"
    "glPixelZoom\0"
    "\0"
-   /* _mesa_function_pool[16961]: ReplacementCodePointerSUN (dynamic) */
+   /* _mesa_function_pool[16994]: ReplacementCodePointerSUN (dynamic) */
    "iip\0"
    "glReplacementCodePointerSUN\0"
    "\0"
-   /* _mesa_function_pool[16994]: ProgramEnvParameter4dARB (will be remapped) */
+   /* _mesa_function_pool[17027]: ProgramEnvParameter4dARB (will be remapped) */
    "iidddd\0"
    "glProgramEnvParameter4dARB\0"
    "glProgramParameter4dNV\0"
    "\0"
-   /* _mesa_function_pool[17052]: ColorTableParameterfv (offset 340) */
+   /* _mesa_function_pool[17085]: ColorTableParameterfv (offset 340) */
    "iip\0"
    "glColorTableParameterfv\0"
    "glColorTableParameterfvSGI\0"
    "\0"
-   /* _mesa_function_pool[17108]: FragmentLightModelfSGIX (dynamic) */
+   /* _mesa_function_pool[17141]: FragmentLightModelfSGIX (dynamic) */
    "if\0"
    "glFragmentLightModelfSGIX\0"
    "\0"
-   /* _mesa_function_pool[17138]: Binormal3bvEXT (dynamic) */
+   /* _mesa_function_pool[17171]: Binormal3bvEXT (dynamic) */
    "p\0"
    "glBinormal3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[17158]: PixelMapuiv (offset 252) */
+   /* _mesa_function_pool[17191]: PixelMapuiv (offset 252) */
    "iip\0"
    "glPixelMapuiv\0"
    "\0"
-   /* _mesa_function_pool[17177]: Color3dv (offset 12) */
+   /* _mesa_function_pool[17210]: Color3dv (offset 12) */
    "p\0"
    "glColor3dv\0"
    "\0"
-   /* _mesa_function_pool[17191]: IsTexture (offset 330) */
+   /* _mesa_function_pool[17224]: IsTexture (offset 330) */
    "i\0"
    "glIsTexture\0"
    "glIsTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[17221]: VertexWeightfvEXT (dynamic) */
+   /* _mesa_function_pool[17254]: VertexWeightfvEXT (dynamic) */
    "p\0"
    "glVertexWeightfvEXT\0"
    "\0"
-   /* _mesa_function_pool[17244]: VertexAttrib1dARB (will be remapped) */
+   /* _mesa_function_pool[17277]: VertexAttrib1dARB (will be remapped) */
    "id\0"
    "glVertexAttrib1d\0"
    "glVertexAttrib1dARB\0"
    "\0"
-   /* _mesa_function_pool[17285]: ImageTransformParameterivHP (dynamic) */
+   /* _mesa_function_pool[17318]: ImageTransformParameterivHP (dynamic) */
    "iip\0"
    "glImageTransformParameterivHP\0"
    "\0"
-   /* _mesa_function_pool[17320]: TexCoord4i (offset 122) */
+   /* _mesa_function_pool[17353]: TexCoord4i (offset 122) */
    "iiii\0"
    "glTexCoord4i\0"
    "\0"
-   /* _mesa_function_pool[17339]: DeleteQueriesARB (will be remapped) */
+   /* _mesa_function_pool[17372]: DeleteQueriesARB (will be remapped) */
    "ip\0"
    "glDeleteQueries\0"
    "glDeleteQueriesARB\0"
    "\0"
-   /* _mesa_function_pool[17378]: Color4ubVertex2fSUN (dynamic) */
+   /* _mesa_function_pool[17411]: Color4ubVertex2fSUN (dynamic) */
    "iiiiff\0"
    "glColor4ubVertex2fSUN\0"
    "\0"
-   /* _mesa_function_pool[17408]: FragmentColorMaterialSGIX (dynamic) */
+   /* _mesa_function_pool[17441]: FragmentColorMaterialSGIX (dynamic) */
    "ii\0"
    "glFragmentColorMaterialSGIX\0"
    "\0"
-   /* _mesa_function_pool[17440]: CurrentPaletteMatrixARB (dynamic) */
+   /* _mesa_function_pool[17473]: CurrentPaletteMatrixARB (dynamic) */
    "i\0"
    "glCurrentPaletteMatrixARB\0"
    "\0"
-   /* _mesa_function_pool[17469]: GetMapdv (offset 266) */
+   /* _mesa_function_pool[17502]: GetMapdv (offset 266) */
    "iip\0"
    "glGetMapdv\0"
    "\0"
-   /* _mesa_function_pool[17485]: SamplePatternSGIS (will be remapped) */
+   /* _mesa_function_pool[17518]: SamplePatternSGIS (will be remapped) */
    "i\0"
    "glSamplePatternSGIS\0"
    "glSamplePatternEXT\0"
    "\0"
-   /* _mesa_function_pool[17527]: PixelStoref (offset 249) */
+   /* _mesa_function_pool[17560]: PixelStoref (offset 249) */
    "if\0"
    "glPixelStoref\0"
    "\0"
-   /* _mesa_function_pool[17545]: IsQueryARB (will be remapped) */
+   /* _mesa_function_pool[17578]: IsQueryARB (will be remapped) */
    "i\0"
    "glIsQuery\0"
    "glIsQueryARB\0"
    "\0"
-   /* _mesa_function_pool[17571]: ReplacementCodeuiColor4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[17604]: ReplacementCodeuiColor4ubVertex3fSUN (dynamic) */
    "iiiiifff\0"
    "glReplacementCodeuiColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[17620]: PixelStorei (offset 250) */
+   /* _mesa_function_pool[17653]: PixelStorei (offset 250) */
    "ii\0"
    "glPixelStorei\0"
    "\0"
-   /* _mesa_function_pool[17638]: VertexAttrib4usvARB (will be remapped) */
+   /* _mesa_function_pool[17671]: VertexAttrib4usvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4usv\0"
    "glVertexAttrib4usvARB\0"
    "\0"
-   /* _mesa_function_pool[17683]: LinkProgramARB (will be remapped) */
+   /* _mesa_function_pool[17716]: LinkProgramARB (will be remapped) */
    "i\0"
    "glLinkProgram\0"
    "glLinkProgramARB\0"
    "\0"
-   /* _mesa_function_pool[17717]: VertexAttrib2fNV (will be remapped) */
+   /* _mesa_function_pool[17750]: VertexAttrib2fNV (will be remapped) */
    "iff\0"
    "glVertexAttrib2fNV\0"
    "\0"
-   /* _mesa_function_pool[17741]: ShaderSourceARB (will be remapped) */
+   /* _mesa_function_pool[17774]: ShaderSourceARB (will be remapped) */
    "iipp\0"
    "glShaderSource\0"
    "glShaderSourceARB\0"
    "\0"
-   /* _mesa_function_pool[17780]: FragmentMaterialiSGIX (dynamic) */
+   /* _mesa_function_pool[17813]: FragmentMaterialiSGIX (dynamic) */
    "iii\0"
    "glFragmentMaterialiSGIX\0"
    "\0"
-   /* _mesa_function_pool[17809]: EvalCoord2dv (offset 233) */
+   /* _mesa_function_pool[17842]: EvalCoord2dv (offset 233) */
    "p\0"
    "glEvalCoord2dv\0"
    "\0"
-   /* _mesa_function_pool[17827]: VertexAttrib3svARB (will be remapped) */
+   /* _mesa_function_pool[17860]: VertexAttrib3svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3sv\0"
    "glVertexAttrib3svARB\0"
    "\0"
-   /* _mesa_function_pool[17870]: ColorMaterial (offset 151) */
+   /* _mesa_function_pool[17903]: ColorMaterial (offset 151) */
    "ii\0"
    "glColorMaterial\0"
    "\0"
-   /* _mesa_function_pool[17890]: CompressedTexSubImage3DARB (will be remapped) */
+   /* _mesa_function_pool[17923]: CompressedTexSubImage3DARB (will be remapped) */
    "iiiiiiiiiip\0"
    "glCompressedTexSubImage3D\0"
    "glCompressedTexSubImage3DARB\0"
    "\0"
-   /* _mesa_function_pool[17958]: WindowPos2ivMESA (will be remapped) */
+   /* _mesa_function_pool[17991]: WindowPos2ivMESA (will be remapped) */
    "p\0"
    "glWindowPos2iv\0"
    "glWindowPos2ivARB\0"
    "glWindowPos2ivMESA\0"
    "\0"
-   /* _mesa_function_pool[18013]: IsFramebufferEXT (will be remapped) */
+   /* _mesa_function_pool[18046]: IsFramebufferEXT (will be remapped) */
    "i\0"
    "glIsFramebuffer\0"
    "glIsFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[18051]: Uniform4ivARB (will be remapped) */
+   /* _mesa_function_pool[18084]: Uniform4ivARB (will be remapped) */
    "iip\0"
    "glUniform4iv\0"
    "glUniform4ivARB\0"
    "\0"
-   /* _mesa_function_pool[18085]: GetVertexAttribdvARB (will be remapped) */
+   /* _mesa_function_pool[18118]: GetVertexAttribdvARB (will be remapped) */
    "iip\0"
    "glGetVertexAttribdv\0"
    "glGetVertexAttribdvARB\0"
    "\0"
-   /* _mesa_function_pool[18133]: TexBumpParameterivATI (will be remapped) */
+   /* _mesa_function_pool[18166]: TexBumpParameterivATI (will be remapped) */
    "ip\0"
    "glTexBumpParameterivATI\0"
    "\0"
-   /* _mesa_function_pool[18161]: GetSeparableFilter (offset 359) */
+   /* _mesa_function_pool[18194]: GetSeparableFilter (offset 359) */
    "iiippp\0"
    "glGetSeparableFilter\0"
    "glGetSeparableFilterEXT\0"
    "\0"
-   /* _mesa_function_pool[18214]: Binormal3dEXT (dynamic) */
+   /* _mesa_function_pool[18247]: Binormal3dEXT (dynamic) */
    "ddd\0"
    "glBinormal3dEXT\0"
    "\0"
-   /* _mesa_function_pool[18235]: SpriteParameteriSGIX (dynamic) */
+   /* _mesa_function_pool[18268]: SpriteParameteriSGIX (dynamic) */
    "ii\0"
    "glSpriteParameteriSGIX\0"
    "\0"
-   /* _mesa_function_pool[18262]: RequestResidentProgramsNV (will be remapped) */
+   /* _mesa_function_pool[18295]: RequestResidentProgramsNV (will be remapped) */
    "ip\0"
    "glRequestResidentProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[18294]: TagSampleBufferSGIX (dynamic) */
+   /* _mesa_function_pool[18327]: TagSampleBufferSGIX (dynamic) */
    "\0"
    "glTagSampleBufferSGIX\0"
    "\0"
-   /* _mesa_function_pool[18318]: ReplacementCodeusSUN (dynamic) */
+   /* _mesa_function_pool[18351]: ReplacementCodeusSUN (dynamic) */
    "i\0"
    "glReplacementCodeusSUN\0"
    "\0"
-   /* _mesa_function_pool[18344]: FeedbackBuffer (offset 194) */
+   /* _mesa_function_pool[18377]: FeedbackBuffer (offset 194) */
    "iip\0"
    "glFeedbackBuffer\0"
    "\0"
-   /* _mesa_function_pool[18366]: RasterPos2iv (offset 67) */
+   /* _mesa_function_pool[18399]: RasterPos2iv (offset 67) */
    "p\0"
    "glRasterPos2iv\0"
    "\0"
-   /* _mesa_function_pool[18384]: TexImage1D (offset 182) */
+   /* _mesa_function_pool[18417]: TexImage1D (offset 182) */
    "iiiiiiip\0"
    "glTexImage1D\0"
    "\0"
-   /* _mesa_function_pool[18407]: ListParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[18440]: ListParameterivSGIX (dynamic) */
    "iip\0"
    "glListParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[18434]: MultiDrawElementsEXT (will be remapped) */
+   /* _mesa_function_pool[18467]: MultiDrawElementsEXT (will be remapped) */
    "ipipi\0"
    "glMultiDrawElements\0"
    "glMultiDrawElementsEXT\0"
    "\0"
-   /* _mesa_function_pool[18484]: Color3s (offset 17) */
+   /* _mesa_function_pool[18517]: Color3s (offset 17) */
    "iii\0"
    "glColor3s\0"
    "\0"
-   /* _mesa_function_pool[18499]: Uniform1ivARB (will be remapped) */
+   /* _mesa_function_pool[18532]: Uniform1ivARB (will be remapped) */
    "iip\0"
    "glUniform1iv\0"
    "glUniform1ivARB\0"
    "\0"
-   /* _mesa_function_pool[18533]: WindowPos2sMESA (will be remapped) */
+   /* _mesa_function_pool[18566]: WindowPos2sMESA (will be remapped) */
    "ii\0"
    "glWindowPos2s\0"
    "glWindowPos2sARB\0"
    "glWindowPos2sMESA\0"
    "\0"
-   /* _mesa_function_pool[18586]: WeightusvARB (dynamic) */
+   /* _mesa_function_pool[18619]: WeightusvARB (dynamic) */
    "ip\0"
    "glWeightusvARB\0"
    "\0"
-   /* _mesa_function_pool[18605]: TexCoordPointer (offset 320) */
+   /* _mesa_function_pool[18638]: TexCoordPointer (offset 320) */
    "iiip\0"
    "glTexCoordPointer\0"
    "\0"
-   /* _mesa_function_pool[18629]: FogCoordPointerEXT (will be remapped) */
+   /* _mesa_function_pool[18662]: FogCoordPointerEXT (will be remapped) */
    "iip\0"
    "glFogCoordPointer\0"
    "glFogCoordPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[18673]: IndexMaterialEXT (dynamic) */
+   /* _mesa_function_pool[18706]: IndexMaterialEXT (dynamic) */
    "ii\0"
    "glIndexMaterialEXT\0"
    "\0"
-   /* _mesa_function_pool[18696]: Color3i (offset 15) */
+   /* _mesa_function_pool[18729]: Color3i (offset 15) */
    "iii\0"
    "glColor3i\0"
    "\0"
-   /* _mesa_function_pool[18711]: FrontFace (offset 157) */
+   /* _mesa_function_pool[18744]: FrontFace (offset 157) */
    "i\0"
    "glFrontFace\0"
    "\0"
-   /* _mesa_function_pool[18726]: EvalCoord2d (offset 232) */
+   /* _mesa_function_pool[18759]: EvalCoord2d (offset 232) */
    "dd\0"
    "glEvalCoord2d\0"
    "\0"
-   /* _mesa_function_pool[18744]: SecondaryColor3ubvEXT (will be remapped) */
+   /* _mesa_function_pool[18777]: SecondaryColor3ubvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3ubv\0"
    "glSecondaryColor3ubvEXT\0"
    "\0"
-   /* _mesa_function_pool[18792]: EvalCoord2f (offset 234) */
+   /* _mesa_function_pool[18825]: EvalCoord2f (offset 234) */
    "ff\0"
    "glEvalCoord2f\0"
    "\0"
-   /* _mesa_function_pool[18810]: VertexAttrib4dvARB (will be remapped) */
+   /* _mesa_function_pool[18843]: VertexAttrib4dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4dv\0"
    "glVertexAttrib4dvARB\0"
    "\0"
-   /* _mesa_function_pool[18853]: BindAttribLocationARB (will be remapped) */
+   /* _mesa_function_pool[18886]: BindAttribLocationARB (will be remapped) */
    "iip\0"
    "glBindAttribLocation\0"
    "glBindAttribLocationARB\0"
    "\0"
-   /* _mesa_function_pool[18903]: Color3b (offset 9) */
+   /* _mesa_function_pool[18936]: Color3b (offset 9) */
    "iii\0"
    "glColor3b\0"
    "\0"
-   /* _mesa_function_pool[18918]: MultiTexCoord2dARB (offset 384) */
+   /* _mesa_function_pool[18951]: MultiTexCoord2dARB (offset 384) */
    "idd\0"
    "glMultiTexCoord2d\0"
    "glMultiTexCoord2dARB\0"
    "\0"
-   /* _mesa_function_pool[18962]: ExecuteProgramNV (will be remapped) */
+   /* _mesa_function_pool[18995]: ExecuteProgramNV (will be remapped) */
    "iip\0"
    "glExecuteProgramNV\0"
    "\0"
-   /* _mesa_function_pool[18986]: Color3f (offset 13) */
+   /* _mesa_function_pool[19019]: Color3f (offset 13) */
    "fff\0"
    "glColor3f\0"
    "\0"
-   /* _mesa_function_pool[19001]: LightEnviSGIX (dynamic) */
+   /* _mesa_function_pool[19034]: LightEnviSGIX (dynamic) */
    "ii\0"
    "glLightEnviSGIX\0"
    "\0"
-   /* _mesa_function_pool[19021]: Color3d (offset 11) */
+   /* _mesa_function_pool[19054]: Color3d (offset 11) */
    "ddd\0"
    "glColor3d\0"
    "\0"
-   /* _mesa_function_pool[19036]: Normal3dv (offset 55) */
+   /* _mesa_function_pool[19069]: Normal3dv (offset 55) */
    "p\0"
    "glNormal3dv\0"
    "\0"
-   /* _mesa_function_pool[19051]: Lightf (offset 159) */
+   /* _mesa_function_pool[19084]: Lightf (offset 159) */
    "iif\0"
    "glLightf\0"
    "\0"
-   /* _mesa_function_pool[19065]: ReplacementCodeuiSUN (dynamic) */
+   /* _mesa_function_pool[19098]: ReplacementCodeuiSUN (dynamic) */
    "i\0"
    "glReplacementCodeuiSUN\0"
    "\0"
-   /* _mesa_function_pool[19091]: MatrixMode (offset 293) */
+   /* _mesa_function_pool[19124]: MatrixMode (offset 293) */
    "i\0"
    "glMatrixMode\0"
    "\0"
-   /* _mesa_function_pool[19107]: GetPixelMapusv (offset 273) */
+   /* _mesa_function_pool[19140]: GetPixelMapusv (offset 273) */
    "ip\0"
    "glGetPixelMapusv\0"
    "\0"
-   /* _mesa_function_pool[19128]: Lighti (offset 161) */
+   /* _mesa_function_pool[19161]: Lighti (offset 161) */
    "iii\0"
    "glLighti\0"
    "\0"
-   /* _mesa_function_pool[19142]: VertexAttribPointerNV (will be remapped) */
+   /* _mesa_function_pool[19175]: VertexAttribPointerNV (will be remapped) */
    "iiiip\0"
    "glVertexAttribPointerNV\0"
    "\0"
-   /* _mesa_function_pool[19173]: GetBooleanIndexedvEXT (will be remapped) */
+   /* _mesa_function_pool[19206]: GetBooleanIndexedvEXT (will be remapped) */
    "iip\0"
    "glGetBooleanIndexedvEXT\0"
    "\0"
-   /* _mesa_function_pool[19202]: GetFramebufferAttachmentParameterivEXT (will be remapped) */
+   /* _mesa_function_pool[19235]: GetFramebufferAttachmentParameterivEXT (will be remapped) */
    "iiip\0"
    "glGetFramebufferAttachmentParameteriv\0"
    "glGetFramebufferAttachmentParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[19287]: PixelTransformParameterfEXT (dynamic) */
+   /* _mesa_function_pool[19320]: PixelTransformParameterfEXT (dynamic) */
    "iif\0"
    "glPixelTransformParameterfEXT\0"
    "\0"
-   /* _mesa_function_pool[19322]: MultiTexCoord4dvARB (offset 401) */
+   /* _mesa_function_pool[19355]: MultiTexCoord4dvARB (offset 401) */
    "ip\0"
    "glMultiTexCoord4dv\0"
    "glMultiTexCoord4dvARB\0"
    "\0"
-   /* _mesa_function_pool[19367]: PixelTransformParameteriEXT (dynamic) */
+   /* _mesa_function_pool[19400]: PixelTransformParameteriEXT (dynamic) */
    "iii\0"
    "glPixelTransformParameteriEXT\0"
    "\0"
-   /* _mesa_function_pool[19402]: GetDoublev (offset 260) */
+   /* _mesa_function_pool[19435]: GetDoublev (offset 260) */
    "ip\0"
    "glGetDoublev\0"
    "\0"
-   /* _mesa_function_pool[19419]: MultMatrixd (offset 295) */
+   /* _mesa_function_pool[19452]: MultMatrixd (offset 295) */
    "p\0"
    "glMultMatrixd\0"
    "\0"
-   /* _mesa_function_pool[19436]: MultMatrixf (offset 294) */
+   /* _mesa_function_pool[19469]: MultMatrixf (offset 294) */
    "p\0"
    "glMultMatrixf\0"
    "\0"
-   /* _mesa_function_pool[19453]: TexCoord2fColor4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[19486]: TexCoord2fColor4ubVertex3fSUN (dynamic) */
    "ffiiiifff\0"
    "glTexCoord2fColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[19496]: Uniform1iARB (will be remapped) */
+   /* _mesa_function_pool[19529]: Uniform1iARB (will be remapped) */
    "ii\0"
    "glUniform1i\0"
    "glUniform1iARB\0"
    "\0"
-   /* _mesa_function_pool[19527]: VertexAttribPointerARB (will be remapped) */
+   /* _mesa_function_pool[19560]: VertexAttribPointerARB (will be remapped) */
    "iiiiip\0"
    "glVertexAttribPointer\0"
    "glVertexAttribPointerARB\0"
    "\0"
-   /* _mesa_function_pool[19582]: SharpenTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[19615]: SharpenTexFuncSGIS (dynamic) */
    "iip\0"
    "glSharpenTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[19608]: MultiTexCoord4fvARB (offset 403) */
+   /* _mesa_function_pool[19641]: MultiTexCoord4fvARB (offset 403) */
    "ip\0"
    "glMultiTexCoord4fv\0"
    "glMultiTexCoord4fvARB\0"
    "\0"
-   /* _mesa_function_pool[19653]: UniformMatrix2x3fv (will be remapped) */
+   /* _mesa_function_pool[19686]: UniformMatrix2x3fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix2x3fv\0"
    "\0"
-   /* _mesa_function_pool[19680]: TrackMatrixNV (will be remapped) */
+   /* _mesa_function_pool[19713]: TrackMatrixNV (will be remapped) */
    "iiii\0"
    "glTrackMatrixNV\0"
    "\0"
-   /* _mesa_function_pool[19702]: CombinerParameteriNV (will be remapped) */
+   /* _mesa_function_pool[19735]: CombinerParameteriNV (will be remapped) */
    "ii\0"
    "glCombinerParameteriNV\0"
    "\0"
-   /* _mesa_function_pool[19729]: DeleteAsyncMarkersSGIX (dynamic) */
+   /* _mesa_function_pool[19762]: DeleteAsyncMarkersSGIX (dynamic) */
    "ii\0"
    "glDeleteAsyncMarkersSGIX\0"
    "\0"
-   /* _mesa_function_pool[19758]: IsAsyncMarkerSGIX (dynamic) */
+   /* _mesa_function_pool[19791]: IsAsyncMarkerSGIX (dynamic) */
    "i\0"
    "glIsAsyncMarkerSGIX\0"
    "\0"
-   /* _mesa_function_pool[19781]: FrameZoomSGIX (dynamic) */
+   /* _mesa_function_pool[19814]: FrameZoomSGIX (dynamic) */
    "i\0"
    "glFrameZoomSGIX\0"
    "\0"
-   /* _mesa_function_pool[19800]: Normal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[19833]: Normal3fVertex3fvSUN (dynamic) */
    "pp\0"
    "glNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[19827]: RasterPos4sv (offset 85) */
+   /* _mesa_function_pool[19860]: RasterPos4sv (offset 85) */
    "p\0"
    "glRasterPos4sv\0"
    "\0"
-   /* _mesa_function_pool[19845]: VertexAttrib4NsvARB (will be remapped) */
+   /* _mesa_function_pool[19878]: VertexAttrib4NsvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nsv\0"
    "glVertexAttrib4NsvARB\0"
    "\0"
-   /* _mesa_function_pool[19890]: VertexAttrib3fvARB (will be remapped) */
+   /* _mesa_function_pool[19923]: VertexAttrib3fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3fv\0"
    "glVertexAttrib3fvARB\0"
    "\0"
-   /* _mesa_function_pool[19933]: ClearColor (offset 206) */
+   /* _mesa_function_pool[19966]: ClearColor (offset 206) */
    "ffff\0"
    "glClearColor\0"
    "\0"
-   /* _mesa_function_pool[19952]: GetSynciv (will be remapped) */
+   /* _mesa_function_pool[19985]: GetSynciv (will be remapped) */
    "iiipp\0"
    "glGetSynciv\0"
    "\0"
-   /* _mesa_function_pool[19971]: DeleteFramebuffersEXT (will be remapped) */
+   /* _mesa_function_pool[20004]: DeleteFramebuffersEXT (will be remapped) */
    "ip\0"
    "glDeleteFramebuffers\0"
    "glDeleteFramebuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[20020]: GlobalAlphaFactorsSUN (dynamic) */
+   /* _mesa_function_pool[20053]: GlobalAlphaFactorsSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorsSUN\0"
    "\0"
-   /* _mesa_function_pool[20047]: IsEnabledIndexedEXT (will be remapped) */
+   /* _mesa_function_pool[20080]: IsEnabledIndexedEXT (will be remapped) */
    "ii\0"
    "glIsEnabledIndexedEXT\0"
    "\0"
-   /* _mesa_function_pool[20073]: TexEnviv (offset 187) */
+   /* _mesa_function_pool[20106]: TexEnviv (offset 187) */
    "iip\0"
    "glTexEnviv\0"
    "\0"
-   /* _mesa_function_pool[20089]: TexSubImage3D (offset 372) */
+   /* _mesa_function_pool[20122]: TexSubImage3D (offset 372) */
    "iiiiiiiiiip\0"
    "glTexSubImage3D\0"
    "glTexSubImage3DEXT\0"
    "\0"
-   /* _mesa_function_pool[20137]: Tangent3fEXT (dynamic) */
+   /* _mesa_function_pool[20170]: Tangent3fEXT (dynamic) */
    "fff\0"
    "glTangent3fEXT\0"
    "\0"
-   /* _mesa_function_pool[20157]: SecondaryColor3uivEXT (will be remapped) */
+   /* _mesa_function_pool[20190]: SecondaryColor3uivEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3uiv\0"
    "glSecondaryColor3uivEXT\0"
    "\0"
-   /* _mesa_function_pool[20205]: MatrixIndexubvARB (dynamic) */
+   /* _mesa_function_pool[20238]: MatrixIndexubvARB (dynamic) */
    "ip\0"
    "glMatrixIndexubvARB\0"
    "\0"
-   /* _mesa_function_pool[20229]: Color4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[20262]: Color4fNormal3fVertex3fSUN (dynamic) */
    "ffffffffff\0"
    "glColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[20270]: PixelTexGenParameterfSGIS (will be remapped) */
+   /* _mesa_function_pool[20303]: PixelTexGenParameterfSGIS (will be remapped) */
    "if\0"
    "glPixelTexGenParameterfSGIS\0"
    "\0"
-   /* _mesa_function_pool[20302]: CreateShader (will be remapped) */
+   /* _mesa_function_pool[20335]: CreateShader (will be remapped) */
    "i\0"
    "glCreateShader\0"
    "\0"
-   /* _mesa_function_pool[20320]: GetColorTableParameterfv (offset 344) */
+   /* _mesa_function_pool[20353]: GetColorTableParameterfv (offset 344) */
    "iip\0"
    "glGetColorTableParameterfv\0"
    "glGetColorTableParameterfvSGI\0"
    "glGetColorTableParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[20412]: FragmentLightModelfvSGIX (dynamic) */
+   /* _mesa_function_pool[20445]: FragmentLightModelfvSGIX (dynamic) */
    "ip\0"
    "glFragmentLightModelfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[20443]: Bitmap (offset 8) */
+   /* _mesa_function_pool[20476]: Bitmap (offset 8) */
    "iiffffp\0"
    "glBitmap\0"
    "\0"
-   /* _mesa_function_pool[20461]: MultiTexCoord3fARB (offset 394) */
+   /* _mesa_function_pool[20494]: MultiTexCoord3fARB (offset 394) */
    "ifff\0"
    "glMultiTexCoord3f\0"
    "glMultiTexCoord3fARB\0"
    "\0"
-   /* _mesa_function_pool[20506]: GetTexLevelParameterfv (offset 284) */
+   /* _mesa_function_pool[20539]: GetTexLevelParameterfv (offset 284) */
    "iiip\0"
    "glGetTexLevelParameterfv\0"
    "\0"
-   /* _mesa_function_pool[20537]: GetPixelTexGenParameterfvSGIS (will be remapped) */
+   /* _mesa_function_pool[20570]: GetPixelTexGenParameterfvSGIS (will be remapped) */
    "ip\0"
    "glGetPixelTexGenParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[20573]: GenFramebuffersEXT (will be remapped) */
+   /* _mesa_function_pool[20606]: GenFramebuffersEXT (will be remapped) */
    "ip\0"
    "glGenFramebuffers\0"
    "glGenFramebuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[20616]: GetProgramParameterdvNV (will be remapped) */
+   /* _mesa_function_pool[20649]: GetProgramParameterdvNV (will be remapped) */
    "iiip\0"
    "glGetProgramParameterdvNV\0"
    "\0"
-   /* _mesa_function_pool[20648]: Vertex2sv (offset 133) */
+   /* _mesa_function_pool[20681]: Vertex2sv (offset 133) */
    "p\0"
    "glVertex2sv\0"
    "\0"
-   /* _mesa_function_pool[20663]: GetIntegerv (offset 263) */
+   /* _mesa_function_pool[20696]: GetIntegerv (offset 263) */
    "ip\0"
    "glGetIntegerv\0"
    "\0"
-   /* _mesa_function_pool[20681]: IsVertexArrayAPPLE (will be remapped) */
+   /* _mesa_function_pool[20714]: IsVertexArrayAPPLE (will be remapped) */
    "i\0"
    "glIsVertexArray\0"
    "glIsVertexArrayAPPLE\0"
    "\0"
-   /* _mesa_function_pool[20721]: FragmentLightfvSGIX (dynamic) */
+   /* _mesa_function_pool[20754]: FragmentLightfvSGIX (dynamic) */
    "iip\0"
    "glFragmentLightfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[20748]: DetachShader (will be remapped) */
+   /* _mesa_function_pool[20781]: DetachShader (will be remapped) */
    "ii\0"
    "glDetachShader\0"
    "\0"
-   /* _mesa_function_pool[20767]: VertexAttrib4NubARB (will be remapped) */
+   /* _mesa_function_pool[20800]: VertexAttrib4NubARB (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4Nub\0"
    "glVertexAttrib4NubARB\0"
    "\0"
-   /* _mesa_function_pool[20815]: GetProgramEnvParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[20848]: GetProgramEnvParameterfvARB (will be remapped) */
    "iip\0"
    "glGetProgramEnvParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[20850]: GetTrackMatrixivNV (will be remapped) */
+   /* _mesa_function_pool[20883]: GetTrackMatrixivNV (will be remapped) */
    "iiip\0"
    "glGetTrackMatrixivNV\0"
    "\0"
-   /* _mesa_function_pool[20877]: VertexAttrib3svNV (will be remapped) */
+   /* _mesa_function_pool[20910]: VertexAttrib3svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3svNV\0"
    "\0"
-   /* _mesa_function_pool[20901]: Uniform4fvARB (will be remapped) */
+   /* _mesa_function_pool[20934]: Uniform4fvARB (will be remapped) */
    "iip\0"
    "glUniform4fv\0"
    "glUniform4fvARB\0"
    "\0"
-   /* _mesa_function_pool[20935]: MultTransposeMatrixfARB (will be remapped) */
+   /* _mesa_function_pool[20968]: MultTransposeMatrixfARB (will be remapped) */
    "p\0"
    "glMultTransposeMatrixf\0"
    "glMultTransposeMatrixfARB\0"
    "\0"
-   /* _mesa_function_pool[20987]: GetTexEnviv (offset 277) */
+   /* _mesa_function_pool[21020]: GetTexEnviv (offset 277) */
    "iip\0"
    "glGetTexEnviv\0"
    "\0"
-   /* _mesa_function_pool[21006]: ColorFragmentOp1ATI (will be remapped) */
+   /* _mesa_function_pool[21039]: ColorFragmentOp1ATI (will be remapped) */
    "iiiiiii\0"
    "glColorFragmentOp1ATI\0"
    "\0"
-   /* _mesa_function_pool[21037]: GetUniformfvARB (will be remapped) */
+   /* _mesa_function_pool[21070]: GetUniformfvARB (will be remapped) */
    "iip\0"
    "glGetUniformfv\0"
    "glGetUniformfvARB\0"
    "\0"
-   /* _mesa_function_pool[21075]: PopClientAttrib (offset 334) */
+   /* _mesa_function_pool[21108]: EGLImageTargetRenderbufferStorageOES (will be remapped) */
+   "ip\0"
+   "glEGLImageTargetRenderbufferStorageOES\0"
+   "\0"
+   /* _mesa_function_pool[21151]: PopClientAttrib (offset 334) */
    "\0"
    "glPopClientAttrib\0"
    "\0"
-   /* _mesa_function_pool[21095]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[21171]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
    "iffffffffffff\0"
    "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[21166]: DetachObjectARB (will be remapped) */
+   /* _mesa_function_pool[21242]: DetachObjectARB (will be remapped) */
    "ii\0"
    "glDetachObjectARB\0"
    "\0"
-   /* _mesa_function_pool[21188]: VertexBlendARB (dynamic) */
+   /* _mesa_function_pool[21264]: VertexBlendARB (dynamic) */
    "i\0"
    "glVertexBlendARB\0"
    "\0"
-   /* _mesa_function_pool[21208]: WindowPos3iMESA (will be remapped) */
+   /* _mesa_function_pool[21284]: WindowPos3iMESA (will be remapped) */
    "iii\0"
    "glWindowPos3i\0"
    "glWindowPos3iARB\0"
    "glWindowPos3iMESA\0"
    "\0"
-   /* _mesa_function_pool[21262]: SeparableFilter2D (offset 360) */
+   /* _mesa_function_pool[21338]: SeparableFilter2D (offset 360) */
    "iiiiiipp\0"
    "glSeparableFilter2D\0"
    "glSeparableFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[21315]: ReplacementCodeuiColor4ubVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[21391]: ReplacementCodeuiColor4ubVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiColor4ubVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[21360]: Map1d (offset 220) */
+   /* _mesa_function_pool[21436]: Map1d (offset 220) */
    "iddiip\0"
    "glMap1d\0"
    "\0"
-   /* _mesa_function_pool[21376]: Map1f (offset 221) */
+   /* _mesa_function_pool[21452]: Map1f (offset 221) */
    "iffiip\0"
    "glMap1f\0"
    "\0"
-   /* _mesa_function_pool[21392]: CompressedTexImage2DARB (will be remapped) */
+   /* _mesa_function_pool[21468]: CompressedTexImage2DARB (will be remapped) */
    "iiiiiiip\0"
    "glCompressedTexImage2D\0"
    "glCompressedTexImage2DARB\0"
    "\0"
-   /* _mesa_function_pool[21451]: ArrayElement (offset 306) */
+   /* _mesa_function_pool[21527]: ArrayElement (offset 306) */
    "i\0"
    "glArrayElement\0"
    "glArrayElementEXT\0"
    "\0"
-   /* _mesa_function_pool[21487]: TexImage2D (offset 183) */
+   /* _mesa_function_pool[21563]: TexImage2D (offset 183) */
    "iiiiiiiip\0"
    "glTexImage2D\0"
    "\0"
-   /* _mesa_function_pool[21511]: DepthBoundsEXT (will be remapped) */
+   /* _mesa_function_pool[21587]: DepthBoundsEXT (will be remapped) */
    "dd\0"
    "glDepthBoundsEXT\0"
    "\0"
-   /* _mesa_function_pool[21532]: ProgramParameters4fvNV (will be remapped) */
+   /* _mesa_function_pool[21608]: ProgramParameters4fvNV (will be remapped) */
    "iiip\0"
    "glProgramParameters4fvNV\0"
    "\0"
-   /* _mesa_function_pool[21563]: DeformationMap3fSGIX (dynamic) */
+   /* _mesa_function_pool[21639]: DeformationMap3fSGIX (dynamic) */
    "iffiiffiiffiip\0"
    "glDeformationMap3fSGIX\0"
    "\0"
-   /* _mesa_function_pool[21602]: GetProgramivNV (will be remapped) */
+   /* _mesa_function_pool[21678]: GetProgramivNV (will be remapped) */
    "iip\0"
    "glGetProgramivNV\0"
    "\0"
-   /* _mesa_function_pool[21624]: GetMinmaxParameteriv (offset 366) */
+   /* _mesa_function_pool[21700]: GetMinmaxParameteriv (offset 366) */
    "iip\0"
    "glGetMinmaxParameteriv\0"
    "glGetMinmaxParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[21678]: PixelTransferf (offset 247) */
+   /* _mesa_function_pool[21754]: PixelTransferf (offset 247) */
    "if\0"
    "glPixelTransferf\0"
    "\0"
-   /* _mesa_function_pool[21699]: CopyTexImage1D (offset 323) */
+   /* _mesa_function_pool[21775]: CopyTexImage1D (offset 323) */
    "iiiiiii\0"
    "glCopyTexImage1D\0"
    "glCopyTexImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[21745]: PushMatrix (offset 298) */
+   /* _mesa_function_pool[21821]: PushMatrix (offset 298) */
    "\0"
    "glPushMatrix\0"
    "\0"
-   /* _mesa_function_pool[21760]: Fogiv (offset 156) */
+   /* _mesa_function_pool[21836]: Fogiv (offset 156) */
    "ip\0"
    "glFogiv\0"
    "\0"
-   /* _mesa_function_pool[21772]: TexCoord1dv (offset 95) */
+   /* _mesa_function_pool[21848]: TexCoord1dv (offset 95) */
    "p\0"
    "glTexCoord1dv\0"
    "\0"
-   /* _mesa_function_pool[21789]: AlphaFragmentOp3ATI (will be remapped) */
+   /* _mesa_function_pool[21865]: AlphaFragmentOp3ATI (will be remapped) */
    "iiiiiiiiiiii\0"
    "glAlphaFragmentOp3ATI\0"
    "\0"
-   /* _mesa_function_pool[21825]: PixelTransferi (offset 248) */
+   /* _mesa_function_pool[21901]: PixelTransferi (offset 248) */
    "ii\0"
    "glPixelTransferi\0"
    "\0"
-   /* _mesa_function_pool[21846]: GetVertexAttribdvNV (will be remapped) */
+   /* _mesa_function_pool[21922]: GetVertexAttribdvNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribdvNV\0"
    "\0"
-   /* _mesa_function_pool[21873]: VertexAttrib3fvNV (will be remapped) */
+   /* _mesa_function_pool[21949]: VertexAttrib3fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3fvNV\0"
    "\0"
-   /* _mesa_function_pool[21897]: Rotatef (offset 300) */
+   /* _mesa_function_pool[21973]: Rotatef (offset 300) */
    "ffff\0"
    "glRotatef\0"
    "\0"
-   /* _mesa_function_pool[21913]: GetFinalCombinerInputParameterivNV (will be remapped) */
+   /* _mesa_function_pool[21989]: GetFinalCombinerInputParameterivNV (will be remapped) */
    "iip\0"
    "glGetFinalCombinerInputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[21955]: Vertex3i (offset 138) */
+   /* _mesa_function_pool[22031]: Vertex3i (offset 138) */
    "iii\0"
    "glVertex3i\0"
    "\0"
-   /* _mesa_function_pool[21971]: Vertex3f (offset 136) */
+   /* _mesa_function_pool[22047]: Vertex3f (offset 136) */
    "fff\0"
    "glVertex3f\0"
    "\0"
-   /* _mesa_function_pool[21987]: Clear (offset 203) */
+   /* _mesa_function_pool[22063]: Clear (offset 203) */
    "i\0"
    "glClear\0"
    "\0"
-   /* _mesa_function_pool[21998]: Vertex3d (offset 134) */
+   /* _mesa_function_pool[22074]: Vertex3d (offset 134) */
    "ddd\0"
    "glVertex3d\0"
    "\0"
-   /* _mesa_function_pool[22014]: GetMapParameterivNV (dynamic) */
+   /* _mesa_function_pool[22090]: GetMapParameterivNV (dynamic) */
    "iip\0"
    "glGetMapParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[22041]: Uniform4iARB (will be remapped) */
+   /* _mesa_function_pool[22117]: Uniform4iARB (will be remapped) */
    "iiiii\0"
    "glUniform4i\0"
    "glUniform4iARB\0"
    "\0"
-   /* _mesa_function_pool[22075]: ReadBuffer (offset 254) */
+   /* _mesa_function_pool[22151]: ReadBuffer (offset 254) */
    "i\0"
    "glReadBuffer\0"
    "\0"
-   /* _mesa_function_pool[22091]: ConvolutionParameteri (offset 352) */
+   /* _mesa_function_pool[22167]: ConvolutionParameteri (offset 352) */
    "iii\0"
    "glConvolutionParameteri\0"
    "glConvolutionParameteriEXT\0"
    "\0"
-   /* _mesa_function_pool[22147]: Ortho (offset 296) */
+   /* _mesa_function_pool[22223]: Ortho (offset 296) */
    "dddddd\0"
    "glOrtho\0"
    "\0"
-   /* _mesa_function_pool[22163]: Binormal3sEXT (dynamic) */
+   /* _mesa_function_pool[22239]: Binormal3sEXT (dynamic) */
    "iii\0"
    "glBinormal3sEXT\0"
    "\0"
-   /* _mesa_function_pool[22184]: ListBase (offset 6) */
+   /* _mesa_function_pool[22260]: ListBase (offset 6) */
    "i\0"
    "glListBase\0"
    "\0"
-   /* _mesa_function_pool[22198]: Vertex3s (offset 140) */
+   /* _mesa_function_pool[22274]: Vertex3s (offset 140) */
    "iii\0"
    "glVertex3s\0"
    "\0"
-   /* _mesa_function_pool[22214]: ConvolutionParameterf (offset 350) */
+   /* _mesa_function_pool[22290]: ConvolutionParameterf (offset 350) */
    "iif\0"
    "glConvolutionParameterf\0"
    "glConvolutionParameterfEXT\0"
    "\0"
-   /* _mesa_function_pool[22270]: GetColorTableParameteriv (offset 345) */
+   /* _mesa_function_pool[22346]: GetColorTableParameteriv (offset 345) */
    "iip\0"
    "glGetColorTableParameteriv\0"
    "glGetColorTableParameterivSGI\0"
    "glGetColorTableParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[22362]: ProgramEnvParameter4dvARB (will be remapped) */
+   /* _mesa_function_pool[22438]: ProgramEnvParameter4dvARB (will be remapped) */
    "iip\0"
    "glProgramEnvParameter4dvARB\0"
    "glProgramParameter4dvNV\0"
    "\0"
-   /* _mesa_function_pool[22419]: ShadeModel (offset 177) */
+   /* _mesa_function_pool[22495]: ShadeModel (offset 177) */
    "i\0"
    "glShadeModel\0"
    "\0"
-   /* _mesa_function_pool[22435]: VertexAttribs2fvNV (will be remapped) */
+   /* _mesa_function_pool[22511]: VertexAttribs2fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2fvNV\0"
    "\0"
-   /* _mesa_function_pool[22461]: Rectiv (offset 91) */
+   /* _mesa_function_pool[22537]: Rectiv (offset 91) */
    "pp\0"
    "glRectiv\0"
    "\0"
-   /* _mesa_function_pool[22474]: UseProgramObjectARB (will be remapped) */
+   /* _mesa_function_pool[22550]: UseProgramObjectARB (will be remapped) */
    "i\0"
    "glUseProgram\0"
    "glUseProgramObjectARB\0"
    "\0"
-   /* _mesa_function_pool[22512]: GetMapParameterfvNV (dynamic) */
+   /* _mesa_function_pool[22588]: GetMapParameterfvNV (dynamic) */
    "iip\0"
    "glGetMapParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[22539]: EndConditionalRenderNV (will be remapped) */
+   /* _mesa_function_pool[22615]: EndConditionalRenderNV (will be remapped) */
    "\0"
    "glEndConditionalRenderNV\0"
    "\0"
-   /* _mesa_function_pool[22566]: PassTexCoordATI (will be remapped) */
+   /* _mesa_function_pool[22642]: PassTexCoordATI (will be remapped) */
    "iii\0"
    "glPassTexCoordATI\0"
    "\0"
-   /* _mesa_function_pool[22589]: DeleteProgram (will be remapped) */
+   /* _mesa_function_pool[22665]: DeleteProgram (will be remapped) */
    "i\0"
    "glDeleteProgram\0"
    "\0"
-   /* _mesa_function_pool[22608]: Tangent3ivEXT (dynamic) */
+   /* _mesa_function_pool[22684]: Tangent3ivEXT (dynamic) */
    "p\0"
    "glTangent3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[22627]: Tangent3dEXT (dynamic) */
+   /* _mesa_function_pool[22703]: Tangent3dEXT (dynamic) */
    "ddd\0"
    "glTangent3dEXT\0"
    "\0"
-   /* _mesa_function_pool[22647]: SecondaryColor3dvEXT (will be remapped) */
+   /* _mesa_function_pool[22723]: SecondaryColor3dvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3dv\0"
    "glSecondaryColor3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[22693]: Vertex2fv (offset 129) */
+   /* _mesa_function_pool[22769]: Vertex2fv (offset 129) */
    "p\0"
    "glVertex2fv\0"
    "\0"
-   /* _mesa_function_pool[22708]: MultiDrawArraysEXT (will be remapped) */
+   /* _mesa_function_pool[22784]: MultiDrawArraysEXT (will be remapped) */
    "ippi\0"
    "glMultiDrawArrays\0"
    "glMultiDrawArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[22753]: BindRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[22829]: BindRenderbufferEXT (will be remapped) */
    "ii\0"
    "glBindRenderbuffer\0"
    "glBindRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[22798]: MultiTexCoord4dARB (offset 400) */
+   /* _mesa_function_pool[22874]: MultiTexCoord4dARB (offset 400) */
    "idddd\0"
    "glMultiTexCoord4d\0"
    "glMultiTexCoord4dARB\0"
    "\0"
-   /* _mesa_function_pool[22844]: Vertex3sv (offset 141) */
+   /* _mesa_function_pool[22920]: Vertex3sv (offset 141) */
    "p\0"
    "glVertex3sv\0"
    "\0"
-   /* _mesa_function_pool[22859]: SecondaryColor3usEXT (will be remapped) */
+   /* _mesa_function_pool[22935]: SecondaryColor3usEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3us\0"
    "glSecondaryColor3usEXT\0"
    "\0"
-   /* _mesa_function_pool[22907]: ProgramLocalParameter4fvARB (will be remapped) */
+   /* _mesa_function_pool[22983]: ProgramLocalParameter4fvARB (will be remapped) */
    "iip\0"
    "glProgramLocalParameter4fvARB\0"
    "\0"
-   /* _mesa_function_pool[22942]: DeleteProgramsNV (will be remapped) */
+   /* _mesa_function_pool[23018]: DeleteProgramsNV (will be remapped) */
    "ip\0"
    "glDeleteProgramsARB\0"
    "glDeleteProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[22985]: EvalMesh1 (offset 236) */
+   /* _mesa_function_pool[23061]: EvalMesh1 (offset 236) */
    "iii\0"
    "glEvalMesh1\0"
    "\0"
-   /* _mesa_function_pool[23002]: MultiTexCoord1sARB (offset 382) */
+   /* _mesa_function_pool[23078]: MultiTexCoord1sARB (offset 382) */
    "ii\0"
    "glMultiTexCoord1s\0"
    "glMultiTexCoord1sARB\0"
    "\0"
-   /* _mesa_function_pool[23045]: ReplacementCodeuiColor3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[23121]: ReplacementCodeuiColor3fVertex3fSUN (dynamic) */
    "iffffff\0"
    "glReplacementCodeuiColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[23092]: GetVertexAttribPointervNV (will be remapped) */
+   /* _mesa_function_pool[23168]: GetVertexAttribPointervNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribPointerv\0"
    "glGetVertexAttribPointervARB\0"
    "glGetVertexAttribPointervNV\0"
    "\0"
-   /* _mesa_function_pool[23180]: DisableIndexedEXT (will be remapped) */
+   /* _mesa_function_pool[23256]: DisableIndexedEXT (will be remapped) */
    "ii\0"
    "glDisableIndexedEXT\0"
    "\0"
-   /* _mesa_function_pool[23204]: MultiTexCoord1dvARB (offset 377) */
+   /* _mesa_function_pool[23280]: MultiTexCoord1dvARB (offset 377) */
    "ip\0"
    "glMultiTexCoord1dv\0"
    "glMultiTexCoord1dvARB\0"
    "\0"
-   /* _mesa_function_pool[23249]: Uniform2iARB (will be remapped) */
+   /* _mesa_function_pool[23325]: Uniform2iARB (will be remapped) */
    "iii\0"
    "glUniform2i\0"
    "glUniform2iARB\0"
    "\0"
-   /* _mesa_function_pool[23281]: Vertex2iv (offset 131) */
+   /* _mesa_function_pool[23357]: Vertex2iv (offset 131) */
    "p\0"
    "glVertex2iv\0"
    "\0"
-   /* _mesa_function_pool[23296]: GetProgramStringNV (will be remapped) */
+   /* _mesa_function_pool[23372]: GetProgramStringNV (will be remapped) */
    "iip\0"
    "glGetProgramStringNV\0"
    "\0"
-   /* _mesa_function_pool[23322]: ColorPointerEXT (will be remapped) */
+   /* _mesa_function_pool[23398]: ColorPointerEXT (will be remapped) */
    "iiiip\0"
    "glColorPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[23347]: LineWidth (offset 168) */
+   /* _mesa_function_pool[23423]: LineWidth (offset 168) */
    "f\0"
    "glLineWidth\0"
    "\0"
-   /* _mesa_function_pool[23362]: MapBufferARB (will be remapped) */
+   /* _mesa_function_pool[23438]: MapBufferARB (will be remapped) */
    "ii\0"
    "glMapBuffer\0"
    "glMapBufferARB\0"
    "\0"
-   /* _mesa_function_pool[23393]: MultiDrawElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[23469]: MultiDrawElementsBaseVertex (will be remapped) */
    "ipipip\0"
    "glMultiDrawElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[23431]: Binormal3svEXT (dynamic) */
+   /* _mesa_function_pool[23507]: Binormal3svEXT (dynamic) */
    "p\0"
    "glBinormal3svEXT\0"
    "\0"
-   /* _mesa_function_pool[23451]: ApplyTextureEXT (dynamic) */
+   /* _mesa_function_pool[23527]: ApplyTextureEXT (dynamic) */
    "i\0"
    "glApplyTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[23472]: TexGendv (offset 189) */
+   /* _mesa_function_pool[23548]: TexGendv (offset 189) */
    "iip\0"
    "glTexGendv\0"
    "\0"
-   /* _mesa_function_pool[23488]: EnableIndexedEXT (will be remapped) */
+   /* _mesa_function_pool[23564]: EnableIndexedEXT (will be remapped) */
    "ii\0"
    "glEnableIndexedEXT\0"
    "\0"
-   /* _mesa_function_pool[23511]: TextureMaterialEXT (dynamic) */
+   /* _mesa_function_pool[23587]: TextureMaterialEXT (dynamic) */
    "ii\0"
    "glTextureMaterialEXT\0"
    "\0"
-   /* _mesa_function_pool[23536]: TextureLightEXT (dynamic) */
+   /* _mesa_function_pool[23612]: TextureLightEXT (dynamic) */
    "i\0"
    "glTextureLightEXT\0"
    "\0"
-   /* _mesa_function_pool[23557]: ResetMinmax (offset 370) */
+   /* _mesa_function_pool[23633]: ResetMinmax (offset 370) */
    "i\0"
    "glResetMinmax\0"
    "glResetMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[23591]: SpriteParameterfSGIX (dynamic) */
+   /* _mesa_function_pool[23667]: SpriteParameterfSGIX (dynamic) */
    "if\0"
    "glSpriteParameterfSGIX\0"
    "\0"
-   /* _mesa_function_pool[23618]: EnableClientState (offset 313) */
+   /* _mesa_function_pool[23694]: EnableClientState (offset 313) */
    "i\0"
    "glEnableClientState\0"
    "\0"
-   /* _mesa_function_pool[23641]: VertexAttrib4sNV (will be remapped) */
+   /* _mesa_function_pool[23717]: VertexAttrib4sNV (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4sNV\0"
    "\0"
-   /* _mesa_function_pool[23667]: GetConvolutionParameterfv (offset 357) */
+   /* _mesa_function_pool[23743]: GetConvolutionParameterfv (offset 357) */
    "iip\0"
    "glGetConvolutionParameterfv\0"
    "glGetConvolutionParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[23731]: VertexAttribs4dvNV (will be remapped) */
+   /* _mesa_function_pool[23807]: VertexAttribs4dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4dvNV\0"
    "\0"
-   /* _mesa_function_pool[23757]: MultiModeDrawArraysIBM (will be remapped) */
+   /* _mesa_function_pool[23833]: MultiModeDrawArraysIBM (will be remapped) */
    "pppii\0"
    "glMultiModeDrawArraysIBM\0"
    "\0"
-   /* _mesa_function_pool[23789]: VertexAttrib4dARB (will be remapped) */
+   /* _mesa_function_pool[23865]: VertexAttrib4dARB (will be remapped) */
    "idddd\0"
    "glVertexAttrib4d\0"
    "glVertexAttrib4dARB\0"
    "\0"
-   /* _mesa_function_pool[23833]: GetTexBumpParameterfvATI (will be remapped) */
+   /* _mesa_function_pool[23909]: GetTexBumpParameterfvATI (will be remapped) */
    "ip\0"
    "glGetTexBumpParameterfvATI\0"
    "\0"
-   /* _mesa_function_pool[23864]: ProgramNamedParameter4dNV (will be remapped) */
+   /* _mesa_function_pool[23940]: ProgramNamedParameter4dNV (will be remapped) */
    "iipdddd\0"
    "glProgramNamedParameter4dNV\0"
    "\0"
-   /* _mesa_function_pool[23901]: GetMaterialfv (offset 269) */
+   /* _mesa_function_pool[23977]: GetMaterialfv (offset 269) */
    "iip\0"
    "glGetMaterialfv\0"
    "\0"
-   /* _mesa_function_pool[23922]: VertexWeightfEXT (dynamic) */
+   /* _mesa_function_pool[23998]: VertexWeightfEXT (dynamic) */
    "f\0"
    "glVertexWeightfEXT\0"
    "\0"
-   /* _mesa_function_pool[23944]: Binormal3fEXT (dynamic) */
+   /* _mesa_function_pool[24020]: Binormal3fEXT (dynamic) */
    "fff\0"
    "glBinormal3fEXT\0"
    "\0"
-   /* _mesa_function_pool[23965]: CallList (offset 2) */
+   /* _mesa_function_pool[24041]: CallList (offset 2) */
    "i\0"
    "glCallList\0"
    "\0"
-   /* _mesa_function_pool[23979]: Materialfv (offset 170) */
+   /* _mesa_function_pool[24055]: Materialfv (offset 170) */
    "iip\0"
    "glMaterialfv\0"
    "\0"
-   /* _mesa_function_pool[23997]: TexCoord3fv (offset 113) */
+   /* _mesa_function_pool[24073]: TexCoord3fv (offset 113) */
    "p\0"
    "glTexCoord3fv\0"
    "\0"
-   /* _mesa_function_pool[24014]: FogCoordfvEXT (will be remapped) */
+   /* _mesa_function_pool[24090]: FogCoordfvEXT (will be remapped) */
    "p\0"
    "glFogCoordfv\0"
    "glFogCoordfvEXT\0"
    "\0"
-   /* _mesa_function_pool[24046]: MultiTexCoord1ivARB (offset 381) */
+   /* _mesa_function_pool[24122]: MultiTexCoord1ivARB (offset 381) */
    "ip\0"
    "glMultiTexCoord1iv\0"
    "glMultiTexCoord1ivARB\0"
    "\0"
-   /* _mesa_function_pool[24091]: SecondaryColor3ubEXT (will be remapped) */
+   /* _mesa_function_pool[24167]: SecondaryColor3ubEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3ub\0"
    "glSecondaryColor3ubEXT\0"
    "\0"
-   /* _mesa_function_pool[24139]: MultiTexCoord2ivARB (offset 389) */
+   /* _mesa_function_pool[24215]: MultiTexCoord2ivARB (offset 389) */
    "ip\0"
    "glMultiTexCoord2iv\0"
    "glMultiTexCoord2ivARB\0"
    "\0"
-   /* _mesa_function_pool[24184]: FogFuncSGIS (dynamic) */
+   /* _mesa_function_pool[24260]: FogFuncSGIS (dynamic) */
    "ip\0"
    "glFogFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[24202]: CopyTexSubImage2D (offset 326) */
+   /* _mesa_function_pool[24278]: CopyTexSubImage2D (offset 326) */
    "iiiiiiii\0"
    "glCopyTexSubImage2D\0"
    "glCopyTexSubImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[24255]: GetObjectParameterivARB (will be remapped) */
+   /* _mesa_function_pool[24331]: GetObjectParameterivARB (will be remapped) */
    "iip\0"
    "glGetObjectParameterivARB\0"
    "\0"
-   /* _mesa_function_pool[24286]: Color3iv (offset 16) */
+   /* _mesa_function_pool[24362]: Color3iv (offset 16) */
    "p\0"
    "glColor3iv\0"
    "\0"
-   /* _mesa_function_pool[24300]: TexCoord4fVertex4fSUN (dynamic) */
+   /* _mesa_function_pool[24376]: TexCoord4fVertex4fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord4fVertex4fSUN\0"
    "\0"
-   /* _mesa_function_pool[24334]: DrawElements (offset 311) */
+   /* _mesa_function_pool[24410]: DrawElements (offset 311) */
    "iiip\0"
    "glDrawElements\0"
    "\0"
-   /* _mesa_function_pool[24355]: BindVertexArrayAPPLE (will be remapped) */
+   /* _mesa_function_pool[24431]: BindVertexArrayAPPLE (will be remapped) */
    "i\0"
    "glBindVertexArrayAPPLE\0"
    "\0"
-   /* _mesa_function_pool[24381]: GetProgramLocalParameterdvARB (will be remapped) */
+   /* _mesa_function_pool[24457]: GetProgramLocalParameterdvARB (will be remapped) */
    "iip\0"
    "glGetProgramLocalParameterdvARB\0"
    "\0"
-   /* _mesa_function_pool[24418]: GetHistogramParameteriv (offset 363) */
+   /* _mesa_function_pool[24494]: GetHistogramParameteriv (offset 363) */
    "iip\0"
    "glGetHistogramParameteriv\0"
    "glGetHistogramParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[24478]: MultiTexCoord1iARB (offset 380) */
+   /* _mesa_function_pool[24554]: MultiTexCoord1iARB (offset 380) */
    "ii\0"
    "glMultiTexCoord1i\0"
    "glMultiTexCoord1iARB\0"
    "\0"
-   /* _mesa_function_pool[24521]: GetConvolutionFilter (offset 356) */
+   /* _mesa_function_pool[24597]: GetConvolutionFilter (offset 356) */
    "iiip\0"
    "glGetConvolutionFilter\0"
    "glGetConvolutionFilterEXT\0"
    "\0"
-   /* _mesa_function_pool[24576]: GetProgramivARB (will be remapped) */
+   /* _mesa_function_pool[24652]: GetProgramivARB (will be remapped) */
    "iip\0"
    "glGetProgramivARB\0"
    "\0"
-   /* _mesa_function_pool[24599]: BlendFuncSeparateEXT (will be remapped) */
+   /* _mesa_function_pool[24675]: BlendFuncSeparateEXT (will be remapped) */
    "iiii\0"
    "glBlendFuncSeparate\0"
    "glBlendFuncSeparateEXT\0"
    "glBlendFuncSeparateINGR\0"
    "\0"
-   /* _mesa_function_pool[24672]: MapBufferRange (will be remapped) */
+   /* _mesa_function_pool[24748]: MapBufferRange (will be remapped) */
    "iiii\0"
    "glMapBufferRange\0"
    "\0"
-   /* _mesa_function_pool[24695]: ProgramParameters4dvNV (will be remapped) */
+   /* _mesa_function_pool[24771]: ProgramParameters4dvNV (will be remapped) */
    "iiip\0"
    "glProgramParameters4dvNV\0"
    "\0"
-   /* _mesa_function_pool[24726]: TexCoord2fColor3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[24802]: TexCoord2fColor3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[24763]: EvalPoint2 (offset 239) */
+   /* _mesa_function_pool[24839]: EvalPoint2 (offset 239) */
    "ii\0"
    "glEvalPoint2\0"
    "\0"
-   /* _mesa_function_pool[24780]: EvalPoint1 (offset 237) */
+   /* _mesa_function_pool[24856]: EvalPoint1 (offset 237) */
    "i\0"
    "glEvalPoint1\0"
    "\0"
-   /* _mesa_function_pool[24796]: Binormal3dvEXT (dynamic) */
+   /* _mesa_function_pool[24872]: Binormal3dvEXT (dynamic) */
    "p\0"
    "glBinormal3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[24816]: PopMatrix (offset 297) */
+   /* _mesa_function_pool[24892]: PopMatrix (offset 297) */
    "\0"
    "glPopMatrix\0"
    "\0"
-   /* _mesa_function_pool[24830]: FinishFenceNV (will be remapped) */
+   /* _mesa_function_pool[24906]: FinishFenceNV (will be remapped) */
    "i\0"
    "glFinishFenceNV\0"
    "\0"
-   /* _mesa_function_pool[24849]: GetFogFuncSGIS (dynamic) */
+   /* _mesa_function_pool[24925]: GetFogFuncSGIS (dynamic) */
    "p\0"
    "glGetFogFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[24869]: GetUniformLocationARB (will be remapped) */
+   /* _mesa_function_pool[24945]: GetUniformLocationARB (will be remapped) */
    "ip\0"
    "glGetUniformLocation\0"
    "glGetUniformLocationARB\0"
    "\0"
-   /* _mesa_function_pool[24918]: SecondaryColor3fEXT (will be remapped) */
+   /* _mesa_function_pool[24994]: SecondaryColor3fEXT (will be remapped) */
    "fff\0"
    "glSecondaryColor3f\0"
    "glSecondaryColor3fEXT\0"
    "\0"
-   /* _mesa_function_pool[24964]: GetTexGeniv (offset 280) */
+   /* _mesa_function_pool[25040]: GetTexGeniv (offset 280) */
    "iip\0"
    "glGetTexGeniv\0"
    "\0"
-   /* _mesa_function_pool[24983]: CombinerInputNV (will be remapped) */
+   /* _mesa_function_pool[25059]: CombinerInputNV (will be remapped) */
    "iiiiii\0"
    "glCombinerInputNV\0"
    "\0"
-   /* _mesa_function_pool[25009]: VertexAttrib3sARB (will be remapped) */
+   /* _mesa_function_pool[25085]: VertexAttrib3sARB (will be remapped) */
    "iiii\0"
    "glVertexAttrib3s\0"
    "glVertexAttrib3sARB\0"
    "\0"
-   /* _mesa_function_pool[25052]: ReplacementCodeuiNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[25128]: ReplacementCodeuiNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[25097]: Map2d (offset 222) */
+   /* _mesa_function_pool[25173]: Map2d (offset 222) */
    "iddiiddiip\0"
    "glMap2d\0"
    "\0"
-   /* _mesa_function_pool[25117]: Map2f (offset 223) */
+   /* _mesa_function_pool[25193]: Map2f (offset 223) */
    "iffiiffiip\0"
    "glMap2f\0"
    "\0"
-   /* _mesa_function_pool[25137]: ProgramStringARB (will be remapped) */
+   /* _mesa_function_pool[25213]: ProgramStringARB (will be remapped) */
    "iiip\0"
    "glProgramStringARB\0"
    "\0"
-   /* _mesa_function_pool[25162]: Vertex4s (offset 148) */
+   /* _mesa_function_pool[25238]: Vertex4s (offset 148) */
    "iiii\0"
    "glVertex4s\0"
    "\0"
-   /* _mesa_function_pool[25179]: TexCoord4fVertex4fvSUN (dynamic) */
+   /* _mesa_function_pool[25255]: TexCoord4fVertex4fvSUN (dynamic) */
    "pp\0"
    "glTexCoord4fVertex4fvSUN\0"
    "\0"
-   /* _mesa_function_pool[25208]: VertexAttrib3sNV (will be remapped) */
+   /* _mesa_function_pool[25284]: VertexAttrib3sNV (will be remapped) */
    "iiii\0"
    "glVertexAttrib3sNV\0"
    "\0"
-   /* _mesa_function_pool[25233]: VertexAttrib1fNV (will be remapped) */
+   /* _mesa_function_pool[25309]: VertexAttrib1fNV (will be remapped) */
    "if\0"
    "glVertexAttrib1fNV\0"
    "\0"
-   /* _mesa_function_pool[25256]: Vertex4f (offset 144) */
+   /* _mesa_function_pool[25332]: Vertex4f (offset 144) */
    "ffff\0"
    "glVertex4f\0"
    "\0"
-   /* _mesa_function_pool[25273]: EvalCoord1d (offset 228) */
+   /* _mesa_function_pool[25349]: EvalCoord1d (offset 228) */
    "d\0"
    "glEvalCoord1d\0"
    "\0"
-   /* _mesa_function_pool[25290]: Vertex4d (offset 142) */
+   /* _mesa_function_pool[25366]: Vertex4d (offset 142) */
    "dddd\0"
    "glVertex4d\0"
    "\0"
-   /* _mesa_function_pool[25307]: RasterPos4dv (offset 79) */
+   /* _mesa_function_pool[25383]: RasterPos4dv (offset 79) */
    "p\0"
    "glRasterPos4dv\0"
    "\0"
-   /* _mesa_function_pool[25325]: FragmentLightfSGIX (dynamic) */
+   /* _mesa_function_pool[25401]: FragmentLightfSGIX (dynamic) */
    "iif\0"
    "glFragmentLightfSGIX\0"
    "\0"
-   /* _mesa_function_pool[25351]: GetCompressedTexImageARB (will be remapped) */
+   /* _mesa_function_pool[25427]: GetCompressedTexImageARB (will be remapped) */
    "iip\0"
    "glGetCompressedTexImage\0"
    "glGetCompressedTexImageARB\0"
    "\0"
-   /* _mesa_function_pool[25407]: GetTexGenfv (offset 279) */
+   /* _mesa_function_pool[25483]: GetTexGenfv (offset 279) */
    "iip\0"
    "glGetTexGenfv\0"
    "\0"
-   /* _mesa_function_pool[25426]: Vertex4i (offset 146) */
+   /* _mesa_function_pool[25502]: Vertex4i (offset 146) */
    "iiii\0"
    "glVertex4i\0"
    "\0"
-   /* _mesa_function_pool[25443]: VertexWeightPointerEXT (dynamic) */
+   /* _mesa_function_pool[25519]: VertexWeightPointerEXT (dynamic) */
    "iiip\0"
    "glVertexWeightPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[25474]: GetHistogram (offset 361) */
+   /* _mesa_function_pool[25550]: GetHistogram (offset 361) */
    "iiiip\0"
    "glGetHistogram\0"
    "glGetHistogramEXT\0"
    "\0"
-   /* _mesa_function_pool[25514]: ActiveStencilFaceEXT (will be remapped) */
+   /* _mesa_function_pool[25590]: ActiveStencilFaceEXT (will be remapped) */
    "i\0"
    "glActiveStencilFaceEXT\0"
    "\0"
-   /* _mesa_function_pool[25540]: StencilFuncSeparateATI (will be remapped) */
+   /* _mesa_function_pool[25616]: StencilFuncSeparateATI (will be remapped) */
    "iiii\0"
    "glStencilFuncSeparateATI\0"
    "\0"
-   /* _mesa_function_pool[25571]: Materialf (offset 169) */
+   /* _mesa_function_pool[25647]: Materialf (offset 169) */
    "iif\0"
    "glMaterialf\0"
    "\0"
-   /* _mesa_function_pool[25588]: GetShaderSourceARB (will be remapped) */
+   /* _mesa_function_pool[25664]: GetShaderSourceARB (will be remapped) */
    "iipp\0"
    "glGetShaderSource\0"
    "glGetShaderSourceARB\0"
    "\0"
-   /* _mesa_function_pool[25633]: IglooInterfaceSGIX (dynamic) */
+   /* _mesa_function_pool[25709]: IglooInterfaceSGIX (dynamic) */
    "ip\0"
    "glIglooInterfaceSGIX\0"
    "\0"
-   /* _mesa_function_pool[25658]: Materiali (offset 171) */
+   /* _mesa_function_pool[25734]: Materiali (offset 171) */
    "iii\0"
    "glMateriali\0"
    "\0"
-   /* _mesa_function_pool[25675]: VertexAttrib4dNV (will be remapped) */
+   /* _mesa_function_pool[25751]: VertexAttrib4dNV (will be remapped) */
    "idddd\0"
    "glVertexAttrib4dNV\0"
    "\0"
-   /* _mesa_function_pool[25701]: MultiModeDrawElementsIBM (will be remapped) */
+   /* _mesa_function_pool[25777]: MultiModeDrawElementsIBM (will be remapped) */
    "ppipii\0"
    "glMultiModeDrawElementsIBM\0"
    "\0"
-   /* _mesa_function_pool[25736]: Indexsv (offset 51) */
+   /* _mesa_function_pool[25812]: Indexsv (offset 51) */
    "p\0"
    "glIndexsv\0"
    "\0"
-   /* _mesa_function_pool[25749]: MultiTexCoord4svARB (offset 407) */
+   /* _mesa_function_pool[25825]: MultiTexCoord4svARB (offset 407) */
    "ip\0"
    "glMultiTexCoord4sv\0"
    "glMultiTexCoord4svARB\0"
    "\0"
-   /* _mesa_function_pool[25794]: LightModelfv (offset 164) */
+   /* _mesa_function_pool[25870]: LightModelfv (offset 164) */
    "ip\0"
    "glLightModelfv\0"
    "\0"
-   /* _mesa_function_pool[25813]: TexCoord2dv (offset 103) */
+   /* _mesa_function_pool[25889]: TexCoord2dv (offset 103) */
    "p\0"
    "glTexCoord2dv\0"
    "\0"
-   /* _mesa_function_pool[25830]: GenQueriesARB (will be remapped) */
+   /* _mesa_function_pool[25906]: GenQueriesARB (will be remapped) */
    "ip\0"
    "glGenQueries\0"
    "glGenQueriesARB\0"
    "\0"
-   /* _mesa_function_pool[25863]: EvalCoord1dv (offset 229) */
+   /* _mesa_function_pool[25939]: EvalCoord1dv (offset 229) */
    "p\0"
    "glEvalCoord1dv\0"
    "\0"
-   /* _mesa_function_pool[25881]: ReplacementCodeuiVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[25957]: ReplacementCodeuiVertex3fSUN (dynamic) */
    "ifff\0"
    "glReplacementCodeuiVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[25918]: Translated (offset 303) */
+   /* _mesa_function_pool[25994]: Translated (offset 303) */
    "ddd\0"
    "glTranslated\0"
    "\0"
-   /* _mesa_function_pool[25936]: Translatef (offset 304) */
+   /* _mesa_function_pool[26012]: Translatef (offset 304) */
    "fff\0"
    "glTranslatef\0"
    "\0"
-   /* _mesa_function_pool[25954]: StencilMask (offset 209) */
+   /* _mesa_function_pool[26030]: StencilMask (offset 209) */
    "i\0"
    "glStencilMask\0"
    "\0"
-   /* _mesa_function_pool[25971]: Tangent3iEXT (dynamic) */
+   /* _mesa_function_pool[26047]: Tangent3iEXT (dynamic) */
    "iii\0"
    "glTangent3iEXT\0"
    "\0"
-   /* _mesa_function_pool[25991]: GetLightiv (offset 265) */
+   /* _mesa_function_pool[26067]: GetLightiv (offset 265) */
    "iip\0"
    "glGetLightiv\0"
    "\0"
-   /* _mesa_function_pool[26009]: DrawMeshArraysSUN (dynamic) */
+   /* _mesa_function_pool[26085]: DrawMeshArraysSUN (dynamic) */
    "iiii\0"
    "glDrawMeshArraysSUN\0"
    "\0"
-   /* _mesa_function_pool[26035]: IsList (offset 287) */
+   /* _mesa_function_pool[26111]: IsList (offset 287) */
    "i\0"
    "glIsList\0"
    "\0"
-   /* _mesa_function_pool[26047]: IsSync (will be remapped) */
+   /* _mesa_function_pool[26123]: IsSync (will be remapped) */
    "i\0"
    "glIsSync\0"
    "\0"
-   /* _mesa_function_pool[26059]: RenderMode (offset 196) */
+   /* _mesa_function_pool[26135]: RenderMode (offset 196) */
    "i\0"
    "glRenderMode\0"
    "\0"
-   /* _mesa_function_pool[26075]: GetMapControlPointsNV (dynamic) */
+   /* _mesa_function_pool[26151]: GetMapControlPointsNV (dynamic) */
    "iiiiiip\0"
    "glGetMapControlPointsNV\0"
    "\0"
-   /* _mesa_function_pool[26108]: DrawBuffersARB (will be remapped) */
+   /* _mesa_function_pool[26184]: DrawBuffersARB (will be remapped) */
    "ip\0"
    "glDrawBuffers\0"
    "glDrawBuffersARB\0"
    "glDrawBuffersATI\0"
    "\0"
-   /* _mesa_function_pool[26160]: ProgramLocalParameter4fARB (will be remapped) */
+   /* _mesa_function_pool[26236]: ProgramLocalParameter4fARB (will be remapped) */
    "iiffff\0"
    "glProgramLocalParameter4fARB\0"
    "\0"
-   /* _mesa_function_pool[26197]: SpriteParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[26273]: SpriteParameterivSGIX (dynamic) */
    "ip\0"
    "glSpriteParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[26225]: ProvokingVertexEXT (will be remapped) */
+   /* _mesa_function_pool[26301]: ProvokingVertexEXT (will be remapped) */
    "i\0"
    "glProvokingVertexEXT\0"
    "glProvokingVertex\0"
    "\0"
-   /* _mesa_function_pool[26267]: MultiTexCoord1fARB (offset 378) */
+   /* _mesa_function_pool[26343]: MultiTexCoord1fARB (offset 378) */
    "if\0"
    "glMultiTexCoord1f\0"
    "glMultiTexCoord1fARB\0"
    "\0"
-   /* _mesa_function_pool[26310]: LoadName (offset 198) */
+   /* _mesa_function_pool[26386]: LoadName (offset 198) */
    "i\0"
    "glLoadName\0"
    "\0"
-   /* _mesa_function_pool[26324]: VertexAttribs4ubvNV (will be remapped) */
+   /* _mesa_function_pool[26400]: VertexAttribs4ubvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4ubvNV\0"
    "\0"
-   /* _mesa_function_pool[26351]: WeightsvARB (dynamic) */
+   /* _mesa_function_pool[26427]: WeightsvARB (dynamic) */
    "ip\0"
    "glWeightsvARB\0"
    "\0"
-   /* _mesa_function_pool[26369]: Uniform1fvARB (will be remapped) */
+   /* _mesa_function_pool[26445]: Uniform1fvARB (will be remapped) */
    "iip\0"
    "glUniform1fv\0"
    "glUniform1fvARB\0"
    "\0"
-   /* _mesa_function_pool[26403]: CopyTexSubImage1D (offset 325) */
+   /* _mesa_function_pool[26479]: CopyTexSubImage1D (offset 325) */
    "iiiiii\0"
    "glCopyTexSubImage1D\0"
    "glCopyTexSubImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[26454]: CullFace (offset 152) */
+   /* _mesa_function_pool[26530]: CullFace (offset 152) */
    "i\0"
    "glCullFace\0"
    "\0"
-   /* _mesa_function_pool[26468]: BindTexture (offset 307) */
+   /* _mesa_function_pool[26544]: BindTexture (offset 307) */
    "ii\0"
    "glBindTexture\0"
    "glBindTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[26503]: BeginFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[26579]: BeginFragmentShaderATI (will be remapped) */
    "\0"
    "glBeginFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[26530]: MultiTexCoord4fARB (offset 402) */
+   /* _mesa_function_pool[26606]: MultiTexCoord4fARB (offset 402) */
    "iffff\0"
    "glMultiTexCoord4f\0"
    "glMultiTexCoord4fARB\0"
    "\0"
-   /* _mesa_function_pool[26576]: VertexAttribs3svNV (will be remapped) */
+   /* _mesa_function_pool[26652]: VertexAttribs3svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs3svNV\0"
    "\0"
-   /* _mesa_function_pool[26602]: StencilFunc (offset 243) */
+   /* _mesa_function_pool[26678]: StencilFunc (offset 243) */
    "iii\0"
    "glStencilFunc\0"
    "\0"
-   /* _mesa_function_pool[26621]: CopyPixels (offset 255) */
+   /* _mesa_function_pool[26697]: CopyPixels (offset 255) */
    "iiiii\0"
    "glCopyPixels\0"
    "\0"
-   /* _mesa_function_pool[26641]: Rectsv (offset 93) */
+   /* _mesa_function_pool[26717]: Rectsv (offset 93) */
    "pp\0"
    "glRectsv\0"
    "\0"
-   /* _mesa_function_pool[26654]: ReplacementCodeuivSUN (dynamic) */
+   /* _mesa_function_pool[26730]: ReplacementCodeuivSUN (dynamic) */
    "p\0"
    "glReplacementCodeuivSUN\0"
    "\0"
-   /* _mesa_function_pool[26681]: EnableVertexAttribArrayARB (will be remapped) */
+   /* _mesa_function_pool[26757]: EnableVertexAttribArrayARB (will be remapped) */
    "i\0"
    "glEnableVertexAttribArray\0"
    "glEnableVertexAttribArrayARB\0"
    "\0"
-   /* _mesa_function_pool[26739]: NormalPointervINTEL (dynamic) */
+   /* _mesa_function_pool[26815]: NormalPointervINTEL (dynamic) */
    "ip\0"
    "glNormalPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[26765]: CopyConvolutionFilter2D (offset 355) */
+   /* _mesa_function_pool[26841]: CopyConvolutionFilter2D (offset 355) */
    "iiiiii\0"
    "glCopyConvolutionFilter2D\0"
    "glCopyConvolutionFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[26828]: WindowPos3ivMESA (will be remapped) */
+   /* _mesa_function_pool[26904]: WindowPos3ivMESA (will be remapped) */
    "p\0"
    "glWindowPos3iv\0"
    "glWindowPos3ivARB\0"
    "glWindowPos3ivMESA\0"
    "\0"
-   /* _mesa_function_pool[26883]: CopyBufferSubData (will be remapped) */
+   /* _mesa_function_pool[26959]: CopyBufferSubData (will be remapped) */
    "iiiii\0"
    "glCopyBufferSubData\0"
    "\0"
-   /* _mesa_function_pool[26910]: NormalPointer (offset 318) */
+   /* _mesa_function_pool[26986]: NormalPointer (offset 318) */
    "iip\0"
    "glNormalPointer\0"
    "\0"
-   /* _mesa_function_pool[26931]: TexParameterfv (offset 179) */
+   /* _mesa_function_pool[27007]: TexParameterfv (offset 179) */
    "iip\0"
    "glTexParameterfv\0"
    "\0"
-   /* _mesa_function_pool[26953]: IsBufferARB (will be remapped) */
+   /* _mesa_function_pool[27029]: IsBufferARB (will be remapped) */
    "i\0"
    "glIsBuffer\0"
    "glIsBufferARB\0"
    "\0"
-   /* _mesa_function_pool[26981]: WindowPos4iMESA (will be remapped) */
+   /* _mesa_function_pool[27057]: WindowPos4iMESA (will be remapped) */
    "iiii\0"
    "glWindowPos4iMESA\0"
    "\0"
-   /* _mesa_function_pool[27005]: VertexAttrib4uivARB (will be remapped) */
+   /* _mesa_function_pool[27081]: VertexAttrib4uivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4uiv\0"
    "glVertexAttrib4uivARB\0"
    "\0"
-   /* _mesa_function_pool[27050]: Tangent3bvEXT (dynamic) */
+   /* _mesa_function_pool[27126]: Tangent3bvEXT (dynamic) */
    "p\0"
    "glTangent3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[27069]: UniformMatrix3x4fv (will be remapped) */
+   /* _mesa_function_pool[27145]: UniformMatrix3x4fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3x4fv\0"
    "\0"
-   /* _mesa_function_pool[27096]: ClipPlane (offset 150) */
+   /* _mesa_function_pool[27172]: ClipPlane (offset 150) */
    "ip\0"
    "glClipPlane\0"
    "\0"
-   /* _mesa_function_pool[27112]: Recti (offset 90) */
+   /* _mesa_function_pool[27188]: Recti (offset 90) */
    "iiii\0"
    "glRecti\0"
    "\0"
-   /* _mesa_function_pool[27126]: DrawRangeElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[27202]: DrawRangeElementsBaseVertex (will be remapped) */
    "iiiiipi\0"
    "glDrawRangeElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[27165]: TexCoordPointervINTEL (dynamic) */
+   /* _mesa_function_pool[27241]: TexCoordPointervINTEL (dynamic) */
    "iip\0"
    "glTexCoordPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[27194]: DeleteBuffersARB (will be remapped) */
+   /* _mesa_function_pool[27270]: DeleteBuffersARB (will be remapped) */
    "ip\0"
    "glDeleteBuffers\0"
    "glDeleteBuffersARB\0"
    "\0"
-   /* _mesa_function_pool[27233]: WindowPos4fvMESA (will be remapped) */
+   /* _mesa_function_pool[27309]: WindowPos4fvMESA (will be remapped) */
    "p\0"
    "glWindowPos4fvMESA\0"
    "\0"
-   /* _mesa_function_pool[27255]: GetPixelMapuiv (offset 272) */
+   /* _mesa_function_pool[27331]: GetPixelMapuiv (offset 272) */
    "ip\0"
    "glGetPixelMapuiv\0"
    "\0"
-   /* _mesa_function_pool[27276]: Rectf (offset 88) */
+   /* _mesa_function_pool[27352]: Rectf (offset 88) */
    "ffff\0"
    "glRectf\0"
    "\0"
-   /* _mesa_function_pool[27290]: VertexAttrib1sNV (will be remapped) */
+   /* _mesa_function_pool[27366]: VertexAttrib1sNV (will be remapped) */
    "ii\0"
    "glVertexAttrib1sNV\0"
    "\0"
-   /* _mesa_function_pool[27313]: Indexfv (offset 47) */
+   /* _mesa_function_pool[27389]: Indexfv (offset 47) */
    "p\0"
    "glIndexfv\0"
    "\0"
-   /* _mesa_function_pool[27326]: SecondaryColor3svEXT (will be remapped) */
+   /* _mesa_function_pool[27402]: SecondaryColor3svEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3sv\0"
    "glSecondaryColor3svEXT\0"
    "\0"
-   /* _mesa_function_pool[27372]: LoadTransposeMatrixfARB (will be remapped) */
+   /* _mesa_function_pool[27448]: LoadTransposeMatrixfARB (will be remapped) */
    "p\0"
    "glLoadTransposeMatrixf\0"
    "glLoadTransposeMatrixfARB\0"
    "\0"
-   /* _mesa_function_pool[27424]: GetPointerv (offset 329) */
+   /* _mesa_function_pool[27500]: GetPointerv (offset 329) */
    "ip\0"
    "glGetPointerv\0"
    "glGetPointervEXT\0"
    "\0"
-   /* _mesa_function_pool[27459]: Tangent3bEXT (dynamic) */
+   /* _mesa_function_pool[27535]: Tangent3bEXT (dynamic) */
    "iii\0"
    "glTangent3bEXT\0"
    "\0"
-   /* _mesa_function_pool[27479]: CombinerParameterfNV (will be remapped) */
+   /* _mesa_function_pool[27555]: CombinerParameterfNV (will be remapped) */
    "if\0"
    "glCombinerParameterfNV\0"
    "\0"
-   /* _mesa_function_pool[27506]: IndexMask (offset 212) */
+   /* _mesa_function_pool[27582]: IndexMask (offset 212) */
    "i\0"
    "glIndexMask\0"
    "\0"
-   /* _mesa_function_pool[27521]: BindProgramNV (will be remapped) */
+   /* _mesa_function_pool[27597]: BindProgramNV (will be remapped) */
    "ii\0"
    "glBindProgramARB\0"
    "glBindProgramNV\0"
    "\0"
-   /* _mesa_function_pool[27558]: VertexAttrib4svARB (will be remapped) */
+   /* _mesa_function_pool[27634]: VertexAttrib4svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4sv\0"
    "glVertexAttrib4svARB\0"
    "\0"
-   /* _mesa_function_pool[27601]: GetFloatv (offset 262) */
+   /* _mesa_function_pool[27677]: GetFloatv (offset 262) */
    "ip\0"
    "glGetFloatv\0"
    "\0"
-   /* _mesa_function_pool[27617]: CreateDebugObjectMESA (dynamic) */
+   /* _mesa_function_pool[27693]: CreateDebugObjectMESA (dynamic) */
    "\0"
    "glCreateDebugObjectMESA\0"
    "\0"
-   /* _mesa_function_pool[27643]: GetShaderiv (will be remapped) */
+   /* _mesa_function_pool[27719]: GetShaderiv (will be remapped) */
    "iip\0"
    "glGetShaderiv\0"
    "\0"
-   /* _mesa_function_pool[27662]: ClientWaitSync (will be remapped) */
+   /* _mesa_function_pool[27738]: ClientWaitSync (will be remapped) */
    "iii\0"
    "glClientWaitSync\0"
    "\0"
-   /* _mesa_function_pool[27684]: TexCoord4s (offset 124) */
+   /* _mesa_function_pool[27760]: TexCoord4s (offset 124) */
    "iiii\0"
    "glTexCoord4s\0"
    "\0"
-   /* _mesa_function_pool[27703]: TexCoord3sv (offset 117) */
+   /* _mesa_function_pool[27779]: TexCoord3sv (offset 117) */
    "p\0"
    "glTexCoord3sv\0"
    "\0"
-   /* _mesa_function_pool[27720]: BindFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[27796]: BindFragmentShaderATI (will be remapped) */
    "i\0"
    "glBindFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[27747]: PopAttrib (offset 218) */
+   /* _mesa_function_pool[27823]: PopAttrib (offset 218) */
    "\0"
    "glPopAttrib\0"
    "\0"
-   /* _mesa_function_pool[27761]: Fogfv (offset 154) */
+   /* _mesa_function_pool[27837]: Fogfv (offset 154) */
    "ip\0"
    "glFogfv\0"
    "\0"
-   /* _mesa_function_pool[27773]: UnmapBufferARB (will be remapped) */
+   /* _mesa_function_pool[27849]: UnmapBufferARB (will be remapped) */
    "i\0"
    "glUnmapBuffer\0"
    "glUnmapBufferARB\0"
    "\0"
-   /* _mesa_function_pool[27807]: InitNames (offset 197) */
+   /* _mesa_function_pool[27883]: InitNames (offset 197) */
    "\0"
    "glInitNames\0"
    "\0"
-   /* _mesa_function_pool[27821]: Normal3sv (offset 61) */
+   /* _mesa_function_pool[27897]: Normal3sv (offset 61) */
    "p\0"
    "glNormal3sv\0"
    "\0"
-   /* _mesa_function_pool[27836]: Minmax (offset 368) */
+   /* _mesa_function_pool[27912]: Minmax (offset 368) */
    "iii\0"
    "glMinmax\0"
    "glMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[27862]: TexCoord4d (offset 118) */
+   /* _mesa_function_pool[27938]: TexCoord4d (offset 118) */
    "dddd\0"
    "glTexCoord4d\0"
    "\0"
-   /* _mesa_function_pool[27881]: TexCoord4f (offset 120) */
+   /* _mesa_function_pool[27957]: TexCoord4f (offset 120) */
    "ffff\0"
    "glTexCoord4f\0"
    "\0"
-   /* _mesa_function_pool[27900]: FogCoorddvEXT (will be remapped) */
+   /* _mesa_function_pool[27976]: FogCoorddvEXT (will be remapped) */
    "p\0"
    "glFogCoorddv\0"
    "glFogCoorddvEXT\0"
    "\0"
-   /* _mesa_function_pool[27932]: FinishTextureSUNX (dynamic) */
+   /* _mesa_function_pool[28008]: FinishTextureSUNX (dynamic) */
    "\0"
    "glFinishTextureSUNX\0"
    "\0"
-   /* _mesa_function_pool[27954]: GetFragmentLightfvSGIX (dynamic) */
+   /* _mesa_function_pool[28030]: GetFragmentLightfvSGIX (dynamic) */
    "iip\0"
    "glGetFragmentLightfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[27984]: Binormal3fvEXT (dynamic) */
+   /* _mesa_function_pool[28060]: Binormal3fvEXT (dynamic) */
    "p\0"
    "glBinormal3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[28004]: GetBooleanv (offset 258) */
+   /* _mesa_function_pool[28080]: GetBooleanv (offset 258) */
    "ip\0"
    "glGetBooleanv\0"
    "\0"
-   /* _mesa_function_pool[28022]: ColorFragmentOp3ATI (will be remapped) */
+   /* _mesa_function_pool[28098]: ColorFragmentOp3ATI (will be remapped) */
    "iiiiiiiiiiiii\0"
    "glColorFragmentOp3ATI\0"
    "\0"
-   /* _mesa_function_pool[28059]: Hint (offset 158) */
+   /* _mesa_function_pool[28135]: Hint (offset 158) */
    "ii\0"
    "glHint\0"
    "\0"
-   /* _mesa_function_pool[28070]: Color4dv (offset 28) */
+   /* _mesa_function_pool[28146]: Color4dv (offset 28) */
    "p\0"
    "glColor4dv\0"
    "\0"
-   /* _mesa_function_pool[28084]: VertexAttrib2svARB (will be remapped) */
+   /* _mesa_function_pool[28160]: VertexAttrib2svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2sv\0"
    "glVertexAttrib2svARB\0"
    "\0"
-   /* _mesa_function_pool[28127]: AreProgramsResidentNV (will be remapped) */
+   /* _mesa_function_pool[28203]: AreProgramsResidentNV (will be remapped) */
    "ipp\0"
    "glAreProgramsResidentNV\0"
    "\0"
-   /* _mesa_function_pool[28156]: WindowPos3svMESA (will be remapped) */
+   /* _mesa_function_pool[28232]: WindowPos3svMESA (will be remapped) */
    "p\0"
    "glWindowPos3sv\0"
    "glWindowPos3svARB\0"
    "glWindowPos3svMESA\0"
    "\0"
-   /* _mesa_function_pool[28211]: CopyColorSubTable (offset 347) */
+   /* _mesa_function_pool[28287]: CopyColorSubTable (offset 347) */
    "iiiii\0"
    "glCopyColorSubTable\0"
    "glCopyColorSubTableEXT\0"
    "\0"
-   /* _mesa_function_pool[28261]: WeightdvARB (dynamic) */
+   /* _mesa_function_pool[28337]: WeightdvARB (dynamic) */
    "ip\0"
    "glWeightdvARB\0"
    "\0"
-   /* _mesa_function_pool[28279]: DeleteRenderbuffersEXT (will be remapped) */
+   /* _mesa_function_pool[28355]: DeleteRenderbuffersEXT (will be remapped) */
    "ip\0"
    "glDeleteRenderbuffers\0"
    "glDeleteRenderbuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[28330]: VertexAttrib4NubvARB (will be remapped) */
+   /* _mesa_function_pool[28406]: VertexAttrib4NubvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nubv\0"
    "glVertexAttrib4NubvARB\0"
    "\0"
-   /* _mesa_function_pool[28377]: VertexAttrib3dvNV (will be remapped) */
+   /* _mesa_function_pool[28453]: VertexAttrib3dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3dvNV\0"
    "\0"
-   /* _mesa_function_pool[28401]: GetObjectParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[28477]: GetObjectParameterfvARB (will be remapped) */
    "iip\0"
    "glGetObjectParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[28432]: Vertex4iv (offset 147) */
+   /* _mesa_function_pool[28508]: Vertex4iv (offset 147) */
    "p\0"
    "glVertex4iv\0"
    "\0"
-   /* _mesa_function_pool[28447]: GetProgramEnvParameterdvARB (will be remapped) */
+   /* _mesa_function_pool[28523]: GetProgramEnvParameterdvARB (will be remapped) */
    "iip\0"
    "glGetProgramEnvParameterdvARB\0"
    "\0"
-   /* _mesa_function_pool[28482]: TexCoord4dv (offset 119) */
+   /* _mesa_function_pool[28558]: TexCoord4dv (offset 119) */
    "p\0"
    "glTexCoord4dv\0"
    "\0"
-   /* _mesa_function_pool[28499]: LockArraysEXT (will be remapped) */
+   /* _mesa_function_pool[28575]: LockArraysEXT (will be remapped) */
    "ii\0"
    "glLockArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[28519]: Begin (offset 7) */
+   /* _mesa_function_pool[28595]: Begin (offset 7) */
    "i\0"
    "glBegin\0"
    "\0"
-   /* _mesa_function_pool[28530]: LightModeli (offset 165) */
+   /* _mesa_function_pool[28606]: LightModeli (offset 165) */
    "ii\0"
    "glLightModeli\0"
    "\0"
-   /* _mesa_function_pool[28548]: Rectfv (offset 89) */
+   /* _mesa_function_pool[28624]: Rectfv (offset 89) */
    "pp\0"
    "glRectfv\0"
    "\0"
-   /* _mesa_function_pool[28561]: LightModelf (offset 163) */
+   /* _mesa_function_pool[28637]: LightModelf (offset 163) */
    "if\0"
    "glLightModelf\0"
    "\0"
-   /* _mesa_function_pool[28579]: GetTexParameterfv (offset 282) */
+   /* _mesa_function_pool[28655]: GetTexParameterfv (offset 282) */
    "iip\0"
    "glGetTexParameterfv\0"
    "\0"
-   /* _mesa_function_pool[28604]: GetLightfv (offset 264) */
+   /* _mesa_function_pool[28680]: GetLightfv (offset 264) */
    "iip\0"
    "glGetLightfv\0"
    "\0"
-   /* _mesa_function_pool[28622]: PixelTransformParameterivEXT (dynamic) */
+   /* _mesa_function_pool[28698]: PixelTransformParameterivEXT (dynamic) */
    "iip\0"
    "glPixelTransformParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[28658]: BinormalPointerEXT (dynamic) */
+   /* _mesa_function_pool[28734]: BinormalPointerEXT (dynamic) */
    "iip\0"
    "glBinormalPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[28684]: VertexAttrib1dNV (will be remapped) */
+   /* _mesa_function_pool[28760]: VertexAttrib1dNV (will be remapped) */
    "id\0"
    "glVertexAttrib1dNV\0"
    "\0"
-   /* _mesa_function_pool[28707]: GetCombinerInputParameterivNV (will be remapped) */
+   /* _mesa_function_pool[28783]: GetCombinerInputParameterivNV (will be remapped) */
    "iiiip\0"
    "glGetCombinerInputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[28746]: Disable (offset 214) */
+   /* _mesa_function_pool[28822]: Disable (offset 214) */
    "i\0"
    "glDisable\0"
    "\0"
-   /* _mesa_function_pool[28759]: MultiTexCoord2fvARB (offset 387) */
+   /* _mesa_function_pool[28835]: MultiTexCoord2fvARB (offset 387) */
    "ip\0"
    "glMultiTexCoord2fv\0"
    "glMultiTexCoord2fvARB\0"
    "\0"
-   /* _mesa_function_pool[28804]: GetRenderbufferParameterivEXT (will be remapped) */
+   /* _mesa_function_pool[28880]: GetRenderbufferParameterivEXT (will be remapped) */
    "iip\0"
    "glGetRenderbufferParameteriv\0"
    "glGetRenderbufferParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[28870]: CombinerParameterivNV (will be remapped) */
+   /* _mesa_function_pool[28946]: CombinerParameterivNV (will be remapped) */
    "ip\0"
    "glCombinerParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[28898]: GenFragmentShadersATI (will be remapped) */
+   /* _mesa_function_pool[28974]: GenFragmentShadersATI (will be remapped) */
    "i\0"
    "glGenFragmentShadersATI\0"
    "\0"
-   /* _mesa_function_pool[28925]: DrawArrays (offset 310) */
+   /* _mesa_function_pool[29001]: DrawArrays (offset 310) */
    "iii\0"
    "glDrawArrays\0"
    "glDrawArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[28959]: WeightuivARB (dynamic) */
+   /* _mesa_function_pool[29035]: WeightuivARB (dynamic) */
    "ip\0"
    "glWeightuivARB\0"
    "\0"
-   /* _mesa_function_pool[28978]: VertexAttrib2sARB (will be remapped) */
+   /* _mesa_function_pool[29054]: VertexAttrib2sARB (will be remapped) */
    "iii\0"
    "glVertexAttrib2s\0"
    "glVertexAttrib2sARB\0"
    "\0"
-   /* _mesa_function_pool[29020]: ColorMask (offset 210) */
+   /* _mesa_function_pool[29096]: ColorMask (offset 210) */
    "iiii\0"
    "glColorMask\0"
    "\0"
-   /* _mesa_function_pool[29038]: GenAsyncMarkersSGIX (dynamic) */
+   /* _mesa_function_pool[29114]: GenAsyncMarkersSGIX (dynamic) */
    "i\0"
    "glGenAsyncMarkersSGIX\0"
    "\0"
-   /* _mesa_function_pool[29063]: Tangent3svEXT (dynamic) */
+   /* _mesa_function_pool[29139]: Tangent3svEXT (dynamic) */
    "p\0"
    "glTangent3svEXT\0"
    "\0"
-   /* _mesa_function_pool[29082]: GetListParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[29158]: GetListParameterivSGIX (dynamic) */
    "iip\0"
    "glGetListParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[29112]: BindBufferARB (will be remapped) */
+   /* _mesa_function_pool[29188]: BindBufferARB (will be remapped) */
    "ii\0"
    "glBindBuffer\0"
    "glBindBufferARB\0"
    "\0"
-   /* _mesa_function_pool[29145]: GetInfoLogARB (will be remapped) */
+   /* _mesa_function_pool[29221]: GetInfoLogARB (will be remapped) */
    "iipp\0"
    "glGetInfoLogARB\0"
    "\0"
-   /* _mesa_function_pool[29167]: RasterPos4iv (offset 83) */
+   /* _mesa_function_pool[29243]: RasterPos4iv (offset 83) */
    "p\0"
    "glRasterPos4iv\0"
    "\0"
-   /* _mesa_function_pool[29185]: Enable (offset 215) */
+   /* _mesa_function_pool[29261]: Enable (offset 215) */
    "i\0"
    "glEnable\0"
    "\0"
-   /* _mesa_function_pool[29197]: LineStipple (offset 167) */
+   /* _mesa_function_pool[29273]: LineStipple (offset 167) */
    "ii\0"
    "glLineStipple\0"
    "\0"
-   /* _mesa_function_pool[29215]: VertexAttribs4svNV (will be remapped) */
+   /* _mesa_function_pool[29291]: VertexAttribs4svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4svNV\0"
    "\0"
-   /* _mesa_function_pool[29241]: EdgeFlagPointerListIBM (dynamic) */
+   /* _mesa_function_pool[29317]: EdgeFlagPointerListIBM (dynamic) */
    "ipi\0"
    "glEdgeFlagPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[29271]: UniformMatrix3x2fv (will be remapped) */
+   /* _mesa_function_pool[29347]: UniformMatrix3x2fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3x2fv\0"
    "\0"
-   /* _mesa_function_pool[29298]: GetMinmaxParameterfv (offset 365) */
+   /* _mesa_function_pool[29374]: GetMinmaxParameterfv (offset 365) */
    "iip\0"
    "glGetMinmaxParameterfv\0"
    "glGetMinmaxParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[29352]: VertexAttrib1fvARB (will be remapped) */
+   /* _mesa_function_pool[29428]: VertexAttrib1fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib1fv\0"
    "glVertexAttrib1fvARB\0"
    "\0"
-   /* _mesa_function_pool[29395]: GenBuffersARB (will be remapped) */
+   /* _mesa_function_pool[29471]: GenBuffersARB (will be remapped) */
    "ip\0"
    "glGenBuffers\0"
    "glGenBuffersARB\0"
    "\0"
-   /* _mesa_function_pool[29428]: VertexAttribs1svNV (will be remapped) */
+   /* _mesa_function_pool[29504]: VertexAttribs1svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1svNV\0"
    "\0"
-   /* _mesa_function_pool[29454]: Vertex3fv (offset 137) */
+   /* _mesa_function_pool[29530]: Vertex3fv (offset 137) */
    "p\0"
    "glVertex3fv\0"
    "\0"
-   /* _mesa_function_pool[29469]: GetTexBumpParameterivATI (will be remapped) */
+   /* _mesa_function_pool[29545]: GetTexBumpParameterivATI (will be remapped) */
    "ip\0"
    "glGetTexBumpParameterivATI\0"
    "\0"
-   /* _mesa_function_pool[29500]: Binormal3bEXT (dynamic) */
+   /* _mesa_function_pool[29576]: Binormal3bEXT (dynamic) */
    "iii\0"
    "glBinormal3bEXT\0"
    "\0"
-   /* _mesa_function_pool[29521]: FragmentMaterialivSGIX (dynamic) */
+   /* _mesa_function_pool[29597]: FragmentMaterialivSGIX (dynamic) */
    "iip\0"
    "glFragmentMaterialivSGIX\0"
    "\0"
-   /* _mesa_function_pool[29551]: IsRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[29627]: IsRenderbufferEXT (will be remapped) */
    "i\0"
    "glIsRenderbuffer\0"
    "glIsRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[29591]: GenProgramsNV (will be remapped) */
+   /* _mesa_function_pool[29667]: GenProgramsNV (will be remapped) */
    "ip\0"
    "glGenProgramsARB\0"
    "glGenProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[29628]: VertexAttrib4dvNV (will be remapped) */
+   /* _mesa_function_pool[29704]: VertexAttrib4dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4dvNV\0"
    "\0"
-   /* _mesa_function_pool[29652]: EndFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[29728]: EndFragmentShaderATI (will be remapped) */
    "\0"
    "glEndFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[29677]: Binormal3iEXT (dynamic) */
+   /* _mesa_function_pool[29753]: Binormal3iEXT (dynamic) */
    "iii\0"
    "glBinormal3iEXT\0"
    "\0"
-   /* _mesa_function_pool[29698]: WindowPos2fMESA (will be remapped) */
+   /* _mesa_function_pool[29774]: WindowPos2fMESA (will be remapped) */
    "ff\0"
    "glWindowPos2f\0"
    "glWindowPos2fARB\0"
@@ -4367,399 +4375,401 @@ static const struct {
 } MESA_remap_table_functions[] = {
    {  1461, AttachShader_remap_index },
    {  8764, CreateProgram_remap_index },
-   { 20302, CreateShader_remap_index },
-   { 22589, DeleteProgram_remap_index },
-   { 16282, DeleteShader_remap_index },
-   { 20748, DetachShader_remap_index },
-   { 15806, GetAttachedShaders_remap_index },
+   { 20335, CreateShader_remap_index },
+   { 22665, DeleteProgram_remap_index },
+   { 16315, DeleteShader_remap_index },
+   { 20781, DetachShader_remap_index },
+   { 15839, GetAttachedShaders_remap_index },
    {  4275, GetProgramInfoLog_remap_index },
    {   361, GetProgramiv_remap_index },
    {  5578, GetShaderInfoLog_remap_index },
-   { 27643, GetShaderiv_remap_index },
-   { 11821, IsProgram_remap_index },
-   { 10856, IsShader_remap_index },
+   { 27719, GetShaderiv_remap_index },
+   { 11854, IsProgram_remap_index },
+   { 10889, IsShader_remap_index },
    {  8868, StencilFuncSeparate_remap_index },
    {  3487, StencilMaskSeparate_remap_index },
    {  6654, StencilOpSeparate_remap_index },
-   { 19653, UniformMatrix2x3fv_remap_index },
+   { 19686, UniformMatrix2x3fv_remap_index },
    {  2615, UniformMatrix2x4fv_remap_index },
-   { 29271, UniformMatrix3x2fv_remap_index },
-   { 27069, UniformMatrix3x4fv_remap_index },
-   { 14354, UniformMatrix4x2fv_remap_index },
+   { 29347, UniformMatrix3x2fv_remap_index },
+   { 27145, UniformMatrix3x4fv_remap_index },
+   { 14387, UniformMatrix4x2fv_remap_index },
    {  2937, UniformMatrix4x3fv_remap_index },
    {  8782, LoadTransposeMatrixdARB_remap_index },
-   { 27372, LoadTransposeMatrixfARB_remap_index },
+   { 27448, LoadTransposeMatrixfARB_remap_index },
    {  4848, MultTransposeMatrixdARB_remap_index },
-   { 20935, MultTransposeMatrixfARB_remap_index },
+   { 20968, MultTransposeMatrixfARB_remap_index },
    {   172, SampleCoverageARB_remap_index },
    {  5002, CompressedTexImage1DARB_remap_index },
-   { 21392, CompressedTexImage2DARB_remap_index },
+   { 21468, CompressedTexImage2DARB_remap_index },
    {  3550, CompressedTexImage3DARB_remap_index },
-   { 16098, CompressedTexSubImage1DARB_remap_index },
+   { 16131, CompressedTexSubImage1DARB_remap_index },
    {  1880, CompressedTexSubImage2DARB_remap_index },
-   { 17890, CompressedTexSubImage3DARB_remap_index },
-   { 25351, GetCompressedTexImageARB_remap_index },
+   { 17923, CompressedTexSubImage3DARB_remap_index },
+   { 25427, GetCompressedTexImageARB_remap_index },
    {  3395, DisableVertexAttribArrayARB_remap_index },
-   { 26681, EnableVertexAttribArrayARB_remap_index },
-   { 28447, GetProgramEnvParameterdvARB_remap_index },
-   { 20815, GetProgramEnvParameterfvARB_remap_index },
-   { 24381, GetProgramLocalParameterdvARB_remap_index },
+   { 26757, EnableVertexAttribArrayARB_remap_index },
+   { 28523, GetProgramEnvParameterdvARB_remap_index },
+   { 20848, GetProgramEnvParameterfvARB_remap_index },
+   { 24457, GetProgramLocalParameterdvARB_remap_index },
    {  7096, GetProgramLocalParameterfvARB_remap_index },
-   { 16189, GetProgramStringARB_remap_index },
-   { 24576, GetProgramivARB_remap_index },
-   { 18085, GetVertexAttribdvARB_remap_index },
-   { 14243, GetVertexAttribfvARB_remap_index },
+   { 16222, GetProgramStringARB_remap_index },
+   { 24652, GetProgramivARB_remap_index },
+   { 18118, GetVertexAttribdvARB_remap_index },
+   { 14276, GetVertexAttribfvARB_remap_index },
    {  8677, GetVertexAttribivARB_remap_index },
-   { 16994, ProgramEnvParameter4dARB_remap_index },
-   { 22362, ProgramEnvParameter4dvARB_remap_index },
-   { 14851, ProgramEnvParameter4fARB_remap_index },
+   { 17027, ProgramEnvParameter4dARB_remap_index },
+   { 22438, ProgramEnvParameter4dvARB_remap_index },
+   { 14884, ProgramEnvParameter4fARB_remap_index },
    {  7959, ProgramEnvParameter4fvARB_remap_index },
    {  3513, ProgramLocalParameter4dARB_remap_index },
-   { 11531, ProgramLocalParameter4dvARB_remap_index },
-   { 26160, ProgramLocalParameter4fARB_remap_index },
-   { 22907, ProgramLocalParameter4fvARB_remap_index },
-   { 25137, ProgramStringARB_remap_index },
-   { 17244, VertexAttrib1dARB_remap_index },
-   { 13897, VertexAttrib1dvARB_remap_index },
+   { 11564, ProgramLocalParameter4dvARB_remap_index },
+   { 26236, ProgramLocalParameter4fARB_remap_index },
+   { 22983, ProgramLocalParameter4fvARB_remap_index },
+   { 25213, ProgramStringARB_remap_index },
+   { 17277, VertexAttrib1dARB_remap_index },
+   { 13930, VertexAttrib1dvARB_remap_index },
    {  3688, VertexAttrib1fARB_remap_index },
-   { 29352, VertexAttrib1fvARB_remap_index },
+   { 29428, VertexAttrib1fvARB_remap_index },
    {  6180, VertexAttrib1sARB_remap_index },
    {  2054, VertexAttrib1svARB_remap_index },
-   { 13328, VertexAttrib2dARB_remap_index },
-   { 15425, VertexAttrib2dvARB_remap_index },
+   { 13361, VertexAttrib2dARB_remap_index },
+   { 15458, VertexAttrib2dvARB_remap_index },
    {  1480, VertexAttrib2fARB_remap_index },
-   { 15538, VertexAttrib2fvARB_remap_index },
-   { 28978, VertexAttrib2sARB_remap_index },
-   { 28084, VertexAttrib2svARB_remap_index },
+   { 15571, VertexAttrib2fvARB_remap_index },
+   { 29054, VertexAttrib2sARB_remap_index },
+   { 28160, VertexAttrib2svARB_remap_index },
    { 10015, VertexAttrib3dARB_remap_index },
    {  7662, VertexAttrib3dvARB_remap_index },
    {  1567, VertexAttrib3fARB_remap_index },
-   { 19890, VertexAttrib3fvARB_remap_index },
-   { 25009, VertexAttrib3sARB_remap_index },
-   { 17827, VertexAttrib3svARB_remap_index },
+   { 19923, VertexAttrib3fvARB_remap_index },
+   { 25085, VertexAttrib3sARB_remap_index },
+   { 17860, VertexAttrib3svARB_remap_index },
    {  4301, VertexAttrib4NbvARB_remap_index },
-   { 15761, VertexAttrib4NivARB_remap_index },
-   { 19845, VertexAttrib4NsvARB_remap_index },
-   { 20767, VertexAttrib4NubARB_remap_index },
-   { 28330, VertexAttrib4NubvARB_remap_index },
-   { 16655, VertexAttrib4NuivARB_remap_index },
+   { 15794, VertexAttrib4NivARB_remap_index },
+   { 19878, VertexAttrib4NsvARB_remap_index },
+   { 20800, VertexAttrib4NubARB_remap_index },
+   { 28406, VertexAttrib4NubvARB_remap_index },
+   { 16688, VertexAttrib4NuivARB_remap_index },
    {  2810, VertexAttrib4NusvARB_remap_index },
    {  9609, VertexAttrib4bvARB_remap_index },
-   { 23789, VertexAttrib4dARB_remap_index },
-   { 18810, VertexAttrib4dvARB_remap_index },
+   { 23865, VertexAttrib4dARB_remap_index },
+   { 18843, VertexAttrib4dvARB_remap_index },
    { 10122, VertexAttrib4fARB_remap_index },
    { 10492, VertexAttrib4fvARB_remap_index },
    {  9061, VertexAttrib4ivARB_remap_index },
-   { 15239, VertexAttrib4sARB_remap_index },
-   { 27558, VertexAttrib4svARB_remap_index },
-   { 14656, VertexAttrib4ubvARB_remap_index },
-   { 27005, VertexAttrib4uivARB_remap_index },
-   { 17638, VertexAttrib4usvARB_remap_index },
-   { 19527, VertexAttribPointerARB_remap_index },
-   { 29112, BindBufferARB_remap_index },
+   { 15272, VertexAttrib4sARB_remap_index },
+   { 27634, VertexAttrib4svARB_remap_index },
+   { 14689, VertexAttrib4ubvARB_remap_index },
+   { 27081, VertexAttrib4uivARB_remap_index },
+   { 17671, VertexAttrib4usvARB_remap_index },
+   { 19560, VertexAttribPointerARB_remap_index },
+   { 29188, BindBufferARB_remap_index },
    {  5893, BufferDataARB_remap_index },
    {  1382, BufferSubDataARB_remap_index },
-   { 27194, DeleteBuffersARB_remap_index },
-   { 29395, GenBuffersARB_remap_index },
-   { 15581, GetBufferParameterivARB_remap_index },
-   { 14803, GetBufferPointervARB_remap_index },
+   { 27270, DeleteBuffersARB_remap_index },
+   { 29471, GenBuffersARB_remap_index },
+   { 15614, GetBufferParameterivARB_remap_index },
+   { 14836, GetBufferPointervARB_remap_index },
    {  1335, GetBufferSubDataARB_remap_index },
-   { 26953, IsBufferARB_remap_index },
-   { 23362, MapBufferARB_remap_index },
-   { 27773, UnmapBufferARB_remap_index },
+   { 27029, IsBufferARB_remap_index },
+   { 23438, MapBufferARB_remap_index },
+   { 27849, UnmapBufferARB_remap_index },
    {   268, BeginQueryARB_remap_index },
-   { 17339, DeleteQueriesARB_remap_index },
-   { 10753, EndQueryARB_remap_index },
-   { 25830, GenQueriesARB_remap_index },
+   { 17372, DeleteQueriesARB_remap_index },
+   { 10786, EndQueryARB_remap_index },
+   { 25906, GenQueriesARB_remap_index },
    {  1772, GetQueryObjectivARB_remap_index },
-   { 15283, GetQueryObjectuivARB_remap_index },
+   { 15316, GetQueryObjectuivARB_remap_index },
    {  1624, GetQueryivARB_remap_index },
-   { 17545, IsQueryARB_remap_index },
+   { 17578, IsQueryARB_remap_index },
    {  7272, AttachObjectARB_remap_index },
-   { 16244, CompileShaderARB_remap_index },
+   { 16277, CompileShaderARB_remap_index },
    {  2879, CreateProgramObjectARB_remap_index },
    {  5838, CreateShaderObjectARB_remap_index },
-   { 12745, DeleteObjectARB_remap_index },
-   { 21166, DetachObjectARB_remap_index },
+   { 12778, DeleteObjectARB_remap_index },
+   { 21242, DetachObjectARB_remap_index },
    { 10564, GetActiveUniformARB_remap_index },
    {  8380, GetAttachedObjectsARB_remap_index },
    {  8659, GetHandleARB_remap_index },
-   { 29145, GetInfoLogARB_remap_index },
-   { 28401, GetObjectParameterfvARB_remap_index },
-   { 24255, GetObjectParameterivARB_remap_index },
-   { 25588, GetShaderSourceARB_remap_index },
-   { 24869, GetUniformLocationARB_remap_index },
-   { 21037, GetUniformfvARB_remap_index },
-   { 11153, GetUniformivARB_remap_index },
-   { 17683, LinkProgramARB_remap_index },
-   { 17741, ShaderSourceARB_remap_index },
+   { 29221, GetInfoLogARB_remap_index },
+   { 28477, GetObjectParameterfvARB_remap_index },
+   { 24331, GetObjectParameterivARB_remap_index },
+   { 25664, GetShaderSourceARB_remap_index },
+   { 24945, GetUniformLocationARB_remap_index },
+   { 21070, GetUniformfvARB_remap_index },
+   { 11186, GetUniformivARB_remap_index },
+   { 17716, LinkProgramARB_remap_index },
+   { 17774, ShaderSourceARB_remap_index },
    {  6554, Uniform1fARB_remap_index },
-   { 26369, Uniform1fvARB_remap_index },
-   { 19496, Uniform1iARB_remap_index },
-   { 18499, Uniform1ivARB_remap_index },
+   { 26445, Uniform1fvARB_remap_index },
+   { 19529, Uniform1iARB_remap_index },
+   { 18532, Uniform1ivARB_remap_index },
    {  2003, Uniform2fARB_remap_index },
-   { 12581, Uniform2fvARB_remap_index },
-   { 23249, Uniform2iARB_remap_index },
+   { 12614, Uniform2fvARB_remap_index },
+   { 23325, Uniform2iARB_remap_index },
    {  2123, Uniform2ivARB_remap_index },
-   { 16354, Uniform3fARB_remap_index },
+   { 16387, Uniform3fARB_remap_index },
    {  8410, Uniform3fvARB_remap_index },
    {  5512, Uniform3iARB_remap_index },
-   { 14909, Uniform3ivARB_remap_index },
-   { 16800, Uniform4fARB_remap_index },
-   { 20901, Uniform4fvARB_remap_index },
-   { 22041, Uniform4iARB_remap_index },
-   { 18051, Uniform4ivARB_remap_index },
+   { 14942, Uniform3ivARB_remap_index },
+   { 16833, Uniform4fARB_remap_index },
+   { 20934, Uniform4fvARB_remap_index },
+   { 22117, Uniform4iARB_remap_index },
+   { 18084, Uniform4ivARB_remap_index },
    {  7324, UniformMatrix2fvARB_remap_index },
    {    17, UniformMatrix3fvARB_remap_index },
    {  2475, UniformMatrix4fvARB_remap_index },
-   { 22474, UseProgramObjectARB_remap_index },
-   { 13016, ValidateProgramARB_remap_index },
-   { 18853, BindAttribLocationARB_remap_index },
+   { 22550, UseProgramObjectARB_remap_index },
+   { 13049, ValidateProgramARB_remap_index },
+   { 18886, BindAttribLocationARB_remap_index },
    {  4346, GetActiveAttribARB_remap_index },
-   { 14590, GetAttribLocationARB_remap_index },
-   { 26108, DrawBuffersARB_remap_index },
-   { 11636, RenderbufferStorageMultisample_remap_index },
-   { 16848, FlushMappedBufferRange_remap_index },
-   { 24672, MapBufferRange_remap_index },
-   { 14465, BindVertexArray_remap_index },
-   { 12875, GenVertexArrays_remap_index },
-   { 26883, CopyBufferSubData_remap_index },
-   { 27662, ClientWaitSync_remap_index },
+   { 14623, GetAttribLocationARB_remap_index },
+   { 26184, DrawBuffersARB_remap_index },
+   { 11669, RenderbufferStorageMultisample_remap_index },
+   { 16881, FlushMappedBufferRange_remap_index },
+   { 24748, MapBufferRange_remap_index },
+   { 14498, BindVertexArray_remap_index },
+   { 12908, GenVertexArrays_remap_index },
+   { 26959, CopyBufferSubData_remap_index },
+   { 27738, ClientWaitSync_remap_index },
    {  2394, DeleteSync_remap_index },
    {  6221, FenceSync_remap_index },
-   { 13387, GetInteger64v_remap_index },
-   { 19952, GetSynciv_remap_index },
-   { 26047, IsSync_remap_index },
+   { 13420, GetInteger64v_remap_index },
+   { 19985, GetSynciv_remap_index },
+   { 26123, IsSync_remap_index },
    {  8328, WaitSync_remap_index },
    {  3363, DrawElementsBaseVertex_remap_index },
-   { 27126, DrawRangeElementsBaseVertex_remap_index },
-   { 23393, MultiDrawElementsBaseVertex_remap_index },
+   { 27202, DrawRangeElementsBaseVertex_remap_index },
+   { 23469, MultiDrawElementsBaseVertex_remap_index },
    {  4711, PolygonOffsetEXT_remap_index },
-   { 20537, GetPixelTexGenParameterfvSGIS_remap_index },
+   { 20570, GetPixelTexGenParameterfvSGIS_remap_index },
    {  3895, GetPixelTexGenParameterivSGIS_remap_index },
-   { 20270, PixelTexGenParameterfSGIS_remap_index },
+   { 20303, PixelTexGenParameterfSGIS_remap_index },
    {   580, PixelTexGenParameterfvSGIS_remap_index },
-   { 11191, PixelTexGenParameteriSGIS_remap_index },
-   { 12152, PixelTexGenParameterivSGIS_remap_index },
-   { 14553, SampleMaskSGIS_remap_index },
-   { 17485, SamplePatternSGIS_remap_index },
-   { 23322, ColorPointerEXT_remap_index },
-   { 15468, EdgeFlagPointerEXT_remap_index },
+   { 11224, PixelTexGenParameteriSGIS_remap_index },
+   { 12185, PixelTexGenParameterivSGIS_remap_index },
+   { 14586, SampleMaskSGIS_remap_index },
+   { 17518, SamplePatternSGIS_remap_index },
+   { 23398, ColorPointerEXT_remap_index },
+   { 15501, EdgeFlagPointerEXT_remap_index },
    {  5166, IndexPointerEXT_remap_index },
    {  5246, NormalPointerEXT_remap_index },
-   { 13981, TexCoordPointerEXT_remap_index },
+   { 14014, TexCoordPointerEXT_remap_index },
    {  6016, VertexPointerEXT_remap_index },
    {  3165, PointParameterfEXT_remap_index },
    {  6861, PointParameterfvEXT_remap_index },
-   { 28499, LockArraysEXT_remap_index },
-   { 13080, UnlockArraysEXT_remap_index },
+   { 28575, LockArraysEXT_remap_index },
+   { 13113, UnlockArraysEXT_remap_index },
    {  7868, CullParameterdvEXT_remap_index },
    { 10359, CullParameterfvEXT_remap_index },
    {  1151, SecondaryColor3bEXT_remap_index },
    {  7020, SecondaryColor3bvEXT_remap_index },
    {  9238, SecondaryColor3dEXT_remap_index },
-   { 22647, SecondaryColor3dvEXT_remap_index },
-   { 24918, SecondaryColor3fEXT_remap_index },
-   { 16034, SecondaryColor3fvEXT_remap_index },
+   { 22723, SecondaryColor3dvEXT_remap_index },
+   { 24994, SecondaryColor3fEXT_remap_index },
+   { 16067, SecondaryColor3fvEXT_remap_index },
    {   426, SecondaryColor3iEXT_remap_index },
-   { 14291, SecondaryColor3ivEXT_remap_index },
+   { 14324, SecondaryColor3ivEXT_remap_index },
    {  8896, SecondaryColor3sEXT_remap_index },
-   { 27326, SecondaryColor3svEXT_remap_index },
-   { 24091, SecondaryColor3ubEXT_remap_index },
-   { 18744, SecondaryColor3ubvEXT_remap_index },
-   { 11386, SecondaryColor3uiEXT_remap_index },
-   { 20157, SecondaryColor3uivEXT_remap_index },
-   { 22859, SecondaryColor3usEXT_remap_index },
-   { 11459, SecondaryColor3usvEXT_remap_index },
+   { 27402, SecondaryColor3svEXT_remap_index },
+   { 24167, SecondaryColor3ubEXT_remap_index },
+   { 18777, SecondaryColor3ubvEXT_remap_index },
+   { 11419, SecondaryColor3uiEXT_remap_index },
+   { 20190, SecondaryColor3uivEXT_remap_index },
+   { 22935, SecondaryColor3usEXT_remap_index },
+   { 11492, SecondaryColor3usvEXT_remap_index },
    { 10435, SecondaryColorPointerEXT_remap_index },
-   { 22708, MultiDrawArraysEXT_remap_index },
-   { 18434, MultiDrawElementsEXT_remap_index },
-   { 18629, FogCoordPointerEXT_remap_index },
+   { 22784, MultiDrawArraysEXT_remap_index },
+   { 18467, MultiDrawElementsEXT_remap_index },
+   { 18662, FogCoordPointerEXT_remap_index },
    {  4044, FogCoorddEXT_remap_index },
-   { 27900, FogCoorddvEXT_remap_index },
+   { 27976, FogCoorddvEXT_remap_index },
    {  4136, FogCoordfEXT_remap_index },
-   { 24014, FogCoordfvEXT_remap_index },
-   { 16752, PixelTexGenSGIX_remap_index },
-   { 24599, BlendFuncSeparateEXT_remap_index },
+   { 24090, FogCoordfvEXT_remap_index },
+   { 16785, PixelTexGenSGIX_remap_index },
+   { 24675, BlendFuncSeparateEXT_remap_index },
    {  5928, FlushVertexArrayRangeNV_remap_index },
    {  4660, VertexArrayRangeNV_remap_index },
-   { 24983, CombinerInputNV_remap_index },
+   { 25059, CombinerInputNV_remap_index },
    {  1946, CombinerOutputNV_remap_index },
-   { 27479, CombinerParameterfNV_remap_index },
+   { 27555, CombinerParameterfNV_remap_index },
    {  4580, CombinerParameterfvNV_remap_index },
-   { 19702, CombinerParameteriNV_remap_index },
-   { 28870, CombinerParameterivNV_remap_index },
+   { 19735, CombinerParameteriNV_remap_index },
+   { 28946, CombinerParameterivNV_remap_index },
    {  6298, FinalCombinerInputNV_remap_index },
    {  8725, GetCombinerInputParameterfvNV_remap_index },
-   { 28707, GetCombinerInputParameterivNV_remap_index },
+   { 28783, GetCombinerInputParameterivNV_remap_index },
    {  6097, GetCombinerOutputParameterfvNV_remap_index },
-   { 12113, GetCombinerOutputParameterivNV_remap_index },
+   { 12146, GetCombinerOutputParameterivNV_remap_index },
    {  5673, GetFinalCombinerInputParameterfvNV_remap_index },
-   { 21913, GetFinalCombinerInputParameterivNV_remap_index },
-   { 11131, ResizeBuffersMESA_remap_index },
+   { 21989, GetFinalCombinerInputParameterivNV_remap_index },
+   { 11164, ResizeBuffersMESA_remap_index },
    {  9842, WindowPos2dMESA_remap_index },
    {   944, WindowPos2dvMESA_remap_index },
-   { 29698, WindowPos2fMESA_remap_index },
+   { 29774, WindowPos2fMESA_remap_index },
    {  6965, WindowPos2fvMESA_remap_index },
-   { 15981, WindowPos2iMESA_remap_index },
-   { 17958, WindowPos2ivMESA_remap_index },
-   { 18533, WindowPos2sMESA_remap_index },
+   { 16014, WindowPos2iMESA_remap_index },
+   { 17991, WindowPos2ivMESA_remap_index },
+   { 18566, WindowPos2sMESA_remap_index },
    {  4916, WindowPos2svMESA_remap_index },
    {  6790, WindowPos3dMESA_remap_index },
-   { 12360, WindowPos3dvMESA_remap_index },
+   { 12393, WindowPos3dvMESA_remap_index },
    {   472, WindowPos3fMESA_remap_index },
-   { 13141, WindowPos3fvMESA_remap_index },
-   { 21208, WindowPos3iMESA_remap_index },
-   { 26828, WindowPos3ivMESA_remap_index },
-   { 16498, WindowPos3sMESA_remap_index },
-   { 28156, WindowPos3svMESA_remap_index },
+   { 13174, WindowPos3fvMESA_remap_index },
+   { 21284, WindowPos3iMESA_remap_index },
+   { 26904, WindowPos3ivMESA_remap_index },
+   { 16531, WindowPos3sMESA_remap_index },
+   { 28232, WindowPos3svMESA_remap_index },
    {  9793, WindowPos4dMESA_remap_index },
-   { 14994, WindowPos4dvMESA_remap_index },
-   { 12319, WindowPos4fMESA_remap_index },
-   { 27233, WindowPos4fvMESA_remap_index },
-   { 26981, WindowPos4iMESA_remap_index },
-   { 10970, WindowPos4ivMESA_remap_index },
-   { 16631, WindowPos4sMESA_remap_index },
+   { 15027, WindowPos4dvMESA_remap_index },
+   { 12352, WindowPos4fMESA_remap_index },
+   { 27309, WindowPos4fvMESA_remap_index },
+   { 27057, WindowPos4iMESA_remap_index },
+   { 11003, WindowPos4ivMESA_remap_index },
+   { 16664, WindowPos4sMESA_remap_index },
    {  2857, WindowPos4svMESA_remap_index },
-   { 23757, MultiModeDrawArraysIBM_remap_index },
-   { 25701, MultiModeDrawElementsIBM_remap_index },
-   { 10781, DeleteFencesNV_remap_index },
-   { 24830, FinishFenceNV_remap_index },
+   { 23833, MultiModeDrawArraysIBM_remap_index },
+   { 25777, MultiModeDrawElementsIBM_remap_index },
+   { 10814, DeleteFencesNV_remap_index },
+   { 24906, FinishFenceNV_remap_index },
    {  3287, GenFencesNV_remap_index },
-   { 14974, GetFenceivNV_remap_index },
+   { 15007, GetFenceivNV_remap_index },
    {  7257, IsFenceNV_remap_index },
-   { 12040, SetFenceNV_remap_index },
+   { 12073, SetFenceNV_remap_index },
    {  3744, TestFenceNV_remap_index },
-   { 28127, AreProgramsResidentNV_remap_index },
-   { 27521, BindProgramNV_remap_index },
-   { 22942, DeleteProgramsNV_remap_index },
-   { 18962, ExecuteProgramNV_remap_index },
-   { 29591, GenProgramsNV_remap_index },
-   { 20616, GetProgramParameterdvNV_remap_index },
+   { 28203, AreProgramsResidentNV_remap_index },
+   { 27597, BindProgramNV_remap_index },
+   { 23018, DeleteProgramsNV_remap_index },
+   { 18995, ExecuteProgramNV_remap_index },
+   { 29667, GenProgramsNV_remap_index },
+   { 20649, GetProgramParameterdvNV_remap_index },
    {  9300, GetProgramParameterfvNV_remap_index },
-   { 23296, GetProgramStringNV_remap_index },
-   { 21602, GetProgramivNV_remap_index },
-   { 20850, GetTrackMatrixivNV_remap_index },
-   { 23092, GetVertexAttribPointervNV_remap_index },
-   { 21846, GetVertexAttribdvNV_remap_index },
-   { 16471, GetVertexAttribfvNV_remap_index },
-   { 16162, GetVertexAttribivNV_remap_index },
-   { 16878, IsProgramNV_remap_index },
+   { 23372, GetProgramStringNV_remap_index },
+   { 21678, GetProgramivNV_remap_index },
+   { 20883, GetTrackMatrixivNV_remap_index },
+   { 23168, GetVertexAttribPointervNV_remap_index },
+   { 21922, GetVertexAttribdvNV_remap_index },
+   { 16504, GetVertexAttribfvNV_remap_index },
+   { 16195, GetVertexAttribivNV_remap_index },
+   { 16911, IsProgramNV_remap_index },
    {  8306, LoadProgramNV_remap_index },
-   { 24695, ProgramParameters4dvNV_remap_index },
-   { 21532, ProgramParameters4fvNV_remap_index },
-   { 18262, RequestResidentProgramsNV_remap_index },
-   { 19680, TrackMatrixNV_remap_index },
-   { 28684, VertexAttrib1dNV_remap_index },
-   { 11981, VertexAttrib1dvNV_remap_index },
-   { 25233, VertexAttrib1fNV_remap_index },
+   { 24771, ProgramParameters4dvNV_remap_index },
+   { 21608, ProgramParameters4fvNV_remap_index },
+   { 18295, RequestResidentProgramsNV_remap_index },
+   { 19713, TrackMatrixNV_remap_index },
+   { 28760, VertexAttrib1dNV_remap_index },
+   { 12014, VertexAttrib1dvNV_remap_index },
+   { 25309, VertexAttrib1fNV_remap_index },
    {  2245, VertexAttrib1fvNV_remap_index },
-   { 27290, VertexAttrib1sNV_remap_index },
-   { 13214, VertexAttrib1svNV_remap_index },
+   { 27366, VertexAttrib1sNV_remap_index },
+   { 13247, VertexAttrib1svNV_remap_index },
    {  4251, VertexAttrib2dNV_remap_index },
-   { 11896, VertexAttrib2dvNV_remap_index },
-   { 17717, VertexAttrib2fNV_remap_index },
-   { 11507, VertexAttrib2fvNV_remap_index },
+   { 11929, VertexAttrib2dvNV_remap_index },
+   { 17750, VertexAttrib2fNV_remap_index },
+   { 11540, VertexAttrib2fvNV_remap_index },
    {  5076, VertexAttrib2sNV_remap_index },
-   { 16552, VertexAttrib2svNV_remap_index },
+   { 16585, VertexAttrib2svNV_remap_index },
    {  9990, VertexAttrib3dNV_remap_index },
-   { 28377, VertexAttrib3dvNV_remap_index },
+   { 28453, VertexAttrib3dvNV_remap_index },
    {  9112, VertexAttrib3fNV_remap_index },
-   { 21873, VertexAttrib3fvNV_remap_index },
-   { 25208, VertexAttrib3sNV_remap_index },
-   { 20877, VertexAttrib3svNV_remap_index },
-   { 25675, VertexAttrib4dNV_remap_index },
-   { 29628, VertexAttrib4dvNV_remap_index },
+   { 21949, VertexAttrib3fvNV_remap_index },
+   { 25284, VertexAttrib3sNV_remap_index },
+   { 20910, VertexAttrib3svNV_remap_index },
+   { 25751, VertexAttrib4dNV_remap_index },
+   { 29704, VertexAttrib4dvNV_remap_index },
    {  3945, VertexAttrib4fNV_remap_index },
    {  8356, VertexAttrib4fvNV_remap_index },
-   { 23641, VertexAttrib4sNV_remap_index },
+   { 23717, VertexAttrib4sNV_remap_index },
    {  1293, VertexAttrib4svNV_remap_index },
    {  4409, VertexAttrib4ubNV_remap_index },
    {   734, VertexAttrib4ubvNV_remap_index },
-   { 19142, VertexAttribPointerNV_remap_index },
+   { 19175, VertexAttribPointerNV_remap_index },
    {  2097, VertexAttribs1dvNV_remap_index },
-   { 16576, VertexAttribs1fvNV_remap_index },
-   { 29428, VertexAttribs1svNV_remap_index },
+   { 16609, VertexAttribs1fvNV_remap_index },
+   { 29504, VertexAttribs1svNV_remap_index },
    {  9137, VertexAttribs2dvNV_remap_index },
-   { 22435, VertexAttribs2fvNV_remap_index },
-   { 15494, VertexAttribs2svNV_remap_index },
+   { 22511, VertexAttribs2fvNV_remap_index },
+   { 15527, VertexAttribs2svNV_remap_index },
    {  4608, VertexAttribs3dvNV_remap_index },
    {  1977, VertexAttribs3fvNV_remap_index },
-   { 26576, VertexAttribs3svNV_remap_index },
-   { 23731, VertexAttribs4dvNV_remap_index },
+   { 26652, VertexAttribs3svNV_remap_index },
+   { 23807, VertexAttribs4dvNV_remap_index },
    {  4634, VertexAttribs4fvNV_remap_index },
-   { 29215, VertexAttribs4svNV_remap_index },
-   { 26324, VertexAttribs4ubvNV_remap_index },
-   { 23833, GetTexBumpParameterfvATI_remap_index },
-   { 29469, GetTexBumpParameterivATI_remap_index },
-   { 16216, TexBumpParameterfvATI_remap_index },
-   { 18133, TexBumpParameterivATI_remap_index },
-   { 13760, AlphaFragmentOp1ATI_remap_index },
+   { 29291, VertexAttribs4svNV_remap_index },
+   { 26400, VertexAttribs4ubvNV_remap_index },
+   { 23909, GetTexBumpParameterfvATI_remap_index },
+   { 29545, GetTexBumpParameterivATI_remap_index },
+   { 16249, TexBumpParameterfvATI_remap_index },
+   { 18166, TexBumpParameterivATI_remap_index },
+   { 13793, AlphaFragmentOp1ATI_remap_index },
    {  9652, AlphaFragmentOp2ATI_remap_index },
-   { 21789, AlphaFragmentOp3ATI_remap_index },
-   { 26503, BeginFragmentShaderATI_remap_index },
-   { 27720, BindFragmentShaderATI_remap_index },
-   { 21006, ColorFragmentOp1ATI_remap_index },
+   { 21865, AlphaFragmentOp3ATI_remap_index },
+   { 26579, BeginFragmentShaderATI_remap_index },
+   { 27796, BindFragmentShaderATI_remap_index },
+   { 21039, ColorFragmentOp1ATI_remap_index },
    {  3823, ColorFragmentOp2ATI_remap_index },
-   { 28022, ColorFragmentOp3ATI_remap_index },
+   { 28098, ColorFragmentOp3ATI_remap_index },
    {  4753, DeleteFragmentShaderATI_remap_index },
-   { 29652, EndFragmentShaderATI_remap_index },
-   { 28898, GenFragmentShadersATI_remap_index },
-   { 22566, PassTexCoordATI_remap_index },
+   { 29728, EndFragmentShaderATI_remap_index },
+   { 28974, GenFragmentShadersATI_remap_index },
+   { 22642, PassTexCoordATI_remap_index },
    {  5996, SampleMapATI_remap_index },
    {  5769, SetFragmentShaderConstantATI_remap_index },
    {   319, PointParameteriNV_remap_index },
-   { 12521, PointParameterivNV_remap_index },
-   { 25514, ActiveStencilFaceEXT_remap_index },
-   { 24355, BindVertexArrayAPPLE_remap_index },
+   { 12554, PointParameterivNV_remap_index },
+   { 25590, ActiveStencilFaceEXT_remap_index },
+   { 24431, BindVertexArrayAPPLE_remap_index },
    {  2522, DeleteVertexArraysAPPLE_remap_index },
-   { 15833, GenVertexArraysAPPLE_remap_index },
-   { 20681, IsVertexArrayAPPLE_remap_index },
+   { 15866, GenVertexArraysAPPLE_remap_index },
+   { 20714, IsVertexArrayAPPLE_remap_index },
    {   775, GetProgramNamedParameterdvNV_remap_index },
    {  3128, GetProgramNamedParameterfvNV_remap_index },
-   { 23864, ProgramNamedParameter4dNV_remap_index },
-   { 12796, ProgramNamedParameter4dvNV_remap_index },
+   { 23940, ProgramNamedParameter4dNV_remap_index },
+   { 12829, ProgramNamedParameter4dvNV_remap_index },
    {  7893, ProgramNamedParameter4fNV_remap_index },
    { 10400, ProgramNamedParameter4fvNV_remap_index },
-   { 21511, DepthBoundsEXT_remap_index },
+   { 21587, DepthBoundsEXT_remap_index },
    {  1043, BlendEquationSeparateEXT_remap_index },
-   { 12915, BindFramebufferEXT_remap_index },
-   { 22753, BindRenderbufferEXT_remap_index },
+   { 12948, BindFramebufferEXT_remap_index },
+   { 22829, BindRenderbufferEXT_remap_index },
    {  8575, CheckFramebufferStatusEXT_remap_index },
-   { 19971, DeleteFramebuffersEXT_remap_index },
-   { 28279, DeleteRenderbuffersEXT_remap_index },
-   { 11920, FramebufferRenderbufferEXT_remap_index },
-   { 12057, FramebufferTexture1DEXT_remap_index },
+   { 20004, DeleteFramebuffersEXT_remap_index },
+   { 28355, DeleteRenderbuffersEXT_remap_index },
+   { 11953, FramebufferRenderbufferEXT_remap_index },
+   { 12090, FramebufferTexture1DEXT_remap_index },
    { 10228, FramebufferTexture2DEXT_remap_index },
    {  9895, FramebufferTexture3DEXT_remap_index },
-   { 20573, GenFramebuffersEXT_remap_index },
-   { 15380, GenRenderbuffersEXT_remap_index },
+   { 20606, GenFramebuffersEXT_remap_index },
+   { 15413, GenRenderbuffersEXT_remap_index },
    {  5715, GenerateMipmapEXT_remap_index },
-   { 19202, GetFramebufferAttachmentParameterivEXT_remap_index },
-   { 28804, GetRenderbufferParameterivEXT_remap_index },
-   { 18013, IsFramebufferEXT_remap_index },
-   { 29551, IsRenderbufferEXT_remap_index },
+   { 19235, GetFramebufferAttachmentParameterivEXT_remap_index },
+   { 28880, GetRenderbufferParameterivEXT_remap_index },
+   { 18046, IsFramebufferEXT_remap_index },
+   { 29627, IsRenderbufferEXT_remap_index },
    {  7204, RenderbufferStorageEXT_remap_index },
    {   651, BlitFramebufferEXT_remap_index },
-   { 12615, BufferParameteriAPPLE_remap_index },
-   { 16910, FlushMappedBufferRangeAPPLE_remap_index },
+   { 12648, BufferParameteriAPPLE_remap_index },
+   { 16943, FlushMappedBufferRangeAPPLE_remap_index },
    {  2701, FramebufferTextureLayerEXT_remap_index },
    {  8277, ColorMaskIndexedEXT_remap_index },
-   { 23180, DisableIndexedEXT_remap_index },
-   { 23488, EnableIndexedEXT_remap_index },
-   { 19173, GetBooleanIndexedvEXT_remap_index },
+   { 23256, DisableIndexedEXT_remap_index },
+   { 23564, EnableIndexedEXT_remap_index },
+   { 19206, GetBooleanIndexedvEXT_remap_index },
    {  9685, GetIntegerIndexedvEXT_remap_index },
-   { 20047, IsEnabledIndexedEXT_remap_index },
+   { 20080, IsEnabledIndexedEXT_remap_index },
    {  4074, BeginConditionalRenderNV_remap_index },
-   { 22539, EndConditionalRenderNV_remap_index },
-   { 26225, ProvokingVertexEXT_remap_index },
+   { 22615, EndConditionalRenderNV_remap_index },
+   { 26301, ProvokingVertexEXT_remap_index },
    {  9521, GetTexParameterPointervAPPLE_remap_index },
    {  4436, TextureRangeAPPLE_remap_index },
-   { 25540, StencilFuncSeparateATI_remap_index },
-   { 15900, ProgramEnvParameters4fvEXT_remap_index },
-   { 15118, ProgramLocalParameters4fvEXT_remap_index },
-   { 12449, GetQueryObjecti64vEXT_remap_index },
+   { 25616, StencilFuncSeparateATI_remap_index },
+   { 15933, ProgramEnvParameters4fvEXT_remap_index },
+   { 15151, ProgramLocalParameters4fvEXT_remap_index },
+   { 12482, GetQueryObjecti64vEXT_remap_index },
    {  9163, GetQueryObjectui64vEXT_remap_index },
+   { 21108, EGLImageTargetRenderbufferStorageOES_remap_index },
+   { 10753, EGLImageTargetTexture2DOES_remap_index },
    {    -1, -1 }
 };
 
@@ -4770,8 +4780,8 @@ static const struct gl_function_remap MESA_alt_functions[] = {
    /* from GL_EXT_blend_minmax */
    {  9952, _gloffset_BlendEquation },
    /* from GL_EXT_color_subtable */
-   { 15016, _gloffset_ColorSubTable },
-   { 28211, _gloffset_CopyColorSubTable },
+   { 15049, _gloffset_ColorSubTable },
+   { 28287, _gloffset_CopyColorSubTable },
    /* from GL_EXT_convolution */
    {   213, _gloffset_ConvolutionFilter1D },
    {  2284, _gloffset_CopyConvolutionFilter1D },
@@ -4779,62 +4789,62 @@ static const struct gl_function_remap MESA_alt_functions[] = {
    {  7553, _gloffset_ConvolutionFilter2D },
    {  7719, _gloffset_ConvolutionParameteriv },
    {  8179, _gloffset_ConvolutionParameterfv },
-   { 18161, _gloffset_GetSeparableFilter },
-   { 21262, _gloffset_SeparableFilter2D },
-   { 22091, _gloffset_ConvolutionParameteri },
-   { 22214, _gloffset_ConvolutionParameterf },
-   { 23667, _gloffset_GetConvolutionParameterfv },
-   { 24521, _gloffset_GetConvolutionFilter },
-   { 26765, _gloffset_CopyConvolutionFilter2D },
+   { 18194, _gloffset_GetSeparableFilter },
+   { 21338, _gloffset_SeparableFilter2D },
+   { 22167, _gloffset_ConvolutionParameteri },
+   { 22290, _gloffset_ConvolutionParameterf },
+   { 23743, _gloffset_GetConvolutionParameterfv },
+   { 24597, _gloffset_GetConvolutionFilter },
+   { 26841, _gloffset_CopyConvolutionFilter2D },
    /* from GL_EXT_copy_texture */
-   { 13274, _gloffset_CopyTexSubImage3D },
-   { 14756, _gloffset_CopyTexImage2D },
-   { 21699, _gloffset_CopyTexImage1D },
-   { 24202, _gloffset_CopyTexSubImage2D },
-   { 26403, _gloffset_CopyTexSubImage1D },
+   { 13307, _gloffset_CopyTexSubImage3D },
+   { 14789, _gloffset_CopyTexImage2D },
+   { 21775, _gloffset_CopyTexImage1D },
+   { 24278, _gloffset_CopyTexSubImage2D },
+   { 26479, _gloffset_CopyTexSubImage1D },
    /* from GL_EXT_draw_range_elements */
    {  8462, _gloffset_DrawRangeElements },
    /* from GL_EXT_histogram */
    {   812, _gloffset_Histogram },
    {  3088, _gloffset_ResetHistogram },
    {  8834, _gloffset_GetMinmax },
-   { 13608, _gloffset_GetHistogramParameterfv },
-   { 21624, _gloffset_GetMinmaxParameteriv },
-   { 23557, _gloffset_ResetMinmax },
-   { 24418, _gloffset_GetHistogramParameteriv },
-   { 25474, _gloffset_GetHistogram },
-   { 27836, _gloffset_Minmax },
-   { 29298, _gloffset_GetMinmaxParameterfv },
+   { 13641, _gloffset_GetHistogramParameterfv },
+   { 21700, _gloffset_GetMinmaxParameteriv },
+   { 23633, _gloffset_ResetMinmax },
+   { 24494, _gloffset_GetHistogramParameteriv },
+   { 25550, _gloffset_GetHistogram },
+   { 27912, _gloffset_Minmax },
+   { 29374, _gloffset_GetMinmaxParameterfv },
    /* from GL_EXT_paletted_texture */
    {  7415, _gloffset_ColorTable },
-   { 13454, _gloffset_GetColorTable },
-   { 20320, _gloffset_GetColorTableParameterfv },
-   { 22270, _gloffset_GetColorTableParameteriv },
+   { 13487, _gloffset_GetColorTable },
+   { 20353, _gloffset_GetColorTableParameterfv },
+   { 22346, _gloffset_GetColorTableParameteriv },
    /* from GL_EXT_subtexture */
    {  6136, _gloffset_TexSubImage1D },
    {  9448, _gloffset_TexSubImage2D },
    /* from GL_EXT_texture3D */
    {  1658, _gloffset_TexImage3D },
-   { 20089, _gloffset_TexSubImage3D },
+   { 20122, _gloffset_TexSubImage3D },
    /* from GL_EXT_texture_object */
    {  2964, _gloffset_PrioritizeTextures },
    {  6585, _gloffset_AreTexturesResident },
-   { 12005, _gloffset_GenTextures },
-   { 13940, _gloffset_DeleteTextures },
-   { 17191, _gloffset_IsTexture },
-   { 26468, _gloffset_BindTexture },
+   { 12038, _gloffset_GenTextures },
+   { 13973, _gloffset_DeleteTextures },
+   { 17224, _gloffset_IsTexture },
+   { 26544, _gloffset_BindTexture },
    /* from GL_EXT_vertex_array */
-   { 21451, _gloffset_ArrayElement },
-   { 27424, _gloffset_GetPointerv },
-   { 28925, _gloffset_DrawArrays },
+   { 21527, _gloffset_ArrayElement },
+   { 27500, _gloffset_GetPointerv },
+   { 29001, _gloffset_DrawArrays },
    /* from GL_SGI_color_table */
    {  6703, _gloffset_ColorTableParameteriv },
    {  7415, _gloffset_ColorTable },
-   { 13454, _gloffset_GetColorTable },
-   { 13564, _gloffset_CopyColorTable },
-   { 17052, _gloffset_ColorTableParameterfv },
-   { 20320, _gloffset_GetColorTableParameterfv },
-   { 22270, _gloffset_GetColorTableParameteriv },
+   { 13487, _gloffset_GetColorTable },
+   { 13597, _gloffset_CopyColorTable },
+   { 17085, _gloffset_ColorTableParameterfv },
+   { 20353, _gloffset_GetColorTableParameterfv },
+   { 22346, _gloffset_GetColorTableParameteriv },
    /* from GL_VERSION_1_3 */
    {   381, _gloffset_MultiTexCoord3sARB },
    {   613, _gloffset_ActiveTextureARB },
@@ -4847,29 +4857,29 @@ static const struct gl_function_remap MESA_alt_functions[] = {
    {  9714, _gloffset_MultiTexCoord4sARB },
    { 10314, _gloffset_MultiTexCoord2dvARB },
    { 10696, _gloffset_MultiTexCoord1svARB },
-   { 10992, _gloffset_MultiTexCoord3svARB },
-   { 11053, _gloffset_MultiTexCoord4iARB },
-   { 11776, _gloffset_MultiTexCoord3iARB },
-   { 12478, _gloffset_MultiTexCoord1dARB },
-   { 12644, _gloffset_MultiTexCoord3dvARB },
-   { 13808, _gloffset_MultiTexCoord3ivARB },
-   { 13853, _gloffset_MultiTexCoord2sARB },
-   { 15073, _gloffset_MultiTexCoord4ivARB },
-   { 16702, _gloffset_ClientActiveTextureARB },
-   { 18918, _gloffset_MultiTexCoord2dARB },
-   { 19322, _gloffset_MultiTexCoord4dvARB },
-   { 19608, _gloffset_MultiTexCoord4fvARB },
-   { 20461, _gloffset_MultiTexCoord3fARB },
-   { 22798, _gloffset_MultiTexCoord4dARB },
-   { 23002, _gloffset_MultiTexCoord1sARB },
-   { 23204, _gloffset_MultiTexCoord1dvARB },
-   { 24046, _gloffset_MultiTexCoord1ivARB },
-   { 24139, _gloffset_MultiTexCoord2ivARB },
-   { 24478, _gloffset_MultiTexCoord1iARB },
-   { 25749, _gloffset_MultiTexCoord4svARB },
-   { 26267, _gloffset_MultiTexCoord1fARB },
-   { 26530, _gloffset_MultiTexCoord4fARB },
-   { 28759, _gloffset_MultiTexCoord2fvARB },
+   { 11025, _gloffset_MultiTexCoord3svARB },
+   { 11086, _gloffset_MultiTexCoord4iARB },
+   { 11809, _gloffset_MultiTexCoord3iARB },
+   { 12511, _gloffset_MultiTexCoord1dARB },
+   { 12677, _gloffset_MultiTexCoord3dvARB },
+   { 13841, _gloffset_MultiTexCoord3ivARB },
+   { 13886, _gloffset_MultiTexCoord2sARB },
+   { 15106, _gloffset_MultiTexCoord4ivARB },
+   { 16735, _gloffset_ClientActiveTextureARB },
+   { 18951, _gloffset_MultiTexCoord2dARB },
+   { 19355, _gloffset_MultiTexCoord4dvARB },
+   { 19641, _gloffset_MultiTexCoord4fvARB },
+   { 20494, _gloffset_MultiTexCoord3fARB },
+   { 22874, _gloffset_MultiTexCoord4dARB },
+   { 23078, _gloffset_MultiTexCoord1sARB },
+   { 23280, _gloffset_MultiTexCoord1dvARB },
+   { 24122, _gloffset_MultiTexCoord1ivARB },
+   { 24215, _gloffset_MultiTexCoord2ivARB },
+   { 24554, _gloffset_MultiTexCoord1iARB },
+   { 25825, _gloffset_MultiTexCoord4svARB },
+   { 26343, _gloffset_MultiTexCoord1fARB },
+   { 26606, _gloffset_MultiTexCoord4fARB },
+   { 28835, _gloffset_MultiTexCoord2fvARB },
    {    -1, -1 }
 };
 
@@ -4941,10 +4951,10 @@ static const struct gl_function_remap GL_ARB_map_buffer_range_functions[] = {
 #if defined(need_GL_ARB_matrix_palette)
 static const struct gl_function_remap GL_ARB_matrix_palette_functions[] = {
    {  3339, -1 }, /* MatrixIndexusvARB */
-   { 11597, -1 }, /* MatrixIndexuivARB */
-   { 12766, -1 }, /* MatrixIndexPointerARB */
-   { 17440, -1 }, /* CurrentPaletteMatrixARB */
-   { 20205, -1 }, /* MatrixIndexubvARB */
+   { 11630, -1 }, /* MatrixIndexuivARB */
+   { 12799, -1 }, /* MatrixIndexPointerARB */
+   { 17473, -1 }, /* CurrentPaletteMatrixARB */
+   { 20238, -1 }, /* MatrixIndexubvARB */
    {    -1, -1 }
 };
 #endif
@@ -5017,13 +5027,13 @@ static const struct gl_function_remap GL_ARB_vertex_blend_functions[] = {
    {  2226, -1 }, /* WeightubvARB */
    {  5603, -1 }, /* WeightivARB */
    {  9817, -1 }, /* WeightPointerARB */
-   { 12235, -1 }, /* WeightfvARB */
-   { 15520, -1 }, /* WeightbvARB */
-   { 18586, -1 }, /* WeightusvARB */
-   { 21188, -1 }, /* VertexBlendARB */
-   { 26351, -1 }, /* WeightsvARB */
-   { 28261, -1 }, /* WeightdvARB */
-   { 28959, -1 }, /* WeightuivARB */
+   { 12268, -1 }, /* WeightfvARB */
+   { 15553, -1 }, /* WeightbvARB */
+   { 18619, -1 }, /* WeightusvARB */
+   { 21264, -1 }, /* VertexBlendARB */
+   { 26427, -1 }, /* WeightsvARB */
+   { 28337, -1 }, /* WeightdvARB */
+   { 29035, -1 }, /* WeightuivARB */
    {    -1, -1 }
 };
 #endif
@@ -5121,8 +5131,8 @@ static const struct gl_function_remap GL_EXT_blend_minmax_functions[] = {
 
 #if defined(need_GL_EXT_color_subtable)
 static const struct gl_function_remap GL_EXT_color_subtable_functions[] = {
-   { 15016, _gloffset_ColorSubTable },
-   { 28211, _gloffset_CopyColorSubTable },
+   { 15049, _gloffset_ColorSubTable },
+   { 28287, _gloffset_CopyColorSubTable },
    {    -1, -1 }
 };
 #endif
@@ -5142,13 +5152,13 @@ static const struct gl_function_remap GL_EXT_convolution_functions[] = {
    {  7553, _gloffset_ConvolutionFilter2D },
    {  7719, _gloffset_ConvolutionParameteriv },
    {  8179, _gloffset_ConvolutionParameterfv },
-   { 18161, _gloffset_GetSeparableFilter },
-   { 21262, _gloffset_SeparableFilter2D },
-   { 22091, _gloffset_ConvolutionParameteri },
-   { 22214, _gloffset_ConvolutionParameterf },
-   { 23667, _gloffset_GetConvolutionParameterfv },
-   { 24521, _gloffset_GetConvolutionFilter },
-   { 26765, _gloffset_CopyConvolutionFilter2D },
+   { 18194, _gloffset_GetSeparableFilter },
+   { 21338, _gloffset_SeparableFilter2D },
+   { 22167, _gloffset_ConvolutionParameteri },
+   { 22290, _gloffset_ConvolutionParameterf },
+   { 23743, _gloffset_GetConvolutionParameterfv },
+   { 24597, _gloffset_GetConvolutionFilter },
+   { 26841, _gloffset_CopyConvolutionFilter2D },
    {    -1, -1 }
 };
 #endif
@@ -5156,38 +5166,38 @@ static const struct gl_function_remap GL_EXT_convolution_functions[] = {
 #if defined(need_GL_EXT_coordinate_frame)
 static const struct gl_function_remap GL_EXT_coordinate_frame_functions[] = {
    {  9332, -1 }, /* TangentPointerEXT */
-   { 11111, -1 }, /* Binormal3ivEXT */
-   { 11729, -1 }, /* Tangent3sEXT */
-   { 12831, -1 }, /* Tangent3fvEXT */
-   { 16452, -1 }, /* Tangent3dvEXT */
-   { 17138, -1 }, /* Binormal3bvEXT */
-   { 18214, -1 }, /* Binormal3dEXT */
-   { 20137, -1 }, /* Tangent3fEXT */
-   { 22163, -1 }, /* Binormal3sEXT */
-   { 22608, -1 }, /* Tangent3ivEXT */
-   { 22627, -1 }, /* Tangent3dEXT */
-   { 23431, -1 }, /* Binormal3svEXT */
-   { 23944, -1 }, /* Binormal3fEXT */
-   { 24796, -1 }, /* Binormal3dvEXT */
-   { 25971, -1 }, /* Tangent3iEXT */
-   { 27050, -1 }, /* Tangent3bvEXT */
-   { 27459, -1 }, /* Tangent3bEXT */
-   { 27984, -1 }, /* Binormal3fvEXT */
-   { 28658, -1 }, /* BinormalPointerEXT */
-   { 29063, -1 }, /* Tangent3svEXT */
-   { 29500, -1 }, /* Binormal3bEXT */
-   { 29677, -1 }, /* Binormal3iEXT */
+   { 11144, -1 }, /* Binormal3ivEXT */
+   { 11762, -1 }, /* Tangent3sEXT */
+   { 12864, -1 }, /* Tangent3fvEXT */
+   { 16485, -1 }, /* Tangent3dvEXT */
+   { 17171, -1 }, /* Binormal3bvEXT */
+   { 18247, -1 }, /* Binormal3dEXT */
+   { 20170, -1 }, /* Tangent3fEXT */
+   { 22239, -1 }, /* Binormal3sEXT */
+   { 22684, -1 }, /* Tangent3ivEXT */
+   { 22703, -1 }, /* Tangent3dEXT */
+   { 23507, -1 }, /* Binormal3svEXT */
+   { 24020, -1 }, /* Binormal3fEXT */
+   { 24872, -1 }, /* Binormal3dvEXT */
+   { 26047, -1 }, /* Tangent3iEXT */
+   { 27126, -1 }, /* Tangent3bvEXT */
+   { 27535, -1 }, /* Tangent3bEXT */
+   { 28060, -1 }, /* Binormal3fvEXT */
+   { 28734, -1 }, /* BinormalPointerEXT */
+   { 29139, -1 }, /* Tangent3svEXT */
+   { 29576, -1 }, /* Binormal3bEXT */
+   { 29753, -1 }, /* Binormal3iEXT */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_copy_texture)
 static const struct gl_function_remap GL_EXT_copy_texture_functions[] = {
-   { 13274, _gloffset_CopyTexSubImage3D },
-   { 14756, _gloffset_CopyTexImage2D },
-   { 21699, _gloffset_CopyTexImage1D },
-   { 24202, _gloffset_CopyTexSubImage2D },
-   { 26403, _gloffset_CopyTexSubImage1D },
+   { 13307, _gloffset_CopyTexSubImage3D },
+   { 14789, _gloffset_CopyTexImage2D },
+   { 21775, _gloffset_CopyTexImage1D },
+   { 24278, _gloffset_CopyTexSubImage2D },
+   { 26479, _gloffset_CopyTexSubImage1D },
    {    -1, -1 }
 };
 #endif
@@ -5260,13 +5270,13 @@ static const struct gl_function_remap GL_EXT_histogram_functions[] = {
    {   812, _gloffset_Histogram },
    {  3088, _gloffset_ResetHistogram },
    {  8834, _gloffset_GetMinmax },
-   { 13608, _gloffset_GetHistogramParameterfv },
-   { 21624, _gloffset_GetMinmaxParameteriv },
-   { 23557, _gloffset_ResetMinmax },
-   { 24418, _gloffset_GetHistogramParameteriv },
-   { 25474, _gloffset_GetHistogram },
-   { 27836, _gloffset_Minmax },
-   { 29298, _gloffset_GetMinmaxParameterfv },
+   { 13641, _gloffset_GetHistogramParameterfv },
+   { 21700, _gloffset_GetMinmaxParameteriv },
+   { 23633, _gloffset_ResetMinmax },
+   { 24494, _gloffset_GetHistogramParameteriv },
+   { 25550, _gloffset_GetHistogram },
+   { 27912, _gloffset_Minmax },
+   { 29374, _gloffset_GetMinmaxParameterfv },
    {    -1, -1 }
 };
 #endif
@@ -5280,16 +5290,16 @@ static const struct gl_function_remap GL_EXT_index_func_functions[] = {
 
 #if defined(need_GL_EXT_index_material)
 static const struct gl_function_remap GL_EXT_index_material_functions[] = {
-   { 18673, -1 }, /* IndexMaterialEXT */
+   { 18706, -1 }, /* IndexMaterialEXT */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_light_texture)
 static const struct gl_function_remap GL_EXT_light_texture_functions[] = {
-   { 23451, -1 }, /* ApplyTextureEXT */
-   { 23511, -1 }, /* TextureMaterialEXT */
-   { 23536, -1 }, /* TextureLightEXT */
+   { 23527, -1 }, /* ApplyTextureEXT */
+   { 23587, -1 }, /* TextureMaterialEXT */
+   { 23612, -1 }, /* TextureLightEXT */
    {    -1, -1 }
 };
 #endif
@@ -5311,9 +5321,9 @@ static const struct gl_function_remap GL_EXT_multisample_functions[] = {
 #if defined(need_GL_EXT_paletted_texture)
 static const struct gl_function_remap GL_EXT_paletted_texture_functions[] = {
    {  7415, _gloffset_ColorTable },
-   { 13454, _gloffset_GetColorTable },
-   { 20320, _gloffset_GetColorTableParameterfv },
-   { 22270, _gloffset_GetColorTableParameteriv },
+   { 13487, _gloffset_GetColorTable },
+   { 20353, _gloffset_GetColorTableParameterfv },
+   { 22346, _gloffset_GetColorTableParameteriv },
    {    -1, -1 }
 };
 #endif
@@ -5321,9 +5331,9 @@ static const struct gl_function_remap GL_EXT_paletted_texture_functions[] = {
 #if defined(need_GL_EXT_pixel_transform)
 static const struct gl_function_remap GL_EXT_pixel_transform_functions[] = {
    {  9573, -1 }, /* PixelTransformParameterfvEXT */
-   { 19287, -1 }, /* PixelTransformParameterfEXT */
-   { 19367, -1 }, /* PixelTransformParameteriEXT */
-   { 28622, -1 }, /* PixelTransformParameterivEXT */
+   { 19320, -1 }, /* PixelTransformParameterfEXT */
+   { 19400, -1 }, /* PixelTransformParameteriEXT */
+   { 28698, -1 }, /* PixelTransformParameterivEXT */
    {    -1, -1 }
 };
 #endif
@@ -5374,7 +5384,7 @@ static const struct gl_function_remap GL_EXT_subtexture_functions[] = {
 #if defined(need_GL_EXT_texture3D)
 static const struct gl_function_remap GL_EXT_texture3D_functions[] = {
    {  1658, _gloffset_TexImage3D },
-   { 20089, _gloffset_TexSubImage3D },
+   { 20122, _gloffset_TexSubImage3D },
    {    -1, -1 }
 };
 #endif
@@ -5390,17 +5400,17 @@ static const struct gl_function_remap GL_EXT_texture_array_functions[] = {
 static const struct gl_function_remap GL_EXT_texture_object_functions[] = {
    {  2964, _gloffset_PrioritizeTextures },
    {  6585, _gloffset_AreTexturesResident },
-   { 12005, _gloffset_GenTextures },
-   { 13940, _gloffset_DeleteTextures },
-   { 17191, _gloffset_IsTexture },
-   { 26468, _gloffset_BindTexture },
+   { 12038, _gloffset_GenTextures },
+   { 13973, _gloffset_DeleteTextures },
+   { 17224, _gloffset_IsTexture },
+   { 26544, _gloffset_BindTexture },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_texture_perturb_normal)
 static const struct gl_function_remap GL_EXT_texture_perturb_normal_functions[] = {
-   { 12185, -1 }, /* TextureNormalEXT */
+   { 12218, -1 }, /* TextureNormalEXT */
    {    -1, -1 }
 };
 #endif
@@ -5415,18 +5425,18 @@ static const struct gl_function_remap GL_EXT_timer_query_functions[] = {
 #if defined(need_GL_EXT_vertex_array)
 /* functions defined in MESA_remap_table_functions are excluded */
 static const struct gl_function_remap GL_EXT_vertex_array_functions[] = {
-   { 21451, _gloffset_ArrayElement },
-   { 27424, _gloffset_GetPointerv },
-   { 28925, _gloffset_DrawArrays },
+   { 21527, _gloffset_ArrayElement },
+   { 27500, _gloffset_GetPointerv },
+   { 29001, _gloffset_DrawArrays },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_vertex_weighting)
 static const struct gl_function_remap GL_EXT_vertex_weighting_functions[] = {
-   { 17221, -1 }, /* VertexWeightfvEXT */
-   { 23922, -1 }, /* VertexWeightfEXT */
-   { 25443, -1 }, /* VertexWeightPointerEXT */
+   { 17254, -1 }, /* VertexWeightfvEXT */
+   { 23998, -1 }, /* VertexWeightfEXT */
+   { 25519, -1 }, /* VertexWeightPointerEXT */
    {    -1, -1 }
 };
 #endif
@@ -5437,8 +5447,8 @@ static const struct gl_function_remap GL_HP_image_transform_functions[] = {
    {  3305, -1 }, /* ImageTransformParameterfHP */
    {  9026, -1 }, /* ImageTransformParameterfvHP */
    { 10614, -1 }, /* ImageTransformParameteriHP */
-   { 10882, -1 }, /* GetImageTransformParameterivHP */
-   { 17285, -1 }, /* ImageTransformParameterivHP */
+   { 10915, -1 }, /* GetImageTransformParameterivHP */
+   { 17318, -1 }, /* ImageTransformParameterivHP */
    {    -1, -1 }
 };
 #endif
@@ -5457,9 +5467,9 @@ static const struct gl_function_remap GL_IBM_vertex_array_lists_functions[] = {
    {  6759, -1 }, /* FogCoordPointerListIBM */
    {  7066, -1 }, /* VertexPointerListIBM */
    { 10535, -1 }, /* ColorPointerListIBM */
-   { 11836, -1 }, /* TexCoordPointerListIBM */
-   { 12207, -1 }, /* IndexPointerListIBM */
-   { 29241, -1 }, /* EdgeFlagPointerListIBM */
+   { 11869, -1 }, /* TexCoordPointerListIBM */
+   { 12240, -1 }, /* IndexPointerListIBM */
+   { 29317, -1 }, /* EdgeFlagPointerListIBM */
    {    -1, -1 }
 };
 #endif
@@ -5473,10 +5483,10 @@ static const struct gl_function_remap GL_INGR_blend_func_separate_functions[] =
 
 #if defined(need_GL_INTEL_parallel_arrays)
 static const struct gl_function_remap GL_INTEL_parallel_arrays_functions[] = {
-   { 11223, -1 }, /* VertexPointervINTEL */
-   { 13701, -1 }, /* ColorPointervINTEL */
-   { 26739, -1 }, /* NormalPointervINTEL */
-   { 27165, -1 }, /* TexCoordPointervINTEL */
+   { 11256, -1 }, /* VertexPointervINTEL */
+   { 13734, -1 }, /* ColorPointervINTEL */
+   { 26815, -1 }, /* NormalPointervINTEL */
+   { 27241, -1 }, /* TexCoordPointervINTEL */
    {    -1, -1 }
 };
 #endif
@@ -5493,7 +5503,7 @@ static const struct gl_function_remap GL_MESA_shader_debug_functions[] = {
    {  1522, -1 }, /* GetDebugLogLengthMESA */
    {  3063, -1 }, /* ClearDebugLogMESA */
    {  4018, -1 }, /* GetDebugLogMESA */
-   { 27617, -1 }, /* CreateDebugObjectMESA */
+   { 27693, -1 }, /* CreateDebugObjectMESA */
    {    -1, -1 }
 };
 #endif
@@ -5518,11 +5528,11 @@ static const struct gl_function_remap GL_NV_evaluators_functions[] = {
    {  7521, -1 }, /* MapControlPointsNV */
    {  7620, -1 }, /* MapParameterfvNV */
    {  9431, -1 }, /* EvalMapsNV */
-   { 15190, -1 }, /* GetMapAttribParameterfvNV */
-   { 15356, -1 }, /* MapParameterivNV */
-   { 22014, -1 }, /* GetMapParameterivNV */
-   { 22512, -1 }, /* GetMapParameterfvNV */
-   { 26075, -1 }, /* GetMapControlPointsNV */
+   { 15223, -1 }, /* GetMapAttribParameterfvNV */
+   { 15389, -1 }, /* MapParameterivNV */
+   { 22090, -1 }, /* GetMapParameterivNV */
+   { 22588, -1 }, /* GetMapParameterfvNV */
+   { 26151, -1 }, /* GetMapControlPointsNV */
    {    -1, -1 }
 };
 #endif
@@ -5557,8 +5567,8 @@ static const struct gl_function_remap GL_NV_register_combiners_functions[] = {
 
 #if defined(need_GL_NV_register_combiners2)
 static const struct gl_function_remap GL_NV_register_combiners2_functions[] = {
-   { 14093, -1 }, /* CombinerStageParameterfvNV */
-   { 14408, -1 }, /* GetCombinerStageParameterfvNV */
+   { 14126, -1 }, /* CombinerStageParameterfvNV */
+   { 14441, -1 }, /* GetCombinerStageParameterfvNV */
    {    -1, -1 }
 };
 #endif
@@ -5577,6 +5587,13 @@ static const struct gl_function_remap GL_NV_vertex_program_functions[] = {
 };
 #endif
 
+#if defined(need_GL_OES_EGL_image)
+/* functions defined in MESA_remap_table_functions are excluded */
+static const struct gl_function_remap GL_OES_EGL_image_functions[] = {
+   {    -1, -1 }
+};
+#endif
+
 #if defined(need_GL_PGI_misc_hints)
 static const struct gl_function_remap GL_PGI_misc_hints_functions[] = {
    {  7705, -1 }, /* HintPGI */
@@ -5586,16 +5603,16 @@ static const struct gl_function_remap GL_PGI_misc_hints_functions[] = {
 
 #if defined(need_GL_SGIS_detail_texture)
 static const struct gl_function_remap GL_SGIS_detail_texture_functions[] = {
-   { 14381, -1 }, /* GetDetailTexFuncSGIS */
-   { 14701, -1 }, /* DetailTexFuncSGIS */
+   { 14414, -1 }, /* GetDetailTexFuncSGIS */
+   { 14734, -1 }, /* DetailTexFuncSGIS */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIS_fog_function)
 static const struct gl_function_remap GL_SGIS_fog_function_functions[] = {
-   { 24184, -1 }, /* FogFuncSGIS */
-   { 24849, -1 }, /* GetFogFuncSGIS */
+   { 24260, -1 }, /* FogFuncSGIS */
+   { 24925, -1 }, /* GetFogFuncSGIS */
    {    -1, -1 }
 };
 #endif
@@ -5624,7 +5641,7 @@ static const struct gl_function_remap GL_SGIS_point_parameters_functions[] = {
 #if defined(need_GL_SGIS_sharpen_texture)
 static const struct gl_function_remap GL_SGIS_sharpen_texture_functions[] = {
    {  5865, -1 }, /* GetSharpenTexFuncSGIS */
-   { 19582, -1 }, /* SharpenTexFuncSGIS */
+   { 19615, -1 }, /* SharpenTexFuncSGIS */
    {    -1, -1 }
 };
 #endif
@@ -5632,14 +5649,14 @@ static const struct gl_function_remap GL_SGIS_sharpen_texture_functions[] = {
 #if defined(need_GL_SGIS_texture4D)
 static const struct gl_function_remap GL_SGIS_texture4D_functions[] = {
    {   894, -1 }, /* TexImage4DSGIS */
-   { 14009, -1 }, /* TexSubImage4DSGIS */
+   { 14042, -1 }, /* TexSubImage4DSGIS */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIS_texture_color_mask)
 static const struct gl_function_remap GL_SGIS_texture_color_mask_functions[] = {
-   { 13407, -1 }, /* TextureColorMaskSGIS */
+   { 13440, -1 }, /* TextureColorMaskSGIS */
    {    -1, -1 }
 };
 #endif
@@ -5647,7 +5664,7 @@ static const struct gl_function_remap GL_SGIS_texture_color_mask_functions[] = {
 #if defined(need_GL_SGIS_texture_filter4)
 static const struct gl_function_remap GL_SGIS_texture_filter4_functions[] = {
    {  6042, -1 }, /* GetTexFilterFuncSGIS */
-   { 14527, -1 }, /* TexFilterFuncSGIS */
+   { 14560, -1 }, /* TexFilterFuncSGIS */
    {    -1, -1 }
 };
 #endif
@@ -5657,9 +5674,9 @@ static const struct gl_function_remap GL_SGIX_async_functions[] = {
    {  3014, -1 }, /* AsyncMarkerSGIX */
    {  3997, -1 }, /* FinishAsyncSGIX */
    {  4734, -1 }, /* PollAsyncSGIX */
-   { 19729, -1 }, /* DeleteAsyncMarkersSGIX */
-   { 19758, -1 }, /* IsAsyncMarkerSGIX */
-   { 29038, -1 }, /* GenAsyncMarkersSGIX */
+   { 19762, -1 }, /* DeleteAsyncMarkersSGIX */
+   { 19791, -1 }, /* IsAsyncMarkerSGIX */
+   { 29114, -1 }, /* GenAsyncMarkersSGIX */
    {    -1, -1 }
 };
 #endif
@@ -5682,29 +5699,29 @@ static const struct gl_function_remap GL_SGIX_fragment_lighting_functions[] = {
    {  8131, -1 }, /* FragmentLightModeliSGIX */
    {  9494, -1 }, /* FragmentLightivSGIX */
    {  9760, -1 }, /* GetFragmentMaterialivSGIX */
-   { 17108, -1 }, /* FragmentLightModelfSGIX */
-   { 17408, -1 }, /* FragmentColorMaterialSGIX */
-   { 17780, -1 }, /* FragmentMaterialiSGIX */
-   { 19001, -1 }, /* LightEnviSGIX */
-   { 20412, -1 }, /* FragmentLightModelfvSGIX */
-   { 20721, -1 }, /* FragmentLightfvSGIX */
-   { 25325, -1 }, /* FragmentLightfSGIX */
-   { 27954, -1 }, /* GetFragmentLightfvSGIX */
-   { 29521, -1 }, /* FragmentMaterialivSGIX */
+   { 17141, -1 }, /* FragmentLightModelfSGIX */
+   { 17441, -1 }, /* FragmentColorMaterialSGIX */
+   { 17813, -1 }, /* FragmentMaterialiSGIX */
+   { 19034, -1 }, /* LightEnviSGIX */
+   { 20445, -1 }, /* FragmentLightModelfvSGIX */
+   { 20754, -1 }, /* FragmentLightfvSGIX */
+   { 25401, -1 }, /* FragmentLightfSGIX */
+   { 28030, -1 }, /* GetFragmentLightfvSGIX */
+   { 29597, -1 }, /* FragmentMaterialivSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_framezoom)
 static const struct gl_function_remap GL_SGIX_framezoom_functions[] = {
-   { 19781, -1 }, /* FrameZoomSGIX */
+   { 19814, -1 }, /* FrameZoomSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_igloo_interface)
 static const struct gl_function_remap GL_SGIX_igloo_interface_functions[] = {
-   { 25633, -1 }, /* IglooInterfaceSGIX */
+   { 25709, -1 }, /* IglooInterfaceSGIX */
    {    -1, -1 }
 };
 #endif
@@ -5714,9 +5731,9 @@ static const struct gl_function_remap GL_SGIX_instruments_functions[] = {
    {  2573, -1 }, /* ReadInstrumentsSGIX */
    {  5621, -1 }, /* PollInstrumentsSGIX */
    {  9392, -1 }, /* GetInstrumentsSGIX */
-   { 11434, -1 }, /* StartInstrumentsSGIX */
-   { 14127, -1 }, /* StopInstrumentsSGIX */
-   { 15733, -1 }, /* InstrumentsBufferSGIX */
+   { 11467, -1 }, /* StartInstrumentsSGIX */
+   { 14160, -1 }, /* StopInstrumentsSGIX */
+   { 15766, -1 }, /* InstrumentsBufferSGIX */
    {    -1, -1 }
 };
 #endif
@@ -5725,10 +5742,10 @@ static const struct gl_function_remap GL_SGIX_instruments_functions[] = {
 static const struct gl_function_remap GL_SGIX_list_priority_functions[] = {
    {  1125, -1 }, /* ListParameterfSGIX */
    {  2763, -1 }, /* GetListParameterfvSGIX */
-   { 15648, -1 }, /* ListParameteriSGIX */
-   { 16402, -1 }, /* ListParameterfvSGIX */
-   { 18407, -1 }, /* ListParameterivSGIX */
-   { 29082, -1 }, /* GetListParameterivSGIX */
+   { 15681, -1 }, /* ListParameteriSGIX */
+   { 16435, -1 }, /* ListParameterfvSGIX */
+   { 18440, -1 }, /* ListParameterivSGIX */
+   { 29158, -1 }, /* GetListParameterivSGIX */
    {    -1, -1 }
 };
 #endif
@@ -5743,16 +5760,16 @@ static const struct gl_function_remap GL_SGIX_pixel_texture_functions[] = {
 #if defined(need_GL_SGIX_polynomial_ffd)
 static const struct gl_function_remap GL_SGIX_polynomial_ffd_functions[] = {
    {  3251, -1 }, /* LoadIdentityDeformationMapSGIX */
-   { 10802, -1 }, /* DeformationMap3dSGIX */
-   { 14227, -1 }, /* DeformSGIX */
-   { 21563, -1 }, /* DeformationMap3fSGIX */
+   { 10835, -1 }, /* DeformationMap3dSGIX */
+   { 14260, -1 }, /* DeformSGIX */
+   { 21639, -1 }, /* DeformationMap3fSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_reference_plane)
 static const struct gl_function_remap GL_SGIX_reference_plane_functions[] = {
-   { 12958, -1 }, /* ReferencePlaneSGIX */
+   { 12991, -1 }, /* ReferencePlaneSGIX */
    {    -1, -1 }
 };
 #endif
@@ -5760,16 +5777,16 @@ static const struct gl_function_remap GL_SGIX_reference_plane_functions[] = {
 #if defined(need_GL_SGIX_sprite)
 static const struct gl_function_remap GL_SGIX_sprite_functions[] = {
    {  8547, -1 }, /* SpriteParameterfvSGIX */
-   { 18235, -1 }, /* SpriteParameteriSGIX */
-   { 23591, -1 }, /* SpriteParameterfSGIX */
-   { 26197, -1 }, /* SpriteParameterivSGIX */
+   { 18268, -1 }, /* SpriteParameteriSGIX */
+   { 23667, -1 }, /* SpriteParameterfSGIX */
+   { 26273, -1 }, /* SpriteParameterivSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_tag_sample_buffer)
 static const struct gl_function_remap GL_SGIX_tag_sample_buffer_functions[] = {
-   { 18294, -1 }, /* TagSampleBufferSGIX */
+   { 18327, -1 }, /* TagSampleBufferSGIX */
    {    -1, -1 }
 };
 #endif
@@ -5778,18 +5795,18 @@ static const struct gl_function_remap GL_SGIX_tag_sample_buffer_functions[] = {
 static const struct gl_function_remap GL_SGI_color_table_functions[] = {
    {  6703, _gloffset_ColorTableParameteriv },
    {  7415, _gloffset_ColorTable },
-   { 13454, _gloffset_GetColorTable },
-   { 13564, _gloffset_CopyColorTable },
-   { 17052, _gloffset_ColorTableParameterfv },
-   { 20320, _gloffset_GetColorTableParameterfv },
-   { 22270, _gloffset_GetColorTableParameteriv },
+   { 13487, _gloffset_GetColorTable },
+   { 13597, _gloffset_CopyColorTable },
+   { 17085, _gloffset_ColorTableParameterfv },
+   { 20353, _gloffset_GetColorTableParameterfv },
+   { 22346, _gloffset_GetColorTableParameteriv },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SUNX_constant_data)
 static const struct gl_function_remap GL_SUNX_constant_data_functions[] = {
-   { 27932, -1 }, /* FinishTextureSUNX */
+   { 28008, -1 }, /* FinishTextureSUNX */
    {    -1, -1 }
 };
 #endif
@@ -5801,16 +5818,16 @@ static const struct gl_function_remap GL_SUN_global_alpha_functions[] = {
    {  5646, -1 }, /* GlobalAlphaFactordSUN */
    {  8631, -1 }, /* GlobalAlphaFactoruiSUN */
    {  8983, -1 }, /* GlobalAlphaFactorbSUN */
-   { 11749, -1 }, /* GlobalAlphaFactorfSUN */
-   { 11868, -1 }, /* GlobalAlphaFactorusSUN */
-   { 20020, -1 }, /* GlobalAlphaFactorsSUN */
+   { 11782, -1 }, /* GlobalAlphaFactorfSUN */
+   { 11901, -1 }, /* GlobalAlphaFactorusSUN */
+   { 20053, -1 }, /* GlobalAlphaFactorsSUN */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SUN_mesh_array)
 static const struct gl_function_remap GL_SUN_mesh_array_functions[] = {
-   { 26009, -1 }, /* DrawMeshArraysSUN */
+   { 26085, -1 }, /* DrawMeshArraysSUN */
    {    -1, -1 }
 };
 #endif
@@ -5819,11 +5836,11 @@ static const struct gl_function_remap GL_SUN_mesh_array_functions[] = {
 static const struct gl_function_remap GL_SUN_triangle_list_functions[] = {
    {  3971, -1 }, /* ReplacementCodeubSUN */
    {  5485, -1 }, /* ReplacementCodeubvSUN */
-   { 16773, -1 }, /* ReplacementCodeusvSUN */
-   { 16961, -1 }, /* ReplacementCodePointerSUN */
-   { 18318, -1 }, /* ReplacementCodeusSUN */
-   { 19065, -1 }, /* ReplacementCodeuiSUN */
-   { 26654, -1 }, /* ReplacementCodeuivSUN */
+   { 16806, -1 }, /* ReplacementCodeusvSUN */
+   { 16994, -1 }, /* ReplacementCodePointerSUN */
+   { 18351, -1 }, /* ReplacementCodeusSUN */
+   { 19098, -1 }, /* ReplacementCodeuiSUN */
+   { 26730, -1 }, /* ReplacementCodeuivSUN */
    {    -1, -1 }
 };
 #endif
@@ -5848,28 +5865,28 @@ static const struct gl_function_remap GL_SUN_vertex_functions[] = {
    {  8942, -1 }, /* Color3fVertex3fvSUN */
    {  9357, -1 }, /* Color4fNormal3fVertex3fvSUN */
    { 10058, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN */
-   { 11297, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fvSUN */
-   { 12689, -1 }, /* ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN */
-   { 13100, -1 }, /* TexCoord2fColor3fVertex3fSUN */
-   { 14152, -1 }, /* TexCoord4fColor4fNormal3fVertex4fSUN */
-   { 14486, -1 }, /* Color4ubVertex2fvSUN */
-   { 14726, -1 }, /* Normal3fVertex3fSUN */
-   { 15674, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fSUN */
-   { 15935, -1 }, /* TexCoord2fColor4fNormal3fVertex3fvSUN */
-   { 16602, -1 }, /* TexCoord2fVertex3fvSUN */
-   { 17378, -1 }, /* Color4ubVertex2fSUN */
-   { 17571, -1 }, /* ReplacementCodeuiColor4ubVertex3fSUN */
-   { 19453, -1 }, /* TexCoord2fColor4ubVertex3fSUN */
-   { 19800, -1 }, /* Normal3fVertex3fvSUN */
-   { 20229, -1 }, /* Color4fNormal3fVertex3fSUN */
-   { 21095, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN */
-   { 21315, -1 }, /* ReplacementCodeuiColor4ubVertex3fvSUN */
-   { 23045, -1 }, /* ReplacementCodeuiColor3fVertex3fSUN */
-   { 24300, -1 }, /* TexCoord4fVertex4fSUN */
-   { 24726, -1 }, /* TexCoord2fColor3fVertex3fvSUN */
-   { 25052, -1 }, /* ReplacementCodeuiNormal3fVertex3fvSUN */
-   { 25179, -1 }, /* TexCoord4fVertex4fvSUN */
-   { 25881, -1 }, /* ReplacementCodeuiVertex3fSUN */
+   { 11330, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fvSUN */
+   { 12722, -1 }, /* ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN */
+   { 13133, -1 }, /* TexCoord2fColor3fVertex3fSUN */
+   { 14185, -1 }, /* TexCoord4fColor4fNormal3fVertex4fSUN */
+   { 14519, -1 }, /* Color4ubVertex2fvSUN */
+   { 14759, -1 }, /* Normal3fVertex3fSUN */
+   { 15707, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fSUN */
+   { 15968, -1 }, /* TexCoord2fColor4fNormal3fVertex3fvSUN */
+   { 16635, -1 }, /* TexCoord2fVertex3fvSUN */
+   { 17411, -1 }, /* Color4ubVertex2fSUN */
+   { 17604, -1 }, /* ReplacementCodeuiColor4ubVertex3fSUN */
+   { 19486, -1 }, /* TexCoord2fColor4ubVertex3fSUN */
+   { 19833, -1 }, /* Normal3fVertex3fvSUN */
+   { 20262, -1 }, /* Color4fNormal3fVertex3fSUN */
+   { 21171, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN */
+   { 21391, -1 }, /* ReplacementCodeuiColor4ubVertex3fvSUN */
+   { 23121, -1 }, /* ReplacementCodeuiColor3fVertex3fSUN */
+   { 24376, -1 }, /* TexCoord4fVertex4fSUN */
+   { 24802, -1 }, /* TexCoord2fColor3fVertex3fvSUN */
+   { 25128, -1 }, /* ReplacementCodeuiNormal3fVertex3fvSUN */
+   { 25255, -1 }, /* TexCoord4fVertex4fvSUN */
+   { 25957, -1 }, /* ReplacementCodeuiVertex3fSUN */
    {    -1, -1 }
 };
 #endif
@@ -5888,29 +5905,29 @@ static const struct gl_function_remap GL_VERSION_1_3_functions[] = {
    {  9714, _gloffset_MultiTexCoord4sARB },
    { 10314, _gloffset_MultiTexCoord2dvARB },
    { 10696, _gloffset_MultiTexCoord1svARB },
-   { 10992, _gloffset_MultiTexCoord3svARB },
-   { 11053, _gloffset_MultiTexCoord4iARB },
-   { 11776, _gloffset_MultiTexCoord3iARB },
-   { 12478, _gloffset_MultiTexCoord1dARB },
-   { 12644, _gloffset_MultiTexCoord3dvARB },
-   { 13808, _gloffset_MultiTexCoord3ivARB },
-   { 13853, _gloffset_MultiTexCoord2sARB },
-   { 15073, _gloffset_MultiTexCoord4ivARB },
-   { 16702, _gloffset_ClientActiveTextureARB },
-   { 18918, _gloffset_MultiTexCoord2dARB },
-   { 19322, _gloffset_MultiTexCoord4dvARB },
-   { 19608, _gloffset_MultiTexCoord4fvARB },
-   { 20461, _gloffset_MultiTexCoord3fARB },
-   { 22798, _gloffset_MultiTexCoord4dARB },
-   { 23002, _gloffset_MultiTexCoord1sARB },
-   { 23204, _gloffset_MultiTexCoord1dvARB },
-   { 24046, _gloffset_MultiTexCoord1ivARB },
-   { 24139, _gloffset_MultiTexCoord2ivARB },
-   { 24478, _gloffset_MultiTexCoord1iARB },
-   { 25749, _gloffset_MultiTexCoord4svARB },
-   { 26267, _gloffset_MultiTexCoord1fARB },
-   { 26530, _gloffset_MultiTexCoord4fARB },
-   { 28759, _gloffset_MultiTexCoord2fvARB },
+   { 11025, _gloffset_MultiTexCoord3svARB },
+   { 11086, _gloffset_MultiTexCoord4iARB },
+   { 11809, _gloffset_MultiTexCoord3iARB },
+   { 12511, _gloffset_MultiTexCoord1dARB },
+   { 12677, _gloffset_MultiTexCoord3dvARB },
+   { 13841, _gloffset_MultiTexCoord3ivARB },
+   { 13886, _gloffset_MultiTexCoord2sARB },
+   { 15106, _gloffset_MultiTexCoord4ivARB },
+   { 16735, _gloffset_ClientActiveTextureARB },
+   { 18951, _gloffset_MultiTexCoord2dARB },
+   { 19355, _gloffset_MultiTexCoord4dvARB },
+   { 19641, _gloffset_MultiTexCoord4fvARB },
+   { 20494, _gloffset_MultiTexCoord3fARB },
+   { 22874, _gloffset_MultiTexCoord4dARB },
+   { 23078, _gloffset_MultiTexCoord1sARB },
+   { 23280, _gloffset_MultiTexCoord1dvARB },
+   { 24122, _gloffset_MultiTexCoord1ivARB },
+   { 24215, _gloffset_MultiTexCoord2ivARB },
+   { 24554, _gloffset_MultiTexCoord1iARB },
+   { 25825, _gloffset_MultiTexCoord4svARB },
+   { 26343, _gloffset_MultiTexCoord1fARB },
+   { 26606, _gloffset_MultiTexCoord4fARB },
+   { 28835, _gloffset_MultiTexCoord2fvARB },
    {    -1, -1 }
 };
 #endif
diff --git a/src/mesa/sparc/glapi_sparc.S b/src/mesa/sparc/glapi_sparc.S
index 9b0f8027eb..3fbdb4abb3 100644
--- a/src/mesa/sparc/glapi_sparc.S
+++ b/src/mesa/sparc/glapi_sparc.S
@@ -1037,6 +1037,8 @@ gl_dispatch_functions_start:
 	HIDDEN(gl_dispatch_stub_801)
 	GL_STUB(gl_dispatch_stub_802, _gloffset_GetQueryObjectui64vEXT)
 	HIDDEN(gl_dispatch_stub_802)
+	GL_STUB(glEGLImageTargetRenderbufferStorageOES, _gloffset_EGLImageTargetRenderbufferStorageOES)
+	GL_STUB(glEGLImageTargetTexture2DOES, _gloffset_EGLImageTargetTexture2DOES)
 	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 8edb69bf84..4c9eab882b 100644
--- a/src/mesa/x86-64/glapi_x86-64.S
+++ b/src/mesa/x86-64/glapi_x86-64.S
@@ -30414,6 +30414,80 @@ GL_PREFIX(_dispatch_stub_802):
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(_dispatch_stub_802), .-GL_PREFIX(_dispatch_stub_802)
 
+	.p2align	4,,15
+	.globl	GL_PREFIX(EGLImageTargetRenderbufferStorageOES)
+	.type	GL_PREFIX(EGLImageTargetRenderbufferStorageOES), @function
+GL_PREFIX(EGLImageTargetRenderbufferStorageOES):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	6424(%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	6424(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	6424(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
+	call	_glapi_get_dispatch
+	popq	%rbp
+	popq	%rsi
+	popq	%rdi
+	movq	6424(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(EGLImageTargetRenderbufferStorageOES), .-GL_PREFIX(EGLImageTargetRenderbufferStorageOES)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(EGLImageTargetTexture2DOES)
+	.type	GL_PREFIX(EGLImageTargetTexture2DOES), @function
+GL_PREFIX(EGLImageTargetTexture2DOES):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	6432(%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	6432(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	6432(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
+	call	_glapi_get_dispatch
+	popq	%rbp
+	popq	%rsi
+	popq	%rdi
+	movq	6432(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(EGLImageTargetTexture2DOES), .-GL_PREFIX(EGLImageTargetTexture2DOES)
+
 	.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 8030fdf90b..13270ef35d 100644
--- a/src/mesa/x86/glapi_x86.S
+++ b/src/mesa/x86/glapi_x86.S
@@ -991,6 +991,8 @@ GLNAME(gl_dispatch_functions_start):
 	HIDDEN(GL_PREFIX(_dispatch_stub_801, _dispatch_stub_801@12))
 	GL_STUB(_dispatch_stub_802, _gloffset_GetQueryObjectui64vEXT, _dispatch_stub_802@12)
 	HIDDEN(GL_PREFIX(_dispatch_stub_802, _dispatch_stub_802@12))
+	GL_STUB(EGLImageTargetRenderbufferStorageOES, _gloffset_EGLImageTargetRenderbufferStorageOES, EGLImageTargetRenderbufferStorageOES@8)
+	GL_STUB(EGLImageTargetTexture2DOES, _gloffset_EGLImageTargetTexture2DOES, EGLImageTargetTexture2DOES@8)
 	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 d1dc5b124e133379be5bb57b68733c09c0e04f71 Mon Sep 17 00:00:00 2001
From: Kristian Høgsberg <krh@bitplanet.net>
Date: Thu, 11 Feb 2010 17:42:30 -0500
Subject: core: Implement GL_OES_EGL_image entry points

---
 src/mesa/main/dd.h        | 11 +++++++++++
 src/mesa/main/fbobject.c  | 24 ++++++++++++++++++++++++
 src/mesa/main/fbobject.h  |  3 +++
 src/mesa/main/mfeatures.h |  2 ++
 src/mesa/main/teximage.c  | 41 +++++++++++++++++++++++++++++++++++++++++
 src/mesa/main/teximage.h  |  2 ++
 6 files changed, 83 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index d98a14e09c..079e44bb95 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -1035,6 +1035,17 @@ struct dd_function_table {
                    GLfloat width, GLfloat height);
    /*@}*/
 #endif
+
+#if FEATURE_OES_EGL_image
+   void (*EGLImageTargetTexture2D)(GLcontext *ctx, GLenum target,
+				   struct gl_texture_object *texObj,
+				   struct gl_texture_image *texImage,
+				   GLeglImageOES image_handle);
+   void (*EGLImageTargetRenderbufferStorage)(GLcontext *ctx,
+					     struct gl_renderbuffer *rb,
+					     void *image_handle);
+#endif
+
 };
 
 
diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 04ea3b4ed7..8fbe0830c7 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -1008,6 +1008,30 @@ renderbuffer_storage(GLenum target, GLenum internalFormat,
     */
 }
 
+#if FEATURE_OES_EGL_image
+void GLAPIENTRY
+_mesa_EGLImageTargetRenderbufferStorageOES (GLenum target, GLeglImageOES image)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+   struct gl_renderbuffer *rb;
+
+   if (target != GL_RENDERBUFFER) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "EGLImageTargetRenderbufferStorageOES");
+      return;
+   }
+
+   rb = ctx->CurrentRenderbuffer;
+   if (!rb) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "EGLImageTargetRenderbufferStorageOES");
+      return;
+   }
+
+   FLUSH_VERTICES(ctx, _NEW_BUFFERS);
+
+   ctx->Driver.EGLImageTargetRenderbufferStorage(ctx, rb, image);
+}
+#endif
 
 /**
  * Helper function for _mesa_GetRenderbufferParameterivEXT() and
diff --git a/src/mesa/main/fbobject.h b/src/mesa/main/fbobject.h
index 5409394073..28f75dfca7 100644
--- a/src/mesa/main/fbobject.h
+++ b/src/mesa/main/fbobject.h
@@ -88,6 +88,9 @@ _mesa_RenderbufferStorageMultisample(GLenum target, GLsizei samples,
                                      GLenum internalformat,
                                      GLsizei width, GLsizei height);
 
+extern void GLAPIENTRY
+_mesa_EGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageOES image);
+
 extern void GLAPIENTRY
 _mesa_GetRenderbufferParameterivEXT(GLenum target, GLenum pname,
                                     GLint *params);
diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index 4e68bc15d8..f0896ee626 100644
--- a/src/mesa/main/mfeatures.h
+++ b/src/mesa/main/mfeatures.h
@@ -122,5 +122,7 @@
 #define FEATURE_NV_fragment_program  _HAVE_FULL_GL
 #define FEATURE_NV_vertex_program  _HAVE_FULL_GL
 
+#define FEATURE_OES_EGL_image _HAVE_FULL_GL
+
 
 #endif /* FEATURES_H */
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
index 00329c755d..40ebff76c6 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -2448,6 +2448,47 @@ _mesa_TexImage3DEXT( GLenum target, GLint level, GLenum internalFormat,
 }
 
 
+#if FEATURE_OES_EGL_image
+void GLAPIENTRY
+_mesa_EGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
+   struct gl_texture_object *texObj;
+   struct gl_texture_image *texImage;
+
+   if (target != GL_TEXTURE_2D) {
+      _mesa_error(ctx, GL_INVALID_ENUM,
+		  "glEGLImageTargetTexture2D(target=%d)", target);
+      return;
+   }
+
+   if (ctx->NewState & _MESA_NEW_TRANSFER_STATE)
+      _mesa_update_state(ctx);
+
+   texObj = _mesa_get_current_tex_object(ctx, target);
+   _mesa_lock_texture(ctx, texObj);
+
+   texImage = _mesa_get_tex_image(ctx, texObj, target, 0);
+   if (!texImage) {
+      _mesa_error(ctx, GL_OUT_OF_MEMORY, "glEGLImageTargetTexture2D");
+   } else {
+      if (texImage->Data)
+	 ctx->Driver.FreeTexImageData( ctx, texImage );
+
+      ASSERT(texImage->Data == NULL);
+      ctx->Driver.EGLImageTargetTexture2D(ctx, target,
+					  texObj, texImage, image);
+
+      /* state update */
+      texObj->_Complete = GL_FALSE;
+      ctx->NewState |= _NEW_TEXTURE;
+   }
+   _mesa_unlock_texture(ctx, texObj);
+
+}
+#endif
+
 
 void GLAPIENTRY
 _mesa_TexSubImage1D( GLenum target, GLint level,
diff --git a/src/mesa/main/teximage.h b/src/mesa/main/teximage.h
index 97c9018319..d82cc98521 100644
--- a/src/mesa/main/teximage.h
+++ b/src/mesa/main/teximage.h
@@ -165,6 +165,8 @@ _mesa_TexImage3DEXT( GLenum target, GLint level, GLenum internalformat,
                      GLint border, GLenum format, GLenum type,
                      const GLvoid *pixels );
 
+extern void GLAPIENTRY
+_mesa_EGLImageTargetTexture2DOES( GLenum target, GLeglImageOES image );
 
 extern void GLAPIENTRY
 _mesa_TexSubImage1D( GLenum target, GLint level, GLint xoffset,
-- 
cgit v1.2.3


From 51b799288a405be3f4cdbfc7221221399512992a Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Wed, 24 Feb 2010 11:57:26 -0700
Subject: mesa: put declaration before code

---
 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 8fbe0830c7..4ce3998812 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -1012,9 +1012,9 @@ renderbuffer_storage(GLenum target, GLenum internalFormat,
 void GLAPIENTRY
 _mesa_EGLImageTargetRenderbufferStorageOES (GLenum target, GLeglImageOES image)
 {
+   struct gl_renderbuffer *rb;
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END(ctx);
-   struct gl_renderbuffer *rb;
 
    if (target != GL_RENDERBUFFER) {
       _mesa_error(ctx, GL_INVALID_ENUM, "EGLImageTargetRenderbufferStorageOES");
-- 
cgit v1.2.3


From 17efc8c05c6931a4638ee9f6138794f2b2b29540 Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Wed, 24 Feb 2010 14:00:30 -0800
Subject: mesa: Fix SCons build.

---
 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 40ebff76c6..d72e91b3a3 100644
--- a/src/mesa/main/teximage.c
+++ b/src/mesa/main/teximage.c
@@ -2452,10 +2452,10 @@ _mesa_TexImage3DEXT( GLenum target, GLint level, GLenum internalFormat,
 void GLAPIENTRY
 _mesa_EGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image)
 {
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
    struct gl_texture_object *texObj;
    struct gl_texture_image *texImage;
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
 
    if (target != GL_TEXTURE_2D) {
       _mesa_error(ctx, GL_INVALID_ENUM,
-- 
cgit v1.2.3


From d553479cc48d512fc5055c166a699bcfff494a24 Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Thu, 25 Feb 2010 02:26:18 -0800
Subject: mesa: Remove dead error condition.

---
 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 f6c316a580..e2e3854fc8 100644
--- a/src/mesa/main/pixel.c
+++ b/src/mesa/main/pixel.c
@@ -427,7 +427,7 @@ _mesa_GetPixelMapusv( GLenum map, GLushort *values )
       _mesa_error(ctx, GL_INVALID_ENUM, "glGetPixelMapusv(map)");
       return;
    }
-   mapsize = pm ? pm->Size : 0;
+   mapsize = pm->Size;
 
    if (!validate_pbo_access(ctx, &ctx->Pack, mapsize,
                             GL_INTENSITY, GL_UNSIGNED_SHORT, values)) {
-- 
cgit v1.2.3


From 2be1fcaafef8af672434553c4bdca73a9db6934d Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olv@lunarg.com>
Date: Wed, 24 Feb 2010 11:17:16 +0800
Subject: mesa: Remove unused Makefile.{ugl,win}.

---
 src/mesa/main/Makefile.ugl | 364 ---------------------------------------------
 src/mesa/main/Makefile.win | 208 --------------------------
 2 files changed, 572 deletions(-)
 delete mode 100644 src/mesa/main/Makefile.ugl
 delete mode 100644 src/mesa/main/Makefile.win

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/Makefile.ugl b/src/mesa/main/Makefile.ugl
deleted file mode 100644
index b440e13643..0000000000
--- a/src/mesa/main/Makefile.ugl
+++ /dev/null
@@ -1,364 +0,0 @@
-# Mesa 3-D graphics library
-# Version:  4.1
-#
-# Copyright (C) 2001 Wind River Systems, Inc
-
-# The MIT License
-# 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
-# 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.
-
-# Makefile for core library
-
-# This makefile can moved all objects files in MESA_OBJ for use with
-# ld in windShell or create a library from objects files in their
-# associated .c folder.
-#
-# For an easy inclusion of lib$(CPU)$(TOOL)GL.a in vxworks image, this
-# makefile collects together all .o in an only file
-# (obj$(CPU)$(TOOL)GL.o). This operation is unnecessary for
-# lib$(CPU)$(TOOL)OSMesa.a and lib$(CPU)$(TOOL)UglMesa.a because they
-# already contain only one file.
-#
-##### MACROS #####
-MESA_MAJOR=4
-MESA_MINOR=1
-MESA_TINY=0
-VERSION=$(MESA_MAJOR).$(MESA_MINOR)
-
-GL_MAJOR = 1
-GL_MINOR = 2
-GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
-
-##### RULES #####
-
-include ..\rules.windml
-
-#### GL #####
-
-GL_SOURCES = \
-	api_arrayelt.c \
-	api_loopback.c \
-	api_noop.c \
-	api_validate.c \
-	accum.c \
-	arbprogram.c \
-	attrib.c \
-	blend.c \
-	bufferobj.c \
-	buffers.c \
-	clip.c \
-	colortab.c \
-	context.c \
-	convolve.c \
-	debug.c \
-	depth.c \
-	dispatch.c \
-	dlist.c \
-	drawpix.c \
-	enable.c \
-	enums.c \
-	eval.c \
-	extensions.c \
-	feedback.c \
-	fog.c \
-	get.c \
-	glapi.c \
-	glthread.c \
-	hash.c \
-	hint.c \
-	histogram.c \
-	image.c \
-	imports.c \
-	light.c \
-	lines.c \
-	matrix.c \
-	pixel.c \
-	points.c \
-	polygon.c \
-	rastpos.c \
-	state.c \
-	stencil.c \
-	texcompress.c \
-	texformat.c \
-	teximage.c \
-	texobj.c \
-	texstate.c \
-	texstore.c \
-	texutil.c \
-	varray.c \
-	vtxfmt.c \
-	X86/x86.c \
-	X86/common_x86.c \
-	X86/3dnow.c \
-	X86/sse.c \
-	math/m_debug_clip.c \
-	math/m_debug_norm.c \
-	math/m_debug_vertex.c \
-	math/m_debug_xform.c \
-	math/m_eval.c \
-	math/m_matrix.c \
-	math/m_translate.c \
-	math/m_vector.c \
-	math/m_vertices.c \
-	math/m_xform.c \
-	array_cache/ac_context.c \
-	array_cache/ac_import.c \
-	swrast/s_aaline.c \
-	swrast/s_aatriangle.c \
-	swrast/s_accum.c \
-	swrast/s_alpha.c \
-	swrast/s_alphabuf.c \
-	swrast/s_bitmap.c \
-	swrast/s_blend.c \
-	swrast/s_buffers.c \
-	swrast/s_copypix.c \
-	swrast/s_context.c \
-	swrast/s_depth.c \
-	swrast/s_drawpix.c \
-	swrast/s_feedback.c \
-	swrast/s_fog.c \
-	swrast/s_imaging.c \
-	swrast/s_lines.c \
-	swrast/s_logic.c \
-	swrast/s_masking.c \
-	swrast/s_pixeltex.c \
-	swrast/s_points.c \
-	swrast/s_readpix.c \
-	swrast/s_span.c \
-	swrast/s_stencil.c \
-	swrast/s_texture.c \
-	swrast/s_texstore.c \
-	swrast/s_triangle.c \
-	swrast/s_zoom.c \
-	swrast_setup/ss_context.c \
-	swrast_setup/ss_triangle.c \
-	swrast_setup/ss_vb.c \
-	tnl/t_array_api.c \
-	tnl/t_array_import.c \
-	tnl/t_context.c \
-	tnl/t_eval_api.c \
-	tnl/t_imm_alloc.c \
-	tnl/t_imm_api.c \
-	tnl/t_imm_debug.c \
-	tnl/t_imm_dlist.c \
-	tnl/t_imm_elt.c \
-	tnl/t_imm_eval.c \
-	tnl/t_imm_exec.c \
-	tnl/t_imm_fixup.c \
-	tnl/t_pipeline.c \
-	tnl/t_vb_fog.c \
-	tnl/t_vb_light.c \
-	tnl/t_vb_normals.c \
-	tnl/t_vb_points.c \
-	tnl/t_vb_render.c \
-	tnl/t_vb_texgen.c \
-	tnl/t_vb_texmat.c \
-	tnl/t_vb_vertex.c
-
-GL_OBJECTS = $(GL_SOURCES:.c=.o)
-GL_OBJNAME = $(MESA_LIBDIR)/objMesaGL.o
-
-#### X86 #####
-
-x86_files = \
-	X86/common_x86_asm.S \
-	X86/glapi_x86.S \
-	X86/x86_cliptest.S \
-	X86/x86_vertex.S \
-	X86/x86_xform2.S \
-	X86/x86_xform3.S \
-	X86/x86_xform4.S \
-
-x3dnow_files = \
-	X86/3dnow_normal.S \
-	X86/3dnow_vertex.S \
-	X86/3dnow_xform1.S \
-	X86/3dnow_xform2.S \
-	X86/3dnow_xform3.S \
-	X86/3dnow_xform4.S
-
-sse_files = \
-	X86/sse_normal.S \
-	X86/sse_vertex.S \
-	X86/sse_xform1.S \
-	X86/sse_xform2.S \
-	X86/sse_xform3.S \
-	X86/sse_xform4.S
-
-mmx_files = X86/mmx_blend.S
-
-X86_OBJNAME = $(MESA_LIBDIR)/objMesaX86.o
-
-##### UGL #####
-
-UGL_SOURCES = \
-	windml/ugl_api.c \
-	windml/ugl_dd.c \
-	windml/ugl_span.c \
-	windml/ugl_line.c \
-	windml/ugl_tri.c \
-	windml/tornado/torMesaUGLInit.c
-
-UGL_OBJECTS = $(UGL_SOURCES:.c=.o)
-UGL_OBJNAME = $(MESA_LIBDIR)/objMesaUGL.o
-
-##### OS #####
-
-OS_SOURCES = OSmesa/osmesa.c windml/tornado/torMesaOSInit.c
-OS_OBJECTS = $(OS_SOURCES:.c=.o)
-OS_OBJNAME = $(MESA_LIBDIR)/objMesaOS.o
-
-##### GLUTSHAPES #####
-
-GLUTSHAPES_SOURCES = \
-	windml/ugl_glutshapes.c \
-	windml/tornado/torGLUTShapesInit.c
-
-GLUTSHAPES_OBJECTS = $(GLUTSHAPES_SOURCES:.c=.o)
-GLUTSHAPES_OBJNAME = $(MESA_LIBDIR)/objGLUTShapes.o
-
-SOURCES = $(GL_SOURCES) $(UGL_SOURCES) $(OS_SOURCES) \
-	$(GLUTSHAPES_SOURCES)
-
-##### TARGETS #####
-
-all: depend.$(CPU)$(TOOL) cfgX86 $(X86_OBJNAME) $(GL_OBJNAME)\
-$(UGL_OBJNAME) $(OS_OBJNAME) $(GLUTSHAPES_OBJNAME)
-
-#histogram.o:
-#	$(CC) $(CFLAGS) -O1 $(OPTION_OBJECT_ONLY) $(OPTION_OBJECT_NAME)$@ $<
-
-#image.o:
-#	$(CC) $(CFLAGS) -O1 $(OPTION_OBJECT_ONLY) $(OPTION_OBJECT_NAME)$@ $<
-
-cfgX86:
-ifdef HAVE_3DNOW
-x3dnow_sources = $(x3dnow_files)
-CFLAGS_3DNOW = -DUSE_3DNOW_ASM
-HAVE_X86 = 1
-endif
-ifdef HAVE_SSE
-sse_sources = $(sse_files)
-CFLAGS_SSE = -DUSE_SSE_ASM
-HAVE_X86 = 1
-endif
-ifdef HAVE_MMX
-mmx_sources = $(mmx_files)
-CFLAGS_MMX = -DUSE_MMX_ASM
-HAVE_X86 = 1
-endif
-ifdef HAVE_X86
-x86_sources = $(x86_files)
-CFLAGS_X86 = -DUSE_X86_ASM
-endif
-X86_SOURCES = $(x86_sources) $(mmx_sources) \
-	$(x3dnow_sources) $(sse_sources)
-X86_OBJECTS = $(X86_SOURCES:.S=.o)
-CFLAGS_USE_X86 = $(CFLAGS_3DNOW) $(CFLAGS_SSE) $(CFLAGS_MMX) $(CFLAGS_X86)
-
-#X86/matypes.h: mtypes.h tnl/t_context.h X86/gen_matypes.c
-#	$(CC) -I ./ X86/gen_matypes.c -o X86/gen_matypes
-#	./X86/gen_matypes > X86/matypes.h
-#	$(RM) X86/gen_matypes
-#	$(RM) X86/gen_matypes.o
-
-# Make the Mesax86 library
-$(X86_OBJNAME): $(X86_OBJECTS)
-ifdef HAVE_X86
-#	$(LD) -r $(X86_OBJECTS) -o $(MESA_OBJNAME)
-	$(LD) -r $(X86_OBJECTS) -o $(X86_OBJNAME)
-#	$(AR) rus $(MESA_LIBNAME) $(X86_OBJNAME)
-#	$(RM) $(X86_OBJNAME)
-endif
-
-# Make the GL library
-$(GL_OBJNAME): $(GL_OBJECTS)
-#	$(LD) -r $(GL_OBJECTS) -o $(MESA_OBJNAME)
-	$(LD) -r $(GL_OBJECTS) -o $(GL_OBJNAME)
-#	$(AR) rus $(MESA_LIBNAME) $(GL_OBJNAME)
-#	$(AR) rus $(VX_LIBNAME) $(GL_OBJNAME)
-#	$(RM) $(GL_OBJNAME)
-
-# Make the UGLMesa library
-$(UGL_OBJNAME): $(UGL_OBJECTS)
-#	$(LD) -r $(UGL_OBJECTS) -o $(MESA_OBJNAME)
-	$(LD) -r $(UGL_OBJECTS) -o $(UGL_OBJNAME)
-#	$(AR) rus $(MESA_LIBNAME) $(UGL_OBJNAME)
-#	$(AR) rus $(VX_LIBNAME) $(UGL_OBJNAME)
-#	$(RM) $(UGL_OBJNAME)
-
-# Make the OSMesa library
-$(OS_OBJNAME): $(OS_OBJECTS)
-#	$(LD) -r $(OS_OBJECTS) -o $(MESA_OBJNAME)
-	$(LD) -r $(OS_OBJECTS) -o $(OS_OBJNAME)
-#	$(AR) rus $(MESA_LIBNAME) $(OS_OBJNAME)
-#	$(AR) rus $(VX_LIBNAME) $(OS_OBJNAME)
-#	$(RM) $(OS_OBJNAME)
-
-# Make the GLUT Shapes library
-$(GLUTSHAPES_OBJNAME): $(GLUTSHAPES_OBJECTS)
-#	$(LD) -r $(GLUTSHAPES_OBJECTS) -o $(MESA_OBJNAME)
-	$(LD) -r $(GLUTSHAPES_OBJECTS) -o $(GLUTSHAPES_OBJNAME)
-#	$(AR) rus $(MESA_LIBNAME) $(GLUTSHAPES_OBJNAME)
-#	$(AR) rus $(VX_LIBNAME) $(GLUTSHAPES_OBJNAME)
-#	$(RM) $(GLUTSHAPES_OBJNAME)
-
-depend.$(CPU)$(TOOL):
-ifeq ($(WIND_HOST_TYPE),x86-win32)
-	@ $(RM) $@
-	@ $(ECHO) Creating depend.$(CPU)$(TOOL)
-ifneq ($(SOURCES),)
-	@ for %f in ($(SOURCES)) do \
-	$(CC) -MM $(CFLAGS) %f >>$@ 
-endif
-else
-Makefile
-	@ $(RM) $@
-	@ $(ECHO) "Creating depend.$(CPU)$(TOOL)"
-ifneq ($(SOURCES),)
-	@ for FILE in $(filter-out $(NODEPENDOBJS), $(SOURCES)); \
-	do \
-	$(CC) -MM $(CFLAGS) $$FILE  \
-	| $(TCL) $(BIN_DIR)/depend.tcl $(TGT_DIR) >>$@; \
-	done	
-endif
-endif
-
-.PHONY = clean
-
-clean:
-# 	$(AR) d $(MESA_LIBNAME) $(GL_OBJNAME)
-# 	$(AR) d $(MESA_LIBNAME) $(UGL_OBJNAME)
-# 	$(AR) d $(MESA_LIBNAME) $(OS_OBJNAME)
-# 	$(AR) d $(MESA_LIBNAME) $(GLUTSHAPES_OBJNAME)
-# 	$(AR) d $(VX_LIBNAME) $(GL_OBJNAME)
-# 	$(AR) d $(VX_LIBNAME) $(UGL_OBJNAME)
-# 	$(AR) d $(VX_LIBNAME) $(OS_OBJNAME)
-# 	$(AR) d $(VX_LIBNAME) $(GLUTSHAPES_OBJNAME)
-	$(RM) $(GL_OBJECTS)
-	$(RM) $(UGL_OBJECTS)
-	$(RM) $(OS_OBJECTS)
-	$(RM) $(GLUTSHAPES_OBJECTS)
-	$(RM) $(GL_OBJNAME)
-	$(RM) $(UGL_OBJNAME)
-	$(RM) $(OS_OBJNAME)
-	$(RM) $(GLUTSHAPES_OBJNAME)
-	$(RM) depend.$(CPU)$(TOOL)
-
-include depend.$(CPU)$(TOOL)
-
diff --git a/src/mesa/main/Makefile.win b/src/mesa/main/Makefile.win
deleted file mode 100644
index a27f44c112..0000000000
--- a/src/mesa/main/Makefile.win
+++ /dev/null
@@ -1,208 +0,0 @@
-# Makefile for Win32
-#
-#  NOTE: the install target may overwrite important files in the system dirs
-#  Check first, before making the install target.
-#
-#  This builds both the osmesa and Windows drivers.
-#
-
-!include <win32.mak>
-
-TOP = ..
-SUBDIRS = osmesa.dir
-
-CORE_SRCS = \
-	api_loopback.c \
-	api_noop.c \
-	api_validate.c \
-	accum.c \
-	arbprogram.c \
-	attrib.c \
-	blend.c \
-	bufferobj.c \
-	buffers.c \
-	clip.c \
-	colortab.c \
-	context.c \
-	convolve.c \
-	debug.c \
-	depth.c \
-	dispatch.c \
-	dlist.c \
-	drawpix.c \
-	enable.c \
-	enums.c \
-	eval.c \
-	extensions.c \
-	feedback.c \
-	fog.c \
-	get.c \
-	glapi.c \
-	glthread.c \
-	hash.c \
-	hint.c \
-	histogram.c \
-	image.c \
-	imports.c \
-	light.c \
-	lines.c \
-	matrix.c \
-	nvprogram.c \
-	nvfragparse.c \
-	nvvertexec.c \
-	nvvertparse.c \
-	pixel.c \
-	points.c \
-	polygon.c \
-	rastpos.c \
-	state.c \
-	stencil.c \
-	texcompress.c \
-	texcompress_fxt1.c \
-	texcompress_s3tc.c \
-	teximage.c \
-	texformat.c \
-	texobj.c \
-	texstate.c \
-	texstore.c \
-	varray.c \
-	vtxfmt.c \
-#	X86\x86.c \
-#	X86\common_x86.c \
-#	X86\3dnow.c \
-#	X86\sse.c \
-	math\m_debug_norm.c \
-	math\m_debug_xform.c \
-	math\m_eval.c \
-	math\m_matrix.c \
-	math\m_translate.c \
-	math\m_vector.c \
-	math\m_xform.c \
-	array_cache\ac_context.c \
-	array_cache\ac_import.c \
-	swrast\s_aaline.c \
-	swrast\s_aatriangle.c \
-	swrast\s_accum.c \
-	swrast\s_alpha.c \
-	swrast\s_alphabuf.c \
-	swrast\s_bitmap.c \
-	swrast\s_blend.c \
-	swrast\s_buffers.c \
-	swrast\s_copypix.c \
-	swrast\s_context.c \
-	swrast\s_depth.c \
-	swrast\s_drawpix.c \
-	swrast\s_feedback.c \
-	swrast\s_fog.c \
-	swrast\s_imaging.c \
-	swrast\s_lines.c \
-	swrast\s_logic.c \
-	swrast\s_masking.c \
-	swrast\s_nvfragprog.c \
-	swrast\s_pixeltex.c \
-	swrast\s_points.c \
-	swrast\s_readpix.c \
-	swrast\s_span.c \
-	swrast\s_stencil.c \
-	swrast\s_texstore.c \
-	swrast\s_texture.c \
-	swrast\s_triangle.c \
-	swrast\s_zoom.c \
-	swrast_setup\ss_context.c \
-	swrast_setup\ss_triangle.c \
-	swrast_setup\ss_vb.c \
-	tnl\t_array_api.c \
-	tnl\t_array_import.c \
-	tnl\t_context.c \
-	tnl\t_eval_api.c \
-	tnl\t_imm_alloc.c \
-	tnl\t_imm_api.c \
-	tnl\t_imm_debug.c \
-	tnl\t_imm_dlist.c \
-	tnl\t_imm_elt.c \
-	tnl\t_imm_eval.c \
-	tnl\t_imm_exec.c \
-	tnl\t_imm_fixup.c \
-	tnl\t_pipeline.c \
-	tnl\t_vb_fog.c \
-	tnl\t_vb_light.c \
-	tnl\t_vb_normals.c \
-	tnl\t_vb_points.c \
-	tnl\t_vb_program.c \
-	tnl\t_vb_render.c \
-	tnl\t_vb_texgen.c \
-	tnl\t_vb_texmat.c \
-	tnl\t_vb_vertex.c
-
-DRIVER_SRCS = \
-	Trace\tr_context.c \
-	Trace\tr_control.c \
-	Trace\tr_error.c \
-	Trace\tr_support.c \
-	Trace\tr_wrapper.c \
-	Trace\tr_write.c \
-	Windows\wgl.c \
-	Windows\wmesa.c
-
-ASM_SRCS =
-
-SRCS	= $(CORE_SRCS) $(DRIVER_SRCS)
-
-all	: mesadll $(SUBDIRS)
-
-!include "$(TOP)/mesawin32.mak"
-
-mesadll	: $(MESADLL)
-
-CFLAGS	= $(cvarsdll) $(CFLAGS) -D_OPENGL32_ -DBUILD_GL32 -DNO_PARALLEL -DNO_STEREO
-!IFNDEF NODEBUG
-CFLAGS = $(CFLAGS) -DMESA_DEBUG
-!ENDIF
-LFLAGS	= $(dlllflags) $(lcommon) $(LFLAGS)
-
-OBJS	= $(ASM_SRCS:.S=.obj) $(CORE_SRCS:.c=.obj) $(DRIVER_SRCS:.c=.obj)
-LIBS	= winmm.lib $(guilibsdll)
-
-$(MESADLL)	: $(OBJS) mesa.def
-	$(link) $(LFLAGS) -out:$(MESADLL) -def:mesa.def $(OBJS) $(LIBS)
-	@echo "copying Mesa dynamic link library to lib directory..."
-	-copy $(MESADLL) ..\lib
-	@echo "copying Mesa import library to lib directory..."
-	-copy $(MESALIB) ..\lib
-
-$(SUBDIRS)	:
-	@echo.
-	@echo Making in $* directory
-	@cd $*
-	@nmake -f Makefile.win -nologo
-	@cd ..
-
-install	: $(MESADLL)
-	@echo.
-	@echo "copying Mesa dynamic link library to system directory..."
-	-copy $(MESADLL) $(DLLINSTALL)
-	@echo "copying Mesa header files to include directory..."
-	-copy ..\..\include\GL\gl.h $(INCLUDEINSTALL)
-	-copy ..\..\include\GL\glext.h $(INCLUDEINSTALL)
-	@echo "copying Mesa import library to library directory..."
-	-copy $(MESALIB) $(LIBINSTALL)
-
-clean	::
-	@del /f tnl\*.obj
-	@del /f swrast_setup\*.obj
-	@del /f math\*.obj
-	@del /f array_cache\*.obj
-	@del /f swrast\*.obj
-	@del /f Trace\*.obj
-	@del /f osmesa\*.obj
-	@del /f Windows\*.obj
-
-clobber	::
-	@del /f OSmesa\*.lib
-	@del /f OSmesa\*.exp
-	@del /f OSmesa\*.dll
-
-# override default inference rule with one that writes the object to
-# the same subdir that the c file is in.
-.c.obj	:
-	$(cc) $(CFLAGS) -I. $< /Fo$*.obj
-- 
cgit v1.2.3


From 27d260b41038e0c19c8f24b8bdb2c004c1eb7aa2 Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olv@lunarg.com>
Date: Wed, 24 Feb 2010 11:20:14 +0800
Subject: glapi: Move src/mesa/main/dispatch.c to glapi and rename.

main/dispatch.c is a glapi source file.  It is part of GLAPI_SOURCES in
sources.mak and part of glapi_sources in SConscript.  This commit moves
it to glapi/ and renames it to glapi_dispatch.c.
---
 docs/devinfo.html                 |  2 +-
 docs/dispatch.html                |  4 +-
 src/mesa/Makefile.mgw             |  2 +-
 src/mesa/SConscript               |  2 +-
 src/mesa/glapi/glapi_dispatch.c   | 96 +++++++++++++++++++++++++++++++++++++++
 src/mesa/main/descrip.mms         |  3 --
 src/mesa/main/dispatch.c          | 96 ---------------------------------------
 src/mesa/sources.mak              |  2 +-
 windows/VC7/mesa/mesa/mesa.vcproj |  6 +--
 windows/VC8/mesa/mesa/mesa.vcproj |  8 ++--
 10 files changed, 109 insertions(+), 112 deletions(-)
 create mode 100644 src/mesa/glapi/glapi_dispatch.c
 delete mode 100644 src/mesa/main/dispatch.c

(limited to 'src/mesa/main')

diff --git a/docs/devinfo.html b/docs/devinfo.html
index 0fb816749e..df0e726524 100644
--- a/docs/devinfo.html
+++ b/docs/devinfo.html
@@ -107,7 +107,7 @@ Global variables are not allowed.
 Function name examples:
 </p>
 <pre>
-	glFooBar()       - a public GL entry point (in dispatch.c)
+	glFooBar()       - a public GL entry point (in glapi_dispatch.c)
 	_mesa_FooBar()   - the internal immediate mode function
 	save_FooBar()    - retained mode (display list) function in dlist.c
 	foo_bar()        - a static (private) function
diff --git a/docs/dispatch.html b/docs/dispatch.html
index bcab74c707..0c54a84675 100644
--- a/docs/dispatch.html
+++ b/docs/dispatch.html
@@ -244,8 +244,8 @@ isn't a significant problem.</p>
 system.  There are two steps to this.  The file must first be added to
 <tt>src/mesa/sources</tt>.  That gets the file built and linked.  The second
 step is to add the correct <tt>#ifdef</tt> magic to
-<tt>src/mesa/main/dispatch.c</tt> to prevent the C version of the dispatch
-functions from being built.</p>
+<tt>src/mesa/glapi/glapi_dispatch.c</tt> to prevent the C version of the
+dispatch functions from being built.</p>
 
 <A NAME="fixedsize"/>
 <H3>3.4. Fixed-Length Dispatch Stubs</H3>
diff --git a/src/mesa/Makefile.mgw b/src/mesa/Makefile.mgw
index e894c6277d..b90384d04a 100644
--- a/src/mesa/Makefile.mgw
+++ b/src/mesa/Makefile.mgw
@@ -200,7 +200,7 @@ ifeq (1,1)
 x86/glapi_x86.o: x86/glapi_x86.S
 	$(CC) -o $@ $(CFLAGS) -DSTDCALL_API -c $<
 else
-main/dispatch.o: main/dispatch.c
+glapi/glapi_dispatch.o: glapi/glapi_dispatch.c
 	$(CC) -o $@ $(CFLAGS) -UUSE_X86_ASM -c $<
 glapi/glapi.o: glapi/glapi.c
 	$(CC) -o $@ $(CFLAGS) -UUSE_X86_ASM -c $<
diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 0726fcb1a7..0a25dccde5 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -247,8 +247,8 @@ if env['platform'] != 'winddk':
 	)
 
 	glapi_sources = [
-		'main/dispatch.c',
 		'glapi/glapi.c',
+		'glapi/glapi_dispatch.c',
 		'glapi/glapi_getproc.c',
 		'glapi/glapi_nop.c',
 		'glapi/glthread.c',
diff --git a/src/mesa/glapi/glapi_dispatch.c b/src/mesa/glapi/glapi_dispatch.c
new file mode 100644
index 0000000000..4cb43f4505
--- /dev/null
+++ b/src/mesa/glapi/glapi_dispatch.c
@@ -0,0 +1,96 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  6.3
+ *
+ * Copyright (C) 1999-2004  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 glapi_dispatch.c
+ *
+ * This file generates all the gl* function entrypoints.  This code is not
+ * used if optimized assembly stubs are available (e.g., using x86/glapi_x86.S
+ * on IA32 or sparc/glapi_sparc.S on SPARC).
+ *
+ * \note
+ * This file is also used to build the client-side libGL that loads DRI-based
+ * device drivers.  At build-time it is symlinked to src/glx.
+ *
+ * \author Brian Paul <brian@precisioninsight.com>
+ */
+
+#include "main/glheader.h"
+#include "main/compiler.h"
+#include "glapi/glapi.h"
+#include "glapi/glapitable.h"
+#include "glapi/glapidispatch.h"
+#include "glapi/glthread.h"
+
+
+#if !(defined(USE_X86_ASM) || defined(USE_X86_64_ASM) || defined(USE_SPARC_ASM))
+
+#if defined(WIN32)
+#define KEYWORD1 GLAPI
+#else
+#define KEYWORD1 PUBLIC
+#endif
+
+#define KEYWORD2 GLAPIENTRY
+
+#if defined(USE_MGL_NAMESPACE)
+#define NAME(func)  mgl##func
+#else
+#define NAME(func)  gl##func
+#endif
+
+#if 0  /* Use this to log GL calls to stdout (for DEBUG only!) */
+
+#define F stdout
+#define DISPATCH(FUNC, ARGS, MESSAGE)		\
+   fprintf MESSAGE;				\
+   CALL_ ## FUNC(GET_DISPATCH(), ARGS);
+
+#define RETURN_DISPATCH(FUNC, ARGS, MESSAGE) 	\
+   fprintf MESSAGE;				\
+   return CALL_ ## FUNC(GET_DISPATCH(), ARGS);
+
+#else
+
+#define DISPATCH(FUNC, ARGS, MESSAGE)		\
+   CALL_ ## FUNC(GET_DISPATCH(), ARGS);
+
+#define RETURN_DISPATCH(FUNC, ARGS, MESSAGE) 	\
+   return CALL_ ## FUNC(GET_DISPATCH(), ARGS);
+
+#endif /* logging */
+
+
+#ifndef GLAPIENTRY
+#define GLAPIENTRY
+#endif
+
+#ifdef GLX_INDIRECT_RENDERING
+/* those link to libglapi.a should provide the entry points */
+#define _GLAPI_SKIP_PROTO_ENTRY_POINTS
+#endif
+#include "glapi/glapitemp.h"
+
+#endif /* USE_X86_ASM */
diff --git a/src/mesa/main/descrip.mms b/src/mesa/main/descrip.mms
index e49ec65d42..70bc263726 100644
--- a/src/mesa/main/descrip.mms
+++ b/src/mesa/main/descrip.mms
@@ -38,7 +38,6 @@ SOURCES =accum.c \
 	debug.c \
 	depth.c \
 	depthstencil.c \
-	dispatch.c \
 	dlist.c \
 	drawpix.c \
 	enable.c \
@@ -113,7 +112,6 @@ convolve.obj,\
 debug.obj,\
 depth.obj,\
 depthstencil.obj,\
-dispatch.obj,\
 dlist.obj,\
 drawpix.obj,\
 enable.obj,\
@@ -198,7 +196,6 @@ 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
diff --git a/src/mesa/main/dispatch.c b/src/mesa/main/dispatch.c
deleted file mode 100644
index b9b726b001..0000000000
--- a/src/mesa/main/dispatch.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  6.3
- *
- * Copyright (C) 1999-2004  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 dispatch.c
- *
- * This file generates all the gl* function entrypoints.  This code is not
- * used if optimized assembly stubs are available (e.g., using x86/glapi_x86.S
- * on IA32 or sparc/glapi_sparc.S on SPARC).
- *
- * \note
- * This file is also used to build the client-side libGL that loads DRI-based
- * device drivers.  At build-time it is symlinked to src/glx.
- *
- * \author Brian Paul <brian@precisioninsight.com>
- */
-
-#include "main/glheader.h"
-#include "main/compiler.h"
-#include "glapi/glapi.h"
-#include "glapi/glapitable.h"
-#include "glapi/glapidispatch.h"
-#include "glapi/glthread.h"
-
-
-#if !(defined(USE_X86_ASM) || defined(USE_X86_64_ASM) || defined(USE_SPARC_ASM))
-
-#if defined(WIN32)
-#define KEYWORD1 GLAPI
-#else
-#define KEYWORD1 PUBLIC
-#endif
-
-#define KEYWORD2 GLAPIENTRY
-
-#if defined(USE_MGL_NAMESPACE)
-#define NAME(func)  mgl##func
-#else
-#define NAME(func)  gl##func
-#endif
-
-#if 0  /* Use this to log GL calls to stdout (for DEBUG only!) */
-
-#define F stdout
-#define DISPATCH(FUNC, ARGS, MESSAGE)		\
-   fprintf MESSAGE;				\
-   CALL_ ## FUNC(GET_DISPATCH(), ARGS);
-
-#define RETURN_DISPATCH(FUNC, ARGS, MESSAGE) 	\
-   fprintf MESSAGE;				\
-   return CALL_ ## FUNC(GET_DISPATCH(), ARGS);
-
-#else
-
-#define DISPATCH(FUNC, ARGS, MESSAGE)		\
-   CALL_ ## FUNC(GET_DISPATCH(), ARGS);
-
-#define RETURN_DISPATCH(FUNC, ARGS, MESSAGE) 	\
-   return CALL_ ## FUNC(GET_DISPATCH(), ARGS);
-
-#endif /* logging */
-
-
-#ifndef GLAPIENTRY
-#define GLAPIENTRY
-#endif
-
-#ifdef GLX_INDIRECT_RENDERING
-/* those link to libglapi.a should provide the entry points */
-#define _GLAPI_SKIP_PROTO_ENTRY_POINTS
-#endif
-#include "glapi/glapitemp.h"
-
-#endif /* USE_X86_ASM */
diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak
index 354331955a..9f2e4e5157 100644
--- a/src/mesa/sources.mak
+++ b/src/mesa/sources.mak
@@ -86,8 +86,8 @@ MAIN_SOURCES = \
 	main/vtxfmt.c
 
 GLAPI_SOURCES = \
-	main/dispatch.c \
 	glapi/glapi.c \
+	glapi/glapi_dispatch.c \
 	glapi/glapi_getproc.c \
 	glapi/glapi_nop.c \
 	glapi/glthread.c
diff --git a/windows/VC7/mesa/mesa/mesa.vcproj b/windows/VC7/mesa/mesa/mesa.vcproj
index caee6c0ca6..623e001c74 100644
--- a/windows/VC7/mesa/mesa/mesa.vcproj
+++ b/windows/VC7/mesa/mesa/mesa.vcproj
@@ -181,9 +181,6 @@
 			<File
 				RelativePath="..\..\..\..\src\mesa\main\depthstencil.c">
 			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\dispatch.c">
-			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\main\dlist.c">
 			</File>
@@ -226,6 +223,9 @@
 			<File
 				RelativePath="..\..\..\..\src\mesa\glapi\glapi.c">
 			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\glapi\glapi_dispatch.c">
+			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\glapi\glthread.c">
 			</File>
diff --git a/windows/VC8/mesa/mesa/mesa.vcproj b/windows/VC8/mesa/mesa/mesa.vcproj
index 15ad229328..8795746916 100644
--- a/windows/VC8/mesa/mesa/mesa.vcproj
+++ b/windows/VC8/mesa/mesa/mesa.vcproj
@@ -422,10 +422,6 @@
 				RelativePath="..\..\..\..\src\mesa\main\depthstencil.c"
 				>
 			</File>
-			<File
-				RelativePath="..\..\..\..\src\mesa\main\dispatch.c"
-				>
-			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\main\dlist.c"
 				>
@@ -494,6 +490,10 @@
 				RelativePath="..\..\..\..\src\mesa\glapi\glapi.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\..\src\mesa\glapi\glapi_dispatch.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\..\..\src\mesa\glapi\glapi_getproc.c"
 				>
-- 
cgit v1.2.3


From 2cf44390d1e819f23e1d7ceb3199276c9148c647 Mon Sep 17 00:00:00 2001
From: Chia-I Wu <olv@lunarg.com>
Date: Wed, 24 Feb 2010 12:01:14 +0800
Subject: mesa: Move src/mesa/glapi/dispatch.h to mesa.

glapi/dispatch.h is a core Mesa header file.  Move the header file to
main/ to make this clear.  It also becomes clear after this change that
IN_DRI_DRIVER is only used in core Mesa to enable the remap table.
---
 src/mesa/es/main/drawtex.c             |  2 +-
 src/mesa/es/main/es_generator.py       |  2 +-
 src/mesa/glapi/dispatch.h              | 37 ----------------------------------
 src/mesa/glapi/gen/extension_helper.py |  2 +-
 src/mesa/glapi/gen/remap_helper.py     |  2 +-
 src/mesa/main/accum.c                  |  2 +-
 src/mesa/main/api_arrayelt.c           |  2 +-
 src/mesa/main/api_exec.c               |  2 +-
 src/mesa/main/api_loopback.c           |  2 +-
 src/mesa/main/api_noop.c               |  2 +-
 src/mesa/main/arrayobj.c               |  2 +-
 src/mesa/main/attrib.c                 |  2 +-
 src/mesa/main/colortab.c               |  2 +-
 src/mesa/main/convolve.c               |  2 +-
 src/mesa/main/dispatch.h               | 37 ++++++++++++++++++++++++++++++++++
 src/mesa/main/dlist.c                  |  2 +-
 src/mesa/main/drawpix.c                |  2 +-
 src/mesa/main/eval.c                   |  2 +-
 src/mesa/main/feedback.c               |  2 +-
 src/mesa/main/histogram.c              |  2 +-
 src/mesa/main/pixel.c                  |  2 +-
 src/mesa/main/queryobj.c               |  2 +-
 src/mesa/main/rastpos.c                |  2 +-
 src/mesa/main/remap.c                  |  4 ++--
 src/mesa/main/remap_helper.h           |  2 +-
 src/mesa/main/texgen.c                 |  2 +-
 src/mesa/main/varray.c                 |  2 +-
 src/mesa/main/vtxfmt_tmp.h             |  2 +-
 src/mesa/shader/shader_api.c           |  2 +-
 src/mesa/vbo/vbo_exec_api.c            |  2 +-
 src/mesa/vbo/vbo_exec_eval.c           |  2 +-
 src/mesa/vbo/vbo_save_api.c            |  2 +-
 src/mesa/vbo/vbo_save_loopback.c       |  2 +-
 33 files changed, 69 insertions(+), 69 deletions(-)
 delete mode 100644 src/mesa/glapi/dispatch.h
 create mode 100644 src/mesa/main/dispatch.h

(limited to 'src/mesa/main')

diff --git a/src/mesa/es/main/drawtex.c b/src/mesa/es/main/drawtex.c
index cbd41ca975..42f4409397 100644
--- a/src/mesa/es/main/drawtex.c
+++ b/src/mesa/es/main/drawtex.c
@@ -25,7 +25,7 @@
 #include "main/state.h"
 #include "main/imports.h"
 
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
 
 
 #if FEATURE_OES_draw_texture
diff --git a/src/mesa/es/main/es_generator.py b/src/mesa/es/main/es_generator.py
index 590f5940a7..f736792dec 100644
--- a/src/mesa/es/main/es_generator.py
+++ b/src/mesa/es/main/es_generator.py
@@ -207,7 +207,7 @@ extern void _mesa_error(void *ctx, GLenum error, const char *fmtString, ... );
 #include "main/compiler.h"
 #include "main/api_exec.h"
 
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
 
 typedef void (*_glapi_proc)(void); /* generic function pointer */
 """
diff --git a/src/mesa/glapi/dispatch.h b/src/mesa/glapi/dispatch.h
deleted file mode 100644
index 27f80a5062..0000000000
--- a/src/mesa/glapi/dispatch.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * (C) Copyright IBM Corporation 2005
- * All Rights Reserved.
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sub license,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
- * IBM,
- * AND/OR THEIR 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 _DISPATCH_H
-#define _DISPATCH_H
-
-#ifdef IN_DRI_DRIVER
-#define _GLAPI_USE_REMAP_TABLE
-#endif
-
-#include "glapi/glapitable.h"
-#include "glapi/glapioffsets.h"
-#include "glapi/glapidispatch.h"
-
-#endif /* _DISPATCH_H */
diff --git a/src/mesa/glapi/gen/extension_helper.py b/src/mesa/glapi/gen/extension_helper.py
index 83471d89f5..2c83b4e0d1 100644
--- a/src/mesa/glapi/gen/extension_helper.py
+++ b/src/mesa/glapi/gen/extension_helper.py
@@ -151,7 +151,7 @@ class PrintGlExtensionGlue(gl_XML.gl_print_base):
 
 	def printRealHeader(self):
 		print '#include "utils.h"'
-		print '#include "glapi/dispatch.h"'
+		print '#include "main/dispatch.h"'
 		print ''
 		return
 
diff --git a/src/mesa/glapi/gen/remap_helper.py b/src/mesa/glapi/gen/remap_helper.py
index d93c7a4285..8b50526d2b 100644
--- a/src/mesa/glapi/gen/remap_helper.py
+++ b/src/mesa/glapi/gen/remap_helper.py
@@ -64,7 +64,7 @@ class PrintGlRemap(gl_XML.gl_print_base):
 
 
 	def printRealHeader(self):
-		print '#include "glapi/dispatch.h"'
+		print '#include "main/dispatch.h"'
 		print ''
 		return
 
diff --git a/src/mesa/main/accum.c b/src/mesa/main/accum.c
index 032e13b96e..2012d00fd5 100644
--- a/src/mesa/main/accum.c
+++ b/src/mesa/main/accum.c
@@ -29,7 +29,7 @@
 #include "macros.h"
 #include "state.h"
 #include "mtypes.h"
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
 
 
 #if FEATURE_accum
diff --git a/src/mesa/main/api_arrayelt.c b/src/mesa/main/api_arrayelt.c
index 469b4529f9..ffcd194240 100644
--- a/src/mesa/main/api_arrayelt.c
+++ b/src/mesa/main/api_arrayelt.c
@@ -32,7 +32,7 @@
 #include "context.h"
 #include "imports.h"
 #include "macros.h"
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
 
 typedef void (GLAPIENTRY *array_func)( const void * );
 
diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index e62c7aa572..f8e004af3f 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -104,7 +104,7 @@
 #if FEATURE_ARB_sync
 #include "syncobj.h"
 #endif
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
 
 
 
diff --git a/src/mesa/main/api_loopback.c b/src/mesa/main/api_loopback.c
index 3d466ac44a..aedc509fb2 100644
--- a/src/mesa/main/api_loopback.c
+++ b/src/mesa/main/api_loopback.c
@@ -36,7 +36,7 @@
 #include "glapi/glapi.h"
 #include "glapi/glapitable.h"
 #include "glapi/glthread.h"
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
 
 /* KW: A set of functions to convert unusual Color/Normal/Vertex/etc
  * calls to a smaller set of driver-provided formats.  Currently just
diff --git a/src/mesa/main/api_noop.c b/src/mesa/main/api_noop.c
index f72f957300..9a36394d65 100644
--- a/src/mesa/main/api_noop.c
+++ b/src/mesa/main/api_noop.c
@@ -32,7 +32,7 @@
 #include "macros.h"
 #include "dlist.h"
 #include "eval.h"
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
 
 
 /**
diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c
index 7feaee316d..0069cd3dcf 100644
--- a/src/mesa/main/arrayobj.c
+++ b/src/mesa/main/arrayobj.c
@@ -48,7 +48,7 @@
 #endif
 #include "arrayobj.h"
 #include "macros.h"
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
 
 
 /**
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 9a32bc335d..92fb8d289d 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -56,7 +56,7 @@
 #include "varray.h"
 #include "viewport.h"
 #include "mtypes.h"
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
 
 
 /**
diff --git a/src/mesa/main/colortab.c b/src/mesa/main/colortab.c
index 785813166c..52d5badf39 100644
--- a/src/mesa/main/colortab.c
+++ b/src/mesa/main/colortab.c
@@ -32,7 +32,7 @@
 #include "state.h"
 #include "teximage.h"
 #include "texstate.h"
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
 
 
 #if FEATURE_colortable
diff --git a/src/mesa/main/convolve.c b/src/mesa/main/convolve.c
index 5ed93e0c60..15e8dffc23 100644
--- a/src/mesa/main/convolve.c
+++ b/src/mesa/main/convolve.c
@@ -39,7 +39,7 @@
 #include "image.h"
 #include "mtypes.h"
 #include "state.h"
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
 
 
 #if FEATURE_convolve
diff --git a/src/mesa/main/dispatch.h b/src/mesa/main/dispatch.h
new file mode 100644
index 0000000000..27f80a5062
--- /dev/null
+++ b/src/mesa/main/dispatch.h
@@ -0,0 +1,37 @@
+/*
+ * (C) Copyright IBM Corporation 2005
+ * All Rights Reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sub license,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
+ * IBM,
+ * AND/OR THEIR 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 _DISPATCH_H
+#define _DISPATCH_H
+
+#ifdef IN_DRI_DRIVER
+#define _GLAPI_USE_REMAP_TABLE
+#endif
+
+#include "glapi/glapitable.h"
+#include "glapi/glapioffsets.h"
+#include "glapi/glapidispatch.h"
+
+#endif /* _DISPATCH_H */
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 9ef7fcae90..673db30f25 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -66,7 +66,7 @@
 
 #include "math/m_matrix.h"
 
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
 
 
 
diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c
index 0afd47b797..84cb78612b 100644
--- a/src/mesa/main/drawpix.c
+++ b/src/mesa/main/drawpix.c
@@ -32,7 +32,7 @@
 #include "framebuffer.h"
 #include "readpix.h"
 #include "state.h"
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
 
 
 #if FEATURE_drawpix
diff --git a/src/mesa/main/eval.c b/src/mesa/main/eval.c
index 58eb59b13c..bd2e1177fd 100644
--- a/src/mesa/main/eval.c
+++ b/src/mesa/main/eval.c
@@ -44,7 +44,7 @@
 #include "eval.h"
 #include "macros.h"
 #include "mtypes.h"
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
 
 
 #if FEATURE_evaluators
diff --git a/src/mesa/main/feedback.c b/src/mesa/main/feedback.c
index fcdbb75fc4..e20456fa75 100644
--- a/src/mesa/main/feedback.c
+++ b/src/mesa/main/feedback.c
@@ -36,7 +36,7 @@
 #include "feedback.h"
 #include "macros.h"
 #include "mtypes.h"
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
 
 
 #if FEATURE_feedback
diff --git a/src/mesa/main/histogram.c b/src/mesa/main/histogram.c
index c7304e8dd7..3a65bb1926 100644
--- a/src/mesa/main/histogram.c
+++ b/src/mesa/main/histogram.c
@@ -29,7 +29,7 @@
 #include "context.h"
 #include "image.h"
 #include "histogram.h"
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
 
 
 #if FEATURE_histogram
diff --git a/src/mesa/main/pixel.c b/src/mesa/main/pixel.c
index e2e3854fc8..675e933ca6 100644
--- a/src/mesa/main/pixel.c
+++ b/src/mesa/main/pixel.c
@@ -35,7 +35,7 @@
 #include "macros.h"
 #include "pixel.h"
 #include "mtypes.h"
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
 
 
 #if FEATURE_pixel_transfer
diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c
index 471352f472..e14511a388 100644
--- a/src/mesa/main/queryobj.c
+++ b/src/mesa/main/queryobj.c
@@ -29,7 +29,7 @@
 #include "imports.h"
 #include "queryobj.h"
 #include "mtypes.h"
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
 
 
 #if FEATURE_queryobj
diff --git a/src/mesa/main/rastpos.c b/src/mesa/main/rastpos.c
index be61dc265d..d72b846c36 100644
--- a/src/mesa/main/rastpos.c
+++ b/src/mesa/main/rastpos.c
@@ -34,7 +34,7 @@
 #include "macros.h"
 #include "rastpos.h"
 #include "state.h"
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
 
 
 #if FEATURE_rastpos
diff --git a/src/mesa/main/remap.c b/src/mesa/main/remap.c
index 5f32a48258..8d9df6b830 100644
--- a/src/mesa/main/remap.c
+++ b/src/mesa/main/remap.c
@@ -38,7 +38,7 @@
 #include "remap.h"
 #include "imports.h"
 
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
 
 
 #if FEATURE_remap_table
@@ -183,7 +183,7 @@ _mesa_map_static_functions(void)
 /**
  * Initialize the remap table.  This is called in one_time_init().
  * The remap table needs to be initialized before calling the
- * CALL/GET/SET macros defined in glapi/dispatch.h.
+ * CALL/GET/SET macros defined in main/dispatch.h.
  */
 void
 _mesa_init_remap_table(void)
diff --git a/src/mesa/main/remap_helper.h b/src/mesa/main/remap_helper.h
index 2c8f0de467..0a5b629688 100644
--- a/src/mesa/main/remap_helper.h
+++ b/src/mesa/main/remap_helper.h
@@ -25,7 +25,7 @@
  * SOFTWARE.
  */
 
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
 
 struct gl_function_remap {
    GLint func_index;
diff --git a/src/mesa/main/texgen.c b/src/mesa/main/texgen.c
index 2ae839b2a6..e70ea30290 100644
--- a/src/mesa/main/texgen.c
+++ b/src/mesa/main/texgen.c
@@ -37,7 +37,7 @@
 #include "main/texgen.h"
 #include "main/texstate.h"
 #include "math/m_matrix.h"
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
 
 
 #if FEATURE_texgen
diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index 86878d6a8a..b4128f84d8 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -34,7 +34,7 @@
 #include "mtypes.h"
 #include "varray.h"
 #include "arrayobj.h"
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
 
 
 /**
diff --git a/src/mesa/main/vtxfmt_tmp.h b/src/mesa/main/vtxfmt_tmp.h
index ae636fb24f..037c4b1888 100644
--- a/src/mesa/main/vtxfmt_tmp.h
+++ b/src/mesa/main/vtxfmt_tmp.h
@@ -29,7 +29,7 @@
 #define PRE_LOOPBACK( FUNC )
 #endif
 
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
 
 static void GLAPIENTRY TAG(ArrayElement)( GLint i )
 {
diff --git a/src/mesa/shader/shader_api.c b/src/mesa/shader/shader_api.c
index 129a973cf1..d0d0575b0b 100644
--- a/src/mesa/shader/shader_api.c
+++ b/src/mesa/shader/shader_api.c
@@ -46,7 +46,7 @@
 #include "shader/shader_api.h"
 #include "shader/slang/slang_compile.h"
 #include "shader/slang/slang_link.h"
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
 
 
 /**
diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c
index 3dde982371..e40f5f9dc4 100644
--- a/src/mesa/vbo/vbo_exec_api.c
+++ b/src/mesa/vbo/vbo_exec_api.c
@@ -41,7 +41,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "main/light.h"
 #include "main/api_arrayelt.h"
 #include "main/api_noop.h"
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
 
 #include "vbo_context.h"
 
diff --git a/src/mesa/vbo/vbo_exec_eval.c b/src/mesa/vbo/vbo_exec_eval.c
index a7846213d0..23ad12608f 100644
--- a/src/mesa/vbo/vbo_exec_eval.c
+++ b/src/mesa/vbo/vbo_exec_eval.c
@@ -29,7 +29,7 @@
 #include "main/context.h"
 #include "main/macros.h"
 #include "math/m_eval.h"
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
 #include "vbo_exec.h"
 
 
diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c
index 3a64c0cf01..a5d027982f 100644
--- a/src/mesa/vbo/vbo_save_api.c
+++ b/src/mesa/vbo/vbo_save_api.c
@@ -78,7 +78,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "main/api_validate.h"
 #include "main/api_arrayelt.h"
 #include "main/vtxfmt.h"
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
 
 #include "vbo_context.h"
 
diff --git a/src/mesa/vbo/vbo_save_loopback.c b/src/mesa/vbo/vbo_save_loopback.c
index 8d9ae307d6..f253c854d2 100644
--- a/src/mesa/vbo/vbo_save_loopback.c
+++ b/src/mesa/vbo/vbo_save_loopback.c
@@ -30,7 +30,7 @@
 #include "main/enums.h"
 #include "main/imports.h"
 #include "main/mtypes.h"
-#include "glapi/dispatch.h"
+#include "main/dispatch.h"
 #include "glapi/glapi.h"
 
 #include "vbo_context.h"
-- 
cgit v1.2.3


From c9e8ff1976cd14fdc84db440a554185be29a0ca2 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 25 Feb 2010 18:59:56 -0700
Subject: mesa: use simplified _BaseFormat value in render-to-texture code

Fixes fd.o bug 26762.
---
 src/mesa/main/texrender.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texrender.c b/src/mesa/main/texrender.c
index dbed51a77f..11d7c06914 100644
--- a/src/mesa/main/texrender.c
+++ b/src/mesa/main/texrender.c
@@ -496,21 +496,24 @@ update_wrapper(GLcontext *ctx, const struct gl_renderbuffer_attachment *att)
    if (trb->TexImage->TexFormat == MESA_FORMAT_Z24_S8) {
       trb->Base.Format = MESA_FORMAT_Z24_S8;
       trb->Base.DataType = GL_UNSIGNED_INT_24_8_EXT;
+      trb->Base._BaseFormat = GL_DEPTH_STENCIL;
    }
    else if (trb->TexImage->TexFormat == MESA_FORMAT_Z16) {
       trb->Base.Format = MESA_FORMAT_Z16;
       trb->Base.DataType = GL_UNSIGNED_SHORT;
+      trb->Base._BaseFormat = GL_DEPTH_STENCIL;
    }
    else if (trb->TexImage->TexFormat == MESA_FORMAT_Z32) {
       trb->Base.Format = MESA_FORMAT_Z32;
       trb->Base.DataType = GL_UNSIGNED_INT;
+      trb->Base._BaseFormat = GL_DEPTH_COMPONENT;
    }
    else {
       trb->Base.Format = trb->TexImage->TexFormat;
       trb->Base.DataType = CHAN_TYPE;
+      trb->Base._BaseFormat = GL_RGBA;
    }
    trb->Base.Data = trb->TexImage->Data;
-   trb->Base._BaseFormat = _mesa_base_fbo_format(ctx, trb->Base.InternalFormat);
 }
 
 
-- 
cgit v1.2.3


From 593eb8a642e8853d50da7792d7c111500d5cbe34 Mon Sep 17 00:00:00 2001
From: George Sapountzis <gsapountzis@gmail.com>
Date: Fri, 26 Feb 2010 04:02:40 +0200
Subject: drop stray src/mesa/main/sources

---
 src/mesa/main/sources | 158 --------------------------------------------------
 1 file changed, 158 deletions(-)
 delete mode 100644 src/mesa/main/sources

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/sources b/src/mesa/main/sources
deleted file mode 100644
index 5d9d99040e..0000000000
--- a/src/mesa/main/sources
+++ /dev/null
@@ -1,158 +0,0 @@
-# List of source files in this directory used for X.org xserver build
-MESA_MAIN_SOURCES = \
-accum.c \
-api_arrayelt.c \
-api_exec.c \
-api_loopback.c \
-api_noop.c \
-api_validate.c \
-arrayobj.c \
-attrib.c \
-blend.c \
-bufferobj.c \
-buffers.c \
-clear.c \
-clip.c \
-colortab.c \
-context.c \
-convolve.c \
-debug.c \
-depth.c \
-depthstencil.c \
-dlist.c \
-dlopen.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 \
-multisample.c \
-occlude.c \
-pixel.c \
-pixelstore.c \
-points.c \
-polygon.c \
-readpix.c \
-rastpos.c \
-rbadaptors.c \
-renderbuffer.c \
-scissor.c \
-state.c \
-stencil.c \
-texcompress.c \
-texcompress_fxt1.c \
-texcompress_s3tc.c \
-texenv.c \
-texenvprogram.c \
-texformat.c \
-texgen.c \
-texgetimage.c \
-teximage.c \
-texobj.c \
-texparam.c \
-texrender.c \
-texstate.c \
-texstore.c \
-varray.c \
-$(VSNPRINTF_SOURCES) \
-vtxfmt.c
-
-MESA_VSNPRINTF_SOURCES = \
-vsnprintf.c
-
-MESA_MAIN_HEADERS = \
-accum.h \
-api_arrayelt.h \
-api_exec.h \
-api_loopback.h \
-api_noop.h \
-api_validate.h \
-arrayobj.h \
-attrib.h \
-bitset.h \
-blend.h \
-bufferobj.h \
-buffers.h \
-clear.h \
-clip.h \
-colormac.h \
-colortab.h \
-config.h \
-context.h \
-convolve.h \
-dd.h \
-debug.h \
-depth.h \
-depthstencil.h \
-dlist.h \
-dlopen.h \
-drawpix.h \
-enable.h \
-enums.h \
-eval.h \
-extensions.h \
-fbobject.h \
-feedback.h \
-fog.h \
-framebuffer.h \
-get.h \
-glheader.h \
-hash.h \
-hint.h \
-histogram.h \
-image.h \
-imports.h \
-light.h \
-lines.h \
-macros.h \
-matrix.h \
-mipmap.h \
-mm.h \
-mtypes.h \
-multisample.h \
-occlude.h \
-pixel.h \
-pixelstore.h \
-points.h \
-polygon.h \
-rastpos.h \
-rbadaptors.h \
-readpix.h \
-renderbuffer.h \
-simple_list.h \
-scissor.h \
-state.h \
-stencil.h \
-texcompress.h \
-texenv.h \
-texenvprogram.h \
-texformat.h \
-texformat_tmp.h \
-texgen.h \
-teximage.h \
-texobj.h \
-texparam.h \
-texrender.h \
-texstate.h \
-texstore.h \
-varray.h \
-version.h \
-vtxfmt.h \
-vtxfmt_tmp.h
-- 
cgit v1.2.3


From a858bc393ec431f836bea275edb4437fe41adc75 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 25 Feb 2010 19:03:24 -0700
Subject: mesa: added renderbuffer->_BaseFormat assertion

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

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/renderbuffer.c b/src/mesa/main/renderbuffer.c
index c44db255d6..4276b23b69 100644
--- a/src/mesa/main/renderbuffer.c
+++ b/src/mesa/main/renderbuffer.c
@@ -1143,6 +1143,7 @@ _mesa_soft_renderbuffer_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
    rb->Width = width;
    rb->Height = height;
    rb->_BaseFormat = _mesa_base_fbo_format(ctx, rb->InternalFormat);
+   ASSERT(rb->_BaseFormat);
 
    return GL_TRUE;
 }
-- 
cgit v1.2.3


From a8dafe713f4b45fd09c678e1ca9fbe4eab16f8be Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 25 Feb 2010 19:03:55 -0700
Subject: mesa: remove redundant call to _mesa_base_fbo_format()

---
 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 4ce3998812..14c533e0d4 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -987,7 +987,7 @@ renderbuffer_storage(GLenum target, GLenum internalFormat,
       assert(rb->Width == (GLuint) width);
       assert(rb->Height == (GLuint) height);
       rb->InternalFormat = internalFormat;
-      rb->_BaseFormat = _mesa_base_fbo_format(ctx, internalFormat);
+      rb->_BaseFormat = baseFormat;
       assert(rb->_BaseFormat != 0);
    }
    else {
-- 
cgit v1.2.3


From 1edd444c2e9afadb56df55682ae606b5cefd811c Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 25 Feb 2010 19:08:02 -0700
Subject: mesa: added new extension flag for GL_EXT_texture_array

---
 src/mesa/main/extensions.c | 1 +
 src/mesa/main/mtypes.h     | 1 +
 2 files changed, 2 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 2c1120e19f..44190c7732 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -131,6 +131,7 @@ static const struct {
    { ON,  "GL_EXT_subtexture",                 F(EXT_subtexture) },
    { ON,  "GL_EXT_texture",                    F(EXT_texture) },
    { ON,  "GL_EXT_texture3D",                  F(EXT_texture3D) },
+   { OFF, "GL_EXT_texture_array",              F(EXT_texture_array) },
    { OFF, "GL_EXT_texture_compression_s3tc",   F(EXT_texture_compression_s3tc) },
    { OFF, "GL_EXT_texture_cube_map",           F(ARB_texture_cube_map) },
    { ON,  "GL_EXT_texture_edge_clamp",         F(SGIS_texture_edge_clamp) },
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 20035417b9..e0ee3c9f5d 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2474,6 +2474,7 @@ struct gl_extensions
    GLboolean EXT_texture;
    GLboolean EXT_texture_object;
    GLboolean EXT_texture3D;
+   GLboolean EXT_texture_array;
    GLboolean EXT_texture_compression_s3tc;
    GLboolean EXT_texture_env_add;
    GLboolean EXT_texture_env_combine;
-- 
cgit v1.2.3


From 4db9f8361207e9377eb772df8d16413d63f55636 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Thu, 25 Feb 2010 19:48:57 -0700
Subject: mesa: enable GL_EXT_texture_array 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 44190c7732..0e7e52a54a 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -305,6 +305,7 @@ _mesa_enable_sw_extensions(GLcontext *ctx)
    ctx->Extensions.EXT_shared_texture_palette = GL_TRUE;
    ctx->Extensions.EXT_stencil_wrap = GL_TRUE;
    ctx->Extensions.EXT_stencil_two_side = GL_TRUE;
+   ctx->Extensions.EXT_texture_array = 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;
-- 
cgit v1.2.3


From fe25476c04b341d50777b8edd0533f7c838f6361 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 26 Feb 2010 09:03:31 -0700
Subject: mesa: fix _BaseFormat assignment in _mesa_soft_renderbuffer_storage()

The rb->InternalFormat field will be set by the caller if the allocation
succeeds.  Until then, this field's value can't be used.  Fixes a failed
assertion with FlightGear.
---
 src/mesa/main/renderbuffer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/renderbuffer.c b/src/mesa/main/renderbuffer.c
index 4276b23b69..2f42924046 100644
--- a/src/mesa/main/renderbuffer.c
+++ b/src/mesa/main/renderbuffer.c
@@ -1142,7 +1142,7 @@ _mesa_soft_renderbuffer_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
 
    rb->Width = width;
    rb->Height = height;
-   rb->_BaseFormat = _mesa_base_fbo_format(ctx, rb->InternalFormat);
+   rb->_BaseFormat = _mesa_base_fbo_format(ctx, internalFormat);
    ASSERT(rb->_BaseFormat);
 
    return GL_TRUE;
-- 
cgit v1.2.3


From ea203de2d005b311d2f7f981523ae84494d6672a Mon Sep 17 00:00:00 2001
From: Kristian Høgsberg <krh@bitplanet.net>
Date: Fri, 26 Feb 2010 13:17:30 -0500
Subject: Set API dispatch pointers for OES_EGL_image functions

This chunk fell through the cracks when I rebase the EGLImage patch series.
---
 src/mesa/main/api_exec.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index f8e004af3f..70c154b62b 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -753,4 +753,9 @@ _mesa_init_exec_table(struct _glapi_table *exec)
    /* GL_NV_conditional_render */
    SET_BeginConditionalRenderNV(exec, _mesa_BeginConditionalRender);
    SET_EndConditionalRenderNV(exec, _mesa_EndConditionalRender);
+
+#if FEATURE_OES_EGL_image
+   SET_EGLImageTargetTexture2DOES(exec, _mesa_EGLImageTargetTexture2DOES);
+   SET_EGLImageTargetRenderbufferStorageOES(exec, _mesa_EGLImageTargetRenderbufferStorageOES);
+#endif
 }
-- 
cgit v1.2.3


From be97d2c0a6269e297f1db0e3639b0b03a45f21d9 Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Fri, 26 Feb 2010 23:58:59 -0800
Subject: mesa: Remove unnecessary header.

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

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texrender.c b/src/mesa/main/texrender.c
index 11d7c06914..5a528535c0 100644
--- a/src/mesa/main/texrender.c
+++ b/src/mesa/main/texrender.c
@@ -1,7 +1,6 @@
 
 #include "context.h"
 #include "colormac.h"
-#include "fbobject.h"
 #include "texfetch.h"
 #include "texrender.h"
 #include "renderbuffer.h"
-- 
cgit v1.2.3


From bfdee9cc70f21ef34ca8497d30ab72106ce43bd1 Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Sat, 27 Feb 2010 17:19:31 -0800
Subject: mesa: Add assert to check input to memcpy is not null.

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

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c
index 355af56b41..89b8c5a356 100644
--- a/src/mesa/main/mipmap.c
+++ b/src/mesa/main/mipmap.c
@@ -979,6 +979,7 @@ make_1d_mipmap(GLenum datatype, GLuint comps, GLint border,
 
    if (border) {
       /* copy left-most pixel from source */
+      assert(srcPtr);
       memcpy(dstPtr, srcPtr, bpt);
       /* copy right-most pixel from source */
       memcpy(dstPtr + (dstWidth - 1) * bpt,
-- 
cgit v1.2.3


From 75dba756b2e3d6850b56376d7c183dc3277a563b Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Sat, 27 Feb 2010 20:11:31 -0800
Subject: mesa: Add asserts to check inputs to memcpy.

---
 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 89b8c5a356..21ee317a31 100644
--- a/src/mesa/main/mipmap.c
+++ b/src/mesa/main/mipmap.c
@@ -979,6 +979,7 @@ make_1d_mipmap(GLenum datatype, GLuint comps, GLint border,
 
    if (border) {
       /* copy left-most pixel from source */
+      assert(dstPtr);
       assert(srcPtr);
       memcpy(dstPtr, srcPtr, bpt);
       /* copy right-most pixel from source */
@@ -1026,6 +1027,8 @@ make_2d_mipmap(GLenum datatype, GLuint comps, GLint border,
    if (border > 0) {
       /* fill in dest border */
       /* lower-left border pixel */
+      assert(dstPtr);
+      assert(srcPtr);
       memcpy(dstPtr, srcPtr, bpt);
       /* lower-right border pixel */
       memcpy(dstPtr + (dstWidth - 1) * bpt,
-- 
cgit v1.2.3


From 247008f6c2014c8f84de3a27ac954afe2c418a93 Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Tue, 2 Mar 2010 01:01:23 -0800
Subject: mesa: Add asserts to check inputs to memcpy.

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

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c
index 21ee317a31..e2efe81a8f 100644
--- a/src/mesa/main/mipmap.c
+++ b/src/mesa/main/mipmap.c
@@ -1269,6 +1269,8 @@ make_1d_stack_mipmap(GLenum datatype, GLuint comps, GLint border,
 
    if (border) {
       /* copy left-most pixel from source */
+      assert(dstPtr);
+      assert(srcPtr);
       memcpy(dstPtr, srcPtr, bpt);
       /* copy right-most pixel from source */
       memcpy(dstPtr + (dstWidth - 1) * bpt,
-- 
cgit v1.2.3


From fcf438e9e03f6e75bca4a49ad372fe7c4b1abbf8 Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed, 24 Feb 2010 18:49:33 -0800
Subject: mesa: Remove support for creating color-index visuals

Remove the rgbMode and indexBits parameters from _mesa_create_visual
and _mesa_initialize_visual.  These values are now hardcoded to
GL_TRUE and 0.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
---
 src/gallium/state_trackers/glx/xlib/xm_api.c   |  3 +--
 src/mesa/drivers/beos/GLView.cpp               |  4 +---
 src/mesa/drivers/fbdev/glfbdev.c               |  6 +++---
 src/mesa/drivers/glslcompiler/glslcompiler.c   |  4 ++--
 src/mesa/drivers/osmesa/osmesa.c               |  4 +---
 src/mesa/drivers/windows/gdi/wmesa.c           |  4 +---
 src/mesa/drivers/windows/gldirect/dglcontext.c |  2 --
 src/mesa/drivers/x11/xm_api.c                  |  3 +--
 src/mesa/main/context.c                        | 15 +++++----------
 src/mesa/main/context.h                        |  6 +-----
 10 files changed, 16 insertions(+), 35 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/gallium/state_trackers/glx/xlib/xm_api.c b/src/gallium/state_trackers/glx/xlib/xm_api.c
index 68518b19b9..217bdeff75 100644
--- a/src/gallium/state_trackers/glx/xlib/xm_api.c
+++ b/src/gallium/state_trackers/glx/xlib/xm_api.c
@@ -746,10 +746,9 @@ XMesaVisual XMesaCreateVisual( Display *display,
    }
 
    _mesa_initialize_visual( &v->mesa_visual,
-                            rgb_flag, db_flag, stereo_flag,
+                            db_flag, stereo_flag,
                             red_bits, green_bits,
                             blue_bits, alpha_bits,
-                            v->mesa_visual.indexBits,
                             depth_size,
                             stencil_size,
                             accum_red_size, accum_green_size,
diff --git a/src/mesa/drivers/beos/GLView.cpp b/src/mesa/drivers/beos/GLView.cpp
index 9e4a7ebe56..a029f6b200 100644
--- a/src/mesa/drivers/beos/GLView.cpp
+++ b/src/mesa/drivers/beos/GLView.cpp
@@ -297,11 +297,9 @@ BGLView::BGLView(BRect rect, char *name,
    MesaDriver * md = new MesaDriver();
 
    // examine option flags and create gl_context struct
-   GLvisual * visual = _mesa_create_visual( rgbFlag,
-                                            dblFlag,
+   GLvisual * visual = _mesa_create_visual( dblFlag,
                                             stereoFlag,
                                             red, green, blue, alpha,
-                                            index,
                                             depth,
                                             stencil,
                                             accum, accum, accum, accum,
diff --git a/src/mesa/drivers/fbdev/glfbdev.c b/src/mesa/drivers/fbdev/glfbdev.c
index e6ece69a64..0ea2796eaa 100644
--- a/src/mesa/drivers/fbdev/glfbdev.c
+++ b/src/mesa/drivers/fbdev/glfbdev.c
@@ -327,7 +327,7 @@ glFBDevCreateVisual( const struct fb_fix_screeninfo *fixInfo,
    const int *attrib;
    GLboolean dbFlag = GL_FALSE, stereoFlag = GL_FALSE;
    GLint redBits = 0, greenBits = 0, blueBits = 0, alphaBits = 0;
-   GLint indexBits = 0, depthBits = 0, stencilBits = 0;
+   GLint depthBits = 0, stencilBits = 0;
    GLint accumRedBits = 0, accumGreenBits = 0;
    GLint accumBlueBits = 0, accumAlphaBits = 0;
    GLint numSamples = 0;
@@ -414,9 +414,9 @@ glFBDevCreateVisual( const struct fb_fix_screeninfo *fixInfo,
       }
    }
 
-   if (!_mesa_initialize_visual(&vis->glvisual, GL_TRUE, dbFlag, stereoFlag,
+   if (!_mesa_initialize_visual(&vis->glvisual, dbFlag, stereoFlag,
                                 redBits, greenBits, blueBits, alphaBits,
-                                indexBits, depthBits, stencilBits,
+                                depthBits, stencilBits,
                                 accumRedBits, accumGreenBits,
                                 accumBlueBits, accumAlphaBits,
                                 numSamples)) {
diff --git a/src/mesa/drivers/glslcompiler/glslcompiler.c b/src/mesa/drivers/glslcompiler/glslcompiler.c
index 448029dace..66035a4a43 100644
--- a/src/mesa/drivers/glslcompiler/glslcompiler.c
+++ b/src/mesa/drivers/glslcompiler/glslcompiler.c
@@ -113,9 +113,9 @@ CreateContext(void)
    GLcontext *ctx;
    CompilerContext *cc;
 
-   vis = _mesa_create_visual(GL_TRUE, GL_FALSE, GL_FALSE, /* RGB */
+   vis = _mesa_create_visual(GL_FALSE, GL_FALSE, /* RGB */
                              8, 8, 8, 8,  /* color */
-                             0, 0, 0,  /* z, stencil */
+                             0, 0,  /* z, stencil */
                              0, 0, 0, 0, 1);  /* accum */
    buf = _mesa_create_framebuffer(vis);
 
diff --git a/src/mesa/drivers/osmesa/osmesa.c b/src/mesa/drivers/osmesa/osmesa.c
index bb6dbdf1c0..e20507ae92 100644
--- a/src/mesa/drivers/osmesa/osmesa.c
+++ b/src/mesa/drivers/osmesa/osmesa.c
@@ -1116,14 +1116,12 @@ OSMesaCreateContextExt( GLenum format, GLint depthBits, GLint stencilBits,
 
    osmesa = (OSMesaContext) CALLOC_STRUCT(osmesa_context);
    if (osmesa) {
-      osmesa->gl_visual = _mesa_create_visual( GL_TRUE,     /* rgbMode */
-                                               GL_FALSE,    /* double buffer */
+      osmesa->gl_visual = _mesa_create_visual( GL_FALSE,    /* double buffer */
                                                GL_FALSE,    /* stereo */
                                                redBits,
                                                greenBits,
                                                blueBits,
                                                alphaBits,
-                                               0,
                                                depthBits,
                                                stencilBits,
                                                accumBits,
diff --git a/src/mesa/drivers/windows/gdi/wmesa.c b/src/mesa/drivers/windows/gdi/wmesa.c
index 2fdcb387be..91ddc3615a 100644
--- a/src/mesa/drivers/windows/gdi/wmesa.c
+++ b/src/mesa/drivers/windows/gdi/wmesa.c
@@ -1461,12 +1461,10 @@ WMesaContext WMesaCreateContext(HDC hDC,
 	break;
     }
     /* Create visual based on flags */
-    visual = _mesa_create_visual(rgb_flag,
-                                 db_flag,    /* db_flag */
+    visual = _mesa_create_visual(db_flag,    /* db_flag */
                                  GL_FALSE,   /* stereo */
                                  red_bits, green_bits, blue_bits, /* color RGB */
                                  alpha_flag ? alpha_bits : 0, /* color A */
-                                 0,          /* index bits */
                                  DEFAULT_SOFTWARE_DEPTH_BITS, /* depth_bits */
                                  8,          /* stencil_bits */
                                  16,16,16,   /* accum RGB */
diff --git a/src/mesa/drivers/windows/gldirect/dglcontext.c b/src/mesa/drivers/windows/gldirect/dglcontext.c
index e9c23d1ccb..a420b36ffb 100644
--- a/src/mesa/drivers/windows/gldirect/dglcontext.c
+++ b/src/mesa/drivers/windows/gldirect/dglcontext.c
@@ -1377,14 +1377,12 @@ SkipPrimaryCreate:
 
 #ifdef _USE_GLD3_WGL
 	lpCtx->glVis = _mesa_create_visual(
-		GL_TRUE,		// RGB mode
 		bDouble,    /* double buffer */
 		GL_FALSE,			// stereo
 		lpPFD->cRedBits,
 		lpPFD->cGreenBits,
 		lpPFD->cBlueBits,
 		dwAlphaBits,
-		0,				// index bits
 		dwDepthBits,
 		dwStencilBits,
 		lpPFD->cAccumRedBits,	// accum bits
diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c
index c59df55166..a1723fa37b 100644
--- a/src/mesa/drivers/x11/xm_api.c
+++ b/src/mesa/drivers/x11/xm_api.c
@@ -1443,10 +1443,9 @@ XMesaVisual XMesaCreateVisual( XMesaDisplay *display,
    }
 
    _mesa_initialize_visual( &v->mesa_visual,
-                            GL_TRUE, db_flag, stereo_flag,
+                            db_flag, stereo_flag,
                             red_bits, green_bits,
                             blue_bits, alpha_bits,
-                            v->mesa_visual.indexBits,
                             depth_size,
                             stencil_size,
                             accum_red_size, accum_green_size,
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 4ecbb5ecf6..b827d54176 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -184,7 +184,6 @@ _mesa_notifySwapBuffers(__GLcontext *ctx)
  * Allocates a GLvisual structure and initializes it via
  * _mesa_initialize_visual().
  * 
- * \param rgbFlag GL_TRUE for RGB(A) mode, GL_FALSE for Color Index mode.
  * \param dbFlag double buffering
  * \param stereoFlag stereo buffer
  * \param depthBits requested bits per depth buffer value. Any value in [0, 32]
@@ -206,14 +205,12 @@ _mesa_notifySwapBuffers(__GLcontext *ctx)
  * \note Need to add params for level and numAuxBuffers (at least)
  */
 GLvisual *
-_mesa_create_visual( GLboolean rgbFlag,
-                     GLboolean dbFlag,
+_mesa_create_visual( GLboolean dbFlag,
                      GLboolean stereoFlag,
                      GLint redBits,
                      GLint greenBits,
                      GLint blueBits,
                      GLint alphaBits,
-                     GLint indexBits,
                      GLint depthBits,
                      GLint stencilBits,
                      GLint accumRedBits,
@@ -224,9 +221,9 @@ _mesa_create_visual( GLboolean rgbFlag,
 {
    GLvisual *vis = (GLvisual *) calloc(1, sizeof(GLvisual));
    if (vis) {
-      if (!_mesa_initialize_visual(vis, rgbFlag, dbFlag, stereoFlag,
+      if (!_mesa_initialize_visual(vis, dbFlag, stereoFlag,
                                    redBits, greenBits, blueBits, alphaBits,
-                                   indexBits, depthBits, stencilBits,
+                                   depthBits, stencilBits,
                                    accumRedBits, accumGreenBits,
                                    accumBlueBits, accumAlphaBits,
                                    numSamples)) {
@@ -248,14 +245,12 @@ _mesa_create_visual( GLboolean rgbFlag,
  */
 GLboolean
 _mesa_initialize_visual( GLvisual *vis,
-                         GLboolean rgbFlag,
                          GLboolean dbFlag,
                          GLboolean stereoFlag,
                          GLint redBits,
                          GLint greenBits,
                          GLint blueBits,
                          GLint alphaBits,
-                         GLint indexBits,
                          GLint depthBits,
                          GLint stencilBits,
                          GLint accumRedBits,
@@ -277,7 +272,7 @@ _mesa_initialize_visual( GLvisual *vis,
    assert(accumBlueBits >= 0);
    assert(accumAlphaBits >= 0);
 
-   vis->rgbMode          = rgbFlag;
+   vis->rgbMode          = GL_TRUE;
    vis->doubleBufferMode = dbFlag;
    vis->stereoMode       = stereoFlag;
 
@@ -287,7 +282,7 @@ _mesa_initialize_visual( GLvisual *vis,
    vis->alphaBits        = alphaBits;
    vis->rgbBits          = redBits + greenBits + blueBits;
 
-   vis->indexBits      = indexBits;
+   vis->indexBits      = 0;
    vis->depthBits      = depthBits;
    vis->stencilBits    = stencilBits;
 
diff --git a/src/mesa/main/context.h b/src/mesa/main/context.h
index c3be1063f8..09bf1777da 100644
--- a/src/mesa/main/context.h
+++ b/src/mesa/main/context.h
@@ -60,14 +60,12 @@ struct _glapi_table;
 /*@{*/
  
 extern GLvisual *
-_mesa_create_visual( GLboolean rgbFlag,
-                     GLboolean dbFlag,
+_mesa_create_visual( GLboolean dbFlag,
                      GLboolean stereoFlag,
                      GLint redBits,
                      GLint greenBits,
                      GLint blueBits,
                      GLint alphaBits,
-                     GLint indexBits,
                      GLint depthBits,
                      GLint stencilBits,
                      GLint accumRedBits,
@@ -78,14 +76,12 @@ _mesa_create_visual( GLboolean rgbFlag,
 
 extern GLboolean
 _mesa_initialize_visual( GLvisual *v,
-                         GLboolean rgbFlag,
                          GLboolean dbFlag,
                          GLboolean stereoFlag,
                          GLint redBits,
                          GLint greenBits,
                          GLint blueBits,
                          GLint alphaBits,
-                         GLint indexBits,
                          GLint depthBits,
                          GLint stencilBits,
                          GLint accumRedBits,
-- 
cgit v1.2.3


From 22a96f305898b5d1aa26809c7156a01686eb9bf0 Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed, 24 Feb 2010 18:58:38 -0800
Subject: mesa: Remove checks of Visual.rgbMode

This must always be true now, so there is no reason to check it.  Ever.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
---
 src/mesa/main/clear.c        | 27 +--------------------------
 src/mesa/main/context.c      |  2 --
 src/mesa/main/feedback.c     | 11 +++--------
 src/mesa/main/framebuffer.c  |  7 +------
 src/mesa/main/light.c        | 41 ++++++++++++++++-------------------------
 src/mesa/main/rastpos.c      | 38 ++++++++++++++++----------------------
 src/mesa/main/readpix.c      | 16 ++++------------
 src/mesa/main/renderbuffer.c | 25 +++++++------------------
 8 files changed, 48 insertions(+), 119 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/clear.c b/src/mesa/main/clear.c
index 8085bedf1c..e76ab5527b 100644
--- a/src/mesa/main/clear.c
+++ b/src/mesa/main/clear.c
@@ -51,11 +51,6 @@ _mesa_ClearIndex( GLfloat c )
 
    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
 
@@ -92,7 +87,7 @@ _mesa_ClearColor( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha )
    FLUSH_VERTICES(ctx, _NEW_COLOR);
    COPY_4V(ctx->Color.ClearColor, tmp);
 
-   if (ctx->Visual.rgbMode && ctx->Driver.ClearColor) {
+   if (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);
    }
@@ -261,11 +256,6 @@ _mesa_ClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *value)
 
    FLUSH_CURRENT(ctx, 0);
 
-   if (!ctx->DrawBuffer->Visual.rgbMode) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glClearBufferiv()");
-      return;
-   }
-
    if (ctx->NewState) {
       _mesa_update_state( ctx );
    }
@@ -342,11 +332,6 @@ _mesa_ClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint *value)
 
    FLUSH_CURRENT(ctx, 0);
 
-   if (!ctx->DrawBuffer->Visual.rgbMode) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glClearBufferuiv()");
-      return;
-   }
-
    if (ctx->NewState) {
       _mesa_update_state( ctx );
    }
@@ -401,11 +386,6 @@ _mesa_ClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat *value)
 
    FLUSH_CURRENT(ctx, 0);
 
-   if (!ctx->DrawBuffer->Visual.rgbMode) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glClearBufferfv()");
-      return;
-   }
-
    if (ctx->NewState) {
       _mesa_update_state( ctx );
    }
@@ -480,11 +460,6 @@ _mesa_ClearBufferfi(GLenum buffer, GLint drawbuffer,
 
    FLUSH_CURRENT(ctx, 0);
 
-   if (!ctx->DrawBuffer->Visual.rgbMode) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glClearBufferfi()");
-      return;
-   }
-
    if (buffer != GL_DEPTH_STENCIL) {
       _mesa_error(ctx, GL_INVALID_ENUM, "glClearBufferfi(buffer=%s)",
                   _mesa_lookup_enum_by_nr(buffer));
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index b827d54176..73126b9575 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1164,8 +1164,6 @@ check_compatible(const GLcontext *ctx, const GLframebuffer *buffer)
    if (ctxvis == bufvis)
       return GL_TRUE;
 
-   if (ctxvis->rgbMode != bufvis->rgbMode)
-      return GL_FALSE;
 #if 0
    /* disabling this fixes the fgl_glxgears pbuffer demo */
    if (ctxvis->doubleBufferMode && !bufvis->doubleBufferMode)
diff --git a/src/mesa/main/feedback.c b/src/mesa/main/feedback.c
index e20456fa75..323cc53036 100644
--- a/src/mesa/main/feedback.c
+++ b/src/mesa/main/feedback.c
@@ -78,18 +78,13 @@ _mesa_FeedbackBuffer( GLsizei size, GLenum type, GLfloat *buffer )
 	 ctx->Feedback._Mask = FB_3D;
 	 break;
       case GL_3D_COLOR:
-	 ctx->Feedback._Mask = (FB_3D |
-				(ctx->Visual.rgbMode ? FB_COLOR : FB_INDEX));
+	 ctx->Feedback._Mask = (FB_3D | FB_COLOR);
 	 break;
       case GL_3D_COLOR_TEXTURE:
-	 ctx->Feedback._Mask = (FB_3D |
-				(ctx->Visual.rgbMode ? FB_COLOR : FB_INDEX) |
-				FB_TEXTURE);
+	 ctx->Feedback._Mask = (FB_3D | FB_COLOR | FB_TEXTURE);
 	 break;
       case GL_4D_COLOR_TEXTURE:
-	 ctx->Feedback._Mask = (FB_3D | FB_4D |
-				(ctx->Visual.rgbMode ? FB_COLOR : FB_INDEX) |
-				FB_TEXTURE);
+	 ctx->Feedback._Mask = (FB_3D | FB_4D | FB_COLOR | FB_TEXTURE);
 	 break;
       default:
          _mesa_error( ctx, GL_INVALID_ENUM, "glFeedbackBuffer" );
diff --git a/src/mesa/main/framebuffer.c b/src/mesa/main/framebuffer.c
index 269bc9ac6c..6a85162d5d 100644
--- a/src/mesa/main/framebuffer.c
+++ b/src/mesa/main/framebuffer.c
@@ -536,7 +536,7 @@ _mesa_update_framebuffer_visual(struct gl_framebuffer *fb)
    }
 #endif
 
-   /* find first RGB or CI renderbuffer */
+   /* find first RGB renderbuffer */
    for (i = 0; i < BUFFER_COUNT; i++) {
       if (fb->Attachment[i].Renderbuffer) {
          const struct gl_renderbuffer *rb = fb->Attachment[i].Renderbuffer;
@@ -554,11 +554,6 @@ _mesa_update_framebuffer_visual(struct gl_framebuffer *fb)
             fb->Visual.samples = rb->NumSamples;
             break;
          }
-         else if (baseFormat == GL_COLOR_INDEX) {
-            fb->Visual.indexBits = _mesa_get_format_bits(fmt, GL_INDEX_BITS);
-            fb->Visual.rgbMode = GL_FALSE;
-            break;
-         }
       }
    }
 
diff --git a/src/mesa/main/light.c b/src/mesa/main/light.c
index 6899ed0ddf..19dc96892d 100644
--- a/src/mesa/main/light.c
+++ b/src/mesa/main/light.c
@@ -1093,31 +1093,22 @@ _mesa_update_lighting( GLcontext *ctx )
     * FLUSH_UPDATE_CURRENT, as when any outstanding material changes
     * are flushed, they will update the derived state at that time.
     */
-   if (ctx->Visual.rgbMode) {
-      if (ctx->Light.Model.TwoSide)
-	 _mesa_update_material( ctx, 
-				MAT_BIT_FRONT_EMISSION |
-				MAT_BIT_FRONT_AMBIENT |
-				MAT_BIT_FRONT_DIFFUSE | 
-				MAT_BIT_FRONT_SPECULAR |
-				MAT_BIT_BACK_EMISSION |
-				MAT_BIT_BACK_AMBIENT |
-				MAT_BIT_BACK_DIFFUSE | 
-				MAT_BIT_BACK_SPECULAR);
-      else
-	 _mesa_update_material( ctx, 
-				MAT_BIT_FRONT_EMISSION |
-				MAT_BIT_FRONT_AMBIENT |
-				MAT_BIT_FRONT_DIFFUSE | 
-				MAT_BIT_FRONT_SPECULAR);
-   }
-   else {
-      static const GLfloat ci[3] = { .30F, .59F, .11F };
-      foreach(light, &ctx->Light.EnabledList) {
-	 light->_dli = DOT3(ci, light->Diffuse);
-	 light->_sli = DOT3(ci, light->Specular);
-      }
-   }
+   if (ctx->Light.Model.TwoSide)
+      _mesa_update_material(ctx,
+			    MAT_BIT_FRONT_EMISSION |
+			    MAT_BIT_FRONT_AMBIENT |
+			    MAT_BIT_FRONT_DIFFUSE |
+			    MAT_BIT_FRONT_SPECULAR |
+			    MAT_BIT_BACK_EMISSION |
+			    MAT_BIT_BACK_AMBIENT |
+			    MAT_BIT_BACK_DIFFUSE |
+			    MAT_BIT_BACK_SPECULAR);
+   else
+      _mesa_update_material(ctx,
+			    MAT_BIT_FRONT_EMISSION |
+			    MAT_BIT_FRONT_AMBIENT |
+			    MAT_BIT_FRONT_DIFFUSE |
+			    MAT_BIT_FRONT_SPECULAR);
 }
 
 
diff --git a/src/mesa/main/rastpos.c b/src/mesa/main/rastpos.c
index d72b846c36..03ff3b6bbc 100644
--- a/src/mesa/main/rastpos.c
+++ b/src/mesa/main/rastpos.c
@@ -246,28 +246,22 @@ window_pos3f(GLfloat x, GLfloat y, GLfloat z)
       ctx->Current.RasterDistance = 0.0;
 
    /* raster color = current color or index */
-   if (ctx->Visual.rgbMode) {
-      ctx->Current.RasterColor[0]
-         = CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][0], 0.0F, 1.0F);
-      ctx->Current.RasterColor[1]
-         = CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][1], 0.0F, 1.0F);
-      ctx->Current.RasterColor[2]
-         = CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][2], 0.0F, 1.0F);
-      ctx->Current.RasterColor[3]
-         = CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][3], 0.0F, 1.0F);
-      ctx->Current.RasterSecondaryColor[0]
-         = CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][0], 0.0F, 1.0F);
-      ctx->Current.RasterSecondaryColor[1]
-         = CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][1], 0.0F, 1.0F);
-      ctx->Current.RasterSecondaryColor[2]
-         = CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][2], 0.0F, 1.0F);
-      ctx->Current.RasterSecondaryColor[3]
-         = CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][3], 0.0F, 1.0F);
-   }
-   else {
-      ctx->Current.RasterIndex
-         = ctx->Current.Attrib[VERT_ATTRIB_COLOR_INDEX][0];
-   }
+   ctx->Current.RasterColor[0]
+      = CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][0], 0.0F, 1.0F);
+   ctx->Current.RasterColor[1]
+      = CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][1], 0.0F, 1.0F);
+   ctx->Current.RasterColor[2]
+      = CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][2], 0.0F, 1.0F);
+   ctx->Current.RasterColor[3]
+      = CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][3], 0.0F, 1.0F);
+   ctx->Current.RasterSecondaryColor[0]
+      = CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][0], 0.0F, 1.0F);
+   ctx->Current.RasterSecondaryColor[1]
+      = CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][1], 0.0F, 1.0F);
+   ctx->Current.RasterSecondaryColor[2]
+      = CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][2], 0.0F, 1.0F);
+   ctx->Current.RasterSecondaryColor[3]
+      = CLAMP(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][3], 0.0F, 1.0F);
 
    /* raster texcoord = current texcoord */
    {
diff --git a/src/mesa/main/readpix.c b/src/mesa/main/readpix.c
index feea1d375f..f4d74e8be6 100644
--- a/src/mesa/main/readpix.c
+++ b/src/mesa/main/readpix.c
@@ -77,14 +77,7 @@ _mesa_error_check_format_type(GLcontext *ctx, GLenum format, GLenum type,
    case GL_RGBA:
    case GL_BGRA:
    case GL_ABGR_EXT:
-      if (drawing) {
-         if (!ctx->DrawBuffer->Visual.rgbMode) {
-            _mesa_error(ctx, GL_INVALID_OPERATION,
-                   "glDrawPixels(drawing RGB pixels into color index buffer)");
-            return GL_TRUE;
-         }
-      }
-      else {
+      if (!drawing) {
          /* reading */
          if (!_mesa_source_buffer_exists(ctx, GL_COLOR)) {
             _mesa_error(ctx, GL_INVALID_OPERATION,
@@ -95,10 +88,9 @@ _mesa_error_check_format_type(GLcontext *ctx, GLenum format, GLenum type,
       break;
    case GL_COLOR_INDEX:
       if (drawing) {
-         if (ctx->DrawBuffer->Visual.rgbMode &&
-             (ctx->PixelMaps.ItoR.Size == 0 ||
-              ctx->PixelMaps.ItoG.Size == 0 ||
-              ctx->PixelMaps.ItoB.Size == 0)) {
+         if (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;
diff --git a/src/mesa/main/renderbuffer.c b/src/mesa/main/renderbuffer.c
index 2f42924046..7557b791e5 100644
--- a/src/mesa/main/renderbuffer.c
+++ b/src/mesa/main/renderbuffer.c
@@ -1907,21 +1907,13 @@ _mesa_add_soft_renderbuffers(struct gl_framebuffer *fb,
    GLboolean backRight = fb->Visual.stereoMode && fb->Visual.doubleBufferMode;
 
    if (color) {
-      if (fb->Visual.rgbMode) {
-         assert(fb->Visual.redBits == fb->Visual.greenBits);
-         assert(fb->Visual.redBits == fb->Visual.blueBits);
-         _mesa_add_color_renderbuffers(NULL, fb,
-                                       fb->Visual.redBits,
-                                       fb->Visual.alphaBits,
-                                       frontLeft, backLeft,
-                                       frontRight, backRight);
-      }
-      else {
-         _mesa_add_color_index_renderbuffers(NULL, fb,
-                                             fb->Visual.indexBits,
-                                             frontLeft, backLeft,
-                                             frontRight, backRight);
-      }
+      assert(fb->Visual.redBits == fb->Visual.greenBits);
+      assert(fb->Visual.redBits == fb->Visual.blueBits);
+      _mesa_add_color_renderbuffers(NULL, fb,
+				    fb->Visual.redBits,
+				    fb->Visual.alphaBits,
+				    frontLeft, backLeft,
+				    frontRight, backRight);
    }
 
    if (depth) {
@@ -1935,7 +1927,6 @@ _mesa_add_soft_renderbuffers(struct gl_framebuffer *fb,
    }
 
    if (accum) {
-      assert(fb->Visual.rgbMode);
       assert(fb->Visual.accumRedBits > 0);
       assert(fb->Visual.accumGreenBits > 0);
       assert(fb->Visual.accumBlueBits > 0);
@@ -1947,14 +1938,12 @@ _mesa_add_soft_renderbuffers(struct gl_framebuffer *fb,
    }
 
    if (aux) {
-      assert(fb->Visual.rgbMode);
       assert(fb->Visual.numAuxBuffers > 0);
       _mesa_add_aux_renderbuffers(NULL, fb, fb->Visual.redBits,
                                   fb->Visual.numAuxBuffers);
    }
 
    if (alpha) {
-      assert(fb->Visual.rgbMode);
       assert(fb->Visual.alphaBits > 0);
       _mesa_add_alpha_renderbuffers(NULL, fb, fb->Visual.alphaBits,
                                     frontLeft, backLeft,
-- 
cgit v1.2.3


From b9f63c277ac84f7b6598cb4e908033514d379171 Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed, 24 Feb 2010 19:00:50 -0800
Subject: mesa: Remove checks of Visual.rgbMode in Get paths

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
---
 src/mesa/main/get.c      | 16 ++++++++--------
 src/mesa/main/get_gen.py |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 60fef552c4..e390d29757 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -391,7 +391,7 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
          params[0] = INT_TO_BOOLEAN(ctx->Color.ClearIndex);
          break;
       case GL_INDEX_MODE:
-         params[0] = !ctx->DrawBuffer->Visual.rgbMode;
+         params[0] = GL_FALSE;
          break;
       case GL_INDEX_OFFSET:
          params[0] = INT_TO_BOOLEAN(ctx->Pixel.IndexOffset);
@@ -827,7 +827,7 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
          params[0] = ctx->Transform.RescaleNormals;
          break;
       case GL_RGBA_MODE:
-         params[0] = ctx->DrawBuffer->Visual.rgbMode;
+         params[0] = GL_TRUE;
          break;
       case GL_SCISSOR_BOX:
          params[0] = INT_TO_BOOLEAN(ctx->Scissor.X);
@@ -2260,7 +2260,7 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          params[0] = (GLfloat)(ctx->Color.ClearIndex);
          break;
       case GL_INDEX_MODE:
-         params[0] = BOOLEAN_TO_FLOAT(!ctx->DrawBuffer->Visual.rgbMode);
+         params[0] = BOOLEAN_TO_FLOAT(GL_FALSE);
          break;
       case GL_INDEX_OFFSET:
          params[0] = (GLfloat)(ctx->Pixel.IndexOffset);
@@ -2696,7 +2696,7 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          params[0] = BOOLEAN_TO_FLOAT(ctx->Transform.RescaleNormals);
          break;
       case GL_RGBA_MODE:
-         params[0] = BOOLEAN_TO_FLOAT(ctx->DrawBuffer->Visual.rgbMode);
+         params[0] = BOOLEAN_TO_FLOAT(GL_TRUE);
          break;
       case GL_SCISSOR_BOX:
          params[0] = (GLfloat)(ctx->Scissor.X);
@@ -4129,7 +4129,7 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
          params[0] = ctx->Color.ClearIndex;
          break;
       case GL_INDEX_MODE:
-         params[0] = BOOLEAN_TO_INT(!ctx->DrawBuffer->Visual.rgbMode);
+         params[0] = BOOLEAN_TO_INT(GL_FALSE);
          break;
       case GL_INDEX_OFFSET:
          params[0] = ctx->Pixel.IndexOffset;
@@ -4565,7 +4565,7 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
          params[0] = BOOLEAN_TO_INT(ctx->Transform.RescaleNormals);
          break;
       case GL_RGBA_MODE:
-         params[0] = BOOLEAN_TO_INT(ctx->DrawBuffer->Visual.rgbMode);
+         params[0] = BOOLEAN_TO_INT(GL_TRUE);
          break;
       case GL_SCISSOR_BOX:
          params[0] = ctx->Scissor.X;
@@ -5999,7 +5999,7 @@ _mesa_GetInteger64v( GLenum pname, GLint64 *params )
          params[0] = (GLint64)(ctx->Color.ClearIndex);
          break;
       case GL_INDEX_MODE:
-         params[0] = BOOLEAN_TO_INT64(!ctx->DrawBuffer->Visual.rgbMode);
+         params[0] = BOOLEAN_TO_INT64(GL_FALSE);
          break;
       case GL_INDEX_OFFSET:
          params[0] = (GLint64)(ctx->Pixel.IndexOffset);
@@ -6435,7 +6435,7 @@ _mesa_GetInteger64v( GLenum pname, GLint64 *params )
          params[0] = BOOLEAN_TO_INT64(ctx->Transform.RescaleNormals);
          break;
       case GL_RGBA_MODE:
-         params[0] = BOOLEAN_TO_INT64(ctx->DrawBuffer->Visual.rgbMode);
+         params[0] = BOOLEAN_TO_INT64(GL_TRUE);
          break;
       case GL_SCISSOR_BOX:
          params[0] = (GLint64)(ctx->Scissor.X);
diff --git a/src/mesa/main/get_gen.py b/src/mesa/main/get_gen.py
index 64aa2aca26..17ea1e4ae6 100644
--- a/src/mesa/main/get_gen.py
+++ b/src/mesa/main/get_gen.py
@@ -231,7 +231,7 @@ StateVars = [
 	( "GL_INDEX_BITS", GLint, ["ctx->DrawBuffer->Visual.indexBits"],
 	  "", None ),
 	( "GL_INDEX_CLEAR_VALUE", GLint, ["ctx->Color.ClearIndex"], "", None ),
-	( "GL_INDEX_MODE", GLboolean, ["!ctx->DrawBuffer->Visual.rgbMode"],
+	( "GL_INDEX_MODE", GLboolean, ["GL_FALSE"],
 	  "", None ),
 	( "GL_INDEX_OFFSET", GLint, ["ctx->Pixel.IndexOffset"], "", None ),
 	( "GL_INDEX_SHIFT", GLint, ["ctx->Pixel.IndexShift"], "", None ),
@@ -410,7 +410,7 @@ StateVars = [
 	( "GL_RENDER_MODE", GLenum, ["ctx->RenderMode"], "", None ),
 	( "GL_RESCALE_NORMAL", GLboolean,
 	  ["ctx->Transform.RescaleNormals"], "", None ),
-	( "GL_RGBA_MODE", GLboolean, ["ctx->DrawBuffer->Visual.rgbMode"],
+	( "GL_RGBA_MODE", GLboolean, ["GL_TRUE"],
 	  "", None ),
 	( "GL_SCISSOR_BOX", GLint,
 	  ["ctx->Scissor.X",
-- 
cgit v1.2.3


From 3d0f608e139336174121617f760398abca25eb31 Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed, 24 Feb 2010 19:03:23 -0800
Subject: mesa: Remove _mesa_add_color_index_renderbuffers

After all the recent color-index visual support removal,
_mesa_add_color_index_renderbuffers is no longer used anywhere.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
---
 src/mesa/main/renderbuffer.c | 56 --------------------------------------------
 src/mesa/main/renderbuffer.h |  6 -----
 2 files changed, 62 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/renderbuffer.c b/src/mesa/main/renderbuffer.c
index 7557b791e5..4d7b0aff04 100644
--- a/src/mesa/main/renderbuffer.c
+++ b/src/mesa/main/renderbuffer.c
@@ -1552,62 +1552,6 @@ _mesa_add_color_renderbuffers(GLcontext *ctx, struct gl_framebuffer *fb,
 }
 
 
-/**
- * Add software-based color index renderbuffers to the given framebuffer.
- * This is a helper routine for device drivers when creating a
- * window system framebuffer (not a user-created render/framebuffer).
- * Once this function is called, you can basically forget about this
- * renderbuffer; core Mesa will handle all the buffer management and
- * rendering!
- */
-GLboolean
-_mesa_add_color_index_renderbuffers(GLcontext *ctx, struct gl_framebuffer *fb,
-                                    GLuint indexBits,
-                                    GLboolean frontLeft, GLboolean backLeft,
-                                    GLboolean frontRight, GLboolean backRight)
-{
-   GLuint b;
-
-   if (indexBits > 8) {
-      _mesa_problem(ctx,
-                "Unsupported bit depth in _mesa_add_color_index_renderbuffers");
-      return GL_FALSE;
-   }
-
-   assert(MAX_COLOR_ATTACHMENTS >= 4);
-
-   for (b = BUFFER_FRONT_LEFT; b <= BUFFER_BACK_RIGHT; b++) {
-      struct gl_renderbuffer *rb;
-
-      if (b == BUFFER_FRONT_LEFT && !frontLeft)
-         continue;
-      else if (b == BUFFER_BACK_LEFT && !backLeft)
-         continue;
-      else if (b == BUFFER_FRONT_RIGHT && !frontRight)
-         continue;
-      else if (b == BUFFER_BACK_RIGHT && !backRight)
-         continue;
-
-      assert(fb->Attachment[b].Renderbuffer == NULL);
-
-      rb = _mesa_new_renderbuffer(ctx, 0);
-      if (!rb) {
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "Allocating color buffer");
-         return GL_FALSE;
-      }
-
-      assert(indexBits <= 8);
-      rb->Format = MESA_FORMAT_CI8;
-      rb->InternalFormat = GL_COLOR_INDEX;
-
-      rb->AllocStorage = _mesa_soft_renderbuffer_storage;
-      _mesa_add_renderbuffer(fb, b, rb);
-   }
-
-   return GL_TRUE;
-}
-
-
 /**
  * Add software-based alpha renderbuffers to the given framebuffer.
  * This is a helper routine for device drivers when creating a
diff --git a/src/mesa/main/renderbuffer.h b/src/mesa/main/renderbuffer.h
index c9bf888548..7c205e141c 100644
--- a/src/mesa/main/renderbuffer.h
+++ b/src/mesa/main/renderbuffer.h
@@ -52,12 +52,6 @@ _mesa_add_color_renderbuffers(GLcontext *ctx, struct gl_framebuffer *fb,
                               GLboolean frontLeft, GLboolean backLeft,
                               GLboolean frontRight, GLboolean backRight);
 
-extern GLboolean
-_mesa_add_color_index_renderbuffers(GLcontext *ctx, struct gl_framebuffer *fb,
-                                    GLuint indexBits,
-                                    GLboolean frontLeft, GLboolean backLeft,
-                                    GLboolean frontRight, GLboolean backRight);
-
 extern GLboolean
 _mesa_add_alpha_renderbuffers(GLcontext *ctx, struct gl_framebuffer *fb,
                               GLuint alphaBits,
-- 
cgit v1.2.3


From bb8c3b1bcc81fd5addc5e214f3efcfdca50c6806 Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed, 24 Feb 2010 19:12:30 -0800
Subject: mesa: Remove ClearIndex and IndexMask from device-driver interface

These are used to inform the driver of the clear value for color-index
buffers and to control write-masking of bits in color-index buffers.
No driver use or need (not even Nouveau) these interfaces.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
---
 src/mesa/drivers/common/driverfuncs.c              |  2 --
 src/mesa/drivers/dri/mach64/mach64_state.c         |  2 --
 src/mesa/drivers/dri/mga/mgastate.c                |  3 --
 src/mesa/drivers/dri/nouveau/nouveau_state.c       |  7 -----
 src/mesa/drivers/dri/r128/r128_state.c             |  2 --
 src/mesa/drivers/dri/r200/r200_state.c             |  2 --
 src/mesa/drivers/dri/radeon/radeon_state.c         |  2 --
 .../windows/gldirect/mesasw/gld_wgl_mesasw.c       | 16 ----------
 src/mesa/drivers/x11/xm_dd.c                       | 34 ----------------------
 src/mesa/main/blend.c                              |  3 --
 src/mesa/main/dd.h                                 |  4 ---
 11 files changed, 77 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c
index 87163e6505..ebfaa2f07b 100644
--- a/src/mesa/drivers/common/driverfuncs.c
+++ b/src/mesa/drivers/common/driverfuncs.c
@@ -142,7 +142,6 @@ _mesa_init_driver_functions(struct dd_function_table *driver)
    driver->BlendFuncSeparate = NULL;
    driver->ClearColor = NULL;
    driver->ClearDepth = NULL;
-   driver->ClearIndex = NULL;
    driver->ClearStencil = NULL;
    driver->ClipPlane = NULL;
    driver->ColorMask = NULL;
@@ -157,7 +156,6 @@ _mesa_init_driver_functions(struct dd_function_table *driver)
    driver->Enable = NULL;
    driver->Fogfv = NULL;
    driver->Hint = NULL;
-   driver->IndexMask = NULL;
    driver->Lightfv = NULL;
    driver->LightModelfv = NULL;
    driver->LineStipple = NULL;
diff --git a/src/mesa/drivers/dri/mach64/mach64_state.c b/src/mesa/drivers/dri/mach64/mach64_state.c
index b9093b5a13..69a5aea02c 100644
--- a/src/mesa/drivers/dri/mach64/mach64_state.c
+++ b/src/mesa/drivers/dri/mach64/mach64_state.c
@@ -1156,12 +1156,10 @@ void mach64DDInitStateFuncs( GLcontext *ctx )
 {
    ctx->Driver.UpdateState		= mach64DDInvalidateState;
 
-   ctx->Driver.ClearIndex		= NULL;
    ctx->Driver.ClearColor		= mach64DDClearColor;
    ctx->Driver.DrawBuffer		= mach64DDDrawBuffer;
    ctx->Driver.ReadBuffer		= mach64DDReadBuffer;
 
-   ctx->Driver.IndexMask		= NULL;
    ctx->Driver.ColorMask		= mach64DDColorMask;
    ctx->Driver.AlphaFunc		= mach64DDAlphaFunc;
    ctx->Driver.BlendEquationSeparate	= mach64DDBlendEquationSeparate;
diff --git a/src/mesa/drivers/dri/mga/mgastate.c b/src/mesa/drivers/dri/mga/mgastate.c
index 0253044761..745d5e9852 100644
--- a/src/mesa/drivers/dri/mga/mgastate.c
+++ b/src/mesa/drivers/dri/mga/mgastate.c
@@ -1193,8 +1193,5 @@ void mgaDDInitStateFuncs( GLcontext *ctx )
    ctx->Driver.Viewport = mgaViewport;
    ctx->Driver.RenderMode = mgaRenderMode;
 
-   ctx->Driver.ClearIndex = 0;
-   ctx->Driver.IndexMask = 0;
-
    TNL_CONTEXT(ctx)->Driver.RunPipeline = mgaRunPipeline;
 }
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_state.c b/src/mesa/drivers/dri/nouveau/nouveau_state.c
index 5d593ed4dd..e1871db0eb 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_state.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_state.c
@@ -242,12 +242,6 @@ nouveau_fog(GLcontext *ctx, GLenum pname, const GLfloat *params)
 	context_dirty(ctx, FOG);
 }
 
-static void
-nouveau_index_mask(GLcontext *ctx, GLuint mask)
-{
-	context_dirty(ctx, INDEX_MASK);
-}
-
 static void
 nouveau_light(GLcontext *ctx, GLenum light, GLenum pname, const GLfloat *params)
 {
@@ -504,7 +498,6 @@ nouveau_state_init(GLcontext *ctx)
 	ctx->Driver.DrawBuffers = nouveau_draw_buffers;
 	ctx->Driver.Enable = nouveau_enable;
 	ctx->Driver.Fogfv = nouveau_fog;
-	ctx->Driver.IndexMask = nouveau_index_mask;
 	ctx->Driver.Lightfv = nouveau_light;
 	ctx->Driver.LightModelfv = nouveau_light_model;
 	ctx->Driver.LineStipple = nouveau_line_stipple;
diff --git a/src/mesa/drivers/dri/r128/r128_state.c b/src/mesa/drivers/dri/r128/r128_state.c
index 42f6dd7388..4d773feaaa 100644
--- a/src/mesa/drivers/dri/r128/r128_state.c
+++ b/src/mesa/drivers/dri/r128/r128_state.c
@@ -1407,13 +1407,11 @@ void r128DDInitStateFuncs( GLcontext *ctx )
 {
    ctx->Driver.UpdateState		= r128DDInvalidateState;
 
-   ctx->Driver.ClearIndex		= NULL;
    ctx->Driver.ClearColor		= r128DDClearColor;
    ctx->Driver.ClearStencil		= r128DDClearStencil;
    ctx->Driver.DrawBuffer		= r128DDDrawBuffer;
    ctx->Driver.ReadBuffer		= r128DDReadBuffer;
 
-   ctx->Driver.IndexMask		= NULL;
    ctx->Driver.ColorMask		= r128DDColorMask;
    ctx->Driver.AlphaFunc		= r128DDAlphaFunc;
    ctx->Driver.BlendEquationSeparate	= r128DDBlendEquationSeparate;
diff --git a/src/mesa/drivers/dri/r200/r200_state.c b/src/mesa/drivers/dri/r200/r200_state.c
index b9ec6f428f..050e5aa877 100644
--- a/src/mesa/drivers/dri/r200/r200_state.c
+++ b/src/mesa/drivers/dri/r200/r200_state.c
@@ -2501,7 +2501,6 @@ void r200InitStateFuncs( struct dd_function_table *functions )
    functions->BlendFuncSeparate		= r200BlendFuncSeparate;
    functions->ClearColor		= r200ClearColor;
    functions->ClearDepth		= r200ClearDepth;
-   functions->ClearIndex		= NULL;
    functions->ClearStencil		= r200ClearStencil;
    functions->ClipPlane			= r200ClipPlane;
    functions->ColorMask			= r200ColorMask;
@@ -2513,7 +2512,6 @@ void r200InitStateFuncs( struct dd_function_table *functions )
    functions->Fogfv			= r200Fogfv;
    functions->FrontFace			= r200FrontFace;
    functions->Hint			= NULL;
-   functions->IndexMask			= NULL;
    functions->LightModelfv		= r200LightModelfv;
    functions->Lightfv			= r200Lightfv;
    functions->LineStipple		= r200LineStipple;
diff --git a/src/mesa/drivers/dri/radeon/radeon_state.c b/src/mesa/drivers/dri/radeon/radeon_state.c
index 7db745a180..0ce97e8697 100644
--- a/src/mesa/drivers/dri/radeon/radeon_state.c
+++ b/src/mesa/drivers/dri/radeon/radeon_state.c
@@ -2254,7 +2254,6 @@ void radeonInitStateFuncs( GLcontext *ctx , GLboolean dri2 )
    ctx->Driver.BlendFuncSeparate	= radeonBlendFuncSeparate;
    ctx->Driver.ClearColor		= radeonClearColor;
    ctx->Driver.ClearDepth		= radeonClearDepth;
-   ctx->Driver.ClearIndex		= NULL;
    ctx->Driver.ClearStencil		= radeonClearStencil;
    ctx->Driver.ClipPlane		= radeonClipPlane;
    ctx->Driver.ColorMask		= radeonColorMask;
@@ -2266,7 +2265,6 @@ void radeonInitStateFuncs( GLcontext *ctx , GLboolean dri2 )
    ctx->Driver.Fogfv			= radeonFogfv;
    ctx->Driver.FrontFace		= radeonFrontFace;
    ctx->Driver.Hint			= NULL;
-   ctx->Driver.IndexMask		= NULL;
    ctx->Driver.LightModelfv		= radeonLightModelfv;
    ctx->Driver.Lightfv			= radeonLightfv;
    ctx->Driver.LineStipple              = radeonLineStipple;
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 7ac425a109..f927abfa11 100644
--- a/src/mesa/drivers/windows/gldirect/mesasw/gld_wgl_mesasw.c
+++ b/src/mesa/drivers/windows/gldirect/mesasw/gld_wgl_mesasw.c
@@ -629,21 +629,6 @@ static void flush(GLcontext* ctx)
 }
 
 
-//---------------------------------------------------------------------------
-
-
-/*
- * Set the color index used to clear the color buffer.
- */
-static void clear_index(GLcontext* ctx, GLuint index)
-{
-	GLD_context *gldCtx = GLD_GET_CONTEXT(ctx);
-	WMesaContext *Current = GLD_GET_WMESA_DRIVER(gldCtx);
-  Current->clearpixel = index;
-}
-
-
-
 //---------------------------------------------------------------------------
 
 /*
@@ -1367,7 +1352,6 @@ static void wmesa_update_state_first_time(
 	ctx->Driver.Clear					= clear;
 	
 	ctx->Driver.Flush					= flush;
-	ctx->Driver.ClearIndex				= clear_index;
 	ctx->Driver.ClearColor				= clear_color;
 	ctx->Driver.Enable					= enable;
 	
diff --git a/src/mesa/drivers/x11/xm_dd.c b/src/mesa/drivers/x11/xm_dd.c
index d304192f4c..5edafb890b 100644
--- a/src/mesa/drivers/x11/xm_dd.c
+++ b/src/mesa/drivers/x11/xm_dd.c
@@ -106,18 +106,6 @@ finish_or_flush( GLcontext *ctx )
 }
 
 
-static void
-clear_index( GLcontext *ctx, GLuint index )
-{
-   if (ctx->DrawBuffer->Name == 0) {
-      const XMesaContext xmesa = XMESA_CONTEXT(ctx);
-      XMesaBuffer xmbuf = XMESA_BUFFER(ctx->DrawBuffer);
-      xmesa->clearpixel = (unsigned long) index;
-      XMesaSetForeground( xmesa->display, xmbuf->cleargc, (unsigned long) index );
-   }
-}
-
-
 static void
 clear_color( GLcontext *ctx, const GLfloat color[4] )
 {
@@ -144,26 +132,6 @@ clear_color( GLcontext *ctx, const GLfloat color[4] )
 
 
 
-/* Set index mask ala glIndexMask */
-static void
-index_mask( GLcontext *ctx, GLuint mask )
-{
-   const XMesaContext xmesa = XMESA_CONTEXT(ctx);
-   XMesaBuffer xmbuf = XMESA_BUFFER(ctx->DrawBuffer);
-   /* not sure this conditional is really needed */
-   if (xmbuf->backxrb && xmbuf->backxrb->pixmap) {
-      unsigned long m;
-      if (mask==0xffffffff) {
-	 m = ((unsigned long)~0L);
-      }
-      else {
-         m = (unsigned long) mask;
-      }
-      XMesaSetPlaneMask( xmesa->display, xmbuf->cleargc, m );
-   }
-}
-
-
 /* Implements glColorMask() */
 static void
 color_mask(GLcontext *ctx,
@@ -1143,9 +1111,7 @@ xmesa_init_driver_functions( XMesaVisual xmvisual,
    driver->GetBufferSize = NULL; /* OBSOLETE */
    driver->Flush = finish_or_flush;
    driver->Finish = finish_or_flush;
-   driver->ClearIndex = clear_index;
    driver->ClearColor = clear_color;
-   driver->IndexMask = index_mask;
    driver->ColorMask = color_mask;
    driver->Enable = enable;
    driver->Viewport = xmesa_viewport;
diff --git a/src/mesa/main/blend.c b/src/mesa/main/blend.c
index de60031cc8..d022770f24 100644
--- a/src/mesa/main/blend.c
+++ b/src/mesa/main/blend.c
@@ -456,9 +456,6 @@ _mesa_IndexMask( GLuint mask )
 
    FLUSH_VERTICES(ctx, _NEW_COLOR);
    ctx->Color.IndexMask = mask;
-
-   if (ctx->Driver.IndexMask)
-      ctx->Driver.IndexMask( ctx, mask );
 }
 #endif
 
diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index 079e44bb95..84b83fe273 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -620,8 +620,6 @@ struct dd_function_table {
    void (*ClearColor)(GLcontext *ctx, const GLfloat color[4]);
    /** Specify the clear value for the depth buffer */
    void (*ClearDepth)(GLcontext *ctx, GLclampd d);
-   /** Specify the clear value for the color index buffers */
-   void (*ClearIndex)(GLcontext *ctx, GLuint index);
    /** Specify the clear value for the stencil buffer */
    void (*ClearStencil)(GLcontext *ctx, GLint s);
    /** Specify a plane against which all geometry is clipped */
@@ -653,8 +651,6 @@ struct dd_function_table {
    void (*Fogfv)(GLcontext *ctx, GLenum pname, const GLfloat *params);
    /** Specify implementation-specific hints */
    void (*Hint)(GLcontext *ctx, GLenum target, GLenum mode);
-   /** Control the writing of individual bits in the color index buffers */
-   void (*IndexMask)(GLcontext *ctx, GLuint mask);
    /** Set light source parameters.
     * Note: for GL_POSITION and GL_SPOT_DIRECTION, params will have already
     * been transformed to eye-space.
-- 
cgit v1.2.3


From 24d311c13339978a37885e88a49a990903652339 Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed, 24 Feb 2010 19:25:19 -0800
Subject: mesa: Eliminate index parameter to _mesa_feedback_vertex

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
---
 src/mesa/main/drawpix.c                 | 3 ---
 src/mesa/main/feedback.c                | 9 ++-------
 src/mesa/main/feedback.h                | 2 --
 src/mesa/state_tracker/st_cb_feedback.c | 3 +--
 src/mesa/swrast/s_feedback.c            | 2 +-
 5 files changed, 4 insertions(+), 15 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/drawpix.c b/src/mesa/main/drawpix.c
index 84cb78612b..bf36a7e7a4 100644
--- a/src/mesa/main/drawpix.c
+++ b/src/mesa/main/drawpix.c
@@ -127,7 +127,6 @@ _mesa_DrawPixels( GLsizei width, GLsizei height,
       _mesa_feedback_vertex( ctx,
                              ctx->Current.RasterPos,
                              ctx->Current.RasterColor,
-                             ctx->Current.RasterIndex,
                              ctx->Current.RasterTexCoords[0] );
    }
    else {
@@ -213,7 +212,6 @@ _mesa_CopyPixels( GLint srcx, GLint srcy, GLsizei width, GLsizei height,
       _mesa_feedback_vertex( ctx, 
                              ctx->Current.RasterPos,
                              ctx->Current.RasterColor,
-                             ctx->Current.RasterIndex,
                              ctx->Current.RasterTexCoords[0] );
    }
    else {
@@ -293,7 +291,6 @@ _mesa_Bitmap( GLsizei width, GLsizei height,
       _mesa_feedback_vertex( ctx,
                              ctx->Current.RasterPos,
                              ctx->Current.RasterColor,
-                             ctx->Current.RasterIndex, 
                              ctx->Current.RasterTexCoords[0] );
    }
    else {
diff --git a/src/mesa/main/feedback.c b/src/mesa/main/feedback.c
index 323cc53036..c72b91280e 100644
--- a/src/mesa/main/feedback.c
+++ b/src/mesa/main/feedback.c
@@ -44,9 +44,8 @@
 
 #define FB_3D		0x01
 #define FB_4D		0x02
-#define FB_INDEX	0x04
-#define FB_COLOR	0x08
-#define FB_TEXTURE	0X10
+#define FB_COLOR	0x04
+#define FB_TEXTURE	0X08
 
 
 
@@ -120,7 +119,6 @@ void
 _mesa_feedback_vertex(GLcontext *ctx,
                       const GLfloat win[4],
                       const GLfloat color[4],
-                      GLfloat index,
                       const GLfloat texcoord[4])
 {
    _mesa_feedback_token( ctx, win[0] );
@@ -131,9 +129,6 @@ _mesa_feedback_vertex(GLcontext *ctx,
    if (ctx->Feedback._Mask & FB_4D) {
       _mesa_feedback_token( ctx, win[3] );
    }
-   if (ctx->Feedback._Mask & FB_INDEX) {
-      _mesa_feedback_token( ctx, (GLfloat) index );
-   }
    if (ctx->Feedback._Mask & FB_COLOR) {
       _mesa_feedback_token( ctx, color[0] );
       _mesa_feedback_token( ctx, color[1] );
diff --git a/src/mesa/main/feedback.h b/src/mesa/main/feedback.h
index 7a648f444f..3e8283ed23 100644
--- a/src/mesa/main/feedback.h
+++ b/src/mesa/main/feedback.h
@@ -41,7 +41,6 @@ extern void
 _mesa_feedback_vertex( GLcontext *ctx,
                        const GLfloat win[4],
                        const GLfloat color[4],
-                       GLfloat index,
                        const GLfloat texcoord[4] );
 
 
@@ -70,7 +69,6 @@ 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 */
diff --git a/src/mesa/state_tracker/st_cb_feedback.c b/src/mesa/state_tracker/st_cb_feedback.c
index edf26473d4..37b1fb55f4 100644
--- a/src/mesa/state_tracker/st_cb_feedback.c
+++ b/src/mesa/state_tracker/st_cb_feedback.c
@@ -83,7 +83,6 @@ feedback_vertex(GLcontext *ctx, const struct draw_context *draw,
    const struct st_context *st = ctx->st;
    GLfloat win[4];
    const GLfloat *color, *texcoord;
-   const GLfloat ci = 0;
    GLuint slot;
 
    /* Recall that Y=0=Top of window for Gallium wincoords */
@@ -109,7 +108,7 @@ feedback_vertex(GLcontext *ctx, const struct draw_context *draw,
    else
       texcoord = ctx->Current.Attrib[VERT_ATTRIB_TEX0];
 
-   _mesa_feedback_vertex(ctx, win, color, ci, texcoord);
+   _mesa_feedback_vertex(ctx, win, color, texcoord);
 }
 
 
diff --git a/src/mesa/swrast/s_feedback.c b/src/mesa/swrast/s_feedback.c
index 2e6066983d..373b1416e2 100644
--- a/src/mesa/swrast/s_feedback.c
+++ b/src/mesa/swrast/s_feedback.c
@@ -46,7 +46,7 @@ feedback_vertex(GLcontext * ctx, const SWvertex * v, const SWvertex * pv)
    win[2] = v->attrib[FRAG_ATTRIB_WPOS][2] / ctx->DrawBuffer->_DepthMaxF;
    win[3] = 1.0F / v->attrib[FRAG_ATTRIB_WPOS][3];
 
-   _mesa_feedback_vertex(ctx, win, color, v->attrib[FRAG_ATTRIB_CI][0], vtc);
+   _mesa_feedback_vertex(ctx, win, color, vtc);
 }
 
 
-- 
cgit v1.2.3


From 5c52b4292ff1aa37f38b20f33ff1642e1c20f894 Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed, 24 Feb 2010 19:28:04 -0800
Subject: mesa: Always return default value for CURRENT_RASTER_INDEX

Since there is no color-index rendering, it is impossible to update
this value.  Just return the initial setting and be happy.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
---
 src/mesa/main/get.c      | 8 ++++----
 src/mesa/main/get_gen.py | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index e390d29757..edc4400912 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -253,7 +253,7 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
          params[0] = FLOAT_TO_BOOLEAN(ctx->Current.RasterDistance);
          break;
       case GL_CURRENT_RASTER_INDEX:
-         params[0] = FLOAT_TO_BOOLEAN(ctx->Current.RasterIndex);
+         params[0] = FLOAT_TO_BOOLEAN(1.0);
          break;
       case GL_CURRENT_RASTER_POSITION:
          params[0] = FLOAT_TO_BOOLEAN(ctx->Current.RasterPos[0]);
@@ -2122,7 +2122,7 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          params[0] = ctx->Current.RasterDistance;
          break;
       case GL_CURRENT_RASTER_INDEX:
-         params[0] = ctx->Current.RasterIndex;
+         params[0] = 1.0;
          break;
       case GL_CURRENT_RASTER_POSITION:
          params[0] = ctx->Current.RasterPos[0];
@@ -3991,7 +3991,7 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
          params[0] = IROUND(ctx->Current.RasterDistance);
          break;
       case GL_CURRENT_RASTER_INDEX:
-         params[0] = IROUND(ctx->Current.RasterIndex);
+         params[0] = IROUND(1.0);
          break;
       case GL_CURRENT_RASTER_POSITION:
          params[0] = IROUND(ctx->Current.RasterPos[0]);
@@ -5861,7 +5861,7 @@ _mesa_GetInteger64v( GLenum pname, GLint64 *params )
          params[0] = IROUND64(ctx->Current.RasterDistance);
          break;
       case GL_CURRENT_RASTER_INDEX:
-         params[0] = IROUND64(ctx->Current.RasterIndex);
+         params[0] = IROUND64(1.0);
          break;
       case GL_CURRENT_RASTER_POSITION:
          params[0] = IROUND64(ctx->Current.RasterPos[0]);
diff --git a/src/mesa/main/get_gen.py b/src/mesa/main/get_gen.py
index 17ea1e4ae6..9d5a51d58c 100644
--- a/src/mesa/main/get_gen.py
+++ b/src/mesa/main/get_gen.py
@@ -155,7 +155,7 @@ StateVars = [
 	( "GL_CURRENT_RASTER_DISTANCE", GLfloat,
 	  ["ctx->Current.RasterDistance"], "", None ),
 	( "GL_CURRENT_RASTER_INDEX", GLfloat,
-	  ["ctx->Current.RasterIndex"], "", None ),
+	  ["1.0"], "", None ),
 	( "GL_CURRENT_RASTER_POSITION", GLfloat,
 	  ["ctx->Current.RasterPos[0]",
 	   "ctx->Current.RasterPos[1]",
-- 
cgit v1.2.3


From 06ceba0a7cab39e770a68b3ae8b8b4f17c0347d2 Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed, 24 Feb 2010 19:29:53 -0800
Subject: mesa: Remove unused RasterIndex field

With the preceeding changes, gl_current_attrib::RasterIndex is not
used.  Remove it.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
---
 src/mesa/main/mtypes.h  | 1 -
 src/mesa/main/rastpos.c | 1 -
 2 files changed, 2 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index e0ee3c9f5d..4d55ebb972 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -630,7 +630,6 @@ struct gl_current_attrib
    GLfloat RasterDistance;
    GLfloat RasterColor[4];
    GLfloat RasterSecondaryColor[4];
-   GLfloat RasterIndex;
    GLfloat RasterTexCoords[MAX_TEXTURE_COORD_UNITS][4];
    GLboolean RasterPosValid;
    /*@}*/
diff --git a/src/mesa/main/rastpos.c b/src/mesa/main/rastpos.c
index 03ff3b6bbc..75c67f2693 100644
--- a/src/mesa/main/rastpos.c
+++ b/src/mesa/main/rastpos.c
@@ -556,7 +556,6 @@ void _mesa_init_rastpos( GLcontext * ctx )
    ctx->Current.RasterDistance = 0.0;
    ASSIGN_4V( ctx->Current.RasterColor, 1.0, 1.0, 1.0, 1.0 );
    ASSIGN_4V( ctx->Current.RasterSecondaryColor, 0.0, 0.0, 0.0, 1.0 );
-   ctx->Current.RasterIndex = 1.0;
    for (i = 0; i < Elements(ctx->Current.RasterTexCoords); i++)
       ASSIGN_4V( ctx->Current.RasterTexCoords[i], 0.0, 0.0, 0.0, 1.0 );
    ctx->Current.RasterPosValid = GL_TRUE;
-- 
cgit v1.2.3


From 016fc30839f0fb67bb37d4a7353a7e38749deab5 Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed, 3 Mar 2010 16:02:45 -0800
Subject: Remove support for GCC older than 3.3.0

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
---
 include/GL/gl.h                       |  3 +--
 include/GL/glut.h                     |  2 +-
 src/egl/main/eglcompiler.h            |  5 ++---
 src/gallium/include/pipe/p_compiler.h |  7 +++----
 src/glx/XF86dri.c                     |  2 +-
 src/glx/glxclient.h                   |  2 +-
 src/glx/indirect_vertex_program.c     |  2 +-
 src/glx/pixelstore.c                  |  2 +-
 src/mesa/glapi/glapi.h                |  2 +-
 src/mesa/main/compiler.h              | 10 ++++------
 src/mesa/main/imports.h               |  4 +---
 src/mesa/x86/assyntax.h               |  2 +-
 12 files changed, 18 insertions(+), 25 deletions(-)

(limited to 'src/mesa/main')

diff --git a/include/GL/gl.h b/include/GL/gl.h
index 3fce3dfc0a..8e5f1383ff 100644
--- a/include/GL/gl.h
+++ b/include/GL/gl.h
@@ -67,8 +67,7 @@
 #elif defined(__CYGWIN__) && defined(USE_OPENGL32) /* use native windows opengl32 */
 #  define GLAPI extern
 #  define GLAPIENTRY __stdcall
-#elif (defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303) \
-	|| (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
+#elif defined(__GNUC__)	|| (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
 #  define GLAPI __attribute__((visibility("default")))
 #  define GLAPIENTRY
 #endif /* WIN32 && !CYGWIN */
diff --git a/include/GL/glut.h b/include/GL/glut.h
index d9fc938dc7..a282635205 100644
--- a/include/GL/glut.h
+++ b/include/GL/glut.h
@@ -103,7 +103,7 @@ extern "C" {
 #	define GLUTAPI extern
 #endif
 
-#elif defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303
+#elif defined(__GNUC__)
 
 #  define GLUTAPIENTRY
 #  define GLUTAPIENTRYV
diff --git a/src/egl/main/eglcompiler.h b/src/egl/main/eglcompiler.h
index d844fbb0ef..401a9cf56a 100644
--- a/src/egl/main/eglcompiler.h
+++ b/src/egl/main/eglcompiler.h
@@ -64,8 +64,7 @@
 /**
  * Function visibility
  */
-#if (defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303) \
-	|| (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
+#if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
 #  define PUBLIC __attribute__((visibility("default")))
 #else
 #  define PUBLIC
@@ -79,7 +78,7 @@
 #ifndef __FUNCTION__
 # if defined(__VMS)
 #  define __FUNCTION__ "VMS$NL:"
-# elif ((!defined __GNUC__) || (__GNUC__ < 2)) && (!defined __xlC__) && \
+# elif (!defined __GNUC__) && (!defined __xlC__) && \
       (!defined(_MSC_VER) || _MSC_VER < 1300)
 #  if (__STDC_VERSION__ >= 199901L) /* C99 */ || \
     (defined(__SUNPRO_C) && defined(__C99FEATURES__))
diff --git a/src/gallium/include/pipe/p_compiler.h b/src/gallium/include/pipe/p_compiler.h
index c7d3507494..b93b38310a 100644
--- a/src/gallium/include/pipe/p_compiler.h
+++ b/src/gallium/include/pipe/p_compiler.h
@@ -106,8 +106,7 @@ typedef unsigned char boolean;
 
 /* Function visibility */
 #ifndef PUBLIC
-#  if (defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303) \
-	|| (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
+#  if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
 #    define PUBLIC __attribute__((visibility("default")))
 #  else
 #    define PUBLIC
@@ -119,7 +118,7 @@ typedef unsigned char boolean;
  * If we're not using gcc, define __FUNCTION__ as a cpp symbol here.
  */
 #ifndef __FUNCTION__
-# if (!defined(__GNUC__) || (__GNUC__ < 2))
+# if !defined(__GNUC__)
 #  if (__STDC_VERSION__ >= 199901L) /* C99 */ || \
     (defined(__SUNPRO_C) && defined(__C99FEATURES__))
 #   define __FUNCTION__ __func__
@@ -145,7 +144,7 @@ typedef unsigned char boolean;
 
 
 
-#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
+#if defined(__GNUC__)
 #define PIPE_DEPRECATED  __attribute__((__deprecated__))
 #else
 #define PIPE_DEPRECATED
diff --git a/src/glx/XF86dri.c b/src/glx/XF86dri.c
index 248d96ac5d..fdbdd43000 100644
--- a/src/glx/XF86dri.c
+++ b/src/glx/XF86dri.c
@@ -45,7 +45,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "xf86dristr.h"
 
 
-#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303
+#if defined(__GNUC__)
 #  define PUBLIC __attribute__((visibility("default")))
 #  define USED __attribute__((used))
 #else
diff --git a/src/glx/glxclient.h b/src/glx/glxclient.h
index 04ce781c43..8e5dc785dd 100644
--- a/src/glx/glxclient.h
+++ b/src/glx/glxclient.h
@@ -69,7 +69,7 @@
  * 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
+#if defined(__GNUC__)
 #  define PUBLIC __attribute__((visibility("default")))
 #  define USED __attribute__((used))
 #else
diff --git a/src/glx/indirect_vertex_program.c b/src/glx/indirect_vertex_program.c
index 3313ac008a..d822a7ee56 100644
--- a/src/glx/indirect_vertex_program.c
+++ b/src/glx/indirect_vertex_program.c
@@ -30,7 +30,7 @@
 #include "indirect_vertex_array.h"
 #include <GL/glxproto.h>
 
-#if !defined __GNUC__ || __GNUC__ < 3
+#if !defined(__GNUC__)
 #  define __builtin_expect(x, y) x
 #endif
 
diff --git a/src/glx/pixelstore.c b/src/glx/pixelstore.c
index 8b51b5d8b7..dc193b9f74 100644
--- a/src/glx/pixelstore.c
+++ b/src/glx/pixelstore.c
@@ -31,7 +31,7 @@
 #include "glxclient.h"
 #include "indirect.h"
 
-#if !defined __GNUC__ || __GNUC__ < 3
+#if !defined(__GNUC__)
 #  define __builtin_expect(x, y) x
 #endif
 
diff --git a/src/mesa/glapi/glapi.h b/src/mesa/glapi/glapi.h
index 2eae6d5c43..1ca2e4beff 100644
--- a/src/mesa/glapi/glapi.h
+++ b/src/mesa/glapi/glapi.h
@@ -62,7 +62,7 @@ typedef void (*_glapi_proc)(void); /* generic function pointer */
 #endif
 
 
-#if defined(__GNUC__) && (__GNUC__ >= 3)
+#if defined(__GNUC__)
 #  define likely(x)   __builtin_expect(!!(x), 1)
 #  define unlikely(x) __builtin_expect(!!(x), 0)
 #else
diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h
index 9cef99f67a..05e69e56a6 100644
--- a/src/mesa/main/compiler.h
+++ b/src/mesa/main/compiler.h
@@ -173,8 +173,7 @@ extern "C" {
  * 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) \
-	|| (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
+#if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)
 #  define PUBLIC __attribute__((visibility("default")))
 #  define USED __attribute__((used))
 #else
@@ -197,7 +196,7 @@ extern "C" {
 /**
  * __builtin_expect macros
  */
-#if (!defined(__GNUC__) || __GNUC__ < 3) && (!defined(__IBMC__) || __IBMC__ < 900)
+#if !defined(__GNUC__)
 #  define __builtin_expect(x, y) x
 #endif
 
@@ -210,7 +209,7 @@ extern "C" {
 #ifndef __FUNCTION__
 # if defined(__VMS)
 #  define __FUNCTION__ "VMS$NL:"
-# elif ((!defined __GNUC__) || (__GNUC__ < 2)) && (!defined __xlC__) && \
+# elif !defined(__GNUC__) && !defined(__xlC__) &&	\
       (!defined(_MSC_VER) || _MSC_VER < 1300)
 #  if (__STDC_VERSION__ >= 199901L) /* C99 */ || \
     (defined(__SUNPRO_C) && defined(__C99FEATURES__))
@@ -322,8 +321,7 @@ static INLINE GLuint CPU_TO_LE32(GLuint x)
  * LONGSTRING macro
  * gcc -pedantic warns about long string literals, LONGSTRING silences that.
  */
-#if !defined(__GNUC__) || (__GNUC__ < 2) || \
-    ((__GNUC__ == 2) && (__GNUC_MINOR__ <= 7))
+#if !defined(__GNUC__)
 # define LONGSTRING
 #else
 # define LONGSTRING __extension__
diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h
index ac3a7b5d61..fb4a00eca7 100644
--- a/src/mesa/main/imports.h
+++ b/src/mesa/main/imports.h
@@ -240,9 +240,7 @@ static INLINE int GET_FLOAT_BITS( float x )
 /***
  *** IROUND: return (as an integer) float rounded to nearest integer
  ***/
-#if defined(USE_X86_ASM) && defined(__GNUC__) && defined(__i386__) && \
-			(!(defined(__BEOS__) || defined(__HAIKU__))  || \
-			(__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)))
+#if defined(USE_X86_ASM) && defined(__GNUC__) && defined(__i386__)
 static INLINE int iround(float f)
 {
    int r;
diff --git a/src/mesa/x86/assyntax.h b/src/mesa/x86/assyntax.h
index de1f6a48de..4a41812f6b 100644
--- a/src/mesa/x86/assyntax.h
+++ b/src/mesa/x86/assyntax.h
@@ -1737,7 +1737,7 @@ SECTION _DATA public align=16 class=DATA use32 flat
  */
 #if defined(GNU_ASSEMBLER) && !defined(__DJGPP__) && !defined(__MINGW32__) && !defined(__APPLE__)
 #  define HIDDEN(x) .hidden x
-#elif defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303 && !defined(__DJGPP__) && !defined(__MINGW32__) && !defined(__APPLE__)
+#elif defined(__GNUC__) && !defined(__DJGPP__) && !defined(__MINGW32__) && !defined(__APPLE__)
 #  pragma GCC visibility push(default)
 #  define HIDDEN(x) .hidden x
 #else
-- 
cgit v1.2.3


From 6d9a9e57dc312a2f9f09a6b826a2de93fab5ae26 Mon Sep 17 00:00:00 2001
From: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed, 3 Mar 2010 17:50:11 -0800
Subject: Fix unmatched parenthesis introduce by previous commits

I wasn't careful enough when removing support for GCC versions earlier
than 3.3.0.  I could have sworn that I compile tested before pushing,
but apparently not.  FAIL.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
---
 src/glx/indirect.h           | 2 +-
 src/glx/indirect_size.c      | 2 +-
 src/glx/indirect_size.h      | 2 +-
 src/mesa/glapi/gen/gl_XML.py | 2 +-
 src/mesa/glapi/glapitemp.h   | 2 +-
 src/mesa/main/compiler.h     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/glx/indirect.h b/src/glx/indirect.h
index 7064bfe279..b09b61aae7 100644
--- a/src/glx/indirect.h
+++ b/src/glx/indirect.h
@@ -37,7 +37,7 @@
  * \author Ian Romanick <idr@us.ibm.com>
  */
 
-#  if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))) && defined(__ELF__)
+#  if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) && defined(__ELF__)
 #    define HIDDEN  __attribute__((visibility("hidden")))
 #  else
 #    define HIDDEN
diff --git a/src/glx/indirect_size.c b/src/glx/indirect_size.c
index 5a8f27ba92..0c136d26cd 100644
--- a/src/glx/indirect_size.c
+++ b/src/glx/indirect_size.c
@@ -41,7 +41,7 @@
 #    define FASTCALL
 #  endif
 
-#  if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))) && defined(__ELF__)
+#  if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) && defined(__ELF__)
 #    define INTERNAL  __attribute__((visibility("internal")))
 #  else
 #    define INTERNAL
diff --git a/src/glx/indirect_size.h b/src/glx/indirect_size.h
index 43f504a319..79b849b683 100644
--- a/src/glx/indirect_size.h
+++ b/src/glx/indirect_size.h
@@ -48,7 +48,7 @@
 #    define FASTCALL
 #  endif
 
-#  if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))) && defined(__ELF__)
+#  if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) && defined(__ELF__)
 #    define INTERNAL  __attribute__((visibility("internal")))
 #  else
 #    define INTERNAL
diff --git a/src/mesa/glapi/gen/gl_XML.py b/src/mesa/glapi/gen/gl_XML.py
index b769ee2bb5..660c8cfb71 100644
--- a/src/mesa/glapi/gen/gl_XML.py
+++ b/src/mesa/glapi/gen/gl_XML.py
@@ -224,7 +224,7 @@ class gl_print_base:
 		"""
 
 		self.undef_list.append(S)
-		print """#  if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))) && defined(__ELF__)
+		print """#  if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) && defined(__ELF__)
 #    define %s  __attribute__((visibility("%s")))
 #  else
 #    define %s
diff --git a/src/mesa/glapi/glapitemp.h b/src/mesa/glapi/glapitemp.h
index f9b803e2ab..67c691c3fb 100644
--- a/src/mesa/glapi/glapitemp.h
+++ b/src/mesa/glapi/glapitemp.h
@@ -27,7 +27,7 @@
  */
 
 
-#  if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))) && defined(__ELF__)
+#  if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)) && defined(__ELF__)
 #    define HIDDEN  __attribute__((visibility("hidden")))
 #  else
 #    define HIDDEN
diff --git a/src/mesa/main/compiler.h b/src/mesa/main/compiler.h
index 05e69e56a6..81704ae2c1 100644
--- a/src/mesa/main/compiler.h
+++ b/src/mesa/main/compiler.h
@@ -173,7 +173,7 @@ extern "C" {
  * 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__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590)
+#if defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
 #  define PUBLIC __attribute__((visibility("default")))
 #  define USED __attribute__((used))
 #else
-- 
cgit v1.2.3


From df62b0da92f50b309d79d6552ecdf5a59910c80a Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Thu, 4 Mar 2010 00:41:21 -0800
Subject: mesa: Add asserts to check inputs to memcpy.

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

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/mipmap.c b/src/mesa/main/mipmap.c
index e2efe81a8f..51f7edfab1 100644
--- a/src/mesa/main/mipmap.c
+++ b/src/mesa/main/mipmap.c
@@ -1325,6 +1325,8 @@ make_2d_stack_mipmap(GLenum datatype, GLuint comps, GLint border,
       if (border > 0) {
          /* fill in dest border */
          /* lower-left border pixel */
+         assert(dstPtr);
+         assert(srcPtr);
          memcpy(dstPtr, srcPtr, bpt);
          /* lower-right border pixel */
          memcpy(dstPtr + (dstWidth - 1) * bpt,
-- 
cgit v1.2.3


From f9504e75f02586a8561733e0e2711c65efa2979d Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Thu, 4 Mar 2010 01:24:44 -0800
Subject: mesa: Fix unsigned comparison.

---
 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 326ad6f909..80bc826d21 100644
--- a/src/mesa/main/api_validate.c
+++ b/src/mesa/main/api_validate.c
@@ -147,7 +147,7 @@ check_index_bounds(GLcontext *ctx, GLsizei count, GLenum type,
 
    vbo_get_minmax_index(ctx, &prim, &ib, &min, &max);
 
-   if (min + basevertex < 0 ||
+   if (min < basevertex ||
        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 "
-- 
cgit v1.2.3


From 34b2cec95c9e7781f4d32deed9980f05ee553d1d Mon Sep 17 00:00:00 2001
From: Vinson Lee <vlee@vmware.com>
Date: Thu, 4 Mar 2010 01:51:50 -0800
Subject: Revert "mesa: Fix unsigned comparison."

This reverts commit f9504e75f02586a8561733e0e2711c65efa2979d.

This patch is incorrect.
---
 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 80bc826d21..326ad6f909 100644
--- a/src/mesa/main/api_validate.c
+++ b/src/mesa/main/api_validate.c
@@ -147,7 +147,7 @@ check_index_bounds(GLcontext *ctx, GLsizei count, GLenum type,
 
    vbo_get_minmax_index(ctx, &prim, &ib, &min, &max);
 
-   if (min < basevertex ||
+   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 "
-- 
cgit v1.2.3


From 894d0ab9388543642b6940f09358844736a8bd3a Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Thu, 12 Nov 2009 10:15:49 +0000
Subject: APPLE_object_purgeable: autogenerated files

---
 src/mesa/glapi/glapidispatch.h |   37 +-
 src/mesa/glapi/glapioffsets.h  |   22 +-
 src/mesa/glapi/glapitable.h    |   17 +-
 src/mesa/glapi/glapitemp.h     |   44 +-
 src/mesa/glapi/glprocs.h       |  640 ++---
 src/mesa/main/enums.c          | 6108 ++++++++++++++++++++--------------------
 src/mesa/main/remap_helper.h   | 3040 ++++++++++----------
 src/mesa/sparc/glapi_sparc.S   |   19 +-
 src/mesa/x86-64/glapi_x86-64.S |  195 +-
 src/mesa/x86/glapi_x86.S       |   23 +-
 10 files changed, 5182 insertions(+), 4963 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/glapi/glapidispatch.h b/src/mesa/glapi/glapidispatch.h
index b7f661c535..7e0f21390f 100644
--- a/src/mesa/glapi/glapidispatch.h
+++ b/src/mesa/glapi/glapidispatch.h
@@ -2455,6 +2455,15 @@
 #define CALL_TextureRangeAPPLE(disp, parameters) (*((disp)->TextureRangeAPPLE)) parameters
 #define GET_TextureRangeAPPLE(disp) ((disp)->TextureRangeAPPLE)
 #define SET_TextureRangeAPPLE(disp, fn) ((disp)->TextureRangeAPPLE = fn)
+#define CALL_GetObjectParameterivAPPLE(disp, parameters) (*((disp)->GetObjectParameterivAPPLE)) parameters
+#define GET_GetObjectParameterivAPPLE(disp) ((disp)->GetObjectParameterivAPPLE)
+#define SET_GetObjectParameterivAPPLE(disp, fn) ((disp)->GetObjectParameterivAPPLE = fn)
+#define CALL_ObjectPurgeableAPPLE(disp, parameters) (*((disp)->ObjectPurgeableAPPLE)) parameters
+#define GET_ObjectPurgeableAPPLE(disp) ((disp)->ObjectPurgeableAPPLE)
+#define SET_ObjectPurgeableAPPLE(disp, fn) ((disp)->ObjectPurgeableAPPLE = fn)
+#define CALL_ObjectUnpurgeableAPPLE(disp, parameters) (*((disp)->ObjectUnpurgeableAPPLE)) parameters
+#define GET_ObjectUnpurgeableAPPLE(disp) ((disp)->ObjectUnpurgeableAPPLE)
+#define SET_ObjectUnpurgeableAPPLE(disp, fn) ((disp)->ObjectUnpurgeableAPPLE = fn)
 #define CALL_StencilFuncSeparateATI(disp, parameters) (*((disp)->StencilFuncSeparateATI)) parameters
 #define GET_StencilFuncSeparateATI(disp) ((disp)->StencilFuncSeparateATI)
 #define SET_StencilFuncSeparateATI(disp, fn) ((disp)->StencilFuncSeparateATI = fn)
@@ -2479,7 +2488,7 @@
 
 #else
 
-#define driDispatchRemapTable_size 397
+#define driDispatchRemapTable_size 400
 extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 
 #define AttachShader_remap_index 0
@@ -2872,13 +2881,16 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define ProvokingVertexEXT_remap_index 387
 #define GetTexParameterPointervAPPLE_remap_index 388
 #define TextureRangeAPPLE_remap_index 389
-#define StencilFuncSeparateATI_remap_index 390
-#define ProgramEnvParameters4fvEXT_remap_index 391
-#define ProgramLocalParameters4fvEXT_remap_index 392
-#define GetQueryObjecti64vEXT_remap_index 393
-#define GetQueryObjectui64vEXT_remap_index 394
-#define EGLImageTargetRenderbufferStorageOES_remap_index 395
-#define EGLImageTargetTexture2DOES_remap_index 396
+#define GetObjectParameterivAPPLE_remap_index 390
+#define ObjectPurgeableAPPLE_remap_index 391
+#define ObjectUnpurgeableAPPLE_remap_index 392
+#define StencilFuncSeparateATI_remap_index 393
+#define ProgramEnvParameters4fvEXT_remap_index 394
+#define ProgramLocalParameters4fvEXT_remap_index 395
+#define GetQueryObjecti64vEXT_remap_index 396
+#define GetQueryObjectui64vEXT_remap_index 397
+#define EGLImageTargetRenderbufferStorageOES_remap_index 398
+#define EGLImageTargetTexture2DOES_remap_index 399
 
 #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])
@@ -4050,6 +4062,15 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #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_GetObjectParameterivAPPLE(disp, parameters) CALL_by_offset(disp, (void (GLAPIENTRYP)(GLenum, GLuint, GLenum, GLint *)), driDispatchRemapTable[GetObjectParameterivAPPLE_remap_index], parameters)
+#define GET_GetObjectParameterivAPPLE(disp) GET_by_offset(disp, driDispatchRemapTable[GetObjectParameterivAPPLE_remap_index])
+#define SET_GetObjectParameterivAPPLE(disp, fn) SET_by_offset(disp, driDispatchRemapTable[GetObjectParameterivAPPLE_remap_index], fn)
+#define CALL_ObjectPurgeableAPPLE(disp, parameters) CALL_by_offset(disp, (GLenum (GLAPIENTRYP)(GLenum, GLuint, GLenum)), driDispatchRemapTable[ObjectPurgeableAPPLE_remap_index], parameters)
+#define GET_ObjectPurgeableAPPLE(disp) GET_by_offset(disp, driDispatchRemapTable[ObjectPurgeableAPPLE_remap_index])
+#define SET_ObjectPurgeableAPPLE(disp, fn) SET_by_offset(disp, driDispatchRemapTable[ObjectPurgeableAPPLE_remap_index], fn)
+#define CALL_ObjectUnpurgeableAPPLE(disp, parameters) CALL_by_offset(disp, (GLenum (GLAPIENTRYP)(GLenum, GLuint, GLenum)), driDispatchRemapTable[ObjectUnpurgeableAPPLE_remap_index], parameters)
+#define GET_ObjectUnpurgeableAPPLE(disp) GET_by_offset(disp, driDispatchRemapTable[ObjectUnpurgeableAPPLE_remap_index])
+#define SET_ObjectUnpurgeableAPPLE(disp, fn) SET_by_offset(disp, driDispatchRemapTable[ObjectUnpurgeableAPPLE_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 8e16e22983..6d7bc2a0fa 100644
--- a/src/mesa/glapi/glapioffsets.h
+++ b/src/mesa/glapi/glapioffsets.h
@@ -832,14 +832,17 @@
 #define _gloffset_ProvokingVertexEXT 795
 #define _gloffset_GetTexParameterPointervAPPLE 796
 #define _gloffset_TextureRangeAPPLE 797
-#define _gloffset_StencilFuncSeparateATI 798
-#define _gloffset_ProgramEnvParameters4fvEXT 799
-#define _gloffset_ProgramLocalParameters4fvEXT 800
-#define _gloffset_GetQueryObjecti64vEXT 801
-#define _gloffset_GetQueryObjectui64vEXT 802
-#define _gloffset_EGLImageTargetRenderbufferStorageOES 803
-#define _gloffset_EGLImageTargetTexture2DOES 804
-#define _gloffset_FIRST_DYNAMIC 805
+#define _gloffset_GetObjectParameterivAPPLE 798
+#define _gloffset_ObjectPurgeableAPPLE 799
+#define _gloffset_ObjectUnpurgeableAPPLE 800
+#define _gloffset_StencilFuncSeparateATI 801
+#define _gloffset_ProgramEnvParameters4fvEXT 802
+#define _gloffset_ProgramLocalParameters4fvEXT 803
+#define _gloffset_GetQueryObjecti64vEXT 804
+#define _gloffset_GetQueryObjectui64vEXT 805
+#define _gloffset_EGLImageTargetRenderbufferStorageOES 806
+#define _gloffset_EGLImageTargetTexture2DOES 807
+#define _gloffset_FIRST_DYNAMIC 808
 
 #else
 
@@ -1233,6 +1236,9 @@
 #define _gloffset_ProvokingVertexEXT driDispatchRemapTable[ProvokingVertexEXT_remap_index]
 #define _gloffset_GetTexParameterPointervAPPLE driDispatchRemapTable[GetTexParameterPointervAPPLE_remap_index]
 #define _gloffset_TextureRangeAPPLE driDispatchRemapTable[TextureRangeAPPLE_remap_index]
+#define _gloffset_GetObjectParameterivAPPLE driDispatchRemapTable[GetObjectParameterivAPPLE_remap_index]
+#define _gloffset_ObjectPurgeableAPPLE driDispatchRemapTable[ObjectPurgeableAPPLE_remap_index]
+#define _gloffset_ObjectUnpurgeableAPPLE driDispatchRemapTable[ObjectUnpurgeableAPPLE_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 8aeb450b99..149ff3f3c4 100644
--- a/src/mesa/glapi/glapitable.h
+++ b/src/mesa/glapi/glapitable.h
@@ -838,13 +838,16 @@ struct _glapi_table
    void (GLAPIENTRYP ProvokingVertexEXT)(GLenum mode); /* 795 */
    void (GLAPIENTRYP GetTexParameterPointervAPPLE)(GLenum target, GLenum pname, GLvoid ** params); /* 796 */
    void (GLAPIENTRYP TextureRangeAPPLE)(GLenum target, GLsizei length, GLvoid * pointer); /* 797 */
-   void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 798 */
-   void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 799 */
-   void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 800 */
-   void (GLAPIENTRYP GetQueryObjecti64vEXT)(GLuint id, GLenum pname, GLint64EXT * params); /* 801 */
-   void (GLAPIENTRYP GetQueryObjectui64vEXT)(GLuint id, GLenum pname, GLuint64EXT * params); /* 802 */
-   void (GLAPIENTRYP EGLImageTargetRenderbufferStorageOES)(GLenum target, GLvoid * writeOffset); /* 803 */
-   void (GLAPIENTRYP EGLImageTargetTexture2DOES)(GLenum target, GLvoid * writeOffset); /* 804 */
+   void (GLAPIENTRYP GetObjectParameterivAPPLE)(GLenum objectType, GLuint name, GLenum pname, GLint * value); /* 798 */
+   GLenum (GLAPIENTRYP ObjectPurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 799 */
+   GLenum (GLAPIENTRYP ObjectUnpurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 800 */
+   void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 801 */
+   void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 802 */
+   void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 803 */
+   void (GLAPIENTRYP GetQueryObjecti64vEXT)(GLuint id, GLenum pname, GLint64EXT * params); /* 804 */
+   void (GLAPIENTRYP GetQueryObjectui64vEXT)(GLuint id, GLenum pname, GLuint64EXT * params); /* 805 */
+   void (GLAPIENTRYP EGLImageTargetRenderbufferStorageOES)(GLenum target, GLvoid * writeOffset); /* 806 */
+   void (GLAPIENTRYP EGLImageTargetTexture2DOES)(GLenum target, GLvoid * writeOffset); /* 807 */
 };
 
 #endif /* !defined( _GLAPI_TABLE_H_ ) */
diff --git a/src/mesa/glapi/glapitemp.h b/src/mesa/glapi/glapitemp.h
index 67c691c3fb..ea6b61159d 100644
--- a/src/mesa/glapi/glapitemp.h
+++ b/src/mesa/glapi/glapitemp.h
@@ -5577,37 +5577,52 @@ KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_797)(GLenum target, GLsizei lengt
    DISPATCH(TextureRangeAPPLE, (target, length, pointer), (F, "glTextureRangeAPPLE(0x%x, %d, %p);\n", target, length, (const void *) pointer));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_798)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+KEYWORD1 void KEYWORD2 NAME(GetObjectParameterivAPPLE)(GLenum objectType, GLuint name, GLenum pname, GLint * value)
+{
+   DISPATCH(GetObjectParameterivAPPLE, (objectType, name, pname, value), (F, "glGetObjectParameterivAPPLE(0x%x, %d, 0x%x, %p);\n", objectType, name, pname, (const void *) value));
+}
+
+KEYWORD1 GLenum KEYWORD2 NAME(ObjectPurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option)
+{
+   RETURN_DISPATCH(ObjectPurgeableAPPLE, (objectType, name, option), (F, "glObjectPurgeableAPPLE(0x%x, %d, 0x%x);\n", objectType, name, option));
+}
+
+KEYWORD1 GLenum KEYWORD2 NAME(ObjectUnpurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option)
+{
+   RETURN_DISPATCH(ObjectUnpurgeableAPPLE, (objectType, name, option), (F, "glObjectUnpurgeableAPPLE(0x%x, %d, 0x%x);\n", objectType, name, option));
+}
+
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_801)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_798)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_801)(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_799)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_802)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_799)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_802)(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_800)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_803)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_800)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_803)(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_801)(GLuint id, GLenum pname, GLint64EXT * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_804)(GLuint id, GLenum pname, GLint64EXT * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_801)(GLuint id, GLenum pname, GLint64EXT * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_804)(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_802)(GLuint id, GLenum pname, GLuint64EXT * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_805)(GLuint id, GLenum pname, GLuint64EXT * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_802)(GLuint id, GLenum pname, GLuint64EXT * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_805)(GLuint id, GLenum pname, GLuint64EXT * params)
 {
    DISPATCH(GetQueryObjectui64vEXT, (id, pname, params), (F, "glGetQueryObjectui64vEXT(%d, 0x%x, %p);\n", id, pname, (const void *) params));
 }
@@ -6573,11 +6588,14 @@ _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(ProvokingVertexEXT),
    TABLE_ENTRY(_dispatch_stub_796),
    TABLE_ENTRY(_dispatch_stub_797),
-   TABLE_ENTRY(_dispatch_stub_798),
-   TABLE_ENTRY(_dispatch_stub_799),
-   TABLE_ENTRY(_dispatch_stub_800),
+   TABLE_ENTRY(GetObjectParameterivAPPLE),
+   TABLE_ENTRY(ObjectPurgeableAPPLE),
+   TABLE_ENTRY(ObjectUnpurgeableAPPLE),
    TABLE_ENTRY(_dispatch_stub_801),
    TABLE_ENTRY(_dispatch_stub_802),
+   TABLE_ENTRY(_dispatch_stub_803),
+   TABLE_ENTRY(_dispatch_stub_804),
+   TABLE_ENTRY(_dispatch_stub_805),
    TABLE_ENTRY(EGLImageTargetRenderbufferStorageOES),
    TABLE_ENTRY(EGLImageTargetTexture2DOES),
    /* A whole bunch of no-op functions.  These might be called
diff --git a/src/mesa/glapi/glprocs.h b/src/mesa/glapi/glprocs.h
index 513fa89726..44861863e6 100644
--- a/src/mesa/glapi/glprocs.h
+++ b/src/mesa/glapi/glprocs.h
@@ -850,6 +850,9 @@ static const char gl_string_table[] =
     "glProvokingVertexEXT\0"
     "glGetTexParameterPointervAPPLE\0"
     "glTextureRangeAPPLE\0"
+    "glGetObjectParameterivAPPLE\0"
+    "glObjectPurgeableAPPLE\0"
+    "glObjectUnpurgeableAPPLE\0"
     "glStencilFuncSeparateATI\0"
     "glProgramEnvParameters4fvEXT\0"
     "glProgramLocalParameters4fvEXT\0"
@@ -1208,11 +1211,11 @@ static const char gl_string_table[] =
 #define gl_dispatch_stub_785 mgl_dispatch_stub_785
 #define gl_dispatch_stub_796 mgl_dispatch_stub_796
 #define gl_dispatch_stub_797 mgl_dispatch_stub_797
-#define gl_dispatch_stub_798 mgl_dispatch_stub_798
-#define gl_dispatch_stub_799 mgl_dispatch_stub_799
-#define gl_dispatch_stub_800 mgl_dispatch_stub_800
 #define gl_dispatch_stub_801 mgl_dispatch_stub_801
 #define gl_dispatch_stub_802 mgl_dispatch_stub_802
+#define gl_dispatch_stub_803 mgl_dispatch_stub_803
+#define gl_dispatch_stub_804 mgl_dispatch_stub_804
+#define gl_dispatch_stub_805 mgl_dispatch_stub_805
 #endif /* USE_MGL_NAMESPACE */
 
 
@@ -1262,11 +1265,11 @@ void GLAPIENTRY gl_dispatch_stub_784(GLenum target, GLenum pname, GLint param);
 void GLAPIENTRY gl_dispatch_stub_785(GLenum target, GLintptr offset, GLsizeiptr size);
 void GLAPIENTRY gl_dispatch_stub_796(GLenum target, GLenum pname, GLvoid ** params);
 void GLAPIENTRY gl_dispatch_stub_797(GLenum target, GLsizei length, GLvoid * pointer);
-void GLAPIENTRY gl_dispatch_stub_798(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-void GLAPIENTRY gl_dispatch_stub_799(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_800(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_801(GLuint id, GLenum pname, GLint64EXT * params);
-void GLAPIENTRY gl_dispatch_stub_802(GLuint id, GLenum pname, GLuint64EXT * params);
+void GLAPIENTRY gl_dispatch_stub_801(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+void GLAPIENTRY gl_dispatch_stub_802(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_803(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_804(GLuint id, GLenum pname, GLint64EXT * params);
+void GLAPIENTRY gl_dispatch_stub_805(GLuint id, GLenum pname, GLuint64EXT * params);
 #endif /* defined(NEED_FUNCTION_POINTER) || defined(GLX_INDIRECT_RENDERING) */
 
 static const glprocs_table_t static_functions[] = {
@@ -2068,315 +2071,318 @@ static const glprocs_table_t static_functions[] = {
     NAME_FUNC_OFFSET(14050, glProvokingVertexEXT, glProvokingVertexEXT, NULL, _gloffset_ProvokingVertexEXT),
     NAME_FUNC_OFFSET(14071, gl_dispatch_stub_796, gl_dispatch_stub_796, NULL, _gloffset_GetTexParameterPointervAPPLE),
     NAME_FUNC_OFFSET(14102, gl_dispatch_stub_797, gl_dispatch_stub_797, NULL, _gloffset_TextureRangeAPPLE),
-    NAME_FUNC_OFFSET(14122, gl_dispatch_stub_798, gl_dispatch_stub_798, NULL, _gloffset_StencilFuncSeparateATI),
-    NAME_FUNC_OFFSET(14147, gl_dispatch_stub_799, gl_dispatch_stub_799, NULL, _gloffset_ProgramEnvParameters4fvEXT),
-    NAME_FUNC_OFFSET(14176, gl_dispatch_stub_800, gl_dispatch_stub_800, NULL, _gloffset_ProgramLocalParameters4fvEXT),
-    NAME_FUNC_OFFSET(14207, gl_dispatch_stub_801, gl_dispatch_stub_801, NULL, _gloffset_GetQueryObjecti64vEXT),
-    NAME_FUNC_OFFSET(14231, gl_dispatch_stub_802, gl_dispatch_stub_802, NULL, _gloffset_GetQueryObjectui64vEXT),
-    NAME_FUNC_OFFSET(14256, glEGLImageTargetRenderbufferStorageOES, glEGLImageTargetRenderbufferStorageOES, NULL, _gloffset_EGLImageTargetRenderbufferStorageOES),
-    NAME_FUNC_OFFSET(14295, glEGLImageTargetTexture2DOES, glEGLImageTargetTexture2DOES, NULL, _gloffset_EGLImageTargetTexture2DOES),
-    NAME_FUNC_OFFSET(14324, glArrayElement, glArrayElement, NULL, _gloffset_ArrayElement),
-    NAME_FUNC_OFFSET(14342, glBindTexture, glBindTexture, NULL, _gloffset_BindTexture),
-    NAME_FUNC_OFFSET(14359, glDrawArrays, glDrawArrays, NULL, _gloffset_DrawArrays),
-    NAME_FUNC_OFFSET(14375, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, _gloffset_AreTexturesResident),
-    NAME_FUNC_OFFSET(14400, glCopyTexImage1D, glCopyTexImage1D, NULL, _gloffset_CopyTexImage1D),
-    NAME_FUNC_OFFSET(14420, glCopyTexImage2D, glCopyTexImage2D, NULL, _gloffset_CopyTexImage2D),
-    NAME_FUNC_OFFSET(14440, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, _gloffset_CopyTexSubImage1D),
-    NAME_FUNC_OFFSET(14463, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, _gloffset_CopyTexSubImage2D),
-    NAME_FUNC_OFFSET(14486, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, _gloffset_DeleteTextures),
-    NAME_FUNC_OFFSET(14506, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, _gloffset_GenTextures),
-    NAME_FUNC_OFFSET(14523, glGetPointerv, glGetPointerv, NULL, _gloffset_GetPointerv),
-    NAME_FUNC_OFFSET(14540, glIsTexture, glIsTextureEXT, glIsTextureEXT, _gloffset_IsTexture),
-    NAME_FUNC_OFFSET(14555, glPrioritizeTextures, glPrioritizeTextures, NULL, _gloffset_PrioritizeTextures),
-    NAME_FUNC_OFFSET(14579, glTexSubImage1D, glTexSubImage1D, NULL, _gloffset_TexSubImage1D),
-    NAME_FUNC_OFFSET(14598, glTexSubImage2D, glTexSubImage2D, NULL, _gloffset_TexSubImage2D),
-    NAME_FUNC_OFFSET(14617, glBlendColor, glBlendColor, NULL, _gloffset_BlendColor),
-    NAME_FUNC_OFFSET(14633, glBlendEquation, glBlendEquation, NULL, _gloffset_BlendEquation),
-    NAME_FUNC_OFFSET(14652, glDrawRangeElements, glDrawRangeElements, NULL, _gloffset_DrawRangeElements),
-    NAME_FUNC_OFFSET(14675, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
-    NAME_FUNC_OFFSET(14691, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
-    NAME_FUNC_OFFSET(14707, glColorTableParameterfv, glColorTableParameterfv, NULL, _gloffset_ColorTableParameterfv),
-    NAME_FUNC_OFFSET(14734, glColorTableParameteriv, glColorTableParameteriv, NULL, _gloffset_ColorTableParameteriv),
-    NAME_FUNC_OFFSET(14761, glCopyColorTable, glCopyColorTable, NULL, _gloffset_CopyColorTable),
-    NAME_FUNC_OFFSET(14781, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
-    NAME_FUNC_OFFSET(14800, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
-    NAME_FUNC_OFFSET(14819, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
-    NAME_FUNC_OFFSET(14849, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
-    NAME_FUNC_OFFSET(14879, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
-    NAME_FUNC_OFFSET(14909, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
-    NAME_FUNC_OFFSET(14939, glColorSubTable, glColorSubTable, NULL, _gloffset_ColorSubTable),
-    NAME_FUNC_OFFSET(14958, glCopyColorSubTable, glCopyColorSubTable, NULL, _gloffset_CopyColorSubTable),
-    NAME_FUNC_OFFSET(14981, glConvolutionFilter1D, glConvolutionFilter1D, NULL, _gloffset_ConvolutionFilter1D),
-    NAME_FUNC_OFFSET(15006, glConvolutionFilter2D, glConvolutionFilter2D, NULL, _gloffset_ConvolutionFilter2D),
-    NAME_FUNC_OFFSET(15031, glConvolutionParameterf, glConvolutionParameterf, NULL, _gloffset_ConvolutionParameterf),
-    NAME_FUNC_OFFSET(15058, glConvolutionParameterfv, glConvolutionParameterfv, NULL, _gloffset_ConvolutionParameterfv),
-    NAME_FUNC_OFFSET(15086, glConvolutionParameteri, glConvolutionParameteri, NULL, _gloffset_ConvolutionParameteri),
-    NAME_FUNC_OFFSET(15113, glConvolutionParameteriv, glConvolutionParameteriv, NULL, _gloffset_ConvolutionParameteriv),
-    NAME_FUNC_OFFSET(15141, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, _gloffset_CopyConvolutionFilter1D),
-    NAME_FUNC_OFFSET(15170, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, _gloffset_CopyConvolutionFilter2D),
-    NAME_FUNC_OFFSET(15199, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, _gloffset_GetConvolutionFilter),
-    NAME_FUNC_OFFSET(15225, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, _gloffset_GetConvolutionParameterfv),
-    NAME_FUNC_OFFSET(15256, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, _gloffset_GetConvolutionParameteriv),
-    NAME_FUNC_OFFSET(15287, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, _gloffset_GetSeparableFilter),
-    NAME_FUNC_OFFSET(15311, glSeparableFilter2D, glSeparableFilter2D, NULL, _gloffset_SeparableFilter2D),
-    NAME_FUNC_OFFSET(15334, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, _gloffset_GetHistogram),
-    NAME_FUNC_OFFSET(15352, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, _gloffset_GetHistogramParameterfv),
-    NAME_FUNC_OFFSET(15381, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, _gloffset_GetHistogramParameteriv),
-    NAME_FUNC_OFFSET(15410, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, _gloffset_GetMinmax),
-    NAME_FUNC_OFFSET(15425, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, _gloffset_GetMinmaxParameterfv),
-    NAME_FUNC_OFFSET(15451, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, _gloffset_GetMinmaxParameteriv),
-    NAME_FUNC_OFFSET(15477, glHistogram, glHistogram, NULL, _gloffset_Histogram),
-    NAME_FUNC_OFFSET(15492, glMinmax, glMinmax, NULL, _gloffset_Minmax),
-    NAME_FUNC_OFFSET(15504, glResetHistogram, glResetHistogram, NULL, _gloffset_ResetHistogram),
-    NAME_FUNC_OFFSET(15524, glResetMinmax, glResetMinmax, NULL, _gloffset_ResetMinmax),
-    NAME_FUNC_OFFSET(15541, glTexImage3D, glTexImage3D, NULL, _gloffset_TexImage3D),
-    NAME_FUNC_OFFSET(15557, glTexSubImage3D, glTexSubImage3D, NULL, _gloffset_TexSubImage3D),
-    NAME_FUNC_OFFSET(15576, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, _gloffset_CopyTexSubImage3D),
-    NAME_FUNC_OFFSET(15599, glActiveTextureARB, glActiveTextureARB, NULL, _gloffset_ActiveTextureARB),
-    NAME_FUNC_OFFSET(15615, glClientActiveTextureARB, glClientActiveTextureARB, NULL, _gloffset_ClientActiveTextureARB),
-    NAME_FUNC_OFFSET(15637, glMultiTexCoord1dARB, glMultiTexCoord1dARB, NULL, _gloffset_MultiTexCoord1dARB),
-    NAME_FUNC_OFFSET(15655, glMultiTexCoord1dvARB, glMultiTexCoord1dvARB, NULL, _gloffset_MultiTexCoord1dvARB),
-    NAME_FUNC_OFFSET(15674, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, _gloffset_MultiTexCoord1fARB),
-    NAME_FUNC_OFFSET(15692, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, _gloffset_MultiTexCoord1fvARB),
-    NAME_FUNC_OFFSET(15711, glMultiTexCoord1iARB, glMultiTexCoord1iARB, NULL, _gloffset_MultiTexCoord1iARB),
-    NAME_FUNC_OFFSET(15729, glMultiTexCoord1ivARB, glMultiTexCoord1ivARB, NULL, _gloffset_MultiTexCoord1ivARB),
-    NAME_FUNC_OFFSET(15748, glMultiTexCoord1sARB, glMultiTexCoord1sARB, NULL, _gloffset_MultiTexCoord1sARB),
-    NAME_FUNC_OFFSET(15766, glMultiTexCoord1svARB, glMultiTexCoord1svARB, NULL, _gloffset_MultiTexCoord1svARB),
-    NAME_FUNC_OFFSET(15785, glMultiTexCoord2dARB, glMultiTexCoord2dARB, NULL, _gloffset_MultiTexCoord2dARB),
-    NAME_FUNC_OFFSET(15803, glMultiTexCoord2dvARB, glMultiTexCoord2dvARB, NULL, _gloffset_MultiTexCoord2dvARB),
-    NAME_FUNC_OFFSET(15822, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, _gloffset_MultiTexCoord2fARB),
-    NAME_FUNC_OFFSET(15840, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, _gloffset_MultiTexCoord2fvARB),
-    NAME_FUNC_OFFSET(15859, glMultiTexCoord2iARB, glMultiTexCoord2iARB, NULL, _gloffset_MultiTexCoord2iARB),
-    NAME_FUNC_OFFSET(15877, glMultiTexCoord2ivARB, glMultiTexCoord2ivARB, NULL, _gloffset_MultiTexCoord2ivARB),
-    NAME_FUNC_OFFSET(15896, glMultiTexCoord2sARB, glMultiTexCoord2sARB, NULL, _gloffset_MultiTexCoord2sARB),
-    NAME_FUNC_OFFSET(15914, glMultiTexCoord2svARB, glMultiTexCoord2svARB, NULL, _gloffset_MultiTexCoord2svARB),
-    NAME_FUNC_OFFSET(15933, glMultiTexCoord3dARB, glMultiTexCoord3dARB, NULL, _gloffset_MultiTexCoord3dARB),
-    NAME_FUNC_OFFSET(15951, glMultiTexCoord3dvARB, glMultiTexCoord3dvARB, NULL, _gloffset_MultiTexCoord3dvARB),
-    NAME_FUNC_OFFSET(15970, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, _gloffset_MultiTexCoord3fARB),
-    NAME_FUNC_OFFSET(15988, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, _gloffset_MultiTexCoord3fvARB),
-    NAME_FUNC_OFFSET(16007, glMultiTexCoord3iARB, glMultiTexCoord3iARB, NULL, _gloffset_MultiTexCoord3iARB),
-    NAME_FUNC_OFFSET(16025, glMultiTexCoord3ivARB, glMultiTexCoord3ivARB, NULL, _gloffset_MultiTexCoord3ivARB),
-    NAME_FUNC_OFFSET(16044, glMultiTexCoord3sARB, glMultiTexCoord3sARB, NULL, _gloffset_MultiTexCoord3sARB),
-    NAME_FUNC_OFFSET(16062, glMultiTexCoord3svARB, glMultiTexCoord3svARB, NULL, _gloffset_MultiTexCoord3svARB),
-    NAME_FUNC_OFFSET(16081, glMultiTexCoord4dARB, glMultiTexCoord4dARB, NULL, _gloffset_MultiTexCoord4dARB),
-    NAME_FUNC_OFFSET(16099, glMultiTexCoord4dvARB, glMultiTexCoord4dvARB, NULL, _gloffset_MultiTexCoord4dvARB),
-    NAME_FUNC_OFFSET(16118, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, _gloffset_MultiTexCoord4fARB),
-    NAME_FUNC_OFFSET(16136, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, _gloffset_MultiTexCoord4fvARB),
-    NAME_FUNC_OFFSET(16155, glMultiTexCoord4iARB, glMultiTexCoord4iARB, NULL, _gloffset_MultiTexCoord4iARB),
-    NAME_FUNC_OFFSET(16173, glMultiTexCoord4ivARB, glMultiTexCoord4ivARB, NULL, _gloffset_MultiTexCoord4ivARB),
-    NAME_FUNC_OFFSET(16192, glMultiTexCoord4sARB, glMultiTexCoord4sARB, NULL, _gloffset_MultiTexCoord4sARB),
-    NAME_FUNC_OFFSET(16210, glMultiTexCoord4svARB, glMultiTexCoord4svARB, NULL, _gloffset_MultiTexCoord4svARB),
-    NAME_FUNC_OFFSET(16229, glStencilOpSeparate, glStencilOpSeparate, NULL, _gloffset_StencilOpSeparate),
-    NAME_FUNC_OFFSET(16252, glLoadTransposeMatrixdARB, glLoadTransposeMatrixdARB, NULL, _gloffset_LoadTransposeMatrixdARB),
-    NAME_FUNC_OFFSET(16275, glLoadTransposeMatrixfARB, glLoadTransposeMatrixfARB, NULL, _gloffset_LoadTransposeMatrixfARB),
-    NAME_FUNC_OFFSET(16298, glMultTransposeMatrixdARB, glMultTransposeMatrixdARB, NULL, _gloffset_MultTransposeMatrixdARB),
-    NAME_FUNC_OFFSET(16321, glMultTransposeMatrixfARB, glMultTransposeMatrixfARB, NULL, _gloffset_MultTransposeMatrixfARB),
-    NAME_FUNC_OFFSET(16344, glSampleCoverageARB, glSampleCoverageARB, NULL, _gloffset_SampleCoverageARB),
-    NAME_FUNC_OFFSET(16361, glCompressedTexImage1DARB, glCompressedTexImage1DARB, NULL, _gloffset_CompressedTexImage1DARB),
-    NAME_FUNC_OFFSET(16384, glCompressedTexImage2DARB, glCompressedTexImage2DARB, NULL, _gloffset_CompressedTexImage2DARB),
-    NAME_FUNC_OFFSET(16407, glCompressedTexImage3DARB, glCompressedTexImage3DARB, NULL, _gloffset_CompressedTexImage3DARB),
-    NAME_FUNC_OFFSET(16430, glCompressedTexSubImage1DARB, glCompressedTexSubImage1DARB, NULL, _gloffset_CompressedTexSubImage1DARB),
-    NAME_FUNC_OFFSET(16456, glCompressedTexSubImage2DARB, glCompressedTexSubImage2DARB, NULL, _gloffset_CompressedTexSubImage2DARB),
-    NAME_FUNC_OFFSET(16482, glCompressedTexSubImage3DARB, glCompressedTexSubImage3DARB, NULL, _gloffset_CompressedTexSubImage3DARB),
-    NAME_FUNC_OFFSET(16508, glGetCompressedTexImageARB, glGetCompressedTexImageARB, NULL, _gloffset_GetCompressedTexImageARB),
-    NAME_FUNC_OFFSET(16532, glDisableVertexAttribArrayARB, glDisableVertexAttribArrayARB, NULL, _gloffset_DisableVertexAttribArrayARB),
-    NAME_FUNC_OFFSET(16559, glEnableVertexAttribArrayARB, glEnableVertexAttribArrayARB, NULL, _gloffset_EnableVertexAttribArrayARB),
-    NAME_FUNC_OFFSET(16585, glGetVertexAttribdvARB, glGetVertexAttribdvARB, NULL, _gloffset_GetVertexAttribdvARB),
-    NAME_FUNC_OFFSET(16605, glGetVertexAttribfvARB, glGetVertexAttribfvARB, NULL, _gloffset_GetVertexAttribfvARB),
-    NAME_FUNC_OFFSET(16625, glGetVertexAttribivARB, glGetVertexAttribivARB, NULL, _gloffset_GetVertexAttribivARB),
-    NAME_FUNC_OFFSET(16645, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, _gloffset_ProgramEnvParameter4dARB),
-    NAME_FUNC_OFFSET(16668, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, _gloffset_ProgramEnvParameter4dvARB),
-    NAME_FUNC_OFFSET(16692, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, _gloffset_ProgramEnvParameter4fARB),
-    NAME_FUNC_OFFSET(16715, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, _gloffset_ProgramEnvParameter4fvARB),
-    NAME_FUNC_OFFSET(16739, glVertexAttrib1dARB, glVertexAttrib1dARB, NULL, _gloffset_VertexAttrib1dARB),
-    NAME_FUNC_OFFSET(16756, glVertexAttrib1dvARB, glVertexAttrib1dvARB, NULL, _gloffset_VertexAttrib1dvARB),
-    NAME_FUNC_OFFSET(16774, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, _gloffset_VertexAttrib1fARB),
-    NAME_FUNC_OFFSET(16791, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, _gloffset_VertexAttrib1fvARB),
-    NAME_FUNC_OFFSET(16809, glVertexAttrib1sARB, glVertexAttrib1sARB, NULL, _gloffset_VertexAttrib1sARB),
-    NAME_FUNC_OFFSET(16826, glVertexAttrib1svARB, glVertexAttrib1svARB, NULL, _gloffset_VertexAttrib1svARB),
-    NAME_FUNC_OFFSET(16844, glVertexAttrib2dARB, glVertexAttrib2dARB, NULL, _gloffset_VertexAttrib2dARB),
-    NAME_FUNC_OFFSET(16861, glVertexAttrib2dvARB, glVertexAttrib2dvARB, NULL, _gloffset_VertexAttrib2dvARB),
-    NAME_FUNC_OFFSET(16879, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, _gloffset_VertexAttrib2fARB),
-    NAME_FUNC_OFFSET(16896, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, _gloffset_VertexAttrib2fvARB),
-    NAME_FUNC_OFFSET(16914, glVertexAttrib2sARB, glVertexAttrib2sARB, NULL, _gloffset_VertexAttrib2sARB),
-    NAME_FUNC_OFFSET(16931, glVertexAttrib2svARB, glVertexAttrib2svARB, NULL, _gloffset_VertexAttrib2svARB),
-    NAME_FUNC_OFFSET(16949, glVertexAttrib3dARB, glVertexAttrib3dARB, NULL, _gloffset_VertexAttrib3dARB),
-    NAME_FUNC_OFFSET(16966, glVertexAttrib3dvARB, glVertexAttrib3dvARB, NULL, _gloffset_VertexAttrib3dvARB),
-    NAME_FUNC_OFFSET(16984, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, _gloffset_VertexAttrib3fARB),
-    NAME_FUNC_OFFSET(17001, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, _gloffset_VertexAttrib3fvARB),
-    NAME_FUNC_OFFSET(17019, glVertexAttrib3sARB, glVertexAttrib3sARB, NULL, _gloffset_VertexAttrib3sARB),
-    NAME_FUNC_OFFSET(17036, glVertexAttrib3svARB, glVertexAttrib3svARB, NULL, _gloffset_VertexAttrib3svARB),
-    NAME_FUNC_OFFSET(17054, glVertexAttrib4NbvARB, glVertexAttrib4NbvARB, NULL, _gloffset_VertexAttrib4NbvARB),
-    NAME_FUNC_OFFSET(17073, glVertexAttrib4NivARB, glVertexAttrib4NivARB, NULL, _gloffset_VertexAttrib4NivARB),
-    NAME_FUNC_OFFSET(17092, glVertexAttrib4NsvARB, glVertexAttrib4NsvARB, NULL, _gloffset_VertexAttrib4NsvARB),
-    NAME_FUNC_OFFSET(17111, glVertexAttrib4NubARB, glVertexAttrib4NubARB, NULL, _gloffset_VertexAttrib4NubARB),
-    NAME_FUNC_OFFSET(17130, glVertexAttrib4NubvARB, glVertexAttrib4NubvARB, NULL, _gloffset_VertexAttrib4NubvARB),
-    NAME_FUNC_OFFSET(17150, glVertexAttrib4NuivARB, glVertexAttrib4NuivARB, NULL, _gloffset_VertexAttrib4NuivARB),
-    NAME_FUNC_OFFSET(17170, glVertexAttrib4NusvARB, glVertexAttrib4NusvARB, NULL, _gloffset_VertexAttrib4NusvARB),
-    NAME_FUNC_OFFSET(17190, glVertexAttrib4bvARB, glVertexAttrib4bvARB, NULL, _gloffset_VertexAttrib4bvARB),
-    NAME_FUNC_OFFSET(17208, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL, _gloffset_VertexAttrib4dARB),
-    NAME_FUNC_OFFSET(17225, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL, _gloffset_VertexAttrib4dvARB),
-    NAME_FUNC_OFFSET(17243, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, _gloffset_VertexAttrib4fARB),
-    NAME_FUNC_OFFSET(17260, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, _gloffset_VertexAttrib4fvARB),
-    NAME_FUNC_OFFSET(17278, glVertexAttrib4ivARB, glVertexAttrib4ivARB, NULL, _gloffset_VertexAttrib4ivARB),
-    NAME_FUNC_OFFSET(17296, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL, _gloffset_VertexAttrib4sARB),
-    NAME_FUNC_OFFSET(17313, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL, _gloffset_VertexAttrib4svARB),
-    NAME_FUNC_OFFSET(17331, glVertexAttrib4ubvARB, glVertexAttrib4ubvARB, NULL, _gloffset_VertexAttrib4ubvARB),
-    NAME_FUNC_OFFSET(17350, glVertexAttrib4uivARB, glVertexAttrib4uivARB, NULL, _gloffset_VertexAttrib4uivARB),
-    NAME_FUNC_OFFSET(17369, glVertexAttrib4usvARB, glVertexAttrib4usvARB, NULL, _gloffset_VertexAttrib4usvARB),
-    NAME_FUNC_OFFSET(17388, glVertexAttribPointerARB, glVertexAttribPointerARB, NULL, _gloffset_VertexAttribPointerARB),
-    NAME_FUNC_OFFSET(17410, glBindBufferARB, glBindBufferARB, NULL, _gloffset_BindBufferARB),
-    NAME_FUNC_OFFSET(17423, glBufferDataARB, glBufferDataARB, NULL, _gloffset_BufferDataARB),
-    NAME_FUNC_OFFSET(17436, glBufferSubDataARB, glBufferSubDataARB, NULL, _gloffset_BufferSubDataARB),
-    NAME_FUNC_OFFSET(17452, glDeleteBuffersARB, glDeleteBuffersARB, NULL, _gloffset_DeleteBuffersARB),
-    NAME_FUNC_OFFSET(17468, glGenBuffersARB, glGenBuffersARB, NULL, _gloffset_GenBuffersARB),
-    NAME_FUNC_OFFSET(17481, glGetBufferParameterivARB, glGetBufferParameterivARB, NULL, _gloffset_GetBufferParameterivARB),
-    NAME_FUNC_OFFSET(17504, glGetBufferPointervARB, glGetBufferPointervARB, NULL, _gloffset_GetBufferPointervARB),
-    NAME_FUNC_OFFSET(17524, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL, _gloffset_GetBufferSubDataARB),
-    NAME_FUNC_OFFSET(17543, glIsBufferARB, glIsBufferARB, NULL, _gloffset_IsBufferARB),
-    NAME_FUNC_OFFSET(17554, glMapBufferARB, glMapBufferARB, NULL, _gloffset_MapBufferARB),
-    NAME_FUNC_OFFSET(17566, glUnmapBufferARB, glUnmapBufferARB, NULL, _gloffset_UnmapBufferARB),
-    NAME_FUNC_OFFSET(17580, glBeginQueryARB, glBeginQueryARB, NULL, _gloffset_BeginQueryARB),
-    NAME_FUNC_OFFSET(17593, glDeleteQueriesARB, glDeleteQueriesARB, NULL, _gloffset_DeleteQueriesARB),
-    NAME_FUNC_OFFSET(17609, glEndQueryARB, glEndQueryARB, NULL, _gloffset_EndQueryARB),
-    NAME_FUNC_OFFSET(17620, glGenQueriesARB, glGenQueriesARB, NULL, _gloffset_GenQueriesARB),
-    NAME_FUNC_OFFSET(17633, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL, _gloffset_GetQueryObjectivARB),
-    NAME_FUNC_OFFSET(17652, glGetQueryObjectuivARB, glGetQueryObjectuivARB, NULL, _gloffset_GetQueryObjectuivARB),
-    NAME_FUNC_OFFSET(17672, glGetQueryivARB, glGetQueryivARB, NULL, _gloffset_GetQueryivARB),
-    NAME_FUNC_OFFSET(17685, glIsQueryARB, glIsQueryARB, NULL, _gloffset_IsQueryARB),
-    NAME_FUNC_OFFSET(17695, glCompileShaderARB, glCompileShaderARB, NULL, _gloffset_CompileShaderARB),
-    NAME_FUNC_OFFSET(17711, glGetActiveUniformARB, glGetActiveUniformARB, NULL, _gloffset_GetActiveUniformARB),
-    NAME_FUNC_OFFSET(17730, glGetShaderSourceARB, glGetShaderSourceARB, NULL, _gloffset_GetShaderSourceARB),
-    NAME_FUNC_OFFSET(17748, glGetUniformLocationARB, glGetUniformLocationARB, NULL, _gloffset_GetUniformLocationARB),
-    NAME_FUNC_OFFSET(17769, glGetUniformfvARB, glGetUniformfvARB, NULL, _gloffset_GetUniformfvARB),
-    NAME_FUNC_OFFSET(17784, glGetUniformivARB, glGetUniformivARB, NULL, _gloffset_GetUniformivARB),
-    NAME_FUNC_OFFSET(17799, glLinkProgramARB, glLinkProgramARB, NULL, _gloffset_LinkProgramARB),
-    NAME_FUNC_OFFSET(17813, glShaderSourceARB, glShaderSourceARB, NULL, _gloffset_ShaderSourceARB),
-    NAME_FUNC_OFFSET(17828, glUniform1fARB, glUniform1fARB, NULL, _gloffset_Uniform1fARB),
-    NAME_FUNC_OFFSET(17840, glUniform1fvARB, glUniform1fvARB, NULL, _gloffset_Uniform1fvARB),
-    NAME_FUNC_OFFSET(17853, glUniform1iARB, glUniform1iARB, NULL, _gloffset_Uniform1iARB),
-    NAME_FUNC_OFFSET(17865, glUniform1ivARB, glUniform1ivARB, NULL, _gloffset_Uniform1ivARB),
-    NAME_FUNC_OFFSET(17878, glUniform2fARB, glUniform2fARB, NULL, _gloffset_Uniform2fARB),
-    NAME_FUNC_OFFSET(17890, glUniform2fvARB, glUniform2fvARB, NULL, _gloffset_Uniform2fvARB),
-    NAME_FUNC_OFFSET(17903, glUniform2iARB, glUniform2iARB, NULL, _gloffset_Uniform2iARB),
-    NAME_FUNC_OFFSET(17915, glUniform2ivARB, glUniform2ivARB, NULL, _gloffset_Uniform2ivARB),
-    NAME_FUNC_OFFSET(17928, glUniform3fARB, glUniform3fARB, NULL, _gloffset_Uniform3fARB),
-    NAME_FUNC_OFFSET(17940, glUniform3fvARB, glUniform3fvARB, NULL, _gloffset_Uniform3fvARB),
-    NAME_FUNC_OFFSET(17953, glUniform3iARB, glUniform3iARB, NULL, _gloffset_Uniform3iARB),
-    NAME_FUNC_OFFSET(17965, glUniform3ivARB, glUniform3ivARB, NULL, _gloffset_Uniform3ivARB),
-    NAME_FUNC_OFFSET(17978, glUniform4fARB, glUniform4fARB, NULL, _gloffset_Uniform4fARB),
-    NAME_FUNC_OFFSET(17990, glUniform4fvARB, glUniform4fvARB, NULL, _gloffset_Uniform4fvARB),
-    NAME_FUNC_OFFSET(18003, glUniform4iARB, glUniform4iARB, NULL, _gloffset_Uniform4iARB),
-    NAME_FUNC_OFFSET(18015, glUniform4ivARB, glUniform4ivARB, NULL, _gloffset_Uniform4ivARB),
-    NAME_FUNC_OFFSET(18028, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL, _gloffset_UniformMatrix2fvARB),
-    NAME_FUNC_OFFSET(18047, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL, _gloffset_UniformMatrix3fvARB),
-    NAME_FUNC_OFFSET(18066, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL, _gloffset_UniformMatrix4fvARB),
-    NAME_FUNC_OFFSET(18085, glUseProgramObjectARB, glUseProgramObjectARB, NULL, _gloffset_UseProgramObjectARB),
-    NAME_FUNC_OFFSET(18098, glValidateProgramARB, glValidateProgramARB, NULL, _gloffset_ValidateProgramARB),
-    NAME_FUNC_OFFSET(18116, glBindAttribLocationARB, glBindAttribLocationARB, NULL, _gloffset_BindAttribLocationARB),
-    NAME_FUNC_OFFSET(18137, glGetActiveAttribARB, glGetActiveAttribARB, NULL, _gloffset_GetActiveAttribARB),
-    NAME_FUNC_OFFSET(18155, glGetAttribLocationARB, glGetAttribLocationARB, NULL, _gloffset_GetAttribLocationARB),
-    NAME_FUNC_OFFSET(18175, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
-    NAME_FUNC_OFFSET(18189, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
-    NAME_FUNC_OFFSET(18206, glRenderbufferStorageMultisample, glRenderbufferStorageMultisample, NULL, _gloffset_RenderbufferStorageMultisample),
-    NAME_FUNC_OFFSET(18242, gl_dispatch_stub_584, gl_dispatch_stub_584, NULL, _gloffset_SampleMaskSGIS),
-    NAME_FUNC_OFFSET(18258, gl_dispatch_stub_585, gl_dispatch_stub_585, NULL, _gloffset_SamplePatternSGIS),
-    NAME_FUNC_OFFSET(18277, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET(18295, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET(18316, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
-    NAME_FUNC_OFFSET(18338, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET(18357, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET(18379, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
-    NAME_FUNC_OFFSET(18402, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, _gloffset_SecondaryColor3bEXT),
-    NAME_FUNC_OFFSET(18421, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, _gloffset_SecondaryColor3bvEXT),
-    NAME_FUNC_OFFSET(18441, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, _gloffset_SecondaryColor3dEXT),
-    NAME_FUNC_OFFSET(18460, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, _gloffset_SecondaryColor3dvEXT),
-    NAME_FUNC_OFFSET(18480, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, _gloffset_SecondaryColor3fEXT),
-    NAME_FUNC_OFFSET(18499, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, _gloffset_SecondaryColor3fvEXT),
-    NAME_FUNC_OFFSET(18519, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, _gloffset_SecondaryColor3iEXT),
-    NAME_FUNC_OFFSET(18538, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, _gloffset_SecondaryColor3ivEXT),
-    NAME_FUNC_OFFSET(18558, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, _gloffset_SecondaryColor3sEXT),
-    NAME_FUNC_OFFSET(18577, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, _gloffset_SecondaryColor3svEXT),
-    NAME_FUNC_OFFSET(18597, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, _gloffset_SecondaryColor3ubEXT),
-    NAME_FUNC_OFFSET(18617, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, _gloffset_SecondaryColor3ubvEXT),
-    NAME_FUNC_OFFSET(18638, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, _gloffset_SecondaryColor3uiEXT),
-    NAME_FUNC_OFFSET(18658, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, _gloffset_SecondaryColor3uivEXT),
-    NAME_FUNC_OFFSET(18679, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, _gloffset_SecondaryColor3usEXT),
-    NAME_FUNC_OFFSET(18699, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, _gloffset_SecondaryColor3usvEXT),
-    NAME_FUNC_OFFSET(18720, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, _gloffset_SecondaryColorPointerEXT),
-    NAME_FUNC_OFFSET(18744, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, _gloffset_MultiDrawArraysEXT),
-    NAME_FUNC_OFFSET(18762, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, _gloffset_MultiDrawElementsEXT),
-    NAME_FUNC_OFFSET(18782, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, _gloffset_FogCoordPointerEXT),
-    NAME_FUNC_OFFSET(18800, glFogCoorddEXT, glFogCoorddEXT, NULL, _gloffset_FogCoorddEXT),
-    NAME_FUNC_OFFSET(18812, glFogCoorddvEXT, glFogCoorddvEXT, NULL, _gloffset_FogCoorddvEXT),
-    NAME_FUNC_OFFSET(18825, glFogCoordfEXT, glFogCoordfEXT, NULL, _gloffset_FogCoordfEXT),
-    NAME_FUNC_OFFSET(18837, glFogCoordfvEXT, glFogCoordfvEXT, NULL, _gloffset_FogCoordfvEXT),
-    NAME_FUNC_OFFSET(18850, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
-    NAME_FUNC_OFFSET(18870, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
-    NAME_FUNC_OFFSET(18894, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
-    NAME_FUNC_OFFSET(18908, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
-    NAME_FUNC_OFFSET(18925, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
-    NAME_FUNC_OFFSET(18940, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
-    NAME_FUNC_OFFSET(18958, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
-    NAME_FUNC_OFFSET(18972, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
-    NAME_FUNC_OFFSET(18989, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
-    NAME_FUNC_OFFSET(19004, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
-    NAME_FUNC_OFFSET(19022, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
-    NAME_FUNC_OFFSET(19036, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
-    NAME_FUNC_OFFSET(19053, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
-    NAME_FUNC_OFFSET(19068, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
-    NAME_FUNC_OFFSET(19086, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
-    NAME_FUNC_OFFSET(19100, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
-    NAME_FUNC_OFFSET(19117, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
-    NAME_FUNC_OFFSET(19132, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
-    NAME_FUNC_OFFSET(19150, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
-    NAME_FUNC_OFFSET(19164, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
-    NAME_FUNC_OFFSET(19181, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
-    NAME_FUNC_OFFSET(19196, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
-    NAME_FUNC_OFFSET(19214, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
-    NAME_FUNC_OFFSET(19228, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
-    NAME_FUNC_OFFSET(19245, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
-    NAME_FUNC_OFFSET(19260, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
-    NAME_FUNC_OFFSET(19278, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
-    NAME_FUNC_OFFSET(19292, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
-    NAME_FUNC_OFFSET(19309, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
-    NAME_FUNC_OFFSET(19324, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
-    NAME_FUNC_OFFSET(19342, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
-    NAME_FUNC_OFFSET(19356, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
-    NAME_FUNC_OFFSET(19373, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
-    NAME_FUNC_OFFSET(19388, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
-    NAME_FUNC_OFFSET(19406, glBindProgramNV, glBindProgramNV, NULL, _gloffset_BindProgramNV),
-    NAME_FUNC_OFFSET(19423, glDeleteProgramsNV, glDeleteProgramsNV, NULL, _gloffset_DeleteProgramsNV),
-    NAME_FUNC_OFFSET(19443, glGenProgramsNV, glGenProgramsNV, NULL, _gloffset_GenProgramsNV),
-    NAME_FUNC_OFFSET(19460, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
-    NAME_FUNC_OFFSET(19486, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
-    NAME_FUNC_OFFSET(19515, glIsProgramNV, glIsProgramNV, NULL, _gloffset_IsProgramNV),
-    NAME_FUNC_OFFSET(19530, glPointParameteriNV, glPointParameteriNV, NULL, _gloffset_PointParameteriNV),
-    NAME_FUNC_OFFSET(19548, glPointParameterivNV, glPointParameterivNV, NULL, _gloffset_PointParameterivNV),
-    NAME_FUNC_OFFSET(19567, gl_dispatch_stub_755, gl_dispatch_stub_755, NULL, _gloffset_DeleteVertexArraysAPPLE),
-    NAME_FUNC_OFFSET(19588, gl_dispatch_stub_757, gl_dispatch_stub_757, NULL, _gloffset_IsVertexArrayAPPLE),
-    NAME_FUNC_OFFSET(19604, gl_dispatch_stub_765, gl_dispatch_stub_765, NULL, _gloffset_BlendEquationSeparateEXT),
-    NAME_FUNC_OFFSET(19628, gl_dispatch_stub_765, gl_dispatch_stub_765, NULL, _gloffset_BlendEquationSeparateEXT),
-    NAME_FUNC_OFFSET(19655, glBindFramebufferEXT, glBindFramebufferEXT, NULL, _gloffset_BindFramebufferEXT),
-    NAME_FUNC_OFFSET(19673, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, _gloffset_BindRenderbufferEXT),
-    NAME_FUNC_OFFSET(19692, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, _gloffset_CheckFramebufferStatusEXT),
-    NAME_FUNC_OFFSET(19717, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, _gloffset_DeleteFramebuffersEXT),
-    NAME_FUNC_OFFSET(19738, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, _gloffset_DeleteRenderbuffersEXT),
-    NAME_FUNC_OFFSET(19760, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, _gloffset_FramebufferRenderbufferEXT),
-    NAME_FUNC_OFFSET(19786, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, _gloffset_FramebufferTexture1DEXT),
-    NAME_FUNC_OFFSET(19809, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, _gloffset_FramebufferTexture2DEXT),
-    NAME_FUNC_OFFSET(19832, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, _gloffset_FramebufferTexture3DEXT),
-    NAME_FUNC_OFFSET(19855, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, _gloffset_GenFramebuffersEXT),
-    NAME_FUNC_OFFSET(19873, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, _gloffset_GenRenderbuffersEXT),
-    NAME_FUNC_OFFSET(19892, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, _gloffset_GenerateMipmapEXT),
-    NAME_FUNC_OFFSET(19909, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, _gloffset_GetFramebufferAttachmentParameterivEXT),
-    NAME_FUNC_OFFSET(19947, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, _gloffset_GetRenderbufferParameterivEXT),
-    NAME_FUNC_OFFSET(19976, glIsFramebufferEXT, glIsFramebufferEXT, NULL, _gloffset_IsFramebufferEXT),
-    NAME_FUNC_OFFSET(19992, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, _gloffset_IsRenderbufferEXT),
-    NAME_FUNC_OFFSET(20009, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, _gloffset_RenderbufferStorageEXT),
-    NAME_FUNC_OFFSET(20031, gl_dispatch_stub_783, gl_dispatch_stub_783, NULL, _gloffset_BlitFramebufferEXT),
-    NAME_FUNC_OFFSET(20049, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, _gloffset_FramebufferTextureLayerEXT),
-    NAME_FUNC_OFFSET(20075, glProvokingVertexEXT, glProvokingVertexEXT, NULL, _gloffset_ProvokingVertexEXT),
+    NAME_FUNC_OFFSET(14122, glGetObjectParameterivAPPLE, glGetObjectParameterivAPPLE, NULL, _gloffset_GetObjectParameterivAPPLE),
+    NAME_FUNC_OFFSET(14150, glObjectPurgeableAPPLE, glObjectPurgeableAPPLE, NULL, _gloffset_ObjectPurgeableAPPLE),
+    NAME_FUNC_OFFSET(14173, glObjectUnpurgeableAPPLE, glObjectUnpurgeableAPPLE, NULL, _gloffset_ObjectUnpurgeableAPPLE),
+    NAME_FUNC_OFFSET(14198, gl_dispatch_stub_801, gl_dispatch_stub_801, NULL, _gloffset_StencilFuncSeparateATI),
+    NAME_FUNC_OFFSET(14223, gl_dispatch_stub_802, gl_dispatch_stub_802, NULL, _gloffset_ProgramEnvParameters4fvEXT),
+    NAME_FUNC_OFFSET(14252, gl_dispatch_stub_803, gl_dispatch_stub_803, NULL, _gloffset_ProgramLocalParameters4fvEXT),
+    NAME_FUNC_OFFSET(14283, gl_dispatch_stub_804, gl_dispatch_stub_804, NULL, _gloffset_GetQueryObjecti64vEXT),
+    NAME_FUNC_OFFSET(14307, gl_dispatch_stub_805, gl_dispatch_stub_805, NULL, _gloffset_GetQueryObjectui64vEXT),
+    NAME_FUNC_OFFSET(14332, glEGLImageTargetRenderbufferStorageOES, glEGLImageTargetRenderbufferStorageOES, NULL, _gloffset_EGLImageTargetRenderbufferStorageOES),
+    NAME_FUNC_OFFSET(14371, glEGLImageTargetTexture2DOES, glEGLImageTargetTexture2DOES, NULL, _gloffset_EGLImageTargetTexture2DOES),
+    NAME_FUNC_OFFSET(14400, glArrayElement, glArrayElement, NULL, _gloffset_ArrayElement),
+    NAME_FUNC_OFFSET(14418, glBindTexture, glBindTexture, NULL, _gloffset_BindTexture),
+    NAME_FUNC_OFFSET(14435, glDrawArrays, glDrawArrays, NULL, _gloffset_DrawArrays),
+    NAME_FUNC_OFFSET(14451, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, _gloffset_AreTexturesResident),
+    NAME_FUNC_OFFSET(14476, glCopyTexImage1D, glCopyTexImage1D, NULL, _gloffset_CopyTexImage1D),
+    NAME_FUNC_OFFSET(14496, glCopyTexImage2D, glCopyTexImage2D, NULL, _gloffset_CopyTexImage2D),
+    NAME_FUNC_OFFSET(14516, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, _gloffset_CopyTexSubImage1D),
+    NAME_FUNC_OFFSET(14539, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, _gloffset_CopyTexSubImage2D),
+    NAME_FUNC_OFFSET(14562, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, _gloffset_DeleteTextures),
+    NAME_FUNC_OFFSET(14582, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, _gloffset_GenTextures),
+    NAME_FUNC_OFFSET(14599, glGetPointerv, glGetPointerv, NULL, _gloffset_GetPointerv),
+    NAME_FUNC_OFFSET(14616, glIsTexture, glIsTextureEXT, glIsTextureEXT, _gloffset_IsTexture),
+    NAME_FUNC_OFFSET(14631, glPrioritizeTextures, glPrioritizeTextures, NULL, _gloffset_PrioritizeTextures),
+    NAME_FUNC_OFFSET(14655, glTexSubImage1D, glTexSubImage1D, NULL, _gloffset_TexSubImage1D),
+    NAME_FUNC_OFFSET(14674, glTexSubImage2D, glTexSubImage2D, NULL, _gloffset_TexSubImage2D),
+    NAME_FUNC_OFFSET(14693, glBlendColor, glBlendColor, NULL, _gloffset_BlendColor),
+    NAME_FUNC_OFFSET(14709, glBlendEquation, glBlendEquation, NULL, _gloffset_BlendEquation),
+    NAME_FUNC_OFFSET(14728, glDrawRangeElements, glDrawRangeElements, NULL, _gloffset_DrawRangeElements),
+    NAME_FUNC_OFFSET(14751, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
+    NAME_FUNC_OFFSET(14767, glColorTable, glColorTable, NULL, _gloffset_ColorTable),
+    NAME_FUNC_OFFSET(14783, glColorTableParameterfv, glColorTableParameterfv, NULL, _gloffset_ColorTableParameterfv),
+    NAME_FUNC_OFFSET(14810, glColorTableParameteriv, glColorTableParameteriv, NULL, _gloffset_ColorTableParameteriv),
+    NAME_FUNC_OFFSET(14837, glCopyColorTable, glCopyColorTable, NULL, _gloffset_CopyColorTable),
+    NAME_FUNC_OFFSET(14857, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
+    NAME_FUNC_OFFSET(14876, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, _gloffset_GetColorTable),
+    NAME_FUNC_OFFSET(14895, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
+    NAME_FUNC_OFFSET(14925, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, _gloffset_GetColorTableParameterfv),
+    NAME_FUNC_OFFSET(14955, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
+    NAME_FUNC_OFFSET(14985, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, _gloffset_GetColorTableParameteriv),
+    NAME_FUNC_OFFSET(15015, glColorSubTable, glColorSubTable, NULL, _gloffset_ColorSubTable),
+    NAME_FUNC_OFFSET(15034, glCopyColorSubTable, glCopyColorSubTable, NULL, _gloffset_CopyColorSubTable),
+    NAME_FUNC_OFFSET(15057, glConvolutionFilter1D, glConvolutionFilter1D, NULL, _gloffset_ConvolutionFilter1D),
+    NAME_FUNC_OFFSET(15082, glConvolutionFilter2D, glConvolutionFilter2D, NULL, _gloffset_ConvolutionFilter2D),
+    NAME_FUNC_OFFSET(15107, glConvolutionParameterf, glConvolutionParameterf, NULL, _gloffset_ConvolutionParameterf),
+    NAME_FUNC_OFFSET(15134, glConvolutionParameterfv, glConvolutionParameterfv, NULL, _gloffset_ConvolutionParameterfv),
+    NAME_FUNC_OFFSET(15162, glConvolutionParameteri, glConvolutionParameteri, NULL, _gloffset_ConvolutionParameteri),
+    NAME_FUNC_OFFSET(15189, glConvolutionParameteriv, glConvolutionParameteriv, NULL, _gloffset_ConvolutionParameteriv),
+    NAME_FUNC_OFFSET(15217, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, _gloffset_CopyConvolutionFilter1D),
+    NAME_FUNC_OFFSET(15246, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, _gloffset_CopyConvolutionFilter2D),
+    NAME_FUNC_OFFSET(15275, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, _gloffset_GetConvolutionFilter),
+    NAME_FUNC_OFFSET(15301, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, _gloffset_GetConvolutionParameterfv),
+    NAME_FUNC_OFFSET(15332, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, _gloffset_GetConvolutionParameteriv),
+    NAME_FUNC_OFFSET(15363, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, _gloffset_GetSeparableFilter),
+    NAME_FUNC_OFFSET(15387, glSeparableFilter2D, glSeparableFilter2D, NULL, _gloffset_SeparableFilter2D),
+    NAME_FUNC_OFFSET(15410, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, _gloffset_GetHistogram),
+    NAME_FUNC_OFFSET(15428, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, _gloffset_GetHistogramParameterfv),
+    NAME_FUNC_OFFSET(15457, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, _gloffset_GetHistogramParameteriv),
+    NAME_FUNC_OFFSET(15486, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, _gloffset_GetMinmax),
+    NAME_FUNC_OFFSET(15501, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, _gloffset_GetMinmaxParameterfv),
+    NAME_FUNC_OFFSET(15527, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, _gloffset_GetMinmaxParameteriv),
+    NAME_FUNC_OFFSET(15553, glHistogram, glHistogram, NULL, _gloffset_Histogram),
+    NAME_FUNC_OFFSET(15568, glMinmax, glMinmax, NULL, _gloffset_Minmax),
+    NAME_FUNC_OFFSET(15580, glResetHistogram, glResetHistogram, NULL, _gloffset_ResetHistogram),
+    NAME_FUNC_OFFSET(15600, glResetMinmax, glResetMinmax, NULL, _gloffset_ResetMinmax),
+    NAME_FUNC_OFFSET(15617, glTexImage3D, glTexImage3D, NULL, _gloffset_TexImage3D),
+    NAME_FUNC_OFFSET(15633, glTexSubImage3D, glTexSubImage3D, NULL, _gloffset_TexSubImage3D),
+    NAME_FUNC_OFFSET(15652, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, _gloffset_CopyTexSubImage3D),
+    NAME_FUNC_OFFSET(15675, glActiveTextureARB, glActiveTextureARB, NULL, _gloffset_ActiveTextureARB),
+    NAME_FUNC_OFFSET(15691, glClientActiveTextureARB, glClientActiveTextureARB, NULL, _gloffset_ClientActiveTextureARB),
+    NAME_FUNC_OFFSET(15713, glMultiTexCoord1dARB, glMultiTexCoord1dARB, NULL, _gloffset_MultiTexCoord1dARB),
+    NAME_FUNC_OFFSET(15731, glMultiTexCoord1dvARB, glMultiTexCoord1dvARB, NULL, _gloffset_MultiTexCoord1dvARB),
+    NAME_FUNC_OFFSET(15750, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, _gloffset_MultiTexCoord1fARB),
+    NAME_FUNC_OFFSET(15768, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, _gloffset_MultiTexCoord1fvARB),
+    NAME_FUNC_OFFSET(15787, glMultiTexCoord1iARB, glMultiTexCoord1iARB, NULL, _gloffset_MultiTexCoord1iARB),
+    NAME_FUNC_OFFSET(15805, glMultiTexCoord1ivARB, glMultiTexCoord1ivARB, NULL, _gloffset_MultiTexCoord1ivARB),
+    NAME_FUNC_OFFSET(15824, glMultiTexCoord1sARB, glMultiTexCoord1sARB, NULL, _gloffset_MultiTexCoord1sARB),
+    NAME_FUNC_OFFSET(15842, glMultiTexCoord1svARB, glMultiTexCoord1svARB, NULL, _gloffset_MultiTexCoord1svARB),
+    NAME_FUNC_OFFSET(15861, glMultiTexCoord2dARB, glMultiTexCoord2dARB, NULL, _gloffset_MultiTexCoord2dARB),
+    NAME_FUNC_OFFSET(15879, glMultiTexCoord2dvARB, glMultiTexCoord2dvARB, NULL, _gloffset_MultiTexCoord2dvARB),
+    NAME_FUNC_OFFSET(15898, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, _gloffset_MultiTexCoord2fARB),
+    NAME_FUNC_OFFSET(15916, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, _gloffset_MultiTexCoord2fvARB),
+    NAME_FUNC_OFFSET(15935, glMultiTexCoord2iARB, glMultiTexCoord2iARB, NULL, _gloffset_MultiTexCoord2iARB),
+    NAME_FUNC_OFFSET(15953, glMultiTexCoord2ivARB, glMultiTexCoord2ivARB, NULL, _gloffset_MultiTexCoord2ivARB),
+    NAME_FUNC_OFFSET(15972, glMultiTexCoord2sARB, glMultiTexCoord2sARB, NULL, _gloffset_MultiTexCoord2sARB),
+    NAME_FUNC_OFFSET(15990, glMultiTexCoord2svARB, glMultiTexCoord2svARB, NULL, _gloffset_MultiTexCoord2svARB),
+    NAME_FUNC_OFFSET(16009, glMultiTexCoord3dARB, glMultiTexCoord3dARB, NULL, _gloffset_MultiTexCoord3dARB),
+    NAME_FUNC_OFFSET(16027, glMultiTexCoord3dvARB, glMultiTexCoord3dvARB, NULL, _gloffset_MultiTexCoord3dvARB),
+    NAME_FUNC_OFFSET(16046, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, _gloffset_MultiTexCoord3fARB),
+    NAME_FUNC_OFFSET(16064, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, _gloffset_MultiTexCoord3fvARB),
+    NAME_FUNC_OFFSET(16083, glMultiTexCoord3iARB, glMultiTexCoord3iARB, NULL, _gloffset_MultiTexCoord3iARB),
+    NAME_FUNC_OFFSET(16101, glMultiTexCoord3ivARB, glMultiTexCoord3ivARB, NULL, _gloffset_MultiTexCoord3ivARB),
+    NAME_FUNC_OFFSET(16120, glMultiTexCoord3sARB, glMultiTexCoord3sARB, NULL, _gloffset_MultiTexCoord3sARB),
+    NAME_FUNC_OFFSET(16138, glMultiTexCoord3svARB, glMultiTexCoord3svARB, NULL, _gloffset_MultiTexCoord3svARB),
+    NAME_FUNC_OFFSET(16157, glMultiTexCoord4dARB, glMultiTexCoord4dARB, NULL, _gloffset_MultiTexCoord4dARB),
+    NAME_FUNC_OFFSET(16175, glMultiTexCoord4dvARB, glMultiTexCoord4dvARB, NULL, _gloffset_MultiTexCoord4dvARB),
+    NAME_FUNC_OFFSET(16194, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, _gloffset_MultiTexCoord4fARB),
+    NAME_FUNC_OFFSET(16212, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, _gloffset_MultiTexCoord4fvARB),
+    NAME_FUNC_OFFSET(16231, glMultiTexCoord4iARB, glMultiTexCoord4iARB, NULL, _gloffset_MultiTexCoord4iARB),
+    NAME_FUNC_OFFSET(16249, glMultiTexCoord4ivARB, glMultiTexCoord4ivARB, NULL, _gloffset_MultiTexCoord4ivARB),
+    NAME_FUNC_OFFSET(16268, glMultiTexCoord4sARB, glMultiTexCoord4sARB, NULL, _gloffset_MultiTexCoord4sARB),
+    NAME_FUNC_OFFSET(16286, glMultiTexCoord4svARB, glMultiTexCoord4svARB, NULL, _gloffset_MultiTexCoord4svARB),
+    NAME_FUNC_OFFSET(16305, glStencilOpSeparate, glStencilOpSeparate, NULL, _gloffset_StencilOpSeparate),
+    NAME_FUNC_OFFSET(16328, glLoadTransposeMatrixdARB, glLoadTransposeMatrixdARB, NULL, _gloffset_LoadTransposeMatrixdARB),
+    NAME_FUNC_OFFSET(16351, glLoadTransposeMatrixfARB, glLoadTransposeMatrixfARB, NULL, _gloffset_LoadTransposeMatrixfARB),
+    NAME_FUNC_OFFSET(16374, glMultTransposeMatrixdARB, glMultTransposeMatrixdARB, NULL, _gloffset_MultTransposeMatrixdARB),
+    NAME_FUNC_OFFSET(16397, glMultTransposeMatrixfARB, glMultTransposeMatrixfARB, NULL, _gloffset_MultTransposeMatrixfARB),
+    NAME_FUNC_OFFSET(16420, glSampleCoverageARB, glSampleCoverageARB, NULL, _gloffset_SampleCoverageARB),
+    NAME_FUNC_OFFSET(16437, glCompressedTexImage1DARB, glCompressedTexImage1DARB, NULL, _gloffset_CompressedTexImage1DARB),
+    NAME_FUNC_OFFSET(16460, glCompressedTexImage2DARB, glCompressedTexImage2DARB, NULL, _gloffset_CompressedTexImage2DARB),
+    NAME_FUNC_OFFSET(16483, glCompressedTexImage3DARB, glCompressedTexImage3DARB, NULL, _gloffset_CompressedTexImage3DARB),
+    NAME_FUNC_OFFSET(16506, glCompressedTexSubImage1DARB, glCompressedTexSubImage1DARB, NULL, _gloffset_CompressedTexSubImage1DARB),
+    NAME_FUNC_OFFSET(16532, glCompressedTexSubImage2DARB, glCompressedTexSubImage2DARB, NULL, _gloffset_CompressedTexSubImage2DARB),
+    NAME_FUNC_OFFSET(16558, glCompressedTexSubImage3DARB, glCompressedTexSubImage3DARB, NULL, _gloffset_CompressedTexSubImage3DARB),
+    NAME_FUNC_OFFSET(16584, glGetCompressedTexImageARB, glGetCompressedTexImageARB, NULL, _gloffset_GetCompressedTexImageARB),
+    NAME_FUNC_OFFSET(16608, glDisableVertexAttribArrayARB, glDisableVertexAttribArrayARB, NULL, _gloffset_DisableVertexAttribArrayARB),
+    NAME_FUNC_OFFSET(16635, glEnableVertexAttribArrayARB, glEnableVertexAttribArrayARB, NULL, _gloffset_EnableVertexAttribArrayARB),
+    NAME_FUNC_OFFSET(16661, glGetVertexAttribdvARB, glGetVertexAttribdvARB, NULL, _gloffset_GetVertexAttribdvARB),
+    NAME_FUNC_OFFSET(16681, glGetVertexAttribfvARB, glGetVertexAttribfvARB, NULL, _gloffset_GetVertexAttribfvARB),
+    NAME_FUNC_OFFSET(16701, glGetVertexAttribivARB, glGetVertexAttribivARB, NULL, _gloffset_GetVertexAttribivARB),
+    NAME_FUNC_OFFSET(16721, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, _gloffset_ProgramEnvParameter4dARB),
+    NAME_FUNC_OFFSET(16744, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, _gloffset_ProgramEnvParameter4dvARB),
+    NAME_FUNC_OFFSET(16768, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, _gloffset_ProgramEnvParameter4fARB),
+    NAME_FUNC_OFFSET(16791, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, _gloffset_ProgramEnvParameter4fvARB),
+    NAME_FUNC_OFFSET(16815, glVertexAttrib1dARB, glVertexAttrib1dARB, NULL, _gloffset_VertexAttrib1dARB),
+    NAME_FUNC_OFFSET(16832, glVertexAttrib1dvARB, glVertexAttrib1dvARB, NULL, _gloffset_VertexAttrib1dvARB),
+    NAME_FUNC_OFFSET(16850, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, _gloffset_VertexAttrib1fARB),
+    NAME_FUNC_OFFSET(16867, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, _gloffset_VertexAttrib1fvARB),
+    NAME_FUNC_OFFSET(16885, glVertexAttrib1sARB, glVertexAttrib1sARB, NULL, _gloffset_VertexAttrib1sARB),
+    NAME_FUNC_OFFSET(16902, glVertexAttrib1svARB, glVertexAttrib1svARB, NULL, _gloffset_VertexAttrib1svARB),
+    NAME_FUNC_OFFSET(16920, glVertexAttrib2dARB, glVertexAttrib2dARB, NULL, _gloffset_VertexAttrib2dARB),
+    NAME_FUNC_OFFSET(16937, glVertexAttrib2dvARB, glVertexAttrib2dvARB, NULL, _gloffset_VertexAttrib2dvARB),
+    NAME_FUNC_OFFSET(16955, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, _gloffset_VertexAttrib2fARB),
+    NAME_FUNC_OFFSET(16972, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, _gloffset_VertexAttrib2fvARB),
+    NAME_FUNC_OFFSET(16990, glVertexAttrib2sARB, glVertexAttrib2sARB, NULL, _gloffset_VertexAttrib2sARB),
+    NAME_FUNC_OFFSET(17007, glVertexAttrib2svARB, glVertexAttrib2svARB, NULL, _gloffset_VertexAttrib2svARB),
+    NAME_FUNC_OFFSET(17025, glVertexAttrib3dARB, glVertexAttrib3dARB, NULL, _gloffset_VertexAttrib3dARB),
+    NAME_FUNC_OFFSET(17042, glVertexAttrib3dvARB, glVertexAttrib3dvARB, NULL, _gloffset_VertexAttrib3dvARB),
+    NAME_FUNC_OFFSET(17060, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, _gloffset_VertexAttrib3fARB),
+    NAME_FUNC_OFFSET(17077, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, _gloffset_VertexAttrib3fvARB),
+    NAME_FUNC_OFFSET(17095, glVertexAttrib3sARB, glVertexAttrib3sARB, NULL, _gloffset_VertexAttrib3sARB),
+    NAME_FUNC_OFFSET(17112, glVertexAttrib3svARB, glVertexAttrib3svARB, NULL, _gloffset_VertexAttrib3svARB),
+    NAME_FUNC_OFFSET(17130, glVertexAttrib4NbvARB, glVertexAttrib4NbvARB, NULL, _gloffset_VertexAttrib4NbvARB),
+    NAME_FUNC_OFFSET(17149, glVertexAttrib4NivARB, glVertexAttrib4NivARB, NULL, _gloffset_VertexAttrib4NivARB),
+    NAME_FUNC_OFFSET(17168, glVertexAttrib4NsvARB, glVertexAttrib4NsvARB, NULL, _gloffset_VertexAttrib4NsvARB),
+    NAME_FUNC_OFFSET(17187, glVertexAttrib4NubARB, glVertexAttrib4NubARB, NULL, _gloffset_VertexAttrib4NubARB),
+    NAME_FUNC_OFFSET(17206, glVertexAttrib4NubvARB, glVertexAttrib4NubvARB, NULL, _gloffset_VertexAttrib4NubvARB),
+    NAME_FUNC_OFFSET(17226, glVertexAttrib4NuivARB, glVertexAttrib4NuivARB, NULL, _gloffset_VertexAttrib4NuivARB),
+    NAME_FUNC_OFFSET(17246, glVertexAttrib4NusvARB, glVertexAttrib4NusvARB, NULL, _gloffset_VertexAttrib4NusvARB),
+    NAME_FUNC_OFFSET(17266, glVertexAttrib4bvARB, glVertexAttrib4bvARB, NULL, _gloffset_VertexAttrib4bvARB),
+    NAME_FUNC_OFFSET(17284, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL, _gloffset_VertexAttrib4dARB),
+    NAME_FUNC_OFFSET(17301, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL, _gloffset_VertexAttrib4dvARB),
+    NAME_FUNC_OFFSET(17319, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, _gloffset_VertexAttrib4fARB),
+    NAME_FUNC_OFFSET(17336, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, _gloffset_VertexAttrib4fvARB),
+    NAME_FUNC_OFFSET(17354, glVertexAttrib4ivARB, glVertexAttrib4ivARB, NULL, _gloffset_VertexAttrib4ivARB),
+    NAME_FUNC_OFFSET(17372, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL, _gloffset_VertexAttrib4sARB),
+    NAME_FUNC_OFFSET(17389, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL, _gloffset_VertexAttrib4svARB),
+    NAME_FUNC_OFFSET(17407, glVertexAttrib4ubvARB, glVertexAttrib4ubvARB, NULL, _gloffset_VertexAttrib4ubvARB),
+    NAME_FUNC_OFFSET(17426, glVertexAttrib4uivARB, glVertexAttrib4uivARB, NULL, _gloffset_VertexAttrib4uivARB),
+    NAME_FUNC_OFFSET(17445, glVertexAttrib4usvARB, glVertexAttrib4usvARB, NULL, _gloffset_VertexAttrib4usvARB),
+    NAME_FUNC_OFFSET(17464, glVertexAttribPointerARB, glVertexAttribPointerARB, NULL, _gloffset_VertexAttribPointerARB),
+    NAME_FUNC_OFFSET(17486, glBindBufferARB, glBindBufferARB, NULL, _gloffset_BindBufferARB),
+    NAME_FUNC_OFFSET(17499, glBufferDataARB, glBufferDataARB, NULL, _gloffset_BufferDataARB),
+    NAME_FUNC_OFFSET(17512, glBufferSubDataARB, glBufferSubDataARB, NULL, _gloffset_BufferSubDataARB),
+    NAME_FUNC_OFFSET(17528, glDeleteBuffersARB, glDeleteBuffersARB, NULL, _gloffset_DeleteBuffersARB),
+    NAME_FUNC_OFFSET(17544, glGenBuffersARB, glGenBuffersARB, NULL, _gloffset_GenBuffersARB),
+    NAME_FUNC_OFFSET(17557, glGetBufferParameterivARB, glGetBufferParameterivARB, NULL, _gloffset_GetBufferParameterivARB),
+    NAME_FUNC_OFFSET(17580, glGetBufferPointervARB, glGetBufferPointervARB, NULL, _gloffset_GetBufferPointervARB),
+    NAME_FUNC_OFFSET(17600, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL, _gloffset_GetBufferSubDataARB),
+    NAME_FUNC_OFFSET(17619, glIsBufferARB, glIsBufferARB, NULL, _gloffset_IsBufferARB),
+    NAME_FUNC_OFFSET(17630, glMapBufferARB, glMapBufferARB, NULL, _gloffset_MapBufferARB),
+    NAME_FUNC_OFFSET(17642, glUnmapBufferARB, glUnmapBufferARB, NULL, _gloffset_UnmapBufferARB),
+    NAME_FUNC_OFFSET(17656, glBeginQueryARB, glBeginQueryARB, NULL, _gloffset_BeginQueryARB),
+    NAME_FUNC_OFFSET(17669, glDeleteQueriesARB, glDeleteQueriesARB, NULL, _gloffset_DeleteQueriesARB),
+    NAME_FUNC_OFFSET(17685, glEndQueryARB, glEndQueryARB, NULL, _gloffset_EndQueryARB),
+    NAME_FUNC_OFFSET(17696, glGenQueriesARB, glGenQueriesARB, NULL, _gloffset_GenQueriesARB),
+    NAME_FUNC_OFFSET(17709, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL, _gloffset_GetQueryObjectivARB),
+    NAME_FUNC_OFFSET(17728, glGetQueryObjectuivARB, glGetQueryObjectuivARB, NULL, _gloffset_GetQueryObjectuivARB),
+    NAME_FUNC_OFFSET(17748, glGetQueryivARB, glGetQueryivARB, NULL, _gloffset_GetQueryivARB),
+    NAME_FUNC_OFFSET(17761, glIsQueryARB, glIsQueryARB, NULL, _gloffset_IsQueryARB),
+    NAME_FUNC_OFFSET(17771, glCompileShaderARB, glCompileShaderARB, NULL, _gloffset_CompileShaderARB),
+    NAME_FUNC_OFFSET(17787, glGetActiveUniformARB, glGetActiveUniformARB, NULL, _gloffset_GetActiveUniformARB),
+    NAME_FUNC_OFFSET(17806, glGetShaderSourceARB, glGetShaderSourceARB, NULL, _gloffset_GetShaderSourceARB),
+    NAME_FUNC_OFFSET(17824, glGetUniformLocationARB, glGetUniformLocationARB, NULL, _gloffset_GetUniformLocationARB),
+    NAME_FUNC_OFFSET(17845, glGetUniformfvARB, glGetUniformfvARB, NULL, _gloffset_GetUniformfvARB),
+    NAME_FUNC_OFFSET(17860, glGetUniformivARB, glGetUniformivARB, NULL, _gloffset_GetUniformivARB),
+    NAME_FUNC_OFFSET(17875, glLinkProgramARB, glLinkProgramARB, NULL, _gloffset_LinkProgramARB),
+    NAME_FUNC_OFFSET(17889, glShaderSourceARB, glShaderSourceARB, NULL, _gloffset_ShaderSourceARB),
+    NAME_FUNC_OFFSET(17904, glUniform1fARB, glUniform1fARB, NULL, _gloffset_Uniform1fARB),
+    NAME_FUNC_OFFSET(17916, glUniform1fvARB, glUniform1fvARB, NULL, _gloffset_Uniform1fvARB),
+    NAME_FUNC_OFFSET(17929, glUniform1iARB, glUniform1iARB, NULL, _gloffset_Uniform1iARB),
+    NAME_FUNC_OFFSET(17941, glUniform1ivARB, glUniform1ivARB, NULL, _gloffset_Uniform1ivARB),
+    NAME_FUNC_OFFSET(17954, glUniform2fARB, glUniform2fARB, NULL, _gloffset_Uniform2fARB),
+    NAME_FUNC_OFFSET(17966, glUniform2fvARB, glUniform2fvARB, NULL, _gloffset_Uniform2fvARB),
+    NAME_FUNC_OFFSET(17979, glUniform2iARB, glUniform2iARB, NULL, _gloffset_Uniform2iARB),
+    NAME_FUNC_OFFSET(17991, glUniform2ivARB, glUniform2ivARB, NULL, _gloffset_Uniform2ivARB),
+    NAME_FUNC_OFFSET(18004, glUniform3fARB, glUniform3fARB, NULL, _gloffset_Uniform3fARB),
+    NAME_FUNC_OFFSET(18016, glUniform3fvARB, glUniform3fvARB, NULL, _gloffset_Uniform3fvARB),
+    NAME_FUNC_OFFSET(18029, glUniform3iARB, glUniform3iARB, NULL, _gloffset_Uniform3iARB),
+    NAME_FUNC_OFFSET(18041, glUniform3ivARB, glUniform3ivARB, NULL, _gloffset_Uniform3ivARB),
+    NAME_FUNC_OFFSET(18054, glUniform4fARB, glUniform4fARB, NULL, _gloffset_Uniform4fARB),
+    NAME_FUNC_OFFSET(18066, glUniform4fvARB, glUniform4fvARB, NULL, _gloffset_Uniform4fvARB),
+    NAME_FUNC_OFFSET(18079, glUniform4iARB, glUniform4iARB, NULL, _gloffset_Uniform4iARB),
+    NAME_FUNC_OFFSET(18091, glUniform4ivARB, glUniform4ivARB, NULL, _gloffset_Uniform4ivARB),
+    NAME_FUNC_OFFSET(18104, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL, _gloffset_UniformMatrix2fvARB),
+    NAME_FUNC_OFFSET(18123, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL, _gloffset_UniformMatrix3fvARB),
+    NAME_FUNC_OFFSET(18142, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL, _gloffset_UniformMatrix4fvARB),
+    NAME_FUNC_OFFSET(18161, glUseProgramObjectARB, glUseProgramObjectARB, NULL, _gloffset_UseProgramObjectARB),
+    NAME_FUNC_OFFSET(18174, glValidateProgramARB, glValidateProgramARB, NULL, _gloffset_ValidateProgramARB),
+    NAME_FUNC_OFFSET(18192, glBindAttribLocationARB, glBindAttribLocationARB, NULL, _gloffset_BindAttribLocationARB),
+    NAME_FUNC_OFFSET(18213, glGetActiveAttribARB, glGetActiveAttribARB, NULL, _gloffset_GetActiveAttribARB),
+    NAME_FUNC_OFFSET(18231, glGetAttribLocationARB, glGetAttribLocationARB, NULL, _gloffset_GetAttribLocationARB),
+    NAME_FUNC_OFFSET(18251, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
+    NAME_FUNC_OFFSET(18265, glDrawBuffersARB, glDrawBuffersARB, NULL, _gloffset_DrawBuffersARB),
+    NAME_FUNC_OFFSET(18282, glRenderbufferStorageMultisample, glRenderbufferStorageMultisample, NULL, _gloffset_RenderbufferStorageMultisample),
+    NAME_FUNC_OFFSET(18318, gl_dispatch_stub_584, gl_dispatch_stub_584, NULL, _gloffset_SampleMaskSGIS),
+    NAME_FUNC_OFFSET(18334, gl_dispatch_stub_585, gl_dispatch_stub_585, NULL, _gloffset_SamplePatternSGIS),
+    NAME_FUNC_OFFSET(18353, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET(18371, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET(18392, glPointParameterfEXT, glPointParameterfEXT, NULL, _gloffset_PointParameterfEXT),
+    NAME_FUNC_OFFSET(18414, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET(18433, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET(18455, glPointParameterfvEXT, glPointParameterfvEXT, NULL, _gloffset_PointParameterfvEXT),
+    NAME_FUNC_OFFSET(18478, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, _gloffset_SecondaryColor3bEXT),
+    NAME_FUNC_OFFSET(18497, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, _gloffset_SecondaryColor3bvEXT),
+    NAME_FUNC_OFFSET(18517, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, _gloffset_SecondaryColor3dEXT),
+    NAME_FUNC_OFFSET(18536, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, _gloffset_SecondaryColor3dvEXT),
+    NAME_FUNC_OFFSET(18556, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, _gloffset_SecondaryColor3fEXT),
+    NAME_FUNC_OFFSET(18575, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, _gloffset_SecondaryColor3fvEXT),
+    NAME_FUNC_OFFSET(18595, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, _gloffset_SecondaryColor3iEXT),
+    NAME_FUNC_OFFSET(18614, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, _gloffset_SecondaryColor3ivEXT),
+    NAME_FUNC_OFFSET(18634, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, _gloffset_SecondaryColor3sEXT),
+    NAME_FUNC_OFFSET(18653, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, _gloffset_SecondaryColor3svEXT),
+    NAME_FUNC_OFFSET(18673, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, _gloffset_SecondaryColor3ubEXT),
+    NAME_FUNC_OFFSET(18693, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, _gloffset_SecondaryColor3ubvEXT),
+    NAME_FUNC_OFFSET(18714, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, _gloffset_SecondaryColor3uiEXT),
+    NAME_FUNC_OFFSET(18734, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, _gloffset_SecondaryColor3uivEXT),
+    NAME_FUNC_OFFSET(18755, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, _gloffset_SecondaryColor3usEXT),
+    NAME_FUNC_OFFSET(18775, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, _gloffset_SecondaryColor3usvEXT),
+    NAME_FUNC_OFFSET(18796, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, _gloffset_SecondaryColorPointerEXT),
+    NAME_FUNC_OFFSET(18820, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, _gloffset_MultiDrawArraysEXT),
+    NAME_FUNC_OFFSET(18838, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, _gloffset_MultiDrawElementsEXT),
+    NAME_FUNC_OFFSET(18858, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, _gloffset_FogCoordPointerEXT),
+    NAME_FUNC_OFFSET(18876, glFogCoorddEXT, glFogCoorddEXT, NULL, _gloffset_FogCoorddEXT),
+    NAME_FUNC_OFFSET(18888, glFogCoorddvEXT, glFogCoorddvEXT, NULL, _gloffset_FogCoorddvEXT),
+    NAME_FUNC_OFFSET(18901, glFogCoordfEXT, glFogCoordfEXT, NULL, _gloffset_FogCoordfEXT),
+    NAME_FUNC_OFFSET(18913, glFogCoordfvEXT, glFogCoordfvEXT, NULL, _gloffset_FogCoordfvEXT),
+    NAME_FUNC_OFFSET(18926, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
+    NAME_FUNC_OFFSET(18946, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, _gloffset_BlendFuncSeparateEXT),
+    NAME_FUNC_OFFSET(18970, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
+    NAME_FUNC_OFFSET(18984, glWindowPos2dMESA, glWindowPos2dMESA, NULL, _gloffset_WindowPos2dMESA),
+    NAME_FUNC_OFFSET(19001, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
+    NAME_FUNC_OFFSET(19016, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, _gloffset_WindowPos2dvMESA),
+    NAME_FUNC_OFFSET(19034, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
+    NAME_FUNC_OFFSET(19048, glWindowPos2fMESA, glWindowPos2fMESA, NULL, _gloffset_WindowPos2fMESA),
+    NAME_FUNC_OFFSET(19065, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
+    NAME_FUNC_OFFSET(19080, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, _gloffset_WindowPos2fvMESA),
+    NAME_FUNC_OFFSET(19098, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
+    NAME_FUNC_OFFSET(19112, glWindowPos2iMESA, glWindowPos2iMESA, NULL, _gloffset_WindowPos2iMESA),
+    NAME_FUNC_OFFSET(19129, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
+    NAME_FUNC_OFFSET(19144, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, _gloffset_WindowPos2ivMESA),
+    NAME_FUNC_OFFSET(19162, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
+    NAME_FUNC_OFFSET(19176, glWindowPos2sMESA, glWindowPos2sMESA, NULL, _gloffset_WindowPos2sMESA),
+    NAME_FUNC_OFFSET(19193, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
+    NAME_FUNC_OFFSET(19208, glWindowPos2svMESA, glWindowPos2svMESA, NULL, _gloffset_WindowPos2svMESA),
+    NAME_FUNC_OFFSET(19226, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
+    NAME_FUNC_OFFSET(19240, glWindowPos3dMESA, glWindowPos3dMESA, NULL, _gloffset_WindowPos3dMESA),
+    NAME_FUNC_OFFSET(19257, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
+    NAME_FUNC_OFFSET(19272, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, _gloffset_WindowPos3dvMESA),
+    NAME_FUNC_OFFSET(19290, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
+    NAME_FUNC_OFFSET(19304, glWindowPos3fMESA, glWindowPos3fMESA, NULL, _gloffset_WindowPos3fMESA),
+    NAME_FUNC_OFFSET(19321, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
+    NAME_FUNC_OFFSET(19336, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, _gloffset_WindowPos3fvMESA),
+    NAME_FUNC_OFFSET(19354, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
+    NAME_FUNC_OFFSET(19368, glWindowPos3iMESA, glWindowPos3iMESA, NULL, _gloffset_WindowPos3iMESA),
+    NAME_FUNC_OFFSET(19385, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
+    NAME_FUNC_OFFSET(19400, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, _gloffset_WindowPos3ivMESA),
+    NAME_FUNC_OFFSET(19418, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
+    NAME_FUNC_OFFSET(19432, glWindowPos3sMESA, glWindowPos3sMESA, NULL, _gloffset_WindowPos3sMESA),
+    NAME_FUNC_OFFSET(19449, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
+    NAME_FUNC_OFFSET(19464, glWindowPos3svMESA, glWindowPos3svMESA, NULL, _gloffset_WindowPos3svMESA),
+    NAME_FUNC_OFFSET(19482, glBindProgramNV, glBindProgramNV, NULL, _gloffset_BindProgramNV),
+    NAME_FUNC_OFFSET(19499, glDeleteProgramsNV, glDeleteProgramsNV, NULL, _gloffset_DeleteProgramsNV),
+    NAME_FUNC_OFFSET(19519, glGenProgramsNV, glGenProgramsNV, NULL, _gloffset_GenProgramsNV),
+    NAME_FUNC_OFFSET(19536, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
+    NAME_FUNC_OFFSET(19562, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, _gloffset_GetVertexAttribPointervNV),
+    NAME_FUNC_OFFSET(19591, glIsProgramNV, glIsProgramNV, NULL, _gloffset_IsProgramNV),
+    NAME_FUNC_OFFSET(19606, glPointParameteriNV, glPointParameteriNV, NULL, _gloffset_PointParameteriNV),
+    NAME_FUNC_OFFSET(19624, glPointParameterivNV, glPointParameterivNV, NULL, _gloffset_PointParameterivNV),
+    NAME_FUNC_OFFSET(19643, gl_dispatch_stub_755, gl_dispatch_stub_755, NULL, _gloffset_DeleteVertexArraysAPPLE),
+    NAME_FUNC_OFFSET(19664, gl_dispatch_stub_757, gl_dispatch_stub_757, NULL, _gloffset_IsVertexArrayAPPLE),
+    NAME_FUNC_OFFSET(19680, gl_dispatch_stub_765, gl_dispatch_stub_765, NULL, _gloffset_BlendEquationSeparateEXT),
+    NAME_FUNC_OFFSET(19704, gl_dispatch_stub_765, gl_dispatch_stub_765, NULL, _gloffset_BlendEquationSeparateEXT),
+    NAME_FUNC_OFFSET(19731, glBindFramebufferEXT, glBindFramebufferEXT, NULL, _gloffset_BindFramebufferEXT),
+    NAME_FUNC_OFFSET(19749, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, _gloffset_BindRenderbufferEXT),
+    NAME_FUNC_OFFSET(19768, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, _gloffset_CheckFramebufferStatusEXT),
+    NAME_FUNC_OFFSET(19793, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, _gloffset_DeleteFramebuffersEXT),
+    NAME_FUNC_OFFSET(19814, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, _gloffset_DeleteRenderbuffersEXT),
+    NAME_FUNC_OFFSET(19836, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, _gloffset_FramebufferRenderbufferEXT),
+    NAME_FUNC_OFFSET(19862, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, _gloffset_FramebufferTexture1DEXT),
+    NAME_FUNC_OFFSET(19885, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, _gloffset_FramebufferTexture2DEXT),
+    NAME_FUNC_OFFSET(19908, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, _gloffset_FramebufferTexture3DEXT),
+    NAME_FUNC_OFFSET(19931, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, _gloffset_GenFramebuffersEXT),
+    NAME_FUNC_OFFSET(19949, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, _gloffset_GenRenderbuffersEXT),
+    NAME_FUNC_OFFSET(19968, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, _gloffset_GenerateMipmapEXT),
+    NAME_FUNC_OFFSET(19985, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, _gloffset_GetFramebufferAttachmentParameterivEXT),
+    NAME_FUNC_OFFSET(20023, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, _gloffset_GetRenderbufferParameterivEXT),
+    NAME_FUNC_OFFSET(20052, glIsFramebufferEXT, glIsFramebufferEXT, NULL, _gloffset_IsFramebufferEXT),
+    NAME_FUNC_OFFSET(20068, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, _gloffset_IsRenderbufferEXT),
+    NAME_FUNC_OFFSET(20085, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, _gloffset_RenderbufferStorageEXT),
+    NAME_FUNC_OFFSET(20107, gl_dispatch_stub_783, gl_dispatch_stub_783, NULL, _gloffset_BlitFramebufferEXT),
+    NAME_FUNC_OFFSET(20125, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, _gloffset_FramebufferTextureLayerEXT),
+    NAME_FUNC_OFFSET(20151, glProvokingVertexEXT, glProvokingVertexEXT, NULL, _gloffset_ProvokingVertexEXT),
     NAME_FUNC_OFFSET(-1, NULL, NULL, NULL, 0)
 };
 
diff --git a/src/mesa/main/enums.c b/src/mesa/main/enums.c
index 140902f677..06d51d4e5c 100644
--- a/src/mesa/main/enums.c
+++ b/src/mesa/main/enums.c
@@ -145,6 +145,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_BUFFER_MAPPED_ARB\0"
    "GL_BUFFER_MAP_POINTER\0"
    "GL_BUFFER_MAP_POINTER_ARB\0"
+   "GL_BUFFER_OBJECT_APPLE\0"
    "GL_BUFFER_SERIALIZED_MODIFY_APPLE\0"
    "GL_BUFFER_SIZE\0"
    "GL_BUFFER_SIZE_ARB\0"
@@ -1320,6 +1321,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_PROXY_TEXTURE_CUBE_MAP_ARB\0"
    "GL_PROXY_TEXTURE_RECTANGLE_ARB\0"
    "GL_PROXY_TEXTURE_RECTANGLE_NV\0"
+   "GL_PURGEABLE_APPLE\0"
    "GL_Q\0"
    "GL_QUADRATIC_ATTENUATION\0"
    "GL_QUADS\0"
@@ -1358,6 +1360,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_REFLECTION_MAP\0"
    "GL_REFLECTION_MAP_ARB\0"
    "GL_REFLECTION_MAP_NV\0"
+   "GL_RELEASED_APPLE\0"
    "GL_RENDER\0"
    "GL_RENDERBUFFER\0"
    "GL_RENDERBUFFER_ALPHA_SIZE\0"
@@ -1385,6 +1388,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_REPLICATE_BORDER_HP\0"
    "GL_RESCALE_NORMAL\0"
    "GL_RESCALE_NORMAL_EXT\0"
+   "GL_RETAINED_APPLE\0"
    "GL_RETURN\0"
    "GL_RGB\0"
    "GL_RGB10\0"
@@ -1811,6 +1815,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_TRIANGLE_MESH_SUN\0"
    "GL_TRIANGLE_STRIP\0"
    "GL_TRUE\0"
+   "GL_UNDEFINED_APPLE\0"
    "GL_UNPACK_ALIGNMENT\0"
    "GL_UNPACK_IMAGE_HEIGHT\0"
    "GL_UNPACK_LSB_FIRST\0"
@@ -1903,6 +1908,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_VERTEX_STATE_PROGRAM_NV\0"
    "GL_VIEWPORT\0"
    "GL_VIEWPORT_BIT\0"
+   "GL_VOLATILE_APPLE\0"
    "GL_WAIT_FAILED\0"
    "GL_WEIGHT_ARRAY_ARB\0"
    "GL_WEIGHT_ARRAY_BUFFER_BINDING\0"
@@ -1923,7 +1929,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_ZOOM_Y\0"
    ;
 
-static const enum_elt all_enums[1885] =
+static const enum_elt all_enums[1891] =
 {
    {     0, 0x00000600 }, /* GL_2D */
    {     6, 0x00001407 }, /* GL_2_BYTES */
@@ -2034,3136 +2040,3148 @@ static const enum_elt all_enums[1885] =
    {  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, 0x000088F0 }, /* GL_DEPTH24_STENCIL8_EXT */
-   {  7214, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT */
-   {  7234, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT_EXT */
-   {  7258, 0x00000D1F }, /* GL_DEPTH_BIAS */
-   {  7272, 0x00000D56 }, /* GL_DEPTH_BITS */
-   {  7286, 0x00008891 }, /* GL_DEPTH_BOUNDS_EXT */
-   {  7306, 0x00008890 }, /* GL_DEPTH_BOUNDS_TEST_EXT */
-   {  7331, 0x00000100 }, /* GL_DEPTH_BUFFER_BIT */
-   {  7351, 0x0000864F }, /* GL_DEPTH_CLAMP */
-   {  7366, 0x0000864F }, /* GL_DEPTH_CLAMP_NV */
-   {  7384, 0x00000B73 }, /* GL_DEPTH_CLEAR_VALUE */
-   {  7405, 0x00001902 }, /* GL_DEPTH_COMPONENT */
-   {  7424, 0x000081A5 }, /* GL_DEPTH_COMPONENT16 */
-   {  7445, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_ARB */
-   {  7470, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_SGIX */
-   {  7496, 0x000081A6 }, /* GL_DEPTH_COMPONENT24 */
-   {  7517, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_ARB */
-   {  7542, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_SGIX */
-   {  7568, 0x000081A7 }, /* GL_DEPTH_COMPONENT32 */
-   {  7589, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_ARB */
-   {  7614, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_SGIX */
-   {  7640, 0x00000B74 }, /* GL_DEPTH_FUNC */
-   {  7654, 0x00000B70 }, /* GL_DEPTH_RANGE */
-   {  7669, 0x00000D1E }, /* GL_DEPTH_SCALE */
-   {  7684, 0x000084F9 }, /* GL_DEPTH_STENCIL */
-   {  7701, 0x0000821A }, /* GL_DEPTH_STENCIL_ATTACHMENT */
-   {  7729, 0x000084F9 }, /* GL_DEPTH_STENCIL_EXT */
-   {  7750, 0x000084F9 }, /* GL_DEPTH_STENCIL_NV */
-   {  7770, 0x0000886F }, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
-   {  7798, 0x0000886E }, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
-   {  7826, 0x00000B71 }, /* GL_DEPTH_TEST */
-   {  7840, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE */
-   {  7862, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE_ARB */
-   {  7888, 0x00000B72 }, /* GL_DEPTH_WRITEMASK */
-   {  7907, 0x00001201 }, /* GL_DIFFUSE */
-   {  7918, 0x00000BD0 }, /* GL_DITHER */
-   {  7928, 0x00000A02 }, /* GL_DOMAIN */
-   {  7938, 0x00001100 }, /* GL_DONT_CARE */
-   {  7951, 0x000086AE }, /* GL_DOT3_RGB */
-   {  7963, 0x000086AF }, /* GL_DOT3_RGBA */
-   {  7976, 0x000086AF }, /* GL_DOT3_RGBA_ARB */
-   {  7993, 0x00008741 }, /* GL_DOT3_RGBA_EXT */
-   {  8010, 0x000086AE }, /* GL_DOT3_RGB_ARB */
-   {  8026, 0x00008740 }, /* GL_DOT3_RGB_EXT */
-   {  8042, 0x0000140A }, /* GL_DOUBLE */
-   {  8052, 0x00000C32 }, /* GL_DOUBLEBUFFER */
-   {  8068, 0x00000C01 }, /* GL_DRAW_BUFFER */
-   {  8083, 0x00008825 }, /* GL_DRAW_BUFFER0 */
-   {  8099, 0x00008825 }, /* GL_DRAW_BUFFER0_ARB */
-   {  8119, 0x00008825 }, /* GL_DRAW_BUFFER0_ATI */
-   {  8139, 0x00008826 }, /* GL_DRAW_BUFFER1 */
-   {  8155, 0x0000882F }, /* GL_DRAW_BUFFER10 */
-   {  8172, 0x0000882F }, /* GL_DRAW_BUFFER10_ARB */
-   {  8193, 0x0000882F }, /* GL_DRAW_BUFFER10_ATI */
-   {  8214, 0x00008830 }, /* GL_DRAW_BUFFER11 */
-   {  8231, 0x00008830 }, /* GL_DRAW_BUFFER11_ARB */
-   {  8252, 0x00008830 }, /* GL_DRAW_BUFFER11_ATI */
-   {  8273, 0x00008831 }, /* GL_DRAW_BUFFER12 */
-   {  8290, 0x00008831 }, /* GL_DRAW_BUFFER12_ARB */
-   {  8311, 0x00008831 }, /* GL_DRAW_BUFFER12_ATI */
-   {  8332, 0x00008832 }, /* GL_DRAW_BUFFER13 */
-   {  8349, 0x00008832 }, /* GL_DRAW_BUFFER13_ARB */
-   {  8370, 0x00008832 }, /* GL_DRAW_BUFFER13_ATI */
-   {  8391, 0x00008833 }, /* GL_DRAW_BUFFER14 */
-   {  8408, 0x00008833 }, /* GL_DRAW_BUFFER14_ARB */
-   {  8429, 0x00008833 }, /* GL_DRAW_BUFFER14_ATI */
-   {  8450, 0x00008834 }, /* GL_DRAW_BUFFER15 */
-   {  8467, 0x00008834 }, /* GL_DRAW_BUFFER15_ARB */
-   {  8488, 0x00008834 }, /* GL_DRAW_BUFFER15_ATI */
-   {  8509, 0x00008826 }, /* GL_DRAW_BUFFER1_ARB */
-   {  8529, 0x00008826 }, /* GL_DRAW_BUFFER1_ATI */
-   {  8549, 0x00008827 }, /* GL_DRAW_BUFFER2 */
-   {  8565, 0x00008827 }, /* GL_DRAW_BUFFER2_ARB */
-   {  8585, 0x00008827 }, /* GL_DRAW_BUFFER2_ATI */
-   {  8605, 0x00008828 }, /* GL_DRAW_BUFFER3 */
-   {  8621, 0x00008828 }, /* GL_DRAW_BUFFER3_ARB */
-   {  8641, 0x00008828 }, /* GL_DRAW_BUFFER3_ATI */
-   {  8661, 0x00008829 }, /* GL_DRAW_BUFFER4 */
-   {  8677, 0x00008829 }, /* GL_DRAW_BUFFER4_ARB */
-   {  8697, 0x00008829 }, /* GL_DRAW_BUFFER4_ATI */
-   {  8717, 0x0000882A }, /* GL_DRAW_BUFFER5 */
-   {  8733, 0x0000882A }, /* GL_DRAW_BUFFER5_ARB */
-   {  8753, 0x0000882A }, /* GL_DRAW_BUFFER5_ATI */
-   {  8773, 0x0000882B }, /* GL_DRAW_BUFFER6 */
-   {  8789, 0x0000882B }, /* GL_DRAW_BUFFER6_ARB */
-   {  8809, 0x0000882B }, /* GL_DRAW_BUFFER6_ATI */
-   {  8829, 0x0000882C }, /* GL_DRAW_BUFFER7 */
-   {  8845, 0x0000882C }, /* GL_DRAW_BUFFER7_ARB */
-   {  8865, 0x0000882C }, /* GL_DRAW_BUFFER7_ATI */
-   {  8885, 0x0000882D }, /* GL_DRAW_BUFFER8 */
-   {  8901, 0x0000882D }, /* GL_DRAW_BUFFER8_ARB */
-   {  8921, 0x0000882D }, /* GL_DRAW_BUFFER8_ATI */
-   {  8941, 0x0000882E }, /* GL_DRAW_BUFFER9 */
-   {  8957, 0x0000882E }, /* GL_DRAW_BUFFER9_ARB */
-   {  8977, 0x0000882E }, /* GL_DRAW_BUFFER9_ATI */
-   {  8997, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER */
-   {  9017, 0x00008CA6 }, /* GL_DRAW_FRAMEBUFFER_BINDING */
-   {  9045, 0x00008CA6 }, /* GL_DRAW_FRAMEBUFFER_BINDING_EXT */
-   {  9077, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER_EXT */
-   {  9101, 0x00000705 }, /* GL_DRAW_PIXEL_TOKEN */
-   {  9121, 0x00000304 }, /* GL_DST_ALPHA */
-   {  9134, 0x00000306 }, /* GL_DST_COLOR */
-   {  9147, 0x0000877A }, /* GL_DU8DV8_ATI */
-   {  9161, 0x00008779 }, /* GL_DUDV_ATI */
-   {  9173, 0x000088EA }, /* GL_DYNAMIC_COPY */
-   {  9189, 0x000088EA }, /* GL_DYNAMIC_COPY_ARB */
-   {  9209, 0x000088E8 }, /* GL_DYNAMIC_DRAW */
-   {  9225, 0x000088E8 }, /* GL_DYNAMIC_DRAW_ARB */
-   {  9245, 0x000088E9 }, /* GL_DYNAMIC_READ */
-   {  9261, 0x000088E9 }, /* GL_DYNAMIC_READ_ARB */
-   {  9281, 0x00000B43 }, /* GL_EDGE_FLAG */
-   {  9294, 0x00008079 }, /* GL_EDGE_FLAG_ARRAY */
-   {  9313, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
-   {  9347, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB */
-   {  9385, 0x00008093 }, /* GL_EDGE_FLAG_ARRAY_POINTER */
-   {  9412, 0x0000808C }, /* GL_EDGE_FLAG_ARRAY_STRIDE */
-   {  9438, 0x00008893 }, /* GL_ELEMENT_ARRAY_BUFFER */
-   {  9462, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
-   {  9494, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB */
-   {  9530, 0x00001600 }, /* GL_EMISSION */
-   {  9542, 0x00002000 }, /* GL_ENABLE_BIT */
-   {  9556, 0x00000202 }, /* GL_EQUAL */
-   {  9565, 0x00001509 }, /* GL_EQUIV */
-   {  9574, 0x00010000 }, /* GL_EVAL_BIT */
-   {  9586, 0x00000800 }, /* GL_EXP */
-   {  9593, 0x00000801 }, /* GL_EXP2 */
-   {  9601, 0x00001F03 }, /* GL_EXTENSIONS */
-   {  9615, 0x00002400 }, /* GL_EYE_LINEAR */
-   {  9629, 0x00002502 }, /* GL_EYE_PLANE */
-   {  9642, 0x0000855C }, /* GL_EYE_PLANE_ABSOLUTE_NV */
-   {  9667, 0x0000855B }, /* GL_EYE_RADIAL_NV */
-   {  9684, 0x00000000 }, /* GL_FALSE */
-   {  9693, 0x00001101 }, /* GL_FASTEST */
-   {  9704, 0x00001C01 }, /* GL_FEEDBACK */
-   {  9716, 0x00000DF0 }, /* GL_FEEDBACK_BUFFER_POINTER */
-   {  9743, 0x00000DF1 }, /* GL_FEEDBACK_BUFFER_SIZE */
-   {  9767, 0x00000DF2 }, /* GL_FEEDBACK_BUFFER_TYPE */
-   {  9791, 0x00001B02 }, /* GL_FILL */
-   {  9799, 0x00008E4D }, /* GL_FIRST_VERTEX_CONVENTION */
-   {  9826, 0x00008E4D }, /* GL_FIRST_VERTEX_CONVENTION_EXT */
-   {  9857, 0x00001D00 }, /* GL_FLAT */
-   {  9865, 0x00001406 }, /* GL_FLOAT */
-   {  9874, 0x00008B5A }, /* GL_FLOAT_MAT2 */
-   {  9888, 0x00008B5A }, /* GL_FLOAT_MAT2_ARB */
-   {  9906, 0x00008B65 }, /* GL_FLOAT_MAT2x3 */
-   {  9922, 0x00008B66 }, /* GL_FLOAT_MAT2x4 */
-   {  9938, 0x00008B5B }, /* GL_FLOAT_MAT3 */
-   {  9952, 0x00008B5B }, /* GL_FLOAT_MAT3_ARB */
-   {  9970, 0x00008B67 }, /* GL_FLOAT_MAT3x2 */
-   {  9986, 0x00008B68 }, /* GL_FLOAT_MAT3x4 */
-   { 10002, 0x00008B5C }, /* GL_FLOAT_MAT4 */
-   { 10016, 0x00008B5C }, /* GL_FLOAT_MAT4_ARB */
-   { 10034, 0x00008B69 }, /* GL_FLOAT_MAT4x2 */
-   { 10050, 0x00008B6A }, /* GL_FLOAT_MAT4x3 */
-   { 10066, 0x00008B50 }, /* GL_FLOAT_VEC2 */
-   { 10080, 0x00008B50 }, /* GL_FLOAT_VEC2_ARB */
-   { 10098, 0x00008B51 }, /* GL_FLOAT_VEC3 */
-   { 10112, 0x00008B51 }, /* GL_FLOAT_VEC3_ARB */
-   { 10130, 0x00008B52 }, /* GL_FLOAT_VEC4 */
-   { 10144, 0x00008B52 }, /* GL_FLOAT_VEC4_ARB */
-   { 10162, 0x00000B60 }, /* GL_FOG */
-   { 10169, 0x00000080 }, /* GL_FOG_BIT */
-   { 10180, 0x00000B66 }, /* GL_FOG_COLOR */
-   { 10193, 0x00008451 }, /* GL_FOG_COORD */
-   { 10206, 0x00008451 }, /* GL_FOG_COORDINATE */
-   { 10224, 0x00008457 }, /* GL_FOG_COORDINATE_ARRAY */
-   { 10248, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
-   { 10287, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB */
-   { 10330, 0x00008456 }, /* GL_FOG_COORDINATE_ARRAY_POINTER */
-   { 10362, 0x00008455 }, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
-   { 10393, 0x00008454 }, /* GL_FOG_COORDINATE_ARRAY_TYPE */
-   { 10422, 0x00008450 }, /* GL_FOG_COORDINATE_SOURCE */
-   { 10447, 0x00008457 }, /* GL_FOG_COORD_ARRAY */
-   { 10466, 0x0000889D }, /* GL_FOG_COORD_ARRAY_BUFFER_BINDING */
-   { 10500, 0x00008456 }, /* GL_FOG_COORD_ARRAY_POINTER */
-   { 10527, 0x00008455 }, /* GL_FOG_COORD_ARRAY_STRIDE */
-   { 10553, 0x00008454 }, /* GL_FOG_COORD_ARRAY_TYPE */
-   { 10577, 0x00008450 }, /* GL_FOG_COORD_SRC */
-   { 10594, 0x00000B62 }, /* GL_FOG_DENSITY */
-   { 10609, 0x0000855A }, /* GL_FOG_DISTANCE_MODE_NV */
-   { 10633, 0x00000B64 }, /* GL_FOG_END */
-   { 10644, 0x00000C54 }, /* GL_FOG_HINT */
-   { 10656, 0x00000B61 }, /* GL_FOG_INDEX */
-   { 10669, 0x00000B65 }, /* GL_FOG_MODE */
-   { 10681, 0x00008198 }, /* GL_FOG_OFFSET_SGIX */
-   { 10700, 0x00008199 }, /* GL_FOG_OFFSET_VALUE_SGIX */
-   { 10725, 0x00000B63 }, /* GL_FOG_START */
-   { 10738, 0x00008452 }, /* GL_FRAGMENT_DEPTH */
-   { 10756, 0x00008804 }, /* GL_FRAGMENT_PROGRAM_ARB */
-   { 10780, 0x00008B30 }, /* GL_FRAGMENT_SHADER */
-   { 10799, 0x00008B30 }, /* GL_FRAGMENT_SHADER_ARB */
-   { 10822, 0x00008B8B }, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
-   { 10857, 0x00008D40 }, /* GL_FRAMEBUFFER */
-   { 10872, 0x00008215 }, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
-   { 10909, 0x00008214 }, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
-   { 10945, 0x00008210 }, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
-   { 10986, 0x00008211 }, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
-   { 11027, 0x00008216 }, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
-   { 11064, 0x00008213 }, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
-   { 11101, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
-   { 11139, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT */
-   { 11181, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
-   { 11219, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT */
-   { 11261, 0x00008212 }, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
-   { 11296, 0x00008217 }, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
-   { 11335, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT */
-   { 11384, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
-   { 11432, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT */
-   { 11484, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
-   { 11524, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
-   { 11568, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
-   { 11608, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT */
-   { 11652, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING */
-   { 11675, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING_EXT */
-   { 11702, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE */
-   { 11726, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE_EXT */
-   { 11754, 0x00008218 }, /* GL_FRAMEBUFFER_DEFAULT */
-   { 11777, 0x00008D40 }, /* GL_FRAMEBUFFER_EXT */
-   { 11796, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
-   { 11833, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT */
-   { 11874, 0x00008CD9 }, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
-   { 11915, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER */
-   { 11953, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT */
-   { 11995, 0x00008CD8 }, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
-   { 12046, 0x00008CDA }, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
-   { 12084, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
-   { 12129, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT */
-   { 12178, 0x00008D56 }, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
-   { 12216, 0x00008D56 }, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT */
-   { 12258, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER */
-   { 12296, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT */
-   { 12338, 0x00008CDE }, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
-   { 12370, 0x00008219 }, /* GL_FRAMEBUFFER_UNDEFINED */
-   { 12395, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED */
-   { 12422, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED_EXT */
-   { 12453, 0x00000404 }, /* GL_FRONT */
-   { 12462, 0x00000408 }, /* GL_FRONT_AND_BACK */
-   { 12480, 0x00000B46 }, /* GL_FRONT_FACE */
-   { 12494, 0x00000400 }, /* GL_FRONT_LEFT */
-   { 12508, 0x00000401 }, /* GL_FRONT_RIGHT */
-   { 12523, 0x00008006 }, /* GL_FUNC_ADD */
-   { 12535, 0x00008006 }, /* GL_FUNC_ADD_EXT */
-   { 12551, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT */
-   { 12576, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT_EXT */
-   { 12605, 0x0000800A }, /* GL_FUNC_SUBTRACT */
-   { 12622, 0x0000800A }, /* GL_FUNC_SUBTRACT_EXT */
-   { 12643, 0x00008191 }, /* GL_GENERATE_MIPMAP */
-   { 12662, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT */
-   { 12686, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT_SGIS */
-   { 12715, 0x00008191 }, /* GL_GENERATE_MIPMAP_SGIS */
-   { 12739, 0x00000206 }, /* GL_GEQUAL */
-   { 12749, 0x00000204 }, /* GL_GREATER */
-   { 12760, 0x00001904 }, /* GL_GREEN */
-   { 12769, 0x00000D19 }, /* GL_GREEN_BIAS */
-   { 12783, 0x00000D53 }, /* GL_GREEN_BITS */
-   { 12797, 0x00000D18 }, /* GL_GREEN_SCALE */
-   { 12812, 0x0000140B }, /* GL_HALF_FLOAT */
-   { 12826, 0x00008000 }, /* GL_HINT_BIT */
-   { 12838, 0x00008024 }, /* GL_HISTOGRAM */
-   { 12851, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE */
-   { 12875, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE_EXT */
-   { 12903, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE */
-   { 12926, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE_EXT */
-   { 12953, 0x00008024 }, /* GL_HISTOGRAM_EXT */
-   { 12970, 0x00008027 }, /* GL_HISTOGRAM_FORMAT */
-   { 12990, 0x00008027 }, /* GL_HISTOGRAM_FORMAT_EXT */
-   { 13014, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE */
-   { 13038, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE_EXT */
-   { 13066, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE */
-   { 13094, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE_EXT */
-   { 13126, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE */
-   { 13148, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE_EXT */
-   { 13174, 0x0000802D }, /* GL_HISTOGRAM_SINK */
-   { 13192, 0x0000802D }, /* GL_HISTOGRAM_SINK_EXT */
-   { 13214, 0x00008026 }, /* GL_HISTOGRAM_WIDTH */
-   { 13233, 0x00008026 }, /* GL_HISTOGRAM_WIDTH_EXT */
-   { 13256, 0x0000862A }, /* GL_IDENTITY_NV */
-   { 13271, 0x00008150 }, /* GL_IGNORE_BORDER_HP */
-   { 13291, 0x00008B9B }, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
-   { 13331, 0x00008B9A }, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
-   { 13369, 0x00001E02 }, /* GL_INCR */
-   { 13377, 0x00008507 }, /* GL_INCR_WRAP */
-   { 13390, 0x00008507 }, /* GL_INCR_WRAP_EXT */
-   { 13407, 0x00008222 }, /* GL_INDEX */
-   { 13416, 0x00008077 }, /* GL_INDEX_ARRAY */
-   { 13431, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING */
-   { 13461, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING_ARB */
-   { 13495, 0x00008091 }, /* GL_INDEX_ARRAY_POINTER */
-   { 13518, 0x00008086 }, /* GL_INDEX_ARRAY_STRIDE */
-   { 13540, 0x00008085 }, /* GL_INDEX_ARRAY_TYPE */
-   { 13560, 0x00000D51 }, /* GL_INDEX_BITS */
-   { 13574, 0x00000C20 }, /* GL_INDEX_CLEAR_VALUE */
-   { 13595, 0x00000BF1 }, /* GL_INDEX_LOGIC_OP */
-   { 13613, 0x00000C30 }, /* GL_INDEX_MODE */
-   { 13627, 0x00000D13 }, /* GL_INDEX_OFFSET */
-   { 13643, 0x00000D12 }, /* GL_INDEX_SHIFT */
-   { 13658, 0x00000C21 }, /* GL_INDEX_WRITEMASK */
-   { 13677, 0x00008B84 }, /* GL_INFO_LOG_LENGTH */
-   { 13696, 0x00001404 }, /* GL_INT */
-   { 13703, 0x00008049 }, /* GL_INTENSITY */
-   { 13716, 0x0000804C }, /* GL_INTENSITY12 */
-   { 13731, 0x0000804C }, /* GL_INTENSITY12_EXT */
-   { 13750, 0x0000804D }, /* GL_INTENSITY16 */
-   { 13765, 0x0000804D }, /* GL_INTENSITY16_EXT */
-   { 13784, 0x0000804A }, /* GL_INTENSITY4 */
-   { 13798, 0x0000804A }, /* GL_INTENSITY4_EXT */
-   { 13816, 0x0000804B }, /* GL_INTENSITY8 */
-   { 13830, 0x0000804B }, /* GL_INTENSITY8_EXT */
-   { 13848, 0x00008049 }, /* GL_INTENSITY_EXT */
-   { 13865, 0x00008575 }, /* GL_INTERPOLATE */
-   { 13880, 0x00008575 }, /* GL_INTERPOLATE_ARB */
-   { 13899, 0x00008575 }, /* GL_INTERPOLATE_EXT */
-   { 13918, 0x00008B53 }, /* GL_INT_VEC2 */
-   { 13930, 0x00008B53 }, /* GL_INT_VEC2_ARB */
-   { 13946, 0x00008B54 }, /* GL_INT_VEC3 */
-   { 13958, 0x00008B54 }, /* GL_INT_VEC3_ARB */
-   { 13974, 0x00008B55 }, /* GL_INT_VEC4 */
-   { 13986, 0x00008B55 }, /* GL_INT_VEC4_ARB */
-   { 14002, 0x00000500 }, /* GL_INVALID_ENUM */
-   { 14018, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION */
-   { 14051, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION_EXT */
-   { 14088, 0x00000502 }, /* GL_INVALID_OPERATION */
-   { 14109, 0x00000501 }, /* GL_INVALID_VALUE */
-   { 14126, 0x0000862B }, /* GL_INVERSE_NV */
-   { 14140, 0x0000862D }, /* GL_INVERSE_TRANSPOSE_NV */
-   { 14164, 0x0000150A }, /* GL_INVERT */
-   { 14174, 0x00001E00 }, /* GL_KEEP */
-   { 14182, 0x00008E4E }, /* GL_LAST_VERTEX_CONVENTION */
-   { 14208, 0x00008E4E }, /* GL_LAST_VERTEX_CONVENTION_EXT */
-   { 14238, 0x00000406 }, /* GL_LEFT */
-   { 14246, 0x00000203 }, /* GL_LEQUAL */
-   { 14256, 0x00000201 }, /* GL_LESS */
-   { 14264, 0x00004000 }, /* GL_LIGHT0 */
-   { 14274, 0x00004001 }, /* GL_LIGHT1 */
-   { 14284, 0x00004002 }, /* GL_LIGHT2 */
-   { 14294, 0x00004003 }, /* GL_LIGHT3 */
-   { 14304, 0x00004004 }, /* GL_LIGHT4 */
-   { 14314, 0x00004005 }, /* GL_LIGHT5 */
-   { 14324, 0x00004006 }, /* GL_LIGHT6 */
-   { 14334, 0x00004007 }, /* GL_LIGHT7 */
-   { 14344, 0x00000B50 }, /* GL_LIGHTING */
-   { 14356, 0x00000040 }, /* GL_LIGHTING_BIT */
-   { 14372, 0x00000B53 }, /* GL_LIGHT_MODEL_AMBIENT */
-   { 14395, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL */
-   { 14424, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL_EXT */
-   { 14457, 0x00000B51 }, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
-   { 14485, 0x00000B52 }, /* GL_LIGHT_MODEL_TWO_SIDE */
-   { 14509, 0x00001B01 }, /* GL_LINE */
-   { 14517, 0x00002601 }, /* GL_LINEAR */
-   { 14527, 0x00001208 }, /* GL_LINEAR_ATTENUATION */
-   { 14549, 0x00008170 }, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
-   { 14579, 0x0000844F }, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
-   { 14610, 0x00002703 }, /* GL_LINEAR_MIPMAP_LINEAR */
-   { 14634, 0x00002701 }, /* GL_LINEAR_MIPMAP_NEAREST */
-   { 14659, 0x00000001 }, /* GL_LINES */
-   { 14668, 0x00000004 }, /* GL_LINE_BIT */
-   { 14680, 0x00000002 }, /* GL_LINE_LOOP */
-   { 14693, 0x00000707 }, /* GL_LINE_RESET_TOKEN */
-   { 14713, 0x00000B20 }, /* GL_LINE_SMOOTH */
-   { 14728, 0x00000C52 }, /* GL_LINE_SMOOTH_HINT */
-   { 14748, 0x00000B24 }, /* GL_LINE_STIPPLE */
-   { 14764, 0x00000B25 }, /* GL_LINE_STIPPLE_PATTERN */
-   { 14788, 0x00000B26 }, /* GL_LINE_STIPPLE_REPEAT */
-   { 14811, 0x00000003 }, /* GL_LINE_STRIP */
-   { 14825, 0x00000702 }, /* GL_LINE_TOKEN */
-   { 14839, 0x00000B21 }, /* GL_LINE_WIDTH */
-   { 14853, 0x00000B23 }, /* GL_LINE_WIDTH_GRANULARITY */
-   { 14879, 0x00000B22 }, /* GL_LINE_WIDTH_RANGE */
-   { 14899, 0x00008B82 }, /* GL_LINK_STATUS */
-   { 14914, 0x00000B32 }, /* GL_LIST_BASE */
-   { 14927, 0x00020000 }, /* GL_LIST_BIT */
-   { 14939, 0x00000B33 }, /* GL_LIST_INDEX */
-   { 14953, 0x00000B30 }, /* GL_LIST_MODE */
-   { 14966, 0x00000101 }, /* GL_LOAD */
-   { 14974, 0x00000BF1 }, /* GL_LOGIC_OP */
-   { 14986, 0x00000BF0 }, /* GL_LOGIC_OP_MODE */
-   { 15003, 0x00008CA1 }, /* GL_LOWER_LEFT */
-   { 15017, 0x00001909 }, /* GL_LUMINANCE */
-   { 15030, 0x00008041 }, /* GL_LUMINANCE12 */
-   { 15045, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12 */
-   { 15068, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12_EXT */
-   { 15095, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4 */
-   { 15117, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4_EXT */
-   { 15143, 0x00008041 }, /* GL_LUMINANCE12_EXT */
-   { 15162, 0x00008042 }, /* GL_LUMINANCE16 */
-   { 15177, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16 */
-   { 15200, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16_EXT */
-   { 15227, 0x00008042 }, /* GL_LUMINANCE16_EXT */
-   { 15246, 0x0000803F }, /* GL_LUMINANCE4 */
-   { 15260, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4 */
-   { 15281, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4_EXT */
-   { 15306, 0x0000803F }, /* GL_LUMINANCE4_EXT */
-   { 15324, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2 */
-   { 15345, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2_EXT */
-   { 15370, 0x00008040 }, /* GL_LUMINANCE8 */
-   { 15384, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8 */
-   { 15405, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8_EXT */
-   { 15430, 0x00008040 }, /* GL_LUMINANCE8_EXT */
-   { 15448, 0x0000190A }, /* GL_LUMINANCE_ALPHA */
-   { 15467, 0x00000D90 }, /* GL_MAP1_COLOR_4 */
-   { 15483, 0x00000DD0 }, /* GL_MAP1_GRID_DOMAIN */
-   { 15503, 0x00000DD1 }, /* GL_MAP1_GRID_SEGMENTS */
-   { 15525, 0x00000D91 }, /* GL_MAP1_INDEX */
-   { 15539, 0x00000D92 }, /* GL_MAP1_NORMAL */
-   { 15554, 0x00000D93 }, /* GL_MAP1_TEXTURE_COORD_1 */
-   { 15578, 0x00000D94 }, /* GL_MAP1_TEXTURE_COORD_2 */
-   { 15602, 0x00000D95 }, /* GL_MAP1_TEXTURE_COORD_3 */
-   { 15626, 0x00000D96 }, /* GL_MAP1_TEXTURE_COORD_4 */
-   { 15650, 0x00000D97 }, /* GL_MAP1_VERTEX_3 */
-   { 15667, 0x00000D98 }, /* GL_MAP1_VERTEX_4 */
-   { 15684, 0x00008660 }, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
-   { 15712, 0x0000866A }, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
-   { 15741, 0x0000866B }, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
-   { 15770, 0x0000866C }, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
-   { 15799, 0x0000866D }, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
-   { 15828, 0x0000866E }, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
-   { 15857, 0x0000866F }, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
-   { 15886, 0x00008661 }, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
-   { 15914, 0x00008662 }, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
-   { 15942, 0x00008663 }, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
-   { 15970, 0x00008664 }, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
-   { 15998, 0x00008665 }, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
-   { 16026, 0x00008666 }, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
-   { 16054, 0x00008667 }, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
-   { 16082, 0x00008668 }, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
-   { 16110, 0x00008669 }, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
-   { 16138, 0x00000DB0 }, /* GL_MAP2_COLOR_4 */
-   { 16154, 0x00000DD2 }, /* GL_MAP2_GRID_DOMAIN */
-   { 16174, 0x00000DD3 }, /* GL_MAP2_GRID_SEGMENTS */
-   { 16196, 0x00000DB1 }, /* GL_MAP2_INDEX */
-   { 16210, 0x00000DB2 }, /* GL_MAP2_NORMAL */
-   { 16225, 0x00000DB3 }, /* GL_MAP2_TEXTURE_COORD_1 */
-   { 16249, 0x00000DB4 }, /* GL_MAP2_TEXTURE_COORD_2 */
-   { 16273, 0x00000DB5 }, /* GL_MAP2_TEXTURE_COORD_3 */
-   { 16297, 0x00000DB6 }, /* GL_MAP2_TEXTURE_COORD_4 */
-   { 16321, 0x00000DB7 }, /* GL_MAP2_VERTEX_3 */
-   { 16338, 0x00000DB8 }, /* GL_MAP2_VERTEX_4 */
-   { 16355, 0x00008670 }, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
-   { 16383, 0x0000867A }, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
-   { 16412, 0x0000867B }, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
-   { 16441, 0x0000867C }, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
-   { 16470, 0x0000867D }, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
-   { 16499, 0x0000867E }, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
-   { 16528, 0x0000867F }, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
-   { 16557, 0x00008671 }, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
-   { 16585, 0x00008672 }, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
-   { 16613, 0x00008673 }, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
-   { 16641, 0x00008674 }, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
-   { 16669, 0x00008675 }, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
-   { 16697, 0x00008676 }, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
-   { 16725, 0x00008677 }, /* GL_MAP2_VERTEX_ATTRIB7_4_NV */
-   { 16753, 0x00008678 }, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
-   { 16781, 0x00008679 }, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
-   { 16809, 0x00000D10 }, /* GL_MAP_COLOR */
-   { 16822, 0x00000010 }, /* GL_MAP_FLUSH_EXPLICIT_BIT */
-   { 16848, 0x00000008 }, /* GL_MAP_INVALIDATE_BUFFER_BIT */
-   { 16877, 0x00000004 }, /* GL_MAP_INVALIDATE_RANGE_BIT */
-   { 16905, 0x00000001 }, /* GL_MAP_READ_BIT */
-   { 16921, 0x00000D11 }, /* GL_MAP_STENCIL */
-   { 16936, 0x00000020 }, /* GL_MAP_UNSYNCHRONIZED_BIT */
-   { 16962, 0x00000002 }, /* GL_MAP_WRITE_BIT */
-   { 16979, 0x000088C0 }, /* GL_MATRIX0_ARB */
-   { 16994, 0x00008630 }, /* GL_MATRIX0_NV */
-   { 17008, 0x000088CA }, /* GL_MATRIX10_ARB */
-   { 17024, 0x000088CB }, /* GL_MATRIX11_ARB */
-   { 17040, 0x000088CC }, /* GL_MATRIX12_ARB */
-   { 17056, 0x000088CD }, /* GL_MATRIX13_ARB */
-   { 17072, 0x000088CE }, /* GL_MATRIX14_ARB */
-   { 17088, 0x000088CF }, /* GL_MATRIX15_ARB */
-   { 17104, 0x000088D0 }, /* GL_MATRIX16_ARB */
-   { 17120, 0x000088D1 }, /* GL_MATRIX17_ARB */
-   { 17136, 0x000088D2 }, /* GL_MATRIX18_ARB */
-   { 17152, 0x000088D3 }, /* GL_MATRIX19_ARB */
-   { 17168, 0x000088C1 }, /* GL_MATRIX1_ARB */
-   { 17183, 0x00008631 }, /* GL_MATRIX1_NV */
-   { 17197, 0x000088D4 }, /* GL_MATRIX20_ARB */
-   { 17213, 0x000088D5 }, /* GL_MATRIX21_ARB */
-   { 17229, 0x000088D6 }, /* GL_MATRIX22_ARB */
-   { 17245, 0x000088D7 }, /* GL_MATRIX23_ARB */
-   { 17261, 0x000088D8 }, /* GL_MATRIX24_ARB */
-   { 17277, 0x000088D9 }, /* GL_MATRIX25_ARB */
-   { 17293, 0x000088DA }, /* GL_MATRIX26_ARB */
-   { 17309, 0x000088DB }, /* GL_MATRIX27_ARB */
-   { 17325, 0x000088DC }, /* GL_MATRIX28_ARB */
-   { 17341, 0x000088DD }, /* GL_MATRIX29_ARB */
-   { 17357, 0x000088C2 }, /* GL_MATRIX2_ARB */
-   { 17372, 0x00008632 }, /* GL_MATRIX2_NV */
-   { 17386, 0x000088DE }, /* GL_MATRIX30_ARB */
-   { 17402, 0x000088DF }, /* GL_MATRIX31_ARB */
-   { 17418, 0x000088C3 }, /* GL_MATRIX3_ARB */
-   { 17433, 0x00008633 }, /* GL_MATRIX3_NV */
-   { 17447, 0x000088C4 }, /* GL_MATRIX4_ARB */
-   { 17462, 0x00008634 }, /* GL_MATRIX4_NV */
-   { 17476, 0x000088C5 }, /* GL_MATRIX5_ARB */
-   { 17491, 0x00008635 }, /* GL_MATRIX5_NV */
-   { 17505, 0x000088C6 }, /* GL_MATRIX6_ARB */
-   { 17520, 0x00008636 }, /* GL_MATRIX6_NV */
-   { 17534, 0x000088C7 }, /* GL_MATRIX7_ARB */
-   { 17549, 0x00008637 }, /* GL_MATRIX7_NV */
-   { 17563, 0x000088C8 }, /* GL_MATRIX8_ARB */
-   { 17578, 0x000088C9 }, /* GL_MATRIX9_ARB */
-   { 17593, 0x00008844 }, /* GL_MATRIX_INDEX_ARRAY_ARB */
-   { 17619, 0x00008849 }, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
-   { 17653, 0x00008846 }, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
-   { 17684, 0x00008848 }, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
-   { 17717, 0x00008847 }, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
-   { 17748, 0x00000BA0 }, /* GL_MATRIX_MODE */
-   { 17763, 0x00008840 }, /* GL_MATRIX_PALETTE_ARB */
-   { 17785, 0x00008008 }, /* GL_MAX */
-   { 17792, 0x00008073 }, /* GL_MAX_3D_TEXTURE_SIZE */
-   { 17815, 0x000088FF }, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
-   { 17847, 0x00000D35 }, /* GL_MAX_ATTRIB_STACK_DEPTH */
-   { 17873, 0x00000D3B }, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
-   { 17906, 0x00008177 }, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
-   { 17932, 0x00008178 }, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-   { 17966, 0x00000D32 }, /* GL_MAX_CLIP_PLANES */
-   { 17985, 0x00008CDF }, /* GL_MAX_COLOR_ATTACHMENTS */
-   { 18010, 0x00008CDF }, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
-   { 18039, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
-   { 18071, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI */
-   { 18107, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
-   { 18143, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB */
-   { 18183, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT */
-   { 18209, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT_EXT */
-   { 18239, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH */
-   { 18264, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH_EXT */
-   { 18293, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
-   { 18322, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB */
-   { 18355, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS */
-   { 18375, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ARB */
-   { 18399, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ATI */
-   { 18423, 0x000080E9 }, /* GL_MAX_ELEMENTS_INDICES */
-   { 18447, 0x000080E8 }, /* GL_MAX_ELEMENTS_VERTICES */
-   { 18472, 0x00000D30 }, /* GL_MAX_EVAL_ORDER */
-   { 18490, 0x00008008 }, /* GL_MAX_EXT */
-   { 18501, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
-   { 18536, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB */
-   { 18575, 0x00000D31 }, /* GL_MAX_LIGHTS */
-   { 18589, 0x00000B31 }, /* GL_MAX_LIST_NESTING */
-   { 18609, 0x00008841 }, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
-   { 18647, 0x00000D36 }, /* GL_MAX_MODELVIEW_STACK_DEPTH */
-   { 18676, 0x00000D37 }, /* GL_MAX_NAME_STACK_DEPTH */
-   { 18700, 0x00008842 }, /* GL_MAX_PALETTE_MATRICES_ARB */
-   { 18728, 0x00000D34 }, /* GL_MAX_PIXEL_MAP_TABLE */
-   { 18751, 0x000088B1 }, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
-   { 18788, 0x0000880B }, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
-   { 18824, 0x000088AD }, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
-   { 18851, 0x000088F5 }, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
-   { 18880, 0x000088B5 }, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
-   { 18914, 0x000088F4 }, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
-   { 18950, 0x000088F6 }, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
-   { 18977, 0x000088A1 }, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
-   { 19009, 0x000088B4 }, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
-   { 19045, 0x000088F8 }, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
-   { 19074, 0x000088F7 }, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
-   { 19103, 0x0000862F }, /* GL_MAX_PROGRAM_MATRICES_ARB */
-   { 19131, 0x0000862E }, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
-   { 19169, 0x000088B3 }, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-   { 19213, 0x0000880E }, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-   { 19256, 0x000088AF }, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
-   { 19290, 0x000088A3 }, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-   { 19329, 0x000088AB }, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
-   { 19366, 0x000088A7 }, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
-   { 19404, 0x00008810 }, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-   { 19447, 0x0000880F }, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-   { 19490, 0x000088A9 }, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
-   { 19520, 0x000088A5 }, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
-   { 19551, 0x0000880D }, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
-   { 19587, 0x0000880C }, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
-   { 19623, 0x00000D38 }, /* GL_MAX_PROJECTION_STACK_DEPTH */
-   { 19653, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
-   { 19687, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_NV */
-   { 19720, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE */
-   { 19745, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
-   { 19774, 0x00008D57 }, /* GL_MAX_SAMPLES */
-   { 19789, 0x00008D57 }, /* GL_MAX_SAMPLES_EXT */
-   { 19808, 0x00009111 }, /* GL_MAX_SERVER_WAIT_TIMEOUT */
-   { 19835, 0x00008504 }, /* GL_MAX_SHININESS_NV */
-   { 19855, 0x00008505 }, /* GL_MAX_SPOT_EXPONENT_NV */
-   { 19879, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS */
-   { 19901, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS_ARB */
-   { 19927, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS */
-   { 19954, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS_ARB */
-   { 19985, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS */
-   { 20009, 0x000084FF }, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
-   { 20043, 0x00000D33 }, /* GL_MAX_TEXTURE_SIZE */
-   { 20063, 0x00000D39 }, /* GL_MAX_TEXTURE_STACK_DEPTH */
-   { 20090, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS */
-   { 20111, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS_ARB */
-   { 20136, 0x0000862F }, /* GL_MAX_TRACK_MATRICES_NV */
-   { 20161, 0x0000862E }, /* GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV */
-   { 20196, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS */
-   { 20218, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS_ARB */
-   { 20244, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS */
-   { 20266, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS_ARB */
-   { 20292, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
-   { 20326, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
-   { 20364, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
-   { 20397, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB */
-   { 20434, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_ARB */
-   { 20458, 0x00000D3A }, /* GL_MAX_VIEWPORT_DIMS */
-   { 20479, 0x00008007 }, /* GL_MIN */
-   { 20486, 0x0000802E }, /* GL_MINMAX */
-   { 20496, 0x0000802E }, /* GL_MINMAX_EXT */
-   { 20510, 0x0000802F }, /* GL_MINMAX_FORMAT */
-   { 20527, 0x0000802F }, /* GL_MINMAX_FORMAT_EXT */
-   { 20548, 0x00008030 }, /* GL_MINMAX_SINK */
-   { 20563, 0x00008030 }, /* GL_MINMAX_SINK_EXT */
-   { 20582, 0x00008007 }, /* GL_MIN_EXT */
-   { 20593, 0x00008370 }, /* GL_MIRRORED_REPEAT */
-   { 20612, 0x00008370 }, /* GL_MIRRORED_REPEAT_ARB */
-   { 20635, 0x00008370 }, /* GL_MIRRORED_REPEAT_IBM */
-   { 20658, 0x00008742 }, /* GL_MIRROR_CLAMP_ATI */
-   { 20678, 0x00008742 }, /* GL_MIRROR_CLAMP_EXT */
-   { 20698, 0x00008912 }, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
-   { 20728, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_ATI */
-   { 20756, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
-   { 20784, 0x00001700 }, /* GL_MODELVIEW */
-   { 20797, 0x00001700 }, /* GL_MODELVIEW0_ARB */
-   { 20815, 0x0000872A }, /* GL_MODELVIEW10_ARB */
-   { 20834, 0x0000872B }, /* GL_MODELVIEW11_ARB */
-   { 20853, 0x0000872C }, /* GL_MODELVIEW12_ARB */
-   { 20872, 0x0000872D }, /* GL_MODELVIEW13_ARB */
-   { 20891, 0x0000872E }, /* GL_MODELVIEW14_ARB */
-   { 20910, 0x0000872F }, /* GL_MODELVIEW15_ARB */
-   { 20929, 0x00008730 }, /* GL_MODELVIEW16_ARB */
-   { 20948, 0x00008731 }, /* GL_MODELVIEW17_ARB */
-   { 20967, 0x00008732 }, /* GL_MODELVIEW18_ARB */
-   { 20986, 0x00008733 }, /* GL_MODELVIEW19_ARB */
-   { 21005, 0x0000850A }, /* GL_MODELVIEW1_ARB */
-   { 21023, 0x00008734 }, /* GL_MODELVIEW20_ARB */
-   { 21042, 0x00008735 }, /* GL_MODELVIEW21_ARB */
-   { 21061, 0x00008736 }, /* GL_MODELVIEW22_ARB */
-   { 21080, 0x00008737 }, /* GL_MODELVIEW23_ARB */
-   { 21099, 0x00008738 }, /* GL_MODELVIEW24_ARB */
-   { 21118, 0x00008739 }, /* GL_MODELVIEW25_ARB */
-   { 21137, 0x0000873A }, /* GL_MODELVIEW26_ARB */
-   { 21156, 0x0000873B }, /* GL_MODELVIEW27_ARB */
-   { 21175, 0x0000873C }, /* GL_MODELVIEW28_ARB */
-   { 21194, 0x0000873D }, /* GL_MODELVIEW29_ARB */
-   { 21213, 0x00008722 }, /* GL_MODELVIEW2_ARB */
-   { 21231, 0x0000873E }, /* GL_MODELVIEW30_ARB */
-   { 21250, 0x0000873F }, /* GL_MODELVIEW31_ARB */
-   { 21269, 0x00008723 }, /* GL_MODELVIEW3_ARB */
-   { 21287, 0x00008724 }, /* GL_MODELVIEW4_ARB */
-   { 21305, 0x00008725 }, /* GL_MODELVIEW5_ARB */
-   { 21323, 0x00008726 }, /* GL_MODELVIEW6_ARB */
-   { 21341, 0x00008727 }, /* GL_MODELVIEW7_ARB */
-   { 21359, 0x00008728 }, /* GL_MODELVIEW8_ARB */
-   { 21377, 0x00008729 }, /* GL_MODELVIEW9_ARB */
-   { 21395, 0x00000BA6 }, /* GL_MODELVIEW_MATRIX */
-   { 21415, 0x00008629 }, /* GL_MODELVIEW_PROJECTION_NV */
-   { 21442, 0x00000BA3 }, /* GL_MODELVIEW_STACK_DEPTH */
-   { 21467, 0x00002100 }, /* GL_MODULATE */
-   { 21479, 0x00008744 }, /* GL_MODULATE_ADD_ATI */
-   { 21499, 0x00008745 }, /* GL_MODULATE_SIGNED_ADD_ATI */
-   { 21526, 0x00008746 }, /* GL_MODULATE_SUBTRACT_ATI */
-   { 21551, 0x00000103 }, /* GL_MULT */
-   { 21559, 0x0000809D }, /* GL_MULTISAMPLE */
-   { 21574, 0x000086B2 }, /* GL_MULTISAMPLE_3DFX */
-   { 21594, 0x0000809D }, /* GL_MULTISAMPLE_ARB */
-   { 21613, 0x20000000 }, /* GL_MULTISAMPLE_BIT */
-   { 21632, 0x20000000 }, /* GL_MULTISAMPLE_BIT_3DFX */
-   { 21656, 0x20000000 }, /* GL_MULTISAMPLE_BIT_ARB */
-   { 21679, 0x00008534 }, /* GL_MULTISAMPLE_FILTER_HINT_NV */
-   { 21709, 0x00002A25 }, /* GL_N3F_V3F */
-   { 21720, 0x00000D70 }, /* GL_NAME_STACK_DEPTH */
-   { 21740, 0x0000150E }, /* GL_NAND */
-   { 21748, 0x00002600 }, /* GL_NEAREST */
-   { 21759, 0x0000844E }, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
-   { 21790, 0x0000844D }, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
-   { 21822, 0x00002702 }, /* GL_NEAREST_MIPMAP_LINEAR */
-   { 21847, 0x00002700 }, /* GL_NEAREST_MIPMAP_NEAREST */
-   { 21873, 0x00000200 }, /* GL_NEVER */
-   { 21882, 0x00001102 }, /* GL_NICEST */
-   { 21892, 0x00000000 }, /* GL_NONE */
-   { 21900, 0x00001505 }, /* GL_NOOP */
-   { 21908, 0x00001508 }, /* GL_NOR */
-   { 21915, 0x00000BA1 }, /* GL_NORMALIZE */
-   { 21928, 0x00008075 }, /* GL_NORMAL_ARRAY */
-   { 21944, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
-   { 21975, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING_ARB */
-   { 22010, 0x0000808F }, /* GL_NORMAL_ARRAY_POINTER */
-   { 22034, 0x0000807F }, /* GL_NORMAL_ARRAY_STRIDE */
-   { 22057, 0x0000807E }, /* GL_NORMAL_ARRAY_TYPE */
-   { 22078, 0x00008511 }, /* GL_NORMAL_MAP */
-   { 22092, 0x00008511 }, /* GL_NORMAL_MAP_ARB */
-   { 22110, 0x00008511 }, /* GL_NORMAL_MAP_NV */
-   { 22127, 0x00000205 }, /* GL_NOTEQUAL */
-   { 22139, 0x00000000 }, /* GL_NO_ERROR */
-   { 22151, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
-   { 22185, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB */
-   { 22223, 0x00008B89 }, /* GL_OBJECT_ACTIVE_ATTRIBUTES_ARB */
-   { 22255, 0x00008B8A }, /* GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB */
-   { 22297, 0x00008B86 }, /* GL_OBJECT_ACTIVE_UNIFORMS_ARB */
-   { 22327, 0x00008B87 }, /* GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB */
-   { 22367, 0x00008B85 }, /* GL_OBJECT_ATTACHED_OBJECTS_ARB */
-   { 22398, 0x00008B81 }, /* GL_OBJECT_COMPILE_STATUS_ARB */
-   { 22427, 0x00008B80 }, /* GL_OBJECT_DELETE_STATUS_ARB */
-   { 22455, 0x00008B84 }, /* GL_OBJECT_INFO_LOG_LENGTH_ARB */
-   { 22485, 0x00002401 }, /* GL_OBJECT_LINEAR */
-   { 22502, 0x00008B82 }, /* GL_OBJECT_LINK_STATUS_ARB */
-   { 22528, 0x00002501 }, /* GL_OBJECT_PLANE */
-   { 22544, 0x00008B88 }, /* GL_OBJECT_SHADER_SOURCE_LENGTH_ARB */
-   { 22579, 0x00008B4F }, /* GL_OBJECT_SUBTYPE_ARB */
-   { 22601, 0x00009112 }, /* GL_OBJECT_TYPE */
-   { 22616, 0x00008B4E }, /* GL_OBJECT_TYPE_ARB */
-   { 22635, 0x00008B83 }, /* GL_OBJECT_VALIDATE_STATUS_ARB */
-   { 22665, 0x00008165 }, /* GL_OCCLUSION_TEST_HP */
-   { 22686, 0x00008166 }, /* GL_OCCLUSION_TEST_RESULT_HP */
-   { 22714, 0x00000001 }, /* GL_ONE */
-   { 22721, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA */
-   { 22749, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA_EXT */
-   { 22781, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR */
-   { 22809, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR_EXT */
-   { 22841, 0x00000305 }, /* GL_ONE_MINUS_DST_ALPHA */
-   { 22864, 0x00000307 }, /* GL_ONE_MINUS_DST_COLOR */
-   { 22887, 0x00000303 }, /* GL_ONE_MINUS_SRC_ALPHA */
-   { 22910, 0x00000301 }, /* GL_ONE_MINUS_SRC_COLOR */
-   { 22933, 0x00008598 }, /* GL_OPERAND0_ALPHA */
-   { 22951, 0x00008598 }, /* GL_OPERAND0_ALPHA_ARB */
-   { 22973, 0x00008598 }, /* GL_OPERAND0_ALPHA_EXT */
-   { 22995, 0x00008590 }, /* GL_OPERAND0_RGB */
-   { 23011, 0x00008590 }, /* GL_OPERAND0_RGB_ARB */
-   { 23031, 0x00008590 }, /* GL_OPERAND0_RGB_EXT */
-   { 23051, 0x00008599 }, /* GL_OPERAND1_ALPHA */
-   { 23069, 0x00008599 }, /* GL_OPERAND1_ALPHA_ARB */
-   { 23091, 0x00008599 }, /* GL_OPERAND1_ALPHA_EXT */
-   { 23113, 0x00008591 }, /* GL_OPERAND1_RGB */
-   { 23129, 0x00008591 }, /* GL_OPERAND1_RGB_ARB */
-   { 23149, 0x00008591 }, /* GL_OPERAND1_RGB_EXT */
-   { 23169, 0x0000859A }, /* GL_OPERAND2_ALPHA */
-   { 23187, 0x0000859A }, /* GL_OPERAND2_ALPHA_ARB */
-   { 23209, 0x0000859A }, /* GL_OPERAND2_ALPHA_EXT */
-   { 23231, 0x00008592 }, /* GL_OPERAND2_RGB */
-   { 23247, 0x00008592 }, /* GL_OPERAND2_RGB_ARB */
-   { 23267, 0x00008592 }, /* GL_OPERAND2_RGB_EXT */
-   { 23287, 0x0000859B }, /* GL_OPERAND3_ALPHA_NV */
-   { 23308, 0x00008593 }, /* GL_OPERAND3_RGB_NV */
-   { 23327, 0x00001507 }, /* GL_OR */
-   { 23333, 0x00000A01 }, /* GL_ORDER */
-   { 23342, 0x0000150D }, /* GL_OR_INVERTED */
-   { 23357, 0x0000150B }, /* GL_OR_REVERSE */
-   { 23371, 0x00000505 }, /* GL_OUT_OF_MEMORY */
-   { 23388, 0x00000D05 }, /* GL_PACK_ALIGNMENT */
-   { 23406, 0x0000806C }, /* GL_PACK_IMAGE_HEIGHT */
-   { 23427, 0x00008758 }, /* GL_PACK_INVERT_MESA */
-   { 23447, 0x00000D01 }, /* GL_PACK_LSB_FIRST */
-   { 23465, 0x00000D02 }, /* GL_PACK_ROW_LENGTH */
-   { 23484, 0x0000806B }, /* GL_PACK_SKIP_IMAGES */
-   { 23504, 0x00000D04 }, /* GL_PACK_SKIP_PIXELS */
-   { 23524, 0x00000D03 }, /* GL_PACK_SKIP_ROWS */
-   { 23542, 0x00000D00 }, /* GL_PACK_SWAP_BYTES */
-   { 23561, 0x00008B92 }, /* GL_PALETTE4_R5_G6_B5_OES */
-   { 23586, 0x00008B94 }, /* GL_PALETTE4_RGB5_A1_OES */
-   { 23610, 0x00008B90 }, /* GL_PALETTE4_RGB8_OES */
-   { 23631, 0x00008B93 }, /* GL_PALETTE4_RGBA4_OES */
-   { 23653, 0x00008B91 }, /* GL_PALETTE4_RGBA8_OES */
-   { 23675, 0x00008B97 }, /* GL_PALETTE8_R5_G6_B5_OES */
-   { 23700, 0x00008B99 }, /* GL_PALETTE8_RGB5_A1_OES */
-   { 23724, 0x00008B95 }, /* GL_PALETTE8_RGB8_OES */
-   { 23745, 0x00008B98 }, /* GL_PALETTE8_RGBA4_OES */
-   { 23767, 0x00008B96 }, /* GL_PALETTE8_RGBA8_OES */
-   { 23789, 0x00000700 }, /* GL_PASS_THROUGH_TOKEN */
-   { 23811, 0x00000C50 }, /* GL_PERSPECTIVE_CORRECTION_HINT */
-   { 23842, 0x00000C79 }, /* GL_PIXEL_MAP_A_TO_A */
-   { 23862, 0x00000CB9 }, /* GL_PIXEL_MAP_A_TO_A_SIZE */
-   { 23887, 0x00000C78 }, /* GL_PIXEL_MAP_B_TO_B */
-   { 23907, 0x00000CB8 }, /* GL_PIXEL_MAP_B_TO_B_SIZE */
-   { 23932, 0x00000C77 }, /* GL_PIXEL_MAP_G_TO_G */
-   { 23952, 0x00000CB7 }, /* GL_PIXEL_MAP_G_TO_G_SIZE */
-   { 23977, 0x00000C75 }, /* GL_PIXEL_MAP_I_TO_A */
-   { 23997, 0x00000CB5 }, /* GL_PIXEL_MAP_I_TO_A_SIZE */
-   { 24022, 0x00000C74 }, /* GL_PIXEL_MAP_I_TO_B */
-   { 24042, 0x00000CB4 }, /* GL_PIXEL_MAP_I_TO_B_SIZE */
-   { 24067, 0x00000C73 }, /* GL_PIXEL_MAP_I_TO_G */
-   { 24087, 0x00000CB3 }, /* GL_PIXEL_MAP_I_TO_G_SIZE */
-   { 24112, 0x00000C70 }, /* GL_PIXEL_MAP_I_TO_I */
-   { 24132, 0x00000CB0 }, /* GL_PIXEL_MAP_I_TO_I_SIZE */
-   { 24157, 0x00000C72 }, /* GL_PIXEL_MAP_I_TO_R */
-   { 24177, 0x00000CB2 }, /* GL_PIXEL_MAP_I_TO_R_SIZE */
-   { 24202, 0x00000C76 }, /* GL_PIXEL_MAP_R_TO_R */
-   { 24222, 0x00000CB6 }, /* GL_PIXEL_MAP_R_TO_R_SIZE */
-   { 24247, 0x00000C71 }, /* GL_PIXEL_MAP_S_TO_S */
-   { 24267, 0x00000CB1 }, /* GL_PIXEL_MAP_S_TO_S_SIZE */
-   { 24292, 0x00000020 }, /* GL_PIXEL_MODE_BIT */
-   { 24310, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER */
-   { 24331, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING */
-   { 24360, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING_EXT */
-   { 24393, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER_EXT */
-   { 24418, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER */
-   { 24441, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
-   { 24472, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING_EXT */
-   { 24507, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER_EXT */
-   { 24534, 0x00001B00 }, /* GL_POINT */
-   { 24543, 0x00000000 }, /* GL_POINTS */
-   { 24553, 0x00000002 }, /* GL_POINT_BIT */
-   { 24566, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION */
-   { 24596, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_ARB */
-   { 24630, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_EXT */
-   { 24664, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_SGIS */
-   { 24699, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE */
-   { 24728, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_ARB */
-   { 24761, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_EXT */
-   { 24794, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_SGIS */
-   { 24828, 0x00000B11 }, /* GL_POINT_SIZE */
-   { 24842, 0x00000B13 }, /* GL_POINT_SIZE_GRANULARITY */
-   { 24868, 0x00008127 }, /* GL_POINT_SIZE_MAX */
-   { 24886, 0x00008127 }, /* GL_POINT_SIZE_MAX_ARB */
-   { 24908, 0x00008127 }, /* GL_POINT_SIZE_MAX_EXT */
-   { 24930, 0x00008127 }, /* GL_POINT_SIZE_MAX_SGIS */
-   { 24953, 0x00008126 }, /* GL_POINT_SIZE_MIN */
-   { 24971, 0x00008126 }, /* GL_POINT_SIZE_MIN_ARB */
-   { 24993, 0x00008126 }, /* GL_POINT_SIZE_MIN_EXT */
-   { 25015, 0x00008126 }, /* GL_POINT_SIZE_MIN_SGIS */
-   { 25038, 0x00000B12 }, /* GL_POINT_SIZE_RANGE */
-   { 25058, 0x00000B10 }, /* GL_POINT_SMOOTH */
-   { 25074, 0x00000C51 }, /* GL_POINT_SMOOTH_HINT */
-   { 25095, 0x00008861 }, /* GL_POINT_SPRITE */
-   { 25111, 0x00008861 }, /* GL_POINT_SPRITE_ARB */
-   { 25131, 0x00008CA0 }, /* GL_POINT_SPRITE_COORD_ORIGIN */
-   { 25160, 0x00008861 }, /* GL_POINT_SPRITE_NV */
-   { 25179, 0x00008863 }, /* GL_POINT_SPRITE_R_MODE_NV */
-   { 25205, 0x00000701 }, /* GL_POINT_TOKEN */
-   { 25220, 0x00000009 }, /* GL_POLYGON */
-   { 25231, 0x00000008 }, /* GL_POLYGON_BIT */
-   { 25246, 0x00000B40 }, /* GL_POLYGON_MODE */
-   { 25262, 0x00008039 }, /* GL_POLYGON_OFFSET_BIAS */
-   { 25285, 0x00008038 }, /* GL_POLYGON_OFFSET_FACTOR */
-   { 25310, 0x00008037 }, /* GL_POLYGON_OFFSET_FILL */
-   { 25333, 0x00002A02 }, /* GL_POLYGON_OFFSET_LINE */
-   { 25356, 0x00002A01 }, /* GL_POLYGON_OFFSET_POINT */
-   { 25380, 0x00002A00 }, /* GL_POLYGON_OFFSET_UNITS */
-   { 25404, 0x00000B41 }, /* GL_POLYGON_SMOOTH */
-   { 25422, 0x00000C53 }, /* GL_POLYGON_SMOOTH_HINT */
-   { 25445, 0x00000B42 }, /* GL_POLYGON_STIPPLE */
-   { 25464, 0x00000010 }, /* GL_POLYGON_STIPPLE_BIT */
-   { 25487, 0x00000703 }, /* GL_POLYGON_TOKEN */
-   { 25504, 0x00001203 }, /* GL_POSITION */
-   { 25516, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
-   { 25548, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI */
-   { 25584, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
-   { 25617, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI */
-   { 25654, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
-   { 25685, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI */
-   { 25720, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
-   { 25752, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI */
-   { 25788, 0x000080D2 }, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
-   { 25821, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
-   { 25853, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI */
-   { 25889, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
-   { 25922, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI */
-   { 25959, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS */
-   { 25989, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS_SGI */
-   { 26023, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE */
-   { 26054, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE_SGI */
-   { 26089, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
-   { 26120, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS_EXT */
-   { 26155, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
-   { 26187, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE_EXT */
-   { 26223, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS */
-   { 26253, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS_EXT */
-   { 26287, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE */
-   { 26318, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE_EXT */
-   { 26353, 0x000080D1 }, /* GL_POST_CONVOLUTION_COLOR_TABLE */
-   { 26385, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS */
-   { 26416, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS_EXT */
-   { 26451, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE */
-   { 26483, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE_EXT */
-   { 26519, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS */
-   { 26548, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS_EXT */
-   { 26581, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE */
-   { 26611, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE_EXT */
-   { 26645, 0x0000817B }, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
-   { 26684, 0x00008179 }, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
-   { 26717, 0x0000817C }, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
-   { 26757, 0x0000817A }, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
-   { 26791, 0x00008578 }, /* GL_PREVIOUS */
-   { 26803, 0x00008578 }, /* GL_PREVIOUS_ARB */
-   { 26819, 0x00008578 }, /* GL_PREVIOUS_EXT */
-   { 26835, 0x00008577 }, /* GL_PRIMARY_COLOR */
-   { 26852, 0x00008577 }, /* GL_PRIMARY_COLOR_ARB */
-   { 26873, 0x00008577 }, /* GL_PRIMARY_COLOR_EXT */
-   { 26894, 0x000088B0 }, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
-   { 26927, 0x00008805 }, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
-   { 26959, 0x000088AC }, /* GL_PROGRAM_ATTRIBS_ARB */
-   { 26982, 0x00008677 }, /* GL_PROGRAM_BINDING_ARB */
-   { 27005, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_ARB */
-   { 27035, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_NV */
-   { 27064, 0x00008874 }, /* GL_PROGRAM_ERROR_STRING_ARB */
-   { 27092, 0x00008876 }, /* GL_PROGRAM_FORMAT_ARB */
-   { 27114, 0x00008875 }, /* GL_PROGRAM_FORMAT_ASCII_ARB */
-   { 27142, 0x000088A0 }, /* GL_PROGRAM_INSTRUCTIONS_ARB */
-   { 27170, 0x00008627 }, /* GL_PROGRAM_LENGTH_ARB */
-   { 27192, 0x00008627 }, /* GL_PROGRAM_LENGTH_NV */
-   { 27213, 0x000088B2 }, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-   { 27253, 0x00008808 }, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-   { 27292, 0x000088AE }, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
-   { 27322, 0x000088A2 }, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-   { 27357, 0x000088AA }, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
-   { 27390, 0x000088A6 }, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
-   { 27424, 0x0000880A }, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-   { 27463, 0x00008809 }, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-   { 27502, 0x00008B40 }, /* GL_PROGRAM_OBJECT_ARB */
-   { 27524, 0x000088A8 }, /* GL_PROGRAM_PARAMETERS_ARB */
-   { 27550, 0x00008644 }, /* GL_PROGRAM_PARAMETER_NV */
-   { 27574, 0x00008647 }, /* GL_PROGRAM_RESIDENT_NV */
-   { 27597, 0x00008628 }, /* GL_PROGRAM_STRING_ARB */
-   { 27619, 0x00008628 }, /* GL_PROGRAM_STRING_NV */
-   { 27640, 0x00008646 }, /* GL_PROGRAM_TARGET_NV */
-   { 27661, 0x000088A4 }, /* GL_PROGRAM_TEMPORARIES_ARB */
-   { 27688, 0x00008807 }, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
-   { 27720, 0x00008806 }, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
-   { 27752, 0x000088B6 }, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
-   { 27787, 0x00001701 }, /* GL_PROJECTION */
-   { 27801, 0x00000BA7 }, /* GL_PROJECTION_MATRIX */
-   { 27822, 0x00000BA4 }, /* GL_PROJECTION_STACK_DEPTH */
-   { 27848, 0x00008E4F }, /* GL_PROVOKING_VERTEX */
-   { 27868, 0x00008E4F }, /* GL_PROVOKING_VERTEX_EXT */
-   { 27892, 0x000080D3 }, /* GL_PROXY_COLOR_TABLE */
-   { 27913, 0x00008025 }, /* GL_PROXY_HISTOGRAM */
-   { 27932, 0x00008025 }, /* GL_PROXY_HISTOGRAM_EXT */
-   { 27955, 0x000080D5 }, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
-   { 27994, 0x000080D4 }, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
-   { 28032, 0x00008063 }, /* GL_PROXY_TEXTURE_1D */
-   { 28052, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
-   { 28082, 0x00008063 }, /* GL_PROXY_TEXTURE_1D_EXT */
-   { 28106, 0x00008064 }, /* GL_PROXY_TEXTURE_2D */
-   { 28126, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
-   { 28156, 0x00008064 }, /* GL_PROXY_TEXTURE_2D_EXT */
-   { 28180, 0x00008070 }, /* GL_PROXY_TEXTURE_3D */
-   { 28200, 0x000080BD }, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
-   { 28233, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP */
-   { 28259, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP_ARB */
-   { 28289, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
-   { 28320, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_NV */
-   { 28350, 0x00002003 }, /* GL_Q */
-   { 28355, 0x00001209 }, /* GL_QUADRATIC_ATTENUATION */
-   { 28380, 0x00000007 }, /* GL_QUADS */
-   { 28389, 0x00008E4C }, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION */
-   { 28433, 0x00008E4C }, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT */
-   { 28481, 0x00008614 }, /* GL_QUAD_MESH_SUN */
-   { 28498, 0x00000008 }, /* GL_QUAD_STRIP */
-   { 28512, 0x00008E16 }, /* GL_QUERY_BY_REGION_NO_WAIT_NV */
-   { 28542, 0x00008E15 }, /* GL_QUERY_BY_REGION_WAIT_NV */
-   { 28569, 0x00008864 }, /* GL_QUERY_COUNTER_BITS */
-   { 28591, 0x00008864 }, /* GL_QUERY_COUNTER_BITS_ARB */
-   { 28617, 0x00008E14 }, /* GL_QUERY_NO_WAIT_NV */
-   { 28637, 0x00008866 }, /* GL_QUERY_RESULT */
-   { 28653, 0x00008866 }, /* GL_QUERY_RESULT_ARB */
-   { 28673, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE */
-   { 28699, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE_ARB */
-   { 28729, 0x00008E13 }, /* GL_QUERY_WAIT_NV */
-   { 28746, 0x00002002 }, /* GL_R */
-   { 28751, 0x00002A10 }, /* GL_R3_G3_B2 */
-   { 28763, 0x00019262 }, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
-   { 28796, 0x00000C02 }, /* GL_READ_BUFFER */
-   { 28811, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER */
-   { 28831, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING */
-   { 28859, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
-   { 28891, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER_EXT */
-   { 28915, 0x000088B8 }, /* GL_READ_ONLY */
-   { 28928, 0x000088B8 }, /* GL_READ_ONLY_ARB */
-   { 28945, 0x000088BA }, /* GL_READ_WRITE */
-   { 28959, 0x000088BA }, /* GL_READ_WRITE_ARB */
-   { 28977, 0x00001903 }, /* GL_RED */
-   { 28984, 0x00008016 }, /* GL_REDUCE */
-   { 28994, 0x00008016 }, /* GL_REDUCE_EXT */
-   { 29008, 0x00000D15 }, /* GL_RED_BIAS */
-   { 29020, 0x00000D52 }, /* GL_RED_BITS */
-   { 29032, 0x00000D14 }, /* GL_RED_SCALE */
-   { 29045, 0x00008512 }, /* GL_REFLECTION_MAP */
-   { 29063, 0x00008512 }, /* GL_REFLECTION_MAP_ARB */
-   { 29085, 0x00008512 }, /* GL_REFLECTION_MAP_NV */
-   { 29106, 0x00001C00 }, /* GL_RENDER */
-   { 29116, 0x00008D41 }, /* GL_RENDERBUFFER */
-   { 29132, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE */
-   { 29159, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING */
-   { 29183, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_EXT */
-   { 29211, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE */
-   { 29237, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE */
-   { 29264, 0x00008D41 }, /* GL_RENDERBUFFER_EXT */
-   { 29284, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE */
-   { 29311, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT */
-   { 29334, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_EXT */
-   { 29361, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
-   { 29393, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_EXT */
-   { 29429, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE */
-   { 29454, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES */
-   { 29478, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES_EXT */
-   { 29506, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE */
-   { 29535, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH */
-   { 29557, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_EXT */
-   { 29583, 0x00001F01 }, /* GL_RENDERER */
-   { 29595, 0x00000C40 }, /* GL_RENDER_MODE */
-   { 29610, 0x00002901 }, /* GL_REPEAT */
-   { 29620, 0x00001E01 }, /* GL_REPLACE */
-   { 29631, 0x00008062 }, /* GL_REPLACE_EXT */
-   { 29646, 0x00008153 }, /* GL_REPLICATE_BORDER_HP */
-   { 29669, 0x0000803A }, /* GL_RESCALE_NORMAL */
-   { 29687, 0x0000803A }, /* GL_RESCALE_NORMAL_EXT */
-   { 29709, 0x00000102 }, /* GL_RETURN */
-   { 29719, 0x00001907 }, /* GL_RGB */
-   { 29726, 0x00008052 }, /* GL_RGB10 */
-   { 29735, 0x00008059 }, /* GL_RGB10_A2 */
-   { 29747, 0x00008059 }, /* GL_RGB10_A2_EXT */
-   { 29763, 0x00008052 }, /* GL_RGB10_EXT */
-   { 29776, 0x00008053 }, /* GL_RGB12 */
-   { 29785, 0x00008053 }, /* GL_RGB12_EXT */
-   { 29798, 0x00008054 }, /* GL_RGB16 */
-   { 29807, 0x00008054 }, /* GL_RGB16_EXT */
-   { 29820, 0x0000804E }, /* GL_RGB2_EXT */
-   { 29832, 0x0000804F }, /* GL_RGB4 */
-   { 29840, 0x0000804F }, /* GL_RGB4_EXT */
-   { 29852, 0x000083A1 }, /* GL_RGB4_S3TC */
-   { 29865, 0x00008050 }, /* GL_RGB5 */
-   { 29873, 0x00008057 }, /* GL_RGB5_A1 */
-   { 29884, 0x00008057 }, /* GL_RGB5_A1_EXT */
-   { 29899, 0x00008050 }, /* GL_RGB5_EXT */
-   { 29911, 0x00008051 }, /* GL_RGB8 */
-   { 29919, 0x00008051 }, /* GL_RGB8_EXT */
-   { 29931, 0x00001908 }, /* GL_RGBA */
-   { 29939, 0x0000805A }, /* GL_RGBA12 */
-   { 29949, 0x0000805A }, /* GL_RGBA12_EXT */
-   { 29963, 0x0000805B }, /* GL_RGBA16 */
-   { 29973, 0x0000805B }, /* GL_RGBA16_EXT */
-   { 29987, 0x00008055 }, /* GL_RGBA2 */
-   { 29996, 0x00008055 }, /* GL_RGBA2_EXT */
-   { 30009, 0x00008056 }, /* GL_RGBA4 */
-   { 30018, 0x000083A5 }, /* GL_RGBA4_DXT5_S3TC */
-   { 30037, 0x00008056 }, /* GL_RGBA4_EXT */
-   { 30050, 0x000083A3 }, /* GL_RGBA4_S3TC */
-   { 30064, 0x00008058 }, /* GL_RGBA8 */
-   { 30073, 0x00008058 }, /* GL_RGBA8_EXT */
-   { 30086, 0x00008F97 }, /* GL_RGBA8_SNORM */
-   { 30101, 0x000083A4 }, /* GL_RGBA_DXT5_S3TC */
-   { 30119, 0x00000C31 }, /* GL_RGBA_MODE */
-   { 30132, 0x000083A2 }, /* GL_RGBA_S3TC */
-   { 30145, 0x00008F93 }, /* GL_RGBA_SNORM */
-   { 30159, 0x000083A0 }, /* GL_RGB_S3TC */
-   { 30171, 0x00008573 }, /* GL_RGB_SCALE */
-   { 30184, 0x00008573 }, /* GL_RGB_SCALE_ARB */
-   { 30201, 0x00008573 }, /* GL_RGB_SCALE_EXT */
-   { 30218, 0x00000407 }, /* GL_RIGHT */
-   { 30227, 0x00002000 }, /* GL_S */
-   { 30232, 0x00008B5D }, /* GL_SAMPLER_1D */
-   { 30246, 0x00008B61 }, /* GL_SAMPLER_1D_SHADOW */
-   { 30267, 0x00008B5E }, /* GL_SAMPLER_2D */
-   { 30281, 0x00008B62 }, /* GL_SAMPLER_2D_SHADOW */
-   { 30302, 0x00008B5F }, /* GL_SAMPLER_3D */
-   { 30316, 0x00008B60 }, /* GL_SAMPLER_CUBE */
-   { 30332, 0x000080A9 }, /* GL_SAMPLES */
-   { 30343, 0x000086B4 }, /* GL_SAMPLES_3DFX */
-   { 30359, 0x000080A9 }, /* GL_SAMPLES_ARB */
-   { 30374, 0x00008914 }, /* GL_SAMPLES_PASSED */
-   { 30392, 0x00008914 }, /* GL_SAMPLES_PASSED_ARB */
-   { 30414, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
-   { 30442, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE_ARB */
-   { 30474, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE */
-   { 30497, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE_ARB */
-   { 30524, 0x000080A8 }, /* GL_SAMPLE_BUFFERS */
-   { 30542, 0x000086B3 }, /* GL_SAMPLE_BUFFERS_3DFX */
-   { 30565, 0x000080A8 }, /* GL_SAMPLE_BUFFERS_ARB */
-   { 30587, 0x000080A0 }, /* GL_SAMPLE_COVERAGE */
-   { 30606, 0x000080A0 }, /* GL_SAMPLE_COVERAGE_ARB */
-   { 30629, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT */
-   { 30655, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT_ARB */
-   { 30685, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE */
-   { 30710, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE_ARB */
-   { 30739, 0x00080000 }, /* GL_SCISSOR_BIT */
-   { 30754, 0x00000C10 }, /* GL_SCISSOR_BOX */
-   { 30769, 0x00000C11 }, /* GL_SCISSOR_TEST */
-   { 30785, 0x0000845E }, /* GL_SECONDARY_COLOR_ARRAY */
-   { 30810, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
-   { 30850, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB */
-   { 30894, 0x0000845D }, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
-   { 30927, 0x0000845A }, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
-   { 30957, 0x0000845C }, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
-   { 30989, 0x0000845B }, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
-   { 31019, 0x00001C02 }, /* GL_SELECT */
-   { 31029, 0x00000DF3 }, /* GL_SELECTION_BUFFER_POINTER */
-   { 31057, 0x00000DF4 }, /* GL_SELECTION_BUFFER_SIZE */
-   { 31082, 0x00008012 }, /* GL_SEPARABLE_2D */
-   { 31098, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR */
-   { 31125, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR_EXT */
-   { 31156, 0x0000150F }, /* GL_SET */
-   { 31163, 0x00008B48 }, /* GL_SHADER_OBJECT_ARB */
-   { 31184, 0x00008B88 }, /* GL_SHADER_SOURCE_LENGTH */
-   { 31208, 0x00008B4F }, /* GL_SHADER_TYPE */
-   { 31223, 0x00000B54 }, /* GL_SHADE_MODEL */
-   { 31238, 0x00008B8C }, /* GL_SHADING_LANGUAGE_VERSION */
-   { 31266, 0x000080BF }, /* GL_SHADOW_AMBIENT_SGIX */
-   { 31289, 0x000081FB }, /* GL_SHARED_TEXTURE_PALETTE_EXT */
-   { 31319, 0x00001601 }, /* GL_SHININESS */
-   { 31332, 0x00001402 }, /* GL_SHORT */
-   { 31341, 0x00009119 }, /* GL_SIGNALED */
-   { 31353, 0x00008F9C }, /* GL_SIGNED_NORMALIZED */
-   { 31374, 0x000081F9 }, /* GL_SINGLE_COLOR */
-   { 31390, 0x000081F9 }, /* GL_SINGLE_COLOR_EXT */
-   { 31410, 0x000085CC }, /* GL_SLICE_ACCUM_SUN */
-   { 31429, 0x00008C46 }, /* GL_SLUMINANCE */
-   { 31443, 0x00008C47 }, /* GL_SLUMINANCE8 */
-   { 31458, 0x00008C45 }, /* GL_SLUMINANCE8_ALPHA8 */
-   { 31480, 0x00008C44 }, /* GL_SLUMINANCE_ALPHA */
-   { 31500, 0x00001D01 }, /* GL_SMOOTH */
-   { 31510, 0x00000B23 }, /* GL_SMOOTH_LINE_WIDTH_GRANULARITY */
-   { 31543, 0x00000B22 }, /* GL_SMOOTH_LINE_WIDTH_RANGE */
-   { 31570, 0x00000B13 }, /* GL_SMOOTH_POINT_SIZE_GRANULARITY */
-   { 31603, 0x00000B12 }, /* GL_SMOOTH_POINT_SIZE_RANGE */
-   { 31630, 0x00008588 }, /* GL_SOURCE0_ALPHA */
-   { 31647, 0x00008588 }, /* GL_SOURCE0_ALPHA_ARB */
-   { 31668, 0x00008588 }, /* GL_SOURCE0_ALPHA_EXT */
-   { 31689, 0x00008580 }, /* GL_SOURCE0_RGB */
-   { 31704, 0x00008580 }, /* GL_SOURCE0_RGB_ARB */
-   { 31723, 0x00008580 }, /* GL_SOURCE0_RGB_EXT */
-   { 31742, 0x00008589 }, /* GL_SOURCE1_ALPHA */
-   { 31759, 0x00008589 }, /* GL_SOURCE1_ALPHA_ARB */
-   { 31780, 0x00008589 }, /* GL_SOURCE1_ALPHA_EXT */
-   { 31801, 0x00008581 }, /* GL_SOURCE1_RGB */
-   { 31816, 0x00008581 }, /* GL_SOURCE1_RGB_ARB */
-   { 31835, 0x00008581 }, /* GL_SOURCE1_RGB_EXT */
-   { 31854, 0x0000858A }, /* GL_SOURCE2_ALPHA */
-   { 31871, 0x0000858A }, /* GL_SOURCE2_ALPHA_ARB */
-   { 31892, 0x0000858A }, /* GL_SOURCE2_ALPHA_EXT */
-   { 31913, 0x00008582 }, /* GL_SOURCE2_RGB */
-   { 31928, 0x00008582 }, /* GL_SOURCE2_RGB_ARB */
-   { 31947, 0x00008582 }, /* GL_SOURCE2_RGB_EXT */
-   { 31966, 0x0000858B }, /* GL_SOURCE3_ALPHA_NV */
-   { 31986, 0x00008583 }, /* GL_SOURCE3_RGB_NV */
-   { 32004, 0x00001202 }, /* GL_SPECULAR */
-   { 32016, 0x00002402 }, /* GL_SPHERE_MAP */
-   { 32030, 0x00001206 }, /* GL_SPOT_CUTOFF */
-   { 32045, 0x00001204 }, /* GL_SPOT_DIRECTION */
-   { 32063, 0x00001205 }, /* GL_SPOT_EXPONENT */
-   { 32080, 0x00008588 }, /* GL_SRC0_ALPHA */
-   { 32094, 0x00008580 }, /* GL_SRC0_RGB */
-   { 32106, 0x00008589 }, /* GL_SRC1_ALPHA */
-   { 32120, 0x00008581 }, /* GL_SRC1_RGB */
-   { 32132, 0x0000858A }, /* GL_SRC2_ALPHA */
-   { 32146, 0x00008582 }, /* GL_SRC2_RGB */
-   { 32158, 0x00000302 }, /* GL_SRC_ALPHA */
-   { 32171, 0x00000308 }, /* GL_SRC_ALPHA_SATURATE */
-   { 32193, 0x00000300 }, /* GL_SRC_COLOR */
-   { 32206, 0x00008C40 }, /* GL_SRGB */
-   { 32214, 0x00008C41 }, /* GL_SRGB8 */
-   { 32223, 0x00008C43 }, /* GL_SRGB8_ALPHA8 */
-   { 32239, 0x00008C42 }, /* GL_SRGB_ALPHA */
-   { 32253, 0x00000503 }, /* GL_STACK_OVERFLOW */
-   { 32271, 0x00000504 }, /* GL_STACK_UNDERFLOW */
-   { 32290, 0x000088E6 }, /* GL_STATIC_COPY */
-   { 32305, 0x000088E6 }, /* GL_STATIC_COPY_ARB */
-   { 32324, 0x000088E4 }, /* GL_STATIC_DRAW */
-   { 32339, 0x000088E4 }, /* GL_STATIC_DRAW_ARB */
-   { 32358, 0x000088E5 }, /* GL_STATIC_READ */
-   { 32373, 0x000088E5 }, /* GL_STATIC_READ_ARB */
-   { 32392, 0x00001802 }, /* GL_STENCIL */
-   { 32403, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT */
-   { 32425, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_EXT */
-   { 32451, 0x00008801 }, /* GL_STENCIL_BACK_FAIL */
-   { 32472, 0x00008801 }, /* GL_STENCIL_BACK_FAIL_ATI */
-   { 32497, 0x00008800 }, /* GL_STENCIL_BACK_FUNC */
-   { 32518, 0x00008800 }, /* GL_STENCIL_BACK_FUNC_ATI */
-   { 32543, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
-   { 32575, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI */
-   { 32611, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
-   { 32643, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI */
-   { 32679, 0x00008CA3 }, /* GL_STENCIL_BACK_REF */
-   { 32699, 0x00008CA4 }, /* GL_STENCIL_BACK_VALUE_MASK */
-   { 32726, 0x00008CA5 }, /* GL_STENCIL_BACK_WRITEMASK */
-   { 32752, 0x00000D57 }, /* GL_STENCIL_BITS */
-   { 32768, 0x00000400 }, /* GL_STENCIL_BUFFER_BIT */
-   { 32790, 0x00000B91 }, /* GL_STENCIL_CLEAR_VALUE */
-   { 32813, 0x00000B94 }, /* GL_STENCIL_FAIL */
-   { 32829, 0x00000B92 }, /* GL_STENCIL_FUNC */
-   { 32845, 0x00001901 }, /* GL_STENCIL_INDEX */
-   { 32862, 0x00008D46 }, /* GL_STENCIL_INDEX1 */
-   { 32880, 0x00008D49 }, /* GL_STENCIL_INDEX16 */
-   { 32899, 0x00008D49 }, /* GL_STENCIL_INDEX16_EXT */
-   { 32922, 0x00008D46 }, /* GL_STENCIL_INDEX1_EXT */
-   { 32944, 0x00008D47 }, /* GL_STENCIL_INDEX4 */
-   { 32962, 0x00008D47 }, /* GL_STENCIL_INDEX4_EXT */
-   { 32984, 0x00008D48 }, /* GL_STENCIL_INDEX8 */
-   { 33002, 0x00008D48 }, /* GL_STENCIL_INDEX8_EXT */
-   { 33024, 0x00008D45 }, /* GL_STENCIL_INDEX_EXT */
-   { 33045, 0x00000B95 }, /* GL_STENCIL_PASS_DEPTH_FAIL */
-   { 33072, 0x00000B96 }, /* GL_STENCIL_PASS_DEPTH_PASS */
-   { 33099, 0x00000B97 }, /* GL_STENCIL_REF */
-   { 33114, 0x00000B90 }, /* GL_STENCIL_TEST */
-   { 33130, 0x00008910 }, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
-   { 33159, 0x00000B93 }, /* GL_STENCIL_VALUE_MASK */
-   { 33181, 0x00000B98 }, /* GL_STENCIL_WRITEMASK */
-   { 33202, 0x00000C33 }, /* GL_STEREO */
-   { 33212, 0x000085BE }, /* GL_STORAGE_CACHED_APPLE */
-   { 33236, 0x000085BD }, /* GL_STORAGE_PRIVATE_APPLE */
-   { 33261, 0x000085BF }, /* GL_STORAGE_SHARED_APPLE */
-   { 33285, 0x000088E2 }, /* GL_STREAM_COPY */
-   { 33300, 0x000088E2 }, /* GL_STREAM_COPY_ARB */
-   { 33319, 0x000088E0 }, /* GL_STREAM_DRAW */
-   { 33334, 0x000088E0 }, /* GL_STREAM_DRAW_ARB */
-   { 33353, 0x000088E1 }, /* GL_STREAM_READ */
-   { 33368, 0x000088E1 }, /* GL_STREAM_READ_ARB */
-   { 33387, 0x00000D50 }, /* GL_SUBPIXEL_BITS */
-   { 33404, 0x000084E7 }, /* GL_SUBTRACT */
-   { 33416, 0x000084E7 }, /* GL_SUBTRACT_ARB */
-   { 33432, 0x00009113 }, /* GL_SYNC_CONDITION */
-   { 33450, 0x00009116 }, /* GL_SYNC_FENCE */
-   { 33464, 0x00009115 }, /* GL_SYNC_FLAGS */
-   { 33478, 0x00000001 }, /* GL_SYNC_FLUSH_COMMANDS_BIT */
-   { 33505, 0x00009117 }, /* GL_SYNC_GPU_COMMANDS_COMPLETE */
-   { 33535, 0x00009114 }, /* GL_SYNC_STATUS */
-   { 33550, 0x00002001 }, /* GL_T */
-   { 33555, 0x00002A2A }, /* GL_T2F_C3F_V3F */
-   { 33570, 0x00002A2C }, /* GL_T2F_C4F_N3F_V3F */
-   { 33589, 0x00002A29 }, /* GL_T2F_C4UB_V3F */
-   { 33605, 0x00002A2B }, /* GL_T2F_N3F_V3F */
-   { 33620, 0x00002A27 }, /* GL_T2F_V3F */
-   { 33631, 0x00002A2D }, /* GL_T4F_C4F_N3F_V4F */
-   { 33650, 0x00002A28 }, /* GL_T4F_V4F */
-   { 33661, 0x00008031 }, /* GL_TABLE_TOO_LARGE_EXT */
-   { 33684, 0x00001702 }, /* GL_TEXTURE */
-   { 33695, 0x000084C0 }, /* GL_TEXTURE0 */
-   { 33707, 0x000084C0 }, /* GL_TEXTURE0_ARB */
-   { 33723, 0x000084C1 }, /* GL_TEXTURE1 */
-   { 33735, 0x000084CA }, /* GL_TEXTURE10 */
-   { 33748, 0x000084CA }, /* GL_TEXTURE10_ARB */
-   { 33765, 0x000084CB }, /* GL_TEXTURE11 */
-   { 33778, 0x000084CB }, /* GL_TEXTURE11_ARB */
-   { 33795, 0x000084CC }, /* GL_TEXTURE12 */
-   { 33808, 0x000084CC }, /* GL_TEXTURE12_ARB */
-   { 33825, 0x000084CD }, /* GL_TEXTURE13 */
-   { 33838, 0x000084CD }, /* GL_TEXTURE13_ARB */
-   { 33855, 0x000084CE }, /* GL_TEXTURE14 */
-   { 33868, 0x000084CE }, /* GL_TEXTURE14_ARB */
-   { 33885, 0x000084CF }, /* GL_TEXTURE15 */
-   { 33898, 0x000084CF }, /* GL_TEXTURE15_ARB */
-   { 33915, 0x000084D0 }, /* GL_TEXTURE16 */
-   { 33928, 0x000084D0 }, /* GL_TEXTURE16_ARB */
-   { 33945, 0x000084D1 }, /* GL_TEXTURE17 */
-   { 33958, 0x000084D1 }, /* GL_TEXTURE17_ARB */
-   { 33975, 0x000084D2 }, /* GL_TEXTURE18 */
-   { 33988, 0x000084D2 }, /* GL_TEXTURE18_ARB */
-   { 34005, 0x000084D3 }, /* GL_TEXTURE19 */
-   { 34018, 0x000084D3 }, /* GL_TEXTURE19_ARB */
-   { 34035, 0x000084C1 }, /* GL_TEXTURE1_ARB */
-   { 34051, 0x000084C2 }, /* GL_TEXTURE2 */
-   { 34063, 0x000084D4 }, /* GL_TEXTURE20 */
-   { 34076, 0x000084D4 }, /* GL_TEXTURE20_ARB */
-   { 34093, 0x000084D5 }, /* GL_TEXTURE21 */
-   { 34106, 0x000084D5 }, /* GL_TEXTURE21_ARB */
-   { 34123, 0x000084D6 }, /* GL_TEXTURE22 */
-   { 34136, 0x000084D6 }, /* GL_TEXTURE22_ARB */
-   { 34153, 0x000084D7 }, /* GL_TEXTURE23 */
-   { 34166, 0x000084D7 }, /* GL_TEXTURE23_ARB */
-   { 34183, 0x000084D8 }, /* GL_TEXTURE24 */
-   { 34196, 0x000084D8 }, /* GL_TEXTURE24_ARB */
-   { 34213, 0x000084D9 }, /* GL_TEXTURE25 */
-   { 34226, 0x000084D9 }, /* GL_TEXTURE25_ARB */
-   { 34243, 0x000084DA }, /* GL_TEXTURE26 */
-   { 34256, 0x000084DA }, /* GL_TEXTURE26_ARB */
-   { 34273, 0x000084DB }, /* GL_TEXTURE27 */
-   { 34286, 0x000084DB }, /* GL_TEXTURE27_ARB */
-   { 34303, 0x000084DC }, /* GL_TEXTURE28 */
-   { 34316, 0x000084DC }, /* GL_TEXTURE28_ARB */
-   { 34333, 0x000084DD }, /* GL_TEXTURE29 */
-   { 34346, 0x000084DD }, /* GL_TEXTURE29_ARB */
-   { 34363, 0x000084C2 }, /* GL_TEXTURE2_ARB */
-   { 34379, 0x000084C3 }, /* GL_TEXTURE3 */
-   { 34391, 0x000084DE }, /* GL_TEXTURE30 */
-   { 34404, 0x000084DE }, /* GL_TEXTURE30_ARB */
-   { 34421, 0x000084DF }, /* GL_TEXTURE31 */
-   { 34434, 0x000084DF }, /* GL_TEXTURE31_ARB */
-   { 34451, 0x000084C3 }, /* GL_TEXTURE3_ARB */
-   { 34467, 0x000084C4 }, /* GL_TEXTURE4 */
-   { 34479, 0x000084C4 }, /* GL_TEXTURE4_ARB */
-   { 34495, 0x000084C5 }, /* GL_TEXTURE5 */
-   { 34507, 0x000084C5 }, /* GL_TEXTURE5_ARB */
-   { 34523, 0x000084C6 }, /* GL_TEXTURE6 */
-   { 34535, 0x000084C6 }, /* GL_TEXTURE6_ARB */
-   { 34551, 0x000084C7 }, /* GL_TEXTURE7 */
-   { 34563, 0x000084C7 }, /* GL_TEXTURE7_ARB */
-   { 34579, 0x000084C8 }, /* GL_TEXTURE8 */
-   { 34591, 0x000084C8 }, /* GL_TEXTURE8_ARB */
-   { 34607, 0x000084C9 }, /* GL_TEXTURE9 */
-   { 34619, 0x000084C9 }, /* GL_TEXTURE9_ARB */
-   { 34635, 0x00000DE0 }, /* GL_TEXTURE_1D */
-   { 34649, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY_EXT */
-   { 34673, 0x00000DE1 }, /* GL_TEXTURE_2D */
-   { 34687, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY_EXT */
-   { 34711, 0x0000806F }, /* GL_TEXTURE_3D */
-   { 34725, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE */
-   { 34747, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE_EXT */
-   { 34773, 0x0000813C }, /* GL_TEXTURE_BASE_LEVEL */
-   { 34795, 0x00008068 }, /* GL_TEXTURE_BINDING_1D */
-   { 34817, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
-   { 34849, 0x00008069 }, /* GL_TEXTURE_BINDING_2D */
-   { 34871, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
-   { 34903, 0x0000806A }, /* GL_TEXTURE_BINDING_3D */
-   { 34925, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP */
-   { 34953, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_ARB */
-   { 34985, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
-   { 35018, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_NV */
-   { 35050, 0x00040000 }, /* GL_TEXTURE_BIT */
-   { 35065, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE */
-   { 35086, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE_EXT */
-   { 35111, 0x00001005 }, /* GL_TEXTURE_BORDER */
-   { 35129, 0x00001004 }, /* GL_TEXTURE_BORDER_COLOR */
-   { 35153, 0x00008171 }, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
-   { 35184, 0x00008176 }, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
-   { 35214, 0x00008172 }, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
-   { 35244, 0x00008175 }, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
-   { 35279, 0x00008173 }, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
-   { 35310, 0x00008174 }, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-   { 35348, 0x000080BC }, /* GL_TEXTURE_COLOR_TABLE_SGI */
-   { 35375, 0x000081EF }, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
-   { 35407, 0x000080BF }, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
-   { 35441, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC */
-   { 35465, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC_ARB */
-   { 35493, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE */
-   { 35517, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE_ARB */
-   { 35545, 0x0000819B }, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
-   { 35578, 0x0000819A }, /* GL_TEXTURE_COMPARE_SGIX */
-   { 35602, 0x00001003 }, /* GL_TEXTURE_COMPONENTS */
-   { 35624, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED */
-   { 35646, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED_ARB */
-   { 35672, 0x000086A3 }, /* GL_TEXTURE_COMPRESSED_FORMATS_ARB */
-   { 35706, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
-   { 35739, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB */
-   { 35776, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT */
-   { 35804, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT_ARB */
-   { 35836, 0x00008078 }, /* GL_TEXTURE_COORD_ARRAY */
-   { 35859, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
-   { 35897, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB */
-   { 35939, 0x00008092 }, /* GL_TEXTURE_COORD_ARRAY_POINTER */
-   { 35970, 0x00008088 }, /* GL_TEXTURE_COORD_ARRAY_SIZE */
-   { 35998, 0x0000808A }, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
-   { 36028, 0x00008089 }, /* GL_TEXTURE_COORD_ARRAY_TYPE */
-   { 36056, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP */
-   { 36076, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_ARB */
-   { 36100, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
-   { 36131, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB */
-   { 36166, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
-   { 36197, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB */
-   { 36232, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
-   { 36263, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB */
-   { 36298, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
-   { 36329, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB */
-   { 36364, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
-   { 36395, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB */
-   { 36430, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
-   { 36461, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB */
-   { 36496, 0x000088F4 }, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
-   { 36525, 0x00008071 }, /* GL_TEXTURE_DEPTH */
-   { 36542, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE */
-   { 36564, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE_ARB */
-   { 36590, 0x00002300 }, /* GL_TEXTURE_ENV */
-   { 36605, 0x00002201 }, /* GL_TEXTURE_ENV_COLOR */
-   { 36626, 0x00002200 }, /* GL_TEXTURE_ENV_MODE */
-   { 36646, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL */
-   { 36672, 0x00002500 }, /* GL_TEXTURE_GEN_MODE */
-   { 36692, 0x00000C63 }, /* GL_TEXTURE_GEN_Q */
-   { 36709, 0x00000C62 }, /* GL_TEXTURE_GEN_R */
-   { 36726, 0x00000C60 }, /* GL_TEXTURE_GEN_S */
-   { 36743, 0x00000C61 }, /* GL_TEXTURE_GEN_T */
-   { 36760, 0x0000819D }, /* GL_TEXTURE_GEQUAL_R_SGIX */
-   { 36785, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE */
-   { 36807, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE_EXT */
-   { 36833, 0x00001001 }, /* GL_TEXTURE_HEIGHT */
-   { 36851, 0x000080ED }, /* GL_TEXTURE_INDEX_SIZE_EXT */
-   { 36877, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE */
-   { 36903, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE_EXT */
-   { 36933, 0x00001003 }, /* GL_TEXTURE_INTERNAL_FORMAT */
-   { 36960, 0x0000819C }, /* GL_TEXTURE_LEQUAL_R_SGIX */
-   { 36985, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS */
-   { 37005, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS_EXT */
-   { 37029, 0x00008190 }, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
-   { 37056, 0x0000818E }, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
-   { 37083, 0x0000818F }, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
-   { 37110, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE */
-   { 37136, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE_EXT */
-   { 37166, 0x00002800 }, /* GL_TEXTURE_MAG_FILTER */
-   { 37188, 0x00000BA8 }, /* GL_TEXTURE_MATRIX */
-   { 37206, 0x000084FE }, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
-   { 37236, 0x0000836B }, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
-   { 37264, 0x00008369 }, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
-   { 37292, 0x0000836A }, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
-   { 37320, 0x0000813D }, /* GL_TEXTURE_MAX_LEVEL */
-   { 37341, 0x0000813B }, /* GL_TEXTURE_MAX_LOD */
-   { 37360, 0x00002801 }, /* GL_TEXTURE_MIN_FILTER */
-   { 37382, 0x0000813A }, /* GL_TEXTURE_MIN_LOD */
-   { 37401, 0x00008066 }, /* GL_TEXTURE_PRIORITY */
-   { 37421, 0x000085B7 }, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
-   { 37451, 0x000085B8 }, /* GL_TEXTURE_RANGE_POINTER_APPLE */
-   { 37482, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_ARB */
-   { 37507, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_NV */
-   { 37531, 0x0000805C }, /* GL_TEXTURE_RED_SIZE */
-   { 37551, 0x0000805C }, /* GL_TEXTURE_RED_SIZE_EXT */
-   { 37575, 0x00008067 }, /* GL_TEXTURE_RESIDENT */
-   { 37595, 0x00000BA5 }, /* GL_TEXTURE_STACK_DEPTH */
-   { 37618, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE */
-   { 37642, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE_EXT */
-   { 37670, 0x000085BC }, /* GL_TEXTURE_STORAGE_HINT_APPLE */
-   { 37700, 0x00008065 }, /* GL_TEXTURE_TOO_LARGE_EXT */
-   { 37725, 0x0000888F }, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
-   { 37759, 0x00001000 }, /* GL_TEXTURE_WIDTH */
-   { 37776, 0x00008072 }, /* GL_TEXTURE_WRAP_R */
-   { 37794, 0x00002802 }, /* GL_TEXTURE_WRAP_S */
-   { 37812, 0x00002803 }, /* GL_TEXTURE_WRAP_T */
-   { 37830, 0x0000911B }, /* GL_TIMEOUT_EXPIRED */
-   { 37849, 0x000088BF }, /* GL_TIME_ELAPSED_EXT */
-   { 37869, 0x00008648 }, /* GL_TRACK_MATRIX_NV */
-   { 37888, 0x00008649 }, /* GL_TRACK_MATRIX_TRANSFORM_NV */
-   { 37917, 0x00001000 }, /* GL_TRANSFORM_BIT */
-   { 37934, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX */
-   { 37960, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX_ARB */
-   { 37990, 0x000088B7 }, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
-   { 38022, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
-   { 38052, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX_ARB */
-   { 38086, 0x0000862C }, /* GL_TRANSPOSE_NV */
-   { 38102, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX */
-   { 38133, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX_ARB */
-   { 38168, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX */
-   { 38196, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX_ARB */
-   { 38228, 0x00000004 }, /* GL_TRIANGLES */
-   { 38241, 0x00000006 }, /* GL_TRIANGLE_FAN */
-   { 38257, 0x00008615 }, /* GL_TRIANGLE_MESH_SUN */
-   { 38278, 0x00000005 }, /* GL_TRIANGLE_STRIP */
-   { 38296, 0x00000001 }, /* GL_TRUE */
-   { 38304, 0x00000CF5 }, /* GL_UNPACK_ALIGNMENT */
-   { 38324, 0x0000806E }, /* GL_UNPACK_IMAGE_HEIGHT */
-   { 38347, 0x00000CF1 }, /* GL_UNPACK_LSB_FIRST */
-   { 38367, 0x00000CF2 }, /* GL_UNPACK_ROW_LENGTH */
-   { 38388, 0x0000806D }, /* GL_UNPACK_SKIP_IMAGES */
-   { 38410, 0x00000CF4 }, /* GL_UNPACK_SKIP_PIXELS */
-   { 38432, 0x00000CF3 }, /* GL_UNPACK_SKIP_ROWS */
-   { 38452, 0x00000CF0 }, /* GL_UNPACK_SWAP_BYTES */
-   { 38473, 0x00009118 }, /* GL_UNSIGNALED */
-   { 38487, 0x00001401 }, /* GL_UNSIGNED_BYTE */
-   { 38504, 0x00008362 }, /* GL_UNSIGNED_BYTE_2_3_3_REV */
-   { 38531, 0x00008032 }, /* GL_UNSIGNED_BYTE_3_3_2 */
-   { 38554, 0x00001405 }, /* GL_UNSIGNED_INT */
-   { 38570, 0x00008036 }, /* GL_UNSIGNED_INT_10_10_10_2 */
-   { 38597, 0x000084FA }, /* GL_UNSIGNED_INT_24_8 */
-   { 38618, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_EXT */
-   { 38643, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_NV */
-   { 38667, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV */
-   { 38698, 0x00008035 }, /* GL_UNSIGNED_INT_8_8_8_8 */
-   { 38722, 0x00008367 }, /* GL_UNSIGNED_INT_8_8_8_8_REV */
-   { 38750, 0x00008C17 }, /* GL_UNSIGNED_NORMALIZED */
-   { 38773, 0x00001403 }, /* GL_UNSIGNED_SHORT */
-   { 38791, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
-   { 38821, 0x00008033 }, /* GL_UNSIGNED_SHORT_4_4_4_4 */
-   { 38847, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
-   { 38877, 0x00008034 }, /* GL_UNSIGNED_SHORT_5_5_5_1 */
-   { 38903, 0x00008363 }, /* GL_UNSIGNED_SHORT_5_6_5 */
-   { 38927, 0x00008364 }, /* GL_UNSIGNED_SHORT_5_6_5_REV */
-   { 38955, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_APPLE */
-   { 38983, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_MESA */
-   { 39010, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
-   { 39042, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_MESA */
-   { 39073, 0x00008CA2 }, /* GL_UPPER_LEFT */
-   { 39087, 0x00002A20 }, /* GL_V2F */
-   { 39094, 0x00002A21 }, /* GL_V3F */
-   { 39101, 0x00008B83 }, /* GL_VALIDATE_STATUS */
-   { 39120, 0x00001F00 }, /* GL_VENDOR */
-   { 39130, 0x00001F02 }, /* GL_VERSION */
-   { 39141, 0x00008074 }, /* GL_VERTEX_ARRAY */
-   { 39157, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING */
-   { 39181, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */
-   { 39211, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
-   { 39242, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
-   { 39277, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
-   { 39301, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
-   { 39322, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
-   { 39345, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
-   { 39366, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-   { 39393, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-   { 39421, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-   { 39449, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-   { 39477, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-   { 39505, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-   { 39533, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
-   { 39561, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-   { 39588, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-   { 39615, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-   { 39642, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-   { 39669, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-   { 39696, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-   { 39723, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-   { 39750, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-   { 39777, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-   { 39804, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
-   { 39842, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
-   { 39884, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
-   { 39915, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
-   { 39950, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
-   { 39984, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
-   { 40022, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
-   { 40053, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
-   { 40088, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
-   { 40116, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
-   { 40148, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
-   { 40178, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
-   { 40212, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
-   { 40240, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
-   { 40272, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
-   { 40292, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
-   { 40314, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
-   { 40343, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
-   { 40364, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE */
-   { 40393, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
-   { 40426, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
-   { 40458, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE */
-   { 40485, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
-   { 40516, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
-   { 40546, 0x00008B31 }, /* GL_VERTEX_SHADER */
-   { 40563, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
-   { 40584, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
-   { 40611, 0x00000BA2 }, /* GL_VIEWPORT */
-   { 40623, 0x00000800 }, /* GL_VIEWPORT_BIT */
-   { 40639, 0x0000911D }, /* GL_WAIT_FAILED */
-   { 40654, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
-   { 40674, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-   { 40705, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
-   { 40740, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-   { 40768, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-   { 40793, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-   { 40820, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-   { 40845, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
-   { 40869, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
-   { 40888, 0x000088B9 }, /* GL_WRITE_ONLY */
-   { 40902, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
-   { 40920, 0x00001506 }, /* GL_XOR */
-   { 40927, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
-   { 40946, 0x00008757 }, /* GL_YCBCR_MESA */
-   { 40960, 0x00000000 }, /* GL_ZERO */
-   { 40968, 0x00000D16 }, /* GL_ZOOM_X */
-   { 40978, 0x00000D17 }, /* GL_ZOOM_Y */
+   {  1824, 0x000085B3 }, /* GL_BUFFER_OBJECT_APPLE */
+   {  1847, 0x00008A12 }, /* GL_BUFFER_SERIALIZED_MODIFY_APPLE */
+   {  1881, 0x00008764 }, /* GL_BUFFER_SIZE */
+   {  1896, 0x00008764 }, /* GL_BUFFER_SIZE_ARB */
+   {  1915, 0x00008765 }, /* GL_BUFFER_USAGE */
+   {  1931, 0x00008765 }, /* GL_BUFFER_USAGE_ARB */
+   {  1951, 0x0000877B }, /* GL_BUMP_ENVMAP_ATI */
+   {  1970, 0x00008777 }, /* GL_BUMP_NUM_TEX_UNITS_ATI */
+   {  1996, 0x00008775 }, /* GL_BUMP_ROT_MATRIX_ATI */
+   {  2019, 0x00008776 }, /* GL_BUMP_ROT_MATRIX_SIZE_ATI */
+   {  2047, 0x0000877C }, /* GL_BUMP_TARGET_ATI */
+   {  2066, 0x00008778 }, /* GL_BUMP_TEX_UNITS_ATI */
+   {  2088, 0x00001400 }, /* GL_BYTE */
+   {  2096, 0x00002A24 }, /* GL_C3F_V3F */
+   {  2107, 0x00002A26 }, /* GL_C4F_N3F_V3F */
+   {  2122, 0x00002A22 }, /* GL_C4UB_V2F */
+   {  2134, 0x00002A23 }, /* GL_C4UB_V3F */
+   {  2146, 0x00000901 }, /* GL_CCW */
+   {  2153, 0x00002900 }, /* GL_CLAMP */
+   {  2162, 0x0000812D }, /* GL_CLAMP_TO_BORDER */
+   {  2181, 0x0000812D }, /* GL_CLAMP_TO_BORDER_ARB */
+   {  2204, 0x0000812D }, /* GL_CLAMP_TO_BORDER_SGIS */
+   {  2228, 0x0000812F }, /* GL_CLAMP_TO_EDGE */
+   {  2245, 0x0000812F }, /* GL_CLAMP_TO_EDGE_SGIS */
+   {  2267, 0x00001500 }, /* GL_CLEAR */
+   {  2276, 0x000084E1 }, /* GL_CLIENT_ACTIVE_TEXTURE */
+   {  2301, 0x000084E1 }, /* GL_CLIENT_ACTIVE_TEXTURE_ARB */
+   {  2330, 0xFFFFFFFF }, /* GL_CLIENT_ALL_ATTRIB_BITS */
+   {  2356, 0x00000BB1 }, /* GL_CLIENT_ATTRIB_STACK_DEPTH */
+   {  2385, 0x00000001 }, /* GL_CLIENT_PIXEL_STORE_BIT */
+   {  2411, 0x00000002 }, /* GL_CLIENT_VERTEX_ARRAY_BIT */
+   {  2438, 0x00003000 }, /* GL_CLIP_PLANE0 */
+   {  2453, 0x00003001 }, /* GL_CLIP_PLANE1 */
+   {  2468, 0x00003002 }, /* GL_CLIP_PLANE2 */
+   {  2483, 0x00003003 }, /* GL_CLIP_PLANE3 */
+   {  2498, 0x00003004 }, /* GL_CLIP_PLANE4 */
+   {  2513, 0x00003005 }, /* GL_CLIP_PLANE5 */
+   {  2528, 0x000080F0 }, /* GL_CLIP_VOLUME_CLIPPING_HINT_EXT */
+   {  2561, 0x00000A00 }, /* GL_COEFF */
+   {  2570, 0x00001800 }, /* GL_COLOR */
+   {  2579, 0x00008076 }, /* GL_COLOR_ARRAY */
+   {  2594, 0x00008898 }, /* GL_COLOR_ARRAY_BUFFER_BINDING */
+   {  2624, 0x00008898 }, /* GL_COLOR_ARRAY_BUFFER_BINDING_ARB */
+   {  2658, 0x00008090 }, /* GL_COLOR_ARRAY_POINTER */
+   {  2681, 0x00008081 }, /* GL_COLOR_ARRAY_SIZE */
+   {  2701, 0x00008083 }, /* GL_COLOR_ARRAY_STRIDE */
+   {  2723, 0x00008082 }, /* GL_COLOR_ARRAY_TYPE */
+   {  2743, 0x00008CE0 }, /* GL_COLOR_ATTACHMENT0 */
+   {  2764, 0x00008CE0 }, /* GL_COLOR_ATTACHMENT0_EXT */
+   {  2789, 0x00008CE1 }, /* GL_COLOR_ATTACHMENT1 */
+   {  2810, 0x00008CEA }, /* GL_COLOR_ATTACHMENT10 */
+   {  2832, 0x00008CEA }, /* GL_COLOR_ATTACHMENT10_EXT */
+   {  2858, 0x00008CEB }, /* GL_COLOR_ATTACHMENT11 */
+   {  2880, 0x00008CEB }, /* GL_COLOR_ATTACHMENT11_EXT */
+   {  2906, 0x00008CEC }, /* GL_COLOR_ATTACHMENT12 */
+   {  2928, 0x00008CEC }, /* GL_COLOR_ATTACHMENT12_EXT */
+   {  2954, 0x00008CED }, /* GL_COLOR_ATTACHMENT13 */
+   {  2976, 0x00008CED }, /* GL_COLOR_ATTACHMENT13_EXT */
+   {  3002, 0x00008CEE }, /* GL_COLOR_ATTACHMENT14 */
+   {  3024, 0x00008CEE }, /* GL_COLOR_ATTACHMENT14_EXT */
+   {  3050, 0x00008CEF }, /* GL_COLOR_ATTACHMENT15 */
+   {  3072, 0x00008CEF }, /* GL_COLOR_ATTACHMENT15_EXT */
+   {  3098, 0x00008CE1 }, /* GL_COLOR_ATTACHMENT1_EXT */
+   {  3123, 0x00008CE2 }, /* GL_COLOR_ATTACHMENT2 */
+   {  3144, 0x00008CE2 }, /* GL_COLOR_ATTACHMENT2_EXT */
+   {  3169, 0x00008CE3 }, /* GL_COLOR_ATTACHMENT3 */
+   {  3190, 0x00008CE3 }, /* GL_COLOR_ATTACHMENT3_EXT */
+   {  3215, 0x00008CE4 }, /* GL_COLOR_ATTACHMENT4 */
+   {  3236, 0x00008CE4 }, /* GL_COLOR_ATTACHMENT4_EXT */
+   {  3261, 0x00008CE5 }, /* GL_COLOR_ATTACHMENT5 */
+   {  3282, 0x00008CE5 }, /* GL_COLOR_ATTACHMENT5_EXT */
+   {  3307, 0x00008CE6 }, /* GL_COLOR_ATTACHMENT6 */
+   {  3328, 0x00008CE6 }, /* GL_COLOR_ATTACHMENT6_EXT */
+   {  3353, 0x00008CE7 }, /* GL_COLOR_ATTACHMENT7 */
+   {  3374, 0x00008CE7 }, /* GL_COLOR_ATTACHMENT7_EXT */
+   {  3399, 0x00008CE8 }, /* GL_COLOR_ATTACHMENT8 */
+   {  3420, 0x00008CE8 }, /* GL_COLOR_ATTACHMENT8_EXT */
+   {  3445, 0x00008CE9 }, /* GL_COLOR_ATTACHMENT9 */
+   {  3466, 0x00008CE9 }, /* GL_COLOR_ATTACHMENT9_EXT */
+   {  3491, 0x00004000 }, /* GL_COLOR_BUFFER_BIT */
+   {  3511, 0x00000C22 }, /* GL_COLOR_CLEAR_VALUE */
+   {  3532, 0x00001900 }, /* GL_COLOR_INDEX */
+   {  3547, 0x00001603 }, /* GL_COLOR_INDEXES */
+   {  3564, 0x00000BF2 }, /* GL_COLOR_LOGIC_OP */
+   {  3582, 0x00000B57 }, /* GL_COLOR_MATERIAL */
+   {  3600, 0x00000B55 }, /* GL_COLOR_MATERIAL_FACE */
+   {  3623, 0x00000B56 }, /* GL_COLOR_MATERIAL_PARAMETER */
+   {  3651, 0x000080B1 }, /* GL_COLOR_MATRIX */
+   {  3667, 0x000080B1 }, /* GL_COLOR_MATRIX_SGI */
+   {  3687, 0x000080B2 }, /* GL_COLOR_MATRIX_STACK_DEPTH */
+   {  3715, 0x000080B2 }, /* GL_COLOR_MATRIX_STACK_DEPTH_SGI */
+   {  3747, 0x00008458 }, /* GL_COLOR_SUM */
+   {  3760, 0x00008458 }, /* GL_COLOR_SUM_ARB */
+   {  3777, 0x000080D0 }, /* GL_COLOR_TABLE */
+   {  3792, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE */
+   {  3818, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE_EXT */
+   {  3848, 0x000080DD }, /* GL_COLOR_TABLE_ALPHA_SIZE_SGI */
+   {  3878, 0x000080D7 }, /* GL_COLOR_TABLE_BIAS */
+   {  3898, 0x000080D7 }, /* GL_COLOR_TABLE_BIAS_SGI */
+   {  3922, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE */
+   {  3947, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE_EXT */
+   {  3976, 0x000080DC }, /* GL_COLOR_TABLE_BLUE_SIZE_SGI */
+   {  4005, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT */
+   {  4027, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT_EXT */
+   {  4053, 0x000080D8 }, /* GL_COLOR_TABLE_FORMAT_SGI */
+   {  4079, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE */
+   {  4105, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE_EXT */
+   {  4135, 0x000080DB }, /* GL_COLOR_TABLE_GREEN_SIZE_SGI */
+   {  4165, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE */
+   {  4195, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE_EXT */
+   {  4229, 0x000080DF }, /* GL_COLOR_TABLE_INTENSITY_SIZE_SGI */
+   {  4263, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE */
+   {  4293, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE_EXT */
+   {  4327, 0x000080DE }, /* GL_COLOR_TABLE_LUMINANCE_SIZE_SGI */
+   {  4361, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE */
+   {  4385, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE_EXT */
+   {  4413, 0x000080DA }, /* GL_COLOR_TABLE_RED_SIZE_SGI */
+   {  4441, 0x000080D6 }, /* GL_COLOR_TABLE_SCALE */
+   {  4462, 0x000080D6 }, /* GL_COLOR_TABLE_SCALE_SGI */
+   {  4487, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH */
+   {  4508, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH_EXT */
+   {  4533, 0x000080D9 }, /* GL_COLOR_TABLE_WIDTH_SGI */
+   {  4558, 0x00000C23 }, /* GL_COLOR_WRITEMASK */
+   {  4577, 0x00008570 }, /* GL_COMBINE */
+   {  4588, 0x00008503 }, /* GL_COMBINE4 */
+   {  4600, 0x00008572 }, /* GL_COMBINE_ALPHA */
+   {  4617, 0x00008572 }, /* GL_COMBINE_ALPHA_ARB */
+   {  4638, 0x00008572 }, /* GL_COMBINE_ALPHA_EXT */
+   {  4659, 0x00008570 }, /* GL_COMBINE_ARB */
+   {  4674, 0x00008570 }, /* GL_COMBINE_EXT */
+   {  4689, 0x00008571 }, /* GL_COMBINE_RGB */
+   {  4704, 0x00008571 }, /* GL_COMBINE_RGB_ARB */
+   {  4723, 0x00008571 }, /* GL_COMBINE_RGB_EXT */
+   {  4742, 0x0000884E }, /* GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT */
+   {  4778, 0x0000884E }, /* GL_COMPARE_R_TO_TEXTURE */
+   {  4802, 0x0000884E }, /* GL_COMPARE_R_TO_TEXTURE_ARB */
+   {  4830, 0x00001300 }, /* GL_COMPILE */
+   {  4841, 0x00001301 }, /* GL_COMPILE_AND_EXECUTE */
+   {  4864, 0x00008B81 }, /* GL_COMPILE_STATUS */
+   {  4882, 0x000084E9 }, /* GL_COMPRESSED_ALPHA */
+   {  4902, 0x000084E9 }, /* GL_COMPRESSED_ALPHA_ARB */
+   {  4926, 0x000084EC }, /* GL_COMPRESSED_INTENSITY */
+   {  4950, 0x000084EC }, /* GL_COMPRESSED_INTENSITY_ARB */
+   {  4978, 0x000084EA }, /* GL_COMPRESSED_LUMINANCE */
+   {  5002, 0x000084EB }, /* GL_COMPRESSED_LUMINANCE_ALPHA */
+   {  5032, 0x000084EB }, /* GL_COMPRESSED_LUMINANCE_ALPHA_ARB */
+   {  5066, 0x000084EA }, /* GL_COMPRESSED_LUMINANCE_ARB */
+   {  5094, 0x000084ED }, /* GL_COMPRESSED_RGB */
+   {  5112, 0x000084EE }, /* GL_COMPRESSED_RGBA */
+   {  5131, 0x000084EE }, /* GL_COMPRESSED_RGBA_ARB */
+   {  5154, 0x000086B1 }, /* GL_COMPRESSED_RGBA_FXT1_3DFX */
+   {  5183, 0x000083F1 }, /* GL_COMPRESSED_RGBA_S3TC_DXT1_EXT */
+   {  5216, 0x000083F2 }, /* GL_COMPRESSED_RGBA_S3TC_DXT3_EXT */
+   {  5249, 0x000083F3 }, /* GL_COMPRESSED_RGBA_S3TC_DXT5_EXT */
+   {  5282, 0x000084ED }, /* GL_COMPRESSED_RGB_ARB */
+   {  5304, 0x000086B0 }, /* GL_COMPRESSED_RGB_FXT1_3DFX */
+   {  5332, 0x000083F0 }, /* GL_COMPRESSED_RGB_S3TC_DXT1_EXT */
+   {  5364, 0x00008C4A }, /* GL_COMPRESSED_SLUMINANCE */
+   {  5389, 0x00008C4B }, /* GL_COMPRESSED_SLUMINANCE_ALPHA */
+   {  5420, 0x00008C48 }, /* GL_COMPRESSED_SRGB */
+   {  5439, 0x00008C49 }, /* GL_COMPRESSED_SRGB_ALPHA */
+   {  5464, 0x000086A3 }, /* GL_COMPRESSED_TEXTURE_FORMATS */
+   {  5494, 0x0000911C }, /* GL_CONDITION_SATISFIED */
+   {  5517, 0x00008576 }, /* GL_CONSTANT */
+   {  5529, 0x00008003 }, /* GL_CONSTANT_ALPHA */
+   {  5547, 0x00008003 }, /* GL_CONSTANT_ALPHA_EXT */
+   {  5569, 0x00008576 }, /* GL_CONSTANT_ARB */
+   {  5585, 0x00001207 }, /* GL_CONSTANT_ATTENUATION */
+   {  5609, 0x00008151 }, /* GL_CONSTANT_BORDER_HP */
+   {  5631, 0x00008001 }, /* GL_CONSTANT_COLOR */
+   {  5649, 0x00008001 }, /* GL_CONSTANT_COLOR_EXT */
+   {  5671, 0x00008576 }, /* GL_CONSTANT_EXT */
+   {  5687, 0x00008010 }, /* GL_CONVOLUTION_1D */
+   {  5705, 0x00008011 }, /* GL_CONVOLUTION_2D */
+   {  5723, 0x00008154 }, /* GL_CONVOLUTION_BORDER_COLOR */
+   {  5751, 0x00008154 }, /* GL_CONVOLUTION_BORDER_COLOR_HP */
+   {  5782, 0x00008013 }, /* GL_CONVOLUTION_BORDER_MODE */
+   {  5809, 0x00008013 }, /* GL_CONVOLUTION_BORDER_MODE_EXT */
+   {  5840, 0x00008015 }, /* GL_CONVOLUTION_FILTER_BIAS */
+   {  5867, 0x00008015 }, /* GL_CONVOLUTION_FILTER_BIAS_EXT */
+   {  5898, 0x00008014 }, /* GL_CONVOLUTION_FILTER_SCALE */
+   {  5926, 0x00008014 }, /* GL_CONVOLUTION_FILTER_SCALE_EXT */
+   {  5958, 0x00008017 }, /* GL_CONVOLUTION_FORMAT */
+   {  5980, 0x00008017 }, /* GL_CONVOLUTION_FORMAT_EXT */
+   {  6006, 0x00008019 }, /* GL_CONVOLUTION_HEIGHT */
+   {  6028, 0x00008019 }, /* GL_CONVOLUTION_HEIGHT_EXT */
+   {  6054, 0x00008018 }, /* GL_CONVOLUTION_WIDTH */
+   {  6075, 0x00008018 }, /* GL_CONVOLUTION_WIDTH_EXT */
+   {  6100, 0x00008862 }, /* GL_COORD_REPLACE */
+   {  6117, 0x00008862 }, /* GL_COORD_REPLACE_ARB */
+   {  6138, 0x00008862 }, /* GL_COORD_REPLACE_NV */
+   {  6158, 0x00001503 }, /* GL_COPY */
+   {  6166, 0x0000150C }, /* GL_COPY_INVERTED */
+   {  6183, 0x00000706 }, /* GL_COPY_PIXEL_TOKEN */
+   {  6203, 0x00008F36 }, /* GL_COPY_READ_BUFFER */
+   {  6223, 0x00008F37 }, /* GL_COPY_WRITE_BUFFER */
+   {  6244, 0x00000B44 }, /* GL_CULL_FACE */
+   {  6257, 0x00000B45 }, /* GL_CULL_FACE_MODE */
+   {  6275, 0x000081AA }, /* GL_CULL_VERTEX_EXT */
+   {  6294, 0x000081AC }, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
+   {  6326, 0x000081AB }, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
+   {  6361, 0x00008626 }, /* GL_CURRENT_ATTRIB_NV */
+   {  6382, 0x00000001 }, /* GL_CURRENT_BIT */
+   {  6397, 0x00000B00 }, /* GL_CURRENT_COLOR */
+   {  6414, 0x00008453 }, /* GL_CURRENT_FOG_COORD */
+   {  6435, 0x00008453 }, /* GL_CURRENT_FOG_COORDINATE */
+   {  6461, 0x00000B01 }, /* GL_CURRENT_INDEX */
+   {  6478, 0x00008641 }, /* GL_CURRENT_MATRIX_ARB */
+   {  6500, 0x00008845 }, /* GL_CURRENT_MATRIX_INDEX_ARB */
+   {  6528, 0x00008641 }, /* GL_CURRENT_MATRIX_NV */
+   {  6549, 0x00008640 }, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
+   {  6583, 0x00008640 }, /* GL_CURRENT_MATRIX_STACK_DEPTH_NV */
+   {  6616, 0x00000B02 }, /* GL_CURRENT_NORMAL */
+   {  6634, 0x00008843 }, /* GL_CURRENT_PALETTE_MATRIX_ARB */
+   {  6664, 0x00008B8D }, /* GL_CURRENT_PROGRAM */
+   {  6683, 0x00008865 }, /* GL_CURRENT_QUERY */
+   {  6700, 0x00008865 }, /* GL_CURRENT_QUERY_ARB */
+   {  6721, 0x00000B04 }, /* GL_CURRENT_RASTER_COLOR */
+   {  6745, 0x00000B09 }, /* GL_CURRENT_RASTER_DISTANCE */
+   {  6772, 0x00000B05 }, /* GL_CURRENT_RASTER_INDEX */
+   {  6796, 0x00000B07 }, /* GL_CURRENT_RASTER_POSITION */
+   {  6823, 0x00000B08 }, /* GL_CURRENT_RASTER_POSITION_VALID */
+   {  6856, 0x0000845F }, /* GL_CURRENT_RASTER_SECONDARY_COLOR */
+   {  6890, 0x00000B06 }, /* GL_CURRENT_RASTER_TEXTURE_COORDS */
+   {  6923, 0x00008459 }, /* GL_CURRENT_SECONDARY_COLOR */
+   {  6950, 0x00000B03 }, /* GL_CURRENT_TEXTURE_COORDS */
+   {  6976, 0x00008626 }, /* GL_CURRENT_VERTEX_ATTRIB */
+   {  7001, 0x00008626 }, /* GL_CURRENT_VERTEX_ATTRIB_ARB */
+   {  7030, 0x000086A8 }, /* GL_CURRENT_WEIGHT_ARB */
+   {  7052, 0x00000900 }, /* GL_CW */
+   {  7058, 0x0000875B }, /* GL_DEBUG_ASSERT_MESA */
+   {  7079, 0x00008759 }, /* GL_DEBUG_OBJECT_MESA */
+   {  7100, 0x0000875A }, /* GL_DEBUG_PRINT_MESA */
+   {  7120, 0x00002101 }, /* GL_DECAL */
+   {  7129, 0x00001E03 }, /* GL_DECR */
+   {  7137, 0x00008508 }, /* GL_DECR_WRAP */
+   {  7150, 0x00008508 }, /* GL_DECR_WRAP_EXT */
+   {  7167, 0x00008B80 }, /* GL_DELETE_STATUS */
+   {  7184, 0x00001801 }, /* GL_DEPTH */
+   {  7193, 0x000088F0 }, /* GL_DEPTH24_STENCIL8 */
+   {  7213, 0x000088F0 }, /* GL_DEPTH24_STENCIL8_EXT */
+   {  7237, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT */
+   {  7257, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT_EXT */
+   {  7281, 0x00000D1F }, /* GL_DEPTH_BIAS */
+   {  7295, 0x00000D56 }, /* GL_DEPTH_BITS */
+   {  7309, 0x00008891 }, /* GL_DEPTH_BOUNDS_EXT */
+   {  7329, 0x00008890 }, /* GL_DEPTH_BOUNDS_TEST_EXT */
+   {  7354, 0x00000100 }, /* GL_DEPTH_BUFFER_BIT */
+   {  7374, 0x0000864F }, /* GL_DEPTH_CLAMP */
+   {  7389, 0x0000864F }, /* GL_DEPTH_CLAMP_NV */
+   {  7407, 0x00000B73 }, /* GL_DEPTH_CLEAR_VALUE */
+   {  7428, 0x00001902 }, /* GL_DEPTH_COMPONENT */
+   {  7447, 0x000081A5 }, /* GL_DEPTH_COMPONENT16 */
+   {  7468, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_ARB */
+   {  7493, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_SGIX */
+   {  7519, 0x000081A6 }, /* GL_DEPTH_COMPONENT24 */
+   {  7540, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_ARB */
+   {  7565, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_SGIX */
+   {  7591, 0x000081A7 }, /* GL_DEPTH_COMPONENT32 */
+   {  7612, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_ARB */
+   {  7637, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_SGIX */
+   {  7663, 0x00000B74 }, /* GL_DEPTH_FUNC */
+   {  7677, 0x00000B70 }, /* GL_DEPTH_RANGE */
+   {  7692, 0x00000D1E }, /* GL_DEPTH_SCALE */
+   {  7707, 0x000084F9 }, /* GL_DEPTH_STENCIL */
+   {  7724, 0x0000821A }, /* GL_DEPTH_STENCIL_ATTACHMENT */
+   {  7752, 0x000084F9 }, /* GL_DEPTH_STENCIL_EXT */
+   {  7773, 0x000084F9 }, /* GL_DEPTH_STENCIL_NV */
+   {  7793, 0x0000886F }, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
+   {  7821, 0x0000886E }, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
+   {  7849, 0x00000B71 }, /* GL_DEPTH_TEST */
+   {  7863, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE */
+   {  7885, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE_ARB */
+   {  7911, 0x00000B72 }, /* GL_DEPTH_WRITEMASK */
+   {  7930, 0x00001201 }, /* GL_DIFFUSE */
+   {  7941, 0x00000BD0 }, /* GL_DITHER */
+   {  7951, 0x00000A02 }, /* GL_DOMAIN */
+   {  7961, 0x00001100 }, /* GL_DONT_CARE */
+   {  7974, 0x000086AE }, /* GL_DOT3_RGB */
+   {  7986, 0x000086AF }, /* GL_DOT3_RGBA */
+   {  7999, 0x000086AF }, /* GL_DOT3_RGBA_ARB */
+   {  8016, 0x00008741 }, /* GL_DOT3_RGBA_EXT */
+   {  8033, 0x000086AE }, /* GL_DOT3_RGB_ARB */
+   {  8049, 0x00008740 }, /* GL_DOT3_RGB_EXT */
+   {  8065, 0x0000140A }, /* GL_DOUBLE */
+   {  8075, 0x00000C32 }, /* GL_DOUBLEBUFFER */
+   {  8091, 0x00000C01 }, /* GL_DRAW_BUFFER */
+   {  8106, 0x00008825 }, /* GL_DRAW_BUFFER0 */
+   {  8122, 0x00008825 }, /* GL_DRAW_BUFFER0_ARB */
+   {  8142, 0x00008825 }, /* GL_DRAW_BUFFER0_ATI */
+   {  8162, 0x00008826 }, /* GL_DRAW_BUFFER1 */
+   {  8178, 0x0000882F }, /* GL_DRAW_BUFFER10 */
+   {  8195, 0x0000882F }, /* GL_DRAW_BUFFER10_ARB */
+   {  8216, 0x0000882F }, /* GL_DRAW_BUFFER10_ATI */
+   {  8237, 0x00008830 }, /* GL_DRAW_BUFFER11 */
+   {  8254, 0x00008830 }, /* GL_DRAW_BUFFER11_ARB */
+   {  8275, 0x00008830 }, /* GL_DRAW_BUFFER11_ATI */
+   {  8296, 0x00008831 }, /* GL_DRAW_BUFFER12 */
+   {  8313, 0x00008831 }, /* GL_DRAW_BUFFER12_ARB */
+   {  8334, 0x00008831 }, /* GL_DRAW_BUFFER12_ATI */
+   {  8355, 0x00008832 }, /* GL_DRAW_BUFFER13 */
+   {  8372, 0x00008832 }, /* GL_DRAW_BUFFER13_ARB */
+   {  8393, 0x00008832 }, /* GL_DRAW_BUFFER13_ATI */
+   {  8414, 0x00008833 }, /* GL_DRAW_BUFFER14 */
+   {  8431, 0x00008833 }, /* GL_DRAW_BUFFER14_ARB */
+   {  8452, 0x00008833 }, /* GL_DRAW_BUFFER14_ATI */
+   {  8473, 0x00008834 }, /* GL_DRAW_BUFFER15 */
+   {  8490, 0x00008834 }, /* GL_DRAW_BUFFER15_ARB */
+   {  8511, 0x00008834 }, /* GL_DRAW_BUFFER15_ATI */
+   {  8532, 0x00008826 }, /* GL_DRAW_BUFFER1_ARB */
+   {  8552, 0x00008826 }, /* GL_DRAW_BUFFER1_ATI */
+   {  8572, 0x00008827 }, /* GL_DRAW_BUFFER2 */
+   {  8588, 0x00008827 }, /* GL_DRAW_BUFFER2_ARB */
+   {  8608, 0x00008827 }, /* GL_DRAW_BUFFER2_ATI */
+   {  8628, 0x00008828 }, /* GL_DRAW_BUFFER3 */
+   {  8644, 0x00008828 }, /* GL_DRAW_BUFFER3_ARB */
+   {  8664, 0x00008828 }, /* GL_DRAW_BUFFER3_ATI */
+   {  8684, 0x00008829 }, /* GL_DRAW_BUFFER4 */
+   {  8700, 0x00008829 }, /* GL_DRAW_BUFFER4_ARB */
+   {  8720, 0x00008829 }, /* GL_DRAW_BUFFER4_ATI */
+   {  8740, 0x0000882A }, /* GL_DRAW_BUFFER5 */
+   {  8756, 0x0000882A }, /* GL_DRAW_BUFFER5_ARB */
+   {  8776, 0x0000882A }, /* GL_DRAW_BUFFER5_ATI */
+   {  8796, 0x0000882B }, /* GL_DRAW_BUFFER6 */
+   {  8812, 0x0000882B }, /* GL_DRAW_BUFFER6_ARB */
+   {  8832, 0x0000882B }, /* GL_DRAW_BUFFER6_ATI */
+   {  8852, 0x0000882C }, /* GL_DRAW_BUFFER7 */
+   {  8868, 0x0000882C }, /* GL_DRAW_BUFFER7_ARB */
+   {  8888, 0x0000882C }, /* GL_DRAW_BUFFER7_ATI */
+   {  8908, 0x0000882D }, /* GL_DRAW_BUFFER8 */
+   {  8924, 0x0000882D }, /* GL_DRAW_BUFFER8_ARB */
+   {  8944, 0x0000882D }, /* GL_DRAW_BUFFER8_ATI */
+   {  8964, 0x0000882E }, /* GL_DRAW_BUFFER9 */
+   {  8980, 0x0000882E }, /* GL_DRAW_BUFFER9_ARB */
+   {  9000, 0x0000882E }, /* GL_DRAW_BUFFER9_ATI */
+   {  9020, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER */
+   {  9040, 0x00008CA6 }, /* GL_DRAW_FRAMEBUFFER_BINDING */
+   {  9068, 0x00008CA6 }, /* GL_DRAW_FRAMEBUFFER_BINDING_EXT */
+   {  9100, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER_EXT */
+   {  9124, 0x00000705 }, /* GL_DRAW_PIXEL_TOKEN */
+   {  9144, 0x00000304 }, /* GL_DST_ALPHA */
+   {  9157, 0x00000306 }, /* GL_DST_COLOR */
+   {  9170, 0x0000877A }, /* GL_DU8DV8_ATI */
+   {  9184, 0x00008779 }, /* GL_DUDV_ATI */
+   {  9196, 0x000088EA }, /* GL_DYNAMIC_COPY */
+   {  9212, 0x000088EA }, /* GL_DYNAMIC_COPY_ARB */
+   {  9232, 0x000088E8 }, /* GL_DYNAMIC_DRAW */
+   {  9248, 0x000088E8 }, /* GL_DYNAMIC_DRAW_ARB */
+   {  9268, 0x000088E9 }, /* GL_DYNAMIC_READ */
+   {  9284, 0x000088E9 }, /* GL_DYNAMIC_READ_ARB */
+   {  9304, 0x00000B43 }, /* GL_EDGE_FLAG */
+   {  9317, 0x00008079 }, /* GL_EDGE_FLAG_ARRAY */
+   {  9336, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
+   {  9370, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB */
+   {  9408, 0x00008093 }, /* GL_EDGE_FLAG_ARRAY_POINTER */
+   {  9435, 0x0000808C }, /* GL_EDGE_FLAG_ARRAY_STRIDE */
+   {  9461, 0x00008893 }, /* GL_ELEMENT_ARRAY_BUFFER */
+   {  9485, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
+   {  9517, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB */
+   {  9553, 0x00001600 }, /* GL_EMISSION */
+   {  9565, 0x00002000 }, /* GL_ENABLE_BIT */
+   {  9579, 0x00000202 }, /* GL_EQUAL */
+   {  9588, 0x00001509 }, /* GL_EQUIV */
+   {  9597, 0x00010000 }, /* GL_EVAL_BIT */
+   {  9609, 0x00000800 }, /* GL_EXP */
+   {  9616, 0x00000801 }, /* GL_EXP2 */
+   {  9624, 0x00001F03 }, /* GL_EXTENSIONS */
+   {  9638, 0x00002400 }, /* GL_EYE_LINEAR */
+   {  9652, 0x00002502 }, /* GL_EYE_PLANE */
+   {  9665, 0x0000855C }, /* GL_EYE_PLANE_ABSOLUTE_NV */
+   {  9690, 0x0000855B }, /* GL_EYE_RADIAL_NV */
+   {  9707, 0x00000000 }, /* GL_FALSE */
+   {  9716, 0x00001101 }, /* GL_FASTEST */
+   {  9727, 0x00001C01 }, /* GL_FEEDBACK */
+   {  9739, 0x00000DF0 }, /* GL_FEEDBACK_BUFFER_POINTER */
+   {  9766, 0x00000DF1 }, /* GL_FEEDBACK_BUFFER_SIZE */
+   {  9790, 0x00000DF2 }, /* GL_FEEDBACK_BUFFER_TYPE */
+   {  9814, 0x00001B02 }, /* GL_FILL */
+   {  9822, 0x00008E4D }, /* GL_FIRST_VERTEX_CONVENTION */
+   {  9849, 0x00008E4D }, /* GL_FIRST_VERTEX_CONVENTION_EXT */
+   {  9880, 0x00001D00 }, /* GL_FLAT */
+   {  9888, 0x00001406 }, /* GL_FLOAT */
+   {  9897, 0x00008B5A }, /* GL_FLOAT_MAT2 */
+   {  9911, 0x00008B5A }, /* GL_FLOAT_MAT2_ARB */
+   {  9929, 0x00008B65 }, /* GL_FLOAT_MAT2x3 */
+   {  9945, 0x00008B66 }, /* GL_FLOAT_MAT2x4 */
+   {  9961, 0x00008B5B }, /* GL_FLOAT_MAT3 */
+   {  9975, 0x00008B5B }, /* GL_FLOAT_MAT3_ARB */
+   {  9993, 0x00008B67 }, /* GL_FLOAT_MAT3x2 */
+   { 10009, 0x00008B68 }, /* GL_FLOAT_MAT3x4 */
+   { 10025, 0x00008B5C }, /* GL_FLOAT_MAT4 */
+   { 10039, 0x00008B5C }, /* GL_FLOAT_MAT4_ARB */
+   { 10057, 0x00008B69 }, /* GL_FLOAT_MAT4x2 */
+   { 10073, 0x00008B6A }, /* GL_FLOAT_MAT4x3 */
+   { 10089, 0x00008B50 }, /* GL_FLOAT_VEC2 */
+   { 10103, 0x00008B50 }, /* GL_FLOAT_VEC2_ARB */
+   { 10121, 0x00008B51 }, /* GL_FLOAT_VEC3 */
+   { 10135, 0x00008B51 }, /* GL_FLOAT_VEC3_ARB */
+   { 10153, 0x00008B52 }, /* GL_FLOAT_VEC4 */
+   { 10167, 0x00008B52 }, /* GL_FLOAT_VEC4_ARB */
+   { 10185, 0x00000B60 }, /* GL_FOG */
+   { 10192, 0x00000080 }, /* GL_FOG_BIT */
+   { 10203, 0x00000B66 }, /* GL_FOG_COLOR */
+   { 10216, 0x00008451 }, /* GL_FOG_COORD */
+   { 10229, 0x00008451 }, /* GL_FOG_COORDINATE */
+   { 10247, 0x00008457 }, /* GL_FOG_COORDINATE_ARRAY */
+   { 10271, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
+   { 10310, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB */
+   { 10353, 0x00008456 }, /* GL_FOG_COORDINATE_ARRAY_POINTER */
+   { 10385, 0x00008455 }, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
+   { 10416, 0x00008454 }, /* GL_FOG_COORDINATE_ARRAY_TYPE */
+   { 10445, 0x00008450 }, /* GL_FOG_COORDINATE_SOURCE */
+   { 10470, 0x00008457 }, /* GL_FOG_COORD_ARRAY */
+   { 10489, 0x0000889D }, /* GL_FOG_COORD_ARRAY_BUFFER_BINDING */
+   { 10523, 0x00008456 }, /* GL_FOG_COORD_ARRAY_POINTER */
+   { 10550, 0x00008455 }, /* GL_FOG_COORD_ARRAY_STRIDE */
+   { 10576, 0x00008454 }, /* GL_FOG_COORD_ARRAY_TYPE */
+   { 10600, 0x00008450 }, /* GL_FOG_COORD_SRC */
+   { 10617, 0x00000B62 }, /* GL_FOG_DENSITY */
+   { 10632, 0x0000855A }, /* GL_FOG_DISTANCE_MODE_NV */
+   { 10656, 0x00000B64 }, /* GL_FOG_END */
+   { 10667, 0x00000C54 }, /* GL_FOG_HINT */
+   { 10679, 0x00000B61 }, /* GL_FOG_INDEX */
+   { 10692, 0x00000B65 }, /* GL_FOG_MODE */
+   { 10704, 0x00008198 }, /* GL_FOG_OFFSET_SGIX */
+   { 10723, 0x00008199 }, /* GL_FOG_OFFSET_VALUE_SGIX */
+   { 10748, 0x00000B63 }, /* GL_FOG_START */
+   { 10761, 0x00008452 }, /* GL_FRAGMENT_DEPTH */
+   { 10779, 0x00008804 }, /* GL_FRAGMENT_PROGRAM_ARB */
+   { 10803, 0x00008B30 }, /* GL_FRAGMENT_SHADER */
+   { 10822, 0x00008B30 }, /* GL_FRAGMENT_SHADER_ARB */
+   { 10845, 0x00008B8B }, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
+   { 10880, 0x00008D40 }, /* GL_FRAMEBUFFER */
+   { 10895, 0x00008215 }, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
+   { 10932, 0x00008214 }, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
+   { 10968, 0x00008210 }, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
+   { 11009, 0x00008211 }, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
+   { 11050, 0x00008216 }, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
+   { 11087, 0x00008213 }, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
+   { 11124, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
+   { 11162, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT */
+   { 11204, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
+   { 11242, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT */
+   { 11284, 0x00008212 }, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
+   { 11319, 0x00008217 }, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
+   { 11358, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT */
+   { 11407, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
+   { 11455, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT */
+   { 11507, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
+   { 11547, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
+   { 11591, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
+   { 11631, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT */
+   { 11675, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING */
+   { 11698, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING_EXT */
+   { 11725, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE */
+   { 11749, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE_EXT */
+   { 11777, 0x00008218 }, /* GL_FRAMEBUFFER_DEFAULT */
+   { 11800, 0x00008D40 }, /* GL_FRAMEBUFFER_EXT */
+   { 11819, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
+   { 11856, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT */
+   { 11897, 0x00008CD9 }, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
+   { 11938, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER */
+   { 11976, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT */
+   { 12018, 0x00008CD8 }, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
+   { 12069, 0x00008CDA }, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
+   { 12107, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
+   { 12152, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT */
+   { 12201, 0x00008D56 }, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
+   { 12239, 0x00008D56 }, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT */
+   { 12281, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER */
+   { 12319, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT */
+   { 12361, 0x00008CDE }, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
+   { 12393, 0x00008219 }, /* GL_FRAMEBUFFER_UNDEFINED */
+   { 12418, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED */
+   { 12445, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED_EXT */
+   { 12476, 0x00000404 }, /* GL_FRONT */
+   { 12485, 0x00000408 }, /* GL_FRONT_AND_BACK */
+   { 12503, 0x00000B46 }, /* GL_FRONT_FACE */
+   { 12517, 0x00000400 }, /* GL_FRONT_LEFT */
+   { 12531, 0x00000401 }, /* GL_FRONT_RIGHT */
+   { 12546, 0x00008006 }, /* GL_FUNC_ADD */
+   { 12558, 0x00008006 }, /* GL_FUNC_ADD_EXT */
+   { 12574, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT */
+   { 12599, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT_EXT */
+   { 12628, 0x0000800A }, /* GL_FUNC_SUBTRACT */
+   { 12645, 0x0000800A }, /* GL_FUNC_SUBTRACT_EXT */
+   { 12666, 0x00008191 }, /* GL_GENERATE_MIPMAP */
+   { 12685, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT */
+   { 12709, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT_SGIS */
+   { 12738, 0x00008191 }, /* GL_GENERATE_MIPMAP_SGIS */
+   { 12762, 0x00000206 }, /* GL_GEQUAL */
+   { 12772, 0x00000204 }, /* GL_GREATER */
+   { 12783, 0x00001904 }, /* GL_GREEN */
+   { 12792, 0x00000D19 }, /* GL_GREEN_BIAS */
+   { 12806, 0x00000D53 }, /* GL_GREEN_BITS */
+   { 12820, 0x00000D18 }, /* GL_GREEN_SCALE */
+   { 12835, 0x0000140B }, /* GL_HALF_FLOAT */
+   { 12849, 0x00008000 }, /* GL_HINT_BIT */
+   { 12861, 0x00008024 }, /* GL_HISTOGRAM */
+   { 12874, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE */
+   { 12898, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE_EXT */
+   { 12926, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE */
+   { 12949, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE_EXT */
+   { 12976, 0x00008024 }, /* GL_HISTOGRAM_EXT */
+   { 12993, 0x00008027 }, /* GL_HISTOGRAM_FORMAT */
+   { 13013, 0x00008027 }, /* GL_HISTOGRAM_FORMAT_EXT */
+   { 13037, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE */
+   { 13061, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE_EXT */
+   { 13089, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE */
+   { 13117, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE_EXT */
+   { 13149, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE */
+   { 13171, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE_EXT */
+   { 13197, 0x0000802D }, /* GL_HISTOGRAM_SINK */
+   { 13215, 0x0000802D }, /* GL_HISTOGRAM_SINK_EXT */
+   { 13237, 0x00008026 }, /* GL_HISTOGRAM_WIDTH */
+   { 13256, 0x00008026 }, /* GL_HISTOGRAM_WIDTH_EXT */
+   { 13279, 0x0000862A }, /* GL_IDENTITY_NV */
+   { 13294, 0x00008150 }, /* GL_IGNORE_BORDER_HP */
+   { 13314, 0x00008B9B }, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
+   { 13354, 0x00008B9A }, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
+   { 13392, 0x00001E02 }, /* GL_INCR */
+   { 13400, 0x00008507 }, /* GL_INCR_WRAP */
+   { 13413, 0x00008507 }, /* GL_INCR_WRAP_EXT */
+   { 13430, 0x00008222 }, /* GL_INDEX */
+   { 13439, 0x00008077 }, /* GL_INDEX_ARRAY */
+   { 13454, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING */
+   { 13484, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING_ARB */
+   { 13518, 0x00008091 }, /* GL_INDEX_ARRAY_POINTER */
+   { 13541, 0x00008086 }, /* GL_INDEX_ARRAY_STRIDE */
+   { 13563, 0x00008085 }, /* GL_INDEX_ARRAY_TYPE */
+   { 13583, 0x00000D51 }, /* GL_INDEX_BITS */
+   { 13597, 0x00000C20 }, /* GL_INDEX_CLEAR_VALUE */
+   { 13618, 0x00000BF1 }, /* GL_INDEX_LOGIC_OP */
+   { 13636, 0x00000C30 }, /* GL_INDEX_MODE */
+   { 13650, 0x00000D13 }, /* GL_INDEX_OFFSET */
+   { 13666, 0x00000D12 }, /* GL_INDEX_SHIFT */
+   { 13681, 0x00000C21 }, /* GL_INDEX_WRITEMASK */
+   { 13700, 0x00008B84 }, /* GL_INFO_LOG_LENGTH */
+   { 13719, 0x00001404 }, /* GL_INT */
+   { 13726, 0x00008049 }, /* GL_INTENSITY */
+   { 13739, 0x0000804C }, /* GL_INTENSITY12 */
+   { 13754, 0x0000804C }, /* GL_INTENSITY12_EXT */
+   { 13773, 0x0000804D }, /* GL_INTENSITY16 */
+   { 13788, 0x0000804D }, /* GL_INTENSITY16_EXT */
+   { 13807, 0x0000804A }, /* GL_INTENSITY4 */
+   { 13821, 0x0000804A }, /* GL_INTENSITY4_EXT */
+   { 13839, 0x0000804B }, /* GL_INTENSITY8 */
+   { 13853, 0x0000804B }, /* GL_INTENSITY8_EXT */
+   { 13871, 0x00008049 }, /* GL_INTENSITY_EXT */
+   { 13888, 0x00008575 }, /* GL_INTERPOLATE */
+   { 13903, 0x00008575 }, /* GL_INTERPOLATE_ARB */
+   { 13922, 0x00008575 }, /* GL_INTERPOLATE_EXT */
+   { 13941, 0x00008B53 }, /* GL_INT_VEC2 */
+   { 13953, 0x00008B53 }, /* GL_INT_VEC2_ARB */
+   { 13969, 0x00008B54 }, /* GL_INT_VEC3 */
+   { 13981, 0x00008B54 }, /* GL_INT_VEC3_ARB */
+   { 13997, 0x00008B55 }, /* GL_INT_VEC4 */
+   { 14009, 0x00008B55 }, /* GL_INT_VEC4_ARB */
+   { 14025, 0x00000500 }, /* GL_INVALID_ENUM */
+   { 14041, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION */
+   { 14074, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION_EXT */
+   { 14111, 0x00000502 }, /* GL_INVALID_OPERATION */
+   { 14132, 0x00000501 }, /* GL_INVALID_VALUE */
+   { 14149, 0x0000862B }, /* GL_INVERSE_NV */
+   { 14163, 0x0000862D }, /* GL_INVERSE_TRANSPOSE_NV */
+   { 14187, 0x0000150A }, /* GL_INVERT */
+   { 14197, 0x00001E00 }, /* GL_KEEP */
+   { 14205, 0x00008E4E }, /* GL_LAST_VERTEX_CONVENTION */
+   { 14231, 0x00008E4E }, /* GL_LAST_VERTEX_CONVENTION_EXT */
+   { 14261, 0x00000406 }, /* GL_LEFT */
+   { 14269, 0x00000203 }, /* GL_LEQUAL */
+   { 14279, 0x00000201 }, /* GL_LESS */
+   { 14287, 0x00004000 }, /* GL_LIGHT0 */
+   { 14297, 0x00004001 }, /* GL_LIGHT1 */
+   { 14307, 0x00004002 }, /* GL_LIGHT2 */
+   { 14317, 0x00004003 }, /* GL_LIGHT3 */
+   { 14327, 0x00004004 }, /* GL_LIGHT4 */
+   { 14337, 0x00004005 }, /* GL_LIGHT5 */
+   { 14347, 0x00004006 }, /* GL_LIGHT6 */
+   { 14357, 0x00004007 }, /* GL_LIGHT7 */
+   { 14367, 0x00000B50 }, /* GL_LIGHTING */
+   { 14379, 0x00000040 }, /* GL_LIGHTING_BIT */
+   { 14395, 0x00000B53 }, /* GL_LIGHT_MODEL_AMBIENT */
+   { 14418, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL */
+   { 14447, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL_EXT */
+   { 14480, 0x00000B51 }, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
+   { 14508, 0x00000B52 }, /* GL_LIGHT_MODEL_TWO_SIDE */
+   { 14532, 0x00001B01 }, /* GL_LINE */
+   { 14540, 0x00002601 }, /* GL_LINEAR */
+   { 14550, 0x00001208 }, /* GL_LINEAR_ATTENUATION */
+   { 14572, 0x00008170 }, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
+   { 14602, 0x0000844F }, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
+   { 14633, 0x00002703 }, /* GL_LINEAR_MIPMAP_LINEAR */
+   { 14657, 0x00002701 }, /* GL_LINEAR_MIPMAP_NEAREST */
+   { 14682, 0x00000001 }, /* GL_LINES */
+   { 14691, 0x00000004 }, /* GL_LINE_BIT */
+   { 14703, 0x00000002 }, /* GL_LINE_LOOP */
+   { 14716, 0x00000707 }, /* GL_LINE_RESET_TOKEN */
+   { 14736, 0x00000B20 }, /* GL_LINE_SMOOTH */
+   { 14751, 0x00000C52 }, /* GL_LINE_SMOOTH_HINT */
+   { 14771, 0x00000B24 }, /* GL_LINE_STIPPLE */
+   { 14787, 0x00000B25 }, /* GL_LINE_STIPPLE_PATTERN */
+   { 14811, 0x00000B26 }, /* GL_LINE_STIPPLE_REPEAT */
+   { 14834, 0x00000003 }, /* GL_LINE_STRIP */
+   { 14848, 0x00000702 }, /* GL_LINE_TOKEN */
+   { 14862, 0x00000B21 }, /* GL_LINE_WIDTH */
+   { 14876, 0x00000B23 }, /* GL_LINE_WIDTH_GRANULARITY */
+   { 14902, 0x00000B22 }, /* GL_LINE_WIDTH_RANGE */
+   { 14922, 0x00008B82 }, /* GL_LINK_STATUS */
+   { 14937, 0x00000B32 }, /* GL_LIST_BASE */
+   { 14950, 0x00020000 }, /* GL_LIST_BIT */
+   { 14962, 0x00000B33 }, /* GL_LIST_INDEX */
+   { 14976, 0x00000B30 }, /* GL_LIST_MODE */
+   { 14989, 0x00000101 }, /* GL_LOAD */
+   { 14997, 0x00000BF1 }, /* GL_LOGIC_OP */
+   { 15009, 0x00000BF0 }, /* GL_LOGIC_OP_MODE */
+   { 15026, 0x00008CA1 }, /* GL_LOWER_LEFT */
+   { 15040, 0x00001909 }, /* GL_LUMINANCE */
+   { 15053, 0x00008041 }, /* GL_LUMINANCE12 */
+   { 15068, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12 */
+   { 15091, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12_EXT */
+   { 15118, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4 */
+   { 15140, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4_EXT */
+   { 15166, 0x00008041 }, /* GL_LUMINANCE12_EXT */
+   { 15185, 0x00008042 }, /* GL_LUMINANCE16 */
+   { 15200, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16 */
+   { 15223, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16_EXT */
+   { 15250, 0x00008042 }, /* GL_LUMINANCE16_EXT */
+   { 15269, 0x0000803F }, /* GL_LUMINANCE4 */
+   { 15283, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4 */
+   { 15304, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4_EXT */
+   { 15329, 0x0000803F }, /* GL_LUMINANCE4_EXT */
+   { 15347, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2 */
+   { 15368, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2_EXT */
+   { 15393, 0x00008040 }, /* GL_LUMINANCE8 */
+   { 15407, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8 */
+   { 15428, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8_EXT */
+   { 15453, 0x00008040 }, /* GL_LUMINANCE8_EXT */
+   { 15471, 0x0000190A }, /* GL_LUMINANCE_ALPHA */
+   { 15490, 0x00000D90 }, /* GL_MAP1_COLOR_4 */
+   { 15506, 0x00000DD0 }, /* GL_MAP1_GRID_DOMAIN */
+   { 15526, 0x00000DD1 }, /* GL_MAP1_GRID_SEGMENTS */
+   { 15548, 0x00000D91 }, /* GL_MAP1_INDEX */
+   { 15562, 0x00000D92 }, /* GL_MAP1_NORMAL */
+   { 15577, 0x00000D93 }, /* GL_MAP1_TEXTURE_COORD_1 */
+   { 15601, 0x00000D94 }, /* GL_MAP1_TEXTURE_COORD_2 */
+   { 15625, 0x00000D95 }, /* GL_MAP1_TEXTURE_COORD_3 */
+   { 15649, 0x00000D96 }, /* GL_MAP1_TEXTURE_COORD_4 */
+   { 15673, 0x00000D97 }, /* GL_MAP1_VERTEX_3 */
+   { 15690, 0x00000D98 }, /* GL_MAP1_VERTEX_4 */
+   { 15707, 0x00008660 }, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
+   { 15735, 0x0000866A }, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
+   { 15764, 0x0000866B }, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
+   { 15793, 0x0000866C }, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
+   { 15822, 0x0000866D }, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
+   { 15851, 0x0000866E }, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
+   { 15880, 0x0000866F }, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
+   { 15909, 0x00008661 }, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
+   { 15937, 0x00008662 }, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
+   { 15965, 0x00008663 }, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
+   { 15993, 0x00008664 }, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
+   { 16021, 0x00008665 }, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
+   { 16049, 0x00008666 }, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
+   { 16077, 0x00008667 }, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
+   { 16105, 0x00008668 }, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
+   { 16133, 0x00008669 }, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
+   { 16161, 0x00000DB0 }, /* GL_MAP2_COLOR_4 */
+   { 16177, 0x00000DD2 }, /* GL_MAP2_GRID_DOMAIN */
+   { 16197, 0x00000DD3 }, /* GL_MAP2_GRID_SEGMENTS */
+   { 16219, 0x00000DB1 }, /* GL_MAP2_INDEX */
+   { 16233, 0x00000DB2 }, /* GL_MAP2_NORMAL */
+   { 16248, 0x00000DB3 }, /* GL_MAP2_TEXTURE_COORD_1 */
+   { 16272, 0x00000DB4 }, /* GL_MAP2_TEXTURE_COORD_2 */
+   { 16296, 0x00000DB5 }, /* GL_MAP2_TEXTURE_COORD_3 */
+   { 16320, 0x00000DB6 }, /* GL_MAP2_TEXTURE_COORD_4 */
+   { 16344, 0x00000DB7 }, /* GL_MAP2_VERTEX_3 */
+   { 16361, 0x00000DB8 }, /* GL_MAP2_VERTEX_4 */
+   { 16378, 0x00008670 }, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
+   { 16406, 0x0000867A }, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
+   { 16435, 0x0000867B }, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
+   { 16464, 0x0000867C }, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
+   { 16493, 0x0000867D }, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
+   { 16522, 0x0000867E }, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
+   { 16551, 0x0000867F }, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
+   { 16580, 0x00008671 }, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
+   { 16608, 0x00008672 }, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
+   { 16636, 0x00008673 }, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
+   { 16664, 0x00008674 }, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
+   { 16692, 0x00008675 }, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
+   { 16720, 0x00008676 }, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
+   { 16748, 0x00008677 }, /* GL_MAP2_VERTEX_ATTRIB7_4_NV */
+   { 16776, 0x00008678 }, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
+   { 16804, 0x00008679 }, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
+   { 16832, 0x00000D10 }, /* GL_MAP_COLOR */
+   { 16845, 0x00000010 }, /* GL_MAP_FLUSH_EXPLICIT_BIT */
+   { 16871, 0x00000008 }, /* GL_MAP_INVALIDATE_BUFFER_BIT */
+   { 16900, 0x00000004 }, /* GL_MAP_INVALIDATE_RANGE_BIT */
+   { 16928, 0x00000001 }, /* GL_MAP_READ_BIT */
+   { 16944, 0x00000D11 }, /* GL_MAP_STENCIL */
+   { 16959, 0x00000020 }, /* GL_MAP_UNSYNCHRONIZED_BIT */
+   { 16985, 0x00000002 }, /* GL_MAP_WRITE_BIT */
+   { 17002, 0x000088C0 }, /* GL_MATRIX0_ARB */
+   { 17017, 0x00008630 }, /* GL_MATRIX0_NV */
+   { 17031, 0x000088CA }, /* GL_MATRIX10_ARB */
+   { 17047, 0x000088CB }, /* GL_MATRIX11_ARB */
+   { 17063, 0x000088CC }, /* GL_MATRIX12_ARB */
+   { 17079, 0x000088CD }, /* GL_MATRIX13_ARB */
+   { 17095, 0x000088CE }, /* GL_MATRIX14_ARB */
+   { 17111, 0x000088CF }, /* GL_MATRIX15_ARB */
+   { 17127, 0x000088D0 }, /* GL_MATRIX16_ARB */
+   { 17143, 0x000088D1 }, /* GL_MATRIX17_ARB */
+   { 17159, 0x000088D2 }, /* GL_MATRIX18_ARB */
+   { 17175, 0x000088D3 }, /* GL_MATRIX19_ARB */
+   { 17191, 0x000088C1 }, /* GL_MATRIX1_ARB */
+   { 17206, 0x00008631 }, /* GL_MATRIX1_NV */
+   { 17220, 0x000088D4 }, /* GL_MATRIX20_ARB */
+   { 17236, 0x000088D5 }, /* GL_MATRIX21_ARB */
+   { 17252, 0x000088D6 }, /* GL_MATRIX22_ARB */
+   { 17268, 0x000088D7 }, /* GL_MATRIX23_ARB */
+   { 17284, 0x000088D8 }, /* GL_MATRIX24_ARB */
+   { 17300, 0x000088D9 }, /* GL_MATRIX25_ARB */
+   { 17316, 0x000088DA }, /* GL_MATRIX26_ARB */
+   { 17332, 0x000088DB }, /* GL_MATRIX27_ARB */
+   { 17348, 0x000088DC }, /* GL_MATRIX28_ARB */
+   { 17364, 0x000088DD }, /* GL_MATRIX29_ARB */
+   { 17380, 0x000088C2 }, /* GL_MATRIX2_ARB */
+   { 17395, 0x00008632 }, /* GL_MATRIX2_NV */
+   { 17409, 0x000088DE }, /* GL_MATRIX30_ARB */
+   { 17425, 0x000088DF }, /* GL_MATRIX31_ARB */
+   { 17441, 0x000088C3 }, /* GL_MATRIX3_ARB */
+   { 17456, 0x00008633 }, /* GL_MATRIX3_NV */
+   { 17470, 0x000088C4 }, /* GL_MATRIX4_ARB */
+   { 17485, 0x00008634 }, /* GL_MATRIX4_NV */
+   { 17499, 0x000088C5 }, /* GL_MATRIX5_ARB */
+   { 17514, 0x00008635 }, /* GL_MATRIX5_NV */
+   { 17528, 0x000088C6 }, /* GL_MATRIX6_ARB */
+   { 17543, 0x00008636 }, /* GL_MATRIX6_NV */
+   { 17557, 0x000088C7 }, /* GL_MATRIX7_ARB */
+   { 17572, 0x00008637 }, /* GL_MATRIX7_NV */
+   { 17586, 0x000088C8 }, /* GL_MATRIX8_ARB */
+   { 17601, 0x000088C9 }, /* GL_MATRIX9_ARB */
+   { 17616, 0x00008844 }, /* GL_MATRIX_INDEX_ARRAY_ARB */
+   { 17642, 0x00008849 }, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
+   { 17676, 0x00008846 }, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
+   { 17707, 0x00008848 }, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
+   { 17740, 0x00008847 }, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
+   { 17771, 0x00000BA0 }, /* GL_MATRIX_MODE */
+   { 17786, 0x00008840 }, /* GL_MATRIX_PALETTE_ARB */
+   { 17808, 0x00008008 }, /* GL_MAX */
+   { 17815, 0x00008073 }, /* GL_MAX_3D_TEXTURE_SIZE */
+   { 17838, 0x000088FF }, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
+   { 17870, 0x00000D35 }, /* GL_MAX_ATTRIB_STACK_DEPTH */
+   { 17896, 0x00000D3B }, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
+   { 17929, 0x00008177 }, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
+   { 17955, 0x00008178 }, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+   { 17989, 0x00000D32 }, /* GL_MAX_CLIP_PLANES */
+   { 18008, 0x00008CDF }, /* GL_MAX_COLOR_ATTACHMENTS */
+   { 18033, 0x00008CDF }, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
+   { 18062, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
+   { 18094, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI */
+   { 18130, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
+   { 18166, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB */
+   { 18206, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT */
+   { 18232, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT_EXT */
+   { 18262, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH */
+   { 18287, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH_EXT */
+   { 18316, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
+   { 18345, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB */
+   { 18378, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS */
+   { 18398, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ARB */
+   { 18422, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ATI */
+   { 18446, 0x000080E9 }, /* GL_MAX_ELEMENTS_INDICES */
+   { 18470, 0x000080E8 }, /* GL_MAX_ELEMENTS_VERTICES */
+   { 18495, 0x00000D30 }, /* GL_MAX_EVAL_ORDER */
+   { 18513, 0x00008008 }, /* GL_MAX_EXT */
+   { 18524, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
+   { 18559, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB */
+   { 18598, 0x00000D31 }, /* GL_MAX_LIGHTS */
+   { 18612, 0x00000B31 }, /* GL_MAX_LIST_NESTING */
+   { 18632, 0x00008841 }, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
+   { 18670, 0x00000D36 }, /* GL_MAX_MODELVIEW_STACK_DEPTH */
+   { 18699, 0x00000D37 }, /* GL_MAX_NAME_STACK_DEPTH */
+   { 18723, 0x00008842 }, /* GL_MAX_PALETTE_MATRICES_ARB */
+   { 18751, 0x00000D34 }, /* GL_MAX_PIXEL_MAP_TABLE */
+   { 18774, 0x000088B1 }, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
+   { 18811, 0x0000880B }, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
+   { 18847, 0x000088AD }, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
+   { 18874, 0x000088F5 }, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
+   { 18903, 0x000088B5 }, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
+   { 18937, 0x000088F4 }, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
+   { 18973, 0x000088F6 }, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
+   { 19000, 0x000088A1 }, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
+   { 19032, 0x000088B4 }, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
+   { 19068, 0x000088F8 }, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
+   { 19097, 0x000088F7 }, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
+   { 19126, 0x0000862F }, /* GL_MAX_PROGRAM_MATRICES_ARB */
+   { 19154, 0x0000862E }, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
+   { 19192, 0x000088B3 }, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+   { 19236, 0x0000880E }, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+   { 19279, 0x000088AF }, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
+   { 19313, 0x000088A3 }, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+   { 19352, 0x000088AB }, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
+   { 19389, 0x000088A7 }, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
+   { 19427, 0x00008810 }, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+   { 19470, 0x0000880F }, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+   { 19513, 0x000088A9 }, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
+   { 19543, 0x000088A5 }, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
+   { 19574, 0x0000880D }, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
+   { 19610, 0x0000880C }, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
+   { 19646, 0x00000D38 }, /* GL_MAX_PROJECTION_STACK_DEPTH */
+   { 19676, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
+   { 19710, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_NV */
+   { 19743, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE */
+   { 19768, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
+   { 19797, 0x00008D57 }, /* GL_MAX_SAMPLES */
+   { 19812, 0x00008D57 }, /* GL_MAX_SAMPLES_EXT */
+   { 19831, 0x00009111 }, /* GL_MAX_SERVER_WAIT_TIMEOUT */
+   { 19858, 0x00008504 }, /* GL_MAX_SHININESS_NV */
+   { 19878, 0x00008505 }, /* GL_MAX_SPOT_EXPONENT_NV */
+   { 19902, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS */
+   { 19924, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS_ARB */
+   { 19950, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS */
+   { 19977, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS_ARB */
+   { 20008, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS */
+   { 20032, 0x000084FF }, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
+   { 20066, 0x00000D33 }, /* GL_MAX_TEXTURE_SIZE */
+   { 20086, 0x00000D39 }, /* GL_MAX_TEXTURE_STACK_DEPTH */
+   { 20113, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS */
+   { 20134, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS_ARB */
+   { 20159, 0x0000862F }, /* GL_MAX_TRACK_MATRICES_NV */
+   { 20184, 0x0000862E }, /* GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV */
+   { 20219, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS */
+   { 20241, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS_ARB */
+   { 20267, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS */
+   { 20289, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS_ARB */
+   { 20315, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
+   { 20349, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
+   { 20387, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
+   { 20420, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB */
+   { 20457, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_ARB */
+   { 20481, 0x00000D3A }, /* GL_MAX_VIEWPORT_DIMS */
+   { 20502, 0x00008007 }, /* GL_MIN */
+   { 20509, 0x0000802E }, /* GL_MINMAX */
+   { 20519, 0x0000802E }, /* GL_MINMAX_EXT */
+   { 20533, 0x0000802F }, /* GL_MINMAX_FORMAT */
+   { 20550, 0x0000802F }, /* GL_MINMAX_FORMAT_EXT */
+   { 20571, 0x00008030 }, /* GL_MINMAX_SINK */
+   { 20586, 0x00008030 }, /* GL_MINMAX_SINK_EXT */
+   { 20605, 0x00008007 }, /* GL_MIN_EXT */
+   { 20616, 0x00008370 }, /* GL_MIRRORED_REPEAT */
+   { 20635, 0x00008370 }, /* GL_MIRRORED_REPEAT_ARB */
+   { 20658, 0x00008370 }, /* GL_MIRRORED_REPEAT_IBM */
+   { 20681, 0x00008742 }, /* GL_MIRROR_CLAMP_ATI */
+   { 20701, 0x00008742 }, /* GL_MIRROR_CLAMP_EXT */
+   { 20721, 0x00008912 }, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
+   { 20751, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_ATI */
+   { 20779, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
+   { 20807, 0x00001700 }, /* GL_MODELVIEW */
+   { 20820, 0x00001700 }, /* GL_MODELVIEW0_ARB */
+   { 20838, 0x0000872A }, /* GL_MODELVIEW10_ARB */
+   { 20857, 0x0000872B }, /* GL_MODELVIEW11_ARB */
+   { 20876, 0x0000872C }, /* GL_MODELVIEW12_ARB */
+   { 20895, 0x0000872D }, /* GL_MODELVIEW13_ARB */
+   { 20914, 0x0000872E }, /* GL_MODELVIEW14_ARB */
+   { 20933, 0x0000872F }, /* GL_MODELVIEW15_ARB */
+   { 20952, 0x00008730 }, /* GL_MODELVIEW16_ARB */
+   { 20971, 0x00008731 }, /* GL_MODELVIEW17_ARB */
+   { 20990, 0x00008732 }, /* GL_MODELVIEW18_ARB */
+   { 21009, 0x00008733 }, /* GL_MODELVIEW19_ARB */
+   { 21028, 0x0000850A }, /* GL_MODELVIEW1_ARB */
+   { 21046, 0x00008734 }, /* GL_MODELVIEW20_ARB */
+   { 21065, 0x00008735 }, /* GL_MODELVIEW21_ARB */
+   { 21084, 0x00008736 }, /* GL_MODELVIEW22_ARB */
+   { 21103, 0x00008737 }, /* GL_MODELVIEW23_ARB */
+   { 21122, 0x00008738 }, /* GL_MODELVIEW24_ARB */
+   { 21141, 0x00008739 }, /* GL_MODELVIEW25_ARB */
+   { 21160, 0x0000873A }, /* GL_MODELVIEW26_ARB */
+   { 21179, 0x0000873B }, /* GL_MODELVIEW27_ARB */
+   { 21198, 0x0000873C }, /* GL_MODELVIEW28_ARB */
+   { 21217, 0x0000873D }, /* GL_MODELVIEW29_ARB */
+   { 21236, 0x00008722 }, /* GL_MODELVIEW2_ARB */
+   { 21254, 0x0000873E }, /* GL_MODELVIEW30_ARB */
+   { 21273, 0x0000873F }, /* GL_MODELVIEW31_ARB */
+   { 21292, 0x00008723 }, /* GL_MODELVIEW3_ARB */
+   { 21310, 0x00008724 }, /* GL_MODELVIEW4_ARB */
+   { 21328, 0x00008725 }, /* GL_MODELVIEW5_ARB */
+   { 21346, 0x00008726 }, /* GL_MODELVIEW6_ARB */
+   { 21364, 0x00008727 }, /* GL_MODELVIEW7_ARB */
+   { 21382, 0x00008728 }, /* GL_MODELVIEW8_ARB */
+   { 21400, 0x00008729 }, /* GL_MODELVIEW9_ARB */
+   { 21418, 0x00000BA6 }, /* GL_MODELVIEW_MATRIX */
+   { 21438, 0x00008629 }, /* GL_MODELVIEW_PROJECTION_NV */
+   { 21465, 0x00000BA3 }, /* GL_MODELVIEW_STACK_DEPTH */
+   { 21490, 0x00002100 }, /* GL_MODULATE */
+   { 21502, 0x00008744 }, /* GL_MODULATE_ADD_ATI */
+   { 21522, 0x00008745 }, /* GL_MODULATE_SIGNED_ADD_ATI */
+   { 21549, 0x00008746 }, /* GL_MODULATE_SUBTRACT_ATI */
+   { 21574, 0x00000103 }, /* GL_MULT */
+   { 21582, 0x0000809D }, /* GL_MULTISAMPLE */
+   { 21597, 0x000086B2 }, /* GL_MULTISAMPLE_3DFX */
+   { 21617, 0x0000809D }, /* GL_MULTISAMPLE_ARB */
+   { 21636, 0x20000000 }, /* GL_MULTISAMPLE_BIT */
+   { 21655, 0x20000000 }, /* GL_MULTISAMPLE_BIT_3DFX */
+   { 21679, 0x20000000 }, /* GL_MULTISAMPLE_BIT_ARB */
+   { 21702, 0x00008534 }, /* GL_MULTISAMPLE_FILTER_HINT_NV */
+   { 21732, 0x00002A25 }, /* GL_N3F_V3F */
+   { 21743, 0x00000D70 }, /* GL_NAME_STACK_DEPTH */
+   { 21763, 0x0000150E }, /* GL_NAND */
+   { 21771, 0x00002600 }, /* GL_NEAREST */
+   { 21782, 0x0000844E }, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
+   { 21813, 0x0000844D }, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
+   { 21845, 0x00002702 }, /* GL_NEAREST_MIPMAP_LINEAR */
+   { 21870, 0x00002700 }, /* GL_NEAREST_MIPMAP_NEAREST */
+   { 21896, 0x00000200 }, /* GL_NEVER */
+   { 21905, 0x00001102 }, /* GL_NICEST */
+   { 21915, 0x00000000 }, /* GL_NONE */
+   { 21923, 0x00001505 }, /* GL_NOOP */
+   { 21931, 0x00001508 }, /* GL_NOR */
+   { 21938, 0x00000BA1 }, /* GL_NORMALIZE */
+   { 21951, 0x00008075 }, /* GL_NORMAL_ARRAY */
+   { 21967, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
+   { 21998, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING_ARB */
+   { 22033, 0x0000808F }, /* GL_NORMAL_ARRAY_POINTER */
+   { 22057, 0x0000807F }, /* GL_NORMAL_ARRAY_STRIDE */
+   { 22080, 0x0000807E }, /* GL_NORMAL_ARRAY_TYPE */
+   { 22101, 0x00008511 }, /* GL_NORMAL_MAP */
+   { 22115, 0x00008511 }, /* GL_NORMAL_MAP_ARB */
+   { 22133, 0x00008511 }, /* GL_NORMAL_MAP_NV */
+   { 22150, 0x00000205 }, /* GL_NOTEQUAL */
+   { 22162, 0x00000000 }, /* GL_NO_ERROR */
+   { 22174, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
+   { 22208, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB */
+   { 22246, 0x00008B89 }, /* GL_OBJECT_ACTIVE_ATTRIBUTES_ARB */
+   { 22278, 0x00008B8A }, /* GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB */
+   { 22320, 0x00008B86 }, /* GL_OBJECT_ACTIVE_UNIFORMS_ARB */
+   { 22350, 0x00008B87 }, /* GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB */
+   { 22390, 0x00008B85 }, /* GL_OBJECT_ATTACHED_OBJECTS_ARB */
+   { 22421, 0x00008B81 }, /* GL_OBJECT_COMPILE_STATUS_ARB */
+   { 22450, 0x00008B80 }, /* GL_OBJECT_DELETE_STATUS_ARB */
+   { 22478, 0x00008B84 }, /* GL_OBJECT_INFO_LOG_LENGTH_ARB */
+   { 22508, 0x00002401 }, /* GL_OBJECT_LINEAR */
+   { 22525, 0x00008B82 }, /* GL_OBJECT_LINK_STATUS_ARB */
+   { 22551, 0x00002501 }, /* GL_OBJECT_PLANE */
+   { 22567, 0x00008B88 }, /* GL_OBJECT_SHADER_SOURCE_LENGTH_ARB */
+   { 22602, 0x00008B4F }, /* GL_OBJECT_SUBTYPE_ARB */
+   { 22624, 0x00009112 }, /* GL_OBJECT_TYPE */
+   { 22639, 0x00008B4E }, /* GL_OBJECT_TYPE_ARB */
+   { 22658, 0x00008B83 }, /* GL_OBJECT_VALIDATE_STATUS_ARB */
+   { 22688, 0x00008165 }, /* GL_OCCLUSION_TEST_HP */
+   { 22709, 0x00008166 }, /* GL_OCCLUSION_TEST_RESULT_HP */
+   { 22737, 0x00000001 }, /* GL_ONE */
+   { 22744, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA */
+   { 22772, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA_EXT */
+   { 22804, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR */
+   { 22832, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR_EXT */
+   { 22864, 0x00000305 }, /* GL_ONE_MINUS_DST_ALPHA */
+   { 22887, 0x00000307 }, /* GL_ONE_MINUS_DST_COLOR */
+   { 22910, 0x00000303 }, /* GL_ONE_MINUS_SRC_ALPHA */
+   { 22933, 0x00000301 }, /* GL_ONE_MINUS_SRC_COLOR */
+   { 22956, 0x00008598 }, /* GL_OPERAND0_ALPHA */
+   { 22974, 0x00008598 }, /* GL_OPERAND0_ALPHA_ARB */
+   { 22996, 0x00008598 }, /* GL_OPERAND0_ALPHA_EXT */
+   { 23018, 0x00008590 }, /* GL_OPERAND0_RGB */
+   { 23034, 0x00008590 }, /* GL_OPERAND0_RGB_ARB */
+   { 23054, 0x00008590 }, /* GL_OPERAND0_RGB_EXT */
+   { 23074, 0x00008599 }, /* GL_OPERAND1_ALPHA */
+   { 23092, 0x00008599 }, /* GL_OPERAND1_ALPHA_ARB */
+   { 23114, 0x00008599 }, /* GL_OPERAND1_ALPHA_EXT */
+   { 23136, 0x00008591 }, /* GL_OPERAND1_RGB */
+   { 23152, 0x00008591 }, /* GL_OPERAND1_RGB_ARB */
+   { 23172, 0x00008591 }, /* GL_OPERAND1_RGB_EXT */
+   { 23192, 0x0000859A }, /* GL_OPERAND2_ALPHA */
+   { 23210, 0x0000859A }, /* GL_OPERAND2_ALPHA_ARB */
+   { 23232, 0x0000859A }, /* GL_OPERAND2_ALPHA_EXT */
+   { 23254, 0x00008592 }, /* GL_OPERAND2_RGB */
+   { 23270, 0x00008592 }, /* GL_OPERAND2_RGB_ARB */
+   { 23290, 0x00008592 }, /* GL_OPERAND2_RGB_EXT */
+   { 23310, 0x0000859B }, /* GL_OPERAND3_ALPHA_NV */
+   { 23331, 0x00008593 }, /* GL_OPERAND3_RGB_NV */
+   { 23350, 0x00001507 }, /* GL_OR */
+   { 23356, 0x00000A01 }, /* GL_ORDER */
+   { 23365, 0x0000150D }, /* GL_OR_INVERTED */
+   { 23380, 0x0000150B }, /* GL_OR_REVERSE */
+   { 23394, 0x00000505 }, /* GL_OUT_OF_MEMORY */
+   { 23411, 0x00000D05 }, /* GL_PACK_ALIGNMENT */
+   { 23429, 0x0000806C }, /* GL_PACK_IMAGE_HEIGHT */
+   { 23450, 0x00008758 }, /* GL_PACK_INVERT_MESA */
+   { 23470, 0x00000D01 }, /* GL_PACK_LSB_FIRST */
+   { 23488, 0x00000D02 }, /* GL_PACK_ROW_LENGTH */
+   { 23507, 0x0000806B }, /* GL_PACK_SKIP_IMAGES */
+   { 23527, 0x00000D04 }, /* GL_PACK_SKIP_PIXELS */
+   { 23547, 0x00000D03 }, /* GL_PACK_SKIP_ROWS */
+   { 23565, 0x00000D00 }, /* GL_PACK_SWAP_BYTES */
+   { 23584, 0x00008B92 }, /* GL_PALETTE4_R5_G6_B5_OES */
+   { 23609, 0x00008B94 }, /* GL_PALETTE4_RGB5_A1_OES */
+   { 23633, 0x00008B90 }, /* GL_PALETTE4_RGB8_OES */
+   { 23654, 0x00008B93 }, /* GL_PALETTE4_RGBA4_OES */
+   { 23676, 0x00008B91 }, /* GL_PALETTE4_RGBA8_OES */
+   { 23698, 0x00008B97 }, /* GL_PALETTE8_R5_G6_B5_OES */
+   { 23723, 0x00008B99 }, /* GL_PALETTE8_RGB5_A1_OES */
+   { 23747, 0x00008B95 }, /* GL_PALETTE8_RGB8_OES */
+   { 23768, 0x00008B98 }, /* GL_PALETTE8_RGBA4_OES */
+   { 23790, 0x00008B96 }, /* GL_PALETTE8_RGBA8_OES */
+   { 23812, 0x00000700 }, /* GL_PASS_THROUGH_TOKEN */
+   { 23834, 0x00000C50 }, /* GL_PERSPECTIVE_CORRECTION_HINT */
+   { 23865, 0x00000C79 }, /* GL_PIXEL_MAP_A_TO_A */
+   { 23885, 0x00000CB9 }, /* GL_PIXEL_MAP_A_TO_A_SIZE */
+   { 23910, 0x00000C78 }, /* GL_PIXEL_MAP_B_TO_B */
+   { 23930, 0x00000CB8 }, /* GL_PIXEL_MAP_B_TO_B_SIZE */
+   { 23955, 0x00000C77 }, /* GL_PIXEL_MAP_G_TO_G */
+   { 23975, 0x00000CB7 }, /* GL_PIXEL_MAP_G_TO_G_SIZE */
+   { 24000, 0x00000C75 }, /* GL_PIXEL_MAP_I_TO_A */
+   { 24020, 0x00000CB5 }, /* GL_PIXEL_MAP_I_TO_A_SIZE */
+   { 24045, 0x00000C74 }, /* GL_PIXEL_MAP_I_TO_B */
+   { 24065, 0x00000CB4 }, /* GL_PIXEL_MAP_I_TO_B_SIZE */
+   { 24090, 0x00000C73 }, /* GL_PIXEL_MAP_I_TO_G */
+   { 24110, 0x00000CB3 }, /* GL_PIXEL_MAP_I_TO_G_SIZE */
+   { 24135, 0x00000C70 }, /* GL_PIXEL_MAP_I_TO_I */
+   { 24155, 0x00000CB0 }, /* GL_PIXEL_MAP_I_TO_I_SIZE */
+   { 24180, 0x00000C72 }, /* GL_PIXEL_MAP_I_TO_R */
+   { 24200, 0x00000CB2 }, /* GL_PIXEL_MAP_I_TO_R_SIZE */
+   { 24225, 0x00000C76 }, /* GL_PIXEL_MAP_R_TO_R */
+   { 24245, 0x00000CB6 }, /* GL_PIXEL_MAP_R_TO_R_SIZE */
+   { 24270, 0x00000C71 }, /* GL_PIXEL_MAP_S_TO_S */
+   { 24290, 0x00000CB1 }, /* GL_PIXEL_MAP_S_TO_S_SIZE */
+   { 24315, 0x00000020 }, /* GL_PIXEL_MODE_BIT */
+   { 24333, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER */
+   { 24354, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING */
+   { 24383, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING_EXT */
+   { 24416, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER_EXT */
+   { 24441, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER */
+   { 24464, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
+   { 24495, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING_EXT */
+   { 24530, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER_EXT */
+   { 24557, 0x00001B00 }, /* GL_POINT */
+   { 24566, 0x00000000 }, /* GL_POINTS */
+   { 24576, 0x00000002 }, /* GL_POINT_BIT */
+   { 24589, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION */
+   { 24619, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_ARB */
+   { 24653, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_EXT */
+   { 24687, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_SGIS */
+   { 24722, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE */
+   { 24751, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_ARB */
+   { 24784, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_EXT */
+   { 24817, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_SGIS */
+   { 24851, 0x00000B11 }, /* GL_POINT_SIZE */
+   { 24865, 0x00000B13 }, /* GL_POINT_SIZE_GRANULARITY */
+   { 24891, 0x00008127 }, /* GL_POINT_SIZE_MAX */
+   { 24909, 0x00008127 }, /* GL_POINT_SIZE_MAX_ARB */
+   { 24931, 0x00008127 }, /* GL_POINT_SIZE_MAX_EXT */
+   { 24953, 0x00008127 }, /* GL_POINT_SIZE_MAX_SGIS */
+   { 24976, 0x00008126 }, /* GL_POINT_SIZE_MIN */
+   { 24994, 0x00008126 }, /* GL_POINT_SIZE_MIN_ARB */
+   { 25016, 0x00008126 }, /* GL_POINT_SIZE_MIN_EXT */
+   { 25038, 0x00008126 }, /* GL_POINT_SIZE_MIN_SGIS */
+   { 25061, 0x00000B12 }, /* GL_POINT_SIZE_RANGE */
+   { 25081, 0x00000B10 }, /* GL_POINT_SMOOTH */
+   { 25097, 0x00000C51 }, /* GL_POINT_SMOOTH_HINT */
+   { 25118, 0x00008861 }, /* GL_POINT_SPRITE */
+   { 25134, 0x00008861 }, /* GL_POINT_SPRITE_ARB */
+   { 25154, 0x00008CA0 }, /* GL_POINT_SPRITE_COORD_ORIGIN */
+   { 25183, 0x00008861 }, /* GL_POINT_SPRITE_NV */
+   { 25202, 0x00008863 }, /* GL_POINT_SPRITE_R_MODE_NV */
+   { 25228, 0x00000701 }, /* GL_POINT_TOKEN */
+   { 25243, 0x00000009 }, /* GL_POLYGON */
+   { 25254, 0x00000008 }, /* GL_POLYGON_BIT */
+   { 25269, 0x00000B40 }, /* GL_POLYGON_MODE */
+   { 25285, 0x00008039 }, /* GL_POLYGON_OFFSET_BIAS */
+   { 25308, 0x00008038 }, /* GL_POLYGON_OFFSET_FACTOR */
+   { 25333, 0x00008037 }, /* GL_POLYGON_OFFSET_FILL */
+   { 25356, 0x00002A02 }, /* GL_POLYGON_OFFSET_LINE */
+   { 25379, 0x00002A01 }, /* GL_POLYGON_OFFSET_POINT */
+   { 25403, 0x00002A00 }, /* GL_POLYGON_OFFSET_UNITS */
+   { 25427, 0x00000B41 }, /* GL_POLYGON_SMOOTH */
+   { 25445, 0x00000C53 }, /* GL_POLYGON_SMOOTH_HINT */
+   { 25468, 0x00000B42 }, /* GL_POLYGON_STIPPLE */
+   { 25487, 0x00000010 }, /* GL_POLYGON_STIPPLE_BIT */
+   { 25510, 0x00000703 }, /* GL_POLYGON_TOKEN */
+   { 25527, 0x00001203 }, /* GL_POSITION */
+   { 25539, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
+   { 25571, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI */
+   { 25607, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
+   { 25640, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI */
+   { 25677, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
+   { 25708, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI */
+   { 25743, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
+   { 25775, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI */
+   { 25811, 0x000080D2 }, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
+   { 25844, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
+   { 25876, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI */
+   { 25912, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
+   { 25945, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI */
+   { 25982, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS */
+   { 26012, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS_SGI */
+   { 26046, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE */
+   { 26077, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE_SGI */
+   { 26112, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
+   { 26143, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS_EXT */
+   { 26178, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
+   { 26210, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE_EXT */
+   { 26246, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS */
+   { 26276, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS_EXT */
+   { 26310, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE */
+   { 26341, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE_EXT */
+   { 26376, 0x000080D1 }, /* GL_POST_CONVOLUTION_COLOR_TABLE */
+   { 26408, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS */
+   { 26439, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS_EXT */
+   { 26474, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE */
+   { 26506, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE_EXT */
+   { 26542, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS */
+   { 26571, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS_EXT */
+   { 26604, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE */
+   { 26634, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE_EXT */
+   { 26668, 0x0000817B }, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
+   { 26707, 0x00008179 }, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
+   { 26740, 0x0000817C }, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
+   { 26780, 0x0000817A }, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
+   { 26814, 0x00008578 }, /* GL_PREVIOUS */
+   { 26826, 0x00008578 }, /* GL_PREVIOUS_ARB */
+   { 26842, 0x00008578 }, /* GL_PREVIOUS_EXT */
+   { 26858, 0x00008577 }, /* GL_PRIMARY_COLOR */
+   { 26875, 0x00008577 }, /* GL_PRIMARY_COLOR_ARB */
+   { 26896, 0x00008577 }, /* GL_PRIMARY_COLOR_EXT */
+   { 26917, 0x000088B0 }, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
+   { 26950, 0x00008805 }, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
+   { 26982, 0x000088AC }, /* GL_PROGRAM_ATTRIBS_ARB */
+   { 27005, 0x00008677 }, /* GL_PROGRAM_BINDING_ARB */
+   { 27028, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_ARB */
+   { 27058, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_NV */
+   { 27087, 0x00008874 }, /* GL_PROGRAM_ERROR_STRING_ARB */
+   { 27115, 0x00008876 }, /* GL_PROGRAM_FORMAT_ARB */
+   { 27137, 0x00008875 }, /* GL_PROGRAM_FORMAT_ASCII_ARB */
+   { 27165, 0x000088A0 }, /* GL_PROGRAM_INSTRUCTIONS_ARB */
+   { 27193, 0x00008627 }, /* GL_PROGRAM_LENGTH_ARB */
+   { 27215, 0x00008627 }, /* GL_PROGRAM_LENGTH_NV */
+   { 27236, 0x000088B2 }, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+   { 27276, 0x00008808 }, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+   { 27315, 0x000088AE }, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
+   { 27345, 0x000088A2 }, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+   { 27380, 0x000088AA }, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
+   { 27413, 0x000088A6 }, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
+   { 27447, 0x0000880A }, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+   { 27486, 0x00008809 }, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+   { 27525, 0x00008B40 }, /* GL_PROGRAM_OBJECT_ARB */
+   { 27547, 0x000088A8 }, /* GL_PROGRAM_PARAMETERS_ARB */
+   { 27573, 0x00008644 }, /* GL_PROGRAM_PARAMETER_NV */
+   { 27597, 0x00008647 }, /* GL_PROGRAM_RESIDENT_NV */
+   { 27620, 0x00008628 }, /* GL_PROGRAM_STRING_ARB */
+   { 27642, 0x00008628 }, /* GL_PROGRAM_STRING_NV */
+   { 27663, 0x00008646 }, /* GL_PROGRAM_TARGET_NV */
+   { 27684, 0x000088A4 }, /* GL_PROGRAM_TEMPORARIES_ARB */
+   { 27711, 0x00008807 }, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
+   { 27743, 0x00008806 }, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
+   { 27775, 0x000088B6 }, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
+   { 27810, 0x00001701 }, /* GL_PROJECTION */
+   { 27824, 0x00000BA7 }, /* GL_PROJECTION_MATRIX */
+   { 27845, 0x00000BA4 }, /* GL_PROJECTION_STACK_DEPTH */
+   { 27871, 0x00008E4F }, /* GL_PROVOKING_VERTEX */
+   { 27891, 0x00008E4F }, /* GL_PROVOKING_VERTEX_EXT */
+   { 27915, 0x000080D3 }, /* GL_PROXY_COLOR_TABLE */
+   { 27936, 0x00008025 }, /* GL_PROXY_HISTOGRAM */
+   { 27955, 0x00008025 }, /* GL_PROXY_HISTOGRAM_EXT */
+   { 27978, 0x000080D5 }, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
+   { 28017, 0x000080D4 }, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
+   { 28055, 0x00008063 }, /* GL_PROXY_TEXTURE_1D */
+   { 28075, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
+   { 28105, 0x00008063 }, /* GL_PROXY_TEXTURE_1D_EXT */
+   { 28129, 0x00008064 }, /* GL_PROXY_TEXTURE_2D */
+   { 28149, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
+   { 28179, 0x00008064 }, /* GL_PROXY_TEXTURE_2D_EXT */
+   { 28203, 0x00008070 }, /* GL_PROXY_TEXTURE_3D */
+   { 28223, 0x000080BD }, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
+   { 28256, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP */
+   { 28282, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP_ARB */
+   { 28312, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
+   { 28343, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_NV */
+   { 28373, 0x00008A1D }, /* GL_PURGEABLE_APPLE */
+   { 28392, 0x00002003 }, /* GL_Q */
+   { 28397, 0x00001209 }, /* GL_QUADRATIC_ATTENUATION */
+   { 28422, 0x00000007 }, /* GL_QUADS */
+   { 28431, 0x00008E4C }, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION */
+   { 28475, 0x00008E4C }, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT */
+   { 28523, 0x00008614 }, /* GL_QUAD_MESH_SUN */
+   { 28540, 0x00000008 }, /* GL_QUAD_STRIP */
+   { 28554, 0x00008E16 }, /* GL_QUERY_BY_REGION_NO_WAIT_NV */
+   { 28584, 0x00008E15 }, /* GL_QUERY_BY_REGION_WAIT_NV */
+   { 28611, 0x00008864 }, /* GL_QUERY_COUNTER_BITS */
+   { 28633, 0x00008864 }, /* GL_QUERY_COUNTER_BITS_ARB */
+   { 28659, 0x00008E14 }, /* GL_QUERY_NO_WAIT_NV */
+   { 28679, 0x00008866 }, /* GL_QUERY_RESULT */
+   { 28695, 0x00008866 }, /* GL_QUERY_RESULT_ARB */
+   { 28715, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE */
+   { 28741, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE_ARB */
+   { 28771, 0x00008E13 }, /* GL_QUERY_WAIT_NV */
+   { 28788, 0x00002002 }, /* GL_R */
+   { 28793, 0x00002A10 }, /* GL_R3_G3_B2 */
+   { 28805, 0x00019262 }, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
+   { 28838, 0x00000C02 }, /* GL_READ_BUFFER */
+   { 28853, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER */
+   { 28873, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING */
+   { 28901, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
+   { 28933, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER_EXT */
+   { 28957, 0x000088B8 }, /* GL_READ_ONLY */
+   { 28970, 0x000088B8 }, /* GL_READ_ONLY_ARB */
+   { 28987, 0x000088BA }, /* GL_READ_WRITE */
+   { 29001, 0x000088BA }, /* GL_READ_WRITE_ARB */
+   { 29019, 0x00001903 }, /* GL_RED */
+   { 29026, 0x00008016 }, /* GL_REDUCE */
+   { 29036, 0x00008016 }, /* GL_REDUCE_EXT */
+   { 29050, 0x00000D15 }, /* GL_RED_BIAS */
+   { 29062, 0x00000D52 }, /* GL_RED_BITS */
+   { 29074, 0x00000D14 }, /* GL_RED_SCALE */
+   { 29087, 0x00008512 }, /* GL_REFLECTION_MAP */
+   { 29105, 0x00008512 }, /* GL_REFLECTION_MAP_ARB */
+   { 29127, 0x00008512 }, /* GL_REFLECTION_MAP_NV */
+   { 29148, 0x00008A19 }, /* GL_RELEASED_APPLE */
+   { 29166, 0x00001C00 }, /* GL_RENDER */
+   { 29176, 0x00008D41 }, /* GL_RENDERBUFFER */
+   { 29192, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE */
+   { 29219, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING */
+   { 29243, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_EXT */
+   { 29271, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE */
+   { 29297, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE */
+   { 29324, 0x00008D41 }, /* GL_RENDERBUFFER_EXT */
+   { 29344, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE */
+   { 29371, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT */
+   { 29394, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_EXT */
+   { 29421, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
+   { 29453, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_EXT */
+   { 29489, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE */
+   { 29514, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES */
+   { 29538, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES_EXT */
+   { 29566, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE */
+   { 29595, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH */
+   { 29617, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_EXT */
+   { 29643, 0x00001F01 }, /* GL_RENDERER */
+   { 29655, 0x00000C40 }, /* GL_RENDER_MODE */
+   { 29670, 0x00002901 }, /* GL_REPEAT */
+   { 29680, 0x00001E01 }, /* GL_REPLACE */
+   { 29691, 0x00008062 }, /* GL_REPLACE_EXT */
+   { 29706, 0x00008153 }, /* GL_REPLICATE_BORDER_HP */
+   { 29729, 0x0000803A }, /* GL_RESCALE_NORMAL */
+   { 29747, 0x0000803A }, /* GL_RESCALE_NORMAL_EXT */
+   { 29769, 0x00008A1B }, /* GL_RETAINED_APPLE */
+   { 29787, 0x00000102 }, /* GL_RETURN */
+   { 29797, 0x00001907 }, /* GL_RGB */
+   { 29804, 0x00008052 }, /* GL_RGB10 */
+   { 29813, 0x00008059 }, /* GL_RGB10_A2 */
+   { 29825, 0x00008059 }, /* GL_RGB10_A2_EXT */
+   { 29841, 0x00008052 }, /* GL_RGB10_EXT */
+   { 29854, 0x00008053 }, /* GL_RGB12 */
+   { 29863, 0x00008053 }, /* GL_RGB12_EXT */
+   { 29876, 0x00008054 }, /* GL_RGB16 */
+   { 29885, 0x00008054 }, /* GL_RGB16_EXT */
+   { 29898, 0x0000804E }, /* GL_RGB2_EXT */
+   { 29910, 0x0000804F }, /* GL_RGB4 */
+   { 29918, 0x0000804F }, /* GL_RGB4_EXT */
+   { 29930, 0x000083A1 }, /* GL_RGB4_S3TC */
+   { 29943, 0x00008050 }, /* GL_RGB5 */
+   { 29951, 0x00008057 }, /* GL_RGB5_A1 */
+   { 29962, 0x00008057 }, /* GL_RGB5_A1_EXT */
+   { 29977, 0x00008050 }, /* GL_RGB5_EXT */
+   { 29989, 0x00008051 }, /* GL_RGB8 */
+   { 29997, 0x00008051 }, /* GL_RGB8_EXT */
+   { 30009, 0x00001908 }, /* GL_RGBA */
+   { 30017, 0x0000805A }, /* GL_RGBA12 */
+   { 30027, 0x0000805A }, /* GL_RGBA12_EXT */
+   { 30041, 0x0000805B }, /* GL_RGBA16 */
+   { 30051, 0x0000805B }, /* GL_RGBA16_EXT */
+   { 30065, 0x00008055 }, /* GL_RGBA2 */
+   { 30074, 0x00008055 }, /* GL_RGBA2_EXT */
+   { 30087, 0x00008056 }, /* GL_RGBA4 */
+   { 30096, 0x000083A5 }, /* GL_RGBA4_DXT5_S3TC */
+   { 30115, 0x00008056 }, /* GL_RGBA4_EXT */
+   { 30128, 0x000083A3 }, /* GL_RGBA4_S3TC */
+   { 30142, 0x00008058 }, /* GL_RGBA8 */
+   { 30151, 0x00008058 }, /* GL_RGBA8_EXT */
+   { 30164, 0x00008F97 }, /* GL_RGBA8_SNORM */
+   { 30179, 0x000083A4 }, /* GL_RGBA_DXT5_S3TC */
+   { 30197, 0x00000C31 }, /* GL_RGBA_MODE */
+   { 30210, 0x000083A2 }, /* GL_RGBA_S3TC */
+   { 30223, 0x00008F93 }, /* GL_RGBA_SNORM */
+   { 30237, 0x000083A0 }, /* GL_RGB_S3TC */
+   { 30249, 0x00008573 }, /* GL_RGB_SCALE */
+   { 30262, 0x00008573 }, /* GL_RGB_SCALE_ARB */
+   { 30279, 0x00008573 }, /* GL_RGB_SCALE_EXT */
+   { 30296, 0x00000407 }, /* GL_RIGHT */
+   { 30305, 0x00002000 }, /* GL_S */
+   { 30310, 0x00008B5D }, /* GL_SAMPLER_1D */
+   { 30324, 0x00008B61 }, /* GL_SAMPLER_1D_SHADOW */
+   { 30345, 0x00008B5E }, /* GL_SAMPLER_2D */
+   { 30359, 0x00008B62 }, /* GL_SAMPLER_2D_SHADOW */
+   { 30380, 0x00008B5F }, /* GL_SAMPLER_3D */
+   { 30394, 0x00008B60 }, /* GL_SAMPLER_CUBE */
+   { 30410, 0x000080A9 }, /* GL_SAMPLES */
+   { 30421, 0x000086B4 }, /* GL_SAMPLES_3DFX */
+   { 30437, 0x000080A9 }, /* GL_SAMPLES_ARB */
+   { 30452, 0x00008914 }, /* GL_SAMPLES_PASSED */
+   { 30470, 0x00008914 }, /* GL_SAMPLES_PASSED_ARB */
+   { 30492, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
+   { 30520, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE_ARB */
+   { 30552, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE */
+   { 30575, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE_ARB */
+   { 30602, 0x000080A8 }, /* GL_SAMPLE_BUFFERS */
+   { 30620, 0x000086B3 }, /* GL_SAMPLE_BUFFERS_3DFX */
+   { 30643, 0x000080A8 }, /* GL_SAMPLE_BUFFERS_ARB */
+   { 30665, 0x000080A0 }, /* GL_SAMPLE_COVERAGE */
+   { 30684, 0x000080A0 }, /* GL_SAMPLE_COVERAGE_ARB */
+   { 30707, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT */
+   { 30733, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT_ARB */
+   { 30763, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE */
+   { 30788, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE_ARB */
+   { 30817, 0x00080000 }, /* GL_SCISSOR_BIT */
+   { 30832, 0x00000C10 }, /* GL_SCISSOR_BOX */
+   { 30847, 0x00000C11 }, /* GL_SCISSOR_TEST */
+   { 30863, 0x0000845E }, /* GL_SECONDARY_COLOR_ARRAY */
+   { 30888, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
+   { 30928, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB */
+   { 30972, 0x0000845D }, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
+   { 31005, 0x0000845A }, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
+   { 31035, 0x0000845C }, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
+   { 31067, 0x0000845B }, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
+   { 31097, 0x00001C02 }, /* GL_SELECT */
+   { 31107, 0x00000DF3 }, /* GL_SELECTION_BUFFER_POINTER */
+   { 31135, 0x00000DF4 }, /* GL_SELECTION_BUFFER_SIZE */
+   { 31160, 0x00008012 }, /* GL_SEPARABLE_2D */
+   { 31176, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR */
+   { 31203, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR_EXT */
+   { 31234, 0x0000150F }, /* GL_SET */
+   { 31241, 0x00008B48 }, /* GL_SHADER_OBJECT_ARB */
+   { 31262, 0x00008B88 }, /* GL_SHADER_SOURCE_LENGTH */
+   { 31286, 0x00008B4F }, /* GL_SHADER_TYPE */
+   { 31301, 0x00000B54 }, /* GL_SHADE_MODEL */
+   { 31316, 0x00008B8C }, /* GL_SHADING_LANGUAGE_VERSION */
+   { 31344, 0x000080BF }, /* GL_SHADOW_AMBIENT_SGIX */
+   { 31367, 0x000081FB }, /* GL_SHARED_TEXTURE_PALETTE_EXT */
+   { 31397, 0x00001601 }, /* GL_SHININESS */
+   { 31410, 0x00001402 }, /* GL_SHORT */
+   { 31419, 0x00009119 }, /* GL_SIGNALED */
+   { 31431, 0x00008F9C }, /* GL_SIGNED_NORMALIZED */
+   { 31452, 0x000081F9 }, /* GL_SINGLE_COLOR */
+   { 31468, 0x000081F9 }, /* GL_SINGLE_COLOR_EXT */
+   { 31488, 0x000085CC }, /* GL_SLICE_ACCUM_SUN */
+   { 31507, 0x00008C46 }, /* GL_SLUMINANCE */
+   { 31521, 0x00008C47 }, /* GL_SLUMINANCE8 */
+   { 31536, 0x00008C45 }, /* GL_SLUMINANCE8_ALPHA8 */
+   { 31558, 0x00008C44 }, /* GL_SLUMINANCE_ALPHA */
+   { 31578, 0x00001D01 }, /* GL_SMOOTH */
+   { 31588, 0x00000B23 }, /* GL_SMOOTH_LINE_WIDTH_GRANULARITY */
+   { 31621, 0x00000B22 }, /* GL_SMOOTH_LINE_WIDTH_RANGE */
+   { 31648, 0x00000B13 }, /* GL_SMOOTH_POINT_SIZE_GRANULARITY */
+   { 31681, 0x00000B12 }, /* GL_SMOOTH_POINT_SIZE_RANGE */
+   { 31708, 0x00008588 }, /* GL_SOURCE0_ALPHA */
+   { 31725, 0x00008588 }, /* GL_SOURCE0_ALPHA_ARB */
+   { 31746, 0x00008588 }, /* GL_SOURCE0_ALPHA_EXT */
+   { 31767, 0x00008580 }, /* GL_SOURCE0_RGB */
+   { 31782, 0x00008580 }, /* GL_SOURCE0_RGB_ARB */
+   { 31801, 0x00008580 }, /* GL_SOURCE0_RGB_EXT */
+   { 31820, 0x00008589 }, /* GL_SOURCE1_ALPHA */
+   { 31837, 0x00008589 }, /* GL_SOURCE1_ALPHA_ARB */
+   { 31858, 0x00008589 }, /* GL_SOURCE1_ALPHA_EXT */
+   { 31879, 0x00008581 }, /* GL_SOURCE1_RGB */
+   { 31894, 0x00008581 }, /* GL_SOURCE1_RGB_ARB */
+   { 31913, 0x00008581 }, /* GL_SOURCE1_RGB_EXT */
+   { 31932, 0x0000858A }, /* GL_SOURCE2_ALPHA */
+   { 31949, 0x0000858A }, /* GL_SOURCE2_ALPHA_ARB */
+   { 31970, 0x0000858A }, /* GL_SOURCE2_ALPHA_EXT */
+   { 31991, 0x00008582 }, /* GL_SOURCE2_RGB */
+   { 32006, 0x00008582 }, /* GL_SOURCE2_RGB_ARB */
+   { 32025, 0x00008582 }, /* GL_SOURCE2_RGB_EXT */
+   { 32044, 0x0000858B }, /* GL_SOURCE3_ALPHA_NV */
+   { 32064, 0x00008583 }, /* GL_SOURCE3_RGB_NV */
+   { 32082, 0x00001202 }, /* GL_SPECULAR */
+   { 32094, 0x00002402 }, /* GL_SPHERE_MAP */
+   { 32108, 0x00001206 }, /* GL_SPOT_CUTOFF */
+   { 32123, 0x00001204 }, /* GL_SPOT_DIRECTION */
+   { 32141, 0x00001205 }, /* GL_SPOT_EXPONENT */
+   { 32158, 0x00008588 }, /* GL_SRC0_ALPHA */
+   { 32172, 0x00008580 }, /* GL_SRC0_RGB */
+   { 32184, 0x00008589 }, /* GL_SRC1_ALPHA */
+   { 32198, 0x00008581 }, /* GL_SRC1_RGB */
+   { 32210, 0x0000858A }, /* GL_SRC2_ALPHA */
+   { 32224, 0x00008582 }, /* GL_SRC2_RGB */
+   { 32236, 0x00000302 }, /* GL_SRC_ALPHA */
+   { 32249, 0x00000308 }, /* GL_SRC_ALPHA_SATURATE */
+   { 32271, 0x00000300 }, /* GL_SRC_COLOR */
+   { 32284, 0x00008C40 }, /* GL_SRGB */
+   { 32292, 0x00008C41 }, /* GL_SRGB8 */
+   { 32301, 0x00008C43 }, /* GL_SRGB8_ALPHA8 */
+   { 32317, 0x00008C42 }, /* GL_SRGB_ALPHA */
+   { 32331, 0x00000503 }, /* GL_STACK_OVERFLOW */
+   { 32349, 0x00000504 }, /* GL_STACK_UNDERFLOW */
+   { 32368, 0x000088E6 }, /* GL_STATIC_COPY */
+   { 32383, 0x000088E6 }, /* GL_STATIC_COPY_ARB */
+   { 32402, 0x000088E4 }, /* GL_STATIC_DRAW */
+   { 32417, 0x000088E4 }, /* GL_STATIC_DRAW_ARB */
+   { 32436, 0x000088E5 }, /* GL_STATIC_READ */
+   { 32451, 0x000088E5 }, /* GL_STATIC_READ_ARB */
+   { 32470, 0x00001802 }, /* GL_STENCIL */
+   { 32481, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT */
+   { 32503, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_EXT */
+   { 32529, 0x00008801 }, /* GL_STENCIL_BACK_FAIL */
+   { 32550, 0x00008801 }, /* GL_STENCIL_BACK_FAIL_ATI */
+   { 32575, 0x00008800 }, /* GL_STENCIL_BACK_FUNC */
+   { 32596, 0x00008800 }, /* GL_STENCIL_BACK_FUNC_ATI */
+   { 32621, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
+   { 32653, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI */
+   { 32689, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
+   { 32721, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI */
+   { 32757, 0x00008CA3 }, /* GL_STENCIL_BACK_REF */
+   { 32777, 0x00008CA4 }, /* GL_STENCIL_BACK_VALUE_MASK */
+   { 32804, 0x00008CA5 }, /* GL_STENCIL_BACK_WRITEMASK */
+   { 32830, 0x00000D57 }, /* GL_STENCIL_BITS */
+   { 32846, 0x00000400 }, /* GL_STENCIL_BUFFER_BIT */
+   { 32868, 0x00000B91 }, /* GL_STENCIL_CLEAR_VALUE */
+   { 32891, 0x00000B94 }, /* GL_STENCIL_FAIL */
+   { 32907, 0x00000B92 }, /* GL_STENCIL_FUNC */
+   { 32923, 0x00001901 }, /* GL_STENCIL_INDEX */
+   { 32940, 0x00008D46 }, /* GL_STENCIL_INDEX1 */
+   { 32958, 0x00008D49 }, /* GL_STENCIL_INDEX16 */
+   { 32977, 0x00008D49 }, /* GL_STENCIL_INDEX16_EXT */
+   { 33000, 0x00008D46 }, /* GL_STENCIL_INDEX1_EXT */
+   { 33022, 0x00008D47 }, /* GL_STENCIL_INDEX4 */
+   { 33040, 0x00008D47 }, /* GL_STENCIL_INDEX4_EXT */
+   { 33062, 0x00008D48 }, /* GL_STENCIL_INDEX8 */
+   { 33080, 0x00008D48 }, /* GL_STENCIL_INDEX8_EXT */
+   { 33102, 0x00008D45 }, /* GL_STENCIL_INDEX_EXT */
+   { 33123, 0x00000B95 }, /* GL_STENCIL_PASS_DEPTH_FAIL */
+   { 33150, 0x00000B96 }, /* GL_STENCIL_PASS_DEPTH_PASS */
+   { 33177, 0x00000B97 }, /* GL_STENCIL_REF */
+   { 33192, 0x00000B90 }, /* GL_STENCIL_TEST */
+   { 33208, 0x00008910 }, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
+   { 33237, 0x00000B93 }, /* GL_STENCIL_VALUE_MASK */
+   { 33259, 0x00000B98 }, /* GL_STENCIL_WRITEMASK */
+   { 33280, 0x00000C33 }, /* GL_STEREO */
+   { 33290, 0x000085BE }, /* GL_STORAGE_CACHED_APPLE */
+   { 33314, 0x000085BD }, /* GL_STORAGE_PRIVATE_APPLE */
+   { 33339, 0x000085BF }, /* GL_STORAGE_SHARED_APPLE */
+   { 33363, 0x000088E2 }, /* GL_STREAM_COPY */
+   { 33378, 0x000088E2 }, /* GL_STREAM_COPY_ARB */
+   { 33397, 0x000088E0 }, /* GL_STREAM_DRAW */
+   { 33412, 0x000088E0 }, /* GL_STREAM_DRAW_ARB */
+   { 33431, 0x000088E1 }, /* GL_STREAM_READ */
+   { 33446, 0x000088E1 }, /* GL_STREAM_READ_ARB */
+   { 33465, 0x00000D50 }, /* GL_SUBPIXEL_BITS */
+   { 33482, 0x000084E7 }, /* GL_SUBTRACT */
+   { 33494, 0x000084E7 }, /* GL_SUBTRACT_ARB */
+   { 33510, 0x00009113 }, /* GL_SYNC_CONDITION */
+   { 33528, 0x00009116 }, /* GL_SYNC_FENCE */
+   { 33542, 0x00009115 }, /* GL_SYNC_FLAGS */
+   { 33556, 0x00000001 }, /* GL_SYNC_FLUSH_COMMANDS_BIT */
+   { 33583, 0x00009117 }, /* GL_SYNC_GPU_COMMANDS_COMPLETE */
+   { 33613, 0x00009114 }, /* GL_SYNC_STATUS */
+   { 33628, 0x00002001 }, /* GL_T */
+   { 33633, 0x00002A2A }, /* GL_T2F_C3F_V3F */
+   { 33648, 0x00002A2C }, /* GL_T2F_C4F_N3F_V3F */
+   { 33667, 0x00002A29 }, /* GL_T2F_C4UB_V3F */
+   { 33683, 0x00002A2B }, /* GL_T2F_N3F_V3F */
+   { 33698, 0x00002A27 }, /* GL_T2F_V3F */
+   { 33709, 0x00002A2D }, /* GL_T4F_C4F_N3F_V4F */
+   { 33728, 0x00002A28 }, /* GL_T4F_V4F */
+   { 33739, 0x00008031 }, /* GL_TABLE_TOO_LARGE_EXT */
+   { 33762, 0x00001702 }, /* GL_TEXTURE */
+   { 33773, 0x000084C0 }, /* GL_TEXTURE0 */
+   { 33785, 0x000084C0 }, /* GL_TEXTURE0_ARB */
+   { 33801, 0x000084C1 }, /* GL_TEXTURE1 */
+   { 33813, 0x000084CA }, /* GL_TEXTURE10 */
+   { 33826, 0x000084CA }, /* GL_TEXTURE10_ARB */
+   { 33843, 0x000084CB }, /* GL_TEXTURE11 */
+   { 33856, 0x000084CB }, /* GL_TEXTURE11_ARB */
+   { 33873, 0x000084CC }, /* GL_TEXTURE12 */
+   { 33886, 0x000084CC }, /* GL_TEXTURE12_ARB */
+   { 33903, 0x000084CD }, /* GL_TEXTURE13 */
+   { 33916, 0x000084CD }, /* GL_TEXTURE13_ARB */
+   { 33933, 0x000084CE }, /* GL_TEXTURE14 */
+   { 33946, 0x000084CE }, /* GL_TEXTURE14_ARB */
+   { 33963, 0x000084CF }, /* GL_TEXTURE15 */
+   { 33976, 0x000084CF }, /* GL_TEXTURE15_ARB */
+   { 33993, 0x000084D0 }, /* GL_TEXTURE16 */
+   { 34006, 0x000084D0 }, /* GL_TEXTURE16_ARB */
+   { 34023, 0x000084D1 }, /* GL_TEXTURE17 */
+   { 34036, 0x000084D1 }, /* GL_TEXTURE17_ARB */
+   { 34053, 0x000084D2 }, /* GL_TEXTURE18 */
+   { 34066, 0x000084D2 }, /* GL_TEXTURE18_ARB */
+   { 34083, 0x000084D3 }, /* GL_TEXTURE19 */
+   { 34096, 0x000084D3 }, /* GL_TEXTURE19_ARB */
+   { 34113, 0x000084C1 }, /* GL_TEXTURE1_ARB */
+   { 34129, 0x000084C2 }, /* GL_TEXTURE2 */
+   { 34141, 0x000084D4 }, /* GL_TEXTURE20 */
+   { 34154, 0x000084D4 }, /* GL_TEXTURE20_ARB */
+   { 34171, 0x000084D5 }, /* GL_TEXTURE21 */
+   { 34184, 0x000084D5 }, /* GL_TEXTURE21_ARB */
+   { 34201, 0x000084D6 }, /* GL_TEXTURE22 */
+   { 34214, 0x000084D6 }, /* GL_TEXTURE22_ARB */
+   { 34231, 0x000084D7 }, /* GL_TEXTURE23 */
+   { 34244, 0x000084D7 }, /* GL_TEXTURE23_ARB */
+   { 34261, 0x000084D8 }, /* GL_TEXTURE24 */
+   { 34274, 0x000084D8 }, /* GL_TEXTURE24_ARB */
+   { 34291, 0x000084D9 }, /* GL_TEXTURE25 */
+   { 34304, 0x000084D9 }, /* GL_TEXTURE25_ARB */
+   { 34321, 0x000084DA }, /* GL_TEXTURE26 */
+   { 34334, 0x000084DA }, /* GL_TEXTURE26_ARB */
+   { 34351, 0x000084DB }, /* GL_TEXTURE27 */
+   { 34364, 0x000084DB }, /* GL_TEXTURE27_ARB */
+   { 34381, 0x000084DC }, /* GL_TEXTURE28 */
+   { 34394, 0x000084DC }, /* GL_TEXTURE28_ARB */
+   { 34411, 0x000084DD }, /* GL_TEXTURE29 */
+   { 34424, 0x000084DD }, /* GL_TEXTURE29_ARB */
+   { 34441, 0x000084C2 }, /* GL_TEXTURE2_ARB */
+   { 34457, 0x000084C3 }, /* GL_TEXTURE3 */
+   { 34469, 0x000084DE }, /* GL_TEXTURE30 */
+   { 34482, 0x000084DE }, /* GL_TEXTURE30_ARB */
+   { 34499, 0x000084DF }, /* GL_TEXTURE31 */
+   { 34512, 0x000084DF }, /* GL_TEXTURE31_ARB */
+   { 34529, 0x000084C3 }, /* GL_TEXTURE3_ARB */
+   { 34545, 0x000084C4 }, /* GL_TEXTURE4 */
+   { 34557, 0x000084C4 }, /* GL_TEXTURE4_ARB */
+   { 34573, 0x000084C5 }, /* GL_TEXTURE5 */
+   { 34585, 0x000084C5 }, /* GL_TEXTURE5_ARB */
+   { 34601, 0x000084C6 }, /* GL_TEXTURE6 */
+   { 34613, 0x000084C6 }, /* GL_TEXTURE6_ARB */
+   { 34629, 0x000084C7 }, /* GL_TEXTURE7 */
+   { 34641, 0x000084C7 }, /* GL_TEXTURE7_ARB */
+   { 34657, 0x000084C8 }, /* GL_TEXTURE8 */
+   { 34669, 0x000084C8 }, /* GL_TEXTURE8_ARB */
+   { 34685, 0x000084C9 }, /* GL_TEXTURE9 */
+   { 34697, 0x000084C9 }, /* GL_TEXTURE9_ARB */
+   { 34713, 0x00000DE0 }, /* GL_TEXTURE_1D */
+   { 34727, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY_EXT */
+   { 34751, 0x00000DE1 }, /* GL_TEXTURE_2D */
+   { 34765, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY_EXT */
+   { 34789, 0x0000806F }, /* GL_TEXTURE_3D */
+   { 34803, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE */
+   { 34825, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE_EXT */
+   { 34851, 0x0000813C }, /* GL_TEXTURE_BASE_LEVEL */
+   { 34873, 0x00008068 }, /* GL_TEXTURE_BINDING_1D */
+   { 34895, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
+   { 34927, 0x00008069 }, /* GL_TEXTURE_BINDING_2D */
+   { 34949, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
+   { 34981, 0x0000806A }, /* GL_TEXTURE_BINDING_3D */
+   { 35003, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP */
+   { 35031, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_ARB */
+   { 35063, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
+   { 35096, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_NV */
+   { 35128, 0x00040000 }, /* GL_TEXTURE_BIT */
+   { 35143, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE */
+   { 35164, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE_EXT */
+   { 35189, 0x00001005 }, /* GL_TEXTURE_BORDER */
+   { 35207, 0x00001004 }, /* GL_TEXTURE_BORDER_COLOR */
+   { 35231, 0x00008171 }, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
+   { 35262, 0x00008176 }, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
+   { 35292, 0x00008172 }, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
+   { 35322, 0x00008175 }, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
+   { 35357, 0x00008173 }, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
+   { 35388, 0x00008174 }, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+   { 35426, 0x000080BC }, /* GL_TEXTURE_COLOR_TABLE_SGI */
+   { 35453, 0x000081EF }, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
+   { 35485, 0x000080BF }, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+   { 35519, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC */
+   { 35543, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC_ARB */
+   { 35571, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE */
+   { 35595, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE_ARB */
+   { 35623, 0x0000819B }, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
+   { 35656, 0x0000819A }, /* GL_TEXTURE_COMPARE_SGIX */
+   { 35680, 0x00001003 }, /* GL_TEXTURE_COMPONENTS */
+   { 35702, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED */
+   { 35724, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED_ARB */
+   { 35750, 0x000086A3 }, /* GL_TEXTURE_COMPRESSED_FORMATS_ARB */
+   { 35784, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
+   { 35817, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB */
+   { 35854, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT */
+   { 35882, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT_ARB */
+   { 35914, 0x00008078 }, /* GL_TEXTURE_COORD_ARRAY */
+   { 35937, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
+   { 35975, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB */
+   { 36017, 0x00008092 }, /* GL_TEXTURE_COORD_ARRAY_POINTER */
+   { 36048, 0x00008088 }, /* GL_TEXTURE_COORD_ARRAY_SIZE */
+   { 36076, 0x0000808A }, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
+   { 36106, 0x00008089 }, /* GL_TEXTURE_COORD_ARRAY_TYPE */
+   { 36134, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP */
+   { 36154, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_ARB */
+   { 36178, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
+   { 36209, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB */
+   { 36244, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
+   { 36275, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB */
+   { 36310, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
+   { 36341, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB */
+   { 36376, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
+   { 36407, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB */
+   { 36442, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
+   { 36473, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB */
+   { 36508, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
+   { 36539, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB */
+   { 36574, 0x000088F4 }, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
+   { 36603, 0x00008071 }, /* GL_TEXTURE_DEPTH */
+   { 36620, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE */
+   { 36642, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE_ARB */
+   { 36668, 0x00002300 }, /* GL_TEXTURE_ENV */
+   { 36683, 0x00002201 }, /* GL_TEXTURE_ENV_COLOR */
+   { 36704, 0x00002200 }, /* GL_TEXTURE_ENV_MODE */
+   { 36724, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL */
+   { 36750, 0x00002500 }, /* GL_TEXTURE_GEN_MODE */
+   { 36770, 0x00000C63 }, /* GL_TEXTURE_GEN_Q */
+   { 36787, 0x00000C62 }, /* GL_TEXTURE_GEN_R */
+   { 36804, 0x00000C60 }, /* GL_TEXTURE_GEN_S */
+   { 36821, 0x00000C61 }, /* GL_TEXTURE_GEN_T */
+   { 36838, 0x0000819D }, /* GL_TEXTURE_GEQUAL_R_SGIX */
+   { 36863, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE */
+   { 36885, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE_EXT */
+   { 36911, 0x00001001 }, /* GL_TEXTURE_HEIGHT */
+   { 36929, 0x000080ED }, /* GL_TEXTURE_INDEX_SIZE_EXT */
+   { 36955, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE */
+   { 36981, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE_EXT */
+   { 37011, 0x00001003 }, /* GL_TEXTURE_INTERNAL_FORMAT */
+   { 37038, 0x0000819C }, /* GL_TEXTURE_LEQUAL_R_SGIX */
+   { 37063, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS */
+   { 37083, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS_EXT */
+   { 37107, 0x00008190 }, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
+   { 37134, 0x0000818E }, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
+   { 37161, 0x0000818F }, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
+   { 37188, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE */
+   { 37214, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE_EXT */
+   { 37244, 0x00002800 }, /* GL_TEXTURE_MAG_FILTER */
+   { 37266, 0x00000BA8 }, /* GL_TEXTURE_MATRIX */
+   { 37284, 0x000084FE }, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
+   { 37314, 0x0000836B }, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
+   { 37342, 0x00008369 }, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
+   { 37370, 0x0000836A }, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
+   { 37398, 0x0000813D }, /* GL_TEXTURE_MAX_LEVEL */
+   { 37419, 0x0000813B }, /* GL_TEXTURE_MAX_LOD */
+   { 37438, 0x00002801 }, /* GL_TEXTURE_MIN_FILTER */
+   { 37460, 0x0000813A }, /* GL_TEXTURE_MIN_LOD */
+   { 37479, 0x00008066 }, /* GL_TEXTURE_PRIORITY */
+   { 37499, 0x000085B7 }, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
+   { 37529, 0x000085B8 }, /* GL_TEXTURE_RANGE_POINTER_APPLE */
+   { 37560, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_ARB */
+   { 37585, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_NV */
+   { 37609, 0x0000805C }, /* GL_TEXTURE_RED_SIZE */
+   { 37629, 0x0000805C }, /* GL_TEXTURE_RED_SIZE_EXT */
+   { 37653, 0x00008067 }, /* GL_TEXTURE_RESIDENT */
+   { 37673, 0x00000BA5 }, /* GL_TEXTURE_STACK_DEPTH */
+   { 37696, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE */
+   { 37720, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE_EXT */
+   { 37748, 0x000085BC }, /* GL_TEXTURE_STORAGE_HINT_APPLE */
+   { 37778, 0x00008065 }, /* GL_TEXTURE_TOO_LARGE_EXT */
+   { 37803, 0x0000888F }, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
+   { 37837, 0x00001000 }, /* GL_TEXTURE_WIDTH */
+   { 37854, 0x00008072 }, /* GL_TEXTURE_WRAP_R */
+   { 37872, 0x00002802 }, /* GL_TEXTURE_WRAP_S */
+   { 37890, 0x00002803 }, /* GL_TEXTURE_WRAP_T */
+   { 37908, 0x0000911B }, /* GL_TIMEOUT_EXPIRED */
+   { 37927, 0x000088BF }, /* GL_TIME_ELAPSED_EXT */
+   { 37947, 0x00008648 }, /* GL_TRACK_MATRIX_NV */
+   { 37966, 0x00008649 }, /* GL_TRACK_MATRIX_TRANSFORM_NV */
+   { 37995, 0x00001000 }, /* GL_TRANSFORM_BIT */
+   { 38012, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX */
+   { 38038, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX_ARB */
+   { 38068, 0x000088B7 }, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
+   { 38100, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
+   { 38130, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX_ARB */
+   { 38164, 0x0000862C }, /* GL_TRANSPOSE_NV */
+   { 38180, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX */
+   { 38211, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX_ARB */
+   { 38246, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX */
+   { 38274, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX_ARB */
+   { 38306, 0x00000004 }, /* GL_TRIANGLES */
+   { 38319, 0x00000006 }, /* GL_TRIANGLE_FAN */
+   { 38335, 0x00008615 }, /* GL_TRIANGLE_MESH_SUN */
+   { 38356, 0x00000005 }, /* GL_TRIANGLE_STRIP */
+   { 38374, 0x00000001 }, /* GL_TRUE */
+   { 38382, 0x00008A1C }, /* GL_UNDEFINED_APPLE */
+   { 38401, 0x00000CF5 }, /* GL_UNPACK_ALIGNMENT */
+   { 38421, 0x0000806E }, /* GL_UNPACK_IMAGE_HEIGHT */
+   { 38444, 0x00000CF1 }, /* GL_UNPACK_LSB_FIRST */
+   { 38464, 0x00000CF2 }, /* GL_UNPACK_ROW_LENGTH */
+   { 38485, 0x0000806D }, /* GL_UNPACK_SKIP_IMAGES */
+   { 38507, 0x00000CF4 }, /* GL_UNPACK_SKIP_PIXELS */
+   { 38529, 0x00000CF3 }, /* GL_UNPACK_SKIP_ROWS */
+   { 38549, 0x00000CF0 }, /* GL_UNPACK_SWAP_BYTES */
+   { 38570, 0x00009118 }, /* GL_UNSIGNALED */
+   { 38584, 0x00001401 }, /* GL_UNSIGNED_BYTE */
+   { 38601, 0x00008362 }, /* GL_UNSIGNED_BYTE_2_3_3_REV */
+   { 38628, 0x00008032 }, /* GL_UNSIGNED_BYTE_3_3_2 */
+   { 38651, 0x00001405 }, /* GL_UNSIGNED_INT */
+   { 38667, 0x00008036 }, /* GL_UNSIGNED_INT_10_10_10_2 */
+   { 38694, 0x000084FA }, /* GL_UNSIGNED_INT_24_8 */
+   { 38715, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_EXT */
+   { 38740, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_NV */
+   { 38764, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV */
+   { 38795, 0x00008035 }, /* GL_UNSIGNED_INT_8_8_8_8 */
+   { 38819, 0x00008367 }, /* GL_UNSIGNED_INT_8_8_8_8_REV */
+   { 38847, 0x00008C17 }, /* GL_UNSIGNED_NORMALIZED */
+   { 38870, 0x00001403 }, /* GL_UNSIGNED_SHORT */
+   { 38888, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
+   { 38918, 0x00008033 }, /* GL_UNSIGNED_SHORT_4_4_4_4 */
+   { 38944, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
+   { 38974, 0x00008034 }, /* GL_UNSIGNED_SHORT_5_5_5_1 */
+   { 39000, 0x00008363 }, /* GL_UNSIGNED_SHORT_5_6_5 */
+   { 39024, 0x00008364 }, /* GL_UNSIGNED_SHORT_5_6_5_REV */
+   { 39052, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_APPLE */
+   { 39080, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_MESA */
+   { 39107, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
+   { 39139, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_MESA */
+   { 39170, 0x00008CA2 }, /* GL_UPPER_LEFT */
+   { 39184, 0x00002A20 }, /* GL_V2F */
+   { 39191, 0x00002A21 }, /* GL_V3F */
+   { 39198, 0x00008B83 }, /* GL_VALIDATE_STATUS */
+   { 39217, 0x00001F00 }, /* GL_VENDOR */
+   { 39227, 0x00001F02 }, /* GL_VERSION */
+   { 39238, 0x00008074 }, /* GL_VERTEX_ARRAY */
+   { 39254, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING */
+   { 39278, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */
+   { 39308, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
+   { 39339, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
+   { 39374, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
+   { 39398, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
+   { 39419, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
+   { 39442, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
+   { 39463, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
+   { 39490, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
+   { 39518, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
+   { 39546, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
+   { 39574, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
+   { 39602, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
+   { 39630, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
+   { 39658, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
+   { 39685, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
+   { 39712, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
+   { 39739, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
+   { 39766, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
+   { 39793, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
+   { 39820, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
+   { 39847, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
+   { 39874, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
+   { 39901, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
+   { 39939, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
+   { 39981, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
+   { 40012, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
+   { 40047, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
+   { 40081, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
+   { 40119, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
+   { 40150, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
+   { 40185, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
+   { 40213, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
+   { 40245, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
+   { 40275, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
+   { 40309, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
+   { 40337, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
+   { 40369, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
+   { 40389, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
+   { 40411, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
+   { 40440, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
+   { 40461, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE */
+   { 40490, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
+   { 40523, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
+   { 40555, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE */
+   { 40582, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
+   { 40613, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
+   { 40643, 0x00008B31 }, /* GL_VERTEX_SHADER */
+   { 40660, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
+   { 40681, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
+   { 40708, 0x00000BA2 }, /* GL_VIEWPORT */
+   { 40720, 0x00000800 }, /* GL_VIEWPORT_BIT */
+   { 40736, 0x00008A1A }, /* GL_VOLATILE_APPLE */
+   { 40754, 0x0000911D }, /* GL_WAIT_FAILED */
+   { 40769, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
+   { 40789, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
+   { 40820, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
+   { 40855, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
+   { 40883, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
+   { 40908, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
+   { 40935, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
+   { 40960, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
+   { 40984, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
+   { 41003, 0x000088B9 }, /* GL_WRITE_ONLY */
+   { 41017, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
+   { 41035, 0x00001506 }, /* GL_XOR */
+   { 41042, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
+   { 41061, 0x00008757 }, /* GL_YCBCR_MESA */
+   { 41075, 0x00000000 }, /* GL_ZERO */
+   { 41083, 0x00000D16 }, /* GL_ZOOM_X */
+   { 41093, 0x00000D17 }, /* GL_ZOOM_Y */
 };
 
-static const unsigned reduced_enums[1351] =
+static const unsigned reduced_enums[1357] =
 {
-       479, /* GL_FALSE */
-       702, /* GL_LINES */
-       704, /* GL_LINE_LOOP */
-       711, /* GL_LINE_STRIP */
-      1770, /* GL_TRIANGLES */
-      1773, /* GL_TRIANGLE_STRIP */
-      1771, /* GL_TRIANGLE_FAN */
-      1286, /* GL_QUADS */
-      1290, /* GL_QUAD_STRIP */
-      1172, /* GL_POLYGON */
-      1184, /* GL_POLYGON_STIPPLE_BIT */
-      1133, /* GL_PIXEL_MODE_BIT */
-       689, /* GL_LIGHTING_BIT */
-       509, /* GL_FOG_BIT */
+       480, /* GL_FALSE */
+       703, /* GL_LINES */
+       705, /* GL_LINE_LOOP */
+       712, /* GL_LINE_STRIP */
+      1774, /* GL_TRIANGLES */
+      1777, /* GL_TRIANGLE_STRIP */
+      1775, /* GL_TRIANGLE_FAN */
+      1288, /* GL_QUADS */
+      1292, /* GL_QUAD_STRIP */
+      1173, /* GL_POLYGON */
+      1185, /* GL_POLYGON_STIPPLE_BIT */
+      1134, /* GL_PIXEL_MODE_BIT */
+       690, /* GL_LIGHTING_BIT */
+       510, /* GL_FOG_BIT */
          8, /* GL_ACCUM */
-       721, /* GL_LOAD */
-      1349, /* GL_RETURN */
-      1005, /* GL_MULT */
+       722, /* GL_LOAD */
+      1353, /* GL_RETURN */
+      1006, /* GL_MULT */
         23, /* GL_ADD */
-      1021, /* GL_NEVER */
-       679, /* GL_LESS */
-       469, /* GL_EQUAL */
-       678, /* GL_LEQUAL */
-       599, /* GL_GREATER */
-      1036, /* GL_NOTEQUAL */
-       598, /* GL_GEQUAL */
+      1022, /* GL_NEVER */
+       680, /* GL_LESS */
+       470, /* GL_EQUAL */
+       679, /* GL_LEQUAL */
+       600, /* GL_GREATER */
+      1037, /* GL_NOTEQUAL */
+       599, /* GL_GEQUAL */
         47, /* GL_ALWAYS */
-      1490, /* GL_SRC_COLOR */
-      1066, /* GL_ONE_MINUS_SRC_COLOR */
-      1488, /* GL_SRC_ALPHA */
-      1065, /* GL_ONE_MINUS_SRC_ALPHA */
-       448, /* GL_DST_ALPHA */
-      1063, /* GL_ONE_MINUS_DST_ALPHA */
-       449, /* GL_DST_COLOR */
-      1064, /* GL_ONE_MINUS_DST_COLOR */
-      1489, /* GL_SRC_ALPHA_SATURATE */
-       586, /* GL_FRONT_LEFT */
-       587, /* GL_FRONT_RIGHT */
+      1494, /* GL_SRC_COLOR */
+      1067, /* GL_ONE_MINUS_SRC_COLOR */
+      1492, /* GL_SRC_ALPHA */
+      1066, /* GL_ONE_MINUS_SRC_ALPHA */
+       449, /* GL_DST_ALPHA */
+      1064, /* GL_ONE_MINUS_DST_ALPHA */
+       450, /* GL_DST_COLOR */
+      1065, /* GL_ONE_MINUS_DST_COLOR */
+      1493, /* GL_SRC_ALPHA_SATURATE */
+       587, /* GL_FRONT_LEFT */
+       588, /* GL_FRONT_RIGHT */
         69, /* GL_BACK_LEFT */
         70, /* GL_BACK_RIGHT */
-       583, /* GL_FRONT */
+       584, /* GL_FRONT */
         68, /* GL_BACK */
-       677, /* GL_LEFT */
-      1391, /* GL_RIGHT */
-       584, /* GL_FRONT_AND_BACK */
+       678, /* GL_LEFT */
+      1395, /* GL_RIGHT */
+       585, /* GL_FRONT_AND_BACK */
         63, /* GL_AUX0 */
         64, /* GL_AUX1 */
         65, /* GL_AUX2 */
         66, /* GL_AUX3 */
-       666, /* GL_INVALID_ENUM */
-       670, /* GL_INVALID_VALUE */
-       669, /* GL_INVALID_OPERATION */
-      1495, /* GL_STACK_OVERFLOW */
-      1496, /* GL_STACK_UNDERFLOW */
-      1091, /* GL_OUT_OF_MEMORY */
-       667, /* GL_INVALID_FRAMEBUFFER_OPERATION */
+       667, /* GL_INVALID_ENUM */
+       671, /* GL_INVALID_VALUE */
+       670, /* GL_INVALID_OPERATION */
+      1499, /* GL_STACK_OVERFLOW */
+      1500, /* GL_STACK_UNDERFLOW */
+      1092, /* GL_OUT_OF_MEMORY */
+       668, /* GL_INVALID_FRAMEBUFFER_OPERATION */
          0, /* GL_2D */
          2, /* GL_3D */
          3, /* GL_3D_COLOR */
          4, /* GL_3D_COLOR_TEXTURE */
          6, /* GL_4D_COLOR_TEXTURE */
-      1111, /* GL_PASS_THROUGH_TOKEN */
-      1171, /* GL_POINT_TOKEN */
-       712, /* GL_LINE_TOKEN */
-      1185, /* GL_POLYGON_TOKEN */
+      1112, /* GL_PASS_THROUGH_TOKEN */
+      1172, /* GL_POINT_TOKEN */
+       713, /* GL_LINE_TOKEN */
+      1186, /* GL_POLYGON_TOKEN */
         74, /* GL_BITMAP_TOKEN */
-       447, /* GL_DRAW_PIXEL_TOKEN */
-       301, /* GL_COPY_PIXEL_TOKEN */
-       705, /* GL_LINE_RESET_TOKEN */
-       472, /* GL_EXP */
-       473, /* GL_EXP2 */
-       337, /* GL_CW */
-       125, /* GL_CCW */
-       146, /* GL_COEFF */
-      1088, /* GL_ORDER */
-       384, /* 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 */
-      1164, /* GL_POINT_SMOOTH */
-      1153, /* GL_POINT_SIZE */
-      1163, /* GL_POINT_SIZE_RANGE */
-      1154, /* GL_POINT_SIZE_GRANULARITY */
-       706, /* GL_LINE_SMOOTH */
-       713, /* GL_LINE_WIDTH */
-       715, /* GL_LINE_WIDTH_RANGE */
-       714, /* GL_LINE_WIDTH_GRANULARITY */
-       708, /* GL_LINE_STIPPLE */
-       709, /* GL_LINE_STIPPLE_PATTERN */
-       710, /* GL_LINE_STIPPLE_REPEAT */
-       720, /* GL_LIST_MODE */
-       886, /* GL_MAX_LIST_NESTING */
-       717, /* GL_LIST_BASE */
-       719, /* GL_LIST_INDEX */
-      1174, /* GL_POLYGON_MODE */
-      1181, /* GL_POLYGON_SMOOTH */
-      1183, /* GL_POLYGON_STIPPLE */
-       458, /* GL_EDGE_FLAG */
-       304, /* GL_CULL_FACE */
-       305, /* GL_CULL_FACE_MODE */
-       585, /* GL_FRONT_FACE */
-       688, /* GL_LIGHTING */
-       693, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
-       694, /* GL_LIGHT_MODEL_TWO_SIDE */
-       690, /* GL_LIGHT_MODEL_AMBIENT */
-      1437, /* GL_SHADE_MODEL */
-       193, /* GL_COLOR_MATERIAL_FACE */
-       194, /* GL_COLOR_MATERIAL_PARAMETER */
-       192, /* GL_COLOR_MATERIAL */
-       508, /* GL_FOG */
-       530, /* GL_FOG_INDEX */
-       526, /* GL_FOG_DENSITY */
-       534, /* GL_FOG_START */
-       528, /* GL_FOG_END */
-       531, /* GL_FOG_MODE */
-       510, /* GL_FOG_COLOR */
-       370, /* GL_DEPTH_RANGE */
-       378, /* GL_DEPTH_TEST */
-       381, /* GL_DEPTH_WRITEMASK */
-       358, /* GL_DEPTH_CLEAR_VALUE */
-       369, /* GL_DEPTH_FUNC */
+       448, /* GL_DRAW_PIXEL_TOKEN */
+       302, /* GL_COPY_PIXEL_TOKEN */
+       706, /* GL_LINE_RESET_TOKEN */
+       473, /* GL_EXP */
+       474, /* GL_EXP2 */
+       338, /* GL_CW */
+       126, /* GL_CCW */
+       147, /* GL_COEFF */
+      1089, /* GL_ORDER */
+       385, /* GL_DOMAIN */
+       312, /* GL_CURRENT_COLOR */
+       315, /* GL_CURRENT_INDEX */
+       321, /* GL_CURRENT_NORMAL */
+       334, /* GL_CURRENT_TEXTURE_COORDS */
+       326, /* GL_CURRENT_RASTER_COLOR */
+       328, /* GL_CURRENT_RASTER_INDEX */
+       332, /* GL_CURRENT_RASTER_TEXTURE_COORDS */
+       329, /* GL_CURRENT_RASTER_POSITION */
+       330, /* GL_CURRENT_RASTER_POSITION_VALID */
+       327, /* GL_CURRENT_RASTER_DISTANCE */
+      1165, /* GL_POINT_SMOOTH */
+      1154, /* GL_POINT_SIZE */
+      1164, /* GL_POINT_SIZE_RANGE */
+      1155, /* GL_POINT_SIZE_GRANULARITY */
+       707, /* GL_LINE_SMOOTH */
+       714, /* GL_LINE_WIDTH */
+       716, /* GL_LINE_WIDTH_RANGE */
+       715, /* GL_LINE_WIDTH_GRANULARITY */
+       709, /* GL_LINE_STIPPLE */
+       710, /* GL_LINE_STIPPLE_PATTERN */
+       711, /* GL_LINE_STIPPLE_REPEAT */
+       721, /* GL_LIST_MODE */
+       887, /* GL_MAX_LIST_NESTING */
+       718, /* GL_LIST_BASE */
+       720, /* GL_LIST_INDEX */
+      1175, /* GL_POLYGON_MODE */
+      1182, /* GL_POLYGON_SMOOTH */
+      1184, /* GL_POLYGON_STIPPLE */
+       459, /* GL_EDGE_FLAG */
+       305, /* GL_CULL_FACE */
+       306, /* GL_CULL_FACE_MODE */
+       586, /* GL_FRONT_FACE */
+       689, /* GL_LIGHTING */
+       694, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
+       695, /* GL_LIGHT_MODEL_TWO_SIDE */
+       691, /* GL_LIGHT_MODEL_AMBIENT */
+      1441, /* GL_SHADE_MODEL */
+       194, /* GL_COLOR_MATERIAL_FACE */
+       195, /* GL_COLOR_MATERIAL_PARAMETER */
+       193, /* GL_COLOR_MATERIAL */
+       509, /* GL_FOG */
+       531, /* GL_FOG_INDEX */
+       527, /* GL_FOG_DENSITY */
+       535, /* GL_FOG_START */
+       529, /* GL_FOG_END */
+       532, /* GL_FOG_MODE */
+       511, /* GL_FOG_COLOR */
+       371, /* GL_DEPTH_RANGE */
+       379, /* GL_DEPTH_TEST */
+       382, /* GL_DEPTH_WRITEMASK */
+       359, /* GL_DEPTH_CLEAR_VALUE */
+       370, /* GL_DEPTH_FUNC */
         12, /* GL_ACCUM_CLEAR_VALUE */
-      1535, /* GL_STENCIL_TEST */
-      1519, /* GL_STENCIL_CLEAR_VALUE */
-      1521, /* GL_STENCIL_FUNC */
-      1537, /* GL_STENCIL_VALUE_MASK */
-      1520, /* GL_STENCIL_FAIL */
-      1532, /* GL_STENCIL_PASS_DEPTH_FAIL */
-      1533, /* GL_STENCIL_PASS_DEPTH_PASS */
-      1534, /* GL_STENCIL_REF */
-      1538, /* GL_STENCIL_WRITEMASK */
-       854, /* GL_MATRIX_MODE */
-      1026, /* GL_NORMALIZE */
-      1865, /* GL_VIEWPORT */
-      1000, /* GL_MODELVIEW_STACK_DEPTH */
-      1264, /* GL_PROJECTION_STACK_DEPTH */
-      1745, /* GL_TEXTURE_STACK_DEPTH */
-       998, /* GL_MODELVIEW_MATRIX */
-      1263, /* GL_PROJECTION_MATRIX */
-      1728, /* GL_TEXTURE_MATRIX */
+      1539, /* GL_STENCIL_TEST */
+      1523, /* GL_STENCIL_CLEAR_VALUE */
+      1525, /* GL_STENCIL_FUNC */
+      1541, /* GL_STENCIL_VALUE_MASK */
+      1524, /* GL_STENCIL_FAIL */
+      1536, /* GL_STENCIL_PASS_DEPTH_FAIL */
+      1537, /* GL_STENCIL_PASS_DEPTH_PASS */
+      1538, /* GL_STENCIL_REF */
+      1542, /* GL_STENCIL_WRITEMASK */
+       855, /* GL_MATRIX_MODE */
+      1027, /* GL_NORMALIZE */
+      1870, /* GL_VIEWPORT */
+      1001, /* GL_MODELVIEW_STACK_DEPTH */
+      1265, /* GL_PROJECTION_STACK_DEPTH */
+      1749, /* GL_TEXTURE_STACK_DEPTH */
+       999, /* GL_MODELVIEW_MATRIX */
+      1264, /* GL_PROJECTION_MATRIX */
+      1732, /* GL_TEXTURE_MATRIX */
         61, /* GL_ATTRIB_STACK_DEPTH */
-       136, /* GL_CLIENT_ATTRIB_STACK_DEPTH */
+       137, /* GL_CLIENT_ATTRIB_STACK_DEPTH */
         43, /* GL_ALPHA_TEST */
         44, /* GL_ALPHA_TEST_FUNC */
         45, /* GL_ALPHA_TEST_REF */
-       383, /* GL_DITHER */
+       384, /* GL_DITHER */
         78, /* GL_BLEND_DST */
         87, /* GL_BLEND_SRC */
         75, /* GL_BLEND */
-       723, /* GL_LOGIC_OP_MODE */
-       640, /* GL_INDEX_LOGIC_OP */
-       191, /* GL_COLOR_LOGIC_OP */
+       724, /* GL_LOGIC_OP_MODE */
+       641, /* GL_INDEX_LOGIC_OP */
+       192, /* GL_COLOR_LOGIC_OP */
         67, /* GL_AUX_BUFFERS */
-       394, /* GL_DRAW_BUFFER */
-      1304, /* GL_READ_BUFFER */
-      1418, /* GL_SCISSOR_BOX */
-      1419, /* GL_SCISSOR_TEST */
-       639, /* GL_INDEX_CLEAR_VALUE */
-       644, /* GL_INDEX_WRITEMASK */
-       188, /* GL_COLOR_CLEAR_VALUE */
-       230, /* GL_COLOR_WRITEMASK */
-       641, /* GL_INDEX_MODE */
-      1384, /* GL_RGBA_MODE */
-       393, /* GL_DOUBLEBUFFER */
-      1539, /* GL_STEREO */
-      1342, /* GL_RENDER_MODE */
-      1112, /* GL_PERSPECTIVE_CORRECTION_HINT */
-      1165, /* GL_POINT_SMOOTH_HINT */
-       707, /* GL_LINE_SMOOTH_HINT */
-      1182, /* GL_POLYGON_SMOOTH_HINT */
-       529, /* GL_FOG_HINT */
-      1709, /* GL_TEXTURE_GEN_S */
-      1710, /* GL_TEXTURE_GEN_T */
-      1708, /* GL_TEXTURE_GEN_R */
-      1707, /* GL_TEXTURE_GEN_Q */
-      1125, /* GL_PIXEL_MAP_I_TO_I */
-      1131, /* GL_PIXEL_MAP_S_TO_S */
-      1127, /* GL_PIXEL_MAP_I_TO_R */
-      1123, /* GL_PIXEL_MAP_I_TO_G */
-      1121, /* GL_PIXEL_MAP_I_TO_B */
-      1119, /* GL_PIXEL_MAP_I_TO_A */
-      1129, /* GL_PIXEL_MAP_R_TO_R */
-      1117, /* GL_PIXEL_MAP_G_TO_G */
-      1115, /* GL_PIXEL_MAP_B_TO_B */
-      1113, /* GL_PIXEL_MAP_A_TO_A */
-      1126, /* GL_PIXEL_MAP_I_TO_I_SIZE */
-      1132, /* GL_PIXEL_MAP_S_TO_S_SIZE */
-      1128, /* GL_PIXEL_MAP_I_TO_R_SIZE */
-      1124, /* GL_PIXEL_MAP_I_TO_G_SIZE */
-      1122, /* GL_PIXEL_MAP_I_TO_B_SIZE */
-      1120, /* GL_PIXEL_MAP_I_TO_A_SIZE */
-      1130, /* GL_PIXEL_MAP_R_TO_R_SIZE */
-      1118, /* GL_PIXEL_MAP_G_TO_G_SIZE */
-      1116, /* GL_PIXEL_MAP_B_TO_B_SIZE */
-      1114, /* GL_PIXEL_MAP_A_TO_A_SIZE */
-      1782, /* GL_UNPACK_SWAP_BYTES */
-      1777, /* GL_UNPACK_LSB_FIRST */
-      1778, /* GL_UNPACK_ROW_LENGTH */
-      1781, /* GL_UNPACK_SKIP_ROWS */
-      1780, /* GL_UNPACK_SKIP_PIXELS */
-      1775, /* GL_UNPACK_ALIGNMENT */
-      1100, /* GL_PACK_SWAP_BYTES */
-      1095, /* GL_PACK_LSB_FIRST */
-      1096, /* GL_PACK_ROW_LENGTH */
-      1099, /* GL_PACK_SKIP_ROWS */
-      1098, /* GL_PACK_SKIP_PIXELS */
-      1092, /* GL_PACK_ALIGNMENT */
-       801, /* GL_MAP_COLOR */
-       806, /* GL_MAP_STENCIL */
-       643, /* GL_INDEX_SHIFT */
-       642, /* GL_INDEX_OFFSET */
-      1318, /* GL_RED_SCALE */
-      1316, /* GL_RED_BIAS */
-      1883, /* GL_ZOOM_X */
-      1884, /* GL_ZOOM_Y */
-       603, /* GL_GREEN_SCALE */
-       601, /* GL_GREEN_BIAS */
+       395, /* GL_DRAW_BUFFER */
+      1306, /* GL_READ_BUFFER */
+      1422, /* GL_SCISSOR_BOX */
+      1423, /* GL_SCISSOR_TEST */
+       640, /* GL_INDEX_CLEAR_VALUE */
+       645, /* GL_INDEX_WRITEMASK */
+       189, /* GL_COLOR_CLEAR_VALUE */
+       231, /* GL_COLOR_WRITEMASK */
+       642, /* GL_INDEX_MODE */
+      1388, /* GL_RGBA_MODE */
+       394, /* GL_DOUBLEBUFFER */
+      1543, /* GL_STEREO */
+      1345, /* GL_RENDER_MODE */
+      1113, /* GL_PERSPECTIVE_CORRECTION_HINT */
+      1166, /* GL_POINT_SMOOTH_HINT */
+       708, /* GL_LINE_SMOOTH_HINT */
+      1183, /* GL_POLYGON_SMOOTH_HINT */
+       530, /* GL_FOG_HINT */
+      1713, /* GL_TEXTURE_GEN_S */
+      1714, /* GL_TEXTURE_GEN_T */
+      1712, /* GL_TEXTURE_GEN_R */
+      1711, /* GL_TEXTURE_GEN_Q */
+      1126, /* GL_PIXEL_MAP_I_TO_I */
+      1132, /* GL_PIXEL_MAP_S_TO_S */
+      1128, /* GL_PIXEL_MAP_I_TO_R */
+      1124, /* GL_PIXEL_MAP_I_TO_G */
+      1122, /* GL_PIXEL_MAP_I_TO_B */
+      1120, /* GL_PIXEL_MAP_I_TO_A */
+      1130, /* GL_PIXEL_MAP_R_TO_R */
+      1118, /* GL_PIXEL_MAP_G_TO_G */
+      1116, /* GL_PIXEL_MAP_B_TO_B */
+      1114, /* GL_PIXEL_MAP_A_TO_A */
+      1127, /* GL_PIXEL_MAP_I_TO_I_SIZE */
+      1133, /* GL_PIXEL_MAP_S_TO_S_SIZE */
+      1129, /* GL_PIXEL_MAP_I_TO_R_SIZE */
+      1125, /* GL_PIXEL_MAP_I_TO_G_SIZE */
+      1123, /* GL_PIXEL_MAP_I_TO_B_SIZE */
+      1121, /* GL_PIXEL_MAP_I_TO_A_SIZE */
+      1131, /* GL_PIXEL_MAP_R_TO_R_SIZE */
+      1119, /* GL_PIXEL_MAP_G_TO_G_SIZE */
+      1117, /* GL_PIXEL_MAP_B_TO_B_SIZE */
+      1115, /* GL_PIXEL_MAP_A_TO_A_SIZE */
+      1787, /* GL_UNPACK_SWAP_BYTES */
+      1782, /* GL_UNPACK_LSB_FIRST */
+      1783, /* GL_UNPACK_ROW_LENGTH */
+      1786, /* GL_UNPACK_SKIP_ROWS */
+      1785, /* GL_UNPACK_SKIP_PIXELS */
+      1780, /* GL_UNPACK_ALIGNMENT */
+      1101, /* GL_PACK_SWAP_BYTES */
+      1096, /* GL_PACK_LSB_FIRST */
+      1097, /* GL_PACK_ROW_LENGTH */
+      1100, /* GL_PACK_SKIP_ROWS */
+      1099, /* GL_PACK_SKIP_PIXELS */
+      1093, /* GL_PACK_ALIGNMENT */
+       802, /* GL_MAP_COLOR */
+       807, /* GL_MAP_STENCIL */
+       644, /* GL_INDEX_SHIFT */
+       643, /* GL_INDEX_OFFSET */
+      1320, /* GL_RED_SCALE */
+      1318, /* GL_RED_BIAS */
+      1889, /* GL_ZOOM_X */
+      1890, /* GL_ZOOM_Y */
+       604, /* GL_GREEN_SCALE */
+       602, /* GL_GREEN_BIAS */
         93, /* GL_BLUE_SCALE */
         91, /* GL_BLUE_BIAS */
         42, /* GL_ALPHA_SCALE */
         40, /* GL_ALPHA_BIAS */
-       371, /* GL_DEPTH_SCALE */
-       351, /* GL_DEPTH_BIAS */
-       881, /* GL_MAX_EVAL_ORDER */
-       885, /* GL_MAX_LIGHTS */
-       863, /* GL_MAX_CLIP_PLANES */
-       933, /* GL_MAX_TEXTURE_SIZE */
-       891, /* GL_MAX_PIXEL_MAP_TABLE */
-       859, /* GL_MAX_ATTRIB_STACK_DEPTH */
-       888, /* GL_MAX_MODELVIEW_STACK_DEPTH */
-       889, /* GL_MAX_NAME_STACK_DEPTH */
-       917, /* GL_MAX_PROJECTION_STACK_DEPTH */
-       934, /* GL_MAX_TEXTURE_STACK_DEPTH */
-       948, /* GL_MAX_VIEWPORT_DIMS */
-       860, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
-      1549, /* GL_SUBPIXEL_BITS */
-       638, /* GL_INDEX_BITS */
-      1317, /* GL_RED_BITS */
-       602, /* GL_GREEN_BITS */
+       372, /* GL_DEPTH_SCALE */
+       352, /* GL_DEPTH_BIAS */
+       882, /* GL_MAX_EVAL_ORDER */
+       886, /* GL_MAX_LIGHTS */
+       864, /* GL_MAX_CLIP_PLANES */
+       934, /* GL_MAX_TEXTURE_SIZE */
+       892, /* GL_MAX_PIXEL_MAP_TABLE */
+       860, /* GL_MAX_ATTRIB_STACK_DEPTH */
+       889, /* GL_MAX_MODELVIEW_STACK_DEPTH */
+       890, /* GL_MAX_NAME_STACK_DEPTH */
+       918, /* GL_MAX_PROJECTION_STACK_DEPTH */
+       935, /* GL_MAX_TEXTURE_STACK_DEPTH */
+       949, /* GL_MAX_VIEWPORT_DIMS */
+       861, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
+      1553, /* GL_SUBPIXEL_BITS */
+       639, /* GL_INDEX_BITS */
+      1319, /* GL_RED_BITS */
+       603, /* GL_GREEN_BITS */
         92, /* GL_BLUE_BITS */
         41, /* GL_ALPHA_BITS */
-       352, /* GL_DEPTH_BITS */
-      1517, /* GL_STENCIL_BITS */
+       353, /* GL_DEPTH_BITS */
+      1521, /* GL_STENCIL_BITS */
         14, /* GL_ACCUM_RED_BITS */
         13, /* GL_ACCUM_GREEN_BITS */
         10, /* GL_ACCUM_BLUE_BITS */
          9, /* GL_ACCUM_ALPHA_BITS */
-      1014, /* GL_NAME_STACK_DEPTH */
+      1015, /* GL_NAME_STACK_DEPTH */
         62, /* GL_AUTO_NORMAL */
-       747, /* GL_MAP1_COLOR_4 */
-       750, /* GL_MAP1_INDEX */
-       751, /* GL_MAP1_NORMAL */
-       752, /* GL_MAP1_TEXTURE_COORD_1 */
-       753, /* GL_MAP1_TEXTURE_COORD_2 */
-       754, /* GL_MAP1_TEXTURE_COORD_3 */
-       755, /* GL_MAP1_TEXTURE_COORD_4 */
-       756, /* GL_MAP1_VERTEX_3 */
-       757, /* GL_MAP1_VERTEX_4 */
-       774, /* GL_MAP2_COLOR_4 */
-       777, /* GL_MAP2_INDEX */
-       778, /* GL_MAP2_NORMAL */
-       779, /* GL_MAP2_TEXTURE_COORD_1 */
-       780, /* GL_MAP2_TEXTURE_COORD_2 */
-       781, /* GL_MAP2_TEXTURE_COORD_3 */
-       782, /* GL_MAP2_TEXTURE_COORD_4 */
-       783, /* GL_MAP2_VERTEX_3 */
-       784, /* GL_MAP2_VERTEX_4 */
-       748, /* GL_MAP1_GRID_DOMAIN */
-       749, /* GL_MAP1_GRID_SEGMENTS */
-       775, /* GL_MAP2_GRID_DOMAIN */
-       776, /* GL_MAP2_GRID_SEGMENTS */
-      1632, /* GL_TEXTURE_1D */
-      1634, /* GL_TEXTURE_2D */
-       482, /* GL_FEEDBACK_BUFFER_POINTER */
-       483, /* GL_FEEDBACK_BUFFER_SIZE */
-       484, /* GL_FEEDBACK_BUFFER_TYPE */
-      1428, /* GL_SELECTION_BUFFER_POINTER */
-      1429, /* GL_SELECTION_BUFFER_SIZE */
-      1751, /* GL_TEXTURE_WIDTH */
-      1714, /* GL_TEXTURE_HEIGHT */
-      1669, /* GL_TEXTURE_COMPONENTS */
-      1653, /* GL_TEXTURE_BORDER_COLOR */
-      1652, /* GL_TEXTURE_BORDER */
-       385, /* GL_DONT_CARE */
-       480, /* GL_FASTEST */
-      1022, /* GL_NICEST */
+       748, /* GL_MAP1_COLOR_4 */
+       751, /* GL_MAP1_INDEX */
+       752, /* GL_MAP1_NORMAL */
+       753, /* GL_MAP1_TEXTURE_COORD_1 */
+       754, /* GL_MAP1_TEXTURE_COORD_2 */
+       755, /* GL_MAP1_TEXTURE_COORD_3 */
+       756, /* GL_MAP1_TEXTURE_COORD_4 */
+       757, /* GL_MAP1_VERTEX_3 */
+       758, /* GL_MAP1_VERTEX_4 */
+       775, /* GL_MAP2_COLOR_4 */
+       778, /* GL_MAP2_INDEX */
+       779, /* GL_MAP2_NORMAL */
+       780, /* GL_MAP2_TEXTURE_COORD_1 */
+       781, /* GL_MAP2_TEXTURE_COORD_2 */
+       782, /* GL_MAP2_TEXTURE_COORD_3 */
+       783, /* GL_MAP2_TEXTURE_COORD_4 */
+       784, /* GL_MAP2_VERTEX_3 */
+       785, /* GL_MAP2_VERTEX_4 */
+       749, /* GL_MAP1_GRID_DOMAIN */
+       750, /* GL_MAP1_GRID_SEGMENTS */
+       776, /* GL_MAP2_GRID_DOMAIN */
+       777, /* GL_MAP2_GRID_SEGMENTS */
+      1636, /* GL_TEXTURE_1D */
+      1638, /* GL_TEXTURE_2D */
+       483, /* GL_FEEDBACK_BUFFER_POINTER */
+       484, /* GL_FEEDBACK_BUFFER_SIZE */
+       485, /* GL_FEEDBACK_BUFFER_TYPE */
+      1432, /* GL_SELECTION_BUFFER_POINTER */
+      1433, /* GL_SELECTION_BUFFER_SIZE */
+      1755, /* GL_TEXTURE_WIDTH */
+      1718, /* GL_TEXTURE_HEIGHT */
+      1673, /* GL_TEXTURE_COMPONENTS */
+      1657, /* GL_TEXTURE_BORDER_COLOR */
+      1656, /* GL_TEXTURE_BORDER */
+       386, /* GL_DONT_CARE */
+       481, /* GL_FASTEST */
+      1023, /* GL_NICEST */
         48, /* GL_AMBIENT */
-       382, /* GL_DIFFUSE */
-      1477, /* GL_SPECULAR */
-      1186, /* GL_POSITION */
-      1480, /* GL_SPOT_DIRECTION */
-      1481, /* GL_SPOT_EXPONENT */
-      1479, /* GL_SPOT_CUTOFF */
-       275, /* GL_CONSTANT_ATTENUATION */
-       697, /* GL_LINEAR_ATTENUATION */
-      1285, /* GL_QUADRATIC_ATTENUATION */
-       244, /* GL_COMPILE */
-       245, /* GL_COMPILE_AND_EXECUTE */
-       120, /* GL_BYTE */
-      1784, /* GL_UNSIGNED_BYTE */
-      1442, /* GL_SHORT */
-      1796, /* GL_UNSIGNED_SHORT */
-       646, /* GL_INT */
-      1787, /* GL_UNSIGNED_INT */
-       489, /* GL_FLOAT */
+       383, /* GL_DIFFUSE */
+      1481, /* GL_SPECULAR */
+      1187, /* GL_POSITION */
+      1484, /* GL_SPOT_DIRECTION */
+      1485, /* GL_SPOT_EXPONENT */
+      1483, /* GL_SPOT_CUTOFF */
+       276, /* GL_CONSTANT_ATTENUATION */
+       698, /* GL_LINEAR_ATTENUATION */
+      1287, /* GL_QUADRATIC_ATTENUATION */
+       245, /* GL_COMPILE */
+       246, /* GL_COMPILE_AND_EXECUTE */
+       121, /* GL_BYTE */
+      1789, /* GL_UNSIGNED_BYTE */
+      1446, /* GL_SHORT */
+      1801, /* GL_UNSIGNED_SHORT */
+       647, /* GL_INT */
+      1792, /* GL_UNSIGNED_INT */
+       490, /* GL_FLOAT */
          1, /* GL_2_BYTES */
          5, /* GL_3_BYTES */
          7, /* GL_4_BYTES */
-       392, /* GL_DOUBLE */
-       604, /* GL_HALF_FLOAT */
-       132, /* GL_CLEAR */
+       393, /* GL_DOUBLE */
+       605, /* GL_HALF_FLOAT */
+       133, /* GL_CLEAR */
         50, /* GL_AND */
         52, /* GL_AND_REVERSE */
-       299, /* GL_COPY */
+       300, /* GL_COPY */
         51, /* GL_AND_INVERTED */
-      1024, /* GL_NOOP */
-      1879, /* GL_XOR */
-      1087, /* GL_OR */
-      1025, /* GL_NOR */
-       470, /* GL_EQUIV */
-       673, /* GL_INVERT */
-      1090, /* GL_OR_REVERSE */
-       300, /* GL_COPY_INVERTED */
-      1089, /* GL_OR_INVERTED */
-      1015, /* GL_NAND */
-      1433, /* GL_SET */
-       467, /* GL_EMISSION */
-      1441, /* GL_SHININESS */
+      1025, /* GL_NOOP */
+      1885, /* GL_XOR */
+      1088, /* GL_OR */
+      1026, /* GL_NOR */
+       471, /* GL_EQUIV */
+       674, /* GL_INVERT */
+      1091, /* GL_OR_REVERSE */
+       301, /* GL_COPY_INVERTED */
+      1090, /* GL_OR_INVERTED */
+      1016, /* GL_NAND */
+      1437, /* GL_SET */
+       468, /* GL_EMISSION */
+      1445, /* GL_SHININESS */
         49, /* GL_AMBIENT_AND_DIFFUSE */
-       190, /* GL_COLOR_INDEXES */
-       965, /* GL_MODELVIEW */
-      1262, /* GL_PROJECTION */
-      1567, /* GL_TEXTURE */
-       147, /* GL_COLOR */
-       346, /* GL_DEPTH */
-      1503, /* GL_STENCIL */
-       189, /* GL_COLOR_INDEX */
-      1522, /* GL_STENCIL_INDEX */
-       359, /* GL_DEPTH_COMPONENT */
-      1313, /* GL_RED */
-       600, /* GL_GREEN */
+       191, /* GL_COLOR_INDEXES */
+       966, /* GL_MODELVIEW */
+      1263, /* GL_PROJECTION */
+      1571, /* GL_TEXTURE */
+       148, /* GL_COLOR */
+       347, /* GL_DEPTH */
+      1507, /* GL_STENCIL */
+       190, /* GL_COLOR_INDEX */
+      1526, /* GL_STENCIL_INDEX */
+       360, /* GL_DEPTH_COMPONENT */
+      1315, /* GL_RED */
+       601, /* GL_GREEN */
         90, /* GL_BLUE */
         31, /* GL_ALPHA */
-      1350, /* GL_RGB */
-      1369, /* GL_RGBA */
-       725, /* GL_LUMINANCE */
-       746, /* GL_LUMINANCE_ALPHA */
+      1354, /* GL_RGB */
+      1373, /* GL_RGBA */
+       726, /* GL_LUMINANCE */
+       747, /* GL_LUMINANCE_ALPHA */
         73, /* GL_BITMAP */
-      1142, /* GL_POINT */
-       695, /* GL_LINE */
-       485, /* GL_FILL */
-      1322, /* GL_RENDER */
-       481, /* GL_FEEDBACK */
-      1427, /* GL_SELECT */
-       488, /* GL_FLAT */
-      1452, /* GL_SMOOTH */
-       674, /* GL_KEEP */
-      1344, /* GL_REPLACE */
-       628, /* GL_INCR */
-       342, /* GL_DECR */
-      1811, /* GL_VENDOR */
-      1341, /* GL_RENDERER */
-      1812, /* GL_VERSION */
-       474, /* GL_EXTENSIONS */
-      1392, /* GL_S */
-      1558, /* GL_T */
-      1301, /* GL_R */
-      1284, /* GL_Q */
-      1001, /* GL_MODULATE */
-       341, /* GL_DECAL */
-      1704, /* GL_TEXTURE_ENV_MODE */
-      1703, /* GL_TEXTURE_ENV_COLOR */
-      1702, /* GL_TEXTURE_ENV */
-       475, /* GL_EYE_LINEAR */
-      1048, /* GL_OBJECT_LINEAR */
-      1478, /* GL_SPHERE_MAP */
-      1706, /* GL_TEXTURE_GEN_MODE */
-      1050, /* GL_OBJECT_PLANE */
-       476, /* GL_EYE_PLANE */
-      1016, /* GL_NEAREST */
-       696, /* GL_LINEAR */
-      1020, /* GL_NEAREST_MIPMAP_NEAREST */
-       701, /* GL_LINEAR_MIPMAP_NEAREST */
-      1019, /* GL_NEAREST_MIPMAP_LINEAR */
-       700, /* GL_LINEAR_MIPMAP_LINEAR */
-      1727, /* GL_TEXTURE_MAG_FILTER */
-      1735, /* GL_TEXTURE_MIN_FILTER */
-      1753, /* GL_TEXTURE_WRAP_S */
-      1754, /* GL_TEXTURE_WRAP_T */
-       126, /* GL_CLAMP */
-      1343, /* GL_REPEAT */
-      1180, /* GL_POLYGON_OFFSET_UNITS */
-      1179, /* GL_POLYGON_OFFSET_POINT */
-      1178, /* GL_POLYGON_OFFSET_LINE */
-      1302, /* GL_R3_G3_B2 */
-      1808, /* GL_V2F */
-      1809, /* GL_V3F */
-       123, /* GL_C4UB_V2F */
-       124, /* GL_C4UB_V3F */
-       121, /* GL_C3F_V3F */
-      1013, /* GL_N3F_V3F */
-       122, /* GL_C4F_N3F_V3F */
-      1563, /* GL_T2F_V3F */
-      1565, /* GL_T4F_V4F */
-      1561, /* GL_T2F_C4UB_V3F */
-      1559, /* GL_T2F_C3F_V3F */
-      1562, /* GL_T2F_N3F_V3F */
-      1560, /* GL_T2F_C4F_N3F_V3F */
-      1564, /* 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 */
-       680, /* GL_LIGHT0 */
-       681, /* GL_LIGHT1 */
-       682, /* GL_LIGHT2 */
-       683, /* GL_LIGHT3 */
-       684, /* GL_LIGHT4 */
-       685, /* GL_LIGHT5 */
-       686, /* GL_LIGHT6 */
-       687, /* GL_LIGHT7 */
-       605, /* GL_HINT_BIT */
-       277, /* GL_CONSTANT_COLOR */
-      1061, /* GL_ONE_MINUS_CONSTANT_COLOR */
-       272, /* GL_CONSTANT_ALPHA */
-      1059, /* GL_ONE_MINUS_CONSTANT_ALPHA */
+      1143, /* GL_POINT */
+       696, /* GL_LINE */
+       486, /* GL_FILL */
+      1325, /* GL_RENDER */
+       482, /* GL_FEEDBACK */
+      1431, /* GL_SELECT */
+       489, /* GL_FLAT */
+      1456, /* GL_SMOOTH */
+       675, /* GL_KEEP */
+      1347, /* GL_REPLACE */
+       629, /* GL_INCR */
+       343, /* GL_DECR */
+      1816, /* GL_VENDOR */
+      1344, /* GL_RENDERER */
+      1817, /* GL_VERSION */
+       475, /* GL_EXTENSIONS */
+      1396, /* GL_S */
+      1562, /* GL_T */
+      1303, /* GL_R */
+      1286, /* GL_Q */
+      1002, /* GL_MODULATE */
+       342, /* GL_DECAL */
+      1708, /* GL_TEXTURE_ENV_MODE */
+      1707, /* GL_TEXTURE_ENV_COLOR */
+      1706, /* GL_TEXTURE_ENV */
+       476, /* GL_EYE_LINEAR */
+      1049, /* GL_OBJECT_LINEAR */
+      1482, /* GL_SPHERE_MAP */
+      1710, /* GL_TEXTURE_GEN_MODE */
+      1051, /* GL_OBJECT_PLANE */
+       477, /* GL_EYE_PLANE */
+      1017, /* GL_NEAREST */
+       697, /* GL_LINEAR */
+      1021, /* GL_NEAREST_MIPMAP_NEAREST */
+       702, /* GL_LINEAR_MIPMAP_NEAREST */
+      1020, /* GL_NEAREST_MIPMAP_LINEAR */
+       701, /* GL_LINEAR_MIPMAP_LINEAR */
+      1731, /* GL_TEXTURE_MAG_FILTER */
+      1739, /* GL_TEXTURE_MIN_FILTER */
+      1757, /* GL_TEXTURE_WRAP_S */
+      1758, /* GL_TEXTURE_WRAP_T */
+       127, /* GL_CLAMP */
+      1346, /* GL_REPEAT */
+      1181, /* GL_POLYGON_OFFSET_UNITS */
+      1180, /* GL_POLYGON_OFFSET_POINT */
+      1179, /* GL_POLYGON_OFFSET_LINE */
+      1304, /* GL_R3_G3_B2 */
+      1813, /* GL_V2F */
+      1814, /* GL_V3F */
+       124, /* GL_C4UB_V2F */
+       125, /* GL_C4UB_V3F */
+       122, /* GL_C3F_V3F */
+      1014, /* GL_N3F_V3F */
+       123, /* GL_C4F_N3F_V3F */
+      1567, /* GL_T2F_V3F */
+      1569, /* GL_T4F_V4F */
+      1565, /* GL_T2F_C4UB_V3F */
+      1563, /* GL_T2F_C3F_V3F */
+      1566, /* GL_T2F_N3F_V3F */
+      1564, /* GL_T2F_C4F_N3F_V3F */
+      1568, /* GL_T4F_C4F_N3F_V4F */
+       140, /* GL_CLIP_PLANE0 */
+       141, /* GL_CLIP_PLANE1 */
+       142, /* GL_CLIP_PLANE2 */
+       143, /* GL_CLIP_PLANE3 */
+       144, /* GL_CLIP_PLANE4 */
+       145, /* GL_CLIP_PLANE5 */
+       681, /* GL_LIGHT0 */
+       682, /* GL_LIGHT1 */
+       683, /* GL_LIGHT2 */
+       684, /* GL_LIGHT3 */
+       685, /* GL_LIGHT4 */
+       686, /* GL_LIGHT5 */
+       687, /* GL_LIGHT6 */
+       688, /* GL_LIGHT7 */
+       606, /* GL_HINT_BIT */
+       278, /* GL_CONSTANT_COLOR */
+      1062, /* GL_ONE_MINUS_CONSTANT_COLOR */
+       273, /* GL_CONSTANT_ALPHA */
+      1060, /* GL_ONE_MINUS_CONSTANT_ALPHA */
         76, /* GL_BLEND_COLOR */
-       588, /* GL_FUNC_ADD */
-       949, /* GL_MIN */
-       856, /* GL_MAX */
+       589, /* GL_FUNC_ADD */
+       950, /* GL_MIN */
+       857, /* GL_MAX */
         81, /* GL_BLEND_EQUATION */
-       592, /* GL_FUNC_SUBTRACT */
-       590, /* GL_FUNC_REVERSE_SUBTRACT */
-       280, /* GL_CONVOLUTION_1D */
-       281, /* GL_CONVOLUTION_2D */
-      1430, /* GL_SEPARABLE_2D */
-       284, /* GL_CONVOLUTION_BORDER_MODE */
-       288, /* GL_CONVOLUTION_FILTER_SCALE */
-       286, /* GL_CONVOLUTION_FILTER_BIAS */
-      1314, /* GL_REDUCE */
-       290, /* GL_CONVOLUTION_FORMAT */
-       294, /* GL_CONVOLUTION_WIDTH */
-       292, /* GL_CONVOLUTION_HEIGHT */
-       872, /* GL_MAX_CONVOLUTION_WIDTH */
-       870, /* GL_MAX_CONVOLUTION_HEIGHT */
-      1219, /* GL_POST_CONVOLUTION_RED_SCALE */
-      1215, /* GL_POST_CONVOLUTION_GREEN_SCALE */
-      1210, /* GL_POST_CONVOLUTION_BLUE_SCALE */
-      1206, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
-      1217, /* GL_POST_CONVOLUTION_RED_BIAS */
-      1213, /* GL_POST_CONVOLUTION_GREEN_BIAS */
-      1208, /* GL_POST_CONVOLUTION_BLUE_BIAS */
-      1204, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
-       606, /* GL_HISTOGRAM */
-      1268, /* GL_PROXY_HISTOGRAM */
-       622, /* GL_HISTOGRAM_WIDTH */
-       612, /* GL_HISTOGRAM_FORMAT */
-       618, /* GL_HISTOGRAM_RED_SIZE */
-       614, /* GL_HISTOGRAM_GREEN_SIZE */
-       609, /* GL_HISTOGRAM_BLUE_SIZE */
-       607, /* GL_HISTOGRAM_ALPHA_SIZE */
-       616, /* GL_HISTOGRAM_LUMINANCE_SIZE */
-       620, /* GL_HISTOGRAM_SINK */
-       950, /* GL_MINMAX */
-       952, /* GL_MINMAX_FORMAT */
-       954, /* GL_MINMAX_SINK */
-      1566, /* GL_TABLE_TOO_LARGE_EXT */
-      1786, /* GL_UNSIGNED_BYTE_3_3_2 */
-      1798, /* GL_UNSIGNED_SHORT_4_4_4_4 */
-      1800, /* GL_UNSIGNED_SHORT_5_5_5_1 */
-      1793, /* GL_UNSIGNED_INT_8_8_8_8 */
-      1788, /* GL_UNSIGNED_INT_10_10_10_2 */
-      1177, /* GL_POLYGON_OFFSET_FILL */
-      1176, /* GL_POLYGON_OFFSET_FACTOR */
-      1175, /* GL_POLYGON_OFFSET_BIAS */
-      1347, /* GL_RESCALE_NORMAL */
+       593, /* GL_FUNC_SUBTRACT */
+       591, /* GL_FUNC_REVERSE_SUBTRACT */
+       281, /* GL_CONVOLUTION_1D */
+       282, /* GL_CONVOLUTION_2D */
+      1434, /* GL_SEPARABLE_2D */
+       285, /* GL_CONVOLUTION_BORDER_MODE */
+       289, /* GL_CONVOLUTION_FILTER_SCALE */
+       287, /* GL_CONVOLUTION_FILTER_BIAS */
+      1316, /* GL_REDUCE */
+       291, /* GL_CONVOLUTION_FORMAT */
+       295, /* GL_CONVOLUTION_WIDTH */
+       293, /* GL_CONVOLUTION_HEIGHT */
+       873, /* GL_MAX_CONVOLUTION_WIDTH */
+       871, /* GL_MAX_CONVOLUTION_HEIGHT */
+      1220, /* GL_POST_CONVOLUTION_RED_SCALE */
+      1216, /* GL_POST_CONVOLUTION_GREEN_SCALE */
+      1211, /* GL_POST_CONVOLUTION_BLUE_SCALE */
+      1207, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
+      1218, /* GL_POST_CONVOLUTION_RED_BIAS */
+      1214, /* GL_POST_CONVOLUTION_GREEN_BIAS */
+      1209, /* GL_POST_CONVOLUTION_BLUE_BIAS */
+      1205, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
+       607, /* GL_HISTOGRAM */
+      1269, /* GL_PROXY_HISTOGRAM */
+       623, /* GL_HISTOGRAM_WIDTH */
+       613, /* GL_HISTOGRAM_FORMAT */
+       619, /* GL_HISTOGRAM_RED_SIZE */
+       615, /* GL_HISTOGRAM_GREEN_SIZE */
+       610, /* GL_HISTOGRAM_BLUE_SIZE */
+       608, /* GL_HISTOGRAM_ALPHA_SIZE */
+       617, /* GL_HISTOGRAM_LUMINANCE_SIZE */
+       621, /* GL_HISTOGRAM_SINK */
+       951, /* GL_MINMAX */
+       953, /* GL_MINMAX_FORMAT */
+       955, /* GL_MINMAX_SINK */
+      1570, /* GL_TABLE_TOO_LARGE_EXT */
+      1791, /* GL_UNSIGNED_BYTE_3_3_2 */
+      1803, /* GL_UNSIGNED_SHORT_4_4_4_4 */
+      1805, /* GL_UNSIGNED_SHORT_5_5_5_1 */
+      1798, /* GL_UNSIGNED_INT_8_8_8_8 */
+      1793, /* GL_UNSIGNED_INT_10_10_10_2 */
+      1178, /* GL_POLYGON_OFFSET_FILL */
+      1177, /* GL_POLYGON_OFFSET_FACTOR */
+      1176, /* GL_POLYGON_OFFSET_BIAS */
+      1350, /* GL_RESCALE_NORMAL */
         36, /* GL_ALPHA4 */
         38, /* GL_ALPHA8 */
         32, /* GL_ALPHA12 */
         34, /* GL_ALPHA16 */
-       736, /* GL_LUMINANCE4 */
-       742, /* GL_LUMINANCE8 */
-       726, /* GL_LUMINANCE12 */
-       732, /* GL_LUMINANCE16 */
-       737, /* GL_LUMINANCE4_ALPHA4 */
-       740, /* GL_LUMINANCE6_ALPHA2 */
-       743, /* GL_LUMINANCE8_ALPHA8 */
-       729, /* GL_LUMINANCE12_ALPHA4 */
-       727, /* GL_LUMINANCE12_ALPHA12 */
-       733, /* GL_LUMINANCE16_ALPHA16 */
-       647, /* GL_INTENSITY */
-       652, /* GL_INTENSITY4 */
-       654, /* GL_INTENSITY8 */
-       648, /* GL_INTENSITY12 */
-       650, /* GL_INTENSITY16 */
-      1359, /* GL_RGB2_EXT */
-      1360, /* GL_RGB4 */
-      1363, /* GL_RGB5 */
-      1367, /* GL_RGB8 */
-      1351, /* GL_RGB10 */
-      1355, /* GL_RGB12 */
-      1357, /* GL_RGB16 */
-      1374, /* GL_RGBA2 */
-      1376, /* GL_RGBA4 */
-      1364, /* GL_RGB5_A1 */
-      1380, /* GL_RGBA8 */
-      1352, /* GL_RGB10_A2 */
-      1370, /* GL_RGBA12 */
-      1372, /* GL_RGBA16 */
-      1742, /* GL_TEXTURE_RED_SIZE */
-      1712, /* GL_TEXTURE_GREEN_SIZE */
-      1650, /* GL_TEXTURE_BLUE_SIZE */
-      1637, /* GL_TEXTURE_ALPHA_SIZE */
-      1725, /* GL_TEXTURE_LUMINANCE_SIZE */
-      1716, /* GL_TEXTURE_INTENSITY_SIZE */
-      1345, /* GL_REPLACE_EXT */
-      1272, /* GL_PROXY_TEXTURE_1D */
-      1275, /* GL_PROXY_TEXTURE_2D */
-      1749, /* GL_TEXTURE_TOO_LARGE_EXT */
-      1737, /* GL_TEXTURE_PRIORITY */
-      1744, /* GL_TEXTURE_RESIDENT */
-      1640, /* GL_TEXTURE_BINDING_1D */
-      1642, /* GL_TEXTURE_BINDING_2D */
-      1644, /* GL_TEXTURE_BINDING_3D */
-      1097, /* GL_PACK_SKIP_IMAGES */
-      1093, /* GL_PACK_IMAGE_HEIGHT */
-      1779, /* GL_UNPACK_SKIP_IMAGES */
-      1776, /* GL_UNPACK_IMAGE_HEIGHT */
-      1636, /* GL_TEXTURE_3D */
-      1278, /* GL_PROXY_TEXTURE_3D */
-      1699, /* GL_TEXTURE_DEPTH */
-      1752, /* GL_TEXTURE_WRAP_R */
-       857, /* GL_MAX_3D_TEXTURE_SIZE */
-      1813, /* GL_VERTEX_ARRAY */
-      1027, /* GL_NORMAL_ARRAY */
-       148, /* GL_COLOR_ARRAY */
-       632, /* GL_INDEX_ARRAY */
-      1677, /* GL_TEXTURE_COORD_ARRAY */
-       459, /* GL_EDGE_FLAG_ARRAY */
-      1819, /* GL_VERTEX_ARRAY_SIZE */
-      1821, /* GL_VERTEX_ARRAY_TYPE */
-      1820, /* GL_VERTEX_ARRAY_STRIDE */
-      1032, /* GL_NORMAL_ARRAY_TYPE */
-      1031, /* GL_NORMAL_ARRAY_STRIDE */
-       152, /* GL_COLOR_ARRAY_SIZE */
-       154, /* GL_COLOR_ARRAY_TYPE */
-       153, /* GL_COLOR_ARRAY_STRIDE */
-       637, /* GL_INDEX_ARRAY_TYPE */
-       636, /* GL_INDEX_ARRAY_STRIDE */
-      1681, /* GL_TEXTURE_COORD_ARRAY_SIZE */
-      1683, /* GL_TEXTURE_COORD_ARRAY_TYPE */
-      1682, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
-       463, /* GL_EDGE_FLAG_ARRAY_STRIDE */
-      1818, /* GL_VERTEX_ARRAY_POINTER */
-      1030, /* GL_NORMAL_ARRAY_POINTER */
-       151, /* GL_COLOR_ARRAY_POINTER */
-       635, /* GL_INDEX_ARRAY_POINTER */
-      1680, /* GL_TEXTURE_COORD_ARRAY_POINTER */
-       462, /* GL_EDGE_FLAG_ARRAY_POINTER */
-      1006, /* GL_MULTISAMPLE */
-      1404, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
-      1406, /* GL_SAMPLE_ALPHA_TO_ONE */
-      1411, /* GL_SAMPLE_COVERAGE */
-      1408, /* GL_SAMPLE_BUFFERS */
-      1399, /* GL_SAMPLES */
-      1415, /* GL_SAMPLE_COVERAGE_VALUE */
-      1413, /* GL_SAMPLE_COVERAGE_INVERT */
-       195, /* GL_COLOR_MATRIX */
-       197, /* GL_COLOR_MATRIX_STACK_DEPTH */
-       866, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
-      1202, /* GL_POST_COLOR_MATRIX_RED_SCALE */
-      1198, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
-      1193, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
-      1189, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
-      1200, /* GL_POST_COLOR_MATRIX_RED_BIAS */
-      1196, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
-      1191, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
-      1187, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
-      1660, /* GL_TEXTURE_COLOR_TABLE_SGI */
-      1279, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
-      1662, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+       737, /* GL_LUMINANCE4 */
+       743, /* GL_LUMINANCE8 */
+       727, /* GL_LUMINANCE12 */
+       733, /* GL_LUMINANCE16 */
+       738, /* GL_LUMINANCE4_ALPHA4 */
+       741, /* GL_LUMINANCE6_ALPHA2 */
+       744, /* GL_LUMINANCE8_ALPHA8 */
+       730, /* GL_LUMINANCE12_ALPHA4 */
+       728, /* GL_LUMINANCE12_ALPHA12 */
+       734, /* GL_LUMINANCE16_ALPHA16 */
+       648, /* GL_INTENSITY */
+       653, /* GL_INTENSITY4 */
+       655, /* GL_INTENSITY8 */
+       649, /* GL_INTENSITY12 */
+       651, /* GL_INTENSITY16 */
+      1363, /* GL_RGB2_EXT */
+      1364, /* GL_RGB4 */
+      1367, /* GL_RGB5 */
+      1371, /* GL_RGB8 */
+      1355, /* GL_RGB10 */
+      1359, /* GL_RGB12 */
+      1361, /* GL_RGB16 */
+      1378, /* GL_RGBA2 */
+      1380, /* GL_RGBA4 */
+      1368, /* GL_RGB5_A1 */
+      1384, /* GL_RGBA8 */
+      1356, /* GL_RGB10_A2 */
+      1374, /* GL_RGBA12 */
+      1376, /* GL_RGBA16 */
+      1746, /* GL_TEXTURE_RED_SIZE */
+      1716, /* GL_TEXTURE_GREEN_SIZE */
+      1654, /* GL_TEXTURE_BLUE_SIZE */
+      1641, /* GL_TEXTURE_ALPHA_SIZE */
+      1729, /* GL_TEXTURE_LUMINANCE_SIZE */
+      1720, /* GL_TEXTURE_INTENSITY_SIZE */
+      1348, /* GL_REPLACE_EXT */
+      1273, /* GL_PROXY_TEXTURE_1D */
+      1276, /* GL_PROXY_TEXTURE_2D */
+      1753, /* GL_TEXTURE_TOO_LARGE_EXT */
+      1741, /* GL_TEXTURE_PRIORITY */
+      1748, /* GL_TEXTURE_RESIDENT */
+      1644, /* GL_TEXTURE_BINDING_1D */
+      1646, /* GL_TEXTURE_BINDING_2D */
+      1648, /* GL_TEXTURE_BINDING_3D */
+      1098, /* GL_PACK_SKIP_IMAGES */
+      1094, /* GL_PACK_IMAGE_HEIGHT */
+      1784, /* GL_UNPACK_SKIP_IMAGES */
+      1781, /* GL_UNPACK_IMAGE_HEIGHT */
+      1640, /* GL_TEXTURE_3D */
+      1279, /* GL_PROXY_TEXTURE_3D */
+      1703, /* GL_TEXTURE_DEPTH */
+      1756, /* GL_TEXTURE_WRAP_R */
+       858, /* GL_MAX_3D_TEXTURE_SIZE */
+      1818, /* GL_VERTEX_ARRAY */
+      1028, /* GL_NORMAL_ARRAY */
+       149, /* GL_COLOR_ARRAY */
+       633, /* GL_INDEX_ARRAY */
+      1681, /* GL_TEXTURE_COORD_ARRAY */
+       460, /* GL_EDGE_FLAG_ARRAY */
+      1824, /* GL_VERTEX_ARRAY_SIZE */
+      1826, /* GL_VERTEX_ARRAY_TYPE */
+      1825, /* GL_VERTEX_ARRAY_STRIDE */
+      1033, /* GL_NORMAL_ARRAY_TYPE */
+      1032, /* GL_NORMAL_ARRAY_STRIDE */
+       153, /* GL_COLOR_ARRAY_SIZE */
+       155, /* GL_COLOR_ARRAY_TYPE */
+       154, /* GL_COLOR_ARRAY_STRIDE */
+       638, /* GL_INDEX_ARRAY_TYPE */
+       637, /* GL_INDEX_ARRAY_STRIDE */
+      1685, /* GL_TEXTURE_COORD_ARRAY_SIZE */
+      1687, /* GL_TEXTURE_COORD_ARRAY_TYPE */
+      1686, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
+       464, /* GL_EDGE_FLAG_ARRAY_STRIDE */
+      1823, /* GL_VERTEX_ARRAY_POINTER */
+      1031, /* GL_NORMAL_ARRAY_POINTER */
+       152, /* GL_COLOR_ARRAY_POINTER */
+       636, /* GL_INDEX_ARRAY_POINTER */
+      1684, /* GL_TEXTURE_COORD_ARRAY_POINTER */
+       463, /* GL_EDGE_FLAG_ARRAY_POINTER */
+      1007, /* GL_MULTISAMPLE */
+      1408, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
+      1410, /* GL_SAMPLE_ALPHA_TO_ONE */
+      1415, /* GL_SAMPLE_COVERAGE */
+      1412, /* GL_SAMPLE_BUFFERS */
+      1403, /* GL_SAMPLES */
+      1419, /* GL_SAMPLE_COVERAGE_VALUE */
+      1417, /* GL_SAMPLE_COVERAGE_INVERT */
+       196, /* GL_COLOR_MATRIX */
+       198, /* GL_COLOR_MATRIX_STACK_DEPTH */
+       867, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
+      1203, /* GL_POST_COLOR_MATRIX_RED_SCALE */
+      1199, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
+      1194, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
+      1190, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
+      1201, /* GL_POST_COLOR_MATRIX_RED_BIAS */
+      1197, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
+      1192, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
+      1188, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
+      1664, /* GL_TEXTURE_COLOR_TABLE_SGI */
+      1280, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
+      1666, /* 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 */
-      1212, /* GL_POST_CONVOLUTION_COLOR_TABLE */
-      1195, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
-      1267, /* GL_PROXY_COLOR_TABLE */
-      1271, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
-      1270, /* 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 */
+       202, /* GL_COLOR_TABLE */
+      1213, /* GL_POST_CONVOLUTION_COLOR_TABLE */
+      1196, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
+      1268, /* GL_PROXY_COLOR_TABLE */
+      1272, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
+      1271, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
+       226, /* GL_COLOR_TABLE_SCALE */
+       206, /* GL_COLOR_TABLE_BIAS */
+       211, /* GL_COLOR_TABLE_FORMAT */
+       228, /* GL_COLOR_TABLE_WIDTH */
+       223, /* GL_COLOR_TABLE_RED_SIZE */
+       214, /* GL_COLOR_TABLE_GREEN_SIZE */
+       208, /* GL_COLOR_TABLE_BLUE_SIZE */
+       203, /* GL_COLOR_TABLE_ALPHA_SIZE */
+       220, /* GL_COLOR_TABLE_LUMINANCE_SIZE */
+       217, /* GL_COLOR_TABLE_INTENSITY_SIZE */
         71, /* GL_BGR */
         72, /* GL_BGRA */
-       880, /* GL_MAX_ELEMENTS_VERTICES */
-       879, /* GL_MAX_ELEMENTS_INDICES */
-      1715, /* GL_TEXTURE_INDEX_SIZE_EXT */
-       145, /* GL_CLIP_VOLUME_CLIPPING_HINT_EXT */
-      1159, /* GL_POINT_SIZE_MIN */
-      1155, /* GL_POINT_SIZE_MAX */
-      1149, /* GL_POINT_FADE_THRESHOLD_SIZE */
-      1145, /* GL_POINT_DISTANCE_ATTENUATION */
-       127, /* GL_CLAMP_TO_BORDER */
-       130, /* GL_CLAMP_TO_EDGE */
-      1736, /* GL_TEXTURE_MIN_LOD */
-      1734, /* GL_TEXTURE_MAX_LOD */
-      1639, /* GL_TEXTURE_BASE_LEVEL */
-      1733, /* GL_TEXTURE_MAX_LEVEL */
-       625, /* GL_IGNORE_BORDER_HP */
-       276, /* GL_CONSTANT_BORDER_HP */
-      1346, /* GL_REPLICATE_BORDER_HP */
-       282, /* GL_CONVOLUTION_BORDER_COLOR */
-      1056, /* GL_OCCLUSION_TEST_HP */
-      1057, /* GL_OCCLUSION_TEST_RESULT_HP */
-       698, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
-      1654, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
-      1656, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
-      1658, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
-      1659, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-      1657, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
-      1655, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
-       861, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
-       862, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-      1222, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
-      1224, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
-      1221, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
-      1223, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
-      1723, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
-      1724, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
-      1722, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
-       594, /* GL_GENERATE_MIPMAP */
-       595, /* GL_GENERATE_MIPMAP_HINT */
-       532, /* GL_FOG_OFFSET_SGIX */
-       533, /* GL_FOG_OFFSET_VALUE_SGIX */
-      1668, /* GL_TEXTURE_COMPARE_SGIX */
-      1667, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
-      1719, /* GL_TEXTURE_LEQUAL_R_SGIX */
-      1711, /* GL_TEXTURE_GEQUAL_R_SGIX */
-       360, /* GL_DEPTH_COMPONENT16 */
-       363, /* GL_DEPTH_COMPONENT24 */
-       366, /* GL_DEPTH_COMPONENT32 */
-       306, /* GL_CULL_VERTEX_EXT */
-       308, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
-       307, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
-      1876, /* GL_WRAP_BORDER_SUN */
-      1661, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
-       691, /* GL_LIGHT_MODEL_COLOR_CONTROL */
-      1445, /* GL_SINGLE_COLOR */
-      1431, /* GL_SEPARATE_SPECULAR_COLOR */
-      1440, /* GL_SHARED_TEXTURE_PALETTE_EXT */
-       543, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
-       544, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
-       551, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
-       546, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
-       542, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
-       541, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
-       545, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
-       552, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
-       564, /* GL_FRAMEBUFFER_DEFAULT */
-       580, /* GL_FRAMEBUFFER_UNDEFINED */
-       373, /* GL_DEPTH_STENCIL_ATTACHMENT */
-       631, /* GL_INDEX */
-      1785, /* GL_UNSIGNED_BYTE_2_3_3_REV */
-      1801, /* GL_UNSIGNED_SHORT_5_6_5 */
-      1802, /* GL_UNSIGNED_SHORT_5_6_5_REV */
-      1799, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
-      1797, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
-      1794, /* GL_UNSIGNED_INT_8_8_8_8_REV */
-      1792, /* GL_UNSIGNED_INT_2_10_10_10_REV */
-      1731, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
-      1732, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
-      1730, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
-       957, /* GL_MIRRORED_REPEAT */
-      1387, /* GL_RGB_S3TC */
-      1362, /* GL_RGB4_S3TC */
-      1385, /* GL_RGBA_S3TC */
-      1379, /* GL_RGBA4_S3TC */
-      1383, /* GL_RGBA_DXT5_S3TC */
-      1377, /* 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 */
-      1018, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
-      1017, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
-       699, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
-       519, /* GL_FOG_COORDINATE_SOURCE */
-       511, /* GL_FOG_COORD */
-       535, /* GL_FRAGMENT_DEPTH */
-       312, /* GL_CURRENT_FOG_COORD */
-       518, /* GL_FOG_COORDINATE_ARRAY_TYPE */
-       517, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
-       516, /* GL_FOG_COORDINATE_ARRAY_POINTER */
-       513, /* GL_FOG_COORDINATE_ARRAY */
-       199, /* GL_COLOR_SUM */
-       332, /* GL_CURRENT_SECONDARY_COLOR */
-      1424, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
-      1426, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
-      1425, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
-      1423, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
-      1420, /* GL_SECONDARY_COLOR_ARRAY */
-       330, /* GL_CURRENT_RASTER_SECONDARY_COLOR */
+       881, /* GL_MAX_ELEMENTS_VERTICES */
+       880, /* GL_MAX_ELEMENTS_INDICES */
+      1719, /* GL_TEXTURE_INDEX_SIZE_EXT */
+       146, /* GL_CLIP_VOLUME_CLIPPING_HINT_EXT */
+      1160, /* GL_POINT_SIZE_MIN */
+      1156, /* GL_POINT_SIZE_MAX */
+      1150, /* GL_POINT_FADE_THRESHOLD_SIZE */
+      1146, /* GL_POINT_DISTANCE_ATTENUATION */
+       128, /* GL_CLAMP_TO_BORDER */
+       131, /* GL_CLAMP_TO_EDGE */
+      1740, /* GL_TEXTURE_MIN_LOD */
+      1738, /* GL_TEXTURE_MAX_LOD */
+      1643, /* GL_TEXTURE_BASE_LEVEL */
+      1737, /* GL_TEXTURE_MAX_LEVEL */
+       626, /* GL_IGNORE_BORDER_HP */
+       277, /* GL_CONSTANT_BORDER_HP */
+      1349, /* GL_REPLICATE_BORDER_HP */
+       283, /* GL_CONVOLUTION_BORDER_COLOR */
+      1057, /* GL_OCCLUSION_TEST_HP */
+      1058, /* GL_OCCLUSION_TEST_RESULT_HP */
+       699, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
+      1658, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
+      1660, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
+      1662, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
+      1663, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+      1661, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
+      1659, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
+       862, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
+       863, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+      1223, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
+      1225, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
+      1222, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
+      1224, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
+      1727, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
+      1728, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
+      1726, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
+       595, /* GL_GENERATE_MIPMAP */
+       596, /* GL_GENERATE_MIPMAP_HINT */
+       533, /* GL_FOG_OFFSET_SGIX */
+       534, /* GL_FOG_OFFSET_VALUE_SGIX */
+      1672, /* GL_TEXTURE_COMPARE_SGIX */
+      1671, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
+      1723, /* GL_TEXTURE_LEQUAL_R_SGIX */
+      1715, /* GL_TEXTURE_GEQUAL_R_SGIX */
+       361, /* GL_DEPTH_COMPONENT16 */
+       364, /* GL_DEPTH_COMPONENT24 */
+       367, /* GL_DEPTH_COMPONENT32 */
+       307, /* GL_CULL_VERTEX_EXT */
+       309, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
+       308, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
+      1882, /* GL_WRAP_BORDER_SUN */
+      1665, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
+       692, /* GL_LIGHT_MODEL_COLOR_CONTROL */
+      1449, /* GL_SINGLE_COLOR */
+      1435, /* GL_SEPARATE_SPECULAR_COLOR */
+      1444, /* GL_SHARED_TEXTURE_PALETTE_EXT */
+       544, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
+       545, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
+       552, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
+       547, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
+       543, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
+       542, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
+       546, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
+       553, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
+       565, /* GL_FRAMEBUFFER_DEFAULT */
+       581, /* GL_FRAMEBUFFER_UNDEFINED */
+       374, /* GL_DEPTH_STENCIL_ATTACHMENT */
+       632, /* GL_INDEX */
+      1790, /* GL_UNSIGNED_BYTE_2_3_3_REV */
+      1806, /* GL_UNSIGNED_SHORT_5_6_5 */
+      1807, /* GL_UNSIGNED_SHORT_5_6_5_REV */
+      1804, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
+      1802, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
+      1799, /* GL_UNSIGNED_INT_8_8_8_8_REV */
+      1797, /* GL_UNSIGNED_INT_2_10_10_10_REV */
+      1735, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
+      1736, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
+      1734, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
+       958, /* GL_MIRRORED_REPEAT */
+      1391, /* GL_RGB_S3TC */
+      1366, /* GL_RGB4_S3TC */
+      1389, /* GL_RGBA_S3TC */
+      1383, /* GL_RGBA4_S3TC */
+      1387, /* GL_RGBA_DXT5_S3TC */
+      1381, /* GL_RGBA4_DXT5_S3TC */
+       265, /* GL_COMPRESSED_RGB_S3TC_DXT1_EXT */
+       260, /* GL_COMPRESSED_RGBA_S3TC_DXT1_EXT */
+       261, /* GL_COMPRESSED_RGBA_S3TC_DXT3_EXT */
+       262, /* GL_COMPRESSED_RGBA_S3TC_DXT5_EXT */
+      1019, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
+      1018, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
+       700, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
+       520, /* GL_FOG_COORDINATE_SOURCE */
+       512, /* GL_FOG_COORD */
+       536, /* GL_FRAGMENT_DEPTH */
+       313, /* GL_CURRENT_FOG_COORD */
+       519, /* GL_FOG_COORDINATE_ARRAY_TYPE */
+       518, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
+       517, /* GL_FOG_COORDINATE_ARRAY_POINTER */
+       514, /* GL_FOG_COORDINATE_ARRAY */
+       200, /* GL_COLOR_SUM */
+       333, /* GL_CURRENT_SECONDARY_COLOR */
+      1428, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
+      1430, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
+      1429, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
+      1427, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
+      1424, /* GL_SECONDARY_COLOR_ARRAY */
+       331, /* GL_CURRENT_RASTER_SECONDARY_COLOR */
         28, /* GL_ALIASED_POINT_SIZE_RANGE */
         27, /* GL_ALIASED_LINE_WIDTH_RANGE */
-      1568, /* GL_TEXTURE0 */
-      1570, /* GL_TEXTURE1 */
-      1592, /* GL_TEXTURE2 */
-      1614, /* GL_TEXTURE3 */
-      1620, /* GL_TEXTURE4 */
-      1622, /* GL_TEXTURE5 */
-      1624, /* GL_TEXTURE6 */
-      1626, /* GL_TEXTURE7 */
-      1628, /* GL_TEXTURE8 */
-      1630, /* GL_TEXTURE9 */
-      1571, /* GL_TEXTURE10 */
-      1573, /* GL_TEXTURE11 */
-      1575, /* GL_TEXTURE12 */
-      1577, /* GL_TEXTURE13 */
-      1579, /* GL_TEXTURE14 */
-      1581, /* GL_TEXTURE15 */
-      1583, /* GL_TEXTURE16 */
-      1585, /* GL_TEXTURE17 */
-      1587, /* GL_TEXTURE18 */
-      1589, /* GL_TEXTURE19 */
-      1593, /* GL_TEXTURE20 */
-      1595, /* GL_TEXTURE21 */
-      1597, /* GL_TEXTURE22 */
-      1599, /* GL_TEXTURE23 */
-      1601, /* GL_TEXTURE24 */
-      1603, /* GL_TEXTURE25 */
-      1605, /* GL_TEXTURE26 */
-      1607, /* GL_TEXTURE27 */
-      1609, /* GL_TEXTURE28 */
-      1611, /* GL_TEXTURE29 */
-      1615, /* GL_TEXTURE30 */
-      1617, /* GL_TEXTURE31 */
+      1572, /* GL_TEXTURE0 */
+      1574, /* GL_TEXTURE1 */
+      1596, /* GL_TEXTURE2 */
+      1618, /* GL_TEXTURE3 */
+      1624, /* GL_TEXTURE4 */
+      1626, /* GL_TEXTURE5 */
+      1628, /* GL_TEXTURE6 */
+      1630, /* GL_TEXTURE7 */
+      1632, /* GL_TEXTURE8 */
+      1634, /* GL_TEXTURE9 */
+      1575, /* GL_TEXTURE10 */
+      1577, /* GL_TEXTURE11 */
+      1579, /* GL_TEXTURE12 */
+      1581, /* GL_TEXTURE13 */
+      1583, /* GL_TEXTURE14 */
+      1585, /* GL_TEXTURE15 */
+      1587, /* GL_TEXTURE16 */
+      1589, /* GL_TEXTURE17 */
+      1591, /* GL_TEXTURE18 */
+      1593, /* GL_TEXTURE19 */
+      1597, /* GL_TEXTURE20 */
+      1599, /* GL_TEXTURE21 */
+      1601, /* GL_TEXTURE22 */
+      1603, /* GL_TEXTURE23 */
+      1605, /* GL_TEXTURE24 */
+      1607, /* GL_TEXTURE25 */
+      1609, /* GL_TEXTURE26 */
+      1611, /* GL_TEXTURE27 */
+      1613, /* GL_TEXTURE28 */
+      1615, /* GL_TEXTURE29 */
+      1619, /* GL_TEXTURE30 */
+      1621, /* GL_TEXTURE31 */
         18, /* GL_ACTIVE_TEXTURE */
-       133, /* GL_CLIENT_ACTIVE_TEXTURE */
-       935, /* GL_MAX_TEXTURE_UNITS */
-      1763, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
-      1766, /* GL_TRANSPOSE_PROJECTION_MATRIX */
-      1768, /* GL_TRANSPOSE_TEXTURE_MATRIX */
-      1760, /* GL_TRANSPOSE_COLOR_MATRIX */
-      1550, /* GL_SUBTRACT */
-       920, /* GL_MAX_RENDERBUFFER_SIZE */
-       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 */
-      1675, /* GL_TEXTURE_COMPRESSION_HINT */
-      1740, /* GL_TEXTURE_RECTANGLE_ARB */
-      1647, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
-      1282, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
-       918, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
-       372, /* GL_DEPTH_STENCIL */
-      1789, /* GL_UNSIGNED_INT_24_8 */
-       931, /* GL_MAX_TEXTURE_LOD_BIAS */
-      1729, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
-       932, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
-      1705, /* GL_TEXTURE_FILTER_CONTROL */
-      1720, /* GL_TEXTURE_LOD_BIAS */
-       232, /* GL_COMBINE4 */
-       925, /* GL_MAX_SHININESS_NV */
-       926, /* GL_MAX_SPOT_EXPONENT_NV */
-       629, /* GL_INCR_WRAP */
-       343, /* GL_DECR_WRAP */
-       977, /* GL_MODELVIEW1_ARB */
-      1033, /* GL_NORMAL_MAP */
-      1319, /* GL_REFLECTION_MAP */
-      1684, /* GL_TEXTURE_CUBE_MAP */
-      1645, /* GL_TEXTURE_BINDING_CUBE_MAP */
-      1692, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
-      1686, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
-      1694, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
-      1688, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
-      1696, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
-      1690, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
-      1280, /* GL_PROXY_TEXTURE_CUBE_MAP */
-       874, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
-      1012, /* GL_MULTISAMPLE_FILTER_HINT_NV */
-       527, /* GL_FOG_DISTANCE_MODE_NV */
-       478, /* GL_EYE_RADIAL_NV */
-       477, /* GL_EYE_PLANE_ABSOLUTE_NV */
-       231, /* GL_COMBINE */
-       238, /* GL_COMBINE_RGB */
-       233, /* GL_COMBINE_ALPHA */
-      1388, /* GL_RGB_SCALE */
+       134, /* GL_CLIENT_ACTIVE_TEXTURE */
+       936, /* GL_MAX_TEXTURE_UNITS */
+      1767, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
+      1770, /* GL_TRANSPOSE_PROJECTION_MATRIX */
+      1772, /* GL_TRANSPOSE_TEXTURE_MATRIX */
+      1764, /* GL_TRANSPOSE_COLOR_MATRIX */
+      1554, /* GL_SUBTRACT */
+       921, /* GL_MAX_RENDERBUFFER_SIZE */
+       248, /* GL_COMPRESSED_ALPHA */
+       252, /* GL_COMPRESSED_LUMINANCE */
+       253, /* GL_COMPRESSED_LUMINANCE_ALPHA */
+       250, /* GL_COMPRESSED_INTENSITY */
+       256, /* GL_COMPRESSED_RGB */
+       257, /* GL_COMPRESSED_RGBA */
+      1679, /* GL_TEXTURE_COMPRESSION_HINT */
+      1744, /* GL_TEXTURE_RECTANGLE_ARB */
+      1651, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
+      1283, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
+       919, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
+       373, /* GL_DEPTH_STENCIL */
+      1794, /* GL_UNSIGNED_INT_24_8 */
+       932, /* GL_MAX_TEXTURE_LOD_BIAS */
+      1733, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
+       933, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
+      1709, /* GL_TEXTURE_FILTER_CONTROL */
+      1724, /* GL_TEXTURE_LOD_BIAS */
+       233, /* GL_COMBINE4 */
+       926, /* GL_MAX_SHININESS_NV */
+       927, /* GL_MAX_SPOT_EXPONENT_NV */
+       630, /* GL_INCR_WRAP */
+       344, /* GL_DECR_WRAP */
+       978, /* GL_MODELVIEW1_ARB */
+      1034, /* GL_NORMAL_MAP */
+      1321, /* GL_REFLECTION_MAP */
+      1688, /* GL_TEXTURE_CUBE_MAP */
+      1649, /* GL_TEXTURE_BINDING_CUBE_MAP */
+      1696, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
+      1690, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
+      1698, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
+      1692, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
+      1700, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
+      1694, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
+      1281, /* GL_PROXY_TEXTURE_CUBE_MAP */
+       875, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
+      1013, /* GL_MULTISAMPLE_FILTER_HINT_NV */
+       528, /* GL_FOG_DISTANCE_MODE_NV */
+       479, /* GL_EYE_RADIAL_NV */
+       478, /* GL_EYE_PLANE_ABSOLUTE_NV */
+       232, /* GL_COMBINE */
+       239, /* GL_COMBINE_RGB */
+       234, /* GL_COMBINE_ALPHA */
+      1392, /* GL_RGB_SCALE */
         24, /* GL_ADD_SIGNED */
-       657, /* GL_INTERPOLATE */
-       271, /* GL_CONSTANT */
-      1228, /* GL_PRIMARY_COLOR */
-      1225, /* GL_PREVIOUS */
-      1460, /* GL_SOURCE0_RGB */
-      1466, /* GL_SOURCE1_RGB */
-      1472, /* GL_SOURCE2_RGB */
-      1476, /* GL_SOURCE3_RGB_NV */
-      1457, /* GL_SOURCE0_ALPHA */
-      1463, /* GL_SOURCE1_ALPHA */
-      1469, /* GL_SOURCE2_ALPHA */
-      1475, /* GL_SOURCE3_ALPHA_NV */
-      1070, /* GL_OPERAND0_RGB */
-      1076, /* GL_OPERAND1_RGB */
-      1082, /* GL_OPERAND2_RGB */
-      1086, /* GL_OPERAND3_RGB_NV */
-      1067, /* GL_OPERAND0_ALPHA */
-      1073, /* GL_OPERAND1_ALPHA */
-      1079, /* GL_OPERAND2_ALPHA */
-      1085, /* GL_OPERAND3_ALPHA_NV */
-      1814, /* GL_VERTEX_ARRAY_BINDING */
-      1738, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
-      1739, /* GL_TEXTURE_RANGE_POINTER_APPLE */
-      1880, /* GL_YCBCR_422_APPLE */
-      1803, /* GL_UNSIGNED_SHORT_8_8_APPLE */
-      1805, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
-      1748, /* GL_TEXTURE_STORAGE_HINT_APPLE */
-      1541, /* GL_STORAGE_PRIVATE_APPLE */
-      1540, /* GL_STORAGE_CACHED_APPLE */
-      1542, /* GL_STORAGE_SHARED_APPLE */
-      1447, /* GL_SLICE_ACCUM_SUN */
-      1289, /* GL_QUAD_MESH_SUN */
-      1772, /* GL_TRIANGLE_MESH_SUN */
-      1853, /* GL_VERTEX_PROGRAM_ARB */
-      1864, /* GL_VERTEX_STATE_PROGRAM_NV */
-      1840, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
-      1846, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
-      1848, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
-      1850, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
-       334, /* GL_CURRENT_VERTEX_ATTRIB */
-      1241, /* GL_PROGRAM_LENGTH_ARB */
-      1255, /* GL_PROGRAM_STRING_ARB */
-       999, /* GL_MODELVIEW_PROJECTION_NV */
-       624, /* GL_IDENTITY_NV */
-       671, /* GL_INVERSE_NV */
-      1765, /* GL_TRANSPOSE_NV */
-       672, /* GL_INVERSE_TRANSPOSE_NV */
-       904, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
-       903, /* GL_MAX_PROGRAM_MATRICES_ARB */
-       810, /* GL_MATRIX0_NV */
-       822, /* GL_MATRIX1_NV */
-       834, /* GL_MATRIX2_NV */
-       838, /* GL_MATRIX3_NV */
-       840, /* GL_MATRIX4_NV */
-       842, /* GL_MATRIX5_NV */
-       844, /* GL_MATRIX6_NV */
-       846, /* GL_MATRIX7_NV */
-       318, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
-       315, /* GL_CURRENT_MATRIX_ARB */
-      1856, /* GL_VERTEX_PROGRAM_POINT_SIZE */
-      1859, /* GL_VERTEX_PROGRAM_TWO_SIDE */
-      1253, /* GL_PROGRAM_PARAMETER_NV */
-      1844, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
-      1257, /* GL_PROGRAM_TARGET_NV */
-      1254, /* GL_PROGRAM_RESIDENT_NV */
-      1757, /* GL_TRACK_MATRIX_NV */
-      1758, /* GL_TRACK_MATRIX_TRANSFORM_NV */
-      1854, /* GL_VERTEX_PROGRAM_BINDING_NV */
-      1235, /* GL_PROGRAM_ERROR_POSITION_ARB */
-       356, /* GL_DEPTH_CLAMP */
-      1822, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-      1829, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-      1830, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-      1831, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-      1832, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-      1833, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-      1834, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-      1835, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-      1836, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-      1837, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-      1823, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-      1824, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-      1825, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-      1826, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-      1827, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-      1828, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
-       758, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
-       765, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
-       766, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
-       767, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
-       768, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
-       769, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
-       770, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
-       771, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
-       772, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
-       773, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
-       759, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
-       760, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
-       761, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
-       762, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
-       763, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
-       764, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
-       785, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
-       792, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
-       793, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
-       794, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
-       795, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
-       796, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
-       797, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
-      1234, /* GL_PROGRAM_BINDING_ARB */
-       799, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
-       800, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
-       786, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
-       787, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
-       788, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
-       789, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
-       790, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
-       791, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
-      1673, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
-      1670, /* GL_TEXTURE_COMPRESSED */
-      1038, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
-       269, /* GL_COMPRESSED_TEXTURE_FORMATS */
-       947, /* GL_MAX_VERTEX_UNITS_ARB */
+       658, /* GL_INTERPOLATE */
+       272, /* GL_CONSTANT */
+      1229, /* GL_PRIMARY_COLOR */
+      1226, /* GL_PREVIOUS */
+      1464, /* GL_SOURCE0_RGB */
+      1470, /* GL_SOURCE1_RGB */
+      1476, /* GL_SOURCE2_RGB */
+      1480, /* GL_SOURCE3_RGB_NV */
+      1461, /* GL_SOURCE0_ALPHA */
+      1467, /* GL_SOURCE1_ALPHA */
+      1473, /* GL_SOURCE2_ALPHA */
+      1479, /* GL_SOURCE3_ALPHA_NV */
+      1071, /* GL_OPERAND0_RGB */
+      1077, /* GL_OPERAND1_RGB */
+      1083, /* GL_OPERAND2_RGB */
+      1087, /* GL_OPERAND3_RGB_NV */
+      1068, /* GL_OPERAND0_ALPHA */
+      1074, /* GL_OPERAND1_ALPHA */
+      1080, /* GL_OPERAND2_ALPHA */
+      1086, /* GL_OPERAND3_ALPHA_NV */
+       109, /* GL_BUFFER_OBJECT_APPLE */
+      1819, /* GL_VERTEX_ARRAY_BINDING */
+      1742, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
+      1743, /* GL_TEXTURE_RANGE_POINTER_APPLE */
+      1886, /* GL_YCBCR_422_APPLE */
+      1808, /* GL_UNSIGNED_SHORT_8_8_APPLE */
+      1810, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
+      1752, /* GL_TEXTURE_STORAGE_HINT_APPLE */
+      1545, /* GL_STORAGE_PRIVATE_APPLE */
+      1544, /* GL_STORAGE_CACHED_APPLE */
+      1546, /* GL_STORAGE_SHARED_APPLE */
+      1451, /* GL_SLICE_ACCUM_SUN */
+      1291, /* GL_QUAD_MESH_SUN */
+      1776, /* GL_TRIANGLE_MESH_SUN */
+      1858, /* GL_VERTEX_PROGRAM_ARB */
+      1869, /* GL_VERTEX_STATE_PROGRAM_NV */
+      1845, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
+      1851, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
+      1853, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
+      1855, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
+       335, /* GL_CURRENT_VERTEX_ATTRIB */
+      1242, /* GL_PROGRAM_LENGTH_ARB */
+      1256, /* GL_PROGRAM_STRING_ARB */
+      1000, /* GL_MODELVIEW_PROJECTION_NV */
+       625, /* GL_IDENTITY_NV */
+       672, /* GL_INVERSE_NV */
+      1769, /* GL_TRANSPOSE_NV */
+       673, /* GL_INVERSE_TRANSPOSE_NV */
+       905, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
+       904, /* GL_MAX_PROGRAM_MATRICES_ARB */
+       811, /* GL_MATRIX0_NV */
+       823, /* GL_MATRIX1_NV */
+       835, /* GL_MATRIX2_NV */
+       839, /* GL_MATRIX3_NV */
+       841, /* GL_MATRIX4_NV */
+       843, /* GL_MATRIX5_NV */
+       845, /* GL_MATRIX6_NV */
+       847, /* GL_MATRIX7_NV */
+       319, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
+       316, /* GL_CURRENT_MATRIX_ARB */
+      1861, /* GL_VERTEX_PROGRAM_POINT_SIZE */
+      1864, /* GL_VERTEX_PROGRAM_TWO_SIDE */
+      1254, /* GL_PROGRAM_PARAMETER_NV */
+      1849, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
+      1258, /* GL_PROGRAM_TARGET_NV */
+      1255, /* GL_PROGRAM_RESIDENT_NV */
+      1761, /* GL_TRACK_MATRIX_NV */
+      1762, /* GL_TRACK_MATRIX_TRANSFORM_NV */
+      1859, /* GL_VERTEX_PROGRAM_BINDING_NV */
+      1236, /* GL_PROGRAM_ERROR_POSITION_ARB */
+       357, /* GL_DEPTH_CLAMP */
+      1827, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
+      1834, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
+      1835, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
+      1836, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
+      1837, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
+      1838, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
+      1839, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
+      1840, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
+      1841, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
+      1842, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
+      1828, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
+      1829, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
+      1830, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
+      1831, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
+      1832, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
+      1833, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
+       759, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
+       766, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
+       767, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
+       768, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
+       769, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
+       770, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
+       771, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
+       772, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
+       773, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
+       774, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
+       760, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
+       761, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
+       762, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
+       763, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
+       764, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
+       765, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
+       786, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
+       793, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
+       794, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
+       795, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
+       796, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
+       797, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
+       798, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
+      1235, /* GL_PROGRAM_BINDING_ARB */
+       800, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
+       801, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
+       787, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
+       788, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
+       789, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
+       790, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
+       791, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
+       792, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
+      1677, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
+      1674, /* GL_TEXTURE_COMPRESSED */
+      1039, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
+       270, /* GL_COMPRESSED_TEXTURE_FORMATS */
+       948, /* GL_MAX_VERTEX_UNITS_ARB */
         22, /* GL_ACTIVE_VERTEX_UNITS_ARB */
-      1875, /* GL_WEIGHT_SUM_UNITY_ARB */
-      1852, /* GL_VERTEX_BLEND_ARB */
-       336, /* GL_CURRENT_WEIGHT_ARB */
-      1874, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-      1873, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-      1872, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-      1871, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-      1868, /* GL_WEIGHT_ARRAY_ARB */
-       386, /* GL_DOT3_RGB */
-       387, /* GL_DOT3_RGBA */
-       263, /* GL_COMPRESSED_RGB_FXT1_3DFX */
-       258, /* GL_COMPRESSED_RGBA_FXT1_3DFX */
-      1007, /* GL_MULTISAMPLE_3DFX */
-      1409, /* GL_SAMPLE_BUFFERS_3DFX */
-      1400, /* GL_SAMPLES_3DFX */
-       988, /* GL_MODELVIEW2_ARB */
-       991, /* GL_MODELVIEW3_ARB */
-       992, /* GL_MODELVIEW4_ARB */
-       993, /* GL_MODELVIEW5_ARB */
-       994, /* GL_MODELVIEW6_ARB */
-       995, /* GL_MODELVIEW7_ARB */
-       996, /* GL_MODELVIEW8_ARB */
-       997, /* GL_MODELVIEW9_ARB */
-       967, /* GL_MODELVIEW10_ARB */
-       968, /* GL_MODELVIEW11_ARB */
-       969, /* GL_MODELVIEW12_ARB */
-       970, /* GL_MODELVIEW13_ARB */
-       971, /* GL_MODELVIEW14_ARB */
-       972, /* GL_MODELVIEW15_ARB */
-       973, /* GL_MODELVIEW16_ARB */
-       974, /* GL_MODELVIEW17_ARB */
-       975, /* GL_MODELVIEW18_ARB */
-       976, /* GL_MODELVIEW19_ARB */
-       978, /* GL_MODELVIEW20_ARB */
-       979, /* GL_MODELVIEW21_ARB */
-       980, /* GL_MODELVIEW22_ARB */
-       981, /* GL_MODELVIEW23_ARB */
-       982, /* GL_MODELVIEW24_ARB */
-       983, /* GL_MODELVIEW25_ARB */
-       984, /* GL_MODELVIEW26_ARB */
-       985, /* GL_MODELVIEW27_ARB */
-       986, /* GL_MODELVIEW28_ARB */
-       987, /* GL_MODELVIEW29_ARB */
-       989, /* GL_MODELVIEW30_ARB */
-       990, /* GL_MODELVIEW31_ARB */
-       391, /* GL_DOT3_RGB_EXT */
-       389, /* GL_DOT3_RGBA_EXT */
-       961, /* GL_MIRROR_CLAMP_EXT */
-       964, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
-      1002, /* GL_MODULATE_ADD_ATI */
-      1003, /* GL_MODULATE_SIGNED_ADD_ATI */
-      1004, /* GL_MODULATE_SUBTRACT_ATI */
-      1881, /* GL_YCBCR_MESA */
-      1094, /* 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 */
-       451, /* GL_DUDV_ATI */
-       450, /* GL_DU8DV8_ATI */
-       114, /* GL_BUMP_ENVMAP_ATI */
-       118, /* GL_BUMP_TARGET_ATI */
-      1508, /* GL_STENCIL_BACK_FUNC */
-      1506, /* GL_STENCIL_BACK_FAIL */
-      1510, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
-      1512, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
-       536, /* GL_FRAGMENT_PROGRAM_ARB */
-      1232, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
-      1260, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
-      1259, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
-      1244, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-      1250, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-      1249, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-       893, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
-       916, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
-       915, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
-       906, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-       912, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-       911, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-       876, /* GL_MAX_DRAW_BUFFERS */
-       395, /* GL_DRAW_BUFFER0 */
-       398, /* GL_DRAW_BUFFER1 */
-       419, /* GL_DRAW_BUFFER2 */
-       422, /* GL_DRAW_BUFFER3 */
-       425, /* GL_DRAW_BUFFER4 */
-       428, /* GL_DRAW_BUFFER5 */
-       431, /* GL_DRAW_BUFFER6 */
-       434, /* GL_DRAW_BUFFER7 */
-       437, /* GL_DRAW_BUFFER8 */
-       440, /* GL_DRAW_BUFFER9 */
-       399, /* GL_DRAW_BUFFER10 */
-       402, /* GL_DRAW_BUFFER11 */
-       405, /* GL_DRAW_BUFFER12 */
-       408, /* GL_DRAW_BUFFER13 */
-       411, /* GL_DRAW_BUFFER14 */
-       414, /* GL_DRAW_BUFFER15 */
+      1881, /* GL_WEIGHT_SUM_UNITY_ARB */
+      1857, /* GL_VERTEX_BLEND_ARB */
+       337, /* GL_CURRENT_WEIGHT_ARB */
+      1880, /* GL_WEIGHT_ARRAY_TYPE_ARB */
+      1879, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
+      1878, /* GL_WEIGHT_ARRAY_SIZE_ARB */
+      1877, /* GL_WEIGHT_ARRAY_POINTER_ARB */
+      1874, /* GL_WEIGHT_ARRAY_ARB */
+       387, /* GL_DOT3_RGB */
+       388, /* GL_DOT3_RGBA */
+       264, /* GL_COMPRESSED_RGB_FXT1_3DFX */
+       259, /* GL_COMPRESSED_RGBA_FXT1_3DFX */
+      1008, /* GL_MULTISAMPLE_3DFX */
+      1413, /* GL_SAMPLE_BUFFERS_3DFX */
+      1404, /* GL_SAMPLES_3DFX */
+       989, /* GL_MODELVIEW2_ARB */
+       992, /* GL_MODELVIEW3_ARB */
+       993, /* GL_MODELVIEW4_ARB */
+       994, /* GL_MODELVIEW5_ARB */
+       995, /* GL_MODELVIEW6_ARB */
+       996, /* GL_MODELVIEW7_ARB */
+       997, /* GL_MODELVIEW8_ARB */
+       998, /* GL_MODELVIEW9_ARB */
+       968, /* GL_MODELVIEW10_ARB */
+       969, /* GL_MODELVIEW11_ARB */
+       970, /* GL_MODELVIEW12_ARB */
+       971, /* GL_MODELVIEW13_ARB */
+       972, /* GL_MODELVIEW14_ARB */
+       973, /* GL_MODELVIEW15_ARB */
+       974, /* GL_MODELVIEW16_ARB */
+       975, /* GL_MODELVIEW17_ARB */
+       976, /* GL_MODELVIEW18_ARB */
+       977, /* GL_MODELVIEW19_ARB */
+       979, /* GL_MODELVIEW20_ARB */
+       980, /* GL_MODELVIEW21_ARB */
+       981, /* GL_MODELVIEW22_ARB */
+       982, /* GL_MODELVIEW23_ARB */
+       983, /* GL_MODELVIEW24_ARB */
+       984, /* GL_MODELVIEW25_ARB */
+       985, /* GL_MODELVIEW26_ARB */
+       986, /* GL_MODELVIEW27_ARB */
+       987, /* GL_MODELVIEW28_ARB */
+       988, /* GL_MODELVIEW29_ARB */
+       990, /* GL_MODELVIEW30_ARB */
+       991, /* GL_MODELVIEW31_ARB */
+       392, /* GL_DOT3_RGB_EXT */
+       390, /* GL_DOT3_RGBA_EXT */
+       962, /* GL_MIRROR_CLAMP_EXT */
+       965, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
+      1003, /* GL_MODULATE_ADD_ATI */
+      1004, /* GL_MODULATE_SIGNED_ADD_ATI */
+      1005, /* GL_MODULATE_SUBTRACT_ATI */
+      1887, /* GL_YCBCR_MESA */
+      1095, /* GL_PACK_INVERT_MESA */
+       340, /* GL_DEBUG_OBJECT_MESA */
+       341, /* GL_DEBUG_PRINT_MESA */
+       339, /* GL_DEBUG_ASSERT_MESA */
+       111, /* GL_BUFFER_SIZE */
+       113, /* GL_BUFFER_USAGE */
+       117, /* GL_BUMP_ROT_MATRIX_ATI */
+       118, /* GL_BUMP_ROT_MATRIX_SIZE_ATI */
+       116, /* GL_BUMP_NUM_TEX_UNITS_ATI */
+       120, /* GL_BUMP_TEX_UNITS_ATI */
+       452, /* GL_DUDV_ATI */
+       451, /* GL_DU8DV8_ATI */
+       115, /* GL_BUMP_ENVMAP_ATI */
+       119, /* GL_BUMP_TARGET_ATI */
+      1512, /* GL_STENCIL_BACK_FUNC */
+      1510, /* GL_STENCIL_BACK_FAIL */
+      1514, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
+      1516, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
+       537, /* GL_FRAGMENT_PROGRAM_ARB */
+      1233, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
+      1261, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
+      1260, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
+      1245, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+      1251, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+      1250, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+       894, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
+       917, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
+       916, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
+       907, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+       913, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+       912, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+       877, /* GL_MAX_DRAW_BUFFERS */
+       396, /* GL_DRAW_BUFFER0 */
+       399, /* GL_DRAW_BUFFER1 */
+       420, /* GL_DRAW_BUFFER2 */
+       423, /* GL_DRAW_BUFFER3 */
+       426, /* GL_DRAW_BUFFER4 */
+       429, /* GL_DRAW_BUFFER5 */
+       432, /* GL_DRAW_BUFFER6 */
+       435, /* GL_DRAW_BUFFER7 */
+       438, /* GL_DRAW_BUFFER8 */
+       441, /* GL_DRAW_BUFFER9 */
+       400, /* GL_DRAW_BUFFER10 */
+       403, /* GL_DRAW_BUFFER11 */
+       406, /* GL_DRAW_BUFFER12 */
+       409, /* GL_DRAW_BUFFER13 */
+       412, /* GL_DRAW_BUFFER14 */
+       415, /* GL_DRAW_BUFFER15 */
         82, /* GL_BLEND_EQUATION_ALPHA */
-       855, /* GL_MATRIX_PALETTE_ARB */
-       887, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
-       890, /* GL_MAX_PALETTE_MATRICES_ARB */
-       321, /* GL_CURRENT_PALETTE_MATRIX_ARB */
-       849, /* GL_MATRIX_INDEX_ARRAY_ARB */
-       316, /* GL_CURRENT_MATRIX_INDEX_ARB */
-       851, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
-       853, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
-       852, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
-       850, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
-      1700, /* GL_TEXTURE_DEPTH_SIZE */
-       379, /* GL_DEPTH_TEXTURE_MODE */
-      1665, /* GL_TEXTURE_COMPARE_MODE */
-      1663, /* GL_TEXTURE_COMPARE_FUNC */
-       242, /* GL_COMPARE_R_TO_TEXTURE */
-      1166, /* GL_POINT_SPRITE */
-       296, /* GL_COORD_REPLACE */
-      1170, /* GL_POINT_SPRITE_R_MODE_NV */
-      1293, /* GL_QUERY_COUNTER_BITS */
-       323, /* GL_CURRENT_QUERY */
-      1296, /* GL_QUERY_RESULT */
-      1298, /* GL_QUERY_RESULT_AVAILABLE */
-       941, /* GL_MAX_VERTEX_ATTRIBS */
-      1842, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
-       377, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
-       376, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
-       927, /* GL_MAX_TEXTURE_COORDS */
-       929, /* GL_MAX_TEXTURE_IMAGE_UNITS */
-      1237, /* GL_PROGRAM_ERROR_STRING_ARB */
-      1239, /* GL_PROGRAM_FORMAT_ASCII_ARB */
-      1238, /* GL_PROGRAM_FORMAT_ARB */
-      1750, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
-       354, /* GL_DEPTH_BOUNDS_TEST_EXT */
-       353, /* GL_DEPTH_BOUNDS_EXT */
+       856, /* GL_MATRIX_PALETTE_ARB */
+       888, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
+       891, /* GL_MAX_PALETTE_MATRICES_ARB */
+       322, /* GL_CURRENT_PALETTE_MATRIX_ARB */
+       850, /* GL_MATRIX_INDEX_ARRAY_ARB */
+       317, /* GL_CURRENT_MATRIX_INDEX_ARB */
+       852, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
+       854, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
+       853, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
+       851, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
+      1704, /* GL_TEXTURE_DEPTH_SIZE */
+       380, /* GL_DEPTH_TEXTURE_MODE */
+      1669, /* GL_TEXTURE_COMPARE_MODE */
+      1667, /* GL_TEXTURE_COMPARE_FUNC */
+       243, /* GL_COMPARE_R_TO_TEXTURE */
+      1167, /* GL_POINT_SPRITE */
+       297, /* GL_COORD_REPLACE */
+      1171, /* GL_POINT_SPRITE_R_MODE_NV */
+      1295, /* GL_QUERY_COUNTER_BITS */
+       324, /* GL_CURRENT_QUERY */
+      1298, /* GL_QUERY_RESULT */
+      1300, /* GL_QUERY_RESULT_AVAILABLE */
+       942, /* GL_MAX_VERTEX_ATTRIBS */
+      1847, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
+       378, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
+       377, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
+       928, /* GL_MAX_TEXTURE_COORDS */
+       930, /* GL_MAX_TEXTURE_IMAGE_UNITS */
+      1238, /* GL_PROGRAM_ERROR_STRING_ARB */
+      1240, /* GL_PROGRAM_FORMAT_ASCII_ARB */
+      1239, /* GL_PROGRAM_FORMAT_ARB */
+      1754, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
+       355, /* GL_DEPTH_BOUNDS_TEST_EXT */
+       354, /* GL_DEPTH_BOUNDS_EXT */
         53, /* GL_ARRAY_BUFFER */
-       464, /* GL_ELEMENT_ARRAY_BUFFER */
+       465, /* GL_ELEMENT_ARRAY_BUFFER */
         54, /* GL_ARRAY_BUFFER_BINDING */
-       465, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
-      1816, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
-      1028, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
-       149, /* GL_COLOR_ARRAY_BUFFER_BINDING */
-       633, /* GL_INDEX_ARRAY_BUFFER_BINDING */
-      1678, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
-       460, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
-      1421, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
-       514, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
-      1869, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-      1838, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
-      1240, /* GL_PROGRAM_INSTRUCTIONS_ARB */
-       899, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
-      1246, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-       908, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-      1258, /* GL_PROGRAM_TEMPORARIES_ARB */
-       914, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
-      1248, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
-       910, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
-      1252, /* GL_PROGRAM_PARAMETERS_ARB */
-       913, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
-      1247, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
-       909, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
-      1233, /* GL_PROGRAM_ATTRIBS_ARB */
-       894, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
-      1245, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
-       907, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
-      1231, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
-       892, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
-      1243, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-       905, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-       900, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
-       896, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
-      1261, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
-      1762, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
-      1309, /* GL_READ_ONLY */
-      1877, /* GL_WRITE_ONLY */
-      1311, /* GL_READ_WRITE */
+       466, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
+      1821, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
+      1029, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
+       150, /* GL_COLOR_ARRAY_BUFFER_BINDING */
+       634, /* GL_INDEX_ARRAY_BUFFER_BINDING */
+      1682, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
+       461, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
+      1425, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
+       515, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
+      1875, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
+      1843, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
+      1241, /* GL_PROGRAM_INSTRUCTIONS_ARB */
+       900, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
+      1247, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+       909, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+      1259, /* GL_PROGRAM_TEMPORARIES_ARB */
+       915, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
+      1249, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
+       911, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
+      1253, /* GL_PROGRAM_PARAMETERS_ARB */
+       914, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
+      1248, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
+       910, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
+      1234, /* GL_PROGRAM_ATTRIBS_ARB */
+       895, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
+      1246, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
+       908, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
+      1232, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
+       893, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
+      1244, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+       906, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+       901, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
+       897, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
+      1262, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
+      1766, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
+      1311, /* GL_READ_ONLY */
+      1883, /* GL_WRITE_ONLY */
+      1313, /* GL_READ_WRITE */
        102, /* GL_BUFFER_ACCESS */
        105, /* GL_BUFFER_MAPPED */
        107, /* GL_BUFFER_MAP_POINTER */
-      1756, /* GL_TIME_ELAPSED_EXT */
-       809, /* GL_MATRIX0_ARB */
-       821, /* GL_MATRIX1_ARB */
-       833, /* GL_MATRIX2_ARB */
-       837, /* GL_MATRIX3_ARB */
-       839, /* GL_MATRIX4_ARB */
-       841, /* GL_MATRIX5_ARB */
-       843, /* GL_MATRIX6_ARB */
-       845, /* GL_MATRIX7_ARB */
-       847, /* GL_MATRIX8_ARB */
-       848, /* GL_MATRIX9_ARB */
-       811, /* GL_MATRIX10_ARB */
-       812, /* GL_MATRIX11_ARB */
-       813, /* GL_MATRIX12_ARB */
-       814, /* GL_MATRIX13_ARB */
-       815, /* GL_MATRIX14_ARB */
-       816, /* GL_MATRIX15_ARB */
-       817, /* GL_MATRIX16_ARB */
-       818, /* GL_MATRIX17_ARB */
-       819, /* GL_MATRIX18_ARB */
-       820, /* GL_MATRIX19_ARB */
-       823, /* GL_MATRIX20_ARB */
-       824, /* GL_MATRIX21_ARB */
-       825, /* GL_MATRIX22_ARB */
-       826, /* GL_MATRIX23_ARB */
-       827, /* GL_MATRIX24_ARB */
-       828, /* GL_MATRIX25_ARB */
-       829, /* GL_MATRIX26_ARB */
-       830, /* GL_MATRIX27_ARB */
-       831, /* GL_MATRIX28_ARB */
-       832, /* GL_MATRIX29_ARB */
-       835, /* GL_MATRIX30_ARB */
-       836, /* GL_MATRIX31_ARB */
-      1545, /* GL_STREAM_DRAW */
-      1547, /* GL_STREAM_READ */
-      1543, /* GL_STREAM_COPY */
-      1499, /* GL_STATIC_DRAW */
-      1501, /* GL_STATIC_READ */
-      1497, /* GL_STATIC_COPY */
-       454, /* GL_DYNAMIC_DRAW */
-       456, /* GL_DYNAMIC_READ */
-       452, /* GL_DYNAMIC_COPY */
-      1134, /* GL_PIXEL_PACK_BUFFER */
-      1138, /* GL_PIXEL_UNPACK_BUFFER */
-      1135, /* GL_PIXEL_PACK_BUFFER_BINDING */
-      1139, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
-       347, /* GL_DEPTH24_STENCIL8 */
-      1746, /* GL_TEXTURE_STENCIL_SIZE */
-      1698, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
-       895, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
-       898, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
-       902, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
-       901, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
-       858, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
-      1536, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
+      1760, /* GL_TIME_ELAPSED_EXT */
+       810, /* GL_MATRIX0_ARB */
+       822, /* GL_MATRIX1_ARB */
+       834, /* GL_MATRIX2_ARB */
+       838, /* GL_MATRIX3_ARB */
+       840, /* GL_MATRIX4_ARB */
+       842, /* GL_MATRIX5_ARB */
+       844, /* GL_MATRIX6_ARB */
+       846, /* GL_MATRIX7_ARB */
+       848, /* GL_MATRIX8_ARB */
+       849, /* GL_MATRIX9_ARB */
+       812, /* GL_MATRIX10_ARB */
+       813, /* GL_MATRIX11_ARB */
+       814, /* GL_MATRIX12_ARB */
+       815, /* GL_MATRIX13_ARB */
+       816, /* GL_MATRIX14_ARB */
+       817, /* GL_MATRIX15_ARB */
+       818, /* GL_MATRIX16_ARB */
+       819, /* GL_MATRIX17_ARB */
+       820, /* GL_MATRIX18_ARB */
+       821, /* GL_MATRIX19_ARB */
+       824, /* GL_MATRIX20_ARB */
+       825, /* GL_MATRIX21_ARB */
+       826, /* GL_MATRIX22_ARB */
+       827, /* GL_MATRIX23_ARB */
+       828, /* GL_MATRIX24_ARB */
+       829, /* GL_MATRIX25_ARB */
+       830, /* GL_MATRIX26_ARB */
+       831, /* GL_MATRIX27_ARB */
+       832, /* GL_MATRIX28_ARB */
+       833, /* GL_MATRIX29_ARB */
+       836, /* GL_MATRIX30_ARB */
+       837, /* GL_MATRIX31_ARB */
+      1549, /* GL_STREAM_DRAW */
+      1551, /* GL_STREAM_READ */
+      1547, /* GL_STREAM_COPY */
+      1503, /* GL_STATIC_DRAW */
+      1505, /* GL_STATIC_READ */
+      1501, /* GL_STATIC_COPY */
+       455, /* GL_DYNAMIC_DRAW */
+       457, /* GL_DYNAMIC_READ */
+       453, /* GL_DYNAMIC_COPY */
+      1135, /* GL_PIXEL_PACK_BUFFER */
+      1139, /* GL_PIXEL_UNPACK_BUFFER */
+      1136, /* GL_PIXEL_PACK_BUFFER_BINDING */
+      1140, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
+       348, /* GL_DEPTH24_STENCIL8 */
+      1750, /* GL_TEXTURE_STENCIL_SIZE */
+      1702, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
+       896, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
+       899, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
+       903, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
+       902, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
+       859, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
+      1540, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
         17, /* GL_ACTIVE_STENCIL_FACE_EXT */
-       962, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
-      1402, /* GL_SAMPLES_PASSED */
-       109, /* GL_BUFFER_SERIALIZED_MODIFY_APPLE */
+       963, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
+      1406, /* GL_SAMPLES_PASSED */
+       110, /* GL_BUFFER_SERIALIZED_MODIFY_APPLE */
        104, /* GL_BUFFER_FLUSHING_UNMAP_APPLE */
-       537, /* GL_FRAGMENT_SHADER */
-      1862, /* GL_VERTEX_SHADER */
-      1251, /* GL_PROGRAM_OBJECT_ARB */
-      1434, /* GL_SHADER_OBJECT_ARB */
-       883, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
-       945, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
-       939, /* GL_MAX_VARYING_FLOATS */
-       943, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
-       868, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
-      1054, /* GL_OBJECT_TYPE_ARB */
-      1436, /* GL_SHADER_TYPE */
-       502, /* GL_FLOAT_VEC2 */
-       504, /* GL_FLOAT_VEC3 */
-       506, /* GL_FLOAT_VEC4 */
-       660, /* GL_INT_VEC2 */
-       662, /* GL_INT_VEC3 */
-       664, /* GL_INT_VEC4 */
+      1324, /* GL_RELEASED_APPLE */
+      1872, /* GL_VOLATILE_APPLE */
+      1352, /* GL_RETAINED_APPLE */
+      1779, /* GL_UNDEFINED_APPLE */
+      1285, /* GL_PURGEABLE_APPLE */
+       538, /* GL_FRAGMENT_SHADER */
+      1867, /* GL_VERTEX_SHADER */
+      1252, /* GL_PROGRAM_OBJECT_ARB */
+      1438, /* GL_SHADER_OBJECT_ARB */
+       884, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
+       946, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
+       940, /* GL_MAX_VARYING_FLOATS */
+       944, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
+       869, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
+      1055, /* GL_OBJECT_TYPE_ARB */
+      1440, /* GL_SHADER_TYPE */
+       503, /* GL_FLOAT_VEC2 */
+       505, /* GL_FLOAT_VEC3 */
+       507, /* GL_FLOAT_VEC4 */
+       661, /* GL_INT_VEC2 */
+       663, /* GL_INT_VEC3 */
+       665, /* GL_INT_VEC4 */
         94, /* GL_BOOL */
         96, /* GL_BOOL_VEC2 */
         98, /* GL_BOOL_VEC3 */
        100, /* GL_BOOL_VEC4 */
-       490, /* GL_FLOAT_MAT2 */
-       494, /* GL_FLOAT_MAT3 */
-       498, /* GL_FLOAT_MAT4 */
-      1393, /* GL_SAMPLER_1D */
-      1395, /* GL_SAMPLER_2D */
-      1397, /* GL_SAMPLER_3D */
-      1398, /* GL_SAMPLER_CUBE */
-      1394, /* GL_SAMPLER_1D_SHADOW */
-      1396, /* GL_SAMPLER_2D_SHADOW */
-       492, /* GL_FLOAT_MAT2x3 */
-       493, /* GL_FLOAT_MAT2x4 */
-       496, /* GL_FLOAT_MAT3x2 */
-       497, /* GL_FLOAT_MAT3x4 */
-       500, /* GL_FLOAT_MAT4x2 */
-       501, /* GL_FLOAT_MAT4x3 */
-       345, /* GL_DELETE_STATUS */
-       246, /* GL_COMPILE_STATUS */
-       716, /* GL_LINK_STATUS */
-      1810, /* GL_VALIDATE_STATUS */
-       645, /* GL_INFO_LOG_LENGTH */
+       491, /* GL_FLOAT_MAT2 */
+       495, /* GL_FLOAT_MAT3 */
+       499, /* GL_FLOAT_MAT4 */
+      1397, /* GL_SAMPLER_1D */
+      1399, /* GL_SAMPLER_2D */
+      1401, /* GL_SAMPLER_3D */
+      1402, /* GL_SAMPLER_CUBE */
+      1398, /* GL_SAMPLER_1D_SHADOW */
+      1400, /* GL_SAMPLER_2D_SHADOW */
+       493, /* GL_FLOAT_MAT2x3 */
+       494, /* GL_FLOAT_MAT2x4 */
+       497, /* GL_FLOAT_MAT3x2 */
+       498, /* GL_FLOAT_MAT3x4 */
+       501, /* GL_FLOAT_MAT4x2 */
+       502, /* GL_FLOAT_MAT4x3 */
+       346, /* GL_DELETE_STATUS */
+       247, /* GL_COMPILE_STATUS */
+       717, /* GL_LINK_STATUS */
+      1815, /* GL_VALIDATE_STATUS */
+       646, /* GL_INFO_LOG_LENGTH */
         56, /* GL_ATTACHED_SHADERS */
         20, /* GL_ACTIVE_UNIFORMS */
         21, /* GL_ACTIVE_UNIFORM_MAX_LENGTH */
-      1435, /* GL_SHADER_SOURCE_LENGTH */
+      1439, /* GL_SHADER_SOURCE_LENGTH */
         15, /* GL_ACTIVE_ATTRIBUTES */
         16, /* GL_ACTIVE_ATTRIBUTE_MAX_LENGTH */
-       539, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
-      1438, /* GL_SHADING_LANGUAGE_VERSION */
-       322, /* GL_CURRENT_PROGRAM */
-      1103, /* GL_PALETTE4_RGB8_OES */
-      1105, /* GL_PALETTE4_RGBA8_OES */
-      1101, /* GL_PALETTE4_R5_G6_B5_OES */
-      1104, /* GL_PALETTE4_RGBA4_OES */
-      1102, /* GL_PALETTE4_RGB5_A1_OES */
-      1108, /* GL_PALETTE8_RGB8_OES */
-      1110, /* GL_PALETTE8_RGBA8_OES */
-      1106, /* GL_PALETTE8_R5_G6_B5_OES */
-      1109, /* GL_PALETTE8_RGBA4_OES */
-      1107, /* GL_PALETTE8_RGB5_A1_OES */
-       627, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
-       626, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
-      1795, /* GL_UNSIGNED_NORMALIZED */
-      1633, /* GL_TEXTURE_1D_ARRAY_EXT */
-      1273, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
-      1635, /* GL_TEXTURE_2D_ARRAY_EXT */
-      1276, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
-      1641, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
-      1643, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
-      1491, /* GL_SRGB */
-      1492, /* GL_SRGB8 */
-      1494, /* GL_SRGB_ALPHA */
-      1493, /* GL_SRGB8_ALPHA8 */
-      1451, /* GL_SLUMINANCE_ALPHA */
-      1450, /* GL_SLUMINANCE8_ALPHA8 */
-      1448, /* GL_SLUMINANCE */
-      1449, /* GL_SLUMINANCE8 */
-       267, /* GL_COMPRESSED_SRGB */
-       268, /* GL_COMPRESSED_SRGB_ALPHA */
-       265, /* GL_COMPRESSED_SLUMINANCE */
-       266, /* GL_COMPRESSED_SLUMINANCE_ALPHA */
-      1168, /* GL_POINT_SPRITE_COORD_ORIGIN */
-       724, /* GL_LOWER_LEFT */
-      1807, /* GL_UPPER_LEFT */
-      1514, /* GL_STENCIL_BACK_REF */
-      1515, /* GL_STENCIL_BACK_VALUE_MASK */
-      1516, /* GL_STENCIL_BACK_WRITEMASK */
-       444, /* GL_DRAW_FRAMEBUFFER_BINDING */
-      1325, /* GL_RENDERBUFFER_BINDING */
-      1305, /* GL_READ_FRAMEBUFFER */
-       443, /* GL_DRAW_FRAMEBUFFER */
-      1306, /* GL_READ_FRAMEBUFFER_BINDING */
-      1336, /* GL_RENDERBUFFER_SAMPLES */
-       549, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
-       547, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
-       558, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
-       554, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
-       556, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
-       562, /* GL_FRAMEBUFFER_COMPLETE */
-       566, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
-       573, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
-       571, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
-       568, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
-       572, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
-       569, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER */
-       577, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER */
-       581, /* GL_FRAMEBUFFER_UNSUPPORTED */
-       579, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
-       864, /* GL_MAX_COLOR_ATTACHMENTS */
-       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 */
-       349, /* GL_DEPTH_ATTACHMENT */
-      1504, /* GL_STENCIL_ATTACHMENT */
-       540, /* GL_FRAMEBUFFER */
-      1323, /* GL_RENDERBUFFER */
-      1339, /* GL_RENDERBUFFER_WIDTH */
-      1331, /* GL_RENDERBUFFER_HEIGHT */
-      1333, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
-      1531, /* GL_STENCIL_INDEX_EXT */
-      1523, /* GL_STENCIL_INDEX1 */
-      1527, /* GL_STENCIL_INDEX4 */
-      1529, /* GL_STENCIL_INDEX8 */
-      1524, /* GL_STENCIL_INDEX16 */
-      1335, /* GL_RENDERBUFFER_RED_SIZE */
-      1330, /* GL_RENDERBUFFER_GREEN_SIZE */
-      1327, /* GL_RENDERBUFFER_BLUE_SIZE */
-      1324, /* GL_RENDERBUFFER_ALPHA_SIZE */
-      1328, /* GL_RENDERBUFFER_DEPTH_SIZE */
-      1338, /* GL_RENDERBUFFER_STENCIL_SIZE */
-       575, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
-       922, /* GL_MAX_SAMPLES */
-      1300, /* GL_QUERY_WAIT_NV */
-      1295, /* GL_QUERY_NO_WAIT_NV */
-      1292, /* GL_QUERY_BY_REGION_WAIT_NV */
-      1291, /* GL_QUERY_BY_REGION_NO_WAIT_NV */
-      1287, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION */
-       486, /* GL_FIRST_VERTEX_CONVENTION */
-       675, /* GL_LAST_VERTEX_CONVENTION */
-      1265, /* GL_PROVOKING_VERTEX */
-       302, /* GL_COPY_READ_BUFFER */
-       303, /* GL_COPY_WRITE_BUFFER */
-      1386, /* GL_RGBA_SNORM */
-      1382, /* GL_RGBA8_SNORM */
-      1444, /* GL_SIGNED_NORMALIZED */
-       924, /* GL_MAX_SERVER_WAIT_TIMEOUT */
-      1053, /* GL_OBJECT_TYPE */
-      1552, /* GL_SYNC_CONDITION */
-      1557, /* GL_SYNC_STATUS */
-      1554, /* GL_SYNC_FLAGS */
-      1553, /* GL_SYNC_FENCE */
-      1556, /* GL_SYNC_GPU_COMMANDS_COMPLETE */
-      1783, /* GL_UNSIGNALED */
-      1443, /* GL_SIGNALED */
+       540, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
+      1442, /* GL_SHADING_LANGUAGE_VERSION */
+       323, /* GL_CURRENT_PROGRAM */
+      1104, /* GL_PALETTE4_RGB8_OES */
+      1106, /* GL_PALETTE4_RGBA8_OES */
+      1102, /* GL_PALETTE4_R5_G6_B5_OES */
+      1105, /* GL_PALETTE4_RGBA4_OES */
+      1103, /* GL_PALETTE4_RGB5_A1_OES */
+      1109, /* GL_PALETTE8_RGB8_OES */
+      1111, /* GL_PALETTE8_RGBA8_OES */
+      1107, /* GL_PALETTE8_R5_G6_B5_OES */
+      1110, /* GL_PALETTE8_RGBA4_OES */
+      1108, /* GL_PALETTE8_RGB5_A1_OES */
+       628, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
+       627, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
+      1800, /* GL_UNSIGNED_NORMALIZED */
+      1637, /* GL_TEXTURE_1D_ARRAY_EXT */
+      1274, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
+      1639, /* GL_TEXTURE_2D_ARRAY_EXT */
+      1277, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
+      1645, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
+      1647, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
+      1495, /* GL_SRGB */
+      1496, /* GL_SRGB8 */
+      1498, /* GL_SRGB_ALPHA */
+      1497, /* GL_SRGB8_ALPHA8 */
+      1455, /* GL_SLUMINANCE_ALPHA */
+      1454, /* GL_SLUMINANCE8_ALPHA8 */
+      1452, /* GL_SLUMINANCE */
+      1453, /* GL_SLUMINANCE8 */
+       268, /* GL_COMPRESSED_SRGB */
+       269, /* GL_COMPRESSED_SRGB_ALPHA */
+       266, /* GL_COMPRESSED_SLUMINANCE */
+       267, /* GL_COMPRESSED_SLUMINANCE_ALPHA */
+      1169, /* GL_POINT_SPRITE_COORD_ORIGIN */
+       725, /* GL_LOWER_LEFT */
+      1812, /* GL_UPPER_LEFT */
+      1518, /* GL_STENCIL_BACK_REF */
+      1519, /* GL_STENCIL_BACK_VALUE_MASK */
+      1520, /* GL_STENCIL_BACK_WRITEMASK */
+       445, /* GL_DRAW_FRAMEBUFFER_BINDING */
+      1328, /* GL_RENDERBUFFER_BINDING */
+      1307, /* GL_READ_FRAMEBUFFER */
+       444, /* GL_DRAW_FRAMEBUFFER */
+      1308, /* GL_READ_FRAMEBUFFER_BINDING */
+      1339, /* GL_RENDERBUFFER_SAMPLES */
+       550, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
+       548, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
+       559, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
+       555, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
+       557, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
+       563, /* GL_FRAMEBUFFER_COMPLETE */
+       567, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
+       574, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
+       572, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
+       569, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
+       573, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
+       570, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER */
+       578, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER */
+       582, /* GL_FRAMEBUFFER_UNSUPPORTED */
+       580, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
+       865, /* GL_MAX_COLOR_ATTACHMENTS */
+       156, /* GL_COLOR_ATTACHMENT0 */
+       158, /* GL_COLOR_ATTACHMENT1 */
+       172, /* GL_COLOR_ATTACHMENT2 */
+       174, /* GL_COLOR_ATTACHMENT3 */
+       176, /* GL_COLOR_ATTACHMENT4 */
+       178, /* GL_COLOR_ATTACHMENT5 */
+       180, /* GL_COLOR_ATTACHMENT6 */
+       182, /* GL_COLOR_ATTACHMENT7 */
+       184, /* GL_COLOR_ATTACHMENT8 */
+       186, /* GL_COLOR_ATTACHMENT9 */
+       159, /* GL_COLOR_ATTACHMENT10 */
+       161, /* GL_COLOR_ATTACHMENT11 */
+       163, /* GL_COLOR_ATTACHMENT12 */
+       165, /* GL_COLOR_ATTACHMENT13 */
+       167, /* GL_COLOR_ATTACHMENT14 */
+       169, /* GL_COLOR_ATTACHMENT15 */
+       350, /* GL_DEPTH_ATTACHMENT */
+      1508, /* GL_STENCIL_ATTACHMENT */
+       541, /* GL_FRAMEBUFFER */
+      1326, /* GL_RENDERBUFFER */
+      1342, /* GL_RENDERBUFFER_WIDTH */
+      1334, /* GL_RENDERBUFFER_HEIGHT */
+      1336, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
+      1535, /* GL_STENCIL_INDEX_EXT */
+      1527, /* GL_STENCIL_INDEX1 */
+      1531, /* GL_STENCIL_INDEX4 */
+      1533, /* GL_STENCIL_INDEX8 */
+      1528, /* GL_STENCIL_INDEX16 */
+      1338, /* GL_RENDERBUFFER_RED_SIZE */
+      1333, /* GL_RENDERBUFFER_GREEN_SIZE */
+      1330, /* GL_RENDERBUFFER_BLUE_SIZE */
+      1327, /* GL_RENDERBUFFER_ALPHA_SIZE */
+      1331, /* GL_RENDERBUFFER_DEPTH_SIZE */
+      1341, /* GL_RENDERBUFFER_STENCIL_SIZE */
+       576, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
+       923, /* GL_MAX_SAMPLES */
+      1302, /* GL_QUERY_WAIT_NV */
+      1297, /* GL_QUERY_NO_WAIT_NV */
+      1294, /* GL_QUERY_BY_REGION_WAIT_NV */
+      1293, /* GL_QUERY_BY_REGION_NO_WAIT_NV */
+      1289, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION */
+       487, /* GL_FIRST_VERTEX_CONVENTION */
+       676, /* GL_LAST_VERTEX_CONVENTION */
+      1266, /* GL_PROVOKING_VERTEX */
+       303, /* GL_COPY_READ_BUFFER */
+       304, /* GL_COPY_WRITE_BUFFER */
+      1390, /* GL_RGBA_SNORM */
+      1386, /* GL_RGBA8_SNORM */
+      1448, /* GL_SIGNED_NORMALIZED */
+       925, /* GL_MAX_SERVER_WAIT_TIMEOUT */
+      1054, /* GL_OBJECT_TYPE */
+      1556, /* GL_SYNC_CONDITION */
+      1561, /* GL_SYNC_STATUS */
+      1558, /* GL_SYNC_FLAGS */
+      1557, /* GL_SYNC_FENCE */
+      1560, /* GL_SYNC_GPU_COMMANDS_COMPLETE */
+      1788, /* GL_UNSIGNALED */
+      1447, /* GL_SIGNALED */
         46, /* GL_ALREADY_SIGNALED */
-      1755, /* GL_TIMEOUT_EXPIRED */
-       270, /* GL_CONDITION_SATISFIED */
-      1867, /* GL_WAIT_FAILED */
-       471, /* GL_EVAL_BIT */
-      1303, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
-       718, /* GL_LIST_BIT */
-      1649, /* GL_TEXTURE_BIT */
-      1417, /* GL_SCISSOR_BIT */
+      1759, /* GL_TIMEOUT_EXPIRED */
+       271, /* GL_CONDITION_SATISFIED */
+      1873, /* GL_WAIT_FAILED */
+       472, /* GL_EVAL_BIT */
+      1305, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
+       719, /* GL_LIST_BIT */
+      1653, /* GL_TEXTURE_BIT */
+      1421, /* GL_SCISSOR_BIT */
         29, /* GL_ALL_ATTRIB_BITS */
-      1009, /* GL_MULTISAMPLE_BIT */
+      1010, /* GL_MULTISAMPLE_BIT */
         30, /* GL_ALL_CLIENT_ATTRIB_BITS */
 };
 
diff --git a/src/mesa/main/remap_helper.h b/src/mesa/main/remap_helper.h
index 0a5b629688..ee898efa5f 100644
--- a/src/mesa/main/remap_helper.h
+++ b/src/mesa/main/remap_helper.h
@@ -733,3634 +733,3646 @@ static const char _mesa_function_pool[] =
    "glMultTransposeMatrixd\0"
    "glMultTransposeMatrixdARB\0"
    "\0"
-   /* _mesa_function_pool[4900]: AlphaFunc (offset 240) */
+   /* _mesa_function_pool[4900]: ObjectUnpurgeableAPPLE (will be remapped) */
+   "iii\0"
+   "glObjectUnpurgeableAPPLE\0"
+   "\0"
+   /* _mesa_function_pool[4930]: AlphaFunc (offset 240) */
    "if\0"
    "glAlphaFunc\0"
    "\0"
-   /* _mesa_function_pool[4916]: WindowPos2svMESA (will be remapped) */
+   /* _mesa_function_pool[4946]: WindowPos2svMESA (will be remapped) */
    "p\0"
    "glWindowPos2sv\0"
    "glWindowPos2svARB\0"
    "glWindowPos2svMESA\0"
    "\0"
-   /* _mesa_function_pool[4971]: EdgeFlag (offset 41) */
+   /* _mesa_function_pool[5001]: EdgeFlag (offset 41) */
    "i\0"
    "glEdgeFlag\0"
    "\0"
-   /* _mesa_function_pool[4985]: TexCoord2iv (offset 107) */
+   /* _mesa_function_pool[5015]: TexCoord2iv (offset 107) */
    "p\0"
    "glTexCoord2iv\0"
    "\0"
-   /* _mesa_function_pool[5002]: CompressedTexImage1DARB (will be remapped) */
+   /* _mesa_function_pool[5032]: CompressedTexImage1DARB (will be remapped) */
    "iiiiiip\0"
    "glCompressedTexImage1D\0"
    "glCompressedTexImage1DARB\0"
    "\0"
-   /* _mesa_function_pool[5060]: Rotated (offset 299) */
+   /* _mesa_function_pool[5090]: Rotated (offset 299) */
    "dddd\0"
    "glRotated\0"
    "\0"
-   /* _mesa_function_pool[5076]: VertexAttrib2sNV (will be remapped) */
+   /* _mesa_function_pool[5106]: VertexAttrib2sNV (will be remapped) */
    "iii\0"
    "glVertexAttrib2sNV\0"
    "\0"
-   /* _mesa_function_pool[5100]: ReadPixels (offset 256) */
+   /* _mesa_function_pool[5130]: ReadPixels (offset 256) */
    "iiiiiip\0"
    "glReadPixels\0"
    "\0"
-   /* _mesa_function_pool[5122]: EdgeFlagv (offset 42) */
+   /* _mesa_function_pool[5152]: EdgeFlagv (offset 42) */
    "p\0"
    "glEdgeFlagv\0"
    "\0"
-   /* _mesa_function_pool[5137]: NormalPointerListIBM (dynamic) */
+   /* _mesa_function_pool[5167]: NormalPointerListIBM (dynamic) */
    "iipi\0"
    "glNormalPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[5166]: IndexPointerEXT (will be remapped) */
+   /* _mesa_function_pool[5196]: IndexPointerEXT (will be remapped) */
    "iiip\0"
    "glIndexPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[5190]: Color4iv (offset 32) */
+   /* _mesa_function_pool[5220]: Color4iv (offset 32) */
    "p\0"
    "glColor4iv\0"
    "\0"
-   /* _mesa_function_pool[5204]: TexParameterf (offset 178) */
+   /* _mesa_function_pool[5234]: TexParameterf (offset 178) */
    "iif\0"
    "glTexParameterf\0"
    "\0"
-   /* _mesa_function_pool[5225]: TexParameteri (offset 180) */
+   /* _mesa_function_pool[5255]: TexParameteri (offset 180) */
    "iii\0"
    "glTexParameteri\0"
    "\0"
-   /* _mesa_function_pool[5246]: NormalPointerEXT (will be remapped) */
+   /* _mesa_function_pool[5276]: NormalPointerEXT (will be remapped) */
    "iiip\0"
    "glNormalPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[5271]: MultiTexCoord3dARB (offset 392) */
+   /* _mesa_function_pool[5301]: MultiTexCoord3dARB (offset 392) */
    "iddd\0"
    "glMultiTexCoord3d\0"
    "glMultiTexCoord3dARB\0"
    "\0"
-   /* _mesa_function_pool[5316]: MultiTexCoord2iARB (offset 388) */
+   /* _mesa_function_pool[5346]: MultiTexCoord2iARB (offset 388) */
    "iii\0"
    "glMultiTexCoord2i\0"
    "glMultiTexCoord2iARB\0"
    "\0"
-   /* _mesa_function_pool[5360]: DrawPixels (offset 257) */
+   /* _mesa_function_pool[5390]: DrawPixels (offset 257) */
    "iiiip\0"
    "glDrawPixels\0"
    "\0"
-   /* _mesa_function_pool[5380]: ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[5410]: ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (dynamic) */
    "iffffffff\0"
    "glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[5440]: MultiTexCoord2svARB (offset 391) */
+   /* _mesa_function_pool[5470]: MultiTexCoord2svARB (offset 391) */
    "ip\0"
    "glMultiTexCoord2sv\0"
    "glMultiTexCoord2svARB\0"
    "\0"
-   /* _mesa_function_pool[5485]: ReplacementCodeubvSUN (dynamic) */
+   /* _mesa_function_pool[5515]: ReplacementCodeubvSUN (dynamic) */
    "p\0"
    "glReplacementCodeubvSUN\0"
    "\0"
-   /* _mesa_function_pool[5512]: Uniform3iARB (will be remapped) */
+   /* _mesa_function_pool[5542]: Uniform3iARB (will be remapped) */
    "iiii\0"
    "glUniform3i\0"
    "glUniform3iARB\0"
    "\0"
-   /* _mesa_function_pool[5545]: GetFragmentMaterialfvSGIX (dynamic) */
+   /* _mesa_function_pool[5575]: GetFragmentMaterialfvSGIX (dynamic) */
    "iip\0"
    "glGetFragmentMaterialfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[5578]: GetShaderInfoLog (will be remapped) */
+   /* _mesa_function_pool[5608]: GetShaderInfoLog (will be remapped) */
    "iipp\0"
    "glGetShaderInfoLog\0"
    "\0"
-   /* _mesa_function_pool[5603]: WeightivARB (dynamic) */
+   /* _mesa_function_pool[5633]: WeightivARB (dynamic) */
    "ip\0"
    "glWeightivARB\0"
    "\0"
-   /* _mesa_function_pool[5621]: PollInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[5651]: PollInstrumentsSGIX (dynamic) */
    "p\0"
    "glPollInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[5646]: GlobalAlphaFactordSUN (dynamic) */
+   /* _mesa_function_pool[5676]: GlobalAlphaFactordSUN (dynamic) */
    "d\0"
    "glGlobalAlphaFactordSUN\0"
    "\0"
-   /* _mesa_function_pool[5673]: GetFinalCombinerInputParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[5703]: GetFinalCombinerInputParameterfvNV (will be remapped) */
    "iip\0"
    "glGetFinalCombinerInputParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[5715]: GenerateMipmapEXT (will be remapped) */
+   /* _mesa_function_pool[5745]: GenerateMipmapEXT (will be remapped) */
    "i\0"
    "glGenerateMipmap\0"
    "glGenerateMipmapEXT\0"
    "\0"
-   /* _mesa_function_pool[5755]: GenLists (offset 5) */
+   /* _mesa_function_pool[5785]: GenLists (offset 5) */
    "i\0"
    "glGenLists\0"
    "\0"
-   /* _mesa_function_pool[5769]: SetFragmentShaderConstantATI (will be remapped) */
+   /* _mesa_function_pool[5799]: SetFragmentShaderConstantATI (will be remapped) */
    "ip\0"
    "glSetFragmentShaderConstantATI\0"
    "\0"
-   /* _mesa_function_pool[5804]: GetMapAttribParameterivNV (dynamic) */
+   /* _mesa_function_pool[5834]: GetMapAttribParameterivNV (dynamic) */
    "iiip\0"
    "glGetMapAttribParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[5838]: CreateShaderObjectARB (will be remapped) */
+   /* _mesa_function_pool[5868]: CreateShaderObjectARB (will be remapped) */
    "i\0"
    "glCreateShaderObjectARB\0"
    "\0"
-   /* _mesa_function_pool[5865]: GetSharpenTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[5895]: GetSharpenTexFuncSGIS (dynamic) */
    "ip\0"
    "glGetSharpenTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[5893]: BufferDataARB (will be remapped) */
+   /* _mesa_function_pool[5923]: BufferDataARB (will be remapped) */
    "iipi\0"
    "glBufferData\0"
    "glBufferDataARB\0"
    "\0"
-   /* _mesa_function_pool[5928]: FlushVertexArrayRangeNV (will be remapped) */
+   /* _mesa_function_pool[5958]: FlushVertexArrayRangeNV (will be remapped) */
    "\0"
    "glFlushVertexArrayRangeNV\0"
    "\0"
-   /* _mesa_function_pool[5956]: MapGrid2d (offset 226) */
+   /* _mesa_function_pool[5986]: MapGrid2d (offset 226) */
    "iddidd\0"
    "glMapGrid2d\0"
    "\0"
-   /* _mesa_function_pool[5976]: MapGrid2f (offset 227) */
+   /* _mesa_function_pool[6006]: MapGrid2f (offset 227) */
    "iffiff\0"
    "glMapGrid2f\0"
    "\0"
-   /* _mesa_function_pool[5996]: SampleMapATI (will be remapped) */
+   /* _mesa_function_pool[6026]: SampleMapATI (will be remapped) */
    "iii\0"
    "glSampleMapATI\0"
    "\0"
-   /* _mesa_function_pool[6016]: VertexPointerEXT (will be remapped) */
+   /* _mesa_function_pool[6046]: VertexPointerEXT (will be remapped) */
    "iiiip\0"
    "glVertexPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[6042]: GetTexFilterFuncSGIS (dynamic) */
+   /* _mesa_function_pool[6072]: GetTexFilterFuncSGIS (dynamic) */
    "iip\0"
    "glGetTexFilterFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[6070]: Scissor (offset 176) */
+   /* _mesa_function_pool[6100]: Scissor (offset 176) */
    "iiii\0"
    "glScissor\0"
    "\0"
-   /* _mesa_function_pool[6086]: Fogf (offset 153) */
+   /* _mesa_function_pool[6116]: Fogf (offset 153) */
    "if\0"
    "glFogf\0"
    "\0"
-   /* _mesa_function_pool[6097]: GetCombinerOutputParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[6127]: GetCombinerOutputParameterfvNV (will be remapped) */
    "iiip\0"
    "glGetCombinerOutputParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[6136]: TexSubImage1D (offset 332) */
+   /* _mesa_function_pool[6166]: TexSubImage1D (offset 332) */
    "iiiiiip\0"
    "glTexSubImage1D\0"
    "glTexSubImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[6180]: VertexAttrib1sARB (will be remapped) */
+   /* _mesa_function_pool[6210]: VertexAttrib1sARB (will be remapped) */
    "ii\0"
    "glVertexAttrib1s\0"
    "glVertexAttrib1sARB\0"
    "\0"
-   /* _mesa_function_pool[6221]: FenceSync (will be remapped) */
+   /* _mesa_function_pool[6251]: FenceSync (will be remapped) */
    "ii\0"
    "glFenceSync\0"
    "\0"
-   /* _mesa_function_pool[6237]: Color4usv (offset 40) */
+   /* _mesa_function_pool[6267]: Color4usv (offset 40) */
    "p\0"
    "glColor4usv\0"
    "\0"
-   /* _mesa_function_pool[6252]: Fogi (offset 155) */
+   /* _mesa_function_pool[6282]: Fogi (offset 155) */
    "ii\0"
    "glFogi\0"
    "\0"
-   /* _mesa_function_pool[6263]: DepthRange (offset 288) */
+   /* _mesa_function_pool[6293]: DepthRange (offset 288) */
    "dd\0"
    "glDepthRange\0"
    "\0"
-   /* _mesa_function_pool[6280]: RasterPos3iv (offset 75) */
+   /* _mesa_function_pool[6310]: RasterPos3iv (offset 75) */
    "p\0"
    "glRasterPos3iv\0"
    "\0"
-   /* _mesa_function_pool[6298]: FinalCombinerInputNV (will be remapped) */
+   /* _mesa_function_pool[6328]: FinalCombinerInputNV (will be remapped) */
    "iiii\0"
    "glFinalCombinerInputNV\0"
    "\0"
-   /* _mesa_function_pool[6327]: TexCoord2i (offset 106) */
+   /* _mesa_function_pool[6357]: TexCoord2i (offset 106) */
    "ii\0"
    "glTexCoord2i\0"
    "\0"
-   /* _mesa_function_pool[6344]: PixelMapfv (offset 251) */
+   /* _mesa_function_pool[6374]: PixelMapfv (offset 251) */
    "iip\0"
    "glPixelMapfv\0"
    "\0"
-   /* _mesa_function_pool[6362]: Color4ui (offset 37) */
+   /* _mesa_function_pool[6392]: Color4ui (offset 37) */
    "iiii\0"
    "glColor4ui\0"
    "\0"
-   /* _mesa_function_pool[6379]: RasterPos3s (offset 76) */
+   /* _mesa_function_pool[6409]: RasterPos3s (offset 76) */
    "iii\0"
    "glRasterPos3s\0"
    "\0"
-   /* _mesa_function_pool[6398]: Color3usv (offset 24) */
+   /* _mesa_function_pool[6428]: Color3usv (offset 24) */
    "p\0"
    "glColor3usv\0"
    "\0"
-   /* _mesa_function_pool[6413]: FlushRasterSGIX (dynamic) */
+   /* _mesa_function_pool[6443]: FlushRasterSGIX (dynamic) */
    "\0"
    "glFlushRasterSGIX\0"
    "\0"
-   /* _mesa_function_pool[6433]: TexCoord2f (offset 104) */
+   /* _mesa_function_pool[6463]: TexCoord2f (offset 104) */
    "ff\0"
    "glTexCoord2f\0"
    "\0"
-   /* _mesa_function_pool[6450]: ReplacementCodeuiTexCoord2fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[6480]: ReplacementCodeuiTexCoord2fVertex3fSUN (dynamic) */
    "ifffff\0"
    "glReplacementCodeuiTexCoord2fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[6499]: TexCoord2d (offset 102) */
+   /* _mesa_function_pool[6529]: TexCoord2d (offset 102) */
    "dd\0"
    "glTexCoord2d\0"
    "\0"
-   /* _mesa_function_pool[6516]: RasterPos3d (offset 70) */
+   /* _mesa_function_pool[6546]: RasterPos3d (offset 70) */
    "ddd\0"
    "glRasterPos3d\0"
    "\0"
-   /* _mesa_function_pool[6535]: RasterPos3f (offset 72) */
+   /* _mesa_function_pool[6565]: RasterPos3f (offset 72) */
    "fff\0"
    "glRasterPos3f\0"
    "\0"
-   /* _mesa_function_pool[6554]: Uniform1fARB (will be remapped) */
+   /* _mesa_function_pool[6584]: Uniform1fARB (will be remapped) */
    "if\0"
    "glUniform1f\0"
    "glUniform1fARB\0"
    "\0"
-   /* _mesa_function_pool[6585]: AreTexturesResident (offset 322) */
+   /* _mesa_function_pool[6615]: AreTexturesResident (offset 322) */
    "ipp\0"
    "glAreTexturesResident\0"
    "glAreTexturesResidentEXT\0"
    "\0"
-   /* _mesa_function_pool[6637]: TexCoord2s (offset 108) */
+   /* _mesa_function_pool[6667]: TexCoord2s (offset 108) */
    "ii\0"
    "glTexCoord2s\0"
    "\0"
-   /* _mesa_function_pool[6654]: StencilOpSeparate (will be remapped) */
+   /* _mesa_function_pool[6684]: StencilOpSeparate (will be remapped) */
    "iiii\0"
    "glStencilOpSeparate\0"
    "glStencilOpSeparateATI\0"
    "\0"
-   /* _mesa_function_pool[6703]: ColorTableParameteriv (offset 341) */
+   /* _mesa_function_pool[6733]: ColorTableParameteriv (offset 341) */
    "iip\0"
    "glColorTableParameteriv\0"
    "glColorTableParameterivSGI\0"
    "\0"
-   /* _mesa_function_pool[6759]: FogCoordPointerListIBM (dynamic) */
+   /* _mesa_function_pool[6789]: FogCoordPointerListIBM (dynamic) */
    "iipi\0"
    "glFogCoordPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[6790]: WindowPos3dMESA (will be remapped) */
+   /* _mesa_function_pool[6820]: WindowPos3dMESA (will be remapped) */
    "ddd\0"
    "glWindowPos3d\0"
    "glWindowPos3dARB\0"
    "glWindowPos3dMESA\0"
    "\0"
-   /* _mesa_function_pool[6844]: Color4us (offset 39) */
+   /* _mesa_function_pool[6874]: Color4us (offset 39) */
    "iiii\0"
    "glColor4us\0"
    "\0"
-   /* _mesa_function_pool[6861]: PointParameterfvEXT (will be remapped) */
+   /* _mesa_function_pool[6891]: PointParameterfvEXT (will be remapped) */
    "ip\0"
    "glPointParameterfv\0"
    "glPointParameterfvARB\0"
    "glPointParameterfvEXT\0"
    "glPointParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[6951]: Color3bv (offset 10) */
+   /* _mesa_function_pool[6981]: Color3bv (offset 10) */
    "p\0"
    "glColor3bv\0"
    "\0"
-   /* _mesa_function_pool[6965]: WindowPos2fvMESA (will be remapped) */
+   /* _mesa_function_pool[6995]: WindowPos2fvMESA (will be remapped) */
    "p\0"
    "glWindowPos2fv\0"
    "glWindowPos2fvARB\0"
    "glWindowPos2fvMESA\0"
    "\0"
-   /* _mesa_function_pool[7020]: SecondaryColor3bvEXT (will be remapped) */
+   /* _mesa_function_pool[7050]: SecondaryColor3bvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3bv\0"
    "glSecondaryColor3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[7066]: VertexPointerListIBM (dynamic) */
+   /* _mesa_function_pool[7096]: VertexPointerListIBM (dynamic) */
    "iiipi\0"
    "glVertexPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[7096]: GetProgramLocalParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[7126]: GetProgramLocalParameterfvARB (will be remapped) */
    "iip\0"
    "glGetProgramLocalParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[7133]: FragmentMaterialfSGIX (dynamic) */
+   /* _mesa_function_pool[7163]: FragmentMaterialfSGIX (dynamic) */
    "iif\0"
    "glFragmentMaterialfSGIX\0"
    "\0"
-   /* _mesa_function_pool[7162]: TexCoord2fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[7192]: TexCoord2fNormal3fVertex3fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord2fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[7204]: RenderbufferStorageEXT (will be remapped) */
+   /* _mesa_function_pool[7234]: RenderbufferStorageEXT (will be remapped) */
    "iiii\0"
    "glRenderbufferStorage\0"
    "glRenderbufferStorageEXT\0"
    "\0"
-   /* _mesa_function_pool[7257]: IsFenceNV (will be remapped) */
+   /* _mesa_function_pool[7287]: IsFenceNV (will be remapped) */
    "i\0"
    "glIsFenceNV\0"
    "\0"
-   /* _mesa_function_pool[7272]: AttachObjectARB (will be remapped) */
+   /* _mesa_function_pool[7302]: AttachObjectARB (will be remapped) */
    "ii\0"
    "glAttachObjectARB\0"
    "\0"
-   /* _mesa_function_pool[7294]: GetFragmentLightivSGIX (dynamic) */
+   /* _mesa_function_pool[7324]: GetFragmentLightivSGIX (dynamic) */
    "iip\0"
    "glGetFragmentLightivSGIX\0"
    "\0"
-   /* _mesa_function_pool[7324]: UniformMatrix2fvARB (will be remapped) */
+   /* _mesa_function_pool[7354]: UniformMatrix2fvARB (will be remapped) */
    "iiip\0"
    "glUniformMatrix2fv\0"
    "glUniformMatrix2fvARB\0"
    "\0"
-   /* _mesa_function_pool[7371]: MultiTexCoord2fARB (offset 386) */
+   /* _mesa_function_pool[7401]: MultiTexCoord2fARB (offset 386) */
    "iff\0"
    "glMultiTexCoord2f\0"
    "glMultiTexCoord2fARB\0"
    "\0"
-   /* _mesa_function_pool[7415]: ColorTable (offset 339) */
+   /* _mesa_function_pool[7445]: ColorTable (offset 339) */
    "iiiiip\0"
    "glColorTable\0"
    "glColorTableSGI\0"
    "glColorTableEXT\0"
    "\0"
-   /* _mesa_function_pool[7468]: IndexPointer (offset 314) */
+   /* _mesa_function_pool[7498]: IndexPointer (offset 314) */
    "iip\0"
    "glIndexPointer\0"
    "\0"
-   /* _mesa_function_pool[7488]: Accum (offset 213) */
+   /* _mesa_function_pool[7518]: Accum (offset 213) */
    "if\0"
    "glAccum\0"
    "\0"
-   /* _mesa_function_pool[7500]: GetTexImage (offset 281) */
+   /* _mesa_function_pool[7530]: GetTexImage (offset 281) */
    "iiiip\0"
    "glGetTexImage\0"
    "\0"
-   /* _mesa_function_pool[7521]: MapControlPointsNV (dynamic) */
+   /* _mesa_function_pool[7551]: MapControlPointsNV (dynamic) */
    "iiiiiiiip\0"
    "glMapControlPointsNV\0"
    "\0"
-   /* _mesa_function_pool[7553]: ConvolutionFilter2D (offset 349) */
+   /* _mesa_function_pool[7583]: ConvolutionFilter2D (offset 349) */
    "iiiiiip\0"
    "glConvolutionFilter2D\0"
    "glConvolutionFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[7609]: Finish (offset 216) */
+   /* _mesa_function_pool[7639]: Finish (offset 216) */
    "\0"
    "glFinish\0"
    "\0"
-   /* _mesa_function_pool[7620]: MapParameterfvNV (dynamic) */
+   /* _mesa_function_pool[7650]: MapParameterfvNV (dynamic) */
    "iip\0"
    "glMapParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[7644]: ClearStencil (offset 207) */
+   /* _mesa_function_pool[7674]: ClearStencil (offset 207) */
    "i\0"
    "glClearStencil\0"
    "\0"
-   /* _mesa_function_pool[7662]: VertexAttrib3dvARB (will be remapped) */
+   /* _mesa_function_pool[7692]: VertexAttrib3dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3dv\0"
    "glVertexAttrib3dvARB\0"
    "\0"
-   /* _mesa_function_pool[7705]: HintPGI (dynamic) */
+   /* _mesa_function_pool[7735]: HintPGI (dynamic) */
    "ii\0"
    "glHintPGI\0"
    "\0"
-   /* _mesa_function_pool[7719]: ConvolutionParameteriv (offset 353) */
+   /* _mesa_function_pool[7749]: ConvolutionParameteriv (offset 353) */
    "iip\0"
    "glConvolutionParameteriv\0"
    "glConvolutionParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[7777]: Color4s (offset 33) */
+   /* _mesa_function_pool[7807]: Color4s (offset 33) */
    "iiii\0"
    "glColor4s\0"
    "\0"
-   /* _mesa_function_pool[7793]: InterleavedArrays (offset 317) */
+   /* _mesa_function_pool[7823]: InterleavedArrays (offset 317) */
    "iip\0"
    "glInterleavedArrays\0"
    "\0"
-   /* _mesa_function_pool[7818]: RasterPos2fv (offset 65) */
+   /* _mesa_function_pool[7848]: RasterPos2fv (offset 65) */
    "p\0"
    "glRasterPos2fv\0"
    "\0"
-   /* _mesa_function_pool[7836]: TexCoord1fv (offset 97) */
+   /* _mesa_function_pool[7866]: TexCoord1fv (offset 97) */
    "p\0"
    "glTexCoord1fv\0"
    "\0"
-   /* _mesa_function_pool[7853]: Vertex2d (offset 126) */
+   /* _mesa_function_pool[7883]: Vertex2d (offset 126) */
    "dd\0"
    "glVertex2d\0"
    "\0"
-   /* _mesa_function_pool[7868]: CullParameterdvEXT (will be remapped) */
+   /* _mesa_function_pool[7898]: CullParameterdvEXT (will be remapped) */
    "ip\0"
    "glCullParameterdvEXT\0"
    "\0"
-   /* _mesa_function_pool[7893]: ProgramNamedParameter4fNV (will be remapped) */
+   /* _mesa_function_pool[7923]: ProgramNamedParameter4fNV (will be remapped) */
    "iipffff\0"
    "glProgramNamedParameter4fNV\0"
    "\0"
-   /* _mesa_function_pool[7930]: Color3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[7960]: Color3fVertex3fSUN (dynamic) */
    "ffffff\0"
    "glColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[7959]: ProgramEnvParameter4fvARB (will be remapped) */
+   /* _mesa_function_pool[7989]: ProgramEnvParameter4fvARB (will be remapped) */
    "iip\0"
    "glProgramEnvParameter4fvARB\0"
    "glProgramParameter4fvNV\0"
    "\0"
-   /* _mesa_function_pool[8016]: Color4i (offset 31) */
+   /* _mesa_function_pool[8046]: Color4i (offset 31) */
    "iiii\0"
    "glColor4i\0"
    "\0"
-   /* _mesa_function_pool[8032]: Color4f (offset 29) */
+   /* _mesa_function_pool[8062]: Color4f (offset 29) */
    "ffff\0"
    "glColor4f\0"
    "\0"
-   /* _mesa_function_pool[8048]: RasterPos4fv (offset 81) */
+   /* _mesa_function_pool[8078]: RasterPos4fv (offset 81) */
    "p\0"
    "glRasterPos4fv\0"
    "\0"
-   /* _mesa_function_pool[8066]: Color4d (offset 27) */
+   /* _mesa_function_pool[8096]: Color4d (offset 27) */
    "dddd\0"
    "glColor4d\0"
    "\0"
-   /* _mesa_function_pool[8082]: ClearIndex (offset 205) */
+   /* _mesa_function_pool[8112]: ClearIndex (offset 205) */
    "f\0"
    "glClearIndex\0"
    "\0"
-   /* _mesa_function_pool[8098]: Color4b (offset 25) */
+   /* _mesa_function_pool[8128]: Color4b (offset 25) */
    "iiii\0"
    "glColor4b\0"
    "\0"
-   /* _mesa_function_pool[8114]: LoadMatrixd (offset 292) */
+   /* _mesa_function_pool[8144]: LoadMatrixd (offset 292) */
    "p\0"
    "glLoadMatrixd\0"
    "\0"
-   /* _mesa_function_pool[8131]: FragmentLightModeliSGIX (dynamic) */
+   /* _mesa_function_pool[8161]: FragmentLightModeliSGIX (dynamic) */
    "ii\0"
    "glFragmentLightModeliSGIX\0"
    "\0"
-   /* _mesa_function_pool[8161]: RasterPos2dv (offset 63) */
+   /* _mesa_function_pool[8191]: RasterPos2dv (offset 63) */
    "p\0"
    "glRasterPos2dv\0"
    "\0"
-   /* _mesa_function_pool[8179]: ConvolutionParameterfv (offset 351) */
+   /* _mesa_function_pool[8209]: ConvolutionParameterfv (offset 351) */
    "iip\0"
    "glConvolutionParameterfv\0"
    "glConvolutionParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[8237]: TbufferMask3DFX (dynamic) */
+   /* _mesa_function_pool[8267]: TbufferMask3DFX (dynamic) */
    "i\0"
    "glTbufferMask3DFX\0"
    "\0"
-   /* _mesa_function_pool[8258]: GetTexGendv (offset 278) */
+   /* _mesa_function_pool[8288]: GetTexGendv (offset 278) */
    "iip\0"
    "glGetTexGendv\0"
    "\0"
-   /* _mesa_function_pool[8277]: ColorMaskIndexedEXT (will be remapped) */
+   /* _mesa_function_pool[8307]: ColorMaskIndexedEXT (will be remapped) */
    "iiiii\0"
    "glColorMaskIndexedEXT\0"
    "\0"
-   /* _mesa_function_pool[8306]: LoadProgramNV (will be remapped) */
+   /* _mesa_function_pool[8336]: LoadProgramNV (will be remapped) */
    "iiip\0"
    "glLoadProgramNV\0"
    "\0"
-   /* _mesa_function_pool[8328]: WaitSync (will be remapped) */
+   /* _mesa_function_pool[8358]: WaitSync (will be remapped) */
    "iii\0"
    "glWaitSync\0"
    "\0"
-   /* _mesa_function_pool[8344]: EndList (offset 1) */
+   /* _mesa_function_pool[8374]: EndList (offset 1) */
    "\0"
    "glEndList\0"
    "\0"
-   /* _mesa_function_pool[8356]: VertexAttrib4fvNV (will be remapped) */
+   /* _mesa_function_pool[8386]: VertexAttrib4fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4fvNV\0"
    "\0"
-   /* _mesa_function_pool[8380]: GetAttachedObjectsARB (will be remapped) */
+   /* _mesa_function_pool[8410]: GetAttachedObjectsARB (will be remapped) */
    "iipp\0"
    "glGetAttachedObjectsARB\0"
    "\0"
-   /* _mesa_function_pool[8410]: Uniform3fvARB (will be remapped) */
+   /* _mesa_function_pool[8440]: Uniform3fvARB (will be remapped) */
    "iip\0"
    "glUniform3fv\0"
    "glUniform3fvARB\0"
    "\0"
-   /* _mesa_function_pool[8444]: EvalCoord1fv (offset 231) */
+   /* _mesa_function_pool[8474]: EvalCoord1fv (offset 231) */
    "p\0"
    "glEvalCoord1fv\0"
    "\0"
-   /* _mesa_function_pool[8462]: DrawRangeElements (offset 338) */
+   /* _mesa_function_pool[8492]: DrawRangeElements (offset 338) */
    "iiiiip\0"
    "glDrawRangeElements\0"
    "glDrawRangeElementsEXT\0"
    "\0"
-   /* _mesa_function_pool[8513]: EvalMesh2 (offset 238) */
+   /* _mesa_function_pool[8543]: EvalMesh2 (offset 238) */
    "iiiii\0"
    "glEvalMesh2\0"
    "\0"
-   /* _mesa_function_pool[8532]: Vertex4fv (offset 145) */
+   /* _mesa_function_pool[8562]: Vertex4fv (offset 145) */
    "p\0"
    "glVertex4fv\0"
    "\0"
-   /* _mesa_function_pool[8547]: SpriteParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[8577]: SpriteParameterfvSGIX (dynamic) */
    "ip\0"
    "glSpriteParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[8575]: CheckFramebufferStatusEXT (will be remapped) */
+   /* _mesa_function_pool[8605]: CheckFramebufferStatusEXT (will be remapped) */
    "i\0"
    "glCheckFramebufferStatus\0"
    "glCheckFramebufferStatusEXT\0"
    "\0"
-   /* _mesa_function_pool[8631]: GlobalAlphaFactoruiSUN (dynamic) */
+   /* _mesa_function_pool[8661]: GlobalAlphaFactoruiSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactoruiSUN\0"
    "\0"
-   /* _mesa_function_pool[8659]: GetHandleARB (will be remapped) */
+   /* _mesa_function_pool[8689]: GetHandleARB (will be remapped) */
    "i\0"
    "glGetHandleARB\0"
    "\0"
-   /* _mesa_function_pool[8677]: GetVertexAttribivARB (will be remapped) */
+   /* _mesa_function_pool[8707]: GetVertexAttribivARB (will be remapped) */
    "iip\0"
    "glGetVertexAttribiv\0"
    "glGetVertexAttribivARB\0"
    "\0"
-   /* _mesa_function_pool[8725]: GetCombinerInputParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[8755]: GetCombinerInputParameterfvNV (will be remapped) */
    "iiiip\0"
    "glGetCombinerInputParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[8764]: CreateProgram (will be remapped) */
+   /* _mesa_function_pool[8794]: CreateProgram (will be remapped) */
    "\0"
    "glCreateProgram\0"
    "\0"
-   /* _mesa_function_pool[8782]: LoadTransposeMatrixdARB (will be remapped) */
+   /* _mesa_function_pool[8812]: LoadTransposeMatrixdARB (will be remapped) */
    "p\0"
    "glLoadTransposeMatrixd\0"
    "glLoadTransposeMatrixdARB\0"
    "\0"
-   /* _mesa_function_pool[8834]: GetMinmax (offset 364) */
+   /* _mesa_function_pool[8864]: GetMinmax (offset 364) */
    "iiiip\0"
    "glGetMinmax\0"
    "glGetMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[8868]: StencilFuncSeparate (will be remapped) */
+   /* _mesa_function_pool[8898]: StencilFuncSeparate (will be remapped) */
    "iiii\0"
    "glStencilFuncSeparate\0"
    "\0"
-   /* _mesa_function_pool[8896]: SecondaryColor3sEXT (will be remapped) */
+   /* _mesa_function_pool[8926]: SecondaryColor3sEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3s\0"
    "glSecondaryColor3sEXT\0"
    "\0"
-   /* _mesa_function_pool[8942]: Color3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[8972]: Color3fVertex3fvSUN (dynamic) */
    "pp\0"
    "glColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[8968]: Normal3fv (offset 57) */
+   /* _mesa_function_pool[8998]: Normal3fv (offset 57) */
    "p\0"
    "glNormal3fv\0"
    "\0"
-   /* _mesa_function_pool[8983]: GlobalAlphaFactorbSUN (dynamic) */
+   /* _mesa_function_pool[9013]: GlobalAlphaFactorbSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorbSUN\0"
    "\0"
-   /* _mesa_function_pool[9010]: Color3us (offset 23) */
+   /* _mesa_function_pool[9040]: Color3us (offset 23) */
    "iii\0"
    "glColor3us\0"
    "\0"
-   /* _mesa_function_pool[9026]: ImageTransformParameterfvHP (dynamic) */
+   /* _mesa_function_pool[9056]: ImageTransformParameterfvHP (dynamic) */
    "iip\0"
    "glImageTransformParameterfvHP\0"
    "\0"
-   /* _mesa_function_pool[9061]: VertexAttrib4ivARB (will be remapped) */
+   /* _mesa_function_pool[9091]: VertexAttrib4ivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4iv\0"
    "glVertexAttrib4ivARB\0"
    "\0"
-   /* _mesa_function_pool[9104]: End (offset 43) */
+   /* _mesa_function_pool[9134]: End (offset 43) */
    "\0"
    "glEnd\0"
    "\0"
-   /* _mesa_function_pool[9112]: VertexAttrib3fNV (will be remapped) */
+   /* _mesa_function_pool[9142]: VertexAttrib3fNV (will be remapped) */
    "ifff\0"
    "glVertexAttrib3fNV\0"
    "\0"
-   /* _mesa_function_pool[9137]: VertexAttribs2dvNV (will be remapped) */
+   /* _mesa_function_pool[9167]: VertexAttribs2dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2dvNV\0"
    "\0"
-   /* _mesa_function_pool[9163]: GetQueryObjectui64vEXT (will be remapped) */
+   /* _mesa_function_pool[9193]: GetQueryObjectui64vEXT (will be remapped) */
    "iip\0"
    "glGetQueryObjectui64vEXT\0"
    "\0"
-   /* _mesa_function_pool[9193]: MultiTexCoord3fvARB (offset 395) */
+   /* _mesa_function_pool[9223]: MultiTexCoord3fvARB (offset 395) */
    "ip\0"
    "glMultiTexCoord3fv\0"
    "glMultiTexCoord3fvARB\0"
    "\0"
-   /* _mesa_function_pool[9238]: SecondaryColor3dEXT (will be remapped) */
+   /* _mesa_function_pool[9268]: SecondaryColor3dEXT (will be remapped) */
    "ddd\0"
    "glSecondaryColor3d\0"
    "glSecondaryColor3dEXT\0"
    "\0"
-   /* _mesa_function_pool[9284]: Color3ub (offset 19) */
+   /* _mesa_function_pool[9314]: Color3ub (offset 19) */
    "iii\0"
    "glColor3ub\0"
    "\0"
-   /* _mesa_function_pool[9300]: GetProgramParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[9330]: GetProgramParameterfvNV (will be remapped) */
    "iiip\0"
    "glGetProgramParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[9332]: TangentPointerEXT (dynamic) */
+   /* _mesa_function_pool[9362]: TangentPointerEXT (dynamic) */
    "iip\0"
    "glTangentPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[9357]: Color4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[9387]: Color4fNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[9392]: GetInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[9422]: GetInstrumentsSGIX (dynamic) */
    "\0"
    "glGetInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[9415]: Color3ui (offset 21) */
+   /* _mesa_function_pool[9445]: Color3ui (offset 21) */
    "iii\0"
    "glColor3ui\0"
    "\0"
-   /* _mesa_function_pool[9431]: EvalMapsNV (dynamic) */
+   /* _mesa_function_pool[9461]: EvalMapsNV (dynamic) */
    "ii\0"
    "glEvalMapsNV\0"
    "\0"
-   /* _mesa_function_pool[9448]: TexSubImage2D (offset 333) */
+   /* _mesa_function_pool[9478]: TexSubImage2D (offset 333) */
    "iiiiiiiip\0"
    "glTexSubImage2D\0"
    "glTexSubImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[9494]: FragmentLightivSGIX (dynamic) */
+   /* _mesa_function_pool[9524]: FragmentLightivSGIX (dynamic) */
    "iip\0"
    "glFragmentLightivSGIX\0"
    "\0"
-   /* _mesa_function_pool[9521]: GetTexParameterPointervAPPLE (will be remapped) */
+   /* _mesa_function_pool[9551]: GetTexParameterPointervAPPLE (will be remapped) */
    "iip\0"
    "glGetTexParameterPointervAPPLE\0"
    "\0"
-   /* _mesa_function_pool[9557]: TexGenfv (offset 191) */
+   /* _mesa_function_pool[9587]: TexGenfv (offset 191) */
    "iip\0"
    "glTexGenfv\0"
    "\0"
-   /* _mesa_function_pool[9573]: PixelTransformParameterfvEXT (dynamic) */
+   /* _mesa_function_pool[9603]: PixelTransformParameterfvEXT (dynamic) */
    "iip\0"
    "glPixelTransformParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[9609]: VertexAttrib4bvARB (will be remapped) */
+   /* _mesa_function_pool[9639]: VertexAttrib4bvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4bv\0"
    "glVertexAttrib4bvARB\0"
    "\0"
-   /* _mesa_function_pool[9652]: AlphaFragmentOp2ATI (will be remapped) */
+   /* _mesa_function_pool[9682]: AlphaFragmentOp2ATI (will be remapped) */
    "iiiiiiiii\0"
    "glAlphaFragmentOp2ATI\0"
    "\0"
-   /* _mesa_function_pool[9685]: GetIntegerIndexedvEXT (will be remapped) */
+   /* _mesa_function_pool[9715]: GetIntegerIndexedvEXT (will be remapped) */
    "iip\0"
    "glGetIntegerIndexedvEXT\0"
    "\0"
-   /* _mesa_function_pool[9714]: MultiTexCoord4sARB (offset 406) */
+   /* _mesa_function_pool[9744]: MultiTexCoord4sARB (offset 406) */
    "iiiii\0"
    "glMultiTexCoord4s\0"
    "glMultiTexCoord4sARB\0"
    "\0"
-   /* _mesa_function_pool[9760]: GetFragmentMaterialivSGIX (dynamic) */
+   /* _mesa_function_pool[9790]: GetFragmentMaterialivSGIX (dynamic) */
    "iip\0"
    "glGetFragmentMaterialivSGIX\0"
    "\0"
-   /* _mesa_function_pool[9793]: WindowPos4dMESA (will be remapped) */
+   /* _mesa_function_pool[9823]: WindowPos4dMESA (will be remapped) */
    "dddd\0"
    "glWindowPos4dMESA\0"
    "\0"
-   /* _mesa_function_pool[9817]: WeightPointerARB (dynamic) */
+   /* _mesa_function_pool[9847]: WeightPointerARB (dynamic) */
    "iiip\0"
    "glWeightPointerARB\0"
    "\0"
-   /* _mesa_function_pool[9842]: WindowPos2dMESA (will be remapped) */
+   /* _mesa_function_pool[9872]: WindowPos2dMESA (will be remapped) */
    "dd\0"
    "glWindowPos2d\0"
    "glWindowPos2dARB\0"
    "glWindowPos2dMESA\0"
    "\0"
-   /* _mesa_function_pool[9895]: FramebufferTexture3DEXT (will be remapped) */
+   /* _mesa_function_pool[9925]: FramebufferTexture3DEXT (will be remapped) */
    "iiiiii\0"
    "glFramebufferTexture3D\0"
    "glFramebufferTexture3DEXT\0"
    "\0"
-   /* _mesa_function_pool[9952]: BlendEquation (offset 337) */
+   /* _mesa_function_pool[9982]: BlendEquation (offset 337) */
    "i\0"
    "glBlendEquation\0"
    "glBlendEquationEXT\0"
    "\0"
-   /* _mesa_function_pool[9990]: VertexAttrib3dNV (will be remapped) */
+   /* _mesa_function_pool[10020]: VertexAttrib3dNV (will be remapped) */
    "iddd\0"
    "glVertexAttrib3dNV\0"
    "\0"
-   /* _mesa_function_pool[10015]: VertexAttrib3dARB (will be remapped) */
+   /* _mesa_function_pool[10045]: VertexAttrib3dARB (will be remapped) */
    "iddd\0"
    "glVertexAttrib3d\0"
    "glVertexAttrib3dARB\0"
    "\0"
-   /* _mesa_function_pool[10058]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[10088]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
    "ppppp\0"
    "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[10122]: VertexAttrib4fARB (will be remapped) */
+   /* _mesa_function_pool[10152]: VertexAttrib4fARB (will be remapped) */
    "iffff\0"
    "glVertexAttrib4f\0"
    "glVertexAttrib4fARB\0"
    "\0"
-   /* _mesa_function_pool[10166]: GetError (offset 261) */
+   /* _mesa_function_pool[10196]: GetError (offset 261) */
    "\0"
    "glGetError\0"
    "\0"
-   /* _mesa_function_pool[10179]: IndexFuncEXT (dynamic) */
+   /* _mesa_function_pool[10209]: IndexFuncEXT (dynamic) */
    "if\0"
    "glIndexFuncEXT\0"
    "\0"
-   /* _mesa_function_pool[10198]: TexCoord3dv (offset 111) */
+   /* _mesa_function_pool[10228]: TexCoord3dv (offset 111) */
    "p\0"
    "glTexCoord3dv\0"
    "\0"
-   /* _mesa_function_pool[10215]: Indexdv (offset 45) */
+   /* _mesa_function_pool[10245]: Indexdv (offset 45) */
    "p\0"
    "glIndexdv\0"
    "\0"
-   /* _mesa_function_pool[10228]: FramebufferTexture2DEXT (will be remapped) */
+   /* _mesa_function_pool[10258]: FramebufferTexture2DEXT (will be remapped) */
    "iiiii\0"
    "glFramebufferTexture2D\0"
    "glFramebufferTexture2DEXT\0"
    "\0"
-   /* _mesa_function_pool[10284]: Normal3s (offset 60) */
+   /* _mesa_function_pool[10314]: Normal3s (offset 60) */
    "iii\0"
    "glNormal3s\0"
    "\0"
-   /* _mesa_function_pool[10300]: PushName (offset 201) */
+   /* _mesa_function_pool[10330]: GetObjectParameterivAPPLE (will be remapped) */
+   "iiip\0"
+   "glGetObjectParameterivAPPLE\0"
+   "\0"
+   /* _mesa_function_pool[10364]: PushName (offset 201) */
    "i\0"
    "glPushName\0"
    "\0"
-   /* _mesa_function_pool[10314]: MultiTexCoord2dvARB (offset 385) */
+   /* _mesa_function_pool[10378]: MultiTexCoord2dvARB (offset 385) */
    "ip\0"
    "glMultiTexCoord2dv\0"
    "glMultiTexCoord2dvARB\0"
    "\0"
-   /* _mesa_function_pool[10359]: CullParameterfvEXT (will be remapped) */
+   /* _mesa_function_pool[10423]: CullParameterfvEXT (will be remapped) */
    "ip\0"
    "glCullParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[10384]: Normal3i (offset 58) */
+   /* _mesa_function_pool[10448]: Normal3i (offset 58) */
    "iii\0"
    "glNormal3i\0"
    "\0"
-   /* _mesa_function_pool[10400]: ProgramNamedParameter4fvNV (will be remapped) */
+   /* _mesa_function_pool[10464]: ProgramNamedParameter4fvNV (will be remapped) */
    "iipp\0"
    "glProgramNamedParameter4fvNV\0"
    "\0"
-   /* _mesa_function_pool[10435]: SecondaryColorPointerEXT (will be remapped) */
+   /* _mesa_function_pool[10499]: SecondaryColorPointerEXT (will be remapped) */
    "iiip\0"
    "glSecondaryColorPointer\0"
    "glSecondaryColorPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[10492]: VertexAttrib4fvARB (will be remapped) */
+   /* _mesa_function_pool[10556]: VertexAttrib4fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4fv\0"
    "glVertexAttrib4fvARB\0"
    "\0"
-   /* _mesa_function_pool[10535]: ColorPointerListIBM (dynamic) */
+   /* _mesa_function_pool[10599]: ColorPointerListIBM (dynamic) */
    "iiipi\0"
    "glColorPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[10564]: GetActiveUniformARB (will be remapped) */
+   /* _mesa_function_pool[10628]: GetActiveUniformARB (will be remapped) */
    "iiipppp\0"
    "glGetActiveUniform\0"
    "glGetActiveUniformARB\0"
    "\0"
-   /* _mesa_function_pool[10614]: ImageTransformParameteriHP (dynamic) */
+   /* _mesa_function_pool[10678]: ImageTransformParameteriHP (dynamic) */
    "iii\0"
    "glImageTransformParameteriHP\0"
    "\0"
-   /* _mesa_function_pool[10648]: Normal3b (offset 52) */
+   /* _mesa_function_pool[10712]: Normal3b (offset 52) */
    "iii\0"
    "glNormal3b\0"
    "\0"
-   /* _mesa_function_pool[10664]: Normal3d (offset 54) */
+   /* _mesa_function_pool[10728]: Normal3d (offset 54) */
    "ddd\0"
    "glNormal3d\0"
    "\0"
-   /* _mesa_function_pool[10680]: Normal3f (offset 56) */
+   /* _mesa_function_pool[10744]: Normal3f (offset 56) */
    "fff\0"
    "glNormal3f\0"
    "\0"
-   /* _mesa_function_pool[10696]: MultiTexCoord1svARB (offset 383) */
+   /* _mesa_function_pool[10760]: MultiTexCoord1svARB (offset 383) */
    "ip\0"
    "glMultiTexCoord1sv\0"
    "glMultiTexCoord1svARB\0"
    "\0"
-   /* _mesa_function_pool[10741]: Indexi (offset 48) */
+   /* _mesa_function_pool[10805]: Indexi (offset 48) */
    "i\0"
    "glIndexi\0"
    "\0"
-   /* _mesa_function_pool[10753]: EGLImageTargetTexture2DOES (will be remapped) */
+   /* _mesa_function_pool[10817]: EGLImageTargetTexture2DOES (will be remapped) */
    "ip\0"
    "glEGLImageTargetTexture2DOES\0"
    "\0"
-   /* _mesa_function_pool[10786]: EndQueryARB (will be remapped) */
+   /* _mesa_function_pool[10850]: EndQueryARB (will be remapped) */
    "i\0"
    "glEndQuery\0"
    "glEndQueryARB\0"
    "\0"
-   /* _mesa_function_pool[10814]: DeleteFencesNV (will be remapped) */
+   /* _mesa_function_pool[10878]: DeleteFencesNV (will be remapped) */
    "ip\0"
    "glDeleteFencesNV\0"
    "\0"
-   /* _mesa_function_pool[10835]: DeformationMap3dSGIX (dynamic) */
-   "iddiiddiiddiip\0"
-   "glDeformationMap3dSGIX\0"
-   "\0"
-   /* _mesa_function_pool[10874]: DepthMask (offset 211) */
+   /* _mesa_function_pool[10899]: DepthMask (offset 211) */
    "i\0"
    "glDepthMask\0"
    "\0"
-   /* _mesa_function_pool[10889]: IsShader (will be remapped) */
+   /* _mesa_function_pool[10914]: IsShader (will be remapped) */
    "i\0"
    "glIsShader\0"
    "\0"
-   /* _mesa_function_pool[10903]: Indexf (offset 46) */
+   /* _mesa_function_pool[10928]: Indexf (offset 46) */
    "f\0"
    "glIndexf\0"
    "\0"
-   /* _mesa_function_pool[10915]: GetImageTransformParameterivHP (dynamic) */
+   /* _mesa_function_pool[10940]: GetImageTransformParameterivHP (dynamic) */
    "iip\0"
    "glGetImageTransformParameterivHP\0"
    "\0"
-   /* _mesa_function_pool[10953]: Indexd (offset 44) */
+   /* _mesa_function_pool[10978]: Indexd (offset 44) */
    "d\0"
    "glIndexd\0"
    "\0"
-   /* _mesa_function_pool[10965]: GetMaterialiv (offset 270) */
+   /* _mesa_function_pool[10990]: GetMaterialiv (offset 270) */
    "iip\0"
    "glGetMaterialiv\0"
    "\0"
-   /* _mesa_function_pool[10986]: StencilOp (offset 244) */
+   /* _mesa_function_pool[11011]: StencilOp (offset 244) */
    "iii\0"
    "glStencilOp\0"
    "\0"
-   /* _mesa_function_pool[11003]: WindowPos4ivMESA (will be remapped) */
+   /* _mesa_function_pool[11028]: WindowPos4ivMESA (will be remapped) */
    "p\0"
    "glWindowPos4ivMESA\0"
    "\0"
-   /* _mesa_function_pool[11025]: MultiTexCoord3svARB (offset 399) */
+   /* _mesa_function_pool[11050]: MultiTexCoord3svARB (offset 399) */
    "ip\0"
    "glMultiTexCoord3sv\0"
    "glMultiTexCoord3svARB\0"
    "\0"
-   /* _mesa_function_pool[11070]: TexEnvfv (offset 185) */
+   /* _mesa_function_pool[11095]: TexEnvfv (offset 185) */
    "iip\0"
    "glTexEnvfv\0"
    "\0"
-   /* _mesa_function_pool[11086]: MultiTexCoord4iARB (offset 404) */
+   /* _mesa_function_pool[11111]: MultiTexCoord4iARB (offset 404) */
    "iiiii\0"
    "glMultiTexCoord4i\0"
    "glMultiTexCoord4iARB\0"
    "\0"
-   /* _mesa_function_pool[11132]: Indexs (offset 50) */
+   /* _mesa_function_pool[11157]: Indexs (offset 50) */
    "i\0"
    "glIndexs\0"
    "\0"
-   /* _mesa_function_pool[11144]: Binormal3ivEXT (dynamic) */
+   /* _mesa_function_pool[11169]: Binormal3ivEXT (dynamic) */
    "p\0"
    "glBinormal3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[11164]: ResizeBuffersMESA (will be remapped) */
+   /* _mesa_function_pool[11189]: ResizeBuffersMESA (will be remapped) */
    "\0"
    "glResizeBuffersMESA\0"
    "\0"
-   /* _mesa_function_pool[11186]: GetUniformivARB (will be remapped) */
+   /* _mesa_function_pool[11211]: GetUniformivARB (will be remapped) */
    "iip\0"
    "glGetUniformiv\0"
    "glGetUniformivARB\0"
    "\0"
-   /* _mesa_function_pool[11224]: PixelTexGenParameteriSGIS (will be remapped) */
+   /* _mesa_function_pool[11249]: PixelTexGenParameteriSGIS (will be remapped) */
    "ii\0"
    "glPixelTexGenParameteriSGIS\0"
    "\0"
-   /* _mesa_function_pool[11256]: VertexPointervINTEL (dynamic) */
+   /* _mesa_function_pool[11281]: VertexPointervINTEL (dynamic) */
    "iip\0"
    "glVertexPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[11283]: Vertex2i (offset 130) */
+   /* _mesa_function_pool[11308]: Vertex2i (offset 130) */
    "ii\0"
    "glVertex2i\0"
    "\0"
-   /* _mesa_function_pool[11298]: LoadMatrixf (offset 291) */
+   /* _mesa_function_pool[11323]: LoadMatrixf (offset 291) */
    "p\0"
    "glLoadMatrixf\0"
    "\0"
-   /* _mesa_function_pool[11315]: Vertex2f (offset 128) */
+   /* _mesa_function_pool[11340]: Vertex2f (offset 128) */
    "ff\0"
    "glVertex2f\0"
    "\0"
-   /* _mesa_function_pool[11330]: ReplacementCodeuiColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[11355]: ReplacementCodeuiColor4fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glReplacementCodeuiColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[11383]: Color4bv (offset 26) */
+   /* _mesa_function_pool[11408]: Color4bv (offset 26) */
    "p\0"
    "glColor4bv\0"
    "\0"
-   /* _mesa_function_pool[11397]: VertexPointer (offset 321) */
+   /* _mesa_function_pool[11422]: VertexPointer (offset 321) */
    "iiip\0"
    "glVertexPointer\0"
    "\0"
-   /* _mesa_function_pool[11419]: SecondaryColor3uiEXT (will be remapped) */
+   /* _mesa_function_pool[11444]: SecondaryColor3uiEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3ui\0"
    "glSecondaryColor3uiEXT\0"
    "\0"
-   /* _mesa_function_pool[11467]: StartInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[11492]: StartInstrumentsSGIX (dynamic) */
    "\0"
    "glStartInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[11492]: SecondaryColor3usvEXT (will be remapped) */
+   /* _mesa_function_pool[11517]: SecondaryColor3usvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3usv\0"
    "glSecondaryColor3usvEXT\0"
    "\0"
-   /* _mesa_function_pool[11540]: VertexAttrib2fvNV (will be remapped) */
+   /* _mesa_function_pool[11565]: VertexAttrib2fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2fvNV\0"
    "\0"
-   /* _mesa_function_pool[11564]: ProgramLocalParameter4dvARB (will be remapped) */
+   /* _mesa_function_pool[11589]: ProgramLocalParameter4dvARB (will be remapped) */
    "iip\0"
    "glProgramLocalParameter4dvARB\0"
    "\0"
-   /* _mesa_function_pool[11599]: DeleteLists (offset 4) */
+   /* _mesa_function_pool[11624]: DeleteLists (offset 4) */
    "ii\0"
    "glDeleteLists\0"
    "\0"
-   /* _mesa_function_pool[11617]: LogicOp (offset 242) */
+   /* _mesa_function_pool[11642]: LogicOp (offset 242) */
    "i\0"
    "glLogicOp\0"
    "\0"
-   /* _mesa_function_pool[11630]: MatrixIndexuivARB (dynamic) */
+   /* _mesa_function_pool[11655]: MatrixIndexuivARB (dynamic) */
    "ip\0"
    "glMatrixIndexuivARB\0"
    "\0"
-   /* _mesa_function_pool[11654]: Vertex2s (offset 132) */
+   /* _mesa_function_pool[11679]: Vertex2s (offset 132) */
    "ii\0"
    "glVertex2s\0"
    "\0"
-   /* _mesa_function_pool[11669]: RenderbufferStorageMultisample (will be remapped) */
+   /* _mesa_function_pool[11694]: RenderbufferStorageMultisample (will be remapped) */
    "iiiii\0"
    "glRenderbufferStorageMultisample\0"
    "glRenderbufferStorageMultisampleEXT\0"
    "\0"
-   /* _mesa_function_pool[11745]: TexCoord4fv (offset 121) */
+   /* _mesa_function_pool[11770]: TexCoord4fv (offset 121) */
    "p\0"
    "glTexCoord4fv\0"
    "\0"
-   /* _mesa_function_pool[11762]: Tangent3sEXT (dynamic) */
+   /* _mesa_function_pool[11787]: Tangent3sEXT (dynamic) */
    "iii\0"
    "glTangent3sEXT\0"
    "\0"
-   /* _mesa_function_pool[11782]: GlobalAlphaFactorfSUN (dynamic) */
+   /* _mesa_function_pool[11807]: GlobalAlphaFactorfSUN (dynamic) */
    "f\0"
    "glGlobalAlphaFactorfSUN\0"
    "\0"
-   /* _mesa_function_pool[11809]: MultiTexCoord3iARB (offset 396) */
+   /* _mesa_function_pool[11834]: MultiTexCoord3iARB (offset 396) */
    "iiii\0"
    "glMultiTexCoord3i\0"
    "glMultiTexCoord3iARB\0"
    "\0"
-   /* _mesa_function_pool[11854]: IsProgram (will be remapped) */
+   /* _mesa_function_pool[11879]: IsProgram (will be remapped) */
    "i\0"
    "glIsProgram\0"
    "\0"
-   /* _mesa_function_pool[11869]: TexCoordPointerListIBM (dynamic) */
+   /* _mesa_function_pool[11894]: TexCoordPointerListIBM (dynamic) */
    "iiipi\0"
    "glTexCoordPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[11901]: GlobalAlphaFactorusSUN (dynamic) */
+   /* _mesa_function_pool[11926]: GlobalAlphaFactorusSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorusSUN\0"
    "\0"
-   /* _mesa_function_pool[11929]: VertexAttrib2dvNV (will be remapped) */
+   /* _mesa_function_pool[11954]: VertexAttrib2dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2dvNV\0"
    "\0"
-   /* _mesa_function_pool[11953]: FramebufferRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[11978]: FramebufferRenderbufferEXT (will be remapped) */
    "iiii\0"
    "glFramebufferRenderbuffer\0"
    "glFramebufferRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[12014]: VertexAttrib1dvNV (will be remapped) */
+   /* _mesa_function_pool[12039]: VertexAttrib1dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1dvNV\0"
    "\0"
-   /* _mesa_function_pool[12038]: GenTextures (offset 328) */
+   /* _mesa_function_pool[12063]: GenTextures (offset 328) */
    "ip\0"
    "glGenTextures\0"
    "glGenTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[12073]: SetFenceNV (will be remapped) */
+   /* _mesa_function_pool[12098]: SetFenceNV (will be remapped) */
    "ii\0"
    "glSetFenceNV\0"
    "\0"
-   /* _mesa_function_pool[12090]: FramebufferTexture1DEXT (will be remapped) */
+   /* _mesa_function_pool[12115]: FramebufferTexture1DEXT (will be remapped) */
    "iiiii\0"
    "glFramebufferTexture1D\0"
    "glFramebufferTexture1DEXT\0"
    "\0"
-   /* _mesa_function_pool[12146]: GetCombinerOutputParameterivNV (will be remapped) */
+   /* _mesa_function_pool[12171]: GetCombinerOutputParameterivNV (will be remapped) */
    "iiip\0"
    "glGetCombinerOutputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[12185]: PixelTexGenParameterivSGIS (will be remapped) */
+   /* _mesa_function_pool[12210]: MultiModeDrawArraysIBM (will be remapped) */
+   "pppii\0"
+   "glMultiModeDrawArraysIBM\0"
+   "\0"
+   /* _mesa_function_pool[12242]: PixelTexGenParameterivSGIS (will be remapped) */
    "ip\0"
    "glPixelTexGenParameterivSGIS\0"
    "\0"
-   /* _mesa_function_pool[12218]: TextureNormalEXT (dynamic) */
+   /* _mesa_function_pool[12275]: TextureNormalEXT (dynamic) */
    "i\0"
    "glTextureNormalEXT\0"
    "\0"
-   /* _mesa_function_pool[12240]: IndexPointerListIBM (dynamic) */
+   /* _mesa_function_pool[12297]: IndexPointerListIBM (dynamic) */
    "iipi\0"
    "glIndexPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[12268]: WeightfvARB (dynamic) */
+   /* _mesa_function_pool[12325]: WeightfvARB (dynamic) */
    "ip\0"
    "glWeightfvARB\0"
    "\0"
-   /* _mesa_function_pool[12286]: RasterPos2sv (offset 69) */
+   /* _mesa_function_pool[12343]: RasterPos2sv (offset 69) */
    "p\0"
    "glRasterPos2sv\0"
    "\0"
-   /* _mesa_function_pool[12304]: Color4ubv (offset 36) */
+   /* _mesa_function_pool[12361]: Color4ubv (offset 36) */
    "p\0"
    "glColor4ubv\0"
    "\0"
-   /* _mesa_function_pool[12319]: DrawBuffer (offset 202) */
+   /* _mesa_function_pool[12376]: DrawBuffer (offset 202) */
    "i\0"
    "glDrawBuffer\0"
    "\0"
-   /* _mesa_function_pool[12335]: TexCoord2fv (offset 105) */
+   /* _mesa_function_pool[12392]: TexCoord2fv (offset 105) */
    "p\0"
    "glTexCoord2fv\0"
    "\0"
-   /* _mesa_function_pool[12352]: WindowPos4fMESA (will be remapped) */
+   /* _mesa_function_pool[12409]: WindowPos4fMESA (will be remapped) */
    "ffff\0"
    "glWindowPos4fMESA\0"
    "\0"
-   /* _mesa_function_pool[12376]: TexCoord1sv (offset 101) */
+   /* _mesa_function_pool[12433]: TexCoord1sv (offset 101) */
    "p\0"
    "glTexCoord1sv\0"
    "\0"
-   /* _mesa_function_pool[12393]: WindowPos3dvMESA (will be remapped) */
+   /* _mesa_function_pool[12450]: WindowPos3dvMESA (will be remapped) */
    "p\0"
    "glWindowPos3dv\0"
    "glWindowPos3dvARB\0"
    "glWindowPos3dvMESA\0"
    "\0"
-   /* _mesa_function_pool[12448]: DepthFunc (offset 245) */
+   /* _mesa_function_pool[12505]: DepthFunc (offset 245) */
    "i\0"
    "glDepthFunc\0"
    "\0"
-   /* _mesa_function_pool[12463]: PixelMapusv (offset 253) */
+   /* _mesa_function_pool[12520]: PixelMapusv (offset 253) */
    "iip\0"
    "glPixelMapusv\0"
    "\0"
-   /* _mesa_function_pool[12482]: GetQueryObjecti64vEXT (will be remapped) */
+   /* _mesa_function_pool[12539]: GetQueryObjecti64vEXT (will be remapped) */
    "iip\0"
    "glGetQueryObjecti64vEXT\0"
    "\0"
-   /* _mesa_function_pool[12511]: MultiTexCoord1dARB (offset 376) */
+   /* _mesa_function_pool[12568]: MultiTexCoord1dARB (offset 376) */
    "id\0"
    "glMultiTexCoord1d\0"
    "glMultiTexCoord1dARB\0"
    "\0"
-   /* _mesa_function_pool[12554]: PointParameterivNV (will be remapped) */
+   /* _mesa_function_pool[12611]: PointParameterivNV (will be remapped) */
    "ip\0"
    "glPointParameteriv\0"
    "glPointParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[12598]: BlendFunc (offset 241) */
+   /* _mesa_function_pool[12655]: BlendFunc (offset 241) */
    "ii\0"
    "glBlendFunc\0"
    "\0"
-   /* _mesa_function_pool[12614]: Uniform2fvARB (will be remapped) */
+   /* _mesa_function_pool[12671]: Uniform2fvARB (will be remapped) */
    "iip\0"
    "glUniform2fv\0"
    "glUniform2fvARB\0"
    "\0"
-   /* _mesa_function_pool[12648]: BufferParameteriAPPLE (will be remapped) */
+   /* _mesa_function_pool[12705]: BufferParameteriAPPLE (will be remapped) */
    "iii\0"
    "glBufferParameteriAPPLE\0"
    "\0"
-   /* _mesa_function_pool[12677]: MultiTexCoord3dvARB (offset 393) */
+   /* _mesa_function_pool[12734]: MultiTexCoord3dvARB (offset 393) */
    "ip\0"
    "glMultiTexCoord3dv\0"
    "glMultiTexCoord3dvARB\0"
    "\0"
-   /* _mesa_function_pool[12722]: ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[12779]: ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[12778]: DeleteObjectARB (will be remapped) */
+   /* _mesa_function_pool[12835]: DeleteObjectARB (will be remapped) */
    "i\0"
    "glDeleteObjectARB\0"
    "\0"
-   /* _mesa_function_pool[12799]: MatrixIndexPointerARB (dynamic) */
+   /* _mesa_function_pool[12856]: MatrixIndexPointerARB (dynamic) */
    "iiip\0"
    "glMatrixIndexPointerARB\0"
    "\0"
-   /* _mesa_function_pool[12829]: ProgramNamedParameter4dvNV (will be remapped) */
+   /* _mesa_function_pool[12886]: ProgramNamedParameter4dvNV (will be remapped) */
    "iipp\0"
    "glProgramNamedParameter4dvNV\0"
    "\0"
-   /* _mesa_function_pool[12864]: Tangent3fvEXT (dynamic) */
+   /* _mesa_function_pool[12921]: Tangent3fvEXT (dynamic) */
    "p\0"
    "glTangent3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[12883]: Flush (offset 217) */
+   /* _mesa_function_pool[12940]: Flush (offset 217) */
    "\0"
    "glFlush\0"
    "\0"
-   /* _mesa_function_pool[12893]: Color4uiv (offset 38) */
+   /* _mesa_function_pool[12950]: Color4uiv (offset 38) */
    "p\0"
    "glColor4uiv\0"
    "\0"
-   /* _mesa_function_pool[12908]: GenVertexArrays (will be remapped) */
+   /* _mesa_function_pool[12965]: GenVertexArrays (will be remapped) */
    "ip\0"
    "glGenVertexArrays\0"
    "\0"
-   /* _mesa_function_pool[12930]: RasterPos3sv (offset 77) */
+   /* _mesa_function_pool[12987]: RasterPos3sv (offset 77) */
    "p\0"
    "glRasterPos3sv\0"
    "\0"
-   /* _mesa_function_pool[12948]: BindFramebufferEXT (will be remapped) */
+   /* _mesa_function_pool[13005]: BindFramebufferEXT (will be remapped) */
    "ii\0"
    "glBindFramebuffer\0"
    "glBindFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[12991]: ReferencePlaneSGIX (dynamic) */
+   /* _mesa_function_pool[13048]: ReferencePlaneSGIX (dynamic) */
    "p\0"
    "glReferencePlaneSGIX\0"
    "\0"
-   /* _mesa_function_pool[13015]: PushAttrib (offset 219) */
+   /* _mesa_function_pool[13072]: PushAttrib (offset 219) */
    "i\0"
    "glPushAttrib\0"
    "\0"
-   /* _mesa_function_pool[13031]: RasterPos2i (offset 66) */
+   /* _mesa_function_pool[13088]: RasterPos2i (offset 66) */
    "ii\0"
    "glRasterPos2i\0"
    "\0"
-   /* _mesa_function_pool[13049]: ValidateProgramARB (will be remapped) */
+   /* _mesa_function_pool[13106]: ValidateProgramARB (will be remapped) */
    "i\0"
    "glValidateProgram\0"
    "glValidateProgramARB\0"
    "\0"
-   /* _mesa_function_pool[13091]: TexParameteriv (offset 181) */
+   /* _mesa_function_pool[13148]: TexParameteriv (offset 181) */
    "iip\0"
    "glTexParameteriv\0"
    "\0"
-   /* _mesa_function_pool[13113]: UnlockArraysEXT (will be remapped) */
+   /* _mesa_function_pool[13170]: UnlockArraysEXT (will be remapped) */
    "\0"
    "glUnlockArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[13133]: TexCoord2fColor3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[13190]: TexCoord2fColor3fVertex3fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord2fColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[13174]: WindowPos3fvMESA (will be remapped) */
+   /* _mesa_function_pool[13231]: WindowPos3fvMESA (will be remapped) */
    "p\0"
    "glWindowPos3fv\0"
    "glWindowPos3fvARB\0"
    "glWindowPos3fvMESA\0"
    "\0"
-   /* _mesa_function_pool[13229]: RasterPos2f (offset 64) */
+   /* _mesa_function_pool[13286]: RasterPos2f (offset 64) */
    "ff\0"
    "glRasterPos2f\0"
    "\0"
-   /* _mesa_function_pool[13247]: VertexAttrib1svNV (will be remapped) */
+   /* _mesa_function_pool[13304]: VertexAttrib1svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1svNV\0"
    "\0"
-   /* _mesa_function_pool[13271]: RasterPos2d (offset 62) */
+   /* _mesa_function_pool[13328]: RasterPos2d (offset 62) */
    "dd\0"
    "glRasterPos2d\0"
    "\0"
-   /* _mesa_function_pool[13289]: RasterPos3fv (offset 73) */
+   /* _mesa_function_pool[13346]: RasterPos3fv (offset 73) */
    "p\0"
    "glRasterPos3fv\0"
    "\0"
-   /* _mesa_function_pool[13307]: CopyTexSubImage3D (offset 373) */
+   /* _mesa_function_pool[13364]: CopyTexSubImage3D (offset 373) */
    "iiiiiiiii\0"
    "glCopyTexSubImage3D\0"
    "glCopyTexSubImage3DEXT\0"
    "\0"
-   /* _mesa_function_pool[13361]: VertexAttrib2dARB (will be remapped) */
+   /* _mesa_function_pool[13418]: VertexAttrib2dARB (will be remapped) */
    "idd\0"
    "glVertexAttrib2d\0"
    "glVertexAttrib2dARB\0"
    "\0"
-   /* _mesa_function_pool[13403]: Color4ub (offset 35) */
+   /* _mesa_function_pool[13460]: Color4ub (offset 35) */
    "iiii\0"
    "glColor4ub\0"
    "\0"
-   /* _mesa_function_pool[13420]: GetInteger64v (will be remapped) */
+   /* _mesa_function_pool[13477]: GetInteger64v (will be remapped) */
    "ip\0"
    "glGetInteger64v\0"
    "\0"
-   /* _mesa_function_pool[13440]: TextureColorMaskSGIS (dynamic) */
+   /* _mesa_function_pool[13497]: TextureColorMaskSGIS (dynamic) */
    "iiii\0"
    "glTextureColorMaskSGIS\0"
    "\0"
-   /* _mesa_function_pool[13469]: RasterPos2s (offset 68) */
+   /* _mesa_function_pool[13526]: RasterPos2s (offset 68) */
    "ii\0"
    "glRasterPos2s\0"
    "\0"
-   /* _mesa_function_pool[13487]: GetColorTable (offset 343) */
+   /* _mesa_function_pool[13544]: GetColorTable (offset 343) */
    "iiip\0"
    "glGetColorTable\0"
    "glGetColorTableSGI\0"
    "glGetColorTableEXT\0"
    "\0"
-   /* _mesa_function_pool[13547]: SelectBuffer (offset 195) */
+   /* _mesa_function_pool[13604]: SelectBuffer (offset 195) */
    "ip\0"
    "glSelectBuffer\0"
    "\0"
-   /* _mesa_function_pool[13566]: Indexiv (offset 49) */
+   /* _mesa_function_pool[13623]: Indexiv (offset 49) */
    "p\0"
    "glIndexiv\0"
    "\0"
-   /* _mesa_function_pool[13579]: TexCoord3i (offset 114) */
+   /* _mesa_function_pool[13636]: TexCoord3i (offset 114) */
    "iii\0"
    "glTexCoord3i\0"
    "\0"
-   /* _mesa_function_pool[13597]: CopyColorTable (offset 342) */
+   /* _mesa_function_pool[13654]: CopyColorTable (offset 342) */
    "iiiii\0"
    "glCopyColorTable\0"
    "glCopyColorTableSGI\0"
    "\0"
-   /* _mesa_function_pool[13641]: GetHistogramParameterfv (offset 362) */
+   /* _mesa_function_pool[13698]: GetHistogramParameterfv (offset 362) */
    "iip\0"
    "glGetHistogramParameterfv\0"
    "glGetHistogramParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[13701]: Frustum (offset 289) */
+   /* _mesa_function_pool[13758]: Frustum (offset 289) */
    "dddddd\0"
    "glFrustum\0"
    "\0"
-   /* _mesa_function_pool[13719]: GetString (offset 275) */
+   /* _mesa_function_pool[13776]: GetString (offset 275) */
    "i\0"
    "glGetString\0"
    "\0"
-   /* _mesa_function_pool[13734]: ColorPointervINTEL (dynamic) */
+   /* _mesa_function_pool[13791]: ColorPointervINTEL (dynamic) */
    "iip\0"
    "glColorPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[13760]: TexEnvf (offset 184) */
+   /* _mesa_function_pool[13817]: TexEnvf (offset 184) */
    "iif\0"
    "glTexEnvf\0"
    "\0"
-   /* _mesa_function_pool[13775]: TexCoord3d (offset 110) */
+   /* _mesa_function_pool[13832]: TexCoord3d (offset 110) */
    "ddd\0"
    "glTexCoord3d\0"
    "\0"
-   /* _mesa_function_pool[13793]: AlphaFragmentOp1ATI (will be remapped) */
+   /* _mesa_function_pool[13850]: AlphaFragmentOp1ATI (will be remapped) */
    "iiiiii\0"
    "glAlphaFragmentOp1ATI\0"
    "\0"
-   /* _mesa_function_pool[13823]: TexCoord3f (offset 112) */
+   /* _mesa_function_pool[13880]: TexCoord3f (offset 112) */
    "fff\0"
    "glTexCoord3f\0"
    "\0"
-   /* _mesa_function_pool[13841]: MultiTexCoord3ivARB (offset 397) */
+   /* _mesa_function_pool[13898]: MultiTexCoord3ivARB (offset 397) */
    "ip\0"
    "glMultiTexCoord3iv\0"
    "glMultiTexCoord3ivARB\0"
    "\0"
-   /* _mesa_function_pool[13886]: MultiTexCoord2sARB (offset 390) */
+   /* _mesa_function_pool[13943]: MultiTexCoord2sARB (offset 390) */
    "iii\0"
    "glMultiTexCoord2s\0"
    "glMultiTexCoord2sARB\0"
    "\0"
-   /* _mesa_function_pool[13930]: VertexAttrib1dvARB (will be remapped) */
+   /* _mesa_function_pool[13987]: VertexAttrib1dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib1dv\0"
    "glVertexAttrib1dvARB\0"
    "\0"
-   /* _mesa_function_pool[13973]: DeleteTextures (offset 327) */
+   /* _mesa_function_pool[14030]: DeleteTextures (offset 327) */
    "ip\0"
    "glDeleteTextures\0"
    "glDeleteTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[14014]: TexCoordPointerEXT (will be remapped) */
+   /* _mesa_function_pool[14071]: TexCoordPointerEXT (will be remapped) */
    "iiiip\0"
    "glTexCoordPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[14042]: TexSubImage4DSGIS (dynamic) */
+   /* _mesa_function_pool[14099]: TexSubImage4DSGIS (dynamic) */
    "iiiiiiiiiiiip\0"
    "glTexSubImage4DSGIS\0"
    "\0"
-   /* _mesa_function_pool[14077]: TexCoord3s (offset 116) */
+   /* _mesa_function_pool[14134]: TexCoord3s (offset 116) */
    "iii\0"
    "glTexCoord3s\0"
    "\0"
-   /* _mesa_function_pool[14095]: GetTexLevelParameteriv (offset 285) */
+   /* _mesa_function_pool[14152]: GetTexLevelParameteriv (offset 285) */
    "iiip\0"
    "glGetTexLevelParameteriv\0"
    "\0"
-   /* _mesa_function_pool[14126]: CombinerStageParameterfvNV (dynamic) */
+   /* _mesa_function_pool[14183]: CombinerStageParameterfvNV (dynamic) */
    "iip\0"
    "glCombinerStageParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[14160]: StopInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[14217]: StopInstrumentsSGIX (dynamic) */
    "i\0"
    "glStopInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[14185]: TexCoord4fColor4fNormal3fVertex4fSUN (dynamic) */
+   /* _mesa_function_pool[14242]: TexCoord4fColor4fNormal3fVertex4fSUN (dynamic) */
    "fffffffffffffff\0"
    "glTexCoord4fColor4fNormal3fVertex4fSUN\0"
    "\0"
-   /* _mesa_function_pool[14241]: ClearAccum (offset 204) */
+   /* _mesa_function_pool[14298]: ClearAccum (offset 204) */
    "ffff\0"
    "glClearAccum\0"
    "\0"
-   /* _mesa_function_pool[14260]: DeformSGIX (dynamic) */
+   /* _mesa_function_pool[14317]: DeformSGIX (dynamic) */
    "i\0"
    "glDeformSGIX\0"
    "\0"
-   /* _mesa_function_pool[14276]: GetVertexAttribfvARB (will be remapped) */
+   /* _mesa_function_pool[14333]: GetVertexAttribfvARB (will be remapped) */
    "iip\0"
    "glGetVertexAttribfv\0"
    "glGetVertexAttribfvARB\0"
    "\0"
-   /* _mesa_function_pool[14324]: SecondaryColor3ivEXT (will be remapped) */
+   /* _mesa_function_pool[14381]: SecondaryColor3ivEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3iv\0"
    "glSecondaryColor3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[14370]: TexCoord4iv (offset 123) */
+   /* _mesa_function_pool[14427]: TexCoord4iv (offset 123) */
    "p\0"
    "glTexCoord4iv\0"
    "\0"
-   /* _mesa_function_pool[14387]: UniformMatrix4x2fv (will be remapped) */
+   /* _mesa_function_pool[14444]: UniformMatrix4x2fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix4x2fv\0"
    "\0"
-   /* _mesa_function_pool[14414]: GetDetailTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[14471]: GetDetailTexFuncSGIS (dynamic) */
    "ip\0"
    "glGetDetailTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[14441]: GetCombinerStageParameterfvNV (dynamic) */
+   /* _mesa_function_pool[14498]: GetCombinerStageParameterfvNV (dynamic) */
    "iip\0"
    "glGetCombinerStageParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[14478]: PolygonOffset (offset 319) */
+   /* _mesa_function_pool[14535]: PolygonOffset (offset 319) */
    "ff\0"
    "glPolygonOffset\0"
    "\0"
-   /* _mesa_function_pool[14498]: BindVertexArray (will be remapped) */
+   /* _mesa_function_pool[14555]: BindVertexArray (will be remapped) */
    "i\0"
    "glBindVertexArray\0"
    "\0"
-   /* _mesa_function_pool[14519]: Color4ubVertex2fvSUN (dynamic) */
+   /* _mesa_function_pool[14576]: Color4ubVertex2fvSUN (dynamic) */
    "pp\0"
    "glColor4ubVertex2fvSUN\0"
    "\0"
-   /* _mesa_function_pool[14546]: Rectd (offset 86) */
+   /* _mesa_function_pool[14603]: Rectd (offset 86) */
    "dddd\0"
    "glRectd\0"
    "\0"
-   /* _mesa_function_pool[14560]: TexFilterFuncSGIS (dynamic) */
+   /* _mesa_function_pool[14617]: TexFilterFuncSGIS (dynamic) */
    "iiip\0"
    "glTexFilterFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[14586]: SampleMaskSGIS (will be remapped) */
+   /* _mesa_function_pool[14643]: SampleMaskSGIS (will be remapped) */
    "fi\0"
    "glSampleMaskSGIS\0"
    "glSampleMaskEXT\0"
    "\0"
-   /* _mesa_function_pool[14623]: GetAttribLocationARB (will be remapped) */
+   /* _mesa_function_pool[14680]: GetAttribLocationARB (will be remapped) */
    "ip\0"
    "glGetAttribLocation\0"
    "glGetAttribLocationARB\0"
    "\0"
-   /* _mesa_function_pool[14670]: RasterPos3i (offset 74) */
+   /* _mesa_function_pool[14727]: RasterPos3i (offset 74) */
    "iii\0"
    "glRasterPos3i\0"
    "\0"
-   /* _mesa_function_pool[14689]: VertexAttrib4ubvARB (will be remapped) */
+   /* _mesa_function_pool[14746]: VertexAttrib4ubvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4ubv\0"
    "glVertexAttrib4ubvARB\0"
    "\0"
-   /* _mesa_function_pool[14734]: DetailTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[14791]: DetailTexFuncSGIS (dynamic) */
    "iip\0"
    "glDetailTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[14759]: Normal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[14816]: Normal3fVertex3fSUN (dynamic) */
    "ffffff\0"
    "glNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[14789]: CopyTexImage2D (offset 324) */
+   /* _mesa_function_pool[14846]: CopyTexImage2D (offset 324) */
    "iiiiiiii\0"
    "glCopyTexImage2D\0"
    "glCopyTexImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[14836]: GetBufferPointervARB (will be remapped) */
+   /* _mesa_function_pool[14893]: GetBufferPointervARB (will be remapped) */
    "iip\0"
    "glGetBufferPointerv\0"
    "glGetBufferPointervARB\0"
    "\0"
-   /* _mesa_function_pool[14884]: ProgramEnvParameter4fARB (will be remapped) */
+   /* _mesa_function_pool[14941]: ProgramEnvParameter4fARB (will be remapped) */
    "iiffff\0"
    "glProgramEnvParameter4fARB\0"
    "glProgramParameter4fNV\0"
    "\0"
-   /* _mesa_function_pool[14942]: Uniform3ivARB (will be remapped) */
+   /* _mesa_function_pool[14999]: Uniform3ivARB (will be remapped) */
    "iip\0"
    "glUniform3iv\0"
    "glUniform3ivARB\0"
    "\0"
-   /* _mesa_function_pool[14976]: Lightfv (offset 160) */
+   /* _mesa_function_pool[15033]: Lightfv (offset 160) */
    "iip\0"
    "glLightfv\0"
    "\0"
-   /* _mesa_function_pool[14991]: ClearDepth (offset 208) */
+   /* _mesa_function_pool[15048]: ClearDepth (offset 208) */
    "d\0"
    "glClearDepth\0"
    "\0"
-   /* _mesa_function_pool[15007]: GetFenceivNV (will be remapped) */
+   /* _mesa_function_pool[15064]: GetFenceivNV (will be remapped) */
    "iip\0"
    "glGetFenceivNV\0"
    "\0"
-   /* _mesa_function_pool[15027]: WindowPos4dvMESA (will be remapped) */
+   /* _mesa_function_pool[15084]: WindowPos4dvMESA (will be remapped) */
    "p\0"
    "glWindowPos4dvMESA\0"
    "\0"
-   /* _mesa_function_pool[15049]: ColorSubTable (offset 346) */
+   /* _mesa_function_pool[15106]: ColorSubTable (offset 346) */
    "iiiiip\0"
    "glColorSubTable\0"
    "glColorSubTableEXT\0"
    "\0"
-   /* _mesa_function_pool[15092]: Color4fv (offset 30) */
+   /* _mesa_function_pool[15149]: Color4fv (offset 30) */
    "p\0"
    "glColor4fv\0"
    "\0"
-   /* _mesa_function_pool[15106]: MultiTexCoord4ivARB (offset 405) */
+   /* _mesa_function_pool[15163]: MultiTexCoord4ivARB (offset 405) */
    "ip\0"
    "glMultiTexCoord4iv\0"
    "glMultiTexCoord4ivARB\0"
    "\0"
-   /* _mesa_function_pool[15151]: ProgramLocalParameters4fvEXT (will be remapped) */
+   /* _mesa_function_pool[15208]: ProgramLocalParameters4fvEXT (will be remapped) */
    "iiip\0"
    "glProgramLocalParameters4fvEXT\0"
    "\0"
-   /* _mesa_function_pool[15188]: ColorPointer (offset 308) */
+   /* _mesa_function_pool[15245]: ColorPointer (offset 308) */
    "iiip\0"
    "glColorPointer\0"
    "\0"
-   /* _mesa_function_pool[15209]: Rects (offset 92) */
+   /* _mesa_function_pool[15266]: Rects (offset 92) */
    "iiii\0"
    "glRects\0"
    "\0"
-   /* _mesa_function_pool[15223]: GetMapAttribParameterfvNV (dynamic) */
+   /* _mesa_function_pool[15280]: GetMapAttribParameterfvNV (dynamic) */
    "iiip\0"
    "glGetMapAttribParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[15257]: Lightiv (offset 162) */
+   /* _mesa_function_pool[15314]: Lightiv (offset 162) */
    "iip\0"
    "glLightiv\0"
    "\0"
-   /* _mesa_function_pool[15272]: VertexAttrib4sARB (will be remapped) */
+   /* _mesa_function_pool[15329]: VertexAttrib4sARB (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4s\0"
    "glVertexAttrib4sARB\0"
    "\0"
-   /* _mesa_function_pool[15316]: GetQueryObjectuivARB (will be remapped) */
+   /* _mesa_function_pool[15373]: GetQueryObjectuivARB (will be remapped) */
    "iip\0"
    "glGetQueryObjectuiv\0"
    "glGetQueryObjectuivARB\0"
    "\0"
-   /* _mesa_function_pool[15364]: GetTexParameteriv (offset 283) */
+   /* _mesa_function_pool[15421]: GetTexParameteriv (offset 283) */
    "iip\0"
    "glGetTexParameteriv\0"
    "\0"
-   /* _mesa_function_pool[15389]: MapParameterivNV (dynamic) */
+   /* _mesa_function_pool[15446]: MapParameterivNV (dynamic) */
    "iip\0"
    "glMapParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[15413]: GenRenderbuffersEXT (will be remapped) */
+   /* _mesa_function_pool[15470]: GenRenderbuffersEXT (will be remapped) */
    "ip\0"
    "glGenRenderbuffers\0"
    "glGenRenderbuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[15458]: VertexAttrib2dvARB (will be remapped) */
+   /* _mesa_function_pool[15515]: VertexAttrib2dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2dv\0"
    "glVertexAttrib2dvARB\0"
    "\0"
-   /* _mesa_function_pool[15501]: EdgeFlagPointerEXT (will be remapped) */
+   /* _mesa_function_pool[15558]: EdgeFlagPointerEXT (will be remapped) */
    "iip\0"
    "glEdgeFlagPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[15527]: VertexAttribs2svNV (will be remapped) */
+   /* _mesa_function_pool[15584]: VertexAttribs2svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2svNV\0"
    "\0"
-   /* _mesa_function_pool[15553]: WeightbvARB (dynamic) */
+   /* _mesa_function_pool[15610]: WeightbvARB (dynamic) */
    "ip\0"
    "glWeightbvARB\0"
    "\0"
-   /* _mesa_function_pool[15571]: VertexAttrib2fvARB (will be remapped) */
+   /* _mesa_function_pool[15628]: VertexAttrib2fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2fv\0"
    "glVertexAttrib2fvARB\0"
    "\0"
-   /* _mesa_function_pool[15614]: GetBufferParameterivARB (will be remapped) */
+   /* _mesa_function_pool[15671]: GetBufferParameterivARB (will be remapped) */
    "iip\0"
    "glGetBufferParameteriv\0"
    "glGetBufferParameterivARB\0"
    "\0"
-   /* _mesa_function_pool[15668]: Rectdv (offset 87) */
+   /* _mesa_function_pool[15725]: Rectdv (offset 87) */
    "pp\0"
    "glRectdv\0"
    "\0"
-   /* _mesa_function_pool[15681]: ListParameteriSGIX (dynamic) */
+   /* _mesa_function_pool[15738]: ListParameteriSGIX (dynamic) */
    "iii\0"
    "glListParameteriSGIX\0"
    "\0"
-   /* _mesa_function_pool[15707]: ReplacementCodeuiColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[15764]: ReplacementCodeuiColor4fNormal3fVertex3fSUN (dynamic) */
    "iffffffffff\0"
    "glReplacementCodeuiColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[15766]: InstrumentsBufferSGIX (dynamic) */
+   /* _mesa_function_pool[15823]: InstrumentsBufferSGIX (dynamic) */
    "ip\0"
    "glInstrumentsBufferSGIX\0"
    "\0"
-   /* _mesa_function_pool[15794]: VertexAttrib4NivARB (will be remapped) */
+   /* _mesa_function_pool[15851]: VertexAttrib4NivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Niv\0"
    "glVertexAttrib4NivARB\0"
    "\0"
-   /* _mesa_function_pool[15839]: GetAttachedShaders (will be remapped) */
+   /* _mesa_function_pool[15896]: GetAttachedShaders (will be remapped) */
    "iipp\0"
    "glGetAttachedShaders\0"
    "\0"
-   /* _mesa_function_pool[15866]: GenVertexArraysAPPLE (will be remapped) */
+   /* _mesa_function_pool[15923]: GenVertexArraysAPPLE (will be remapped) */
    "ip\0"
    "glGenVertexArraysAPPLE\0"
    "\0"
-   /* _mesa_function_pool[15893]: Materialiv (offset 172) */
+   /* _mesa_function_pool[15950]: Materialiv (offset 172) */
    "iip\0"
    "glMaterialiv\0"
    "\0"
-   /* _mesa_function_pool[15911]: PushClientAttrib (offset 335) */
+   /* _mesa_function_pool[15968]: PushClientAttrib (offset 335) */
    "i\0"
    "glPushClientAttrib\0"
    "\0"
-   /* _mesa_function_pool[15933]: ProgramEnvParameters4fvEXT (will be remapped) */
+   /* _mesa_function_pool[15990]: ProgramEnvParameters4fvEXT (will be remapped) */
    "iiip\0"
    "glProgramEnvParameters4fvEXT\0"
    "\0"
-   /* _mesa_function_pool[15968]: TexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[16025]: TexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glTexCoord2fColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[16014]: WindowPos2iMESA (will be remapped) */
+   /* _mesa_function_pool[16071]: WindowPos2iMESA (will be remapped) */
    "ii\0"
    "glWindowPos2i\0"
    "glWindowPos2iARB\0"
    "glWindowPos2iMESA\0"
    "\0"
-   /* _mesa_function_pool[16067]: SecondaryColor3fvEXT (will be remapped) */
+   /* _mesa_function_pool[16124]: SecondaryColor3fvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3fv\0"
    "glSecondaryColor3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[16113]: PolygonMode (offset 174) */
+   /* _mesa_function_pool[16170]: PolygonMode (offset 174) */
    "ii\0"
    "glPolygonMode\0"
    "\0"
-   /* _mesa_function_pool[16131]: CompressedTexSubImage1DARB (will be remapped) */
+   /* _mesa_function_pool[16188]: CompressedTexSubImage1DARB (will be remapped) */
    "iiiiiip\0"
    "glCompressedTexSubImage1D\0"
    "glCompressedTexSubImage1DARB\0"
    "\0"
-   /* _mesa_function_pool[16195]: GetVertexAttribivNV (will be remapped) */
+   /* _mesa_function_pool[16252]: GetVertexAttribivNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribivNV\0"
    "\0"
-   /* _mesa_function_pool[16222]: GetProgramStringARB (will be remapped) */
+   /* _mesa_function_pool[16279]: GetProgramStringARB (will be remapped) */
    "iip\0"
    "glGetProgramStringARB\0"
    "\0"
-   /* _mesa_function_pool[16249]: TexBumpParameterfvATI (will be remapped) */
+   /* _mesa_function_pool[16306]: TexBumpParameterfvATI (will be remapped) */
    "ip\0"
    "glTexBumpParameterfvATI\0"
    "\0"
-   /* _mesa_function_pool[16277]: CompileShaderARB (will be remapped) */
+   /* _mesa_function_pool[16334]: CompileShaderARB (will be remapped) */
    "i\0"
    "glCompileShader\0"
    "glCompileShaderARB\0"
    "\0"
-   /* _mesa_function_pool[16315]: DeleteShader (will be remapped) */
+   /* _mesa_function_pool[16372]: DeleteShader (will be remapped) */
    "i\0"
    "glDeleteShader\0"
    "\0"
-   /* _mesa_function_pool[16333]: DisableClientState (offset 309) */
+   /* _mesa_function_pool[16390]: DisableClientState (offset 309) */
    "i\0"
    "glDisableClientState\0"
    "\0"
-   /* _mesa_function_pool[16357]: TexGeni (offset 192) */
+   /* _mesa_function_pool[16414]: TexGeni (offset 192) */
    "iii\0"
    "glTexGeni\0"
    "\0"
-   /* _mesa_function_pool[16372]: TexGenf (offset 190) */
+   /* _mesa_function_pool[16429]: TexGenf (offset 190) */
    "iif\0"
    "glTexGenf\0"
    "\0"
-   /* _mesa_function_pool[16387]: Uniform3fARB (will be remapped) */
+   /* _mesa_function_pool[16444]: Uniform3fARB (will be remapped) */
    "ifff\0"
    "glUniform3f\0"
    "glUniform3fARB\0"
    "\0"
-   /* _mesa_function_pool[16420]: TexGend (offset 188) */
+   /* _mesa_function_pool[16477]: TexGend (offset 188) */
    "iid\0"
    "glTexGend\0"
    "\0"
-   /* _mesa_function_pool[16435]: ListParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[16492]: ListParameterfvSGIX (dynamic) */
    "iip\0"
    "glListParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[16462]: GetPolygonStipple (offset 274) */
+   /* _mesa_function_pool[16519]: GetPolygonStipple (offset 274) */
    "p\0"
    "glGetPolygonStipple\0"
    "\0"
-   /* _mesa_function_pool[16485]: Tangent3dvEXT (dynamic) */
+   /* _mesa_function_pool[16542]: Tangent3dvEXT (dynamic) */
    "p\0"
    "glTangent3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[16504]: GetVertexAttribfvNV (will be remapped) */
+   /* _mesa_function_pool[16561]: GetVertexAttribfvNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribfvNV\0"
    "\0"
-   /* _mesa_function_pool[16531]: WindowPos3sMESA (will be remapped) */
+   /* _mesa_function_pool[16588]: WindowPos3sMESA (will be remapped) */
    "iii\0"
    "glWindowPos3s\0"
    "glWindowPos3sARB\0"
    "glWindowPos3sMESA\0"
    "\0"
-   /* _mesa_function_pool[16585]: VertexAttrib2svNV (will be remapped) */
+   /* _mesa_function_pool[16642]: VertexAttrib2svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2svNV\0"
    "\0"
-   /* _mesa_function_pool[16609]: VertexAttribs1fvNV (will be remapped) */
+   /* _mesa_function_pool[16666]: VertexAttribs1fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1fvNV\0"
    "\0"
-   /* _mesa_function_pool[16635]: TexCoord2fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[16692]: TexCoord2fVertex3fvSUN (dynamic) */
    "pp\0"
    "glTexCoord2fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[16664]: WindowPos4sMESA (will be remapped) */
+   /* _mesa_function_pool[16721]: WindowPos4sMESA (will be remapped) */
    "iiii\0"
    "glWindowPos4sMESA\0"
    "\0"
-   /* _mesa_function_pool[16688]: VertexAttrib4NuivARB (will be remapped) */
+   /* _mesa_function_pool[16745]: VertexAttrib4NuivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nuiv\0"
    "glVertexAttrib4NuivARB\0"
    "\0"
-   /* _mesa_function_pool[16735]: ClientActiveTextureARB (offset 375) */
+   /* _mesa_function_pool[16792]: ClientActiveTextureARB (offset 375) */
    "i\0"
    "glClientActiveTexture\0"
    "glClientActiveTextureARB\0"
    "\0"
-   /* _mesa_function_pool[16785]: PixelTexGenSGIX (will be remapped) */
+   /* _mesa_function_pool[16842]: PixelTexGenSGIX (will be remapped) */
    "i\0"
    "glPixelTexGenSGIX\0"
    "\0"
-   /* _mesa_function_pool[16806]: ReplacementCodeusvSUN (dynamic) */
+   /* _mesa_function_pool[16863]: ReplacementCodeusvSUN (dynamic) */
    "p\0"
    "glReplacementCodeusvSUN\0"
    "\0"
-   /* _mesa_function_pool[16833]: Uniform4fARB (will be remapped) */
+   /* _mesa_function_pool[16890]: Uniform4fARB (will be remapped) */
    "iffff\0"
    "glUniform4f\0"
    "glUniform4fARB\0"
    "\0"
-   /* _mesa_function_pool[16867]: Color4sv (offset 34) */
+   /* _mesa_function_pool[16924]: Color4sv (offset 34) */
    "p\0"
    "glColor4sv\0"
    "\0"
-   /* _mesa_function_pool[16881]: FlushMappedBufferRange (will be remapped) */
+   /* _mesa_function_pool[16938]: FlushMappedBufferRange (will be remapped) */
    "iii\0"
    "glFlushMappedBufferRange\0"
    "\0"
-   /* _mesa_function_pool[16911]: IsProgramNV (will be remapped) */
+   /* _mesa_function_pool[16968]: IsProgramNV (will be remapped) */
    "i\0"
    "glIsProgramARB\0"
    "glIsProgramNV\0"
    "\0"
-   /* _mesa_function_pool[16943]: FlushMappedBufferRangeAPPLE (will be remapped) */
+   /* _mesa_function_pool[17000]: FlushMappedBufferRangeAPPLE (will be remapped) */
    "iii\0"
    "glFlushMappedBufferRangeAPPLE\0"
    "\0"
-   /* _mesa_function_pool[16978]: PixelZoom (offset 246) */
+   /* _mesa_function_pool[17035]: PixelZoom (offset 246) */
    "ff\0"
    "glPixelZoom\0"
    "\0"
-   /* _mesa_function_pool[16994]: ReplacementCodePointerSUN (dynamic) */
+   /* _mesa_function_pool[17051]: ReplacementCodePointerSUN (dynamic) */
    "iip\0"
    "glReplacementCodePointerSUN\0"
    "\0"
-   /* _mesa_function_pool[17027]: ProgramEnvParameter4dARB (will be remapped) */
+   /* _mesa_function_pool[17084]: ProgramEnvParameter4dARB (will be remapped) */
    "iidddd\0"
    "glProgramEnvParameter4dARB\0"
    "glProgramParameter4dNV\0"
    "\0"
-   /* _mesa_function_pool[17085]: ColorTableParameterfv (offset 340) */
+   /* _mesa_function_pool[17142]: ColorTableParameterfv (offset 340) */
    "iip\0"
    "glColorTableParameterfv\0"
    "glColorTableParameterfvSGI\0"
    "\0"
-   /* _mesa_function_pool[17141]: FragmentLightModelfSGIX (dynamic) */
+   /* _mesa_function_pool[17198]: FragmentLightModelfSGIX (dynamic) */
    "if\0"
    "glFragmentLightModelfSGIX\0"
    "\0"
-   /* _mesa_function_pool[17171]: Binormal3bvEXT (dynamic) */
+   /* _mesa_function_pool[17228]: Binormal3bvEXT (dynamic) */
    "p\0"
    "glBinormal3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[17191]: PixelMapuiv (offset 252) */
+   /* _mesa_function_pool[17248]: PixelMapuiv (offset 252) */
    "iip\0"
    "glPixelMapuiv\0"
    "\0"
-   /* _mesa_function_pool[17210]: Color3dv (offset 12) */
+   /* _mesa_function_pool[17267]: Color3dv (offset 12) */
    "p\0"
    "glColor3dv\0"
    "\0"
-   /* _mesa_function_pool[17224]: IsTexture (offset 330) */
+   /* _mesa_function_pool[17281]: IsTexture (offset 330) */
    "i\0"
    "glIsTexture\0"
    "glIsTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[17254]: VertexWeightfvEXT (dynamic) */
+   /* _mesa_function_pool[17311]: VertexWeightfvEXT (dynamic) */
    "p\0"
    "glVertexWeightfvEXT\0"
    "\0"
-   /* _mesa_function_pool[17277]: VertexAttrib1dARB (will be remapped) */
+   /* _mesa_function_pool[17334]: VertexAttrib1dARB (will be remapped) */
    "id\0"
    "glVertexAttrib1d\0"
    "glVertexAttrib1dARB\0"
    "\0"
-   /* _mesa_function_pool[17318]: ImageTransformParameterivHP (dynamic) */
+   /* _mesa_function_pool[17375]: ImageTransformParameterivHP (dynamic) */
    "iip\0"
    "glImageTransformParameterivHP\0"
    "\0"
-   /* _mesa_function_pool[17353]: TexCoord4i (offset 122) */
+   /* _mesa_function_pool[17410]: TexCoord4i (offset 122) */
    "iiii\0"
    "glTexCoord4i\0"
    "\0"
-   /* _mesa_function_pool[17372]: DeleteQueriesARB (will be remapped) */
+   /* _mesa_function_pool[17429]: DeleteQueriesARB (will be remapped) */
    "ip\0"
    "glDeleteQueries\0"
    "glDeleteQueriesARB\0"
    "\0"
-   /* _mesa_function_pool[17411]: Color4ubVertex2fSUN (dynamic) */
+   /* _mesa_function_pool[17468]: Color4ubVertex2fSUN (dynamic) */
    "iiiiff\0"
    "glColor4ubVertex2fSUN\0"
    "\0"
-   /* _mesa_function_pool[17441]: FragmentColorMaterialSGIX (dynamic) */
+   /* _mesa_function_pool[17498]: FragmentColorMaterialSGIX (dynamic) */
    "ii\0"
    "glFragmentColorMaterialSGIX\0"
    "\0"
-   /* _mesa_function_pool[17473]: CurrentPaletteMatrixARB (dynamic) */
+   /* _mesa_function_pool[17530]: CurrentPaletteMatrixARB (dynamic) */
    "i\0"
    "glCurrentPaletteMatrixARB\0"
    "\0"
-   /* _mesa_function_pool[17502]: GetMapdv (offset 266) */
+   /* _mesa_function_pool[17559]: GetMapdv (offset 266) */
    "iip\0"
    "glGetMapdv\0"
    "\0"
-   /* _mesa_function_pool[17518]: SamplePatternSGIS (will be remapped) */
+   /* _mesa_function_pool[17575]: ObjectPurgeableAPPLE (will be remapped) */
+   "iii\0"
+   "glObjectPurgeableAPPLE\0"
+   "\0"
+   /* _mesa_function_pool[17603]: SamplePatternSGIS (will be remapped) */
    "i\0"
    "glSamplePatternSGIS\0"
    "glSamplePatternEXT\0"
    "\0"
-   /* _mesa_function_pool[17560]: PixelStoref (offset 249) */
+   /* _mesa_function_pool[17645]: PixelStoref (offset 249) */
    "if\0"
    "glPixelStoref\0"
    "\0"
-   /* _mesa_function_pool[17578]: IsQueryARB (will be remapped) */
+   /* _mesa_function_pool[17663]: IsQueryARB (will be remapped) */
    "i\0"
    "glIsQuery\0"
    "glIsQueryARB\0"
    "\0"
-   /* _mesa_function_pool[17604]: ReplacementCodeuiColor4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[17689]: ReplacementCodeuiColor4ubVertex3fSUN (dynamic) */
    "iiiiifff\0"
    "glReplacementCodeuiColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[17653]: PixelStorei (offset 250) */
+   /* _mesa_function_pool[17738]: PixelStorei (offset 250) */
    "ii\0"
    "glPixelStorei\0"
    "\0"
-   /* _mesa_function_pool[17671]: VertexAttrib4usvARB (will be remapped) */
+   /* _mesa_function_pool[17756]: VertexAttrib4usvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4usv\0"
    "glVertexAttrib4usvARB\0"
    "\0"
-   /* _mesa_function_pool[17716]: LinkProgramARB (will be remapped) */
+   /* _mesa_function_pool[17801]: LinkProgramARB (will be remapped) */
    "i\0"
    "glLinkProgram\0"
    "glLinkProgramARB\0"
    "\0"
-   /* _mesa_function_pool[17750]: VertexAttrib2fNV (will be remapped) */
+   /* _mesa_function_pool[17835]: VertexAttrib2fNV (will be remapped) */
    "iff\0"
    "glVertexAttrib2fNV\0"
    "\0"
-   /* _mesa_function_pool[17774]: ShaderSourceARB (will be remapped) */
+   /* _mesa_function_pool[17859]: ShaderSourceARB (will be remapped) */
    "iipp\0"
    "glShaderSource\0"
    "glShaderSourceARB\0"
    "\0"
-   /* _mesa_function_pool[17813]: FragmentMaterialiSGIX (dynamic) */
+   /* _mesa_function_pool[17898]: FragmentMaterialiSGIX (dynamic) */
    "iii\0"
    "glFragmentMaterialiSGIX\0"
    "\0"
-   /* _mesa_function_pool[17842]: EvalCoord2dv (offset 233) */
+   /* _mesa_function_pool[17927]: EvalCoord2dv (offset 233) */
    "p\0"
    "glEvalCoord2dv\0"
    "\0"
-   /* _mesa_function_pool[17860]: VertexAttrib3svARB (will be remapped) */
+   /* _mesa_function_pool[17945]: VertexAttrib3svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3sv\0"
    "glVertexAttrib3svARB\0"
    "\0"
-   /* _mesa_function_pool[17903]: ColorMaterial (offset 151) */
+   /* _mesa_function_pool[17988]: ColorMaterial (offset 151) */
    "ii\0"
    "glColorMaterial\0"
    "\0"
-   /* _mesa_function_pool[17923]: CompressedTexSubImage3DARB (will be remapped) */
+   /* _mesa_function_pool[18008]: CompressedTexSubImage3DARB (will be remapped) */
    "iiiiiiiiiip\0"
    "glCompressedTexSubImage3D\0"
    "glCompressedTexSubImage3DARB\0"
    "\0"
-   /* _mesa_function_pool[17991]: WindowPos2ivMESA (will be remapped) */
+   /* _mesa_function_pool[18076]: WindowPos2ivMESA (will be remapped) */
    "p\0"
    "glWindowPos2iv\0"
    "glWindowPos2ivARB\0"
    "glWindowPos2ivMESA\0"
    "\0"
-   /* _mesa_function_pool[18046]: IsFramebufferEXT (will be remapped) */
+   /* _mesa_function_pool[18131]: IsFramebufferEXT (will be remapped) */
    "i\0"
    "glIsFramebuffer\0"
    "glIsFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[18084]: Uniform4ivARB (will be remapped) */
+   /* _mesa_function_pool[18169]: Uniform4ivARB (will be remapped) */
    "iip\0"
    "glUniform4iv\0"
    "glUniform4ivARB\0"
    "\0"
-   /* _mesa_function_pool[18118]: GetVertexAttribdvARB (will be remapped) */
+   /* _mesa_function_pool[18203]: GetVertexAttribdvARB (will be remapped) */
    "iip\0"
    "glGetVertexAttribdv\0"
    "glGetVertexAttribdvARB\0"
    "\0"
-   /* _mesa_function_pool[18166]: TexBumpParameterivATI (will be remapped) */
+   /* _mesa_function_pool[18251]: TexBumpParameterivATI (will be remapped) */
    "ip\0"
    "glTexBumpParameterivATI\0"
    "\0"
-   /* _mesa_function_pool[18194]: GetSeparableFilter (offset 359) */
+   /* _mesa_function_pool[18279]: GetSeparableFilter (offset 359) */
    "iiippp\0"
    "glGetSeparableFilter\0"
    "glGetSeparableFilterEXT\0"
    "\0"
-   /* _mesa_function_pool[18247]: Binormal3dEXT (dynamic) */
+   /* _mesa_function_pool[18332]: Binormal3dEXT (dynamic) */
    "ddd\0"
    "glBinormal3dEXT\0"
    "\0"
-   /* _mesa_function_pool[18268]: SpriteParameteriSGIX (dynamic) */
+   /* _mesa_function_pool[18353]: SpriteParameteriSGIX (dynamic) */
    "ii\0"
    "glSpriteParameteriSGIX\0"
    "\0"
-   /* _mesa_function_pool[18295]: RequestResidentProgramsNV (will be remapped) */
+   /* _mesa_function_pool[18380]: RequestResidentProgramsNV (will be remapped) */
    "ip\0"
    "glRequestResidentProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[18327]: TagSampleBufferSGIX (dynamic) */
+   /* _mesa_function_pool[18412]: TagSampleBufferSGIX (dynamic) */
    "\0"
    "glTagSampleBufferSGIX\0"
    "\0"
-   /* _mesa_function_pool[18351]: ReplacementCodeusSUN (dynamic) */
+   /* _mesa_function_pool[18436]: ReplacementCodeusSUN (dynamic) */
    "i\0"
    "glReplacementCodeusSUN\0"
    "\0"
-   /* _mesa_function_pool[18377]: FeedbackBuffer (offset 194) */
+   /* _mesa_function_pool[18462]: FeedbackBuffer (offset 194) */
    "iip\0"
    "glFeedbackBuffer\0"
    "\0"
-   /* _mesa_function_pool[18399]: RasterPos2iv (offset 67) */
+   /* _mesa_function_pool[18484]: RasterPos2iv (offset 67) */
    "p\0"
    "glRasterPos2iv\0"
    "\0"
-   /* _mesa_function_pool[18417]: TexImage1D (offset 182) */
+   /* _mesa_function_pool[18502]: TexImage1D (offset 182) */
    "iiiiiiip\0"
    "glTexImage1D\0"
    "\0"
-   /* _mesa_function_pool[18440]: ListParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[18525]: ListParameterivSGIX (dynamic) */
    "iip\0"
    "glListParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[18467]: MultiDrawElementsEXT (will be remapped) */
+   /* _mesa_function_pool[18552]: MultiDrawElementsEXT (will be remapped) */
    "ipipi\0"
    "glMultiDrawElements\0"
    "glMultiDrawElementsEXT\0"
    "\0"
-   /* _mesa_function_pool[18517]: Color3s (offset 17) */
+   /* _mesa_function_pool[18602]: Color3s (offset 17) */
    "iii\0"
    "glColor3s\0"
    "\0"
-   /* _mesa_function_pool[18532]: Uniform1ivARB (will be remapped) */
+   /* _mesa_function_pool[18617]: Uniform1ivARB (will be remapped) */
    "iip\0"
    "glUniform1iv\0"
    "glUniform1ivARB\0"
    "\0"
-   /* _mesa_function_pool[18566]: WindowPos2sMESA (will be remapped) */
+   /* _mesa_function_pool[18651]: WindowPos2sMESA (will be remapped) */
    "ii\0"
    "glWindowPos2s\0"
    "glWindowPos2sARB\0"
    "glWindowPos2sMESA\0"
    "\0"
-   /* _mesa_function_pool[18619]: WeightusvARB (dynamic) */
+   /* _mesa_function_pool[18704]: WeightusvARB (dynamic) */
    "ip\0"
    "glWeightusvARB\0"
    "\0"
-   /* _mesa_function_pool[18638]: TexCoordPointer (offset 320) */
+   /* _mesa_function_pool[18723]: TexCoordPointer (offset 320) */
    "iiip\0"
    "glTexCoordPointer\0"
    "\0"
-   /* _mesa_function_pool[18662]: FogCoordPointerEXT (will be remapped) */
+   /* _mesa_function_pool[18747]: FogCoordPointerEXT (will be remapped) */
    "iip\0"
    "glFogCoordPointer\0"
    "glFogCoordPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[18706]: IndexMaterialEXT (dynamic) */
+   /* _mesa_function_pool[18791]: IndexMaterialEXT (dynamic) */
    "ii\0"
    "glIndexMaterialEXT\0"
    "\0"
-   /* _mesa_function_pool[18729]: Color3i (offset 15) */
+   /* _mesa_function_pool[18814]: Color3i (offset 15) */
    "iii\0"
    "glColor3i\0"
    "\0"
-   /* _mesa_function_pool[18744]: FrontFace (offset 157) */
+   /* _mesa_function_pool[18829]: FrontFace (offset 157) */
    "i\0"
    "glFrontFace\0"
    "\0"
-   /* _mesa_function_pool[18759]: EvalCoord2d (offset 232) */
+   /* _mesa_function_pool[18844]: EvalCoord2d (offset 232) */
    "dd\0"
    "glEvalCoord2d\0"
    "\0"
-   /* _mesa_function_pool[18777]: SecondaryColor3ubvEXT (will be remapped) */
+   /* _mesa_function_pool[18862]: SecondaryColor3ubvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3ubv\0"
    "glSecondaryColor3ubvEXT\0"
    "\0"
-   /* _mesa_function_pool[18825]: EvalCoord2f (offset 234) */
+   /* _mesa_function_pool[18910]: EvalCoord2f (offset 234) */
    "ff\0"
    "glEvalCoord2f\0"
    "\0"
-   /* _mesa_function_pool[18843]: VertexAttrib4dvARB (will be remapped) */
+   /* _mesa_function_pool[18928]: VertexAttrib4dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4dv\0"
    "glVertexAttrib4dvARB\0"
    "\0"
-   /* _mesa_function_pool[18886]: BindAttribLocationARB (will be remapped) */
+   /* _mesa_function_pool[18971]: BindAttribLocationARB (will be remapped) */
    "iip\0"
    "glBindAttribLocation\0"
    "glBindAttribLocationARB\0"
    "\0"
-   /* _mesa_function_pool[18936]: Color3b (offset 9) */
+   /* _mesa_function_pool[19021]: Color3b (offset 9) */
    "iii\0"
    "glColor3b\0"
    "\0"
-   /* _mesa_function_pool[18951]: MultiTexCoord2dARB (offset 384) */
+   /* _mesa_function_pool[19036]: MultiTexCoord2dARB (offset 384) */
    "idd\0"
    "glMultiTexCoord2d\0"
    "glMultiTexCoord2dARB\0"
    "\0"
-   /* _mesa_function_pool[18995]: ExecuteProgramNV (will be remapped) */
+   /* _mesa_function_pool[19080]: ExecuteProgramNV (will be remapped) */
    "iip\0"
    "glExecuteProgramNV\0"
    "\0"
-   /* _mesa_function_pool[19019]: Color3f (offset 13) */
+   /* _mesa_function_pool[19104]: Color3f (offset 13) */
    "fff\0"
    "glColor3f\0"
    "\0"
-   /* _mesa_function_pool[19034]: LightEnviSGIX (dynamic) */
+   /* _mesa_function_pool[19119]: LightEnviSGIX (dynamic) */
    "ii\0"
    "glLightEnviSGIX\0"
    "\0"
-   /* _mesa_function_pool[19054]: Color3d (offset 11) */
+   /* _mesa_function_pool[19139]: Color3d (offset 11) */
    "ddd\0"
    "glColor3d\0"
    "\0"
-   /* _mesa_function_pool[19069]: Normal3dv (offset 55) */
+   /* _mesa_function_pool[19154]: Normal3dv (offset 55) */
    "p\0"
    "glNormal3dv\0"
    "\0"
-   /* _mesa_function_pool[19084]: Lightf (offset 159) */
+   /* _mesa_function_pool[19169]: Lightf (offset 159) */
    "iif\0"
    "glLightf\0"
    "\0"
-   /* _mesa_function_pool[19098]: ReplacementCodeuiSUN (dynamic) */
+   /* _mesa_function_pool[19183]: ReplacementCodeuiSUN (dynamic) */
    "i\0"
    "glReplacementCodeuiSUN\0"
    "\0"
-   /* _mesa_function_pool[19124]: MatrixMode (offset 293) */
+   /* _mesa_function_pool[19209]: MatrixMode (offset 293) */
    "i\0"
    "glMatrixMode\0"
    "\0"
-   /* _mesa_function_pool[19140]: GetPixelMapusv (offset 273) */
+   /* _mesa_function_pool[19225]: GetPixelMapusv (offset 273) */
    "ip\0"
    "glGetPixelMapusv\0"
    "\0"
-   /* _mesa_function_pool[19161]: Lighti (offset 161) */
+   /* _mesa_function_pool[19246]: Lighti (offset 161) */
    "iii\0"
    "glLighti\0"
    "\0"
-   /* _mesa_function_pool[19175]: VertexAttribPointerNV (will be remapped) */
+   /* _mesa_function_pool[19260]: VertexAttribPointerNV (will be remapped) */
    "iiiip\0"
    "glVertexAttribPointerNV\0"
    "\0"
-   /* _mesa_function_pool[19206]: GetBooleanIndexedvEXT (will be remapped) */
+   /* _mesa_function_pool[19291]: GetBooleanIndexedvEXT (will be remapped) */
    "iip\0"
    "glGetBooleanIndexedvEXT\0"
    "\0"
-   /* _mesa_function_pool[19235]: GetFramebufferAttachmentParameterivEXT (will be remapped) */
+   /* _mesa_function_pool[19320]: GetFramebufferAttachmentParameterivEXT (will be remapped) */
    "iiip\0"
    "glGetFramebufferAttachmentParameteriv\0"
    "glGetFramebufferAttachmentParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[19320]: PixelTransformParameterfEXT (dynamic) */
+   /* _mesa_function_pool[19405]: PixelTransformParameterfEXT (dynamic) */
    "iif\0"
    "glPixelTransformParameterfEXT\0"
    "\0"
-   /* _mesa_function_pool[19355]: MultiTexCoord4dvARB (offset 401) */
+   /* _mesa_function_pool[19440]: MultiTexCoord4dvARB (offset 401) */
    "ip\0"
    "glMultiTexCoord4dv\0"
    "glMultiTexCoord4dvARB\0"
    "\0"
-   /* _mesa_function_pool[19400]: PixelTransformParameteriEXT (dynamic) */
+   /* _mesa_function_pool[19485]: PixelTransformParameteriEXT (dynamic) */
    "iii\0"
    "glPixelTransformParameteriEXT\0"
    "\0"
-   /* _mesa_function_pool[19435]: GetDoublev (offset 260) */
+   /* _mesa_function_pool[19520]: GetDoublev (offset 260) */
    "ip\0"
    "glGetDoublev\0"
    "\0"
-   /* _mesa_function_pool[19452]: MultMatrixd (offset 295) */
+   /* _mesa_function_pool[19537]: MultMatrixd (offset 295) */
    "p\0"
    "glMultMatrixd\0"
    "\0"
-   /* _mesa_function_pool[19469]: MultMatrixf (offset 294) */
+   /* _mesa_function_pool[19554]: MultMatrixf (offset 294) */
    "p\0"
    "glMultMatrixf\0"
    "\0"
-   /* _mesa_function_pool[19486]: TexCoord2fColor4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[19571]: TexCoord2fColor4ubVertex3fSUN (dynamic) */
    "ffiiiifff\0"
    "glTexCoord2fColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[19529]: Uniform1iARB (will be remapped) */
+   /* _mesa_function_pool[19614]: Uniform1iARB (will be remapped) */
    "ii\0"
    "glUniform1i\0"
    "glUniform1iARB\0"
    "\0"
-   /* _mesa_function_pool[19560]: VertexAttribPointerARB (will be remapped) */
+   /* _mesa_function_pool[19645]: VertexAttribPointerARB (will be remapped) */
    "iiiiip\0"
    "glVertexAttribPointer\0"
    "glVertexAttribPointerARB\0"
    "\0"
-   /* _mesa_function_pool[19615]: SharpenTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[19700]: SharpenTexFuncSGIS (dynamic) */
    "iip\0"
    "glSharpenTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[19641]: MultiTexCoord4fvARB (offset 403) */
+   /* _mesa_function_pool[19726]: MultiTexCoord4fvARB (offset 403) */
    "ip\0"
    "glMultiTexCoord4fv\0"
    "glMultiTexCoord4fvARB\0"
    "\0"
-   /* _mesa_function_pool[19686]: UniformMatrix2x3fv (will be remapped) */
+   /* _mesa_function_pool[19771]: UniformMatrix2x3fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix2x3fv\0"
    "\0"
-   /* _mesa_function_pool[19713]: TrackMatrixNV (will be remapped) */
+   /* _mesa_function_pool[19798]: TrackMatrixNV (will be remapped) */
    "iiii\0"
    "glTrackMatrixNV\0"
    "\0"
-   /* _mesa_function_pool[19735]: CombinerParameteriNV (will be remapped) */
+   /* _mesa_function_pool[19820]: CombinerParameteriNV (will be remapped) */
    "ii\0"
    "glCombinerParameteriNV\0"
    "\0"
-   /* _mesa_function_pool[19762]: DeleteAsyncMarkersSGIX (dynamic) */
+   /* _mesa_function_pool[19847]: DeleteAsyncMarkersSGIX (dynamic) */
    "ii\0"
    "glDeleteAsyncMarkersSGIX\0"
    "\0"
-   /* _mesa_function_pool[19791]: IsAsyncMarkerSGIX (dynamic) */
+   /* _mesa_function_pool[19876]: IsAsyncMarkerSGIX (dynamic) */
    "i\0"
    "glIsAsyncMarkerSGIX\0"
    "\0"
-   /* _mesa_function_pool[19814]: FrameZoomSGIX (dynamic) */
+   /* _mesa_function_pool[19899]: FrameZoomSGIX (dynamic) */
    "i\0"
    "glFrameZoomSGIX\0"
    "\0"
-   /* _mesa_function_pool[19833]: Normal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[19918]: Normal3fVertex3fvSUN (dynamic) */
    "pp\0"
    "glNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[19860]: RasterPos4sv (offset 85) */
+   /* _mesa_function_pool[19945]: RasterPos4sv (offset 85) */
    "p\0"
    "glRasterPos4sv\0"
    "\0"
-   /* _mesa_function_pool[19878]: VertexAttrib4NsvARB (will be remapped) */
+   /* _mesa_function_pool[19963]: VertexAttrib4NsvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nsv\0"
    "glVertexAttrib4NsvARB\0"
    "\0"
-   /* _mesa_function_pool[19923]: VertexAttrib3fvARB (will be remapped) */
+   /* _mesa_function_pool[20008]: VertexAttrib3fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3fv\0"
    "glVertexAttrib3fvARB\0"
    "\0"
-   /* _mesa_function_pool[19966]: ClearColor (offset 206) */
+   /* _mesa_function_pool[20051]: ClearColor (offset 206) */
    "ffff\0"
    "glClearColor\0"
    "\0"
-   /* _mesa_function_pool[19985]: GetSynciv (will be remapped) */
+   /* _mesa_function_pool[20070]: GetSynciv (will be remapped) */
    "iiipp\0"
    "glGetSynciv\0"
    "\0"
-   /* _mesa_function_pool[20004]: DeleteFramebuffersEXT (will be remapped) */
+   /* _mesa_function_pool[20089]: DeleteFramebuffersEXT (will be remapped) */
    "ip\0"
    "glDeleteFramebuffers\0"
    "glDeleteFramebuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[20053]: GlobalAlphaFactorsSUN (dynamic) */
+   /* _mesa_function_pool[20138]: GlobalAlphaFactorsSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorsSUN\0"
    "\0"
-   /* _mesa_function_pool[20080]: IsEnabledIndexedEXT (will be remapped) */
+   /* _mesa_function_pool[20165]: IsEnabledIndexedEXT (will be remapped) */
    "ii\0"
    "glIsEnabledIndexedEXT\0"
    "\0"
-   /* _mesa_function_pool[20106]: TexEnviv (offset 187) */
+   /* _mesa_function_pool[20191]: TexEnviv (offset 187) */
    "iip\0"
    "glTexEnviv\0"
    "\0"
-   /* _mesa_function_pool[20122]: TexSubImage3D (offset 372) */
+   /* _mesa_function_pool[20207]: TexSubImage3D (offset 372) */
    "iiiiiiiiiip\0"
    "glTexSubImage3D\0"
    "glTexSubImage3DEXT\0"
    "\0"
-   /* _mesa_function_pool[20170]: Tangent3fEXT (dynamic) */
+   /* _mesa_function_pool[20255]: Tangent3fEXT (dynamic) */
    "fff\0"
    "glTangent3fEXT\0"
    "\0"
-   /* _mesa_function_pool[20190]: SecondaryColor3uivEXT (will be remapped) */
+   /* _mesa_function_pool[20275]: SecondaryColor3uivEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3uiv\0"
    "glSecondaryColor3uivEXT\0"
    "\0"
-   /* _mesa_function_pool[20238]: MatrixIndexubvARB (dynamic) */
+   /* _mesa_function_pool[20323]: MatrixIndexubvARB (dynamic) */
    "ip\0"
    "glMatrixIndexubvARB\0"
    "\0"
-   /* _mesa_function_pool[20262]: Color4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[20347]: Color4fNormal3fVertex3fSUN (dynamic) */
    "ffffffffff\0"
    "glColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[20303]: PixelTexGenParameterfSGIS (will be remapped) */
+   /* _mesa_function_pool[20388]: PixelTexGenParameterfSGIS (will be remapped) */
    "if\0"
    "glPixelTexGenParameterfSGIS\0"
    "\0"
-   /* _mesa_function_pool[20335]: CreateShader (will be remapped) */
+   /* _mesa_function_pool[20420]: CreateShader (will be remapped) */
    "i\0"
    "glCreateShader\0"
    "\0"
-   /* _mesa_function_pool[20353]: GetColorTableParameterfv (offset 344) */
+   /* _mesa_function_pool[20438]: GetColorTableParameterfv (offset 344) */
    "iip\0"
    "glGetColorTableParameterfv\0"
    "glGetColorTableParameterfvSGI\0"
    "glGetColorTableParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[20445]: FragmentLightModelfvSGIX (dynamic) */
+   /* _mesa_function_pool[20530]: FragmentLightModelfvSGIX (dynamic) */
    "ip\0"
    "glFragmentLightModelfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[20476]: Bitmap (offset 8) */
+   /* _mesa_function_pool[20561]: Bitmap (offset 8) */
    "iiffffp\0"
    "glBitmap\0"
    "\0"
-   /* _mesa_function_pool[20494]: MultiTexCoord3fARB (offset 394) */
+   /* _mesa_function_pool[20579]: MultiTexCoord3fARB (offset 394) */
    "ifff\0"
    "glMultiTexCoord3f\0"
    "glMultiTexCoord3fARB\0"
    "\0"
-   /* _mesa_function_pool[20539]: GetTexLevelParameterfv (offset 284) */
+   /* _mesa_function_pool[20624]: GetTexLevelParameterfv (offset 284) */
    "iiip\0"
    "glGetTexLevelParameterfv\0"
    "\0"
-   /* _mesa_function_pool[20570]: GetPixelTexGenParameterfvSGIS (will be remapped) */
+   /* _mesa_function_pool[20655]: GetPixelTexGenParameterfvSGIS (will be remapped) */
    "ip\0"
    "glGetPixelTexGenParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[20606]: GenFramebuffersEXT (will be remapped) */
+   /* _mesa_function_pool[20691]: GenFramebuffersEXT (will be remapped) */
    "ip\0"
    "glGenFramebuffers\0"
    "glGenFramebuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[20649]: GetProgramParameterdvNV (will be remapped) */
+   /* _mesa_function_pool[20734]: GetProgramParameterdvNV (will be remapped) */
    "iiip\0"
    "glGetProgramParameterdvNV\0"
    "\0"
-   /* _mesa_function_pool[20681]: Vertex2sv (offset 133) */
+   /* _mesa_function_pool[20766]: Vertex2sv (offset 133) */
    "p\0"
    "glVertex2sv\0"
    "\0"
-   /* _mesa_function_pool[20696]: GetIntegerv (offset 263) */
+   /* _mesa_function_pool[20781]: GetIntegerv (offset 263) */
    "ip\0"
    "glGetIntegerv\0"
    "\0"
-   /* _mesa_function_pool[20714]: IsVertexArrayAPPLE (will be remapped) */
+   /* _mesa_function_pool[20799]: IsVertexArrayAPPLE (will be remapped) */
    "i\0"
    "glIsVertexArray\0"
    "glIsVertexArrayAPPLE\0"
    "\0"
-   /* _mesa_function_pool[20754]: FragmentLightfvSGIX (dynamic) */
+   /* _mesa_function_pool[20839]: FragmentLightfvSGIX (dynamic) */
    "iip\0"
    "glFragmentLightfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[20781]: DetachShader (will be remapped) */
+   /* _mesa_function_pool[20866]: DetachShader (will be remapped) */
    "ii\0"
    "glDetachShader\0"
    "\0"
-   /* _mesa_function_pool[20800]: VertexAttrib4NubARB (will be remapped) */
+   /* _mesa_function_pool[20885]: VertexAttrib4NubARB (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4Nub\0"
    "glVertexAttrib4NubARB\0"
    "\0"
-   /* _mesa_function_pool[20848]: GetProgramEnvParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[20933]: GetProgramEnvParameterfvARB (will be remapped) */
    "iip\0"
    "glGetProgramEnvParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[20883]: GetTrackMatrixivNV (will be remapped) */
+   /* _mesa_function_pool[20968]: GetTrackMatrixivNV (will be remapped) */
    "iiip\0"
    "glGetTrackMatrixivNV\0"
    "\0"
-   /* _mesa_function_pool[20910]: VertexAttrib3svNV (will be remapped) */
+   /* _mesa_function_pool[20995]: VertexAttrib3svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3svNV\0"
    "\0"
-   /* _mesa_function_pool[20934]: Uniform4fvARB (will be remapped) */
+   /* _mesa_function_pool[21019]: Uniform4fvARB (will be remapped) */
    "iip\0"
    "glUniform4fv\0"
    "glUniform4fvARB\0"
    "\0"
-   /* _mesa_function_pool[20968]: MultTransposeMatrixfARB (will be remapped) */
+   /* _mesa_function_pool[21053]: MultTransposeMatrixfARB (will be remapped) */
    "p\0"
    "glMultTransposeMatrixf\0"
    "glMultTransposeMatrixfARB\0"
    "\0"
-   /* _mesa_function_pool[21020]: GetTexEnviv (offset 277) */
+   /* _mesa_function_pool[21105]: GetTexEnviv (offset 277) */
    "iip\0"
    "glGetTexEnviv\0"
    "\0"
-   /* _mesa_function_pool[21039]: ColorFragmentOp1ATI (will be remapped) */
+   /* _mesa_function_pool[21124]: ColorFragmentOp1ATI (will be remapped) */
    "iiiiiii\0"
    "glColorFragmentOp1ATI\0"
    "\0"
-   /* _mesa_function_pool[21070]: GetUniformfvARB (will be remapped) */
+   /* _mesa_function_pool[21155]: GetUniformfvARB (will be remapped) */
    "iip\0"
    "glGetUniformfv\0"
    "glGetUniformfvARB\0"
    "\0"
-   /* _mesa_function_pool[21108]: EGLImageTargetRenderbufferStorageOES (will be remapped) */
+   /* _mesa_function_pool[21193]: EGLImageTargetRenderbufferStorageOES (will be remapped) */
    "ip\0"
    "glEGLImageTargetRenderbufferStorageOES\0"
    "\0"
-   /* _mesa_function_pool[21151]: PopClientAttrib (offset 334) */
+   /* _mesa_function_pool[21236]: PopClientAttrib (offset 334) */
    "\0"
    "glPopClientAttrib\0"
    "\0"
-   /* _mesa_function_pool[21171]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[21256]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
    "iffffffffffff\0"
    "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[21242]: DetachObjectARB (will be remapped) */
+   /* _mesa_function_pool[21327]: DetachObjectARB (will be remapped) */
    "ii\0"
    "glDetachObjectARB\0"
    "\0"
-   /* _mesa_function_pool[21264]: VertexBlendARB (dynamic) */
+   /* _mesa_function_pool[21349]: VertexBlendARB (dynamic) */
    "i\0"
    "glVertexBlendARB\0"
    "\0"
-   /* _mesa_function_pool[21284]: WindowPos3iMESA (will be remapped) */
+   /* _mesa_function_pool[21369]: WindowPos3iMESA (will be remapped) */
    "iii\0"
    "glWindowPos3i\0"
    "glWindowPos3iARB\0"
    "glWindowPos3iMESA\0"
    "\0"
-   /* _mesa_function_pool[21338]: SeparableFilter2D (offset 360) */
+   /* _mesa_function_pool[21423]: SeparableFilter2D (offset 360) */
    "iiiiiipp\0"
    "glSeparableFilter2D\0"
    "glSeparableFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[21391]: ReplacementCodeuiColor4ubVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[21476]: ReplacementCodeuiColor4ubVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiColor4ubVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[21436]: Map1d (offset 220) */
+   /* _mesa_function_pool[21521]: Map1d (offset 220) */
    "iddiip\0"
    "glMap1d\0"
    "\0"
-   /* _mesa_function_pool[21452]: Map1f (offset 221) */
+   /* _mesa_function_pool[21537]: Map1f (offset 221) */
    "iffiip\0"
    "glMap1f\0"
    "\0"
-   /* _mesa_function_pool[21468]: CompressedTexImage2DARB (will be remapped) */
+   /* _mesa_function_pool[21553]: CompressedTexImage2DARB (will be remapped) */
    "iiiiiiip\0"
    "glCompressedTexImage2D\0"
    "glCompressedTexImage2DARB\0"
    "\0"
-   /* _mesa_function_pool[21527]: ArrayElement (offset 306) */
+   /* _mesa_function_pool[21612]: ArrayElement (offset 306) */
    "i\0"
    "glArrayElement\0"
    "glArrayElementEXT\0"
    "\0"
-   /* _mesa_function_pool[21563]: TexImage2D (offset 183) */
+   /* _mesa_function_pool[21648]: TexImage2D (offset 183) */
    "iiiiiiiip\0"
    "glTexImage2D\0"
    "\0"
-   /* _mesa_function_pool[21587]: DepthBoundsEXT (will be remapped) */
+   /* _mesa_function_pool[21672]: DepthBoundsEXT (will be remapped) */
    "dd\0"
    "glDepthBoundsEXT\0"
    "\0"
-   /* _mesa_function_pool[21608]: ProgramParameters4fvNV (will be remapped) */
+   /* _mesa_function_pool[21693]: ProgramParameters4fvNV (will be remapped) */
    "iiip\0"
    "glProgramParameters4fvNV\0"
    "\0"
-   /* _mesa_function_pool[21639]: DeformationMap3fSGIX (dynamic) */
+   /* _mesa_function_pool[21724]: DeformationMap3fSGIX (dynamic) */
    "iffiiffiiffiip\0"
    "glDeformationMap3fSGIX\0"
    "\0"
-   /* _mesa_function_pool[21678]: GetProgramivNV (will be remapped) */
+   /* _mesa_function_pool[21763]: GetProgramivNV (will be remapped) */
    "iip\0"
    "glGetProgramivNV\0"
    "\0"
-   /* _mesa_function_pool[21700]: GetMinmaxParameteriv (offset 366) */
+   /* _mesa_function_pool[21785]: GetMinmaxParameteriv (offset 366) */
    "iip\0"
    "glGetMinmaxParameteriv\0"
    "glGetMinmaxParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[21754]: PixelTransferf (offset 247) */
+   /* _mesa_function_pool[21839]: PixelTransferf (offset 247) */
    "if\0"
    "glPixelTransferf\0"
    "\0"
-   /* _mesa_function_pool[21775]: CopyTexImage1D (offset 323) */
+   /* _mesa_function_pool[21860]: CopyTexImage1D (offset 323) */
    "iiiiiii\0"
    "glCopyTexImage1D\0"
    "glCopyTexImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[21821]: PushMatrix (offset 298) */
+   /* _mesa_function_pool[21906]: PushMatrix (offset 298) */
    "\0"
    "glPushMatrix\0"
    "\0"
-   /* _mesa_function_pool[21836]: Fogiv (offset 156) */
+   /* _mesa_function_pool[21921]: Fogiv (offset 156) */
    "ip\0"
    "glFogiv\0"
    "\0"
-   /* _mesa_function_pool[21848]: TexCoord1dv (offset 95) */
+   /* _mesa_function_pool[21933]: TexCoord1dv (offset 95) */
    "p\0"
    "glTexCoord1dv\0"
    "\0"
-   /* _mesa_function_pool[21865]: AlphaFragmentOp3ATI (will be remapped) */
+   /* _mesa_function_pool[21950]: AlphaFragmentOp3ATI (will be remapped) */
    "iiiiiiiiiiii\0"
    "glAlphaFragmentOp3ATI\0"
    "\0"
-   /* _mesa_function_pool[21901]: PixelTransferi (offset 248) */
+   /* _mesa_function_pool[21986]: PixelTransferi (offset 248) */
    "ii\0"
    "glPixelTransferi\0"
    "\0"
-   /* _mesa_function_pool[21922]: GetVertexAttribdvNV (will be remapped) */
+   /* _mesa_function_pool[22007]: GetVertexAttribdvNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribdvNV\0"
    "\0"
-   /* _mesa_function_pool[21949]: VertexAttrib3fvNV (will be remapped) */
+   /* _mesa_function_pool[22034]: VertexAttrib3fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3fvNV\0"
    "\0"
-   /* _mesa_function_pool[21973]: Rotatef (offset 300) */
+   /* _mesa_function_pool[22058]: Rotatef (offset 300) */
    "ffff\0"
    "glRotatef\0"
    "\0"
-   /* _mesa_function_pool[21989]: GetFinalCombinerInputParameterivNV (will be remapped) */
+   /* _mesa_function_pool[22074]: GetFinalCombinerInputParameterivNV (will be remapped) */
    "iip\0"
    "glGetFinalCombinerInputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[22031]: Vertex3i (offset 138) */
+   /* _mesa_function_pool[22116]: Vertex3i (offset 138) */
    "iii\0"
    "glVertex3i\0"
    "\0"
-   /* _mesa_function_pool[22047]: Vertex3f (offset 136) */
+   /* _mesa_function_pool[22132]: Vertex3f (offset 136) */
    "fff\0"
    "glVertex3f\0"
    "\0"
-   /* _mesa_function_pool[22063]: Clear (offset 203) */
+   /* _mesa_function_pool[22148]: Clear (offset 203) */
    "i\0"
    "glClear\0"
    "\0"
-   /* _mesa_function_pool[22074]: Vertex3d (offset 134) */
+   /* _mesa_function_pool[22159]: Vertex3d (offset 134) */
    "ddd\0"
    "glVertex3d\0"
    "\0"
-   /* _mesa_function_pool[22090]: GetMapParameterivNV (dynamic) */
+   /* _mesa_function_pool[22175]: GetMapParameterivNV (dynamic) */
    "iip\0"
    "glGetMapParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[22117]: Uniform4iARB (will be remapped) */
+   /* _mesa_function_pool[22202]: Uniform4iARB (will be remapped) */
    "iiiii\0"
    "glUniform4i\0"
    "glUniform4iARB\0"
    "\0"
-   /* _mesa_function_pool[22151]: ReadBuffer (offset 254) */
+   /* _mesa_function_pool[22236]: ReadBuffer (offset 254) */
    "i\0"
    "glReadBuffer\0"
    "\0"
-   /* _mesa_function_pool[22167]: ConvolutionParameteri (offset 352) */
+   /* _mesa_function_pool[22252]: ConvolutionParameteri (offset 352) */
    "iii\0"
    "glConvolutionParameteri\0"
    "glConvolutionParameteriEXT\0"
    "\0"
-   /* _mesa_function_pool[22223]: Ortho (offset 296) */
+   /* _mesa_function_pool[22308]: Ortho (offset 296) */
    "dddddd\0"
    "glOrtho\0"
    "\0"
-   /* _mesa_function_pool[22239]: Binormal3sEXT (dynamic) */
+   /* _mesa_function_pool[22324]: Binormal3sEXT (dynamic) */
    "iii\0"
    "glBinormal3sEXT\0"
    "\0"
-   /* _mesa_function_pool[22260]: ListBase (offset 6) */
+   /* _mesa_function_pool[22345]: ListBase (offset 6) */
    "i\0"
    "glListBase\0"
    "\0"
-   /* _mesa_function_pool[22274]: Vertex3s (offset 140) */
+   /* _mesa_function_pool[22359]: Vertex3s (offset 140) */
    "iii\0"
    "glVertex3s\0"
    "\0"
-   /* _mesa_function_pool[22290]: ConvolutionParameterf (offset 350) */
+   /* _mesa_function_pool[22375]: ConvolutionParameterf (offset 350) */
    "iif\0"
    "glConvolutionParameterf\0"
    "glConvolutionParameterfEXT\0"
    "\0"
-   /* _mesa_function_pool[22346]: GetColorTableParameteriv (offset 345) */
+   /* _mesa_function_pool[22431]: GetColorTableParameteriv (offset 345) */
    "iip\0"
    "glGetColorTableParameteriv\0"
    "glGetColorTableParameterivSGI\0"
    "glGetColorTableParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[22438]: ProgramEnvParameter4dvARB (will be remapped) */
+   /* _mesa_function_pool[22523]: ProgramEnvParameter4dvARB (will be remapped) */
    "iip\0"
    "glProgramEnvParameter4dvARB\0"
    "glProgramParameter4dvNV\0"
    "\0"
-   /* _mesa_function_pool[22495]: ShadeModel (offset 177) */
+   /* _mesa_function_pool[22580]: ShadeModel (offset 177) */
    "i\0"
    "glShadeModel\0"
    "\0"
-   /* _mesa_function_pool[22511]: VertexAttribs2fvNV (will be remapped) */
+   /* _mesa_function_pool[22596]: VertexAttribs2fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2fvNV\0"
    "\0"
-   /* _mesa_function_pool[22537]: Rectiv (offset 91) */
+   /* _mesa_function_pool[22622]: Rectiv (offset 91) */
    "pp\0"
    "glRectiv\0"
    "\0"
-   /* _mesa_function_pool[22550]: UseProgramObjectARB (will be remapped) */
+   /* _mesa_function_pool[22635]: UseProgramObjectARB (will be remapped) */
    "i\0"
    "glUseProgram\0"
    "glUseProgramObjectARB\0"
    "\0"
-   /* _mesa_function_pool[22588]: GetMapParameterfvNV (dynamic) */
+   /* _mesa_function_pool[22673]: GetMapParameterfvNV (dynamic) */
    "iip\0"
    "glGetMapParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[22615]: EndConditionalRenderNV (will be remapped) */
+   /* _mesa_function_pool[22700]: EndConditionalRenderNV (will be remapped) */
    "\0"
    "glEndConditionalRenderNV\0"
    "\0"
-   /* _mesa_function_pool[22642]: PassTexCoordATI (will be remapped) */
+   /* _mesa_function_pool[22727]: PassTexCoordATI (will be remapped) */
    "iii\0"
    "glPassTexCoordATI\0"
    "\0"
-   /* _mesa_function_pool[22665]: DeleteProgram (will be remapped) */
+   /* _mesa_function_pool[22750]: DeleteProgram (will be remapped) */
    "i\0"
    "glDeleteProgram\0"
    "\0"
-   /* _mesa_function_pool[22684]: Tangent3ivEXT (dynamic) */
+   /* _mesa_function_pool[22769]: Tangent3ivEXT (dynamic) */
    "p\0"
    "glTangent3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[22703]: Tangent3dEXT (dynamic) */
+   /* _mesa_function_pool[22788]: Tangent3dEXT (dynamic) */
    "ddd\0"
    "glTangent3dEXT\0"
    "\0"
-   /* _mesa_function_pool[22723]: SecondaryColor3dvEXT (will be remapped) */
+   /* _mesa_function_pool[22808]: SecondaryColor3dvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3dv\0"
    "glSecondaryColor3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[22769]: Vertex2fv (offset 129) */
+   /* _mesa_function_pool[22854]: Vertex2fv (offset 129) */
    "p\0"
    "glVertex2fv\0"
    "\0"
-   /* _mesa_function_pool[22784]: MultiDrawArraysEXT (will be remapped) */
+   /* _mesa_function_pool[22869]: MultiDrawArraysEXT (will be remapped) */
    "ippi\0"
    "glMultiDrawArrays\0"
    "glMultiDrawArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[22829]: BindRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[22914]: BindRenderbufferEXT (will be remapped) */
    "ii\0"
    "glBindRenderbuffer\0"
    "glBindRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[22874]: MultiTexCoord4dARB (offset 400) */
+   /* _mesa_function_pool[22959]: MultiTexCoord4dARB (offset 400) */
    "idddd\0"
    "glMultiTexCoord4d\0"
    "glMultiTexCoord4dARB\0"
    "\0"
-   /* _mesa_function_pool[22920]: Vertex3sv (offset 141) */
+   /* _mesa_function_pool[23005]: Vertex3sv (offset 141) */
    "p\0"
    "glVertex3sv\0"
    "\0"
-   /* _mesa_function_pool[22935]: SecondaryColor3usEXT (will be remapped) */
+   /* _mesa_function_pool[23020]: SecondaryColor3usEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3us\0"
    "glSecondaryColor3usEXT\0"
    "\0"
-   /* _mesa_function_pool[22983]: ProgramLocalParameter4fvARB (will be remapped) */
+   /* _mesa_function_pool[23068]: ProgramLocalParameter4fvARB (will be remapped) */
    "iip\0"
    "glProgramLocalParameter4fvARB\0"
    "\0"
-   /* _mesa_function_pool[23018]: DeleteProgramsNV (will be remapped) */
+   /* _mesa_function_pool[23103]: DeleteProgramsNV (will be remapped) */
    "ip\0"
    "glDeleteProgramsARB\0"
    "glDeleteProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[23061]: EvalMesh1 (offset 236) */
+   /* _mesa_function_pool[23146]: EvalMesh1 (offset 236) */
    "iii\0"
    "glEvalMesh1\0"
    "\0"
-   /* _mesa_function_pool[23078]: MultiTexCoord1sARB (offset 382) */
+   /* _mesa_function_pool[23163]: MultiTexCoord1sARB (offset 382) */
    "ii\0"
    "glMultiTexCoord1s\0"
    "glMultiTexCoord1sARB\0"
    "\0"
-   /* _mesa_function_pool[23121]: ReplacementCodeuiColor3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[23206]: ReplacementCodeuiColor3fVertex3fSUN (dynamic) */
    "iffffff\0"
    "glReplacementCodeuiColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[23168]: GetVertexAttribPointervNV (will be remapped) */
+   /* _mesa_function_pool[23253]: GetVertexAttribPointervNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribPointerv\0"
    "glGetVertexAttribPointervARB\0"
    "glGetVertexAttribPointervNV\0"
    "\0"
-   /* _mesa_function_pool[23256]: DisableIndexedEXT (will be remapped) */
+   /* _mesa_function_pool[23341]: DisableIndexedEXT (will be remapped) */
    "ii\0"
    "glDisableIndexedEXT\0"
    "\0"
-   /* _mesa_function_pool[23280]: MultiTexCoord1dvARB (offset 377) */
+   /* _mesa_function_pool[23365]: MultiTexCoord1dvARB (offset 377) */
    "ip\0"
    "glMultiTexCoord1dv\0"
    "glMultiTexCoord1dvARB\0"
    "\0"
-   /* _mesa_function_pool[23325]: Uniform2iARB (will be remapped) */
+   /* _mesa_function_pool[23410]: Uniform2iARB (will be remapped) */
    "iii\0"
    "glUniform2i\0"
    "glUniform2iARB\0"
    "\0"
-   /* _mesa_function_pool[23357]: Vertex2iv (offset 131) */
+   /* _mesa_function_pool[23442]: Vertex2iv (offset 131) */
    "p\0"
    "glVertex2iv\0"
    "\0"
-   /* _mesa_function_pool[23372]: GetProgramStringNV (will be remapped) */
+   /* _mesa_function_pool[23457]: GetProgramStringNV (will be remapped) */
    "iip\0"
    "glGetProgramStringNV\0"
    "\0"
-   /* _mesa_function_pool[23398]: ColorPointerEXT (will be remapped) */
+   /* _mesa_function_pool[23483]: ColorPointerEXT (will be remapped) */
    "iiiip\0"
    "glColorPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[23423]: LineWidth (offset 168) */
+   /* _mesa_function_pool[23508]: LineWidth (offset 168) */
    "f\0"
    "glLineWidth\0"
    "\0"
-   /* _mesa_function_pool[23438]: MapBufferARB (will be remapped) */
+   /* _mesa_function_pool[23523]: MapBufferARB (will be remapped) */
    "ii\0"
    "glMapBuffer\0"
    "glMapBufferARB\0"
    "\0"
-   /* _mesa_function_pool[23469]: MultiDrawElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[23554]: MultiDrawElementsBaseVertex (will be remapped) */
    "ipipip\0"
    "glMultiDrawElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[23507]: Binormal3svEXT (dynamic) */
+   /* _mesa_function_pool[23592]: Binormal3svEXT (dynamic) */
    "p\0"
    "glBinormal3svEXT\0"
    "\0"
-   /* _mesa_function_pool[23527]: ApplyTextureEXT (dynamic) */
+   /* _mesa_function_pool[23612]: ApplyTextureEXT (dynamic) */
    "i\0"
    "glApplyTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[23548]: TexGendv (offset 189) */
+   /* _mesa_function_pool[23633]: TexGendv (offset 189) */
    "iip\0"
    "glTexGendv\0"
    "\0"
-   /* _mesa_function_pool[23564]: EnableIndexedEXT (will be remapped) */
+   /* _mesa_function_pool[23649]: EnableIndexedEXT (will be remapped) */
    "ii\0"
    "glEnableIndexedEXT\0"
    "\0"
-   /* _mesa_function_pool[23587]: TextureMaterialEXT (dynamic) */
+   /* _mesa_function_pool[23672]: TextureMaterialEXT (dynamic) */
    "ii\0"
    "glTextureMaterialEXT\0"
    "\0"
-   /* _mesa_function_pool[23612]: TextureLightEXT (dynamic) */
+   /* _mesa_function_pool[23697]: TextureLightEXT (dynamic) */
    "i\0"
    "glTextureLightEXT\0"
    "\0"
-   /* _mesa_function_pool[23633]: ResetMinmax (offset 370) */
+   /* _mesa_function_pool[23718]: ResetMinmax (offset 370) */
    "i\0"
    "glResetMinmax\0"
    "glResetMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[23667]: SpriteParameterfSGIX (dynamic) */
+   /* _mesa_function_pool[23752]: SpriteParameterfSGIX (dynamic) */
    "if\0"
    "glSpriteParameterfSGIX\0"
    "\0"
-   /* _mesa_function_pool[23694]: EnableClientState (offset 313) */
+   /* _mesa_function_pool[23779]: EnableClientState (offset 313) */
    "i\0"
    "glEnableClientState\0"
    "\0"
-   /* _mesa_function_pool[23717]: VertexAttrib4sNV (will be remapped) */
+   /* _mesa_function_pool[23802]: VertexAttrib4sNV (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4sNV\0"
    "\0"
-   /* _mesa_function_pool[23743]: GetConvolutionParameterfv (offset 357) */
+   /* _mesa_function_pool[23828]: GetConvolutionParameterfv (offset 357) */
    "iip\0"
    "glGetConvolutionParameterfv\0"
    "glGetConvolutionParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[23807]: VertexAttribs4dvNV (will be remapped) */
+   /* _mesa_function_pool[23892]: VertexAttribs4dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4dvNV\0"
    "\0"
-   /* _mesa_function_pool[23833]: MultiModeDrawArraysIBM (will be remapped) */
-   "pppii\0"
-   "glMultiModeDrawArraysIBM\0"
-   "\0"
-   /* _mesa_function_pool[23865]: VertexAttrib4dARB (will be remapped) */
+   /* _mesa_function_pool[23918]: VertexAttrib4dARB (will be remapped) */
    "idddd\0"
    "glVertexAttrib4d\0"
    "glVertexAttrib4dARB\0"
    "\0"
-   /* _mesa_function_pool[23909]: GetTexBumpParameterfvATI (will be remapped) */
+   /* _mesa_function_pool[23962]: GetTexBumpParameterfvATI (will be remapped) */
    "ip\0"
    "glGetTexBumpParameterfvATI\0"
    "\0"
-   /* _mesa_function_pool[23940]: ProgramNamedParameter4dNV (will be remapped) */
+   /* _mesa_function_pool[23993]: ProgramNamedParameter4dNV (will be remapped) */
    "iipdddd\0"
    "glProgramNamedParameter4dNV\0"
    "\0"
-   /* _mesa_function_pool[23977]: GetMaterialfv (offset 269) */
+   /* _mesa_function_pool[24030]: GetMaterialfv (offset 269) */
    "iip\0"
    "glGetMaterialfv\0"
    "\0"
-   /* _mesa_function_pool[23998]: VertexWeightfEXT (dynamic) */
+   /* _mesa_function_pool[24051]: VertexWeightfEXT (dynamic) */
    "f\0"
    "glVertexWeightfEXT\0"
    "\0"
-   /* _mesa_function_pool[24020]: Binormal3fEXT (dynamic) */
+   /* _mesa_function_pool[24073]: Binormal3fEXT (dynamic) */
    "fff\0"
    "glBinormal3fEXT\0"
    "\0"
-   /* _mesa_function_pool[24041]: CallList (offset 2) */
+   /* _mesa_function_pool[24094]: CallList (offset 2) */
    "i\0"
    "glCallList\0"
    "\0"
-   /* _mesa_function_pool[24055]: Materialfv (offset 170) */
+   /* _mesa_function_pool[24108]: Materialfv (offset 170) */
    "iip\0"
    "glMaterialfv\0"
    "\0"
-   /* _mesa_function_pool[24073]: TexCoord3fv (offset 113) */
+   /* _mesa_function_pool[24126]: TexCoord3fv (offset 113) */
    "p\0"
    "glTexCoord3fv\0"
    "\0"
-   /* _mesa_function_pool[24090]: FogCoordfvEXT (will be remapped) */
+   /* _mesa_function_pool[24143]: FogCoordfvEXT (will be remapped) */
    "p\0"
    "glFogCoordfv\0"
    "glFogCoordfvEXT\0"
    "\0"
-   /* _mesa_function_pool[24122]: MultiTexCoord1ivARB (offset 381) */
+   /* _mesa_function_pool[24175]: MultiTexCoord1ivARB (offset 381) */
    "ip\0"
    "glMultiTexCoord1iv\0"
    "glMultiTexCoord1ivARB\0"
    "\0"
-   /* _mesa_function_pool[24167]: SecondaryColor3ubEXT (will be remapped) */
+   /* _mesa_function_pool[24220]: SecondaryColor3ubEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3ub\0"
    "glSecondaryColor3ubEXT\0"
    "\0"
-   /* _mesa_function_pool[24215]: MultiTexCoord2ivARB (offset 389) */
+   /* _mesa_function_pool[24268]: MultiTexCoord2ivARB (offset 389) */
    "ip\0"
    "glMultiTexCoord2iv\0"
    "glMultiTexCoord2ivARB\0"
    "\0"
-   /* _mesa_function_pool[24260]: FogFuncSGIS (dynamic) */
+   /* _mesa_function_pool[24313]: FogFuncSGIS (dynamic) */
    "ip\0"
    "glFogFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[24278]: CopyTexSubImage2D (offset 326) */
+   /* _mesa_function_pool[24331]: CopyTexSubImage2D (offset 326) */
    "iiiiiiii\0"
    "glCopyTexSubImage2D\0"
    "glCopyTexSubImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[24331]: GetObjectParameterivARB (will be remapped) */
+   /* _mesa_function_pool[24384]: GetObjectParameterivARB (will be remapped) */
    "iip\0"
    "glGetObjectParameterivARB\0"
    "\0"
-   /* _mesa_function_pool[24362]: Color3iv (offset 16) */
+   /* _mesa_function_pool[24415]: Color3iv (offset 16) */
    "p\0"
    "glColor3iv\0"
    "\0"
-   /* _mesa_function_pool[24376]: TexCoord4fVertex4fSUN (dynamic) */
+   /* _mesa_function_pool[24429]: TexCoord4fVertex4fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord4fVertex4fSUN\0"
    "\0"
-   /* _mesa_function_pool[24410]: DrawElements (offset 311) */
+   /* _mesa_function_pool[24463]: DrawElements (offset 311) */
    "iiip\0"
    "glDrawElements\0"
    "\0"
-   /* _mesa_function_pool[24431]: BindVertexArrayAPPLE (will be remapped) */
+   /* _mesa_function_pool[24484]: BindVertexArrayAPPLE (will be remapped) */
    "i\0"
    "glBindVertexArrayAPPLE\0"
    "\0"
-   /* _mesa_function_pool[24457]: GetProgramLocalParameterdvARB (will be remapped) */
+   /* _mesa_function_pool[24510]: GetProgramLocalParameterdvARB (will be remapped) */
    "iip\0"
    "glGetProgramLocalParameterdvARB\0"
    "\0"
-   /* _mesa_function_pool[24494]: GetHistogramParameteriv (offset 363) */
+   /* _mesa_function_pool[24547]: GetHistogramParameteriv (offset 363) */
    "iip\0"
    "glGetHistogramParameteriv\0"
    "glGetHistogramParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[24554]: MultiTexCoord1iARB (offset 380) */
+   /* _mesa_function_pool[24607]: MultiTexCoord1iARB (offset 380) */
    "ii\0"
    "glMultiTexCoord1i\0"
    "glMultiTexCoord1iARB\0"
    "\0"
-   /* _mesa_function_pool[24597]: GetConvolutionFilter (offset 356) */
+   /* _mesa_function_pool[24650]: GetConvolutionFilter (offset 356) */
    "iiip\0"
    "glGetConvolutionFilter\0"
    "glGetConvolutionFilterEXT\0"
    "\0"
-   /* _mesa_function_pool[24652]: GetProgramivARB (will be remapped) */
+   /* _mesa_function_pool[24705]: GetProgramivARB (will be remapped) */
    "iip\0"
    "glGetProgramivARB\0"
    "\0"
-   /* _mesa_function_pool[24675]: BlendFuncSeparateEXT (will be remapped) */
+   /* _mesa_function_pool[24728]: BlendFuncSeparateEXT (will be remapped) */
    "iiii\0"
    "glBlendFuncSeparate\0"
    "glBlendFuncSeparateEXT\0"
    "glBlendFuncSeparateINGR\0"
    "\0"
-   /* _mesa_function_pool[24748]: MapBufferRange (will be remapped) */
+   /* _mesa_function_pool[24801]: MapBufferRange (will be remapped) */
    "iiii\0"
    "glMapBufferRange\0"
    "\0"
-   /* _mesa_function_pool[24771]: ProgramParameters4dvNV (will be remapped) */
+   /* _mesa_function_pool[24824]: ProgramParameters4dvNV (will be remapped) */
    "iiip\0"
    "glProgramParameters4dvNV\0"
    "\0"
-   /* _mesa_function_pool[24802]: TexCoord2fColor3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[24855]: TexCoord2fColor3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[24839]: EvalPoint2 (offset 239) */
+   /* _mesa_function_pool[24892]: EvalPoint2 (offset 239) */
    "ii\0"
    "glEvalPoint2\0"
    "\0"
-   /* _mesa_function_pool[24856]: EvalPoint1 (offset 237) */
+   /* _mesa_function_pool[24909]: EvalPoint1 (offset 237) */
    "i\0"
    "glEvalPoint1\0"
    "\0"
-   /* _mesa_function_pool[24872]: Binormal3dvEXT (dynamic) */
+   /* _mesa_function_pool[24925]: Binormal3dvEXT (dynamic) */
    "p\0"
    "glBinormal3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[24892]: PopMatrix (offset 297) */
+   /* _mesa_function_pool[24945]: PopMatrix (offset 297) */
    "\0"
    "glPopMatrix\0"
    "\0"
-   /* _mesa_function_pool[24906]: FinishFenceNV (will be remapped) */
+   /* _mesa_function_pool[24959]: FinishFenceNV (will be remapped) */
    "i\0"
    "glFinishFenceNV\0"
    "\0"
-   /* _mesa_function_pool[24925]: GetFogFuncSGIS (dynamic) */
+   /* _mesa_function_pool[24978]: GetFogFuncSGIS (dynamic) */
    "p\0"
    "glGetFogFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[24945]: GetUniformLocationARB (will be remapped) */
+   /* _mesa_function_pool[24998]: GetUniformLocationARB (will be remapped) */
    "ip\0"
    "glGetUniformLocation\0"
    "glGetUniformLocationARB\0"
    "\0"
-   /* _mesa_function_pool[24994]: SecondaryColor3fEXT (will be remapped) */
+   /* _mesa_function_pool[25047]: SecondaryColor3fEXT (will be remapped) */
    "fff\0"
    "glSecondaryColor3f\0"
    "glSecondaryColor3fEXT\0"
    "\0"
-   /* _mesa_function_pool[25040]: GetTexGeniv (offset 280) */
+   /* _mesa_function_pool[25093]: GetTexGeniv (offset 280) */
    "iip\0"
    "glGetTexGeniv\0"
    "\0"
-   /* _mesa_function_pool[25059]: CombinerInputNV (will be remapped) */
+   /* _mesa_function_pool[25112]: CombinerInputNV (will be remapped) */
    "iiiiii\0"
    "glCombinerInputNV\0"
    "\0"
-   /* _mesa_function_pool[25085]: VertexAttrib3sARB (will be remapped) */
+   /* _mesa_function_pool[25138]: VertexAttrib3sARB (will be remapped) */
    "iiii\0"
    "glVertexAttrib3s\0"
    "glVertexAttrib3sARB\0"
    "\0"
-   /* _mesa_function_pool[25128]: ReplacementCodeuiNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[25181]: ReplacementCodeuiNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[25173]: Map2d (offset 222) */
+   /* _mesa_function_pool[25226]: Map2d (offset 222) */
    "iddiiddiip\0"
    "glMap2d\0"
    "\0"
-   /* _mesa_function_pool[25193]: Map2f (offset 223) */
+   /* _mesa_function_pool[25246]: Map2f (offset 223) */
    "iffiiffiip\0"
    "glMap2f\0"
    "\0"
-   /* _mesa_function_pool[25213]: ProgramStringARB (will be remapped) */
+   /* _mesa_function_pool[25266]: ProgramStringARB (will be remapped) */
    "iiip\0"
    "glProgramStringARB\0"
    "\0"
-   /* _mesa_function_pool[25238]: Vertex4s (offset 148) */
+   /* _mesa_function_pool[25291]: Vertex4s (offset 148) */
    "iiii\0"
    "glVertex4s\0"
    "\0"
-   /* _mesa_function_pool[25255]: TexCoord4fVertex4fvSUN (dynamic) */
+   /* _mesa_function_pool[25308]: TexCoord4fVertex4fvSUN (dynamic) */
    "pp\0"
    "glTexCoord4fVertex4fvSUN\0"
    "\0"
-   /* _mesa_function_pool[25284]: VertexAttrib3sNV (will be remapped) */
+   /* _mesa_function_pool[25337]: VertexAttrib3sNV (will be remapped) */
    "iiii\0"
    "glVertexAttrib3sNV\0"
    "\0"
-   /* _mesa_function_pool[25309]: VertexAttrib1fNV (will be remapped) */
+   /* _mesa_function_pool[25362]: VertexAttrib1fNV (will be remapped) */
    "if\0"
    "glVertexAttrib1fNV\0"
    "\0"
-   /* _mesa_function_pool[25332]: Vertex4f (offset 144) */
+   /* _mesa_function_pool[25385]: Vertex4f (offset 144) */
    "ffff\0"
    "glVertex4f\0"
    "\0"
-   /* _mesa_function_pool[25349]: EvalCoord1d (offset 228) */
+   /* _mesa_function_pool[25402]: EvalCoord1d (offset 228) */
    "d\0"
    "glEvalCoord1d\0"
    "\0"
-   /* _mesa_function_pool[25366]: Vertex4d (offset 142) */
+   /* _mesa_function_pool[25419]: Vertex4d (offset 142) */
    "dddd\0"
    "glVertex4d\0"
    "\0"
-   /* _mesa_function_pool[25383]: RasterPos4dv (offset 79) */
+   /* _mesa_function_pool[25436]: RasterPos4dv (offset 79) */
    "p\0"
    "glRasterPos4dv\0"
    "\0"
-   /* _mesa_function_pool[25401]: FragmentLightfSGIX (dynamic) */
+   /* _mesa_function_pool[25454]: FragmentLightfSGIX (dynamic) */
    "iif\0"
    "glFragmentLightfSGIX\0"
    "\0"
-   /* _mesa_function_pool[25427]: GetCompressedTexImageARB (will be remapped) */
+   /* _mesa_function_pool[25480]: GetCompressedTexImageARB (will be remapped) */
    "iip\0"
    "glGetCompressedTexImage\0"
    "glGetCompressedTexImageARB\0"
    "\0"
-   /* _mesa_function_pool[25483]: GetTexGenfv (offset 279) */
+   /* _mesa_function_pool[25536]: GetTexGenfv (offset 279) */
    "iip\0"
    "glGetTexGenfv\0"
    "\0"
-   /* _mesa_function_pool[25502]: Vertex4i (offset 146) */
+   /* _mesa_function_pool[25555]: Vertex4i (offset 146) */
    "iiii\0"
    "glVertex4i\0"
    "\0"
-   /* _mesa_function_pool[25519]: VertexWeightPointerEXT (dynamic) */
+   /* _mesa_function_pool[25572]: VertexWeightPointerEXT (dynamic) */
    "iiip\0"
    "glVertexWeightPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[25550]: GetHistogram (offset 361) */
+   /* _mesa_function_pool[25603]: GetHistogram (offset 361) */
    "iiiip\0"
    "glGetHistogram\0"
    "glGetHistogramEXT\0"
    "\0"
-   /* _mesa_function_pool[25590]: ActiveStencilFaceEXT (will be remapped) */
+   /* _mesa_function_pool[25643]: ActiveStencilFaceEXT (will be remapped) */
    "i\0"
    "glActiveStencilFaceEXT\0"
    "\0"
-   /* _mesa_function_pool[25616]: StencilFuncSeparateATI (will be remapped) */
+   /* _mesa_function_pool[25669]: StencilFuncSeparateATI (will be remapped) */
    "iiii\0"
    "glStencilFuncSeparateATI\0"
    "\0"
-   /* _mesa_function_pool[25647]: Materialf (offset 169) */
+   /* _mesa_function_pool[25700]: Materialf (offset 169) */
    "iif\0"
    "glMaterialf\0"
    "\0"
-   /* _mesa_function_pool[25664]: GetShaderSourceARB (will be remapped) */
+   /* _mesa_function_pool[25717]: GetShaderSourceARB (will be remapped) */
    "iipp\0"
    "glGetShaderSource\0"
    "glGetShaderSourceARB\0"
    "\0"
-   /* _mesa_function_pool[25709]: IglooInterfaceSGIX (dynamic) */
+   /* _mesa_function_pool[25762]: IglooInterfaceSGIX (dynamic) */
    "ip\0"
    "glIglooInterfaceSGIX\0"
    "\0"
-   /* _mesa_function_pool[25734]: Materiali (offset 171) */
+   /* _mesa_function_pool[25787]: Materiali (offset 171) */
    "iii\0"
    "glMateriali\0"
    "\0"
-   /* _mesa_function_pool[25751]: VertexAttrib4dNV (will be remapped) */
+   /* _mesa_function_pool[25804]: VertexAttrib4dNV (will be remapped) */
    "idddd\0"
    "glVertexAttrib4dNV\0"
    "\0"
-   /* _mesa_function_pool[25777]: MultiModeDrawElementsIBM (will be remapped) */
+   /* _mesa_function_pool[25830]: MultiModeDrawElementsIBM (will be remapped) */
    "ppipii\0"
    "glMultiModeDrawElementsIBM\0"
    "\0"
-   /* _mesa_function_pool[25812]: Indexsv (offset 51) */
+   /* _mesa_function_pool[25865]: Indexsv (offset 51) */
    "p\0"
    "glIndexsv\0"
    "\0"
-   /* _mesa_function_pool[25825]: MultiTexCoord4svARB (offset 407) */
+   /* _mesa_function_pool[25878]: MultiTexCoord4svARB (offset 407) */
    "ip\0"
    "glMultiTexCoord4sv\0"
    "glMultiTexCoord4svARB\0"
    "\0"
-   /* _mesa_function_pool[25870]: LightModelfv (offset 164) */
+   /* _mesa_function_pool[25923]: LightModelfv (offset 164) */
    "ip\0"
    "glLightModelfv\0"
    "\0"
-   /* _mesa_function_pool[25889]: TexCoord2dv (offset 103) */
+   /* _mesa_function_pool[25942]: TexCoord2dv (offset 103) */
    "p\0"
    "glTexCoord2dv\0"
    "\0"
-   /* _mesa_function_pool[25906]: GenQueriesARB (will be remapped) */
+   /* _mesa_function_pool[25959]: GenQueriesARB (will be remapped) */
    "ip\0"
    "glGenQueries\0"
    "glGenQueriesARB\0"
    "\0"
-   /* _mesa_function_pool[25939]: EvalCoord1dv (offset 229) */
+   /* _mesa_function_pool[25992]: EvalCoord1dv (offset 229) */
    "p\0"
    "glEvalCoord1dv\0"
    "\0"
-   /* _mesa_function_pool[25957]: ReplacementCodeuiVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[26010]: ReplacementCodeuiVertex3fSUN (dynamic) */
    "ifff\0"
    "glReplacementCodeuiVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[25994]: Translated (offset 303) */
+   /* _mesa_function_pool[26047]: Translated (offset 303) */
    "ddd\0"
    "glTranslated\0"
    "\0"
-   /* _mesa_function_pool[26012]: Translatef (offset 304) */
+   /* _mesa_function_pool[26065]: Translatef (offset 304) */
    "fff\0"
    "glTranslatef\0"
    "\0"
-   /* _mesa_function_pool[26030]: StencilMask (offset 209) */
+   /* _mesa_function_pool[26083]: StencilMask (offset 209) */
    "i\0"
    "glStencilMask\0"
    "\0"
-   /* _mesa_function_pool[26047]: Tangent3iEXT (dynamic) */
+   /* _mesa_function_pool[26100]: Tangent3iEXT (dynamic) */
    "iii\0"
    "glTangent3iEXT\0"
    "\0"
-   /* _mesa_function_pool[26067]: GetLightiv (offset 265) */
+   /* _mesa_function_pool[26120]: GetLightiv (offset 265) */
    "iip\0"
    "glGetLightiv\0"
    "\0"
-   /* _mesa_function_pool[26085]: DrawMeshArraysSUN (dynamic) */
+   /* _mesa_function_pool[26138]: DrawMeshArraysSUN (dynamic) */
    "iiii\0"
    "glDrawMeshArraysSUN\0"
    "\0"
-   /* _mesa_function_pool[26111]: IsList (offset 287) */
+   /* _mesa_function_pool[26164]: IsList (offset 287) */
    "i\0"
    "glIsList\0"
    "\0"
-   /* _mesa_function_pool[26123]: IsSync (will be remapped) */
+   /* _mesa_function_pool[26176]: IsSync (will be remapped) */
    "i\0"
    "glIsSync\0"
    "\0"
-   /* _mesa_function_pool[26135]: RenderMode (offset 196) */
+   /* _mesa_function_pool[26188]: RenderMode (offset 196) */
    "i\0"
    "glRenderMode\0"
    "\0"
-   /* _mesa_function_pool[26151]: GetMapControlPointsNV (dynamic) */
+   /* _mesa_function_pool[26204]: GetMapControlPointsNV (dynamic) */
    "iiiiiip\0"
    "glGetMapControlPointsNV\0"
    "\0"
-   /* _mesa_function_pool[26184]: DrawBuffersARB (will be remapped) */
+   /* _mesa_function_pool[26237]: DrawBuffersARB (will be remapped) */
    "ip\0"
    "glDrawBuffers\0"
    "glDrawBuffersARB\0"
    "glDrawBuffersATI\0"
    "\0"
-   /* _mesa_function_pool[26236]: ProgramLocalParameter4fARB (will be remapped) */
+   /* _mesa_function_pool[26289]: ProgramLocalParameter4fARB (will be remapped) */
    "iiffff\0"
    "glProgramLocalParameter4fARB\0"
    "\0"
-   /* _mesa_function_pool[26273]: SpriteParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[26326]: SpriteParameterivSGIX (dynamic) */
    "ip\0"
    "glSpriteParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[26301]: ProvokingVertexEXT (will be remapped) */
+   /* _mesa_function_pool[26354]: ProvokingVertexEXT (will be remapped) */
    "i\0"
    "glProvokingVertexEXT\0"
    "glProvokingVertex\0"
    "\0"
-   /* _mesa_function_pool[26343]: MultiTexCoord1fARB (offset 378) */
+   /* _mesa_function_pool[26396]: MultiTexCoord1fARB (offset 378) */
    "if\0"
    "glMultiTexCoord1f\0"
    "glMultiTexCoord1fARB\0"
    "\0"
-   /* _mesa_function_pool[26386]: LoadName (offset 198) */
+   /* _mesa_function_pool[26439]: LoadName (offset 198) */
    "i\0"
    "glLoadName\0"
    "\0"
-   /* _mesa_function_pool[26400]: VertexAttribs4ubvNV (will be remapped) */
+   /* _mesa_function_pool[26453]: VertexAttribs4ubvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4ubvNV\0"
    "\0"
-   /* _mesa_function_pool[26427]: WeightsvARB (dynamic) */
+   /* _mesa_function_pool[26480]: WeightsvARB (dynamic) */
    "ip\0"
    "glWeightsvARB\0"
    "\0"
-   /* _mesa_function_pool[26445]: Uniform1fvARB (will be remapped) */
+   /* _mesa_function_pool[26498]: Uniform1fvARB (will be remapped) */
    "iip\0"
    "glUniform1fv\0"
    "glUniform1fvARB\0"
    "\0"
-   /* _mesa_function_pool[26479]: CopyTexSubImage1D (offset 325) */
+   /* _mesa_function_pool[26532]: CopyTexSubImage1D (offset 325) */
    "iiiiii\0"
    "glCopyTexSubImage1D\0"
    "glCopyTexSubImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[26530]: CullFace (offset 152) */
+   /* _mesa_function_pool[26583]: CullFace (offset 152) */
    "i\0"
    "glCullFace\0"
    "\0"
-   /* _mesa_function_pool[26544]: BindTexture (offset 307) */
+   /* _mesa_function_pool[26597]: BindTexture (offset 307) */
    "ii\0"
    "glBindTexture\0"
    "glBindTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[26579]: BeginFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[26632]: BeginFragmentShaderATI (will be remapped) */
    "\0"
    "glBeginFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[26606]: MultiTexCoord4fARB (offset 402) */
+   /* _mesa_function_pool[26659]: MultiTexCoord4fARB (offset 402) */
    "iffff\0"
    "glMultiTexCoord4f\0"
    "glMultiTexCoord4fARB\0"
    "\0"
-   /* _mesa_function_pool[26652]: VertexAttribs3svNV (will be remapped) */
+   /* _mesa_function_pool[26705]: VertexAttribs3svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs3svNV\0"
    "\0"
-   /* _mesa_function_pool[26678]: StencilFunc (offset 243) */
+   /* _mesa_function_pool[26731]: StencilFunc (offset 243) */
    "iii\0"
    "glStencilFunc\0"
    "\0"
-   /* _mesa_function_pool[26697]: CopyPixels (offset 255) */
+   /* _mesa_function_pool[26750]: CopyPixels (offset 255) */
    "iiiii\0"
    "glCopyPixels\0"
    "\0"
-   /* _mesa_function_pool[26717]: Rectsv (offset 93) */
+   /* _mesa_function_pool[26770]: Rectsv (offset 93) */
    "pp\0"
    "glRectsv\0"
    "\0"
-   /* _mesa_function_pool[26730]: ReplacementCodeuivSUN (dynamic) */
+   /* _mesa_function_pool[26783]: ReplacementCodeuivSUN (dynamic) */
    "p\0"
    "glReplacementCodeuivSUN\0"
    "\0"
-   /* _mesa_function_pool[26757]: EnableVertexAttribArrayARB (will be remapped) */
+   /* _mesa_function_pool[26810]: EnableVertexAttribArrayARB (will be remapped) */
    "i\0"
    "glEnableVertexAttribArray\0"
    "glEnableVertexAttribArrayARB\0"
    "\0"
-   /* _mesa_function_pool[26815]: NormalPointervINTEL (dynamic) */
+   /* _mesa_function_pool[26868]: NormalPointervINTEL (dynamic) */
    "ip\0"
    "glNormalPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[26841]: CopyConvolutionFilter2D (offset 355) */
+   /* _mesa_function_pool[26894]: CopyConvolutionFilter2D (offset 355) */
    "iiiiii\0"
    "glCopyConvolutionFilter2D\0"
    "glCopyConvolutionFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[26904]: WindowPos3ivMESA (will be remapped) */
+   /* _mesa_function_pool[26957]: WindowPos3ivMESA (will be remapped) */
    "p\0"
    "glWindowPos3iv\0"
    "glWindowPos3ivARB\0"
    "glWindowPos3ivMESA\0"
    "\0"
-   /* _mesa_function_pool[26959]: CopyBufferSubData (will be remapped) */
+   /* _mesa_function_pool[27012]: CopyBufferSubData (will be remapped) */
    "iiiii\0"
    "glCopyBufferSubData\0"
    "\0"
-   /* _mesa_function_pool[26986]: NormalPointer (offset 318) */
+   /* _mesa_function_pool[27039]: NormalPointer (offset 318) */
    "iip\0"
    "glNormalPointer\0"
    "\0"
-   /* _mesa_function_pool[27007]: TexParameterfv (offset 179) */
+   /* _mesa_function_pool[27060]: TexParameterfv (offset 179) */
    "iip\0"
    "glTexParameterfv\0"
    "\0"
-   /* _mesa_function_pool[27029]: IsBufferARB (will be remapped) */
+   /* _mesa_function_pool[27082]: IsBufferARB (will be remapped) */
    "i\0"
    "glIsBuffer\0"
    "glIsBufferARB\0"
    "\0"
-   /* _mesa_function_pool[27057]: WindowPos4iMESA (will be remapped) */
+   /* _mesa_function_pool[27110]: WindowPos4iMESA (will be remapped) */
    "iiii\0"
    "glWindowPos4iMESA\0"
    "\0"
-   /* _mesa_function_pool[27081]: VertexAttrib4uivARB (will be remapped) */
+   /* _mesa_function_pool[27134]: VertexAttrib4uivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4uiv\0"
    "glVertexAttrib4uivARB\0"
    "\0"
-   /* _mesa_function_pool[27126]: Tangent3bvEXT (dynamic) */
+   /* _mesa_function_pool[27179]: Tangent3bvEXT (dynamic) */
    "p\0"
    "glTangent3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[27145]: UniformMatrix3x4fv (will be remapped) */
+   /* _mesa_function_pool[27198]: UniformMatrix3x4fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3x4fv\0"
    "\0"
-   /* _mesa_function_pool[27172]: ClipPlane (offset 150) */
+   /* _mesa_function_pool[27225]: ClipPlane (offset 150) */
    "ip\0"
    "glClipPlane\0"
    "\0"
-   /* _mesa_function_pool[27188]: Recti (offset 90) */
+   /* _mesa_function_pool[27241]: Recti (offset 90) */
    "iiii\0"
    "glRecti\0"
    "\0"
-   /* _mesa_function_pool[27202]: DrawRangeElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[27255]: DrawRangeElementsBaseVertex (will be remapped) */
    "iiiiipi\0"
    "glDrawRangeElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[27241]: TexCoordPointervINTEL (dynamic) */
+   /* _mesa_function_pool[27294]: TexCoordPointervINTEL (dynamic) */
    "iip\0"
    "glTexCoordPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[27270]: DeleteBuffersARB (will be remapped) */
+   /* _mesa_function_pool[27323]: DeleteBuffersARB (will be remapped) */
    "ip\0"
    "glDeleteBuffers\0"
    "glDeleteBuffersARB\0"
    "\0"
-   /* _mesa_function_pool[27309]: WindowPos4fvMESA (will be remapped) */
+   /* _mesa_function_pool[27362]: WindowPos4fvMESA (will be remapped) */
    "p\0"
    "glWindowPos4fvMESA\0"
    "\0"
-   /* _mesa_function_pool[27331]: GetPixelMapuiv (offset 272) */
+   /* _mesa_function_pool[27384]: GetPixelMapuiv (offset 272) */
    "ip\0"
    "glGetPixelMapuiv\0"
    "\0"
-   /* _mesa_function_pool[27352]: Rectf (offset 88) */
+   /* _mesa_function_pool[27405]: Rectf (offset 88) */
    "ffff\0"
    "glRectf\0"
    "\0"
-   /* _mesa_function_pool[27366]: VertexAttrib1sNV (will be remapped) */
+   /* _mesa_function_pool[27419]: VertexAttrib1sNV (will be remapped) */
    "ii\0"
    "glVertexAttrib1sNV\0"
    "\0"
-   /* _mesa_function_pool[27389]: Indexfv (offset 47) */
+   /* _mesa_function_pool[27442]: Indexfv (offset 47) */
    "p\0"
    "glIndexfv\0"
    "\0"
-   /* _mesa_function_pool[27402]: SecondaryColor3svEXT (will be remapped) */
+   /* _mesa_function_pool[27455]: SecondaryColor3svEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3sv\0"
    "glSecondaryColor3svEXT\0"
    "\0"
-   /* _mesa_function_pool[27448]: LoadTransposeMatrixfARB (will be remapped) */
+   /* _mesa_function_pool[27501]: LoadTransposeMatrixfARB (will be remapped) */
    "p\0"
    "glLoadTransposeMatrixf\0"
    "glLoadTransposeMatrixfARB\0"
    "\0"
-   /* _mesa_function_pool[27500]: GetPointerv (offset 329) */
+   /* _mesa_function_pool[27553]: GetPointerv (offset 329) */
    "ip\0"
    "glGetPointerv\0"
    "glGetPointervEXT\0"
    "\0"
-   /* _mesa_function_pool[27535]: Tangent3bEXT (dynamic) */
+   /* _mesa_function_pool[27588]: Tangent3bEXT (dynamic) */
    "iii\0"
    "glTangent3bEXT\0"
    "\0"
-   /* _mesa_function_pool[27555]: CombinerParameterfNV (will be remapped) */
+   /* _mesa_function_pool[27608]: CombinerParameterfNV (will be remapped) */
    "if\0"
    "glCombinerParameterfNV\0"
    "\0"
-   /* _mesa_function_pool[27582]: IndexMask (offset 212) */
+   /* _mesa_function_pool[27635]: IndexMask (offset 212) */
    "i\0"
    "glIndexMask\0"
    "\0"
-   /* _mesa_function_pool[27597]: BindProgramNV (will be remapped) */
+   /* _mesa_function_pool[27650]: BindProgramNV (will be remapped) */
    "ii\0"
    "glBindProgramARB\0"
    "glBindProgramNV\0"
    "\0"
-   /* _mesa_function_pool[27634]: VertexAttrib4svARB (will be remapped) */
+   /* _mesa_function_pool[27687]: VertexAttrib4svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4sv\0"
    "glVertexAttrib4svARB\0"
    "\0"
-   /* _mesa_function_pool[27677]: GetFloatv (offset 262) */
+   /* _mesa_function_pool[27730]: GetFloatv (offset 262) */
    "ip\0"
    "glGetFloatv\0"
    "\0"
-   /* _mesa_function_pool[27693]: CreateDebugObjectMESA (dynamic) */
+   /* _mesa_function_pool[27746]: CreateDebugObjectMESA (dynamic) */
    "\0"
    "glCreateDebugObjectMESA\0"
    "\0"
-   /* _mesa_function_pool[27719]: GetShaderiv (will be remapped) */
+   /* _mesa_function_pool[27772]: GetShaderiv (will be remapped) */
    "iip\0"
    "glGetShaderiv\0"
    "\0"
-   /* _mesa_function_pool[27738]: ClientWaitSync (will be remapped) */
+   /* _mesa_function_pool[27791]: ClientWaitSync (will be remapped) */
    "iii\0"
    "glClientWaitSync\0"
    "\0"
-   /* _mesa_function_pool[27760]: TexCoord4s (offset 124) */
+   /* _mesa_function_pool[27813]: TexCoord4s (offset 124) */
    "iiii\0"
    "glTexCoord4s\0"
    "\0"
-   /* _mesa_function_pool[27779]: TexCoord3sv (offset 117) */
+   /* _mesa_function_pool[27832]: TexCoord3sv (offset 117) */
    "p\0"
    "glTexCoord3sv\0"
    "\0"
-   /* _mesa_function_pool[27796]: BindFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[27849]: BindFragmentShaderATI (will be remapped) */
    "i\0"
    "glBindFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[27823]: PopAttrib (offset 218) */
+   /* _mesa_function_pool[27876]: PopAttrib (offset 218) */
    "\0"
    "glPopAttrib\0"
    "\0"
-   /* _mesa_function_pool[27837]: Fogfv (offset 154) */
+   /* _mesa_function_pool[27890]: Fogfv (offset 154) */
    "ip\0"
    "glFogfv\0"
    "\0"
-   /* _mesa_function_pool[27849]: UnmapBufferARB (will be remapped) */
+   /* _mesa_function_pool[27902]: UnmapBufferARB (will be remapped) */
    "i\0"
    "glUnmapBuffer\0"
    "glUnmapBufferARB\0"
    "\0"
-   /* _mesa_function_pool[27883]: InitNames (offset 197) */
+   /* _mesa_function_pool[27936]: InitNames (offset 197) */
    "\0"
    "glInitNames\0"
    "\0"
-   /* _mesa_function_pool[27897]: Normal3sv (offset 61) */
+   /* _mesa_function_pool[27950]: Normal3sv (offset 61) */
    "p\0"
    "glNormal3sv\0"
    "\0"
-   /* _mesa_function_pool[27912]: Minmax (offset 368) */
+   /* _mesa_function_pool[27965]: Minmax (offset 368) */
    "iii\0"
    "glMinmax\0"
    "glMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[27938]: TexCoord4d (offset 118) */
+   /* _mesa_function_pool[27991]: TexCoord4d (offset 118) */
    "dddd\0"
    "glTexCoord4d\0"
    "\0"
-   /* _mesa_function_pool[27957]: TexCoord4f (offset 120) */
+   /* _mesa_function_pool[28010]: DeformationMap3dSGIX (dynamic) */
+   "iddiiddiiddiip\0"
+   "glDeformationMap3dSGIX\0"
+   "\0"
+   /* _mesa_function_pool[28049]: TexCoord4f (offset 120) */
    "ffff\0"
    "glTexCoord4f\0"
    "\0"
-   /* _mesa_function_pool[27976]: FogCoorddvEXT (will be remapped) */
+   /* _mesa_function_pool[28068]: FogCoorddvEXT (will be remapped) */
    "p\0"
    "glFogCoorddv\0"
    "glFogCoorddvEXT\0"
    "\0"
-   /* _mesa_function_pool[28008]: FinishTextureSUNX (dynamic) */
+   /* _mesa_function_pool[28100]: FinishTextureSUNX (dynamic) */
    "\0"
    "glFinishTextureSUNX\0"
    "\0"
-   /* _mesa_function_pool[28030]: GetFragmentLightfvSGIX (dynamic) */
+   /* _mesa_function_pool[28122]: GetFragmentLightfvSGIX (dynamic) */
    "iip\0"
    "glGetFragmentLightfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[28060]: Binormal3fvEXT (dynamic) */
+   /* _mesa_function_pool[28152]: Binormal3fvEXT (dynamic) */
    "p\0"
    "glBinormal3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[28080]: GetBooleanv (offset 258) */
+   /* _mesa_function_pool[28172]: GetBooleanv (offset 258) */
    "ip\0"
    "glGetBooleanv\0"
    "\0"
-   /* _mesa_function_pool[28098]: ColorFragmentOp3ATI (will be remapped) */
+   /* _mesa_function_pool[28190]: ColorFragmentOp3ATI (will be remapped) */
    "iiiiiiiiiiiii\0"
    "glColorFragmentOp3ATI\0"
    "\0"
-   /* _mesa_function_pool[28135]: Hint (offset 158) */
+   /* _mesa_function_pool[28227]: Hint (offset 158) */
    "ii\0"
    "glHint\0"
    "\0"
-   /* _mesa_function_pool[28146]: Color4dv (offset 28) */
+   /* _mesa_function_pool[28238]: Color4dv (offset 28) */
    "p\0"
    "glColor4dv\0"
    "\0"
-   /* _mesa_function_pool[28160]: VertexAttrib2svARB (will be remapped) */
+   /* _mesa_function_pool[28252]: VertexAttrib2svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2sv\0"
    "glVertexAttrib2svARB\0"
    "\0"
-   /* _mesa_function_pool[28203]: AreProgramsResidentNV (will be remapped) */
+   /* _mesa_function_pool[28295]: AreProgramsResidentNV (will be remapped) */
    "ipp\0"
    "glAreProgramsResidentNV\0"
    "\0"
-   /* _mesa_function_pool[28232]: WindowPos3svMESA (will be remapped) */
+   /* _mesa_function_pool[28324]: WindowPos3svMESA (will be remapped) */
    "p\0"
    "glWindowPos3sv\0"
    "glWindowPos3svARB\0"
    "glWindowPos3svMESA\0"
    "\0"
-   /* _mesa_function_pool[28287]: CopyColorSubTable (offset 347) */
+   /* _mesa_function_pool[28379]: CopyColorSubTable (offset 347) */
    "iiiii\0"
    "glCopyColorSubTable\0"
    "glCopyColorSubTableEXT\0"
    "\0"
-   /* _mesa_function_pool[28337]: WeightdvARB (dynamic) */
+   /* _mesa_function_pool[28429]: WeightdvARB (dynamic) */
    "ip\0"
    "glWeightdvARB\0"
    "\0"
-   /* _mesa_function_pool[28355]: DeleteRenderbuffersEXT (will be remapped) */
+   /* _mesa_function_pool[28447]: DeleteRenderbuffersEXT (will be remapped) */
    "ip\0"
    "glDeleteRenderbuffers\0"
    "glDeleteRenderbuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[28406]: VertexAttrib4NubvARB (will be remapped) */
+   /* _mesa_function_pool[28498]: VertexAttrib4NubvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nubv\0"
    "glVertexAttrib4NubvARB\0"
    "\0"
-   /* _mesa_function_pool[28453]: VertexAttrib3dvNV (will be remapped) */
+   /* _mesa_function_pool[28545]: VertexAttrib3dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3dvNV\0"
    "\0"
-   /* _mesa_function_pool[28477]: GetObjectParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[28569]: GetObjectParameterfvARB (will be remapped) */
    "iip\0"
    "glGetObjectParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[28508]: Vertex4iv (offset 147) */
+   /* _mesa_function_pool[28600]: Vertex4iv (offset 147) */
    "p\0"
    "glVertex4iv\0"
    "\0"
-   /* _mesa_function_pool[28523]: GetProgramEnvParameterdvARB (will be remapped) */
+   /* _mesa_function_pool[28615]: GetProgramEnvParameterdvARB (will be remapped) */
    "iip\0"
    "glGetProgramEnvParameterdvARB\0"
    "\0"
-   /* _mesa_function_pool[28558]: TexCoord4dv (offset 119) */
+   /* _mesa_function_pool[28650]: TexCoord4dv (offset 119) */
    "p\0"
    "glTexCoord4dv\0"
    "\0"
-   /* _mesa_function_pool[28575]: LockArraysEXT (will be remapped) */
+   /* _mesa_function_pool[28667]: LockArraysEXT (will be remapped) */
    "ii\0"
    "glLockArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[28595]: Begin (offset 7) */
+   /* _mesa_function_pool[28687]: Begin (offset 7) */
    "i\0"
    "glBegin\0"
    "\0"
-   /* _mesa_function_pool[28606]: LightModeli (offset 165) */
+   /* _mesa_function_pool[28698]: LightModeli (offset 165) */
    "ii\0"
    "glLightModeli\0"
    "\0"
-   /* _mesa_function_pool[28624]: Rectfv (offset 89) */
+   /* _mesa_function_pool[28716]: Rectfv (offset 89) */
    "pp\0"
    "glRectfv\0"
    "\0"
-   /* _mesa_function_pool[28637]: LightModelf (offset 163) */
+   /* _mesa_function_pool[28729]: LightModelf (offset 163) */
    "if\0"
    "glLightModelf\0"
    "\0"
-   /* _mesa_function_pool[28655]: GetTexParameterfv (offset 282) */
+   /* _mesa_function_pool[28747]: GetTexParameterfv (offset 282) */
    "iip\0"
    "glGetTexParameterfv\0"
    "\0"
-   /* _mesa_function_pool[28680]: GetLightfv (offset 264) */
+   /* _mesa_function_pool[28772]: GetLightfv (offset 264) */
    "iip\0"
    "glGetLightfv\0"
    "\0"
-   /* _mesa_function_pool[28698]: PixelTransformParameterivEXT (dynamic) */
+   /* _mesa_function_pool[28790]: PixelTransformParameterivEXT (dynamic) */
    "iip\0"
    "glPixelTransformParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[28734]: BinormalPointerEXT (dynamic) */
+   /* _mesa_function_pool[28826]: BinormalPointerEXT (dynamic) */
    "iip\0"
    "glBinormalPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[28760]: VertexAttrib1dNV (will be remapped) */
+   /* _mesa_function_pool[28852]: VertexAttrib1dNV (will be remapped) */
    "id\0"
    "glVertexAttrib1dNV\0"
    "\0"
-   /* _mesa_function_pool[28783]: GetCombinerInputParameterivNV (will be remapped) */
+   /* _mesa_function_pool[28875]: GetCombinerInputParameterivNV (will be remapped) */
    "iiiip\0"
    "glGetCombinerInputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[28822]: Disable (offset 214) */
+   /* _mesa_function_pool[28914]: Disable (offset 214) */
    "i\0"
    "glDisable\0"
    "\0"
-   /* _mesa_function_pool[28835]: MultiTexCoord2fvARB (offset 387) */
+   /* _mesa_function_pool[28927]: MultiTexCoord2fvARB (offset 387) */
    "ip\0"
    "glMultiTexCoord2fv\0"
    "glMultiTexCoord2fvARB\0"
    "\0"
-   /* _mesa_function_pool[28880]: GetRenderbufferParameterivEXT (will be remapped) */
+   /* _mesa_function_pool[28972]: GetRenderbufferParameterivEXT (will be remapped) */
    "iip\0"
    "glGetRenderbufferParameteriv\0"
    "glGetRenderbufferParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[28946]: CombinerParameterivNV (will be remapped) */
+   /* _mesa_function_pool[29038]: CombinerParameterivNV (will be remapped) */
    "ip\0"
    "glCombinerParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[28974]: GenFragmentShadersATI (will be remapped) */
+   /* _mesa_function_pool[29066]: GenFragmentShadersATI (will be remapped) */
    "i\0"
    "glGenFragmentShadersATI\0"
    "\0"
-   /* _mesa_function_pool[29001]: DrawArrays (offset 310) */
+   /* _mesa_function_pool[29093]: DrawArrays (offset 310) */
    "iii\0"
    "glDrawArrays\0"
    "glDrawArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[29035]: WeightuivARB (dynamic) */
+   /* _mesa_function_pool[29127]: WeightuivARB (dynamic) */
    "ip\0"
    "glWeightuivARB\0"
    "\0"
-   /* _mesa_function_pool[29054]: VertexAttrib2sARB (will be remapped) */
+   /* _mesa_function_pool[29146]: VertexAttrib2sARB (will be remapped) */
    "iii\0"
    "glVertexAttrib2s\0"
    "glVertexAttrib2sARB\0"
    "\0"
-   /* _mesa_function_pool[29096]: ColorMask (offset 210) */
+   /* _mesa_function_pool[29188]: ColorMask (offset 210) */
    "iiii\0"
    "glColorMask\0"
    "\0"
-   /* _mesa_function_pool[29114]: GenAsyncMarkersSGIX (dynamic) */
+   /* _mesa_function_pool[29206]: GenAsyncMarkersSGIX (dynamic) */
    "i\0"
    "glGenAsyncMarkersSGIX\0"
    "\0"
-   /* _mesa_function_pool[29139]: Tangent3svEXT (dynamic) */
+   /* _mesa_function_pool[29231]: Tangent3svEXT (dynamic) */
    "p\0"
    "glTangent3svEXT\0"
    "\0"
-   /* _mesa_function_pool[29158]: GetListParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[29250]: GetListParameterivSGIX (dynamic) */
    "iip\0"
    "glGetListParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[29188]: BindBufferARB (will be remapped) */
+   /* _mesa_function_pool[29280]: BindBufferARB (will be remapped) */
    "ii\0"
    "glBindBuffer\0"
    "glBindBufferARB\0"
    "\0"
-   /* _mesa_function_pool[29221]: GetInfoLogARB (will be remapped) */
+   /* _mesa_function_pool[29313]: GetInfoLogARB (will be remapped) */
    "iipp\0"
    "glGetInfoLogARB\0"
    "\0"
-   /* _mesa_function_pool[29243]: RasterPos4iv (offset 83) */
+   /* _mesa_function_pool[29335]: RasterPos4iv (offset 83) */
    "p\0"
    "glRasterPos4iv\0"
    "\0"
-   /* _mesa_function_pool[29261]: Enable (offset 215) */
+   /* _mesa_function_pool[29353]: Enable (offset 215) */
    "i\0"
    "glEnable\0"
    "\0"
-   /* _mesa_function_pool[29273]: LineStipple (offset 167) */
+   /* _mesa_function_pool[29365]: LineStipple (offset 167) */
    "ii\0"
    "glLineStipple\0"
    "\0"
-   /* _mesa_function_pool[29291]: VertexAttribs4svNV (will be remapped) */
+   /* _mesa_function_pool[29383]: VertexAttribs4svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4svNV\0"
    "\0"
-   /* _mesa_function_pool[29317]: EdgeFlagPointerListIBM (dynamic) */
+   /* _mesa_function_pool[29409]: EdgeFlagPointerListIBM (dynamic) */
    "ipi\0"
    "glEdgeFlagPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[29347]: UniformMatrix3x2fv (will be remapped) */
+   /* _mesa_function_pool[29439]: UniformMatrix3x2fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3x2fv\0"
    "\0"
-   /* _mesa_function_pool[29374]: GetMinmaxParameterfv (offset 365) */
+   /* _mesa_function_pool[29466]: GetMinmaxParameterfv (offset 365) */
    "iip\0"
    "glGetMinmaxParameterfv\0"
    "glGetMinmaxParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[29428]: VertexAttrib1fvARB (will be remapped) */
+   /* _mesa_function_pool[29520]: VertexAttrib1fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib1fv\0"
    "glVertexAttrib1fvARB\0"
    "\0"
-   /* _mesa_function_pool[29471]: GenBuffersARB (will be remapped) */
+   /* _mesa_function_pool[29563]: GenBuffersARB (will be remapped) */
    "ip\0"
    "glGenBuffers\0"
    "glGenBuffersARB\0"
    "\0"
-   /* _mesa_function_pool[29504]: VertexAttribs1svNV (will be remapped) */
+   /* _mesa_function_pool[29596]: VertexAttribs1svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1svNV\0"
    "\0"
-   /* _mesa_function_pool[29530]: Vertex3fv (offset 137) */
+   /* _mesa_function_pool[29622]: Vertex3fv (offset 137) */
    "p\0"
    "glVertex3fv\0"
    "\0"
-   /* _mesa_function_pool[29545]: GetTexBumpParameterivATI (will be remapped) */
+   /* _mesa_function_pool[29637]: GetTexBumpParameterivATI (will be remapped) */
    "ip\0"
    "glGetTexBumpParameterivATI\0"
    "\0"
-   /* _mesa_function_pool[29576]: Binormal3bEXT (dynamic) */
+   /* _mesa_function_pool[29668]: Binormal3bEXT (dynamic) */
    "iii\0"
    "glBinormal3bEXT\0"
    "\0"
-   /* _mesa_function_pool[29597]: FragmentMaterialivSGIX (dynamic) */
+   /* _mesa_function_pool[29689]: FragmentMaterialivSGIX (dynamic) */
    "iip\0"
    "glFragmentMaterialivSGIX\0"
    "\0"
-   /* _mesa_function_pool[29627]: IsRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[29719]: IsRenderbufferEXT (will be remapped) */
    "i\0"
    "glIsRenderbuffer\0"
    "glIsRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[29667]: GenProgramsNV (will be remapped) */
+   /* _mesa_function_pool[29759]: GenProgramsNV (will be remapped) */
    "ip\0"
    "glGenProgramsARB\0"
    "glGenProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[29704]: VertexAttrib4dvNV (will be remapped) */
+   /* _mesa_function_pool[29796]: VertexAttrib4dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4dvNV\0"
    "\0"
-   /* _mesa_function_pool[29728]: EndFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[29820]: EndFragmentShaderATI (will be remapped) */
    "\0"
    "glEndFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[29753]: Binormal3iEXT (dynamic) */
+   /* _mesa_function_pool[29845]: Binormal3iEXT (dynamic) */
    "iii\0"
    "glBinormal3iEXT\0"
    "\0"
-   /* _mesa_function_pool[29774]: WindowPos2fMESA (will be remapped) */
+   /* _mesa_function_pool[29866]: WindowPos2fMESA (will be remapped) */
    "ff\0"
    "glWindowPos2f\0"
    "glWindowPos2fARB\0"
@@ -4374,402 +4386,405 @@ static const struct {
    GLint remap_index;
 } MESA_remap_table_functions[] = {
    {  1461, AttachShader_remap_index },
-   {  8764, CreateProgram_remap_index },
-   { 20335, CreateShader_remap_index },
-   { 22665, DeleteProgram_remap_index },
-   { 16315, DeleteShader_remap_index },
-   { 20781, DetachShader_remap_index },
-   { 15839, GetAttachedShaders_remap_index },
+   {  8794, CreateProgram_remap_index },
+   { 20420, CreateShader_remap_index },
+   { 22750, DeleteProgram_remap_index },
+   { 16372, DeleteShader_remap_index },
+   { 20866, DetachShader_remap_index },
+   { 15896, GetAttachedShaders_remap_index },
    {  4275, GetProgramInfoLog_remap_index },
    {   361, GetProgramiv_remap_index },
-   {  5578, GetShaderInfoLog_remap_index },
-   { 27719, GetShaderiv_remap_index },
-   { 11854, IsProgram_remap_index },
-   { 10889, IsShader_remap_index },
-   {  8868, StencilFuncSeparate_remap_index },
+   {  5608, GetShaderInfoLog_remap_index },
+   { 27772, GetShaderiv_remap_index },
+   { 11879, IsProgram_remap_index },
+   { 10914, IsShader_remap_index },
+   {  8898, StencilFuncSeparate_remap_index },
    {  3487, StencilMaskSeparate_remap_index },
-   {  6654, StencilOpSeparate_remap_index },
-   { 19686, UniformMatrix2x3fv_remap_index },
+   {  6684, StencilOpSeparate_remap_index },
+   { 19771, UniformMatrix2x3fv_remap_index },
    {  2615, UniformMatrix2x4fv_remap_index },
-   { 29347, UniformMatrix3x2fv_remap_index },
-   { 27145, UniformMatrix3x4fv_remap_index },
-   { 14387, UniformMatrix4x2fv_remap_index },
+   { 29439, UniformMatrix3x2fv_remap_index },
+   { 27198, UniformMatrix3x4fv_remap_index },
+   { 14444, UniformMatrix4x2fv_remap_index },
    {  2937, UniformMatrix4x3fv_remap_index },
-   {  8782, LoadTransposeMatrixdARB_remap_index },
-   { 27448, LoadTransposeMatrixfARB_remap_index },
+   {  8812, LoadTransposeMatrixdARB_remap_index },
+   { 27501, LoadTransposeMatrixfARB_remap_index },
    {  4848, MultTransposeMatrixdARB_remap_index },
-   { 20968, MultTransposeMatrixfARB_remap_index },
+   { 21053, MultTransposeMatrixfARB_remap_index },
    {   172, SampleCoverageARB_remap_index },
-   {  5002, CompressedTexImage1DARB_remap_index },
-   { 21468, CompressedTexImage2DARB_remap_index },
+   {  5032, CompressedTexImage1DARB_remap_index },
+   { 21553, CompressedTexImage2DARB_remap_index },
    {  3550, CompressedTexImage3DARB_remap_index },
-   { 16131, CompressedTexSubImage1DARB_remap_index },
+   { 16188, CompressedTexSubImage1DARB_remap_index },
    {  1880, CompressedTexSubImage2DARB_remap_index },
-   { 17923, CompressedTexSubImage3DARB_remap_index },
-   { 25427, GetCompressedTexImageARB_remap_index },
+   { 18008, CompressedTexSubImage3DARB_remap_index },
+   { 25480, GetCompressedTexImageARB_remap_index },
    {  3395, DisableVertexAttribArrayARB_remap_index },
-   { 26757, EnableVertexAttribArrayARB_remap_index },
-   { 28523, GetProgramEnvParameterdvARB_remap_index },
-   { 20848, GetProgramEnvParameterfvARB_remap_index },
-   { 24457, GetProgramLocalParameterdvARB_remap_index },
-   {  7096, GetProgramLocalParameterfvARB_remap_index },
-   { 16222, GetProgramStringARB_remap_index },
-   { 24652, GetProgramivARB_remap_index },
-   { 18118, GetVertexAttribdvARB_remap_index },
-   { 14276, GetVertexAttribfvARB_remap_index },
-   {  8677, GetVertexAttribivARB_remap_index },
-   { 17027, ProgramEnvParameter4dARB_remap_index },
-   { 22438, ProgramEnvParameter4dvARB_remap_index },
-   { 14884, ProgramEnvParameter4fARB_remap_index },
-   {  7959, ProgramEnvParameter4fvARB_remap_index },
+   { 26810, EnableVertexAttribArrayARB_remap_index },
+   { 28615, GetProgramEnvParameterdvARB_remap_index },
+   { 20933, GetProgramEnvParameterfvARB_remap_index },
+   { 24510, GetProgramLocalParameterdvARB_remap_index },
+   {  7126, GetProgramLocalParameterfvARB_remap_index },
+   { 16279, GetProgramStringARB_remap_index },
+   { 24705, GetProgramivARB_remap_index },
+   { 18203, GetVertexAttribdvARB_remap_index },
+   { 14333, GetVertexAttribfvARB_remap_index },
+   {  8707, GetVertexAttribivARB_remap_index },
+   { 17084, ProgramEnvParameter4dARB_remap_index },
+   { 22523, ProgramEnvParameter4dvARB_remap_index },
+   { 14941, ProgramEnvParameter4fARB_remap_index },
+   {  7989, ProgramEnvParameter4fvARB_remap_index },
    {  3513, ProgramLocalParameter4dARB_remap_index },
-   { 11564, ProgramLocalParameter4dvARB_remap_index },
-   { 26236, ProgramLocalParameter4fARB_remap_index },
-   { 22983, ProgramLocalParameter4fvARB_remap_index },
-   { 25213, ProgramStringARB_remap_index },
-   { 17277, VertexAttrib1dARB_remap_index },
-   { 13930, VertexAttrib1dvARB_remap_index },
+   { 11589, ProgramLocalParameter4dvARB_remap_index },
+   { 26289, ProgramLocalParameter4fARB_remap_index },
+   { 23068, ProgramLocalParameter4fvARB_remap_index },
+   { 25266, ProgramStringARB_remap_index },
+   { 17334, VertexAttrib1dARB_remap_index },
+   { 13987, VertexAttrib1dvARB_remap_index },
    {  3688, VertexAttrib1fARB_remap_index },
-   { 29428, VertexAttrib1fvARB_remap_index },
-   {  6180, VertexAttrib1sARB_remap_index },
+   { 29520, VertexAttrib1fvARB_remap_index },
+   {  6210, VertexAttrib1sARB_remap_index },
    {  2054, VertexAttrib1svARB_remap_index },
-   { 13361, VertexAttrib2dARB_remap_index },
-   { 15458, VertexAttrib2dvARB_remap_index },
+   { 13418, VertexAttrib2dARB_remap_index },
+   { 15515, VertexAttrib2dvARB_remap_index },
    {  1480, VertexAttrib2fARB_remap_index },
-   { 15571, VertexAttrib2fvARB_remap_index },
-   { 29054, VertexAttrib2sARB_remap_index },
-   { 28160, VertexAttrib2svARB_remap_index },
-   { 10015, VertexAttrib3dARB_remap_index },
-   {  7662, VertexAttrib3dvARB_remap_index },
+   { 15628, VertexAttrib2fvARB_remap_index },
+   { 29146, VertexAttrib2sARB_remap_index },
+   { 28252, VertexAttrib2svARB_remap_index },
+   { 10045, VertexAttrib3dARB_remap_index },
+   {  7692, VertexAttrib3dvARB_remap_index },
    {  1567, VertexAttrib3fARB_remap_index },
-   { 19923, VertexAttrib3fvARB_remap_index },
-   { 25085, VertexAttrib3sARB_remap_index },
-   { 17860, VertexAttrib3svARB_remap_index },
+   { 20008, VertexAttrib3fvARB_remap_index },
+   { 25138, VertexAttrib3sARB_remap_index },
+   { 17945, VertexAttrib3svARB_remap_index },
    {  4301, VertexAttrib4NbvARB_remap_index },
-   { 15794, VertexAttrib4NivARB_remap_index },
-   { 19878, VertexAttrib4NsvARB_remap_index },
-   { 20800, VertexAttrib4NubARB_remap_index },
-   { 28406, VertexAttrib4NubvARB_remap_index },
-   { 16688, VertexAttrib4NuivARB_remap_index },
+   { 15851, VertexAttrib4NivARB_remap_index },
+   { 19963, VertexAttrib4NsvARB_remap_index },
+   { 20885, VertexAttrib4NubARB_remap_index },
+   { 28498, VertexAttrib4NubvARB_remap_index },
+   { 16745, VertexAttrib4NuivARB_remap_index },
    {  2810, VertexAttrib4NusvARB_remap_index },
-   {  9609, VertexAttrib4bvARB_remap_index },
-   { 23865, VertexAttrib4dARB_remap_index },
-   { 18843, VertexAttrib4dvARB_remap_index },
-   { 10122, VertexAttrib4fARB_remap_index },
-   { 10492, VertexAttrib4fvARB_remap_index },
-   {  9061, VertexAttrib4ivARB_remap_index },
-   { 15272, VertexAttrib4sARB_remap_index },
-   { 27634, VertexAttrib4svARB_remap_index },
-   { 14689, VertexAttrib4ubvARB_remap_index },
-   { 27081, VertexAttrib4uivARB_remap_index },
-   { 17671, VertexAttrib4usvARB_remap_index },
-   { 19560, VertexAttribPointerARB_remap_index },
-   { 29188, BindBufferARB_remap_index },
-   {  5893, BufferDataARB_remap_index },
+   {  9639, VertexAttrib4bvARB_remap_index },
+   { 23918, VertexAttrib4dARB_remap_index },
+   { 18928, VertexAttrib4dvARB_remap_index },
+   { 10152, VertexAttrib4fARB_remap_index },
+   { 10556, VertexAttrib4fvARB_remap_index },
+   {  9091, VertexAttrib4ivARB_remap_index },
+   { 15329, VertexAttrib4sARB_remap_index },
+   { 27687, VertexAttrib4svARB_remap_index },
+   { 14746, VertexAttrib4ubvARB_remap_index },
+   { 27134, VertexAttrib4uivARB_remap_index },
+   { 17756, VertexAttrib4usvARB_remap_index },
+   { 19645, VertexAttribPointerARB_remap_index },
+   { 29280, BindBufferARB_remap_index },
+   {  5923, BufferDataARB_remap_index },
    {  1382, BufferSubDataARB_remap_index },
-   { 27270, DeleteBuffersARB_remap_index },
-   { 29471, GenBuffersARB_remap_index },
-   { 15614, GetBufferParameterivARB_remap_index },
-   { 14836, GetBufferPointervARB_remap_index },
+   { 27323, DeleteBuffersARB_remap_index },
+   { 29563, GenBuffersARB_remap_index },
+   { 15671, GetBufferParameterivARB_remap_index },
+   { 14893, GetBufferPointervARB_remap_index },
    {  1335, GetBufferSubDataARB_remap_index },
-   { 27029, IsBufferARB_remap_index },
-   { 23438, MapBufferARB_remap_index },
-   { 27849, UnmapBufferARB_remap_index },
+   { 27082, IsBufferARB_remap_index },
+   { 23523, MapBufferARB_remap_index },
+   { 27902, UnmapBufferARB_remap_index },
    {   268, BeginQueryARB_remap_index },
-   { 17372, DeleteQueriesARB_remap_index },
-   { 10786, EndQueryARB_remap_index },
-   { 25906, GenQueriesARB_remap_index },
+   { 17429, DeleteQueriesARB_remap_index },
+   { 10850, EndQueryARB_remap_index },
+   { 25959, GenQueriesARB_remap_index },
    {  1772, GetQueryObjectivARB_remap_index },
-   { 15316, GetQueryObjectuivARB_remap_index },
+   { 15373, GetQueryObjectuivARB_remap_index },
    {  1624, GetQueryivARB_remap_index },
-   { 17578, IsQueryARB_remap_index },
-   {  7272, AttachObjectARB_remap_index },
-   { 16277, CompileShaderARB_remap_index },
+   { 17663, IsQueryARB_remap_index },
+   {  7302, AttachObjectARB_remap_index },
+   { 16334, CompileShaderARB_remap_index },
    {  2879, CreateProgramObjectARB_remap_index },
-   {  5838, CreateShaderObjectARB_remap_index },
-   { 12778, DeleteObjectARB_remap_index },
-   { 21242, DetachObjectARB_remap_index },
-   { 10564, GetActiveUniformARB_remap_index },
-   {  8380, GetAttachedObjectsARB_remap_index },
-   {  8659, GetHandleARB_remap_index },
-   { 29221, GetInfoLogARB_remap_index },
-   { 28477, GetObjectParameterfvARB_remap_index },
-   { 24331, GetObjectParameterivARB_remap_index },
-   { 25664, GetShaderSourceARB_remap_index },
-   { 24945, GetUniformLocationARB_remap_index },
-   { 21070, GetUniformfvARB_remap_index },
-   { 11186, GetUniformivARB_remap_index },
-   { 17716, LinkProgramARB_remap_index },
-   { 17774, ShaderSourceARB_remap_index },
-   {  6554, Uniform1fARB_remap_index },
-   { 26445, Uniform1fvARB_remap_index },
-   { 19529, Uniform1iARB_remap_index },
-   { 18532, Uniform1ivARB_remap_index },
+   {  5868, CreateShaderObjectARB_remap_index },
+   { 12835, DeleteObjectARB_remap_index },
+   { 21327, DetachObjectARB_remap_index },
+   { 10628, GetActiveUniformARB_remap_index },
+   {  8410, GetAttachedObjectsARB_remap_index },
+   {  8689, GetHandleARB_remap_index },
+   { 29313, GetInfoLogARB_remap_index },
+   { 28569, GetObjectParameterfvARB_remap_index },
+   { 24384, GetObjectParameterivARB_remap_index },
+   { 25717, GetShaderSourceARB_remap_index },
+   { 24998, GetUniformLocationARB_remap_index },
+   { 21155, GetUniformfvARB_remap_index },
+   { 11211, GetUniformivARB_remap_index },
+   { 17801, LinkProgramARB_remap_index },
+   { 17859, ShaderSourceARB_remap_index },
+   {  6584, Uniform1fARB_remap_index },
+   { 26498, Uniform1fvARB_remap_index },
+   { 19614, Uniform1iARB_remap_index },
+   { 18617, Uniform1ivARB_remap_index },
    {  2003, Uniform2fARB_remap_index },
-   { 12614, Uniform2fvARB_remap_index },
-   { 23325, Uniform2iARB_remap_index },
+   { 12671, Uniform2fvARB_remap_index },
+   { 23410, Uniform2iARB_remap_index },
    {  2123, Uniform2ivARB_remap_index },
-   { 16387, Uniform3fARB_remap_index },
-   {  8410, Uniform3fvARB_remap_index },
-   {  5512, Uniform3iARB_remap_index },
-   { 14942, Uniform3ivARB_remap_index },
-   { 16833, Uniform4fARB_remap_index },
-   { 20934, Uniform4fvARB_remap_index },
-   { 22117, Uniform4iARB_remap_index },
-   { 18084, Uniform4ivARB_remap_index },
-   {  7324, UniformMatrix2fvARB_remap_index },
+   { 16444, Uniform3fARB_remap_index },
+   {  8440, Uniform3fvARB_remap_index },
+   {  5542, Uniform3iARB_remap_index },
+   { 14999, Uniform3ivARB_remap_index },
+   { 16890, Uniform4fARB_remap_index },
+   { 21019, Uniform4fvARB_remap_index },
+   { 22202, Uniform4iARB_remap_index },
+   { 18169, Uniform4ivARB_remap_index },
+   {  7354, UniformMatrix2fvARB_remap_index },
    {    17, UniformMatrix3fvARB_remap_index },
    {  2475, UniformMatrix4fvARB_remap_index },
-   { 22550, UseProgramObjectARB_remap_index },
-   { 13049, ValidateProgramARB_remap_index },
-   { 18886, BindAttribLocationARB_remap_index },
+   { 22635, UseProgramObjectARB_remap_index },
+   { 13106, ValidateProgramARB_remap_index },
+   { 18971, BindAttribLocationARB_remap_index },
    {  4346, GetActiveAttribARB_remap_index },
-   { 14623, GetAttribLocationARB_remap_index },
-   { 26184, DrawBuffersARB_remap_index },
-   { 11669, RenderbufferStorageMultisample_remap_index },
-   { 16881, FlushMappedBufferRange_remap_index },
-   { 24748, MapBufferRange_remap_index },
-   { 14498, BindVertexArray_remap_index },
-   { 12908, GenVertexArrays_remap_index },
-   { 26959, CopyBufferSubData_remap_index },
-   { 27738, ClientWaitSync_remap_index },
+   { 14680, GetAttribLocationARB_remap_index },
+   { 26237, DrawBuffersARB_remap_index },
+   { 11694, RenderbufferStorageMultisample_remap_index },
+   { 16938, FlushMappedBufferRange_remap_index },
+   { 24801, MapBufferRange_remap_index },
+   { 14555, BindVertexArray_remap_index },
+   { 12965, GenVertexArrays_remap_index },
+   { 27012, CopyBufferSubData_remap_index },
+   { 27791, ClientWaitSync_remap_index },
    {  2394, DeleteSync_remap_index },
-   {  6221, FenceSync_remap_index },
-   { 13420, GetInteger64v_remap_index },
-   { 19985, GetSynciv_remap_index },
-   { 26123, IsSync_remap_index },
-   {  8328, WaitSync_remap_index },
+   {  6251, FenceSync_remap_index },
+   { 13477, GetInteger64v_remap_index },
+   { 20070, GetSynciv_remap_index },
+   { 26176, IsSync_remap_index },
+   {  8358, WaitSync_remap_index },
    {  3363, DrawElementsBaseVertex_remap_index },
-   { 27202, DrawRangeElementsBaseVertex_remap_index },
-   { 23469, MultiDrawElementsBaseVertex_remap_index },
+   { 27255, DrawRangeElementsBaseVertex_remap_index },
+   { 23554, MultiDrawElementsBaseVertex_remap_index },
    {  4711, PolygonOffsetEXT_remap_index },
-   { 20570, GetPixelTexGenParameterfvSGIS_remap_index },
+   { 20655, GetPixelTexGenParameterfvSGIS_remap_index },
    {  3895, GetPixelTexGenParameterivSGIS_remap_index },
-   { 20303, PixelTexGenParameterfSGIS_remap_index },
+   { 20388, PixelTexGenParameterfSGIS_remap_index },
    {   580, PixelTexGenParameterfvSGIS_remap_index },
-   { 11224, PixelTexGenParameteriSGIS_remap_index },
-   { 12185, PixelTexGenParameterivSGIS_remap_index },
-   { 14586, SampleMaskSGIS_remap_index },
-   { 17518, SamplePatternSGIS_remap_index },
-   { 23398, ColorPointerEXT_remap_index },
-   { 15501, EdgeFlagPointerEXT_remap_index },
-   {  5166, IndexPointerEXT_remap_index },
-   {  5246, NormalPointerEXT_remap_index },
-   { 14014, TexCoordPointerEXT_remap_index },
-   {  6016, VertexPointerEXT_remap_index },
+   { 11249, PixelTexGenParameteriSGIS_remap_index },
+   { 12242, PixelTexGenParameterivSGIS_remap_index },
+   { 14643, SampleMaskSGIS_remap_index },
+   { 17603, SamplePatternSGIS_remap_index },
+   { 23483, ColorPointerEXT_remap_index },
+   { 15558, EdgeFlagPointerEXT_remap_index },
+   {  5196, IndexPointerEXT_remap_index },
+   {  5276, NormalPointerEXT_remap_index },
+   { 14071, TexCoordPointerEXT_remap_index },
+   {  6046, VertexPointerEXT_remap_index },
    {  3165, PointParameterfEXT_remap_index },
-   {  6861, PointParameterfvEXT_remap_index },
-   { 28575, LockArraysEXT_remap_index },
-   { 13113, UnlockArraysEXT_remap_index },
-   {  7868, CullParameterdvEXT_remap_index },
-   { 10359, CullParameterfvEXT_remap_index },
+   {  6891, PointParameterfvEXT_remap_index },
+   { 28667, LockArraysEXT_remap_index },
+   { 13170, UnlockArraysEXT_remap_index },
+   {  7898, CullParameterdvEXT_remap_index },
+   { 10423, CullParameterfvEXT_remap_index },
    {  1151, SecondaryColor3bEXT_remap_index },
-   {  7020, SecondaryColor3bvEXT_remap_index },
-   {  9238, SecondaryColor3dEXT_remap_index },
-   { 22723, SecondaryColor3dvEXT_remap_index },
-   { 24994, SecondaryColor3fEXT_remap_index },
-   { 16067, SecondaryColor3fvEXT_remap_index },
+   {  7050, SecondaryColor3bvEXT_remap_index },
+   {  9268, SecondaryColor3dEXT_remap_index },
+   { 22808, SecondaryColor3dvEXT_remap_index },
+   { 25047, SecondaryColor3fEXT_remap_index },
+   { 16124, SecondaryColor3fvEXT_remap_index },
    {   426, SecondaryColor3iEXT_remap_index },
-   { 14324, SecondaryColor3ivEXT_remap_index },
-   {  8896, SecondaryColor3sEXT_remap_index },
-   { 27402, SecondaryColor3svEXT_remap_index },
-   { 24167, SecondaryColor3ubEXT_remap_index },
-   { 18777, SecondaryColor3ubvEXT_remap_index },
-   { 11419, SecondaryColor3uiEXT_remap_index },
-   { 20190, SecondaryColor3uivEXT_remap_index },
-   { 22935, SecondaryColor3usEXT_remap_index },
-   { 11492, SecondaryColor3usvEXT_remap_index },
-   { 10435, SecondaryColorPointerEXT_remap_index },
-   { 22784, MultiDrawArraysEXT_remap_index },
-   { 18467, MultiDrawElementsEXT_remap_index },
-   { 18662, FogCoordPointerEXT_remap_index },
+   { 14381, SecondaryColor3ivEXT_remap_index },
+   {  8926, SecondaryColor3sEXT_remap_index },
+   { 27455, SecondaryColor3svEXT_remap_index },
+   { 24220, SecondaryColor3ubEXT_remap_index },
+   { 18862, SecondaryColor3ubvEXT_remap_index },
+   { 11444, SecondaryColor3uiEXT_remap_index },
+   { 20275, SecondaryColor3uivEXT_remap_index },
+   { 23020, SecondaryColor3usEXT_remap_index },
+   { 11517, SecondaryColor3usvEXT_remap_index },
+   { 10499, SecondaryColorPointerEXT_remap_index },
+   { 22869, MultiDrawArraysEXT_remap_index },
+   { 18552, MultiDrawElementsEXT_remap_index },
+   { 18747, FogCoordPointerEXT_remap_index },
    {  4044, FogCoorddEXT_remap_index },
-   { 27976, FogCoorddvEXT_remap_index },
+   { 28068, FogCoorddvEXT_remap_index },
    {  4136, FogCoordfEXT_remap_index },
-   { 24090, FogCoordfvEXT_remap_index },
-   { 16785, PixelTexGenSGIX_remap_index },
-   { 24675, BlendFuncSeparateEXT_remap_index },
-   {  5928, FlushVertexArrayRangeNV_remap_index },
+   { 24143, FogCoordfvEXT_remap_index },
+   { 16842, PixelTexGenSGIX_remap_index },
+   { 24728, BlendFuncSeparateEXT_remap_index },
+   {  5958, FlushVertexArrayRangeNV_remap_index },
    {  4660, VertexArrayRangeNV_remap_index },
-   { 25059, CombinerInputNV_remap_index },
+   { 25112, CombinerInputNV_remap_index },
    {  1946, CombinerOutputNV_remap_index },
-   { 27555, CombinerParameterfNV_remap_index },
+   { 27608, CombinerParameterfNV_remap_index },
    {  4580, CombinerParameterfvNV_remap_index },
-   { 19735, CombinerParameteriNV_remap_index },
-   { 28946, CombinerParameterivNV_remap_index },
-   {  6298, FinalCombinerInputNV_remap_index },
-   {  8725, GetCombinerInputParameterfvNV_remap_index },
-   { 28783, GetCombinerInputParameterivNV_remap_index },
-   {  6097, GetCombinerOutputParameterfvNV_remap_index },
-   { 12146, GetCombinerOutputParameterivNV_remap_index },
-   {  5673, GetFinalCombinerInputParameterfvNV_remap_index },
-   { 21989, GetFinalCombinerInputParameterivNV_remap_index },
-   { 11164, ResizeBuffersMESA_remap_index },
-   {  9842, WindowPos2dMESA_remap_index },
+   { 19820, CombinerParameteriNV_remap_index },
+   { 29038, CombinerParameterivNV_remap_index },
+   {  6328, FinalCombinerInputNV_remap_index },
+   {  8755, GetCombinerInputParameterfvNV_remap_index },
+   { 28875, GetCombinerInputParameterivNV_remap_index },
+   {  6127, GetCombinerOutputParameterfvNV_remap_index },
+   { 12171, GetCombinerOutputParameterivNV_remap_index },
+   {  5703, GetFinalCombinerInputParameterfvNV_remap_index },
+   { 22074, GetFinalCombinerInputParameterivNV_remap_index },
+   { 11189, ResizeBuffersMESA_remap_index },
+   {  9872, WindowPos2dMESA_remap_index },
    {   944, WindowPos2dvMESA_remap_index },
-   { 29774, WindowPos2fMESA_remap_index },
-   {  6965, WindowPos2fvMESA_remap_index },
-   { 16014, WindowPos2iMESA_remap_index },
-   { 17991, WindowPos2ivMESA_remap_index },
-   { 18566, WindowPos2sMESA_remap_index },
-   {  4916, WindowPos2svMESA_remap_index },
-   {  6790, WindowPos3dMESA_remap_index },
-   { 12393, WindowPos3dvMESA_remap_index },
+   { 29866, WindowPos2fMESA_remap_index },
+   {  6995, WindowPos2fvMESA_remap_index },
+   { 16071, WindowPos2iMESA_remap_index },
+   { 18076, WindowPos2ivMESA_remap_index },
+   { 18651, WindowPos2sMESA_remap_index },
+   {  4946, WindowPos2svMESA_remap_index },
+   {  6820, WindowPos3dMESA_remap_index },
+   { 12450, WindowPos3dvMESA_remap_index },
    {   472, WindowPos3fMESA_remap_index },
-   { 13174, WindowPos3fvMESA_remap_index },
-   { 21284, WindowPos3iMESA_remap_index },
-   { 26904, WindowPos3ivMESA_remap_index },
-   { 16531, WindowPos3sMESA_remap_index },
-   { 28232, WindowPos3svMESA_remap_index },
-   {  9793, WindowPos4dMESA_remap_index },
-   { 15027, WindowPos4dvMESA_remap_index },
-   { 12352, WindowPos4fMESA_remap_index },
-   { 27309, WindowPos4fvMESA_remap_index },
-   { 27057, WindowPos4iMESA_remap_index },
-   { 11003, WindowPos4ivMESA_remap_index },
-   { 16664, WindowPos4sMESA_remap_index },
+   { 13231, WindowPos3fvMESA_remap_index },
+   { 21369, WindowPos3iMESA_remap_index },
+   { 26957, WindowPos3ivMESA_remap_index },
+   { 16588, WindowPos3sMESA_remap_index },
+   { 28324, WindowPos3svMESA_remap_index },
+   {  9823, WindowPos4dMESA_remap_index },
+   { 15084, WindowPos4dvMESA_remap_index },
+   { 12409, WindowPos4fMESA_remap_index },
+   { 27362, WindowPos4fvMESA_remap_index },
+   { 27110, WindowPos4iMESA_remap_index },
+   { 11028, WindowPos4ivMESA_remap_index },
+   { 16721, WindowPos4sMESA_remap_index },
    {  2857, WindowPos4svMESA_remap_index },
-   { 23833, MultiModeDrawArraysIBM_remap_index },
-   { 25777, MultiModeDrawElementsIBM_remap_index },
-   { 10814, DeleteFencesNV_remap_index },
-   { 24906, FinishFenceNV_remap_index },
+   { 12210, MultiModeDrawArraysIBM_remap_index },
+   { 25830, MultiModeDrawElementsIBM_remap_index },
+   { 10878, DeleteFencesNV_remap_index },
+   { 24959, FinishFenceNV_remap_index },
    {  3287, GenFencesNV_remap_index },
-   { 15007, GetFenceivNV_remap_index },
-   {  7257, IsFenceNV_remap_index },
-   { 12073, SetFenceNV_remap_index },
+   { 15064, GetFenceivNV_remap_index },
+   {  7287, IsFenceNV_remap_index },
+   { 12098, SetFenceNV_remap_index },
    {  3744, TestFenceNV_remap_index },
-   { 28203, AreProgramsResidentNV_remap_index },
-   { 27597, BindProgramNV_remap_index },
-   { 23018, DeleteProgramsNV_remap_index },
-   { 18995, ExecuteProgramNV_remap_index },
-   { 29667, GenProgramsNV_remap_index },
-   { 20649, GetProgramParameterdvNV_remap_index },
-   {  9300, GetProgramParameterfvNV_remap_index },
-   { 23372, GetProgramStringNV_remap_index },
-   { 21678, GetProgramivNV_remap_index },
-   { 20883, GetTrackMatrixivNV_remap_index },
-   { 23168, GetVertexAttribPointervNV_remap_index },
-   { 21922, GetVertexAttribdvNV_remap_index },
-   { 16504, GetVertexAttribfvNV_remap_index },
-   { 16195, GetVertexAttribivNV_remap_index },
-   { 16911, IsProgramNV_remap_index },
-   {  8306, LoadProgramNV_remap_index },
-   { 24771, ProgramParameters4dvNV_remap_index },
-   { 21608, ProgramParameters4fvNV_remap_index },
-   { 18295, RequestResidentProgramsNV_remap_index },
-   { 19713, TrackMatrixNV_remap_index },
-   { 28760, VertexAttrib1dNV_remap_index },
-   { 12014, VertexAttrib1dvNV_remap_index },
-   { 25309, VertexAttrib1fNV_remap_index },
+   { 28295, AreProgramsResidentNV_remap_index },
+   { 27650, BindProgramNV_remap_index },
+   { 23103, DeleteProgramsNV_remap_index },
+   { 19080, ExecuteProgramNV_remap_index },
+   { 29759, GenProgramsNV_remap_index },
+   { 20734, GetProgramParameterdvNV_remap_index },
+   {  9330, GetProgramParameterfvNV_remap_index },
+   { 23457, GetProgramStringNV_remap_index },
+   { 21763, GetProgramivNV_remap_index },
+   { 20968, GetTrackMatrixivNV_remap_index },
+   { 23253, GetVertexAttribPointervNV_remap_index },
+   { 22007, GetVertexAttribdvNV_remap_index },
+   { 16561, GetVertexAttribfvNV_remap_index },
+   { 16252, GetVertexAttribivNV_remap_index },
+   { 16968, IsProgramNV_remap_index },
+   {  8336, LoadProgramNV_remap_index },
+   { 24824, ProgramParameters4dvNV_remap_index },
+   { 21693, ProgramParameters4fvNV_remap_index },
+   { 18380, RequestResidentProgramsNV_remap_index },
+   { 19798, TrackMatrixNV_remap_index },
+   { 28852, VertexAttrib1dNV_remap_index },
+   { 12039, VertexAttrib1dvNV_remap_index },
+   { 25362, VertexAttrib1fNV_remap_index },
    {  2245, VertexAttrib1fvNV_remap_index },
-   { 27366, VertexAttrib1sNV_remap_index },
-   { 13247, VertexAttrib1svNV_remap_index },
+   { 27419, VertexAttrib1sNV_remap_index },
+   { 13304, VertexAttrib1svNV_remap_index },
    {  4251, VertexAttrib2dNV_remap_index },
-   { 11929, VertexAttrib2dvNV_remap_index },
-   { 17750, VertexAttrib2fNV_remap_index },
-   { 11540, VertexAttrib2fvNV_remap_index },
-   {  5076, VertexAttrib2sNV_remap_index },
-   { 16585, VertexAttrib2svNV_remap_index },
-   {  9990, VertexAttrib3dNV_remap_index },
-   { 28453, VertexAttrib3dvNV_remap_index },
-   {  9112, VertexAttrib3fNV_remap_index },
-   { 21949, VertexAttrib3fvNV_remap_index },
-   { 25284, VertexAttrib3sNV_remap_index },
-   { 20910, VertexAttrib3svNV_remap_index },
-   { 25751, VertexAttrib4dNV_remap_index },
-   { 29704, VertexAttrib4dvNV_remap_index },
+   { 11954, VertexAttrib2dvNV_remap_index },
+   { 17835, VertexAttrib2fNV_remap_index },
+   { 11565, VertexAttrib2fvNV_remap_index },
+   {  5106, VertexAttrib2sNV_remap_index },
+   { 16642, VertexAttrib2svNV_remap_index },
+   { 10020, VertexAttrib3dNV_remap_index },
+   { 28545, VertexAttrib3dvNV_remap_index },
+   {  9142, VertexAttrib3fNV_remap_index },
+   { 22034, VertexAttrib3fvNV_remap_index },
+   { 25337, VertexAttrib3sNV_remap_index },
+   { 20995, VertexAttrib3svNV_remap_index },
+   { 25804, VertexAttrib4dNV_remap_index },
+   { 29796, VertexAttrib4dvNV_remap_index },
    {  3945, VertexAttrib4fNV_remap_index },
-   {  8356, VertexAttrib4fvNV_remap_index },
-   { 23717, VertexAttrib4sNV_remap_index },
+   {  8386, VertexAttrib4fvNV_remap_index },
+   { 23802, VertexAttrib4sNV_remap_index },
    {  1293, VertexAttrib4svNV_remap_index },
    {  4409, VertexAttrib4ubNV_remap_index },
    {   734, VertexAttrib4ubvNV_remap_index },
-   { 19175, VertexAttribPointerNV_remap_index },
+   { 19260, VertexAttribPointerNV_remap_index },
    {  2097, VertexAttribs1dvNV_remap_index },
-   { 16609, VertexAttribs1fvNV_remap_index },
-   { 29504, VertexAttribs1svNV_remap_index },
-   {  9137, VertexAttribs2dvNV_remap_index },
-   { 22511, VertexAttribs2fvNV_remap_index },
-   { 15527, VertexAttribs2svNV_remap_index },
+   { 16666, VertexAttribs1fvNV_remap_index },
+   { 29596, VertexAttribs1svNV_remap_index },
+   {  9167, VertexAttribs2dvNV_remap_index },
+   { 22596, VertexAttribs2fvNV_remap_index },
+   { 15584, VertexAttribs2svNV_remap_index },
    {  4608, VertexAttribs3dvNV_remap_index },
    {  1977, VertexAttribs3fvNV_remap_index },
-   { 26652, VertexAttribs3svNV_remap_index },
-   { 23807, VertexAttribs4dvNV_remap_index },
+   { 26705, VertexAttribs3svNV_remap_index },
+   { 23892, VertexAttribs4dvNV_remap_index },
    {  4634, VertexAttribs4fvNV_remap_index },
-   { 29291, VertexAttribs4svNV_remap_index },
-   { 26400, VertexAttribs4ubvNV_remap_index },
-   { 23909, GetTexBumpParameterfvATI_remap_index },
-   { 29545, GetTexBumpParameterivATI_remap_index },
-   { 16249, TexBumpParameterfvATI_remap_index },
-   { 18166, TexBumpParameterivATI_remap_index },
-   { 13793, AlphaFragmentOp1ATI_remap_index },
-   {  9652, AlphaFragmentOp2ATI_remap_index },
-   { 21865, AlphaFragmentOp3ATI_remap_index },
-   { 26579, BeginFragmentShaderATI_remap_index },
-   { 27796, BindFragmentShaderATI_remap_index },
-   { 21039, ColorFragmentOp1ATI_remap_index },
+   { 29383, VertexAttribs4svNV_remap_index },
+   { 26453, VertexAttribs4ubvNV_remap_index },
+   { 23962, GetTexBumpParameterfvATI_remap_index },
+   { 29637, GetTexBumpParameterivATI_remap_index },
+   { 16306, TexBumpParameterfvATI_remap_index },
+   { 18251, TexBumpParameterivATI_remap_index },
+   { 13850, AlphaFragmentOp1ATI_remap_index },
+   {  9682, AlphaFragmentOp2ATI_remap_index },
+   { 21950, AlphaFragmentOp3ATI_remap_index },
+   { 26632, BeginFragmentShaderATI_remap_index },
+   { 27849, BindFragmentShaderATI_remap_index },
+   { 21124, ColorFragmentOp1ATI_remap_index },
    {  3823, ColorFragmentOp2ATI_remap_index },
-   { 28098, ColorFragmentOp3ATI_remap_index },
+   { 28190, ColorFragmentOp3ATI_remap_index },
    {  4753, DeleteFragmentShaderATI_remap_index },
-   { 29728, EndFragmentShaderATI_remap_index },
-   { 28974, GenFragmentShadersATI_remap_index },
-   { 22642, PassTexCoordATI_remap_index },
-   {  5996, SampleMapATI_remap_index },
-   {  5769, SetFragmentShaderConstantATI_remap_index },
+   { 29820, EndFragmentShaderATI_remap_index },
+   { 29066, GenFragmentShadersATI_remap_index },
+   { 22727, PassTexCoordATI_remap_index },
+   {  6026, SampleMapATI_remap_index },
+   {  5799, SetFragmentShaderConstantATI_remap_index },
    {   319, PointParameteriNV_remap_index },
-   { 12554, PointParameterivNV_remap_index },
-   { 25590, ActiveStencilFaceEXT_remap_index },
-   { 24431, BindVertexArrayAPPLE_remap_index },
+   { 12611, PointParameterivNV_remap_index },
+   { 25643, ActiveStencilFaceEXT_remap_index },
+   { 24484, BindVertexArrayAPPLE_remap_index },
    {  2522, DeleteVertexArraysAPPLE_remap_index },
-   { 15866, GenVertexArraysAPPLE_remap_index },
-   { 20714, IsVertexArrayAPPLE_remap_index },
+   { 15923, GenVertexArraysAPPLE_remap_index },
+   { 20799, IsVertexArrayAPPLE_remap_index },
    {   775, GetProgramNamedParameterdvNV_remap_index },
    {  3128, GetProgramNamedParameterfvNV_remap_index },
-   { 23940, ProgramNamedParameter4dNV_remap_index },
-   { 12829, ProgramNamedParameter4dvNV_remap_index },
-   {  7893, ProgramNamedParameter4fNV_remap_index },
-   { 10400, ProgramNamedParameter4fvNV_remap_index },
-   { 21587, DepthBoundsEXT_remap_index },
+   { 23993, ProgramNamedParameter4dNV_remap_index },
+   { 12886, ProgramNamedParameter4dvNV_remap_index },
+   {  7923, ProgramNamedParameter4fNV_remap_index },
+   { 10464, ProgramNamedParameter4fvNV_remap_index },
+   { 21672, DepthBoundsEXT_remap_index },
    {  1043, BlendEquationSeparateEXT_remap_index },
-   { 12948, BindFramebufferEXT_remap_index },
-   { 22829, BindRenderbufferEXT_remap_index },
-   {  8575, CheckFramebufferStatusEXT_remap_index },
-   { 20004, DeleteFramebuffersEXT_remap_index },
-   { 28355, DeleteRenderbuffersEXT_remap_index },
-   { 11953, FramebufferRenderbufferEXT_remap_index },
-   { 12090, FramebufferTexture1DEXT_remap_index },
-   { 10228, FramebufferTexture2DEXT_remap_index },
-   {  9895, FramebufferTexture3DEXT_remap_index },
-   { 20606, GenFramebuffersEXT_remap_index },
-   { 15413, GenRenderbuffersEXT_remap_index },
-   {  5715, GenerateMipmapEXT_remap_index },
-   { 19235, GetFramebufferAttachmentParameterivEXT_remap_index },
-   { 28880, GetRenderbufferParameterivEXT_remap_index },
-   { 18046, IsFramebufferEXT_remap_index },
-   { 29627, IsRenderbufferEXT_remap_index },
-   {  7204, RenderbufferStorageEXT_remap_index },
+   { 13005, BindFramebufferEXT_remap_index },
+   { 22914, BindRenderbufferEXT_remap_index },
+   {  8605, CheckFramebufferStatusEXT_remap_index },
+   { 20089, DeleteFramebuffersEXT_remap_index },
+   { 28447, DeleteRenderbuffersEXT_remap_index },
+   { 11978, FramebufferRenderbufferEXT_remap_index },
+   { 12115, FramebufferTexture1DEXT_remap_index },
+   { 10258, FramebufferTexture2DEXT_remap_index },
+   {  9925, FramebufferTexture3DEXT_remap_index },
+   { 20691, GenFramebuffersEXT_remap_index },
+   { 15470, GenRenderbuffersEXT_remap_index },
+   {  5745, GenerateMipmapEXT_remap_index },
+   { 19320, GetFramebufferAttachmentParameterivEXT_remap_index },
+   { 28972, GetRenderbufferParameterivEXT_remap_index },
+   { 18131, IsFramebufferEXT_remap_index },
+   { 29719, IsRenderbufferEXT_remap_index },
+   {  7234, RenderbufferStorageEXT_remap_index },
    {   651, BlitFramebufferEXT_remap_index },
-   { 12648, BufferParameteriAPPLE_remap_index },
-   { 16943, FlushMappedBufferRangeAPPLE_remap_index },
+   { 12705, BufferParameteriAPPLE_remap_index },
+   { 17000, FlushMappedBufferRangeAPPLE_remap_index },
    {  2701, FramebufferTextureLayerEXT_remap_index },
-   {  8277, ColorMaskIndexedEXT_remap_index },
-   { 23256, DisableIndexedEXT_remap_index },
-   { 23564, EnableIndexedEXT_remap_index },
-   { 19206, GetBooleanIndexedvEXT_remap_index },
-   {  9685, GetIntegerIndexedvEXT_remap_index },
-   { 20080, IsEnabledIndexedEXT_remap_index },
+   {  8307, ColorMaskIndexedEXT_remap_index },
+   { 23341, DisableIndexedEXT_remap_index },
+   { 23649, EnableIndexedEXT_remap_index },
+   { 19291, GetBooleanIndexedvEXT_remap_index },
+   {  9715, GetIntegerIndexedvEXT_remap_index },
+   { 20165, IsEnabledIndexedEXT_remap_index },
    {  4074, BeginConditionalRenderNV_remap_index },
-   { 22615, EndConditionalRenderNV_remap_index },
-   { 26301, ProvokingVertexEXT_remap_index },
-   {  9521, GetTexParameterPointervAPPLE_remap_index },
+   { 22700, EndConditionalRenderNV_remap_index },
+   { 26354, ProvokingVertexEXT_remap_index },
+   {  9551, GetTexParameterPointervAPPLE_remap_index },
    {  4436, TextureRangeAPPLE_remap_index },
-   { 25616, StencilFuncSeparateATI_remap_index },
-   { 15933, ProgramEnvParameters4fvEXT_remap_index },
-   { 15151, ProgramLocalParameters4fvEXT_remap_index },
-   { 12482, GetQueryObjecti64vEXT_remap_index },
-   {  9163, GetQueryObjectui64vEXT_remap_index },
-   { 21108, EGLImageTargetRenderbufferStorageOES_remap_index },
-   { 10753, EGLImageTargetTexture2DOES_remap_index },
+   { 10330, GetObjectParameterivAPPLE_remap_index },
+   { 17575, ObjectPurgeableAPPLE_remap_index },
+   {  4900, ObjectUnpurgeableAPPLE_remap_index },
+   { 25669, StencilFuncSeparateATI_remap_index },
+   { 15990, ProgramEnvParameters4fvEXT_remap_index },
+   { 15208, ProgramLocalParameters4fvEXT_remap_index },
+   { 12539, GetQueryObjecti64vEXT_remap_index },
+   {  9193, GetQueryObjectui64vEXT_remap_index },
+   { 21193, EGLImageTargetRenderbufferStorageOES_remap_index },
+   { 10817, EGLImageTargetTexture2DOES_remap_index },
    {    -1, -1 }
 };
 
@@ -4778,108 +4793,108 @@ static const struct gl_function_remap MESA_alt_functions[] = {
    /* from GL_EXT_blend_color */
    {  2440, _gloffset_BlendColor },
    /* from GL_EXT_blend_minmax */
-   {  9952, _gloffset_BlendEquation },
+   {  9982, _gloffset_BlendEquation },
    /* from GL_EXT_color_subtable */
-   { 15049, _gloffset_ColorSubTable },
-   { 28287, _gloffset_CopyColorSubTable },
+   { 15106, _gloffset_ColorSubTable },
+   { 28379, _gloffset_CopyColorSubTable },
    /* from GL_EXT_convolution */
    {   213, _gloffset_ConvolutionFilter1D },
    {  2284, _gloffset_CopyConvolutionFilter1D },
    {  3624, _gloffset_GetConvolutionParameteriv },
-   {  7553, _gloffset_ConvolutionFilter2D },
-   {  7719, _gloffset_ConvolutionParameteriv },
-   {  8179, _gloffset_ConvolutionParameterfv },
-   { 18194, _gloffset_GetSeparableFilter },
-   { 21338, _gloffset_SeparableFilter2D },
-   { 22167, _gloffset_ConvolutionParameteri },
-   { 22290, _gloffset_ConvolutionParameterf },
-   { 23743, _gloffset_GetConvolutionParameterfv },
-   { 24597, _gloffset_GetConvolutionFilter },
-   { 26841, _gloffset_CopyConvolutionFilter2D },
+   {  7583, _gloffset_ConvolutionFilter2D },
+   {  7749, _gloffset_ConvolutionParameteriv },
+   {  8209, _gloffset_ConvolutionParameterfv },
+   { 18279, _gloffset_GetSeparableFilter },
+   { 21423, _gloffset_SeparableFilter2D },
+   { 22252, _gloffset_ConvolutionParameteri },
+   { 22375, _gloffset_ConvolutionParameterf },
+   { 23828, _gloffset_GetConvolutionParameterfv },
+   { 24650, _gloffset_GetConvolutionFilter },
+   { 26894, _gloffset_CopyConvolutionFilter2D },
    /* from GL_EXT_copy_texture */
-   { 13307, _gloffset_CopyTexSubImage3D },
-   { 14789, _gloffset_CopyTexImage2D },
-   { 21775, _gloffset_CopyTexImage1D },
-   { 24278, _gloffset_CopyTexSubImage2D },
-   { 26479, _gloffset_CopyTexSubImage1D },
+   { 13364, _gloffset_CopyTexSubImage3D },
+   { 14846, _gloffset_CopyTexImage2D },
+   { 21860, _gloffset_CopyTexImage1D },
+   { 24331, _gloffset_CopyTexSubImage2D },
+   { 26532, _gloffset_CopyTexSubImage1D },
    /* from GL_EXT_draw_range_elements */
-   {  8462, _gloffset_DrawRangeElements },
+   {  8492, _gloffset_DrawRangeElements },
    /* from GL_EXT_histogram */
    {   812, _gloffset_Histogram },
    {  3088, _gloffset_ResetHistogram },
-   {  8834, _gloffset_GetMinmax },
-   { 13641, _gloffset_GetHistogramParameterfv },
-   { 21700, _gloffset_GetMinmaxParameteriv },
-   { 23633, _gloffset_ResetMinmax },
-   { 24494, _gloffset_GetHistogramParameteriv },
-   { 25550, _gloffset_GetHistogram },
-   { 27912, _gloffset_Minmax },
-   { 29374, _gloffset_GetMinmaxParameterfv },
+   {  8864, _gloffset_GetMinmax },
+   { 13698, _gloffset_GetHistogramParameterfv },
+   { 21785, _gloffset_GetMinmaxParameteriv },
+   { 23718, _gloffset_ResetMinmax },
+   { 24547, _gloffset_GetHistogramParameteriv },
+   { 25603, _gloffset_GetHistogram },
+   { 27965, _gloffset_Minmax },
+   { 29466, _gloffset_GetMinmaxParameterfv },
    /* from GL_EXT_paletted_texture */
-   {  7415, _gloffset_ColorTable },
-   { 13487, _gloffset_GetColorTable },
-   { 20353, _gloffset_GetColorTableParameterfv },
-   { 22346, _gloffset_GetColorTableParameteriv },
+   {  7445, _gloffset_ColorTable },
+   { 13544, _gloffset_GetColorTable },
+   { 20438, _gloffset_GetColorTableParameterfv },
+   { 22431, _gloffset_GetColorTableParameteriv },
    /* from GL_EXT_subtexture */
-   {  6136, _gloffset_TexSubImage1D },
-   {  9448, _gloffset_TexSubImage2D },
+   {  6166, _gloffset_TexSubImage1D },
+   {  9478, _gloffset_TexSubImage2D },
    /* from GL_EXT_texture3D */
    {  1658, _gloffset_TexImage3D },
-   { 20122, _gloffset_TexSubImage3D },
+   { 20207, _gloffset_TexSubImage3D },
    /* from GL_EXT_texture_object */
    {  2964, _gloffset_PrioritizeTextures },
-   {  6585, _gloffset_AreTexturesResident },
-   { 12038, _gloffset_GenTextures },
-   { 13973, _gloffset_DeleteTextures },
-   { 17224, _gloffset_IsTexture },
-   { 26544, _gloffset_BindTexture },
+   {  6615, _gloffset_AreTexturesResident },
+   { 12063, _gloffset_GenTextures },
+   { 14030, _gloffset_DeleteTextures },
+   { 17281, _gloffset_IsTexture },
+   { 26597, _gloffset_BindTexture },
    /* from GL_EXT_vertex_array */
-   { 21527, _gloffset_ArrayElement },
-   { 27500, _gloffset_GetPointerv },
-   { 29001, _gloffset_DrawArrays },
+   { 21612, _gloffset_ArrayElement },
+   { 27553, _gloffset_GetPointerv },
+   { 29093, _gloffset_DrawArrays },
    /* from GL_SGI_color_table */
-   {  6703, _gloffset_ColorTableParameteriv },
-   {  7415, _gloffset_ColorTable },
-   { 13487, _gloffset_GetColorTable },
-   { 13597, _gloffset_CopyColorTable },
-   { 17085, _gloffset_ColorTableParameterfv },
-   { 20353, _gloffset_GetColorTableParameterfv },
-   { 22346, _gloffset_GetColorTableParameteriv },
+   {  6733, _gloffset_ColorTableParameteriv },
+   {  7445, _gloffset_ColorTable },
+   { 13544, _gloffset_GetColorTable },
+   { 13654, _gloffset_CopyColorTable },
+   { 17142, _gloffset_ColorTableParameterfv },
+   { 20438, _gloffset_GetColorTableParameterfv },
+   { 22431, _gloffset_GetColorTableParameteriv },
    /* from GL_VERSION_1_3 */
    {   381, _gloffset_MultiTexCoord3sARB },
    {   613, _gloffset_ActiveTextureARB },
    {  3761, _gloffset_MultiTexCoord1fvARB },
-   {  5271, _gloffset_MultiTexCoord3dARB },
-   {  5316, _gloffset_MultiTexCoord2iARB },
-   {  5440, _gloffset_MultiTexCoord2svARB },
-   {  7371, _gloffset_MultiTexCoord2fARB },
-   {  9193, _gloffset_MultiTexCoord3fvARB },
-   {  9714, _gloffset_MultiTexCoord4sARB },
-   { 10314, _gloffset_MultiTexCoord2dvARB },
-   { 10696, _gloffset_MultiTexCoord1svARB },
-   { 11025, _gloffset_MultiTexCoord3svARB },
-   { 11086, _gloffset_MultiTexCoord4iARB },
-   { 11809, _gloffset_MultiTexCoord3iARB },
-   { 12511, _gloffset_MultiTexCoord1dARB },
-   { 12677, _gloffset_MultiTexCoord3dvARB },
-   { 13841, _gloffset_MultiTexCoord3ivARB },
-   { 13886, _gloffset_MultiTexCoord2sARB },
-   { 15106, _gloffset_MultiTexCoord4ivARB },
-   { 16735, _gloffset_ClientActiveTextureARB },
-   { 18951, _gloffset_MultiTexCoord2dARB },
-   { 19355, _gloffset_MultiTexCoord4dvARB },
-   { 19641, _gloffset_MultiTexCoord4fvARB },
-   { 20494, _gloffset_MultiTexCoord3fARB },
-   { 22874, _gloffset_MultiTexCoord4dARB },
-   { 23078, _gloffset_MultiTexCoord1sARB },
-   { 23280, _gloffset_MultiTexCoord1dvARB },
-   { 24122, _gloffset_MultiTexCoord1ivARB },
-   { 24215, _gloffset_MultiTexCoord2ivARB },
-   { 24554, _gloffset_MultiTexCoord1iARB },
-   { 25825, _gloffset_MultiTexCoord4svARB },
-   { 26343, _gloffset_MultiTexCoord1fARB },
-   { 26606, _gloffset_MultiTexCoord4fARB },
-   { 28835, _gloffset_MultiTexCoord2fvARB },
+   {  5301, _gloffset_MultiTexCoord3dARB },
+   {  5346, _gloffset_MultiTexCoord2iARB },
+   {  5470, _gloffset_MultiTexCoord2svARB },
+   {  7401, _gloffset_MultiTexCoord2fARB },
+   {  9223, _gloffset_MultiTexCoord3fvARB },
+   {  9744, _gloffset_MultiTexCoord4sARB },
+   { 10378, _gloffset_MultiTexCoord2dvARB },
+   { 10760, _gloffset_MultiTexCoord1svARB },
+   { 11050, _gloffset_MultiTexCoord3svARB },
+   { 11111, _gloffset_MultiTexCoord4iARB },
+   { 11834, _gloffset_MultiTexCoord3iARB },
+   { 12568, _gloffset_MultiTexCoord1dARB },
+   { 12734, _gloffset_MultiTexCoord3dvARB },
+   { 13898, _gloffset_MultiTexCoord3ivARB },
+   { 13943, _gloffset_MultiTexCoord2sARB },
+   { 15163, _gloffset_MultiTexCoord4ivARB },
+   { 16792, _gloffset_ClientActiveTextureARB },
+   { 19036, _gloffset_MultiTexCoord2dARB },
+   { 19440, _gloffset_MultiTexCoord4dvARB },
+   { 19726, _gloffset_MultiTexCoord4fvARB },
+   { 20579, _gloffset_MultiTexCoord3fARB },
+   { 22959, _gloffset_MultiTexCoord4dARB },
+   { 23163, _gloffset_MultiTexCoord1sARB },
+   { 23365, _gloffset_MultiTexCoord1dvARB },
+   { 24175, _gloffset_MultiTexCoord1ivARB },
+   { 24268, _gloffset_MultiTexCoord2ivARB },
+   { 24607, _gloffset_MultiTexCoord1iARB },
+   { 25878, _gloffset_MultiTexCoord4svARB },
+   { 26396, _gloffset_MultiTexCoord1fARB },
+   { 26659, _gloffset_MultiTexCoord4fARB },
+   { 28927, _gloffset_MultiTexCoord2fvARB },
    {    -1, -1 }
 };
 
@@ -4887,7 +4902,7 @@ static const struct gl_function_remap MESA_alt_functions[] = {
 
 #if defined(need_GL_3DFX_tbuffer)
 static const struct gl_function_remap GL_3DFX_tbuffer_functions[] = {
-   {  8237, -1 }, /* TbufferMask3DFX */
+   {  8267, -1 }, /* TbufferMask3DFX */
    {    -1, -1 }
 };
 #endif
@@ -4899,6 +4914,13 @@ static const struct gl_function_remap GL_APPLE_flush_buffer_range_functions[] =
 };
 #endif
 
+#if defined(need_GL_APPLE_object_purgeable)
+/* functions defined in MESA_remap_table_functions are excluded */
+static const struct gl_function_remap GL_APPLE_object_purgeable_functions[] = {
+   {    -1, -1 }
+};
+#endif
+
 #if defined(need_GL_APPLE_texture_range)
 /* functions defined in MESA_remap_table_functions are excluded */
 static const struct gl_function_remap GL_APPLE_texture_range_functions[] = {
@@ -4951,10 +4973,10 @@ static const struct gl_function_remap GL_ARB_map_buffer_range_functions[] = {
 #if defined(need_GL_ARB_matrix_palette)
 static const struct gl_function_remap GL_ARB_matrix_palette_functions[] = {
    {  3339, -1 }, /* MatrixIndexusvARB */
-   { 11630, -1 }, /* MatrixIndexuivARB */
-   { 12799, -1 }, /* MatrixIndexPointerARB */
-   { 17473, -1 }, /* CurrentPaletteMatrixARB */
-   { 20238, -1 }, /* MatrixIndexubvARB */
+   { 11655, -1 }, /* MatrixIndexuivARB */
+   { 12856, -1 }, /* MatrixIndexPointerARB */
+   { 17530, -1 }, /* CurrentPaletteMatrixARB */
+   { 20323, -1 }, /* MatrixIndexubvARB */
    {    -1, -1 }
 };
 #endif
@@ -5025,15 +5047,15 @@ static const struct gl_function_remap GL_ARB_vertex_array_object_functions[] = {
 #if defined(need_GL_ARB_vertex_blend)
 static const struct gl_function_remap GL_ARB_vertex_blend_functions[] = {
    {  2226, -1 }, /* WeightubvARB */
-   {  5603, -1 }, /* WeightivARB */
-   {  9817, -1 }, /* WeightPointerARB */
-   { 12268, -1 }, /* WeightfvARB */
-   { 15553, -1 }, /* WeightbvARB */
-   { 18619, -1 }, /* WeightusvARB */
-   { 21264, -1 }, /* VertexBlendARB */
-   { 26427, -1 }, /* WeightsvARB */
-   { 28337, -1 }, /* WeightdvARB */
-   { 29035, -1 }, /* WeightuivARB */
+   {  5633, -1 }, /* WeightivARB */
+   {  9847, -1 }, /* WeightPointerARB */
+   { 12325, -1 }, /* WeightfvARB */
+   { 15610, -1 }, /* WeightbvARB */
+   { 18704, -1 }, /* WeightusvARB */
+   { 21349, -1 }, /* VertexBlendARB */
+   { 26480, -1 }, /* WeightsvARB */
+   { 28429, -1 }, /* WeightdvARB */
+   { 29127, -1 }, /* WeightuivARB */
    {    -1, -1 }
 };
 #endif
@@ -5124,15 +5146,15 @@ static const struct gl_function_remap GL_EXT_blend_func_separate_functions[] = {
 
 #if defined(need_GL_EXT_blend_minmax)
 static const struct gl_function_remap GL_EXT_blend_minmax_functions[] = {
-   {  9952, _gloffset_BlendEquation },
+   {  9982, _gloffset_BlendEquation },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_color_subtable)
 static const struct gl_function_remap GL_EXT_color_subtable_functions[] = {
-   { 15049, _gloffset_ColorSubTable },
-   { 28287, _gloffset_CopyColorSubTable },
+   { 15106, _gloffset_ColorSubTable },
+   { 28379, _gloffset_CopyColorSubTable },
    {    -1, -1 }
 };
 #endif
@@ -5149,55 +5171,55 @@ static const struct gl_function_remap GL_EXT_convolution_functions[] = {
    {   213, _gloffset_ConvolutionFilter1D },
    {  2284, _gloffset_CopyConvolutionFilter1D },
    {  3624, _gloffset_GetConvolutionParameteriv },
-   {  7553, _gloffset_ConvolutionFilter2D },
-   {  7719, _gloffset_ConvolutionParameteriv },
-   {  8179, _gloffset_ConvolutionParameterfv },
-   { 18194, _gloffset_GetSeparableFilter },
-   { 21338, _gloffset_SeparableFilter2D },
-   { 22167, _gloffset_ConvolutionParameteri },
-   { 22290, _gloffset_ConvolutionParameterf },
-   { 23743, _gloffset_GetConvolutionParameterfv },
-   { 24597, _gloffset_GetConvolutionFilter },
-   { 26841, _gloffset_CopyConvolutionFilter2D },
+   {  7583, _gloffset_ConvolutionFilter2D },
+   {  7749, _gloffset_ConvolutionParameteriv },
+   {  8209, _gloffset_ConvolutionParameterfv },
+   { 18279, _gloffset_GetSeparableFilter },
+   { 21423, _gloffset_SeparableFilter2D },
+   { 22252, _gloffset_ConvolutionParameteri },
+   { 22375, _gloffset_ConvolutionParameterf },
+   { 23828, _gloffset_GetConvolutionParameterfv },
+   { 24650, _gloffset_GetConvolutionFilter },
+   { 26894, _gloffset_CopyConvolutionFilter2D },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_coordinate_frame)
 static const struct gl_function_remap GL_EXT_coordinate_frame_functions[] = {
-   {  9332, -1 }, /* TangentPointerEXT */
-   { 11144, -1 }, /* Binormal3ivEXT */
-   { 11762, -1 }, /* Tangent3sEXT */
-   { 12864, -1 }, /* Tangent3fvEXT */
-   { 16485, -1 }, /* Tangent3dvEXT */
-   { 17171, -1 }, /* Binormal3bvEXT */
-   { 18247, -1 }, /* Binormal3dEXT */
-   { 20170, -1 }, /* Tangent3fEXT */
-   { 22239, -1 }, /* Binormal3sEXT */
-   { 22684, -1 }, /* Tangent3ivEXT */
-   { 22703, -1 }, /* Tangent3dEXT */
-   { 23507, -1 }, /* Binormal3svEXT */
-   { 24020, -1 }, /* Binormal3fEXT */
-   { 24872, -1 }, /* Binormal3dvEXT */
-   { 26047, -1 }, /* Tangent3iEXT */
-   { 27126, -1 }, /* Tangent3bvEXT */
-   { 27535, -1 }, /* Tangent3bEXT */
-   { 28060, -1 }, /* Binormal3fvEXT */
-   { 28734, -1 }, /* BinormalPointerEXT */
-   { 29139, -1 }, /* Tangent3svEXT */
-   { 29576, -1 }, /* Binormal3bEXT */
-   { 29753, -1 }, /* Binormal3iEXT */
+   {  9362, -1 }, /* TangentPointerEXT */
+   { 11169, -1 }, /* Binormal3ivEXT */
+   { 11787, -1 }, /* Tangent3sEXT */
+   { 12921, -1 }, /* Tangent3fvEXT */
+   { 16542, -1 }, /* Tangent3dvEXT */
+   { 17228, -1 }, /* Binormal3bvEXT */
+   { 18332, -1 }, /* Binormal3dEXT */
+   { 20255, -1 }, /* Tangent3fEXT */
+   { 22324, -1 }, /* Binormal3sEXT */
+   { 22769, -1 }, /* Tangent3ivEXT */
+   { 22788, -1 }, /* Tangent3dEXT */
+   { 23592, -1 }, /* Binormal3svEXT */
+   { 24073, -1 }, /* Binormal3fEXT */
+   { 24925, -1 }, /* Binormal3dvEXT */
+   { 26100, -1 }, /* Tangent3iEXT */
+   { 27179, -1 }, /* Tangent3bvEXT */
+   { 27588, -1 }, /* Tangent3bEXT */
+   { 28152, -1 }, /* Binormal3fvEXT */
+   { 28826, -1 }, /* BinormalPointerEXT */
+   { 29231, -1 }, /* Tangent3svEXT */
+   { 29668, -1 }, /* Binormal3bEXT */
+   { 29845, -1 }, /* Binormal3iEXT */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_copy_texture)
 static const struct gl_function_remap GL_EXT_copy_texture_functions[] = {
-   { 13307, _gloffset_CopyTexSubImage3D },
-   { 14789, _gloffset_CopyTexImage2D },
-   { 21775, _gloffset_CopyTexImage1D },
-   { 24278, _gloffset_CopyTexSubImage2D },
-   { 26479, _gloffset_CopyTexSubImage1D },
+   { 13364, _gloffset_CopyTexSubImage3D },
+   { 14846, _gloffset_CopyTexImage2D },
+   { 21860, _gloffset_CopyTexImage1D },
+   { 24331, _gloffset_CopyTexSubImage2D },
+   { 26532, _gloffset_CopyTexSubImage1D },
    {    -1, -1 }
 };
 #endif
@@ -5225,7 +5247,7 @@ static const struct gl_function_remap GL_EXT_draw_buffers2_functions[] = {
 
 #if defined(need_GL_EXT_draw_range_elements)
 static const struct gl_function_remap GL_EXT_draw_range_elements_functions[] = {
-   {  8462, _gloffset_DrawRangeElements },
+   {  8492, _gloffset_DrawRangeElements },
    {    -1, -1 }
 };
 #endif
@@ -5269,37 +5291,37 @@ static const struct gl_function_remap GL_EXT_gpu_program_parameters_functions[]
 static const struct gl_function_remap GL_EXT_histogram_functions[] = {
    {   812, _gloffset_Histogram },
    {  3088, _gloffset_ResetHistogram },
-   {  8834, _gloffset_GetMinmax },
-   { 13641, _gloffset_GetHistogramParameterfv },
-   { 21700, _gloffset_GetMinmaxParameteriv },
-   { 23633, _gloffset_ResetMinmax },
-   { 24494, _gloffset_GetHistogramParameteriv },
-   { 25550, _gloffset_GetHistogram },
-   { 27912, _gloffset_Minmax },
-   { 29374, _gloffset_GetMinmaxParameterfv },
+   {  8864, _gloffset_GetMinmax },
+   { 13698, _gloffset_GetHistogramParameterfv },
+   { 21785, _gloffset_GetMinmaxParameteriv },
+   { 23718, _gloffset_ResetMinmax },
+   { 24547, _gloffset_GetHistogramParameteriv },
+   { 25603, _gloffset_GetHistogram },
+   { 27965, _gloffset_Minmax },
+   { 29466, _gloffset_GetMinmaxParameterfv },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_index_func)
 static const struct gl_function_remap GL_EXT_index_func_functions[] = {
-   { 10179, -1 }, /* IndexFuncEXT */
+   { 10209, -1 }, /* IndexFuncEXT */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_index_material)
 static const struct gl_function_remap GL_EXT_index_material_functions[] = {
-   { 18706, -1 }, /* IndexMaterialEXT */
+   { 18791, -1 }, /* IndexMaterialEXT */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_light_texture)
 static const struct gl_function_remap GL_EXT_light_texture_functions[] = {
-   { 23527, -1 }, /* ApplyTextureEXT */
-   { 23587, -1 }, /* TextureMaterialEXT */
-   { 23612, -1 }, /* TextureLightEXT */
+   { 23612, -1 }, /* ApplyTextureEXT */
+   { 23672, -1 }, /* TextureMaterialEXT */
+   { 23697, -1 }, /* TextureLightEXT */
    {    -1, -1 }
 };
 #endif
@@ -5320,20 +5342,20 @@ static const struct gl_function_remap GL_EXT_multisample_functions[] = {
 
 #if defined(need_GL_EXT_paletted_texture)
 static const struct gl_function_remap GL_EXT_paletted_texture_functions[] = {
-   {  7415, _gloffset_ColorTable },
-   { 13487, _gloffset_GetColorTable },
-   { 20353, _gloffset_GetColorTableParameterfv },
-   { 22346, _gloffset_GetColorTableParameteriv },
+   {  7445, _gloffset_ColorTable },
+   { 13544, _gloffset_GetColorTable },
+   { 20438, _gloffset_GetColorTableParameterfv },
+   { 22431, _gloffset_GetColorTableParameteriv },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_pixel_transform)
 static const struct gl_function_remap GL_EXT_pixel_transform_functions[] = {
-   {  9573, -1 }, /* PixelTransformParameterfvEXT */
-   { 19320, -1 }, /* PixelTransformParameterfEXT */
-   { 19400, -1 }, /* PixelTransformParameteriEXT */
-   { 28698, -1 }, /* PixelTransformParameterivEXT */
+   {  9603, -1 }, /* PixelTransformParameterfvEXT */
+   { 19405, -1 }, /* PixelTransformParameterfEXT */
+   { 19485, -1 }, /* PixelTransformParameteriEXT */
+   { 28790, -1 }, /* PixelTransformParameterivEXT */
    {    -1, -1 }
 };
 #endif
@@ -5375,8 +5397,8 @@ static const struct gl_function_remap GL_EXT_stencil_two_side_functions[] = {
 
 #if defined(need_GL_EXT_subtexture)
 static const struct gl_function_remap GL_EXT_subtexture_functions[] = {
-   {  6136, _gloffset_TexSubImage1D },
-   {  9448, _gloffset_TexSubImage2D },
+   {  6166, _gloffset_TexSubImage1D },
+   {  9478, _gloffset_TexSubImage2D },
    {    -1, -1 }
 };
 #endif
@@ -5384,7 +5406,7 @@ static const struct gl_function_remap GL_EXT_subtexture_functions[] = {
 #if defined(need_GL_EXT_texture3D)
 static const struct gl_function_remap GL_EXT_texture3D_functions[] = {
    {  1658, _gloffset_TexImage3D },
-   { 20122, _gloffset_TexSubImage3D },
+   { 20207, _gloffset_TexSubImage3D },
    {    -1, -1 }
 };
 #endif
@@ -5399,18 +5421,18 @@ static const struct gl_function_remap GL_EXT_texture_array_functions[] = {
 #if defined(need_GL_EXT_texture_object)
 static const struct gl_function_remap GL_EXT_texture_object_functions[] = {
    {  2964, _gloffset_PrioritizeTextures },
-   {  6585, _gloffset_AreTexturesResident },
-   { 12038, _gloffset_GenTextures },
-   { 13973, _gloffset_DeleteTextures },
-   { 17224, _gloffset_IsTexture },
-   { 26544, _gloffset_BindTexture },
+   {  6615, _gloffset_AreTexturesResident },
+   { 12063, _gloffset_GenTextures },
+   { 14030, _gloffset_DeleteTextures },
+   { 17281, _gloffset_IsTexture },
+   { 26597, _gloffset_BindTexture },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_texture_perturb_normal)
 static const struct gl_function_remap GL_EXT_texture_perturb_normal_functions[] = {
-   { 12218, -1 }, /* TextureNormalEXT */
+   { 12275, -1 }, /* TextureNormalEXT */
    {    -1, -1 }
 };
 #endif
@@ -5425,18 +5447,18 @@ static const struct gl_function_remap GL_EXT_timer_query_functions[] = {
 #if defined(need_GL_EXT_vertex_array)
 /* functions defined in MESA_remap_table_functions are excluded */
 static const struct gl_function_remap GL_EXT_vertex_array_functions[] = {
-   { 21527, _gloffset_ArrayElement },
-   { 27500, _gloffset_GetPointerv },
-   { 29001, _gloffset_DrawArrays },
+   { 21612, _gloffset_ArrayElement },
+   { 27553, _gloffset_GetPointerv },
+   { 29093, _gloffset_DrawArrays },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_EXT_vertex_weighting)
 static const struct gl_function_remap GL_EXT_vertex_weighting_functions[] = {
-   { 17254, -1 }, /* VertexWeightfvEXT */
-   { 23998, -1 }, /* VertexWeightfEXT */
-   { 25519, -1 }, /* VertexWeightPointerEXT */
+   { 17311, -1 }, /* VertexWeightfvEXT */
+   { 24051, -1 }, /* VertexWeightfEXT */
+   { 25572, -1 }, /* VertexWeightPointerEXT */
    {    -1, -1 }
 };
 #endif
@@ -5445,10 +5467,10 @@ static const struct gl_function_remap GL_EXT_vertex_weighting_functions[] = {
 static const struct gl_function_remap GL_HP_image_transform_functions[] = {
    {  2157, -1 }, /* GetImageTransformParameterfvHP */
    {  3305, -1 }, /* ImageTransformParameterfHP */
-   {  9026, -1 }, /* ImageTransformParameterfvHP */
-   { 10614, -1 }, /* ImageTransformParameteriHP */
-   { 10915, -1 }, /* GetImageTransformParameterivHP */
-   { 17318, -1 }, /* ImageTransformParameterivHP */
+   {  9056, -1 }, /* ImageTransformParameterfvHP */
+   { 10678, -1 }, /* ImageTransformParameteriHP */
+   { 10940, -1 }, /* GetImageTransformParameterivHP */
+   { 17375, -1 }, /* ImageTransformParameterivHP */
    {    -1, -1 }
 };
 #endif
@@ -5463,13 +5485,13 @@ static const struct gl_function_remap GL_IBM_multimode_draw_arrays_functions[] =
 #if defined(need_GL_IBM_vertex_array_lists)
 static const struct gl_function_remap GL_IBM_vertex_array_lists_functions[] = {
    {  3857, -1 }, /* SecondaryColorPointerListIBM */
-   {  5137, -1 }, /* NormalPointerListIBM */
-   {  6759, -1 }, /* FogCoordPointerListIBM */
-   {  7066, -1 }, /* VertexPointerListIBM */
-   { 10535, -1 }, /* ColorPointerListIBM */
-   { 11869, -1 }, /* TexCoordPointerListIBM */
-   { 12240, -1 }, /* IndexPointerListIBM */
-   { 29317, -1 }, /* EdgeFlagPointerListIBM */
+   {  5167, -1 }, /* NormalPointerListIBM */
+   {  6789, -1 }, /* FogCoordPointerListIBM */
+   {  7096, -1 }, /* VertexPointerListIBM */
+   { 10599, -1 }, /* ColorPointerListIBM */
+   { 11894, -1 }, /* TexCoordPointerListIBM */
+   { 12297, -1 }, /* IndexPointerListIBM */
+   { 29409, -1 }, /* EdgeFlagPointerListIBM */
    {    -1, -1 }
 };
 #endif
@@ -5483,10 +5505,10 @@ static const struct gl_function_remap GL_INGR_blend_func_separate_functions[] =
 
 #if defined(need_GL_INTEL_parallel_arrays)
 static const struct gl_function_remap GL_INTEL_parallel_arrays_functions[] = {
-   { 11256, -1 }, /* VertexPointervINTEL */
-   { 13734, -1 }, /* ColorPointervINTEL */
-   { 26815, -1 }, /* NormalPointervINTEL */
-   { 27241, -1 }, /* TexCoordPointervINTEL */
+   { 11281, -1 }, /* VertexPointervINTEL */
+   { 13791, -1 }, /* ColorPointervINTEL */
+   { 26868, -1 }, /* NormalPointervINTEL */
+   { 27294, -1 }, /* TexCoordPointervINTEL */
    {    -1, -1 }
 };
 #endif
@@ -5503,7 +5525,7 @@ static const struct gl_function_remap GL_MESA_shader_debug_functions[] = {
    {  1522, -1 }, /* GetDebugLogLengthMESA */
    {  3063, -1 }, /* ClearDebugLogMESA */
    {  4018, -1 }, /* GetDebugLogMESA */
-   { 27693, -1 }, /* CreateDebugObjectMESA */
+   { 27746, -1 }, /* CreateDebugObjectMESA */
    {    -1, -1 }
 };
 #endif
@@ -5524,15 +5546,15 @@ static const struct gl_function_remap GL_NV_condtitional_render_functions[] = {
 
 #if defined(need_GL_NV_evaluators)
 static const struct gl_function_remap GL_NV_evaluators_functions[] = {
-   {  5804, -1 }, /* GetMapAttribParameterivNV */
-   {  7521, -1 }, /* MapControlPointsNV */
-   {  7620, -1 }, /* MapParameterfvNV */
-   {  9431, -1 }, /* EvalMapsNV */
-   { 15223, -1 }, /* GetMapAttribParameterfvNV */
-   { 15389, -1 }, /* MapParameterivNV */
-   { 22090, -1 }, /* GetMapParameterivNV */
-   { 22588, -1 }, /* GetMapParameterfvNV */
-   { 26151, -1 }, /* GetMapControlPointsNV */
+   {  5834, -1 }, /* GetMapAttribParameterivNV */
+   {  7551, -1 }, /* MapControlPointsNV */
+   {  7650, -1 }, /* MapParameterfvNV */
+   {  9461, -1 }, /* EvalMapsNV */
+   { 15280, -1 }, /* GetMapAttribParameterfvNV */
+   { 15446, -1 }, /* MapParameterivNV */
+   { 22175, -1 }, /* GetMapParameterivNV */
+   { 22673, -1 }, /* GetMapParameterfvNV */
+   { 26204, -1 }, /* GetMapControlPointsNV */
    {    -1, -1 }
 };
 #endif
@@ -5567,8 +5589,8 @@ static const struct gl_function_remap GL_NV_register_combiners_functions[] = {
 
 #if defined(need_GL_NV_register_combiners2)
 static const struct gl_function_remap GL_NV_register_combiners2_functions[] = {
-   { 14126, -1 }, /* CombinerStageParameterfvNV */
-   { 14441, -1 }, /* GetCombinerStageParameterfvNV */
+   { 14183, -1 }, /* CombinerStageParameterfvNV */
+   { 14498, -1 }, /* GetCombinerStageParameterfvNV */
    {    -1, -1 }
 };
 #endif
@@ -5596,23 +5618,23 @@ static const struct gl_function_remap GL_OES_EGL_image_functions[] = {
 
 #if defined(need_GL_PGI_misc_hints)
 static const struct gl_function_remap GL_PGI_misc_hints_functions[] = {
-   {  7705, -1 }, /* HintPGI */
+   {  7735, -1 }, /* HintPGI */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIS_detail_texture)
 static const struct gl_function_remap GL_SGIS_detail_texture_functions[] = {
-   { 14414, -1 }, /* GetDetailTexFuncSGIS */
-   { 14734, -1 }, /* DetailTexFuncSGIS */
+   { 14471, -1 }, /* GetDetailTexFuncSGIS */
+   { 14791, -1 }, /* DetailTexFuncSGIS */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIS_fog_function)
 static const struct gl_function_remap GL_SGIS_fog_function_functions[] = {
-   { 24260, -1 }, /* FogFuncSGIS */
-   { 24925, -1 }, /* GetFogFuncSGIS */
+   { 24313, -1 }, /* FogFuncSGIS */
+   { 24978, -1 }, /* GetFogFuncSGIS */
    {    -1, -1 }
 };
 #endif
@@ -5640,8 +5662,8 @@ static const struct gl_function_remap GL_SGIS_point_parameters_functions[] = {
 
 #if defined(need_GL_SGIS_sharpen_texture)
 static const struct gl_function_remap GL_SGIS_sharpen_texture_functions[] = {
-   {  5865, -1 }, /* GetSharpenTexFuncSGIS */
-   { 19615, -1 }, /* SharpenTexFuncSGIS */
+   {  5895, -1 }, /* GetSharpenTexFuncSGIS */
+   { 19700, -1 }, /* SharpenTexFuncSGIS */
    {    -1, -1 }
 };
 #endif
@@ -5649,22 +5671,22 @@ static const struct gl_function_remap GL_SGIS_sharpen_texture_functions[] = {
 #if defined(need_GL_SGIS_texture4D)
 static const struct gl_function_remap GL_SGIS_texture4D_functions[] = {
    {   894, -1 }, /* TexImage4DSGIS */
-   { 14042, -1 }, /* TexSubImage4DSGIS */
+   { 14099, -1 }, /* TexSubImage4DSGIS */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIS_texture_color_mask)
 static const struct gl_function_remap GL_SGIS_texture_color_mask_functions[] = {
-   { 13440, -1 }, /* TextureColorMaskSGIS */
+   { 13497, -1 }, /* TextureColorMaskSGIS */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIS_texture_filter4)
 static const struct gl_function_remap GL_SGIS_texture_filter4_functions[] = {
-   {  6042, -1 }, /* GetTexFilterFuncSGIS */
-   { 14560, -1 }, /* TexFilterFuncSGIS */
+   {  6072, -1 }, /* GetTexFilterFuncSGIS */
+   { 14617, -1 }, /* TexFilterFuncSGIS */
    {    -1, -1 }
 };
 #endif
@@ -5674,16 +5696,16 @@ static const struct gl_function_remap GL_SGIX_async_functions[] = {
    {  3014, -1 }, /* AsyncMarkerSGIX */
    {  3997, -1 }, /* FinishAsyncSGIX */
    {  4734, -1 }, /* PollAsyncSGIX */
-   { 19762, -1 }, /* DeleteAsyncMarkersSGIX */
-   { 19791, -1 }, /* IsAsyncMarkerSGIX */
-   { 29114, -1 }, /* GenAsyncMarkersSGIX */
+   { 19847, -1 }, /* DeleteAsyncMarkersSGIX */
+   { 19876, -1 }, /* IsAsyncMarkerSGIX */
+   { 29206, -1 }, /* GenAsyncMarkersSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_flush_raster)
 static const struct gl_function_remap GL_SGIX_flush_raster_functions[] = {
-   {  6413, -1 }, /* FlushRasterSGIX */
+   {  6443, -1 }, /* FlushRasterSGIX */
    {    -1, -1 }
 };
 #endif
@@ -5693,35 +5715,35 @@ static const struct gl_function_remap GL_SGIX_fragment_lighting_functions[] = {
    {  2410, -1 }, /* FragmentMaterialfvSGIX */
    {  2906, -1 }, /* FragmentLightModelivSGIX */
    {  4685, -1 }, /* FragmentLightiSGIX */
-   {  5545, -1 }, /* GetFragmentMaterialfvSGIX */
-   {  7133, -1 }, /* FragmentMaterialfSGIX */
-   {  7294, -1 }, /* GetFragmentLightivSGIX */
-   {  8131, -1 }, /* FragmentLightModeliSGIX */
-   {  9494, -1 }, /* FragmentLightivSGIX */
-   {  9760, -1 }, /* GetFragmentMaterialivSGIX */
-   { 17141, -1 }, /* FragmentLightModelfSGIX */
-   { 17441, -1 }, /* FragmentColorMaterialSGIX */
-   { 17813, -1 }, /* FragmentMaterialiSGIX */
-   { 19034, -1 }, /* LightEnviSGIX */
-   { 20445, -1 }, /* FragmentLightModelfvSGIX */
-   { 20754, -1 }, /* FragmentLightfvSGIX */
-   { 25401, -1 }, /* FragmentLightfSGIX */
-   { 28030, -1 }, /* GetFragmentLightfvSGIX */
-   { 29597, -1 }, /* FragmentMaterialivSGIX */
+   {  5575, -1 }, /* GetFragmentMaterialfvSGIX */
+   {  7163, -1 }, /* FragmentMaterialfSGIX */
+   {  7324, -1 }, /* GetFragmentLightivSGIX */
+   {  8161, -1 }, /* FragmentLightModeliSGIX */
+   {  9524, -1 }, /* FragmentLightivSGIX */
+   {  9790, -1 }, /* GetFragmentMaterialivSGIX */
+   { 17198, -1 }, /* FragmentLightModelfSGIX */
+   { 17498, -1 }, /* FragmentColorMaterialSGIX */
+   { 17898, -1 }, /* FragmentMaterialiSGIX */
+   { 19119, -1 }, /* LightEnviSGIX */
+   { 20530, -1 }, /* FragmentLightModelfvSGIX */
+   { 20839, -1 }, /* FragmentLightfvSGIX */
+   { 25454, -1 }, /* FragmentLightfSGIX */
+   { 28122, -1 }, /* GetFragmentLightfvSGIX */
+   { 29689, -1 }, /* FragmentMaterialivSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_framezoom)
 static const struct gl_function_remap GL_SGIX_framezoom_functions[] = {
-   { 19814, -1 }, /* FrameZoomSGIX */
+   { 19899, -1 }, /* FrameZoomSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_igloo_interface)
 static const struct gl_function_remap GL_SGIX_igloo_interface_functions[] = {
-   { 25709, -1 }, /* IglooInterfaceSGIX */
+   { 25762, -1 }, /* IglooInterfaceSGIX */
    {    -1, -1 }
 };
 #endif
@@ -5729,11 +5751,11 @@ static const struct gl_function_remap GL_SGIX_igloo_interface_functions[] = {
 #if defined(need_GL_SGIX_instruments)
 static const struct gl_function_remap GL_SGIX_instruments_functions[] = {
    {  2573, -1 }, /* ReadInstrumentsSGIX */
-   {  5621, -1 }, /* PollInstrumentsSGIX */
-   {  9392, -1 }, /* GetInstrumentsSGIX */
-   { 11467, -1 }, /* StartInstrumentsSGIX */
-   { 14160, -1 }, /* StopInstrumentsSGIX */
-   { 15766, -1 }, /* InstrumentsBufferSGIX */
+   {  5651, -1 }, /* PollInstrumentsSGIX */
+   {  9422, -1 }, /* GetInstrumentsSGIX */
+   { 11492, -1 }, /* StartInstrumentsSGIX */
+   { 14217, -1 }, /* StopInstrumentsSGIX */
+   { 15823, -1 }, /* InstrumentsBufferSGIX */
    {    -1, -1 }
 };
 #endif
@@ -5742,10 +5764,10 @@ static const struct gl_function_remap GL_SGIX_instruments_functions[] = {
 static const struct gl_function_remap GL_SGIX_list_priority_functions[] = {
    {  1125, -1 }, /* ListParameterfSGIX */
    {  2763, -1 }, /* GetListParameterfvSGIX */
-   { 15681, -1 }, /* ListParameteriSGIX */
-   { 16435, -1 }, /* ListParameterfvSGIX */
-   { 18440, -1 }, /* ListParameterivSGIX */
-   { 29158, -1 }, /* GetListParameterivSGIX */
+   { 15738, -1 }, /* ListParameteriSGIX */
+   { 16492, -1 }, /* ListParameterfvSGIX */
+   { 18525, -1 }, /* ListParameterivSGIX */
+   { 29250, -1 }, /* GetListParameterivSGIX */
    {    -1, -1 }
 };
 #endif
@@ -5760,53 +5782,53 @@ static const struct gl_function_remap GL_SGIX_pixel_texture_functions[] = {
 #if defined(need_GL_SGIX_polynomial_ffd)
 static const struct gl_function_remap GL_SGIX_polynomial_ffd_functions[] = {
    {  3251, -1 }, /* LoadIdentityDeformationMapSGIX */
-   { 10835, -1 }, /* DeformationMap3dSGIX */
-   { 14260, -1 }, /* DeformSGIX */
-   { 21639, -1 }, /* DeformationMap3fSGIX */
+   { 14317, -1 }, /* DeformSGIX */
+   { 21724, -1 }, /* DeformationMap3fSGIX */
+   { 28010, -1 }, /* DeformationMap3dSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_reference_plane)
 static const struct gl_function_remap GL_SGIX_reference_plane_functions[] = {
-   { 12991, -1 }, /* ReferencePlaneSGIX */
+   { 13048, -1 }, /* ReferencePlaneSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_sprite)
 static const struct gl_function_remap GL_SGIX_sprite_functions[] = {
-   {  8547, -1 }, /* SpriteParameterfvSGIX */
-   { 18268, -1 }, /* SpriteParameteriSGIX */
-   { 23667, -1 }, /* SpriteParameterfSGIX */
-   { 26273, -1 }, /* SpriteParameterivSGIX */
+   {  8577, -1 }, /* SpriteParameterfvSGIX */
+   { 18353, -1 }, /* SpriteParameteriSGIX */
+   { 23752, -1 }, /* SpriteParameterfSGIX */
+   { 26326, -1 }, /* SpriteParameterivSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGIX_tag_sample_buffer)
 static const struct gl_function_remap GL_SGIX_tag_sample_buffer_functions[] = {
-   { 18327, -1 }, /* TagSampleBufferSGIX */
+   { 18412, -1 }, /* TagSampleBufferSGIX */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SGI_color_table)
 static const struct gl_function_remap GL_SGI_color_table_functions[] = {
-   {  6703, _gloffset_ColorTableParameteriv },
-   {  7415, _gloffset_ColorTable },
-   { 13487, _gloffset_GetColorTable },
-   { 13597, _gloffset_CopyColorTable },
-   { 17085, _gloffset_ColorTableParameterfv },
-   { 20353, _gloffset_GetColorTableParameterfv },
-   { 22346, _gloffset_GetColorTableParameteriv },
+   {  6733, _gloffset_ColorTableParameteriv },
+   {  7445, _gloffset_ColorTable },
+   { 13544, _gloffset_GetColorTable },
+   { 13654, _gloffset_CopyColorTable },
+   { 17142, _gloffset_ColorTableParameterfv },
+   { 20438, _gloffset_GetColorTableParameterfv },
+   { 22431, _gloffset_GetColorTableParameteriv },
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SUNX_constant_data)
 static const struct gl_function_remap GL_SUNX_constant_data_functions[] = {
-   { 28008, -1 }, /* FinishTextureSUNX */
+   { 28100, -1 }, /* FinishTextureSUNX */
    {    -1, -1 }
 };
 #endif
@@ -5815,19 +5837,19 @@ static const struct gl_function_remap GL_SUNX_constant_data_functions[] = {
 static const struct gl_function_remap GL_SUN_global_alpha_functions[] = {
    {  3035, -1 }, /* GlobalAlphaFactorubSUN */
    {  4224, -1 }, /* GlobalAlphaFactoriSUN */
-   {  5646, -1 }, /* GlobalAlphaFactordSUN */
-   {  8631, -1 }, /* GlobalAlphaFactoruiSUN */
-   {  8983, -1 }, /* GlobalAlphaFactorbSUN */
-   { 11782, -1 }, /* GlobalAlphaFactorfSUN */
-   { 11901, -1 }, /* GlobalAlphaFactorusSUN */
-   { 20053, -1 }, /* GlobalAlphaFactorsSUN */
+   {  5676, -1 }, /* GlobalAlphaFactordSUN */
+   {  8661, -1 }, /* GlobalAlphaFactoruiSUN */
+   {  9013, -1 }, /* GlobalAlphaFactorbSUN */
+   { 11807, -1 }, /* GlobalAlphaFactorfSUN */
+   { 11926, -1 }, /* GlobalAlphaFactorusSUN */
+   { 20138, -1 }, /* GlobalAlphaFactorsSUN */
    {    -1, -1 }
 };
 #endif
 
 #if defined(need_GL_SUN_mesh_array)
 static const struct gl_function_remap GL_SUN_mesh_array_functions[] = {
-   { 26085, -1 }, /* DrawMeshArraysSUN */
+   { 26138, -1 }, /* DrawMeshArraysSUN */
    {    -1, -1 }
 };
 #endif
@@ -5835,12 +5857,12 @@ static const struct gl_function_remap GL_SUN_mesh_array_functions[] = {
 #if defined(need_GL_SUN_triangle_list)
 static const struct gl_function_remap GL_SUN_triangle_list_functions[] = {
    {  3971, -1 }, /* ReplacementCodeubSUN */
-   {  5485, -1 }, /* ReplacementCodeubvSUN */
-   { 16806, -1 }, /* ReplacementCodeusvSUN */
-   { 16994, -1 }, /* ReplacementCodePointerSUN */
-   { 18351, -1 }, /* ReplacementCodeusSUN */
-   { 19098, -1 }, /* ReplacementCodeuiSUN */
-   { 26730, -1 }, /* ReplacementCodeuivSUN */
+   {  5515, -1 }, /* ReplacementCodeubvSUN */
+   { 16863, -1 }, /* ReplacementCodeusvSUN */
+   { 17051, -1 }, /* ReplacementCodePointerSUN */
+   { 18436, -1 }, /* ReplacementCodeusSUN */
+   { 19183, -1 }, /* ReplacementCodeuiSUN */
+   { 26783, -1 }, /* ReplacementCodeuivSUN */
    {    -1, -1 }
 };
 #endif
@@ -5858,35 +5880,35 @@ static const struct gl_function_remap GL_SUN_vertex_functions[] = {
    {  4181, -1 }, /* TexCoord2fVertex3fSUN */
    {  4480, -1 }, /* TexCoord2fColor4fNormal3fVertex3fSUN */
    {  4810, -1 }, /* TexCoord2fNormal3fVertex3fvSUN */
-   {  5380, -1 }, /* ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN */
-   {  6450, -1 }, /* ReplacementCodeuiTexCoord2fVertex3fSUN */
-   {  7162, -1 }, /* TexCoord2fNormal3fVertex3fSUN */
-   {  7930, -1 }, /* Color3fVertex3fSUN */
-   {  8942, -1 }, /* Color3fVertex3fvSUN */
-   {  9357, -1 }, /* Color4fNormal3fVertex3fvSUN */
-   { 10058, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN */
-   { 11330, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fvSUN */
-   { 12722, -1 }, /* ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN */
-   { 13133, -1 }, /* TexCoord2fColor3fVertex3fSUN */
-   { 14185, -1 }, /* TexCoord4fColor4fNormal3fVertex4fSUN */
-   { 14519, -1 }, /* Color4ubVertex2fvSUN */
-   { 14759, -1 }, /* Normal3fVertex3fSUN */
-   { 15707, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fSUN */
-   { 15968, -1 }, /* TexCoord2fColor4fNormal3fVertex3fvSUN */
-   { 16635, -1 }, /* TexCoord2fVertex3fvSUN */
-   { 17411, -1 }, /* Color4ubVertex2fSUN */
-   { 17604, -1 }, /* ReplacementCodeuiColor4ubVertex3fSUN */
-   { 19486, -1 }, /* TexCoord2fColor4ubVertex3fSUN */
-   { 19833, -1 }, /* Normal3fVertex3fvSUN */
-   { 20262, -1 }, /* Color4fNormal3fVertex3fSUN */
-   { 21171, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN */
-   { 21391, -1 }, /* ReplacementCodeuiColor4ubVertex3fvSUN */
-   { 23121, -1 }, /* ReplacementCodeuiColor3fVertex3fSUN */
-   { 24376, -1 }, /* TexCoord4fVertex4fSUN */
-   { 24802, -1 }, /* TexCoord2fColor3fVertex3fvSUN */
-   { 25128, -1 }, /* ReplacementCodeuiNormal3fVertex3fvSUN */
-   { 25255, -1 }, /* TexCoord4fVertex4fvSUN */
-   { 25957, -1 }, /* ReplacementCodeuiVertex3fSUN */
+   {  5410, -1 }, /* ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN */
+   {  6480, -1 }, /* ReplacementCodeuiTexCoord2fVertex3fSUN */
+   {  7192, -1 }, /* TexCoord2fNormal3fVertex3fSUN */
+   {  7960, -1 }, /* Color3fVertex3fSUN */
+   {  8972, -1 }, /* Color3fVertex3fvSUN */
+   {  9387, -1 }, /* Color4fNormal3fVertex3fvSUN */
+   { 10088, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN */
+   { 11355, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fvSUN */
+   { 12779, -1 }, /* ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN */
+   { 13190, -1 }, /* TexCoord2fColor3fVertex3fSUN */
+   { 14242, -1 }, /* TexCoord4fColor4fNormal3fVertex4fSUN */
+   { 14576, -1 }, /* Color4ubVertex2fvSUN */
+   { 14816, -1 }, /* Normal3fVertex3fSUN */
+   { 15764, -1 }, /* ReplacementCodeuiColor4fNormal3fVertex3fSUN */
+   { 16025, -1 }, /* TexCoord2fColor4fNormal3fVertex3fvSUN */
+   { 16692, -1 }, /* TexCoord2fVertex3fvSUN */
+   { 17468, -1 }, /* Color4ubVertex2fSUN */
+   { 17689, -1 }, /* ReplacementCodeuiColor4ubVertex3fSUN */
+   { 19571, -1 }, /* TexCoord2fColor4ubVertex3fSUN */
+   { 19918, -1 }, /* Normal3fVertex3fvSUN */
+   { 20347, -1 }, /* Color4fNormal3fVertex3fSUN */
+   { 21256, -1 }, /* ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN */
+   { 21476, -1 }, /* ReplacementCodeuiColor4ubVertex3fvSUN */
+   { 23206, -1 }, /* ReplacementCodeuiColor3fVertex3fSUN */
+   { 24429, -1 }, /* TexCoord4fVertex4fSUN */
+   { 24855, -1 }, /* TexCoord2fColor3fVertex3fvSUN */
+   { 25181, -1 }, /* ReplacementCodeuiNormal3fVertex3fvSUN */
+   { 25308, -1 }, /* TexCoord4fVertex4fvSUN */
+   { 26010, -1 }, /* ReplacementCodeuiVertex3fSUN */
    {    -1, -1 }
 };
 #endif
@@ -5897,37 +5919,37 @@ static const struct gl_function_remap GL_VERSION_1_3_functions[] = {
    {   381, _gloffset_MultiTexCoord3sARB },
    {   613, _gloffset_ActiveTextureARB },
    {  3761, _gloffset_MultiTexCoord1fvARB },
-   {  5271, _gloffset_MultiTexCoord3dARB },
-   {  5316, _gloffset_MultiTexCoord2iARB },
-   {  5440, _gloffset_MultiTexCoord2svARB },
-   {  7371, _gloffset_MultiTexCoord2fARB },
-   {  9193, _gloffset_MultiTexCoord3fvARB },
-   {  9714, _gloffset_MultiTexCoord4sARB },
-   { 10314, _gloffset_MultiTexCoord2dvARB },
-   { 10696, _gloffset_MultiTexCoord1svARB },
-   { 11025, _gloffset_MultiTexCoord3svARB },
-   { 11086, _gloffset_MultiTexCoord4iARB },
-   { 11809, _gloffset_MultiTexCoord3iARB },
-   { 12511, _gloffset_MultiTexCoord1dARB },
-   { 12677, _gloffset_MultiTexCoord3dvARB },
-   { 13841, _gloffset_MultiTexCoord3ivARB },
-   { 13886, _gloffset_MultiTexCoord2sARB },
-   { 15106, _gloffset_MultiTexCoord4ivARB },
-   { 16735, _gloffset_ClientActiveTextureARB },
-   { 18951, _gloffset_MultiTexCoord2dARB },
-   { 19355, _gloffset_MultiTexCoord4dvARB },
-   { 19641, _gloffset_MultiTexCoord4fvARB },
-   { 20494, _gloffset_MultiTexCoord3fARB },
-   { 22874, _gloffset_MultiTexCoord4dARB },
-   { 23078, _gloffset_MultiTexCoord1sARB },
-   { 23280, _gloffset_MultiTexCoord1dvARB },
-   { 24122, _gloffset_MultiTexCoord1ivARB },
-   { 24215, _gloffset_MultiTexCoord2ivARB },
-   { 24554, _gloffset_MultiTexCoord1iARB },
-   { 25825, _gloffset_MultiTexCoord4svARB },
-   { 26343, _gloffset_MultiTexCoord1fARB },
-   { 26606, _gloffset_MultiTexCoord4fARB },
-   { 28835, _gloffset_MultiTexCoord2fvARB },
+   {  5301, _gloffset_MultiTexCoord3dARB },
+   {  5346, _gloffset_MultiTexCoord2iARB },
+   {  5470, _gloffset_MultiTexCoord2svARB },
+   {  7401, _gloffset_MultiTexCoord2fARB },
+   {  9223, _gloffset_MultiTexCoord3fvARB },
+   {  9744, _gloffset_MultiTexCoord4sARB },
+   { 10378, _gloffset_MultiTexCoord2dvARB },
+   { 10760, _gloffset_MultiTexCoord1svARB },
+   { 11050, _gloffset_MultiTexCoord3svARB },
+   { 11111, _gloffset_MultiTexCoord4iARB },
+   { 11834, _gloffset_MultiTexCoord3iARB },
+   { 12568, _gloffset_MultiTexCoord1dARB },
+   { 12734, _gloffset_MultiTexCoord3dvARB },
+   { 13898, _gloffset_MultiTexCoord3ivARB },
+   { 13943, _gloffset_MultiTexCoord2sARB },
+   { 15163, _gloffset_MultiTexCoord4ivARB },
+   { 16792, _gloffset_ClientActiveTextureARB },
+   { 19036, _gloffset_MultiTexCoord2dARB },
+   { 19440, _gloffset_MultiTexCoord4dvARB },
+   { 19726, _gloffset_MultiTexCoord4fvARB },
+   { 20579, _gloffset_MultiTexCoord3fARB },
+   { 22959, _gloffset_MultiTexCoord4dARB },
+   { 23163, _gloffset_MultiTexCoord1sARB },
+   { 23365, _gloffset_MultiTexCoord1dvARB },
+   { 24175, _gloffset_MultiTexCoord1ivARB },
+   { 24268, _gloffset_MultiTexCoord2ivARB },
+   { 24607, _gloffset_MultiTexCoord1iARB },
+   { 25878, _gloffset_MultiTexCoord4svARB },
+   { 26396, _gloffset_MultiTexCoord1fARB },
+   { 26659, _gloffset_MultiTexCoord4fARB },
+   { 28927, _gloffset_MultiTexCoord2fvARB },
    {    -1, -1 }
 };
 #endif
diff --git a/src/mesa/sparc/glapi_sparc.S b/src/mesa/sparc/glapi_sparc.S
index 3fbdb4abb3..478adc6520 100644
--- a/src/mesa/sparc/glapi_sparc.S
+++ b/src/mesa/sparc/glapi_sparc.S
@@ -1027,16 +1027,19 @@ gl_dispatch_functions_start:
 	HIDDEN(gl_dispatch_stub_796)
 	GL_STUB(gl_dispatch_stub_797, _gloffset_TextureRangeAPPLE)
 	HIDDEN(gl_dispatch_stub_797)
-	GL_STUB(gl_dispatch_stub_798, _gloffset_StencilFuncSeparateATI)
-	HIDDEN(gl_dispatch_stub_798)
-	GL_STUB(gl_dispatch_stub_799, _gloffset_ProgramEnvParameters4fvEXT)
-	HIDDEN(gl_dispatch_stub_799)
-	GL_STUB(gl_dispatch_stub_800, _gloffset_ProgramLocalParameters4fvEXT)
-	HIDDEN(gl_dispatch_stub_800)
-	GL_STUB(gl_dispatch_stub_801, _gloffset_GetQueryObjecti64vEXT)
+	GL_STUB(glGetObjectParameterivAPPLE, _gloffset_GetObjectParameterivAPPLE)
+	GL_STUB(glObjectPurgeableAPPLE, _gloffset_ObjectPurgeableAPPLE)
+	GL_STUB(glObjectUnpurgeableAPPLE, _gloffset_ObjectUnpurgeableAPPLE)
+	GL_STUB(gl_dispatch_stub_801, _gloffset_StencilFuncSeparateATI)
 	HIDDEN(gl_dispatch_stub_801)
-	GL_STUB(gl_dispatch_stub_802, _gloffset_GetQueryObjectui64vEXT)
+	GL_STUB(gl_dispatch_stub_802, _gloffset_ProgramEnvParameters4fvEXT)
 	HIDDEN(gl_dispatch_stub_802)
+	GL_STUB(gl_dispatch_stub_803, _gloffset_ProgramLocalParameters4fvEXT)
+	HIDDEN(gl_dispatch_stub_803)
+	GL_STUB(gl_dispatch_stub_804, _gloffset_GetQueryObjecti64vEXT)
+	HIDDEN(gl_dispatch_stub_804)
+	GL_STUB(gl_dispatch_stub_805, _gloffset_GetQueryObjectui64vEXT)
+	HIDDEN(gl_dispatch_stub_805)
 	GL_STUB(glEGLImageTargetRenderbufferStorageOES, _gloffset_EGLImageTargetRenderbufferStorageOES)
 	GL_STUB(glEGLImageTargetTexture2DOES, _gloffset_EGLImageTargetTexture2DOES)
 	GL_STUB_ALIAS(glArrayElementEXT, glArrayElement)
diff --git a/src/mesa/x86-64/glapi_x86-64.S b/src/mesa/x86-64/glapi_x86-64.S
index 03a2c999ff..a76cbb07d5 100644
--- a/src/mesa/x86-64/glapi_x86-64.S
+++ b/src/mesa/x86-64/glapi_x86-64.S
@@ -30201,10 +30201,9 @@ GL_PREFIX(_dispatch_stub_797):
 	.size	GL_PREFIX(_dispatch_stub_797), .-GL_PREFIX(_dispatch_stub_797)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_798)
-	.type	GL_PREFIX(_dispatch_stub_798), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_798))
-GL_PREFIX(_dispatch_stub_798):
+	.globl	GL_PREFIX(GetObjectParameterivAPPLE)
+	.type	GL_PREFIX(GetObjectParameterivAPPLE), @function
+GL_PREFIX(GetObjectParameterivAPPLE):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
 	movq	6384(%rax), %r11
@@ -30244,13 +30243,12 @@ GL_PREFIX(_dispatch_stub_798):
 	movq	6384(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_798), .-GL_PREFIX(_dispatch_stub_798)
+	.size	GL_PREFIX(GetObjectParameterivAPPLE), .-GL_PREFIX(GetObjectParameterivAPPLE)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_799)
-	.type	GL_PREFIX(_dispatch_stub_799), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_799))
-GL_PREFIX(_dispatch_stub_799):
+	.globl	GL_PREFIX(ObjectPurgeableAPPLE)
+	.type	GL_PREFIX(ObjectPurgeableAPPLE), @function
+GL_PREFIX(ObjectPurgeableAPPLE):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
 	movq	6392(%rax), %r11
@@ -30259,11 +30257,7 @@ GL_PREFIX(_dispatch_stub_799):
 	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
@@ -30279,24 +30273,19 @@ GL_PREFIX(_dispatch_stub_799):
 	pushq	%rdi
 	pushq	%rsi
 	pushq	%rdx
-	pushq	%rcx
-	pushq	%rbp
 	call	_glapi_get_dispatch
-	popq	%rbp
-	popq	%rcx
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
 	movq	6392(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_799), .-GL_PREFIX(_dispatch_stub_799)
+	.size	GL_PREFIX(ObjectPurgeableAPPLE), .-GL_PREFIX(ObjectPurgeableAPPLE)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_800)
-	.type	GL_PREFIX(_dispatch_stub_800), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_800))
-GL_PREFIX(_dispatch_stub_800):
+	.globl	GL_PREFIX(ObjectUnpurgeableAPPLE)
+	.type	GL_PREFIX(ObjectUnpurgeableAPPLE), @function
+GL_PREFIX(ObjectUnpurgeableAPPLE):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
 	movq	6400(%rax), %r11
@@ -30305,11 +30294,7 @@ GL_PREFIX(_dispatch_stub_800):
 	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
@@ -30325,18 +30310,14 @@ GL_PREFIX(_dispatch_stub_800):
 	pushq	%rdi
 	pushq	%rsi
 	pushq	%rdx
-	pushq	%rcx
-	pushq	%rbp
 	call	_glapi_get_dispatch
-	popq	%rbp
-	popq	%rcx
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
 	movq	6400(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_800), .-GL_PREFIX(_dispatch_stub_800)
+	.size	GL_PREFIX(ObjectUnpurgeableAPPLE), .-GL_PREFIX(ObjectUnpurgeableAPPLE)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(_dispatch_stub_801)
@@ -30351,7 +30332,11 @@ GL_PREFIX(_dispatch_stub_801):
 	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
@@ -30367,7 +30352,11 @@ GL_PREFIX(_dispatch_stub_801):
 	pushq	%rdi
 	pushq	%rsi
 	pushq	%rdx
+	pushq	%rcx
+	pushq	%rbp
 	call	_glapi_get_dispatch
+	popq	%rbp
+	popq	%rcx
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
@@ -30389,7 +30378,11 @@ GL_PREFIX(_dispatch_stub_802):
 	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
@@ -30405,7 +30398,11 @@ GL_PREFIX(_dispatch_stub_802):
 	pushq	%rdi
 	pushq	%rsi
 	pushq	%rdx
+	pushq	%rcx
+	pushq	%rbp
 	call	_glapi_get_dispatch
+	popq	%rbp
+	popq	%rcx
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
@@ -30415,9 +30412,10 @@ GL_PREFIX(_dispatch_stub_802):
 	.size	GL_PREFIX(_dispatch_stub_802), .-GL_PREFIX(_dispatch_stub_802)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(EGLImageTargetRenderbufferStorageOES)
-	.type	GL_PREFIX(EGLImageTargetRenderbufferStorageOES), @function
-GL_PREFIX(EGLImageTargetRenderbufferStorageOES):
+	.globl	GL_PREFIX(_dispatch_stub_803)
+	.type	GL_PREFIX(_dispatch_stub_803), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_803))
+GL_PREFIX(_dispatch_stub_803):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
 	movq	6424(%rax), %r11
@@ -30425,9 +30423,13 @@ GL_PREFIX(EGLImageTargetRenderbufferStorageOES):
 #elif defined(PTHREADS)
 	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
 	movq	6424(%rax), %r11
@@ -30441,13 +30443,130 @@ GL_PREFIX(EGLImageTargetRenderbufferStorageOES):
 1:
 	pushq	%rdi
 	pushq	%rsi
+	pushq	%rdx
+	pushq	%rcx
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
+	popq	%rcx
+	popq	%rdx
 	popq	%rsi
 	popq	%rdi
 	movq	6424(%rax), %r11
 	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(_dispatch_stub_803), .-GL_PREFIX(_dispatch_stub_803)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(_dispatch_stub_804)
+	.type	GL_PREFIX(_dispatch_stub_804), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_804))
+GL_PREFIX(_dispatch_stub_804):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	6432(%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	6432(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	6432(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	call	_glapi_get_dispatch
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	6432(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(_dispatch_stub_804), .-GL_PREFIX(_dispatch_stub_804)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(_dispatch_stub_805)
+	.type	GL_PREFIX(_dispatch_stub_805), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_805))
+GL_PREFIX(_dispatch_stub_805):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	6440(%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	6440(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	6440(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	call	_glapi_get_dispatch
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	6440(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(_dispatch_stub_805), .-GL_PREFIX(_dispatch_stub_805)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(EGLImageTargetRenderbufferStorageOES)
+	.type	GL_PREFIX(EGLImageTargetRenderbufferStorageOES), @function
+GL_PREFIX(EGLImageTargetRenderbufferStorageOES):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	6448(%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	6448(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	6448(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
+	call	_glapi_get_dispatch
+	popq	%rbp
+	popq	%rsi
+	popq	%rdi
+	movq	6448(%rax), %r11
+	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(EGLImageTargetRenderbufferStorageOES), .-GL_PREFIX(EGLImageTargetRenderbufferStorageOES)
 
@@ -30457,7 +30576,7 @@ GL_PREFIX(EGLImageTargetRenderbufferStorageOES):
 GL_PREFIX(EGLImageTargetTexture2DOES):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6432(%rax), %r11
+	movq	6456(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30467,13 +30586,13 @@ GL_PREFIX(EGLImageTargetTexture2DOES):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6432(%rax), %r11
+	movq	6456(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6432(%rax), %r11
+	movq	6456(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30483,7 +30602,7 @@ GL_PREFIX(EGLImageTargetTexture2DOES):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6432(%rax), %r11
+	movq	6456(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(EGLImageTargetTexture2DOES), .-GL_PREFIX(EGLImageTargetTexture2DOES)
diff --git a/src/mesa/x86/glapi_x86.S b/src/mesa/x86/glapi_x86.S
index ae5dd2b0d1..a7dd8d7218 100644
--- a/src/mesa/x86/glapi_x86.S
+++ b/src/mesa/x86/glapi_x86.S
@@ -981,16 +981,19 @@ GLNAME(gl_dispatch_functions_start):
 	HIDDEN(GL_PREFIX(_dispatch_stub_796, _dispatch_stub_796@12))
 	GL_STUB(_dispatch_stub_797, _gloffset_TextureRangeAPPLE, _dispatch_stub_797@12)
 	HIDDEN(GL_PREFIX(_dispatch_stub_797, _dispatch_stub_797@12))
-	GL_STUB(_dispatch_stub_798, _gloffset_StencilFuncSeparateATI, _dispatch_stub_798@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_798, _dispatch_stub_798@16))
-	GL_STUB(_dispatch_stub_799, _gloffset_ProgramEnvParameters4fvEXT, _dispatch_stub_799@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_799, _dispatch_stub_799@16))
-	GL_STUB(_dispatch_stub_800, _gloffset_ProgramLocalParameters4fvEXT, _dispatch_stub_800@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_800, _dispatch_stub_800@16))
-	GL_STUB(_dispatch_stub_801, _gloffset_GetQueryObjecti64vEXT, _dispatch_stub_801@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_801, _dispatch_stub_801@12))
-	GL_STUB(_dispatch_stub_802, _gloffset_GetQueryObjectui64vEXT, _dispatch_stub_802@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_802, _dispatch_stub_802@12))
+	GL_STUB(GetObjectParameterivAPPLE, _gloffset_GetObjectParameterivAPPLE, GetObjectParameterivAPPLE@16)
+	GL_STUB(ObjectPurgeableAPPLE, _gloffset_ObjectPurgeableAPPLE, ObjectPurgeableAPPLE@12)
+	GL_STUB(ObjectUnpurgeableAPPLE, _gloffset_ObjectUnpurgeableAPPLE, ObjectUnpurgeableAPPLE@12)
+	GL_STUB(_dispatch_stub_801, _gloffset_StencilFuncSeparateATI, _dispatch_stub_801@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_801, _dispatch_stub_801@16))
+	GL_STUB(_dispatch_stub_802, _gloffset_ProgramEnvParameters4fvEXT, _dispatch_stub_802@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_802, _dispatch_stub_802@16))
+	GL_STUB(_dispatch_stub_803, _gloffset_ProgramLocalParameters4fvEXT, _dispatch_stub_803@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_803, _dispatch_stub_803@16))
+	GL_STUB(_dispatch_stub_804, _gloffset_GetQueryObjecti64vEXT, _dispatch_stub_804@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_804, _dispatch_stub_804@12))
+	GL_STUB(_dispatch_stub_805, _gloffset_GetQueryObjectui64vEXT, _dispatch_stub_805@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_805, _dispatch_stub_805@12))
 	GL_STUB(EGLImageTargetRenderbufferStorageOES, _gloffset_EGLImageTargetRenderbufferStorageOES, EGLImageTargetRenderbufferStorageOES@8)
 	GL_STUB(EGLImageTargetTexture2DOES, _gloffset_EGLImageTargetTexture2DOES, EGLImageTargetTexture2DOES@8)
 	GL_STUB_ALIAS(ArrayElementEXT, _gloffset_ArrayElement, ArrayElementEXT@4, ArrayElement, ArrayElement@4)
-- 
cgit v1.2.3


From 391b396f3fb300a912e6d9bfbf26f49cc30e52df Mon Sep 17 00:00:00 2001
From: Michel Dänzer <daenzer@vmware.com>
Date: Fri, 5 Mar 2010 00:15:40 +0100
Subject: Fix comparison of unsigned value against < 0.

---
 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 326ad6f909..e9359dbe5f 100644
--- a/src/mesa/main/api_validate.c
+++ b/src/mesa/main/api_validate.c
@@ -147,7 +147,7 @@ check_index_bounds(GLcontext *ctx, GLsizei count, GLenum type,
 
    vbo_get_minmax_index(ctx, &prim, &ib, &min, &max);
 
-   if (min + basevertex < 0 ||
+   if ((int)(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 "
-- 
cgit v1.2.3


From 99864d595f7d4c13e9548f83d5972db9af64e67b Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri, 13 Nov 2009 12:19:35 +0000
Subject: APPLE_object_purgeable: core

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 src/mesa/main/api_exec.c   |   6 +
 src/mesa/main/bufferobj.c  | 356 +++++++++++++++++++++++++++++++++++++++++++++
 src/mesa/main/bufferobj.h  |  11 ++
 src/mesa/main/dd.h         |  17 +++
 src/mesa/main/dlist.c      |   6 +
 src/mesa/main/extensions.c |   4 +
 src/mesa/main/mfeatures.h  |   1 +
 src/mesa/main/mtypes.h     |   4 +
 8 files changed, 405 insertions(+)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index 70c154b62b..fa8d409caa 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -758,4 +758,10 @@ _mesa_init_exec_table(struct _glapi_table *exec)
    SET_EGLImageTargetTexture2DOES(exec, _mesa_EGLImageTargetTexture2DOES);
    SET_EGLImageTargetRenderbufferStorageOES(exec, _mesa_EGLImageTargetRenderbufferStorageOES);
 #endif
+
+#if FEATURE_APPLE_object_purgeable
+   SET_ObjectPurgeableAPPLE(exec, _mesa_ObjectPurgeableAPPLE);
+   SET_ObjectUnpurgeableAPPLE(exec, _mesa_ObjectUnpurgeableAPPLE);
+   SET_GetObjectParameterivAPPLE(exec, _mesa_GetObjectParameterivAPPLE);
+#endif
 }
diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 971b280f3b..3c48f6cce5 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -37,6 +37,8 @@
 #include "image.h"
 #include "context.h"
 #include "bufferobj.h"
+#include "fbobject.h"
+#include "texobj.h"
 
 
 /* Debug flags */
@@ -1710,3 +1712,357 @@ _mesa_FlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length)
    if (ctx->Driver.FlushMappedBufferRange)
       ctx->Driver.FlushMappedBufferRange(ctx, target, offset, length, bufObj);
 }
+
+#if FEATURE_APPLE_object_purgeable
+static GLenum
+_mesa_BufferObjectPurgeable(GLcontext *ctx, GLuint name, GLenum option)
+{
+   struct gl_buffer_object *bufObj;
+   GLenum retval;
+
+   bufObj = _mesa_lookup_bufferobj(ctx, name);
+   if (!bufObj) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glObjectPurgeable(name = 0x%x)", name);
+      return 0;
+   }
+   if (!_mesa_is_bufferobj(bufObj)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glObjectPurgeable(buffer 0)" );
+      return 0;
+   }
+
+   if (bufObj->Purgeable) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glObjectPurgeable(name = 0x%x) is already purgeable", name);
+      return GL_VOLATILE_APPLE;
+   }
+
+   bufObj->Purgeable = GL_TRUE;
+
+   retval = GL_VOLATILE_APPLE;
+   if (ctx->Driver.BufferObjectPurgeable)
+      retval = ctx->Driver.BufferObjectPurgeable(ctx, bufObj, option);
+
+   return retval;
+}
+
+static GLenum
+_mesa_RenderObjectPurgeable(GLcontext *ctx, GLuint name, GLenum option)
+{
+   struct gl_renderbuffer *bufObj;
+   GLenum retval;
+
+   bufObj = _mesa_lookup_renderbuffer(ctx, name);
+   if (!bufObj) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glObjectUnpurgeable(name = 0x%x)", name);
+      return 0;
+   }
+
+   if (bufObj->Purgeable) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glObjectPurgeable(name = 0x%x) is already purgeable", name);
+      return GL_VOLATILE_APPLE;
+   }
+
+   bufObj->Purgeable = GL_TRUE;
+
+   retval = GL_VOLATILE_APPLE;
+   if (ctx->Driver.RenderObjectPurgeable)
+      retval = ctx->Driver.RenderObjectPurgeable(ctx, bufObj, option);
+
+   return retval;
+}
+
+static GLenum
+_mesa_TextureObjectPurgeable(GLcontext *ctx, GLuint name, GLenum option)
+{
+   struct gl_texture_object *bufObj;
+   GLenum retval;
+
+   bufObj = _mesa_lookup_texture(ctx, name);
+   if (!bufObj) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glObjectPurgeable(name = 0x%x)", name);
+      return 0;
+   }
+
+   if (bufObj->Purgeable) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glObjectPurgeable(name = 0x%x) is already purgeable", name);
+      return GL_VOLATILE_APPLE;
+   }
+
+   bufObj->Purgeable = GL_TRUE;
+
+   retval = GL_VOLATILE_APPLE;
+   if (ctx->Driver.TextureObjectPurgeable)
+      retval = ctx->Driver.TextureObjectPurgeable(ctx, bufObj, option);
+
+   return retval;
+}
+
+GLenum GLAPIENTRY
+_mesa_ObjectPurgeableAPPLE(GLenum objectType, GLuint name, GLenum option)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0);
+
+   if (name == 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glObjectPurgeable(name = 0x%x)", name);
+      return 0;
+   }
+
+   switch (option) {
+   case GL_VOLATILE_APPLE:
+   case GL_RELEASED_APPLE:
+      break;
+
+   default:
+      _mesa_error(ctx, GL_INVALID_ENUM,
+                  "glObjectPurgeable(name = 0x%x) invalid option: %d", name, option);
+      return 0;
+   }
+
+   switch (objectType) {
+   case GL_TEXTURE:
+      return _mesa_TextureObjectPurgeable (ctx, name, option);
+   case GL_RENDERBUFFER_EXT:
+      return _mesa_RenderObjectPurgeable (ctx, name, option);
+   case GL_BUFFER_OBJECT_APPLE:
+      return _mesa_BufferObjectPurgeable (ctx, name, option);
+
+   default:
+      _mesa_error(ctx, GL_INVALID_ENUM,
+                  "glObjectPurgeable(name = 0x%x) invalid type: %d", name, objectType);
+      return 0;
+   }
+}
+
+static GLenum
+_mesa_BufferObjectUnpurgeable(GLcontext *ctx, GLuint name, GLenum option)
+{
+   struct gl_buffer_object *bufObj;
+   GLenum retval;
+
+   bufObj = _mesa_lookup_bufferobj(ctx, name);
+   if (!bufObj) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glObjectUnpurgeable(name = 0x%x)", name);
+      return 0;
+   }
+
+   if (! bufObj->Purgeable) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glObjectUnpurgeable(name = 0x%x) object is already \"unpurged\"", name);
+      return 0;
+   }
+
+   bufObj->Purgeable = GL_FALSE;
+
+   retval = GL_RETAINED_APPLE;
+   if (ctx->Driver.BufferObjectUnpurgeable)
+      retval = ctx->Driver.BufferObjectUnpurgeable(ctx, bufObj, option);
+
+   return retval;
+}
+
+static GLenum
+_mesa_RenderObjectUnpurgeable(GLcontext *ctx, GLuint name, GLenum option)
+{
+   struct gl_renderbuffer *bufObj;
+   GLenum retval;
+
+   bufObj = _mesa_lookup_renderbuffer(ctx, name);
+   if (!bufObj) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glObjectUnpurgeable(name = 0x%x)", name);
+      return 0;
+   }
+
+   if (! bufObj->Purgeable) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glObjectUnpurgeable(name = 0x%x) object is already \"unpurged\"", name);
+      return 0;
+   }
+
+   bufObj->Purgeable = GL_FALSE;
+
+   retval = GL_RETAINED_APPLE;
+   if (ctx->Driver.RenderObjectUnpurgeable)
+      retval = ctx->Driver.RenderObjectUnpurgeable(ctx, bufObj, option);
+
+   return retval;
+}
+
+static GLenum
+_mesa_TextureObjectUnpurgeable(GLcontext *ctx, GLuint name, GLenum option)
+{
+   struct gl_texture_object *bufObj;
+   GLenum retval;
+
+   bufObj = _mesa_lookup_texture(ctx, name);
+   if (!bufObj) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glObjectUnpurgeable(name = 0x%x)", name);
+      return 0;
+   }
+
+   if (! bufObj->Purgeable) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "glObjectUnpurgeable(name = 0x%x) object is already \"unpurged\"", name);
+      return 0;
+   }
+
+   bufObj->Purgeable = GL_FALSE;
+
+   retval = GL_RETAINED_APPLE;
+   if (ctx->Driver.TextureObjectUnpurgeable)
+      retval = ctx->Driver.TextureObjectUnpurgeable(ctx, bufObj, option);
+
+   return retval;
+}
+
+GLenum GLAPIENTRY
+_mesa_ObjectUnpurgeableAPPLE(GLenum objectType, GLuint name, GLenum option)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0);
+
+   if (name == 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glObjectUnpurgeable(name = 0x%x)", name);
+      return 0;
+   }
+
+   switch (option) {
+   case GL_RETAINED_APPLE:
+   case GL_UNDEFINED_APPLE:
+      break;
+
+   default:
+      _mesa_error(ctx, GL_INVALID_ENUM,
+                  "glObjectUnpurgeable(name = 0x%x) invalid option: %d", name, option);
+      return 0;
+   }
+
+   switch (objectType) {
+   case GL_BUFFER_OBJECT_APPLE:
+      return _mesa_BufferObjectUnpurgeable(ctx, name, option);
+
+   case GL_TEXTURE:
+      return _mesa_TextureObjectUnpurgeable(ctx, name, option);
+
+   case GL_RENDERBUFFER_EXT:
+      return _mesa_RenderObjectUnpurgeable(ctx, name, option);
+
+   default:
+      _mesa_error(ctx, GL_INVALID_ENUM,
+                  "glObjectUnpurgeable(name = 0x%x) invalid type: %d", name, objectType);
+      return 0;
+   }
+}
+
+static void
+_mesa_GetBufferObjectParameterivAPPLE(GLcontext *ctx, GLuint name, GLenum pname, GLint* params)
+{
+   struct gl_buffer_object *bufObj;
+
+   bufObj = _mesa_lookup_bufferobj(ctx, name);
+   if (!bufObj) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glGetObjectParameteriv(name = 0x%x) invalid object", name);
+      return;
+   }
+
+   switch (pname) {
+   case GL_PURGEABLE_APPLE:
+      *params = bufObj->Purgeable;
+      break;
+
+   default:
+      _mesa_error(ctx, GL_INVALID_ENUM,
+                  "glGetObjectParameteriv(name = 0x%x) invalid enum: %d", name, pname);
+      break;
+   }
+}
+
+static void
+_mesa_GetRenderObjectParameterivAPPLE(GLcontext *ctx, GLuint name, GLenum pname, GLint* params)
+{
+   struct gl_renderbuffer *bufObj;
+
+   bufObj = _mesa_lookup_renderbuffer(ctx, name);
+   if (!bufObj) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glObjectUnpurgeable(name = 0x%x)", name);
+      return;
+   }
+
+   switch (pname) {
+   case GL_PURGEABLE_APPLE:
+      *params = bufObj->Purgeable;
+      break;
+
+   default:
+      _mesa_error(ctx, GL_INVALID_ENUM,
+                  "glGetObjectParameteriv(name = 0x%x) invalid enum: %d", name, pname);
+      break;
+   }
+}
+
+static void
+_mesa_GetTextureObjectParameterivAPPLE(GLcontext *ctx, GLuint name, GLenum pname, GLint* params)
+{
+   struct gl_texture_object *bufObj;
+
+   bufObj = _mesa_lookup_texture(ctx, name);
+   if (!bufObj) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glObjectUnpurgeable(name = 0x%x)", name);
+      return;
+   }
+
+   switch (pname) {
+   case GL_PURGEABLE_APPLE:
+      *params = bufObj->Purgeable;
+      break;
+
+   default:
+      _mesa_error(ctx, GL_INVALID_ENUM,
+                  "glGetObjectParameteriv(name = 0x%x) invalid enum: %d", name, pname);
+      break;
+   }
+}
+
+void GLAPIENTRY
+_mesa_GetObjectParameterivAPPLE(GLenum objectType, GLuint name, GLenum pname, GLint* params)
+{
+   GET_CURRENT_CONTEXT(ctx);
+
+   if (name == 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glGetObjectParameteriv(name = 0x%x)", name);
+      return;
+   }
+
+   switch (objectType) {
+   case GL_TEXTURE:
+      _mesa_GetTextureObjectParameterivAPPLE (ctx, name, pname, params);
+      break;
+
+   case GL_BUFFER_OBJECT_APPLE:
+      _mesa_GetBufferObjectParameterivAPPLE (ctx, name, pname, params);
+      break;
+
+   case GL_RENDERBUFFER_EXT:
+      _mesa_GetRenderObjectParameterivAPPLE (ctx, name, pname, params);
+      break;
+
+   default:
+      _mesa_error(ctx, GL_INVALID_ENUM,
+                  "glGetObjectParameteriv(name = 0x%x) invalid type: %d", name, objectType);
+   }
+}
+#endif
diff --git a/src/mesa/main/bufferobj.h b/src/mesa/main/bufferobj.h
index f8bca5ff71..912529cfdf 100644
--- a/src/mesa/main/bufferobj.h
+++ b/src/mesa/main/bufferobj.h
@@ -175,4 +175,15 @@ _mesa_MapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length,
 extern void GLAPIENTRY
 _mesa_FlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length);
 
+#if FEATURE_APPLE_object_purgeable
+extern GLenum GLAPIENTRY
+_mesa_ObjectPurgeableAPPLE(GLenum objectType, GLuint name, GLenum option);
+
+extern GLenum GLAPIENTRY
+_mesa_ObjectUnpurgeableAPPLE(GLenum objectType, GLuint name, GLenum option);
+
+extern void GLAPIENTRY
+_mesa_GetObjectParameterivAPPLE(GLenum objectType, GLuint name, GLenum pname, GLint* params);
+#endif
+
 #endif
diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index 84b83fe273..197de09b22 100644
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -776,6 +776,23 @@ struct dd_function_table {
    /*@}*/
 #endif
 
+   /**
+    * \name Functions for GL_APPLE_object_purgeable
+    */
+#if FEATURE_APPLE_object_purgeable
+   /*@{*/
+   /* variations on ObjectPurgeable */
+   GLenum (*BufferObjectPurgeable)( GLcontext *ctx, struct gl_buffer_object *obj, GLenum option );
+   GLenum (*RenderObjectPurgeable)( GLcontext *ctx, struct gl_renderbuffer *obj, GLenum option );
+   GLenum (*TextureObjectPurgeable)( GLcontext *ctx, struct gl_texture_object *obj, GLenum option );
+
+   /* variations on ObjectUnpurgeable */
+   GLenum (*BufferObjectUnpurgeable)( GLcontext *ctx, struct gl_buffer_object *obj, GLenum option );
+   GLenum (*RenderObjectUnpurgeable)( GLcontext *ctx, struct gl_renderbuffer *obj, GLenum option );
+   GLenum (*TextureObjectUnpurgeable)( GLcontext *ctx, struct gl_texture_object *obj, GLenum option );
+   /*@}*/
+#endif
+
    /**
     * \name Functions for GL_EXT_framebuffer_object
     */
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 673db30f25..43aadb1de5 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -9285,6 +9285,12 @@ _mesa_init_save_table(struct _glapi_table *table)
    /* 364. GL_EXT_provoking_vertex */
    SET_ProvokingVertexEXT(table, save_ProvokingVertexEXT);
 
+   /* 371. GL_APPLE_object_purgeable */
+#if FEATURE_APPLE_object_purgeable
+   SET_ObjectPurgeableAPPLE(table, _mesa_ObjectPurgeableAPPLE);
+   SET_ObjectUnpurgeableAPPLE(table, _mesa_ObjectUnpurgeableAPPLE);
+#endif
+
    /* GL 3.0 */
 #if 0
    SET_ClearBufferiv(table, save_ClearBufferiv);
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 0e7e52a54a..30245d6aaf 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -153,6 +153,7 @@ static const struct {
    { OFF, "GL_APPLE_client_storage",           F(APPLE_client_storage) },
    { ON,  "GL_APPLE_packed_pixels",            F(APPLE_packed_pixels) },
    { OFF, "GL_APPLE_vertex_array_object",      F(APPLE_vertex_array_object) },
+   { OFF, "GL_APPLE_object_purgeable",         F(APPLE_object_purgeable) },
    { 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)},
@@ -265,6 +266,9 @@ _mesa_enable_sw_extensions(GLcontext *ctx)
    ctx->Extensions.ARB_sync = GL_TRUE;
 #endif
    ctx->Extensions.APPLE_vertex_array_object = GL_TRUE;
+#if FEATURE_APPLE_object_purgeable
+   ctx->Extensions.APPLE_object_purgeable = GL_TRUE;
+#endif
    ctx->Extensions.ATI_envmap_bumpmap = GL_TRUE;
 #if FEATURE_ATI_fragment_shader
    ctx->Extensions.ATI_fragment_shader = GL_TRUE;
diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index f0896ee626..cb96c4d1d0 100644
--- a/src/mesa/main/mfeatures.h
+++ b/src/mesa/main/mfeatures.h
@@ -116,6 +116,7 @@
 #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_APPLE_object_purgeable _HAVE_FULL_GL
 #define FEATURE_EXT_texture_sRGB _HAVE_FULL_GL
 #define FEATURE_ATI_fragment_shader _HAVE_FULL_GL
 #define FEATURE_NV_fence  _HAVE_FULL_GL
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 4d55ebb972..9d9b475dd1 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -1244,6 +1244,7 @@ struct gl_texture_object
    GLboolean GenerateMipmap;    /**< GL_SGIS_generate_mipmap */
    GLboolean _Complete;		/**< Is texture object complete? */
    GLboolean _RenderToTexture;  /**< Any rendering to this texture? */
+   GLboolean Purgeable;         /**< Is the buffer purgeable under memory pressure? */
 
    /** Actual texture images, indexed by [cube face] and [mipmap level] */
    struct gl_texture_image *Image[MAX_FACES][MAX_TEXTURE_LEVELS];
@@ -1439,6 +1440,7 @@ struct gl_buffer_object
    GLsizeiptr Length;   /**< Mapped length */
    /*@}*/
    GLboolean Written;   /**< Ever written to? (for debugging) */
+   GLboolean Purgeable; /**< Is the buffer purgeable under memory pressure? */
 };
 
 
@@ -2104,6 +2106,7 @@ struct gl_renderbuffer
    GLuint Name;
    GLint RefCount;
    GLuint Width, Height;
+   GLboolean Purgeable;   /**< Is the buffer purgeable under memory pressure? */
 
    GLenum InternalFormat; /**< The user-specified format */
    GLenum _BaseFormat;    /**< Either GL_RGB, GL_RGBA, GL_DEPTH_COMPONENT or
@@ -2491,6 +2494,7 @@ struct gl_extensions
    GLboolean APPLE_client_storage;
    GLboolean APPLE_packed_pixels;
    GLboolean APPLE_vertex_array_object;
+   GLboolean APPLE_object_purgeable;
    GLboolean ATI_envmap_bumpmap;
    GLboolean ATI_texture_mirror_once;
    GLboolean ATI_texture_env_combine3;
-- 
cgit v1.2.3


From e176ae5f2a90632c778c3ae7dcab587f119035b1 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 5 Mar 2010 09:23:43 -0700
Subject: mesa: whitespace fixes, 80-column wrapping, etc.

---
 src/mesa/main/bufferobj.c | 186 +++++++++++++++++++++++++---------------------
 1 file changed, 102 insertions(+), 84 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 3c48f6cce5..c532cbef11 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -1119,20 +1119,20 @@ _mesa_BufferDataARB(GLenum target, GLsizeiptrARB size,
    }
 
    switch (usage) {
-      case GL_STREAM_DRAW_ARB:
-      case GL_STREAM_READ_ARB:
-      case GL_STREAM_COPY_ARB:
-      case GL_STATIC_DRAW_ARB:
-      case GL_STATIC_READ_ARB:
-      case GL_STATIC_COPY_ARB:
-      case GL_DYNAMIC_DRAW_ARB:
-      case GL_DYNAMIC_READ_ARB:
-      case GL_DYNAMIC_COPY_ARB:
-         /* OK */
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glBufferDataARB(usage)");
-         return;
+   case GL_STREAM_DRAW_ARB:
+   case GL_STREAM_READ_ARB:
+   case GL_STREAM_COPY_ARB:
+   case GL_STATIC_DRAW_ARB:
+   case GL_STATIC_READ_ARB:
+   case GL_STATIC_COPY_ARB:
+   case GL_DYNAMIC_DRAW_ARB:
+   case GL_DYNAMIC_READ_ARB:
+   case GL_DYNAMIC_COPY_ARB:
+      /* OK */
+      break;
+   default:
+      _mesa_error(ctx, GL_INVALID_ENUM, "glBufferDataARB(usage)");
+      return;
    }
 
    bufObj = get_buffer(ctx, target);
@@ -1225,18 +1225,18 @@ _mesa_MapBufferARB(GLenum target, GLenum access)
    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:
-         accessFlags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT;
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glMapBufferARB(access)");
-         return NULL;
+   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:
+      accessFlags = GL_MAP_READ_BIT | GL_MAP_WRITE_BIT;
+      break;
+   default:
+      _mesa_error(ctx, GL_INVALID_ENUM, "glMapBufferARB(access)");
+      return NULL;
    }
 
    bufObj = get_buffer(ctx, target);
@@ -1385,21 +1385,21 @@ _mesa_GetBufferParameterivARB(GLenum target, GLenum pname, GLint *params)
    }
 
    switch (pname) {
-      case GL_BUFFER_SIZE_ARB:
-         *params = (GLint) bufObj->Size;
-         break;
-      case GL_BUFFER_USAGE_ARB:
-         *params = bufObj->Usage;
-         break;
-      case GL_BUFFER_ACCESS_ARB:
-         *params = simplified_access_mode(bufObj->AccessFlags);
-         break;
-      case GL_BUFFER_MAPPED_ARB:
-         *params = _mesa_bufferobj_mapped(bufObj);
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetBufferParameterivARB(pname)");
-         return;
+   case GL_BUFFER_SIZE_ARB:
+      *params = (GLint) bufObj->Size;
+      break;
+   case GL_BUFFER_USAGE_ARB:
+      *params = bufObj->Usage;
+      break;
+   case GL_BUFFER_ACCESS_ARB:
+      *params = simplified_access_mode(bufObj->AccessFlags);
+      break;
+   case GL_BUFFER_MAPPED_ARB:
+      *params = _mesa_bufferobj_mapped(bufObj);
+      break;
+   default:
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetBufferParameterivARB(pname)");
+      return;
    }
 }
 
@@ -1427,21 +1427,21 @@ _mesa_GetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params)
    }
 
    switch (pname) {
-      case GL_BUFFER_SIZE_ARB:
-         *params = bufObj->Size;
-         break;
-      case GL_BUFFER_USAGE_ARB:
-         *params = bufObj->Usage;
-         break;
-      case GL_BUFFER_ACCESS_ARB:
-         *params = simplified_access_mode(bufObj->AccessFlags);
-         break;
-      case GL_BUFFER_MAPPED_ARB:
-         *params = _mesa_bufferobj_mapped(bufObj);
-         break;
-      default:
-         _mesa_error(ctx, GL_INVALID_ENUM, "glGetBufferParameteri64v(pname)");
-         return;
+   case GL_BUFFER_SIZE_ARB:
+      *params = bufObj->Size;
+      break;
+   case GL_BUFFER_USAGE_ARB:
+      *params = bufObj->Usage;
+      break;
+   case GL_BUFFER_ACCESS_ARB:
+      *params = simplified_access_mode(bufObj->AccessFlags);
+      break;
+   case GL_BUFFER_MAPPED_ARB:
+      *params = _mesa_bufferobj_mapped(bufObj);
+      break;
+   default:
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetBufferParameteri64v(pname)");
+      return;
    }
 }
 
@@ -1713,6 +1713,7 @@ _mesa_FlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length)
       ctx->Driver.FlushMappedBufferRange(ctx, target, offset, length, bufObj);
 }
 
+
 #if FEATURE_APPLE_object_purgeable
 static GLenum
 _mesa_BufferObjectPurgeable(GLcontext *ctx, GLuint name, GLenum option)
@@ -1746,6 +1747,7 @@ _mesa_BufferObjectPurgeable(GLcontext *ctx, GLuint name, GLenum option)
    return retval;
 }
 
+
 static GLenum
 _mesa_RenderObjectPurgeable(GLcontext *ctx, GLuint name, GLenum option)
 {
@@ -1774,6 +1776,7 @@ _mesa_RenderObjectPurgeable(GLcontext *ctx, GLuint name, GLenum option)
    return retval;
 }
 
+
 static GLenum
 _mesa_TextureObjectPurgeable(GLcontext *ctx, GLuint name, GLenum option)
 {
@@ -1802,6 +1805,7 @@ _mesa_TextureObjectPurgeable(GLcontext *ctx, GLuint name, GLenum option)
    return retval;
 }
 
+
 GLenum GLAPIENTRY
 _mesa_ObjectPurgeableAPPLE(GLenum objectType, GLuint name, GLenum option)
 {
@@ -1817,11 +1821,12 @@ _mesa_ObjectPurgeableAPPLE(GLenum objectType, GLuint name, GLenum option)
    switch (option) {
    case GL_VOLATILE_APPLE:
    case GL_RELEASED_APPLE:
+      /* legal */
       break;
-
    default:
       _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glObjectPurgeable(name = 0x%x) invalid option: %d", name, option);
+                  "glObjectPurgeable(name = 0x%x) invalid option: %d",
+                  name, option);
       return 0;
    }
 
@@ -1832,14 +1837,15 @@ _mesa_ObjectPurgeableAPPLE(GLenum objectType, GLuint name, GLenum option)
       return _mesa_RenderObjectPurgeable (ctx, name, option);
    case GL_BUFFER_OBJECT_APPLE:
       return _mesa_BufferObjectPurgeable (ctx, name, option);
-
    default:
       _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glObjectPurgeable(name = 0x%x) invalid type: %d", name, objectType);
+                  "glObjectPurgeable(name = 0x%x) invalid type: %d",
+                  name, objectType);
       return 0;
    }
 }
 
+
 static GLenum
 _mesa_BufferObjectUnpurgeable(GLcontext *ctx, GLuint name, GLenum option)
 {
@@ -1855,7 +1861,8 @@ _mesa_BufferObjectUnpurgeable(GLcontext *ctx, GLuint name, GLenum option)
 
    if (! bufObj->Purgeable) {
       _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glObjectUnpurgeable(name = 0x%x) object is already \"unpurged\"", name);
+                  "glObjectUnpurgeable(name = 0x%x) object is "
+                  " already \"unpurged\"", name);
       return 0;
    }
 
@@ -1868,6 +1875,7 @@ _mesa_BufferObjectUnpurgeable(GLcontext *ctx, GLuint name, GLenum option)
    return retval;
 }
 
+
 static GLenum
 _mesa_RenderObjectUnpurgeable(GLcontext *ctx, GLuint name, GLenum option)
 {
@@ -1883,7 +1891,8 @@ _mesa_RenderObjectUnpurgeable(GLcontext *ctx, GLuint name, GLenum option)
 
    if (! bufObj->Purgeable) {
       _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glObjectUnpurgeable(name = 0x%x) object is already \"unpurged\"", name);
+                  "glObjectUnpurgeable(name = 0x%x) object is "
+                  " already \"unpurged\"", name);
       return 0;
    }
 
@@ -1896,6 +1905,7 @@ _mesa_RenderObjectUnpurgeable(GLcontext *ctx, GLuint name, GLenum option)
    return retval;
 }
 
+
 static GLenum
 _mesa_TextureObjectUnpurgeable(GLcontext *ctx, GLuint name, GLenum option)
 {
@@ -1911,7 +1921,8 @@ _mesa_TextureObjectUnpurgeable(GLcontext *ctx, GLuint name, GLenum option)
 
    if (! bufObj->Purgeable) {
       _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glObjectUnpurgeable(name = 0x%x) object is already \"unpurged\"", name);
+                  "glObjectUnpurgeable(name = 0x%x) object is"
+                  " already \"unpurged\"", name);
       return 0;
    }
 
@@ -1924,6 +1935,7 @@ _mesa_TextureObjectUnpurgeable(GLcontext *ctx, GLuint name, GLenum option)
    return retval;
 }
 
+
 GLenum GLAPIENTRY
 _mesa_ObjectUnpurgeableAPPLE(GLenum objectType, GLuint name, GLenum option)
 {
@@ -1939,33 +1951,34 @@ _mesa_ObjectUnpurgeableAPPLE(GLenum objectType, GLuint name, GLenum option)
    switch (option) {
    case GL_RETAINED_APPLE:
    case GL_UNDEFINED_APPLE:
+      /* legal */
       break;
-
    default:
       _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glObjectUnpurgeable(name = 0x%x) invalid option: %d", name, option);
+                  "glObjectUnpurgeable(name = 0x%x) invalid option: %d",
+                  name, option);
       return 0;
    }
 
    switch (objectType) {
    case GL_BUFFER_OBJECT_APPLE:
       return _mesa_BufferObjectUnpurgeable(ctx, name, option);
-
    case GL_TEXTURE:
       return _mesa_TextureObjectUnpurgeable(ctx, name, option);
-
    case GL_RENDERBUFFER_EXT:
       return _mesa_RenderObjectUnpurgeable(ctx, name, option);
-
    default:
       _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glObjectUnpurgeable(name = 0x%x) invalid type: %d", name, objectType);
+                  "glObjectUnpurgeable(name = 0x%x) invalid type: %d",
+                  name, objectType);
       return 0;
    }
 }
 
+
 static void
-_mesa_GetBufferObjectParameterivAPPLE(GLcontext *ctx, GLuint name, GLenum pname, GLint* params)
+_mesa_GetBufferObjectParameterivAPPLE(GLcontext *ctx, GLuint name,
+                                      GLenum pname, GLint* params)
 {
    struct gl_buffer_object *bufObj;
 
@@ -1980,16 +1993,18 @@ _mesa_GetBufferObjectParameterivAPPLE(GLcontext *ctx, GLuint name, GLenum pname,
    case GL_PURGEABLE_APPLE:
       *params = bufObj->Purgeable;
       break;
-
    default:
       _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glGetObjectParameteriv(name = 0x%x) invalid enum: %d", name, pname);
+                  "glGetObjectParameteriv(name = 0x%x) invalid enum: %d",
+                  name, pname);
       break;
    }
 }
 
+
 static void
-_mesa_GetRenderObjectParameterivAPPLE(GLcontext *ctx, GLuint name, GLenum pname, GLint* params)
+_mesa_GetRenderObjectParameterivAPPLE(GLcontext *ctx, GLuint name,
+                                      GLenum pname, GLint* params)
 {
    struct gl_renderbuffer *bufObj;
 
@@ -2004,16 +2019,18 @@ _mesa_GetRenderObjectParameterivAPPLE(GLcontext *ctx, GLuint name, GLenum pname,
    case GL_PURGEABLE_APPLE:
       *params = bufObj->Purgeable;
       break;
-
    default:
       _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glGetObjectParameteriv(name = 0x%x) invalid enum: %d", name, pname);
+                  "glGetObjectParameteriv(name = 0x%x) invalid enum: %d",
+                  name, pname);
       break;
    }
 }
 
+
 static void
-_mesa_GetTextureObjectParameterivAPPLE(GLcontext *ctx, GLuint name, GLenum pname, GLint* params)
+_mesa_GetTextureObjectParameterivAPPLE(GLcontext *ctx, GLuint name,
+                                       GLenum pname, GLint* params)
 {
    struct gl_texture_object *bufObj;
 
@@ -2028,16 +2045,18 @@ _mesa_GetTextureObjectParameterivAPPLE(GLcontext *ctx, GLuint name, GLenum pname
    case GL_PURGEABLE_APPLE:
       *params = bufObj->Purgeable;
       break;
-
    default:
       _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glGetObjectParameteriv(name = 0x%x) invalid enum: %d", name, pname);
+                  "glGetObjectParameteriv(name = 0x%x) invalid enum: %d",
+                  name, pname);
       break;
    }
 }
 
+
 void GLAPIENTRY
-_mesa_GetObjectParameterivAPPLE(GLenum objectType, GLuint name, GLenum pname, GLint* params)
+_mesa_GetObjectParameterivAPPLE(GLenum objectType, GLuint name, GLenum pname,
+                                GLint* params)
 {
    GET_CURRENT_CONTEXT(ctx);
 
@@ -2051,18 +2070,17 @@ _mesa_GetObjectParameterivAPPLE(GLenum objectType, GLuint name, GLenum pname, GL
    case GL_TEXTURE:
       _mesa_GetTextureObjectParameterivAPPLE (ctx, name, pname, params);
       break;
-
    case GL_BUFFER_OBJECT_APPLE:
       _mesa_GetBufferObjectParameterivAPPLE (ctx, name, pname, params);
       break;
-
    case GL_RENDERBUFFER_EXT:
       _mesa_GetRenderObjectParameterivAPPLE (ctx, name, pname, params);
       break;
-
    default:
       _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glGetObjectParameteriv(name = 0x%x) invalid type: %d", name, objectType);
+                  "glGetObjectParameteriv(name = 0x%x) invalid type: %d",
+                  name, objectType);
    }
 }
-#endif
+
+#endif /* FEATURE_APPLE_object_purgeable */
-- 
cgit v1.2.3


From e9968ebfa40b4740601c1596950ebd3f168664b0 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 5 Mar 2010 12:32:32 -0700
Subject: mesa: minor reformatting, new comments

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

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/api_validate.c b/src/mesa/main/api_validate.c
index e9359dbe5f..4fb7b5ad61 100644
--- a/src/mesa/main/api_validate.c
+++ b/src/mesa/main/api_validate.c
@@ -123,6 +123,12 @@ check_valid_to_render(GLcontext *ctx, const char *function)
    return GL_TRUE;
 }
 
+
+/**
+ * Do bounds checking on array element indexes.  Check that the vertices
+ * pointed to by the indices don't lie outside buffer object bounds.
+ * \return GL_TRUE if OK, GL_FALSE if any indexed vertex goes is out of bounds
+ */
 static GLboolean
 check_index_bounds(GLcontext *ctx, GLsizei count, GLenum type,
 		   const GLvoid *indices, GLint basevertex)
@@ -150,14 +156,15 @@ check_index_bounds(GLcontext *ctx, GLsizei count, GLenum type,
    if ((int)(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);
+      _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
  * and VBO bounds checking.
-- 
cgit v1.2.3


From 24f90112761d108a4a131fad11bd7b426d8edfa0 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Fri, 5 Mar 2010 23:10:45 +0000
Subject: Always return VOLATILE for ObjectPurgeable(VOLATILE)

Fixes fdo bug 26128.

The spec mandates that VOLATILE is returned from
ObjectPurgeable(VOLATILE) irrespective of the actual status of the
object upon completion of marking it purgeable.

Conform to the spec, even though it seems wrong.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 src/mesa/main/bufferobj.c | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index c532cbef11..71d1514fe4 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -1809,6 +1809,8 @@ _mesa_TextureObjectPurgeable(GLcontext *ctx, GLuint name, GLenum option)
 GLenum GLAPIENTRY
 _mesa_ObjectPurgeableAPPLE(GLenum objectType, GLuint name, GLenum option)
 {
+   GLenum retval;
+
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0);
 
@@ -1832,17 +1834,27 @@ _mesa_ObjectPurgeableAPPLE(GLenum objectType, GLuint name, GLenum option)
 
    switch (objectType) {
    case GL_TEXTURE:
-      return _mesa_TextureObjectPurgeable (ctx, name, option);
+      retval = _mesa_TextureObjectPurgeable (ctx, name, option);
+      break;
    case GL_RENDERBUFFER_EXT:
-      return _mesa_RenderObjectPurgeable (ctx, name, option);
+      retval = _mesa_RenderObjectPurgeable (ctx, name, option);
+      break;
    case GL_BUFFER_OBJECT_APPLE:
-      return _mesa_BufferObjectPurgeable (ctx, name, option);
+      retval = _mesa_BufferObjectPurgeable (ctx, name, option);
+      break;
    default:
       _mesa_error(ctx, GL_INVALID_ENUM,
                   "glObjectPurgeable(name = 0x%x) invalid type: %d",
                   name, objectType);
       return 0;
    }
+
+   /* In strict conformance to the spec, we must only return VOLATILE when
+    * when passed the VOLATILE option. Madness.
+    *
+    * XXX First fix the spec, then fix me.
+    */
+   return option == GL_VOLATILE_APPLE ? GL_VOLATILE_APPLE : retval;
 }
 
 
@@ -1902,7 +1914,7 @@ _mesa_RenderObjectUnpurgeable(GLcontext *ctx, GLuint name, GLenum option)
    if (ctx->Driver.RenderObjectUnpurgeable)
       retval = ctx->Driver.RenderObjectUnpurgeable(ctx, bufObj, option);
 
-   return retval;
+   return option;
 }
 
 
-- 
cgit v1.2.3


From 6ce4a85e0b1d6581d73c1b1cbc37525d7a9ed1ba Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Fri, 5 Mar 2010 17:35:01 -0700
Subject: mesa: bump version to 7.9

Now that the 7.8 branch has been created Mesa/master will be version 7.9
---
 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 c4ee9e583c..92b227ca48 100644
--- a/Makefile
+++ b/Makefile
@@ -180,7 +180,7 @@ ultrix-gcc:
 
 # Rules for making release tarballs
 
-VERSION=7.8-devel
+VERSION=7.9-devel
 DIRECTORY = Mesa-$(VERSION)
 LIB_NAME = MesaLib-$(VERSION)
 DEMO_NAME = MesaDemos-$(VERSION)
diff --git a/configs/default b/configs/default
index ad6d93c92f..4fe64cc6c9 100644
--- a/configs/default
+++ b/configs/default
@@ -9,7 +9,7 @@ CONFIG_NAME = default
 
 # Version info
 MESA_MAJOR=7
-MESA_MINOR=8
+MESA_MINOR=9
 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 d521569f8d..59f62ebd6c 100644
--- a/src/mesa/main/version.h
+++ b/src/mesa/main/version.h
@@ -1,6 +1,6 @@
 /*
  * Mesa 3-D graphics library
- * Version:  7.8
+ * Version:  7.9
  *
  * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
  * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
@@ -33,9 +33,9 @@
 
 /* Mesa version */
 #define MESA_MAJOR 7
-#define MESA_MINOR 8
+#define MESA_MINOR 9
 #define MESA_PATCH 0
-#define MESA_VERSION_STRING "7.8-devel"
+#define MESA_VERSION_STRING "7.9-devel"
 
 /* To make version comparison easy */
 #define MESA_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
-- 
cgit v1.2.3


From 614f490ca918f891cd70674ea7841d5b2a97e9ef Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 8 Mar 2010 09:34:46 -0700
Subject: mesa: s/GL_DEPTH_STENCIL/GL_DEPTH_COMPONENT/ for MESA_FORMAT_Z16
 renderbuffer

MESA_FORMAT_Z16 has no stencil bits.
---
 src/mesa/main/texrender.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texrender.c b/src/mesa/main/texrender.c
index 5a528535c0..b7b23ade30 100644
--- a/src/mesa/main/texrender.c
+++ b/src/mesa/main/texrender.c
@@ -500,7 +500,7 @@ update_wrapper(GLcontext *ctx, const struct gl_renderbuffer_attachment *att)
    else if (trb->TexImage->TexFormat == MESA_FORMAT_Z16) {
       trb->Base.Format = MESA_FORMAT_Z16;
       trb->Base.DataType = GL_UNSIGNED_SHORT;
-      trb->Base._BaseFormat = GL_DEPTH_STENCIL;
+      trb->Base._BaseFormat = GL_DEPTH_COMPONENT;
    }
    else if (trb->TexImage->TexFormat == MESA_FORMAT_Z32) {
       trb->Base.Format = MESA_FORMAT_Z32;
-- 
cgit v1.2.3


From 26aa870a0d80f8b93239a98c558402c3c9ce6445 Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 8 Mar 2010 09:38:07 -0700
Subject: mesa: add render-to-texture case for MESA_FORMAT_S8_Z24

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

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texrender.c b/src/mesa/main/texrender.c
index b7b23ade30..9996a996c1 100644
--- a/src/mesa/main/texrender.c
+++ b/src/mesa/main/texrender.c
@@ -497,6 +497,11 @@ update_wrapper(GLcontext *ctx, const struct gl_renderbuffer_attachment *att)
       trb->Base.DataType = GL_UNSIGNED_INT_24_8_EXT;
       trb->Base._BaseFormat = GL_DEPTH_STENCIL;
    }
+   else if (trb->TexImage->TexFormat == MESA_FORMAT_S8_Z24) {
+      trb->Base.Format = MESA_FORMAT_S8_Z24;
+      trb->Base.DataType = GL_UNSIGNED_INT_24_8_EXT; /* not 8_24 */
+      trb->Base._BaseFormat = GL_DEPTH_STENCIL;
+   }
    else if (trb->TexImage->TexFormat == MESA_FORMAT_Z16) {
       trb->Base.Format = MESA_FORMAT_Z16;
       trb->Base.DataType = GL_UNSIGNED_SHORT;
-- 
cgit v1.2.3


From fe25bee14f4df3ef87cc7fee67e610da9afc5eda Mon Sep 17 00:00:00 2001
From: Brian Paul <brianp@vmware.com>
Date: Mon, 8 Mar 2010 09:58:54 -0700
Subject: mesa: add additional missing z formats for render to texture

Allow render to texture for X8_Z24 and Z24_X8 formats.
Replace big if/else with switch, etc.
---
 src/mesa/main/texrender.c | 98 +++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 83 insertions(+), 15 deletions(-)

(limited to 'src/mesa/main')

diff --git a/src/mesa/main/texrender.c b/src/mesa/main/texrender.c
index 9996a996c1..d29af5a5b2 100644
--- a/src/mesa/main/texrender.c
+++ b/src/mesa/main/texrender.c
@@ -84,6 +84,14 @@ texture_get_row(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
          zValues[i] = ((GLuint) (flt * 0xffffff)) << 8;
       }
    }
+   else if (rb->DataType == GL_UNSIGNED_INT_8_24_REV_MESA) {
+      GLuint *zValues = (GLuint *) values;
+      for (i = 0; i < count; i++) {
+         GLfloat flt;
+         trb->TexImage->FetchTexelf(trb->TexImage, x + i, y, z, &flt);
+         zValues[i] = (GLuint) (flt * 0xffffff);
+      }
+   }
    else {
       _mesa_problem(ctx, "invalid rb->DataType in texture_get_row");
    }
@@ -139,6 +147,15 @@ texture_get_values(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
          zValues[i] = ((GLuint) (flt * 0xffffff)) << 8;
       }
    }
+   else if (rb->DataType == GL_UNSIGNED_INT_8_24_REV_MESA) {
+      GLuint *zValues = (GLuint *) values;
+      for (i = 0; i < count; i++) {
+         GLfloat flt;
+         trb->TexImage->FetchTexelf(trb->TexImage, x[i], y[i] + trb->Yoffset,
+				    z, &flt);
+         zValues[i] = (GLuint) (flt * 0xffffff);
+      }
+   }
    else {
       _mesa_problem(ctx, "invalid rb->DataType in texture_get_values");
    }
@@ -193,6 +210,15 @@ texture_put_row(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
          }
       }
    }
+   else if (rb->DataType == GL_UNSIGNED_INT_8_24_REV_MESA) {
+      const GLuint *zValues = (const GLuint *) values;
+      for (i = 0; i < count; i++) {
+         if (!mask || mask[i]) {
+            GLfloat flt = (GLfloat) ((zValues[i] & 0xffffff) * (1.0 / 0xffffff));
+            trb->Store(trb->TexImage, x + i, y, z, &flt);
+         }
+      }
+   }
    else {
       _mesa_problem(ctx, "invalid rb->DataType in texture_put_row");
    }
@@ -246,6 +272,15 @@ texture_put_row_rgb(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
          }
       }
    }
+   else if (rb->DataType == GL_UNSIGNED_INT_8_24_REV_MESA) {
+      const GLuint *zValues = (const GLuint *) values;
+      for (i = 0; i < count; i++) {
+         if (!mask || mask[i]) {
+            GLfloat flt = (GLfloat) ((zValues[i] & 0xffffff) * (1.0 / 0xffffff));
+            trb->Store(trb->TexImage, x + i, y, z, &flt);
+         }
+      }
+   }
    else {
       _mesa_problem(ctx, "invalid rb->DataType in texture_put_row");
    }
@@ -296,6 +331,15 @@ texture_put_mono_row(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
          }
       }
    }
+   else if (rb->DataType == GL_UNSIGNED_INT_8_24_REV_MESA) {
+      const GLuint zValue = *((const GLuint *) value);
+      const GLfloat flt = (GLfloat) ((zValue & 0xffffff) * (1.0 / 0xffffff));
+      for (i = 0; i < count; i++) {
+         if (!mask || mask[i]) {
+            trb->Store(trb->TexImage, x + i, y, z, &flt);
+         }
+      }
+   }
    else {
       _mesa_problem(ctx, "invalid rb->DataType in texture_put_mono_row");
    }
@@ -346,6 +390,15 @@ texture_put_values(GLcontext *ctx, struct gl_renderbuffer *rb, GLuint count,
          }
       }
    }
+   else if (rb->DataType == GL_UNSIGNED_INT_8_24_REV_MESA) {
+      const GLuint *zValues = (const GLuint *) values;
+      for (i = 0; i < count; i++) {
+         if (!mask || mask[i]) {
+            GLfloat flt = (GLfloat) ((zValues[i] & 0xffffff) * (1.0 / 0xffffff));
+            trb->Store(trb->TexImage, x[i], y[i] + trb->Yoffset, z, &flt);
+         }
+      }
+   }
    else {
       _mesa_problem(ctx, "invalid rb->DataType in texture_put_values");
    }
@@ -395,6 +448,15 @@ texture_put_mono_values(GLcontext *ctx, struct gl_renderbuffer *rb,
          }
       }
    }
+   else if (rb->DataType == GL_UNSIGNED_INT_8_24_REV_MESA) {
+      const GLuint zValue = *((const GLuint *) value);
+      const GLfloat flt = (GLfloat) ((zValue & 0xffffff) * (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);
+         }
+      }
+   }
    else {
       _mesa_problem(ctx, "invalid rb->DataType in texture_put_mono_values");
    }
@@ -491,29 +553,35 @@ update_wrapper(GLcontext *ctx, const struct gl_renderbuffer_attachment *att)
    trb->Base.Width = trb->TexImage->Width;
    trb->Base.Height = trb->TexImage->Height;
    trb->Base.InternalFormat = trb->TexImage->InternalFormat;
+   trb->Base.Format = trb->TexImage->TexFormat;
+
    /* XXX may need more special cases here */
-   if (trb->TexImage->TexFormat == MESA_FORMAT_Z24_S8) {
-      trb->Base.Format = MESA_FORMAT_Z24_S8;
+   switch (trb->TexImage->TexFormat) {
+   case MESA_FORMAT_Z24_S8:
       trb->Base.DataType = GL_UNSIGNED_INT_24_8_EXT;
       trb->Base._BaseFormat = GL_DEPTH_STENCIL;
-   }
-   else if (trb->TexImage->TexFormat == MESA_FORMAT_S8_Z24) {
-      trb->Base.Format = MESA_FORMAT_S8_Z24;
-      trb->Base.DataType = GL_UNSIGNED_INT_24_8_EXT; /* not 8_24 */
+      break;
+   case MESA_FORMAT_S8_Z24:
+      trb->Base.DataType = GL_UNSIGNED_INT_8_24_REV_MESA;
       trb->Base._BaseFormat = GL_DEPTH_STENCIL;
-   }
-   else if (trb->TexImage->TexFormat == MESA_FORMAT_Z16) {
-      trb->Base.Format = MESA_FORMAT_Z16;
+      break;
+   case MESA_FORMAT_Z24_X8:
+      trb->Base.DataType = GL_UNSIGNED_INT_24_8_EXT;
+      trb->Base._BaseFormat = GL_DEPTH_COMPONENT;
+      break;
+   case MESA_FORMAT_X8_Z24:
+      trb->Base.DataType = GL_UNSIGNED_INT_8_24_REV_MESA;
+      trb->Base._BaseFormat = GL_DEPTH_COMPONENT;
+      break;
+   case MESA_FORMAT_Z16:
       trb->Base.DataType = GL_UNSIGNED_SHORT;
       trb->Base._BaseFormat = GL_DEPTH_COMPONENT;
-   }
-   else if (trb->TexImage->TexFormat == MESA_FORMAT_Z32) {
-      trb->Base.Format = MESA_FORMAT_Z32;
+      break;
+   case MESA_FORMAT_Z32:
       trb->Base.DataType = GL_UNSIGNED_INT;
       trb->Base._BaseFormat = GL_DEPTH_COMPONENT;
-   }
-   else {
-      trb->Base.Format = trb->TexImage->TexFormat;
+      break;
+   default:
       trb->Base.DataType = CHAN_TYPE;
       trb->Base._BaseFormat = GL_RGBA;
    }
-- 
cgit v1.2.3