Merge remote-tracking branch 'origin/released'

* origin/released:
  fontconfig mesa xserver git update 9 Mar 2014

Conflicts:
	mesalib/src/mapi/glapi/glapi.h
	xorg-server/hw/kdrive/ephyr/hostx.c

113 files changed, 6735 insertions, 4793 deletions

diff --git a/fontconfig/doc/fccache.fncs b/fontconfig/doc/fccache.fncs
index ca8ffa03c..34ce63f27 100644
--- a/fontconfig/doc/fccache.fncs
+++ b/fontconfig/doc/fccache.fncs
@@ -74,6 +74,7 @@ FcCacheCopySet.
 @PURPOSE@
 This tries to clean up the cache directory of <parameter>cache_dir</parameter>.
 This returns FcTrue if the operation is successfully complete. otherwise FcFalse.
+@SINCE@		2.9.91
 @@
 
 @RET@		void
@@ -83,4 +84,5 @@ This returns FcTrue if the operation is successfully complete. otherwise FcFalse
 @DESC@
 This tries to create CACHEDIR.TAG file at the cache directory registered
 to <parameter>config</parameter>.
+@SINCE@		2.9.91
 @@
diff --git a/fontconfig/doc/fccharset.fncs b/fontconfig/doc/fccharset.fncs
index efcd0ccf1..7245a2a0e 100644
--- a/fontconfig/doc/fccharset.fncs
+++ b/fontconfig/doc/fccharset.fncs
@@ -60,6 +60,7 @@ running out of memory.
 <function>FcCharSetDelChar</function> deletes a single Unicode char from the set,
 returning FcFalse on failure, either as a result of a constant set or from
 running out of memory.
+@SINCE@		2.9.0
 @@
 
 @RET@		FcCharSet *
diff --git a/fontconfig/doc/fcconfig.fncs b/fontconfig/doc/fcconfig.fncs
index 0491a566f..24d7121e4 100644
--- a/fontconfig/doc/fcconfig.fncs
+++ b/fontconfig/doc/fcconfig.fncs
@@ -378,6 +378,7 @@ parse error, semantic error or allocation failure. Otherwise returns FcTrue.
 @PURPOSE@	Obtain the system root directory
 @DESC@
 Obtrains the system root directory in 'config' if available.
+@SINCE@		2.10.92
 @@
 
 @RET@		void
@@ -390,5 +391,6 @@ Set 'sysroot' as the system root directory. fontconfig prepend 'sysroot'
 to the cache directories in order to allow people to generate caches at
 the build time. Note that this causes changing current config. i.e.
 this function calls FcConfigSetCurrent() internally.
+@SINCE@		2.10.92
 @@
 
diff --git a/fontconfig/doc/fcdircache.fncs b/fontconfig/doc/fcdircache.fncs
index ab5e3d9a0..faeba2928 100644
--- a/fontconfig/doc/fcdircache.fncs
+++ b/fontconfig/doc/fcdircache.fncs
@@ -62,6 +62,7 @@ FcDirCacheRead.
 @DESC@
 Re-scan directories only at <parameter>dir</parameter> and update the cache.
 returns NULL if failed.
+@SINCE@		2.11.1
 @@
 
 @RET@		FcCache *
diff --git a/fontconfig/doc/fcformat.fncs b/fontconfig/doc/fcformat.fncs
index c136e8cf2..71b866b88 100644
--- a/fontconfig/doc/fcformat.fncs
+++ b/fontconfig/doc/fcformat.fncs
@@ -305,4 +305,5 @@ For example, the format "%{family|downcase|delete( )}\n" will expand
 to the values of the family element in <parameter>pattern</parameter>,
 lower-cased and with spaces removed.
 
+@SINCE@		2.9.0
 @@
diff --git a/fontconfig/doc/fclangset.fncs b/fontconfig/doc/fclangset.fncs
index c08d60c70..c7ed83b34 100644
--- a/fontconfig/doc/fclangset.fncs
+++ b/fontconfig/doc/fclangset.fncs
@@ -68,6 +68,7 @@ two or three letter language from ISO 639 and Tt is a territory from ISO
 <parameter>lang</parameter> should be of the form Ll-Tt where Ll is a
 two or three letter language from ISO 639 and Tt is a territory from ISO
 3166.
+@SINCE@		2.9.0
 @@
 
 @RET@		FcLangSet *
@@ -77,6 +78,7 @@ two or three letter language from ISO 639 and Tt is a territory from ISO
 @PURPOSE@	Add langsets
 @DESC@
 Returns a set including only those languages found in either <parameter>ls_a</parameter> or <parameter>ls_b</parameter>.
+@SINCE@		2.9.0
 @@
 
 @RET@		FcLangSet *
@@ -86,6 +88,7 @@ Returns a set including only those languages found in either <parameter>ls_a</pa
 @PURPOSE@	Subtract langsets
 @DESC@
 Returns a set including only those languages found in <parameter>ls_a</parameter> but not in <parameter>ls_b</parameter>.
+@SINCE@		2.9.0
 @@
 
 @RET@		FcLangResult
@@ -161,6 +164,8 @@ has no matching language, this function returns FcLangDifferentLang.
 Returns a string set of the default languages according to the environment variables on the system.
 This function looks for them in order of FC_LANG, LC_ALL, LC_CTYPE and LANG then.
 If there are no valid values in those environment variables, "en" will be set as fallback.
+@SINCE@		2.9.91
+@@
 
 @RET@		FcStrSet *
 @FUNC@		FcLangSetGetLangs
@@ -184,6 +189,7 @@ Returns a string set of all known languages.
 @PURPOSE@	Normalize the language string
 @DESC@
 Returns a string to make <parameter>lang</parameter> suitable on fontconfig.
+@SINCE@		2.10.91
 @@
 
 @RET@		const FcCharSet *
diff --git a/fontconfig/doc/fcstrset.fncs b/fontconfig/doc/fcstrset.fncs
index b96489a43..67aa61ac0 100644
--- a/fontconfig/doc/fcstrset.fncs
+++ b/fontconfig/doc/fcstrset.fncs
@@ -104,6 +104,7 @@ Creates an iterator to list the strings in <parameter>set</parameter>.
 @PURPOSE@	get first string in iteration
 @DESC@
 Returns the first string in <parameter>list</parameter>.
+@SINCE@		2.11.0
 @@
 
 @RET@		FcChar8 *
diff --git a/fontconfig/doc/func.sgml b/fontconfig/doc/func.sgml
index 73e7761ce..f076baff2 100644
--- a/fontconfig/doc/func.sgml
+++ b/fontconfig/doc/func.sgml
@@ -33,6 +33,7 @@
 	    <refentrytitle>@FUNC@</refentrytitle>
 @;@
 	    <manvolnum>3</manvolnum>
+	    <refmiscinfo class="software">Fontconfig &version;</refmiscinfo>
 	</refmeta>
 	<refnamediv>
 @{PROTOTYPE@
@@ -82,9 +83,9 @@
 @DESC@
 	    </para>
 	</refsect1>
-	<refsect1><title>Version</title>
-	    <para>
-Fontconfig version &version;
-	    </para>
+@?SINCE@
+	<refsect1><title>Since</title>
+	    <para>version @SINCE@</para>
 	</refsect1>
+@;@
     </refentry>
diff --git a/fontconfig/src/fcstat.c b/fontconfig/src/fcstat.c
index 01371d637..7b054cf78 100644
--- a/fontconfig/src/fcstat.c
+++ b/fontconfig/src/fcstat.c
@@ -186,10 +186,8 @@ FcDirChecksum (const FcChar8 *dir, time_t *checksum)
     struct Adler32 ctx;
     struct dirent **files;
     int n;
-#ifndef HAVE_STRUCT_DIRENT_D_TYPE
     int ret = 0;
     size_t len = strlen ((const char *)dir);
-#endif
 
     Adler32Init (&ctx);
 
@@ -210,7 +208,9 @@ FcDirChecksum (const FcChar8 *dir, time_t *checksum)
 
 #ifdef HAVE_STRUCT_DIRENT_D_TYPE
 	dtype = files[n]->d_type;
-#else
+	if (dtype == DT_UNKNOWN)
+	{
+#endif
 	struct stat statb;
 	char f[PATH_MAX + 1];
 
@@ -227,20 +227,18 @@ FcDirChecksum (const FcChar8 *dir, time_t *checksum)
 	    goto bail;
 
 	dtype = statb.st_mode;
+#ifdef HAVE_STRUCT_DIRENT_D_TYPE
+	}
 #endif
 	Adler32Update (&ctx, files[n]->d_name, dlen + 1);
 	Adler32Update (&ctx, (char *)&dtype, sizeof (int));
 
-#ifndef HAVE_STRUCT_DIRENT_D_TYPE
       bail:
-#endif
 	free (files[n]);
     }
     free (files);
-#ifndef HAVE_STRUCT_DIRENT_D_TYPE
     if (ret == -1)
 	return -1;
-#endif
 
     *checksum = Adler32Finish (&ctx);
 
diff --git a/mesalib/configure.ac b/mesalib/configure.ac
index d54cba36d..3f752664b 100644
--- a/mesalib/configure.ac
+++ b/mesalib/configure.ac
@@ -611,7 +611,7 @@ AC_ARG_ENABLE([omx],
 AC_ARG_ENABLE([opencl],
    [AS_HELP_STRING([--enable-opencl],
          [enable OpenCL library NOTE: Enabling this option will also enable
-          --with-llvm-shared-libs
+          --enable-llvm-shared-libs
           @<:@default=no@:>@])],
    [],
    [enable_opencl=no])
@@ -994,6 +994,10 @@ if test "x$enable_dri" = xyes; then
             DEFINES="$DEFINES -DHAVE_DRI3"
         fi
 
+        if test "x$have_libudev" != xyes; then
+            AC_MSG_ERROR([libudev-dev required for building DRI])
+        fi
+
         case "$host_cpu" in
         powerpc* | sparc*)
             # Build only the drivers for cards that exist on PowerPC/sparc
@@ -1068,7 +1072,7 @@ if test -n "$with_dri_drivers"; then
 
     dri_drivers=`IFS=', '; echo $with_dri_drivers`
     for driver in $dri_drivers; do
-        DRI_DIRS+="$driver "
+        DRI_DIRS="$DRI_DIRS $driver"
         case "x$driver" in
         xi915)
             HAVE_I915_DRI=yes;
@@ -1888,7 +1892,7 @@ if test "x$MESA_LLVM" != x0; then
 	can use the --with-llvm-prefix= configure flag to specify this directory.
 	NOTE: Mesa is attempting to use llvm shared libraries because you have
 	passed one of the following options to configure:
-		--with-llvm-shared-libs
+		--enable-llvm-shared-libs
 		--enable-opencl
 	If you do not want to build with llvm shared libraries and instead want to
 	use llvm static libraries then remove these options from your configure
diff --git a/mesalib/docs/GL3.txt b/mesalib/docs/GL3.txt
index 755a89c0f..9758dcca2 100644
--- a/mesalib/docs/GL3.txt
+++ b/mesalib/docs/GL3.txt
@@ -158,7 +158,7 @@ GL 4.3:
   GL_ARB_robust_buffer_access_behavior                 not started
   GL_ARB_shader_image_size                             not started
   GL_ARB_shader_storage_buffer_object                  not started
-  GL_ARB_stencil_texturing                             not started
+  GL_ARB_stencil_texturing                             DONE (i965/gen8+)
   GL_ARB_texture_buffer_range                          DONE (nv50, nvc0, i965, r600, radeonsi)
   GL_ARB_texture_query_levels                          DONE (i965)
   GL_ARB_texture_storage_multisample                   DONE (all drivers that support GL_ARB_texture_multisample)
@@ -177,7 +177,7 @@ GL 4.4:
   GL_ARB_query_buffer_object                           not started
   GL_ARB_texture_mirror_clamp_to_edge                  DONE (i965, nv30, nv50, nvc0, r300, r600, radeonsi, swrast)
   GL_ARB_texture_stencil8                              not started
-  GL_ARB_vertex_type_10f_11f_11f_rev                   DONE (i965, r600)
+  GL_ARB_vertex_type_10f_11f_11f_rev                   DONE (i965, nv50, nvc0, r600)
 
 
 More info about these features and the work involved can be found at
diff --git a/mesalib/docs/index.html b/mesalib/docs/index.html
index 4f92801b5..925c22cd4 100644
--- a/mesalib/docs/index.html
+++ b/mesalib/docs/index.html
@@ -16,6 +16,13 @@
 
 <h1>News</h1>
 
+<h2>March 4, 2014</h2>
+<p>
+<a href="relnotes/10.1.html">Mesa 10.1</a> is released.
+This is a new development release.
+See the release notes for more information about the release.
+</p>
+
 <h2>February 3, 2014</h2>
 <p>
 <a href="relnotes/10.0.3.html">Mesa 10.0.3</a> is released.
diff --git a/mesalib/docs/relnotes/10.1.html b/mesalib/docs/relnotes/10.1.html
index 8626b65fd..991388238 100644
--- a/mesalib/docs/relnotes/10.1.html
+++ b/mesalib/docs/relnotes/10.1.html
@@ -14,7 +14,7 @@
 <iframe src="../contents.html"></iframe>
 <div class="content">
 
-<h1>Mesa 10.1 Release Notes / TBD</h1>
+<h1>Mesa 10.1 Release Notes / March 4, 2014</h1>
 
 <p>
 Mesa 10.1 is a new development release.
@@ -33,7 +33,9 @@ because compatibility contexts are not supported.
 
 <h2>MD5 checksums</h2>
 <pre>
-TBD.
+3ec43f79dbcd9aa2a4a27bf1f51655b6  MesaLib-10.1.0.tar.bz2
+08e796ec7122aa299d32d4f67a254315  MesaLib-10.1.0.tar.gz
+bd365356543f4b38e57c1ddf7a317c40  MesaLib-10.1.0.zip
 </pre>
 
 
@@ -44,7 +46,6 @@ Note: some of the new features are only available with certain drivers.
 </p>
 
 <ul>
-<li>GL_ARB_buffer_storage on r300, r600, and radeonsi</li>
 <li>GL_ARB_draw_indirect on i965.</li>
 <li>GL_ARB_clear_buffer_object</li>
 <li>GL_ARB_viewport_array on i965.</li>
diff --git a/mesalib/docs/relnotes/10.2.html b/mesalib/docs/relnotes/10.2.html
index 332c33a3f..da79e7d80 100644
--- a/mesalib/docs/relnotes/10.2.html
+++ b/mesalib/docs/relnotes/10.2.html
@@ -44,6 +44,8 @@ Note: some of the new features are only available with certain drivers.
 </p>
 
 <ul>
+<li>GL_ARB_buffer_storage on r300, r600, and radeonsi</li>
+<li>GL_ARB_stencil_texturing on i965/gen8+</li>
 </ul>
 
 
diff --git a/mesalib/include/c11/threads_win32.h b/mesalib/include/c11/threads_win32.h
index be1a38957..d4c2a72d2 100644
--- a/mesalib/include/c11/threads_win32.h
+++ b/mesalib/include/c11/threads_win32.h
@@ -146,7 +146,7 @@ static unsigned __stdcall impl_thrd_routine(void *p)
 
 static DWORD impl_xtime2msec(const xtime *xt)
 {
-    return (DWORD)((xt->sec * 1000u) + (xt->nsec / 1000));
+    return (DWORD)((xt->sec * 1000U) + (xt->nsec / 1000000L));
 }
 
 #ifdef EMULATED_THREADS_USE_NATIVE_CALL_ONCE
@@ -492,12 +492,42 @@ thrd_create(thrd_t *thr, thrd_start_t func, void *arg)
     return thrd_success;
 }
 
+#if 0
 // 7.25.5.2
 static inline thrd_t
 thrd_current(void)
 {
-    return GetCurrentThread();
+    HANDLE hCurrentThread;
+    BOOL bRet;
+
+    /* GetCurrentThread() returns a pseudo-handle, which is useless.  We need
+     * to call DuplicateHandle to get a real handle.  However the handle value
+     * will not match the one returned by thread_create.
+     *
+     * Other potential solutions would be:
+     * - define thrd_t as a thread Ids, but this would mean we'd need to OpenThread for many operations
+     * - use malloc'ed memory for thrd_t. This would imply using TLS for current thread.
+     *
+     * Neither is particularly nice.
+     *
+     * Life would be much easier if C11 threads had different abstractions for
+     * threads and thread IDs, just like C++11 threads does...
+     */
+
+    bRet = DuplicateHandle(GetCurrentProcess(), // source process (pseudo) handle
+                           GetCurrentThread(), // source (pseudo) handle
+                           GetCurrentProcess(), // target process
+                           &hCurrentThread, // target handle
+                           0,
+                           FALSE,
+                           DUPLICATE_SAME_ACCESS);
+    assert(bRet);
+    if (!bRet) {
+	hCurrentThread = GetCurrentThread();
+    }
+    return hCurrentThread;
 }
+#endif
 
 // 7.25.5.3
 static inline int
@@ -511,7 +541,7 @@ thrd_detach(thrd_t thr)
 static inline int
 thrd_equal(thrd_t thr0, thrd_t thr1)
 {
-    return (thr0 == thr1);
+    return GetThreadId(thr0) == GetThreadId(thr1);
 }
 
 // 7.25.5.5
diff --git a/mesalib/scons/llvm.py b/mesalib/scons/llvm.py
index 6282cb538..134a0728e 100644
--- a/mesalib/scons/llvm.py
+++ b/mesalib/scons/llvm.py
@@ -204,6 +204,7 @@ def generate(env):
             env.ParseConfig('llvm-config --ldflags')
             if llvm_version >= distutils.version.LooseVersion('3.5'):
                 env.ParseConfig('llvm-config --system-libs')
+                env.Append(CXXFLAGS = ['-std=c++11'])
         except OSError:
             print 'scons: llvm-config version %s failed' % llvm_version
             return
diff --git a/mesalib/src/gallium/auxiliary/util/u_blitter.c b/mesalib/src/gallium/auxiliary/util/u_blitter.c
index 95e7fb631..66b511eb5 100644
--- a/mesalib/src/gallium/auxiliary/util/u_blitter.c
+++ b/mesalib/src/gallium/auxiliary/util/u_blitter.c
@@ -364,6 +364,8 @@ void util_blitter_destroy(struct blitter_context *blitter)
    pipe->delete_vs_state(pipe, ctx->vs);
    if (ctx->vs_pos_only)
       pipe->delete_vs_state(pipe, ctx->vs_pos_only);
+   if (ctx->vs_layered)
+      pipe->delete_vs_state(pipe, ctx->vs_layered);
    pipe->delete_vertex_elements_state(pipe, ctx->velem_state);
    for (i = 0; i < 4; i++) {
       if (ctx->velem_state_readbuf[i]) {
diff --git a/mesalib/src/gallium/auxiliary/util/u_format.csv b/mesalib/src/gallium/auxiliary/util/u_format.csv
index 8d04b00c4..8fb068b81 100644
--- a/mesalib/src/gallium/auxiliary/util/u_format.csv
+++ b/mesalib/src/gallium/auxiliary/util/u_format.csv
@@ -272,8 +272,8 @@ PIPE_FORMAT_NV12                  , other, 1, 1, x8  , x8  , x8  , x8  , xyzw, y
 PIPE_FORMAT_NV21                  , other, 1, 1, x8  , x8  , x8  , x8  , xyzw, yuv
 
 # Usually used to implement IA44 and AI44 formats in video decoding
-PIPE_FORMAT_R4A4_UNORM            , plain, 1, 1, un4 , un4 ,     ,     , y00x, rgb
-PIPE_FORMAT_A4R4_UNORM            , plain, 1, 1, un4 , un4 ,     ,     , x00y, rgb
+PIPE_FORMAT_A4R4_UNORM            , plain, 1, 1, un4 , un4 ,     ,     , y00x, rgb
+PIPE_FORMAT_R4A4_UNORM            , plain, 1, 1, un4 , un4 ,     ,     , x00y, rgb
 PIPE_FORMAT_R8A8_UNORM            , plain, 1, 1, un8 , un8 ,     ,     , x00y, rgb
 PIPE_FORMAT_A8R8_UNORM            , plain, 1, 1, un8 , un8 ,     ,     , y00x, rgb
 
diff --git a/mesalib/src/gallium/auxiliary/util/u_format.h b/mesalib/src/gallium/auxiliary/util/u_format.h
index e36a9e237..747e1429d 100644
--- a/mesalib/src/gallium/auxiliary/util/u_format.h
+++ b/mesalib/src/gallium/auxiliary/util/u_format.h
@@ -1060,8 +1060,7 @@ util_format_luminance_to_red(enum pipe_format format)
       return PIPE_FORMAT_RGTC1_SNORM;
 
    case PIPE_FORMAT_L4A4_UNORM:
-      /* XXX A4R4 is defined as x00y in u_format.csv */
-      return PIPE_FORMAT_A4R4_UNORM;
+      return PIPE_FORMAT_R4A4_UNORM;
 
    case PIPE_FORMAT_L8A8_UNORM:
       return PIPE_FORMAT_R8A8_UNORM;
diff --git a/mesalib/src/glsl/ast.h b/mesalib/src/glsl/ast.h
index c7710e5d6..eb047e0a2 100644
--- a/mesalib/src/glsl/ast.h
+++ b/mesalib/src/glsl/ast.h
@@ -79,10 +79,10 @@ public:
       struct YYLTYPE locp;
 
       locp.source = this->location.source;
-      locp.first_line = this->location.line;
-      locp.first_column = this->location.column;
-      locp.last_line = locp.first_line;
-      locp.last_column = locp.first_column;
+      locp.first_line = this->location.first_line;
+      locp.first_column = this->location.first_column;
+      locp.last_line = this->location.last_line;
+      locp.last_column = this->location.last_column;
 
       return locp;
    }
@@ -95,17 +95,35 @@ public:
    void set_location(const struct YYLTYPE &locp)
    {
       this->location.source = locp.source;
-      this->location.line = locp.first_line;
-      this->location.column = locp.first_column;
+      this->location.first_line = locp.first_line;
+      this->location.first_column = locp.first_column;
+      this->location.last_line = locp.last_line;
+      this->location.last_column = locp.last_column;
+   }
+
+   /**
+    * Set the source location range of an AST node using two location nodes
+    *
+    * \sa ast_node::set_location
+    */
+   void set_location_range(const struct YYLTYPE &begin, const struct YYLTYPE &end)
+   {
+      this->location.source = begin.source;
+      this->location.first_line = begin.first_line;
+      this->location.last_line = end.last_line;
+      this->location.first_column = begin.first_column;
+      this->location.last_column = end.last_column;
    }
 
    /**
     * Source location of the AST node.
     */
    struct {
-      unsigned source;    /**< GLSL source number. */
-      unsigned line;      /**< Line number within the source string. */
-      unsigned column;    /**< Column in the line. */
+      unsigned source;          /**< GLSL source number. */
+      unsigned first_line;      /**< First line number within the source string. */
+      unsigned first_column;    /**< First column in the first line. */
+      unsigned last_line;       /**< Last line number within the source string. */
+      unsigned last_column;     /**< Last column in the last line. */
    } location;
 
    exec_node link;
diff --git a/mesalib/src/glsl/glcpp/glcpp-lex.l b/mesalib/src/glsl/glcpp/glcpp-lex.l
index ea3b862e4..188e45466 100644
--- a/mesalib/src/glsl/glcpp/glcpp-lex.l
+++ b/mesalib/src/glsl/glcpp/glcpp-lex.l
@@ -47,8 +47,9 @@ void glcpp_set_column (int  column_no , yyscan_t yyscanner);
 		if (parser->has_new_source_number)			\
 			yylloc->source = parser->new_source_number;	\
 		yylloc->first_column = yycolumn + 1;			\
-		yylloc->first_line = yylineno;				\
+		yylloc->first_line = yylloc->last_line = yylineno;	\
 		yycolumn += yyleng;					\
+		yylloc->last_column = yycolumn + 1;			\
 		parser->has_new_line_number = 0;			\
 		parser->has_new_source_number = 0;			\
  } while(0);
@@ -337,7 +338,7 @@ HEXADECIMAL_INTEGER	0[xX][0-9a-fA-F]+[uU]?
 	return OTHER;
 }
 
-{HSPACE}+ {
+{HSPACE} {
 	if (yyextra->space_tokens) {
 		return SPACE;
 	}
diff --git a/mesalib/src/glsl/glsl_lexer.ll b/mesalib/src/glsl/glsl_lexer.ll
index 9fd9b80d3..760235127 100644
--- a/mesalib/src/glsl/glsl_lexer.ll
+++ b/mesalib/src/glsl/glsl_lexer.ll
@@ -38,8 +38,9 @@ static int classify_identifier(struct _mesa_glsl_parse_state *, const char *);
    do {								\
       yylloc->source = 0;					\
       yylloc->first_column = yycolumn + 1;			\
-      yylloc->first_line = yylineno + 1;			\
+      yylloc->first_line = yylloc->last_line = yylineno + 1;	\
       yycolumn += yyleng;					\
+      yylloc->last_column = yycolumn + 1;			\
    } while(0);
 
 #define YY_USER_INIT yylineno = 0; yycolumn = 0;
diff --git a/mesalib/src/glsl/glsl_parser.yy b/mesalib/src/glsl/glsl_parser.yy
index 8751524c2..3798af455 100644
--- a/mesalib/src/glsl/glsl_parser.yy
+++ b/mesalib/src/glsl/glsl_parser.yy
@@ -389,35 +389,35 @@ primary_expression:
    {
       void *ctx = state;
       $$ = new(ctx) ast_expression(ast_identifier, NULL, NULL, NULL);
-      $$->set_location(yylloc);
+      $$->set_location(@1);
       $$->primary_expression.identifier = $1;
    }
    | INTCONSTANT
    {
       void *ctx = state;
       $$ = new(ctx) ast_expression(ast_int_constant, NULL, NULL, NULL);
-      $$->set_location(yylloc);
+      $$->set_location(@1);
       $$->primary_expression.int_constant = $1;
    }
    | UINTCONSTANT
    {
       void *ctx = state;
       $$ = new(ctx) ast_expression(ast_uint_constant, NULL, NULL, NULL);
-      $$->set_location(yylloc);
+      $$->set_location(@1);
       $$->primary_expression.uint_constant = $1;
    }
    | FLOATCONSTANT
    {
       void *ctx = state;
       $$ = new(ctx) ast_expression(ast_float_constant, NULL, NULL, NULL);
-      $$->set_location(yylloc);
+      $$->set_location(@1);
       $$->primary_expression.float_constant = $1;
    }
    | BOOLCONSTANT
    {
       void *ctx = state;
       $$ = new(ctx) ast_expression(ast_bool_constant, NULL, NULL, NULL);
-      $$->set_location(yylloc);
+      $$->set_location(@1);
       $$->primary_expression.bool_constant = $1;
    }
    | '(' expression ')'
@@ -432,7 +432,7 @@ postfix_expression:
    {
       void *ctx = state;
       $$ = new(ctx) ast_expression(ast_array_index, $1, $3, NULL);
-      $$->set_location(yylloc);
+      $$->set_location_range(@1, @4);
    }
    | function_call
    {
@@ -442,20 +442,20 @@ postfix_expression:
    {
       void *ctx = state;
       $$ = new(ctx) ast_expression(ast_field_selection, $1, NULL, NULL);
-      $$->set_location(yylloc);
+      $$->set_location_range(@1, @3);
       $$->primary_expression.identifier = $3;
    }
    | postfix_expression INC_OP
    {
       void *ctx = state;
       $$ = new(ctx) ast_expression(ast_post_inc, $1, NULL, NULL);
-      $$->set_location(yylloc);
+      $$->set_location_range(@1, @2);
    }
    | postfix_expression DEC_OP
    {
       void *ctx = state;
       $$ = new(ctx) ast_expression(ast_post_dec, $1, NULL, NULL);
-      $$->set_location(yylloc);
+      $$->set_location_range(@1, @2);
    }
    ;
 
@@ -473,7 +473,7 @@ function_call_or_method:
    {
       void *ctx = state;
       $$ = new(ctx) ast_expression(ast_field_selection, $1, $3, NULL);
-      $$->set_location(yylloc);
+      $$->set_location_range(@1, @3);
    }
    ;
 
@@ -491,13 +491,13 @@ function_call_header_with_parameters:
    function_call_header assignment_expression
    {
       $$ = $1;
-      $$->set_location(yylloc);
+      $$->set_location(@1);
       $$->expressions.push_tail(& $2->link);
    }
    | function_call_header_with_parameters ',' assignment_expression
    {
       $$ = $1;
-      $$->set_location(yylloc);
+      $$->set_location(@1);
       $$->expressions.push_tail(& $3->link);
    }
    ;
@@ -514,21 +514,23 @@ function_identifier:
    {
       void *ctx = state;
       $$ = new(ctx) ast_function_expression($1);
-      $$->set_location(yylloc);
+      $$->set_location(@1);
       }
    | variable_identifier
    {
       void *ctx = state;
       ast_expression *callee = new(ctx) ast_expression($1);
+      callee->set_location(@1);
       $$ = new(ctx) ast_function_expression(callee);
-      $$->set_location(yylloc);
+      $$->set_location(@1);
       }
    | FIELD_SELECTION
    {
       void *ctx = state;
       ast_expression *callee = new(ctx) ast_expression($1);
+      callee->set_location(@1);
       $$ = new(ctx) ast_function_expression(callee);
-      $$->set_location(yylloc);
+      $$->set_location(@1);
       }
    ;
 
@@ -546,13 +548,13 @@ method_call_header_with_parameters:
    method_call_header assignment_expression
    {
       $$ = $1;
-      $$->set_location(yylloc);
+      $$->set_location(@1);
       $$->expressions.push_tail(& $2->link);
    }
    | method_call_header_with_parameters ',' assignment_expression
    {
       $$ = $1;
-      $$->set_location(yylloc);
+      $$->set_location(@1);
       $$->expressions.push_tail(& $3->link);
    }
    ;
@@ -565,8 +567,9 @@ method_call_header:
    {
       void *ctx = state;
       ast_expression *callee = new(ctx) ast_expression($1);
+      callee->set_location(@1);
       $$ = new(ctx) ast_function_expression(callee);
-      $$->set_location(yylloc);
+      $$->set_location(@1);
    }
    ;
 
@@ -577,19 +580,19 @@ unary_expression:
    {
       void *ctx = state;
       $$ = new(ctx) ast_expression(ast_pre_inc, $2, NULL, NULL);
-      $$->set_location(yylloc);
+      $$->set_location(@1);
    }
    | DEC_OP unary_expression
    {
       void *ctx = state;
       $$ = new(ctx) ast_expression(ast_pre_dec, $2, NULL, NULL);
-      $$->set_location(yylloc);
+      $$->set_location(@1);
    }
    | unary_operator unary_expression
    {
       void *ctx = state;
       $$ = new(ctx) ast_expression($1, $2, NULL, NULL);
-      $$->set_location(yylloc);
+      $$->set_location_range(@1, @2);
    }
    ;
 
@@ -607,19 +610,19 @@ multiplicative_expression:
    {
       void *ctx = state;
       $$ = new(ctx) ast_expression_bin(ast_mul, $1, $3);
-      $$->set_location(yylloc);
+      $$->set_location_range(@1, @3);
    }
    | multiplicative_expression '/' unary_expression
    {
       void *ctx = state;
       $$ = new(ctx) ast_expression_bin(ast_div, $1, $3);
-      $$->set_location(yylloc);
+      $$->set_location_range(@1, @3);
    }
    | multiplicative_expression '%' unary_expression
    {
       void *ctx = state;
       $$ = new(ctx) ast_expression_bin(ast_mod, $1, $3);
-      $$->set_location(yylloc);
+      $$->set_location_range(@1, @3);
    }
    ;
 
@@ -629,13 +632,13 @@ additive_expression:
    {
       void *ctx = state;
       $$ = new(ctx) ast_expression_bin(ast_add, $1, $3);
-      $$->set_location(yylloc);
+      $$->set_location_range(@1, @3);
    }
    | additive_expression '-' multiplicative_expression
    {
       void *ctx = state;
       $$ = new(ctx) ast_expression_bin(ast_sub, $1, $3);
-      $$->set_location(yylloc);
+      $$->set_location_range(@1, @3);
    }
    ;
 
@@ -645,13 +648,13 @@ shift_expression:
    {
       void *ctx = state;
       $$ = new(ctx) ast_expression_bin(ast_lshift, $1, $3);
-      $$->set_location(yylloc);
+      $$->set_location_range(@1, @3);
    }
    | shift_expression RIGHT_OP additive_expression
    {
       void *ctx = state;
       $$ = new(ctx) ast_expression_bin(ast_rshift, $1, $3);
-      $$->set_location(yylloc);
+      $$->set_location_range(@1, @3);
    }
    ;
 
@@ -661,25 +664,25 @@ relational_expression:
    {
       void *ctx = state;
       $$ = new(ctx) ast_expression_bin(ast_less, $1, $3);
-      $$->set_location(yylloc);
+      $$->set_location_range(@1, @3);
    }
    | relational_expression '>' shift_expression
    {
       void *ctx = state;
       $$ = new(ctx) ast_expression_bin(ast_greater, $1, $3);
-      $$->set_location(yylloc);
+      $$->set_location_range(@1, @3);
    }
    | relational_expression LE_OP shift_expression
    {
       void *ctx = state;
       $$ = new(ctx) ast_expression_bin(ast_lequal, $1, $3);
-      $$->set_location(yylloc);
+      $$->set_location_range(@1, @3);
    }
    | relational_expression GE_OP shift_expression
    {
       void *ctx = state;
       $$ = new(ctx) ast_expression_bin(ast_gequal, $1, $3);
-      $$->set_location(yylloc);
+      $$->set_location_range(@1, @3);
    }
    ;
 
@@ -689,13 +692,13 @@ equality_expression:
    {
       void *ctx = state;
       $$ = new(ctx) ast_expression_bin(ast_equal, $1, $3);
-      $$->set_location(yylloc);
+      $$->set_location_range(@1, @3);
    }
    | equality_expression NE_OP relational_expression
    {
       void *ctx = state;
       $$ = new(ctx) ast_expression_bin(ast_nequal, $1, $3);
-      $$->set_location(yylloc);
+      $$->set_location_range(@1, @3);
    }
    ;
 
@@ -705,7 +708,7 @@ and_expression:
    {
       void *ctx = state;
       $$ = new(ctx) ast_expression_bin(ast_bit_and, $1, $3);
-      $$->set_location(yylloc);
+      $$->set_location_range(@1, @3);
    }
    ;
 
@@ -715,7 +718,7 @@ exclusive_or_expression:
    {
       void *ctx = state;
       $$ = new(ctx) ast_expression_bin(ast_bit_xor, $1, $3);
-      $$->set_location(yylloc);
+      $$->set_location_range(@1, @3);
    }
    ;
 
@@ -725,7 +728,7 @@ inclusive_or_expression:
    {
       void *ctx = state;
       $$ = new(ctx) ast_expression_bin(ast_bit_or, $1, $3);
-      $$->set_location(yylloc);
+      $$->set_location_range(@1, @3);
    }
    ;
 
@@ -735,7 +738,7 @@ logical_and_expression:
    {
       void *ctx = state;
       $$ = new(ctx) ast_expression_bin(ast_logic_and, $1, $3);
-      $$->set_location(yylloc);
+      $$->set_location_range(@1, @3);
    }
    ;
 
@@ -745,7 +748,7 @@ logical_xor_expression:
    {
       void *ctx = state;
       $$ = new(ctx) ast_expression_bin(ast_logic_xor, $1, $3);
-      $$->set_location(yylloc);
+      $$->set_location_range(@1, @3);
    }
    ;
 
@@ -755,7 +758,7 @@ logical_or_expression:
    {
       void *ctx = state;
       $$ = new(ctx) ast_expression_bin(ast_logic_or, $1, $3);
-      $$->set_location(yylloc);
+      $$->set_location_range(@1, @3);
    }
    ;
 
@@ -765,7 +768,7 @@ conditional_expression:
    {
       void *ctx = state;
       $$ = new(ctx) ast_expression(ast_conditional, $1, $3, $5);
-      $$->set_location(yylloc);
+      $$->set_location_range(@1, @5);
    }
    ;
 
@@ -775,7 +778,7 @@ assignment_expression:
    {
       void *ctx = state;
       $$ = new(ctx) ast_expression($2, $1, $3, NULL);
-      $$->set_location(yylloc);
+      $$->set_location_range(@1, @3);
    }
    ;
 
@@ -803,7 +806,7 @@ expression:
       void *ctx = state;
       if ($1->oper != ast_sequence) {
          $$ = new(ctx) ast_expression(ast_sequence, NULL, NULL, NULL);
-         $$->set_location(yylloc);
+         $$->set_location_range(@1, @3);
          $$->expressions.push_tail(& $1->link);
       } else {
          $$ = $1;
@@ -865,7 +868,7 @@ function_header:
    {
       void *ctx = state;
       $$ = new(ctx) ast_function();
-      $$->set_location(yylloc);
+      $$->set_location(@2);
       $$->return_type = $1;
       $$->identifier = $2;
 
@@ -879,9 +882,9 @@ parameter_declarator:
    {
       void *ctx = state;
       $$ = new(ctx) ast_parameter_declarator();
-      $$->set_location(yylloc);
+      $$->set_location_range(@1, @2);
       $$->type = new(ctx) ast_fully_specified_type();
-      $$->type->set_location(yylloc);
+      $$->type->set_location(@1);
       $$->type->specifier = $1;
       $$->identifier = $2;
    }
@@ -889,9 +892,9 @@ parameter_declarator:
    {
       void *ctx = state;
       $$ = new(ctx) ast_parameter_declarator();
-      $$->set_location(yylloc);
+      $$->set_location_range(@1, @3);
       $$->type = new(ctx) ast_fully_specified_type();
-      $$->type->set_location(yylloc);
+      $$->type->set_location(@1);
       $$->type->specifier = $1;
       $$->identifier = $2;
       $$->array_specifier = $3;
@@ -908,8 +911,9 @@ parameter_declaration:
    {
       void *ctx = state;
       $$ = new(ctx) ast_parameter_declarator();
-      $$->set_location(yylloc);
+      $$->set_location(@2);
       $$->type = new(ctx) ast_fully_specified_type();
+      $$->type->set_location_range(@1, @2);
       $$->type->qualifier = $1;
       $$->type->specifier = $2;
    }
@@ -981,7 +985,7 @@ init_declarator_list:
    {
       void *ctx = state;
       ast_declaration *decl = new(ctx) ast_declaration($3, NULL, NULL);
-      decl->set_location(yylloc);
+      decl->set_location(@3);
 
       $$ = $1;
       $$->declarations.push_tail(&decl->link);
@@ -991,7 +995,7 @@ init_declarator_list:
    {
       void *ctx = state;
       ast_declaration *decl = new(ctx) ast_declaration($3, $4, NULL);
-      decl->set_location(yylloc);
+      decl->set_location_range(@3, @4);
 
       $$ = $1;
       $$->declarations.push_tail(&decl->link);
@@ -1001,7 +1005,7 @@ init_declarator_list:
    {
       void *ctx = state;
       ast_declaration *decl = new(ctx) ast_declaration($3, $4, $6);
-      decl->set_location(yylloc);
+      decl->set_location_range(@3, @4);
 
       $$ = $1;
       $$->declarations.push_tail(&decl->link);
@@ -1011,7 +1015,7 @@ init_declarator_list:
    {
       void *ctx = state;
       ast_declaration *decl = new(ctx) ast_declaration($3, NULL, $5);
-      decl->set_location(yylloc);
+      decl->set_location(@3);
 
       $$ = $1;
       $$->declarations.push_tail(&decl->link);
@@ -1026,51 +1030,56 @@ single_declaration:
       void *ctx = state;
       /* Empty declaration list is valid. */
       $$ = new(ctx) ast_declarator_list($1);
-      $$->set_location(yylloc);
+      $$->set_location(@1);
    }
    | fully_specified_type any_identifier
    {
       void *ctx = state;
       ast_declaration *decl = new(ctx) ast_declaration($2, NULL, NULL);
+      decl->set_location(@2);
 
       $$ = new(ctx) ast_declarator_list($1);
-      $$->set_location(yylloc);
+      $$->set_location_range(@1, @2);
       $$->declarations.push_tail(&decl->link);
    }
    | fully_specified_type any_identifier array_specifier
    {
       void *ctx = state;
       ast_declaration *decl = new(ctx) ast_declaration($2, $3, NULL);
+      decl->set_location_range(@2, @3);
 
       $$ = new(ctx) ast_declarator_list($1);
-      $$->set_location(yylloc);
+      $$->set_location_range(@1, @3);
       $$->declarations.push_tail(&decl->link);
    }
    | fully_specified_type any_identifier array_specifier '=' initializer
    {
       void *ctx = state;
       ast_declaration *decl = new(ctx) ast_declaration($2, $3, $5);
+      decl->set_location_range(@2, @3);
 
       $$ = new(ctx) ast_declarator_list($1);
-      $$->set_location(yylloc);
+      $$->set_location_range(@1, @3);
       $$->declarations.push_tail(&decl->link);
    }
    | fully_specified_type any_identifier '=' initializer
    {
       void *ctx = state;
       ast_declaration *decl = new(ctx) ast_declaration($2, NULL, $4);
+      decl->set_location(@2);
 
       $$ = new(ctx) ast_declarator_list($1);
-      $$->set_location(yylloc);
+      $$->set_location_range(@1, @2);
       $$->declarations.push_tail(&decl->link);
    }
    | INVARIANT variable_identifier // Vertex only.
    {
       void *ctx = state;
       ast_declaration *decl = new(ctx) ast_declaration($2, NULL, NULL);
+      decl->set_location(@2);
 
       $$ = new(ctx) ast_declarator_list(NULL);
-      $$->set_location(yylloc);
+      $$->set_location_range(@1, @2);
       $$->invariant = true;
 
       $$->declarations.push_tail(&decl->link);
@@ -1082,14 +1091,14 @@ fully_specified_type:
    {
       void *ctx = state;
       $$ = new(ctx) ast_fully_specified_type();
-      $$->set_location(yylloc);
+      $$->set_location(@1);
       $$->specifier = $1;
    }
    | type_qualifier type_specifier
    {
       void *ctx = state;
       $$ = new(ctx) ast_fully_specified_type();
-      $$->set_location(yylloc);
+      $$->set_location_range(@1, @2);
       $$->qualifier = $1;
       $$->specifier = $2;
    }
@@ -1697,12 +1706,14 @@ array_specifier:
    '[' ']'
    {
       void *ctx = state;
-      $$ = new(ctx) ast_array_specifier(yylloc);
+      $$ = new(ctx) ast_array_specifier(@1);
+      $$->set_location_range(@1, @2);
    }
    | '[' constant_expression ']'
    {
       void *ctx = state;
-      $$ = new(ctx) ast_array_specifier(yylloc, $2);
+      $$ = new(ctx) ast_array_specifier(@1, $2);
+      $$->set_location_range(@1, @3);
    }
    | array_specifier '[' ']'
    {
@@ -1746,19 +1757,19 @@ type_specifier_nonarray:
    {
       void *ctx = state;
       $$ = new(ctx) ast_type_specifier($1);
-      $$->set_location(yylloc);
+      $$->set_location(@1);
    }
    | struct_specifier
    {
       void *ctx = state;
       $$ = new(ctx) ast_type_specifier($1);
-      $$->set_location(yylloc);
+      $$->set_location(@1);
    }
    | TYPE_IDENTIFIER
    {
       void *ctx = state;
       $$ = new(ctx) ast_type_specifier($1);
-      $$->set_location(yylloc);
+      $$->set_location(@1);
    }
    ;
 
@@ -1889,7 +1900,7 @@ struct_specifier:
    {
       void *ctx = state;
       $$ = new(ctx) ast_struct_specifier($2, $4);
-      $$->set_location(yylloc);
+      $$->set_location_range(@2, @5);
       state->symbols->add_type($2, glsl_type::void_type);
       state->symbols->add_type_ast($2, new(ctx) ast_type_specifier($$));
    }
@@ -1897,7 +1908,7 @@ struct_specifier:
    {
       void *ctx = state;
       $$ = new(ctx) ast_struct_specifier(NULL, $3);
-      $$->set_location(yylloc);
+      $$->set_location_range(@2, @4);
    }
    ;
 
@@ -1919,7 +1930,7 @@ struct_declaration:
    {
       void *ctx = state;
       ast_fully_specified_type *const type = $1;
-      type->set_location(yylloc);
+      type->set_location(@1);
 
       if (type->qualifier.flags.i != 0)
          _mesa_glsl_error(&@1, state,
@@ -1927,7 +1938,7 @@ struct_declaration:
 			  "structure members");
 
       $$ = new(ctx) ast_declarator_list(type);
-      $$->set_location(yylloc);
+      $$->set_location(@2);
 
       $$->declarations.push_degenerate_list_at_head(& $2->link);
    }
@@ -1951,13 +1962,13 @@ struct_declarator:
    {
       void *ctx = state;
       $$ = new(ctx) ast_declaration($1, NULL, NULL);
-      $$->set_location(yylloc);
+      $$->set_location(@1);
    }
    | any_identifier array_specifier
    {
       void *ctx = state;
       $$ = new(ctx) ast_declaration($1, $2, NULL);
-      $$->set_location(yylloc);
+      $$->set_location_range(@1, @2);
    }
    ;
 
@@ -1978,7 +1989,7 @@ initializer_list:
    {
       void *ctx = state;
       $$ = new(ctx) ast_aggregate_initializer();
-      $$->set_location(yylloc);
+      $$->set_location(@1);
       $$->expressions.push_tail(& $1->link);
    }
    | initializer_list ',' initializer
@@ -2012,7 +2023,7 @@ compound_statement:
    {
       void *ctx = state;
       $$ = new(ctx) ast_compound_statement(true, NULL);
-      $$->set_location(yylloc);
+      $$->set_location_range(@1, @2);
    }
    | '{'
    {
@@ -2022,7 +2033,7 @@ compound_statement:
    {
       void *ctx = state;
       $$ = new(ctx) ast_compound_statement(true, $3);
-      $$->set_location(yylloc);
+      $$->set_location_range(@1, @4);
       state->symbols->pop_scope();
    }
    ;
@@ -2037,13 +2048,13 @@ compound_statement_no_new_scope:
    {
       void *ctx = state;
       $$ = new(ctx) ast_compound_statement(false, NULL);
-      $$->set_location(yylloc);
+      $$->set_location_range(@1, @2);
    }
    | '{' statement_list '}'
    {
       void *ctx = state;
       $$ = new(ctx) ast_compound_statement(false, $2);
-      $$->set_location(yylloc);
+      $$->set_location_range(@1, @3);
    }
    ;
 
@@ -2074,13 +2085,13 @@ expression_statement:
    {
       void *ctx = state;
       $$ = new(ctx) ast_expression_statement(NULL);
-      $$->set_location(yylloc);
+      $$->set_location(@1);
    }
    | expression ';'
    {
       void *ctx = state;
       $$ = new(ctx) ast_expression_statement($1);
-      $$->set_location(yylloc);
+      $$->set_location(@1);
    }
    ;
 
@@ -2089,7 +2100,7 @@ selection_statement:
    {
       $$ = new(state) ast_selection_statement($3, $5.then_statement,
                                               $5.else_statement);
-      $$->set_location(yylloc);
+      $$->set_location_range(@1, @5);
    }
    ;
 
@@ -2116,8 +2127,8 @@ condition:
       void *ctx = state;
       ast_declaration *decl = new(ctx) ast_declaration($2, NULL, $4);
       ast_declarator_list *declarator = new(ctx) ast_declarator_list($1);
-      decl->set_location(yylloc);
-      declarator->set_location(yylloc);
+      decl->set_location_range(@2, @4);
+      declarator->set_location(@1);
 
       declarator->declarations.push_tail(&decl->link);
       $$ = declarator;
@@ -2132,7 +2143,7 @@ switch_statement:
    SWITCH '(' expression ')' switch_body
    {
       $$ = new(state) ast_switch_statement($3, $5);
-      $$->set_location(yylloc);
+      $$->set_location_range(@1, @5);
    }
    ;
 
@@ -2140,12 +2151,12 @@ switch_body:
    '{' '}'
    {
       $$ = new(state) ast_switch_body(NULL);
-      $$->set_location(yylloc);
+      $$->set_location_range(@1, @2);
    }
    | '{' case_statement_list '}'
    {
       $$ = new(state) ast_switch_body($2);
-      $$->set_location(yylloc);
+      $$->set_location_range(@1, @3);
    }
    ;
 
@@ -2153,12 +2164,12 @@ case_label:
    CASE expression ':'
    {
       $$ = new(state) ast_case_label($2);
-      $$->set_location(yylloc);
+      $$->set_location(@2);
    }
    | DEFAULT ':'
    {
       $$ = new(state) ast_case_label(NULL);
-      $$->set_location(yylloc);
+      $$->set_location(@2);
    }
    ;
 
@@ -2169,7 +2180,7 @@ case_label_list:
 
       labels->labels.push_tail(& $1->link);
       $$ = labels;
-      $$->set_location(yylloc);
+      $$->set_location(@1);
    }
    | case_label_list case_label
    {
@@ -2182,7 +2193,7 @@ case_statement:
    case_label_list statement
    {
       ast_case_statement *stmts = new(state) ast_case_statement($1);
-      stmts->set_location(yylloc);
+      stmts->set_location(@2);
 
       stmts->stmts.push_tail(& $2->link);
       $$ = stmts;
@@ -2198,7 +2209,7 @@ case_statement_list:
    case_statement
    {
       ast_case_statement_list *cases= new(state) ast_case_statement_list();
-      cases->set_location(yylloc);
+      cases->set_location(@1);
 
       cases->cases.push_tail(& $1->link);
       $$ = cases;
@@ -2216,21 +2227,21 @@ iteration_statement:
       void *ctx = state;
       $$ = new(ctx) ast_iteration_statement(ast_iteration_statement::ast_while,
                                             NULL, $3, NULL, $5);
-      $$->set_location(yylloc);
+      $$->set_location_range(@1, @4);
    }
    | DO statement WHILE '(' expression ')' ';'
    {
       void *ctx = state;
       $$ = new(ctx) ast_iteration_statement(ast_iteration_statement::ast_do_while,
                                             NULL, $5, NULL, $2);
-      $$->set_location(yylloc);
+      $$->set_location_range(@1, @6);
    }
    | FOR '(' for_init_statement for_rest_statement ')' statement_no_new_scope
    {
       void *ctx = state;
       $$ = new(ctx) ast_iteration_statement(ast_iteration_statement::ast_for,
                                             $3, $4.cond, $4.rest, $6);
-      $$->set_location(yylloc);
+      $$->set_location_range(@1, @6);
    }
    ;
 
@@ -2266,31 +2277,31 @@ jump_statement:
    {
       void *ctx = state;
       $$ = new(ctx) ast_jump_statement(ast_jump_statement::ast_continue, NULL);
-      $$->set_location(yylloc);
+      $$->set_location(@1);
    }
    | BREAK ';'
    {
       void *ctx = state;
       $$ = new(ctx) ast_jump_statement(ast_jump_statement::ast_break, NULL);
-      $$->set_location(yylloc);
+      $$->set_location(@1);
    }
    | RETURN ';'
    {
       void *ctx = state;
       $$ = new(ctx) ast_jump_statement(ast_jump_statement::ast_return, NULL);
-      $$->set_location(yylloc);
+      $$->set_location(@1);
    }
    | RETURN expression ';'
    {
       void *ctx = state;
       $$ = new(ctx) ast_jump_statement(ast_jump_statement::ast_return, $2);
-      $$->set_location(yylloc);
+      $$->set_location_range(@1, @2);
    }
    | DISCARD ';' // Fragment shader only.
    {
       void *ctx = state;
       $$ = new(ctx) ast_jump_statement(ast_jump_statement::ast_discard, NULL);
-      $$->set_location(yylloc);
+      $$->set_location(@1);
    }
    ;
 
@@ -2306,7 +2317,7 @@ function_definition:
    {
       void *ctx = state;
       $$ = new(ctx) ast_function_definition();
-      $$->set_location(yylloc);
+      $$->set_location_range(@1, @2);
       $$->prototype = $1;
       $$->body = $2;
 
@@ -2455,11 +2466,13 @@ instance_name_opt:
    {
       $$ = new(state) ast_interface_block(*state->default_uniform_qualifier,
                                           $1, NULL);
+      $$->set_location(@1);
    }
    | NEW_IDENTIFIER array_specifier
    {
       $$ = new(state) ast_interface_block(*state->default_uniform_qualifier,
                                           $1, $2);
+      $$->set_location_range(@1, @2);
    }
    ;
 
@@ -2481,7 +2494,7 @@ member_declaration:
    {
       void *ctx = state;
       ast_fully_specified_type *type = $1;
-      type->set_location(yylloc);
+      type->set_location(@1);
 
       if (type->qualifier.flags.q.attribute) {
          _mesa_glsl_error(& @1, state,
@@ -2494,7 +2507,7 @@ member_declaration:
       }
 
       $$ = new(ctx) ast_declarator_list(type);
-      $$->set_location(yylloc);
+      $$->set_location(@2);
 
       $$->declarations.push_degenerate_list_at_head(& $2->link);
    }
diff --git a/mesalib/src/glsl/glsl_parser_extras.cpp b/mesalib/src/glsl/glsl_parser_extras.cpp
index d7f5202fe..61ae62150 100644
--- a/mesalib/src/glsl/glsl_parser_extras.cpp
+++ b/mesalib/src/glsl/glsl_parser_extras.cpp
@@ -807,8 +807,10 @@ ast_node::print(void) const
 ast_node::ast_node(void)
 {
    this->location.source = 0;
-   this->location.line = 0;
-   this->location.column = 0;
+   this->location.first_line = 0;
+   this->location.first_column = 0;
+   this->location.last_line = 0;
+   this->location.last_column = 0;
 }
 
 
diff --git a/mesalib/src/glsl/link_uniforms.cpp b/mesalib/src/glsl/link_uniforms.cpp
index 8d38324fb..5114a0a65 100644
--- a/mesalib/src/glsl/link_uniforms.cpp
+++ b/mesalib/src/glsl/link_uniforms.cpp
@@ -775,9 +775,10 @@ link_set_image_access_qualifiers(struct gl_shader_program *prog)
 
          if (var && var->data.mode == ir_var_uniform &&
              var->type->contains_image()) {
-            unsigned id;
+            unsigned id = 0;
             bool found = prog->UniformHash->get(id, var->name);
             assert(found);
+            (void) found;
             const gl_uniform_storage *storage = &prog->UniformStorage[id];
             const unsigned index = storage->image[i].index;
             const GLenum access = (var->data.image.read_only ? GL_READ_ONLY :
diff --git a/mesalib/src/mapi/entry.c b/mesalib/src/mapi/entry.c
index 128f0115d..b6e8db28d 100644
--- a/mesalib/src/mapi/entry.c
+++ b/mesalib/src/mapi/entry.c
@@ -36,7 +36,7 @@
 #ifdef MAPI_MODE_BRIDGE
 #define ENTRY_CURRENT_TABLE_GET "_glapi_get_dispatch"
 #else
-#define ENTRY_CURRENT_TABLE_GET U_STRINGIFY(u_current_get_internal)
+#define ENTRY_CURRENT_TABLE_GET U_STRINGIFY(u_current_get_table_internal)
 #endif
 
 #if defined(USE_X86_ASM) && defined(__GNUC__)
@@ -57,7 +57,7 @@ entry_current_get(void)
 #ifdef MAPI_MODE_BRIDGE
    return GET_DISPATCH();
 #else
-   return u_current_get();
+   return u_current_get_table();
 #endif
 }
 
diff --git a/mesalib/src/mapi/glapi/gen/ARB_debug_output.xml b/mesalib/src/mapi/glapi/gen/ARB_debug_output.xml
index 11f268dc6..0468d570c 100644
--- a/mesalib/src/mapi/glapi/gen/ARB_debug_output.xml
+++ b/mesalib/src/mapi/glapi/gen/ARB_debug_output.xml
@@ -52,7 +52,7 @@
     <enum name="DEBUG_SEVERITY_LOW_ARB"                    value="0x9148"/>
 
 
-    <function name="DebugMessageControlARB" offset="assign">
+    <function name="DebugMessageControlARB" alias="DebugMessageControl">
         <param name="source" type="GLenum"/>
         <param name="type" type="GLenum"/>
         <param name="severity" type="GLenum"/>
@@ -61,7 +61,7 @@
         <param name="enabled" type="GLboolean"/>
     </function>
 
-    <function name="DebugMessageInsertARB" offset="assign">
+    <function name="DebugMessageInsertARB" alias="DebugMessageInsert">
         <param name="source" type="GLenum"/>
         <param name="type" type="GLenum"/>
         <param name="id" type="GLuint"/>
@@ -70,12 +70,12 @@
         <param name="buf" type="const GLcharARB *"/>
     </function>
 
-    <function name="DebugMessageCallbackARB" offset="assign">
+    <function name="DebugMessageCallbackARB" alias="DebugMessageCallback">
         <param name="callback" type="GLDEBUGPROCARB"/>
         <param name="userParam" type="const GLvoid *"/>
     </function>
 
-    <function name="GetDebugMessageLogARB" offset="assign">
+    <function name="GetDebugMessageLogARB" alias="GetDebugMessageLog">
         <return type="GLuint"/>
         <param name="count" type="GLuint"/>
         <param name="bufsize" type="GLsizei"/>
diff --git a/mesalib/src/mapi/glapi/gen/GL4x.xml b/mesalib/src/mapi/glapi/gen/GL4x.xml
index 6706278ce..8efef0b91 100644
--- a/mesalib/src/mapi/glapi/gen/GL4x.xml
+++ b/mesalib/src/mapi/glapi/gen/GL4x.xml
@@ -15,7 +15,7 @@
 </category>
 
 <category name="4.3">
-
+  <enum name="DEPTH_STENCIL_TEXTURE_MODE"              value="0x90EA"/>
 </category>
 
 </OpenGLAPI>
diff --git a/mesalib/src/mapi/glapi/gen/KHR_debug.xml b/mesalib/src/mapi/glapi/gen/KHR_debug.xml
new file mode 100644
index 000000000..48f7fa762
--- /dev/null
+++ b/mesalib/src/mapi/glapi/gen/KHR_debug.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0"?>
+<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
+
+<OpenGLAPI>
+
+<category name="GL_KHR_debug" number="119">
+  <enum name="DEBUG_OUTPUT"                               value="0x92E0"/>
+  <enum name="DEBUG_OUTPUT_SYNCHRONOUS"                   value="0x8242"/>
+
+  <enum name="CONTEXT_FLAG_DEBUG_BIT"                     value="0x00000002"/>
+
+  <enum name="MAX_DEBUG_MESSAGE_LENGTH" count="1"         value="0x9143">
+    <size name="Get" mode="get"/>
+  </enum>
+  <enum name="MAX_DEBUG_LOGGED_MESSAGES" count="1"        value="0x9144">
+    <size name="Get" mode="get"/>
+  </enum>
+  <enum name="DEBUG_LOGGED_MESSAGES" count="1"            value="0x9145">
+    <size name="Get" mode="get"/>
+  </enum>
+  <enum name="DEBUG_NEXT_LOGGED_MESSAGE_LENGTH" count="1" value="0x8243">
+    <size name="Get" mode="get"/>
+  </enum>
+  <enum name="MAX_DEBUG_GROUP_STACK_DEPTH" count="1"      value="0x826C">
+    <size name="Get" mode="get"/>
+  </enum>
+  <enum name="DEBUG_GROUP_STACK_DEPTH" count="1"          value="0x826D">
+    <size name="Get" mode="get"/>
+  </enum>
+  <enum name="MAX_LABEL_LENGTH" count="1"                 value="0x82E8">
+    <size name="Get" mode="get"/>
+  </enum>
+
+  <enum name="DEBUG_CALLBACK_FUNCTION" count="1"          value="0x8244">
+     <size name="GetPointerv" mode="get"/>
+  </enum>
+  <enum name="DEBUG_CALLBACK_USER_PARAM" count="1"        value="0x8245">
+    <size name="GetPointerv" mode="get"/>
+  </enum>
+
+  <enum name="DEBUG_SOURCE_API"                           value="0x8246"/>
+  <enum name="DEBUG_SOURCE_WINDOW_SYSTEM"                 value="0x8247"/>
+  <enum name="DEBUG_SOURCE_SHADER_COMPILER"               value="0x8248"/>
+  <enum name="DEBUG_SOURCE_THIRD_PARTY"                   value="0x8249"/>
+  <enum name="DEBUG_SOURCE_APPLICATION"                   value="0x824A"/>
+  <enum name="DEBUG_SOURCE_OTHER"                         value="0x824B"/>
+
+  <enum name="DEBUG_TYPE_ERROR"                           value="0x824C"/>
+  <enum name="DEBUG_TYPE_DEPRECATED_BEHAVIOR"             value="0x824D"/>
+  <enum name="DEBUG_TYPE_UNDEFINED_BEHAVIOR"              value="0x824E"/>
+  <enum name="DEBUG_TYPE_PORTABILITY"                     value="0x824F"/>
+  <enum name="DEBUG_TYPE_PERFORMANCE"                     value="0x8250"/>
+  <enum name="DEBUG_TYPE_OTHER"                           value="0x8251"/>
+  <enum name="DEBUG_TYPE_MARKER"                          value="0x8268"/>
+
+  <enum name="DEBUG_TYPE_PUSH_GROUP"                      value="0x8269"/>
+  <enum name="DEBUG_TYPE_POP_GROUP"                       value="0x826A"/>
+
+  <enum name="DEBUG_SEVERITY_HIGH"                        value="0x9146"/>
+  <enum name="DEBUG_SEVERITY_MEDIUM"                      value="0x9147"/>
+  <enum name="DEBUG_SEVERITY_LOW"                         value="0x9148"/>
+  <enum name="DEBUG_SEVERITY_NOTIFICATION"                value="0x826B"/>
+
+  <enum name="STACK_UNDERFLOW"                            value="0x0504"/>
+  <enum name="STACK_OVERFLOW"                             value="0x0503"/>
+
+  <enum name="BUFFER"                                     value="0x82E0"/>
+  <enum name="SHADER"                                     value="0x82E1"/>
+  <enum name="PROGRAM"                                    value="0x82E2"/>
+  <enum name="QUERY"                                      value="0x82E3"/>
+  <enum name="PROGRAM_PIPELINE"                           value="0x82E4"/>
+  <enum name="SAMPLER"                                    value="0x82E6"/>
+  <!-- Compatibility Profile -->
+  <enum name="DISPLAY_LIST"                               value="0x82E7"/>
+
+  <function name="DebugMessageControl" offset="assign">
+    <param name="source" type="GLenum"/>
+    <param name="type" type="GLenum"/>
+    <param name="severity" type="GLenum"/>
+    <param name="count" type="GLsizei" counter="true"/>
+    <param name="ids" type="const GLuint *" count="count"/>
+    <param name="enabled" type="GLboolean"/>
+  </function>
+
+  <function name="DebugMessageInsert" offset="assign">
+    <param name="source" type="GLenum"/>
+    <param name="type" type="GLenum"/>
+    <param name="id" type="GLuint"/>
+    <param name="severity" type="GLenum"/>
+    <param name="length" type="GLsizei"/>
+    <param name="buf" type="const GLchar *"/>
+  </function>
+
+  <function name="DebugMessageCallback" offset="assign">
+    <param name="callback" type="GLDEBUGPROC"/>
+    <param name="userParam" type="const GLvoid *"/>
+  </function>
+
+  <function name="GetDebugMessageLog" offset="assign">
+    <return type="GLuint"/>
+    <param name="count" type="GLuint"/>
+    <param name="bufsize" type="GLsizei"/>
+    <param name="sources" type="GLenum *" output="true"/>
+    <param name="types" type="GLenum *" output="true"/>
+    <param name="ids" type="GLuint *" output="true"/>
+    <param name="severities" type="GLenum *" output="true"/>
+    <param name="lengths" type="GLsizei *" output="true"/>
+    <param name="messageLog" type="GLchar *" output="true"/>
+  </function>
+
+  <function name="PushDebugGroup" offset="assign">
+    <param name="source" type="GLenum"/>
+    <param name="id" type="GLuint"/>
+    <param name="length" type="GLsizei"/>
+    <param name="message" type="const GLchar *"/>
+  </function>
+
+  <function name="PopDebugGroup" offset="assign"/>
+
+  <function name="ObjectLabel" offset="assign">
+    <param name="identifier" type="GLenum"/>
+    <param name="name" type="GLuint"/>
+    <param name="length" type="GLsizei"/>
+    <param name="label" type="const GLchar *"/>
+  </function>
+
+  <function name="GetObjectLabel" offset="assign">
+    <param name="identifier" type="GLenum"/>
+    <param name="name" type="GLuint"/>
+    <param name="bufSize" type="GLsizei"/>
+    <param name="length" type="GLsizei *"/>
+    <param name="label" type="GLchar *"/>
+  </function>
+
+  <function name="ObjectPtrLabel" offset="assign">
+    <param name="ptr" type="const GLvoid *"/>
+    <param name="length" type="GLsizei"/>
+    <param name="label" type="const GLchar *"/>
+  </function>
+
+  <function name="GetObjectPtrLabel" offset="assign">
+    <param name="ptr" type="const GLvoid *"/>
+    <param name="bufSize" type="GLsizei"/>
+    <param name="length" type="GLsizei *"/>
+    <param name="label" type="GLchar *"/>
+  </function>
+
+</category>
+
+</OpenGLAPI>
diff --git a/mesalib/src/mapi/glapi/gen/gl_API.xml b/mesalib/src/mapi/glapi/gen/gl_API.xml
index 8f175e6be..6c4fb9506 100755
--- a/mesalib/src/mapi/glapi/gen/gl_API.xml
+++ b/mesalib/src/mapi/glapi/gen/gl_API.xml
@@ -8324,149 +8324,7 @@
 
 <!-- ARB extension #118 -->
 
-<category name="GL_KHR_debug" number="119">
-  <enum name="DEBUG_OUTPUT"                               value="0x92E0"/>
-  <enum name="DEBUG_OUTPUT_SYNCHRONOUS"                   value="0x8242"/>
-
-  <enum name="CONTEXT_FLAG_DEBUG_BIT"                     value="0x00000002"/>
-
-  <enum name="MAX_DEBUG_MESSAGE_LENGTH" count="1"         value="0x9143">
-    <size name="Get" mode="get"/>
-  </enum>
-  <enum name="MAX_DEBUG_LOGGED_MESSAGES" count="1"        value="0x9144">
-    <size name="Get" mode="get"/>
-  </enum>
-  <enum name="DEBUG_LOGGED_MESSAGES" count="1"            value="0x9145">
-    <size name="Get" mode="get"/>
-  </enum>
-  <enum name="DEBUG_NEXT_LOGGED_MESSAGE_LENGTH" count="1" value="0x8243">
-    <size name="Get" mode="get"/>
-  </enum>
-  <enum name="MAX_DEBUG_GROUP_STACK_DEPTH" count="1"      value="0x826C">
-    <size name="Get" mode="get"/>
-  </enum>
-  <enum name="DEBUG_GROUP_STACK_DEPTH" count="1"          value="0x826D">
-    <size name="Get" mode="get"/>
-  </enum>
-  <enum name="MAX_LABEL_LENGTH" count="1"                 value="0x82E8">
-    <size name="Get" mode="get"/>
-  </enum>
-
-  <enum name="DEBUG_CALLBACK_FUNCTION" count="1"          value="0x8244">
-     <size name="GetPointerv" mode="get"/>
-  </enum>
-  <enum name="DEBUG_CALLBACK_USER_PARAM" count="1"        value="0x8245">
-    <size name="GetPointerv" mode="get"/>
-  </enum>
-
-  <enum name="DEBUG_SOURCE_API"                           value="0x8246"/>
-  <enum name="DEBUG_SOURCE_WINDOW_SYSTEM"                 value="0x8247"/>
-  <enum name="DEBUG_SOURCE_SHADER_COMPILER"               value="0x8248"/>
-  <enum name="DEBUG_SOURCE_THIRD_PARTY"                   value="0x8249"/>
-  <enum name="DEBUG_SOURCE_APPLICATION"                   value="0x824A"/>
-  <enum name="DEBUG_SOURCE_OTHER"                         value="0x824B"/>
-
-  <enum name="DEBUG_TYPE_ERROR"                           value="0x824C"/>
-  <enum name="DEBUG_TYPE_DEPRECATED_BEHAVIOR"             value="0x824D"/>
-  <enum name="DEBUG_TYPE_UNDEFINED_BEHAVIOR"              value="0x824E"/>
-  <enum name="DEBUG_TYPE_PORTABILITY"                     value="0x824F"/>
-  <enum name="DEBUG_TYPE_PERFORMANCE"                     value="0x8250"/>
-  <enum name="DEBUG_TYPE_OTHER"                           value="0x8251"/>
-  <enum name="DEBUG_TYPE_MARKER"                          value="0x8268"/>
-
-  <enum name="DEBUG_TYPE_PUSH_GROUP"                      value="0x8269"/>
-  <enum name="DEBUG_TYPE_POP_GROUP"                       value="0x826A"/>
-
-  <enum name="DEBUG_SEVERITY_HIGH"                        value="0x9146"/>
-  <enum name="DEBUG_SEVERITY_MEDIUM"                      value="0x9147"/>
-  <enum name="DEBUG_SEVERITY_LOW"                         value="0x9148"/>
-  <enum name="DEBUG_SEVERITY_NOTIFICATION"                value="0x826B"/>
-
-  <enum name="STACK_UNDERFLOW"                            value="0x0504"/>
-  <enum name="STACK_OVERFLOW"                             value="0x0503"/>
-
-  <enum name="BUFFER"                                     value="0x82E0"/>
-  <enum name="SHADER"                                     value="0x82E1"/>
-  <enum name="PROGRAM"                                    value="0x82E2"/>
-  <enum name="QUERY"                                      value="0x82E3"/>
-  <enum name="PROGRAM_PIPELINE"                           value="0x82E4"/>
-  <enum name="SAMPLER"                                    value="0x82E6"/>
-  <!-- Compatibility Profile -->
-  <enum name="DISPLAY_LIST"                               value="0x82E7"/>
-
-  <function name="DebugMessageControl" offset="assign">
-    <param name="source" type="GLenum"/>
-    <param name="type" type="GLenum"/>
-    <param name="severity" type="GLenum"/>
-    <param name="count" type="GLsizei" counter="true"/>
-    <param name="ids" type="const GLuint *" count="count"/>
-    <param name="enabled" type="GLboolean"/>
-  </function>
-
-  <function name="DebugMessageInsert" offset="assign">
-    <param name="source" type="GLenum"/>
-    <param name="type" type="GLenum"/>
-    <param name="id" type="GLuint"/>
-    <param name="severity" type="GLenum"/>
-    <param name="length" type="GLsizei"/>
-    <param name="buf" type="const GLchar *"/>
-  </function>
-
-  <function name="DebugMessageCallback" offset="assign">
-    <param name="callback" type="GLDEBUGPROC"/>
-    <param name="userParam" type="const GLvoid *"/>
-  </function>
-
-  <function name="GetDebugMessageLog" offset="assign">
-    <return type="GLuint"/>
-    <param name="count" type="GLuint"/>
-    <param name="bufsize" type="GLsizei"/>
-    <param name="sources" type="GLenum *" output="true"/>
-    <param name="types" type="GLenum *" output="true"/>
-    <param name="ids" type="GLuint *" output="true"/>
-    <param name="severities" type="GLenum *" output="true"/>
-    <param name="lengths" type="GLsizei *" output="true"/>
-    <param name="messageLog" type="GLchar *" output="true"/>
-  </function>
-
-  <function name="PushDebugGroup" offset="assign">
-    <param name="source" type="GLenum"/>
-    <param name="id" type="GLuint"/>
-    <param name="length" type="GLsizei"/>
-    <param name="message" type="const GLchar *"/>
-  </function>
-
-  <function name="PopDebugGroup" offset="assign"/>
-
-  <function name="ObjectLabel" offset="assign">
-    <param name="identifier" type="GLenum"/>
-    <param name="name" type="GLuint"/>
-    <param name="length" type="GLsizei"/>
-    <param name="label" type="const GLchar *"/>
-  </function>
-
-  <function name="GetObjectLabel" offset="assign">
-    <param name="identifier" type="GLenum"/>
-    <param name="name" type="GLuint"/>
-    <param name="bufSize" type="GLsizei"/>
-    <param name="length" type="GLsizei *"/>
-    <param name="label" type="GLchar *"/>
-  </function>
-
-  <function name="ObjectPtrLabel" offset="assign">
-    <param name="ptr" type="const GLvoid *"/>
-    <param name="length" type="GLsizei"/>
-    <param name="label" type="const GLchar *"/>
-  </function>
-
-  <function name="GetObjectPtrLabel" offset="assign">
-    <param name="ptr" type="const GLvoid *"/>
-    <param name="bufSize" type="GLsizei"/>
-    <param name="length" type="GLsizei *"/>
-    <param name="label" type="GLchar *"/>
-  </function>
-
-</category>
+<xi:include href="KHR_debug.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
 <!-- ARB extension #120 -->
 
diff --git a/mesalib/src/mapi/glapi/glapi.c b/mesalib/src/mapi/glapi/glapi.c
index 3a0b638f7..194b9ee86 100644
--- a/mesalib/src/mapi/glapi/glapi.c
+++ b/mesalib/src/mapi/glapi/glapi.c
@@ -54,11 +54,11 @@ _glapi_check_multithread(void)
 void
 _glapi_set_context(void *context)
 {
-   u_current_set_user((const void *) context);
+   u_current_set_context((const void *) context);
 }
 
 void
 _glapi_set_dispatch(struct _glapi_table *dispatch)
 {
-   u_current_set((const struct mapi_table *) dispatch);
+   u_current_set_table((const struct mapi_table *) dispatch);
 }
diff --git a/mesalib/src/mapi/glapi/glapi.h b/mesalib/src/mapi/glapi/glapi.h
index 67bf1f42e..67bf1f42e 100644..100755
--- a/mesalib/src/mapi/glapi/glapi.h
+++ b/mesalib/src/mapi/glapi/glapi.h
diff --git a/mesalib/src/mapi/mapi.c b/mesalib/src/mapi/mapi.c
index 56f209bfa..aa6b91b42 100644
--- a/mesalib/src/mapi/mapi.c
+++ b/mesalib/src/mapi/mapi.c
@@ -72,15 +72,15 @@ get_stub(const char *name, const struct mapi_stub *alias)
 void
 mapi_init(const char *spec)
 {
-   u_mutex_declare_static(mutex);
+   static mtx_t mutex = _MTX_INITIALIZER_NP;
    const char *p;
    int ver, count;
 
-   u_mutex_lock(mutex);
+   mtx_lock(&mutex);
 
    /* already initialized */
    if (mapi_num_stubs) {
-      u_mutex_unlock(mutex);
+      mtx_unlock(&mutex);
       return;
    }
 
@@ -90,7 +90,7 @@ mapi_init(const char *spec)
    /* parse version string */
    ver = atoi(p);
    if (ver != 1) {
-      u_mutex_unlock(mutex);
+      mtx_unlock(&mutex);
       return;
    }
    p += strlen(p) + 1;
@@ -115,7 +115,7 @@ mapi_init(const char *spec)
 
    mapi_num_stubs = count;
 
-   u_mutex_unlock(mutex);
+   mtx_unlock(&mutex);
 }
 
 /**
@@ -186,5 +186,5 @@ mapi_table_fill(struct mapi_table *tbl, const mapi_proc *procs)
 void
 mapi_table_make_current(const struct mapi_table *tbl)
 {
-   u_current_set(tbl);
+   u_current_set_table(tbl);
 }
diff --git a/mesalib/src/mapi/mapi_glapi.c b/mesalib/src/mapi/mapi_glapi.c
index 7b9f1aee4..7b0903be9 100644
--- a/mesalib/src/mapi/mapi_glapi.c
+++ b/mesalib/src/mapi/mapi_glapi.c
@@ -58,13 +58,13 @@ _glapi_check_multithread(void)
 void
 _glapi_set_context(void *context)
 {
-   u_current_set_user((const void *) context);
+   u_current_set_context((const void *) context);
 }
 
 void
 _glapi_set_dispatch(struct _glapi_table *dispatch)
 {
-   u_current_set((const struct mapi_table *) dispatch);
+   u_current_set_table((const struct mapi_table *) dispatch);
 }
 
 /**
@@ -222,12 +222,6 @@ _glapi_get_proc_name(unsigned int offset)
    return stub ? stub_get_name(stub) : NULL;
 }
 
-unsigned long
-_glthread_GetID(void)
-{
-   return u_thread_self();
-}
-
 void
 _glapi_noop_enable_warnings(unsigned char enable)
 {
diff --git a/mesalib/src/mapi/stub.c b/mesalib/src/mapi/stub.c
index acd2c0a79..dfadbe1a5 100644
--- a/mesalib/src/mapi/stub.c
+++ b/mesalib/src/mapi/stub.c
@@ -126,11 +126,11 @@ stub_add_dynamic(const char *name)
 struct mapi_stub *
 stub_find_dynamic(const char *name, int generate)
 {
-   u_mutex_declare_static(dynamic_mutex);
+   static mtx_t dynamic_mutex = _MTX_INITIALIZER_NP;
    struct mapi_stub *stub = NULL;
    int count, i;
    
-   u_mutex_lock(dynamic_mutex);
+   mtx_lock(&dynamic_mutex);
 
    if (generate)
       assert(!stub_find_public(name));
@@ -147,7 +147,7 @@ stub_find_dynamic(const char *name, int generate)
    if (generate && !stub)
          stub = stub_add_dynamic(name);
 
-   u_mutex_unlock(dynamic_mutex);
+   mtx_unlock(&dynamic_mutex);
 
    return stub;
 }
diff --git a/mesalib/src/mapi/u_current.c b/mesalib/src/mapi/u_current.c
index 07213380d..afa887e06 100644
--- a/mesalib/src/mapi/u_current.c
+++ b/mesalib/src/mapi/u_current.c
@@ -103,18 +103,18 @@ __thread struct mapi_table *u_current_table
     __attribute__((tls_model("initial-exec")))
     = (struct mapi_table *) table_noop_array;
 
-__thread void *u_current_user
+__thread void *u_current_context
     __attribute__((tls_model("initial-exec")));
 
 #else
 
 struct mapi_table *u_current_table =
    (struct mapi_table *) table_noop_array;
-void *u_current_user;
+void *u_current_context;
 
 #ifdef THREADS
 struct u_tsd u_current_table_tsd;
-static struct u_tsd u_current_user_tsd;
+static struct u_tsd u_current_context_tsd;
 static int ThreadSafe;
 #endif /* THREADS */
 
@@ -127,7 +127,7 @@ u_current_destroy(void)
 {
 #if defined(THREADS) && defined(_WIN32)
    u_tsd_destroy(&u_current_table_tsd);
-   u_tsd_destroy(&u_current_user_tsd);
+   u_tsd_destroy(&u_current_context_tsd);
 #endif
 }
 
@@ -138,13 +138,13 @@ static void
 u_current_init_tsd(void)
 {
    u_tsd_init(&u_current_table_tsd);
-   u_tsd_init(&u_current_user_tsd);
+   u_tsd_init(&u_current_context_tsd);
 }
 
 /**
  * Mutex for multithread check.
  */
-u_mutex_declare_static(ThreadCheckMutex);
+static mtx_t ThreadCheckMutex = _MTX_INITIALIZER_NP;
 
 /**
  * We should call this periodically from a function such as glXMakeCurrent
@@ -159,7 +159,7 @@ u_current_init(void)
    if (ThreadSafe)
       return;
 
-   u_mutex_lock(ThreadCheckMutex);
+   mtx_lock(&ThreadCheckMutex);
    if (firstCall) {
       u_current_init_tsd();
 
@@ -168,10 +168,10 @@ u_current_init(void)
    }
    else if (knownID != u_thread_self()) {
       ThreadSafe = 1;
-      u_current_set(NULL);
-      u_current_set_user(NULL);
+      u_current_set_table(NULL);
+      u_current_set_context(NULL);
    }
-   u_mutex_unlock(ThreadCheckMutex);
+   mtx_unlock(&ThreadCheckMutex);
 }
 
 #else
@@ -191,17 +191,17 @@ u_current_init(void)
  * void from the real context pointer type.
  */
 void
-u_current_set_user(const void *ptr)
+u_current_set_context(const void *ptr)
 {
    u_current_init();
 
 #if defined(GLX_USE_TLS)
-   u_current_user = (void *) ptr;
+   u_current_context = (void *) ptr;
 #elif defined(THREADS)
-   u_tsd_set(&u_current_user_tsd, (void *) ptr);
-   u_current_user = (ThreadSafe) ? NULL : (void *) ptr;
+   u_tsd_set(&u_current_context_tsd, (void *) ptr);
+   u_current_context = (ThreadSafe) ? NULL : (void *) ptr;
 #else
-   u_current_user = (void *) ptr;
+   u_current_context = (void *) ptr;
 #endif
 }
 
@@ -211,16 +211,16 @@ u_current_set_user(const void *ptr)
  * void to the real context pointer type.
  */
 void *
-u_current_get_user_internal(void)
+u_current_get_context_internal(void)
 {
 #if defined(GLX_USE_TLS)
-   return u_current_user;
+   return u_current_context;
 #elif defined(THREADS)
    return (ThreadSafe)
-      ? u_tsd_get(&u_current_user_tsd)
-      : u_current_user;
+      ? u_tsd_get(&u_current_context_tsd)
+      : u_current_context;
 #else
-   return u_current_user;
+   return u_current_context;
 #endif
 }
 
@@ -230,7 +230,7 @@ u_current_get_user_internal(void)
  * table (__glapi_noop_table).
  */
 void
-u_current_set(const struct mapi_table *tbl)
+u_current_set_table(const struct mapi_table *tbl)
 {
    u_current_init();
 
@@ -253,7 +253,7 @@ u_current_set(const struct mapi_table *tbl)
  * Return pointer to current dispatch table for calling thread.
  */
 struct mapi_table *
-u_current_get_internal(void)
+u_current_get_table_internal(void)
 {
 #if defined(GLX_USE_TLS)
    return u_current_table;
diff --git a/mesalib/src/mapi/u_current.h b/mesalib/src/mapi/u_current.h
index f9cffd8c3..72708d433 100644
--- a/mesalib/src/mapi/u_current.h
+++ b/mesalib/src/mapi/u_current.h
@@ -11,14 +11,14 @@
 
 #ifdef GLX_USE_TLS
 #define u_current_table _glapi_tls_Dispatch
-#define u_current_user _glapi_tls_Context
+#define u_current_context _glapi_tls_Context
 #else
 #define u_current_table _glapi_Dispatch
-#define u_current_user _glapi_Context
+#define u_current_context _glapi_Context
 #endif
 
-#define u_current_get_internal _glapi_get_dispatch
-#define u_current_get_user_internal _glapi_get_context
+#define u_current_get_table_internal _glapi_get_dispatch
+#define u_current_get_context_internal _glapi_get_context
 
 #define u_current_table_tsd _gl_DispatchTSD
 
@@ -33,13 +33,13 @@ struct mapi_table;
 extern __thread struct mapi_table *u_current_table
     __attribute__((tls_model("initial-exec")));
 
-extern __thread void *u_current_user
+extern __thread void *u_current_context
     __attribute__((tls_model("initial-exec")));
 
 #else /* GLX_USE_TLS */
 
 extern struct mapi_table *u_current_table;
-extern void *u_current_user;
+extern void *u_current_context;
 
 #endif /* GLX_USE_TLS */
 
@@ -52,35 +52,35 @@ void
 u_current_destroy(void);
 
 void
-u_current_set(const struct mapi_table *tbl);
+u_current_set_table(const struct mapi_table *tbl);
 
 struct mapi_table *
-u_current_get_internal(void);
+u_current_get_table_internal(void);
 
 void
-u_current_set_user(const void *ptr);
+u_current_set_context(const void *ptr);
 
 void *
-u_current_get_user_internal(void);
+u_current_get_context_internal(void);
 
 static INLINE const struct mapi_table *
-u_current_get(void)
+u_current_get_table(void)
 {
 #ifdef GLX_USE_TLS
    return u_current_table;
 #else
    return (likely(u_current_table) ?
-         u_current_table : u_current_get_internal());
+         u_current_table : u_current_get_table_internal());
 #endif
 }
 
 static INLINE const void *
-u_current_get_user(void)
+u_current_get_context(void)
 {
 #ifdef GLX_USE_TLS
-   return u_current_user;
+   return u_current_context;
 #else
-   return likely(u_current_user) ? u_current_user : u_current_get_user_internal();
+   return likely(u_current_context) ? u_current_context : u_current_get_context_internal();
 #endif
 }
 
diff --git a/mesalib/src/mapi/u_execmem.c b/mesalib/src/mapi/u_execmem.c
index 357365263..ac1cae093 100644
--- a/mesalib/src/mapi/u_execmem.c
+++ b/mesalib/src/mapi/u_execmem.c
@@ -39,7 +39,7 @@
 
 #define EXEC_MAP_SIZE (4*1024)
 
-u_mutex_declare_static(exec_mutex);
+static mtx_t exec_mutex = _MTX_INITIALIZER_NP;
 
 static unsigned int head = 0;
 
@@ -123,7 +123,7 @@ u_execmem_alloc(unsigned int size)
 {
    void *addr = NULL;
 
-   u_mutex_lock(exec_mutex);
+   mtx_lock(&exec_mutex);
 
    if (!init_map())
       goto bail;
@@ -137,7 +137,7 @@ u_execmem_alloc(unsigned int size)
    head += size;
 
 bail:
-   u_mutex_unlock(exec_mutex);
+   mtx_unlock(&exec_mutex);
 
    return addr;
 }
diff --git a/mesalib/src/mapi/u_thread.h b/mesalib/src/mapi/u_thread.h
index ba5d98ea9..57c3b076a 100644
--- a/mesalib/src/mapi/u_thread.h
+++ b/mesalib/src/mapi/u_thread.h
@@ -57,9 +57,9 @@
 /*
  * Error messages
  */
-#define INIT_TSD_ERROR "_glthread_: failed to allocate key for thread specific data"
-#define GET_TSD_ERROR "_glthread_: failed to get thread specific data"
-#define SET_TSD_ERROR "_glthread_: thread failed to set thread specific data"
+#define INIT_TSD_ERROR "Mesa: failed to allocate key for thread specific data"
+#define GET_TSD_ERROR "Mesa: failed to get thread specific data"
+#define SET_TSD_ERROR "Mesa: thread failed to set thread specific data"
 
 
 /*
@@ -79,20 +79,28 @@ struct u_tsd {
    unsigned initMagic;
 };
 
-typedef mtx_t u_mutex;
-
-#define u_mutex_declare_static(name) \
-   static u_mutex name = _MTX_INITIALIZER_NP
-
-#define u_mutex_init(name)    mtx_init(&(name), mtx_plain)
-#define u_mutex_destroy(name) mtx_destroy(&(name))
-#define u_mutex_lock(name)    (void) mtx_lock(&(name))
-#define u_mutex_unlock(name)  (void) mtx_unlock(&(name))
 
 static INLINE unsigned long
 u_thread_self(void)
 {
+   /*
+    * XXX: Callers of u_thread_self assume it is a lightweight function,
+    * returning a numeric value.  But unfortunately C11's thrd_current() gives
+    * no such guarantees.  In fact, it's pretty hard to have a compliant
+    * implementation of thrd_current() on Windows with such characteristics.
+    * So for now, we side-step this mess and use Windows thread primitives
+    * directly here.
+    *
+    * FIXME: On the other hand, u_thread_self() is a bad
+    * abstraction.  Even with pthreads, there is no guarantee that
+    * pthread_self() will return numeric IDs -- we should be using
+    * pthread_equal() instead of assuming we can compare thread ids...
+    */
+#ifdef _WIN32
+   return GetCurrentThreadId();
+#else
    return (unsigned long) (uintptr_t) thrd_current();
+#endif
 }
 
 
diff --git a/mesalib/src/mesa/Makefile.am b/mesalib/src/mesa/Makefile.am
index ffe65990d..16ac148af 100644
--- a/mesalib/src/mesa/Makefile.am
+++ b/mesalib/src/mesa/Makefile.am
@@ -70,7 +70,7 @@ BUILT_SOURCES = \
 CLEANFILES = \
 	$(BUILT_SOURCES) \
 	$(BUILDDIR)program/program_parse.tab.h \
-	git_sha1.h.tmp
+	$(BUILDDIR)main/git_sha1.h.tmp
 
 GET_HASH_GEN = main/get_hash_generator.py
 
diff --git a/mesalib/src/mesa/Makefile.sources b/mesalib/src/mesa/Makefile.sources
index f6f4062a4..f4904fbbd 100644
--- a/mesalib/src/mesa/Makefile.sources
+++ b/mesalib/src/mesa/Makefile.sources
@@ -321,6 +321,7 @@ SPARC_FILES =			\
 COMMON_DRIVER_FILES =			\
 	$(SRCDIR)drivers/common/driverfuncs.c	\
 	$(SRCDIR)drivers/common/meta_blit.c	\
+	$(SRCDIR)drivers/common/meta_generate_mipmap.c	\
 	$(SRCDIR)drivers/common/meta.c
 
 
diff --git a/mesalib/src/mesa/SConscript b/mesalib/src/mesa/SConscript
index 7f4e41983..cd959be65 100644
--- a/mesalib/src/mesa/SConscript
+++ b/mesalib/src/mesa/SConscript
@@ -326,7 +326,8 @@ program_sources = [
 common_driver_sources =	[
     'drivers/common/driverfuncs.c',
     'drivers/common/meta.c',
-    'drivers/common/meta_blit.c'
+    'drivers/common/meta_blit.c',
+    'drivers/common/meta_generate_mipmap.c'
 ]
 
 mesa_sources = (
diff --git a/mesalib/src/mesa/drivers/common/meta.c b/mesalib/src/mesa/drivers/common/meta.c
index cde34f99f..030e1116e 100644
--- a/mesalib/src/mesa/drivers/common/meta.c
+++ b/mesalib/src/mesa/drivers/common/meta.c
@@ -89,7 +89,6 @@ choose_blit_shader(GLenum target, struct blit_shader_table *table);
 
 static void cleanup_temp_texture(struct temp_texture *tex);
 static void meta_glsl_clear_cleanup(struct clear_state *clear);
-static void meta_glsl_generate_mipmap_cleanup(struct gen_mipmap_state *mipmap);
 static void meta_decompress_cleanup(struct decompress_state *decompress);
 static void meta_drawpix_cleanup(struct drawpix_state *drawpix);
 
@@ -361,7 +360,7 @@ _mesa_meta_free(struct gl_context *ctx)
    _mesa_make_current(ctx, NULL, NULL);
    _mesa_meta_glsl_blit_cleanup(&ctx->Meta->Blit);
    meta_glsl_clear_cleanup(&ctx->Meta->Clear);
-   meta_glsl_generate_mipmap_cleanup(&ctx->Meta->Mipmap);
+   _mesa_meta_glsl_generate_mipmap_cleanup(&ctx->Meta->Mipmap);
    cleanup_temp_texture(&ctx->Meta->TempTex);
    meta_decompress_cleanup(&ctx->Meta->Decompress);
    meta_drawpix_cleanup(&ctx->Meta->DrawPix);
@@ -2360,102 +2359,6 @@ _mesa_meta_Bitmap(struct gl_context *ctx,
    _mesa_meta_end(ctx);
 }
 
-
-/**
- * Check if the call to _mesa_meta_GenerateMipmap() will require a
- * software fallback.  The fallback path will require that the texture
- * images are mapped.
- * \return GL_TRUE if a fallback is needed, GL_FALSE otherwise
- */
-GLboolean
-_mesa_meta_check_generate_mipmap_fallback(struct gl_context *ctx, GLenum target,
-                                          struct gl_texture_object *texObj)
-{
-   const GLuint fboSave = ctx->DrawBuffer->Name;
-   struct gen_mipmap_state *mipmap = &ctx->Meta->Mipmap;
-   struct gl_texture_image *baseImage;
-   GLuint srcLevel;
-   GLenum status;
-
-   /* check for fallbacks */
-   if (target == GL_TEXTURE_3D ||
-       target == GL_TEXTURE_1D_ARRAY ||
-       target == GL_TEXTURE_2D_ARRAY) {
-      _mesa_perf_debug(ctx, MESA_DEBUG_SEVERITY_HIGH,
-                       "glGenerateMipmap() to %s target\n",
-                       _mesa_lookup_enum_by_nr(target));
-      return GL_TRUE;
-   }
-
-   srcLevel = texObj->BaseLevel;
-   baseImage = _mesa_select_tex_image(ctx, texObj, target, srcLevel);
-   if (!baseImage) {
-      _mesa_perf_debug(ctx, MESA_DEBUG_SEVERITY_HIGH,
-                       "glGenerateMipmap() couldn't find base teximage\n");
-      return GL_TRUE;
-   }
-
-   if (_mesa_is_format_compressed(baseImage->TexFormat)) {
-      _mesa_perf_debug(ctx, MESA_DEBUG_SEVERITY_HIGH,
-                       "glGenerateMipmap() with %s format\n",
-                       _mesa_get_format_name(baseImage->TexFormat));
-      return GL_TRUE;
-   }
-
-   if (_mesa_get_format_color_encoding(baseImage->TexFormat) == GL_SRGB &&
-       !ctx->Extensions.EXT_texture_sRGB_decode) {
-      /* The texture format is sRGB but we can't turn off sRGB->linear
-       * texture sample conversion.  So we won't be able to generate the
-       * right colors when rendering.  Need to use a fallback.
-       */
-      _mesa_perf_debug(ctx, MESA_DEBUG_SEVERITY_HIGH,
-                       "glGenerateMipmap() of sRGB texture without "
-                       "sRGB decode\n");
-      return GL_TRUE;
-   }
-
-   /*
-    * Test that we can actually render in the texture's format.
-    */
-   if (!mipmap->FBO)
-      _mesa_GenFramebuffers(1, &mipmap->FBO);
-   _mesa_BindFramebuffer(GL_FRAMEBUFFER_EXT, mipmap->FBO);
-
-   if (target == GL_TEXTURE_1D) {
-      _mesa_FramebufferTexture1D(GL_FRAMEBUFFER_EXT,
-                                    GL_COLOR_ATTACHMENT0_EXT,
-                                    target, texObj->Name, srcLevel);
-   }
-#if 0
-   /* other work is needed to enable 3D mipmap generation */
-   else if (target == GL_TEXTURE_3D) {
-      GLint zoffset = 0;
-      _mesa_FramebufferTexture3D(GL_FRAMEBUFFER_EXT,
-                                    GL_COLOR_ATTACHMENT0_EXT,
-                                    target, texObj->Name, srcLevel, zoffset);
-   }
-#endif
-   else {
-      /* 2D / cube */
-      _mesa_FramebufferTexture2D(GL_FRAMEBUFFER_EXT,
-                                    GL_COLOR_ATTACHMENT0_EXT,
-                                    target, texObj->Name, srcLevel);
-   }
-
-   status = _mesa_CheckFramebufferStatus(GL_FRAMEBUFFER_EXT);
-
-   _mesa_BindFramebuffer(GL_FRAMEBUFFER_EXT, fboSave);
-
-   if (status != GL_FRAMEBUFFER_COMPLETE_EXT) {
-      _mesa_perf_debug(ctx, MESA_DEBUG_SEVERITY_HIGH,
-                       "glGenerateMipmap() got incomplete FBO\n");
-      return GL_TRUE;
-   }
-
-   return GL_FALSE;
-}
-
-
 /**
  * Compute the texture coordinates for the four vertices of a quad for
  * drawing a 2D texture image or slice of a cube/3D texture.
@@ -2465,16 +2368,16 @@ _mesa_meta_check_generate_mipmap_fallback(struct gl_context *ctx, GLenum target,
  * \param height  height of the texture image
  * \param coords0/1/2/3  returns the computed texcoords
  */
-static void
-setup_texture_coords(GLenum faceTarget,
-                     GLint slice,
-                     GLint width,
-                     GLint height,
-                     GLint depth,
-                     GLfloat coords0[4],
-                     GLfloat coords1[4],
-                     GLfloat coords2[4],
-                     GLfloat coords3[4])
+void
+_mesa_meta_setup_texture_coords(GLenum faceTarget,
+                                GLint slice,
+                                GLint width,
+                                GLint height,
+                                GLint depth,
+                                GLfloat coords0[4],
+                                GLfloat coords1[4],
+                                GLfloat coords2[4],
+                                GLfloat coords3[4])
 {
    static const GLfloat st[4][2] = {
       {0.0f, 0.0f}, {1.0f, 0.0f}, {1.0f, 1.0f}, {0.0f, 1.0f}
@@ -2618,7 +2521,7 @@ setup_texture_coords(GLenum faceTarget,
       }
       break;
    default:
-      assert(0 && "unexpected target in meta setup_texture_coords()");
+      assert(!"unexpected target in _mesa_meta_setup_texture_coords()");
    }
 }
 
@@ -2698,245 +2601,6 @@ _mesa_meta_blit_shader_table_cleanup(struct blit_shader_table *table)
    table->sampler_cubemap_array.shader_prog = 0;
 }
 
-static void
-meta_glsl_generate_mipmap_cleanup(struct gen_mipmap_state *mipmap)
-{
-   if (mipmap->VAO == 0)
-      return;
-   _mesa_DeleteVertexArrays(1, &mipmap->VAO);
-   mipmap->VAO = 0;
-   _mesa_DeleteBuffers(1, &mipmap->VBO);
-   mipmap->VBO = 0;
-
-   _mesa_meta_blit_shader_table_cleanup(&mipmap->shaders);
-}
-
-
-/**
- * Called via ctx->Driver.GenerateMipmap()
- * Note: We don't yet support 3D textures, 1D/2D array textures or texture
- * borders.
- */
-void
-_mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target,
-                          struct gl_texture_object *texObj)
-{
-   struct gen_mipmap_state *mipmap = &ctx->Meta->Mipmap;
-   struct vertex verts[4];
-   const GLuint baseLevel = texObj->BaseLevel;
-   const GLuint maxLevel = texObj->MaxLevel;
-   const GLint maxLevelSave = texObj->MaxLevel;
-   const GLboolean genMipmapSave = texObj->GenerateMipmap;
-   const GLuint fboSave = ctx->DrawBuffer->Name;
-   const GLuint currentTexUnitSave = ctx->Texture.CurrentUnit;
-   const GLboolean use_glsl_version = ctx->Extensions.ARB_vertex_shader &&
-                                      ctx->Extensions.ARB_fragment_shader;
-   GLenum faceTarget;
-   GLuint dstLevel;
-   const GLint slice = 0;
-   GLuint samplerSave;
-
-   if (_mesa_meta_check_generate_mipmap_fallback(ctx, target, texObj)) {
-      _mesa_generate_mipmap(ctx, target, texObj);
-      return;
-   }
-
-   if (target >= GL_TEXTURE_CUBE_MAP_POSITIVE_X &&
-       target <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z) {
-      faceTarget = target;
-      target = GL_TEXTURE_CUBE_MAP;
-   }
-   else {
-      faceTarget = target;
-   }
-
-   _mesa_meta_begin(ctx, MESA_META_ALL);
-
-   /* Choose between glsl version and fixed function version of
-    * GenerateMipmap function.
-    */
-   if (use_glsl_version) {
-      _mesa_meta_setup_vertex_objects(&mipmap->VAO, &mipmap->VBO, true,
-                                      2, 3, 0);
-      _mesa_meta_setup_blit_shader(ctx, target, &mipmap->shaders);
-   }
-   else {
-      _mesa_meta_setup_ff_tnl_for_blit(&mipmap->VAO, &mipmap->VBO, 3);
-      _mesa_set_enable(ctx, target, GL_TRUE);
-   }
-
-   samplerSave = ctx->Texture.Unit[ctx->Texture.CurrentUnit].Sampler ?
-      ctx->Texture.Unit[ctx->Texture.CurrentUnit].Sampler->Name : 0;
-
-   if (currentTexUnitSave != 0)
-      _mesa_BindTexture(target, texObj->Name);
-
-   if (!mipmap->FBO) {
-      _mesa_GenFramebuffers(1, &mipmap->FBO);
-   }
-
-   if (!mipmap->Sampler) {
-      _mesa_GenSamplers(1, &mipmap->Sampler);
-      _mesa_BindSampler(ctx->Texture.CurrentUnit, mipmap->Sampler);
-
-      _mesa_SamplerParameteri(mipmap->Sampler,
-                              GL_TEXTURE_MIN_FILTER,
-                              GL_LINEAR_MIPMAP_LINEAR);
-      _mesa_SamplerParameteri(mipmap->Sampler, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-      _mesa_SamplerParameteri(mipmap->Sampler, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-      _mesa_SamplerParameteri(mipmap->Sampler, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-      _mesa_SamplerParameteri(mipmap->Sampler, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
-
-      /* We don't want to encode or decode sRGB values; treat them as linear.
-       * This is not technically correct for GLES3 but we don't get any API
-       * error at the moment.
-       */
-      if (ctx->Extensions.EXT_texture_sRGB_decode) {
-         _mesa_SamplerParameteri(mipmap->Sampler, GL_TEXTURE_SRGB_DECODE_EXT,
-               GL_SKIP_DECODE_EXT);
-      }
-
-   } else {
-      _mesa_BindSampler(ctx->Texture.CurrentUnit, mipmap->Sampler);
-   }
-
-   _mesa_BindFramebuffer(GL_FRAMEBUFFER_EXT, mipmap->FBO);
-
-   _mesa_TexParameteri(target, GL_GENERATE_MIPMAP, GL_FALSE);
-
-   /* Silence valgrind warnings about reading uninitialized stack. */
-   memset(verts, 0, sizeof(verts));
-
-   /* Setup texture coordinates */
-   setup_texture_coords(faceTarget,
-                        slice,
-                        0, 0, 1, /* width, height never used here */
-                        verts[0].tex,
-                        verts[1].tex,
-                        verts[2].tex,
-                        verts[3].tex);
-
-   /* setup vertex positions */
-   verts[0].x = -1.0F;
-   verts[0].y = -1.0F;
-   verts[1].x =  1.0F;
-   verts[1].y = -1.0F;
-   verts[2].x =  1.0F;
-   verts[2].y =  1.0F;
-   verts[3].x = -1.0F;
-   verts[3].y =  1.0F;
-
-   /* upload vertex data */
-   _mesa_BufferData(GL_ARRAY_BUFFER_ARB, sizeof(verts),
-                       verts, GL_DYNAMIC_DRAW_ARB);
-
-   /* texture is already locked, unlock now */
-   _mesa_unlock_texture(ctx, texObj);
-
-   for (dstLevel = baseLevel + 1; dstLevel <= maxLevel; dstLevel++) {
-      const struct gl_texture_image *srcImage;
-      const GLuint srcLevel = dstLevel - 1;
-      GLsizei srcWidth, srcHeight, srcDepth;
-      GLsizei dstWidth, dstHeight, dstDepth;
-      GLenum status;
-
-      srcImage = _mesa_select_tex_image(ctx, texObj, faceTarget, srcLevel);
-      assert(srcImage->Border == 0);
-
-      /* src size */
-      srcWidth = srcImage->Width;
-      srcHeight = srcImage->Height;
-      srcDepth = srcImage->Depth;
-
-      /* new dst size */
-      dstWidth = MAX2(1, srcWidth / 2);
-      dstHeight = MAX2(1, srcHeight / 2);
-      dstDepth = MAX2(1, srcDepth / 2);
-
-      if (dstWidth == srcImage->Width &&
-          dstHeight == srcImage->Height &&
-          dstDepth == srcImage->Depth) {
-         /* all done */
-         break;
-      }
-
-      /* Allocate storage for the destination mipmap image(s) */
-
-      /* Set MaxLevel large enough to hold the new level when we allocate it */
-      _mesa_TexParameteri(target, GL_TEXTURE_MAX_LEVEL, dstLevel);
-
-      if (!_mesa_prepare_mipmap_level(ctx, texObj, dstLevel,
-                                      dstWidth, dstHeight, dstDepth,
-                                      srcImage->Border,
-                                      srcImage->InternalFormat,
-                                      srcImage->TexFormat)) {
-         /* All done.  We either ran out of memory or we would go beyond the
-          * last valid level of an immutable texture if we continued.
-          */
-         break;
-      }
-
-      /* limit minification to src level */
-      _mesa_TexParameteri(target, GL_TEXTURE_MAX_LEVEL, srcLevel);
-
-      /* Set to draw into the current dstLevel */
-      if (target == GL_TEXTURE_1D) {
-         _mesa_FramebufferTexture1D(GL_FRAMEBUFFER_EXT,
-                                       GL_COLOR_ATTACHMENT0_EXT,
-                                       target,
-                                       texObj->Name,
-                                       dstLevel);
-      }
-      else if (target == GL_TEXTURE_3D) {
-         GLint zoffset = 0; /* XXX unfinished */
-         _mesa_FramebufferTexture3D(GL_FRAMEBUFFER_EXT,
-                                       GL_COLOR_ATTACHMENT0_EXT,
-                                       target,
-                                       texObj->Name,
-                                       dstLevel, zoffset);
-      }
-      else {
-         /* 2D / cube */
-         _mesa_FramebufferTexture2D(GL_FRAMEBUFFER_EXT,
-                                       GL_COLOR_ATTACHMENT0_EXT,
-                                       faceTarget,
-                                       texObj->Name,
-                                       dstLevel);
-      }
-
-      _mesa_DrawBuffer(GL_COLOR_ATTACHMENT0_EXT);
-
-      /* sanity check */
-      status = _mesa_CheckFramebufferStatus(GL_FRAMEBUFFER_EXT);
-      if (status != GL_FRAMEBUFFER_COMPLETE_EXT) {
-         _mesa_problem(ctx, "Unexpected incomplete framebuffer in "
-                       "_mesa_meta_GenerateMipmap()");
-         break;
-      }
-
-      assert(dstWidth == ctx->DrawBuffer->Width);
-      assert(dstHeight == ctx->DrawBuffer->Height);
-
-      /* setup viewport */
-      _mesa_set_viewport(ctx, 0, 0, 0, dstWidth, dstHeight);
-
-      _mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4);
-   }
-
-   _mesa_lock_texture(ctx, texObj); /* relock */
-
-   _mesa_BindSampler(ctx->Texture.CurrentUnit, samplerSave);
-
-   _mesa_meta_end(ctx);
-
-   _mesa_TexParameteri(target, GL_TEXTURE_MAX_LEVEL, maxLevelSave);
-   if (genMipmapSave)
-      _mesa_TexParameteri(target, GL_GENERATE_MIPMAP, genMipmapSave);
-
-   _mesa_BindFramebuffer(GL_FRAMEBUFFER_EXT, fboSave);
-}
-
-
 /**
  * Determine the GL data type to use for the temporary image read with
  * ReadPixels() and passed to Tex[Sub]Image().
@@ -3219,11 +2883,11 @@ decompress_texture_image(struct gl_context *ctx,
    /* Silence valgrind warnings about reading uninitialized stack. */
    memset(verts, 0, sizeof(verts));
 
-   setup_texture_coords(faceTarget, slice, width, height, depth,
-                        verts[0].tex,
-                        verts[1].tex,
-                        verts[2].tex,
-                        verts[3].tex);
+   _mesa_meta_setup_texture_coords(faceTarget, slice, width, height, depth,
+                                   verts[0].tex,
+                                   verts[1].tex,
+                                   verts[2].tex,
+                                   verts[3].tex);
 
    /* setup vertex positions */
    verts[0].x = -1.0F;
diff --git a/mesalib/src/mesa/drivers/common/meta.h b/mesalib/src/mesa/drivers/common/meta.h
index fcf45c403..6029a775c 100644
--- a/mesalib/src/mesa/drivers/common/meta.h
+++ b/mesalib/src/mesa/drivers/common/meta.h
@@ -410,10 +410,6 @@ _mesa_meta_Bitmap(struct gl_context *ctx,
                   const struct gl_pixelstore_attrib *unpack,
                   const GLubyte *bitmap);
 
-extern GLboolean
-_mesa_meta_check_generate_mipmap_fallback(struct gl_context *ctx, GLenum target,
-                                          struct gl_texture_object *texObj);
-
 extern void
 _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target,
                           struct gl_texture_object *texObj);
@@ -448,6 +444,17 @@ GLboolean
 _mesa_meta_alloc_texture(struct temp_texture *tex,
                          GLsizei width, GLsizei height, GLenum intFormat);
 
+void
+_mesa_meta_setup_texture_coords(GLenum faceTarget,
+                                GLint slice,
+                                GLint width,
+                                GLint height,
+                                GLint depth,
+                                GLfloat coords0[4],
+                                GLfloat coords1[4],
+                                GLfloat coords2[4],
+                                GLfloat coords3[4]);
+
 struct temp_texture *
 _mesa_meta_get_temp_texture(struct gl_context *ctx);
 
@@ -491,4 +498,7 @@ _mesa_meta_glsl_blit_cleanup(struct blit_state *blit);
 void
 _mesa_meta_blit_shader_table_cleanup(struct blit_shader_table *table);
 
+void
+_mesa_meta_glsl_generate_mipmap_cleanup(struct gen_mipmap_state *mipmap);
+
 #endif /* META_H */
diff --git a/mesalib/src/mesa/drivers/common/meta_generate_mipmap.c b/mesalib/src/mesa/drivers/common/meta_generate_mipmap.c
new file mode 100644
index 000000000..3db073ab1
--- /dev/null
+++ b/mesalib/src/mesa/drivers/common/meta_generate_mipmap.c
@@ -0,0 +1,383 @@
+/*
+ * Mesa 3-D graphics library
+ *
+ * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * 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.
+ */
+
+/**
+ * Meta operations.  Some GL operations can be expressed in terms of
+ * other GL operations.  For example, glBlitFramebuffer() can be done
+ * with texture mapping and glClear() can be done with polygon rendering.
+ *
+ * \author Brian Paul
+ */
+
+#include "main/arrayobj.h"
+#include "main/buffers.h"
+#include "main/enums.h"
+#include "main/enable.h"
+#include "main/fbobject.h"
+#include "main/macros.h"
+#include "main/mipmap.h"
+#include "main/teximage.h"
+#include "main/texobj.h"
+#include "main/texparam.h"
+#include "main/varray.h"
+#include "main/viewport.h"
+#include "drivers/common/meta.h"
+
+/**
+ * Bind a particular texture level/layer to mipmap->FBO's GL_COLOR_ATTACHMENT0.
+ */
+static void
+bind_fbo_image(struct gl_texture_object *texObj, GLenum target,
+               GLuint level, GLuint layer)
+{
+   switch (target) {
+   case GL_TEXTURE_1D:
+      _mesa_FramebufferTexture1D(GL_FRAMEBUFFER,
+                                 GL_COLOR_ATTACHMENT0,
+                                 target,
+                                 texObj->Name,
+                                 level);
+      break;
+   case GL_TEXTURE_1D_ARRAY:
+   case GL_TEXTURE_2D_ARRAY:
+   case GL_TEXTURE_3D:
+      _mesa_FramebufferTextureLayer(GL_FRAMEBUFFER,
+                                    GL_COLOR_ATTACHMENT0,
+                                    texObj->Name,
+                                    level,
+                                    layer);
+      break;
+   default: /* 2D / cube */
+      _mesa_FramebufferTexture2D(GL_FRAMEBUFFER,
+                                 GL_COLOR_ATTACHMENT0,
+                                 target,
+                                 texObj->Name,
+                                 level);
+   }
+}
+
+/**
+ * Check if the call to _mesa_meta_GenerateMipmap() will require a
+ * software fallback.  The fallback path will require that the texture
+ * images are mapped.
+ * \return GL_TRUE if a fallback is needed, GL_FALSE otherwise
+ */
+static bool
+fallback_required(struct gl_context *ctx, GLenum target,
+                  struct gl_texture_object *texObj)
+{
+   const GLuint fboSave = ctx->DrawBuffer->Name;
+   struct gen_mipmap_state *mipmap = &ctx->Meta->Mipmap;
+   struct gl_texture_image *baseImage;
+   GLuint srcLevel;
+   GLenum status;
+
+   /* check for fallbacks */
+   if (target == GL_TEXTURE_3D) {
+      _mesa_perf_debug(ctx, MESA_DEBUG_SEVERITY_HIGH,
+                       "glGenerateMipmap() to %s target\n",
+                       _mesa_lookup_enum_by_nr(target));
+      return true;
+   }
+
+   srcLevel = texObj->BaseLevel;
+   baseImage = _mesa_select_tex_image(ctx, texObj, target, srcLevel);
+   if (!baseImage) {
+      _mesa_perf_debug(ctx, MESA_DEBUG_SEVERITY_HIGH,
+                       "glGenerateMipmap() couldn't find base teximage\n");
+      return true;
+   }
+
+   if (_mesa_is_format_compressed(baseImage->TexFormat)) {
+      _mesa_perf_debug(ctx, MESA_DEBUG_SEVERITY_HIGH,
+                       "glGenerateMipmap() with %s format\n",
+                       _mesa_get_format_name(baseImage->TexFormat));
+      return true;
+   }
+
+   if (_mesa_get_format_color_encoding(baseImage->TexFormat) == GL_SRGB &&
+       !ctx->Extensions.EXT_texture_sRGB_decode) {
+      /* The texture format is sRGB but we can't turn off sRGB->linear
+       * texture sample conversion.  So we won't be able to generate the
+       * right colors when rendering.  Need to use a fallback.
+       */
+      _mesa_perf_debug(ctx, MESA_DEBUG_SEVERITY_HIGH,
+                       "glGenerateMipmap() of sRGB texture without "
+                       "sRGB decode\n");
+      return true;
+   }
+
+   /*
+    * Test that we can actually render in the texture's format.
+    */
+   if (!mipmap->FBO)
+      _mesa_GenFramebuffers(1, &mipmap->FBO);
+   _mesa_BindFramebuffer(GL_FRAMEBUFFER_EXT, mipmap->FBO);
+
+   bind_fbo_image(texObj, target, srcLevel, 0);
+
+   status = _mesa_CheckFramebufferStatus(GL_FRAMEBUFFER_EXT);
+
+   _mesa_BindFramebuffer(GL_FRAMEBUFFER_EXT, fboSave);
+
+   if (status != GL_FRAMEBUFFER_COMPLETE_EXT) {
+      _mesa_perf_debug(ctx, MESA_DEBUG_SEVERITY_HIGH,
+                       "glGenerateMipmap() got incomplete FBO\n");
+      return true;
+   }
+
+   return false;
+}
+
+void
+_mesa_meta_glsl_generate_mipmap_cleanup(struct gen_mipmap_state *mipmap)
+{
+   if (mipmap->VAO == 0)
+      return;
+   _mesa_DeleteVertexArrays(1, &mipmap->VAO);
+   mipmap->VAO = 0;
+   _mesa_DeleteBuffers(1, &mipmap->VBO);
+   mipmap->VBO = 0;
+
+   _mesa_meta_blit_shader_table_cleanup(&mipmap->shaders);
+}
+
+static GLboolean
+prepare_mipmap_level(struct gl_context *ctx,
+                     struct gl_texture_object *texObj, GLuint level,
+                     GLsizei width, GLsizei height, GLsizei depth,
+                     GLenum intFormat, mesa_format format)
+{
+   if (texObj->Target == GL_TEXTURE_1D_ARRAY) {
+      /* Work around Mesa expecting the number of array slices in "height". */
+      height = depth;
+      depth = 1;
+   }
+
+   return _mesa_prepare_mipmap_level(ctx, texObj, level, width, height, depth,
+                                     0, intFormat, format);
+}
+
+/**
+ * Called via ctx->Driver.GenerateMipmap()
+ * Note: We don't yet support 3D textures, 1D/2D array textures or texture
+ * borders.
+ */
+void
+_mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target,
+                          struct gl_texture_object *texObj)
+{
+   struct gen_mipmap_state *mipmap = &ctx->Meta->Mipmap;
+   struct vertex verts[4];
+   const GLuint baseLevel = texObj->BaseLevel;
+   const GLuint maxLevel = texObj->MaxLevel;
+   const GLint maxLevelSave = texObj->MaxLevel;
+   const GLboolean genMipmapSave = texObj->GenerateMipmap;
+   const GLuint fboSave = ctx->DrawBuffer->Name;
+   const GLuint currentTexUnitSave = ctx->Texture.CurrentUnit;
+   const GLboolean use_glsl_version = ctx->Extensions.ARB_vertex_shader &&
+                                      ctx->Extensions.ARB_fragment_shader;
+   GLenum faceTarget;
+   GLuint dstLevel;
+   GLuint samplerSave;
+
+   if (fallback_required(ctx, target, texObj)) {
+      _mesa_generate_mipmap(ctx, target, texObj);
+      return;
+   }
+
+   if (target >= GL_TEXTURE_CUBE_MAP_POSITIVE_X &&
+       target <= GL_TEXTURE_CUBE_MAP_NEGATIVE_Z) {
+      faceTarget = target;
+      target = GL_TEXTURE_CUBE_MAP;
+   } else {
+      faceTarget = target;
+   }
+
+   _mesa_meta_begin(ctx, MESA_META_ALL);
+
+   /* Choose between glsl version and fixed function version of
+    * GenerateMipmap function.
+    */
+   if (use_glsl_version) {
+      _mesa_meta_setup_vertex_objects(&mipmap->VAO, &mipmap->VBO, true,
+                                      2, 3, 0);
+      _mesa_meta_setup_blit_shader(ctx, target, &mipmap->shaders);
+   } else {
+      _mesa_meta_setup_ff_tnl_for_blit(&mipmap->VAO, &mipmap->VBO, 3);
+      _mesa_set_enable(ctx, target, GL_TRUE);
+   }
+
+   samplerSave = ctx->Texture.Unit[ctx->Texture.CurrentUnit].Sampler ?
+      ctx->Texture.Unit[ctx->Texture.CurrentUnit].Sampler->Name : 0;
+
+   if (currentTexUnitSave != 0)
+      _mesa_BindTexture(target, texObj->Name);
+
+   if (!mipmap->Sampler) {
+      _mesa_GenSamplers(1, &mipmap->Sampler);
+      _mesa_BindSampler(ctx->Texture.CurrentUnit, mipmap->Sampler);
+
+      _mesa_SamplerParameteri(mipmap->Sampler,
+                              GL_TEXTURE_MIN_FILTER,
+                              GL_LINEAR_MIPMAP_LINEAR);
+      _mesa_SamplerParameteri(mipmap->Sampler, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+      _mesa_SamplerParameteri(mipmap->Sampler, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+      _mesa_SamplerParameteri(mipmap->Sampler, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+      _mesa_SamplerParameteri(mipmap->Sampler, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE);
+
+      /* We don't want to encode or decode sRGB values; treat them as linear.
+       * This is not technically correct for GLES3 but we don't get any API
+       * error at the moment.
+       */
+      if (ctx->Extensions.EXT_texture_sRGB_decode) {
+         _mesa_SamplerParameteri(mipmap->Sampler, GL_TEXTURE_SRGB_DECODE_EXT,
+               GL_SKIP_DECODE_EXT);
+      }
+   } else {
+      _mesa_BindSampler(ctx->Texture.CurrentUnit, mipmap->Sampler);
+   }
+
+   assert(mipmap->FBO != 0);
+   _mesa_BindFramebuffer(GL_FRAMEBUFFER_EXT, mipmap->FBO);
+
+   _mesa_TexParameteri(target, GL_GENERATE_MIPMAP, GL_FALSE);
+
+   /* Silence valgrind warnings about reading uninitialized stack. */
+   memset(verts, 0, sizeof(verts));
+
+   /* setup vertex positions */
+   verts[0].x = -1.0F;
+   verts[0].y = -1.0F;
+   verts[1].x =  1.0F;
+   verts[1].y = -1.0F;
+   verts[2].x =  1.0F;
+   verts[2].y =  1.0F;
+   verts[3].x = -1.0F;
+   verts[3].y =  1.0F;
+
+   /* texture is already locked, unlock now */
+   _mesa_unlock_texture(ctx, texObj);
+
+   for (dstLevel = baseLevel + 1; dstLevel <= maxLevel; dstLevel++) {
+      const struct gl_texture_image *srcImage;
+      const GLuint srcLevel = dstLevel - 1;
+      GLuint layer;
+      GLsizei srcWidth, srcHeight, srcDepth;
+      GLsizei dstWidth, dstHeight, dstDepth;
+
+      srcImage = _mesa_select_tex_image(ctx, texObj, faceTarget, srcLevel);
+      assert(srcImage->Border == 0);
+
+      /* src size */
+      srcWidth = srcImage->Width;
+      if (target == GL_TEXTURE_1D_ARRAY) {
+         srcHeight = 1;
+         srcDepth = srcImage->Height;
+      } else {
+         srcHeight = srcImage->Height;
+         srcDepth = srcImage->Depth;
+      }
+
+      /* new dst size */
+      dstWidth = minify(srcWidth, 1);
+      dstHeight = minify(srcHeight, 1);
+      dstDepth = target == GL_TEXTURE_3D ? minify(srcDepth, 1) : srcDepth;
+
+      if (dstWidth == srcWidth &&
+          dstHeight == srcHeight &&
+          dstDepth == srcDepth) {
+         /* all done */
+         break;
+      }
+
+      /* Allocate storage for the destination mipmap image(s) */
+
+      /* Set MaxLevel large enough to hold the new level when we allocate it */
+      _mesa_TexParameteri(target, GL_TEXTURE_MAX_LEVEL, dstLevel);
+
+      if (!prepare_mipmap_level(ctx, texObj, dstLevel,
+                                dstWidth, dstHeight, dstDepth,
+                                srcImage->InternalFormat,
+                                srcImage->TexFormat)) {
+         /* All done.  We either ran out of memory or we would go beyond the
+          * last valid level of an immutable texture if we continued.
+          */
+         break;
+      }
+
+      /* limit minification to src level */
+      _mesa_TexParameteri(target, GL_TEXTURE_MAX_LEVEL, srcLevel);
+
+      /* setup viewport */
+      _mesa_set_viewport(ctx, 0, 0, 0, dstWidth, dstHeight);
+      _mesa_DrawBuffer(GL_COLOR_ATTACHMENT0);
+
+      for (layer = 0; layer < dstDepth; ++layer) {
+         /* Setup texture coordinates */
+         _mesa_meta_setup_texture_coords(faceTarget,
+                                         layer,
+                                         0, 0, 1, /* width, height never used here */
+                                         verts[0].tex,
+                                         verts[1].tex,
+                                         verts[2].tex,
+                                         verts[3].tex);
+
+         /* upload vertex data */
+         _mesa_BufferData(GL_ARRAY_BUFFER_ARB, sizeof(verts),
+                          verts, GL_DYNAMIC_DRAW_ARB);
+
+         bind_fbo_image(texObj, faceTarget, dstLevel, layer);
+
+         /* sanity check */
+         if (_mesa_CheckFramebufferStatus(GL_FRAMEBUFFER) !=
+             GL_FRAMEBUFFER_COMPLETE) {
+            _mesa_problem(ctx, "Unexpected incomplete framebuffer in "
+                          "_mesa_meta_GenerateMipmap()");
+            break;
+         }
+
+         assert(dstWidth == ctx->DrawBuffer->Width);
+         if (target == GL_TEXTURE_1D_ARRAY) {
+            assert(dstHeight == 1);
+         } else {
+            assert(dstHeight == ctx->DrawBuffer->Height);
+         }
+
+         _mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4);
+      }
+   }
+
+   _mesa_lock_texture(ctx, texObj); /* relock */
+
+   _mesa_BindSampler(ctx->Texture.CurrentUnit, samplerSave);
+
+   _mesa_meta_end(ctx);
+
+   _mesa_TexParameteri(target, GL_TEXTURE_MAX_LEVEL, maxLevelSave);
+   if (genMipmapSave)
+      _mesa_TexParameteri(target, GL_GENERATE_MIPMAP, genMipmapSave);
+
+   _mesa_BindFramebuffer(GL_FRAMEBUFFER_EXT, fboSave);
+}
diff --git a/mesalib/src/mesa/drivers/dri/common/dri_test.c b/mesalib/src/mesa/drivers/dri/common/dri_test.c
index 35732857d..7ab50d923 100644
--- a/mesalib/src/mesa/drivers/dri/common/dri_test.c
+++ b/mesalib/src/mesa/drivers/dri/common/dri_test.c
@@ -76,12 +76,6 @@ _glapi_get_dispatch_table_size(void)
 	return 0;
 }
 
-PUBLIC unsigned long
-_glthread_GetID(void)
-{
-   return 0;
-}
-
 #ifndef NO_MAIN
 int main(int argc, char** argv)
 {
diff --git a/mesalib/src/mesa/main/errors.c b/mesalib/src/mesa/main/errors.c
index ca73a6686..8ec6a8c33 100644
--- a/mesalib/src/mesa/main/errors.c
+++ b/mesalib/src/mesa/main/errors.c
@@ -38,9 +38,6 @@
 #include "version.h"
 #include "hash_table.h"
 
-#define MESSAGE_LOG 1
-#define MESSAGE_LOG_ARB 2
-
 static mtx_t DynamicIDMutex = _MTX_INITIALIZER_NP;
 static GLuint NextDynamicID = 1;
 
@@ -373,40 +370,6 @@ store_message_details(struct gl_debug_msg *emptySlot,
 
 
 /**
- * Remap any type exclusive to KHR_debug to something suitable
- * for ARB_debug_output
- */
-inline static int
-remap_type(GLenum type) {
-
-   switch(type) {
-   case GL_DEBUG_TYPE_MARKER:
-   case GL_DEBUG_TYPE_PUSH_GROUP:
-   case GL_DEBUG_TYPE_POP_GROUP:
-      type = GL_DEBUG_TYPE_OTHER;
-   default:
-      ;
-   }
-
-  return type;
-}
-
-
-/**
- * Remap severity exclusive to KHR_debug to something suitable
- * for ARB_debug_output
- */
-inline static int
-remap_severity(GLenum severity) {
-
-   if (GL_DEBUG_SEVERITY_NOTIFICATION == severity)
-      severity = GL_DEBUG_SEVERITY_LOW;
-
-   return severity;
-}
-
-
-/**
  * 'buf' is not necessarily a null-terminated string. When logging, copy
  * 'len' characters from it, store them in a new, null-terminated string,
  * and remember the number of bytes used by that string, *including*
@@ -433,10 +396,6 @@ log_msg(struct gl_context *ctx, enum mesa_debug_source source,
        GLenum gl_type = debug_type_enums[type];
        GLenum gl_severity = debug_severity_enums[severity];
 
-       if (debug->ARBCallback) {
-          gl_severity = remap_severity(gl_severity);
-          gl_type = remap_type(gl_type);
-      }
       debug->Callback(debug_source_enums[source], gl_type, id, gl_severity,
                       len, buf, debug->CallbackData);
       return;
@@ -470,8 +429,7 @@ log_msg(struct gl_context *ctx, enum mesa_debug_source source,
  */
 static GLsizei
 get_msg(struct gl_context *ctx, GLenum *source, GLenum *type,
-        GLuint *id, GLenum *severity, GLsizei bufSize, char *buf,
-        unsigned caller)
+        GLuint *id, GLenum *severity, GLsizei bufSize, char *buf)
 {
    struct gl_debug_state *debug = _mesa_get_debug_state(ctx);
    struct gl_debug_msg *msg;
@@ -490,8 +448,6 @@ get_msg(struct gl_context *ctx, GLenum *source, GLenum *type,
 
    if (severity) {
       *severity = debug_severity_enums[msg->severity];
-      if (caller == MESSAGE_LOG_ARB)
-         *severity = remap_severity(*severity);
    }
 
    if (source) {
@@ -500,8 +456,6 @@ get_msg(struct gl_context *ctx, GLenum *source, GLenum *type,
 
    if (type) {
       *type = debug_type_enums[msg->type];
-      if (caller == MESSAGE_LOG_ARB)
-         *type = remap_type(*type);
    }
 
    if (id) {
@@ -529,12 +483,9 @@ get_msg(struct gl_context *ctx, GLenum *source, GLenum *type,
 
 /**
  * Verify that source, type, and severity are valid enums.
- * glDebugMessageInsertARB only accepts two values for 'source',
- * and glDebugMessageControlARB will additionally accept GL_DONT_CARE
- * in any parameter, so handle those cases specially.
  *
- * There is also special cases for handling values available in
- * GL_KHR_debug that are not avaliable in GL_ARB_debug_output
+ * The 'caller' param is used for handling values available
+ * only in glDebugMessageInsert or glDebugMessageControl
  */
 static GLboolean
 validate_params(struct gl_context *ctx, unsigned caller,
@@ -543,8 +494,6 @@ validate_params(struct gl_context *ctx, unsigned caller,
 {
 #define INSERT 1
 #define CONTROL 2
-#define INSERT_ARB 3
-#define CONTROL_ARB 4
    switch(source) {
    case GL_DEBUG_SOURCE_APPLICATION_ARB:
    case GL_DEBUG_SOURCE_THIRD_PARTY_ARB:
@@ -553,11 +502,15 @@ validate_params(struct gl_context *ctx, unsigned caller,
    case GL_DEBUG_SOURCE_SHADER_COMPILER_ARB:
    case GL_DEBUG_SOURCE_WINDOW_SYSTEM_ARB:
    case GL_DEBUG_SOURCE_OTHER_ARB:
-      if (caller != INSERT || caller == INSERT_ARB)
+      if (caller != INSERT)
          break;
+      else
+         goto error;
    case GL_DONT_CARE:
-      if (caller == CONTROL || caller == CONTROL_ARB)
+      if (caller == CONTROL)
          break;
+      else
+         goto error;
    default:
       goto error;
    }
@@ -569,14 +522,15 @@ validate_params(struct gl_context *ctx, unsigned caller,
    case GL_DEBUG_TYPE_PERFORMANCE_ARB:
    case GL_DEBUG_TYPE_PORTABILITY_ARB:
    case GL_DEBUG_TYPE_OTHER_ARB:
-      break;
    case GL_DEBUG_TYPE_MARKER:
-      /* this value is only valid for GL_KHR_debug functions */
-      if (caller == CONTROL || caller == INSERT)
-         break;
+      break;
+   case GL_DEBUG_TYPE_PUSH_GROUP:
+   case GL_DEBUG_TYPE_POP_GROUP:
    case GL_DONT_CARE:
-      if (caller == CONTROL || caller == CONTROL_ARB)
+      if (caller == CONTROL)
          break;
+      else
+         goto error;
    default:
       goto error;
    }
@@ -585,14 +539,13 @@ validate_params(struct gl_context *ctx, unsigned caller,
    case GL_DEBUG_SEVERITY_HIGH_ARB:
    case GL_DEBUG_SEVERITY_MEDIUM_ARB:
    case GL_DEBUG_SEVERITY_LOW_ARB:
-      break;
    case GL_DEBUG_SEVERITY_NOTIFICATION:
-      /* this value is only valid for GL_KHR_debug functions */
-      if (caller == CONTROL || caller == INSERT)
-         break;
+      break;
    case GL_DONT_CARE:
-      if (caller == CONTROL || caller == CONTROL_ARB)
+      if (caller == CONTROL)
          break;
+      else
+         goto error;
    default:
       goto error;
    }
@@ -706,44 +659,6 @@ control_app_messages(struct gl_context *ctx, GLenum esource, GLenum etype,
 
 
 /**
- * This is a generic message control function for use by both
- * glDebugMessageControlARB and glDebugMessageControl.
- */
-static void
-message_control(GLenum gl_source, GLenum gl_type,
-                GLenum gl_severity,
-                GLsizei count, const GLuint *ids,
-                GLboolean enabled,
-                unsigned caller, const char *callerstr)
-{
-   GET_CURRENT_CONTEXT(ctx);
-
-   if (count < 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "%s(count=%d : count must not be negative)", callerstr,
-                  count);
-      return;
-   }
-
-   if (!validate_params(ctx, caller, callerstr, gl_source, gl_type,
-                        gl_severity))
-      return; /* GL_INVALID_ENUM */
-
-   if (count && (gl_severity != GL_DONT_CARE || gl_type == GL_DONT_CARE
-                 || gl_source == GL_DONT_CARE)) {
-      _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "%s(When passing an array of ids, severity must be"
-         " GL_DONT_CARE, and source and type must not be GL_DONT_CARE.",
-                  callerstr);
-      return;
-   }
-
-   control_app_messages(ctx, gl_source, gl_type, gl_severity,
-                        count, ids, enabled);
-}
-
-
-/**
  * This is a generic message insert function.
  * Validation of source, type and severity parameters should be done
  * before calling this funtion.
@@ -773,58 +688,6 @@ message_insert(GLenum source, GLenum type, GLuint id,
 }
 
 
-/**
- * This is a generic message insert function for use by both
- * glGetDebugMessageLogARB and glGetDebugMessageLog.
- */
-static GLuint
-get_message_log(GLuint count, GLsizei logSize, GLenum *sources,
-                GLenum *types, GLenum *ids, GLenum *severities,
-                GLsizei *lengths, GLchar *messageLog,
-                unsigned caller, const char *callerstr)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   GLuint ret;
-
-   if (!messageLog)
-      logSize = 0;
-
-   if (logSize < 0) {
-      _mesa_error(ctx, GL_INVALID_VALUE,
-                  "%s(logSize=%d : logSize must not be negative)", callerstr,
-                  logSize);
-      return 0;
-   }
-
-   for (ret = 0; ret < count; ret++) {
-      GLsizei written = get_msg(ctx, sources, types, ids, severities,
-                                logSize, messageLog, caller);
-      if (!written)
-         break;
-
-      if (messageLog) {
-         messageLog += written;
-         logSize -= written;
-      }
-      if (lengths) {
-         *lengths = written;
-         lengths++;
-      }
-
-      if (severities)
-         severities++;
-      if (sources)
-         sources++;
-      if (types)
-         types++;
-      if (ids)
-         ids++;
-   }
-
-   return ret;
-}
-
-
 static void
 do_nothing(GLuint key, void *data, void *userData)
 {
@@ -887,22 +750,79 @@ _mesa_GetDebugMessageLog(GLuint count, GLsizei logSize, GLenum *sources,
                          GLenum *types, GLenum *ids, GLenum *severities,
                          GLsizei *lengths, GLchar *messageLog)
 {
-   const char *callerstr = "glGetDebugMessageLog";
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint ret;
+
+   if (!messageLog)
+      logSize = 0;
+
+   if (logSize < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "glGetDebugMessageLog(logSize=%d : logSize must not be"
+                  " negative)", logSize);
+      return 0;
+   }
+
+   for (ret = 0; ret < count; ret++) {
+      GLsizei written = get_msg(ctx, sources, types, ids, severities,
+                                logSize, messageLog);
+      if (!written)
+         break;
+
+      if (messageLog) {
+         messageLog += written;
+         logSize -= written;
+      }
+      if (lengths) {
+         *lengths = written;
+         lengths++;
+      }
 
-   return get_message_log(count, logSize, sources, types, ids, severities,
-                          lengths, messageLog, MESSAGE_LOG, callerstr);
+      if (severities)
+         severities++;
+      if (sources)
+         sources++;
+      if (types)
+         types++;
+      if (ids)
+         ids++;
+   }
+
+   return ret;
 }
 
 
 void GLAPIENTRY
-_mesa_DebugMessageControl(GLenum source, GLenum type, GLenum severity,
-                          GLsizei count, const GLuint *ids,
-                          GLboolean enabled)
+_mesa_DebugMessageControl(GLenum gl_source, GLenum gl_type,
+                          GLenum gl_severity, GLsizei count,
+                          const GLuint *ids, GLboolean enabled)
 {
    const char *callerstr = "glDebugMessageControl";
 
-   message_control(source, type, severity, count, ids,
-                   enabled, CONTROL, callerstr);
+   GET_CURRENT_CONTEXT(ctx);
+
+   if (count < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE,
+                  "%s(count=%d : count must not be negative)", callerstr,
+                  count);
+      return;
+   }
+
+   if (!validate_params(ctx, CONTROL, callerstr, gl_source, gl_type,
+                        gl_severity))
+      return; /* GL_INVALID_ENUM */
+
+   if (count && (gl_severity != GL_DONT_CARE || gl_type == GL_DONT_CARE
+                 || gl_source == GL_DONT_CARE)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION,
+                  "%s(When passing an array of ids, severity must be"
+         " GL_DONT_CARE, and source and type must not be GL_DONT_CARE.",
+                  callerstr);
+      return;
+   }
+
+   control_app_messages(ctx, gl_source, gl_type, gl_severity,
+                        count, ids, enabled);
 }
 
 
@@ -914,7 +834,6 @@ _mesa_DebugMessageCallback(GLDEBUGPROC callback, const void *userParam)
    if (debug) {
       debug->Callback = callback;
       debug->CallbackData = userParam;
-      debug->ARBCallback = GL_FALSE;
    }
 }
 
@@ -1041,60 +960,6 @@ _mesa_PopDebugGroup(void)
 }
 
 
-void GLAPIENTRY
-_mesa_DebugMessageInsertARB(GLenum source, GLenum type, GLuint id,
-                            GLenum severity, GLint length,
-                            const GLcharARB *buf)
-{
-   const char *callerstr = "glDebugMessageInsertARB";
-
-   GET_CURRENT_CONTEXT(ctx);
-
-   if (!validate_params(ctx, INSERT_ARB, callerstr, source, type, severity))
-      return; /* GL_INVALID_ENUM */
-
-   message_insert(source, type, id, severity, length, buf, callerstr);
-}
-
-
-GLuint GLAPIENTRY
-_mesa_GetDebugMessageLogARB(GLuint count, GLsizei logSize, GLenum *sources,
-                            GLenum *types, GLenum *ids, GLenum *severities,
-                            GLsizei *lengths, GLcharARB *messageLog)
-{
-   const char *callerstr = "glGetDebugMessageLogARB";
-
-   return get_message_log(count, logSize, sources, types, ids, severities,
-                          lengths, messageLog, MESSAGE_LOG_ARB, callerstr);
-}
-
-
-void GLAPIENTRY
-_mesa_DebugMessageControlARB(GLenum gl_source, GLenum gl_type,
-                             GLenum gl_severity,
-                             GLsizei count, const GLuint *ids,
-                             GLboolean enabled)
-{
-   const char *callerstr = "glDebugMessageControlARB";
-
-   message_control(gl_source, gl_type, gl_severity, count, ids,
-                   enabled, CONTROL_ARB, callerstr);
-}
-
-
-void GLAPIENTRY
-_mesa_DebugMessageCallbackARB(GLDEBUGPROCARB callback, const void *userParam)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   struct gl_debug_state *debug = _mesa_get_debug_state(ctx);
-   if (debug) {
-      debug->Callback = callback;
-      debug->CallbackData = userParam;
-      debug->ARBCallback = GL_TRUE;
-   }
-}
-
-
 void
 _mesa_init_errors(struct gl_context *ctx)
 {
diff --git a/mesalib/src/mesa/main/errors.h b/mesalib/src/mesa/main/errors.h
index cd414e6b6..e0706e5b9 100644
--- a/mesalib/src/mesa/main/errors.h
+++ b/mesalib/src/mesa/main/errors.h
@@ -91,21 +91,6 @@ _mesa_shader_debug(struct gl_context *ctx, GLenum type, GLuint *id,
                    const char *msg, int len);
 
 void GLAPIENTRY
-_mesa_DebugMessageInsertARB(GLenum source, GLenum type, GLuint id,
-                            GLenum severity, GLint length,
-                            const GLcharARB* buf);
-GLuint GLAPIENTRY
-_mesa_GetDebugMessageLogARB(GLuint count, GLsizei logSize, GLenum* sources,
-                            GLenum* types, GLenum* ids, GLenum* severities,
-                            GLsizei* lengths, GLcharARB* messageLog);
-void GLAPIENTRY
-_mesa_DebugMessageControlARB(GLenum source, GLenum type, GLenum severity,
-                             GLsizei count, const GLuint *ids,
-                             GLboolean enabled);
-void GLAPIENTRY
-_mesa_DebugMessageCallbackARB(GLDEBUGPROCARB callback,
-                              const void *userParam);
-void GLAPIENTRY
 _mesa_DebugMessageInsert(GLenum source, GLenum type, GLuint id,
                          GLenum severity, GLint length,
                          const GLchar* buf);
diff --git a/mesalib/src/mesa/main/extensions.c b/mesalib/src/mesa/main/extensions.c
index c46d70b20..a72284c9a 100644
--- a/mesalib/src/mesa/main/extensions.c
+++ b/mesalib/src/mesa/main/extensions.c
@@ -138,6 +138,7 @@ static const struct extension extension_table[] = {
    { "GL_ARB_shading_language_packing",            o(ARB_shading_language_packing),            GL,             2011 },
    { "GL_ARB_shading_language_420pack",            o(ARB_shading_language_420pack),            GL,             2011 },
    { "GL_ARB_shadow",                              o(ARB_shadow),                              GLL,            2001 },
+   { "GL_ARB_stencil_texturing",                   o(ARB_stencil_texturing),                   GL,             2012 },
    { "GL_ARB_sync",                                o(ARB_sync),                                GL,             2003 },
    { "GL_ARB_texture_border_clamp",                o(ARB_texture_border_clamp),                GLL,            2000 },
    { "GL_ARB_texture_buffer_object",               o(ARB_texture_buffer_object),               GLC,            2008 },
diff --git a/mesalib/src/mesa/main/format_pack.c b/mesalib/src/mesa/main/format_pack.c
index 2772ff2d3..acab6cb8d 100644
--- a/mesalib/src/mesa/main/format_pack.c
+++ b/mesalib/src/mesa/main/format_pack.c
@@ -567,7 +567,7 @@ static void
 pack_ubyte_ARGB4444_REV(const GLubyte src[4], void *dst)
 {
    GLushort *d = ((GLushort *) dst);
-   *d = PACK_COLOR_4444(src[GCOMP], src[BCOMP], src[ACOMP], src[RCOMP]);
+   *d = PACK_COLOR_4444(src[BCOMP], src[GCOMP], src[RCOMP], src[ACOMP]);
 }
 
 static void
@@ -1044,8 +1044,8 @@ pack_ubyte_SRGB8(const GLubyte src[4], void *dst)
 {
    GLubyte *d = ((GLubyte *) dst);
    d[2] = linear_ubyte_to_srgb_ubyte(src[RCOMP]);
-   d[1] = linear_ubyte_to_srgb_ubyte(src[RCOMP]);
-   d[0] = linear_ubyte_to_srgb_ubyte(src[RCOMP]);
+   d[1] = linear_ubyte_to_srgb_ubyte(src[GCOMP]);
+   d[0] = linear_ubyte_to_srgb_ubyte(src[BCOMP]);
 }
 
 static void
@@ -1090,8 +1090,8 @@ pack_ubyte_SARGB8(const GLubyte src[4], void *dst)
 {
    GLuint *d = ((GLuint *) dst);
    GLubyte r = linear_ubyte_to_srgb_ubyte(src[RCOMP]);
-   GLubyte g = linear_ubyte_to_srgb_ubyte(src[RCOMP]);
-   GLubyte b = linear_ubyte_to_srgb_ubyte(src[RCOMP]);
+   GLubyte g = linear_ubyte_to_srgb_ubyte(src[GCOMP]);
+   GLubyte b = linear_ubyte_to_srgb_ubyte(src[BCOMP]);
    *d = PACK_COLOR_8888(src[ACOMP], r, g, b);
 }
 
@@ -1108,6 +1108,31 @@ pack_float_SARGB8(const GLfloat src[4], void *dst)
 }
 
 
+/* MESA_FORMAT_R8G8B8A8_SRGB */
+
+static void
+pack_ubyte_SABGR8(const GLubyte src[4], void *dst)
+{
+   GLuint *d = ((GLuint *) dst);
+   GLubyte r = linear_ubyte_to_srgb_ubyte(src[RCOMP]);
+   GLubyte g = linear_ubyte_to_srgb_ubyte(src[GCOMP]);
+   GLubyte b = linear_ubyte_to_srgb_ubyte(src[BCOMP]);
+   *d = PACK_COLOR_8888(src[ACOMP], b, g, r);
+}
+
+static void
+pack_float_SABGR8(const GLfloat src[4], void *dst)
+{
+   GLuint *d = ((GLuint *) dst);
+   GLubyte r, g, b, a;
+   r = linear_float_to_srgb_ubyte(src[RCOMP]);
+   g = linear_float_to_srgb_ubyte(src[GCOMP]);
+   b = linear_float_to_srgb_ubyte(src[BCOMP]);
+   UNCLAMPED_FLOAT_TO_UBYTE(a, src[ACOMP]);
+   *d = PACK_COLOR_8888(a, b, g, r);
+}
+
+
 /* MESA_FORMAT_L_SRGB8 */
 
 static void
@@ -1880,6 +1905,20 @@ pack_float_SIGNED_RG1616(const GLfloat src[4], void *dst)
    *d = (r << 16) | (g & 0xffff);
 }
 
+/*
+ * MESA_FORMAT_B8G8R8X8_SRGB
+ */
+
+static void
+pack_float_XRGB8888_SRGB(const GLfloat src[4], void *dst)
+{
+   GLuint *d = (GLuint *) dst;
+   GLubyte r = linear_float_to_srgb_ubyte(src[RCOMP]);
+   GLubyte g = linear_float_to_srgb_ubyte(src[GCOMP]);
+   GLubyte b = linear_float_to_srgb_ubyte(src[BCOMP]);
+   *d = PACK_COLOR_8888(127, r, g, b);
+}
+
 /**
  * Return a function that can pack a GLubyte rgba[4] color.
  */
@@ -1947,6 +1986,7 @@ _mesa_get_pack_ubyte_rgba_function(mesa_format format)
       table[MESA_FORMAT_BGR_SRGB8] = pack_ubyte_SRGB8;
       table[MESA_FORMAT_A8B8G8R8_SRGB] = pack_ubyte_SRGBA8;
       table[MESA_FORMAT_B8G8R8A8_SRGB] = pack_ubyte_SARGB8;
+      table[MESA_FORMAT_R8G8B8A8_SRGB] = pack_ubyte_SABGR8;
       table[MESA_FORMAT_L_SRGB8] = pack_ubyte_SL8;
       table[MESA_FORMAT_L8A8_SRGB] = pack_ubyte_SLA8;
       /* n/a */
@@ -2034,6 +2074,8 @@ _mesa_get_pack_ubyte_rgba_function(mesa_format format)
 
       table[MESA_FORMAT_R10G10B10A2_UNORM] = pack_ubyte_ABGR2101010;
 
+      table[MESA_FORMAT_B8G8R8X8_SRGB] = NULL;
+
       initialized = GL_TRUE;
    }
 
@@ -2109,6 +2151,7 @@ _mesa_get_pack_float_rgba_function(mesa_format format)
       table[MESA_FORMAT_BGR_SRGB8] = pack_float_SRGB8;
       table[MESA_FORMAT_A8B8G8R8_SRGB] = pack_float_SRGBA8;
       table[MESA_FORMAT_B8G8R8A8_SRGB] = pack_float_SARGB8;
+      table[MESA_FORMAT_R8G8B8A8_SRGB] = pack_float_SABGR8;
       table[MESA_FORMAT_L_SRGB8] = pack_float_SL8;
       table[MESA_FORMAT_L8A8_SRGB] = pack_float_SLA8;
 
@@ -2197,6 +2240,8 @@ _mesa_get_pack_float_rgba_function(mesa_format format)
       table[MESA_FORMAT_G8R8_SNORM] = pack_float_SIGNED_RG88;
       table[MESA_FORMAT_G16R16_SNORM] = pack_float_SIGNED_RG1616;
 
+      table[MESA_FORMAT_B8G8R8X8_SRGB] = pack_float_XRGB8888_SRGB;
+
       initialized = GL_TRUE;
    }
 
diff --git a/mesalib/src/mesa/main/format_unpack.c b/mesalib/src/mesa/main/format_unpack.c
index 276ba556a..2348ef605 100644
--- a/mesalib/src/mesa/main/format_unpack.c
+++ b/mesalib/src/mesa/main/format_unpack.c
@@ -267,10 +267,10 @@ unpack_ARGB4444_REV(const void *src, GLfloat dst[][4], GLuint n)
    const GLushort *s = ((const GLushort *) src);
    GLuint i;
    for (i = 0; i < n; i++) {
-      dst[i][RCOMP] = ((s[i]      ) & 0xf) * (1.0F / 15.0F);
-      dst[i][GCOMP] = ((s[i] >> 12) & 0xf) * (1.0F / 15.0F);
-      dst[i][BCOMP] = ((s[i] >>  8) & 0xf) * (1.0F / 15.0F);
-      dst[i][ACOMP] = ((s[i] >>  4) & 0xf) * (1.0F / 15.0F);
+      dst[i][RCOMP] = ((s[i] >>  4) & 0xf) * (1.0F / 15.0F);
+      dst[i][GCOMP] = ((s[i] >>  8) & 0xf) * (1.0F / 15.0F);
+      dst[i][BCOMP] = ((s[i] >> 12) & 0xf) * (1.0F / 15.0F);
+      dst[i][ACOMP] = ((s[i]      ) & 0xf) * (1.0F / 15.0F);
    }
 }
 
@@ -797,6 +797,19 @@ unpack_SARGB8(const void *src, GLfloat dst[][4], GLuint n)
 }
 
 static void
+unpack_SABGR8(const void *src, GLfloat dst[][4], GLuint n)
+{
+   const GLuint *s = ((const GLuint *) src);
+   GLuint i;
+   for (i = 0; i < n; i++) {
+      dst[i][RCOMP] = _mesa_nonlinear_to_linear( (s[i]      ) & 0xff );
+      dst[i][GCOMP] = _mesa_nonlinear_to_linear( (s[i] >>  8) & 0xff );
+      dst[i][BCOMP] = _mesa_nonlinear_to_linear( (s[i] >> 16) & 0xff );
+      dst[i][ACOMP] = UBYTE_TO_FLOAT( s[i] >> 24 ); /* linear! */
+   }
+}
+
+static void
 unpack_SL8(const void *src, GLfloat dst[][4], GLuint n)
 {
    const GLubyte *s = ((const GLubyte *) src);
@@ -2313,6 +2326,19 @@ unpack_SIGNED_RG1616(const void *src, GLfloat dst[][4], GLuint n)
    }
 }
 
+static void
+unpack_XRGB8888_SRGB(const void *src, GLfloat dst[][4], GLuint n)
+{
+   const GLuint *s = ((const GLuint *) src);
+   GLuint i;
+   for (i = 0; i < n; i++) {
+      dst[i][RCOMP] = _mesa_nonlinear_to_linear( (s[i] >> 16) & 0xff );
+      dst[i][GCOMP] = _mesa_nonlinear_to_linear( (s[i] >>  8) & 0xff );
+      dst[i][BCOMP] = _mesa_nonlinear_to_linear( (s[i]      ) & 0xff );
+      dst[i][ACOMP] = 1.0F;
+   }
+}
+
 /**
  * Return the unpacker function for the given format.
  */
@@ -2375,6 +2401,7 @@ get_unpack_rgba_function(mesa_format format)
       table[MESA_FORMAT_BGR_SRGB8] = unpack_SRGB8;
       table[MESA_FORMAT_A8B8G8R8_SRGB] = unpack_SRGBA8;
       table[MESA_FORMAT_B8G8R8A8_SRGB] = unpack_SARGB8;
+      table[MESA_FORMAT_R8G8B8A8_SRGB] = unpack_SABGR8;
       table[MESA_FORMAT_L_SRGB8] = unpack_SL8;
       table[MESA_FORMAT_L8A8_SRGB] = unpack_SLA8;
       table[MESA_FORMAT_SRGB_DXT1] = unpack_SRGB_DXT1;
@@ -2530,6 +2557,8 @@ get_unpack_rgba_function(mesa_format format)
       table[MESA_FORMAT_G8R8_SNORM] = unpack_SIGNED_RG88;
       table[MESA_FORMAT_G16R16_SNORM] = unpack_SIGNED_RG1616;
 
+      table[MESA_FORMAT_B8G8R8X8_SRGB] = unpack_XRGB8888_SRGB;
+
       initialized = GL_TRUE;
    }
 
@@ -2738,10 +2767,10 @@ unpack_ubyte_ARGB4444_REV(const void *src, GLubyte dst[][4], GLuint n)
    const GLushort *s = ((const GLushort *) src);
    GLuint i;
    for (i = 0; i < n; i++) {
-      dst[i][RCOMP] = EXPAND_4_8((s[i]      ) & 0xf);
-      dst[i][GCOMP] = EXPAND_4_8((s[i] >> 12) & 0xf);
-      dst[i][BCOMP] = EXPAND_4_8((s[i] >>  8) & 0xf);
-      dst[i][ACOMP] = EXPAND_4_8((s[i] >>  4) & 0xf);
+      dst[i][RCOMP] = EXPAND_4_8((s[i] >>  4) & 0xf);
+      dst[i][GCOMP] = EXPAND_4_8((s[i] >>  8) & 0xf);
+      dst[i][BCOMP] = EXPAND_4_8((s[i] >> 12) & 0xf);
+      dst[i][ACOMP] = EXPAND_4_8((s[i]      ) & 0xf);
    }
 }
 
diff --git a/mesalib/src/mesa/main/formats.c b/mesalib/src/mesa/main/formats.c
index f6c399ede..0cf97fa31 100644
--- a/mesalib/src/mesa/main/formats.c
+++ b/mesalib/src/mesa/main/formats.c
@@ -520,6 +520,15 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       1, 1, 4
    },
    {
+      MESA_FORMAT_R8G8B8A8_SRGB,
+      "MESA_FORMAT_R8G8B8A8_SRGB",
+      GL_RGBA,
+      GL_UNSIGNED_NORMALIZED,    
+      8, 8, 8, 8,
+      0, 0, 0, 0, 0,
+      1, 1, 4
+   },
+   {
       MESA_FORMAT_L_SRGB8,
       "MESA_FORMAT_L_SRGB8",
       GL_LUMINANCE,
@@ -1790,6 +1799,15 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       0, 0, 0, 0, 0,
       1, 1, 4
    },
+   {
+      MESA_FORMAT_B8G8R8X8_SRGB,
+      "MESA_FORMAT_B8G8R8X8_SRGB",
+      GL_RGB,
+      GL_UNSIGNED_NORMALIZED,
+      8, 8, 8, 0,
+      0, 0, 0, 0, 0,
+      1, 1, 4
+   },
 };
 
 
@@ -2025,6 +2043,7 @@ _mesa_get_format_color_encoding(mesa_format format)
    case MESA_FORMAT_BGR_SRGB8:
    case MESA_FORMAT_A8B8G8R8_SRGB:
    case MESA_FORMAT_B8G8R8A8_SRGB:
+   case MESA_FORMAT_R8G8B8A8_SRGB:
    case MESA_FORMAT_L_SRGB8:
    case MESA_FORMAT_L8A8_SRGB:
    case MESA_FORMAT_SRGB_DXT1:
@@ -2035,6 +2054,7 @@ _mesa_get_format_color_encoding(mesa_format format)
    case MESA_FORMAT_ETC2_SRGB8:
    case MESA_FORMAT_ETC2_SRGB8_ALPHA8_EAC:
    case MESA_FORMAT_ETC2_SRGB8_PUNCHTHROUGH_ALPHA1:
+   case MESA_FORMAT_B8G8R8X8_SRGB:
       return GL_SRGB;
    default:
       return GL_LINEAR;
@@ -2059,6 +2079,9 @@ _mesa_get_srgb_format_linear(mesa_format format)
    case MESA_FORMAT_B8G8R8A8_SRGB:
       format = MESA_FORMAT_B8G8R8A8_UNORM;
       break;
+   case MESA_FORMAT_R8G8B8A8_SRGB:
+      format = MESA_FORMAT_R8G8B8A8_UNORM;
+      break;
    case MESA_FORMAT_L_SRGB8:
       format = MESA_FORMAT_L_UNORM8;
       break;
@@ -2089,6 +2112,9 @@ _mesa_get_srgb_format_linear(mesa_format format)
    case MESA_FORMAT_ETC2_SRGB8_PUNCHTHROUGH_ALPHA1:
       format = MESA_FORMAT_ETC2_RGB8_PUNCHTHROUGH_ALPHA1;
       break;
+   case MESA_FORMAT_B8G8R8X8_SRGB:
+      format = MESA_FORMAT_B8G8R8X8_UNORM;
+      break;
    default:
       break;
    }
@@ -2563,6 +2589,7 @@ _mesa_format_to_type_and_comps(mesa_format format,
       return;
    case MESA_FORMAT_A8B8G8R8_SRGB:
    case MESA_FORMAT_B8G8R8A8_SRGB:
+   case MESA_FORMAT_R8G8B8A8_SRGB:
       *datatype = GL_UNSIGNED_BYTE;
       *comps = 4;
       return;
@@ -2895,6 +2922,11 @@ _mesa_format_to_type_and_comps(mesa_format format,
       *comps = 2;
       return;
 
+   case MESA_FORMAT_B8G8R8X8_SRGB:
+      *datatype = GL_UNSIGNED_BYTE;
+      *comps = 4;
+      return;
+
    case MESA_FORMAT_COUNT:
       assert(0);
       return;
@@ -2967,6 +2999,7 @@ _mesa_format_matches_format_and_type(mesa_format mesa_format,
       return GL_FALSE;
 
    case MESA_FORMAT_R8G8B8A8_UNORM:
+   case MESA_FORMAT_R8G8B8A8_SRGB:
       if (format == GL_RGBA && type == GL_UNSIGNED_INT_8_8_8_8_REV &&
           !swapBytes)
          return GL_TRUE;
@@ -3448,6 +3481,9 @@ _mesa_format_matches_format_and_type(mesa_format mesa_format,
    case MESA_FORMAT_G16R16_SNORM:
       return format == GL_RG && type == GL_SHORT && !littleEndian &&
          !swapBytes;
+
+   case MESA_FORMAT_B8G8R8X8_SRGB:
+      return GL_FALSE;
    }
 
    return GL_FALSE;
diff --git a/mesalib/src/mesa/main/formats.h b/mesalib/src/mesa/main/formats.h
index 3102584b6..a12fe4f08 100644
--- a/mesalib/src/mesa/main/formats.h
+++ b/mesalib/src/mesa/main/formats.h
@@ -333,6 +333,7 @@ typedef enum
     *  R10G10B10A2_UNORM
     *  G8R8_SINT
     *  G16R16_SINT
+    *  B8G8R8X8_SRGB
     *
     */
    /*@{*/
@@ -418,6 +419,7 @@ typedef enum
    /* Type P formats */
    MESA_FORMAT_A8B8G8R8_SRGB,    /* RRRR RRRR GGGG GGGG BBBB BBBB AAAA AAAA */
    MESA_FORMAT_B8G8R8A8_SRGB,    /* AAAA AAAA RRRR RRRR GGGG GGGG BBBB BBBB */
+   MESA_FORMAT_R8G8B8A8_SRGB,    /* AAAA AAAA BBBB BBBB GGGG GGGG RRRR RRRR */
 
    /* Type A format(s) */
    MESA_FORMAT_L_SRGB8,       /* uchar[i] = L */
@@ -647,6 +649,8 @@ typedef enum
    MESA_FORMAT_G8R8_SNORM,        /*                     RRRR RRRR GGGG GGGG */
    MESA_FORMAT_G16R16_SNORM,      /* RRRR RRRR RRRR RRRR GGGG GGGG GGGG GGGG */
 
+   MESA_FORMAT_B8G8R8X8_SRGB,     /* xxxx xxxx RRRR RRRR GGGG GGGG BBBB BBBB */
+
    MESA_FORMAT_COUNT
 } mesa_format;
 
diff --git a/mesalib/src/mesa/main/hash_table.c b/mesalib/src/mesa/main/hash_table.c
index 008b4cdbc..ad8f89852 100644
--- a/mesalib/src/mesa/main/hash_table.c
+++ b/mesalib/src/mesa/main/hash_table.c
@@ -119,7 +119,6 @@ _mesa_hash_table_create(void *mem_ctx,
    if (ht == NULL)
       return NULL;
 
-   ht->mem_ctx = mem_ctx;
    ht->size_index = 0;
    ht->size = hash_sizes[ht->size_index].size;
    ht->rehash = hash_sizes[ht->size_index].rehash;
diff --git a/mesalib/src/mesa/main/hash_table.h b/mesalib/src/mesa/main/hash_table.h
index ad1dae478..f51131aee 100644
--- a/mesalib/src/mesa/main/hash_table.h
+++ b/mesalib/src/mesa/main/hash_table.h
@@ -44,7 +44,6 @@ struct hash_entry {
 };
 
 struct hash_table {
-   void *mem_ctx;
    struct hash_entry *table;
    bool (*key_equals_function)(const void *a, const void *b);
    const void *deleted_key;
diff --git a/mesalib/src/mesa/main/mtypes.h b/mesalib/src/mesa/main/mtypes.h
index bbc377280..e5f10baab 100644
--- a/mesalib/src/mesa/main/mtypes.h
+++ b/mesalib/src/mesa/main/mtypes.h
@@ -1199,6 +1199,7 @@ struct gl_texture_object
    struct gl_sampler_object Sampler;
 
    GLenum DepthMode;           /**< GL_ARB_depth_texture */
+   bool StencilSampling;       /**< Should we sample stencil instead of depth? */
 
    GLfloat Priority;           /**< in [0,1] */
    GLint BaseLevel;            /**< min mipmap level, OpenGL 1.2 */
@@ -3526,6 +3527,7 @@ struct gl_extensions
    GLboolean ARB_shading_language_packing;
    GLboolean ARB_shading_language_420pack;
    GLboolean ARB_shadow;
+   GLboolean ARB_stencil_texturing;
    GLboolean ARB_sync;
    GLboolean ARB_texture_border_clamp;
    GLboolean ARB_texture_buffer_object;
@@ -3843,7 +3845,6 @@ struct gl_debug_state
    const void *CallbackData;
    GLboolean SyncOutput;
    GLboolean DebugOutput;
-   GLboolean ARBCallback; /* Used to track if current callback is of type ARB_debug_output or KHR_debug */
    GLboolean Defaults[MAX_DEBUG_GROUP_STACK_DEPTH][MESA_DEBUG_SEVERITY_COUNT][MESA_DEBUG_SOURCE_COUNT][MESA_DEBUG_TYPE_COUNT];
    struct gl_debug_namespace Namespaces[MAX_DEBUG_GROUP_STACK_DEPTH][MESA_DEBUG_SOURCE_COUNT][MESA_DEBUG_TYPE_COUNT];
    struct gl_debug_msg Log[MAX_DEBUG_LOGGED_MESSAGES];
diff --git a/mesalib/src/mesa/main/set.c b/mesalib/src/mesa/main/set.c
index dc3550c76..989e5dece 100644
--- a/mesalib/src/mesa/main/set.c
+++ b/mesalib/src/mesa/main/set.c
@@ -112,7 +112,6 @@ _mesa_set_create(void *mem_ctx,
    if (ht == NULL)
       return NULL;
 
-   ht->mem_ctx = mem_ctx;
    ht->size_index = 0;
    ht->size = hash_sizes[ht->size_index].size;
    ht->rehash = hash_sizes[ht->size_index].rehash;
diff --git a/mesalib/src/mesa/main/streaming-load-memcpy.c b/mesalib/src/mesa/main/streaming-load-memcpy.c
index d7147afdc..8427149c5 100644
--- a/mesalib/src/mesa/main/streaming-load-memcpy.c
+++ b/mesalib/src/mesa/main/streaming-load-memcpy.c
@@ -26,6 +26,7 @@
  *
  */
 
+#ifdef __SSE4_1__
 #include "main/macros.h"
 #include "main/streaming-load-memcpy.h"
 #include <smmintrin.h>
@@ -83,3 +84,5 @@ _mesa_streaming_load_memcpy(void *restrict dst, void *restrict src, size_t len)
       memcpy(d, s, len);
    }
 }
+
+#endif
diff --git a/mesalib/src/mesa/main/teximage.c b/mesalib/src/mesa/main/teximage.c
index 0519d221f..a6c3581bf 100644
--- a/mesalib/src/mesa/main/teximage.c
+++ b/mesalib/src/mesa/main/teximage.c
@@ -1290,16 +1290,19 @@ clear_teximage_fields(struct gl_texture_image *img)
  * \param border image border.
  * \param internalFormat internal format.
  * \param format  the actual hardware format (one of MESA_FORMAT_*)
+ * \param numSamples  number of samples per texel, or zero for non-MS.
+ * \param fixedSampleLocations  are sample locations fixed?
  *
  * Fills in the fields of \p img with the given information.
  * Note: width, height and depth include the border.
  */
-void
-_mesa_init_teximage_fields(struct gl_context *ctx,
-                           struct gl_texture_image *img,
-                           GLsizei width, GLsizei height, GLsizei depth,
-                           GLint border, GLenum internalFormat,
-                           mesa_format format)
+static void
+init_teximage_fields_ms(struct gl_context *ctx,
+                        struct gl_texture_image *img,
+                        GLsizei width, GLsizei height, GLsizei depth,
+                        GLint border, GLenum internalFormat,
+                        mesa_format format,
+                        GLuint numSamples, GLboolean fixedSampleLocations)
 {
    GLenum target;
    ASSERT(img);
@@ -1397,6 +1400,20 @@ _mesa_init_teximage_fields(struct gl_context *ctx,
       _mesa_get_tex_max_num_levels(target,
                                    img->Width2, img->Height2, img->Depth2);
    img->TexFormat = format;
+   img->NumSamples = numSamples;
+   img->FixedSampleLocations = fixedSampleLocations;
+}
+
+
+void
+_mesa_init_teximage_fields(struct gl_context *ctx,
+                           struct gl_texture_image *img,
+                           GLsizei width, GLsizei height, GLsizei depth,
+                           GLint border, GLenum internalFormat,
+                           mesa_format format)
+{
+   init_teximage_fields_ms(ctx, img, width, height, depth, border,
+                           internalFormat, format, 0, GL_TRUE);
 }
 
 
@@ -2039,6 +2056,8 @@ texture_error_check( struct gl_context *ctx,
                      GLint depth, GLint border )
 {
    GLboolean colorFormat;
+   GLboolean is_format_depth_or_depthstencil;
+   GLboolean is_internalFormat_depth_or_depthstencil;
    GLenum err;
 
    /* Even though there are no color-index textures, we still have to support
@@ -2129,11 +2148,18 @@ texture_error_check( struct gl_context *ctx,
    }
 
    /* make sure internal format and format basically agree */
+   is_internalFormat_depth_or_depthstencil =
+      _mesa_is_depth_format(internalFormat) ||
+      _mesa_is_depthstencil_format(internalFormat);
+
+   is_format_depth_or_depthstencil =
+      _mesa_is_depth_format(format) ||
+      _mesa_is_depthstencil_format(format);
+
    colorFormat = _mesa_is_color_format(format);
    if ((_mesa_is_color_format(internalFormat) && !colorFormat && !indexFormat) ||
-       (_mesa_is_depth_format(internalFormat) != _mesa_is_depth_format(format)) ||
+       (is_internalFormat_depth_or_depthstencil != is_format_depth_or_depthstencil) ||
        (_mesa_is_ycbcr_format(internalFormat) != _mesa_is_ycbcr_format(format)) ||
-       (_mesa_is_depthstencil_format(internalFormat) != _mesa_is_depthstencil_format(format)) ||
        (_mesa_is_dudv_format(internalFormat) != _mesa_is_dudv_format(format))) {
       _mesa_error(ctx, GL_INVALID_OPERATION,
                   "glTexImage%dD(incompatible internalFormat = %s, format = %s)",
@@ -4420,15 +4446,13 @@ teximagemultisample(GLuint dims, GLenum target, GLsizei samples,
 
    if (_mesa_is_proxy_texture(target)) {
       if (dimensionsOK && sizeOK) {
-         _mesa_init_teximage_fields(ctx, texImage,
-               width, height, depth, 0, internalformat, texFormat);
-         texImage->NumSamples = samples;
-         texImage->FixedSampleLocations = fixedsamplelocations;
+         init_teximage_fields_ms(ctx, texImage, width, height, depth, 0,
+                                 internalformat, texFormat,
+                                 samples, fixedsamplelocations);
       }
       else {
          /* clear all image fields */
-         _mesa_init_teximage_fields(ctx, texImage,
-               0, 0, 0, 0, GL_NONE, MESA_FORMAT_NONE);
+         clear_teximage_fields(texImage);
       }
    }
    else {
@@ -4452,11 +4476,9 @@ teximagemultisample(GLuint dims, GLenum target, GLsizei samples,
 
       ctx->Driver.FreeTextureImageBuffer(ctx, texImage);
 
-      _mesa_init_teximage_fields(ctx, texImage,
-            width, height, depth, 0, internalformat, texFormat);
-
-      texImage->NumSamples = samples;
-      texImage->FixedSampleLocations = fixedsamplelocations;
+      init_teximage_fields_ms(ctx, texImage, width, height, depth, 0,
+                              internalformat, texFormat,
+                              samples, fixedsamplelocations);
 
       if (width > 0 && height > 0 && depth > 0) {
          if (!ctx->Driver.AllocTextureStorage(ctx, texObj, 1,
diff --git a/mesalib/src/mesa/main/texobj.c b/mesalib/src/mesa/main/texobj.c
index 3375fe36b..8bdbb08c8 100644
--- a/mesalib/src/mesa/main/texobj.c
+++ b/mesalib/src/mesa/main/texobj.c
@@ -148,6 +148,7 @@ _mesa_initialize_texture_object( struct gl_context *ctx,
    obj->Sampler.CompareMode = GL_NONE;         /* ARB_shadow */
    obj->Sampler.CompareFunc = GL_LEQUAL;       /* ARB_shadow */
    obj->DepthMode = ctx->API == API_OPENGL_CORE ? GL_RED : GL_LUMINANCE;
+   obj->StencilSampling = false;
    obj->Sampler.CubeMapSeamless = GL_FALSE;
    obj->Swizzle[0] = GL_RED;
    obj->Swizzle[1] = GL_GREEN;
@@ -280,6 +281,7 @@ _mesa_copy_texture_object( struct gl_texture_object *dest,
    dest->Sampler.CompareFunc = src->Sampler.CompareFunc;
    dest->Sampler.CubeMapSeamless = src->Sampler.CubeMapSeamless;
    dest->DepthMode = src->DepthMode;
+   dest->StencilSampling = src->StencilSampling;
    dest->Sampler.sRGBDecode = src->Sampler.sRGBDecode;
    dest->_MaxLevel = src->_MaxLevel;
    dest->_MaxLambda = src->_MaxLambda;
diff --git a/mesalib/src/mesa/main/texobj.h b/mesalib/src/mesa/main/texobj.h
index a4573b399..a9de73fff 100644
--- a/mesalib/src/mesa/main/texobj.h
+++ b/mesalib/src/mesa/main/texobj.h
@@ -114,6 +114,20 @@ _mesa_is_texture_complete(const struct gl_texture_object *texObj,
       return GL_FALSE;
    }
 
+   /* From the ARB_stencil_texturing specification:
+    * "Add a new bullet point for the conditions that cause the texture
+    *  to not be complete:
+    *
+    *  * The internal format of the texture is DEPTH_STENCIL, the
+    *    DEPTH_STENCIL_TEXTURE_MODE for the texture is STENCIL_INDEX and either
+    *    the magnification filter or the minification filter is not NEAREST."
+    */
+   if (texObj->StencilSampling &&
+       texObj->Image[0][texObj->BaseLevel]->_BaseFormat == GL_DEPTH_STENCIL &&
+       (sampler->MagFilter != GL_NEAREST || sampler->MinFilter != GL_NEAREST)) {
+      return GL_FALSE;
+   }
+
    if (_mesa_is_mipmap_filter(sampler))
       return texObj->_MipmapComplete;
    else
diff --git a/mesalib/src/mesa/main/texparam.c b/mesalib/src/mesa/main/texparam.c
index bbdbc2763..bfb2e1b9f 100644
--- a/mesalib/src/mesa/main/texparam.c
+++ b/mesalib/src/mesa/main/texparam.c
@@ -451,6 +451,20 @@ set_tex_parameteri(struct gl_context *ctx,
       }
       goto invalid_pname;
 
+   case GL_DEPTH_STENCIL_TEXTURE_MODE:
+      if (_mesa_is_desktop_gl(ctx) && ctx->Extensions.ARB_stencil_texturing) {
+         bool stencil = params[0] == GL_STENCIL_INDEX;
+         if (!stencil && params[0] != GL_DEPTH_COMPONENT)
+            goto invalid_param;
+
+         if (texObj->StencilSampling == stencil)
+            return GL_FALSE;
+
+         texObj->StencilSampling = stencil;
+         return GL_TRUE;
+      }
+      goto invalid_pname;
+
    case GL_TEXTURE_CROP_RECT_OES:
       if (ctx->API != API_OPENGLES || !ctx->Extensions.OES_draw_texture)
          goto invalid_pname;
@@ -707,6 +721,7 @@ _mesa_TexParameterf(GLenum target, GLenum pname, GLfloat param)
    case GL_TEXTURE_COMPARE_MODE_ARB:
    case GL_TEXTURE_COMPARE_FUNC_ARB:
    case GL_DEPTH_TEXTURE_MODE_ARB:
+   case GL_DEPTH_STENCIL_TEXTURE_MODE:
    case GL_TEXTURE_SRGB_DECODE_EXT:
    case GL_TEXTURE_CUBE_MAP_SEAMLESS:
    case GL_TEXTURE_SWIZZLE_R_EXT:
@@ -762,6 +777,7 @@ _mesa_TexParameterfv(GLenum target, GLenum pname, const GLfloat *params)
    case GL_TEXTURE_COMPARE_MODE_ARB:
    case GL_TEXTURE_COMPARE_FUNC_ARB:
    case GL_DEPTH_TEXTURE_MODE_ARB:
+   case GL_DEPTH_STENCIL_TEXTURE_MODE:
    case GL_TEXTURE_SRGB_DECODE_EXT:
    case GL_TEXTURE_CUBE_MAP_SEAMLESS:
       {
@@ -1038,9 +1054,16 @@ get_tex_level_parameter_image(struct gl_context *ctx,
 
    img = _mesa_select_tex_image(ctx, texObj, target, level);
    if (!img || img->TexFormat == MESA_FORMAT_NONE) {
-      /* undefined texture image */
-      if (pname == GL_TEXTURE_COMPONENTS)
-         *params = 1;
+      /* In case of undefined texture image return the default values.
+       *
+       * From OpenGL 4.0 spec, page 398:
+       *    "The initial internal format of a texel array is RGBA
+       *     instead of 1. TEXTURE_COMPONENTS is deprecated; always
+       *     use TEXTURE_INTERNAL_FORMAT."
+       */
+
+      if (pname == GL_TEXTURE_INTERNAL_FORMAT)
+         *params = GL_RGBA;
       else
          *params = 0;
       return;
@@ -1452,6 +1475,12 @@ _mesa_GetTexParameterfv( GLenum target, GLenum pname, GLfloat *params )
             goto invalid_pname;
          *params = (GLfloat) obj->DepthMode;
          break;
+      case GL_DEPTH_STENCIL_TEXTURE_MODE:
+         if (!_mesa_is_desktop_gl(ctx) || !ctx->Extensions.ARB_stencil_texturing)
+            goto invalid_pname;
+         *params = (GLfloat)
+            (obj->StencilSampling ? GL_STENCIL_INDEX : GL_DEPTH_COMPONENT);
+         break;
       case GL_TEXTURE_LOD_BIAS:
          if (_mesa_is_gles(ctx))
             goto invalid_pname;
@@ -1666,6 +1695,12 @@ _mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params )
             goto invalid_pname;
          *params = (GLint) obj->DepthMode;
          break;
+      case GL_DEPTH_STENCIL_TEXTURE_MODE:
+         if (!_mesa_is_desktop_gl(ctx) || !ctx->Extensions.ARB_stencil_texturing)
+            goto invalid_pname;
+         *params = (GLint)
+            (obj->StencilSampling ? GL_STENCIL_INDEX : GL_DEPTH_COMPONENT);
+         break;
       case GL_TEXTURE_LOD_BIAS:
          if (_mesa_is_gles(ctx))
             goto invalid_pname;
diff --git a/mesalib/src/mesa/main/texstore.c b/mesalib/src/mesa/main/texstore.c
index 3e22a0b46..557703d01 100644
--- a/mesalib/src/mesa/main/texstore.c
+++ b/mesalib/src/mesa/main/texstore.c
@@ -3290,10 +3290,20 @@ _mesa_texstore_sargb8(TEXSTORE_PARAMS)
    mesa_format newDstFormat;
    GLboolean k;
 
-   ASSERT(dstFormat == MESA_FORMAT_B8G8R8A8_SRGB);
-
-   /* reuse normal rgba texstore code */
-   newDstFormat = MESA_FORMAT_B8G8R8A8_UNORM;
+   switch (dstFormat) {
+   case MESA_FORMAT_B8G8R8A8_SRGB:
+      newDstFormat = MESA_FORMAT_B8G8R8A8_UNORM;
+      break;
+   case MESA_FORMAT_R8G8B8A8_SRGB:
+      newDstFormat = MESA_FORMAT_R8G8B8A8_UNORM;
+      break;
+   case MESA_FORMAT_B8G8R8X8_SRGB:
+      newDstFormat = MESA_FORMAT_B8G8R8X8_UNORM;
+      break;
+   default:
+      ASSERT(0);
+      return GL_FALSE;
+   }
 
    k = _mesa_texstore_argb8888(ctx, dims, baseInternalFormat,
                                newDstFormat,
@@ -3859,6 +3869,8 @@ _mesa_get_texstore_func(mesa_format format)
       table[MESA_FORMAT_G8R8_SNORM] = _mesa_texstore_snorm88;
       table[MESA_FORMAT_G16R16_SNORM] = _mesa_texstore_snorm1616;
 
+      table[MESA_FORMAT_B8G8R8X8_SRGB] = _mesa_texstore_sargb8;
+
       initialized = GL_TRUE;
    }
 
diff --git a/mesalib/src/mesa/main/varray.c b/mesalib/src/mesa/main/varray.c
index 44db2cbcd..b4b6fa9be 100644
--- a/mesalib/src/mesa/main/varray.c
+++ b/mesalib/src/mesa/main/varray.c
@@ -569,8 +569,8 @@ void GLAPIENTRY
 _mesa_EdgeFlagPointer(GLsizei stride, const GLvoid *ptr)
 {
    const GLbitfield legalTypes = UNSIGNED_BYTE_BIT;
-   /* see table 2.4 edits in GL_EXT_gpu_shader4 spec: */
-   const GLboolean integer = GL_TRUE;
+   /* this is the same type that glEdgeFlag uses */
+   const GLboolean integer = GL_FALSE;
    GET_CURRENT_CONTEXT(ctx);
 
    FLUSH_VERTICES(ctx, 0);
diff --git a/mesalib/src/mesa/state_tracker/st_atom_framebuffer.c b/mesalib/src/mesa/state_tracker/st_atom_framebuffer.c
index c08d91297..4c4f839d1 100644
--- a/mesalib/src/mesa/state_tracker/st_atom_framebuffer.c
+++ b/mesalib/src/mesa/state_tracker/st_atom_framebuffer.c
@@ -73,8 +73,8 @@ update_framebuffer_state( struct st_context *st )
       strb = st_renderbuffer(fb->_ColorDrawBuffers[i]);
 
       if (strb) {
-         if (strb->is_rtt ||
-             (strb->texture && util_format_is_srgb(strb->texture->format))) {
+         if (strb->is_rtt || (strb->texture &&
+             _mesa_get_format_color_encoding(strb->Base.Format) == GL_SRGB)) {
             /* rendering to a GL texture, may have to update surface */
             st_update_renderbuffer_surface(st, strb);
          }
diff --git a/mesalib/src/mesa/state_tracker/st_atom_scissor.c b/mesalib/src/mesa/state_tracker/st_atom_scissor.c
index a19ade1fa..b72030944 100644
--- a/mesalib/src/mesa/state_tracker/st_atom_scissor.c
+++ b/mesalib/src/mesa/state_tracker/st_atom_scissor.c
@@ -85,7 +85,7 @@ update_scissor( struct st_context *st )
          scissor[i].maxy = maxy;
       }
 
-      if (memcmp(&scissor[i], &st->state.scissor[i], sizeof(scissor)) != 0) {
+      if (memcmp(&scissor[i], &st->state.scissor[i], sizeof(scissor[0])) != 0) {
          /* state has changed */
          st->state.scissor[i] = scissor[i];  /* struct copy */
          changed = true;
diff --git a/mesalib/src/mesa/state_tracker/st_cb_fbo.c b/mesalib/src/mesa/state_tracker/st_cb_fbo.c
index 6449c62a8..ce8d91514 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_fbo.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_fbo.c
@@ -295,7 +295,7 @@ st_new_renderbuffer_fb(enum pipe_format format, int samples, boolean sw)
    strb->Base.Format = st_pipe_format_to_mesa_format(format);
    strb->Base._BaseFormat = _mesa_get_format_base_format(strb->Base.Format);
    strb->software = sw;
-   
+
    switch (format) {
    case PIPE_FORMAT_R8G8B8A8_UNORM:
    case PIPE_FORMAT_B8G8R8A8_UNORM:
@@ -307,6 +307,16 @@ st_new_renderbuffer_fb(enum pipe_format format, int samples, boolean sw)
    case PIPE_FORMAT_X8R8G8B8_UNORM:
       strb->Base.InternalFormat = GL_RGB8;
       break;
+   case PIPE_FORMAT_R8G8B8A8_SRGB:
+   case PIPE_FORMAT_B8G8R8A8_SRGB:
+   case PIPE_FORMAT_A8R8G8B8_SRGB:
+      strb->Base.InternalFormat = GL_SRGB8_ALPHA8;
+      break;
+   case PIPE_FORMAT_R8G8B8X8_SRGB:
+   case PIPE_FORMAT_B8G8R8X8_SRGB:
+   case PIPE_FORMAT_X8R8G8B8_SRGB:
+      strb->Base.InternalFormat = GL_SRGB8;
+      break;
    case PIPE_FORMAT_B5G5R5A1_UNORM:
       strb->Base.InternalFormat = GL_RGB5_A1;
       break;
@@ -401,8 +411,17 @@ st_update_renderbuffer_surface(struct st_context *st,
    int rtt_width = strb->Base.Width;
    int rtt_height = strb->Base.Height;
    int rtt_depth = strb->Base.Depth;
-   enum pipe_format format = st->ctx->Color.sRGBEnabled ? resource->format :
-         util_format_linear(resource->format);
+   /*
+    * For winsys fbo, it is possible that the renderbuffer is sRGB-capable but
+    * the format of strb->texture is linear (because we have no control over
+    * the format).  Check strb->Base.Format instead of strb->texture->format
+    * to determine if the rb is sRGB-capable.
+    */
+   boolean enable_srgb = (st->ctx->Color.sRGBEnabled &&
+         _mesa_get_format_color_encoding(strb->Base.Format) == GL_SRGB);
+   enum pipe_format format = (enable_srgb) ?
+      util_format_srgb(resource->format) :
+      util_format_linear(resource->format);
    unsigned first_layer, last_layer, level;
 
    if (resource->target == PIPE_TEXTURE_1D_ARRAY) {
diff --git a/mesalib/src/mesa/state_tracker/st_format.c b/mesalib/src/mesa/state_tracker/st_format.c
index 5f951eb02..a55ee3079 100644
--- a/mesalib/src/mesa/state_tracker/st_format.c
+++ b/mesalib/src/mesa/state_tracker/st_format.c
@@ -121,6 +121,8 @@ st_mesa_format_to_pipe_format(mesa_format mesaFormat)
       return PIPE_FORMAT_Z32_FLOAT_S8X24_UINT;
    case MESA_FORMAT_YCBCR:
       return PIPE_FORMAT_UYVY;
+   case MESA_FORMAT_YCBCR_REV:
+      return PIPE_FORMAT_YUYV;
    case MESA_FORMAT_RGB_DXT1:
       return PIPE_FORMAT_DXT1_RGB;
    case MESA_FORMAT_RGBA_DXT1:
@@ -147,6 +149,8 @@ st_mesa_format_to_pipe_format(mesa_format mesaFormat)
       return PIPE_FORMAT_A8B8G8R8_SRGB;
    case MESA_FORMAT_B8G8R8A8_SRGB:
       return PIPE_FORMAT_B8G8R8A8_SRGB;
+   case MESA_FORMAT_R8G8B8A8_SRGB:
+      return PIPE_FORMAT_R8G8B8A8_SRGB;
    case MESA_FORMAT_RGBA_FLOAT32:
       return PIPE_FORMAT_R32G32B32A32_FLOAT;
    case MESA_FORMAT_RGBA_FLOAT16:
@@ -393,6 +397,9 @@ st_mesa_format_to_pipe_format(mesa_format mesaFormat)
    case MESA_FORMAT_RGBX_SINT32:
       return PIPE_FORMAT_R32G32B32X32_SINT;
 
+   case MESA_FORMAT_B8G8R8X8_SRGB:
+      return PIPE_FORMAT_B8G8R8X8_SRGB;
+
    default:
       return PIPE_FORMAT_NONE;
    }
@@ -748,14 +755,47 @@ st_pipe_format_to_mesa_format(enum pipe_format format)
    case PIPE_FORMAT_R32G32B32X32_SINT:
       return MESA_FORMAT_RGBX_SINT32;
 
+   case PIPE_FORMAT_B8G8R8X8_SRGB:
+      return MESA_FORMAT_B8G8R8X8_SRGB;
+   case PIPE_FORMAT_R8G8B8A8_SRGB:
+      return MESA_FORMAT_R8G8B8A8_SRGB;
+
    default:
-      assert(0);
       return MESA_FORMAT_NONE;
    }
 }
 
 
 /**
+ * Debug only: check that the two functions above correctly map
+ * Mesa formats to Gallium formats and back again.
+ */
+static void
+test_format_conversion(void)
+{
+   GLuint i;
+
+   /* test all Mesa formats */
+   for (i = 1; i < MESA_FORMAT_COUNT; i++) {
+      enum pipe_format pf = st_mesa_format_to_pipe_format(i);
+      if (pf != PIPE_FORMAT_NONE) {
+         mesa_format mf = st_pipe_format_to_mesa_format(pf);
+         assert(mf == i);
+      }
+   }
+
+   /* Test all Gallium formats */
+   for (i = 1; i < PIPE_FORMAT_COUNT; i++) {
+      mesa_format mf = st_pipe_format_to_mesa_format(i);
+      if (mf != MESA_FORMAT_NONE) {
+         enum pipe_format pf = st_mesa_format_to_pipe_format(mf);
+         assert(pf == i);
+      }
+   }
+}
+
+
+/**
  * Map GL texture formats to Gallium pipe formats.
  */
 struct format_mapping
@@ -1006,7 +1046,8 @@ static const struct format_mapping format_map[] = {
    /* sRGB formats */
    {
       { GL_SRGB_EXT, GL_SRGB8_EXT, 0 },
-      { PIPE_FORMAT_R8G8B8X8_SRGB, DEFAULT_SRGBA_FORMATS }
+      { PIPE_FORMAT_R8G8B8X8_SRGB, PIPE_FORMAT_B8G8R8X8_SRGB,
+        DEFAULT_SRGBA_FORMATS }
    },
    {
       { GL_SRGB_ALPHA_EXT, GL_SRGB8_ALPHA8_EXT, 0 },
@@ -1015,7 +1056,7 @@ static const struct format_mapping format_map[] = {
    {
       { GL_COMPRESSED_SRGB_EXT, GL_COMPRESSED_SRGB_S3TC_DXT1_EXT, 0 },
       { PIPE_FORMAT_DXT1_SRGB, PIPE_FORMAT_R8G8B8X8_SRGB,
-        DEFAULT_SRGBA_FORMATS }
+        PIPE_FORMAT_B8G8R8X8_SRGB, DEFAULT_SRGBA_FORMATS }
    },
    {
       { GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT, 0 },
@@ -1630,6 +1671,18 @@ st_choose_format(struct st_context *st, GLenum internalFormat,
    int i, j;
    enum pipe_format pf;
 
+#ifdef DEBUG
+   {
+      static boolean firstCall = TRUE;
+      if (firstCall) {
+         test_format_conversion();
+         firstCall = FALSE;
+      }
+   }
+#else
+   (void) test_format_conversion;
+#endif
+
    /* can't render to compressed formats at this time */
    if (_mesa_is_compressed_format(st->ctx, internalFormat)
        && (bindings & ~PIPE_BIND_SAMPLER_VIEW)) {
diff --git a/mesalib/src/mesa/state_tracker/st_manager.c b/mesalib/src/mesa/state_tracker/st_manager.c
index 6a776a8a2..314d34232 100644
--- a/mesalib/src/mesa/state_tracker/st_manager.c
+++ b/mesalib/src/mesa/state_tracker/st_manager.c
@@ -302,6 +302,8 @@ st_framebuffer_add_renderbuffer(struct st_framebuffer *stfb,
       break;
    default:
       format = stfb->iface->visual->color_format;
+      if (stfb->Base.Visual.sRGBCapable)
+         format = util_format_srgb(format);
       sw = FALSE;
       break;
    }
@@ -400,7 +402,8 @@ st_visual_to_context_mode(const struct st_visual *visual,
  * Create a framebuffer from a manager interface.
  */
 static struct st_framebuffer *
-st_framebuffer_create(struct st_framebuffer_iface *stfbi)
+st_framebuffer_create(struct st_context *st,
+                      struct st_framebuffer_iface *stfbi)
 {
    struct st_framebuffer *stfb;
    struct gl_config mode;
@@ -414,6 +417,38 @@ st_framebuffer_create(struct st_framebuffer_iface *stfbi)
       return NULL;
 
    st_visual_to_context_mode(stfbi->visual, &mode);
+
+   /*
+    * For desktop GL, sRGB framebuffer write is controlled by both the
+    * capability of the framebuffer and GL_FRAMEBUFFER_SRGB.  We should
+    * advertise the capability when the pipe driver (and core Mesa) supports
+    * it so that applications can enable sRGB write when they want to.
+    *
+    * This is not to be confused with GLX_FRAMEBUFFER_SRGB_CAPABLE_ARB.  When
+    * the attribute is GLX_TRUE, it tells the st manager to pick a color
+    * format such that util_format_srgb(visual->color_format) can be supported
+    * by the pipe driver.  We still need to advertise the capability here.
+    *
+    * For GLES, however, sRGB framebuffer write is controlled only by the
+    * capability of the framebuffer.  There is GL_EXT_sRGB_write_control to
+    * give applications the control back, but sRGB write is still enabled by
+    * default.  To avoid unexpected results, we should not advertise the
+    * capability.  This could change when we add support for
+    * EGL_KHR_gl_colorspace.
+    */
+   if (_mesa_is_desktop_gl(st->ctx)) {
+      struct pipe_screen *screen = st->pipe->screen;
+      const enum pipe_format srgb_format =
+         util_format_srgb(stfbi->visual->color_format);
+
+      if (srgb_format != PIPE_FORMAT_NONE &&
+          st_pipe_format_to_mesa_format(srgb_format) != MESA_FORMAT_NONE &&
+          screen->is_format_supported(screen, srgb_format,
+                                      PIPE_TEXTURE_2D, stfbi->visual->samples,
+                                      PIPE_BIND_RENDER_TARGET))
+         mode.sRGBCapable = GL_TRUE;
+   }
+
    _mesa_initialize_window_framebuffer(&stfb->Base, &mode);
 
    stfb->iface = stfbi;
@@ -677,7 +712,8 @@ st_api_get_current(struct st_api *stapi)
 }
 
 static struct st_framebuffer *
-st_framebuffer_reuse_or_create(struct gl_framebuffer *fb,
+st_framebuffer_reuse_or_create(struct st_context *st,
+                               struct gl_framebuffer *fb,
                                struct st_framebuffer_iface *stfbi)
 {
    struct st_framebuffer *cur = st_ws_framebuffer(fb), *stfb = NULL;
@@ -690,7 +726,7 @@ st_framebuffer_reuse_or_create(struct gl_framebuffer *fb,
    }
    else {
       /* create a new one */
-      stfb = st_framebuffer_create(stfbi);
+      stfb = st_framebuffer_create(st, stfbi);
    }
 
    return stfb;
@@ -709,12 +745,12 @@ st_api_make_current(struct st_api *stapi, struct st_context_iface *stctxi,
 
    if (st) {
       /* reuse or create the draw fb */
-      stdraw = st_framebuffer_reuse_or_create(st->ctx->WinSysDrawBuffer,
-                                              stdrawi);
+      stdraw = st_framebuffer_reuse_or_create(st,
+            st->ctx->WinSysDrawBuffer, stdrawi);
       if (streadi != stdrawi) {
          /* do the same for the read fb */
-         stread = st_framebuffer_reuse_or_create(st->ctx->WinSysReadBuffer,
-                                                 streadi);
+         stread = st_framebuffer_reuse_or_create(st,
+               st->ctx->WinSysReadBuffer, streadi);
       }
       else {
          stread = NULL;
diff --git a/mesalib/src/mesa/swrast/s_texfetch.c b/mesalib/src/mesa/swrast/s_texfetch.c
index b620748c9..8ba75348f 100644
--- a/mesalib/src/mesa/swrast/s_texfetch.c
+++ b/mesalib/src/mesa/swrast/s_texfetch.c
@@ -437,6 +437,12 @@ texfetch_funcs[] =
       fetch_texel_3d_sargb8
    },
    {
+      MESA_FORMAT_R8G8B8A8_SRGB,
+      fetch_texel_1d_sabgr8,
+      fetch_texel_2d_sabgr8,
+      fetch_texel_3d_sabgr8
+   },
+   {
       MESA_FORMAT_L_SRGB8,
       fetch_texel_1d_sl8,
       fetch_texel_2d_sl8,
@@ -1304,6 +1310,12 @@ texfetch_funcs[] =
       NULL,
       NULL
    },
+   {
+      MESA_FORMAT_B8G8R8X8_SRGB,
+      NULL,
+      NULL,
+      NULL
+   },
 };
 
 
diff --git a/mesalib/src/mesa/swrast/s_texfetch_tmp.h b/mesalib/src/mesa/swrast/s_texfetch_tmp.h
index 806f0fd1a..8821125a0 100644
--- a/mesalib/src/mesa/swrast/s_texfetch_tmp.h
+++ b/mesalib/src/mesa/swrast/s_texfetch_tmp.h
@@ -611,10 +611,10 @@ static void FETCH(f_argb4444_rev)( const struct swrast_texture_image *texImage,
                                    GLint i, GLint j, GLint k, GLfloat *texel )
 {
    const GLushort s = *TEXEL_ADDR(GLushort, texImage, i, j, k, 1);
-   texel[RCOMP] = ((s      ) & 0xf) * (1.0F / 15.0F);
-   texel[GCOMP] = ((s >> 12) & 0xf) * (1.0F / 15.0F);
-   texel[BCOMP] = ((s >>  8) & 0xf) * (1.0F / 15.0F);
-   texel[ACOMP] = ((s >>  4) & 0xf) * (1.0F / 15.0F);
+   texel[RCOMP] = ((s >>  4) & 0xf) * (1.0F / 15.0F);
+   texel[GCOMP] = ((s >>  8) & 0xf) * (1.0F / 15.0F);
+   texel[BCOMP] = ((s >> 12) & 0xf) * (1.0F / 15.0F);
+   texel[ACOMP] = ((s      ) & 0xf) * (1.0F / 15.0F);
 }
 
 
@@ -1015,6 +1015,19 @@ static void FETCH(sargb8)(const struct swrast_texture_image *texImage,
 
 
 
+/* Fetch texel from 1D, 2D or 3D sabgr8 texture, return 4 GLfloats */
+static void FETCH(sabgr8)(const struct swrast_texture_image *texImage,
+                          GLint i, GLint j, GLint k, GLfloat *texel )
+{
+   const GLuint s = *TEXEL_ADDR(GLuint, texImage, i, j, k, 1);
+   texel[RCOMP] = nonlinear_to_linear( (s      ) & 0xff );
+   texel[GCOMP] = nonlinear_to_linear( (s >>  8) & 0xff );
+   texel[BCOMP] = nonlinear_to_linear( (s >> 16) & 0xff );
+   texel[ACOMP] = UBYTE_TO_FLOAT( (s >> 24) ); /* linear! */
+}
+
+
+
 /* Fetch texel from 1D, 2D or 3D sl8 texture, return 4 GLfloats */
 static void FETCH(sl8)(const struct swrast_texture_image *texImage,
                        GLint i, GLint j, GLint k, GLfloat *texel )
diff --git a/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj b/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj
index 3f8180b72..3ea6f593f 100644
--- a/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj
+++ b/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj
@@ -242,6 +242,7 @@
     <ClCompile Include="..\..\..\..\..\expat\lib\xmltok.c" />

     <ClCompile Include="..\..\..\..\src\mesa\drivers\common\driverfuncs.c" />

     <ClCompile Include="..\..\..\..\src\mesa\drivers\common\meta.c" />

+    <ClCompile Include="..\..\..\..\src\mesa\drivers\common\meta_generate_mipmap.c" />

     <ClCompile Include="..\..\..\..\src\mesa\drivers\dri\common\dri_util.c" />

     <ClCompile Include="..\..\..\..\src\mesa\drivers\dri\common\megadriver_stub.c" />

     <ClCompile Include="..\..\..\..\src\mesa\drivers\dri\common\xmlconfig.c" />

diff --git a/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj.filters b/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj.filters
index f8f5c991e..e7575d9ca 100644
--- a/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj.filters
+++ b/mesalib/windows/VC8/mesa/swrast_dri/swrast_dri.vcxproj.filters
@@ -138,6 +138,9 @@
     <ClCompile Include="..\..\..\..\src\mesa\drivers\dri\common\megadriver_stub.c">

       <Filter>Source Files</Filter>

     </ClCompile>

+    <ClCompile Include="..\..\..\..\src\mesa\drivers\common\meta_generate_mipmap.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="..\..\..\..\src\mesa\drivers\dri\swrast\swrast_priv.h">

diff --git a/xorg-server/config/config.c b/xorg-server/config/config.c
index 760cf193a..732670038 100644
--- a/xorg-server/config/config.c
+++ b/xorg-server/config/config.c
@@ -27,10 +27,12 @@
 #include <dix-config.h>
 #endif
 
+#include <unistd.h>
 #include "os.h"
 #include "inputstr.h"
 #include "hotplug.h"
 #include "config-backends.h"
+#include "systemd-logind.h"
 
 void
 config_pre_init(void)
@@ -145,30 +147,111 @@ config_odev_free_attribute_list(struct OdevAttributes *attribs)
     free(attribs);
 }
 
+static struct OdevAttribute *
+config_odev_find_attribute(struct OdevAttributes *attribs, int attrib_id)
+{
+    struct OdevAttribute *oa;
+
+    xorg_list_for_each_entry(oa, &attribs->list, member) {
+        if (oa->attrib_id == attrib_id)
+          return oa;
+    }
+    return NULL;
+}
+
 Bool
 config_odev_add_attribute(struct OdevAttributes *attribs, int attrib,
                           const char *attrib_name)
 {
     struct OdevAttribute *oa;
 
-    oa = malloc(sizeof(struct OdevAttribute));
+    oa = config_odev_find_attribute(attribs, attrib);
+    if (!oa)
+        oa = calloc(1, sizeof(struct OdevAttribute));
     if (!oa)
         return FALSE;
 
     oa->attrib_id = attrib;
+    free(oa->attrib_name);
     oa->attrib_name = strdup(attrib_name);
+    oa->attrib_type = ODEV_ATTRIB_STRING;
     xorg_list_append(&oa->member, &attribs->list);
     return TRUE;
 }
 
+Bool
+config_odev_add_int_attribute(struct OdevAttributes *attribs, int attrib,
+                              int attrib_value)
+{
+    struct OdevAttribute *oa;
+
+    oa = config_odev_find_attribute(attribs, attrib);
+    if (!oa)
+        oa = calloc(1, sizeof(struct OdevAttribute));
+    if (!oa)
+        return FALSE;
+
+    oa->attrib_id = attrib;
+    oa->attrib_value = attrib_value;
+    oa->attrib_type = ODEV_ATTRIB_INT;
+    xorg_list_append(&oa->member, &attribs->list);
+    return TRUE;
+}
+
+char *
+config_odev_get_attribute(struct OdevAttributes *attribs, int attrib_id)
+{
+    struct OdevAttribute *oa;
+
+    oa = config_odev_find_attribute(attribs, attrib_id);
+    if (!oa)
+        return NULL;
+
+    if (oa->attrib_type != ODEV_ATTRIB_STRING) {
+        LogMessage(X_ERROR, "Error %s called for non string attrib %d\n",
+                   __FUNCTION__, attrib_id);
+        return NULL;
+    }
+    return oa->attrib_name;
+}
+
+int
+config_odev_get_int_attribute(struct OdevAttributes *attribs, int attrib_id, int def)
+{
+    struct OdevAttribute *oa;
+
+    oa = config_odev_find_attribute(attribs, attrib_id);
+    if (!oa)
+        return def;
+
+    if (oa->attrib_type != ODEV_ATTRIB_INT) {
+        LogMessage(X_ERROR, "Error %s called for non integer attrib %d\n",
+                   __FUNCTION__, attrib_id);
+        return def;
+    }
+
+    return oa->attrib_value;
+}
+
 void
 config_odev_free_attributes(struct OdevAttributes *attribs)
 {
     struct OdevAttribute *iter, *safe;
+    int major = 0, minor = 0, fd = -1;
 
     xorg_list_for_each_entry_safe(iter, safe, &attribs->list, member) {
+        switch (iter->attrib_id) {
+        case ODEV_ATTRIB_MAJOR: major = iter->attrib_value; break;
+        case ODEV_ATTRIB_MINOR: minor = iter->attrib_value; break;
+        case ODEV_ATTRIB_FD: fd = iter->attrib_value; break;
+        }
         xorg_list_del(&iter->member);
         free(iter->attrib_name);
         free(iter);
     }
+
+    if (fd != -1) {
+        systemd_logind_release_fd(major, minor);
+        close(fd);
+    }
 }
diff --git a/xorg-server/config/udev.c b/xorg-server/config/udev.c
index 68ed34843..d70eeb48c 100644
--- a/xorg-server/config/udev.c
+++ b/xorg-server/config/udev.c
@@ -29,6 +29,7 @@
 
 #include <libudev.h>
 #include <ctype.h>
+#include <unistd.h>
 
 #include "input.h"
 #include "inputstr.h"
@@ -36,6 +37,7 @@
 #include "config-backends.h"
 #include "os.h"
 #include "globals.h"
+#include "systemd-logind.h"
 
 #define UDEV_XKB_PROP_KEY "xkb"
 
@@ -55,9 +57,18 @@ static struct udev_monitor *udev_monitor;
 #ifdef CONFIG_UDEV_KMS
 static Bool
 config_udev_odev_setup_attribs(const char *path, const char *syspath,
+                               int major, int minor,
                                config_odev_probe_proc_ptr probe_callback);
 #endif
 
+static char itoa_buf[16];
+
+static const char *itoa(int i)
+{
+    snprintf(itoa_buf, sizeof(itoa_buf), "%d", i);
+    return itoa_buf;
+}
+
 static void
 device_added(struct udev_device *udev_device)
 {
@@ -73,6 +84,7 @@ device_added(struct udev_device *udev_device)
     struct udev_device *parent;
     int rc;
     const char *dev_seat;
+    dev_t devnum;
 
     path = udev_device_get_devnode(udev_device);
 
@@ -91,6 +103,8 @@ device_added(struct udev_device *udev_device)
     if (!SeatId && strcmp(dev_seat, "seat0"))
         return;
 
+    devnum = udev_device_get_devnum(udev_device);
+
 #ifdef CONFIG_UDEV_KMS
     if (!strcmp(udev_device_get_subsystem(udev_device), "drm")) {
         const char *sysname = udev_device_get_sysname(udev_device);
@@ -98,9 +112,14 @@ device_added(struct udev_device *udev_device)
         if (strncmp(sysname, "card", 4) != 0)
             return;
 
+        /* Check for devices already added through xf86platformProbe() */
+        if (xf86_find_platform_device_by_devnum(major(devnum), minor(devnum)))
+            return;
+
         LogMessage(X_INFO, "config/udev: Adding drm device (%s)\n", path);
 
-        config_udev_odev_setup_attribs(path, syspath, NewGPUDeviceRequest);
+        config_udev_odev_setup_attribs(path, syspath, major(devnum),
+                                       minor(devnum), NewGPUDeviceRequest);
         return;
     }
 #endif
@@ -153,6 +172,8 @@ device_added(struct udev_device *udev_device)
     input_options = input_option_new(input_options, "name", name);
     input_options = input_option_new(input_options, "path", path);
     input_options = input_option_new(input_options, "device", path);
+    input_options = input_option_new(input_options, "major", itoa(major(devnum)));
+    input_options = input_option_new(input_options, "minor", itoa(minor(devnum)));
     if (path)
         attrs.device = strdup(path);
 
@@ -270,6 +291,7 @@ device_removed(struct udev_device *device)
     if (!strcmp(udev_device_get_subsystem(device), "drm")) {
         const char *sysname = udev_device_get_sysname(device);
         const char *path = udev_device_get_devnode(device);
+        dev_t devnum = udev_device_get_devnum(device);
 
         if (strncmp(sysname,"card", 4) != 0)
             return;
@@ -277,7 +299,10 @@ device_removed(struct udev_device *device)
         if (!path)
             return;
 
-        config_udev_odev_setup_attribs(path, syspath, DeleteGPUDeviceRequest);
+        config_udev_odev_setup_attribs(path, syspath, major(devnum),
+                                       minor(devnum), DeleteGPUDeviceRequest);
+        /* Retry vtenter after a drm node removal */
+        systemd_logind_vtenter();
         return;
     }
 #endif
@@ -427,6 +452,7 @@ config_udev_fini(void)
 
 static Bool
 config_udev_odev_setup_attribs(const char *path, const char *syspath,
+                               int major, int minor,
                                config_odev_probe_proc_ptr probe_callback)
 {
     struct OdevAttributes *attribs = config_odev_allocate_attribute_list();
@@ -443,6 +469,14 @@ config_udev_odev_setup_attribs(const char *path, const char *syspath,
     if (ret == FALSE)
         goto fail;
 
+    ret = config_odev_add_int_attribute(attribs, ODEV_ATTRIB_MAJOR, major);
+    if (ret == FALSE)
+        goto fail;
+
+    ret = config_odev_add_int_attribute(attribs, ODEV_ATTRIB_MINOR, minor);
+    if (ret == FALSE)
+        goto fail;
+
     /* ownership of attribs is passed to probe layer */
     probe_callback(attribs);
     return TRUE;
@@ -477,6 +511,7 @@ config_udev_odev_probe(config_odev_probe_proc_ptr probe_callback)
         struct udev_device *udev_device = udev_device_new_from_syspath(udev, syspath);
         const char *path = udev_device_get_devnode(udev_device);
         const char *sysname = udev_device_get_sysname(udev_device);
+        dev_t devnum = udev_device_get_devnum(udev_device);
 
         if (!path || !syspath)
             goto no_probe;
@@ -485,8 +520,8 @@ config_udev_odev_probe(config_odev_probe_proc_ptr probe_callback)
         else if (strncmp(sysname, "card", 4) != 0)
             goto no_probe;
 
-        config_udev_odev_setup_attribs(path, syspath, probe_callback);
-
+        config_udev_odev_setup_attribs(path, syspath, major(devnum),
+                                       minor(devnum), probe_callback);
     no_probe:
         udev_device_unref(udev_device);
     }
diff --git a/xorg-server/configure.ac b/xorg-server/configure.ac
index 0fb2fc375..162c0cf3c 100644
--- a/xorg-server/configure.ac
+++ b/xorg-server/configure.ac
@@ -626,6 +626,7 @@ AC_ARG_ENABLE(clientids,      AS_HELP_STRING([--disable-clientids], [Build Xorg
 AC_ARG_ENABLE(pciaccess, AS_HELP_STRING([--enable-pciaccess], [Build Xorg with pciaccess library (default: enabled)]), [PCI=$enableval], [PCI=yes])
 AC_ARG_ENABLE(linux_acpi, AS_HELP_STRING([--disable-linux-acpi], [Disable building ACPI support on Linux (if available).]), [enable_linux_acpi=$enableval], [enable_linux_acpi=yes])
 AC_ARG_ENABLE(linux_apm, AS_HELP_STRING([--disable-linux-apm], [Disable building APM support on Linux (if available).]), [enable_linux_apm=$enableval], [enable_linux_apm=yes])
+AC_ARG_ENABLE(systemd-logind, AC_HELP_STRING([--enable-systemd-logind], [Build systemd-logind support (default: auto)]), [SYSTEMD_LOGIND=$enableval], [SYSTEMD_LOGIND=auto])
 
 dnl DDXes.
 AC_ARG_ENABLE(xorg,    	      AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])
@@ -806,6 +807,8 @@ LIBAPPLEWM="applewm >= 1.4"
 LIBDMX="dmx >= 1.0.99.1"
 LIBDRI="dri >= 7.8.0"
 LIBDRM="libdrm >= 2.3.0"
+LIBEGL="egl"
+LIBGBM="gbm >= 9"
 LIBGL="gl >= 7.1.0"
 LIBXEXT="xext >= 1.0.99.4"
 LIBXFONT="xfont >= 1.4.2"
@@ -901,6 +904,26 @@ if test "x$CONFIG_HAL" = xyes; then
 fi
 AM_CONDITIONAL(CONFIG_HAL, [test "x$CONFIG_HAL" = xyes])
 
+if test "x$SYSTEMD_LOGIND" = xauto; then
+        if test "x$HAVE_DBUS" = xyes -a "x$CONFIG_UDEV" = xyes ; then
+                SYSTEMD_LOGIND=yes
+        else
+                SYSTEMD_LOGIND=no
+        fi
+fi
+if test "x$SYSTEMD_LOGIND" = xyes; then
+        if ! test "x$HAVE_DBUS" = xyes; then
+                AC_MSG_ERROR([systemd-logind requested, but D-Bus is not installed.])
+        fi
+        if ! test "x$CONFIG_UDEV" = xyes ; then
+                AC_MSG_ERROR([systemd-logind is only supported in combination with udev configuration.])
+        fi
+
+        AC_DEFINE(SYSTEMD_LOGIND, 1, [Enable systemd-logind integration])
+        NEED_DBUS="yes"
+fi
+AM_CONDITIONAL(SYSTEMD_LOGIND, [test "x$SYSTEMD_LOGIND" = xyes])
+
 if test "x$NEED_DBUS" = xyes; then
         AC_DEFINE(NEED_DBUS, 1, [Enable D-Bus core])
 fi
@@ -2070,7 +2093,15 @@ AM_CONDITIONAL([GLAMOR], [test "x$GLAMOR" = xyes])
 if test "x$GLAMOR" = xyes; then
 	AC_DEFINE(GLAMOR, 1, [Build glamor])
 	PKG_CHECK_MODULES([GLAMOR], [epoxy])
+
+	PKG_CHECK_MODULES(GBM, "$LIBGBM", [GBM=yes], [GBM=no])
+	if test "x$GBM" = xyes; then
+		AC_DEFINE(GLAMOR_HAS_GBM, 1,
+			  [Build glamor with GBM-based EGL support])
+	fi
+
 fi
+AM_CONDITIONAL([GLAMOR_EGL], [test "x$GBM" = xyes])
 
 dnl XWin DDX
 
@@ -2319,6 +2350,9 @@ if test "$KDRIVE" = yes; then
     if test "x$DRI" = xyes && test "x$GLX" = xyes; then
         XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS libdrm xcb-glx xcb-xf86dri > 1.6"
     fi
+    if test "x$GLAMOR" = xyes; then
+        XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS x11-xcb"
+    fi
 
     if test "x$XEPHYR" = xauto; then
         PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS, [XEPHYR="yes"], [XEPHYR="no"])
@@ -2476,6 +2510,7 @@ hw/xfree86/exa/Makefile
 hw/xfree86/exa/man/Makefile
 hw/xfree86/fbdevhw/Makefile
 hw/xfree86/fbdevhw/man/Makefile
+hw/xfree86/glamor_egl/Makefile
 hw/xfree86/i2c/Makefile
 hw/xfree86/int10/Makefile
 hw/xfree86/loader/Makefile
diff --git a/xorg-server/dix/main.c b/xorg-server/dix/main.c
index 5f499741c..84c47d46e 100644
--- a/xorg-server/dix/main.c
+++ b/xorg-server/dix/main.c
@@ -220,6 +220,9 @@ dix_main(int argc, char *argv[], char *envp[])
         currentMaxClients = 1;
         OsInit();
 
+        /* clear any existing selections */
+        InitSelections();
+
         /* Initialize privates before first allocation */
         dixResetPrivates();
 
@@ -237,7 +240,6 @@ dix_main(int argc, char *argv[], char *envp[])
 
         InitAtoms();
         InitEvents();
-        InitSelections();
         InitGlyphCaching();
         dixResetRegistry();
         ResetFontPrivateIndex();
diff --git a/xorg-server/glamor/Makefile.am b/xorg-server/glamor/Makefile.am
index 12a57c441..77492bcaa 100644
--- a/xorg-server/glamor/Makefile.am
+++ b/xorg-server/glamor/Makefile.am
@@ -37,7 +37,6 @@ libglamor_la_SOURCES = \
 	glamor_window.c\
 	glamor_fbo.c\
 	glamor_compositerects.c\
-	glamor_xv.c\
 	glamor_utils.h\
 	glamor.h
 
diff --git a/xorg-server/glamor/glamor.c b/xorg-server/glamor/glamor.c
index 7d8228cdd..fa753bb1a 100644
--- a/xorg-server/glamor/glamor.c
+++ b/xorg-server/glamor/glamor.c
@@ -123,6 +123,17 @@ glamor_set_screen_pixmap(PixmapPtr screen_pixmap, PixmapPtr *back_pixmap)
     glamor_priv->back_pixmap = back_pixmap;
 }
 
+uint32_t
+glamor_get_pixmap_texture(PixmapPtr pixmap)
+{
+    glamor_pixmap_private *pixmap_priv = glamor_get_pixmap_private(pixmap);
+
+    if (pixmap_priv->type != GLAMOR_TEXTURE_ONLY)
+        return 0;
+
+    return pixmap_priv->base.fbo->tex;
+}
+
 PixmapPtr
 glamor_create_pixmap(ScreenPtr screen, int w, int h, int depth,
                      unsigned int usage)
@@ -556,16 +567,16 @@ glamor_enable_dri3(ScreenPtr screen)
 }
 
 Bool
-glamor_is_dri3_support_enabled(ScreenPtr screen)
+glamor_supports_pixmap_import_export(ScreenPtr screen)
 {
     glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
 
     return glamor_priv->dri3_enabled;
 }
 
-int
-glamor_dri3_fd_from_pixmap(ScreenPtr screen,
-                           PixmapPtr pixmap, CARD16 *stride, CARD32 *size)
+_X_EXPORT int
+glamor_fd_from_pixmap(ScreenPtr screen,
+                      PixmapPtr pixmap, CARD16 *stride, CARD32 *size)
 {
     glamor_pixmap_private *pixmap_priv;
     glamor_screen_private *glamor_priv =
@@ -589,7 +600,7 @@ glamor_dri3_fd_from_pixmap(ScreenPtr screen,
 }
 
 int
-glamor_dri3_name_from_pixmap(PixmapPtr pixmap)
+glamor_name_from_pixmap(PixmapPtr pixmap)
 {
     glamor_pixmap_private *pixmap_priv;
     glamor_screen_private *glamor_priv =
diff --git a/xorg-server/glamor/glamor.h b/xorg-server/glamor/glamor.h
index eec687256..e12f497cb 100644
--- a/xorg-server/glamor/glamor.h
+++ b/xorg-server/glamor/glamor.h
@@ -35,6 +35,9 @@
 #include <picturestr.h>
 #include <fb.h>
 #include <fbpict.h>
+#ifdef GLAMOR_FOR_XORG
+#include <xf86xv.h>
+#endif
 
 struct glamor_context;
 
@@ -64,10 +67,12 @@ typedef enum glamor_pixmap_type {
 #define GLAMOR_USE_SCREEN		(1 << 1)
 #define GLAMOR_USE_PICTURE_SCREEN 	(1 << 2)
 #define GLAMOR_USE_EGL_SCREEN		(1 << 3)
+#define GLAMOR_NO_DRI3			(1 << 4)
 #define GLAMOR_VALID_FLAGS      (GLAMOR_INVERTED_Y_AXIS  		\
 				 | GLAMOR_USE_SCREEN 			\
                                  | GLAMOR_USE_PICTURE_SCREEN		\
-				 | GLAMOR_USE_EGL_SCREEN)
+				 | GLAMOR_USE_EGL_SCREEN                \
+                                 | GLAMOR_NO_DRI3)
 
 /* @glamor_init: Initialize glamor internal data structure.
  *
@@ -124,6 +129,8 @@ extern _X_EXPORT Bool glamor_close_screen(ScreenPtr screen);
 extern _X_EXPORT void glamor_set_screen_pixmap(PixmapPtr screen_pixmap,
                                                PixmapPtr *back_pixmap);
 
+extern _X_EXPORT uint32_t glamor_get_pixmap_texture(PixmapPtr pixmap);
+
 /* @glamor_glyphs_init: Initialize glyphs internal data structures.
  *
  * @pScreen: Current screen pointer.
@@ -168,21 +175,23 @@ extern _X_EXPORT int glamor_egl_dri3_fd_name_from_tex(ScreenPtr, PixmapPtr,
                                                       unsigned int, Bool,
                                                       CARD16 *, CARD32 *);
 
-/* @glamor_is_dri3_support_enabled: Returns if DRI3 support is enabled.
+/* @glamor_supports_pixmap_import_export: Returns whether
+ * glamor_fd_from_pixmap(), glamor_name_from_pixmap(), and
+ * glamor_pixmap_from_fd() are supported.
  *
  * @screen: Current screen pointer.
  *
- * To have DRI3 support enabled, glamor and glamor_egl need to be initialized,
- * and glamor_egl_init_textured_pixmap need to be called. glamor also
- * has to be compiled with gbm support.
- * The EGL layer need to have the following extensions working:
+ * To have DRI3 support enabled, glamor and glamor_egl need to be
+ * initialized. glamor also has to be compiled with gbm support.
+ *
+ * The EGL layer needs to have the following extensions working:
+ *
  * .EGL_KHR_gl_texture_2D_image
  * .EGL_EXT_image_dma_buf_import
- * If DRI3 support is not enabled, the following helpers will return an error.
  * */
-extern _X_EXPORT Bool glamor_is_dri3_support_enabled(ScreenPtr screen);
+extern _X_EXPORT Bool glamor_supports_pixmap_import_export(ScreenPtr screen);
 
-/* @glamor_dri3_fd_from_pixmap: DRI3 helper to get a dma-buf fd from a pixmap.
+/* @glamor_fd_from_pixmap: Get a dma-buf fd from a pixmap.
  *
  * @screen: Current screen pointer.
  * @pixmap: The pixmap from which we want the fd.
@@ -193,22 +202,25 @@ extern _X_EXPORT Bool glamor_is_dri3_support_enabled(ScreenPtr screen);
  * content.
  * Returns the fd on success, -1 on error.
  * */
-extern _X_EXPORT int glamor_dri3_fd_from_pixmap(ScreenPtr screen,
-                                                PixmapPtr pixmap,
-                                                CARD16 *stride, CARD32 *size);
+extern _X_EXPORT int glamor_fd_from_pixmap(ScreenPtr screen,
+                                           PixmapPtr pixmap,
+                                           CARD16 *stride, CARD32 *size);
 
-/* @glamor_dri3_name_from_pixmap: helper to get an gem name from a pixmap.
+/**
+ * @glamor_name_from_pixmap: Gets a gem name from a pixmap.
  *
  * @pixmap: The pixmap from which we want the gem name.
  *
- * the pixmap and the buffer associated by the gem name will share the same
- * content. This function can be used by the DDX to support DRI2, but needs
- * glamor DRI3 support to be activated.
+ * the pixmap and the buffer associated by the gem name will share the
+ * same content. This function can be used by the DDX to support DRI2,
+ * and needs the same set of buffer export GL extensions as DRI3
+ * support.
+ *
  * Returns the name on success, -1 on error.
  * */
-extern _X_EXPORT int glamor_dri3_name_from_pixmap(PixmapPtr pixmap);
+extern _X_EXPORT int glamor_name_from_pixmap(PixmapPtr pixmap);
 
-/* @glamor_egl_dri3_pixmap_from_fd: DRI3 helper to get a pixmap from a dma-buf fd.
+/* @glamor_pixmap_from_fd: Creates a pixmap to wrap a dma-buf fd.
  *
  * @screen: Current screen pointer.
  * @fd: The dma-buf fd to import.
@@ -220,13 +232,13 @@ extern _X_EXPORT int glamor_dri3_name_from_pixmap(PixmapPtr pixmap);
  *
  * Returns a valid pixmap if the import succeeded, else NULL.
  * */
-extern _X_EXPORT PixmapPtr glamor_egl_dri3_pixmap_from_fd(ScreenPtr screen,
-                                                          int fd,
-                                                          CARD16 width,
-                                                          CARD16 height,
-                                                          CARD16 stride,
-                                                          CARD8 depth,
-                                                          CARD8 bpp);
+extern _X_EXPORT PixmapPtr glamor_pixmap_from_fd(ScreenPtr screen,
+                                                 int fd,
+                                                 CARD16 width,
+                                                 CARD16 height,
+                                                 CARD16 stride,
+                                                 CARD8 depth,
+                                                 CARD8 bpp);
 
 #ifdef GLAMOR_FOR_XORG
 
@@ -432,7 +444,7 @@ extern _X_EXPORT Bool glamor_poly_line_nf(DrawablePtr pDrawable, GCPtr pGC,
 extern _X_EXPORT Bool glamor_poly_lines_nf(DrawablePtr drawable, GCPtr gc,
                                            int mode, int n, DDXPointPtr points);
 
-#if 0
+#ifdef GLAMOR_FOR_XORG
 extern _X_EXPORT XF86VideoAdaptorPtr glamor_xv_init(ScreenPtr pScreen,
                                                     int num_texture_ports);
 #endif
diff --git a/xorg-server/glamor/glamor_egl.c b/xorg-server/glamor/glamor_egl.c
index 9dcba71ce..05e6bd02e 100644
--- a/xorg-server/glamor/glamor_egl.c
+++ b/xorg-server/glamor/glamor_egl.c
@@ -50,6 +50,7 @@
 
 #include "glamor.h"
 #include "glamor_priv.h"
+#include "dri3.h"
 
 static const char glamor_name[] = "glamor";
 
@@ -68,6 +69,7 @@ struct glamor_egl_screen_private {
     EGLDisplay display;
     EGLContext context;
     EGLint major, minor;
+    char *device_path;
 
     CreateScreenResourcesProcPtr CreateScreenResources;
     CloseScreenProcPtr CloseScreen;
@@ -453,12 +455,12 @@ glamor_egl_dri3_fd_name_from_tex(ScreenPtr screen,
 #endif
 }
 
-PixmapPtr
-glamor_egl_dri3_pixmap_from_fd(ScreenPtr screen,
-                               int fd,
-                               CARD16 width,
-                               CARD16 height,
-                               CARD16 stride, CARD8 depth, CARD8 bpp)
+_X_EXPORT PixmapPtr
+glamor_pixmap_from_fd(ScreenPtr screen,
+                      int fd,
+                      CARD16 width,
+                      CARD16 height,
+                      CARD16 stride, CARD8 depth, CARD8 bpp)
 {
 #ifdef GLAMOR_HAS_GBM
     ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
@@ -627,10 +629,67 @@ glamor_egl_has_extension(struct glamor_egl_screen_private *glamor_egl,
     return FALSE;
 }
 
+static int
+glamor_dri3_open(ScreenPtr screen,
+                 RRProviderPtr provider,
+                 int *fdp)
+{
+    ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
+    struct glamor_egl_screen_private *glamor_egl =
+        glamor_egl_get_screen_private(scrn);
+    int fd;
+    drm_magic_t magic;
+
+    fd = open(glamor_egl->device_path, O_RDWR|O_CLOEXEC);
+    if (fd < 0)
+        return BadAlloc;
+
+    /* Before FD passing in the X protocol with DRI3 (and increased
+     * security of rendering with per-process address spaces on the
+     * GPU), the kernel had to come up with a way to have the server
+     * decide which clients got to access the GPU, which was done by
+     * each client getting a unique (magic) number from the kernel,
+     * passing it to the server, and the server then telling the
+     * kernel which clients were authenticated for using the device.
+     *
+     * Now that we have FD passing, the server can just set up the
+     * authentication on its own and hand the prepared FD off to the
+     * client.
+     */
+    if (drmGetMagic(fd, &magic) < 0) {
+        if (errno == EACCES) {
+            /* Assume that we're on a render node, and the fd is
+             * already as authenticated as it should be.
+             */
+            *fdp = fd;
+            return Success;
+        } else {
+            close(fd);
+            return BadMatch;
+        }
+    }
+
+    if (drmAuthMagic(glamor_egl->fd, magic) < 0) {
+        close(fd);
+        return BadMatch;
+    }
+
+    *fdp = fd;
+    return Success;
+}
+
+static dri3_screen_info_rec glamor_dri3_info = {
+    .version = 0,
+    .open = glamor_dri3_open,
+    .pixmap_from_fd = glamor_pixmap_from_fd,
+    .fd_from_pixmap = glamor_fd_from_pixmap,
+};
+
 void
 glamor_egl_screen_init(ScreenPtr screen, struct glamor_context *glamor_ctx)
 {
     ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
+    glamor_screen_private *glamor_priv = glamor_get_screen_private(screen);
     struct glamor_egl_screen_private *glamor_egl =
         glamor_egl_get_screen_private(scrn);
 
@@ -642,6 +701,30 @@ glamor_egl_screen_init(ScreenPtr screen, struct glamor_context *glamor_ctx)
 
     glamor_ctx->get_context = glamor_egl_get_context;
     glamor_ctx->put_context = glamor_egl_put_context;
+
+    if (glamor_egl->dri3_capable) {
+        /* Tell the core that we have the interfaces for import/export
+         * of pixmaps.
+         */
+        glamor_enable_dri3(screen);
+
+        /* If the driver wants to do its own auth dance (e.g. Xwayland
+         * on pre-3.15 kernels that don't have render nodes and thus
+         * has the wayland compositor as a master), then it needs us
+         * to stay out of the way and let it init DRI3 on its own.
+         */
+        if (!(glamor_priv->flags & GLAMOR_NO_DRI3)) {
+            /* To do DRI3 device FD generation, we need to open a new fd
+             * to the same device we were handed in originally.
+             */
+            glamor_egl->device_path = drmGetDeviceNameFromFd(glamor_egl->fd);
+
+            if (!dri3_screen_init(screen, &glamor_dri3_info)) {
+                xf86DrvMsg(scrn->scrnIndex, X_ERROR,
+                           "Failed to initialize DRI3.\n");
+            }
+        }
+    }
 }
 
 static void
@@ -658,6 +741,8 @@ glamor_egl_free_screen(ScrnInfoPtr scrn)
         if (glamor_egl->gbm)
             gbm_device_destroy(glamor_egl->gbm);
 #endif
+        free(glamor_egl->device_path);
+
         scrn->FreeScreen = glamor_egl->saved_free_screen;
         free(glamor_egl);
         scrn->FreeScreen(scrn);
diff --git a/xorg-server/glamor/glamor_eglmodule.c b/xorg-server/glamor/glamor_eglmodule.c
index 5ddd60235..d7e183649 100644
--- a/xorg-server/glamor/glamor_eglmodule.c
+++ b/xorg-server/glamor/glamor_eglmodule.c
@@ -30,6 +30,7 @@
 #include "dix-config.h"
 
 #include <xorg-server.h>
+#include <xf86.h>
 #define GLAMOR_FOR_XORG
 #include <xf86Module.h>
 #include "glamor.h"
@@ -40,7 +41,7 @@ static XF86ModuleVersionInfo VersRec = {
     MODINFOSTRING1,
     MODINFOSTRING2,
     XORG_VERSION_CURRENT,
-    PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL,
+    1, 0, 0, /* version */
     ABI_CLASS_ANSIC,            /* Only need the ansic layer */
     ABI_ANSIC_VERSION,
     MOD_CLASS_NONE,
diff --git a/xorg-server/glamor/glamor_xv.c b/xorg-server/glamor/glamor_xv.c
index dc39476b5..fb9045747 100644
--- a/xorg-server/glamor/glamor_xv.c
+++ b/xorg-server/glamor/glamor_xv.c
@@ -32,10 +32,14 @@
  * Xv acceleration implementation
  */
 
-#include "glamor_priv.h"
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
 
-#ifdef GLAMOR_XV
 #include "xf86xv.h"
+#define GLAMOR_FOR_XORG
+#include "glamor_priv.h"
+
 #include <X11/extensions/Xv.h>
 #include "fourcc.h"
 /* Reference color space transform data */
@@ -430,7 +434,7 @@ glamor_xv_put_image(ScrnInfoPtr pScrn,
                     Bool sync,
                     RegionPtr clipBoxes, void *data, DrawablePtr pDrawable)
 {
-    ScreenPtr screen = xf86ScrnToScreen(pScrn);
+    ScreenPtr screen = pDrawable->pScreen;
     glamor_port_private *port_priv = (glamor_port_private *) data;
     INT32 x1, x2, y1, y2;
     int srcPitch, srcPitch2;
@@ -614,12 +618,3 @@ glamor_xv_init(ScreenPtr screen, int num_texture_ports)
     }
     return adapt;
 }
-#else
-#if 0
-XF86VideoAdaptorPtr
-glamor_xv_init(ScreenPtr screen, int num_texture_ports)
-{
-    return NULL;
-}
-#endif
-#endif
diff --git a/xorg-server/glx/dispatch.h b/xorg-server/glx/dispatch.h
index 6facd054b..f9533c96d 100644
--- a/xorg-server/glx/dispatch.h
+++ b/xorg-server/glx/dispatch.h
@@ -63,7 +63,7 @@
     } while(0)
 
 /* total number of offsets below */
-#define _gloffset_COUNT 1140
+#define _gloffset_COUNT 1136
 
 #define _gloffset_NewList 0
 #define _gloffset_EndList 1
@@ -473,7 +473,7 @@
 #define _gloffset_MultiTexCoord4iv 405
 #define _gloffset_MultiTexCoord4s 406
 #define _gloffset_MultiTexCoord4sv 407
-#define driDispatchRemapTable_size 732
+#define driDispatchRemapTable_size 728
 SERVEXTERN int driDispatchRemapTable[ driDispatchRemapTable_size ];
 
 #define CompressedTexImage1D_remap_index 0
@@ -871,343 +871,339 @@ SERVEXTERN int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define ViewportArrayv_remap_index 392
 #define ViewportIndexedf_remap_index 393
 #define ViewportIndexedfv_remap_index 394
-#define DebugMessageCallbackARB_remap_index 395
-#define DebugMessageControlARB_remap_index 396
-#define DebugMessageInsertARB_remap_index 397
-#define GetDebugMessageLogARB_remap_index 398
-#define GetGraphicsResetStatusARB_remap_index 399
-#define GetnColorTableARB_remap_index 400
-#define GetnCompressedTexImageARB_remap_index 401
-#define GetnConvolutionFilterARB_remap_index 402
-#define GetnHistogramARB_remap_index 403
-#define GetnMapdvARB_remap_index 404
-#define GetnMapfvARB_remap_index 405
-#define GetnMapivARB_remap_index 406
-#define GetnMinmaxARB_remap_index 407
-#define GetnPixelMapfvARB_remap_index 408
-#define GetnPixelMapuivARB_remap_index 409
-#define GetnPixelMapusvARB_remap_index 410
-#define GetnPolygonStippleARB_remap_index 411
-#define GetnSeparableFilterARB_remap_index 412
-#define GetnTexImageARB_remap_index 413
-#define GetnUniformdvARB_remap_index 414
-#define GetnUniformfvARB_remap_index 415
-#define GetnUniformivARB_remap_index 416
-#define GetnUniformuivARB_remap_index 417
-#define ReadnPixelsARB_remap_index 418
-#define DrawArraysInstancedBaseInstance_remap_index 419
-#define DrawElementsInstancedBaseInstance_remap_index 420
-#define DrawElementsInstancedBaseVertexBaseInstance_remap_index 421
-#define DrawTransformFeedbackInstanced_remap_index 422
-#define DrawTransformFeedbackStreamInstanced_remap_index 423
-#define GetInternalformativ_remap_index 424
-#define GetActiveAtomicCounterBufferiv_remap_index 425
-#define BindImageTexture_remap_index 426
-#define MemoryBarrier_remap_index 427
-#define TexStorage1D_remap_index 428
-#define TexStorage2D_remap_index 429
-#define TexStorage3D_remap_index 430
-#define TextureStorage1DEXT_remap_index 431
-#define TextureStorage2DEXT_remap_index 432
-#define TextureStorage3DEXT_remap_index 433
-#define ClearBufferData_remap_index 434
-#define ClearBufferSubData_remap_index 435
-#define DispatchCompute_remap_index 436
-#define DispatchComputeIndirect_remap_index 437
-#define TextureView_remap_index 438
-#define BindVertexBuffer_remap_index 439
-#define VertexAttribBinding_remap_index 440
-#define VertexAttribFormat_remap_index 441
-#define VertexAttribIFormat_remap_index 442
-#define VertexAttribLFormat_remap_index 443
-#define VertexBindingDivisor_remap_index 444
-#define MultiDrawArraysIndirect_remap_index 445
-#define MultiDrawElementsIndirect_remap_index 446
-#define TexBufferRange_remap_index 447
-#define TexStorage2DMultisample_remap_index 448
-#define TexStorage3DMultisample_remap_index 449
-#define BufferStorage_remap_index 450
-#define InvalidateBufferData_remap_index 451
-#define InvalidateBufferSubData_remap_index 452
-#define InvalidateFramebuffer_remap_index 453
-#define InvalidateSubFramebuffer_remap_index 454
-#define InvalidateTexImage_remap_index 455
-#define InvalidateTexSubImage_remap_index 456
-#define PolygonOffsetEXT_remap_index 457
-#define DrawTexfOES_remap_index 458
-#define DrawTexfvOES_remap_index 459
-#define DrawTexiOES_remap_index 460
-#define DrawTexivOES_remap_index 461
-#define DrawTexsOES_remap_index 462
-#define DrawTexsvOES_remap_index 463
-#define DrawTexxOES_remap_index 464
-#define DrawTexxvOES_remap_index 465
-#define PointSizePointerOES_remap_index 466
-#define QueryMatrixxOES_remap_index 467
-#define SampleMaskSGIS_remap_index 468
-#define SamplePatternSGIS_remap_index 469
-#define ColorPointerEXT_remap_index 470
-#define EdgeFlagPointerEXT_remap_index 471
-#define IndexPointerEXT_remap_index 472
-#define NormalPointerEXT_remap_index 473
-#define TexCoordPointerEXT_remap_index 474
-#define VertexPointerEXT_remap_index 475
-#define DiscardFramebufferEXT_remap_index 476
-#define ActiveShaderProgram_remap_index 477
-#define BindProgramPipeline_remap_index 478
-#define CreateShaderProgramv_remap_index 479
-#define DeleteProgramPipelines_remap_index 480
-#define GenProgramPipelines_remap_index 481
-#define GetProgramPipelineInfoLog_remap_index 482
-#define GetProgramPipelineiv_remap_index 483
-#define IsProgramPipeline_remap_index 484
-#define LockArraysEXT_remap_index 485
-#define ProgramUniform1f_remap_index 486
-#define ProgramUniform1fv_remap_index 487
-#define ProgramUniform1i_remap_index 488
-#define ProgramUniform1iv_remap_index 489
-#define ProgramUniform1ui_remap_index 490
-#define ProgramUniform1uiv_remap_index 491
-#define ProgramUniform2f_remap_index 492
-#define ProgramUniform2fv_remap_index 493
-#define ProgramUniform2i_remap_index 494
-#define ProgramUniform2iv_remap_index 495
-#define ProgramUniform2ui_remap_index 496
-#define ProgramUniform2uiv_remap_index 497
-#define ProgramUniform3f_remap_index 498
-#define ProgramUniform3fv_remap_index 499
-#define ProgramUniform3i_remap_index 500
-#define ProgramUniform3iv_remap_index 501
-#define ProgramUniform3ui_remap_index 502
-#define ProgramUniform3uiv_remap_index 503
-#define ProgramUniform4f_remap_index 504
-#define ProgramUniform4fv_remap_index 505
-#define ProgramUniform4i_remap_index 506
-#define ProgramUniform4iv_remap_index 507
-#define ProgramUniform4ui_remap_index 508
-#define ProgramUniform4uiv_remap_index 509
-#define ProgramUniformMatrix2fv_remap_index 510
-#define ProgramUniformMatrix2x3fv_remap_index 511
-#define ProgramUniformMatrix2x4fv_remap_index 512
-#define ProgramUniformMatrix3fv_remap_index 513
-#define ProgramUniformMatrix3x2fv_remap_index 514
-#define ProgramUniformMatrix3x4fv_remap_index 515
-#define ProgramUniformMatrix4fv_remap_index 516
-#define ProgramUniformMatrix4x2fv_remap_index 517
-#define ProgramUniformMatrix4x3fv_remap_index 518
-#define UnlockArraysEXT_remap_index 519
-#define UseProgramStages_remap_index 520
-#define ValidateProgramPipeline_remap_index 521
-#define DebugMessageCallback_remap_index 522
-#define DebugMessageControl_remap_index 523
-#define DebugMessageInsert_remap_index 524
-#define GetDebugMessageLog_remap_index 525
-#define GetObjectLabel_remap_index 526
-#define GetObjectPtrLabel_remap_index 527
-#define ObjectLabel_remap_index 528
-#define ObjectPtrLabel_remap_index 529
-#define PopDebugGroup_remap_index 530
-#define PushDebugGroup_remap_index 531
-#define SecondaryColor3fEXT_remap_index 532
-#define SecondaryColor3fvEXT_remap_index 533
-#define MultiDrawElementsEXT_remap_index 534
-#define FogCoordfEXT_remap_index 535
-#define FogCoordfvEXT_remap_index 536
-#define ResizeBuffersMESA_remap_index 537
-#define WindowPos4dMESA_remap_index 538
-#define WindowPos4dvMESA_remap_index 539
-#define WindowPos4fMESA_remap_index 540
-#define WindowPos4fvMESA_remap_index 541
-#define WindowPos4iMESA_remap_index 542
-#define WindowPos4ivMESA_remap_index 543
-#define WindowPos4sMESA_remap_index 544
-#define WindowPos4svMESA_remap_index 545
-#define MultiModeDrawArraysIBM_remap_index 546
-#define MultiModeDrawElementsIBM_remap_index 547
-#define AreProgramsResidentNV_remap_index 548
-#define ExecuteProgramNV_remap_index 549
-#define GetProgramParameterdvNV_remap_index 550
-#define GetProgramParameterfvNV_remap_index 551
-#define GetProgramStringNV_remap_index 552
-#define GetProgramivNV_remap_index 553
-#define GetTrackMatrixivNV_remap_index 554
-#define GetVertexAttribdvNV_remap_index 555
-#define GetVertexAttribfvNV_remap_index 556
-#define GetVertexAttribivNV_remap_index 557
-#define LoadProgramNV_remap_index 558
-#define ProgramParameters4dvNV_remap_index 559
-#define ProgramParameters4fvNV_remap_index 560
-#define RequestResidentProgramsNV_remap_index 561
-#define TrackMatrixNV_remap_index 562
-#define VertexAttrib1dNV_remap_index 563
-#define VertexAttrib1dvNV_remap_index 564
-#define VertexAttrib1fNV_remap_index 565
-#define VertexAttrib1fvNV_remap_index 566
-#define VertexAttrib1sNV_remap_index 567
-#define VertexAttrib1svNV_remap_index 568
-#define VertexAttrib2dNV_remap_index 569
-#define VertexAttrib2dvNV_remap_index 570
-#define VertexAttrib2fNV_remap_index 571
-#define VertexAttrib2fvNV_remap_index 572
-#define VertexAttrib2sNV_remap_index 573
-#define VertexAttrib2svNV_remap_index 574
-#define VertexAttrib3dNV_remap_index 575
-#define VertexAttrib3dvNV_remap_index 576
-#define VertexAttrib3fNV_remap_index 577
-#define VertexAttrib3fvNV_remap_index 578
-#define VertexAttrib3sNV_remap_index 579
-#define VertexAttrib3svNV_remap_index 580
-#define VertexAttrib4dNV_remap_index 581
-#define VertexAttrib4dvNV_remap_index 582
-#define VertexAttrib4fNV_remap_index 583
-#define VertexAttrib4fvNV_remap_index 584
-#define VertexAttrib4sNV_remap_index 585
-#define VertexAttrib4svNV_remap_index 586
-#define VertexAttrib4ubNV_remap_index 587
-#define VertexAttrib4ubvNV_remap_index 588
-#define VertexAttribPointerNV_remap_index 589
-#define VertexAttribs1dvNV_remap_index 590
-#define VertexAttribs1fvNV_remap_index 591
-#define VertexAttribs1svNV_remap_index 592
-#define VertexAttribs2dvNV_remap_index 593
-#define VertexAttribs2fvNV_remap_index 594
-#define VertexAttribs2svNV_remap_index 595
-#define VertexAttribs3dvNV_remap_index 596
-#define VertexAttribs3fvNV_remap_index 597
-#define VertexAttribs3svNV_remap_index 598
-#define VertexAttribs4dvNV_remap_index 599
-#define VertexAttribs4fvNV_remap_index 600
-#define VertexAttribs4svNV_remap_index 601
-#define VertexAttribs4ubvNV_remap_index 602
-#define GetTexBumpParameterfvATI_remap_index 603
-#define GetTexBumpParameterivATI_remap_index 604
-#define TexBumpParameterfvATI_remap_index 605
-#define TexBumpParameterivATI_remap_index 606
-#define AlphaFragmentOp1ATI_remap_index 607
-#define AlphaFragmentOp2ATI_remap_index 608
-#define AlphaFragmentOp3ATI_remap_index 609
-#define BeginFragmentShaderATI_remap_index 610
-#define BindFragmentShaderATI_remap_index 611
-#define ColorFragmentOp1ATI_remap_index 612
-#define ColorFragmentOp2ATI_remap_index 613
-#define ColorFragmentOp3ATI_remap_index 614
-#define DeleteFragmentShaderATI_remap_index 615
-#define EndFragmentShaderATI_remap_index 616
-#define GenFragmentShadersATI_remap_index 617
-#define PassTexCoordATI_remap_index 618
-#define SampleMapATI_remap_index 619
-#define SetFragmentShaderConstantATI_remap_index 620
-#define ActiveStencilFaceEXT_remap_index 621
-#define BindVertexArrayAPPLE_remap_index 622
-#define GenVertexArraysAPPLE_remap_index 623
-#define GetProgramNamedParameterdvNV_remap_index 624
-#define GetProgramNamedParameterfvNV_remap_index 625
-#define ProgramNamedParameter4dNV_remap_index 626
-#define ProgramNamedParameter4dvNV_remap_index 627
-#define ProgramNamedParameter4fNV_remap_index 628
-#define ProgramNamedParameter4fvNV_remap_index 629
-#define PrimitiveRestartNV_remap_index 630
-#define GetTexGenxvOES_remap_index 631
-#define TexGenxOES_remap_index 632
-#define TexGenxvOES_remap_index 633
-#define DepthBoundsEXT_remap_index 634
-#define BindFramebufferEXT_remap_index 635
-#define BindRenderbufferEXT_remap_index 636
-#define BufferParameteriAPPLE_remap_index 637
-#define FlushMappedBufferRangeAPPLE_remap_index 638
-#define VertexAttribI1iEXT_remap_index 639
-#define VertexAttribI1uiEXT_remap_index 640
-#define VertexAttribI2iEXT_remap_index 641
-#define VertexAttribI2ivEXT_remap_index 642
-#define VertexAttribI2uiEXT_remap_index 643
-#define VertexAttribI2uivEXT_remap_index 644
-#define VertexAttribI3iEXT_remap_index 645
-#define VertexAttribI3ivEXT_remap_index 646
-#define VertexAttribI3uiEXT_remap_index 647
-#define VertexAttribI3uivEXT_remap_index 648
-#define VertexAttribI4iEXT_remap_index 649
-#define VertexAttribI4ivEXT_remap_index 650
-#define VertexAttribI4uiEXT_remap_index 651
-#define VertexAttribI4uivEXT_remap_index 652
-#define ClearColorIiEXT_remap_index 653
-#define ClearColorIuiEXT_remap_index 654
-#define BindBufferOffsetEXT_remap_index 655
-#define BeginPerfMonitorAMD_remap_index 656
-#define DeletePerfMonitorsAMD_remap_index 657
-#define EndPerfMonitorAMD_remap_index 658
-#define GenPerfMonitorsAMD_remap_index 659
-#define GetPerfMonitorCounterDataAMD_remap_index 660
-#define GetPerfMonitorCounterInfoAMD_remap_index 661
-#define GetPerfMonitorCounterStringAMD_remap_index 662
-#define GetPerfMonitorCountersAMD_remap_index 663
-#define GetPerfMonitorGroupStringAMD_remap_index 664
-#define GetPerfMonitorGroupsAMD_remap_index 665
-#define SelectPerfMonitorCountersAMD_remap_index 666
-#define GetObjectParameterivAPPLE_remap_index 667
-#define ObjectPurgeableAPPLE_remap_index 668
-#define ObjectUnpurgeableAPPLE_remap_index 669
-#define ActiveProgramEXT_remap_index 670
-#define CreateShaderProgramEXT_remap_index 671
-#define UseShaderProgramEXT_remap_index 672
-#define TextureBarrierNV_remap_index 673
-#define VDPAUFiniNV_remap_index 674
-#define VDPAUGetSurfaceivNV_remap_index 675
-#define VDPAUInitNV_remap_index 676
-#define VDPAUIsSurfaceNV_remap_index 677
-#define VDPAUMapSurfacesNV_remap_index 678
-#define VDPAURegisterOutputSurfaceNV_remap_index 679
-#define VDPAURegisterVideoSurfaceNV_remap_index 680
-#define VDPAUSurfaceAccessNV_remap_index 681
-#define VDPAUUnmapSurfacesNV_remap_index 682
-#define VDPAUUnregisterSurfaceNV_remap_index 683
-#define StencilFuncSeparateATI_remap_index 684
-#define ProgramEnvParameters4fvEXT_remap_index 685
-#define ProgramLocalParameters4fvEXT_remap_index 686
-#define EGLImageTargetRenderbufferStorageOES_remap_index 687
-#define EGLImageTargetTexture2DOES_remap_index 688
-#define AlphaFuncx_remap_index 689
-#define ClearColorx_remap_index 690
-#define ClearDepthx_remap_index 691
-#define Color4x_remap_index 692
-#define DepthRangex_remap_index 693
-#define Fogx_remap_index 694
-#define Fogxv_remap_index 695
-#define Frustumf_remap_index 696
-#define Frustumx_remap_index 697
-#define LightModelx_remap_index 698
-#define LightModelxv_remap_index 699
-#define Lightx_remap_index 700
-#define Lightxv_remap_index 701
-#define LineWidthx_remap_index 702
-#define LoadMatrixx_remap_index 703
-#define Materialx_remap_index 704
-#define Materialxv_remap_index 705
-#define MultMatrixx_remap_index 706
-#define MultiTexCoord4x_remap_index 707
-#define Normal3x_remap_index 708
-#define Orthof_remap_index 709
-#define Orthox_remap_index 710
-#define PointSizex_remap_index 711
-#define PolygonOffsetx_remap_index 712
-#define Rotatex_remap_index 713
-#define SampleCoveragex_remap_index 714
-#define Scalex_remap_index 715
-#define TexEnvx_remap_index 716
-#define TexEnvxv_remap_index 717
-#define TexParameterx_remap_index 718
-#define Translatex_remap_index 719
-#define ClipPlanef_remap_index 720
-#define ClipPlanex_remap_index 721
-#define GetClipPlanef_remap_index 722
-#define GetClipPlanex_remap_index 723
-#define GetFixedv_remap_index 724
-#define GetLightxv_remap_index 725
-#define GetMaterialxv_remap_index 726
-#define GetTexEnvxv_remap_index 727
-#define GetTexParameterxv_remap_index 728
-#define PointParameterx_remap_index 729
-#define PointParameterxv_remap_index 730
-#define TexParameterxv_remap_index 731
+#define GetGraphicsResetStatusARB_remap_index 395
+#define GetnColorTableARB_remap_index 396
+#define GetnCompressedTexImageARB_remap_index 397
+#define GetnConvolutionFilterARB_remap_index 398
+#define GetnHistogramARB_remap_index 399
+#define GetnMapdvARB_remap_index 400
+#define GetnMapfvARB_remap_index 401
+#define GetnMapivARB_remap_index 402
+#define GetnMinmaxARB_remap_index 403
+#define GetnPixelMapfvARB_remap_index 404
+#define GetnPixelMapuivARB_remap_index 405
+#define GetnPixelMapusvARB_remap_index 406
+#define GetnPolygonStippleARB_remap_index 407
+#define GetnSeparableFilterARB_remap_index 408
+#define GetnTexImageARB_remap_index 409
+#define GetnUniformdvARB_remap_index 410
+#define GetnUniformfvARB_remap_index 411
+#define GetnUniformivARB_remap_index 412
+#define GetnUniformuivARB_remap_index 413
+#define ReadnPixelsARB_remap_index 414
+#define DrawArraysInstancedBaseInstance_remap_index 415
+#define DrawElementsInstancedBaseInstance_remap_index 416
+#define DrawElementsInstancedBaseVertexBaseInstance_remap_index 417
+#define DrawTransformFeedbackInstanced_remap_index 418
+#define DrawTransformFeedbackStreamInstanced_remap_index 419
+#define GetInternalformativ_remap_index 420
+#define GetActiveAtomicCounterBufferiv_remap_index 421
+#define BindImageTexture_remap_index 422
+#define MemoryBarrier_remap_index 423
+#define TexStorage1D_remap_index 424
+#define TexStorage2D_remap_index 425
+#define TexStorage3D_remap_index 426
+#define TextureStorage1DEXT_remap_index 427
+#define TextureStorage2DEXT_remap_index 428
+#define TextureStorage3DEXT_remap_index 429
+#define ClearBufferData_remap_index 430
+#define ClearBufferSubData_remap_index 431
+#define DispatchCompute_remap_index 432
+#define DispatchComputeIndirect_remap_index 433
+#define TextureView_remap_index 434
+#define BindVertexBuffer_remap_index 435
+#define VertexAttribBinding_remap_index 436
+#define VertexAttribFormat_remap_index 437
+#define VertexAttribIFormat_remap_index 438
+#define VertexAttribLFormat_remap_index 439
+#define VertexBindingDivisor_remap_index 440
+#define MultiDrawArraysIndirect_remap_index 441
+#define MultiDrawElementsIndirect_remap_index 442
+#define TexBufferRange_remap_index 443
+#define TexStorage2DMultisample_remap_index 444
+#define TexStorage3DMultisample_remap_index 445
+#define BufferStorage_remap_index 446
+#define InvalidateBufferData_remap_index 447
+#define InvalidateBufferSubData_remap_index 448
+#define InvalidateFramebuffer_remap_index 449
+#define InvalidateSubFramebuffer_remap_index 450
+#define InvalidateTexImage_remap_index 451
+#define InvalidateTexSubImage_remap_index 452
+#define PolygonOffsetEXT_remap_index 453
+#define DrawTexfOES_remap_index 454
+#define DrawTexfvOES_remap_index 455
+#define DrawTexiOES_remap_index 456
+#define DrawTexivOES_remap_index 457
+#define DrawTexsOES_remap_index 458
+#define DrawTexsvOES_remap_index 459
+#define DrawTexxOES_remap_index 460
+#define DrawTexxvOES_remap_index 461
+#define PointSizePointerOES_remap_index 462
+#define QueryMatrixxOES_remap_index 463
+#define SampleMaskSGIS_remap_index 464
+#define SamplePatternSGIS_remap_index 465
+#define ColorPointerEXT_remap_index 466
+#define EdgeFlagPointerEXT_remap_index 467
+#define IndexPointerEXT_remap_index 468
+#define NormalPointerEXT_remap_index 469
+#define TexCoordPointerEXT_remap_index 470
+#define VertexPointerEXT_remap_index 471
+#define DiscardFramebufferEXT_remap_index 472
+#define ActiveShaderProgram_remap_index 473
+#define BindProgramPipeline_remap_index 474
+#define CreateShaderProgramv_remap_index 475
+#define DeleteProgramPipelines_remap_index 476
+#define GenProgramPipelines_remap_index 477
+#define GetProgramPipelineInfoLog_remap_index 478
+#define GetProgramPipelineiv_remap_index 479
+#define IsProgramPipeline_remap_index 480
+#define LockArraysEXT_remap_index 481
+#define ProgramUniform1f_remap_index 482
+#define ProgramUniform1fv_remap_index 483
+#define ProgramUniform1i_remap_index 484
+#define ProgramUniform1iv_remap_index 485
+#define ProgramUniform1ui_remap_index 486
+#define ProgramUniform1uiv_remap_index 487
+#define ProgramUniform2f_remap_index 488
+#define ProgramUniform2fv_remap_index 489
+#define ProgramUniform2i_remap_index 490
+#define ProgramUniform2iv_remap_index 491
+#define ProgramUniform2ui_remap_index 492
+#define ProgramUniform2uiv_remap_index 493
+#define ProgramUniform3f_remap_index 494
+#define ProgramUniform3fv_remap_index 495
+#define ProgramUniform3i_remap_index 496
+#define ProgramUniform3iv_remap_index 497
+#define ProgramUniform3ui_remap_index 498
+#define ProgramUniform3uiv_remap_index 499
+#define ProgramUniform4f_remap_index 500
+#define ProgramUniform4fv_remap_index 501
+#define ProgramUniform4i_remap_index 502
+#define ProgramUniform4iv_remap_index 503
+#define ProgramUniform4ui_remap_index 504
+#define ProgramUniform4uiv_remap_index 505
+#define ProgramUniformMatrix2fv_remap_index 506
+#define ProgramUniformMatrix2x3fv_remap_index 507
+#define ProgramUniformMatrix2x4fv_remap_index 508
+#define ProgramUniformMatrix3fv_remap_index 509
+#define ProgramUniformMatrix3x2fv_remap_index 510
+#define ProgramUniformMatrix3x4fv_remap_index 511
+#define ProgramUniformMatrix4fv_remap_index 512
+#define ProgramUniformMatrix4x2fv_remap_index 513
+#define ProgramUniformMatrix4x3fv_remap_index 514
+#define UnlockArraysEXT_remap_index 515
+#define UseProgramStages_remap_index 516
+#define ValidateProgramPipeline_remap_index 517
+#define DebugMessageCallback_remap_index 518
+#define DebugMessageControl_remap_index 519
+#define DebugMessageInsert_remap_index 520
+#define GetDebugMessageLog_remap_index 521
+#define GetObjectLabel_remap_index 522
+#define GetObjectPtrLabel_remap_index 523
+#define ObjectLabel_remap_index 524
+#define ObjectPtrLabel_remap_index 525
+#define PopDebugGroup_remap_index 526
+#define PushDebugGroup_remap_index 527
+#define SecondaryColor3fEXT_remap_index 528
+#define SecondaryColor3fvEXT_remap_index 529
+#define MultiDrawElementsEXT_remap_index 530
+#define FogCoordfEXT_remap_index 531
+#define FogCoordfvEXT_remap_index 532
+#define ResizeBuffersMESA_remap_index 533
+#define WindowPos4dMESA_remap_index 534
+#define WindowPos4dvMESA_remap_index 535
+#define WindowPos4fMESA_remap_index 536
+#define WindowPos4fvMESA_remap_index 537
+#define WindowPos4iMESA_remap_index 538
+#define WindowPos4ivMESA_remap_index 539
+#define WindowPos4sMESA_remap_index 540
+#define WindowPos4svMESA_remap_index 541
+#define MultiModeDrawArraysIBM_remap_index 542
+#define MultiModeDrawElementsIBM_remap_index 543
+#define AreProgramsResidentNV_remap_index 544
+#define ExecuteProgramNV_remap_index 545
+#define GetProgramParameterdvNV_remap_index 546
+#define GetProgramParameterfvNV_remap_index 547
+#define GetProgramStringNV_remap_index 548
+#define GetProgramivNV_remap_index 549
+#define GetTrackMatrixivNV_remap_index 550
+#define GetVertexAttribdvNV_remap_index 551
+#define GetVertexAttribfvNV_remap_index 552
+#define GetVertexAttribivNV_remap_index 553
+#define LoadProgramNV_remap_index 554
+#define ProgramParameters4dvNV_remap_index 555
+#define ProgramParameters4fvNV_remap_index 556
+#define RequestResidentProgramsNV_remap_index 557
+#define TrackMatrixNV_remap_index 558
+#define VertexAttrib1dNV_remap_index 559
+#define VertexAttrib1dvNV_remap_index 560
+#define VertexAttrib1fNV_remap_index 561
+#define VertexAttrib1fvNV_remap_index 562
+#define VertexAttrib1sNV_remap_index 563
+#define VertexAttrib1svNV_remap_index 564
+#define VertexAttrib2dNV_remap_index 565
+#define VertexAttrib2dvNV_remap_index 566
+#define VertexAttrib2fNV_remap_index 567
+#define VertexAttrib2fvNV_remap_index 568
+#define VertexAttrib2sNV_remap_index 569
+#define VertexAttrib2svNV_remap_index 570
+#define VertexAttrib3dNV_remap_index 571
+#define VertexAttrib3dvNV_remap_index 572
+#define VertexAttrib3fNV_remap_index 573
+#define VertexAttrib3fvNV_remap_index 574
+#define VertexAttrib3sNV_remap_index 575
+#define VertexAttrib3svNV_remap_index 576
+#define VertexAttrib4dNV_remap_index 577
+#define VertexAttrib4dvNV_remap_index 578
+#define VertexAttrib4fNV_remap_index 579
+#define VertexAttrib4fvNV_remap_index 580
+#define VertexAttrib4sNV_remap_index 581
+#define VertexAttrib4svNV_remap_index 582
+#define VertexAttrib4ubNV_remap_index 583
+#define VertexAttrib4ubvNV_remap_index 584
+#define VertexAttribPointerNV_remap_index 585
+#define VertexAttribs1dvNV_remap_index 586
+#define VertexAttribs1fvNV_remap_index 587
+#define VertexAttribs1svNV_remap_index 588
+#define VertexAttribs2dvNV_remap_index 589
+#define VertexAttribs2fvNV_remap_index 590
+#define VertexAttribs2svNV_remap_index 591
+#define VertexAttribs3dvNV_remap_index 592
+#define VertexAttribs3fvNV_remap_index 593
+#define VertexAttribs3svNV_remap_index 594
+#define VertexAttribs4dvNV_remap_index 595
+#define VertexAttribs4fvNV_remap_index 596
+#define VertexAttribs4svNV_remap_index 597
+#define VertexAttribs4ubvNV_remap_index 598
+#define GetTexBumpParameterfvATI_remap_index 599
+#define GetTexBumpParameterivATI_remap_index 600
+#define TexBumpParameterfvATI_remap_index 601
+#define TexBumpParameterivATI_remap_index 602
+#define AlphaFragmentOp1ATI_remap_index 603
+#define AlphaFragmentOp2ATI_remap_index 604
+#define AlphaFragmentOp3ATI_remap_index 605
+#define BeginFragmentShaderATI_remap_index 606
+#define BindFragmentShaderATI_remap_index 607
+#define ColorFragmentOp1ATI_remap_index 608
+#define ColorFragmentOp2ATI_remap_index 609
+#define ColorFragmentOp3ATI_remap_index 610
+#define DeleteFragmentShaderATI_remap_index 611
+#define EndFragmentShaderATI_remap_index 612
+#define GenFragmentShadersATI_remap_index 613
+#define PassTexCoordATI_remap_index 614
+#define SampleMapATI_remap_index 615
+#define SetFragmentShaderConstantATI_remap_index 616
+#define ActiveStencilFaceEXT_remap_index 617
+#define BindVertexArrayAPPLE_remap_index 618
+#define GenVertexArraysAPPLE_remap_index 619
+#define GetProgramNamedParameterdvNV_remap_index 620
+#define GetProgramNamedParameterfvNV_remap_index 621
+#define ProgramNamedParameter4dNV_remap_index 622
+#define ProgramNamedParameter4dvNV_remap_index 623
+#define ProgramNamedParameter4fNV_remap_index 624
+#define ProgramNamedParameter4fvNV_remap_index 625
+#define PrimitiveRestartNV_remap_index 626
+#define GetTexGenxvOES_remap_index 627
+#define TexGenxOES_remap_index 628
+#define TexGenxvOES_remap_index 629
+#define DepthBoundsEXT_remap_index 630
+#define BindFramebufferEXT_remap_index 631
+#define BindRenderbufferEXT_remap_index 632
+#define BufferParameteriAPPLE_remap_index 633
+#define FlushMappedBufferRangeAPPLE_remap_index 634
+#define VertexAttribI1iEXT_remap_index 635
+#define VertexAttribI1uiEXT_remap_index 636
+#define VertexAttribI2iEXT_remap_index 637
+#define VertexAttribI2ivEXT_remap_index 638
+#define VertexAttribI2uiEXT_remap_index 639
+#define VertexAttribI2uivEXT_remap_index 640
+#define VertexAttribI3iEXT_remap_index 641
+#define VertexAttribI3ivEXT_remap_index 642
+#define VertexAttribI3uiEXT_remap_index 643
+#define VertexAttribI3uivEXT_remap_index 644
+#define VertexAttribI4iEXT_remap_index 645
+#define VertexAttribI4ivEXT_remap_index 646
+#define VertexAttribI4uiEXT_remap_index 647
+#define VertexAttribI4uivEXT_remap_index 648
+#define ClearColorIiEXT_remap_index 649
+#define ClearColorIuiEXT_remap_index 650
+#define BindBufferOffsetEXT_remap_index 651
+#define BeginPerfMonitorAMD_remap_index 652
+#define DeletePerfMonitorsAMD_remap_index 653
+#define EndPerfMonitorAMD_remap_index 654
+#define GenPerfMonitorsAMD_remap_index 655
+#define GetPerfMonitorCounterDataAMD_remap_index 656
+#define GetPerfMonitorCounterInfoAMD_remap_index 657
+#define GetPerfMonitorCounterStringAMD_remap_index 658
+#define GetPerfMonitorCountersAMD_remap_index 659
+#define GetPerfMonitorGroupStringAMD_remap_index 660
+#define GetPerfMonitorGroupsAMD_remap_index 661
+#define SelectPerfMonitorCountersAMD_remap_index 662
+#define GetObjectParameterivAPPLE_remap_index 663
+#define ObjectPurgeableAPPLE_remap_index 664
+#define ObjectUnpurgeableAPPLE_remap_index 665
+#define ActiveProgramEXT_remap_index 666
+#define CreateShaderProgramEXT_remap_index 667
+#define UseShaderProgramEXT_remap_index 668
+#define TextureBarrierNV_remap_index 669
+#define VDPAUFiniNV_remap_index 670
+#define VDPAUGetSurfaceivNV_remap_index 671
+#define VDPAUInitNV_remap_index 672
+#define VDPAUIsSurfaceNV_remap_index 673
+#define VDPAUMapSurfacesNV_remap_index 674
+#define VDPAURegisterOutputSurfaceNV_remap_index 675
+#define VDPAURegisterVideoSurfaceNV_remap_index 676
+#define VDPAUSurfaceAccessNV_remap_index 677
+#define VDPAUUnmapSurfacesNV_remap_index 678
+#define VDPAUUnregisterSurfaceNV_remap_index 679
+#define StencilFuncSeparateATI_remap_index 680
+#define ProgramEnvParameters4fvEXT_remap_index 681
+#define ProgramLocalParameters4fvEXT_remap_index 682
+#define EGLImageTargetRenderbufferStorageOES_remap_index 683
+#define EGLImageTargetTexture2DOES_remap_index 684
+#define AlphaFuncx_remap_index 685
+#define ClearColorx_remap_index 686
+#define ClearDepthx_remap_index 687
+#define Color4x_remap_index 688
+#define DepthRangex_remap_index 689
+#define Fogx_remap_index 690
+#define Fogxv_remap_index 691
+#define Frustumf_remap_index 692
+#define Frustumx_remap_index 693
+#define LightModelx_remap_index 694
+#define LightModelxv_remap_index 695
+#define Lightx_remap_index 696
+#define Lightxv_remap_index 697
+#define LineWidthx_remap_index 698
+#define LoadMatrixx_remap_index 699
+#define Materialx_remap_index 700
+#define Materialxv_remap_index 701
+#define MultMatrixx_remap_index 702
+#define MultiTexCoord4x_remap_index 703
+#define Normal3x_remap_index 704
+#define Orthof_remap_index 705
+#define Orthox_remap_index 706
+#define PointSizex_remap_index 707
+#define PolygonOffsetx_remap_index 708
+#define Rotatex_remap_index 709
+#define SampleCoveragex_remap_index 710
+#define Scalex_remap_index 711
+#define TexEnvx_remap_index 712
+#define TexEnvxv_remap_index 713
+#define TexParameterx_remap_index 714
+#define Translatex_remap_index 715
+#define ClipPlanef_remap_index 716
+#define ClipPlanex_remap_index 717
+#define GetClipPlanef_remap_index 718
+#define GetClipPlanex_remap_index 719
+#define GetFixedv_remap_index 720
+#define GetLightxv_remap_index 721
+#define GetMaterialxv_remap_index 722
+#define GetTexEnvxv_remap_index 723
+#define GetTexParameterxv_remap_index 724
+#define PointParameterx_remap_index 725
+#define PointParameterxv_remap_index 726
+#define TexParameterxv_remap_index 727
 
 #define _gloffset_CompressedTexImage1D driDispatchRemapTable[CompressedTexImage1D_remap_index]
 #define _gloffset_CompressedTexImage2D driDispatchRemapTable[CompressedTexImage2D_remap_index]
@@ -1604,10 +1600,6 @@ SERVEXTERN int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define _gloffset_ViewportArrayv driDispatchRemapTable[ViewportArrayv_remap_index]
 #define _gloffset_ViewportIndexedf driDispatchRemapTable[ViewportIndexedf_remap_index]
 #define _gloffset_ViewportIndexedfv driDispatchRemapTable[ViewportIndexedfv_remap_index]
-#define _gloffset_DebugMessageCallbackARB driDispatchRemapTable[DebugMessageCallbackARB_remap_index]
-#define _gloffset_DebugMessageControlARB driDispatchRemapTable[DebugMessageControlARB_remap_index]
-#define _gloffset_DebugMessageInsertARB driDispatchRemapTable[DebugMessageInsertARB_remap_index]
-#define _gloffset_GetDebugMessageLogARB driDispatchRemapTable[GetDebugMessageLogARB_remap_index]
 #define _gloffset_GetGraphicsResetStatusARB driDispatchRemapTable[GetGraphicsResetStatusARB_remap_index]
 #define _gloffset_GetnColorTableARB driDispatchRemapTable[GetnColorTableARB_remap_index]
 #define _gloffset_GetnCompressedTexImageARB driDispatchRemapTable[GetnCompressedTexImageARB_remap_index]
@@ -10775,50 +10767,6 @@ static INLINE void SET_ViewportIndexedfv(struct _glapi_table *disp, void (GLAPIE
    SET_by_offset(disp, _gloffset_ViewportIndexedfv, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_DebugMessageCallbackARB)(GLDEBUGPROCARB, const GLvoid *);
-#define CALL_DebugMessageCallbackARB(disp, parameters) \
-    (* GET_DebugMessageCallbackARB(disp)) parameters
-static INLINE _glptr_DebugMessageCallbackARB GET_DebugMessageCallbackARB(struct _glapi_table *disp) {
-   return (_glptr_DebugMessageCallbackARB) (GET_by_offset(disp, _gloffset_DebugMessageCallbackARB));
-}
-
-static INLINE void SET_DebugMessageCallbackARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLDEBUGPROCARB, const GLvoid *)) {
-   SET_by_offset(disp, _gloffset_DebugMessageCallbackARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DebugMessageControlARB)(GLenum, GLenum, GLenum, GLsizei, const GLuint *, GLboolean);
-#define CALL_DebugMessageControlARB(disp, parameters) \
-    (* GET_DebugMessageControlARB(disp)) parameters
-static INLINE _glptr_DebugMessageControlARB GET_DebugMessageControlARB(struct _glapi_table *disp) {
-   return (_glptr_DebugMessageControlARB) (GET_by_offset(disp, _gloffset_DebugMessageControlARB));
-}
-
-static INLINE void SET_DebugMessageControlARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLsizei, const GLuint *, GLboolean)) {
-   SET_by_offset(disp, _gloffset_DebugMessageControlARB, fn);
-}
-
-typedef void (GLAPIENTRYP _glptr_DebugMessageInsertARB)(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLcharARB *);
-#define CALL_DebugMessageInsertARB(disp, parameters) \
-    (* GET_DebugMessageInsertARB(disp)) parameters
-static INLINE _glptr_DebugMessageInsertARB GET_DebugMessageInsertARB(struct _glapi_table *disp) {
-   return (_glptr_DebugMessageInsertARB) (GET_by_offset(disp, _gloffset_DebugMessageInsertARB));
-}
-
-static INLINE void SET_DebugMessageInsertARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLcharARB *)) {
-   SET_by_offset(disp, _gloffset_DebugMessageInsertARB, fn);
-}
-
-typedef GLuint (GLAPIENTRYP _glptr_GetDebugMessageLogARB)(GLuint, GLsizei, GLenum *, GLenum *, GLuint *, GLenum *, GLsizei *, GLcharARB *);
-#define CALL_GetDebugMessageLogARB(disp, parameters) \
-    (* GET_GetDebugMessageLogARB(disp)) parameters
-static INLINE _glptr_GetDebugMessageLogARB GET_GetDebugMessageLogARB(struct _glapi_table *disp) {
-   return (_glptr_GetDebugMessageLogARB) (GET_by_offset(disp, _gloffset_GetDebugMessageLogARB));
-}
-
-static INLINE void SET_GetDebugMessageLogARB(struct _glapi_table *disp, GLuint (GLAPIENTRYP fn)(GLuint, GLsizei, GLenum *, GLenum *, GLuint *, GLenum *, GLsizei *, GLcharARB *)) {
-   SET_by_offset(disp, _gloffset_GetDebugMessageLogARB, fn);
-}
-
 typedef GLenum (GLAPIENTRYP _glptr_GetGraphicsResetStatusARB)(void);
 #define CALL_GetGraphicsResetStatusARB(disp, parameters) \
     (* GET_GetGraphicsResetStatusARB(disp)) parameters
diff --git a/xorg-server/glx/glapitable.h b/xorg-server/glx/glapitable.h
index 7f5fcbb43..567d517a9 100644
--- a/xorg-server/glx/glapitable.h
+++ b/xorg-server/glx/glapitable.h
@@ -844,343 +844,339 @@ struct _glapi_table
    void (GLAPIENTRYP ViewportArrayv)(GLuint first, GLsizei count, const GLfloat * v); /* 800 */
    void (GLAPIENTRYP ViewportIndexedf)(GLuint index, GLfloat x, GLfloat y, GLfloat w, GLfloat h); /* 801 */
    void (GLAPIENTRYP ViewportIndexedfv)(GLuint index, const GLfloat * v); /* 802 */
-   void (GLAPIENTRYP DebugMessageCallbackARB)(GLDEBUGPROCARB callback, const GLvoid * userParam); /* 803 */
-   void (GLAPIENTRYP DebugMessageControlARB)(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint * ids, GLboolean enabled); /* 804 */
-   void (GLAPIENTRYP DebugMessageInsertARB)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLcharARB * buf); /* 805 */
-   GLuint (GLAPIENTRYP GetDebugMessageLogARB)(GLuint count, GLsizei bufsize, GLenum * sources, GLenum * types, GLuint * ids, GLenum * severities, GLsizei * lengths, GLcharARB * messageLog); /* 806 */
-   GLenum (GLAPIENTRYP GetGraphicsResetStatusARB)(void); /* 807 */
-   void (GLAPIENTRYP GetnColorTableARB)(GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid * table); /* 808 */
-   void (GLAPIENTRYP GetnCompressedTexImageARB)(GLenum target, GLint lod, GLsizei bufSize, GLvoid * img); /* 809 */
-   void (GLAPIENTRYP GetnConvolutionFilterARB)(GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid * image); /* 810 */
-   void (GLAPIENTRYP GetnHistogramARB)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid * values); /* 811 */
-   void (GLAPIENTRYP GetnMapdvARB)(GLenum target, GLenum query, GLsizei bufSize, GLdouble * v); /* 812 */
-   void (GLAPIENTRYP GetnMapfvARB)(GLenum target, GLenum query, GLsizei bufSize, GLfloat * v); /* 813 */
-   void (GLAPIENTRYP GetnMapivARB)(GLenum target, GLenum query, GLsizei bufSize, GLint * v); /* 814 */
-   void (GLAPIENTRYP GetnMinmaxARB)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid * values); /* 815 */
-   void (GLAPIENTRYP GetnPixelMapfvARB)(GLenum map, GLsizei bufSize, GLfloat * values); /* 816 */
-   void (GLAPIENTRYP GetnPixelMapuivARB)(GLenum map, GLsizei bufSize, GLuint * values); /* 817 */
-   void (GLAPIENTRYP GetnPixelMapusvARB)(GLenum map, GLsizei bufSize, GLushort * values); /* 818 */
-   void (GLAPIENTRYP GetnPolygonStippleARB)(GLsizei bufSize, GLubyte * pattern); /* 819 */
-   void (GLAPIENTRYP GetnSeparableFilterARB)(GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, GLvoid * row, GLsizei columnBufSize, GLvoid * column, GLvoid * span); /* 820 */
-   void (GLAPIENTRYP GetnTexImageARB)(GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, GLvoid * img); /* 821 */
-   void (GLAPIENTRYP GetnUniformdvARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLdouble * params); /* 822 */
-   void (GLAPIENTRYP GetnUniformfvARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLfloat * params); /* 823 */
-   void (GLAPIENTRYP GetnUniformivARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLint * params); /* 824 */
-   void (GLAPIENTRYP GetnUniformuivARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLuint * params); /* 825 */
-   void (GLAPIENTRYP ReadnPixelsARB)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, GLvoid * data); /* 826 */
-   void (GLAPIENTRYP DrawArraysInstancedBaseInstance)(GLenum mode, GLint first, GLsizei count, GLsizei primcount, GLuint baseinstance); /* 827 */
-   void (GLAPIENTRYP DrawElementsInstancedBaseInstance)(GLenum mode, GLsizei count, GLenum type, const GLvoid * indices, GLsizei primcount, GLuint baseinstance); /* 828 */
-   void (GLAPIENTRYP DrawElementsInstancedBaseVertexBaseInstance)(GLenum mode, GLsizei count, GLenum type, const GLvoid * indices, GLsizei primcount, GLint basevertex, GLuint baseinstance); /* 829 */
-   void (GLAPIENTRYP DrawTransformFeedbackInstanced)(GLenum mode, GLuint id, GLsizei primcount); /* 830 */
-   void (GLAPIENTRYP DrawTransformFeedbackStreamInstanced)(GLenum mode, GLuint id, GLuint stream, GLsizei primcount); /* 831 */
-   void (GLAPIENTRYP GetInternalformativ)(GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint * params); /* 832 */
-   void (GLAPIENTRYP GetActiveAtomicCounterBufferiv)(GLuint program, GLuint bufferIndex, GLenum pname, GLint * params); /* 833 */
-   void (GLAPIENTRYP BindImageTexture)(GLuint unit, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLenum format); /* 834 */
-   void (GLAPIENTRYP MemoryBarrier)(GLbitfield barriers); /* 835 */
-   void (GLAPIENTRYP TexStorage1D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width); /* 836 */
-   void (GLAPIENTRYP TexStorage2D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height); /* 837 */
-   void (GLAPIENTRYP TexStorage3D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth); /* 838 */
-   void (GLAPIENTRYP TextureStorage1DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width); /* 839 */
-   void (GLAPIENTRYP TextureStorage2DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height); /* 840 */
-   void (GLAPIENTRYP TextureStorage3DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth); /* 841 */
-   void (GLAPIENTRYP ClearBufferData)(GLenum target, GLenum internalformat, GLenum format, GLenum type, const GLvoid * data); /* 842 */
-   void (GLAPIENTRYP ClearBufferSubData)(GLenum target, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const GLvoid * data); /* 843 */
-   void (GLAPIENTRYP DispatchCompute)(GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z); /* 844 */
-   void (GLAPIENTRYP DispatchComputeIndirect)(GLintptr indirect); /* 845 */
-   void (GLAPIENTRYP TextureView)(GLuint texture, GLenum target, GLuint origtexture, GLenum internalformat, GLuint minlevel, GLuint numlevels, GLuint minlayer, GLuint numlayers); /* 846 */
-   void (GLAPIENTRYP BindVertexBuffer)(GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride); /* 847 */
-   void (GLAPIENTRYP VertexAttribBinding)(GLuint attribindex, GLuint bindingindex); /* 848 */
-   void (GLAPIENTRYP VertexAttribFormat)(GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset); /* 849 */
-   void (GLAPIENTRYP VertexAttribIFormat)(GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset); /* 850 */
-   void (GLAPIENTRYP VertexAttribLFormat)(GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset); /* 851 */
-   void (GLAPIENTRYP VertexBindingDivisor)(GLuint attribindex, GLuint divisor); /* 852 */
-   void (GLAPIENTRYP MultiDrawArraysIndirect)(GLenum mode, const GLvoid * indirect, GLsizei primcount, GLsizei stride); /* 853 */
-   void (GLAPIENTRYP MultiDrawElementsIndirect)(GLenum mode, GLenum type, const GLvoid * indirect, GLsizei primcount, GLsizei stride); /* 854 */
-   void (GLAPIENTRYP TexBufferRange)(GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size); /* 855 */
-   void (GLAPIENTRYP TexStorage2DMultisample)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations); /* 856 */
-   void (GLAPIENTRYP TexStorage3DMultisample)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations); /* 857 */
-   void (GLAPIENTRYP BufferStorage)(GLenum target, GLsizeiptr size, const GLvoid * data, GLbitfield flags); /* 858 */
-   void (GLAPIENTRYP InvalidateBufferData)(GLuint buffer); /* 859 */
-   void (GLAPIENTRYP InvalidateBufferSubData)(GLuint buffer, GLintptr offset, GLsizeiptr length); /* 860 */
-   void (GLAPIENTRYP InvalidateFramebuffer)(GLenum target, GLsizei numAttachments, const GLenum * attachments); /* 861 */
-   void (GLAPIENTRYP InvalidateSubFramebuffer)(GLenum target, GLsizei numAttachments, const GLenum * attachments, GLint x, GLint y, GLsizei width, GLsizei height); /* 862 */
-   void (GLAPIENTRYP InvalidateTexImage)(GLuint texture, GLint level); /* 863 */
-   void (GLAPIENTRYP InvalidateTexSubImage)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth); /* 864 */
-   void (GLAPIENTRYP PolygonOffsetEXT)(GLfloat factor, GLfloat bias); /* 865 */
-   void (GLAPIENTRYP DrawTexfOES)(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height); /* 866 */
-   void (GLAPIENTRYP DrawTexfvOES)(const GLfloat * coords); /* 867 */
-   void (GLAPIENTRYP DrawTexiOES)(GLint x, GLint y, GLint z, GLint width, GLint height); /* 868 */
-   void (GLAPIENTRYP DrawTexivOES)(const GLint * coords); /* 869 */
-   void (GLAPIENTRYP DrawTexsOES)(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height); /* 870 */
-   void (GLAPIENTRYP DrawTexsvOES)(const GLshort * coords); /* 871 */
-   void (GLAPIENTRYP DrawTexxOES)(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height); /* 872 */
-   void (GLAPIENTRYP DrawTexxvOES)(const GLfixed * coords); /* 873 */
-   void (GLAPIENTRYP PointSizePointerOES)(GLenum type, GLsizei stride, const GLvoid * pointer); /* 874 */
-   GLbitfield (GLAPIENTRYP QueryMatrixxOES)(GLfixed * mantissa, GLint * exponent); /* 875 */
-   void (GLAPIENTRYP SampleMaskSGIS)(GLclampf value, GLboolean invert); /* 876 */
-   void (GLAPIENTRYP SamplePatternSGIS)(GLenum pattern); /* 877 */
-   void (GLAPIENTRYP ColorPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 878 */
-   void (GLAPIENTRYP EdgeFlagPointerEXT)(GLsizei stride, GLsizei count, const GLboolean * pointer); /* 879 */
-   void (GLAPIENTRYP IndexPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 880 */
-   void (GLAPIENTRYP NormalPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 881 */
-   void (GLAPIENTRYP TexCoordPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 882 */
-   void (GLAPIENTRYP VertexPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 883 */
-   void (GLAPIENTRYP DiscardFramebufferEXT)(GLenum target, GLsizei numAttachments, const GLenum * attachments); /* 884 */
-   void (GLAPIENTRYP ActiveShaderProgram)(GLuint pipeline, GLuint program); /* 885 */
-   void (GLAPIENTRYP BindProgramPipeline)(GLuint pipeline); /* 886 */
-   GLuint (GLAPIENTRYP CreateShaderProgramv)(GLenum type, GLsizei count, const GLchar * const * strings); /* 887 */
-   void (GLAPIENTRYP DeleteProgramPipelines)(GLsizei n, const GLuint * pipelines); /* 888 */
-   void (GLAPIENTRYP GenProgramPipelines)(GLsizei n, GLuint * pipelines); /* 889 */
-   void (GLAPIENTRYP GetProgramPipelineInfoLog)(GLuint pipeline, GLsizei bufSize, GLsizei * length, GLchar * infoLog); /* 890 */
-   void (GLAPIENTRYP GetProgramPipelineiv)(GLuint pipeline, GLenum pname, GLint * params); /* 891 */
-   GLboolean (GLAPIENTRYP IsProgramPipeline)(GLuint pipeline); /* 892 */
-   void (GLAPIENTRYP LockArraysEXT)(GLint first, GLsizei count); /* 893 */
-   void (GLAPIENTRYP ProgramUniform1f)(GLuint program, GLint location, GLfloat x); /* 894 */
-   void (GLAPIENTRYP ProgramUniform1fv)(GLuint program, GLint location, GLsizei count, const GLfloat * value); /* 895 */
-   void (GLAPIENTRYP ProgramUniform1i)(GLuint program, GLint location, GLint x); /* 896 */
-   void (GLAPIENTRYP ProgramUniform1iv)(GLuint program, GLint location, GLsizei count, const GLint * value); /* 897 */
-   void (GLAPIENTRYP ProgramUniform1ui)(GLuint program, GLint location, GLuint x); /* 898 */
-   void (GLAPIENTRYP ProgramUniform1uiv)(GLuint program, GLint location, GLsizei count, const GLuint * value); /* 899 */
-   void (GLAPIENTRYP ProgramUniform2f)(GLuint program, GLint location, GLfloat x, GLfloat y); /* 900 */
-   void (GLAPIENTRYP ProgramUniform2fv)(GLuint program, GLint location, GLsizei count, const GLfloat * value); /* 901 */
-   void (GLAPIENTRYP ProgramUniform2i)(GLuint program, GLint location, GLint x, GLint y); /* 902 */
-   void (GLAPIENTRYP ProgramUniform2iv)(GLuint program, GLint location, GLsizei count, const GLint * value); /* 903 */
-   void (GLAPIENTRYP ProgramUniform2ui)(GLuint program, GLint location, GLuint x, GLuint y); /* 904 */
-   void (GLAPIENTRYP ProgramUniform2uiv)(GLuint program, GLint location, GLsizei count, const GLuint * value); /* 905 */
-   void (GLAPIENTRYP ProgramUniform3f)(GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z); /* 906 */
-   void (GLAPIENTRYP ProgramUniform3fv)(GLuint program, GLint location, GLsizei count, const GLfloat * value); /* 907 */
-   void (GLAPIENTRYP ProgramUniform3i)(GLuint program, GLint location, GLint x, GLint y, GLint z); /* 908 */
-   void (GLAPIENTRYP ProgramUniform3iv)(GLuint program, GLint location, GLsizei count, const GLint * value); /* 909 */
-   void (GLAPIENTRYP ProgramUniform3ui)(GLuint program, GLint location, GLuint x, GLuint y, GLuint z); /* 910 */
-   void (GLAPIENTRYP ProgramUniform3uiv)(GLuint program, GLint location, GLsizei count, const GLuint * value); /* 911 */
-   void (GLAPIENTRYP ProgramUniform4f)(GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 912 */
-   void (GLAPIENTRYP ProgramUniform4fv)(GLuint program, GLint location, GLsizei count, const GLfloat * value); /* 913 */
-   void (GLAPIENTRYP ProgramUniform4i)(GLuint program, GLint location, GLint x, GLint y, GLint z, GLint w); /* 914 */
-   void (GLAPIENTRYP ProgramUniform4iv)(GLuint program, GLint location, GLsizei count, const GLint * value); /* 915 */
-   void (GLAPIENTRYP ProgramUniform4ui)(GLuint program, GLint location, GLuint x, GLuint y, GLuint z, GLuint w); /* 916 */
-   void (GLAPIENTRYP ProgramUniform4uiv)(GLuint program, GLint location, GLsizei count, const GLuint * value); /* 917 */
-   void (GLAPIENTRYP ProgramUniformMatrix2fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 918 */
-   void (GLAPIENTRYP ProgramUniformMatrix2x3fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 919 */
-   void (GLAPIENTRYP ProgramUniformMatrix2x4fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 920 */
-   void (GLAPIENTRYP ProgramUniformMatrix3fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 921 */
-   void (GLAPIENTRYP ProgramUniformMatrix3x2fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 922 */
-   void (GLAPIENTRYP ProgramUniformMatrix3x4fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 923 */
-   void (GLAPIENTRYP ProgramUniformMatrix4fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 924 */
-   void (GLAPIENTRYP ProgramUniformMatrix4x2fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 925 */
-   void (GLAPIENTRYP ProgramUniformMatrix4x3fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 926 */
-   void (GLAPIENTRYP UnlockArraysEXT)(void); /* 927 */
-   void (GLAPIENTRYP UseProgramStages)(GLuint pipeline, GLbitfield stages, GLuint program); /* 928 */
-   void (GLAPIENTRYP ValidateProgramPipeline)(GLuint pipeline); /* 929 */
-   void (GLAPIENTRYP DebugMessageCallback)(GLDEBUGPROC callback, const GLvoid * userParam); /* 930 */
-   void (GLAPIENTRYP DebugMessageControl)(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint * ids, GLboolean enabled); /* 931 */
-   void (GLAPIENTRYP DebugMessageInsert)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar * buf); /* 932 */
-   GLuint (GLAPIENTRYP GetDebugMessageLog)(GLuint count, GLsizei bufsize, GLenum * sources, GLenum * types, GLuint * ids, GLenum * severities, GLsizei * lengths, GLchar * messageLog); /* 933 */
-   void (GLAPIENTRYP GetObjectLabel)(GLenum identifier, GLuint name, GLsizei bufSize, GLsizei * length, GLchar * label); /* 934 */
-   void (GLAPIENTRYP GetObjectPtrLabel)(const GLvoid * ptr, GLsizei bufSize, GLsizei * length, GLchar * label); /* 935 */
-   void (GLAPIENTRYP ObjectLabel)(GLenum identifier, GLuint name, GLsizei length, const GLchar * label); /* 936 */
-   void (GLAPIENTRYP ObjectPtrLabel)(const GLvoid * ptr, GLsizei length, const GLchar * label); /* 937 */
-   void (GLAPIENTRYP PopDebugGroup)(void); /* 938 */
-   void (GLAPIENTRYP PushDebugGroup)(GLenum source, GLuint id, GLsizei length, const GLchar * message); /* 939 */
-   void (GLAPIENTRYP SecondaryColor3fEXT)(GLfloat red, GLfloat green, GLfloat blue); /* 940 */
-   void (GLAPIENTRYP SecondaryColor3fvEXT)(const GLfloat * v); /* 941 */
-   void (GLAPIENTRYP MultiDrawElementsEXT)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount); /* 942 */
-   void (GLAPIENTRYP FogCoordfEXT)(GLfloat coord); /* 943 */
-   void (GLAPIENTRYP FogCoordfvEXT)(const GLfloat * coord); /* 944 */
-   void (GLAPIENTRYP ResizeBuffersMESA)(void); /* 945 */
-   void (GLAPIENTRYP WindowPos4dMESA)(GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 946 */
-   void (GLAPIENTRYP WindowPos4dvMESA)(const GLdouble * v); /* 947 */
-   void (GLAPIENTRYP WindowPos4fMESA)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 948 */
-   void (GLAPIENTRYP WindowPos4fvMESA)(const GLfloat * v); /* 949 */
-   void (GLAPIENTRYP WindowPos4iMESA)(GLint x, GLint y, GLint z, GLint w); /* 950 */
-   void (GLAPIENTRYP WindowPos4ivMESA)(const GLint * v); /* 951 */
-   void (GLAPIENTRYP WindowPos4sMESA)(GLshort x, GLshort y, GLshort z, GLshort w); /* 952 */
-   void (GLAPIENTRYP WindowPos4svMESA)(const GLshort * v); /* 953 */
-   void (GLAPIENTRYP MultiModeDrawArraysIBM)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride); /* 954 */
-   void (GLAPIENTRYP MultiModeDrawElementsIBM)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride); /* 955 */
-   GLboolean (GLAPIENTRYP AreProgramsResidentNV)(GLsizei n, const GLuint * ids, GLboolean * residences); /* 956 */
-   void (GLAPIENTRYP ExecuteProgramNV)(GLenum target, GLuint id, const GLfloat * params); /* 957 */
-   void (GLAPIENTRYP GetProgramParameterdvNV)(GLenum target, GLuint index, GLenum pname, GLdouble * params); /* 958 */
-   void (GLAPIENTRYP GetProgramParameterfvNV)(GLenum target, GLuint index, GLenum pname, GLfloat * params); /* 959 */
-   void (GLAPIENTRYP GetProgramStringNV)(GLuint id, GLenum pname, GLubyte * program); /* 960 */
-   void (GLAPIENTRYP GetProgramivNV)(GLuint id, GLenum pname, GLint * params); /* 961 */
-   void (GLAPIENTRYP GetTrackMatrixivNV)(GLenum target, GLuint address, GLenum pname, GLint * params); /* 962 */
-   void (GLAPIENTRYP GetVertexAttribdvNV)(GLuint index, GLenum pname, GLdouble * params); /* 963 */
-   void (GLAPIENTRYP GetVertexAttribfvNV)(GLuint index, GLenum pname, GLfloat * params); /* 964 */
-   void (GLAPIENTRYP GetVertexAttribivNV)(GLuint index, GLenum pname, GLint * params); /* 965 */
-   void (GLAPIENTRYP LoadProgramNV)(GLenum target, GLuint id, GLsizei len, const GLubyte * program); /* 966 */
-   void (GLAPIENTRYP ProgramParameters4dvNV)(GLenum target, GLuint index, GLsizei num, const GLdouble * params); /* 967 */
-   void (GLAPIENTRYP ProgramParameters4fvNV)(GLenum target, GLuint index, GLsizei num, const GLfloat * params); /* 968 */
-   void (GLAPIENTRYP RequestResidentProgramsNV)(GLsizei n, const GLuint * ids); /* 969 */
-   void (GLAPIENTRYP TrackMatrixNV)(GLenum target, GLuint address, GLenum matrix, GLenum transform); /* 970 */
-   void (GLAPIENTRYP VertexAttrib1dNV)(GLuint index, GLdouble x); /* 971 */
-   void (GLAPIENTRYP VertexAttrib1dvNV)(GLuint index, const GLdouble * v); /* 972 */
-   void (GLAPIENTRYP VertexAttrib1fNV)(GLuint index, GLfloat x); /* 973 */
-   void (GLAPIENTRYP VertexAttrib1fvNV)(GLuint index, const GLfloat * v); /* 974 */
-   void (GLAPIENTRYP VertexAttrib1sNV)(GLuint index, GLshort x); /* 975 */
-   void (GLAPIENTRYP VertexAttrib1svNV)(GLuint index, const GLshort * v); /* 976 */
-   void (GLAPIENTRYP VertexAttrib2dNV)(GLuint index, GLdouble x, GLdouble y); /* 977 */
-   void (GLAPIENTRYP VertexAttrib2dvNV)(GLuint index, const GLdouble * v); /* 978 */
-   void (GLAPIENTRYP VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y); /* 979 */
-   void (GLAPIENTRYP VertexAttrib2fvNV)(GLuint index, const GLfloat * v); /* 980 */
-   void (GLAPIENTRYP VertexAttrib2sNV)(GLuint index, GLshort x, GLshort y); /* 981 */
-   void (GLAPIENTRYP VertexAttrib2svNV)(GLuint index, const GLshort * v); /* 982 */
-   void (GLAPIENTRYP VertexAttrib3dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z); /* 983 */
-   void (GLAPIENTRYP VertexAttrib3dvNV)(GLuint index, const GLdouble * v); /* 984 */
-   void (GLAPIENTRYP VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z); /* 985 */
-   void (GLAPIENTRYP VertexAttrib3fvNV)(GLuint index, const GLfloat * v); /* 986 */
-   void (GLAPIENTRYP VertexAttrib3sNV)(GLuint index, GLshort x, GLshort y, GLshort z); /* 987 */
-   void (GLAPIENTRYP VertexAttrib3svNV)(GLuint index, const GLshort * v); /* 988 */
-   void (GLAPIENTRYP VertexAttrib4dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 989 */
-   void (GLAPIENTRYP VertexAttrib4dvNV)(GLuint index, const GLdouble * v); /* 990 */
-   void (GLAPIENTRYP VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 991 */
-   void (GLAPIENTRYP VertexAttrib4fvNV)(GLuint index, const GLfloat * v); /* 992 */
-   void (GLAPIENTRYP VertexAttrib4sNV)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); /* 993 */
-   void (GLAPIENTRYP VertexAttrib4svNV)(GLuint index, const GLshort * v); /* 994 */
-   void (GLAPIENTRYP VertexAttrib4ubNV)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); /* 995 */
-   void (GLAPIENTRYP VertexAttrib4ubvNV)(GLuint index, const GLubyte * v); /* 996 */
-   void (GLAPIENTRYP VertexAttribPointerNV)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 997 */
-   void (GLAPIENTRYP VertexAttribs1dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 998 */
-   void (GLAPIENTRYP VertexAttribs1fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 999 */
-   void (GLAPIENTRYP VertexAttribs1svNV)(GLuint index, GLsizei n, const GLshort * v); /* 1000 */
-   void (GLAPIENTRYP VertexAttribs2dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 1001 */
-   void (GLAPIENTRYP VertexAttribs2fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 1002 */
-   void (GLAPIENTRYP VertexAttribs2svNV)(GLuint index, GLsizei n, const GLshort * v); /* 1003 */
-   void (GLAPIENTRYP VertexAttribs3dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 1004 */
-   void (GLAPIENTRYP VertexAttribs3fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 1005 */
-   void (GLAPIENTRYP VertexAttribs3svNV)(GLuint index, GLsizei n, const GLshort * v); /* 1006 */
-   void (GLAPIENTRYP VertexAttribs4dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 1007 */
-   void (GLAPIENTRYP VertexAttribs4fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 1008 */
-   void (GLAPIENTRYP VertexAttribs4svNV)(GLuint index, GLsizei n, const GLshort * v); /* 1009 */
-   void (GLAPIENTRYP VertexAttribs4ubvNV)(GLuint index, GLsizei n, const GLubyte * v); /* 1010 */
-   void (GLAPIENTRYP GetTexBumpParameterfvATI)(GLenum pname, GLfloat * param); /* 1011 */
-   void (GLAPIENTRYP GetTexBumpParameterivATI)(GLenum pname, GLint * param); /* 1012 */
-   void (GLAPIENTRYP TexBumpParameterfvATI)(GLenum pname, const GLfloat * param); /* 1013 */
-   void (GLAPIENTRYP TexBumpParameterivATI)(GLenum pname, const GLint * param); /* 1014 */
-   void (GLAPIENTRYP AlphaFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 1015 */
-   void (GLAPIENTRYP AlphaFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 1016 */
-   void (GLAPIENTRYP AlphaFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 1017 */
-   void (GLAPIENTRYP BeginFragmentShaderATI)(void); /* 1018 */
-   void (GLAPIENTRYP BindFragmentShaderATI)(GLuint id); /* 1019 */
-   void (GLAPIENTRYP ColorFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 1020 */
-   void (GLAPIENTRYP ColorFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 1021 */
-   void (GLAPIENTRYP ColorFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 1022 */
-   void (GLAPIENTRYP DeleteFragmentShaderATI)(GLuint id); /* 1023 */
-   void (GLAPIENTRYP EndFragmentShaderATI)(void); /* 1024 */
-   GLuint (GLAPIENTRYP GenFragmentShadersATI)(GLuint range); /* 1025 */
-   void (GLAPIENTRYP PassTexCoordATI)(GLuint dst, GLuint coord, GLenum swizzle); /* 1026 */
-   void (GLAPIENTRYP SampleMapATI)(GLuint dst, GLuint interp, GLenum swizzle); /* 1027 */
-   void (GLAPIENTRYP SetFragmentShaderConstantATI)(GLuint dst, const GLfloat * value); /* 1028 */
-   void (GLAPIENTRYP ActiveStencilFaceEXT)(GLenum face); /* 1029 */
-   void (GLAPIENTRYP BindVertexArrayAPPLE)(GLuint array); /* 1030 */
-   void (GLAPIENTRYP GenVertexArraysAPPLE)(GLsizei n, GLuint * arrays); /* 1031 */
-   void (GLAPIENTRYP GetProgramNamedParameterdvNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble * params); /* 1032 */
-   void (GLAPIENTRYP GetProgramNamedParameterfvNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat * params); /* 1033 */
-   void (GLAPIENTRYP ProgramNamedParameter4dNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 1034 */
-   void (GLAPIENTRYP ProgramNamedParameter4dvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLdouble * v); /* 1035 */
-   void (GLAPIENTRYP ProgramNamedParameter4fNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 1036 */
-   void (GLAPIENTRYP ProgramNamedParameter4fvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLfloat * v); /* 1037 */
-   void (GLAPIENTRYP PrimitiveRestartNV)(void); /* 1038 */
-   void (GLAPIENTRYP GetTexGenxvOES)(GLenum coord, GLenum pname, GLfixed * params); /* 1039 */
-   void (GLAPIENTRYP TexGenxOES)(GLenum coord, GLenum pname, GLint param); /* 1040 */
-   void (GLAPIENTRYP TexGenxvOES)(GLenum coord, GLenum pname, const GLfixed * params); /* 1041 */
-   void (GLAPIENTRYP DepthBoundsEXT)(GLclampd zmin, GLclampd zmax); /* 1042 */
-   void (GLAPIENTRYP BindFramebufferEXT)(GLenum target, GLuint framebuffer); /* 1043 */
-   void (GLAPIENTRYP BindRenderbufferEXT)(GLenum target, GLuint renderbuffer); /* 1044 */
-   void (GLAPIENTRYP BufferParameteriAPPLE)(GLenum target, GLenum pname, GLint param); /* 1045 */
-   void (GLAPIENTRYP FlushMappedBufferRangeAPPLE)(GLenum target, GLintptr offset, GLsizeiptr size); /* 1046 */
-   void (GLAPIENTRYP VertexAttribI1iEXT)(GLuint index, GLint x); /* 1047 */
-   void (GLAPIENTRYP VertexAttribI1uiEXT)(GLuint index, GLuint x); /* 1048 */
-   void (GLAPIENTRYP VertexAttribI2iEXT)(GLuint index, GLint x, GLint y); /* 1049 */
-   void (GLAPIENTRYP VertexAttribI2ivEXT)(GLuint index, const GLint * v); /* 1050 */
-   void (GLAPIENTRYP VertexAttribI2uiEXT)(GLuint index, GLuint x, GLuint y); /* 1051 */
-   void (GLAPIENTRYP VertexAttribI2uivEXT)(GLuint index, const GLuint * v); /* 1052 */
-   void (GLAPIENTRYP VertexAttribI3iEXT)(GLuint index, GLint x, GLint y, GLint z); /* 1053 */
-   void (GLAPIENTRYP VertexAttribI3ivEXT)(GLuint index, const GLint * v); /* 1054 */
-   void (GLAPIENTRYP VertexAttribI3uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z); /* 1055 */
-   void (GLAPIENTRYP VertexAttribI3uivEXT)(GLuint index, const GLuint * v); /* 1056 */
-   void (GLAPIENTRYP VertexAttribI4iEXT)(GLuint index, GLint x, GLint y, GLint z, GLint w); /* 1057 */
-   void (GLAPIENTRYP VertexAttribI4ivEXT)(GLuint index, const GLint * v); /* 1058 */
-   void (GLAPIENTRYP VertexAttribI4uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); /* 1059 */
-   void (GLAPIENTRYP VertexAttribI4uivEXT)(GLuint index, const GLuint * v); /* 1060 */
-   void (GLAPIENTRYP ClearColorIiEXT)(GLint r, GLint g, GLint b, GLint a); /* 1061 */
-   void (GLAPIENTRYP ClearColorIuiEXT)(GLuint r, GLuint g, GLuint b, GLuint a); /* 1062 */
-   void (GLAPIENTRYP BindBufferOffsetEXT)(GLenum target, GLuint index, GLuint buffer, GLintptr offset); /* 1063 */
-   void (GLAPIENTRYP BeginPerfMonitorAMD)(GLuint monitor); /* 1064 */
-   void (GLAPIENTRYP DeletePerfMonitorsAMD)(GLsizei n, GLuint * monitors); /* 1065 */
-   void (GLAPIENTRYP EndPerfMonitorAMD)(GLuint monitor); /* 1066 */
-   void (GLAPIENTRYP GenPerfMonitorsAMD)(GLsizei n, GLuint * monitors); /* 1067 */
-   void (GLAPIENTRYP GetPerfMonitorCounterDataAMD)(GLuint monitor, GLenum pname, GLsizei dataSize, GLuint * data, GLint * bytesWritten); /* 1068 */
-   void (GLAPIENTRYP GetPerfMonitorCounterInfoAMD)(GLuint group, GLuint counter, GLenum pname, GLvoid * data); /* 1069 */
-   void (GLAPIENTRYP GetPerfMonitorCounterStringAMD)(GLuint group, GLuint counter, GLsizei bufSize, GLsizei * length, GLchar * counterString); /* 1070 */
-   void (GLAPIENTRYP GetPerfMonitorCountersAMD)(GLuint group, GLint * numCounters, GLint * maxActiveCounters, GLsizei countersSize, GLuint * counters); /* 1071 */
-   void (GLAPIENTRYP GetPerfMonitorGroupStringAMD)(GLuint group, GLsizei bufSize, GLsizei * length, GLchar * groupString); /* 1072 */
-   void (GLAPIENTRYP GetPerfMonitorGroupsAMD)(GLint * numGroups, GLsizei groupsSize, GLuint * groups); /* 1073 */
-   void (GLAPIENTRYP SelectPerfMonitorCountersAMD)(GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint * counterList); /* 1074 */
-   void (GLAPIENTRYP GetObjectParameterivAPPLE)(GLenum objectType, GLuint name, GLenum pname, GLint * value); /* 1075 */
-   GLenum (GLAPIENTRYP ObjectPurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 1076 */
-   GLenum (GLAPIENTRYP ObjectUnpurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 1077 */
-   void (GLAPIENTRYP ActiveProgramEXT)(GLuint program); /* 1078 */
-   GLuint (GLAPIENTRYP CreateShaderProgramEXT)(GLenum type, const GLchar * string); /* 1079 */
-   void (GLAPIENTRYP UseShaderProgramEXT)(GLenum type, GLuint program); /* 1080 */
-   void (GLAPIENTRYP TextureBarrierNV)(void); /* 1081 */
-   void (GLAPIENTRYP VDPAUFiniNV)(void); /* 1082 */
-   void (GLAPIENTRYP VDPAUGetSurfaceivNV)(GLintptr surface, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * values); /* 1083 */
-   void (GLAPIENTRYP VDPAUInitNV)(const GLvoid * vdpDevice, const GLvoid * getProcAddress); /* 1084 */
-   GLboolean (GLAPIENTRYP VDPAUIsSurfaceNV)(GLintptr surface); /* 1085 */
-   void (GLAPIENTRYP VDPAUMapSurfacesNV)(GLsizei numSurfaces, const GLintptr * surfaces); /* 1086 */
-   GLintptr (GLAPIENTRYP VDPAURegisterOutputSurfaceNV)(const GLvoid * vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint * textureNames); /* 1087 */
-   GLintptr (GLAPIENTRYP VDPAURegisterVideoSurfaceNV)(const GLvoid * vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint * textureNames); /* 1088 */
-   void (GLAPIENTRYP VDPAUSurfaceAccessNV)(GLintptr surface, GLenum access); /* 1089 */
-   void (GLAPIENTRYP VDPAUUnmapSurfacesNV)(GLsizei numSurfaces, const GLintptr * surfaces); /* 1090 */
-   void (GLAPIENTRYP VDPAUUnregisterSurfaceNV)(GLintptr surface); /* 1091 */
-   void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 1092 */
-   void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 1093 */
-   void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 1094 */
-   void (GLAPIENTRYP EGLImageTargetRenderbufferStorageOES)(GLenum target, GLvoid * writeOffset); /* 1095 */
-   void (GLAPIENTRYP EGLImageTargetTexture2DOES)(GLenum target, GLvoid * writeOffset); /* 1096 */
-   void (GLAPIENTRYP AlphaFuncx)(GLenum func, GLclampx ref); /* 1097 */
-   void (GLAPIENTRYP ClearColorx)(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha); /* 1098 */
-   void (GLAPIENTRYP ClearDepthx)(GLclampx depth); /* 1099 */
-   void (GLAPIENTRYP Color4x)(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha); /* 1100 */
-   void (GLAPIENTRYP DepthRangex)(GLclampx zNear, GLclampx zFar); /* 1101 */
-   void (GLAPIENTRYP Fogx)(GLenum pname, GLfixed param); /* 1102 */
-   void (GLAPIENTRYP Fogxv)(GLenum pname, const GLfixed * params); /* 1103 */
-   void (GLAPIENTRYP Frustumf)(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar); /* 1104 */
-   void (GLAPIENTRYP Frustumx)(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar); /* 1105 */
-   void (GLAPIENTRYP LightModelx)(GLenum pname, GLfixed param); /* 1106 */
-   void (GLAPIENTRYP LightModelxv)(GLenum pname, const GLfixed * params); /* 1107 */
-   void (GLAPIENTRYP Lightx)(GLenum light, GLenum pname, GLfixed param); /* 1108 */
-   void (GLAPIENTRYP Lightxv)(GLenum light, GLenum pname, const GLfixed * params); /* 1109 */
-   void (GLAPIENTRYP LineWidthx)(GLfixed width); /* 1110 */
-   void (GLAPIENTRYP LoadMatrixx)(const GLfixed * m); /* 1111 */
-   void (GLAPIENTRYP Materialx)(GLenum face, GLenum pname, GLfixed param); /* 1112 */
-   void (GLAPIENTRYP Materialxv)(GLenum face, GLenum pname, const GLfixed * params); /* 1113 */
-   void (GLAPIENTRYP MultMatrixx)(const GLfixed * m); /* 1114 */
-   void (GLAPIENTRYP MultiTexCoord4x)(GLenum target, GLfixed s, GLfixed t, GLfixed r, GLfixed q); /* 1115 */
-   void (GLAPIENTRYP Normal3x)(GLfixed nx, GLfixed ny, GLfixed nz); /* 1116 */
-   void (GLAPIENTRYP Orthof)(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar); /* 1117 */
-   void (GLAPIENTRYP Orthox)(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar); /* 1118 */
-   void (GLAPIENTRYP PointSizex)(GLfixed size); /* 1119 */
-   void (GLAPIENTRYP PolygonOffsetx)(GLfixed factor, GLfixed units); /* 1120 */
-   void (GLAPIENTRYP Rotatex)(GLfixed angle, GLfixed x, GLfixed y, GLfixed z); /* 1121 */
-   void (GLAPIENTRYP SampleCoveragex)(GLclampx value, GLboolean invert); /* 1122 */
-   void (GLAPIENTRYP Scalex)(GLfixed x, GLfixed y, GLfixed z); /* 1123 */
-   void (GLAPIENTRYP TexEnvx)(GLenum target, GLenum pname, GLfixed param); /* 1124 */
-   void (GLAPIENTRYP TexEnvxv)(GLenum target, GLenum pname, const GLfixed * params); /* 1125 */
-   void (GLAPIENTRYP TexParameterx)(GLenum target, GLenum pname, GLfixed param); /* 1126 */
-   void (GLAPIENTRYP Translatex)(GLfixed x, GLfixed y, GLfixed z); /* 1127 */
-   void (GLAPIENTRYP ClipPlanef)(GLenum plane, const GLfloat * equation); /* 1128 */
-   void (GLAPIENTRYP ClipPlanex)(GLenum plane, const GLfixed * equation); /* 1129 */
-   void (GLAPIENTRYP GetClipPlanef)(GLenum plane, GLfloat * equation); /* 1130 */
-   void (GLAPIENTRYP GetClipPlanex)(GLenum plane, GLfixed * equation); /* 1131 */
-   void (GLAPIENTRYP GetFixedv)(GLenum pname, GLfixed * params); /* 1132 */
-   void (GLAPIENTRYP GetLightxv)(GLenum light, GLenum pname, GLfixed * params); /* 1133 */
-   void (GLAPIENTRYP GetMaterialxv)(GLenum face, GLenum pname, GLfixed * params); /* 1134 */
-   void (GLAPIENTRYP GetTexEnvxv)(GLenum target, GLenum pname, GLfixed * params); /* 1135 */
-   void (GLAPIENTRYP GetTexParameterxv)(GLenum target, GLenum pname, GLfixed * params); /* 1136 */
-   void (GLAPIENTRYP PointParameterx)(GLenum pname, GLfixed param); /* 1137 */
-   void (GLAPIENTRYP PointParameterxv)(GLenum pname, const GLfixed * params); /* 1138 */
-   void (GLAPIENTRYP TexParameterxv)(GLenum target, GLenum pname, const GLfixed * params); /* 1139 */
+   GLenum (GLAPIENTRYP GetGraphicsResetStatusARB)(void); /* 803 */
+   void (GLAPIENTRYP GetnColorTableARB)(GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid * table); /* 804 */
+   void (GLAPIENTRYP GetnCompressedTexImageARB)(GLenum target, GLint lod, GLsizei bufSize, GLvoid * img); /* 805 */
+   void (GLAPIENTRYP GetnConvolutionFilterARB)(GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid * image); /* 806 */
+   void (GLAPIENTRYP GetnHistogramARB)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid * values); /* 807 */
+   void (GLAPIENTRYP GetnMapdvARB)(GLenum target, GLenum query, GLsizei bufSize, GLdouble * v); /* 808 */
+   void (GLAPIENTRYP GetnMapfvARB)(GLenum target, GLenum query, GLsizei bufSize, GLfloat * v); /* 809 */
+   void (GLAPIENTRYP GetnMapivARB)(GLenum target, GLenum query, GLsizei bufSize, GLint * v); /* 810 */
+   void (GLAPIENTRYP GetnMinmaxARB)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid * values); /* 811 */
+   void (GLAPIENTRYP GetnPixelMapfvARB)(GLenum map, GLsizei bufSize, GLfloat * values); /* 812 */
+   void (GLAPIENTRYP GetnPixelMapuivARB)(GLenum map, GLsizei bufSize, GLuint * values); /* 813 */
+   void (GLAPIENTRYP GetnPixelMapusvARB)(GLenum map, GLsizei bufSize, GLushort * values); /* 814 */
+   void (GLAPIENTRYP GetnPolygonStippleARB)(GLsizei bufSize, GLubyte * pattern); /* 815 */
+   void (GLAPIENTRYP GetnSeparableFilterARB)(GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, GLvoid * row, GLsizei columnBufSize, GLvoid * column, GLvoid * span); /* 816 */
+   void (GLAPIENTRYP GetnTexImageARB)(GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, GLvoid * img); /* 817 */
+   void (GLAPIENTRYP GetnUniformdvARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLdouble * params); /* 818 */
+   void (GLAPIENTRYP GetnUniformfvARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLfloat * params); /* 819 */
+   void (GLAPIENTRYP GetnUniformivARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLint * params); /* 820 */
+   void (GLAPIENTRYP GetnUniformuivARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLuint * params); /* 821 */
+   void (GLAPIENTRYP ReadnPixelsARB)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, GLvoid * data); /* 822 */
+   void (GLAPIENTRYP DrawArraysInstancedBaseInstance)(GLenum mode, GLint first, GLsizei count, GLsizei primcount, GLuint baseinstance); /* 823 */
+   void (GLAPIENTRYP DrawElementsInstancedBaseInstance)(GLenum mode, GLsizei count, GLenum type, const GLvoid * indices, GLsizei primcount, GLuint baseinstance); /* 824 */
+   void (GLAPIENTRYP DrawElementsInstancedBaseVertexBaseInstance)(GLenum mode, GLsizei count, GLenum type, const GLvoid * indices, GLsizei primcount, GLint basevertex, GLuint baseinstance); /* 825 */
+   void (GLAPIENTRYP DrawTransformFeedbackInstanced)(GLenum mode, GLuint id, GLsizei primcount); /* 826 */
+   void (GLAPIENTRYP DrawTransformFeedbackStreamInstanced)(GLenum mode, GLuint id, GLuint stream, GLsizei primcount); /* 827 */
+   void (GLAPIENTRYP GetInternalformativ)(GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint * params); /* 828 */
+   void (GLAPIENTRYP GetActiveAtomicCounterBufferiv)(GLuint program, GLuint bufferIndex, GLenum pname, GLint * params); /* 829 */
+   void (GLAPIENTRYP BindImageTexture)(GLuint unit, GLuint texture, GLint level, GLboolean layered, GLint layer, GLenum access, GLenum format); /* 830 */
+   void (GLAPIENTRYP MemoryBarrier)(GLbitfield barriers); /* 831 */
+   void (GLAPIENTRYP TexStorage1D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width); /* 832 */
+   void (GLAPIENTRYP TexStorage2D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height); /* 833 */
+   void (GLAPIENTRYP TexStorage3D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth); /* 834 */
+   void (GLAPIENTRYP TextureStorage1DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width); /* 835 */
+   void (GLAPIENTRYP TextureStorage2DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height); /* 836 */
+   void (GLAPIENTRYP TextureStorage3DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth); /* 837 */
+   void (GLAPIENTRYP ClearBufferData)(GLenum target, GLenum internalformat, GLenum format, GLenum type, const GLvoid * data); /* 838 */
+   void (GLAPIENTRYP ClearBufferSubData)(GLenum target, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const GLvoid * data); /* 839 */
+   void (GLAPIENTRYP DispatchCompute)(GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z); /* 840 */
+   void (GLAPIENTRYP DispatchComputeIndirect)(GLintptr indirect); /* 841 */
+   void (GLAPIENTRYP TextureView)(GLuint texture, GLenum target, GLuint origtexture, GLenum internalformat, GLuint minlevel, GLuint numlevels, GLuint minlayer, GLuint numlayers); /* 842 */
+   void (GLAPIENTRYP BindVertexBuffer)(GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride); /* 843 */
+   void (GLAPIENTRYP VertexAttribBinding)(GLuint attribindex, GLuint bindingindex); /* 844 */
+   void (GLAPIENTRYP VertexAttribFormat)(GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset); /* 845 */
+   void (GLAPIENTRYP VertexAttribIFormat)(GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset); /* 846 */
+   void (GLAPIENTRYP VertexAttribLFormat)(GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset); /* 847 */
+   void (GLAPIENTRYP VertexBindingDivisor)(GLuint attribindex, GLuint divisor); /* 848 */
+   void (GLAPIENTRYP MultiDrawArraysIndirect)(GLenum mode, const GLvoid * indirect, GLsizei primcount, GLsizei stride); /* 849 */
+   void (GLAPIENTRYP MultiDrawElementsIndirect)(GLenum mode, GLenum type, const GLvoid * indirect, GLsizei primcount, GLsizei stride); /* 850 */
+   void (GLAPIENTRYP TexBufferRange)(GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size); /* 851 */
+   void (GLAPIENTRYP TexStorage2DMultisample)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations); /* 852 */
+   void (GLAPIENTRYP TexStorage3DMultisample)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations); /* 853 */
+   void (GLAPIENTRYP BufferStorage)(GLenum target, GLsizeiptr size, const GLvoid * data, GLbitfield flags); /* 854 */
+   void (GLAPIENTRYP InvalidateBufferData)(GLuint buffer); /* 855 */
+   void (GLAPIENTRYP InvalidateBufferSubData)(GLuint buffer, GLintptr offset, GLsizeiptr length); /* 856 */
+   void (GLAPIENTRYP InvalidateFramebuffer)(GLenum target, GLsizei numAttachments, const GLenum * attachments); /* 857 */
+   void (GLAPIENTRYP InvalidateSubFramebuffer)(GLenum target, GLsizei numAttachments, const GLenum * attachments, GLint x, GLint y, GLsizei width, GLsizei height); /* 858 */
+   void (GLAPIENTRYP InvalidateTexImage)(GLuint texture, GLint level); /* 859 */
+   void (GLAPIENTRYP InvalidateTexSubImage)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth); /* 860 */
+   void (GLAPIENTRYP PolygonOffsetEXT)(GLfloat factor, GLfloat bias); /* 861 */
+   void (GLAPIENTRYP DrawTexfOES)(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height); /* 862 */
+   void (GLAPIENTRYP DrawTexfvOES)(const GLfloat * coords); /* 863 */
+   void (GLAPIENTRYP DrawTexiOES)(GLint x, GLint y, GLint z, GLint width, GLint height); /* 864 */
+   void (GLAPIENTRYP DrawTexivOES)(const GLint * coords); /* 865 */
+   void (GLAPIENTRYP DrawTexsOES)(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height); /* 866 */
+   void (GLAPIENTRYP DrawTexsvOES)(const GLshort * coords); /* 867 */
+   void (GLAPIENTRYP DrawTexxOES)(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height); /* 868 */
+   void (GLAPIENTRYP DrawTexxvOES)(const GLfixed * coords); /* 869 */
+   void (GLAPIENTRYP PointSizePointerOES)(GLenum type, GLsizei stride, const GLvoid * pointer); /* 870 */
+   GLbitfield (GLAPIENTRYP QueryMatrixxOES)(GLfixed * mantissa, GLint * exponent); /* 871 */
+   void (GLAPIENTRYP SampleMaskSGIS)(GLclampf value, GLboolean invert); /* 872 */
+   void (GLAPIENTRYP SamplePatternSGIS)(GLenum pattern); /* 873 */
+   void (GLAPIENTRYP ColorPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 874 */
+   void (GLAPIENTRYP EdgeFlagPointerEXT)(GLsizei stride, GLsizei count, const GLboolean * pointer); /* 875 */
+   void (GLAPIENTRYP IndexPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 876 */
+   void (GLAPIENTRYP NormalPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 877 */
+   void (GLAPIENTRYP TexCoordPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 878 */
+   void (GLAPIENTRYP VertexPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 879 */
+   void (GLAPIENTRYP DiscardFramebufferEXT)(GLenum target, GLsizei numAttachments, const GLenum * attachments); /* 880 */
+   void (GLAPIENTRYP ActiveShaderProgram)(GLuint pipeline, GLuint program); /* 881 */
+   void (GLAPIENTRYP BindProgramPipeline)(GLuint pipeline); /* 882 */
+   GLuint (GLAPIENTRYP CreateShaderProgramv)(GLenum type, GLsizei count, const GLchar * const * strings); /* 883 */
+   void (GLAPIENTRYP DeleteProgramPipelines)(GLsizei n, const GLuint * pipelines); /* 884 */
+   void (GLAPIENTRYP GenProgramPipelines)(GLsizei n, GLuint * pipelines); /* 885 */
+   void (GLAPIENTRYP GetProgramPipelineInfoLog)(GLuint pipeline, GLsizei bufSize, GLsizei * length, GLchar * infoLog); /* 886 */
+   void (GLAPIENTRYP GetProgramPipelineiv)(GLuint pipeline, GLenum pname, GLint * params); /* 887 */
+   GLboolean (GLAPIENTRYP IsProgramPipeline)(GLuint pipeline); /* 888 */
+   void (GLAPIENTRYP LockArraysEXT)(GLint first, GLsizei count); /* 889 */
+   void (GLAPIENTRYP ProgramUniform1f)(GLuint program, GLint location, GLfloat x); /* 890 */
+   void (GLAPIENTRYP ProgramUniform1fv)(GLuint program, GLint location, GLsizei count, const GLfloat * value); /* 891 */
+   void (GLAPIENTRYP ProgramUniform1i)(GLuint program, GLint location, GLint x); /* 892 */
+   void (GLAPIENTRYP ProgramUniform1iv)(GLuint program, GLint location, GLsizei count, const GLint * value); /* 893 */
+   void (GLAPIENTRYP ProgramUniform1ui)(GLuint program, GLint location, GLuint x); /* 894 */
+   void (GLAPIENTRYP ProgramUniform1uiv)(GLuint program, GLint location, GLsizei count, const GLuint * value); /* 895 */
+   void (GLAPIENTRYP ProgramUniform2f)(GLuint program, GLint location, GLfloat x, GLfloat y); /* 896 */
+   void (GLAPIENTRYP ProgramUniform2fv)(GLuint program, GLint location, GLsizei count, const GLfloat * value); /* 897 */
+   void (GLAPIENTRYP ProgramUniform2i)(GLuint program, GLint location, GLint x, GLint y); /* 898 */
+   void (GLAPIENTRYP ProgramUniform2iv)(GLuint program, GLint location, GLsizei count, const GLint * value); /* 899 */
+   void (GLAPIENTRYP ProgramUniform2ui)(GLuint program, GLint location, GLuint x, GLuint y); /* 900 */
+   void (GLAPIENTRYP ProgramUniform2uiv)(GLuint program, GLint location, GLsizei count, const GLuint * value); /* 901 */
+   void (GLAPIENTRYP ProgramUniform3f)(GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z); /* 902 */
+   void (GLAPIENTRYP ProgramUniform3fv)(GLuint program, GLint location, GLsizei count, const GLfloat * value); /* 903 */
+   void (GLAPIENTRYP ProgramUniform3i)(GLuint program, GLint location, GLint x, GLint y, GLint z); /* 904 */
+   void (GLAPIENTRYP ProgramUniform3iv)(GLuint program, GLint location, GLsizei count, const GLint * value); /* 905 */
+   void (GLAPIENTRYP ProgramUniform3ui)(GLuint program, GLint location, GLuint x, GLuint y, GLuint z); /* 906 */
+   void (GLAPIENTRYP ProgramUniform3uiv)(GLuint program, GLint location, GLsizei count, const GLuint * value); /* 907 */
+   void (GLAPIENTRYP ProgramUniform4f)(GLuint program, GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 908 */
+   void (GLAPIENTRYP ProgramUniform4fv)(GLuint program, GLint location, GLsizei count, const GLfloat * value); /* 909 */
+   void (GLAPIENTRYP ProgramUniform4i)(GLuint program, GLint location, GLint x, GLint y, GLint z, GLint w); /* 910 */
+   void (GLAPIENTRYP ProgramUniform4iv)(GLuint program, GLint location, GLsizei count, const GLint * value); /* 911 */
+   void (GLAPIENTRYP ProgramUniform4ui)(GLuint program, GLint location, GLuint x, GLuint y, GLuint z, GLuint w); /* 912 */
+   void (GLAPIENTRYP ProgramUniform4uiv)(GLuint program, GLint location, GLsizei count, const GLuint * value); /* 913 */
+   void (GLAPIENTRYP ProgramUniformMatrix2fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 914 */
+   void (GLAPIENTRYP ProgramUniformMatrix2x3fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 915 */
+   void (GLAPIENTRYP ProgramUniformMatrix2x4fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 916 */
+   void (GLAPIENTRYP ProgramUniformMatrix3fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 917 */
+   void (GLAPIENTRYP ProgramUniformMatrix3x2fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 918 */
+   void (GLAPIENTRYP ProgramUniformMatrix3x4fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 919 */
+   void (GLAPIENTRYP ProgramUniformMatrix4fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 920 */
+   void (GLAPIENTRYP ProgramUniformMatrix4x2fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 921 */
+   void (GLAPIENTRYP ProgramUniformMatrix4x3fv)(GLuint program, GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 922 */
+   void (GLAPIENTRYP UnlockArraysEXT)(void); /* 923 */
+   void (GLAPIENTRYP UseProgramStages)(GLuint pipeline, GLbitfield stages, GLuint program); /* 924 */
+   void (GLAPIENTRYP ValidateProgramPipeline)(GLuint pipeline); /* 925 */
+   void (GLAPIENTRYP DebugMessageCallback)(GLDEBUGPROC callback, const GLvoid * userParam); /* 926 */
+   void (GLAPIENTRYP DebugMessageControl)(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint * ids, GLboolean enabled); /* 927 */
+   void (GLAPIENTRYP DebugMessageInsert)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar * buf); /* 928 */
+   GLuint (GLAPIENTRYP GetDebugMessageLog)(GLuint count, GLsizei bufsize, GLenum * sources, GLenum * types, GLuint * ids, GLenum * severities, GLsizei * lengths, GLchar * messageLog); /* 929 */
+   void (GLAPIENTRYP GetObjectLabel)(GLenum identifier, GLuint name, GLsizei bufSize, GLsizei * length, GLchar * label); /* 930 */
+   void (GLAPIENTRYP GetObjectPtrLabel)(const GLvoid * ptr, GLsizei bufSize, GLsizei * length, GLchar * label); /* 931 */
+   void (GLAPIENTRYP ObjectLabel)(GLenum identifier, GLuint name, GLsizei length, const GLchar * label); /* 932 */
+   void (GLAPIENTRYP ObjectPtrLabel)(const GLvoid * ptr, GLsizei length, const GLchar * label); /* 933 */
+   void (GLAPIENTRYP PopDebugGroup)(void); /* 934 */
+   void (GLAPIENTRYP PushDebugGroup)(GLenum source, GLuint id, GLsizei length, const GLchar * message); /* 935 */
+   void (GLAPIENTRYP SecondaryColor3fEXT)(GLfloat red, GLfloat green, GLfloat blue); /* 936 */
+   void (GLAPIENTRYP SecondaryColor3fvEXT)(const GLfloat * v); /* 937 */
+   void (GLAPIENTRYP MultiDrawElementsEXT)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount); /* 938 */
+   void (GLAPIENTRYP FogCoordfEXT)(GLfloat coord); /* 939 */
+   void (GLAPIENTRYP FogCoordfvEXT)(const GLfloat * coord); /* 940 */
+   void (GLAPIENTRYP ResizeBuffersMESA)(void); /* 941 */
+   void (GLAPIENTRYP WindowPos4dMESA)(GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 942 */
+   void (GLAPIENTRYP WindowPos4dvMESA)(const GLdouble * v); /* 943 */
+   void (GLAPIENTRYP WindowPos4fMESA)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 944 */
+   void (GLAPIENTRYP WindowPos4fvMESA)(const GLfloat * v); /* 945 */
+   void (GLAPIENTRYP WindowPos4iMESA)(GLint x, GLint y, GLint z, GLint w); /* 946 */
+   void (GLAPIENTRYP WindowPos4ivMESA)(const GLint * v); /* 947 */
+   void (GLAPIENTRYP WindowPos4sMESA)(GLshort x, GLshort y, GLshort z, GLshort w); /* 948 */
+   void (GLAPIENTRYP WindowPos4svMESA)(const GLshort * v); /* 949 */
+   void (GLAPIENTRYP MultiModeDrawArraysIBM)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride); /* 950 */
+   void (GLAPIENTRYP MultiModeDrawElementsIBM)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride); /* 951 */
+   GLboolean (GLAPIENTRYP AreProgramsResidentNV)(GLsizei n, const GLuint * ids, GLboolean * residences); /* 952 */
+   void (GLAPIENTRYP ExecuteProgramNV)(GLenum target, GLuint id, const GLfloat * params); /* 953 */
+   void (GLAPIENTRYP GetProgramParameterdvNV)(GLenum target, GLuint index, GLenum pname, GLdouble * params); /* 954 */
+   void (GLAPIENTRYP GetProgramParameterfvNV)(GLenum target, GLuint index, GLenum pname, GLfloat * params); /* 955 */
+   void (GLAPIENTRYP GetProgramStringNV)(GLuint id, GLenum pname, GLubyte * program); /* 956 */
+   void (GLAPIENTRYP GetProgramivNV)(GLuint id, GLenum pname, GLint * params); /* 957 */
+   void (GLAPIENTRYP GetTrackMatrixivNV)(GLenum target, GLuint address, GLenum pname, GLint * params); /* 958 */
+   void (GLAPIENTRYP GetVertexAttribdvNV)(GLuint index, GLenum pname, GLdouble * params); /* 959 */
+   void (GLAPIENTRYP GetVertexAttribfvNV)(GLuint index, GLenum pname, GLfloat * params); /* 960 */
+   void (GLAPIENTRYP GetVertexAttribivNV)(GLuint index, GLenum pname, GLint * params); /* 961 */
+   void (GLAPIENTRYP LoadProgramNV)(GLenum target, GLuint id, GLsizei len, const GLubyte * program); /* 962 */
+   void (GLAPIENTRYP ProgramParameters4dvNV)(GLenum target, GLuint index, GLsizei num, const GLdouble * params); /* 963 */
+   void (GLAPIENTRYP ProgramParameters4fvNV)(GLenum target, GLuint index, GLsizei num, const GLfloat * params); /* 964 */
+   void (GLAPIENTRYP RequestResidentProgramsNV)(GLsizei n, const GLuint * ids); /* 965 */
+   void (GLAPIENTRYP TrackMatrixNV)(GLenum target, GLuint address, GLenum matrix, GLenum transform); /* 966 */
+   void (GLAPIENTRYP VertexAttrib1dNV)(GLuint index, GLdouble x); /* 967 */
+   void (GLAPIENTRYP VertexAttrib1dvNV)(GLuint index, const GLdouble * v); /* 968 */
+   void (GLAPIENTRYP VertexAttrib1fNV)(GLuint index, GLfloat x); /* 969 */
+   void (GLAPIENTRYP VertexAttrib1fvNV)(GLuint index, const GLfloat * v); /* 970 */
+   void (GLAPIENTRYP VertexAttrib1sNV)(GLuint index, GLshort x); /* 971 */
+   void (GLAPIENTRYP VertexAttrib1svNV)(GLuint index, const GLshort * v); /* 972 */
+   void (GLAPIENTRYP VertexAttrib2dNV)(GLuint index, GLdouble x, GLdouble y); /* 973 */
+   void (GLAPIENTRYP VertexAttrib2dvNV)(GLuint index, const GLdouble * v); /* 974 */
+   void (GLAPIENTRYP VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y); /* 975 */
+   void (GLAPIENTRYP VertexAttrib2fvNV)(GLuint index, const GLfloat * v); /* 976 */
+   void (GLAPIENTRYP VertexAttrib2sNV)(GLuint index, GLshort x, GLshort y); /* 977 */
+   void (GLAPIENTRYP VertexAttrib2svNV)(GLuint index, const GLshort * v); /* 978 */
+   void (GLAPIENTRYP VertexAttrib3dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z); /* 979 */
+   void (GLAPIENTRYP VertexAttrib3dvNV)(GLuint index, const GLdouble * v); /* 980 */
+   void (GLAPIENTRYP VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z); /* 981 */
+   void (GLAPIENTRYP VertexAttrib3fvNV)(GLuint index, const GLfloat * v); /* 982 */
+   void (GLAPIENTRYP VertexAttrib3sNV)(GLuint index, GLshort x, GLshort y, GLshort z); /* 983 */
+   void (GLAPIENTRYP VertexAttrib3svNV)(GLuint index, const GLshort * v); /* 984 */
+   void (GLAPIENTRYP VertexAttrib4dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 985 */
+   void (GLAPIENTRYP VertexAttrib4dvNV)(GLuint index, const GLdouble * v); /* 986 */
+   void (GLAPIENTRYP VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 987 */
+   void (GLAPIENTRYP VertexAttrib4fvNV)(GLuint index, const GLfloat * v); /* 988 */
+   void (GLAPIENTRYP VertexAttrib4sNV)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); /* 989 */
+   void (GLAPIENTRYP VertexAttrib4svNV)(GLuint index, const GLshort * v); /* 990 */
+   void (GLAPIENTRYP VertexAttrib4ubNV)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); /* 991 */
+   void (GLAPIENTRYP VertexAttrib4ubvNV)(GLuint index, const GLubyte * v); /* 992 */
+   void (GLAPIENTRYP VertexAttribPointerNV)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 993 */
+   void (GLAPIENTRYP VertexAttribs1dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 994 */
+   void (GLAPIENTRYP VertexAttribs1fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 995 */
+   void (GLAPIENTRYP VertexAttribs1svNV)(GLuint index, GLsizei n, const GLshort * v); /* 996 */
+   void (GLAPIENTRYP VertexAttribs2dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 997 */
+   void (GLAPIENTRYP VertexAttribs2fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 998 */
+   void (GLAPIENTRYP VertexAttribs2svNV)(GLuint index, GLsizei n, const GLshort * v); /* 999 */
+   void (GLAPIENTRYP VertexAttribs3dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 1000 */
+   void (GLAPIENTRYP VertexAttribs3fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 1001 */
+   void (GLAPIENTRYP VertexAttribs3svNV)(GLuint index, GLsizei n, const GLshort * v); /* 1002 */
+   void (GLAPIENTRYP VertexAttribs4dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 1003 */
+   void (GLAPIENTRYP VertexAttribs4fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 1004 */
+   void (GLAPIENTRYP VertexAttribs4svNV)(GLuint index, GLsizei n, const GLshort * v); /* 1005 */
+   void (GLAPIENTRYP VertexAttribs4ubvNV)(GLuint index, GLsizei n, const GLubyte * v); /* 1006 */
+   void (GLAPIENTRYP GetTexBumpParameterfvATI)(GLenum pname, GLfloat * param); /* 1007 */
+   void (GLAPIENTRYP GetTexBumpParameterivATI)(GLenum pname, GLint * param); /* 1008 */
+   void (GLAPIENTRYP TexBumpParameterfvATI)(GLenum pname, const GLfloat * param); /* 1009 */
+   void (GLAPIENTRYP TexBumpParameterivATI)(GLenum pname, const GLint * param); /* 1010 */
+   void (GLAPIENTRYP AlphaFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 1011 */
+   void (GLAPIENTRYP AlphaFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 1012 */
+   void (GLAPIENTRYP AlphaFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 1013 */
+   void (GLAPIENTRYP BeginFragmentShaderATI)(void); /* 1014 */
+   void (GLAPIENTRYP BindFragmentShaderATI)(GLuint id); /* 1015 */
+   void (GLAPIENTRYP ColorFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 1016 */
+   void (GLAPIENTRYP ColorFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 1017 */
+   void (GLAPIENTRYP ColorFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); /* 1018 */
+   void (GLAPIENTRYP DeleteFragmentShaderATI)(GLuint id); /* 1019 */
+   void (GLAPIENTRYP EndFragmentShaderATI)(void); /* 1020 */
+   GLuint (GLAPIENTRYP GenFragmentShadersATI)(GLuint range); /* 1021 */
+   void (GLAPIENTRYP PassTexCoordATI)(GLuint dst, GLuint coord, GLenum swizzle); /* 1022 */
+   void (GLAPIENTRYP SampleMapATI)(GLuint dst, GLuint interp, GLenum swizzle); /* 1023 */
+   void (GLAPIENTRYP SetFragmentShaderConstantATI)(GLuint dst, const GLfloat * value); /* 1024 */
+   void (GLAPIENTRYP ActiveStencilFaceEXT)(GLenum face); /* 1025 */
+   void (GLAPIENTRYP BindVertexArrayAPPLE)(GLuint array); /* 1026 */
+   void (GLAPIENTRYP GenVertexArraysAPPLE)(GLsizei n, GLuint * arrays); /* 1027 */
+   void (GLAPIENTRYP GetProgramNamedParameterdvNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble * params); /* 1028 */
+   void (GLAPIENTRYP GetProgramNamedParameterfvNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat * params); /* 1029 */
+   void (GLAPIENTRYP ProgramNamedParameter4dNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 1030 */
+   void (GLAPIENTRYP ProgramNamedParameter4dvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLdouble * v); /* 1031 */
+   void (GLAPIENTRYP ProgramNamedParameter4fNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 1032 */
+   void (GLAPIENTRYP ProgramNamedParameter4fvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLfloat * v); /* 1033 */
+   void (GLAPIENTRYP PrimitiveRestartNV)(void); /* 1034 */
+   void (GLAPIENTRYP GetTexGenxvOES)(GLenum coord, GLenum pname, GLfixed * params); /* 1035 */
+   void (GLAPIENTRYP TexGenxOES)(GLenum coord, GLenum pname, GLint param); /* 1036 */
+   void (GLAPIENTRYP TexGenxvOES)(GLenum coord, GLenum pname, const GLfixed * params); /* 1037 */
+   void (GLAPIENTRYP DepthBoundsEXT)(GLclampd zmin, GLclampd zmax); /* 1038 */
+   void (GLAPIENTRYP BindFramebufferEXT)(GLenum target, GLuint framebuffer); /* 1039 */
+   void (GLAPIENTRYP BindRenderbufferEXT)(GLenum target, GLuint renderbuffer); /* 1040 */
+   void (GLAPIENTRYP BufferParameteriAPPLE)(GLenum target, GLenum pname, GLint param); /* 1041 */
+   void (GLAPIENTRYP FlushMappedBufferRangeAPPLE)(GLenum target, GLintptr offset, GLsizeiptr size); /* 1042 */
+   void (GLAPIENTRYP VertexAttribI1iEXT)(GLuint index, GLint x); /* 1043 */
+   void (GLAPIENTRYP VertexAttribI1uiEXT)(GLuint index, GLuint x); /* 1044 */
+   void (GLAPIENTRYP VertexAttribI2iEXT)(GLuint index, GLint x, GLint y); /* 1045 */
+   void (GLAPIENTRYP VertexAttribI2ivEXT)(GLuint index, const GLint * v); /* 1046 */
+   void (GLAPIENTRYP VertexAttribI2uiEXT)(GLuint index, GLuint x, GLuint y); /* 1047 */
+   void (GLAPIENTRYP VertexAttribI2uivEXT)(GLuint index, const GLuint * v); /* 1048 */
+   void (GLAPIENTRYP VertexAttribI3iEXT)(GLuint index, GLint x, GLint y, GLint z); /* 1049 */
+   void (GLAPIENTRYP VertexAttribI3ivEXT)(GLuint index, const GLint * v); /* 1050 */
+   void (GLAPIENTRYP VertexAttribI3uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z); /* 1051 */
+   void (GLAPIENTRYP VertexAttribI3uivEXT)(GLuint index, const GLuint * v); /* 1052 */
+   void (GLAPIENTRYP VertexAttribI4iEXT)(GLuint index, GLint x, GLint y, GLint z, GLint w); /* 1053 */
+   void (GLAPIENTRYP VertexAttribI4ivEXT)(GLuint index, const GLint * v); /* 1054 */
+   void (GLAPIENTRYP VertexAttribI4uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); /* 1055 */
+   void (GLAPIENTRYP VertexAttribI4uivEXT)(GLuint index, const GLuint * v); /* 1056 */
+   void (GLAPIENTRYP ClearColorIiEXT)(GLint r, GLint g, GLint b, GLint a); /* 1057 */
+   void (GLAPIENTRYP ClearColorIuiEXT)(GLuint r, GLuint g, GLuint b, GLuint a); /* 1058 */
+   void (GLAPIENTRYP BindBufferOffsetEXT)(GLenum target, GLuint index, GLuint buffer, GLintptr offset); /* 1059 */
+   void (GLAPIENTRYP BeginPerfMonitorAMD)(GLuint monitor); /* 1060 */
+   void (GLAPIENTRYP DeletePerfMonitorsAMD)(GLsizei n, GLuint * monitors); /* 1061 */
+   void (GLAPIENTRYP EndPerfMonitorAMD)(GLuint monitor); /* 1062 */
+   void (GLAPIENTRYP GenPerfMonitorsAMD)(GLsizei n, GLuint * monitors); /* 1063 */
+   void (GLAPIENTRYP GetPerfMonitorCounterDataAMD)(GLuint monitor, GLenum pname, GLsizei dataSize, GLuint * data, GLint * bytesWritten); /* 1064 */
+   void (GLAPIENTRYP GetPerfMonitorCounterInfoAMD)(GLuint group, GLuint counter, GLenum pname, GLvoid * data); /* 1065 */
+   void (GLAPIENTRYP GetPerfMonitorCounterStringAMD)(GLuint group, GLuint counter, GLsizei bufSize, GLsizei * length, GLchar * counterString); /* 1066 */
+   void (GLAPIENTRYP GetPerfMonitorCountersAMD)(GLuint group, GLint * numCounters, GLint * maxActiveCounters, GLsizei countersSize, GLuint * counters); /* 1067 */
+   void (GLAPIENTRYP GetPerfMonitorGroupStringAMD)(GLuint group, GLsizei bufSize, GLsizei * length, GLchar * groupString); /* 1068 */
+   void (GLAPIENTRYP GetPerfMonitorGroupsAMD)(GLint * numGroups, GLsizei groupsSize, GLuint * groups); /* 1069 */
+   void (GLAPIENTRYP SelectPerfMonitorCountersAMD)(GLuint monitor, GLboolean enable, GLuint group, GLint numCounters, GLuint * counterList); /* 1070 */
+   void (GLAPIENTRYP GetObjectParameterivAPPLE)(GLenum objectType, GLuint name, GLenum pname, GLint * value); /* 1071 */
+   GLenum (GLAPIENTRYP ObjectPurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 1072 */
+   GLenum (GLAPIENTRYP ObjectUnpurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 1073 */
+   void (GLAPIENTRYP ActiveProgramEXT)(GLuint program); /* 1074 */
+   GLuint (GLAPIENTRYP CreateShaderProgramEXT)(GLenum type, const GLchar * string); /* 1075 */
+   void (GLAPIENTRYP UseShaderProgramEXT)(GLenum type, GLuint program); /* 1076 */
+   void (GLAPIENTRYP TextureBarrierNV)(void); /* 1077 */
+   void (GLAPIENTRYP VDPAUFiniNV)(void); /* 1078 */
+   void (GLAPIENTRYP VDPAUGetSurfaceivNV)(GLintptr surface, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * values); /* 1079 */
+   void (GLAPIENTRYP VDPAUInitNV)(const GLvoid * vdpDevice, const GLvoid * getProcAddress); /* 1080 */
+   GLboolean (GLAPIENTRYP VDPAUIsSurfaceNV)(GLintptr surface); /* 1081 */
+   void (GLAPIENTRYP VDPAUMapSurfacesNV)(GLsizei numSurfaces, const GLintptr * surfaces); /* 1082 */
+   GLintptr (GLAPIENTRYP VDPAURegisterOutputSurfaceNV)(const GLvoid * vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint * textureNames); /* 1083 */
+   GLintptr (GLAPIENTRYP VDPAURegisterVideoSurfaceNV)(const GLvoid * vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint * textureNames); /* 1084 */
+   void (GLAPIENTRYP VDPAUSurfaceAccessNV)(GLintptr surface, GLenum access); /* 1085 */
+   void (GLAPIENTRYP VDPAUUnmapSurfacesNV)(GLsizei numSurfaces, const GLintptr * surfaces); /* 1086 */
+   void (GLAPIENTRYP VDPAUUnregisterSurfaceNV)(GLintptr surface); /* 1087 */
+   void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 1088 */
+   void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 1089 */
+   void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 1090 */
+   void (GLAPIENTRYP EGLImageTargetRenderbufferStorageOES)(GLenum target, GLvoid * writeOffset); /* 1091 */
+   void (GLAPIENTRYP EGLImageTargetTexture2DOES)(GLenum target, GLvoid * writeOffset); /* 1092 */
+   void (GLAPIENTRYP AlphaFuncx)(GLenum func, GLclampx ref); /* 1093 */
+   void (GLAPIENTRYP ClearColorx)(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha); /* 1094 */
+   void (GLAPIENTRYP ClearDepthx)(GLclampx depth); /* 1095 */
+   void (GLAPIENTRYP Color4x)(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha); /* 1096 */
+   void (GLAPIENTRYP DepthRangex)(GLclampx zNear, GLclampx zFar); /* 1097 */
+   void (GLAPIENTRYP Fogx)(GLenum pname, GLfixed param); /* 1098 */
+   void (GLAPIENTRYP Fogxv)(GLenum pname, const GLfixed * params); /* 1099 */
+   void (GLAPIENTRYP Frustumf)(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar); /* 1100 */
+   void (GLAPIENTRYP Frustumx)(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar); /* 1101 */
+   void (GLAPIENTRYP LightModelx)(GLenum pname, GLfixed param); /* 1102 */
+   void (GLAPIENTRYP LightModelxv)(GLenum pname, const GLfixed * params); /* 1103 */
+   void (GLAPIENTRYP Lightx)(GLenum light, GLenum pname, GLfixed param); /* 1104 */
+   void (GLAPIENTRYP Lightxv)(GLenum light, GLenum pname, const GLfixed * params); /* 1105 */
+   void (GLAPIENTRYP LineWidthx)(GLfixed width); /* 1106 */
+   void (GLAPIENTRYP LoadMatrixx)(const GLfixed * m); /* 1107 */
+   void (GLAPIENTRYP Materialx)(GLenum face, GLenum pname, GLfixed param); /* 1108 */
+   void (GLAPIENTRYP Materialxv)(GLenum face, GLenum pname, const GLfixed * params); /* 1109 */
+   void (GLAPIENTRYP MultMatrixx)(const GLfixed * m); /* 1110 */
+   void (GLAPIENTRYP MultiTexCoord4x)(GLenum target, GLfixed s, GLfixed t, GLfixed r, GLfixed q); /* 1111 */
+   void (GLAPIENTRYP Normal3x)(GLfixed nx, GLfixed ny, GLfixed nz); /* 1112 */
+   void (GLAPIENTRYP Orthof)(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar); /* 1113 */
+   void (GLAPIENTRYP Orthox)(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar); /* 1114 */
+   void (GLAPIENTRYP PointSizex)(GLfixed size); /* 1115 */
+   void (GLAPIENTRYP PolygonOffsetx)(GLfixed factor, GLfixed units); /* 1116 */
+   void (GLAPIENTRYP Rotatex)(GLfixed angle, GLfixed x, GLfixed y, GLfixed z); /* 1117 */
+   void (GLAPIENTRYP SampleCoveragex)(GLclampx value, GLboolean invert); /* 1118 */
+   void (GLAPIENTRYP Scalex)(GLfixed x, GLfixed y, GLfixed z); /* 1119 */
+   void (GLAPIENTRYP TexEnvx)(GLenum target, GLenum pname, GLfixed param); /* 1120 */
+   void (GLAPIENTRYP TexEnvxv)(GLenum target, GLenum pname, const GLfixed * params); /* 1121 */
+   void (GLAPIENTRYP TexParameterx)(GLenum target, GLenum pname, GLfixed param); /* 1122 */
+   void (GLAPIENTRYP Translatex)(GLfixed x, GLfixed y, GLfixed z); /* 1123 */
+   void (GLAPIENTRYP ClipPlanef)(GLenum plane, const GLfloat * equation); /* 1124 */
+   void (GLAPIENTRYP ClipPlanex)(GLenum plane, const GLfixed * equation); /* 1125 */
+   void (GLAPIENTRYP GetClipPlanef)(GLenum plane, GLfloat * equation); /* 1126 */
+   void (GLAPIENTRYP GetClipPlanex)(GLenum plane, GLfixed * equation); /* 1127 */
+   void (GLAPIENTRYP GetFixedv)(GLenum pname, GLfixed * params); /* 1128 */
+   void (GLAPIENTRYP GetLightxv)(GLenum light, GLenum pname, GLfixed * params); /* 1129 */
+   void (GLAPIENTRYP GetMaterialxv)(GLenum face, GLenum pname, GLfixed * params); /* 1130 */
+   void (GLAPIENTRYP GetTexEnvxv)(GLenum target, GLenum pname, GLfixed * params); /* 1131 */
+   void (GLAPIENTRYP GetTexParameterxv)(GLenum target, GLenum pname, GLfixed * params); /* 1132 */
+   void (GLAPIENTRYP PointParameterx)(GLenum pname, GLfixed param); /* 1133 */
+   void (GLAPIENTRYP PointParameterxv)(GLenum pname, const GLfixed * params); /* 1134 */
+   void (GLAPIENTRYP TexParameterxv)(GLenum target, GLenum pname, const GLfixed * params); /* 1135 */
 #endif /* !defined HAVE_SHARED_GLAPI */
 };
 
diff --git a/xorg-server/glx/glfunctions.h b/xorg-server/glx/glfunctions.h
index 6634f827a..5fb989e47 100644
--- a/xorg-server/glx/glfunctions.h
+++ b/xorg-server/glx/glfunctions.h
@@ -837,10 +837,6 @@
 #define glViewportArrayv(a1, a2, a3) CALL_ViewportArrayv(GET_DISPATCH(), (a1, a2, a3))
 #define glViewportIndexedf(a1, a2, a3, a4, a5) CALL_ViewportIndexedf(GET_DISPATCH(), (a1, a2, a3, a4, a5))
 #define glViewportIndexedfv(a1, a2) CALL_ViewportIndexedfv(GET_DISPATCH(), (a1, a2))
-#define glDebugMessageCallbackARB(a1, a2) CALL_DebugMessageCallbackARB(GET_DISPATCH(), (a1, a2))
-#define glDebugMessageControlARB(a1, a2, a3, a4, a5, a6) CALL_DebugMessageControlARB(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6))
-#define glDebugMessageInsertARB(a1, a2, a3, a4, a5, a6) CALL_DebugMessageInsertARB(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6))
-#define glGetDebugMessageLogARB(a1, a2, a3, a4, a5, a6, a7, a8) CALL_GetDebugMessageLogARB(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8))
 #define glGetGraphicsResetStatusARB() CALL_GetGraphicsResetStatusARB(GET_DISPATCH(), ())
 #define glGetnColorTableARB(a1, a2, a3, a4, a5) CALL_GetnColorTableARB(GET_DISPATCH(), (a1, a2, a3, a4, a5))
 #define glGetnCompressedTexImageARB(a1, a2, a3, a4) CALL_GetnCompressedTexImageARB(GET_DISPATCH(), (a1, a2, a3, a4))
diff --git a/xorg-server/glx/glprocs.h b/xorg-server/glx/glprocs.h
index d96269bab..860b29a26 100644
--- a/xorg-server/glx/glprocs.h
+++ b/xorg-server/glx/glprocs.h
@@ -855,10 +855,6 @@ static const char gl_string_table[] =
     "glViewportArrayv\0"
     "glViewportIndexedf\0"
     "glViewportIndexedfv\0"
-    "glDebugMessageCallbackARB\0"
-    "glDebugMessageControlARB\0"
-    "glDebugMessageInsertARB\0"
-    "glGetDebugMessageLogARB\0"
     "glGetGraphicsResetStatusARB\0"
     "glGetnColorTableARB\0"
     "glGetnCompressedTexImageARB\0"
@@ -1588,6 +1584,10 @@ static const char gl_string_table[] =
     "glProgramParameteriARB\0"
     "glSampleMaskEXT\0"
     "glSamplePatternEXT\0"
+    "glDebugMessageCallbackARB\0"
+    "glDebugMessageControlARB\0"
+    "glDebugMessageInsertARB\0"
+    "glGetDebugMessageLogARB\0"
     "glSecondaryColor3f\0"
     "glSecondaryColor3fv\0"
     "glMultiDrawElements\0"
@@ -1670,7 +1670,11 @@ static const char gl_string_table[] =
 #define gl_dispatch_stub_731 mgl_dispatch_stub_731
 #define gl_dispatch_stub_732 mgl_dispatch_stub_732
 #define gl_dispatch_stub_733 mgl_dispatch_stub_733
-#define gl_dispatch_stub_832 mgl_dispatch_stub_832
+#define gl_dispatch_stub_828 mgl_dispatch_stub_828
+#define gl_dispatch_stub_862 mgl_dispatch_stub_862
+#define gl_dispatch_stub_863 mgl_dispatch_stub_863
+#define gl_dispatch_stub_864 mgl_dispatch_stub_864
+#define gl_dispatch_stub_865 mgl_dispatch_stub_865
 #define gl_dispatch_stub_866 mgl_dispatch_stub_866
 #define gl_dispatch_stub_867 mgl_dispatch_stub_867
 #define gl_dispatch_stub_868 mgl_dispatch_stub_868
@@ -1679,25 +1683,25 @@ static const char gl_string_table[] =
 #define gl_dispatch_stub_871 mgl_dispatch_stub_871
 #define gl_dispatch_stub_872 mgl_dispatch_stub_872
 #define gl_dispatch_stub_873 mgl_dispatch_stub_873
-#define gl_dispatch_stub_874 mgl_dispatch_stub_874
-#define gl_dispatch_stub_875 mgl_dispatch_stub_875
-#define gl_dispatch_stub_876 mgl_dispatch_stub_876
-#define gl_dispatch_stub_877 mgl_dispatch_stub_877
-#define gl_dispatch_stub_884 mgl_dispatch_stub_884
-#define gl_dispatch_stub_954 mgl_dispatch_stub_954
-#define gl_dispatch_stub_955 mgl_dispatch_stub_955
-#define gl_dispatch_stub_1029 mgl_dispatch_stub_1029
-#define gl_dispatch_stub_1030 mgl_dispatch_stub_1030
-#define gl_dispatch_stub_1031 mgl_dispatch_stub_1031
-#define gl_dispatch_stub_1039 mgl_dispatch_stub_1039
-#define gl_dispatch_stub_1040 mgl_dispatch_stub_1040
+#define gl_dispatch_stub_880 mgl_dispatch_stub_880
+#define gl_dispatch_stub_950 mgl_dispatch_stub_950
+#define gl_dispatch_stub_951 mgl_dispatch_stub_951
+#define gl_dispatch_stub_1025 mgl_dispatch_stub_1025
+#define gl_dispatch_stub_1026 mgl_dispatch_stub_1026
+#define gl_dispatch_stub_1027 mgl_dispatch_stub_1027
+#define gl_dispatch_stub_1035 mgl_dispatch_stub_1035
+#define gl_dispatch_stub_1036 mgl_dispatch_stub_1036
+#define gl_dispatch_stub_1037 mgl_dispatch_stub_1037
+#define gl_dispatch_stub_1038 mgl_dispatch_stub_1038
 #define gl_dispatch_stub_1041 mgl_dispatch_stub_1041
 #define gl_dispatch_stub_1042 mgl_dispatch_stub_1042
-#define gl_dispatch_stub_1045 mgl_dispatch_stub_1045
-#define gl_dispatch_stub_1046 mgl_dispatch_stub_1046
-#define gl_dispatch_stub_1092 mgl_dispatch_stub_1092
+#define gl_dispatch_stub_1088 mgl_dispatch_stub_1088
+#define gl_dispatch_stub_1089 mgl_dispatch_stub_1089
+#define gl_dispatch_stub_1090 mgl_dispatch_stub_1090
 #define gl_dispatch_stub_1093 mgl_dispatch_stub_1093
 #define gl_dispatch_stub_1094 mgl_dispatch_stub_1094
+#define gl_dispatch_stub_1095 mgl_dispatch_stub_1095
+#define gl_dispatch_stub_1096 mgl_dispatch_stub_1096
 #define gl_dispatch_stub_1097 mgl_dispatch_stub_1097
 #define gl_dispatch_stub_1098 mgl_dispatch_stub_1098
 #define gl_dispatch_stub_1099 mgl_dispatch_stub_1099
@@ -1737,10 +1741,6 @@ static const char gl_string_table[] =
 #define gl_dispatch_stub_1133 mgl_dispatch_stub_1133
 #define gl_dispatch_stub_1134 mgl_dispatch_stub_1134
 #define gl_dispatch_stub_1135 mgl_dispatch_stub_1135
-#define gl_dispatch_stub_1136 mgl_dispatch_stub_1136
-#define gl_dispatch_stub_1137 mgl_dispatch_stub_1137
-#define gl_dispatch_stub_1138 mgl_dispatch_stub_1138
-#define gl_dispatch_stub_1139 mgl_dispatch_stub_1139
 #endif /* USE_MGL_NAMESPACE */
 
 
@@ -1761,77 +1761,77 @@ void GLAPIENTRY gl_dispatch_stub_366(GLenum target, GLenum pname, GLint * params
 void GLAPIENTRY gl_dispatch_stub_731(GLuint id, GLenum pname, GLint64 * params);
 void GLAPIENTRY gl_dispatch_stub_732(GLuint id, GLenum pname, GLuint64 * params);
 void GLAPIENTRY gl_dispatch_stub_733(GLuint id, GLenum target);
-void GLAPIENTRY gl_dispatch_stub_832(GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint * params);
-void GLAPIENTRY gl_dispatch_stub_866(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height);
-void GLAPIENTRY gl_dispatch_stub_867(const GLfloat * coords);
-void GLAPIENTRY gl_dispatch_stub_868(GLint x, GLint y, GLint z, GLint width, GLint height);
-void GLAPIENTRY gl_dispatch_stub_869(const GLint * coords);
-void GLAPIENTRY gl_dispatch_stub_870(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height);
-void GLAPIENTRY gl_dispatch_stub_871(const GLshort * coords);
-void GLAPIENTRY gl_dispatch_stub_872(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height);
-void GLAPIENTRY gl_dispatch_stub_873(const GLfixed * coords);
-void GLAPIENTRY gl_dispatch_stub_874(GLenum type, GLsizei stride, const GLvoid * pointer);
-GLbitfield GLAPIENTRY gl_dispatch_stub_875(GLfixed * mantissa, GLint * exponent);
-void GLAPIENTRY gl_dispatch_stub_876(GLclampf value, GLboolean invert);
-void GLAPIENTRY gl_dispatch_stub_877(GLenum pattern);
-void GLAPIENTRY gl_dispatch_stub_884(GLenum target, GLsizei numAttachments, const GLenum * attachments);
-void GLAPIENTRY gl_dispatch_stub_954(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
-void GLAPIENTRY gl_dispatch_stub_955(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
-void GLAPIENTRY gl_dispatch_stub_1029(GLenum face);
-void GLAPIENTRY gl_dispatch_stub_1030(GLuint array);
-void GLAPIENTRY gl_dispatch_stub_1031(GLsizei n, GLuint * arrays);
-void GLAPIENTRY gl_dispatch_stub_1039(GLenum coord, GLenum pname, GLfixed * params);
-void GLAPIENTRY gl_dispatch_stub_1040(GLenum coord, GLenum pname, GLint param);
-void GLAPIENTRY gl_dispatch_stub_1041(GLenum coord, GLenum pname, const GLfixed * params);
-void GLAPIENTRY gl_dispatch_stub_1042(GLclampd zmin, GLclampd zmax);
-void GLAPIENTRY gl_dispatch_stub_1045(GLenum target, GLenum pname, GLint param);
-void GLAPIENTRY gl_dispatch_stub_1046(GLenum target, GLintptr offset, GLsizeiptr size);
-void GLAPIENTRY gl_dispatch_stub_1092(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-void GLAPIENTRY gl_dispatch_stub_1093(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_1094(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_1097(GLenum func, GLclampx ref);
-void GLAPIENTRY gl_dispatch_stub_1098(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha);
-void GLAPIENTRY gl_dispatch_stub_1099(GLclampx depth);
-void GLAPIENTRY gl_dispatch_stub_1100(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
-void GLAPIENTRY gl_dispatch_stub_1101(GLclampx zNear, GLclampx zFar);
+void GLAPIENTRY gl_dispatch_stub_828(GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint * params);
+void GLAPIENTRY gl_dispatch_stub_862(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height);
+void GLAPIENTRY gl_dispatch_stub_863(const GLfloat * coords);
+void GLAPIENTRY gl_dispatch_stub_864(GLint x, GLint y, GLint z, GLint width, GLint height);
+void GLAPIENTRY gl_dispatch_stub_865(const GLint * coords);
+void GLAPIENTRY gl_dispatch_stub_866(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height);
+void GLAPIENTRY gl_dispatch_stub_867(const GLshort * coords);
+void GLAPIENTRY gl_dispatch_stub_868(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height);
+void GLAPIENTRY gl_dispatch_stub_869(const GLfixed * coords);
+void GLAPIENTRY gl_dispatch_stub_870(GLenum type, GLsizei stride, const GLvoid * pointer);
+GLbitfield GLAPIENTRY gl_dispatch_stub_871(GLfixed * mantissa, GLint * exponent);
+void GLAPIENTRY gl_dispatch_stub_872(GLclampf value, GLboolean invert);
+void GLAPIENTRY gl_dispatch_stub_873(GLenum pattern);
+void GLAPIENTRY gl_dispatch_stub_880(GLenum target, GLsizei numAttachments, const GLenum * attachments);
+void GLAPIENTRY gl_dispatch_stub_950(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
+void GLAPIENTRY gl_dispatch_stub_951(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
+void GLAPIENTRY gl_dispatch_stub_1025(GLenum face);
+void GLAPIENTRY gl_dispatch_stub_1026(GLuint array);
+void GLAPIENTRY gl_dispatch_stub_1027(GLsizei n, GLuint * arrays);
+void GLAPIENTRY gl_dispatch_stub_1035(GLenum coord, GLenum pname, GLfixed * params);
+void GLAPIENTRY gl_dispatch_stub_1036(GLenum coord, GLenum pname, GLint param);
+void GLAPIENTRY gl_dispatch_stub_1037(GLenum coord, GLenum pname, const GLfixed * params);
+void GLAPIENTRY gl_dispatch_stub_1038(GLclampd zmin, GLclampd zmax);
+void GLAPIENTRY gl_dispatch_stub_1041(GLenum target, GLenum pname, GLint param);
+void GLAPIENTRY gl_dispatch_stub_1042(GLenum target, GLintptr offset, GLsizeiptr size);
+void GLAPIENTRY gl_dispatch_stub_1088(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+void GLAPIENTRY gl_dispatch_stub_1089(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_1090(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_1093(GLenum func, GLclampx ref);
+void GLAPIENTRY gl_dispatch_stub_1094(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha);
+void GLAPIENTRY gl_dispatch_stub_1095(GLclampx depth);
+void GLAPIENTRY gl_dispatch_stub_1096(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
+void GLAPIENTRY gl_dispatch_stub_1097(GLclampx zNear, GLclampx zFar);
+void GLAPIENTRY gl_dispatch_stub_1098(GLenum pname, GLfixed param);
+void GLAPIENTRY gl_dispatch_stub_1099(GLenum pname, const GLfixed * params);
+void GLAPIENTRY gl_dispatch_stub_1100(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar);
+void GLAPIENTRY gl_dispatch_stub_1101(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar);
 void GLAPIENTRY gl_dispatch_stub_1102(GLenum pname, GLfixed param);
 void GLAPIENTRY gl_dispatch_stub_1103(GLenum pname, const GLfixed * params);
-void GLAPIENTRY gl_dispatch_stub_1104(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar);
-void GLAPIENTRY gl_dispatch_stub_1105(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar);
-void GLAPIENTRY gl_dispatch_stub_1106(GLenum pname, GLfixed param);
-void GLAPIENTRY gl_dispatch_stub_1107(GLenum pname, const GLfixed * params);
-void GLAPIENTRY gl_dispatch_stub_1108(GLenum light, GLenum pname, GLfixed param);
-void GLAPIENTRY gl_dispatch_stub_1109(GLenum light, GLenum pname, const GLfixed * params);
-void GLAPIENTRY gl_dispatch_stub_1110(GLfixed width);
-void GLAPIENTRY gl_dispatch_stub_1111(const GLfixed * m);
-void GLAPIENTRY gl_dispatch_stub_1112(GLenum face, GLenum pname, GLfixed param);
-void GLAPIENTRY gl_dispatch_stub_1113(GLenum face, GLenum pname, const GLfixed * params);
-void GLAPIENTRY gl_dispatch_stub_1114(const GLfixed * m);
-void GLAPIENTRY gl_dispatch_stub_1115(GLenum target, GLfixed s, GLfixed t, GLfixed r, GLfixed q);
-void GLAPIENTRY gl_dispatch_stub_1116(GLfixed nx, GLfixed ny, GLfixed nz);
-void GLAPIENTRY gl_dispatch_stub_1117(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar);
-void GLAPIENTRY gl_dispatch_stub_1118(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar);
-void GLAPIENTRY gl_dispatch_stub_1119(GLfixed size);
-void GLAPIENTRY gl_dispatch_stub_1120(GLfixed factor, GLfixed units);
-void GLAPIENTRY gl_dispatch_stub_1121(GLfixed angle, GLfixed x, GLfixed y, GLfixed z);
-void GLAPIENTRY gl_dispatch_stub_1122(GLclampx value, GLboolean invert);
+void GLAPIENTRY gl_dispatch_stub_1104(GLenum light, GLenum pname, GLfixed param);
+void GLAPIENTRY gl_dispatch_stub_1105(GLenum light, GLenum pname, const GLfixed * params);
+void GLAPIENTRY gl_dispatch_stub_1106(GLfixed width);
+void GLAPIENTRY gl_dispatch_stub_1107(const GLfixed * m);
+void GLAPIENTRY gl_dispatch_stub_1108(GLenum face, GLenum pname, GLfixed param);
+void GLAPIENTRY gl_dispatch_stub_1109(GLenum face, GLenum pname, const GLfixed * params);
+void GLAPIENTRY gl_dispatch_stub_1110(const GLfixed * m);
+void GLAPIENTRY gl_dispatch_stub_1111(GLenum target, GLfixed s, GLfixed t, GLfixed r, GLfixed q);
+void GLAPIENTRY gl_dispatch_stub_1112(GLfixed nx, GLfixed ny, GLfixed nz);
+void GLAPIENTRY gl_dispatch_stub_1113(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar);
+void GLAPIENTRY gl_dispatch_stub_1114(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar);
+void GLAPIENTRY gl_dispatch_stub_1115(GLfixed size);
+void GLAPIENTRY gl_dispatch_stub_1116(GLfixed factor, GLfixed units);
+void GLAPIENTRY gl_dispatch_stub_1117(GLfixed angle, GLfixed x, GLfixed y, GLfixed z);
+void GLAPIENTRY gl_dispatch_stub_1118(GLclampx value, GLboolean invert);
+void GLAPIENTRY gl_dispatch_stub_1119(GLfixed x, GLfixed y, GLfixed z);
+void GLAPIENTRY gl_dispatch_stub_1120(GLenum target, GLenum pname, GLfixed param);
+void GLAPIENTRY gl_dispatch_stub_1121(GLenum target, GLenum pname, const GLfixed * params);
+void GLAPIENTRY gl_dispatch_stub_1122(GLenum target, GLenum pname, GLfixed param);
 void GLAPIENTRY gl_dispatch_stub_1123(GLfixed x, GLfixed y, GLfixed z);
-void GLAPIENTRY gl_dispatch_stub_1124(GLenum target, GLenum pname, GLfixed param);
-void GLAPIENTRY gl_dispatch_stub_1125(GLenum target, GLenum pname, const GLfixed * params);
-void GLAPIENTRY gl_dispatch_stub_1126(GLenum target, GLenum pname, GLfixed param);
-void GLAPIENTRY gl_dispatch_stub_1127(GLfixed x, GLfixed y, GLfixed z);
-void GLAPIENTRY gl_dispatch_stub_1128(GLenum plane, const GLfloat * equation);
-void GLAPIENTRY gl_dispatch_stub_1129(GLenum plane, const GLfixed * equation);
-void GLAPIENTRY gl_dispatch_stub_1130(GLenum plane, GLfloat * equation);
-void GLAPIENTRY gl_dispatch_stub_1131(GLenum plane, GLfixed * equation);
-void GLAPIENTRY gl_dispatch_stub_1132(GLenum pname, GLfixed * params);
-void GLAPIENTRY gl_dispatch_stub_1133(GLenum light, GLenum pname, GLfixed * params);
-void GLAPIENTRY gl_dispatch_stub_1134(GLenum face, GLenum pname, GLfixed * params);
-void GLAPIENTRY gl_dispatch_stub_1135(GLenum target, GLenum pname, GLfixed * params);
-void GLAPIENTRY gl_dispatch_stub_1136(GLenum target, GLenum pname, GLfixed * params);
-void GLAPIENTRY gl_dispatch_stub_1137(GLenum pname, GLfixed param);
-void GLAPIENTRY gl_dispatch_stub_1138(GLenum pname, const GLfixed * params);
-void GLAPIENTRY gl_dispatch_stub_1139(GLenum target, GLenum pname, const GLfixed * params);
+void GLAPIENTRY gl_dispatch_stub_1124(GLenum plane, const GLfloat * equation);
+void GLAPIENTRY gl_dispatch_stub_1125(GLenum plane, const GLfixed * equation);
+void GLAPIENTRY gl_dispatch_stub_1126(GLenum plane, GLfloat * equation);
+void GLAPIENTRY gl_dispatch_stub_1127(GLenum plane, GLfixed * equation);
+void GLAPIENTRY gl_dispatch_stub_1128(GLenum pname, GLfixed * params);
+void GLAPIENTRY gl_dispatch_stub_1129(GLenum light, GLenum pname, GLfixed * params);
+void GLAPIENTRY gl_dispatch_stub_1130(GLenum face, GLenum pname, GLfixed * params);
+void GLAPIENTRY gl_dispatch_stub_1131(GLenum target, GLenum pname, GLfixed * params);
+void GLAPIENTRY gl_dispatch_stub_1132(GLenum target, GLenum pname, GLfixed * params);
+void GLAPIENTRY gl_dispatch_stub_1133(GLenum pname, GLfixed param);
+void GLAPIENTRY gl_dispatch_stub_1134(GLenum pname, const GLfixed * params);
+void GLAPIENTRY gl_dispatch_stub_1135(GLenum target, GLenum pname, const GLfixed * params);
 #endif /* defined(NEED_FUNCTION_POINTER) || defined(GLX_INDIRECT_RENDERING) */
 
 static const glprocs_table_t static_functions[] = {
@@ -2638,801 +2638,801 @@ static const glprocs_table_t static_functions[] = {
     NAME_FUNC_OFFSET(13149, glViewportArrayv, glViewportArrayv, NULL, 800),
     NAME_FUNC_OFFSET(13166, glViewportIndexedf, glViewportIndexedf, NULL, 801),
     NAME_FUNC_OFFSET(13185, glViewportIndexedfv, glViewportIndexedfv, NULL, 802),
-    NAME_FUNC_OFFSET(13205, glDebugMessageCallbackARB, glDebugMessageCallbackARB, NULL, 803),
-    NAME_FUNC_OFFSET(13231, glDebugMessageControlARB, glDebugMessageControlARB, NULL, 804),
-    NAME_FUNC_OFFSET(13256, glDebugMessageInsertARB, glDebugMessageInsertARB, NULL, 805),
-    NAME_FUNC_OFFSET(13280, glGetDebugMessageLogARB, glGetDebugMessageLogARB, NULL, 806),
-    NAME_FUNC_OFFSET(13304, glGetGraphicsResetStatusARB, glGetGraphicsResetStatusARB, NULL, 807),
-    NAME_FUNC_OFFSET(13332, glGetnColorTableARB, glGetnColorTableARB, NULL, 808),
-    NAME_FUNC_OFFSET(13352, glGetnCompressedTexImageARB, glGetnCompressedTexImageARB, NULL, 809),
-    NAME_FUNC_OFFSET(13380, glGetnConvolutionFilterARB, glGetnConvolutionFilterARB, NULL, 810),
-    NAME_FUNC_OFFSET(13407, glGetnHistogramARB, glGetnHistogramARB, NULL, 811),
-    NAME_FUNC_OFFSET(13426, glGetnMapdvARB, glGetnMapdvARB, NULL, 812),
-    NAME_FUNC_OFFSET(13441, glGetnMapfvARB, glGetnMapfvARB, NULL, 813),
-    NAME_FUNC_OFFSET(13456, glGetnMapivARB, glGetnMapivARB, NULL, 814),
-    NAME_FUNC_OFFSET(13471, glGetnMinmaxARB, glGetnMinmaxARB, NULL, 815),
-    NAME_FUNC_OFFSET(13487, glGetnPixelMapfvARB, glGetnPixelMapfvARB, NULL, 816),
-    NAME_FUNC_OFFSET(13507, glGetnPixelMapuivARB, glGetnPixelMapuivARB, NULL, 817),
-    NAME_FUNC_OFFSET(13528, glGetnPixelMapusvARB, glGetnPixelMapusvARB, NULL, 818),
-    NAME_FUNC_OFFSET(13549, glGetnPolygonStippleARB, glGetnPolygonStippleARB, NULL, 819),
-    NAME_FUNC_OFFSET(13573, glGetnSeparableFilterARB, glGetnSeparableFilterARB, NULL, 820),
-    NAME_FUNC_OFFSET(13598, glGetnTexImageARB, glGetnTexImageARB, NULL, 821),
-    NAME_FUNC_OFFSET(13616, glGetnUniformdvARB, glGetnUniformdvARB, NULL, 822),
-    NAME_FUNC_OFFSET(13635, glGetnUniformfvARB, glGetnUniformfvARB, NULL, 823),
-    NAME_FUNC_OFFSET(13654, glGetnUniformivARB, glGetnUniformivARB, NULL, 824),
-    NAME_FUNC_OFFSET(13673, glGetnUniformuivARB, glGetnUniformuivARB, NULL, 825),
-    NAME_FUNC_OFFSET(13693, glReadnPixelsARB, glReadnPixelsARB, NULL, 826),
-    NAME_FUNC_OFFSET(13710, glDrawArraysInstancedBaseInstance, glDrawArraysInstancedBaseInstance, NULL, 827),
-    NAME_FUNC_OFFSET(13744, glDrawElementsInstancedBaseInstance, glDrawElementsInstancedBaseInstance, NULL, 828),
-    NAME_FUNC_OFFSET(13780, glDrawElementsInstancedBaseVertexBaseInstance, glDrawElementsInstancedBaseVertexBaseInstance, NULL, 829),
-    NAME_FUNC_OFFSET(13826, glDrawTransformFeedbackInstanced, glDrawTransformFeedbackInstanced, NULL, 830),
-    NAME_FUNC_OFFSET(13859, glDrawTransformFeedbackStreamInstanced, glDrawTransformFeedbackStreamInstanced, NULL, 831),
-    NAME_FUNC_OFFSET(13898, gl_dispatch_stub_832, gl_dispatch_stub_832, NULL, 832),
-    NAME_FUNC_OFFSET(13920, glGetActiveAtomicCounterBufferiv, glGetActiveAtomicCounterBufferiv, NULL, 833),
-    NAME_FUNC_OFFSET(13953, glBindImageTexture, glBindImageTexture, NULL, 834),
-    NAME_FUNC_OFFSET(13972, glMemoryBarrier, glMemoryBarrier, NULL, 835),
-    NAME_FUNC_OFFSET(13988, glTexStorage1D, glTexStorage1D, NULL, 836),
-    NAME_FUNC_OFFSET(14003, glTexStorage2D, glTexStorage2D, NULL, 837),
-    NAME_FUNC_OFFSET(14018, glTexStorage3D, glTexStorage3D, NULL, 838),
-    NAME_FUNC_OFFSET(14033, glTextureStorage1DEXT, glTextureStorage1DEXT, NULL, 839),
-    NAME_FUNC_OFFSET(14055, glTextureStorage2DEXT, glTextureStorage2DEXT, NULL, 840),
-    NAME_FUNC_OFFSET(14077, glTextureStorage3DEXT, glTextureStorage3DEXT, NULL, 841),
-    NAME_FUNC_OFFSET(14099, glClearBufferData, glClearBufferData, NULL, 842),
-    NAME_FUNC_OFFSET(14117, glClearBufferSubData, glClearBufferSubData, NULL, 843),
-    NAME_FUNC_OFFSET(14138, glDispatchCompute, glDispatchCompute, NULL, 844),
-    NAME_FUNC_OFFSET(14156, glDispatchComputeIndirect, glDispatchComputeIndirect, NULL, 845),
-    NAME_FUNC_OFFSET(14182, glTextureView, glTextureView, NULL, 846),
-    NAME_FUNC_OFFSET(14196, glBindVertexBuffer, glBindVertexBuffer, NULL, 847),
-    NAME_FUNC_OFFSET(14215, glVertexAttribBinding, glVertexAttribBinding, NULL, 848),
-    NAME_FUNC_OFFSET(14237, glVertexAttribFormat, glVertexAttribFormat, NULL, 849),
-    NAME_FUNC_OFFSET(14258, glVertexAttribIFormat, glVertexAttribIFormat, NULL, 850),
-    NAME_FUNC_OFFSET(14280, glVertexAttribLFormat, glVertexAttribLFormat, NULL, 851),
-    NAME_FUNC_OFFSET(14302, glVertexBindingDivisor, glVertexBindingDivisor, NULL, 852),
-    NAME_FUNC_OFFSET(14325, glMultiDrawArraysIndirect, glMultiDrawArraysIndirect, NULL, 853),
-    NAME_FUNC_OFFSET(14351, glMultiDrawElementsIndirect, glMultiDrawElementsIndirect, NULL, 854),
-    NAME_FUNC_OFFSET(14379, glTexBufferRange, glTexBufferRange, NULL, 855),
-    NAME_FUNC_OFFSET(14396, glTexStorage2DMultisample, glTexStorage2DMultisample, NULL, 856),
-    NAME_FUNC_OFFSET(14422, glTexStorage3DMultisample, glTexStorage3DMultisample, NULL, 857),
-    NAME_FUNC_OFFSET(14448, glBufferStorage, glBufferStorage, NULL, 858),
-    NAME_FUNC_OFFSET(14464, glInvalidateBufferData, glInvalidateBufferData, NULL, 859),
-    NAME_FUNC_OFFSET(14487, glInvalidateBufferSubData, glInvalidateBufferSubData, NULL, 860),
-    NAME_FUNC_OFFSET(14513, glInvalidateFramebuffer, glInvalidateFramebuffer, NULL, 861),
-    NAME_FUNC_OFFSET(14537, glInvalidateSubFramebuffer, glInvalidateSubFramebuffer, NULL, 862),
-    NAME_FUNC_OFFSET(14564, glInvalidateTexImage, glInvalidateTexImage, NULL, 863),
-    NAME_FUNC_OFFSET(14585, glInvalidateTexSubImage, glInvalidateTexSubImage, NULL, 864),
-    NAME_FUNC_OFFSET(14609, glPolygonOffsetEXT, glPolygonOffsetEXT, NULL, 865),
-    NAME_FUNC_OFFSET(14628, gl_dispatch_stub_866, gl_dispatch_stub_866, NULL, 866),
-    NAME_FUNC_OFFSET(14642, gl_dispatch_stub_867, gl_dispatch_stub_867, NULL, 867),
-    NAME_FUNC_OFFSET(14657, gl_dispatch_stub_868, gl_dispatch_stub_868, NULL, 868),
-    NAME_FUNC_OFFSET(14671, gl_dispatch_stub_869, gl_dispatch_stub_869, NULL, 869),
-    NAME_FUNC_OFFSET(14686, gl_dispatch_stub_870, gl_dispatch_stub_870, NULL, 870),
-    NAME_FUNC_OFFSET(14700, gl_dispatch_stub_871, gl_dispatch_stub_871, NULL, 871),
-    NAME_FUNC_OFFSET(14715, gl_dispatch_stub_872, gl_dispatch_stub_872, NULL, 872),
-    NAME_FUNC_OFFSET(14729, gl_dispatch_stub_873, gl_dispatch_stub_873, NULL, 873),
-    NAME_FUNC_OFFSET(14744, gl_dispatch_stub_874, gl_dispatch_stub_874, NULL, 874),
-    NAME_FUNC_OFFSET(14766, gl_dispatch_stub_875, gl_dispatch_stub_875, NULL, 875),
-    NAME_FUNC_OFFSET(14784, gl_dispatch_stub_876, gl_dispatch_stub_876, NULL, 876),
-    NAME_FUNC_OFFSET(14801, gl_dispatch_stub_877, gl_dispatch_stub_877, NULL, 877),
-    NAME_FUNC_OFFSET(14821, glColorPointerEXT, glColorPointerEXT, NULL, 878),
-    NAME_FUNC_OFFSET(14839, glEdgeFlagPointerEXT, glEdgeFlagPointerEXT, NULL, 879),
-    NAME_FUNC_OFFSET(14860, glIndexPointerEXT, glIndexPointerEXT, NULL, 880),
-    NAME_FUNC_OFFSET(14878, glNormalPointerEXT, glNormalPointerEXT, NULL, 881),
-    NAME_FUNC_OFFSET(14897, glTexCoordPointerEXT, glTexCoordPointerEXT, NULL, 882),
-    NAME_FUNC_OFFSET(14918, glVertexPointerEXT, glVertexPointerEXT, NULL, 883),
-    NAME_FUNC_OFFSET(14937, gl_dispatch_stub_884, gl_dispatch_stub_884, NULL, 884),
-    NAME_FUNC_OFFSET(14961, glActiveShaderProgram, glActiveShaderProgram, NULL, 885),
-    NAME_FUNC_OFFSET(14983, glBindProgramPipeline, glBindProgramPipeline, NULL, 886),
-    NAME_FUNC_OFFSET(15005, glCreateShaderProgramv, glCreateShaderProgramv, NULL, 887),
-    NAME_FUNC_OFFSET(15028, glDeleteProgramPipelines, glDeleteProgramPipelines, NULL, 888),
-    NAME_FUNC_OFFSET(15053, glGenProgramPipelines, glGenProgramPipelines, NULL, 889),
-    NAME_FUNC_OFFSET(15075, glGetProgramPipelineInfoLog, glGetProgramPipelineInfoLog, NULL, 890),
-    NAME_FUNC_OFFSET(15103, glGetProgramPipelineiv, glGetProgramPipelineiv, NULL, 891),
-    NAME_FUNC_OFFSET(15126, glIsProgramPipeline, glIsProgramPipeline, NULL, 892),
-    NAME_FUNC_OFFSET(15146, glLockArraysEXT, glLockArraysEXT, NULL, 893),
-    NAME_FUNC_OFFSET(15162, glProgramUniform1f, glProgramUniform1f, NULL, 894),
-    NAME_FUNC_OFFSET(15181, glProgramUniform1fv, glProgramUniform1fv, NULL, 895),
-    NAME_FUNC_OFFSET(15201, glProgramUniform1i, glProgramUniform1i, NULL, 896),
-    NAME_FUNC_OFFSET(15220, glProgramUniform1iv, glProgramUniform1iv, NULL, 897),
-    NAME_FUNC_OFFSET(15240, glProgramUniform1ui, glProgramUniform1ui, NULL, 898),
-    NAME_FUNC_OFFSET(15260, glProgramUniform1uiv, glProgramUniform1uiv, NULL, 899),
-    NAME_FUNC_OFFSET(15281, glProgramUniform2f, glProgramUniform2f, NULL, 900),
-    NAME_FUNC_OFFSET(15300, glProgramUniform2fv, glProgramUniform2fv, NULL, 901),
-    NAME_FUNC_OFFSET(15320, glProgramUniform2i, glProgramUniform2i, NULL, 902),
-    NAME_FUNC_OFFSET(15339, glProgramUniform2iv, glProgramUniform2iv, NULL, 903),
-    NAME_FUNC_OFFSET(15359, glProgramUniform2ui, glProgramUniform2ui, NULL, 904),
-    NAME_FUNC_OFFSET(15379, glProgramUniform2uiv, glProgramUniform2uiv, NULL, 905),
-    NAME_FUNC_OFFSET(15400, glProgramUniform3f, glProgramUniform3f, NULL, 906),
-    NAME_FUNC_OFFSET(15419, glProgramUniform3fv, glProgramUniform3fv, NULL, 907),
-    NAME_FUNC_OFFSET(15439, glProgramUniform3i, glProgramUniform3i, NULL, 908),
-    NAME_FUNC_OFFSET(15458, glProgramUniform3iv, glProgramUniform3iv, NULL, 909),
-    NAME_FUNC_OFFSET(15478, glProgramUniform3ui, glProgramUniform3ui, NULL, 910),
-    NAME_FUNC_OFFSET(15498, glProgramUniform3uiv, glProgramUniform3uiv, NULL, 911),
-    NAME_FUNC_OFFSET(15519, glProgramUniform4f, glProgramUniform4f, NULL, 912),
-    NAME_FUNC_OFFSET(15538, glProgramUniform4fv, glProgramUniform4fv, NULL, 913),
-    NAME_FUNC_OFFSET(15558, glProgramUniform4i, glProgramUniform4i, NULL, 914),
-    NAME_FUNC_OFFSET(15577, glProgramUniform4iv, glProgramUniform4iv, NULL, 915),
-    NAME_FUNC_OFFSET(15597, glProgramUniform4ui, glProgramUniform4ui, NULL, 916),
-    NAME_FUNC_OFFSET(15617, glProgramUniform4uiv, glProgramUniform4uiv, NULL, 917),
-    NAME_FUNC_OFFSET(15638, glProgramUniformMatrix2fv, glProgramUniformMatrix2fv, NULL, 918),
-    NAME_FUNC_OFFSET(15664, glProgramUniformMatrix2x3fv, glProgramUniformMatrix2x3fv, NULL, 919),
-    NAME_FUNC_OFFSET(15692, glProgramUniformMatrix2x4fv, glProgramUniformMatrix2x4fv, NULL, 920),
-    NAME_FUNC_OFFSET(15720, glProgramUniformMatrix3fv, glProgramUniformMatrix3fv, NULL, 921),
-    NAME_FUNC_OFFSET(15746, glProgramUniformMatrix3x2fv, glProgramUniformMatrix3x2fv, NULL, 922),
-    NAME_FUNC_OFFSET(15774, glProgramUniformMatrix3x4fv, glProgramUniformMatrix3x4fv, NULL, 923),
-    NAME_FUNC_OFFSET(15802, glProgramUniformMatrix4fv, glProgramUniformMatrix4fv, NULL, 924),
-    NAME_FUNC_OFFSET(15828, glProgramUniformMatrix4x2fv, glProgramUniformMatrix4x2fv, NULL, 925),
-    NAME_FUNC_OFFSET(15856, glProgramUniformMatrix4x3fv, glProgramUniformMatrix4x3fv, NULL, 926),
-    NAME_FUNC_OFFSET(15884, glUnlockArraysEXT, glUnlockArraysEXT, NULL, 927),
-    NAME_FUNC_OFFSET(15902, glUseProgramStages, glUseProgramStages, NULL, 928),
-    NAME_FUNC_OFFSET(15921, glValidateProgramPipeline, glValidateProgramPipeline, NULL, 929),
-    NAME_FUNC_OFFSET(15947, glDebugMessageCallback, glDebugMessageCallback, NULL, 930),
-    NAME_FUNC_OFFSET(15970, glDebugMessageControl, glDebugMessageControl, NULL, 931),
-    NAME_FUNC_OFFSET(15992, glDebugMessageInsert, glDebugMessageInsert, NULL, 932),
-    NAME_FUNC_OFFSET(16013, glGetDebugMessageLog, glGetDebugMessageLog, NULL, 933),
-    NAME_FUNC_OFFSET(16034, glGetObjectLabel, glGetObjectLabel, NULL, 934),
-    NAME_FUNC_OFFSET(16051, glGetObjectPtrLabel, glGetObjectPtrLabel, NULL, 935),
-    NAME_FUNC_OFFSET(16071, glObjectLabel, glObjectLabel, NULL, 936),
-    NAME_FUNC_OFFSET(16085, glObjectPtrLabel, glObjectPtrLabel, NULL, 937),
-    NAME_FUNC_OFFSET(16102, glPopDebugGroup, glPopDebugGroup, NULL, 938),
-    NAME_FUNC_OFFSET(16118, glPushDebugGroup, glPushDebugGroup, NULL, 939),
-    NAME_FUNC_OFFSET(16135, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, 940),
-    NAME_FUNC_OFFSET(16157, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, 941),
-    NAME_FUNC_OFFSET(16180, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, 942),
-    NAME_FUNC_OFFSET(16203, glFogCoordfEXT, glFogCoordfEXT, NULL, 943),
-    NAME_FUNC_OFFSET(16218, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 944),
-    NAME_FUNC_OFFSET(16234, glResizeBuffersMESA, glResizeBuffersMESA, NULL, 945),
-    NAME_FUNC_OFFSET(16254, glWindowPos4dMESA, glWindowPos4dMESA, NULL, 946),
-    NAME_FUNC_OFFSET(16272, glWindowPos4dvMESA, glWindowPos4dvMESA, NULL, 947),
-    NAME_FUNC_OFFSET(16291, glWindowPos4fMESA, glWindowPos4fMESA, NULL, 948),
-    NAME_FUNC_OFFSET(16309, glWindowPos4fvMESA, glWindowPos4fvMESA, NULL, 949),
-    NAME_FUNC_OFFSET(16328, glWindowPos4iMESA, glWindowPos4iMESA, NULL, 950),
-    NAME_FUNC_OFFSET(16346, glWindowPos4ivMESA, glWindowPos4ivMESA, NULL, 951),
-    NAME_FUNC_OFFSET(16365, glWindowPos4sMESA, glWindowPos4sMESA, NULL, 952),
-    NAME_FUNC_OFFSET(16383, glWindowPos4svMESA, glWindowPos4svMESA, NULL, 953),
-    NAME_FUNC_OFFSET(16402, gl_dispatch_stub_954, gl_dispatch_stub_954, NULL, 954),
-    NAME_FUNC_OFFSET(16427, gl_dispatch_stub_955, gl_dispatch_stub_955, NULL, 955),
-    NAME_FUNC_OFFSET(16454, glAreProgramsResidentNV, glAreProgramsResidentNV, NULL, 956),
-    NAME_FUNC_OFFSET(16478, glExecuteProgramNV, glExecuteProgramNV, NULL, 957),
-    NAME_FUNC_OFFSET(16497, glGetProgramParameterdvNV, glGetProgramParameterdvNV, NULL, 958),
-    NAME_FUNC_OFFSET(16523, glGetProgramParameterfvNV, glGetProgramParameterfvNV, NULL, 959),
-    NAME_FUNC_OFFSET(16549, glGetProgramStringNV, glGetProgramStringNV, NULL, 960),
-    NAME_FUNC_OFFSET(16570, glGetProgramivNV, glGetProgramivNV, NULL, 961),
-    NAME_FUNC_OFFSET(16587, glGetTrackMatrixivNV, glGetTrackMatrixivNV, NULL, 962),
-    NAME_FUNC_OFFSET(16608, glGetVertexAttribdvNV, glGetVertexAttribdvNV, NULL, 963),
-    NAME_FUNC_OFFSET(16630, glGetVertexAttribfvNV, glGetVertexAttribfvNV, NULL, 964),
-    NAME_FUNC_OFFSET(16652, glGetVertexAttribivNV, glGetVertexAttribivNV, NULL, 965),
-    NAME_FUNC_OFFSET(16674, glLoadProgramNV, glLoadProgramNV, NULL, 966),
-    NAME_FUNC_OFFSET(16690, glProgramParameters4dvNV, glProgramParameters4dvNV, NULL, 967),
-    NAME_FUNC_OFFSET(16715, glProgramParameters4fvNV, glProgramParameters4fvNV, NULL, 968),
-    NAME_FUNC_OFFSET(16740, glRequestResidentProgramsNV, glRequestResidentProgramsNV, NULL, 969),
-    NAME_FUNC_OFFSET(16768, glTrackMatrixNV, glTrackMatrixNV, NULL, 970),
-    NAME_FUNC_OFFSET(16784, glVertexAttrib1dNV, glVertexAttrib1dNV, NULL, 971),
-    NAME_FUNC_OFFSET(16803, glVertexAttrib1dvNV, glVertexAttrib1dvNV, NULL, 972),
-    NAME_FUNC_OFFSET(16823, glVertexAttrib1fNV, glVertexAttrib1fNV, NULL, 973),
-    NAME_FUNC_OFFSET(16842, glVertexAttrib1fvNV, glVertexAttrib1fvNV, NULL, 974),
-    NAME_FUNC_OFFSET(16862, glVertexAttrib1sNV, glVertexAttrib1sNV, NULL, 975),
-    NAME_FUNC_OFFSET(16881, glVertexAttrib1svNV, glVertexAttrib1svNV, NULL, 976),
-    NAME_FUNC_OFFSET(16901, glVertexAttrib2dNV, glVertexAttrib2dNV, NULL, 977),
-    NAME_FUNC_OFFSET(16920, glVertexAttrib2dvNV, glVertexAttrib2dvNV, NULL, 978),
-    NAME_FUNC_OFFSET(16940, glVertexAttrib2fNV, glVertexAttrib2fNV, NULL, 979),
-    NAME_FUNC_OFFSET(16959, glVertexAttrib2fvNV, glVertexAttrib2fvNV, NULL, 980),
-    NAME_FUNC_OFFSET(16979, glVertexAttrib2sNV, glVertexAttrib2sNV, NULL, 981),
-    NAME_FUNC_OFFSET(16998, glVertexAttrib2svNV, glVertexAttrib2svNV, NULL, 982),
-    NAME_FUNC_OFFSET(17018, glVertexAttrib3dNV, glVertexAttrib3dNV, NULL, 983),
-    NAME_FUNC_OFFSET(17037, glVertexAttrib3dvNV, glVertexAttrib3dvNV, NULL, 984),
-    NAME_FUNC_OFFSET(17057, glVertexAttrib3fNV, glVertexAttrib3fNV, NULL, 985),
-    NAME_FUNC_OFFSET(17076, glVertexAttrib3fvNV, glVertexAttrib3fvNV, NULL, 986),
-    NAME_FUNC_OFFSET(17096, glVertexAttrib3sNV, glVertexAttrib3sNV, NULL, 987),
-    NAME_FUNC_OFFSET(17115, glVertexAttrib3svNV, glVertexAttrib3svNV, NULL, 988),
-    NAME_FUNC_OFFSET(17135, glVertexAttrib4dNV, glVertexAttrib4dNV, NULL, 989),
-    NAME_FUNC_OFFSET(17154, glVertexAttrib4dvNV, glVertexAttrib4dvNV, NULL, 990),
-    NAME_FUNC_OFFSET(17174, glVertexAttrib4fNV, glVertexAttrib4fNV, NULL, 991),
-    NAME_FUNC_OFFSET(17193, glVertexAttrib4fvNV, glVertexAttrib4fvNV, NULL, 992),
-    NAME_FUNC_OFFSET(17213, glVertexAttrib4sNV, glVertexAttrib4sNV, NULL, 993),
-    NAME_FUNC_OFFSET(17232, glVertexAttrib4svNV, glVertexAttrib4svNV, NULL, 994),
-    NAME_FUNC_OFFSET(17252, glVertexAttrib4ubNV, glVertexAttrib4ubNV, NULL, 995),
-    NAME_FUNC_OFFSET(17272, glVertexAttrib4ubvNV, glVertexAttrib4ubvNV, NULL, 996),
-    NAME_FUNC_OFFSET(17293, glVertexAttribPointerNV, glVertexAttribPointerNV, NULL, 997),
-    NAME_FUNC_OFFSET(17317, glVertexAttribs1dvNV, glVertexAttribs1dvNV, NULL, 998),
-    NAME_FUNC_OFFSET(17338, glVertexAttribs1fvNV, glVertexAttribs1fvNV, NULL, 999),
-    NAME_FUNC_OFFSET(17359, glVertexAttribs1svNV, glVertexAttribs1svNV, NULL, 1000),
-    NAME_FUNC_OFFSET(17380, glVertexAttribs2dvNV, glVertexAttribs2dvNV, NULL, 1001),
-    NAME_FUNC_OFFSET(17401, glVertexAttribs2fvNV, glVertexAttribs2fvNV, NULL, 1002),
-    NAME_FUNC_OFFSET(17422, glVertexAttribs2svNV, glVertexAttribs2svNV, NULL, 1003),
-    NAME_FUNC_OFFSET(17443, glVertexAttribs3dvNV, glVertexAttribs3dvNV, NULL, 1004),
-    NAME_FUNC_OFFSET(17464, glVertexAttribs3fvNV, glVertexAttribs3fvNV, NULL, 1005),
-    NAME_FUNC_OFFSET(17485, glVertexAttribs3svNV, glVertexAttribs3svNV, NULL, 1006),
-    NAME_FUNC_OFFSET(17506, glVertexAttribs4dvNV, glVertexAttribs4dvNV, NULL, 1007),
-    NAME_FUNC_OFFSET(17527, glVertexAttribs4fvNV, glVertexAttribs4fvNV, NULL, 1008),
-    NAME_FUNC_OFFSET(17548, glVertexAttribs4svNV, glVertexAttribs4svNV, NULL, 1009),
-    NAME_FUNC_OFFSET(17569, glVertexAttribs4ubvNV, glVertexAttribs4ubvNV, NULL, 1010),
-    NAME_FUNC_OFFSET(17591, glGetTexBumpParameterfvATI, glGetTexBumpParameterfvATI, NULL, 1011),
-    NAME_FUNC_OFFSET(17618, glGetTexBumpParameterivATI, glGetTexBumpParameterivATI, NULL, 1012),
-    NAME_FUNC_OFFSET(17645, glTexBumpParameterfvATI, glTexBumpParameterfvATI, NULL, 1013),
-    NAME_FUNC_OFFSET(17669, glTexBumpParameterivATI, glTexBumpParameterivATI, NULL, 1014),
-    NAME_FUNC_OFFSET(17693, glAlphaFragmentOp1ATI, glAlphaFragmentOp1ATI, NULL, 1015),
-    NAME_FUNC_OFFSET(17715, glAlphaFragmentOp2ATI, glAlphaFragmentOp2ATI, NULL, 1016),
-    NAME_FUNC_OFFSET(17737, glAlphaFragmentOp3ATI, glAlphaFragmentOp3ATI, NULL, 1017),
-    NAME_FUNC_OFFSET(17759, glBeginFragmentShaderATI, glBeginFragmentShaderATI, NULL, 1018),
-    NAME_FUNC_OFFSET(17784, glBindFragmentShaderATI, glBindFragmentShaderATI, NULL, 1019),
-    NAME_FUNC_OFFSET(17808, glColorFragmentOp1ATI, glColorFragmentOp1ATI, NULL, 1020),
-    NAME_FUNC_OFFSET(17830, glColorFragmentOp2ATI, glColorFragmentOp2ATI, NULL, 1021),
-    NAME_FUNC_OFFSET(17852, glColorFragmentOp3ATI, glColorFragmentOp3ATI, NULL, 1022),
-    NAME_FUNC_OFFSET(17874, glDeleteFragmentShaderATI, glDeleteFragmentShaderATI, NULL, 1023),
-    NAME_FUNC_OFFSET(17900, glEndFragmentShaderATI, glEndFragmentShaderATI, NULL, 1024),
-    NAME_FUNC_OFFSET(17923, glGenFragmentShadersATI, glGenFragmentShadersATI, NULL, 1025),
-    NAME_FUNC_OFFSET(17947, glPassTexCoordATI, glPassTexCoordATI, NULL, 1026),
-    NAME_FUNC_OFFSET(17965, glSampleMapATI, glSampleMapATI, NULL, 1027),
-    NAME_FUNC_OFFSET(17980, glSetFragmentShaderConstantATI, glSetFragmentShaderConstantATI, NULL, 1028),
-    NAME_FUNC_OFFSET(18011, gl_dispatch_stub_1029, gl_dispatch_stub_1029, NULL, 1029),
-    NAME_FUNC_OFFSET(18034, gl_dispatch_stub_1030, gl_dispatch_stub_1030, NULL, 1030),
-    NAME_FUNC_OFFSET(18057, gl_dispatch_stub_1031, gl_dispatch_stub_1031, NULL, 1031),
-    NAME_FUNC_OFFSET(18080, glGetProgramNamedParameterdvNV, glGetProgramNamedParameterdvNV, NULL, 1032),
-    NAME_FUNC_OFFSET(18111, glGetProgramNamedParameterfvNV, glGetProgramNamedParameterfvNV, NULL, 1033),
-    NAME_FUNC_OFFSET(18142, glProgramNamedParameter4dNV, glProgramNamedParameter4dNV, NULL, 1034),
-    NAME_FUNC_OFFSET(18170, glProgramNamedParameter4dvNV, glProgramNamedParameter4dvNV, NULL, 1035),
-    NAME_FUNC_OFFSET(18199, glProgramNamedParameter4fNV, glProgramNamedParameter4fNV, NULL, 1036),
-    NAME_FUNC_OFFSET(18227, glProgramNamedParameter4fvNV, glProgramNamedParameter4fvNV, NULL, 1037),
-    NAME_FUNC_OFFSET(18256, glPrimitiveRestartNV, glPrimitiveRestartNV, NULL, 1038),
-    NAME_FUNC_OFFSET(18277, gl_dispatch_stub_1039, gl_dispatch_stub_1039, NULL, 1039),
-    NAME_FUNC_OFFSET(18294, gl_dispatch_stub_1040, gl_dispatch_stub_1040, NULL, 1040),
-    NAME_FUNC_OFFSET(18307, gl_dispatch_stub_1041, gl_dispatch_stub_1041, NULL, 1041),
-    NAME_FUNC_OFFSET(18321, gl_dispatch_stub_1042, gl_dispatch_stub_1042, NULL, 1042),
-    NAME_FUNC_OFFSET(18338, glBindFramebufferEXT, glBindFramebufferEXT, NULL, 1043),
-    NAME_FUNC_OFFSET(18359, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, 1044),
-    NAME_FUNC_OFFSET(18381, gl_dispatch_stub_1045, gl_dispatch_stub_1045, NULL, 1045),
-    NAME_FUNC_OFFSET(18405, gl_dispatch_stub_1046, gl_dispatch_stub_1046, NULL, 1046),
-    NAME_FUNC_OFFSET(18435, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL, 1047),
-    NAME_FUNC_OFFSET(18456, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL, 1048),
-    NAME_FUNC_OFFSET(18478, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL, 1049),
-    NAME_FUNC_OFFSET(18499, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL, 1050),
-    NAME_FUNC_OFFSET(18521, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL, 1051),
-    NAME_FUNC_OFFSET(18543, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT, NULL, 1052),
-    NAME_FUNC_OFFSET(18566, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL, 1053),
-    NAME_FUNC_OFFSET(18587, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL, 1054),
-    NAME_FUNC_OFFSET(18609, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL, 1055),
-    NAME_FUNC_OFFSET(18631, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT, NULL, 1056),
-    NAME_FUNC_OFFSET(18654, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL, 1057),
-    NAME_FUNC_OFFSET(18675, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL, 1058),
-    NAME_FUNC_OFFSET(18697, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL, 1059),
-    NAME_FUNC_OFFSET(18719, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT, NULL, 1060),
-    NAME_FUNC_OFFSET(18742, glClearColorIiEXT, glClearColorIiEXT, NULL, 1061),
-    NAME_FUNC_OFFSET(18760, glClearColorIuiEXT, glClearColorIuiEXT, NULL, 1062),
-    NAME_FUNC_OFFSET(18779, glBindBufferOffsetEXT, glBindBufferOffsetEXT, NULL, 1063),
-    NAME_FUNC_OFFSET(18801, glBeginPerfMonitorAMD, glBeginPerfMonitorAMD, NULL, 1064),
-    NAME_FUNC_OFFSET(18823, glDeletePerfMonitorsAMD, glDeletePerfMonitorsAMD, NULL, 1065),
-    NAME_FUNC_OFFSET(18847, glEndPerfMonitorAMD, glEndPerfMonitorAMD, NULL, 1066),
-    NAME_FUNC_OFFSET(18867, glGenPerfMonitorsAMD, glGenPerfMonitorsAMD, NULL, 1067),
-    NAME_FUNC_OFFSET(18888, glGetPerfMonitorCounterDataAMD, glGetPerfMonitorCounterDataAMD, NULL, 1068),
-    NAME_FUNC_OFFSET(18919, glGetPerfMonitorCounterInfoAMD, glGetPerfMonitorCounterInfoAMD, NULL, 1069),
-    NAME_FUNC_OFFSET(18950, glGetPerfMonitorCounterStringAMD, glGetPerfMonitorCounterStringAMD, NULL, 1070),
-    NAME_FUNC_OFFSET(18983, glGetPerfMonitorCountersAMD, glGetPerfMonitorCountersAMD, NULL, 1071),
-    NAME_FUNC_OFFSET(19011, glGetPerfMonitorGroupStringAMD, glGetPerfMonitorGroupStringAMD, NULL, 1072),
-    NAME_FUNC_OFFSET(19042, glGetPerfMonitorGroupsAMD, glGetPerfMonitorGroupsAMD, NULL, 1073),
-    NAME_FUNC_OFFSET(19068, glSelectPerfMonitorCountersAMD, glSelectPerfMonitorCountersAMD, NULL, 1074),
-    NAME_FUNC_OFFSET(19099, glGetObjectParameterivAPPLE, glGetObjectParameterivAPPLE, NULL, 1075),
-    NAME_FUNC_OFFSET(19127, glObjectPurgeableAPPLE, glObjectPurgeableAPPLE, NULL, 1076),
-    NAME_FUNC_OFFSET(19150, glObjectUnpurgeableAPPLE, glObjectUnpurgeableAPPLE, NULL, 1077),
-    NAME_FUNC_OFFSET(19175, glActiveProgramEXT, glActiveProgramEXT, NULL, 1078),
-    NAME_FUNC_OFFSET(19194, glCreateShaderProgramEXT, glCreateShaderProgramEXT, NULL, 1079),
-    NAME_FUNC_OFFSET(19219, glUseShaderProgramEXT, glUseShaderProgramEXT, NULL, 1080),
-    NAME_FUNC_OFFSET(19241, glTextureBarrierNV, glTextureBarrierNV, NULL, 1081),
-    NAME_FUNC_OFFSET(19260, glVDPAUFiniNV, glVDPAUFiniNV, NULL, 1082),
-    NAME_FUNC_OFFSET(19274, glVDPAUGetSurfaceivNV, glVDPAUGetSurfaceivNV, NULL, 1083),
-    NAME_FUNC_OFFSET(19296, glVDPAUInitNV, glVDPAUInitNV, NULL, 1084),
-    NAME_FUNC_OFFSET(19310, glVDPAUIsSurfaceNV, glVDPAUIsSurfaceNV, NULL, 1085),
-    NAME_FUNC_OFFSET(19329, glVDPAUMapSurfacesNV, glVDPAUMapSurfacesNV, NULL, 1086),
-    NAME_FUNC_OFFSET(19350, glVDPAURegisterOutputSurfaceNV, glVDPAURegisterOutputSurfaceNV, NULL, 1087),
-    NAME_FUNC_OFFSET(19381, glVDPAURegisterVideoSurfaceNV, glVDPAURegisterVideoSurfaceNV, NULL, 1088),
-    NAME_FUNC_OFFSET(19411, glVDPAUSurfaceAccessNV, glVDPAUSurfaceAccessNV, NULL, 1089),
-    NAME_FUNC_OFFSET(19434, glVDPAUUnmapSurfacesNV, glVDPAUUnmapSurfacesNV, NULL, 1090),
-    NAME_FUNC_OFFSET(19457, glVDPAUUnregisterSurfaceNV, glVDPAUUnregisterSurfaceNV, NULL, 1091),
-    NAME_FUNC_OFFSET(19484, gl_dispatch_stub_1092, gl_dispatch_stub_1092, NULL, 1092),
-    NAME_FUNC_OFFSET(19509, gl_dispatch_stub_1093, gl_dispatch_stub_1093, NULL, 1093),
-    NAME_FUNC_OFFSET(19538, gl_dispatch_stub_1094, gl_dispatch_stub_1094, NULL, 1094),
-    NAME_FUNC_OFFSET(19569, glEGLImageTargetRenderbufferStorageOES, glEGLImageTargetRenderbufferStorageOES, NULL, 1095),
-    NAME_FUNC_OFFSET(19608, glEGLImageTargetTexture2DOES, glEGLImageTargetTexture2DOES, NULL, 1096),
-    NAME_FUNC_OFFSET(19637, gl_dispatch_stub_1097, gl_dispatch_stub_1097, NULL, 1097),
-    NAME_FUNC_OFFSET(19650, gl_dispatch_stub_1098, gl_dispatch_stub_1098, NULL, 1098),
-    NAME_FUNC_OFFSET(19664, gl_dispatch_stub_1099, gl_dispatch_stub_1099, NULL, 1099),
-    NAME_FUNC_OFFSET(19678, gl_dispatch_stub_1100, gl_dispatch_stub_1100, NULL, 1100),
-    NAME_FUNC_OFFSET(19688, gl_dispatch_stub_1101, gl_dispatch_stub_1101, NULL, 1101),
-    NAME_FUNC_OFFSET(19702, gl_dispatch_stub_1102, gl_dispatch_stub_1102, NULL, 1102),
-    NAME_FUNC_OFFSET(19709, gl_dispatch_stub_1103, gl_dispatch_stub_1103, NULL, 1103),
-    NAME_FUNC_OFFSET(19717, gl_dispatch_stub_1104, gl_dispatch_stub_1104, NULL, 1104),
-    NAME_FUNC_OFFSET(19728, gl_dispatch_stub_1105, gl_dispatch_stub_1105, NULL, 1105),
-    NAME_FUNC_OFFSET(19739, gl_dispatch_stub_1106, gl_dispatch_stub_1106, NULL, 1106),
-    NAME_FUNC_OFFSET(19753, gl_dispatch_stub_1107, gl_dispatch_stub_1107, NULL, 1107),
-    NAME_FUNC_OFFSET(19768, gl_dispatch_stub_1108, gl_dispatch_stub_1108, NULL, 1108),
-    NAME_FUNC_OFFSET(19777, gl_dispatch_stub_1109, gl_dispatch_stub_1109, NULL, 1109),
-    NAME_FUNC_OFFSET(19787, gl_dispatch_stub_1110, gl_dispatch_stub_1110, NULL, 1110),
-    NAME_FUNC_OFFSET(19800, gl_dispatch_stub_1111, gl_dispatch_stub_1111, NULL, 1111),
-    NAME_FUNC_OFFSET(19814, gl_dispatch_stub_1112, gl_dispatch_stub_1112, NULL, 1112),
-    NAME_FUNC_OFFSET(19826, gl_dispatch_stub_1113, gl_dispatch_stub_1113, NULL, 1113),
-    NAME_FUNC_OFFSET(19839, gl_dispatch_stub_1114, gl_dispatch_stub_1114, NULL, 1114),
-    NAME_FUNC_OFFSET(19853, gl_dispatch_stub_1115, gl_dispatch_stub_1115, NULL, 1115),
-    NAME_FUNC_OFFSET(19871, gl_dispatch_stub_1116, gl_dispatch_stub_1116, NULL, 1116),
-    NAME_FUNC_OFFSET(19882, gl_dispatch_stub_1117, gl_dispatch_stub_1117, NULL, 1117),
-    NAME_FUNC_OFFSET(19891, gl_dispatch_stub_1118, gl_dispatch_stub_1118, NULL, 1118),
-    NAME_FUNC_OFFSET(19900, gl_dispatch_stub_1119, gl_dispatch_stub_1119, NULL, 1119),
-    NAME_FUNC_OFFSET(19913, gl_dispatch_stub_1120, gl_dispatch_stub_1120, NULL, 1120),
-    NAME_FUNC_OFFSET(19930, gl_dispatch_stub_1121, gl_dispatch_stub_1121, NULL, 1121),
-    NAME_FUNC_OFFSET(19940, gl_dispatch_stub_1122, gl_dispatch_stub_1122, NULL, 1122),
-    NAME_FUNC_OFFSET(19958, gl_dispatch_stub_1123, gl_dispatch_stub_1123, NULL, 1123),
-    NAME_FUNC_OFFSET(19967, gl_dispatch_stub_1124, gl_dispatch_stub_1124, NULL, 1124),
-    NAME_FUNC_OFFSET(19977, gl_dispatch_stub_1125, gl_dispatch_stub_1125, NULL, 1125),
-    NAME_FUNC_OFFSET(19988, gl_dispatch_stub_1126, gl_dispatch_stub_1126, NULL, 1126),
-    NAME_FUNC_OFFSET(20004, gl_dispatch_stub_1127, gl_dispatch_stub_1127, NULL, 1127),
-    NAME_FUNC_OFFSET(20017, gl_dispatch_stub_1128, gl_dispatch_stub_1128, NULL, 1128),
-    NAME_FUNC_OFFSET(20030, gl_dispatch_stub_1129, gl_dispatch_stub_1129, NULL, 1129),
-    NAME_FUNC_OFFSET(20043, gl_dispatch_stub_1130, gl_dispatch_stub_1130, NULL, 1130),
-    NAME_FUNC_OFFSET(20059, gl_dispatch_stub_1131, gl_dispatch_stub_1131, NULL, 1131),
-    NAME_FUNC_OFFSET(20075, gl_dispatch_stub_1132, gl_dispatch_stub_1132, NULL, 1132),
-    NAME_FUNC_OFFSET(20087, gl_dispatch_stub_1133, gl_dispatch_stub_1133, NULL, 1133),
-    NAME_FUNC_OFFSET(20100, gl_dispatch_stub_1134, gl_dispatch_stub_1134, NULL, 1134),
-    NAME_FUNC_OFFSET(20116, gl_dispatch_stub_1135, gl_dispatch_stub_1135, NULL, 1135),
-    NAME_FUNC_OFFSET(20130, gl_dispatch_stub_1136, gl_dispatch_stub_1136, NULL, 1136),
-    NAME_FUNC_OFFSET(20150, gl_dispatch_stub_1137, gl_dispatch_stub_1137, NULL, 1137),
-    NAME_FUNC_OFFSET(20168, gl_dispatch_stub_1138, gl_dispatch_stub_1138, NULL, 1138),
-    NAME_FUNC_OFFSET(20187, gl_dispatch_stub_1139, gl_dispatch_stub_1139, NULL, 1139),
-    NAME_FUNC_OFFSET(20204, glTexGenf, glTexGenf, NULL, 190),
-    NAME_FUNC_OFFSET(20217, glTexGenfv, glTexGenfv, NULL, 191),
-    NAME_FUNC_OFFSET(20231, glTexGeni, glTexGeni, NULL, 192),
-    NAME_FUNC_OFFSET(20244, glTexGeniv, glTexGeniv, NULL, 193),
-    NAME_FUNC_OFFSET(20258, glReadBuffer, glReadBuffer, NULL, 254),
-    NAME_FUNC_OFFSET(20273, glGetTexGenfv, glGetTexGenfv, NULL, 279),
-    NAME_FUNC_OFFSET(20290, glGetTexGeniv, glGetTexGeniv, NULL, 280),
-    NAME_FUNC_OFFSET(20307, glArrayElement, glArrayElement, NULL, 306),
-    NAME_FUNC_OFFSET(20325, glBindTexture, glBindTexture, NULL, 307),
-    NAME_FUNC_OFFSET(20342, glDrawArrays, glDrawArrays, NULL, 310),
-    NAME_FUNC_OFFSET(20358, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, 322),
-    NAME_FUNC_OFFSET(20383, glCopyTexImage1D, glCopyTexImage1D, NULL, 323),
-    NAME_FUNC_OFFSET(20403, glCopyTexImage2D, glCopyTexImage2D, NULL, 324),
-    NAME_FUNC_OFFSET(20423, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, 325),
-    NAME_FUNC_OFFSET(20446, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, 326),
-    NAME_FUNC_OFFSET(20469, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, 327),
-    NAME_FUNC_OFFSET(20489, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, 328),
-    NAME_FUNC_OFFSET(20506, glGetPointerv, glGetPointerv, NULL, 329),
-    NAME_FUNC_OFFSET(20523, glIsTexture, glIsTextureEXT, glIsTextureEXT, 330),
-    NAME_FUNC_OFFSET(20538, glPrioritizeTextures, glPrioritizeTextures, NULL, 331),
-    NAME_FUNC_OFFSET(20562, glTexSubImage1D, glTexSubImage1D, NULL, 332),
-    NAME_FUNC_OFFSET(20581, glTexSubImage2D, glTexSubImage2D, NULL, 333),
-    NAME_FUNC_OFFSET(20600, glBlendColor, glBlendColor, NULL, 336),
-    NAME_FUNC_OFFSET(20616, glBlendEquation, glBlendEquation, NULL, 337),
-    NAME_FUNC_OFFSET(20635, glBlendEquation, glBlendEquation, NULL, 337),
-    NAME_FUNC_OFFSET(20654, glDrawRangeElements, glDrawRangeElements, NULL, 338),
-    NAME_FUNC_OFFSET(20677, glColorTable, glColorTable, NULL, 339),
-    NAME_FUNC_OFFSET(20693, glColorTable, glColorTable, NULL, 339),
-    NAME_FUNC_OFFSET(20709, glColorTableParameterfv, glColorTableParameterfv, NULL, 340),
-    NAME_FUNC_OFFSET(20736, glColorTableParameteriv, glColorTableParameteriv, NULL, 341),
-    NAME_FUNC_OFFSET(20763, glCopyColorTable, glCopyColorTable, NULL, 342),
-    NAME_FUNC_OFFSET(20783, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, 343),
-    NAME_FUNC_OFFSET(20802, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, 343),
-    NAME_FUNC_OFFSET(20821, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, 344),
-    NAME_FUNC_OFFSET(20851, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, 344),
-    NAME_FUNC_OFFSET(20881, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, 345),
-    NAME_FUNC_OFFSET(20911, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, 345),
-    NAME_FUNC_OFFSET(20941, glColorSubTable, glColorSubTable, NULL, 346),
-    NAME_FUNC_OFFSET(20960, glCopyColorSubTable, glCopyColorSubTable, NULL, 347),
-    NAME_FUNC_OFFSET(20983, glConvolutionFilter1D, glConvolutionFilter1D, NULL, 348),
-    NAME_FUNC_OFFSET(21008, glConvolutionFilter2D, glConvolutionFilter2D, NULL, 349),
-    NAME_FUNC_OFFSET(21033, glConvolutionParameterf, glConvolutionParameterf, NULL, 350),
-    NAME_FUNC_OFFSET(21060, glConvolutionParameterfv, glConvolutionParameterfv, NULL, 351),
-    NAME_FUNC_OFFSET(21088, glConvolutionParameteri, glConvolutionParameteri, NULL, 352),
-    NAME_FUNC_OFFSET(21115, glConvolutionParameteriv, glConvolutionParameteriv, NULL, 353),
-    NAME_FUNC_OFFSET(21143, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, 354),
-    NAME_FUNC_OFFSET(21172, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, 355),
-    NAME_FUNC_OFFSET(21201, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, 356),
-    NAME_FUNC_OFFSET(21227, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, 357),
-    NAME_FUNC_OFFSET(21258, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, 358),
-    NAME_FUNC_OFFSET(21289, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, 359),
-    NAME_FUNC_OFFSET(21313, glSeparableFilter2D, glSeparableFilter2D, NULL, 360),
-    NAME_FUNC_OFFSET(21336, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, 361),
-    NAME_FUNC_OFFSET(21354, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, 362),
-    NAME_FUNC_OFFSET(21383, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, 363),
-    NAME_FUNC_OFFSET(21412, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, 364),
-    NAME_FUNC_OFFSET(21427, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, 365),
-    NAME_FUNC_OFFSET(21453, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, 366),
-    NAME_FUNC_OFFSET(21479, glHistogram, glHistogram, NULL, 367),
-    NAME_FUNC_OFFSET(21494, glMinmax, glMinmax, NULL, 368),
-    NAME_FUNC_OFFSET(21506, glResetHistogram, glResetHistogram, NULL, 369),
-    NAME_FUNC_OFFSET(21526, glResetMinmax, glResetMinmax, NULL, 370),
-    NAME_FUNC_OFFSET(21543, glTexImage3D, glTexImage3D, NULL, 371),
-    NAME_FUNC_OFFSET(21559, glTexImage3D, glTexImage3D, NULL, 371),
-    NAME_FUNC_OFFSET(21575, glTexSubImage3D, glTexSubImage3D, NULL, 372),
-    NAME_FUNC_OFFSET(21594, glTexSubImage3D, glTexSubImage3D, NULL, 372),
-    NAME_FUNC_OFFSET(21613, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, 373),
-    NAME_FUNC_OFFSET(21636, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, 373),
-    NAME_FUNC_OFFSET(21659, glActiveTexture, glActiveTexture, NULL, 374),
-    NAME_FUNC_OFFSET(21678, glClientActiveTexture, glClientActiveTexture, NULL, 375),
-    NAME_FUNC_OFFSET(21703, glMultiTexCoord1d, glMultiTexCoord1d, NULL, 376),
-    NAME_FUNC_OFFSET(21724, glMultiTexCoord1dv, glMultiTexCoord1dv, NULL, 377),
-    NAME_FUNC_OFFSET(21746, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, 378),
-    NAME_FUNC_OFFSET(21764, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, 379),
-    NAME_FUNC_OFFSET(21783, glMultiTexCoord1i, glMultiTexCoord1i, NULL, 380),
-    NAME_FUNC_OFFSET(21804, glMultiTexCoord1iv, glMultiTexCoord1iv, NULL, 381),
-    NAME_FUNC_OFFSET(21826, glMultiTexCoord1s, glMultiTexCoord1s, NULL, 382),
-    NAME_FUNC_OFFSET(21847, glMultiTexCoord1sv, glMultiTexCoord1sv, NULL, 383),
-    NAME_FUNC_OFFSET(21869, glMultiTexCoord2d, glMultiTexCoord2d, NULL, 384),
-    NAME_FUNC_OFFSET(21890, glMultiTexCoord2dv, glMultiTexCoord2dv, NULL, 385),
-    NAME_FUNC_OFFSET(21912, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, 386),
-    NAME_FUNC_OFFSET(21930, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, 387),
-    NAME_FUNC_OFFSET(21949, glMultiTexCoord2i, glMultiTexCoord2i, NULL, 388),
-    NAME_FUNC_OFFSET(21970, glMultiTexCoord2iv, glMultiTexCoord2iv, NULL, 389),
-    NAME_FUNC_OFFSET(21992, glMultiTexCoord2s, glMultiTexCoord2s, NULL, 390),
-    NAME_FUNC_OFFSET(22013, glMultiTexCoord2sv, glMultiTexCoord2sv, NULL, 391),
-    NAME_FUNC_OFFSET(22035, glMultiTexCoord3d, glMultiTexCoord3d, NULL, 392),
-    NAME_FUNC_OFFSET(22056, glMultiTexCoord3dv, glMultiTexCoord3dv, NULL, 393),
-    NAME_FUNC_OFFSET(22078, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, 394),
-    NAME_FUNC_OFFSET(22096, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, 395),
-    NAME_FUNC_OFFSET(22115, glMultiTexCoord3i, glMultiTexCoord3i, NULL, 396),
-    NAME_FUNC_OFFSET(22136, glMultiTexCoord3iv, glMultiTexCoord3iv, NULL, 397),
-    NAME_FUNC_OFFSET(22158, glMultiTexCoord3s, glMultiTexCoord3s, NULL, 398),
-    NAME_FUNC_OFFSET(22179, glMultiTexCoord3sv, glMultiTexCoord3sv, NULL, 399),
-    NAME_FUNC_OFFSET(22201, glMultiTexCoord4d, glMultiTexCoord4d, NULL, 400),
-    NAME_FUNC_OFFSET(22222, glMultiTexCoord4dv, glMultiTexCoord4dv, NULL, 401),
-    NAME_FUNC_OFFSET(22244, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, 402),
-    NAME_FUNC_OFFSET(22262, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, 403),
-    NAME_FUNC_OFFSET(22281, glMultiTexCoord4i, glMultiTexCoord4i, NULL, 404),
-    NAME_FUNC_OFFSET(22302, glMultiTexCoord4iv, glMultiTexCoord4iv, NULL, 405),
-    NAME_FUNC_OFFSET(22324, glMultiTexCoord4s, glMultiTexCoord4s, NULL, 406),
-    NAME_FUNC_OFFSET(22345, glMultiTexCoord4sv, glMultiTexCoord4sv, NULL, 407),
-    NAME_FUNC_OFFSET(22367, glCompressedTexImage1D, glCompressedTexImage1D, NULL, 408),
-    NAME_FUNC_OFFSET(22393, glCompressedTexImage2D, glCompressedTexImage2D, NULL, 409),
-    NAME_FUNC_OFFSET(22419, glCompressedTexImage3D, glCompressedTexImage3D, NULL, 410),
-    NAME_FUNC_OFFSET(22445, glCompressedTexImage3D, glCompressedTexImage3D, NULL, 410),
-    NAME_FUNC_OFFSET(22471, glCompressedTexSubImage1D, glCompressedTexSubImage1D, NULL, 411),
-    NAME_FUNC_OFFSET(22500, glCompressedTexSubImage2D, glCompressedTexSubImage2D, NULL, 412),
-    NAME_FUNC_OFFSET(22529, glCompressedTexSubImage3D, glCompressedTexSubImage3D, NULL, 413),
-    NAME_FUNC_OFFSET(22558, glCompressedTexSubImage3D, glCompressedTexSubImage3D, NULL, 413),
-    NAME_FUNC_OFFSET(22587, glGetCompressedTexImage, glGetCompressedTexImage, NULL, 414),
-    NAME_FUNC_OFFSET(22614, glLoadTransposeMatrixd, glLoadTransposeMatrixd, NULL, 415),
-    NAME_FUNC_OFFSET(22640, glLoadTransposeMatrixf, glLoadTransposeMatrixf, NULL, 416),
-    NAME_FUNC_OFFSET(22666, glMultTransposeMatrixd, glMultTransposeMatrixd, NULL, 417),
-    NAME_FUNC_OFFSET(22692, glMultTransposeMatrixf, glMultTransposeMatrixf, NULL, 418),
-    NAME_FUNC_OFFSET(22718, glSampleCoverage, glSampleCoverage, NULL, 419),
-    NAME_FUNC_OFFSET(22738, glBlendFuncSeparate, glBlendFuncSeparate, NULL, 420),
-    NAME_FUNC_OFFSET(22761, glBlendFuncSeparate, glBlendFuncSeparate, NULL, 420),
-    NAME_FUNC_OFFSET(22785, glBlendFuncSeparate, glBlendFuncSeparate, NULL, 420),
-    NAME_FUNC_OFFSET(22808, glFogCoordPointer, glFogCoordPointer, NULL, 421),
-    NAME_FUNC_OFFSET(22829, glFogCoordd, glFogCoordd, NULL, 422),
-    NAME_FUNC_OFFSET(22844, glFogCoorddv, glFogCoorddv, NULL, 423),
-    NAME_FUNC_OFFSET(22860, glMultiDrawArrays, glMultiDrawArrays, NULL, 424),
-    NAME_FUNC_OFFSET(22881, glPointParameterf, glPointParameterf, NULL, 425),
-    NAME_FUNC_OFFSET(22902, glPointParameterf, glPointParameterf, NULL, 425),
-    NAME_FUNC_OFFSET(22923, glPointParameterf, glPointParameterf, NULL, 425),
-    NAME_FUNC_OFFSET(22945, glPointParameterfv, glPointParameterfv, NULL, 426),
-    NAME_FUNC_OFFSET(22967, glPointParameterfv, glPointParameterfv, NULL, 426),
-    NAME_FUNC_OFFSET(22989, glPointParameterfv, glPointParameterfv, NULL, 426),
-    NAME_FUNC_OFFSET(23012, glPointParameteri, glPointParameteri, NULL, 427),
-    NAME_FUNC_OFFSET(23032, glPointParameteriv, glPointParameteriv, NULL, 428),
-    NAME_FUNC_OFFSET(23053, glSecondaryColor3b, glSecondaryColor3b, NULL, 429),
-    NAME_FUNC_OFFSET(23075, glSecondaryColor3bv, glSecondaryColor3bv, NULL, 430),
-    NAME_FUNC_OFFSET(23098, glSecondaryColor3d, glSecondaryColor3d, NULL, 431),
-    NAME_FUNC_OFFSET(23120, glSecondaryColor3dv, glSecondaryColor3dv, NULL, 432),
-    NAME_FUNC_OFFSET(23143, glSecondaryColor3i, glSecondaryColor3i, NULL, 433),
-    NAME_FUNC_OFFSET(23165, glSecondaryColor3iv, glSecondaryColor3iv, NULL, 434),
-    NAME_FUNC_OFFSET(23188, glSecondaryColor3s, glSecondaryColor3s, NULL, 435),
-    NAME_FUNC_OFFSET(23210, glSecondaryColor3sv, glSecondaryColor3sv, NULL, 436),
-    NAME_FUNC_OFFSET(23233, glSecondaryColor3ub, glSecondaryColor3ub, NULL, 437),
-    NAME_FUNC_OFFSET(23256, glSecondaryColor3ubv, glSecondaryColor3ubv, NULL, 438),
-    NAME_FUNC_OFFSET(23280, glSecondaryColor3ui, glSecondaryColor3ui, NULL, 439),
-    NAME_FUNC_OFFSET(23303, glSecondaryColor3uiv, glSecondaryColor3uiv, NULL, 440),
-    NAME_FUNC_OFFSET(23327, glSecondaryColor3us, glSecondaryColor3us, NULL, 441),
-    NAME_FUNC_OFFSET(23350, glSecondaryColor3usv, glSecondaryColor3usv, NULL, 442),
-    NAME_FUNC_OFFSET(23374, glSecondaryColorPointer, glSecondaryColorPointer, NULL, 443),
-    NAME_FUNC_OFFSET(23401, glWindowPos2d, glWindowPos2d, NULL, 444),
-    NAME_FUNC_OFFSET(23418, glWindowPos2d, glWindowPos2d, NULL, 444),
-    NAME_FUNC_OFFSET(23436, glWindowPos2dv, glWindowPos2dv, NULL, 445),
-    NAME_FUNC_OFFSET(23454, glWindowPos2dv, glWindowPos2dv, NULL, 445),
-    NAME_FUNC_OFFSET(23473, glWindowPos2f, glWindowPos2f, NULL, 446),
-    NAME_FUNC_OFFSET(23490, glWindowPos2f, glWindowPos2f, NULL, 446),
-    NAME_FUNC_OFFSET(23508, glWindowPos2fv, glWindowPos2fv, NULL, 447),
-    NAME_FUNC_OFFSET(23526, glWindowPos2fv, glWindowPos2fv, NULL, 447),
-    NAME_FUNC_OFFSET(23545, glWindowPos2i, glWindowPos2i, NULL, 448),
-    NAME_FUNC_OFFSET(23562, glWindowPos2i, glWindowPos2i, NULL, 448),
-    NAME_FUNC_OFFSET(23580, glWindowPos2iv, glWindowPos2iv, NULL, 449),
-    NAME_FUNC_OFFSET(23598, glWindowPos2iv, glWindowPos2iv, NULL, 449),
-    NAME_FUNC_OFFSET(23617, glWindowPos2s, glWindowPos2s, NULL, 450),
-    NAME_FUNC_OFFSET(23634, glWindowPos2s, glWindowPos2s, NULL, 450),
-    NAME_FUNC_OFFSET(23652, glWindowPos2sv, glWindowPos2sv, NULL, 451),
-    NAME_FUNC_OFFSET(23670, glWindowPos2sv, glWindowPos2sv, NULL, 451),
-    NAME_FUNC_OFFSET(23689, glWindowPos3d, glWindowPos3d, NULL, 452),
-    NAME_FUNC_OFFSET(23706, glWindowPos3d, glWindowPos3d, NULL, 452),
-    NAME_FUNC_OFFSET(23724, glWindowPos3dv, glWindowPos3dv, NULL, 453),
-    NAME_FUNC_OFFSET(23742, glWindowPos3dv, glWindowPos3dv, NULL, 453),
-    NAME_FUNC_OFFSET(23761, glWindowPos3f, glWindowPos3f, NULL, 454),
-    NAME_FUNC_OFFSET(23778, glWindowPos3f, glWindowPos3f, NULL, 454),
-    NAME_FUNC_OFFSET(23796, glWindowPos3fv, glWindowPos3fv, NULL, 455),
-    NAME_FUNC_OFFSET(23814, glWindowPos3fv, glWindowPos3fv, NULL, 455),
-    NAME_FUNC_OFFSET(23833, glWindowPos3i, glWindowPos3i, NULL, 456),
-    NAME_FUNC_OFFSET(23850, glWindowPos3i, glWindowPos3i, NULL, 456),
-    NAME_FUNC_OFFSET(23868, glWindowPos3iv, glWindowPos3iv, NULL, 457),
-    NAME_FUNC_OFFSET(23886, glWindowPos3iv, glWindowPos3iv, NULL, 457),
-    NAME_FUNC_OFFSET(23905, glWindowPos3s, glWindowPos3s, NULL, 458),
-    NAME_FUNC_OFFSET(23922, glWindowPos3s, glWindowPos3s, NULL, 458),
-    NAME_FUNC_OFFSET(23940, glWindowPos3sv, glWindowPos3sv, NULL, 459),
-    NAME_FUNC_OFFSET(23958, glWindowPos3sv, glWindowPos3sv, NULL, 459),
-    NAME_FUNC_OFFSET(23977, glBeginQuery, glBeginQuery, NULL, 460),
-    NAME_FUNC_OFFSET(23993, glBindBuffer, glBindBuffer, NULL, 461),
-    NAME_FUNC_OFFSET(24009, glBufferData, glBufferData, NULL, 462),
-    NAME_FUNC_OFFSET(24025, glBufferSubData, glBufferSubData, NULL, 463),
-    NAME_FUNC_OFFSET(24044, glDeleteBuffers, glDeleteBuffers, NULL, 464),
-    NAME_FUNC_OFFSET(24063, glDeleteQueries, glDeleteQueries, NULL, 465),
-    NAME_FUNC_OFFSET(24082, glEndQuery, glEndQuery, NULL, 466),
-    NAME_FUNC_OFFSET(24096, glGenBuffers, glGenBuffers, NULL, 467),
-    NAME_FUNC_OFFSET(24112, glGenQueries, glGenQueries, NULL, 468),
-    NAME_FUNC_OFFSET(24128, glGetBufferParameteriv, glGetBufferParameteriv, NULL, 469),
-    NAME_FUNC_OFFSET(24154, glGetBufferPointerv, glGetBufferPointerv, NULL, 470),
-    NAME_FUNC_OFFSET(24177, glGetBufferPointerv, glGetBufferPointerv, NULL, 470),
-    NAME_FUNC_OFFSET(24200, glGetBufferSubData, glGetBufferSubData, NULL, 471),
-    NAME_FUNC_OFFSET(24222, glGetQueryObjectiv, glGetQueryObjectiv, NULL, 472),
-    NAME_FUNC_OFFSET(24244, glGetQueryObjectuiv, glGetQueryObjectuiv, NULL, 473),
-    NAME_FUNC_OFFSET(24267, glGetQueryiv, glGetQueryiv, NULL, 474),
-    NAME_FUNC_OFFSET(24283, glIsBuffer, glIsBuffer, NULL, 475),
-    NAME_FUNC_OFFSET(24297, glIsQuery, glIsQuery, NULL, 476),
-    NAME_FUNC_OFFSET(24310, glMapBuffer, glMapBuffer, NULL, 477),
-    NAME_FUNC_OFFSET(24325, glMapBuffer, glMapBuffer, NULL, 477),
-    NAME_FUNC_OFFSET(24340, glUnmapBuffer, glUnmapBuffer, NULL, 478),
-    NAME_FUNC_OFFSET(24357, glUnmapBuffer, glUnmapBuffer, NULL, 478),
-    NAME_FUNC_OFFSET(24374, glBindAttribLocation, glBindAttribLocation, NULL, 480),
-    NAME_FUNC_OFFSET(24398, glBlendEquationSeparate, glBlendEquationSeparate, NULL, 481),
-    NAME_FUNC_OFFSET(24425, glBlendEquationSeparate, glBlendEquationSeparate, NULL, 481),
-    NAME_FUNC_OFFSET(24452, glBlendEquationSeparate, glBlendEquationSeparate, NULL, 481),
-    NAME_FUNC_OFFSET(24479, glCompileShader, glCompileShader, NULL, 482),
-    NAME_FUNC_OFFSET(24498, glDisableVertexAttribArray, glDisableVertexAttribArray, NULL, 488),
-    NAME_FUNC_OFFSET(24528, glDrawBuffers, glDrawBuffers, NULL, 489),
-    NAME_FUNC_OFFSET(24545, glDrawBuffers, glDrawBuffers, NULL, 489),
-    NAME_FUNC_OFFSET(24562, glDrawBuffers, glDrawBuffers, NULL, 489),
-    NAME_FUNC_OFFSET(24578, glEnableVertexAttribArray, glEnableVertexAttribArray, NULL, 490),
-    NAME_FUNC_OFFSET(24607, glGetActiveAttrib, glGetActiveAttrib, NULL, 491),
-    NAME_FUNC_OFFSET(24628, glGetActiveUniform, glGetActiveUniform, NULL, 492),
-    NAME_FUNC_OFFSET(24650, glGetAttribLocation, glGetAttribLocation, NULL, 494),
-    NAME_FUNC_OFFSET(24673, glGetShaderSource, glGetShaderSource, NULL, 498),
-    NAME_FUNC_OFFSET(24694, glGetUniformLocation, glGetUniformLocation, NULL, 500),
-    NAME_FUNC_OFFSET(24718, glGetUniformfv, glGetUniformfv, NULL, 501),
-    NAME_FUNC_OFFSET(24736, glGetUniformiv, glGetUniformiv, NULL, 502),
-    NAME_FUNC_OFFSET(24754, glGetVertexAttribPointerv, glGetVertexAttribPointerv, NULL, 503),
-    NAME_FUNC_OFFSET(24783, glGetVertexAttribPointerv, glGetVertexAttribPointerv, NULL, 503),
-    NAME_FUNC_OFFSET(24811, glGetVertexAttribdv, glGetVertexAttribdv, NULL, 504),
-    NAME_FUNC_OFFSET(24834, glGetVertexAttribfv, glGetVertexAttribfv, NULL, 505),
-    NAME_FUNC_OFFSET(24857, glGetVertexAttribiv, glGetVertexAttribiv, NULL, 506),
-    NAME_FUNC_OFFSET(24880, glLinkProgram, glLinkProgram, NULL, 509),
-    NAME_FUNC_OFFSET(24897, glShaderSource, glShaderSource, NULL, 510),
-    NAME_FUNC_OFFSET(24915, glStencilOpSeparate, glStencilOpSeparate, NULL, 513),
-    NAME_FUNC_OFFSET(24938, glUniform1f, glUniform1f, NULL, 514),
-    NAME_FUNC_OFFSET(24953, glUniform1fv, glUniform1fv, NULL, 515),
-    NAME_FUNC_OFFSET(24969, glUniform1i, glUniform1i, NULL, 516),
-    NAME_FUNC_OFFSET(24984, glUniform1iv, glUniform1iv, NULL, 517),
-    NAME_FUNC_OFFSET(25000, glUniform2f, glUniform2f, NULL, 518),
-    NAME_FUNC_OFFSET(25015, glUniform2fv, glUniform2fv, NULL, 519),
-    NAME_FUNC_OFFSET(25031, glUniform2i, glUniform2i, NULL, 520),
-    NAME_FUNC_OFFSET(25046, glUniform2iv, glUniform2iv, NULL, 521),
-    NAME_FUNC_OFFSET(25062, glUniform3f, glUniform3f, NULL, 522),
-    NAME_FUNC_OFFSET(25077, glUniform3fv, glUniform3fv, NULL, 523),
-    NAME_FUNC_OFFSET(25093, glUniform3i, glUniform3i, NULL, 524),
-    NAME_FUNC_OFFSET(25108, glUniform3iv, glUniform3iv, NULL, 525),
-    NAME_FUNC_OFFSET(25124, glUniform4f, glUniform4f, NULL, 526),
-    NAME_FUNC_OFFSET(25139, glUniform4fv, glUniform4fv, NULL, 527),
-    NAME_FUNC_OFFSET(25155, glUniform4i, glUniform4i, NULL, 528),
-    NAME_FUNC_OFFSET(25170, glUniform4iv, glUniform4iv, NULL, 529),
-    NAME_FUNC_OFFSET(25186, glUniformMatrix2fv, glUniformMatrix2fv, NULL, 530),
-    NAME_FUNC_OFFSET(25208, glUniformMatrix3fv, glUniformMatrix3fv, NULL, 531),
-    NAME_FUNC_OFFSET(25230, glUniformMatrix4fv, glUniformMatrix4fv, NULL, 532),
-    NAME_FUNC_OFFSET(25252, glUseProgram, glUseProgram, NULL, 533),
-    NAME_FUNC_OFFSET(25274, glValidateProgram, glValidateProgram, NULL, 534),
-    NAME_FUNC_OFFSET(25295, glVertexAttrib1d, glVertexAttrib1d, NULL, 535),
-    NAME_FUNC_OFFSET(25315, glVertexAttrib1dv, glVertexAttrib1dv, NULL, 536),
-    NAME_FUNC_OFFSET(25336, glVertexAttrib1s, glVertexAttrib1s, NULL, 537),
-    NAME_FUNC_OFFSET(25356, glVertexAttrib1sv, glVertexAttrib1sv, NULL, 538),
-    NAME_FUNC_OFFSET(25377, glVertexAttrib2d, glVertexAttrib2d, NULL, 539),
-    NAME_FUNC_OFFSET(25397, glVertexAttrib2dv, glVertexAttrib2dv, NULL, 540),
-    NAME_FUNC_OFFSET(25418, glVertexAttrib2s, glVertexAttrib2s, NULL, 541),
-    NAME_FUNC_OFFSET(25438, glVertexAttrib2sv, glVertexAttrib2sv, NULL, 542),
-    NAME_FUNC_OFFSET(25459, glVertexAttrib3d, glVertexAttrib3d, NULL, 543),
-    NAME_FUNC_OFFSET(25479, glVertexAttrib3dv, glVertexAttrib3dv, NULL, 544),
-    NAME_FUNC_OFFSET(25500, glVertexAttrib3s, glVertexAttrib3s, NULL, 545),
-    NAME_FUNC_OFFSET(25520, glVertexAttrib3sv, glVertexAttrib3sv, NULL, 546),
-    NAME_FUNC_OFFSET(25541, glVertexAttrib4Nbv, glVertexAttrib4Nbv, NULL, 547),
-    NAME_FUNC_OFFSET(25563, glVertexAttrib4Niv, glVertexAttrib4Niv, NULL, 548),
-    NAME_FUNC_OFFSET(25585, glVertexAttrib4Nsv, glVertexAttrib4Nsv, NULL, 549),
-    NAME_FUNC_OFFSET(25607, glVertexAttrib4Nub, glVertexAttrib4Nub, NULL, 550),
-    NAME_FUNC_OFFSET(25629, glVertexAttrib4Nubv, glVertexAttrib4Nubv, NULL, 551),
-    NAME_FUNC_OFFSET(25652, glVertexAttrib4Nuiv, glVertexAttrib4Nuiv, NULL, 552),
-    NAME_FUNC_OFFSET(25675, glVertexAttrib4Nusv, glVertexAttrib4Nusv, NULL, 553),
-    NAME_FUNC_OFFSET(25698, glVertexAttrib4bv, glVertexAttrib4bv, NULL, 554),
-    NAME_FUNC_OFFSET(25719, glVertexAttrib4d, glVertexAttrib4d, NULL, 555),
-    NAME_FUNC_OFFSET(25739, glVertexAttrib4dv, glVertexAttrib4dv, NULL, 556),
-    NAME_FUNC_OFFSET(25760, glVertexAttrib4iv, glVertexAttrib4iv, NULL, 557),
-    NAME_FUNC_OFFSET(25781, glVertexAttrib4s, glVertexAttrib4s, NULL, 558),
-    NAME_FUNC_OFFSET(25801, glVertexAttrib4sv, glVertexAttrib4sv, NULL, 559),
-    NAME_FUNC_OFFSET(25822, glVertexAttrib4ubv, glVertexAttrib4ubv, NULL, 560),
-    NAME_FUNC_OFFSET(25844, glVertexAttrib4uiv, glVertexAttrib4uiv, NULL, 561),
-    NAME_FUNC_OFFSET(25866, glVertexAttrib4usv, glVertexAttrib4usv, NULL, 562),
-    NAME_FUNC_OFFSET(25888, glVertexAttribPointer, glVertexAttribPointer, NULL, 563),
-    NAME_FUNC_OFFSET(25913, glBeginConditionalRender, glBeginConditionalRender, NULL, 570),
-    NAME_FUNC_OFFSET(25940, glBeginTransformFeedback, glBeginTransformFeedback, NULL, 571),
-    NAME_FUNC_OFFSET(25968, glBindBufferBase, glBindBufferBase, NULL, 572),
-    NAME_FUNC_OFFSET(25988, glBindBufferRange, glBindBufferRange, NULL, 573),
-    NAME_FUNC_OFFSET(26009, glBindFragDataLocation, glBindFragDataLocation, NULL, 574),
-    NAME_FUNC_OFFSET(26035, glClampColor, glClampColor, NULL, 575),
-    NAME_FUNC_OFFSET(26051, glColorMaski, glColorMaski, NULL, 580),
-    NAME_FUNC_OFFSET(26073, glDisablei, glDisablei, NULL, 581),
-    NAME_FUNC_OFFSET(26093, glEnablei, glEnablei, NULL, 582),
-    NAME_FUNC_OFFSET(26112, glEndConditionalRender, glEndConditionalRender, NULL, 583),
-    NAME_FUNC_OFFSET(26137, glEndTransformFeedback, glEndTransformFeedback, NULL, 584),
-    NAME_FUNC_OFFSET(26163, glGetBooleani_v, glGetBooleani_v, NULL, 585),
-    NAME_FUNC_OFFSET(26187, glGetFragDataLocation, glGetFragDataLocation, NULL, 586),
-    NAME_FUNC_OFFSET(26212, glGetIntegeri_v, glGetIntegeri_v, NULL, 587),
-    NAME_FUNC_OFFSET(26236, glGetTexParameterIiv, glGetTexParameterIiv, NULL, 589),
-    NAME_FUNC_OFFSET(26260, glGetTexParameterIuiv, glGetTexParameterIuiv, NULL, 590),
-    NAME_FUNC_OFFSET(26285, glGetTransformFeedbackVarying, glGetTransformFeedbackVarying, NULL, 591),
-    NAME_FUNC_OFFSET(26318, glGetUniformuiv, glGetUniformuiv, NULL, 592),
-    NAME_FUNC_OFFSET(26337, glGetVertexAttribIiv, glGetVertexAttribIiv, NULL, 593),
-    NAME_FUNC_OFFSET(26361, glGetVertexAttribIuiv, glGetVertexAttribIuiv, NULL, 594),
-    NAME_FUNC_OFFSET(26386, glIsEnabledi, glIsEnabledi, NULL, 595),
-    NAME_FUNC_OFFSET(26408, glTexParameterIiv, glTexParameterIiv, NULL, 596),
-    NAME_FUNC_OFFSET(26429, glTexParameterIuiv, glTexParameterIuiv, NULL, 597),
-    NAME_FUNC_OFFSET(26451, glTransformFeedbackVaryings, glTransformFeedbackVaryings, NULL, 598),
-    NAME_FUNC_OFFSET(26482, glUniform1ui, glUniform1ui, NULL, 599),
-    NAME_FUNC_OFFSET(26498, glUniform1uiv, glUniform1uiv, NULL, 600),
-    NAME_FUNC_OFFSET(26515, glUniform2ui, glUniform2ui, NULL, 601),
-    NAME_FUNC_OFFSET(26531, glUniform2uiv, glUniform2uiv, NULL, 602),
-    NAME_FUNC_OFFSET(26548, glUniform3ui, glUniform3ui, NULL, 603),
-    NAME_FUNC_OFFSET(26564, glUniform3uiv, glUniform3uiv, NULL, 604),
-    NAME_FUNC_OFFSET(26581, glUniform4ui, glUniform4ui, NULL, 605),
-    NAME_FUNC_OFFSET(26597, glUniform4uiv, glUniform4uiv, NULL, 606),
-    NAME_FUNC_OFFSET(26614, glVertexAttribI1iv, glVertexAttribI1iv, NULL, 607),
-    NAME_FUNC_OFFSET(26636, glVertexAttribI1uiv, glVertexAttribI1uiv, NULL, 608),
-    NAME_FUNC_OFFSET(26659, glVertexAttribI4bv, glVertexAttribI4bv, NULL, 609),
-    NAME_FUNC_OFFSET(26681, glVertexAttribI4sv, glVertexAttribI4sv, NULL, 610),
-    NAME_FUNC_OFFSET(26703, glVertexAttribI4ubv, glVertexAttribI4ubv, NULL, 611),
-    NAME_FUNC_OFFSET(26726, glVertexAttribI4usv, glVertexAttribI4usv, NULL, 612),
-    NAME_FUNC_OFFSET(26749, glVertexAttribIPointer, glVertexAttribIPointer, NULL, 613),
-    NAME_FUNC_OFFSET(26775, glPrimitiveRestartIndex, glPrimitiveRestartIndex, NULL, 614),
-    NAME_FUNC_OFFSET(26801, glTexBuffer, glTexBuffer, NULL, 615),
-    NAME_FUNC_OFFSET(26816, glFramebufferTexture, glFramebufferTexture, NULL, 616),
-    NAME_FUNC_OFFSET(26840, glVertexAttribDivisor, glVertexAttribDivisor, NULL, 619),
-    NAME_FUNC_OFFSET(26865, glMinSampleShading, glMinSampleShading, NULL, 620),
-    NAME_FUNC_OFFSET(26887, glBindProgramARB, glBindProgramARB, NULL, 621),
-    NAME_FUNC_OFFSET(26903, glDeleteProgramsARB, glDeleteProgramsARB, NULL, 622),
-    NAME_FUNC_OFFSET(26922, glGenProgramsARB, glGenProgramsARB, NULL, 623),
-    NAME_FUNC_OFFSET(26938, glIsProgramARB, glIsProgramARB, NULL, 630),
-    NAME_FUNC_OFFSET(26952, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, 631),
-    NAME_FUNC_OFFSET(26975, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, 632),
-    NAME_FUNC_OFFSET(26999, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, 633),
-    NAME_FUNC_OFFSET(27022, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, 634),
-    NAME_FUNC_OFFSET(27046, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, 640),
-    NAME_FUNC_OFFSET(27063, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, 641),
-    NAME_FUNC_OFFSET(27081, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, 642),
-    NAME_FUNC_OFFSET(27098, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, 643),
-    NAME_FUNC_OFFSET(27116, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, 644),
-    NAME_FUNC_OFFSET(27133, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, 645),
-    NAME_FUNC_OFFSET(27151, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, 646),
-    NAME_FUNC_OFFSET(27168, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, 647),
-    NAME_FUNC_OFFSET(27186, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 658),
-    NAME_FUNC_OFFSET(27211, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 658),
-    NAME_FUNC_OFFSET(27233, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 659),
-    NAME_FUNC_OFFSET(27260, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 659),
-    NAME_FUNC_OFFSET(27284, glBindFramebuffer, glBindFramebuffer, NULL, 660),
-    NAME_FUNC_OFFSET(27305, glBindRenderbuffer, glBindRenderbuffer, NULL, 661),
-    NAME_FUNC_OFFSET(27327, glBlitFramebuffer, glBlitFramebuffer, NULL, 662),
-    NAME_FUNC_OFFSET(27348, glCheckFramebufferStatus, glCheckFramebufferStatus, NULL, 663),
-    NAME_FUNC_OFFSET(27376, glCheckFramebufferStatus, glCheckFramebufferStatus, NULL, 663),
-    NAME_FUNC_OFFSET(27404, glDeleteFramebuffers, glDeleteFramebuffers, NULL, 664),
-    NAME_FUNC_OFFSET(27428, glDeleteFramebuffers, glDeleteFramebuffers, NULL, 664),
-    NAME_FUNC_OFFSET(27452, glDeleteRenderbuffers, glDeleteRenderbuffers, NULL, 665),
-    NAME_FUNC_OFFSET(27477, glDeleteRenderbuffers, glDeleteRenderbuffers, NULL, 665),
-    NAME_FUNC_OFFSET(27502, glFramebufferRenderbuffer, glFramebufferRenderbuffer, NULL, 666),
-    NAME_FUNC_OFFSET(27531, glFramebufferRenderbuffer, glFramebufferRenderbuffer, NULL, 666),
-    NAME_FUNC_OFFSET(27560, glFramebufferTexture1D, glFramebufferTexture1D, NULL, 667),
-    NAME_FUNC_OFFSET(27586, glFramebufferTexture2D, glFramebufferTexture2D, NULL, 668),
-    NAME_FUNC_OFFSET(27612, glFramebufferTexture2D, glFramebufferTexture2D, NULL, 668),
-    NAME_FUNC_OFFSET(27638, glFramebufferTexture3D, glFramebufferTexture3D, NULL, 669),
-    NAME_FUNC_OFFSET(27664, glFramebufferTexture3D, glFramebufferTexture3D, NULL, 669),
-    NAME_FUNC_OFFSET(27690, glFramebufferTextureLayer, glFramebufferTextureLayer, NULL, 670),
-    NAME_FUNC_OFFSET(27719, glFramebufferTextureLayer, glFramebufferTextureLayer, NULL, 670),
-    NAME_FUNC_OFFSET(27748, glGenFramebuffers, glGenFramebuffers, NULL, 671),
-    NAME_FUNC_OFFSET(27769, glGenFramebuffers, glGenFramebuffers, NULL, 671),
-    NAME_FUNC_OFFSET(27790, glGenRenderbuffers, glGenRenderbuffers, NULL, 672),
-    NAME_FUNC_OFFSET(27812, glGenRenderbuffers, glGenRenderbuffers, NULL, 672),
-    NAME_FUNC_OFFSET(27834, glGenerateMipmap, glGenerateMipmap, NULL, 673),
-    NAME_FUNC_OFFSET(27854, glGenerateMipmap, glGenerateMipmap, NULL, 673),
-    NAME_FUNC_OFFSET(27874, glGetFramebufferAttachmentParameteriv, glGetFramebufferAttachmentParameteriv, NULL, 674),
-    NAME_FUNC_OFFSET(27915, glGetFramebufferAttachmentParameteriv, glGetFramebufferAttachmentParameteriv, NULL, 674),
-    NAME_FUNC_OFFSET(27956, glGetRenderbufferParameteriv, glGetRenderbufferParameteriv, NULL, 675),
-    NAME_FUNC_OFFSET(27988, glGetRenderbufferParameteriv, glGetRenderbufferParameteriv, NULL, 675),
-    NAME_FUNC_OFFSET(28020, glIsFramebuffer, glIsFramebuffer, NULL, 676),
-    NAME_FUNC_OFFSET(28039, glIsFramebuffer, glIsFramebuffer, NULL, 676),
-    NAME_FUNC_OFFSET(28058, glIsRenderbuffer, glIsRenderbuffer, NULL, 677),
-    NAME_FUNC_OFFSET(28078, glIsRenderbuffer, glIsRenderbuffer, NULL, 677),
-    NAME_FUNC_OFFSET(28098, glRenderbufferStorage, glRenderbufferStorage, NULL, 678),
-    NAME_FUNC_OFFSET(28123, glRenderbufferStorage, glRenderbufferStorage, NULL, 678),
-    NAME_FUNC_OFFSET(28148, glRenderbufferStorageMultisample, glRenderbufferStorageMultisample, NULL, 679),
-    NAME_FUNC_OFFSET(28184, glFlushMappedBufferRange, glFlushMappedBufferRange, NULL, 681),
-    NAME_FUNC_OFFSET(28212, glMapBufferRange, glMapBufferRange, NULL, 682),
-    NAME_FUNC_OFFSET(28232, glBindVertexArray, glBindVertexArray, NULL, 683),
-    NAME_FUNC_OFFSET(28253, glDeleteVertexArrays, glDeleteVertexArrays, NULL, 684),
-    NAME_FUNC_OFFSET(28279, glDeleteVertexArrays, glDeleteVertexArrays, NULL, 684),
-    NAME_FUNC_OFFSET(28303, glGenVertexArrays, glGenVertexArrays, NULL, 685),
-    NAME_FUNC_OFFSET(28324, glIsVertexArray, glIsVertexArray, NULL, 686),
-    NAME_FUNC_OFFSET(28345, glIsVertexArray, glIsVertexArray, NULL, 686),
-    NAME_FUNC_OFFSET(28364, glProvokingVertex, glProvokingVertex, NULL, 706),
-    NAME_FUNC_OFFSET(28385, glBlendEquationSeparateiARB, glBlendEquationSeparateiARB, NULL, 711),
-    NAME_FUNC_OFFSET(28419, glBlendEquationiARB, glBlendEquationiARB, NULL, 712),
-    NAME_FUNC_OFFSET(28445, glBlendFuncSeparateiARB, glBlendFuncSeparateiARB, NULL, 713),
-    NAME_FUNC_OFFSET(28475, glBlendFunciARB, glBlendFunciARB, NULL, 714),
-    NAME_FUNC_OFFSET(28497, gl_dispatch_stub_731, gl_dispatch_stub_731, NULL, 731),
-    NAME_FUNC_OFFSET(28521, gl_dispatch_stub_732, gl_dispatch_stub_732, NULL, 732),
-    NAME_FUNC_OFFSET(28546, glClearDepthf, glClearDepthf, NULL, 785),
-    NAME_FUNC_OFFSET(28563, glDepthRangef, glDepthRangef, NULL, 786),
-    NAME_FUNC_OFFSET(28580, glGetProgramBinary, glGetProgramBinary, NULL, 790),
-    NAME_FUNC_OFFSET(28602, glProgramBinary, glProgramBinary, NULL, 791),
-    NAME_FUNC_OFFSET(28621, glProgramParameteri, glProgramParameteri, NULL, 792),
-    NAME_FUNC_OFFSET(28644, gl_dispatch_stub_876, gl_dispatch_stub_876, NULL, 876),
-    NAME_FUNC_OFFSET(28660, gl_dispatch_stub_877, gl_dispatch_stub_877, NULL, 877),
-    NAME_FUNC_OFFSET(28679, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, 940),
-    NAME_FUNC_OFFSET(28698, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, 941),
-    NAME_FUNC_OFFSET(28718, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, 942),
-    NAME_FUNC_OFFSET(28738, glFogCoordfEXT, glFogCoordfEXT, NULL, 943),
-    NAME_FUNC_OFFSET(28750, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 944),
-    NAME_FUNC_OFFSET(28763, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL, 1047),
-    NAME_FUNC_OFFSET(28781, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL, 1048),
-    NAME_FUNC_OFFSET(28800, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL, 1049),
-    NAME_FUNC_OFFSET(28818, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL, 1050),
-    NAME_FUNC_OFFSET(28837, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL, 1051),
-    NAME_FUNC_OFFSET(28856, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT, NULL, 1052),
-    NAME_FUNC_OFFSET(28876, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL, 1053),
-    NAME_FUNC_OFFSET(28894, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL, 1054),
-    NAME_FUNC_OFFSET(28913, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL, 1055),
-    NAME_FUNC_OFFSET(28932, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT, NULL, 1056),
-    NAME_FUNC_OFFSET(28952, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL, 1057),
-    NAME_FUNC_OFFSET(28970, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL, 1058),
-    NAME_FUNC_OFFSET(28989, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL, 1059),
-    NAME_FUNC_OFFSET(29008, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT, NULL, 1060),
-    NAME_FUNC_OFFSET(29028, gl_dispatch_stub_1097, gl_dispatch_stub_1097, NULL, 1097),
-    NAME_FUNC_OFFSET(29044, gl_dispatch_stub_1098, gl_dispatch_stub_1098, NULL, 1098),
-    NAME_FUNC_OFFSET(29061, gl_dispatch_stub_1099, gl_dispatch_stub_1099, NULL, 1099),
-    NAME_FUNC_OFFSET(29078, gl_dispatch_stub_1100, gl_dispatch_stub_1100, NULL, 1100),
-    NAME_FUNC_OFFSET(29091, gl_dispatch_stub_1101, gl_dispatch_stub_1101, NULL, 1101),
-    NAME_FUNC_OFFSET(29108, gl_dispatch_stub_1102, gl_dispatch_stub_1102, NULL, 1102),
-    NAME_FUNC_OFFSET(29118, gl_dispatch_stub_1103, gl_dispatch_stub_1103, NULL, 1103),
-    NAME_FUNC_OFFSET(29129, gl_dispatch_stub_1104, gl_dispatch_stub_1104, NULL, 1104),
-    NAME_FUNC_OFFSET(29143, gl_dispatch_stub_1105, gl_dispatch_stub_1105, NULL, 1105),
-    NAME_FUNC_OFFSET(29157, gl_dispatch_stub_1106, gl_dispatch_stub_1106, NULL, 1106),
-    NAME_FUNC_OFFSET(29174, gl_dispatch_stub_1107, gl_dispatch_stub_1107, NULL, 1107),
-    NAME_FUNC_OFFSET(29192, gl_dispatch_stub_1108, gl_dispatch_stub_1108, NULL, 1108),
-    NAME_FUNC_OFFSET(29204, gl_dispatch_stub_1109, gl_dispatch_stub_1109, NULL, 1109),
-    NAME_FUNC_OFFSET(29217, gl_dispatch_stub_1110, gl_dispatch_stub_1110, NULL, 1110),
-    NAME_FUNC_OFFSET(29233, gl_dispatch_stub_1111, gl_dispatch_stub_1111, NULL, 1111),
-    NAME_FUNC_OFFSET(29250, gl_dispatch_stub_1112, gl_dispatch_stub_1112, NULL, 1112),
-    NAME_FUNC_OFFSET(29265, gl_dispatch_stub_1113, gl_dispatch_stub_1113, NULL, 1113),
-    NAME_FUNC_OFFSET(29281, gl_dispatch_stub_1114, gl_dispatch_stub_1114, NULL, 1114),
-    NAME_FUNC_OFFSET(29298, gl_dispatch_stub_1115, gl_dispatch_stub_1115, NULL, 1115),
-    NAME_FUNC_OFFSET(29319, gl_dispatch_stub_1116, gl_dispatch_stub_1116, NULL, 1116),
-    NAME_FUNC_OFFSET(29333, gl_dispatch_stub_1117, gl_dispatch_stub_1117, NULL, 1117),
-    NAME_FUNC_OFFSET(29345, gl_dispatch_stub_1118, gl_dispatch_stub_1118, NULL, 1118),
-    NAME_FUNC_OFFSET(29357, gl_dispatch_stub_1119, gl_dispatch_stub_1119, NULL, 1119),
-    NAME_FUNC_OFFSET(29373, gl_dispatch_stub_1120, gl_dispatch_stub_1120, NULL, 1120),
-    NAME_FUNC_OFFSET(29393, gl_dispatch_stub_1121, gl_dispatch_stub_1121, NULL, 1121),
-    NAME_FUNC_OFFSET(29406, gl_dispatch_stub_1122, gl_dispatch_stub_1122, NULL, 1122),
-    NAME_FUNC_OFFSET(29427, gl_dispatch_stub_1123, gl_dispatch_stub_1123, NULL, 1123),
-    NAME_FUNC_OFFSET(29439, gl_dispatch_stub_1124, gl_dispatch_stub_1124, NULL, 1124),
-    NAME_FUNC_OFFSET(29452, gl_dispatch_stub_1125, gl_dispatch_stub_1125, NULL, 1125),
-    NAME_FUNC_OFFSET(29466, gl_dispatch_stub_1126, gl_dispatch_stub_1126, NULL, 1126),
-    NAME_FUNC_OFFSET(29485, gl_dispatch_stub_1127, gl_dispatch_stub_1127, NULL, 1127),
-    NAME_FUNC_OFFSET(29501, gl_dispatch_stub_1128, gl_dispatch_stub_1128, NULL, 1128),
-    NAME_FUNC_OFFSET(29517, gl_dispatch_stub_1129, gl_dispatch_stub_1129, NULL, 1129),
-    NAME_FUNC_OFFSET(29533, gl_dispatch_stub_1130, gl_dispatch_stub_1130, NULL, 1130),
-    NAME_FUNC_OFFSET(29552, gl_dispatch_stub_1131, gl_dispatch_stub_1131, NULL, 1131),
-    NAME_FUNC_OFFSET(29571, gl_dispatch_stub_1132, gl_dispatch_stub_1132, NULL, 1132),
-    NAME_FUNC_OFFSET(29586, gl_dispatch_stub_1133, gl_dispatch_stub_1133, NULL, 1133),
-    NAME_FUNC_OFFSET(29602, gl_dispatch_stub_1134, gl_dispatch_stub_1134, NULL, 1134),
-    NAME_FUNC_OFFSET(29621, gl_dispatch_stub_1135, gl_dispatch_stub_1135, NULL, 1135),
-    NAME_FUNC_OFFSET(29638, gl_dispatch_stub_1136, gl_dispatch_stub_1136, NULL, 1136),
-    NAME_FUNC_OFFSET(29661, gl_dispatch_stub_1137, gl_dispatch_stub_1137, NULL, 1137),
-    NAME_FUNC_OFFSET(29682, gl_dispatch_stub_1138, gl_dispatch_stub_1138, NULL, 1138),
-    NAME_FUNC_OFFSET(29704, gl_dispatch_stub_1139, gl_dispatch_stub_1139, NULL, 1139),
+    NAME_FUNC_OFFSET(13205, glGetGraphicsResetStatusARB, glGetGraphicsResetStatusARB, NULL, 803),
+    NAME_FUNC_OFFSET(13233, glGetnColorTableARB, glGetnColorTableARB, NULL, 804),
+    NAME_FUNC_OFFSET(13253, glGetnCompressedTexImageARB, glGetnCompressedTexImageARB, NULL, 805),
+    NAME_FUNC_OFFSET(13281, glGetnConvolutionFilterARB, glGetnConvolutionFilterARB, NULL, 806),
+    NAME_FUNC_OFFSET(13308, glGetnHistogramARB, glGetnHistogramARB, NULL, 807),
+    NAME_FUNC_OFFSET(13327, glGetnMapdvARB, glGetnMapdvARB, NULL, 808),
+    NAME_FUNC_OFFSET(13342, glGetnMapfvARB, glGetnMapfvARB, NULL, 809),
+    NAME_FUNC_OFFSET(13357, glGetnMapivARB, glGetnMapivARB, NULL, 810),
+    NAME_FUNC_OFFSET(13372, glGetnMinmaxARB, glGetnMinmaxARB, NULL, 811),
+    NAME_FUNC_OFFSET(13388, glGetnPixelMapfvARB, glGetnPixelMapfvARB, NULL, 812),
+    NAME_FUNC_OFFSET(13408, glGetnPixelMapuivARB, glGetnPixelMapuivARB, NULL, 813),
+    NAME_FUNC_OFFSET(13429, glGetnPixelMapusvARB, glGetnPixelMapusvARB, NULL, 814),
+    NAME_FUNC_OFFSET(13450, glGetnPolygonStippleARB, glGetnPolygonStippleARB, NULL, 815),
+    NAME_FUNC_OFFSET(13474, glGetnSeparableFilterARB, glGetnSeparableFilterARB, NULL, 816),
+    NAME_FUNC_OFFSET(13499, glGetnTexImageARB, glGetnTexImageARB, NULL, 817),
+    NAME_FUNC_OFFSET(13517, glGetnUniformdvARB, glGetnUniformdvARB, NULL, 818),
+    NAME_FUNC_OFFSET(13536, glGetnUniformfvARB, glGetnUniformfvARB, NULL, 819),
+    NAME_FUNC_OFFSET(13555, glGetnUniformivARB, glGetnUniformivARB, NULL, 820),
+    NAME_FUNC_OFFSET(13574, glGetnUniformuivARB, glGetnUniformuivARB, NULL, 821),
+    NAME_FUNC_OFFSET(13594, glReadnPixelsARB, glReadnPixelsARB, NULL, 822),
+    NAME_FUNC_OFFSET(13611, glDrawArraysInstancedBaseInstance, glDrawArraysInstancedBaseInstance, NULL, 823),
+    NAME_FUNC_OFFSET(13645, glDrawElementsInstancedBaseInstance, glDrawElementsInstancedBaseInstance, NULL, 824),
+    NAME_FUNC_OFFSET(13681, glDrawElementsInstancedBaseVertexBaseInstance, glDrawElementsInstancedBaseVertexBaseInstance, NULL, 825),
+    NAME_FUNC_OFFSET(13727, glDrawTransformFeedbackInstanced, glDrawTransformFeedbackInstanced, NULL, 826),
+    NAME_FUNC_OFFSET(13760, glDrawTransformFeedbackStreamInstanced, glDrawTransformFeedbackStreamInstanced, NULL, 827),
+    NAME_FUNC_OFFSET(13799, gl_dispatch_stub_828, gl_dispatch_stub_828, NULL, 828),
+    NAME_FUNC_OFFSET(13821, glGetActiveAtomicCounterBufferiv, glGetActiveAtomicCounterBufferiv, NULL, 829),
+    NAME_FUNC_OFFSET(13854, glBindImageTexture, glBindImageTexture, NULL, 830),
+    NAME_FUNC_OFFSET(13873, glMemoryBarrier, glMemoryBarrier, NULL, 831),
+    NAME_FUNC_OFFSET(13889, glTexStorage1D, glTexStorage1D, NULL, 832),
+    NAME_FUNC_OFFSET(13904, glTexStorage2D, glTexStorage2D, NULL, 833),
+    NAME_FUNC_OFFSET(13919, glTexStorage3D, glTexStorage3D, NULL, 834),
+    NAME_FUNC_OFFSET(13934, glTextureStorage1DEXT, glTextureStorage1DEXT, NULL, 835),
+    NAME_FUNC_OFFSET(13956, glTextureStorage2DEXT, glTextureStorage2DEXT, NULL, 836),
+    NAME_FUNC_OFFSET(13978, glTextureStorage3DEXT, glTextureStorage3DEXT, NULL, 837),
+    NAME_FUNC_OFFSET(14000, glClearBufferData, glClearBufferData, NULL, 838),
+    NAME_FUNC_OFFSET(14018, glClearBufferSubData, glClearBufferSubData, NULL, 839),
+    NAME_FUNC_OFFSET(14039, glDispatchCompute, glDispatchCompute, NULL, 840),
+    NAME_FUNC_OFFSET(14057, glDispatchComputeIndirect, glDispatchComputeIndirect, NULL, 841),
+    NAME_FUNC_OFFSET(14083, glTextureView, glTextureView, NULL, 842),
+    NAME_FUNC_OFFSET(14097, glBindVertexBuffer, glBindVertexBuffer, NULL, 843),
+    NAME_FUNC_OFFSET(14116, glVertexAttribBinding, glVertexAttribBinding, NULL, 844),
+    NAME_FUNC_OFFSET(14138, glVertexAttribFormat, glVertexAttribFormat, NULL, 845),
+    NAME_FUNC_OFFSET(14159, glVertexAttribIFormat, glVertexAttribIFormat, NULL, 846),
+    NAME_FUNC_OFFSET(14181, glVertexAttribLFormat, glVertexAttribLFormat, NULL, 847),
+    NAME_FUNC_OFFSET(14203, glVertexBindingDivisor, glVertexBindingDivisor, NULL, 848),
+    NAME_FUNC_OFFSET(14226, glMultiDrawArraysIndirect, glMultiDrawArraysIndirect, NULL, 849),
+    NAME_FUNC_OFFSET(14252, glMultiDrawElementsIndirect, glMultiDrawElementsIndirect, NULL, 850),
+    NAME_FUNC_OFFSET(14280, glTexBufferRange, glTexBufferRange, NULL, 851),
+    NAME_FUNC_OFFSET(14297, glTexStorage2DMultisample, glTexStorage2DMultisample, NULL, 852),
+    NAME_FUNC_OFFSET(14323, glTexStorage3DMultisample, glTexStorage3DMultisample, NULL, 853),
+    NAME_FUNC_OFFSET(14349, glBufferStorage, glBufferStorage, NULL, 854),
+    NAME_FUNC_OFFSET(14365, glInvalidateBufferData, glInvalidateBufferData, NULL, 855),
+    NAME_FUNC_OFFSET(14388, glInvalidateBufferSubData, glInvalidateBufferSubData, NULL, 856),
+    NAME_FUNC_OFFSET(14414, glInvalidateFramebuffer, glInvalidateFramebuffer, NULL, 857),
+    NAME_FUNC_OFFSET(14438, glInvalidateSubFramebuffer, glInvalidateSubFramebuffer, NULL, 858),
+    NAME_FUNC_OFFSET(14465, glInvalidateTexImage, glInvalidateTexImage, NULL, 859),
+    NAME_FUNC_OFFSET(14486, glInvalidateTexSubImage, glInvalidateTexSubImage, NULL, 860),
+    NAME_FUNC_OFFSET(14510, glPolygonOffsetEXT, glPolygonOffsetEXT, NULL, 861),
+    NAME_FUNC_OFFSET(14529, gl_dispatch_stub_862, gl_dispatch_stub_862, NULL, 862),
+    NAME_FUNC_OFFSET(14543, gl_dispatch_stub_863, gl_dispatch_stub_863, NULL, 863),
+    NAME_FUNC_OFFSET(14558, gl_dispatch_stub_864, gl_dispatch_stub_864, NULL, 864),
+    NAME_FUNC_OFFSET(14572, gl_dispatch_stub_865, gl_dispatch_stub_865, NULL, 865),
+    NAME_FUNC_OFFSET(14587, gl_dispatch_stub_866, gl_dispatch_stub_866, NULL, 866),
+    NAME_FUNC_OFFSET(14601, gl_dispatch_stub_867, gl_dispatch_stub_867, NULL, 867),
+    NAME_FUNC_OFFSET(14616, gl_dispatch_stub_868, gl_dispatch_stub_868, NULL, 868),
+    NAME_FUNC_OFFSET(14630, gl_dispatch_stub_869, gl_dispatch_stub_869, NULL, 869),
+    NAME_FUNC_OFFSET(14645, gl_dispatch_stub_870, gl_dispatch_stub_870, NULL, 870),
+    NAME_FUNC_OFFSET(14667, gl_dispatch_stub_871, gl_dispatch_stub_871, NULL, 871),
+    NAME_FUNC_OFFSET(14685, gl_dispatch_stub_872, gl_dispatch_stub_872, NULL, 872),
+    NAME_FUNC_OFFSET(14702, gl_dispatch_stub_873, gl_dispatch_stub_873, NULL, 873),
+    NAME_FUNC_OFFSET(14722, glColorPointerEXT, glColorPointerEXT, NULL, 874),
+    NAME_FUNC_OFFSET(14740, glEdgeFlagPointerEXT, glEdgeFlagPointerEXT, NULL, 875),
+    NAME_FUNC_OFFSET(14761, glIndexPointerEXT, glIndexPointerEXT, NULL, 876),
+    NAME_FUNC_OFFSET(14779, glNormalPointerEXT, glNormalPointerEXT, NULL, 877),
+    NAME_FUNC_OFFSET(14798, glTexCoordPointerEXT, glTexCoordPointerEXT, NULL, 878),
+    NAME_FUNC_OFFSET(14819, glVertexPointerEXT, glVertexPointerEXT, NULL, 879),
+    NAME_FUNC_OFFSET(14838, gl_dispatch_stub_880, gl_dispatch_stub_880, NULL, 880),
+    NAME_FUNC_OFFSET(14862, glActiveShaderProgram, glActiveShaderProgram, NULL, 881),
+    NAME_FUNC_OFFSET(14884, glBindProgramPipeline, glBindProgramPipeline, NULL, 882),
+    NAME_FUNC_OFFSET(14906, glCreateShaderProgramv, glCreateShaderProgramv, NULL, 883),
+    NAME_FUNC_OFFSET(14929, glDeleteProgramPipelines, glDeleteProgramPipelines, NULL, 884),
+    NAME_FUNC_OFFSET(14954, glGenProgramPipelines, glGenProgramPipelines, NULL, 885),
+    NAME_FUNC_OFFSET(14976, glGetProgramPipelineInfoLog, glGetProgramPipelineInfoLog, NULL, 886),
+    NAME_FUNC_OFFSET(15004, glGetProgramPipelineiv, glGetProgramPipelineiv, NULL, 887),
+    NAME_FUNC_OFFSET(15027, glIsProgramPipeline, glIsProgramPipeline, NULL, 888),
+    NAME_FUNC_OFFSET(15047, glLockArraysEXT, glLockArraysEXT, NULL, 889),
+    NAME_FUNC_OFFSET(15063, glProgramUniform1f, glProgramUniform1f, NULL, 890),
+    NAME_FUNC_OFFSET(15082, glProgramUniform1fv, glProgramUniform1fv, NULL, 891),
+    NAME_FUNC_OFFSET(15102, glProgramUniform1i, glProgramUniform1i, NULL, 892),
+    NAME_FUNC_OFFSET(15121, glProgramUniform1iv, glProgramUniform1iv, NULL, 893),
+    NAME_FUNC_OFFSET(15141, glProgramUniform1ui, glProgramUniform1ui, NULL, 894),
+    NAME_FUNC_OFFSET(15161, glProgramUniform1uiv, glProgramUniform1uiv, NULL, 895),
+    NAME_FUNC_OFFSET(15182, glProgramUniform2f, glProgramUniform2f, NULL, 896),
+    NAME_FUNC_OFFSET(15201, glProgramUniform2fv, glProgramUniform2fv, NULL, 897),
+    NAME_FUNC_OFFSET(15221, glProgramUniform2i, glProgramUniform2i, NULL, 898),
+    NAME_FUNC_OFFSET(15240, glProgramUniform2iv, glProgramUniform2iv, NULL, 899),
+    NAME_FUNC_OFFSET(15260, glProgramUniform2ui, glProgramUniform2ui, NULL, 900),
+    NAME_FUNC_OFFSET(15280, glProgramUniform2uiv, glProgramUniform2uiv, NULL, 901),
+    NAME_FUNC_OFFSET(15301, glProgramUniform3f, glProgramUniform3f, NULL, 902),
+    NAME_FUNC_OFFSET(15320, glProgramUniform3fv, glProgramUniform3fv, NULL, 903),
+    NAME_FUNC_OFFSET(15340, glProgramUniform3i, glProgramUniform3i, NULL, 904),
+    NAME_FUNC_OFFSET(15359, glProgramUniform3iv, glProgramUniform3iv, NULL, 905),
+    NAME_FUNC_OFFSET(15379, glProgramUniform3ui, glProgramUniform3ui, NULL, 906),
+    NAME_FUNC_OFFSET(15399, glProgramUniform3uiv, glProgramUniform3uiv, NULL, 907),
+    NAME_FUNC_OFFSET(15420, glProgramUniform4f, glProgramUniform4f, NULL, 908),
+    NAME_FUNC_OFFSET(15439, glProgramUniform4fv, glProgramUniform4fv, NULL, 909),
+    NAME_FUNC_OFFSET(15459, glProgramUniform4i, glProgramUniform4i, NULL, 910),
+    NAME_FUNC_OFFSET(15478, glProgramUniform4iv, glProgramUniform4iv, NULL, 911),
+    NAME_FUNC_OFFSET(15498, glProgramUniform4ui, glProgramUniform4ui, NULL, 912),
+    NAME_FUNC_OFFSET(15518, glProgramUniform4uiv, glProgramUniform4uiv, NULL, 913),
+    NAME_FUNC_OFFSET(15539, glProgramUniformMatrix2fv, glProgramUniformMatrix2fv, NULL, 914),
+    NAME_FUNC_OFFSET(15565, glProgramUniformMatrix2x3fv, glProgramUniformMatrix2x3fv, NULL, 915),
+    NAME_FUNC_OFFSET(15593, glProgramUniformMatrix2x4fv, glProgramUniformMatrix2x4fv, NULL, 916),
+    NAME_FUNC_OFFSET(15621, glProgramUniformMatrix3fv, glProgramUniformMatrix3fv, NULL, 917),
+    NAME_FUNC_OFFSET(15647, glProgramUniformMatrix3x2fv, glProgramUniformMatrix3x2fv, NULL, 918),
+    NAME_FUNC_OFFSET(15675, glProgramUniformMatrix3x4fv, glProgramUniformMatrix3x4fv, NULL, 919),
+    NAME_FUNC_OFFSET(15703, glProgramUniformMatrix4fv, glProgramUniformMatrix4fv, NULL, 920),
+    NAME_FUNC_OFFSET(15729, glProgramUniformMatrix4x2fv, glProgramUniformMatrix4x2fv, NULL, 921),
+    NAME_FUNC_OFFSET(15757, glProgramUniformMatrix4x3fv, glProgramUniformMatrix4x3fv, NULL, 922),
+    NAME_FUNC_OFFSET(15785, glUnlockArraysEXT, glUnlockArraysEXT, NULL, 923),
+    NAME_FUNC_OFFSET(15803, glUseProgramStages, glUseProgramStages, NULL, 924),
+    NAME_FUNC_OFFSET(15822, glValidateProgramPipeline, glValidateProgramPipeline, NULL, 925),
+    NAME_FUNC_OFFSET(15848, glDebugMessageCallback, glDebugMessageCallback, NULL, 926),
+    NAME_FUNC_OFFSET(15871, glDebugMessageControl, glDebugMessageControl, NULL, 927),
+    NAME_FUNC_OFFSET(15893, glDebugMessageInsert, glDebugMessageInsert, NULL, 928),
+    NAME_FUNC_OFFSET(15914, glGetDebugMessageLog, glGetDebugMessageLog, NULL, 929),
+    NAME_FUNC_OFFSET(15935, glGetObjectLabel, glGetObjectLabel, NULL, 930),
+    NAME_FUNC_OFFSET(15952, glGetObjectPtrLabel, glGetObjectPtrLabel, NULL, 931),
+    NAME_FUNC_OFFSET(15972, glObjectLabel, glObjectLabel, NULL, 932),
+    NAME_FUNC_OFFSET(15986, glObjectPtrLabel, glObjectPtrLabel, NULL, 933),
+    NAME_FUNC_OFFSET(16003, glPopDebugGroup, glPopDebugGroup, NULL, 934),
+    NAME_FUNC_OFFSET(16019, glPushDebugGroup, glPushDebugGroup, NULL, 935),
+    NAME_FUNC_OFFSET(16036, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, 936),
+    NAME_FUNC_OFFSET(16058, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, 937),
+    NAME_FUNC_OFFSET(16081, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, 938),
+    NAME_FUNC_OFFSET(16104, glFogCoordfEXT, glFogCoordfEXT, NULL, 939),
+    NAME_FUNC_OFFSET(16119, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 940),
+    NAME_FUNC_OFFSET(16135, glResizeBuffersMESA, glResizeBuffersMESA, NULL, 941),
+    NAME_FUNC_OFFSET(16155, glWindowPos4dMESA, glWindowPos4dMESA, NULL, 942),
+    NAME_FUNC_OFFSET(16173, glWindowPos4dvMESA, glWindowPos4dvMESA, NULL, 943),
+    NAME_FUNC_OFFSET(16192, glWindowPos4fMESA, glWindowPos4fMESA, NULL, 944),
+    NAME_FUNC_OFFSET(16210, glWindowPos4fvMESA, glWindowPos4fvMESA, NULL, 945),
+    NAME_FUNC_OFFSET(16229, glWindowPos4iMESA, glWindowPos4iMESA, NULL, 946),
+    NAME_FUNC_OFFSET(16247, glWindowPos4ivMESA, glWindowPos4ivMESA, NULL, 947),
+    NAME_FUNC_OFFSET(16266, glWindowPos4sMESA, glWindowPos4sMESA, NULL, 948),
+    NAME_FUNC_OFFSET(16284, glWindowPos4svMESA, glWindowPos4svMESA, NULL, 949),
+    NAME_FUNC_OFFSET(16303, gl_dispatch_stub_950, gl_dispatch_stub_950, NULL, 950),
+    NAME_FUNC_OFFSET(16328, gl_dispatch_stub_951, gl_dispatch_stub_951, NULL, 951),
+    NAME_FUNC_OFFSET(16355, glAreProgramsResidentNV, glAreProgramsResidentNV, NULL, 952),
+    NAME_FUNC_OFFSET(16379, glExecuteProgramNV, glExecuteProgramNV, NULL, 953),
+    NAME_FUNC_OFFSET(16398, glGetProgramParameterdvNV, glGetProgramParameterdvNV, NULL, 954),
+    NAME_FUNC_OFFSET(16424, glGetProgramParameterfvNV, glGetProgramParameterfvNV, NULL, 955),
+    NAME_FUNC_OFFSET(16450, glGetProgramStringNV, glGetProgramStringNV, NULL, 956),
+    NAME_FUNC_OFFSET(16471, glGetProgramivNV, glGetProgramivNV, NULL, 957),
+    NAME_FUNC_OFFSET(16488, glGetTrackMatrixivNV, glGetTrackMatrixivNV, NULL, 958),
+    NAME_FUNC_OFFSET(16509, glGetVertexAttribdvNV, glGetVertexAttribdvNV, NULL, 959),
+    NAME_FUNC_OFFSET(16531, glGetVertexAttribfvNV, glGetVertexAttribfvNV, NULL, 960),
+    NAME_FUNC_OFFSET(16553, glGetVertexAttribivNV, glGetVertexAttribivNV, NULL, 961),
+    NAME_FUNC_OFFSET(16575, glLoadProgramNV, glLoadProgramNV, NULL, 962),
+    NAME_FUNC_OFFSET(16591, glProgramParameters4dvNV, glProgramParameters4dvNV, NULL, 963),
+    NAME_FUNC_OFFSET(16616, glProgramParameters4fvNV, glProgramParameters4fvNV, NULL, 964),
+    NAME_FUNC_OFFSET(16641, glRequestResidentProgramsNV, glRequestResidentProgramsNV, NULL, 965),
+    NAME_FUNC_OFFSET(16669, glTrackMatrixNV, glTrackMatrixNV, NULL, 966),
+    NAME_FUNC_OFFSET(16685, glVertexAttrib1dNV, glVertexAttrib1dNV, NULL, 967),
+    NAME_FUNC_OFFSET(16704, glVertexAttrib1dvNV, glVertexAttrib1dvNV, NULL, 968),
+    NAME_FUNC_OFFSET(16724, glVertexAttrib1fNV, glVertexAttrib1fNV, NULL, 969),
+    NAME_FUNC_OFFSET(16743, glVertexAttrib1fvNV, glVertexAttrib1fvNV, NULL, 970),
+    NAME_FUNC_OFFSET(16763, glVertexAttrib1sNV, glVertexAttrib1sNV, NULL, 971),
+    NAME_FUNC_OFFSET(16782, glVertexAttrib1svNV, glVertexAttrib1svNV, NULL, 972),
+    NAME_FUNC_OFFSET(16802, glVertexAttrib2dNV, glVertexAttrib2dNV, NULL, 973),
+    NAME_FUNC_OFFSET(16821, glVertexAttrib2dvNV, glVertexAttrib2dvNV, NULL, 974),
+    NAME_FUNC_OFFSET(16841, glVertexAttrib2fNV, glVertexAttrib2fNV, NULL, 975),
+    NAME_FUNC_OFFSET(16860, glVertexAttrib2fvNV, glVertexAttrib2fvNV, NULL, 976),
+    NAME_FUNC_OFFSET(16880, glVertexAttrib2sNV, glVertexAttrib2sNV, NULL, 977),
+    NAME_FUNC_OFFSET(16899, glVertexAttrib2svNV, glVertexAttrib2svNV, NULL, 978),
+    NAME_FUNC_OFFSET(16919, glVertexAttrib3dNV, glVertexAttrib3dNV, NULL, 979),
+    NAME_FUNC_OFFSET(16938, glVertexAttrib3dvNV, glVertexAttrib3dvNV, NULL, 980),
+    NAME_FUNC_OFFSET(16958, glVertexAttrib3fNV, glVertexAttrib3fNV, NULL, 981),
+    NAME_FUNC_OFFSET(16977, glVertexAttrib3fvNV, glVertexAttrib3fvNV, NULL, 982),
+    NAME_FUNC_OFFSET(16997, glVertexAttrib3sNV, glVertexAttrib3sNV, NULL, 983),
+    NAME_FUNC_OFFSET(17016, glVertexAttrib3svNV, glVertexAttrib3svNV, NULL, 984),
+    NAME_FUNC_OFFSET(17036, glVertexAttrib4dNV, glVertexAttrib4dNV, NULL, 985),
+    NAME_FUNC_OFFSET(17055, glVertexAttrib4dvNV, glVertexAttrib4dvNV, NULL, 986),
+    NAME_FUNC_OFFSET(17075, glVertexAttrib4fNV, glVertexAttrib4fNV, NULL, 987),
+    NAME_FUNC_OFFSET(17094, glVertexAttrib4fvNV, glVertexAttrib4fvNV, NULL, 988),
+    NAME_FUNC_OFFSET(17114, glVertexAttrib4sNV, glVertexAttrib4sNV, NULL, 989),
+    NAME_FUNC_OFFSET(17133, glVertexAttrib4svNV, glVertexAttrib4svNV, NULL, 990),
+    NAME_FUNC_OFFSET(17153, glVertexAttrib4ubNV, glVertexAttrib4ubNV, NULL, 991),
+    NAME_FUNC_OFFSET(17173, glVertexAttrib4ubvNV, glVertexAttrib4ubvNV, NULL, 992),
+    NAME_FUNC_OFFSET(17194, glVertexAttribPointerNV, glVertexAttribPointerNV, NULL, 993),
+    NAME_FUNC_OFFSET(17218, glVertexAttribs1dvNV, glVertexAttribs1dvNV, NULL, 994),
+    NAME_FUNC_OFFSET(17239, glVertexAttribs1fvNV, glVertexAttribs1fvNV, NULL, 995),
+    NAME_FUNC_OFFSET(17260, glVertexAttribs1svNV, glVertexAttribs1svNV, NULL, 996),
+    NAME_FUNC_OFFSET(17281, glVertexAttribs2dvNV, glVertexAttribs2dvNV, NULL, 997),
+    NAME_FUNC_OFFSET(17302, glVertexAttribs2fvNV, glVertexAttribs2fvNV, NULL, 998),
+    NAME_FUNC_OFFSET(17323, glVertexAttribs2svNV, glVertexAttribs2svNV, NULL, 999),
+    NAME_FUNC_OFFSET(17344, glVertexAttribs3dvNV, glVertexAttribs3dvNV, NULL, 1000),
+    NAME_FUNC_OFFSET(17365, glVertexAttribs3fvNV, glVertexAttribs3fvNV, NULL, 1001),
+    NAME_FUNC_OFFSET(17386, glVertexAttribs3svNV, glVertexAttribs3svNV, NULL, 1002),
+    NAME_FUNC_OFFSET(17407, glVertexAttribs4dvNV, glVertexAttribs4dvNV, NULL, 1003),
+    NAME_FUNC_OFFSET(17428, glVertexAttribs4fvNV, glVertexAttribs4fvNV, NULL, 1004),
+    NAME_FUNC_OFFSET(17449, glVertexAttribs4svNV, glVertexAttribs4svNV, NULL, 1005),
+    NAME_FUNC_OFFSET(17470, glVertexAttribs4ubvNV, glVertexAttribs4ubvNV, NULL, 1006),
+    NAME_FUNC_OFFSET(17492, glGetTexBumpParameterfvATI, glGetTexBumpParameterfvATI, NULL, 1007),
+    NAME_FUNC_OFFSET(17519, glGetTexBumpParameterivATI, glGetTexBumpParameterivATI, NULL, 1008),
+    NAME_FUNC_OFFSET(17546, glTexBumpParameterfvATI, glTexBumpParameterfvATI, NULL, 1009),
+    NAME_FUNC_OFFSET(17570, glTexBumpParameterivATI, glTexBumpParameterivATI, NULL, 1010),
+    NAME_FUNC_OFFSET(17594, glAlphaFragmentOp1ATI, glAlphaFragmentOp1ATI, NULL, 1011),
+    NAME_FUNC_OFFSET(17616, glAlphaFragmentOp2ATI, glAlphaFragmentOp2ATI, NULL, 1012),
+    NAME_FUNC_OFFSET(17638, glAlphaFragmentOp3ATI, glAlphaFragmentOp3ATI, NULL, 1013),
+    NAME_FUNC_OFFSET(17660, glBeginFragmentShaderATI, glBeginFragmentShaderATI, NULL, 1014),
+    NAME_FUNC_OFFSET(17685, glBindFragmentShaderATI, glBindFragmentShaderATI, NULL, 1015),
+    NAME_FUNC_OFFSET(17709, glColorFragmentOp1ATI, glColorFragmentOp1ATI, NULL, 1016),
+    NAME_FUNC_OFFSET(17731, glColorFragmentOp2ATI, glColorFragmentOp2ATI, NULL, 1017),
+    NAME_FUNC_OFFSET(17753, glColorFragmentOp3ATI, glColorFragmentOp3ATI, NULL, 1018),
+    NAME_FUNC_OFFSET(17775, glDeleteFragmentShaderATI, glDeleteFragmentShaderATI, NULL, 1019),
+    NAME_FUNC_OFFSET(17801, glEndFragmentShaderATI, glEndFragmentShaderATI, NULL, 1020),
+    NAME_FUNC_OFFSET(17824, glGenFragmentShadersATI, glGenFragmentShadersATI, NULL, 1021),
+    NAME_FUNC_OFFSET(17848, glPassTexCoordATI, glPassTexCoordATI, NULL, 1022),
+    NAME_FUNC_OFFSET(17866, glSampleMapATI, glSampleMapATI, NULL, 1023),
+    NAME_FUNC_OFFSET(17881, glSetFragmentShaderConstantATI, glSetFragmentShaderConstantATI, NULL, 1024),
+    NAME_FUNC_OFFSET(17912, gl_dispatch_stub_1025, gl_dispatch_stub_1025, NULL, 1025),
+    NAME_FUNC_OFFSET(17935, gl_dispatch_stub_1026, gl_dispatch_stub_1026, NULL, 1026),
+    NAME_FUNC_OFFSET(17958, gl_dispatch_stub_1027, gl_dispatch_stub_1027, NULL, 1027),
+    NAME_FUNC_OFFSET(17981, glGetProgramNamedParameterdvNV, glGetProgramNamedParameterdvNV, NULL, 1028),
+    NAME_FUNC_OFFSET(18012, glGetProgramNamedParameterfvNV, glGetProgramNamedParameterfvNV, NULL, 1029),
+    NAME_FUNC_OFFSET(18043, glProgramNamedParameter4dNV, glProgramNamedParameter4dNV, NULL, 1030),
+    NAME_FUNC_OFFSET(18071, glProgramNamedParameter4dvNV, glProgramNamedParameter4dvNV, NULL, 1031),
+    NAME_FUNC_OFFSET(18100, glProgramNamedParameter4fNV, glProgramNamedParameter4fNV, NULL, 1032),
+    NAME_FUNC_OFFSET(18128, glProgramNamedParameter4fvNV, glProgramNamedParameter4fvNV, NULL, 1033),
+    NAME_FUNC_OFFSET(18157, glPrimitiveRestartNV, glPrimitiveRestartNV, NULL, 1034),
+    NAME_FUNC_OFFSET(18178, gl_dispatch_stub_1035, gl_dispatch_stub_1035, NULL, 1035),
+    NAME_FUNC_OFFSET(18195, gl_dispatch_stub_1036, gl_dispatch_stub_1036, NULL, 1036),
+    NAME_FUNC_OFFSET(18208, gl_dispatch_stub_1037, gl_dispatch_stub_1037, NULL, 1037),
+    NAME_FUNC_OFFSET(18222, gl_dispatch_stub_1038, gl_dispatch_stub_1038, NULL, 1038),
+    NAME_FUNC_OFFSET(18239, glBindFramebufferEXT, glBindFramebufferEXT, NULL, 1039),
+    NAME_FUNC_OFFSET(18260, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, 1040),
+    NAME_FUNC_OFFSET(18282, gl_dispatch_stub_1041, gl_dispatch_stub_1041, NULL, 1041),
+    NAME_FUNC_OFFSET(18306, gl_dispatch_stub_1042, gl_dispatch_stub_1042, NULL, 1042),
+    NAME_FUNC_OFFSET(18336, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL, 1043),
+    NAME_FUNC_OFFSET(18357, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL, 1044),
+    NAME_FUNC_OFFSET(18379, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL, 1045),
+    NAME_FUNC_OFFSET(18400, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL, 1046),
+    NAME_FUNC_OFFSET(18422, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL, 1047),
+    NAME_FUNC_OFFSET(18444, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT, NULL, 1048),
+    NAME_FUNC_OFFSET(18467, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL, 1049),
+    NAME_FUNC_OFFSET(18488, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL, 1050),
+    NAME_FUNC_OFFSET(18510, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL, 1051),
+    NAME_FUNC_OFFSET(18532, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT, NULL, 1052),
+    NAME_FUNC_OFFSET(18555, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL, 1053),
+    NAME_FUNC_OFFSET(18576, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL, 1054),
+    NAME_FUNC_OFFSET(18598, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL, 1055),
+    NAME_FUNC_OFFSET(18620, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT, NULL, 1056),
+    NAME_FUNC_OFFSET(18643, glClearColorIiEXT, glClearColorIiEXT, NULL, 1057),
+    NAME_FUNC_OFFSET(18661, glClearColorIuiEXT, glClearColorIuiEXT, NULL, 1058),
+    NAME_FUNC_OFFSET(18680, glBindBufferOffsetEXT, glBindBufferOffsetEXT, NULL, 1059),
+    NAME_FUNC_OFFSET(18702, glBeginPerfMonitorAMD, glBeginPerfMonitorAMD, NULL, 1060),
+    NAME_FUNC_OFFSET(18724, glDeletePerfMonitorsAMD, glDeletePerfMonitorsAMD, NULL, 1061),
+    NAME_FUNC_OFFSET(18748, glEndPerfMonitorAMD, glEndPerfMonitorAMD, NULL, 1062),
+    NAME_FUNC_OFFSET(18768, glGenPerfMonitorsAMD, glGenPerfMonitorsAMD, NULL, 1063),
+    NAME_FUNC_OFFSET(18789, glGetPerfMonitorCounterDataAMD, glGetPerfMonitorCounterDataAMD, NULL, 1064),
+    NAME_FUNC_OFFSET(18820, glGetPerfMonitorCounterInfoAMD, glGetPerfMonitorCounterInfoAMD, NULL, 1065),
+    NAME_FUNC_OFFSET(18851, glGetPerfMonitorCounterStringAMD, glGetPerfMonitorCounterStringAMD, NULL, 1066),
+    NAME_FUNC_OFFSET(18884, glGetPerfMonitorCountersAMD, glGetPerfMonitorCountersAMD, NULL, 1067),
+    NAME_FUNC_OFFSET(18912, glGetPerfMonitorGroupStringAMD, glGetPerfMonitorGroupStringAMD, NULL, 1068),
+    NAME_FUNC_OFFSET(18943, glGetPerfMonitorGroupsAMD, glGetPerfMonitorGroupsAMD, NULL, 1069),
+    NAME_FUNC_OFFSET(18969, glSelectPerfMonitorCountersAMD, glSelectPerfMonitorCountersAMD, NULL, 1070),
+    NAME_FUNC_OFFSET(19000, glGetObjectParameterivAPPLE, glGetObjectParameterivAPPLE, NULL, 1071),
+    NAME_FUNC_OFFSET(19028, glObjectPurgeableAPPLE, glObjectPurgeableAPPLE, NULL, 1072),
+    NAME_FUNC_OFFSET(19051, glObjectUnpurgeableAPPLE, glObjectUnpurgeableAPPLE, NULL, 1073),
+    NAME_FUNC_OFFSET(19076, glActiveProgramEXT, glActiveProgramEXT, NULL, 1074),
+    NAME_FUNC_OFFSET(19095, glCreateShaderProgramEXT, glCreateShaderProgramEXT, NULL, 1075),
+    NAME_FUNC_OFFSET(19120, glUseShaderProgramEXT, glUseShaderProgramEXT, NULL, 1076),
+    NAME_FUNC_OFFSET(19142, glTextureBarrierNV, glTextureBarrierNV, NULL, 1077),
+    NAME_FUNC_OFFSET(19161, glVDPAUFiniNV, glVDPAUFiniNV, NULL, 1078),
+    NAME_FUNC_OFFSET(19175, glVDPAUGetSurfaceivNV, glVDPAUGetSurfaceivNV, NULL, 1079),
+    NAME_FUNC_OFFSET(19197, glVDPAUInitNV, glVDPAUInitNV, NULL, 1080),
+    NAME_FUNC_OFFSET(19211, glVDPAUIsSurfaceNV, glVDPAUIsSurfaceNV, NULL, 1081),
+    NAME_FUNC_OFFSET(19230, glVDPAUMapSurfacesNV, glVDPAUMapSurfacesNV, NULL, 1082),
+    NAME_FUNC_OFFSET(19251, glVDPAURegisterOutputSurfaceNV, glVDPAURegisterOutputSurfaceNV, NULL, 1083),
+    NAME_FUNC_OFFSET(19282, glVDPAURegisterVideoSurfaceNV, glVDPAURegisterVideoSurfaceNV, NULL, 1084),
+    NAME_FUNC_OFFSET(19312, glVDPAUSurfaceAccessNV, glVDPAUSurfaceAccessNV, NULL, 1085),
+    NAME_FUNC_OFFSET(19335, glVDPAUUnmapSurfacesNV, glVDPAUUnmapSurfacesNV, NULL, 1086),
+    NAME_FUNC_OFFSET(19358, glVDPAUUnregisterSurfaceNV, glVDPAUUnregisterSurfaceNV, NULL, 1087),
+    NAME_FUNC_OFFSET(19385, gl_dispatch_stub_1088, gl_dispatch_stub_1088, NULL, 1088),
+    NAME_FUNC_OFFSET(19410, gl_dispatch_stub_1089, gl_dispatch_stub_1089, NULL, 1089),
+    NAME_FUNC_OFFSET(19439, gl_dispatch_stub_1090, gl_dispatch_stub_1090, NULL, 1090),
+    NAME_FUNC_OFFSET(19470, glEGLImageTargetRenderbufferStorageOES, glEGLImageTargetRenderbufferStorageOES, NULL, 1091),
+    NAME_FUNC_OFFSET(19509, glEGLImageTargetTexture2DOES, glEGLImageTargetTexture2DOES, NULL, 1092),
+    NAME_FUNC_OFFSET(19538, gl_dispatch_stub_1093, gl_dispatch_stub_1093, NULL, 1093),
+    NAME_FUNC_OFFSET(19551, gl_dispatch_stub_1094, gl_dispatch_stub_1094, NULL, 1094),
+    NAME_FUNC_OFFSET(19565, gl_dispatch_stub_1095, gl_dispatch_stub_1095, NULL, 1095),
+    NAME_FUNC_OFFSET(19579, gl_dispatch_stub_1096, gl_dispatch_stub_1096, NULL, 1096),
+    NAME_FUNC_OFFSET(19589, gl_dispatch_stub_1097, gl_dispatch_stub_1097, NULL, 1097),
+    NAME_FUNC_OFFSET(19603, gl_dispatch_stub_1098, gl_dispatch_stub_1098, NULL, 1098),
+    NAME_FUNC_OFFSET(19610, gl_dispatch_stub_1099, gl_dispatch_stub_1099, NULL, 1099),
+    NAME_FUNC_OFFSET(19618, gl_dispatch_stub_1100, gl_dispatch_stub_1100, NULL, 1100),
+    NAME_FUNC_OFFSET(19629, gl_dispatch_stub_1101, gl_dispatch_stub_1101, NULL, 1101),
+    NAME_FUNC_OFFSET(19640, gl_dispatch_stub_1102, gl_dispatch_stub_1102, NULL, 1102),
+    NAME_FUNC_OFFSET(19654, gl_dispatch_stub_1103, gl_dispatch_stub_1103, NULL, 1103),
+    NAME_FUNC_OFFSET(19669, gl_dispatch_stub_1104, gl_dispatch_stub_1104, NULL, 1104),
+    NAME_FUNC_OFFSET(19678, gl_dispatch_stub_1105, gl_dispatch_stub_1105, NULL, 1105),
+    NAME_FUNC_OFFSET(19688, gl_dispatch_stub_1106, gl_dispatch_stub_1106, NULL, 1106),
+    NAME_FUNC_OFFSET(19701, gl_dispatch_stub_1107, gl_dispatch_stub_1107, NULL, 1107),
+    NAME_FUNC_OFFSET(19715, gl_dispatch_stub_1108, gl_dispatch_stub_1108, NULL, 1108),
+    NAME_FUNC_OFFSET(19727, gl_dispatch_stub_1109, gl_dispatch_stub_1109, NULL, 1109),
+    NAME_FUNC_OFFSET(19740, gl_dispatch_stub_1110, gl_dispatch_stub_1110, NULL, 1110),
+    NAME_FUNC_OFFSET(19754, gl_dispatch_stub_1111, gl_dispatch_stub_1111, NULL, 1111),
+    NAME_FUNC_OFFSET(19772, gl_dispatch_stub_1112, gl_dispatch_stub_1112, NULL, 1112),
+    NAME_FUNC_OFFSET(19783, gl_dispatch_stub_1113, gl_dispatch_stub_1113, NULL, 1113),
+    NAME_FUNC_OFFSET(19792, gl_dispatch_stub_1114, gl_dispatch_stub_1114, NULL, 1114),
+    NAME_FUNC_OFFSET(19801, gl_dispatch_stub_1115, gl_dispatch_stub_1115, NULL, 1115),
+    NAME_FUNC_OFFSET(19814, gl_dispatch_stub_1116, gl_dispatch_stub_1116, NULL, 1116),
+    NAME_FUNC_OFFSET(19831, gl_dispatch_stub_1117, gl_dispatch_stub_1117, NULL, 1117),
+    NAME_FUNC_OFFSET(19841, gl_dispatch_stub_1118, gl_dispatch_stub_1118, NULL, 1118),
+    NAME_FUNC_OFFSET(19859, gl_dispatch_stub_1119, gl_dispatch_stub_1119, NULL, 1119),
+    NAME_FUNC_OFFSET(19868, gl_dispatch_stub_1120, gl_dispatch_stub_1120, NULL, 1120),
+    NAME_FUNC_OFFSET(19878, gl_dispatch_stub_1121, gl_dispatch_stub_1121, NULL, 1121),
+    NAME_FUNC_OFFSET(19889, gl_dispatch_stub_1122, gl_dispatch_stub_1122, NULL, 1122),
+    NAME_FUNC_OFFSET(19905, gl_dispatch_stub_1123, gl_dispatch_stub_1123, NULL, 1123),
+    NAME_FUNC_OFFSET(19918, gl_dispatch_stub_1124, gl_dispatch_stub_1124, NULL, 1124),
+    NAME_FUNC_OFFSET(19931, gl_dispatch_stub_1125, gl_dispatch_stub_1125, NULL, 1125),
+    NAME_FUNC_OFFSET(19944, gl_dispatch_stub_1126, gl_dispatch_stub_1126, NULL, 1126),
+    NAME_FUNC_OFFSET(19960, gl_dispatch_stub_1127, gl_dispatch_stub_1127, NULL, 1127),
+    NAME_FUNC_OFFSET(19976, gl_dispatch_stub_1128, gl_dispatch_stub_1128, NULL, 1128),
+    NAME_FUNC_OFFSET(19988, gl_dispatch_stub_1129, gl_dispatch_stub_1129, NULL, 1129),
+    NAME_FUNC_OFFSET(20001, gl_dispatch_stub_1130, gl_dispatch_stub_1130, NULL, 1130),
+    NAME_FUNC_OFFSET(20017, gl_dispatch_stub_1131, gl_dispatch_stub_1131, NULL, 1131),
+    NAME_FUNC_OFFSET(20031, gl_dispatch_stub_1132, gl_dispatch_stub_1132, NULL, 1132),
+    NAME_FUNC_OFFSET(20051, gl_dispatch_stub_1133, gl_dispatch_stub_1133, NULL, 1133),
+    NAME_FUNC_OFFSET(20069, gl_dispatch_stub_1134, gl_dispatch_stub_1134, NULL, 1134),
+    NAME_FUNC_OFFSET(20088, gl_dispatch_stub_1135, gl_dispatch_stub_1135, NULL, 1135),
+    NAME_FUNC_OFFSET(20105, glTexGenf, glTexGenf, NULL, 190),
+    NAME_FUNC_OFFSET(20118, glTexGenfv, glTexGenfv, NULL, 191),
+    NAME_FUNC_OFFSET(20132, glTexGeni, glTexGeni, NULL, 192),
+    NAME_FUNC_OFFSET(20145, glTexGeniv, glTexGeniv, NULL, 193),
+    NAME_FUNC_OFFSET(20159, glReadBuffer, glReadBuffer, NULL, 254),
+    NAME_FUNC_OFFSET(20174, glGetTexGenfv, glGetTexGenfv, NULL, 279),
+    NAME_FUNC_OFFSET(20191, glGetTexGeniv, glGetTexGeniv, NULL, 280),
+    NAME_FUNC_OFFSET(20208, glArrayElement, glArrayElement, NULL, 306),
+    NAME_FUNC_OFFSET(20226, glBindTexture, glBindTexture, NULL, 307),
+    NAME_FUNC_OFFSET(20243, glDrawArrays, glDrawArrays, NULL, 310),
+    NAME_FUNC_OFFSET(20259, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, 322),
+    NAME_FUNC_OFFSET(20284, glCopyTexImage1D, glCopyTexImage1D, NULL, 323),
+    NAME_FUNC_OFFSET(20304, glCopyTexImage2D, glCopyTexImage2D, NULL, 324),
+    NAME_FUNC_OFFSET(20324, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, 325),
+    NAME_FUNC_OFFSET(20347, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, 326),
+    NAME_FUNC_OFFSET(20370, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, 327),
+    NAME_FUNC_OFFSET(20390, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, 328),
+    NAME_FUNC_OFFSET(20407, glGetPointerv, glGetPointerv, NULL, 329),
+    NAME_FUNC_OFFSET(20424, glIsTexture, glIsTextureEXT, glIsTextureEXT, 330),
+    NAME_FUNC_OFFSET(20439, glPrioritizeTextures, glPrioritizeTextures, NULL, 331),
+    NAME_FUNC_OFFSET(20463, glTexSubImage1D, glTexSubImage1D, NULL, 332),
+    NAME_FUNC_OFFSET(20482, glTexSubImage2D, glTexSubImage2D, NULL, 333),
+    NAME_FUNC_OFFSET(20501, glBlendColor, glBlendColor, NULL, 336),
+    NAME_FUNC_OFFSET(20517, glBlendEquation, glBlendEquation, NULL, 337),
+    NAME_FUNC_OFFSET(20536, glBlendEquation, glBlendEquation, NULL, 337),
+    NAME_FUNC_OFFSET(20555, glDrawRangeElements, glDrawRangeElements, NULL, 338),
+    NAME_FUNC_OFFSET(20578, glColorTable, glColorTable, NULL, 339),
+    NAME_FUNC_OFFSET(20594, glColorTable, glColorTable, NULL, 339),
+    NAME_FUNC_OFFSET(20610, glColorTableParameterfv, glColorTableParameterfv, NULL, 340),
+    NAME_FUNC_OFFSET(20637, glColorTableParameteriv, glColorTableParameteriv, NULL, 341),
+    NAME_FUNC_OFFSET(20664, glCopyColorTable, glCopyColorTable, NULL, 342),
+    NAME_FUNC_OFFSET(20684, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, 343),
+    NAME_FUNC_OFFSET(20703, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, 343),
+    NAME_FUNC_OFFSET(20722, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, 344),
+    NAME_FUNC_OFFSET(20752, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, 344),
+    NAME_FUNC_OFFSET(20782, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, 345),
+    NAME_FUNC_OFFSET(20812, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, 345),
+    NAME_FUNC_OFFSET(20842, glColorSubTable, glColorSubTable, NULL, 346),
+    NAME_FUNC_OFFSET(20861, glCopyColorSubTable, glCopyColorSubTable, NULL, 347),
+    NAME_FUNC_OFFSET(20884, glConvolutionFilter1D, glConvolutionFilter1D, NULL, 348),
+    NAME_FUNC_OFFSET(20909, glConvolutionFilter2D, glConvolutionFilter2D, NULL, 349),
+    NAME_FUNC_OFFSET(20934, glConvolutionParameterf, glConvolutionParameterf, NULL, 350),
+    NAME_FUNC_OFFSET(20961, glConvolutionParameterfv, glConvolutionParameterfv, NULL, 351),
+    NAME_FUNC_OFFSET(20989, glConvolutionParameteri, glConvolutionParameteri, NULL, 352),
+    NAME_FUNC_OFFSET(21016, glConvolutionParameteriv, glConvolutionParameteriv, NULL, 353),
+    NAME_FUNC_OFFSET(21044, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, 354),
+    NAME_FUNC_OFFSET(21073, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, 355),
+    NAME_FUNC_OFFSET(21102, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, 356),
+    NAME_FUNC_OFFSET(21128, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, 357),
+    NAME_FUNC_OFFSET(21159, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, 358),
+    NAME_FUNC_OFFSET(21190, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, 359),
+    NAME_FUNC_OFFSET(21214, glSeparableFilter2D, glSeparableFilter2D, NULL, 360),
+    NAME_FUNC_OFFSET(21237, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, 361),
+    NAME_FUNC_OFFSET(21255, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, 362),
+    NAME_FUNC_OFFSET(21284, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, 363),
+    NAME_FUNC_OFFSET(21313, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, 364),
+    NAME_FUNC_OFFSET(21328, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, 365),
+    NAME_FUNC_OFFSET(21354, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, 366),
+    NAME_FUNC_OFFSET(21380, glHistogram, glHistogram, NULL, 367),
+    NAME_FUNC_OFFSET(21395, glMinmax, glMinmax, NULL, 368),
+    NAME_FUNC_OFFSET(21407, glResetHistogram, glResetHistogram, NULL, 369),
+    NAME_FUNC_OFFSET(21427, glResetMinmax, glResetMinmax, NULL, 370),
+    NAME_FUNC_OFFSET(21444, glTexImage3D, glTexImage3D, NULL, 371),
+    NAME_FUNC_OFFSET(21460, glTexImage3D, glTexImage3D, NULL, 371),
+    NAME_FUNC_OFFSET(21476, glTexSubImage3D, glTexSubImage3D, NULL, 372),
+    NAME_FUNC_OFFSET(21495, glTexSubImage3D, glTexSubImage3D, NULL, 372),
+    NAME_FUNC_OFFSET(21514, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, 373),
+    NAME_FUNC_OFFSET(21537, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, 373),
+    NAME_FUNC_OFFSET(21560, glActiveTexture, glActiveTexture, NULL, 374),
+    NAME_FUNC_OFFSET(21579, glClientActiveTexture, glClientActiveTexture, NULL, 375),
+    NAME_FUNC_OFFSET(21604, glMultiTexCoord1d, glMultiTexCoord1d, NULL, 376),
+    NAME_FUNC_OFFSET(21625, glMultiTexCoord1dv, glMultiTexCoord1dv, NULL, 377),
+    NAME_FUNC_OFFSET(21647, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, 378),
+    NAME_FUNC_OFFSET(21665, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, 379),
+    NAME_FUNC_OFFSET(21684, glMultiTexCoord1i, glMultiTexCoord1i, NULL, 380),
+    NAME_FUNC_OFFSET(21705, glMultiTexCoord1iv, glMultiTexCoord1iv, NULL, 381),
+    NAME_FUNC_OFFSET(21727, glMultiTexCoord1s, glMultiTexCoord1s, NULL, 382),
+    NAME_FUNC_OFFSET(21748, glMultiTexCoord1sv, glMultiTexCoord1sv, NULL, 383),
+    NAME_FUNC_OFFSET(21770, glMultiTexCoord2d, glMultiTexCoord2d, NULL, 384),
+    NAME_FUNC_OFFSET(21791, glMultiTexCoord2dv, glMultiTexCoord2dv, NULL, 385),
+    NAME_FUNC_OFFSET(21813, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, 386),
+    NAME_FUNC_OFFSET(21831, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, 387),
+    NAME_FUNC_OFFSET(21850, glMultiTexCoord2i, glMultiTexCoord2i, NULL, 388),
+    NAME_FUNC_OFFSET(21871, glMultiTexCoord2iv, glMultiTexCoord2iv, NULL, 389),
+    NAME_FUNC_OFFSET(21893, glMultiTexCoord2s, glMultiTexCoord2s, NULL, 390),
+    NAME_FUNC_OFFSET(21914, glMultiTexCoord2sv, glMultiTexCoord2sv, NULL, 391),
+    NAME_FUNC_OFFSET(21936, glMultiTexCoord3d, glMultiTexCoord3d, NULL, 392),
+    NAME_FUNC_OFFSET(21957, glMultiTexCoord3dv, glMultiTexCoord3dv, NULL, 393),
+    NAME_FUNC_OFFSET(21979, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, 394),
+    NAME_FUNC_OFFSET(21997, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, 395),
+    NAME_FUNC_OFFSET(22016, glMultiTexCoord3i, glMultiTexCoord3i, NULL, 396),
+    NAME_FUNC_OFFSET(22037, glMultiTexCoord3iv, glMultiTexCoord3iv, NULL, 397),
+    NAME_FUNC_OFFSET(22059, glMultiTexCoord3s, glMultiTexCoord3s, NULL, 398),
+    NAME_FUNC_OFFSET(22080, glMultiTexCoord3sv, glMultiTexCoord3sv, NULL, 399),
+    NAME_FUNC_OFFSET(22102, glMultiTexCoord4d, glMultiTexCoord4d, NULL, 400),
+    NAME_FUNC_OFFSET(22123, glMultiTexCoord4dv, glMultiTexCoord4dv, NULL, 401),
+    NAME_FUNC_OFFSET(22145, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, 402),
+    NAME_FUNC_OFFSET(22163, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, 403),
+    NAME_FUNC_OFFSET(22182, glMultiTexCoord4i, glMultiTexCoord4i, NULL, 404),
+    NAME_FUNC_OFFSET(22203, glMultiTexCoord4iv, glMultiTexCoord4iv, NULL, 405),
+    NAME_FUNC_OFFSET(22225, glMultiTexCoord4s, glMultiTexCoord4s, NULL, 406),
+    NAME_FUNC_OFFSET(22246, glMultiTexCoord4sv, glMultiTexCoord4sv, NULL, 407),
+    NAME_FUNC_OFFSET(22268, glCompressedTexImage1D, glCompressedTexImage1D, NULL, 408),
+    NAME_FUNC_OFFSET(22294, glCompressedTexImage2D, glCompressedTexImage2D, NULL, 409),
+    NAME_FUNC_OFFSET(22320, glCompressedTexImage3D, glCompressedTexImage3D, NULL, 410),
+    NAME_FUNC_OFFSET(22346, glCompressedTexImage3D, glCompressedTexImage3D, NULL, 410),
+    NAME_FUNC_OFFSET(22372, glCompressedTexSubImage1D, glCompressedTexSubImage1D, NULL, 411),
+    NAME_FUNC_OFFSET(22401, glCompressedTexSubImage2D, glCompressedTexSubImage2D, NULL, 412),
+    NAME_FUNC_OFFSET(22430, glCompressedTexSubImage3D, glCompressedTexSubImage3D, NULL, 413),
+    NAME_FUNC_OFFSET(22459, glCompressedTexSubImage3D, glCompressedTexSubImage3D, NULL, 413),
+    NAME_FUNC_OFFSET(22488, glGetCompressedTexImage, glGetCompressedTexImage, NULL, 414),
+    NAME_FUNC_OFFSET(22515, glLoadTransposeMatrixd, glLoadTransposeMatrixd, NULL, 415),
+    NAME_FUNC_OFFSET(22541, glLoadTransposeMatrixf, glLoadTransposeMatrixf, NULL, 416),
+    NAME_FUNC_OFFSET(22567, glMultTransposeMatrixd, glMultTransposeMatrixd, NULL, 417),
+    NAME_FUNC_OFFSET(22593, glMultTransposeMatrixf, glMultTransposeMatrixf, NULL, 418),
+    NAME_FUNC_OFFSET(22619, glSampleCoverage, glSampleCoverage, NULL, 419),
+    NAME_FUNC_OFFSET(22639, glBlendFuncSeparate, glBlendFuncSeparate, NULL, 420),
+    NAME_FUNC_OFFSET(22662, glBlendFuncSeparate, glBlendFuncSeparate, NULL, 420),
+    NAME_FUNC_OFFSET(22686, glBlendFuncSeparate, glBlendFuncSeparate, NULL, 420),
+    NAME_FUNC_OFFSET(22709, glFogCoordPointer, glFogCoordPointer, NULL, 421),
+    NAME_FUNC_OFFSET(22730, glFogCoordd, glFogCoordd, NULL, 422),
+    NAME_FUNC_OFFSET(22745, glFogCoorddv, glFogCoorddv, NULL, 423),
+    NAME_FUNC_OFFSET(22761, glMultiDrawArrays, glMultiDrawArrays, NULL, 424),
+    NAME_FUNC_OFFSET(22782, glPointParameterf, glPointParameterf, NULL, 425),
+    NAME_FUNC_OFFSET(22803, glPointParameterf, glPointParameterf, NULL, 425),
+    NAME_FUNC_OFFSET(22824, glPointParameterf, glPointParameterf, NULL, 425),
+    NAME_FUNC_OFFSET(22846, glPointParameterfv, glPointParameterfv, NULL, 426),
+    NAME_FUNC_OFFSET(22868, glPointParameterfv, glPointParameterfv, NULL, 426),
+    NAME_FUNC_OFFSET(22890, glPointParameterfv, glPointParameterfv, NULL, 426),
+    NAME_FUNC_OFFSET(22913, glPointParameteri, glPointParameteri, NULL, 427),
+    NAME_FUNC_OFFSET(22933, glPointParameteriv, glPointParameteriv, NULL, 428),
+    NAME_FUNC_OFFSET(22954, glSecondaryColor3b, glSecondaryColor3b, NULL, 429),
+    NAME_FUNC_OFFSET(22976, glSecondaryColor3bv, glSecondaryColor3bv, NULL, 430),
+    NAME_FUNC_OFFSET(22999, glSecondaryColor3d, glSecondaryColor3d, NULL, 431),
+    NAME_FUNC_OFFSET(23021, glSecondaryColor3dv, glSecondaryColor3dv, NULL, 432),
+    NAME_FUNC_OFFSET(23044, glSecondaryColor3i, glSecondaryColor3i, NULL, 433),
+    NAME_FUNC_OFFSET(23066, glSecondaryColor3iv, glSecondaryColor3iv, NULL, 434),
+    NAME_FUNC_OFFSET(23089, glSecondaryColor3s, glSecondaryColor3s, NULL, 435),
+    NAME_FUNC_OFFSET(23111, glSecondaryColor3sv, glSecondaryColor3sv, NULL, 436),
+    NAME_FUNC_OFFSET(23134, glSecondaryColor3ub, glSecondaryColor3ub, NULL, 437),
+    NAME_FUNC_OFFSET(23157, glSecondaryColor3ubv, glSecondaryColor3ubv, NULL, 438),
+    NAME_FUNC_OFFSET(23181, glSecondaryColor3ui, glSecondaryColor3ui, NULL, 439),
+    NAME_FUNC_OFFSET(23204, glSecondaryColor3uiv, glSecondaryColor3uiv, NULL, 440),
+    NAME_FUNC_OFFSET(23228, glSecondaryColor3us, glSecondaryColor3us, NULL, 441),
+    NAME_FUNC_OFFSET(23251, glSecondaryColor3usv, glSecondaryColor3usv, NULL, 442),
+    NAME_FUNC_OFFSET(23275, glSecondaryColorPointer, glSecondaryColorPointer, NULL, 443),
+    NAME_FUNC_OFFSET(23302, glWindowPos2d, glWindowPos2d, NULL, 444),
+    NAME_FUNC_OFFSET(23319, glWindowPos2d, glWindowPos2d, NULL, 444),
+    NAME_FUNC_OFFSET(23337, glWindowPos2dv, glWindowPos2dv, NULL, 445),
+    NAME_FUNC_OFFSET(23355, glWindowPos2dv, glWindowPos2dv, NULL, 445),
+    NAME_FUNC_OFFSET(23374, glWindowPos2f, glWindowPos2f, NULL, 446),
+    NAME_FUNC_OFFSET(23391, glWindowPos2f, glWindowPos2f, NULL, 446),
+    NAME_FUNC_OFFSET(23409, glWindowPos2fv, glWindowPos2fv, NULL, 447),
+    NAME_FUNC_OFFSET(23427, glWindowPos2fv, glWindowPos2fv, NULL, 447),
+    NAME_FUNC_OFFSET(23446, glWindowPos2i, glWindowPos2i, NULL, 448),
+    NAME_FUNC_OFFSET(23463, glWindowPos2i, glWindowPos2i, NULL, 448),
+    NAME_FUNC_OFFSET(23481, glWindowPos2iv, glWindowPos2iv, NULL, 449),
+    NAME_FUNC_OFFSET(23499, glWindowPos2iv, glWindowPos2iv, NULL, 449),
+    NAME_FUNC_OFFSET(23518, glWindowPos2s, glWindowPos2s, NULL, 450),
+    NAME_FUNC_OFFSET(23535, glWindowPos2s, glWindowPos2s, NULL, 450),
+    NAME_FUNC_OFFSET(23553, glWindowPos2sv, glWindowPos2sv, NULL, 451),
+    NAME_FUNC_OFFSET(23571, glWindowPos2sv, glWindowPos2sv, NULL, 451),
+    NAME_FUNC_OFFSET(23590, glWindowPos3d, glWindowPos3d, NULL, 452),
+    NAME_FUNC_OFFSET(23607, glWindowPos3d, glWindowPos3d, NULL, 452),
+    NAME_FUNC_OFFSET(23625, glWindowPos3dv, glWindowPos3dv, NULL, 453),
+    NAME_FUNC_OFFSET(23643, glWindowPos3dv, glWindowPos3dv, NULL, 453),
+    NAME_FUNC_OFFSET(23662, glWindowPos3f, glWindowPos3f, NULL, 454),
+    NAME_FUNC_OFFSET(23679, glWindowPos3f, glWindowPos3f, NULL, 454),
+    NAME_FUNC_OFFSET(23697, glWindowPos3fv, glWindowPos3fv, NULL, 455),
+    NAME_FUNC_OFFSET(23715, glWindowPos3fv, glWindowPos3fv, NULL, 455),
+    NAME_FUNC_OFFSET(23734, glWindowPos3i, glWindowPos3i, NULL, 456),
+    NAME_FUNC_OFFSET(23751, glWindowPos3i, glWindowPos3i, NULL, 456),
+    NAME_FUNC_OFFSET(23769, glWindowPos3iv, glWindowPos3iv, NULL, 457),
+    NAME_FUNC_OFFSET(23787, glWindowPos3iv, glWindowPos3iv, NULL, 457),
+    NAME_FUNC_OFFSET(23806, glWindowPos3s, glWindowPos3s, NULL, 458),
+    NAME_FUNC_OFFSET(23823, glWindowPos3s, glWindowPos3s, NULL, 458),
+    NAME_FUNC_OFFSET(23841, glWindowPos3sv, glWindowPos3sv, NULL, 459),
+    NAME_FUNC_OFFSET(23859, glWindowPos3sv, glWindowPos3sv, NULL, 459),
+    NAME_FUNC_OFFSET(23878, glBeginQuery, glBeginQuery, NULL, 460),
+    NAME_FUNC_OFFSET(23894, glBindBuffer, glBindBuffer, NULL, 461),
+    NAME_FUNC_OFFSET(23910, glBufferData, glBufferData, NULL, 462),
+    NAME_FUNC_OFFSET(23926, glBufferSubData, glBufferSubData, NULL, 463),
+    NAME_FUNC_OFFSET(23945, glDeleteBuffers, glDeleteBuffers, NULL, 464),
+    NAME_FUNC_OFFSET(23964, glDeleteQueries, glDeleteQueries, NULL, 465),
+    NAME_FUNC_OFFSET(23983, glEndQuery, glEndQuery, NULL, 466),
+    NAME_FUNC_OFFSET(23997, glGenBuffers, glGenBuffers, NULL, 467),
+    NAME_FUNC_OFFSET(24013, glGenQueries, glGenQueries, NULL, 468),
+    NAME_FUNC_OFFSET(24029, glGetBufferParameteriv, glGetBufferParameteriv, NULL, 469),
+    NAME_FUNC_OFFSET(24055, glGetBufferPointerv, glGetBufferPointerv, NULL, 470),
+    NAME_FUNC_OFFSET(24078, glGetBufferPointerv, glGetBufferPointerv, NULL, 470),
+    NAME_FUNC_OFFSET(24101, glGetBufferSubData, glGetBufferSubData, NULL, 471),
+    NAME_FUNC_OFFSET(24123, glGetQueryObjectiv, glGetQueryObjectiv, NULL, 472),
+    NAME_FUNC_OFFSET(24145, glGetQueryObjectuiv, glGetQueryObjectuiv, NULL, 473),
+    NAME_FUNC_OFFSET(24168, glGetQueryiv, glGetQueryiv, NULL, 474),
+    NAME_FUNC_OFFSET(24184, glIsBuffer, glIsBuffer, NULL, 475),
+    NAME_FUNC_OFFSET(24198, glIsQuery, glIsQuery, NULL, 476),
+    NAME_FUNC_OFFSET(24211, glMapBuffer, glMapBuffer, NULL, 477),
+    NAME_FUNC_OFFSET(24226, glMapBuffer, glMapBuffer, NULL, 477),
+    NAME_FUNC_OFFSET(24241, glUnmapBuffer, glUnmapBuffer, NULL, 478),
+    NAME_FUNC_OFFSET(24258, glUnmapBuffer, glUnmapBuffer, NULL, 478),
+    NAME_FUNC_OFFSET(24275, glBindAttribLocation, glBindAttribLocation, NULL, 480),
+    NAME_FUNC_OFFSET(24299, glBlendEquationSeparate, glBlendEquationSeparate, NULL, 481),
+    NAME_FUNC_OFFSET(24326, glBlendEquationSeparate, glBlendEquationSeparate, NULL, 481),
+    NAME_FUNC_OFFSET(24353, glBlendEquationSeparate, glBlendEquationSeparate, NULL, 481),
+    NAME_FUNC_OFFSET(24380, glCompileShader, glCompileShader, NULL, 482),
+    NAME_FUNC_OFFSET(24399, glDisableVertexAttribArray, glDisableVertexAttribArray, NULL, 488),
+    NAME_FUNC_OFFSET(24429, glDrawBuffers, glDrawBuffers, NULL, 489),
+    NAME_FUNC_OFFSET(24446, glDrawBuffers, glDrawBuffers, NULL, 489),
+    NAME_FUNC_OFFSET(24463, glDrawBuffers, glDrawBuffers, NULL, 489),
+    NAME_FUNC_OFFSET(24479, glEnableVertexAttribArray, glEnableVertexAttribArray, NULL, 490),
+    NAME_FUNC_OFFSET(24508, glGetActiveAttrib, glGetActiveAttrib, NULL, 491),
+    NAME_FUNC_OFFSET(24529, glGetActiveUniform, glGetActiveUniform, NULL, 492),
+    NAME_FUNC_OFFSET(24551, glGetAttribLocation, glGetAttribLocation, NULL, 494),
+    NAME_FUNC_OFFSET(24574, glGetShaderSource, glGetShaderSource, NULL, 498),
+    NAME_FUNC_OFFSET(24595, glGetUniformLocation, glGetUniformLocation, NULL, 500),
+    NAME_FUNC_OFFSET(24619, glGetUniformfv, glGetUniformfv, NULL, 501),
+    NAME_FUNC_OFFSET(24637, glGetUniformiv, glGetUniformiv, NULL, 502),
+    NAME_FUNC_OFFSET(24655, glGetVertexAttribPointerv, glGetVertexAttribPointerv, NULL, 503),
+    NAME_FUNC_OFFSET(24684, glGetVertexAttribPointerv, glGetVertexAttribPointerv, NULL, 503),
+    NAME_FUNC_OFFSET(24712, glGetVertexAttribdv, glGetVertexAttribdv, NULL, 504),
+    NAME_FUNC_OFFSET(24735, glGetVertexAttribfv, glGetVertexAttribfv, NULL, 505),
+    NAME_FUNC_OFFSET(24758, glGetVertexAttribiv, glGetVertexAttribiv, NULL, 506),
+    NAME_FUNC_OFFSET(24781, glLinkProgram, glLinkProgram, NULL, 509),
+    NAME_FUNC_OFFSET(24798, glShaderSource, glShaderSource, NULL, 510),
+    NAME_FUNC_OFFSET(24816, glStencilOpSeparate, glStencilOpSeparate, NULL, 513),
+    NAME_FUNC_OFFSET(24839, glUniform1f, glUniform1f, NULL, 514),
+    NAME_FUNC_OFFSET(24854, glUniform1fv, glUniform1fv, NULL, 515),
+    NAME_FUNC_OFFSET(24870, glUniform1i, glUniform1i, NULL, 516),
+    NAME_FUNC_OFFSET(24885, glUniform1iv, glUniform1iv, NULL, 517),
+    NAME_FUNC_OFFSET(24901, glUniform2f, glUniform2f, NULL, 518),
+    NAME_FUNC_OFFSET(24916, glUniform2fv, glUniform2fv, NULL, 519),
+    NAME_FUNC_OFFSET(24932, glUniform2i, glUniform2i, NULL, 520),
+    NAME_FUNC_OFFSET(24947, glUniform2iv, glUniform2iv, NULL, 521),
+    NAME_FUNC_OFFSET(24963, glUniform3f, glUniform3f, NULL, 522),
+    NAME_FUNC_OFFSET(24978, glUniform3fv, glUniform3fv, NULL, 523),
+    NAME_FUNC_OFFSET(24994, glUniform3i, glUniform3i, NULL, 524),
+    NAME_FUNC_OFFSET(25009, glUniform3iv, glUniform3iv, NULL, 525),
+    NAME_FUNC_OFFSET(25025, glUniform4f, glUniform4f, NULL, 526),
+    NAME_FUNC_OFFSET(25040, glUniform4fv, glUniform4fv, NULL, 527),
+    NAME_FUNC_OFFSET(25056, glUniform4i, glUniform4i, NULL, 528),
+    NAME_FUNC_OFFSET(25071, glUniform4iv, glUniform4iv, NULL, 529),
+    NAME_FUNC_OFFSET(25087, glUniformMatrix2fv, glUniformMatrix2fv, NULL, 530),
+    NAME_FUNC_OFFSET(25109, glUniformMatrix3fv, glUniformMatrix3fv, NULL, 531),
+    NAME_FUNC_OFFSET(25131, glUniformMatrix4fv, glUniformMatrix4fv, NULL, 532),
+    NAME_FUNC_OFFSET(25153, glUseProgram, glUseProgram, NULL, 533),
+    NAME_FUNC_OFFSET(25175, glValidateProgram, glValidateProgram, NULL, 534),
+    NAME_FUNC_OFFSET(25196, glVertexAttrib1d, glVertexAttrib1d, NULL, 535),
+    NAME_FUNC_OFFSET(25216, glVertexAttrib1dv, glVertexAttrib1dv, NULL, 536),
+    NAME_FUNC_OFFSET(25237, glVertexAttrib1s, glVertexAttrib1s, NULL, 537),
+    NAME_FUNC_OFFSET(25257, glVertexAttrib1sv, glVertexAttrib1sv, NULL, 538),
+    NAME_FUNC_OFFSET(25278, glVertexAttrib2d, glVertexAttrib2d, NULL, 539),
+    NAME_FUNC_OFFSET(25298, glVertexAttrib2dv, glVertexAttrib2dv, NULL, 540),
+    NAME_FUNC_OFFSET(25319, glVertexAttrib2s, glVertexAttrib2s, NULL, 541),
+    NAME_FUNC_OFFSET(25339, glVertexAttrib2sv, glVertexAttrib2sv, NULL, 542),
+    NAME_FUNC_OFFSET(25360, glVertexAttrib3d, glVertexAttrib3d, NULL, 543),
+    NAME_FUNC_OFFSET(25380, glVertexAttrib3dv, glVertexAttrib3dv, NULL, 544),
+    NAME_FUNC_OFFSET(25401, glVertexAttrib3s, glVertexAttrib3s, NULL, 545),
+    NAME_FUNC_OFFSET(25421, glVertexAttrib3sv, glVertexAttrib3sv, NULL, 546),
+    NAME_FUNC_OFFSET(25442, glVertexAttrib4Nbv, glVertexAttrib4Nbv, NULL, 547),
+    NAME_FUNC_OFFSET(25464, glVertexAttrib4Niv, glVertexAttrib4Niv, NULL, 548),
+    NAME_FUNC_OFFSET(25486, glVertexAttrib4Nsv, glVertexAttrib4Nsv, NULL, 549),
+    NAME_FUNC_OFFSET(25508, glVertexAttrib4Nub, glVertexAttrib4Nub, NULL, 550),
+    NAME_FUNC_OFFSET(25530, glVertexAttrib4Nubv, glVertexAttrib4Nubv, NULL, 551),
+    NAME_FUNC_OFFSET(25553, glVertexAttrib4Nuiv, glVertexAttrib4Nuiv, NULL, 552),
+    NAME_FUNC_OFFSET(25576, glVertexAttrib4Nusv, glVertexAttrib4Nusv, NULL, 553),
+    NAME_FUNC_OFFSET(25599, glVertexAttrib4bv, glVertexAttrib4bv, NULL, 554),
+    NAME_FUNC_OFFSET(25620, glVertexAttrib4d, glVertexAttrib4d, NULL, 555),
+    NAME_FUNC_OFFSET(25640, glVertexAttrib4dv, glVertexAttrib4dv, NULL, 556),
+    NAME_FUNC_OFFSET(25661, glVertexAttrib4iv, glVertexAttrib4iv, NULL, 557),
+    NAME_FUNC_OFFSET(25682, glVertexAttrib4s, glVertexAttrib4s, NULL, 558),
+    NAME_FUNC_OFFSET(25702, glVertexAttrib4sv, glVertexAttrib4sv, NULL, 559),
+    NAME_FUNC_OFFSET(25723, glVertexAttrib4ubv, glVertexAttrib4ubv, NULL, 560),
+    NAME_FUNC_OFFSET(25745, glVertexAttrib4uiv, glVertexAttrib4uiv, NULL, 561),
+    NAME_FUNC_OFFSET(25767, glVertexAttrib4usv, glVertexAttrib4usv, NULL, 562),
+    NAME_FUNC_OFFSET(25789, glVertexAttribPointer, glVertexAttribPointer, NULL, 563),
+    NAME_FUNC_OFFSET(25814, glBeginConditionalRender, glBeginConditionalRender, NULL, 570),
+    NAME_FUNC_OFFSET(25841, glBeginTransformFeedback, glBeginTransformFeedback, NULL, 571),
+    NAME_FUNC_OFFSET(25869, glBindBufferBase, glBindBufferBase, NULL, 572),
+    NAME_FUNC_OFFSET(25889, glBindBufferRange, glBindBufferRange, NULL, 573),
+    NAME_FUNC_OFFSET(25910, glBindFragDataLocation, glBindFragDataLocation, NULL, 574),
+    NAME_FUNC_OFFSET(25936, glClampColor, glClampColor, NULL, 575),
+    NAME_FUNC_OFFSET(25952, glColorMaski, glColorMaski, NULL, 580),
+    NAME_FUNC_OFFSET(25974, glDisablei, glDisablei, NULL, 581),
+    NAME_FUNC_OFFSET(25994, glEnablei, glEnablei, NULL, 582),
+    NAME_FUNC_OFFSET(26013, glEndConditionalRender, glEndConditionalRender, NULL, 583),
+    NAME_FUNC_OFFSET(26038, glEndTransformFeedback, glEndTransformFeedback, NULL, 584),
+    NAME_FUNC_OFFSET(26064, glGetBooleani_v, glGetBooleani_v, NULL, 585),
+    NAME_FUNC_OFFSET(26088, glGetFragDataLocation, glGetFragDataLocation, NULL, 586),
+    NAME_FUNC_OFFSET(26113, glGetIntegeri_v, glGetIntegeri_v, NULL, 587),
+    NAME_FUNC_OFFSET(26137, glGetTexParameterIiv, glGetTexParameterIiv, NULL, 589),
+    NAME_FUNC_OFFSET(26161, glGetTexParameterIuiv, glGetTexParameterIuiv, NULL, 590),
+    NAME_FUNC_OFFSET(26186, glGetTransformFeedbackVarying, glGetTransformFeedbackVarying, NULL, 591),
+    NAME_FUNC_OFFSET(26219, glGetUniformuiv, glGetUniformuiv, NULL, 592),
+    NAME_FUNC_OFFSET(26238, glGetVertexAttribIiv, glGetVertexAttribIiv, NULL, 593),
+    NAME_FUNC_OFFSET(26262, glGetVertexAttribIuiv, glGetVertexAttribIuiv, NULL, 594),
+    NAME_FUNC_OFFSET(26287, glIsEnabledi, glIsEnabledi, NULL, 595),
+    NAME_FUNC_OFFSET(26309, glTexParameterIiv, glTexParameterIiv, NULL, 596),
+    NAME_FUNC_OFFSET(26330, glTexParameterIuiv, glTexParameterIuiv, NULL, 597),
+    NAME_FUNC_OFFSET(26352, glTransformFeedbackVaryings, glTransformFeedbackVaryings, NULL, 598),
+    NAME_FUNC_OFFSET(26383, glUniform1ui, glUniform1ui, NULL, 599),
+    NAME_FUNC_OFFSET(26399, glUniform1uiv, glUniform1uiv, NULL, 600),
+    NAME_FUNC_OFFSET(26416, glUniform2ui, glUniform2ui, NULL, 601),
+    NAME_FUNC_OFFSET(26432, glUniform2uiv, glUniform2uiv, NULL, 602),
+    NAME_FUNC_OFFSET(26449, glUniform3ui, glUniform3ui, NULL, 603),
+    NAME_FUNC_OFFSET(26465, glUniform3uiv, glUniform3uiv, NULL, 604),
+    NAME_FUNC_OFFSET(26482, glUniform4ui, glUniform4ui, NULL, 605),
+    NAME_FUNC_OFFSET(26498, glUniform4uiv, glUniform4uiv, NULL, 606),
+    NAME_FUNC_OFFSET(26515, glVertexAttribI1iv, glVertexAttribI1iv, NULL, 607),
+    NAME_FUNC_OFFSET(26537, glVertexAttribI1uiv, glVertexAttribI1uiv, NULL, 608),
+    NAME_FUNC_OFFSET(26560, glVertexAttribI4bv, glVertexAttribI4bv, NULL, 609),
+    NAME_FUNC_OFFSET(26582, glVertexAttribI4sv, glVertexAttribI4sv, NULL, 610),
+    NAME_FUNC_OFFSET(26604, glVertexAttribI4ubv, glVertexAttribI4ubv, NULL, 611),
+    NAME_FUNC_OFFSET(26627, glVertexAttribI4usv, glVertexAttribI4usv, NULL, 612),
+    NAME_FUNC_OFFSET(26650, glVertexAttribIPointer, glVertexAttribIPointer, NULL, 613),
+    NAME_FUNC_OFFSET(26676, glPrimitiveRestartIndex, glPrimitiveRestartIndex, NULL, 614),
+    NAME_FUNC_OFFSET(26702, glTexBuffer, glTexBuffer, NULL, 615),
+    NAME_FUNC_OFFSET(26717, glFramebufferTexture, glFramebufferTexture, NULL, 616),
+    NAME_FUNC_OFFSET(26741, glVertexAttribDivisor, glVertexAttribDivisor, NULL, 619),
+    NAME_FUNC_OFFSET(26766, glMinSampleShading, glMinSampleShading, NULL, 620),
+    NAME_FUNC_OFFSET(26788, glBindProgramARB, glBindProgramARB, NULL, 621),
+    NAME_FUNC_OFFSET(26804, glDeleteProgramsARB, glDeleteProgramsARB, NULL, 622),
+    NAME_FUNC_OFFSET(26823, glGenProgramsARB, glGenProgramsARB, NULL, 623),
+    NAME_FUNC_OFFSET(26839, glIsProgramARB, glIsProgramARB, NULL, 630),
+    NAME_FUNC_OFFSET(26853, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, 631),
+    NAME_FUNC_OFFSET(26876, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, 632),
+    NAME_FUNC_OFFSET(26900, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, 633),
+    NAME_FUNC_OFFSET(26923, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, 634),
+    NAME_FUNC_OFFSET(26947, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, 640),
+    NAME_FUNC_OFFSET(26964, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, 641),
+    NAME_FUNC_OFFSET(26982, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, 642),
+    NAME_FUNC_OFFSET(26999, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, 643),
+    NAME_FUNC_OFFSET(27017, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, 644),
+    NAME_FUNC_OFFSET(27034, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, 645),
+    NAME_FUNC_OFFSET(27052, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, 646),
+    NAME_FUNC_OFFSET(27069, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, 647),
+    NAME_FUNC_OFFSET(27087, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 658),
+    NAME_FUNC_OFFSET(27112, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 658),
+    NAME_FUNC_OFFSET(27134, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 659),
+    NAME_FUNC_OFFSET(27161, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 659),
+    NAME_FUNC_OFFSET(27185, glBindFramebuffer, glBindFramebuffer, NULL, 660),
+    NAME_FUNC_OFFSET(27206, glBindRenderbuffer, glBindRenderbuffer, NULL, 661),
+    NAME_FUNC_OFFSET(27228, glBlitFramebuffer, glBlitFramebuffer, NULL, 662),
+    NAME_FUNC_OFFSET(27249, glCheckFramebufferStatus, glCheckFramebufferStatus, NULL, 663),
+    NAME_FUNC_OFFSET(27277, glCheckFramebufferStatus, glCheckFramebufferStatus, NULL, 663),
+    NAME_FUNC_OFFSET(27305, glDeleteFramebuffers, glDeleteFramebuffers, NULL, 664),
+    NAME_FUNC_OFFSET(27329, glDeleteFramebuffers, glDeleteFramebuffers, NULL, 664),
+    NAME_FUNC_OFFSET(27353, glDeleteRenderbuffers, glDeleteRenderbuffers, NULL, 665),
+    NAME_FUNC_OFFSET(27378, glDeleteRenderbuffers, glDeleteRenderbuffers, NULL, 665),
+    NAME_FUNC_OFFSET(27403, glFramebufferRenderbuffer, glFramebufferRenderbuffer, NULL, 666),
+    NAME_FUNC_OFFSET(27432, glFramebufferRenderbuffer, glFramebufferRenderbuffer, NULL, 666),
+    NAME_FUNC_OFFSET(27461, glFramebufferTexture1D, glFramebufferTexture1D, NULL, 667),
+    NAME_FUNC_OFFSET(27487, glFramebufferTexture2D, glFramebufferTexture2D, NULL, 668),
+    NAME_FUNC_OFFSET(27513, glFramebufferTexture2D, glFramebufferTexture2D, NULL, 668),
+    NAME_FUNC_OFFSET(27539, glFramebufferTexture3D, glFramebufferTexture3D, NULL, 669),
+    NAME_FUNC_OFFSET(27565, glFramebufferTexture3D, glFramebufferTexture3D, NULL, 669),
+    NAME_FUNC_OFFSET(27591, glFramebufferTextureLayer, glFramebufferTextureLayer, NULL, 670),
+    NAME_FUNC_OFFSET(27620, glFramebufferTextureLayer, glFramebufferTextureLayer, NULL, 670),
+    NAME_FUNC_OFFSET(27649, glGenFramebuffers, glGenFramebuffers, NULL, 671),
+    NAME_FUNC_OFFSET(27670, glGenFramebuffers, glGenFramebuffers, NULL, 671),
+    NAME_FUNC_OFFSET(27691, glGenRenderbuffers, glGenRenderbuffers, NULL, 672),
+    NAME_FUNC_OFFSET(27713, glGenRenderbuffers, glGenRenderbuffers, NULL, 672),
+    NAME_FUNC_OFFSET(27735, glGenerateMipmap, glGenerateMipmap, NULL, 673),
+    NAME_FUNC_OFFSET(27755, glGenerateMipmap, glGenerateMipmap, NULL, 673),
+    NAME_FUNC_OFFSET(27775, glGetFramebufferAttachmentParameteriv, glGetFramebufferAttachmentParameteriv, NULL, 674),
+    NAME_FUNC_OFFSET(27816, glGetFramebufferAttachmentParameteriv, glGetFramebufferAttachmentParameteriv, NULL, 674),
+    NAME_FUNC_OFFSET(27857, glGetRenderbufferParameteriv, glGetRenderbufferParameteriv, NULL, 675),
+    NAME_FUNC_OFFSET(27889, glGetRenderbufferParameteriv, glGetRenderbufferParameteriv, NULL, 675),
+    NAME_FUNC_OFFSET(27921, glIsFramebuffer, glIsFramebuffer, NULL, 676),
+    NAME_FUNC_OFFSET(27940, glIsFramebuffer, glIsFramebuffer, NULL, 676),
+    NAME_FUNC_OFFSET(27959, glIsRenderbuffer, glIsRenderbuffer, NULL, 677),
+    NAME_FUNC_OFFSET(27979, glIsRenderbuffer, glIsRenderbuffer, NULL, 677),
+    NAME_FUNC_OFFSET(27999, glRenderbufferStorage, glRenderbufferStorage, NULL, 678),
+    NAME_FUNC_OFFSET(28024, glRenderbufferStorage, glRenderbufferStorage, NULL, 678),
+    NAME_FUNC_OFFSET(28049, glRenderbufferStorageMultisample, glRenderbufferStorageMultisample, NULL, 679),
+    NAME_FUNC_OFFSET(28085, glFlushMappedBufferRange, glFlushMappedBufferRange, NULL, 681),
+    NAME_FUNC_OFFSET(28113, glMapBufferRange, glMapBufferRange, NULL, 682),
+    NAME_FUNC_OFFSET(28133, glBindVertexArray, glBindVertexArray, NULL, 683),
+    NAME_FUNC_OFFSET(28154, glDeleteVertexArrays, glDeleteVertexArrays, NULL, 684),
+    NAME_FUNC_OFFSET(28180, glDeleteVertexArrays, glDeleteVertexArrays, NULL, 684),
+    NAME_FUNC_OFFSET(28204, glGenVertexArrays, glGenVertexArrays, NULL, 685),
+    NAME_FUNC_OFFSET(28225, glIsVertexArray, glIsVertexArray, NULL, 686),
+    NAME_FUNC_OFFSET(28246, glIsVertexArray, glIsVertexArray, NULL, 686),
+    NAME_FUNC_OFFSET(28265, glProvokingVertex, glProvokingVertex, NULL, 706),
+    NAME_FUNC_OFFSET(28286, glBlendEquationSeparateiARB, glBlendEquationSeparateiARB, NULL, 711),
+    NAME_FUNC_OFFSET(28320, glBlendEquationiARB, glBlendEquationiARB, NULL, 712),
+    NAME_FUNC_OFFSET(28346, glBlendFuncSeparateiARB, glBlendFuncSeparateiARB, NULL, 713),
+    NAME_FUNC_OFFSET(28376, glBlendFunciARB, glBlendFunciARB, NULL, 714),
+    NAME_FUNC_OFFSET(28398, gl_dispatch_stub_731, gl_dispatch_stub_731, NULL, 731),
+    NAME_FUNC_OFFSET(28422, gl_dispatch_stub_732, gl_dispatch_stub_732, NULL, 732),
+    NAME_FUNC_OFFSET(28447, glClearDepthf, glClearDepthf, NULL, 785),
+    NAME_FUNC_OFFSET(28464, glDepthRangef, glDepthRangef, NULL, 786),
+    NAME_FUNC_OFFSET(28481, glGetProgramBinary, glGetProgramBinary, NULL, 790),
+    NAME_FUNC_OFFSET(28503, glProgramBinary, glProgramBinary, NULL, 791),
+    NAME_FUNC_OFFSET(28522, glProgramParameteri, glProgramParameteri, NULL, 792),
+    NAME_FUNC_OFFSET(28545, gl_dispatch_stub_872, gl_dispatch_stub_872, NULL, 872),
+    NAME_FUNC_OFFSET(28561, gl_dispatch_stub_873, gl_dispatch_stub_873, NULL, 873),
+    NAME_FUNC_OFFSET(28580, glDebugMessageCallback, glDebugMessageCallback, NULL, 926),
+    NAME_FUNC_OFFSET(28606, glDebugMessageControl, glDebugMessageControl, NULL, 927),
+    NAME_FUNC_OFFSET(28631, glDebugMessageInsert, glDebugMessageInsert, NULL, 928),
+    NAME_FUNC_OFFSET(28655, glGetDebugMessageLog, glGetDebugMessageLog, NULL, 929),
+    NAME_FUNC_OFFSET(28679, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, 936),
+    NAME_FUNC_OFFSET(28698, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, 937),
+    NAME_FUNC_OFFSET(28718, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, 938),
+    NAME_FUNC_OFFSET(28738, glFogCoordfEXT, glFogCoordfEXT, NULL, 939),
+    NAME_FUNC_OFFSET(28750, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 940),
+    NAME_FUNC_OFFSET(28763, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL, 1043),
+    NAME_FUNC_OFFSET(28781, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL, 1044),
+    NAME_FUNC_OFFSET(28800, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL, 1045),
+    NAME_FUNC_OFFSET(28818, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL, 1046),
+    NAME_FUNC_OFFSET(28837, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL, 1047),
+    NAME_FUNC_OFFSET(28856, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT, NULL, 1048),
+    NAME_FUNC_OFFSET(28876, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL, 1049),
+    NAME_FUNC_OFFSET(28894, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL, 1050),
+    NAME_FUNC_OFFSET(28913, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL, 1051),
+    NAME_FUNC_OFFSET(28932, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT, NULL, 1052),
+    NAME_FUNC_OFFSET(28952, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL, 1053),
+    NAME_FUNC_OFFSET(28970, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL, 1054),
+    NAME_FUNC_OFFSET(28989, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL, 1055),
+    NAME_FUNC_OFFSET(29008, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT, NULL, 1056),
+    NAME_FUNC_OFFSET(29028, gl_dispatch_stub_1093, gl_dispatch_stub_1093, NULL, 1093),
+    NAME_FUNC_OFFSET(29044, gl_dispatch_stub_1094, gl_dispatch_stub_1094, NULL, 1094),
+    NAME_FUNC_OFFSET(29061, gl_dispatch_stub_1095, gl_dispatch_stub_1095, NULL, 1095),
+    NAME_FUNC_OFFSET(29078, gl_dispatch_stub_1096, gl_dispatch_stub_1096, NULL, 1096),
+    NAME_FUNC_OFFSET(29091, gl_dispatch_stub_1097, gl_dispatch_stub_1097, NULL, 1097),
+    NAME_FUNC_OFFSET(29108, gl_dispatch_stub_1098, gl_dispatch_stub_1098, NULL, 1098),
+    NAME_FUNC_OFFSET(29118, gl_dispatch_stub_1099, gl_dispatch_stub_1099, NULL, 1099),
+    NAME_FUNC_OFFSET(29129, gl_dispatch_stub_1100, gl_dispatch_stub_1100, NULL, 1100),
+    NAME_FUNC_OFFSET(29143, gl_dispatch_stub_1101, gl_dispatch_stub_1101, NULL, 1101),
+    NAME_FUNC_OFFSET(29157, gl_dispatch_stub_1102, gl_dispatch_stub_1102, NULL, 1102),
+    NAME_FUNC_OFFSET(29174, gl_dispatch_stub_1103, gl_dispatch_stub_1103, NULL, 1103),
+    NAME_FUNC_OFFSET(29192, gl_dispatch_stub_1104, gl_dispatch_stub_1104, NULL, 1104),
+    NAME_FUNC_OFFSET(29204, gl_dispatch_stub_1105, gl_dispatch_stub_1105, NULL, 1105),
+    NAME_FUNC_OFFSET(29217, gl_dispatch_stub_1106, gl_dispatch_stub_1106, NULL, 1106),
+    NAME_FUNC_OFFSET(29233, gl_dispatch_stub_1107, gl_dispatch_stub_1107, NULL, 1107),
+    NAME_FUNC_OFFSET(29250, gl_dispatch_stub_1108, gl_dispatch_stub_1108, NULL, 1108),
+    NAME_FUNC_OFFSET(29265, gl_dispatch_stub_1109, gl_dispatch_stub_1109, NULL, 1109),
+    NAME_FUNC_OFFSET(29281, gl_dispatch_stub_1110, gl_dispatch_stub_1110, NULL, 1110),
+    NAME_FUNC_OFFSET(29298, gl_dispatch_stub_1111, gl_dispatch_stub_1111, NULL, 1111),
+    NAME_FUNC_OFFSET(29319, gl_dispatch_stub_1112, gl_dispatch_stub_1112, NULL, 1112),
+    NAME_FUNC_OFFSET(29333, gl_dispatch_stub_1113, gl_dispatch_stub_1113, NULL, 1113),
+    NAME_FUNC_OFFSET(29345, gl_dispatch_stub_1114, gl_dispatch_stub_1114, NULL, 1114),
+    NAME_FUNC_OFFSET(29357, gl_dispatch_stub_1115, gl_dispatch_stub_1115, NULL, 1115),
+    NAME_FUNC_OFFSET(29373, gl_dispatch_stub_1116, gl_dispatch_stub_1116, NULL, 1116),
+    NAME_FUNC_OFFSET(29393, gl_dispatch_stub_1117, gl_dispatch_stub_1117, NULL, 1117),
+    NAME_FUNC_OFFSET(29406, gl_dispatch_stub_1118, gl_dispatch_stub_1118, NULL, 1118),
+    NAME_FUNC_OFFSET(29427, gl_dispatch_stub_1119, gl_dispatch_stub_1119, NULL, 1119),
+    NAME_FUNC_OFFSET(29439, gl_dispatch_stub_1120, gl_dispatch_stub_1120, NULL, 1120),
+    NAME_FUNC_OFFSET(29452, gl_dispatch_stub_1121, gl_dispatch_stub_1121, NULL, 1121),
+    NAME_FUNC_OFFSET(29466, gl_dispatch_stub_1122, gl_dispatch_stub_1122, NULL, 1122),
+    NAME_FUNC_OFFSET(29485, gl_dispatch_stub_1123, gl_dispatch_stub_1123, NULL, 1123),
+    NAME_FUNC_OFFSET(29501, gl_dispatch_stub_1124, gl_dispatch_stub_1124, NULL, 1124),
+    NAME_FUNC_OFFSET(29517, gl_dispatch_stub_1125, gl_dispatch_stub_1125, NULL, 1125),
+    NAME_FUNC_OFFSET(29533, gl_dispatch_stub_1126, gl_dispatch_stub_1126, NULL, 1126),
+    NAME_FUNC_OFFSET(29552, gl_dispatch_stub_1127, gl_dispatch_stub_1127, NULL, 1127),
+    NAME_FUNC_OFFSET(29571, gl_dispatch_stub_1128, gl_dispatch_stub_1128, NULL, 1128),
+    NAME_FUNC_OFFSET(29586, gl_dispatch_stub_1129, gl_dispatch_stub_1129, NULL, 1129),
+    NAME_FUNC_OFFSET(29602, gl_dispatch_stub_1130, gl_dispatch_stub_1130, NULL, 1130),
+    NAME_FUNC_OFFSET(29621, gl_dispatch_stub_1131, gl_dispatch_stub_1131, NULL, 1131),
+    NAME_FUNC_OFFSET(29638, gl_dispatch_stub_1132, gl_dispatch_stub_1132, NULL, 1132),
+    NAME_FUNC_OFFSET(29661, gl_dispatch_stub_1133, gl_dispatch_stub_1133, NULL, 1133),
+    NAME_FUNC_OFFSET(29682, gl_dispatch_stub_1134, gl_dispatch_stub_1134, NULL, 1134),
+    NAME_FUNC_OFFSET(29704, gl_dispatch_stub_1135, gl_dispatch_stub_1135, NULL, 1135),
     NAME_FUNC_OFFSET(-1, NULL, NULL, NULL, 0)
 };
 
diff --git a/xorg-server/glx/remap_helper.h b/xorg-server/glx/remap_helper.h
index eac065709..efef7806c 100644
--- a/xorg-server/glx/remap_helper.h
+++ b/xorg-server/glx/remap_helper.h
@@ -457,5529 +457,5517 @@ static const char _mesa_function_pool[] =
    "iiipp\0"
    "glGetActiveUniformName\0"
    "\0"
-   /* _mesa_function_pool[2958]: DebugMessageControlARB (will be remapped) */
-   "iiiipi\0"
-   "glDebugMessageControlARB\0"
-   "\0"
-   /* _mesa_function_pool[2991]: GetnUniformivARB (will be remapped) */
+   /* _mesa_function_pool[2958]: GetnUniformivARB (will be remapped) */
    "iiip\0"
    "glGetnUniformivARB\0"
    "\0"
-   /* _mesa_function_pool[3016]: ReleaseShaderCompiler (will be remapped) */
+   /* _mesa_function_pool[2983]: ReleaseShaderCompiler (will be remapped) */
    "\0"
    "glReleaseShaderCompiler\0"
    "\0"
-   /* _mesa_function_pool[3042]: BlendFuncSeparate (will be remapped) */
+   /* _mesa_function_pool[3009]: BlendFuncSeparate (will be remapped) */
    "iiii\0"
    "glBlendFuncSeparate\0"
    "glBlendFuncSeparateEXT\0"
    "glBlendFuncSeparateINGR\0"
    "glBlendFuncSeparateOES\0"
    "\0"
-   /* _mesa_function_pool[3138]: Color3us (offset 23) */
+   /* _mesa_function_pool[3105]: Color3us (offset 23) */
    "iii\0"
    "glColor3us\0"
    "\0"
-   /* _mesa_function_pool[3154]: MultiDrawArraysIndirect (will be remapped) */
+   /* _mesa_function_pool[3121]: MultiDrawArraysIndirect (will be remapped) */
    "ipii\0"
    "glMultiDrawArraysIndirect\0"
    "\0"
-   /* _mesa_function_pool[3186]: BufferStorage (will be remapped) */
+   /* _mesa_function_pool[3153]: BufferStorage (will be remapped) */
    "iipi\0"
    "glBufferStorage\0"
    "\0"
-   /* _mesa_function_pool[3208]: Color3ub (offset 19) */
+   /* _mesa_function_pool[3175]: Color3ub (offset 19) */
    "iii\0"
    "glColor3ub\0"
    "\0"
-   /* _mesa_function_pool[3224]: GetInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[3191]: GetInstrumentsSGIX (dynamic) */
    "\0"
    "glGetInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[3247]: Color3ui (offset 21) */
+   /* _mesa_function_pool[3214]: Color3ui (offset 21) */
    "iii\0"
    "glColor3ui\0"
    "\0"
-   /* _mesa_function_pool[3263]: VertexAttrib4dvNV (will be remapped) */
+   /* _mesa_function_pool[3230]: VertexAttrib4dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4dvNV\0"
    "\0"
-   /* _mesa_function_pool[3287]: AlphaFragmentOp2ATI (will be remapped) */
+   /* _mesa_function_pool[3254]: AlphaFragmentOp2ATI (will be remapped) */
    "iiiiiiiii\0"
    "glAlphaFragmentOp2ATI\0"
    "\0"
-   /* _mesa_function_pool[3320]: RasterPos4dv (offset 79) */
+   /* _mesa_function_pool[3287]: RasterPos4dv (offset 79) */
    "p\0"
    "glRasterPos4dv\0"
    "\0"
-   /* _mesa_function_pool[3338]: DeleteProgramPipelines (will be remapped) */
+   /* _mesa_function_pool[3305]: DeleteProgramPipelines (will be remapped) */
    "ip\0"
    "glDeleteProgramPipelines\0"
    "\0"
-   /* _mesa_function_pool[3367]: LineWidthx (will be remapped) */
+   /* _mesa_function_pool[3334]: LineWidthx (will be remapped) */
    "i\0"
    "glLineWidthxOES\0"
    "glLineWidthx\0"
    "\0"
-   /* _mesa_function_pool[3399]: Indexdv (offset 45) */
+   /* _mesa_function_pool[3366]: Indexdv (offset 45) */
    "p\0"
    "glIndexdv\0"
    "\0"
-   /* _mesa_function_pool[3412]: GetnPixelMapfvARB (will be remapped) */
+   /* _mesa_function_pool[3379]: GetnPixelMapfvARB (will be remapped) */
    "iip\0"
    "glGetnPixelMapfvARB\0"
    "\0"
-   /* _mesa_function_pool[3437]: EGLImageTargetTexture2DOES (will be remapped) */
+   /* _mesa_function_pool[3404]: EGLImageTargetTexture2DOES (will be remapped) */
    "ip\0"
    "glEGLImageTargetTexture2DOES\0"
    "\0"
-   /* _mesa_function_pool[3470]: DepthMask (offset 211) */
+   /* _mesa_function_pool[3437]: DepthMask (offset 211) */
    "i\0"
    "glDepthMask\0"
    "\0"
-   /* _mesa_function_pool[3485]: WindowPos4ivMESA (will be remapped) */
+   /* _mesa_function_pool[3452]: WindowPos4ivMESA (will be remapped) */
    "p\0"
    "glWindowPos4ivMESA\0"
    "\0"
-   /* _mesa_function_pool[3507]: GetShaderInfoLog (will be remapped) */
+   /* _mesa_function_pool[3474]: GetShaderInfoLog (will be remapped) */
    "iipp\0"
    "glGetShaderInfoLog\0"
    "\0"
-   /* _mesa_function_pool[3532]: BindFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[3499]: BindFragmentShaderATI (will be remapped) */
    "i\0"
    "glBindFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[3559]: BlendFuncSeparateiARB (will be remapped) */
+   /* _mesa_function_pool[3526]: BlendFuncSeparateiARB (will be remapped) */
    "iiiii\0"
    "glBlendFuncSeparateiARB\0"
    "glBlendFuncSeparateIndexedAMD\0"
    "\0"
-   /* _mesa_function_pool[3620]: PixelTexGenParameteriSGIS (dynamic) */
+   /* _mesa_function_pool[3587]: PixelTexGenParameteriSGIS (dynamic) */
    "ii\0"
    "glPixelTexGenParameteriSGIS\0"
    "\0"
-   /* _mesa_function_pool[3652]: EGLImageTargetRenderbufferStorageOES (will be remapped) */
+   /* _mesa_function_pool[3619]: EGLImageTargetRenderbufferStorageOES (will be remapped) */
    "ip\0"
    "glEGLImageTargetRenderbufferStorageOES\0"
    "\0"
-   /* _mesa_function_pool[3695]: GenTransformFeedbacks (will be remapped) */
+   /* _mesa_function_pool[3662]: GenTransformFeedbacks (will be remapped) */
    "ip\0"
    "glGenTransformFeedbacks\0"
    "\0"
-   /* _mesa_function_pool[3723]: DrawTexfvOES (will be remapped) */
+   /* _mesa_function_pool[3690]: DrawTexfvOES (will be remapped) */
    "p\0"
    "glDrawTexfvOES\0"
    "\0"
-   /* _mesa_function_pool[3741]: GetCompressedTexImage (will be remapped) */
+   /* _mesa_function_pool[3708]: GetCompressedTexImage (will be remapped) */
    "iip\0"
    "glGetCompressedTexImage\0"
    "glGetCompressedTexImageARB\0"
    "\0"
-   /* _mesa_function_pool[3797]: ProgramLocalParameter4dvARB (will be remapped) */
+   /* _mesa_function_pool[3764]: ProgramLocalParameter4dvARB (will be remapped) */
    "iip\0"
    "glProgramLocalParameter4dvARB\0"
    "\0"
-   /* _mesa_function_pool[3832]: TexCoord4fv (offset 121) */
+   /* _mesa_function_pool[3799]: TexCoord4fv (offset 121) */
    "p\0"
    "glTexCoord4fv\0"
    "\0"
-   /* _mesa_function_pool[3849]: GetQueryObjectui64v (will be remapped) */
+   /* _mesa_function_pool[3816]: GetQueryObjectui64v (will be remapped) */
    "iip\0"
    "glGetQueryObjectui64v\0"
    "glGetQueryObjectui64vEXT\0"
    "\0"
-   /* _mesa_function_pool[3901]: VertexAttribP1uiv (will be remapped) */
+   /* _mesa_function_pool[3868]: VertexAttribP1uiv (will be remapped) */
    "iiip\0"
    "glVertexAttribP1uiv\0"
    "\0"
-   /* _mesa_function_pool[3927]: IsProgram (will be remapped) */
+   /* _mesa_function_pool[3894]: IsProgram (will be remapped) */
    "i\0"
    "glIsProgram\0"
    "\0"
-   /* _mesa_function_pool[3942]: TexCoordPointerListIBM (dynamic) */
+   /* _mesa_function_pool[3909]: TexCoordPointerListIBM (dynamic) */
    "iiipi\0"
    "glTexCoordPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[3974]: ResizeBuffersMESA (will be remapped) */
+   /* _mesa_function_pool[3941]: ResizeBuffersMESA (will be remapped) */
    "\0"
    "glResizeBuffersMESA\0"
    "\0"
-   /* _mesa_function_pool[3996]: GenTextures (offset 328) */
+   /* _mesa_function_pool[3963]: GenTextures (offset 328) */
    "ip\0"
    "glGenTextures\0"
    "glGenTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[4031]: IndexPointerListIBM (dynamic) */
+   /* _mesa_function_pool[3998]: IndexPointerListIBM (dynamic) */
    "iipi\0"
    "glIndexPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[4059]: WindowPos4fMESA (will be remapped) */
+   /* _mesa_function_pool[4026]: WindowPos4fMESA (will be remapped) */
    "ffff\0"
    "glWindowPos4fMESA\0"
    "\0"
-   /* _mesa_function_pool[4083]: VertexAttribs2fvNV (will be remapped) */
+   /* _mesa_function_pool[4050]: VertexAttribs2fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2fvNV\0"
    "\0"
-   /* _mesa_function_pool[4109]: VertexAttribP4ui (will be remapped) */
+   /* _mesa_function_pool[4076]: VertexAttribP4ui (will be remapped) */
    "iiii\0"
    "glVertexAttribP4ui\0"
    "\0"
-   /* _mesa_function_pool[4134]: Uniform4i (will be remapped) */
+   /* _mesa_function_pool[4101]: Uniform4i (will be remapped) */
    "iiiii\0"
    "glUniform4i\0"
    "glUniform4iARB\0"
    "\0"
-   /* _mesa_function_pool[4168]: BufferParameteriAPPLE (will be remapped) */
+   /* _mesa_function_pool[4135]: BufferParameteriAPPLE (will be remapped) */
    "iii\0"
    "glBufferParameteriAPPLE\0"
    "\0"
-   /* _mesa_function_pool[4197]: Uniform4f (will be remapped) */
+   /* _mesa_function_pool[4164]: Uniform4f (will be remapped) */
    "iffff\0"
    "glUniform4f\0"
    "glUniform4fARB\0"
    "\0"
-   /* _mesa_function_pool[4231]: ProgramUniform3f (will be remapped) */
+   /* _mesa_function_pool[4198]: ProgramUniform3f (will be remapped) */
    "iifff\0"
    "glProgramUniform3f\0"
    "\0"
-   /* _mesa_function_pool[4257]: ProgramUniform3i (will be remapped) */
+   /* _mesa_function_pool[4224]: ProgramUniform3i (will be remapped) */
    "iiiii\0"
    "glProgramUniform3i\0"
    "\0"
-   /* _mesa_function_pool[4283]: PointParameterfv (will be remapped) */
+   /* _mesa_function_pool[4250]: PointParameterfv (will be remapped) */
    "ip\0"
    "glPointParameterfv\0"
    "glPointParameterfvARB\0"
    "glPointParameterfvEXT\0"
    "glPointParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[4373]: GetHistogramParameterfv (offset 362) */
+   /* _mesa_function_pool[4340]: GetHistogramParameterfv (offset 362) */
    "iip\0"
    "glGetHistogramParameterfv\0"
    "glGetHistogramParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[4433]: GetString (offset 275) */
+   /* _mesa_function_pool[4400]: GetString (offset 275) */
    "i\0"
    "glGetString\0"
    "\0"
-   /* _mesa_function_pool[4448]: ColorPointervINTEL (dynamic) */
+   /* _mesa_function_pool[4415]: ColorPointervINTEL (dynamic) */
    "iip\0"
    "glColorPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[4474]: VDPAUUnmapSurfacesNV (will be remapped) */
+   /* _mesa_function_pool[4441]: VDPAUUnmapSurfacesNV (will be remapped) */
    "ip\0"
    "glVDPAUUnmapSurfacesNV\0"
    "\0"
-   /* _mesa_function_pool[4501]: GetnHistogramARB (will be remapped) */
+   /* _mesa_function_pool[4468]: GetnHistogramARB (will be remapped) */
    "iiiiip\0"
    "glGetnHistogramARB\0"
    "\0"
-   /* _mesa_function_pool[4528]: ReplacementCodeuiColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[4495]: ReplacementCodeuiColor4fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glReplacementCodeuiColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[4581]: SecondaryColor3s (will be remapped) */
+   /* _mesa_function_pool[4548]: SecondaryColor3s (will be remapped) */
    "iii\0"
    "glSecondaryColor3s\0"
    "glSecondaryColor3sEXT\0"
    "\0"
-   /* _mesa_function_pool[4627]: VertexAttribP2uiv (will be remapped) */
+   /* _mesa_function_pool[4594]: VertexAttribP2uiv (will be remapped) */
    "iiip\0"
    "glVertexAttribP2uiv\0"
    "\0"
-   /* _mesa_function_pool[4653]: GetDetailTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[4620]: GetDetailTexFuncSGIS (dynamic) */
    "ip\0"
    "glGetDetailTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[4680]: VertexAttrib3fNV (will be remapped) */
+   /* _mesa_function_pool[4647]: VertexAttrib3fNV (will be remapped) */
    "ifff\0"
    "glVertexAttrib3fNV\0"
    "\0"
-   /* _mesa_function_pool[4705]: SecondaryColor3b (will be remapped) */
+   /* _mesa_function_pool[4672]: SecondaryColor3b (will be remapped) */
    "iii\0"
    "glSecondaryColor3b\0"
    "glSecondaryColor3bEXT\0"
    "\0"
-   /* _mesa_function_pool[4751]: EnableClientState (offset 313) */
+   /* _mesa_function_pool[4718]: EnableClientState (offset 313) */
    "i\0"
    "glEnableClientState\0"
    "\0"
-   /* _mesa_function_pool[4774]: Color4ubVertex2fvSUN (dynamic) */
+   /* _mesa_function_pool[4741]: Color4ubVertex2fvSUN (dynamic) */
    "pp\0"
    "glColor4ubVertex2fvSUN\0"
    "\0"
-   /* _mesa_function_pool[4801]: SecondaryColor3i (will be remapped) */
+   /* _mesa_function_pool[4768]: SecondaryColor3i (will be remapped) */
    "iii\0"
    "glSecondaryColor3i\0"
    "glSecondaryColor3iEXT\0"
    "\0"
-   /* _mesa_function_pool[4847]: TexFilterFuncSGIS (dynamic) */
+   /* _mesa_function_pool[4814]: TexFilterFuncSGIS (dynamic) */
    "iiip\0"
    "glTexFilterFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[4873]: GetFragmentMaterialfvSGIX (dynamic) */
+   /* _mesa_function_pool[4840]: GetFragmentMaterialfvSGIX (dynamic) */
    "iip\0"
    "glGetFragmentMaterialfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[4906]: DetailTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[4873]: DetailTexFuncSGIS (dynamic) */
    "iip\0"
    "glDetailTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[4931]: FlushMappedBufferRange (will be remapped) */
+   /* _mesa_function_pool[4898]: FlushMappedBufferRange (will be remapped) */
    "iii\0"
    "glFlushMappedBufferRange\0"
    "glFlushMappedBufferRangeEXT\0"
    "\0"
-   /* _mesa_function_pool[4989]: Lightfv (offset 160) */
+   /* _mesa_function_pool[4956]: Lightfv (offset 160) */
    "iip\0"
    "glLightfv\0"
    "\0"
-   /* _mesa_function_pool[5004]: GetFramebufferAttachmentParameteriv (will be remapped) */
+   /* _mesa_function_pool[4971]: GetFramebufferAttachmentParameteriv (will be remapped) */
    "iiip\0"
    "glGetFramebufferAttachmentParameteriv\0"
    "glGetFramebufferAttachmentParameterivEXT\0"
    "glGetFramebufferAttachmentParameterivOES\0"
    "\0"
-   /* _mesa_function_pool[5130]: ColorSubTable (offset 346) */
+   /* _mesa_function_pool[5097]: ColorSubTable (offset 346) */
    "iiiiip\0"
    "glColorSubTable\0"
    "glColorSubTableEXT\0"
    "\0"
-   /* _mesa_function_pool[5173]: EndPerfMonitorAMD (will be remapped) */
+   /* _mesa_function_pool[5140]: EndPerfMonitorAMD (will be remapped) */
    "i\0"
    "glEndPerfMonitorAMD\0"
    "\0"
-   /* _mesa_function_pool[5196]: Uniform1ui (will be remapped) */
+   /* _mesa_function_pool[5163]: Uniform1ui (will be remapped) */
    "ii\0"
    "glUniform1uiEXT\0"
    "glUniform1ui\0"
    "\0"
-   /* _mesa_function_pool[5229]: MapParameterivNV (dynamic) */
+   /* _mesa_function_pool[5196]: MapParameterivNV (dynamic) */
    "iip\0"
    "glMapParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[5253]: GetMultisamplefv (will be remapped) */
+   /* _mesa_function_pool[5220]: GetMultisamplefv (will be remapped) */
    "iip\0"
    "glGetMultisamplefv\0"
    "\0"
-   /* _mesa_function_pool[5277]: WeightbvARB (dynamic) */
+   /* _mesa_function_pool[5244]: WeightbvARB (dynamic) */
    "ip\0"
    "glWeightbvARB\0"
    "\0"
-   /* _mesa_function_pool[5295]: Rectdv (offset 87) */
+   /* _mesa_function_pool[5262]: Rectdv (offset 87) */
    "pp\0"
    "glRectdv\0"
    "\0"
-   /* _mesa_function_pool[5308]: DrawArraysInstancedARB (will be remapped) */
+   /* _mesa_function_pool[5275]: DrawArraysInstancedARB (will be remapped) */
    "iiii\0"
    "glDrawArraysInstancedARB\0"
    "glDrawArraysInstancedEXT\0"
    "glDrawArraysInstanced\0"
    "\0"
-   /* _mesa_function_pool[5386]: ProgramEnvParameters4fvEXT (will be remapped) */
+   /* _mesa_function_pool[5353]: ProgramEnvParameters4fvEXT (will be remapped) */
    "iiip\0"
    "glProgramEnvParameters4fvEXT\0"
    "\0"
-   /* _mesa_function_pool[5421]: VertexAttrib2svNV (will be remapped) */
+   /* _mesa_function_pool[5388]: VertexAttrib2svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2svNV\0"
    "\0"
-   /* _mesa_function_pool[5445]: SecondaryColorP3uiv (will be remapped) */
+   /* _mesa_function_pool[5412]: SecondaryColorP3uiv (will be remapped) */
    "ip\0"
    "glSecondaryColorP3uiv\0"
    "\0"
-   /* _mesa_function_pool[5471]: GetnPixelMapuivARB (will be remapped) */
+   /* _mesa_function_pool[5438]: GetnPixelMapuivARB (will be remapped) */
    "iip\0"
    "glGetnPixelMapuivARB\0"
    "\0"
-   /* _mesa_function_pool[5497]: GetSamplerParameterIuiv (will be remapped) */
+   /* _mesa_function_pool[5464]: GetSamplerParameterIuiv (will be remapped) */
    "iip\0"
    "glGetSamplerParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[5528]: PointParameterxv (will be remapped) */
+   /* _mesa_function_pool[5495]: PointParameterxv (will be remapped) */
    "ip\0"
    "glPointParameterxvOES\0"
    "glPointParameterxv\0"
    "\0"
-   /* _mesa_function_pool[5573]: CompressedTexSubImage3D (will be remapped) */
+   /* _mesa_function_pool[5540]: CompressedTexSubImage3D (will be remapped) */
    "iiiiiiiiiip\0"
    "glCompressedTexSubImage3D\0"
    "glCompressedTexSubImage3DARB\0"
    "glCompressedTexSubImage3DOES\0"
    "\0"
-   /* _mesa_function_pool[5670]: BindFramebufferEXT (will be remapped) */
+   /* _mesa_function_pool[5637]: BindFramebufferEXT (will be remapped) */
    "ii\0"
    "glBindFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[5695]: Color3dv (offset 12) */
+   /* _mesa_function_pool[5662]: Color3dv (offset 12) */
    "p\0"
    "glColor3dv\0"
    "\0"
-   /* _mesa_function_pool[5709]: BeginQuery (will be remapped) */
+   /* _mesa_function_pool[5676]: BeginQuery (will be remapped) */
    "ii\0"
    "glBeginQuery\0"
    "glBeginQueryARB\0"
    "\0"
-   /* _mesa_function_pool[5742]: VertexP3uiv (will be remapped) */
+   /* _mesa_function_pool[5709]: VertexP3uiv (will be remapped) */
    "ip\0"
    "glVertexP3uiv\0"
    "\0"
-   /* _mesa_function_pool[5760]: GetUniformLocation (will be remapped) */
+   /* _mesa_function_pool[5727]: GetUniformLocation (will be remapped) */
    "ip\0"
    "glGetUniformLocation\0"
    "glGetUniformLocationARB\0"
    "\0"
-   /* _mesa_function_pool[5809]: PixelStoref (offset 249) */
+   /* _mesa_function_pool[5776]: PixelStoref (offset 249) */
    "if\0"
    "glPixelStoref\0"
    "\0"
-   /* _mesa_function_pool[5827]: WindowPos2iv (will be remapped) */
+   /* _mesa_function_pool[5794]: WindowPos2iv (will be remapped) */
    "p\0"
    "glWindowPos2iv\0"
    "glWindowPos2ivARB\0"
    "glWindowPos2ivMESA\0"
    "\0"
-   /* _mesa_function_pool[5882]: PixelStorei (offset 250) */
+   /* _mesa_function_pool[5849]: PixelStorei (offset 250) */
    "ii\0"
    "glPixelStorei\0"
    "\0"
-   /* _mesa_function_pool[5900]: VertexAttribs1svNV (will be remapped) */
+   /* _mesa_function_pool[5867]: VertexAttribs1svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1svNV\0"
    "\0"
-   /* _mesa_function_pool[5926]: RequestResidentProgramsNV (will be remapped) */
+   /* _mesa_function_pool[5893]: RequestResidentProgramsNV (will be remapped) */
    "ip\0"
    "glRequestResidentProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[5958]: ListParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[5925]: ListParameterivSGIX (dynamic) */
    "iip\0"
    "glListParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[5985]: TexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[5952]: TexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glTexCoord2fColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[6031]: CheckFramebufferStatus (will be remapped) */
+   /* _mesa_function_pool[5998]: CheckFramebufferStatus (will be remapped) */
    "i\0"
    "glCheckFramebufferStatus\0"
    "glCheckFramebufferStatusEXT\0"
    "glCheckFramebufferStatusOES\0"
    "\0"
-   /* _mesa_function_pool[6115]: DispatchComputeIndirect (will be remapped) */
+   /* _mesa_function_pool[6082]: DispatchComputeIndirect (will be remapped) */
    "i\0"
    "glDispatchComputeIndirect\0"
    "\0"
-   /* _mesa_function_pool[6144]: InvalidateBufferData (will be remapped) */
+   /* _mesa_function_pool[6111]: InvalidateBufferData (will be remapped) */
    "i\0"
    "glInvalidateBufferData\0"
    "\0"
-   /* _mesa_function_pool[6170]: VDPAUMapSurfacesNV (will be remapped) */
+   /* _mesa_function_pool[6137]: VDPAUMapSurfacesNV (will be remapped) */
    "ip\0"
    "glVDPAUMapSurfacesNV\0"
    "\0"
-   /* _mesa_function_pool[6195]: IsFramebuffer (will be remapped) */
+   /* _mesa_function_pool[6162]: IsFramebuffer (will be remapped) */
    "i\0"
    "glIsFramebuffer\0"
    "glIsFramebufferEXT\0"
    "glIsFramebufferOES\0"
    "\0"
-   /* _mesa_function_pool[6252]: GetPixelTexGenParameterfvSGIS (dynamic) */
+   /* _mesa_function_pool[6219]: GetPixelTexGenParameterfvSGIS (dynamic) */
    "ip\0"
    "glGetPixelTexGenParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[6288]: GetDoublev (offset 260) */
+   /* _mesa_function_pool[6255]: GetDoublev (offset 260) */
    "ip\0"
    "glGetDoublev\0"
    "\0"
-   /* _mesa_function_pool[6305]: GetObjectLabel (will be remapped) */
+   /* _mesa_function_pool[6272]: GetObjectLabel (will be remapped) */
    "iiipp\0"
    "glGetObjectLabel\0"
    "\0"
-   /* _mesa_function_pool[6329]: TextureLightEXT (dynamic) */
+   /* _mesa_function_pool[6296]: TextureLightEXT (dynamic) */
    "i\0"
    "glTextureLightEXT\0"
    "\0"
-   /* _mesa_function_pool[6350]: ColorP3uiv (will be remapped) */
+   /* _mesa_function_pool[6317]: ColorP3uiv (will be remapped) */
    "ip\0"
    "glColorP3uiv\0"
    "\0"
-   /* _mesa_function_pool[6367]: CombinerParameteriNV (dynamic) */
+   /* _mesa_function_pool[6334]: CombinerParameteriNV (dynamic) */
    "ii\0"
    "glCombinerParameteriNV\0"
    "\0"
-   /* _mesa_function_pool[6394]: Normal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[6361]: Normal3fVertex3fvSUN (dynamic) */
    "pp\0"
    "glNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[6421]: VertexAttribI4ivEXT (will be remapped) */
+   /* _mesa_function_pool[6388]: VertexAttribI4ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4ivEXT\0"
    "glVertexAttribI4iv\0"
    "\0"
-   /* _mesa_function_pool[6466]: SecondaryColor3ubv (will be remapped) */
+   /* _mesa_function_pool[6433]: SecondaryColor3ubv (will be remapped) */
    "p\0"
    "glSecondaryColor3ubv\0"
    "glSecondaryColor3ubvEXT\0"
    "\0"
-   /* _mesa_function_pool[6514]: GetDebugMessageLog (will be remapped) */
+   /* _mesa_function_pool[6481]: GetDebugMessageLog (will be remapped) */
    "iipppppp\0"
+   "glGetDebugMessageLogARB\0"
    "glGetDebugMessageLog\0"
    "\0"
-   /* _mesa_function_pool[6545]: DeformationMap3fSGIX (dynamic) */
+   /* _mesa_function_pool[6536]: DeformationMap3fSGIX (dynamic) */
    "iffiiffiiffiip\0"
    "glDeformationMap3fSGIX\0"
    "\0"
-   /* _mesa_function_pool[6584]: MatrixIndexubvARB (dynamic) */
+   /* _mesa_function_pool[6575]: MatrixIndexubvARB (dynamic) */
    "ip\0"
    "glMatrixIndexubvARB\0"
    "\0"
-   /* _mesa_function_pool[6608]: VertexAttribI4usv (will be remapped) */
+   /* _mesa_function_pool[6599]: VertexAttribI4usv (will be remapped) */
    "ip\0"
    "glVertexAttribI4usvEXT\0"
    "glVertexAttribI4usv\0"
    "\0"
-   /* _mesa_function_pool[6655]: PixelTexGenParameterfSGIS (dynamic) */
+   /* _mesa_function_pool[6646]: PixelTexGenParameterfSGIS (dynamic) */
    "if\0"
    "glPixelTexGenParameterfSGIS\0"
    "\0"
-   /* _mesa_function_pool[6687]: ProgramUniform2ui (will be remapped) */
+   /* _mesa_function_pool[6678]: ProgramUniform2ui (will be remapped) */
    "iiii\0"
    "glProgramUniform2ui\0"
    "\0"
-   /* _mesa_function_pool[6713]: TexCoord2fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[6704]: TexCoord2fVertex3fvSUN (dynamic) */
    "pp\0"
    "glTexCoord2fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[6742]: Color4ubVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[6733]: Color4ubVertex3fvSUN (dynamic) */
    "pp\0"
    "glColor4ubVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[6769]: GetShaderSource (will be remapped) */
+   /* _mesa_function_pool[6760]: GetShaderSource (will be remapped) */
    "iipp\0"
    "glGetShaderSource\0"
    "glGetShaderSourceARB\0"
    "\0"
-   /* _mesa_function_pool[6814]: BindProgramARB (will be remapped) */
+   /* _mesa_function_pool[6805]: BindProgramARB (will be remapped) */
    "ii\0"
    "glBindProgramARB\0"
    "glBindProgramNV\0"
    "\0"
-   /* _mesa_function_pool[6851]: VertexAttrib3sNV (will be remapped) */
+   /* _mesa_function_pool[6842]: VertexAttrib3sNV (will be remapped) */
    "iiii\0"
    "glVertexAttrib3sNV\0"
    "\0"
-   /* _mesa_function_pool[6876]: ColorFragmentOp1ATI (will be remapped) */
+   /* _mesa_function_pool[6867]: ColorFragmentOp1ATI (will be remapped) */
    "iiiiiii\0"
    "glColorFragmentOp1ATI\0"
    "\0"
-   /* _mesa_function_pool[6907]: ProgramUniformMatrix4x3fv (will be remapped) */
+   /* _mesa_function_pool[6898]: ProgramUniformMatrix4x3fv (will be remapped) */
    "iiiip\0"
    "glProgramUniformMatrix4x3fv\0"
    "\0"
-   /* _mesa_function_pool[6942]: PopClientAttrib (offset 334) */
+   /* _mesa_function_pool[6933]: PopClientAttrib (offset 334) */
    "\0"
    "glPopClientAttrib\0"
    "\0"
-   /* _mesa_function_pool[6962]: DrawElementsInstancedARB (will be remapped) */
+   /* _mesa_function_pool[6953]: DrawElementsInstancedARB (will be remapped) */
    "iiipi\0"
    "glDrawElementsInstancedARB\0"
    "glDrawElementsInstancedEXT\0"
    "glDrawElementsInstanced\0"
    "\0"
-   /* _mesa_function_pool[7047]: GetQueryObjectuiv (will be remapped) */
+   /* _mesa_function_pool[7038]: GetQueryObjectuiv (will be remapped) */
    "iip\0"
    "glGetQueryObjectuiv\0"
    "glGetQueryObjectuivARB\0"
    "\0"
-   /* _mesa_function_pool[7095]: VertexAttribI4bv (will be remapped) */
+   /* _mesa_function_pool[7086]: VertexAttribI4bv (will be remapped) */
    "ip\0"
    "glVertexAttribI4bvEXT\0"
    "glVertexAttribI4bv\0"
    "\0"
-   /* _mesa_function_pool[7140]: FogCoordPointerListIBM (dynamic) */
+   /* _mesa_function_pool[7131]: FogCoordPointerListIBM (dynamic) */
    "iipi\0"
    "glFogCoordPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[7171]: Binormal3sEXT (dynamic) */
+   /* _mesa_function_pool[7162]: Binormal3sEXT (dynamic) */
    "iii\0"
    "glBinormal3sEXT\0"
    "\0"
-   /* _mesa_function_pool[7192]: ListBase (offset 6) */
+   /* _mesa_function_pool[7183]: ListBase (offset 6) */
    "i\0"
    "glListBase\0"
    "\0"
-   /* _mesa_function_pool[7206]: GenerateMipmap (will be remapped) */
+   /* _mesa_function_pool[7197]: GenerateMipmap (will be remapped) */
    "i\0"
    "glGenerateMipmap\0"
    "glGenerateMipmapEXT\0"
    "glGenerateMipmapOES\0"
    "\0"
-   /* _mesa_function_pool[7266]: BindBufferRange (will be remapped) */
+   /* _mesa_function_pool[7257]: BindBufferRange (will be remapped) */
    "iiiii\0"
    "glBindBufferRange\0"
    "glBindBufferRangeEXT\0"
    "\0"
-   /* _mesa_function_pool[7312]: ProgramUniformMatrix2x4fv (will be remapped) */
+   /* _mesa_function_pool[7303]: ProgramUniformMatrix2x4fv (will be remapped) */
    "iiiip\0"
    "glProgramUniformMatrix2x4fv\0"
    "\0"
-   /* _mesa_function_pool[7347]: GetQueryObjectiv (will be remapped) */
+   /* _mesa_function_pool[7338]: GetQueryObjectiv (will be remapped) */
    "iip\0"
    "glGetQueryObjectiv\0"
    "glGetQueryObjectivARB\0"
    "\0"
-   /* _mesa_function_pool[7393]: VertexAttrib2s (will be remapped) */
+   /* _mesa_function_pool[7384]: VertexAttrib2s (will be remapped) */
    "iii\0"
    "glVertexAttrib2s\0"
    "glVertexAttrib2sARB\0"
    "\0"
-   /* _mesa_function_pool[7435]: SecondaryColor3fvEXT (will be remapped) */
+   /* _mesa_function_pool[7426]: SecondaryColor3fvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3fv\0"
    "glSecondaryColor3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[7481]: VertexAttrib2d (will be remapped) */
+   /* _mesa_function_pool[7472]: VertexAttrib2d (will be remapped) */
    "idd\0"
    "glVertexAttrib2d\0"
    "glVertexAttrib2dARB\0"
    "\0"
-   /* _mesa_function_pool[7523]: Uniform1fv (will be remapped) */
+   /* _mesa_function_pool[7514]: Uniform1fv (will be remapped) */
    "iip\0"
    "glUniform1fv\0"
    "glUniform1fvARB\0"
    "\0"
-   /* _mesa_function_pool[7557]: GetProgramPipelineInfoLog (will be remapped) */
+   /* _mesa_function_pool[7548]: GetProgramPipelineInfoLog (will be remapped) */
    "iipp\0"
    "glGetProgramPipelineInfoLog\0"
    "\0"
-   /* _mesa_function_pool[7591]: TextureMaterialEXT (dynamic) */
+   /* _mesa_function_pool[7582]: TextureMaterialEXT (dynamic) */
    "ii\0"
    "glTextureMaterialEXT\0"
    "\0"
-   /* _mesa_function_pool[7616]: DepthBoundsEXT (will be remapped) */
+   /* _mesa_function_pool[7607]: DepthBoundsEXT (will be remapped) */
    "dd\0"
    "glDepthBoundsEXT\0"
    "\0"
-   /* _mesa_function_pool[7637]: WindowPos3fv (will be remapped) */
+   /* _mesa_function_pool[7628]: WindowPos3fv (will be remapped) */
    "p\0"
    "glWindowPos3fv\0"
    "glWindowPos3fvARB\0"
    "glWindowPos3fvMESA\0"
    "\0"
-   /* _mesa_function_pool[7692]: BindVertexArrayAPPLE (will be remapped) */
+   /* _mesa_function_pool[7683]: BindVertexArrayAPPLE (will be remapped) */
    "i\0"
    "glBindVertexArrayAPPLE\0"
    "\0"
-   /* _mesa_function_pool[7718]: GetHistogramParameteriv (offset 363) */
+   /* _mesa_function_pool[7709]: GetHistogramParameteriv (offset 363) */
    "iip\0"
    "glGetHistogramParameteriv\0"
    "glGetHistogramParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[7778]: PointParameteriv (will be remapped) */
+   /* _mesa_function_pool[7769]: PointParameteriv (will be remapped) */
    "ip\0"
    "glPointParameteriv\0"
    "glPointParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[7822]: GetProgramivARB (will be remapped) */
+   /* _mesa_function_pool[7813]: GetProgramivARB (will be remapped) */
    "iip\0"
    "glGetProgramivARB\0"
    "\0"
-   /* _mesa_function_pool[7845]: BindRenderbuffer (will be remapped) */
+   /* _mesa_function_pool[7836]: BindRenderbuffer (will be remapped) */
    "ii\0"
    "glBindRenderbuffer\0"
    "glBindRenderbufferOES\0"
    "\0"
-   /* _mesa_function_pool[7890]: SecondaryColor3fEXT (will be remapped) */
+   /* _mesa_function_pool[7881]: SecondaryColor3fEXT (will be remapped) */
    "fff\0"
    "glSecondaryColor3f\0"
    "glSecondaryColor3fEXT\0"
    "\0"
-   /* _mesa_function_pool[7936]: PrimitiveRestartIndex (will be remapped) */
+   /* _mesa_function_pool[7927]: PrimitiveRestartIndex (will be remapped) */
    "i\0"
    "glPrimitiveRestartIndex\0"
    "glPrimitiveRestartIndexNV\0"
    "\0"
-   /* _mesa_function_pool[7989]: VertexAttribI4ubv (will be remapped) */
+   /* _mesa_function_pool[7980]: VertexAttribI4ubv (will be remapped) */
    "ip\0"
    "glVertexAttribI4ubvEXT\0"
    "glVertexAttribI4ubv\0"
    "\0"
-   /* _mesa_function_pool[8036]: GetGraphicsResetStatusARB (will be remapped) */
+   /* _mesa_function_pool[8027]: GetGraphicsResetStatusARB (will be remapped) */
    "\0"
    "glGetGraphicsResetStatusARB\0"
    "\0"
-   /* _mesa_function_pool[8066]: ActiveStencilFaceEXT (will be remapped) */
+   /* _mesa_function_pool[8057]: ActiveStencilFaceEXT (will be remapped) */
    "i\0"
    "glActiveStencilFaceEXT\0"
    "\0"
-   /* _mesa_function_pool[8092]: VertexAttrib4dNV (will be remapped) */
+   /* _mesa_function_pool[8083]: VertexAttrib4dNV (will be remapped) */
    "idddd\0"
    "glVertexAttrib4dNV\0"
    "\0"
-   /* _mesa_function_pool[8118]: DepthRange (offset 288) */
+   /* _mesa_function_pool[8109]: DepthRange (offset 288) */
    "dd\0"
    "glDepthRange\0"
    "\0"
-   /* _mesa_function_pool[8135]: TexBumpParameterivATI (will be remapped) */
+   /* _mesa_function_pool[8126]: TexBumpParameterivATI (will be remapped) */
    "ip\0"
    "glTexBumpParameterivATI\0"
    "\0"
-   /* _mesa_function_pool[8163]: VertexAttrib4fNV (will be remapped) */
+   /* _mesa_function_pool[8154]: VertexAttrib4fNV (will be remapped) */
    "iffff\0"
    "glVertexAttrib4fNV\0"
    "\0"
-   /* _mesa_function_pool[8189]: Uniform4fv (will be remapped) */
+   /* _mesa_function_pool[8180]: Uniform4fv (will be remapped) */
    "iip\0"
    "glUniform4fv\0"
    "glUniform4fvARB\0"
    "\0"
-   /* _mesa_function_pool[8223]: DrawMeshArraysSUN (dynamic) */
+   /* _mesa_function_pool[8214]: DrawMeshArraysSUN (dynamic) */
    "iiii\0"
    "glDrawMeshArraysSUN\0"
    "\0"
-   /* _mesa_function_pool[8249]: GetMapControlPointsNV (dynamic) */
+   /* _mesa_function_pool[8240]: GetMapControlPointsNV (dynamic) */
    "iiiiiip\0"
    "glGetMapControlPointsNV\0"
    "\0"
-   /* _mesa_function_pool[8282]: SpriteParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[8273]: SpriteParameterivSGIX (dynamic) */
    "ip\0"
    "glSpriteParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[8310]: Frustumf (will be remapped) */
+   /* _mesa_function_pool[8301]: Frustumf (will be remapped) */
    "ffffff\0"
    "glFrustumfOES\0"
    "glFrustumf\0"
    "\0"
-   /* _mesa_function_pool[8343]: ProgramUniform2uiv (will be remapped) */
+   /* _mesa_function_pool[8334]: ProgramUniform2uiv (will be remapped) */
    "iiip\0"
    "glProgramUniform2uiv\0"
    "\0"
-   /* _mesa_function_pool[8370]: Rectsv (offset 93) */
+   /* _mesa_function_pool[8361]: Rectsv (offset 93) */
    "pp\0"
    "glRectsv\0"
    "\0"
-   /* _mesa_function_pool[8383]: Frustumx (will be remapped) */
+   /* _mesa_function_pool[8374]: Frustumx (will be remapped) */
    "iiiiii\0"
    "glFrustumxOES\0"
    "glFrustumx\0"
    "\0"
-   /* _mesa_function_pool[8416]: CullFace (offset 152) */
+   /* _mesa_function_pool[8407]: CullFace (offset 152) */
    "i\0"
    "glCullFace\0"
    "\0"
-   /* _mesa_function_pool[8430]: BindTexture (offset 307) */
+   /* _mesa_function_pool[8421]: BindTexture (offset 307) */
    "ii\0"
    "glBindTexture\0"
    "glBindTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[8465]: MultiTexCoord4fARB (offset 402) */
+   /* _mesa_function_pool[8456]: MultiTexCoord4fARB (offset 402) */
    "iffff\0"
    "glMultiTexCoord4f\0"
    "glMultiTexCoord4fARB\0"
    "\0"
-   /* _mesa_function_pool[8511]: MultiTexCoordP2uiv (will be remapped) */
+   /* _mesa_function_pool[8502]: MultiTexCoordP2uiv (will be remapped) */
    "iip\0"
    "glMultiTexCoordP2uiv\0"
    "\0"
-   /* _mesa_function_pool[8537]: NormalPointer (offset 318) */
+   /* _mesa_function_pool[8528]: NormalPointer (offset 318) */
    "iip\0"
    "glNormalPointer\0"
    "\0"
-   /* _mesa_function_pool[8558]: TangentPointerEXT (dynamic) */
+   /* _mesa_function_pool[8549]: TangentPointerEXT (dynamic) */
    "iip\0"
    "glTangentPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[8583]: WindowPos4iMESA (will be remapped) */
+   /* _mesa_function_pool[8574]: WindowPos4iMESA (will be remapped) */
    "iiii\0"
    "glWindowPos4iMESA\0"
    "\0"
-   /* _mesa_function_pool[8607]: ReferencePlaneSGIX (dynamic) */
+   /* _mesa_function_pool[8598]: ReferencePlaneSGIX (dynamic) */
    "p\0"
    "glReferencePlaneSGIX\0"
    "\0"
-   /* _mesa_function_pool[8631]: VertexAttrib4bv (will be remapped) */
+   /* _mesa_function_pool[8622]: VertexAttrib4bv (will be remapped) */
    "ip\0"
    "glVertexAttrib4bv\0"
    "glVertexAttrib4bvARB\0"
    "\0"
-   /* _mesa_function_pool[8674]: ReplacementCodeuivSUN (dynamic) */
+   /* _mesa_function_pool[8665]: ReplacementCodeuivSUN (dynamic) */
    "p\0"
    "glReplacementCodeuivSUN\0"
    "\0"
-   /* _mesa_function_pool[8701]: SecondaryColor3usv (will be remapped) */
+   /* _mesa_function_pool[8692]: SecondaryColor3usv (will be remapped) */
    "p\0"
    "glSecondaryColor3usv\0"
    "glSecondaryColor3usvEXT\0"
    "\0"
-   /* _mesa_function_pool[8749]: GetPixelMapuiv (offset 272) */
+   /* _mesa_function_pool[8740]: GetPixelMapuiv (offset 272) */
    "ip\0"
    "glGetPixelMapuiv\0"
    "\0"
-   /* _mesa_function_pool[8770]: Indexfv (offset 47) */
+   /* _mesa_function_pool[8761]: Indexfv (offset 47) */
    "p\0"
    "glIndexfv\0"
    "\0"
-   /* _mesa_function_pool[8783]: AlphaFragmentOp1ATI (will be remapped) */
+   /* _mesa_function_pool[8774]: AlphaFragmentOp1ATI (will be remapped) */
    "iiiiii\0"
    "glAlphaFragmentOp1ATI\0"
    "\0"
-   /* _mesa_function_pool[8813]: ListParameteriSGIX (dynamic) */
+   /* _mesa_function_pool[8804]: ListParameteriSGIX (dynamic) */
    "iii\0"
    "glListParameteriSGIX\0"
    "\0"
-   /* _mesa_function_pool[8839]: GetFloatv (offset 262) */
+   /* _mesa_function_pool[8830]: GetFloatv (offset 262) */
    "ip\0"
    "glGetFloatv\0"
    "\0"
-   /* _mesa_function_pool[8855]: MultiTexCoord3i (offset 396) */
+   /* _mesa_function_pool[8846]: MultiTexCoord3i (offset 396) */
    "iiii\0"
    "glMultiTexCoord3i\0"
    "glMultiTexCoord3iARB\0"
    "\0"
-   /* _mesa_function_pool[8900]: ProgramUniform1fv (will be remapped) */
+   /* _mesa_function_pool[8891]: ProgramUniform1fv (will be remapped) */
    "iiip\0"
    "glProgramUniform1fv\0"
    "\0"
-   /* _mesa_function_pool[8926]: MultiTexCoord3d (offset 392) */
+   /* _mesa_function_pool[8917]: MultiTexCoord3d (offset 392) */
    "iddd\0"
    "glMultiTexCoord3d\0"
    "glMultiTexCoord3dARB\0"
    "\0"
-   /* _mesa_function_pool[8971]: TexCoord3sv (offset 117) */
+   /* _mesa_function_pool[8962]: TexCoord3sv (offset 117) */
    "p\0"
    "glTexCoord3sv\0"
    "\0"
-   /* _mesa_function_pool[8988]: Fogfv (offset 154) */
+   /* _mesa_function_pool[8979]: Fogfv (offset 154) */
    "ip\0"
    "glFogfv\0"
    "\0"
-   /* _mesa_function_pool[9000]: Minmax (offset 368) */
+   /* _mesa_function_pool[8991]: Minmax (offset 368) */
    "iii\0"
    "glMinmax\0"
    "glMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[9026]: MultiTexCoord3s (offset 398) */
+   /* _mesa_function_pool[9017]: MultiTexCoord3s (offset 398) */
    "iiii\0"
    "glMultiTexCoord3s\0"
    "glMultiTexCoord3sARB\0"
    "\0"
-   /* _mesa_function_pool[9071]: FinishTextureSUNX (dynamic) */
+   /* _mesa_function_pool[9062]: FinishTextureSUNX (dynamic) */
    "\0"
    "glFinishTextureSUNX\0"
    "\0"
-   /* _mesa_function_pool[9093]: GetFinalCombinerInputParameterfvNV (dynamic) */
+   /* _mesa_function_pool[9084]: GetFinalCombinerInputParameterfvNV (dynamic) */
    "iip\0"
    "glGetFinalCombinerInputParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[9135]: PollInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[9126]: PollInstrumentsSGIX (dynamic) */
    "p\0"
    "glPollInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[9160]: Vertex4iv (offset 147) */
+   /* _mesa_function_pool[9151]: Vertex4iv (offset 147) */
    "p\0"
    "glVertex4iv\0"
    "\0"
-   /* _mesa_function_pool[9175]: BufferSubData (will be remapped) */
+   /* _mesa_function_pool[9166]: BufferSubData (will be remapped) */
    "iiip\0"
    "glBufferSubData\0"
    "glBufferSubDataARB\0"
    "\0"
-   /* _mesa_function_pool[9216]: AlphaFragmentOp3ATI (will be remapped) */
+   /* _mesa_function_pool[9207]: AlphaFragmentOp3ATI (will be remapped) */
    "iiiiiiiiiiii\0"
    "glAlphaFragmentOp3ATI\0"
    "\0"
-   /* _mesa_function_pool[9252]: Begin (offset 7) */
+   /* _mesa_function_pool[9243]: Begin (offset 7) */
    "i\0"
    "glBegin\0"
    "\0"
-   /* _mesa_function_pool[9263]: LightModeli (offset 165) */
+   /* _mesa_function_pool[9254]: LightModeli (offset 165) */
    "ii\0"
    "glLightModeli\0"
    "\0"
-   /* _mesa_function_pool[9281]: UniformMatrix2fv (will be remapped) */
+   /* _mesa_function_pool[9272]: UniformMatrix2fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix2fv\0"
    "glUniformMatrix2fvARB\0"
    "\0"
-   /* _mesa_function_pool[9328]: LightModelf (offset 163) */
+   /* _mesa_function_pool[9319]: LightModelf (offset 163) */
    "if\0"
    "glLightModelf\0"
    "\0"
-   /* _mesa_function_pool[9346]: GetTexParameterfv (offset 282) */
+   /* _mesa_function_pool[9337]: GetTexParameterfv (offset 282) */
    "iip\0"
    "glGetTexParameterfv\0"
    "\0"
-   /* _mesa_function_pool[9371]: BinormalPointerEXT (dynamic) */
+   /* _mesa_function_pool[9362]: BinormalPointerEXT (dynamic) */
    "iip\0"
    "glBinormalPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[9397]: GetCombinerInputParameterivNV (dynamic) */
+   /* _mesa_function_pool[9388]: GetCombinerInputParameterivNV (dynamic) */
    "iiiip\0"
    "glGetCombinerInputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[9436]: DeleteAsyncMarkersSGIX (dynamic) */
+   /* _mesa_function_pool[9427]: DeleteAsyncMarkersSGIX (dynamic) */
    "ii\0"
    "glDeleteAsyncMarkersSGIX\0"
    "\0"
-   /* _mesa_function_pool[9465]: MultiTexCoord2fvARB (offset 387) */
+   /* _mesa_function_pool[9456]: MultiTexCoord2fvARB (offset 387) */
    "ip\0"
    "glMultiTexCoord2fv\0"
    "glMultiTexCoord2fvARB\0"
    "\0"
-   /* _mesa_function_pool[9510]: VertexAttrib4ubv (will be remapped) */
+   /* _mesa_function_pool[9501]: VertexAttrib4ubv (will be remapped) */
    "ip\0"
    "glVertexAttrib4ubv\0"
    "glVertexAttrib4ubvARB\0"
    "\0"
-   /* _mesa_function_pool[9555]: GetnTexImageARB (will be remapped) */
+   /* _mesa_function_pool[9546]: GetnTexImageARB (will be remapped) */
    "iiiiip\0"
    "glGetnTexImageARB\0"
    "\0"
-   /* _mesa_function_pool[9581]: ColorMask (offset 210) */
+   /* _mesa_function_pool[9572]: ColorMask (offset 210) */
    "iiii\0"
    "glColorMask\0"
    "\0"
-   /* _mesa_function_pool[9599]: GenAsyncMarkersSGIX (dynamic) */
+   /* _mesa_function_pool[9590]: GenAsyncMarkersSGIX (dynamic) */
    "i\0"
    "glGenAsyncMarkersSGIX\0"
    "\0"
-   /* _mesa_function_pool[9624]: ReplacementCodeuiVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[9615]: ReplacementCodeuiVertex3fSUN (dynamic) */
    "ifff\0"
    "glReplacementCodeuiVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[9661]: VertexAttribI4sv (will be remapped) */
+   /* _mesa_function_pool[9652]: VertexAttribI4sv (will be remapped) */
    "ip\0"
    "glVertexAttribI4svEXT\0"
    "glVertexAttribI4sv\0"
    "\0"
-   /* _mesa_function_pool[9706]: DrawElementsInstancedBaseInstance (will be remapped) */
+   /* _mesa_function_pool[9697]: DrawElementsInstancedBaseInstance (will be remapped) */
    "iiipii\0"
    "glDrawElementsInstancedBaseInstance\0"
    "\0"
-   /* _mesa_function_pool[9750]: UniformMatrix4fv (will be remapped) */
+   /* _mesa_function_pool[9741]: UniformMatrix4fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix4fv\0"
    "glUniformMatrix4fvARB\0"
    "\0"
-   /* _mesa_function_pool[9797]: UniformMatrix3x2fv (will be remapped) */
+   /* _mesa_function_pool[9788]: UniformMatrix3x2fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3x2fv\0"
    "\0"
-   /* _mesa_function_pool[9824]: VertexAttrib4Nuiv (will be remapped) */
+   /* _mesa_function_pool[9815]: VertexAttrib4Nuiv (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nuiv\0"
    "glVertexAttrib4NuivARB\0"
    "\0"
-   /* _mesa_function_pool[9871]: ClientActiveTexture (offset 375) */
+   /* _mesa_function_pool[9862]: ClientActiveTexture (offset 375) */
    "i\0"
    "glClientActiveTexture\0"
    "glClientActiveTextureARB\0"
    "\0"
-   /* _mesa_function_pool[9921]: GetUniformIndices (will be remapped) */
+   /* _mesa_function_pool[9912]: GetUniformIndices (will be remapped) */
    "iipp\0"
    "glGetUniformIndices\0"
    "\0"
-   /* _mesa_function_pool[9947]: GetTexBumpParameterivATI (will be remapped) */
+   /* _mesa_function_pool[9938]: GetTexBumpParameterivATI (will be remapped) */
    "ip\0"
    "glGetTexBumpParameterivATI\0"
    "\0"
-   /* _mesa_function_pool[9978]: Binormal3bEXT (dynamic) */
+   /* _mesa_function_pool[9969]: Binormal3bEXT (dynamic) */
    "iii\0"
    "glBinormal3bEXT\0"
    "\0"
-   /* _mesa_function_pool[9999]: CombinerParameterivNV (dynamic) */
+   /* _mesa_function_pool[9990]: CombinerParameterivNV (dynamic) */
    "ip\0"
    "glCombinerParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[10027]: MultiTexCoord2sv (offset 391) */
+   /* _mesa_function_pool[10018]: MultiTexCoord2sv (offset 391) */
    "ip\0"
    "glMultiTexCoord2sv\0"
    "glMultiTexCoord2svARB\0"
    "\0"
-   /* _mesa_function_pool[10072]: LoadIdentity (offset 290) */
+   /* _mesa_function_pool[10063]: LoadIdentity (offset 290) */
    "\0"
    "glLoadIdentity\0"
    "\0"
-   /* _mesa_function_pool[10089]: ActiveShaderProgram (will be remapped) */
+   /* _mesa_function_pool[10080]: ActiveShaderProgram (will be remapped) */
    "ii\0"
    "glActiveShaderProgram\0"
    "\0"
-   /* _mesa_function_pool[10115]: DeleteTransformFeedbacks (will be remapped) */
+   /* _mesa_function_pool[10106]: DeleteTransformFeedbacks (will be remapped) */
    "ip\0"
    "glDeleteTransformFeedbacks\0"
    "\0"
-   /* _mesa_function_pool[10146]: VertexAttrib4ubvNV (will be remapped) */
+   /* _mesa_function_pool[10137]: VertexAttrib4ubvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4ubvNV\0"
    "\0"
-   /* _mesa_function_pool[10171]: FogCoordfEXT (will be remapped) */
+   /* _mesa_function_pool[10162]: FogCoordfEXT (will be remapped) */
    "f\0"
    "glFogCoordf\0"
    "glFogCoordfEXT\0"
    "\0"
-   /* _mesa_function_pool[10201]: GetMapfv (offset 267) */
+   /* _mesa_function_pool[10192]: GetMapfv (offset 267) */
    "iip\0"
    "glGetMapfv\0"
    "\0"
-   /* _mesa_function_pool[10217]: GetProgramInfoLog (will be remapped) */
+   /* _mesa_function_pool[10208]: GetProgramInfoLog (will be remapped) */
    "iipp\0"
    "glGetProgramInfoLog\0"
    "\0"
-   /* _mesa_function_pool[10243]: BindTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[10234]: BindTransformFeedback (will be remapped) */
    "ii\0"
    "glBindTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[10271]: TexCoord4fColor4fNormal3fVertex4fvSUN (dynamic) */
+   /* _mesa_function_pool[10262]: TexCoord4fColor4fNormal3fVertex4fvSUN (dynamic) */
    "pppp\0"
    "glTexCoord4fColor4fNormal3fVertex4fvSUN\0"
    "\0"
-   /* _mesa_function_pool[10317]: GetPixelMapfv (offset 271) */
+   /* _mesa_function_pool[10308]: GetPixelMapfv (offset 271) */
    "ip\0"
    "glGetPixelMapfv\0"
    "\0"
-   /* _mesa_function_pool[10337]: WeightivARB (dynamic) */
+   /* _mesa_function_pool[10328]: WeightivARB (dynamic) */
    "ip\0"
    "glWeightivARB\0"
    "\0"
-   /* _mesa_function_pool[10355]: DebugMessageCallbackARB (will be remapped) */
-   "pp\0"
-   "glDebugMessageCallbackARB\0"
-   "\0"
-   /* _mesa_function_pool[10385]: VertexAttrib4svNV (will be remapped) */
+   /* _mesa_function_pool[10346]: VertexAttrib4svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4svNV\0"
    "\0"
-   /* _mesa_function_pool[10409]: ReplacementCodeuiTexCoord2fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[10370]: ReplacementCodeuiTexCoord2fVertex3fSUN (dynamic) */
    "ifffff\0"
    "glReplacementCodeuiTexCoord2fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[10458]: VDPAUSurfaceAccessNV (will be remapped) */
+   /* _mesa_function_pool[10419]: VDPAUSurfaceAccessNV (will be remapped) */
    "ii\0"
    "glVDPAUSurfaceAccessNV\0"
    "\0"
-   /* _mesa_function_pool[10485]: EdgeFlagPointer (offset 312) */
+   /* _mesa_function_pool[10446]: EdgeFlagPointer (offset 312) */
    "ip\0"
    "glEdgeFlagPointer\0"
    "\0"
-   /* _mesa_function_pool[10507]: WindowPos2f (will be remapped) */
+   /* _mesa_function_pool[10468]: WindowPos2f (will be remapped) */
    "ff\0"
    "glWindowPos2f\0"
    "glWindowPos2fARB\0"
    "glWindowPos2fMESA\0"
    "\0"
-   /* _mesa_function_pool[10560]: WindowPos2d (will be remapped) */
+   /* _mesa_function_pool[10521]: WindowPos2d (will be remapped) */
    "dd\0"
    "glWindowPos2d\0"
    "glWindowPos2dARB\0"
    "glWindowPos2dMESA\0"
    "\0"
-   /* _mesa_function_pool[10613]: WindowPos2i (will be remapped) */
+   /* _mesa_function_pool[10574]: WindowPos2i (will be remapped) */
    "ii\0"
    "glWindowPos2i\0"
    "glWindowPos2iARB\0"
    "glWindowPos2iMESA\0"
    "\0"
-   /* _mesa_function_pool[10666]: WindowPos2s (will be remapped) */
+   /* _mesa_function_pool[10627]: WindowPos2s (will be remapped) */
    "ii\0"
    "glWindowPos2s\0"
    "glWindowPos2sARB\0"
    "glWindowPos2sMESA\0"
    "\0"
-   /* _mesa_function_pool[10719]: VertexAttribI1uiEXT (will be remapped) */
+   /* _mesa_function_pool[10680]: VertexAttribI1uiEXT (will be remapped) */
    "ii\0"
    "glVertexAttribI1uiEXT\0"
    "glVertexAttribI1ui\0"
    "\0"
-   /* _mesa_function_pool[10764]: DeleteSync (will be remapped) */
+   /* _mesa_function_pool[10725]: DeleteSync (will be remapped) */
    "i\0"
    "glDeleteSync\0"
    "\0"
-   /* _mesa_function_pool[10780]: WindowPos4fvMESA (will be remapped) */
+   /* _mesa_function_pool[10741]: WindowPos4fvMESA (will be remapped) */
    "p\0"
    "glWindowPos4fvMESA\0"
    "\0"
-   /* _mesa_function_pool[10802]: CompressedTexImage3D (will be remapped) */
+   /* _mesa_function_pool[10763]: CompressedTexImage3D (will be remapped) */
    "iiiiiiiip\0"
    "glCompressedTexImage3D\0"
    "glCompressedTexImage3DARB\0"
    "glCompressedTexImage3DOES\0"
    "\0"
-   /* _mesa_function_pool[10888]: VertexAttribI1uiv (will be remapped) */
+   /* _mesa_function_pool[10849]: VertexAttribI1uiv (will be remapped) */
    "ip\0"
    "glVertexAttribI1uivEXT\0"
    "glVertexAttribI1uiv\0"
    "\0"
-   /* _mesa_function_pool[10935]: SecondaryColor3dv (will be remapped) */
+   /* _mesa_function_pool[10896]: SecondaryColor3dv (will be remapped) */
    "p\0"
    "glSecondaryColor3dv\0"
    "glSecondaryColor3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[10981]: GetListParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[10942]: GetListParameterivSGIX (dynamic) */
    "iip\0"
    "glGetListParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[11011]: GetnPixelMapusvARB (will be remapped) */
+   /* _mesa_function_pool[10972]: GetnPixelMapusvARB (will be remapped) */
    "iip\0"
    "glGetnPixelMapusvARB\0"
    "\0"
-   /* _mesa_function_pool[11037]: VertexAttrib3s (will be remapped) */
+   /* _mesa_function_pool[10998]: VertexAttrib3s (will be remapped) */
    "iiii\0"
    "glVertexAttrib3s\0"
    "glVertexAttrib3sARB\0"
    "\0"
-   /* _mesa_function_pool[11080]: UniformMatrix4x3fv (will be remapped) */
+   /* _mesa_function_pool[11041]: UniformMatrix4x3fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix4x3fv\0"
    "\0"
-   /* _mesa_function_pool[11107]: Binormal3dEXT (dynamic) */
+   /* _mesa_function_pool[11068]: Binormal3dEXT (dynamic) */
    "ddd\0"
    "glBinormal3dEXT\0"
    "\0"
-   /* _mesa_function_pool[11128]: GetQueryiv (will be remapped) */
+   /* _mesa_function_pool[11089]: GetQueryiv (will be remapped) */
    "iip\0"
    "glGetQueryiv\0"
    "glGetQueryivARB\0"
    "\0"
-   /* _mesa_function_pool[11162]: VertexAttrib3d (will be remapped) */
+   /* _mesa_function_pool[11123]: VertexAttrib3d (will be remapped) */
    "iddd\0"
    "glVertexAttrib3d\0"
    "glVertexAttrib3dARB\0"
    "\0"
-   /* _mesa_function_pool[11205]: ImageTransformParameterfHP (dynamic) */
+   /* _mesa_function_pool[11166]: ImageTransformParameterfHP (dynamic) */
    "iif\0"
    "glImageTransformParameterfHP\0"
    "\0"
-   /* _mesa_function_pool[11239]: MapBuffer (will be remapped) */
+   /* _mesa_function_pool[11200]: MapBuffer (will be remapped) */
    "ii\0"
    "glMapBuffer\0"
    "glMapBufferARB\0"
    "glMapBufferOES\0"
    "\0"
-   /* _mesa_function_pool[11285]: VertexAttrib4Nbv (will be remapped) */
+   /* _mesa_function_pool[11246]: VertexAttrib4Nbv (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nbv\0"
    "glVertexAttrib4NbvARB\0"
    "\0"
-   /* _mesa_function_pool[11330]: ProgramBinary (will be remapped) */
+   /* _mesa_function_pool[11291]: ProgramBinary (will be remapped) */
    "iipi\0"
    "glProgramBinary\0"
    "glProgramBinaryOES\0"
    "\0"
-   /* _mesa_function_pool[11371]: InvalidateTexImage (will be remapped) */
+   /* _mesa_function_pool[11332]: InvalidateTexImage (will be remapped) */
    "ii\0"
    "glInvalidateTexImage\0"
    "\0"
-   /* _mesa_function_pool[11396]: Uniform4ui (will be remapped) */
+   /* _mesa_function_pool[11357]: Uniform4ui (will be remapped) */
    "iiiii\0"
    "glUniform4uiEXT\0"
    "glUniform4ui\0"
    "\0"
-   /* _mesa_function_pool[11432]: VertexAttrib1fARB (will be remapped) */
+   /* _mesa_function_pool[11393]: VertexAttrib1fARB (will be remapped) */
    "if\0"
    "glVertexAttrib1f\0"
    "glVertexAttrib1fARB\0"
    "\0"
-   /* _mesa_function_pool[11473]: GetBooleani_v (will be remapped) */
+   /* _mesa_function_pool[11434]: GetBooleani_v (will be remapped) */
    "iip\0"
    "glGetBooleanIndexedvEXT\0"
    "glGetBooleani_v\0"
    "\0"
-   /* _mesa_function_pool[11518]: DrawTexsOES (will be remapped) */
+   /* _mesa_function_pool[11479]: DrawTexsOES (will be remapped) */
    "iiiii\0"
    "glDrawTexsOES\0"
    "\0"
-   /* _mesa_function_pool[11539]: GetObjectPtrLabel (will be remapped) */
+   /* _mesa_function_pool[11500]: GetObjectPtrLabel (will be remapped) */
    "pipp\0"
    "glGetObjectPtrLabel\0"
    "\0"
-   /* _mesa_function_pool[11565]: ProgramParameteri (will be remapped) */
+   /* _mesa_function_pool[11526]: ProgramParameteri (will be remapped) */
    "iii\0"
    "glProgramParameteriARB\0"
    "glProgramParameteri\0"
    "\0"
-   /* _mesa_function_pool[11613]: SecondaryColorPointerListIBM (dynamic) */
+   /* _mesa_function_pool[11574]: SecondaryColorPointerListIBM (dynamic) */
    "iiipi\0"
    "glSecondaryColorPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[11651]: Color3fv (offset 14) */
+   /* _mesa_function_pool[11612]: Color3fv (offset 14) */
    "p\0"
    "glColor3fv\0"
    "\0"
-   /* _mesa_function_pool[11665]: ReplacementCodeubSUN (dynamic) */
+   /* _mesa_function_pool[11626]: ReplacementCodeubSUN (dynamic) */
    "i\0"
    "glReplacementCodeubSUN\0"
    "\0"
-   /* _mesa_function_pool[11691]: GetnMapfvARB (will be remapped) */
+   /* _mesa_function_pool[11652]: GetnMapfvARB (will be remapped) */
    "iiip\0"
    "glGetnMapfvARB\0"
    "\0"
-   /* _mesa_function_pool[11712]: MultiTexCoord2i (offset 388) */
+   /* _mesa_function_pool[11673]: MultiTexCoord2i (offset 388) */
    "iii\0"
    "glMultiTexCoord2i\0"
    "glMultiTexCoord2iARB\0"
    "\0"
-   /* _mesa_function_pool[11756]: MultiTexCoord2d (offset 384) */
+   /* _mesa_function_pool[11717]: MultiTexCoord2d (offset 384) */
    "idd\0"
    "glMultiTexCoord2d\0"
    "glMultiTexCoord2dARB\0"
    "\0"
-   /* _mesa_function_pool[11800]: SamplerParameterIuiv (will be remapped) */
+   /* _mesa_function_pool[11761]: SamplerParameterIuiv (will be remapped) */
    "iip\0"
    "glSamplerParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[11828]: MultiTexCoord2s (offset 390) */
+   /* _mesa_function_pool[11789]: MultiTexCoord2s (offset 390) */
    "iii\0"
    "glMultiTexCoord2s\0"
    "glMultiTexCoord2sARB\0"
    "\0"
-   /* _mesa_function_pool[11872]: VDPAURegisterVideoSurfaceNV (will be remapped) */
+   /* _mesa_function_pool[11833]: VDPAURegisterVideoSurfaceNV (will be remapped) */
    "piip\0"
    "glVDPAURegisterVideoSurfaceNV\0"
    "\0"
-   /* _mesa_function_pool[11908]: TexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[11869]: TexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
    "ffffffffffff\0"
    "glTexCoord2fColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[11961]: BindBufferBase (will be remapped) */
+   /* _mesa_function_pool[11922]: BindBufferBase (will be remapped) */
    "iii\0"
    "glBindBufferBase\0"
    "glBindBufferBaseEXT\0"
    "\0"
-   /* _mesa_function_pool[12003]: GetPerfMonitorCounterDataAMD (will be remapped) */
+   /* _mesa_function_pool[11964]: GetPerfMonitorCounterDataAMD (will be remapped) */
    "iiipp\0"
    "glGetPerfMonitorCounterDataAMD\0"
    "\0"
-   /* _mesa_function_pool[12041]: ReplacementCodeuiNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[12002]: ReplacementCodeuiNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[12086]: MultTransposeMatrixf (will be remapped) */
+   /* _mesa_function_pool[12047]: MultTransposeMatrixf (will be remapped) */
    "p\0"
    "glMultTransposeMatrixf\0"
    "glMultTransposeMatrixfARB\0"
    "\0"
-   /* _mesa_function_pool[12138]: PolygonOffsetEXT (will be remapped) */
+   /* _mesa_function_pool[12099]: PolygonOffsetEXT (will be remapped) */
    "ff\0"
    "glPolygonOffsetEXT\0"
    "\0"
-   /* _mesa_function_pool[12161]: Scalex (will be remapped) */
+   /* _mesa_function_pool[12122]: Scalex (will be remapped) */
    "iii\0"
    "glScalexOES\0"
    "glScalex\0"
    "\0"
-   /* _mesa_function_pool[12187]: Scaled (offset 301) */
+   /* _mesa_function_pool[12148]: Scaled (offset 301) */
    "ddd\0"
    "glScaled\0"
    "\0"
-   /* _mesa_function_pool[12201]: Scalef (offset 302) */
+   /* _mesa_function_pool[12162]: Scalef (offset 302) */
    "fff\0"
    "glScalef\0"
    "\0"
-   /* _mesa_function_pool[12215]: IndexPointerEXT (will be remapped) */
+   /* _mesa_function_pool[12176]: IndexPointerEXT (will be remapped) */
    "iiip\0"
    "glIndexPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[12239]: GetUniformfv (will be remapped) */
+   /* _mesa_function_pool[12200]: GetUniformfv (will be remapped) */
    "iip\0"
    "glGetUniformfv\0"
    "glGetUniformfvARB\0"
    "\0"
-   /* _mesa_function_pool[12277]: ColorFragmentOp2ATI (will be remapped) */
+   /* _mesa_function_pool[12238]: ColorFragmentOp2ATI (will be remapped) */
    "iiiiiiiiii\0"
    "glColorFragmentOp2ATI\0"
    "\0"
-   /* _mesa_function_pool[12311]: VertexAttrib2sNV (will be remapped) */
+   /* _mesa_function_pool[12272]: VertexAttrib2sNV (will be remapped) */
    "iii\0"
    "glVertexAttrib2sNV\0"
    "\0"
-   /* _mesa_function_pool[12335]: ReadPixels (offset 256) */
+   /* _mesa_function_pool[12296]: ReadPixels (offset 256) */
    "iiiiiip\0"
    "glReadPixels\0"
    "\0"
-   /* _mesa_function_pool[12357]: NormalPointerListIBM (dynamic) */
+   /* _mesa_function_pool[12318]: NormalPointerListIBM (dynamic) */
    "iipi\0"
    "glNormalPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[12386]: QueryCounter (will be remapped) */
+   /* _mesa_function_pool[12347]: QueryCounter (will be remapped) */
    "ii\0"
    "glQueryCounter\0"
    "\0"
-   /* _mesa_function_pool[12405]: NormalPointerEXT (will be remapped) */
+   /* _mesa_function_pool[12366]: NormalPointerEXT (will be remapped) */
    "iiip\0"
    "glNormalPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[12430]: ProgramUniform3iv (will be remapped) */
+   /* _mesa_function_pool[12391]: ProgramUniform3iv (will be remapped) */
    "iiip\0"
    "glProgramUniform3iv\0"
    "\0"
-   /* _mesa_function_pool[12456]: GetActiveUniformBlockName (will be remapped) */
+   /* _mesa_function_pool[12417]: GetActiveUniformBlockName (will be remapped) */
    "iiipp\0"
    "glGetActiveUniformBlockName\0"
    "\0"
-   /* _mesa_function_pool[12491]: DrawElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[12452]: DrawElementsBaseVertex (will be remapped) */
    "iiipi\0"
    "glDrawElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[12523]: RasterPos3iv (offset 75) */
+   /* _mesa_function_pool[12484]: RasterPos3iv (offset 75) */
    "p\0"
    "glRasterPos3iv\0"
    "\0"
-   /* _mesa_function_pool[12541]: ColorMaski (will be remapped) */
+   /* _mesa_function_pool[12502]: ColorMaski (will be remapped) */
    "iiiii\0"
    "glColorMaskIndexedEXT\0"
    "glColorMaski\0"
    "\0"
-   /* _mesa_function_pool[12583]: Uniform2uiv (will be remapped) */
+   /* _mesa_function_pool[12544]: Uniform2uiv (will be remapped) */
    "iip\0"
    "glUniform2uivEXT\0"
    "glUniform2uiv\0"
    "\0"
-   /* _mesa_function_pool[12619]: RasterPos3s (offset 76) */
+   /* _mesa_function_pool[12580]: RasterPos3s (offset 76) */
    "iii\0"
    "glRasterPos3s\0"
    "\0"
-   /* _mesa_function_pool[12638]: RasterPos3d (offset 70) */
+   /* _mesa_function_pool[12599]: RasterPos3d (offset 70) */
    "ddd\0"
    "glRasterPos3d\0"
    "\0"
-   /* _mesa_function_pool[12657]: RasterPos3f (offset 72) */
+   /* _mesa_function_pool[12618]: RasterPos3f (offset 72) */
    "fff\0"
    "glRasterPos3f\0"
    "\0"
-   /* _mesa_function_pool[12676]: BindVertexArray (will be remapped) */
+   /* _mesa_function_pool[12637]: BindVertexArray (will be remapped) */
    "i\0"
    "glBindVertexArray\0"
    "glBindVertexArrayOES\0"
    "\0"
-   /* _mesa_function_pool[12718]: RasterPos3i (offset 74) */
+   /* _mesa_function_pool[12679]: RasterPos3i (offset 74) */
    "iii\0"
    "glRasterPos3i\0"
    "\0"
-   /* _mesa_function_pool[12737]: GetTexParameterIuiv (will be remapped) */
+   /* _mesa_function_pool[12698]: GetTexParameterIuiv (will be remapped) */
    "iip\0"
    "glGetTexParameterIuivEXT\0"
    "glGetTexParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[12789]: DrawTransformFeedbackStreamInstanced (will be remapped) */
+   /* _mesa_function_pool[12750]: DrawTransformFeedbackStreamInstanced (will be remapped) */
    "iiii\0"
    "glDrawTransformFeedbackStreamInstanced\0"
    "\0"
-   /* _mesa_function_pool[12834]: VertexAttrib2fvARB (will be remapped) */
+   /* _mesa_function_pool[12795]: VertexAttrib2fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2fv\0"
    "glVertexAttrib2fvARB\0"
    "\0"
-   /* _mesa_function_pool[12877]: VertexPointerListIBM (dynamic) */
+   /* _mesa_function_pool[12838]: VertexPointerListIBM (dynamic) */
    "iiipi\0"
    "glVertexPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[12907]: TexCoord2fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[12868]: TexCoord2fNormal3fVertex3fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord2fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[12949]: IsFenceNV (dynamic) */
+   /* _mesa_function_pool[12910]: IsFenceNV (dynamic) */
    "i\0"
    "glIsFenceNV\0"
    "\0"
-   /* _mesa_function_pool[12964]: ColorTable (offset 339) */
+   /* _mesa_function_pool[12925]: ColorTable (offset 339) */
    "iiiiip\0"
    "glColorTable\0"
    "glColorTableSGI\0"
    "glColorTableEXT\0"
    "\0"
-   /* _mesa_function_pool[13017]: LoadName (offset 198) */
+   /* _mesa_function_pool[12978]: LoadName (offset 198) */
    "i\0"
    "glLoadName\0"
    "\0"
-   /* _mesa_function_pool[13031]: Color3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[12992]: Color3fVertex3fSUN (dynamic) */
    "ffffff\0"
    "glColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[13060]: GetnUniformuivARB (will be remapped) */
+   /* _mesa_function_pool[13021]: GetnUniformuivARB (will be remapped) */
    "iiip\0"
    "glGetnUniformuivARB\0"
    "\0"
-   /* _mesa_function_pool[13086]: ClearIndex (offset 205) */
+   /* _mesa_function_pool[13047]: ClearIndex (offset 205) */
    "f\0"
    "glClearIndex\0"
    "\0"
-   /* _mesa_function_pool[13102]: ConvolutionParameterfv (offset 351) */
+   /* _mesa_function_pool[13063]: ConvolutionParameterfv (offset 351) */
    "iip\0"
    "glConvolutionParameterfv\0"
    "glConvolutionParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[13160]: TbufferMask3DFX (dynamic) */
+   /* _mesa_function_pool[13121]: TbufferMask3DFX (dynamic) */
    "i\0"
    "glTbufferMask3DFX\0"
    "\0"
-   /* _mesa_function_pool[13181]: GetTexGendv (offset 278) */
+   /* _mesa_function_pool[13142]: GetTexGendv (offset 278) */
    "iip\0"
    "glGetTexGendv\0"
    "\0"
-   /* _mesa_function_pool[13200]: MultiTexCoordP1ui (will be remapped) */
+   /* _mesa_function_pool[13161]: MultiTexCoordP1ui (will be remapped) */
    "iii\0"
    "glMultiTexCoordP1ui\0"
    "\0"
-   /* _mesa_function_pool[13225]: EvalMesh2 (offset 238) */
+   /* _mesa_function_pool[13186]: EvalMesh2 (offset 238) */
    "iiiii\0"
    "glEvalMesh2\0"
    "\0"
-   /* _mesa_function_pool[13244]: Vertex4fv (offset 145) */
+   /* _mesa_function_pool[13205]: Vertex4fv (offset 145) */
    "p\0"
    "glVertex4fv\0"
    "\0"
-   /* _mesa_function_pool[13259]: SelectPerfMonitorCountersAMD (will be remapped) */
+   /* _mesa_function_pool[13220]: SelectPerfMonitorCountersAMD (will be remapped) */
    "iiiip\0"
    "glSelectPerfMonitorCountersAMD\0"
    "\0"
-   /* _mesa_function_pool[13297]: BindFramebuffer (will be remapped) */
+   /* _mesa_function_pool[13258]: BindFramebuffer (will be remapped) */
    "ii\0"
    "glBindFramebuffer\0"
    "glBindFramebufferOES\0"
    "\0"
-   /* _mesa_function_pool[13340]: LoadIdentityDeformationMapSGIX (dynamic) */
+   /* _mesa_function_pool[13301]: LoadIdentityDeformationMapSGIX (dynamic) */
    "i\0"
    "glLoadIdentityDeformationMapSGIX\0"
    "\0"
-   /* _mesa_function_pool[13376]: GetMinmax (offset 364) */
+   /* _mesa_function_pool[13337]: GetMinmax (offset 364) */
    "iiiip\0"
    "glGetMinmax\0"
    "glGetMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[13410]: Color3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[13371]: Color3fVertex3fvSUN (dynamic) */
    "pp\0"
    "glColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[13436]: VertexAttribs3svNV (will be remapped) */
+   /* _mesa_function_pool[13397]: VertexAttribs3svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs3svNV\0"
    "\0"
-   /* _mesa_function_pool[13462]: GetActiveUniformsiv (will be remapped) */
+   /* _mesa_function_pool[13423]: GetActiveUniformsiv (will be remapped) */
    "iipip\0"
    "glGetActiveUniformsiv\0"
    "\0"
-   /* _mesa_function_pool[13491]: VertexAttrib2sv (will be remapped) */
+   /* _mesa_function_pool[13452]: VertexAttrib2sv (will be remapped) */
    "ip\0"
    "glVertexAttrib2sv\0"
    "glVertexAttrib2svARB\0"
    "\0"
-   /* _mesa_function_pool[13534]: GetProgramEnvParameterdvARB (will be remapped) */
+   /* _mesa_function_pool[13495]: GetProgramEnvParameterdvARB (will be remapped) */
    "iip\0"
    "glGetProgramEnvParameterdvARB\0"
    "\0"
-   /* _mesa_function_pool[13569]: VertexAttrib1dNV (will be remapped) */
+   /* _mesa_function_pool[13530]: VertexAttrib1dNV (will be remapped) */
    "id\0"
    "glVertexAttrib1dNV\0"
    "\0"
-   /* _mesa_function_pool[13592]: ReplacementCodeuiNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[13553]: ReplacementCodeuiNormal3fVertex3fSUN (dynamic) */
    "iffffff\0"
    "glReplacementCodeuiNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[13640]: GetPerfMonitorGroupStringAMD (will be remapped) */
+   /* _mesa_function_pool[13601]: GetPerfMonitorGroupStringAMD (will be remapped) */
    "iipp\0"
    "glGetPerfMonitorGroupStringAMD\0"
    "\0"
-   /* _mesa_function_pool[13677]: GetError (offset 261) */
+   /* _mesa_function_pool[13638]: GetError (offset 261) */
    "\0"
    "glGetError\0"
    "\0"
-   /* _mesa_function_pool[13690]: PassThrough (offset 199) */
+   /* _mesa_function_pool[13651]: PassThrough (offset 199) */
    "f\0"
    "glPassThrough\0"
    "\0"
-   /* _mesa_function_pool[13707]: GetListParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[13668]: GetListParameterfvSGIX (dynamic) */
    "iip\0"
    "glGetListParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[13737]: GetObjectParameterivAPPLE (will be remapped) */
+   /* _mesa_function_pool[13698]: GetObjectParameterivAPPLE (will be remapped) */
    "iiip\0"
    "glGetObjectParameterivAPPLE\0"
    "\0"
-   /* _mesa_function_pool[13771]: GlobalAlphaFactorubSUN (dynamic) */
+   /* _mesa_function_pool[13732]: GlobalAlphaFactorubSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorubSUN\0"
    "\0"
-   /* _mesa_function_pool[13799]: VertexAttrib4fvARB (will be remapped) */
+   /* _mesa_function_pool[13760]: VertexAttrib4fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4fv\0"
    "glVertexAttrib4fvARB\0"
    "\0"
-   /* _mesa_function_pool[13842]: WindowPos3dv (will be remapped) */
+   /* _mesa_function_pool[13803]: WindowPos3dv (will be remapped) */
    "p\0"
    "glWindowPos3dv\0"
    "glWindowPos3dvARB\0"
    "glWindowPos3dvMESA\0"
    "\0"
-   /* _mesa_function_pool[13897]: ReplacementCodeusvSUN (dynamic) */
+   /* _mesa_function_pool[13858]: ReplacementCodeusvSUN (dynamic) */
    "p\0"
    "glReplacementCodeusvSUN\0"
    "\0"
-   /* _mesa_function_pool[13924]: DeleteFencesNV (dynamic) */
+   /* _mesa_function_pool[13885]: DeleteFencesNV (dynamic) */
    "ip\0"
    "glDeleteFencesNV\0"
    "\0"
-   /* _mesa_function_pool[13945]: GetImageTransformParameterivHP (dynamic) */
+   /* _mesa_function_pool[13906]: GetImageTransformParameterivHP (dynamic) */
    "iip\0"
    "glGetImageTransformParameterivHP\0"
    "\0"
-   /* _mesa_function_pool[13983]: StencilOp (offset 244) */
+   /* _mesa_function_pool[13944]: StencilOp (offset 244) */
    "iii\0"
    "glStencilOp\0"
    "\0"
-   /* _mesa_function_pool[14000]: Binormal3fEXT (dynamic) */
+   /* _mesa_function_pool[13961]: Binormal3fEXT (dynamic) */
    "fff\0"
    "glBinormal3fEXT\0"
    "\0"
-   /* _mesa_function_pool[14021]: ProgramUniform1iv (will be remapped) */
+   /* _mesa_function_pool[13982]: ProgramUniform1iv (will be remapped) */
    "iiip\0"
    "glProgramUniform1iv\0"
    "\0"
-   /* _mesa_function_pool[14047]: ProgramUniform3ui (will be remapped) */
+   /* _mesa_function_pool[14008]: ProgramUniform3ui (will be remapped) */
    "iiiii\0"
    "glProgramUniform3ui\0"
    "\0"
-   /* _mesa_function_pool[14074]: SecondaryColor3sv (will be remapped) */
+   /* _mesa_function_pool[14035]: SecondaryColor3sv (will be remapped) */
    "p\0"
    "glSecondaryColor3sv\0"
    "glSecondaryColor3svEXT\0"
    "\0"
-   /* _mesa_function_pool[14120]: TexCoordP3ui (will be remapped) */
+   /* _mesa_function_pool[14081]: TexCoordP3ui (will be remapped) */
    "ii\0"
    "glTexCoordP3ui\0"
    "\0"
-   /* _mesa_function_pool[14139]: Fogxv (will be remapped) */
+   /* _mesa_function_pool[14100]: Fogxv (will be remapped) */
    "ip\0"
    "glFogxvOES\0"
    "glFogxv\0"
    "\0"
-   /* _mesa_function_pool[14162]: VertexPointervINTEL (dynamic) */
+   /* _mesa_function_pool[14123]: VertexPointervINTEL (dynamic) */
    "iip\0"
    "glVertexPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[14189]: VertexAttribP1ui (will be remapped) */
+   /* _mesa_function_pool[14150]: VertexAttribP1ui (will be remapped) */
    "iiii\0"
    "glVertexAttribP1ui\0"
    "\0"
-   /* _mesa_function_pool[14214]: DeleteLists (offset 4) */
+   /* _mesa_function_pool[14175]: DeleteLists (offset 4) */
    "ii\0"
    "glDeleteLists\0"
    "\0"
-   /* _mesa_function_pool[14232]: LogicOp (offset 242) */
+   /* _mesa_function_pool[14193]: LogicOp (offset 242) */
    "i\0"
    "glLogicOp\0"
    "\0"
-   /* _mesa_function_pool[14245]: RenderbufferStorageMultisample (will be remapped) */
+   /* _mesa_function_pool[14206]: RenderbufferStorageMultisample (will be remapped) */
    "iiiii\0"
    "glRenderbufferStorageMultisample\0"
    "glRenderbufferStorageMultisampleEXT\0"
    "\0"
-   /* _mesa_function_pool[14321]: WindowPos3d (will be remapped) */
+   /* _mesa_function_pool[14282]: WindowPos3d (will be remapped) */
    "ddd\0"
    "glWindowPos3d\0"
    "glWindowPos3dARB\0"
    "glWindowPos3dMESA\0"
    "\0"
-   /* _mesa_function_pool[14375]: Enablei (will be remapped) */
+   /* _mesa_function_pool[14336]: Enablei (will be remapped) */
    "ii\0"
    "glEnableIndexedEXT\0"
    "glEnablei\0"
    "\0"
-   /* _mesa_function_pool[14408]: WindowPos3f (will be remapped) */
+   /* _mesa_function_pool[14369]: WindowPos3f (will be remapped) */
    "fff\0"
    "glWindowPos3f\0"
    "glWindowPos3fARB\0"
    "glWindowPos3fMESA\0"
    "\0"
-   /* _mesa_function_pool[14462]: GenProgramsARB (will be remapped) */
+   /* _mesa_function_pool[14423]: GenProgramsARB (will be remapped) */
    "ip\0"
    "glGenProgramsARB\0"
    "glGenProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[14499]: RasterPos2sv (offset 69) */
+   /* _mesa_function_pool[14460]: RasterPos2sv (offset 69) */
    "p\0"
    "glRasterPos2sv\0"
    "\0"
-   /* _mesa_function_pool[14517]: WindowPos3i (will be remapped) */
+   /* _mesa_function_pool[14478]: WindowPos3i (will be remapped) */
    "iii\0"
    "glWindowPos3i\0"
    "glWindowPos3iARB\0"
    "glWindowPos3iMESA\0"
    "\0"
-   /* _mesa_function_pool[14571]: MultiTexCoord4iv (offset 405) */
+   /* _mesa_function_pool[14532]: MultiTexCoord4iv (offset 405) */
    "ip\0"
    "glMultiTexCoord4iv\0"
    "glMultiTexCoord4ivARB\0"
    "\0"
-   /* _mesa_function_pool[14616]: TexCoord1sv (offset 101) */
+   /* _mesa_function_pool[14577]: TexCoord1sv (offset 101) */
    "p\0"
    "glTexCoord1sv\0"
    "\0"
-   /* _mesa_function_pool[14633]: WindowPos3s (will be remapped) */
+   /* _mesa_function_pool[14594]: WindowPos3s (will be remapped) */
    "iii\0"
    "glWindowPos3s\0"
    "glWindowPos3sARB\0"
    "glWindowPos3sMESA\0"
    "\0"
-   /* _mesa_function_pool[14687]: PixelMapusv (offset 253) */
+   /* _mesa_function_pool[14648]: PixelMapusv (offset 253) */
    "iip\0"
    "glPixelMapusv\0"
    "\0"
-   /* _mesa_function_pool[14706]: DebugMessageInsert (will be remapped) */
+   /* _mesa_function_pool[14667]: DebugMessageInsert (will be remapped) */
    "iiiiip\0"
+   "glDebugMessageInsertARB\0"
    "glDebugMessageInsert\0"
    "\0"
-   /* _mesa_function_pool[14735]: Orthof (will be remapped) */
+   /* _mesa_function_pool[14720]: Orthof (will be remapped) */
    "ffffff\0"
    "glOrthofOES\0"
    "glOrthof\0"
    "\0"
-   /* _mesa_function_pool[14764]: CompressedTexImage2D (will be remapped) */
+   /* _mesa_function_pool[14749]: CompressedTexImage2D (will be remapped) */
    "iiiiiiip\0"
    "glCompressedTexImage2D\0"
    "glCompressedTexImage2DARB\0"
    "\0"
-   /* _mesa_function_pool[14823]: DeleteObjectARB (will be remapped) */
+   /* _mesa_function_pool[14808]: DeleteObjectARB (will be remapped) */
    "i\0"
    "glDeleteObjectARB\0"
    "\0"
-   /* _mesa_function_pool[14844]: IsSync (will be remapped) */
+   /* _mesa_function_pool[14829]: IsSync (will be remapped) */
    "i\0"
    "glIsSync\0"
    "\0"
-   /* _mesa_function_pool[14856]: Color4uiv (offset 38) */
+   /* _mesa_function_pool[14841]: Color4uiv (offset 38) */
    "p\0"
    "glColor4uiv\0"
    "\0"
-   /* _mesa_function_pool[14871]: MultiTexCoord1sv (offset 383) */
+   /* _mesa_function_pool[14856]: MultiTexCoord1sv (offset 383) */
    "ip\0"
    "glMultiTexCoord1sv\0"
    "glMultiTexCoord1svARB\0"
    "\0"
-   /* _mesa_function_pool[14916]: Orthox (will be remapped) */
+   /* _mesa_function_pool[14901]: Orthox (will be remapped) */
    "iiiiii\0"
    "glOrthoxOES\0"
    "glOrthox\0"
    "\0"
-   /* _mesa_function_pool[14945]: PushAttrib (offset 219) */
+   /* _mesa_function_pool[14930]: PushAttrib (offset 219) */
    "i\0"
    "glPushAttrib\0"
    "\0"
-   /* _mesa_function_pool[14961]: RasterPos2i (offset 66) */
+   /* _mesa_function_pool[14946]: RasterPos2i (offset 66) */
    "ii\0"
    "glRasterPos2i\0"
    "\0"
-   /* _mesa_function_pool[14979]: ClipPlane (offset 150) */
+   /* _mesa_function_pool[14964]: ClipPlane (offset 150) */
    "ip\0"
    "glClipPlane\0"
    "\0"
-   /* _mesa_function_pool[14995]: TexCoord2fColor3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[14980]: TexCoord2fColor3fVertex3fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord2fColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[15036]: GetProgramivNV (will be remapped) */
+   /* _mesa_function_pool[15021]: GetProgramivNV (will be remapped) */
    "iip\0"
    "glGetProgramivNV\0"
    "\0"
-   /* _mesa_function_pool[15058]: RasterPos2f (offset 64) */
+   /* _mesa_function_pool[15043]: RasterPos2f (offset 64) */
    "ff\0"
    "glRasterPos2f\0"
    "\0"
-   /* _mesa_function_pool[15076]: RasterPos2d (offset 62) */
+   /* _mesa_function_pool[15061]: RasterPos2d (offset 62) */
    "dd\0"
    "glRasterPos2d\0"
    "\0"
-   /* _mesa_function_pool[15094]: RasterPos3fv (offset 73) */
+   /* _mesa_function_pool[15079]: RasterPos3fv (offset 73) */
    "p\0"
    "glRasterPos3fv\0"
    "\0"
-   /* _mesa_function_pool[15112]: InvalidateSubFramebuffer (will be remapped) */
+   /* _mesa_function_pool[15097]: InvalidateSubFramebuffer (will be remapped) */
    "iipiiii\0"
    "glInvalidateSubFramebuffer\0"
    "\0"
-   /* _mesa_function_pool[15148]: Color4ub (offset 35) */
+   /* _mesa_function_pool[15133]: Color4ub (offset 35) */
    "iiii\0"
    "glColor4ub\0"
    "\0"
-   /* _mesa_function_pool[15165]: RasterPos2s (offset 68) */
+   /* _mesa_function_pool[15150]: RasterPos2s (offset 68) */
    "ii\0"
    "glRasterPos2s\0"
    "\0"
-   /* _mesa_function_pool[15183]: Color4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[15168]: Color4fNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[15218]: GetVertexAttribivNV (will be remapped) */
+   /* _mesa_function_pool[15203]: GetVertexAttribivNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribivNV\0"
    "\0"
-   /* _mesa_function_pool[15245]: TexSubImage4DSGIS (dynamic) */
+   /* _mesa_function_pool[15230]: TexSubImage4DSGIS (dynamic) */
    "iiiiiiiiiiiip\0"
    "glTexSubImage4DSGIS\0"
    "\0"
-   /* _mesa_function_pool[15280]: MultiTexCoord3dv (offset 393) */
+   /* _mesa_function_pool[15265]: MultiTexCoord3dv (offset 393) */
    "ip\0"
    "glMultiTexCoord3dv\0"
    "glMultiTexCoord3dvARB\0"
    "\0"
-   /* _mesa_function_pool[15325]: BindProgramPipeline (will be remapped) */
+   /* _mesa_function_pool[15310]: BindProgramPipeline (will be remapped) */
    "i\0"
    "glBindProgramPipeline\0"
    "\0"
-   /* _mesa_function_pool[15350]: VertexAttribP4uiv (will be remapped) */
+   /* _mesa_function_pool[15335]: VertexAttribP4uiv (will be remapped) */
    "iiip\0"
    "glVertexAttribP4uiv\0"
    "\0"
-   /* _mesa_function_pool[15376]: DebugMessageCallback (will be remapped) */
+   /* _mesa_function_pool[15361]: DebugMessageCallback (will be remapped) */
    "pp\0"
+   "glDebugMessageCallbackARB\0"
    "glDebugMessageCallback\0"
    "\0"
-   /* _mesa_function_pool[15403]: MultiTexCoord1i (offset 380) */
+   /* _mesa_function_pool[15414]: MultiTexCoord1i (offset 380) */
    "ii\0"
    "glMultiTexCoord1i\0"
    "glMultiTexCoord1iARB\0"
    "\0"
-   /* _mesa_function_pool[15446]: WindowPos2dv (will be remapped) */
+   /* _mesa_function_pool[15457]: WindowPos2dv (will be remapped) */
    "p\0"
    "glWindowPos2dv\0"
    "glWindowPos2dvARB\0"
    "glWindowPos2dvMESA\0"
    "\0"
-   /* _mesa_function_pool[15501]: TexParameterIuiv (will be remapped) */
+   /* _mesa_function_pool[15512]: TexParameterIuiv (will be remapped) */
    "iip\0"
    "glTexParameterIuivEXT\0"
    "glTexParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[15547]: MultiTexCoord1d (offset 376) */
+   /* _mesa_function_pool[15558]: MultiTexCoord1d (offset 376) */
    "id\0"
    "glMultiTexCoord1d\0"
    "glMultiTexCoord1dARB\0"
    "\0"
-   /* _mesa_function_pool[15590]: GenVertexArraysAPPLE (will be remapped) */
+   /* _mesa_function_pool[15601]: GenVertexArraysAPPLE (will be remapped) */
    "ip\0"
    "glGenVertexArraysAPPLE\0"
    "\0"
-   /* _mesa_function_pool[15617]: MultiTexCoord1s (offset 382) */
+   /* _mesa_function_pool[15628]: MultiTexCoord1s (offset 382) */
    "ii\0"
    "glMultiTexCoord1s\0"
    "glMultiTexCoord1sARB\0"
    "\0"
-   /* _mesa_function_pool[15660]: BeginConditionalRender (will be remapped) */
+   /* _mesa_function_pool[15671]: BeginConditionalRender (will be remapped) */
    "ii\0"
    "glBeginConditionalRender\0"
    "glBeginConditionalRenderNV\0"
    "\0"
-   /* _mesa_function_pool[15716]: LoadPaletteFromModelViewMatrixOES (dynamic) */
+   /* _mesa_function_pool[15727]: LoadPaletteFromModelViewMatrixOES (dynamic) */
    "\0"
    "glLoadPaletteFromModelViewMatrixOES\0"
    "\0"
-   /* _mesa_function_pool[15754]: GetShaderiv (will be remapped) */
+   /* _mesa_function_pool[15765]: GetShaderiv (will be remapped) */
    "iip\0"
    "glGetShaderiv\0"
    "\0"
-   /* _mesa_function_pool[15773]: GetMapAttribParameterfvNV (dynamic) */
+   /* _mesa_function_pool[15784]: GetMapAttribParameterfvNV (dynamic) */
    "iiip\0"
    "glGetMapAttribParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[15807]: CopyConvolutionFilter1D (offset 354) */
+   /* _mesa_function_pool[15818]: CopyConvolutionFilter1D (offset 354) */
    "iiiii\0"
    "glCopyConvolutionFilter1D\0"
    "glCopyConvolutionFilter1DEXT\0"
    "\0"
-   /* _mesa_function_pool[15869]: ClearBufferfv (will be remapped) */
+   /* _mesa_function_pool[15880]: ClearBufferfv (will be remapped) */
    "iip\0"
    "glClearBufferfv\0"
    "\0"
-   /* _mesa_function_pool[15890]: InstrumentsBufferSGIX (dynamic) */
+   /* _mesa_function_pool[15901]: InstrumentsBufferSGIX (dynamic) */
    "ip\0"
    "glInstrumentsBufferSGIX\0"
    "\0"
-   /* _mesa_function_pool[15918]: CreateShaderObjectARB (will be remapped) */
+   /* _mesa_function_pool[15929]: CreateShaderObjectARB (will be remapped) */
    "i\0"
    "glCreateShaderObjectARB\0"
    "\0"
-   /* _mesa_function_pool[15945]: GetTexParameterxv (will be remapped) */
+   /* _mesa_function_pool[15956]: GetTexParameterxv (will be remapped) */
    "iip\0"
    "glGetTexParameterxvOES\0"
    "glGetTexParameterxv\0"
    "\0"
-   /* _mesa_function_pool[15993]: GetAttachedShaders (will be remapped) */
+   /* _mesa_function_pool[16004]: GetAttachedShaders (will be remapped) */
    "iipp\0"
    "glGetAttachedShaders\0"
    "\0"
-   /* _mesa_function_pool[16020]: ClearBufferfi (will be remapped) */
+   /* _mesa_function_pool[16031]: ClearBufferfi (will be remapped) */
    "iifi\0"
    "glClearBufferfi\0"
    "\0"
-   /* _mesa_function_pool[16042]: Materialiv (offset 172) */
+   /* _mesa_function_pool[16053]: Materialiv (offset 172) */
    "iip\0"
    "glMaterialiv\0"
    "\0"
-   /* _mesa_function_pool[16060]: DeleteFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[16071]: DeleteFragmentShaderATI (will be remapped) */
    "i\0"
    "glDeleteFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[16089]: Tangent3dvEXT (dynamic) */
+   /* _mesa_function_pool[16100]: Tangent3dvEXT (dynamic) */
    "p\0"
    "glTangent3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[16108]: DrawElementsInstancedBaseVertex (will be remapped) */
+   /* _mesa_function_pool[16119]: DrawElementsInstancedBaseVertex (will be remapped) */
    "iiipii\0"
    "glDrawElementsInstancedBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[16150]: DisableClientState (offset 309) */
+   /* _mesa_function_pool[16161]: DisableClientState (offset 309) */
    "i\0"
    "glDisableClientState\0"
    "\0"
-   /* _mesa_function_pool[16174]: TexGeni (offset 192) */
+   /* _mesa_function_pool[16185]: TexGeni (offset 192) */
    "iii\0"
    "glTexGeni\0"
    "glTexGeniOES\0"
    "\0"
-   /* _mesa_function_pool[16202]: TexGenf (offset 190) */
+   /* _mesa_function_pool[16213]: TexGenf (offset 190) */
    "iif\0"
    "glTexGenf\0"
    "glTexGenfOES\0"
    "\0"
-   /* _mesa_function_pool[16230]: TexGend (offset 188) */
+   /* _mesa_function_pool[16241]: TexGend (offset 188) */
    "iid\0"
    "glTexGend\0"
    "\0"
-   /* _mesa_function_pool[16245]: GetVertexAttribfvNV (will be remapped) */
+   /* _mesa_function_pool[16256]: GetVertexAttribfvNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribfvNV\0"
    "\0"
-   /* _mesa_function_pool[16272]: ColorPointerListIBM (dynamic) */
+   /* _mesa_function_pool[16283]: ColorPointerListIBM (dynamic) */
    "iiipi\0"
    "glColorPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[16301]: Color4sv (offset 34) */
+   /* _mesa_function_pool[16312]: Color4sv (offset 34) */
    "p\0"
    "glColor4sv\0"
    "\0"
-   /* _mesa_function_pool[16315]: GetCombinerInputParameterfvNV (dynamic) */
+   /* _mesa_function_pool[16326]: GetCombinerInputParameterfvNV (dynamic) */
    "iiiip\0"
    "glGetCombinerInputParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[16354]: LoadTransposeMatrixf (will be remapped) */
+   /* _mesa_function_pool[16365]: LoadTransposeMatrixf (will be remapped) */
    "p\0"
    "glLoadTransposeMatrixf\0"
    "glLoadTransposeMatrixfARB\0"
    "\0"
-   /* _mesa_function_pool[16406]: LoadTransposeMatrixd (will be remapped) */
+   /* _mesa_function_pool[16417]: LoadTransposeMatrixd (will be remapped) */
    "p\0"
    "glLoadTransposeMatrixd\0"
    "glLoadTransposeMatrixdARB\0"
    "\0"
-   /* _mesa_function_pool[16458]: PixelZoom (offset 246) */
+   /* _mesa_function_pool[16469]: PixelZoom (offset 246) */
    "ff\0"
    "glPixelZoom\0"
    "\0"
-   /* _mesa_function_pool[16474]: ProgramEnvParameter4dARB (will be remapped) */
+   /* _mesa_function_pool[16485]: ProgramEnvParameter4dARB (will be remapped) */
    "iidddd\0"
    "glProgramEnvParameter4dARB\0"
    "glProgramParameter4dNV\0"
    "\0"
-   /* _mesa_function_pool[16532]: ColorTableParameterfv (offset 340) */
+   /* _mesa_function_pool[16543]: ColorTableParameterfv (offset 340) */
    "iip\0"
    "glColorTableParameterfv\0"
    "glColorTableParameterfvSGI\0"
    "\0"
-   /* _mesa_function_pool[16588]: IsTexture (offset 330) */
+   /* _mesa_function_pool[16599]: IsTexture (offset 330) */
    "i\0"
    "glIsTexture\0"
    "glIsTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[16618]: ProgramUniform3uiv (will be remapped) */
+   /* _mesa_function_pool[16629]: ProgramUniform3uiv (will be remapped) */
    "iiip\0"
    "glProgramUniform3uiv\0"
    "\0"
-   /* _mesa_function_pool[16645]: ProgramUniform2fv (will be remapped) */
+   /* _mesa_function_pool[16656]: ProgramUniform2fv (will be remapped) */
    "iiip\0"
    "glProgramUniform2fv\0"
    "\0"
-   /* _mesa_function_pool[16671]: ImageTransformParameterivHP (dynamic) */
+   /* _mesa_function_pool[16682]: ImageTransformParameterivHP (dynamic) */
    "iip\0"
    "glImageTransformParameterivHP\0"
    "\0"
-   /* _mesa_function_pool[16706]: VertexAttrib4sNV (will be remapped) */
+   /* _mesa_function_pool[16717]: VertexAttrib4sNV (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4sNV\0"
    "\0"
-   /* _mesa_function_pool[16732]: GetMapdv (offset 266) */
+   /* _mesa_function_pool[16743]: GetMapdv (offset 266) */
    "iip\0"
    "glGetMapdv\0"
    "\0"
-   /* _mesa_function_pool[16748]: GenVertexArrays (will be remapped) */
+   /* _mesa_function_pool[16759]: GenVertexArrays (will be remapped) */
    "ip\0"
    "glGenVertexArrays\0"
    "glGenVertexArraysOES\0"
    "\0"
-   /* _mesa_function_pool[16791]: ReplacementCodeuiColor4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[16802]: ReplacementCodeuiColor4ubVertex3fSUN (dynamic) */
    "iiiiifff\0"
    "glReplacementCodeuiColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[16840]: IsBuffer (will be remapped) */
+   /* _mesa_function_pool[16851]: IsBuffer (will be remapped) */
    "i\0"
    "glIsBuffer\0"
    "glIsBufferARB\0"
    "\0"
-   /* _mesa_function_pool[16868]: ColorP4ui (will be remapped) */
+   /* _mesa_function_pool[16879]: ColorP4ui (will be remapped) */
    "ii\0"
    "glColorP4ui\0"
    "\0"
-   /* _mesa_function_pool[16884]: SpriteParameteriSGIX (dynamic) */
+   /* _mesa_function_pool[16895]: SpriteParameteriSGIX (dynamic) */
    "ii\0"
    "glSpriteParameteriSGIX\0"
    "\0"
-   /* _mesa_function_pool[16911]: TexCoordP3uiv (will be remapped) */
+   /* _mesa_function_pool[16922]: TexCoordP3uiv (will be remapped) */
    "ip\0"
    "glTexCoordP3uiv\0"
    "\0"
-   /* _mesa_function_pool[16931]: WeightusvARB (dynamic) */
+   /* _mesa_function_pool[16942]: WeightusvARB (dynamic) */
    "ip\0"
    "glWeightusvARB\0"
    "\0"
-   /* _mesa_function_pool[16950]: EvalMapsNV (dynamic) */
+   /* _mesa_function_pool[16961]: EvalMapsNV (dynamic) */
    "ii\0"
    "glEvalMapsNV\0"
    "\0"
-   /* _mesa_function_pool[16967]: ReplacementCodeuiSUN (dynamic) */
+   /* _mesa_function_pool[16978]: ReplacementCodeuiSUN (dynamic) */
    "i\0"
    "glReplacementCodeuiSUN\0"
    "\0"
-   /* _mesa_function_pool[16993]: GlobalAlphaFactoruiSUN (dynamic) */
+   /* _mesa_function_pool[17004]: GlobalAlphaFactoruiSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactoruiSUN\0"
    "\0"
-   /* _mesa_function_pool[17021]: Uniform1iv (will be remapped) */
+   /* _mesa_function_pool[17032]: Uniform1iv (will be remapped) */
    "iip\0"
    "glUniform1iv\0"
    "glUniform1ivARB\0"
    "\0"
-   /* _mesa_function_pool[17055]: Uniform4uiv (will be remapped) */
+   /* _mesa_function_pool[17066]: Uniform4uiv (will be remapped) */
    "iip\0"
    "glUniform4uivEXT\0"
    "glUniform4uiv\0"
    "\0"
-   /* _mesa_function_pool[17091]: PopDebugGroup (will be remapped) */
+   /* _mesa_function_pool[17102]: PopDebugGroup (will be remapped) */
    "\0"
    "glPopDebugGroup\0"
    "\0"
-   /* _mesa_function_pool[17109]: VertexAttrib1d (will be remapped) */
+   /* _mesa_function_pool[17120]: VertexAttrib1d (will be remapped) */
    "id\0"
    "glVertexAttrib1d\0"
    "glVertexAttrib1dARB\0"
    "\0"
-   /* _mesa_function_pool[17150]: CompressedTexImage1D (will be remapped) */
+   /* _mesa_function_pool[17161]: CompressedTexImage1D (will be remapped) */
    "iiiiiip\0"
    "glCompressedTexImage1D\0"
    "glCompressedTexImage1DARB\0"
    "\0"
-   /* _mesa_function_pool[17208]: TexBufferRange (will be remapped) */
+   /* _mesa_function_pool[17219]: TexBufferRange (will be remapped) */
    "iiiii\0"
    "glTexBufferRange\0"
    "\0"
-   /* _mesa_function_pool[17232]: VertexAttrib1s (will be remapped) */
+   /* _mesa_function_pool[17243]: VertexAttrib1s (will be remapped) */
    "ii\0"
    "glVertexAttrib1s\0"
    "glVertexAttrib1sARB\0"
    "\0"
-   /* _mesa_function_pool[17273]: MultiDrawElementsIndirect (will be remapped) */
+   /* _mesa_function_pool[17284]: MultiDrawElementsIndirect (will be remapped) */
    "iipii\0"
    "glMultiDrawElementsIndirect\0"
    "\0"
-   /* _mesa_function_pool[17308]: FogCoordfvEXT (will be remapped) */
+   /* _mesa_function_pool[17319]: FogCoordfvEXT (will be remapped) */
    "p\0"
    "glFogCoordfv\0"
    "glFogCoordfvEXT\0"
    "\0"
-   /* _mesa_function_pool[17340]: BeginPerfMonitorAMD (will be remapped) */
+   /* _mesa_function_pool[17351]: BeginPerfMonitorAMD (will be remapped) */
    "i\0"
    "glBeginPerfMonitorAMD\0"
    "\0"
-   /* _mesa_function_pool[17365]: GetColorTableParameterfv (offset 344) */
+   /* _mesa_function_pool[17376]: GetColorTableParameterfv (offset 344) */
    "iip\0"
    "glGetColorTableParameterfv\0"
    "glGetColorTableParameterfvSGI\0"
    "glGetColorTableParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[17457]: MultiTexCoord3fARB (offset 394) */
+   /* _mesa_function_pool[17468]: MultiTexCoord3fARB (offset 394) */
    "ifff\0"
    "glMultiTexCoord3f\0"
    "glMultiTexCoord3fARB\0"
    "\0"
-   /* _mesa_function_pool[17502]: GetTexLevelParameterfv (offset 284) */
+   /* _mesa_function_pool[17513]: GetTexLevelParameterfv (offset 284) */
    "iiip\0"
    "glGetTexLevelParameterfv\0"
    "\0"
-   /* _mesa_function_pool[17533]: Vertex2sv (offset 133) */
+   /* _mesa_function_pool[17544]: Vertex2sv (offset 133) */
    "p\0"
    "glVertex2sv\0"
    "\0"
-   /* _mesa_function_pool[17548]: GetnMapdvARB (will be remapped) */
+   /* _mesa_function_pool[17559]: GetnMapdvARB (will be remapped) */
    "iiip\0"
    "glGetnMapdvARB\0"
    "\0"
-   /* _mesa_function_pool[17569]: VertexAttrib2dNV (will be remapped) */
+   /* _mesa_function_pool[17580]: VertexAttrib2dNV (will be remapped) */
    "idd\0"
    "glVertexAttrib2dNV\0"
    "\0"
-   /* _mesa_function_pool[17593]: GetTrackMatrixivNV (will be remapped) */
+   /* _mesa_function_pool[17604]: GetTrackMatrixivNV (will be remapped) */
    "iiip\0"
    "glGetTrackMatrixivNV\0"
    "\0"
-   /* _mesa_function_pool[17620]: VertexAttrib3svNV (will be remapped) */
+   /* _mesa_function_pool[17631]: VertexAttrib3svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3svNV\0"
    "\0"
-   /* _mesa_function_pool[17644]: GetTexEnviv (offset 277) */
+   /* _mesa_function_pool[17655]: GetTexEnviv (offset 277) */
    "iip\0"
    "glGetTexEnviv\0"
    "\0"
-   /* _mesa_function_pool[17663]: ViewportArrayv (will be remapped) */
+   /* _mesa_function_pool[17674]: ViewportArrayv (will be remapped) */
    "iip\0"
    "glViewportArrayv\0"
    "\0"
-   /* _mesa_function_pool[17685]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[17696]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
    "iffffffffffff\0"
    "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[17756]: SeparableFilter2D (offset 360) */
+   /* _mesa_function_pool[17767]: SeparableFilter2D (offset 360) */
    "iiiiiipp\0"
    "glSeparableFilter2D\0"
    "glSeparableFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[17809]: ReplacementCodeuiColor4ubVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[17820]: ReplacementCodeuiColor4ubVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiColor4ubVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[17854]: ArrayElement (offset 306) */
+   /* _mesa_function_pool[17865]: ArrayElement (offset 306) */
    "i\0"
    "glArrayElement\0"
    "glArrayElementEXT\0"
    "\0"
-   /* _mesa_function_pool[17890]: TexImage2D (offset 183) */
+   /* _mesa_function_pool[17901]: TexImage2D (offset 183) */
    "iiiiiiiip\0"
    "glTexImage2D\0"
    "\0"
-   /* _mesa_function_pool[17914]: FragmentMaterialiSGIX (dynamic) */
+   /* _mesa_function_pool[17925]: FragmentMaterialiSGIX (dynamic) */
    "iii\0"
    "glFragmentMaterialiSGIX\0"
    "\0"
-   /* _mesa_function_pool[17943]: RasterPos2dv (offset 63) */
+   /* _mesa_function_pool[17954]: RasterPos2dv (offset 63) */
    "p\0"
    "glRasterPos2dv\0"
    "\0"
-   /* _mesa_function_pool[17961]: Fogiv (offset 156) */
+   /* _mesa_function_pool[17972]: Fogiv (offset 156) */
    "ip\0"
    "glFogiv\0"
    "\0"
-   /* _mesa_function_pool[17973]: EndQuery (will be remapped) */
+   /* _mesa_function_pool[17984]: EndQuery (will be remapped) */
    "i\0"
    "glEndQuery\0"
    "glEndQueryARB\0"
    "\0"
-   /* _mesa_function_pool[18001]: TexCoord1dv (offset 95) */
+   /* _mesa_function_pool[18012]: TexCoord1dv (offset 95) */
    "p\0"
    "glTexCoord1dv\0"
    "\0"
-   /* _mesa_function_pool[18018]: TexCoord4dv (offset 119) */
+   /* _mesa_function_pool[18029]: TexCoord4dv (offset 119) */
    "p\0"
    "glTexCoord4dv\0"
    "\0"
-   /* _mesa_function_pool[18035]: GetVertexAttribdvNV (will be remapped) */
+   /* _mesa_function_pool[18046]: GetVertexAttribdvNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribdvNV\0"
    "\0"
-   /* _mesa_function_pool[18062]: Clear (offset 203) */
+   /* _mesa_function_pool[18073]: Clear (offset 203) */
    "i\0"
    "glClear\0"
    "\0"
-   /* _mesa_function_pool[18073]: VertexAttrib4sv (will be remapped) */
+   /* _mesa_function_pool[18084]: VertexAttrib4sv (will be remapped) */
    "ip\0"
    "glVertexAttrib4sv\0"
    "glVertexAttrib4svARB\0"
    "\0"
-   /* _mesa_function_pool[18116]: Ortho (offset 296) */
+   /* _mesa_function_pool[18127]: Ortho (offset 296) */
    "dddddd\0"
    "glOrtho\0"
    "\0"
-   /* _mesa_function_pool[18132]: Uniform3uiv (will be remapped) */
+   /* _mesa_function_pool[18143]: Uniform3uiv (will be remapped) */
    "iip\0"
    "glUniform3uivEXT\0"
    "glUniform3uiv\0"
    "\0"
-   /* _mesa_function_pool[18168]: MatrixIndexPointerARB (dynamic) */
+   /* _mesa_function_pool[18179]: MatrixIndexPointerARB (dynamic) */
    "iiip\0"
    "glMatrixIndexPointerARB\0"
    "glMatrixIndexPointerOES\0"
    "\0"
-   /* _mesa_function_pool[18222]: EndQueryIndexed (will be remapped) */
+   /* _mesa_function_pool[18233]: EndQueryIndexed (will be remapped) */
    "ii\0"
    "glEndQueryIndexed\0"
    "\0"
-   /* _mesa_function_pool[18244]: TexParameterxv (will be remapped) */
+   /* _mesa_function_pool[18255]: TexParameterxv (will be remapped) */
    "iip\0"
    "glTexParameterxvOES\0"
    "glTexParameterxv\0"
    "\0"
-   /* _mesa_function_pool[18286]: SampleMaskSGIS (will be remapped) */
+   /* _mesa_function_pool[18297]: SampleMaskSGIS (will be remapped) */
    "fi\0"
    "glSampleMaskSGIS\0"
    "glSampleMaskEXT\0"
    "\0"
-   /* _mesa_function_pool[18323]: FramebufferTextureFaceARB (will be remapped) */
+   /* _mesa_function_pool[18334]: FramebufferTextureFaceARB (will be remapped) */
    "iiiii\0"
    "glFramebufferTextureFaceARB\0"
    "\0"
-   /* _mesa_function_pool[18358]: ProgramUniformMatrix2fv (will be remapped) */
+   /* _mesa_function_pool[18369]: ProgramUniformMatrix2fv (will be remapped) */
    "iiiip\0"
    "glProgramUniformMatrix2fv\0"
    "\0"
-   /* _mesa_function_pool[18391]: ProgramLocalParameter4fvARB (will be remapped) */
+   /* _mesa_function_pool[18402]: ProgramLocalParameter4fvARB (will be remapped) */
    "iip\0"
    "glProgramLocalParameter4fvARB\0"
    "\0"
-   /* _mesa_function_pool[18426]: GetProgramStringNV (will be remapped) */
+   /* _mesa_function_pool[18437]: GetProgramStringNV (will be remapped) */
    "iip\0"
    "glGetProgramStringNV\0"
    "\0"
-   /* _mesa_function_pool[18452]: Binormal3svEXT (dynamic) */
+   /* _mesa_function_pool[18463]: Binormal3svEXT (dynamic) */
    "p\0"
    "glBinormal3svEXT\0"
    "\0"
-   /* _mesa_function_pool[18472]: LightModelx (will be remapped) */
+   /* _mesa_function_pool[18483]: LightModelx (will be remapped) */
    "ii\0"
    "glLightModelxOES\0"
    "glLightModelx\0"
    "\0"
-   /* _mesa_function_pool[18507]: VertexAttribI3iEXT (will be remapped) */
+   /* _mesa_function_pool[18518]: VertexAttribI3iEXT (will be remapped) */
    "iiii\0"
    "glVertexAttribI3iEXT\0"
    "glVertexAttribI3i\0"
    "\0"
-   /* _mesa_function_pool[18552]: ClearColorx (will be remapped) */
+   /* _mesa_function_pool[18563]: ClearColorx (will be remapped) */
    "iiii\0"
    "glClearColorxOES\0"
    "glClearColorx\0"
    "\0"
-   /* _mesa_function_pool[18589]: EndTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[18600]: EndTransformFeedback (will be remapped) */
    "\0"
    "glEndTransformFeedback\0"
    "glEndTransformFeedbackEXT\0"
    "\0"
-   /* _mesa_function_pool[18640]: VertexAttribs4dvNV (will be remapped) */
+   /* _mesa_function_pool[18651]: VertexAttribs4dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4dvNV\0"
    "\0"
-   /* _mesa_function_pool[18666]: GetProgramBinary (will be remapped) */
+   /* _mesa_function_pool[18677]: GetProgramBinary (will be remapped) */
    "iippp\0"
    "glGetProgramBinary\0"
    "glGetProgramBinaryOES\0"
    "\0"
-   /* _mesa_function_pool[18714]: ViewportIndexedfv (will be remapped) */
+   /* _mesa_function_pool[18725]: ViewportIndexedfv (will be remapped) */
    "ip\0"
    "glViewportIndexedfv\0"
    "\0"
-   /* _mesa_function_pool[18738]: CallList (offset 2) */
+   /* _mesa_function_pool[18749]: CallList (offset 2) */
    "i\0"
    "glCallList\0"
    "\0"
-   /* _mesa_function_pool[18752]: Materialfv (offset 170) */
+   /* _mesa_function_pool[18763]: Materialfv (offset 170) */
    "iip\0"
    "glMaterialfv\0"
    "\0"
-   /* _mesa_function_pool[18770]: DeleteProgram (will be remapped) */
+   /* _mesa_function_pool[18781]: DeleteProgram (will be remapped) */
    "i\0"
    "glDeleteProgram\0"
    "\0"
-   /* _mesa_function_pool[18789]: GetActiveAtomicCounterBufferiv (will be remapped) */
+   /* _mesa_function_pool[18800]: GetActiveAtomicCounterBufferiv (will be remapped) */
    "iiip\0"
    "glGetActiveAtomicCounterBufferiv\0"
    "\0"
-   /* _mesa_function_pool[18828]: TexParameterIiv (will be remapped) */
+   /* _mesa_function_pool[18839]: TexParameterIiv (will be remapped) */
    "iip\0"
    "glTexParameterIivEXT\0"
    "glTexParameterIiv\0"
    "\0"
-   /* _mesa_function_pool[18872]: VertexWeightfEXT (dynamic) */
+   /* _mesa_function_pool[18883]: VertexWeightfEXT (dynamic) */
    "f\0"
    "glVertexWeightfEXT\0"
    "\0"
-   /* _mesa_function_pool[18894]: FlushVertexArrayRangeNV (dynamic) */
+   /* _mesa_function_pool[18905]: FlushVertexArrayRangeNV (dynamic) */
    "\0"
    "glFlushVertexArrayRangeNV\0"
    "\0"
-   /* _mesa_function_pool[18922]: GetConvolutionFilter (offset 356) */
+   /* _mesa_function_pool[18933]: GetConvolutionFilter (offset 356) */
    "iiip\0"
    "glGetConvolutionFilter\0"
    "glGetConvolutionFilterEXT\0"
    "\0"
-   /* _mesa_function_pool[18977]: MultiModeDrawElementsIBM (will be remapped) */
+   /* _mesa_function_pool[18988]: MultiModeDrawElementsIBM (will be remapped) */
    "ppipii\0"
    "glMultiModeDrawElementsIBM\0"
    "\0"
-   /* _mesa_function_pool[19012]: Uniform2iv (will be remapped) */
+   /* _mesa_function_pool[19023]: Uniform2iv (will be remapped) */
    "iip\0"
    "glUniform2iv\0"
    "glUniform2ivARB\0"
    "\0"
-   /* _mesa_function_pool[19046]: GetFixedv (will be remapped) */
+   /* _mesa_function_pool[19057]: GetFixedv (will be remapped) */
    "ip\0"
    "glGetFixedvOES\0"
    "glGetFixedv\0"
    "\0"
-   /* _mesa_function_pool[19077]: ProgramParameters4dvNV (will be remapped) */
+   /* _mesa_function_pool[19088]: ProgramParameters4dvNV (will be remapped) */
    "iiip\0"
    "glProgramParameters4dvNV\0"
    "\0"
-   /* _mesa_function_pool[19108]: Binormal3dvEXT (dynamic) */
+   /* _mesa_function_pool[19119]: Binormal3dvEXT (dynamic) */
    "p\0"
    "glBinormal3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[19128]: SampleCoveragex (will be remapped) */
+   /* _mesa_function_pool[19139]: SampleCoveragex (will be remapped) */
    "ii\0"
    "glSampleCoveragexOES\0"
    "glSampleCoveragex\0"
    "\0"
-   /* _mesa_function_pool[19171]: DeleteFramebuffers (will be remapped) */
+   /* _mesa_function_pool[19182]: DeleteFramebuffers (will be remapped) */
    "ip\0"
    "glDeleteFramebuffers\0"
    "glDeleteFramebuffersEXT\0"
    "glDeleteFramebuffersOES\0"
    "\0"
-   /* _mesa_function_pool[19244]: CombinerInputNV (dynamic) */
+   /* _mesa_function_pool[19255]: CombinerInputNV (dynamic) */
    "iiiiii\0"
    "glCombinerInputNV\0"
    "\0"
-   /* _mesa_function_pool[19270]: VertexAttrib4uiv (will be remapped) */
+   /* _mesa_function_pool[19281]: VertexAttrib4uiv (will be remapped) */
    "ip\0"
    "glVertexAttrib4uiv\0"
    "glVertexAttrib4uivARB\0"
    "\0"
-   /* _mesa_function_pool[19315]: VertexAttrib4Nsv (will be remapped) */
+   /* _mesa_function_pool[19326]: VertexAttrib4Nsv (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nsv\0"
    "glVertexAttrib4NsvARB\0"
    "\0"
-   /* _mesa_function_pool[19360]: Vertex4s (offset 148) */
+   /* _mesa_function_pool[19371]: Vertex4s (offset 148) */
    "iiii\0"
    "glVertex4s\0"
    "\0"
-   /* _mesa_function_pool[19377]: VertexAttribI2iEXT (will be remapped) */
+   /* _mesa_function_pool[19388]: VertexAttribI2iEXT (will be remapped) */
    "iii\0"
    "glVertexAttribI2iEXT\0"
    "glVertexAttribI2i\0"
    "\0"
-   /* _mesa_function_pool[19421]: Vertex4f (offset 144) */
+   /* _mesa_function_pool[19432]: Vertex4f (offset 144) */
    "ffff\0"
    "glVertex4f\0"
    "\0"
-   /* _mesa_function_pool[19438]: Vertex4d (offset 142) */
+   /* _mesa_function_pool[19449]: Vertex4d (offset 142) */
    "dddd\0"
    "glVertex4d\0"
    "\0"
-   /* _mesa_function_pool[19455]: GetTexGenfv (offset 279) */
+   /* _mesa_function_pool[19466]: GetTexGenfv (offset 279) */
    "iip\0"
    "glGetTexGenfv\0"
    "glGetTexGenfvOES\0"
    "\0"
-   /* _mesa_function_pool[19491]: Vertex4i (offset 146) */
+   /* _mesa_function_pool[19502]: Vertex4i (offset 146) */
    "iiii\0"
    "glVertex4i\0"
    "\0"
-   /* _mesa_function_pool[19508]: VertexWeightPointerEXT (dynamic) */
+   /* _mesa_function_pool[19519]: VertexWeightPointerEXT (dynamic) */
    "iiip\0"
    "glVertexWeightPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[19539]: StencilFuncSeparateATI (will be remapped) */
+   /* _mesa_function_pool[19550]: StencilFuncSeparateATI (will be remapped) */
    "iiii\0"
    "glStencilFuncSeparateATI\0"
    "\0"
-   /* _mesa_function_pool[19570]: GetVertexAttribIuiv (will be remapped) */
+   /* _mesa_function_pool[19581]: GetVertexAttribIuiv (will be remapped) */
    "iip\0"
    "glGetVertexAttribIuivEXT\0"
    "glGetVertexAttribIuiv\0"
    "\0"
-   /* _mesa_function_pool[19622]: LightModelfv (offset 164) */
+   /* _mesa_function_pool[19633]: LightModelfv (offset 164) */
    "ip\0"
    "glLightModelfv\0"
    "\0"
-   /* _mesa_function_pool[19641]: Vertex4dv (offset 143) */
+   /* _mesa_function_pool[19652]: Vertex4dv (offset 143) */
    "p\0"
    "glVertex4dv\0"
    "\0"
-   /* _mesa_function_pool[19656]: ProgramParameters4fvNV (will be remapped) */
+   /* _mesa_function_pool[19667]: ProgramParameters4fvNV (will be remapped) */
    "iiip\0"
    "glProgramParameters4fvNV\0"
    "\0"
-   /* _mesa_function_pool[19687]: GetInfoLogARB (will be remapped) */
+   /* _mesa_function_pool[19698]: GetInfoLogARB (will be remapped) */
    "iipp\0"
    "glGetInfoLogARB\0"
    "\0"
-   /* _mesa_function_pool[19709]: StencilMask (offset 209) */
+   /* _mesa_function_pool[19720]: StencilMask (offset 209) */
    "i\0"
    "glStencilMask\0"
    "\0"
-   /* _mesa_function_pool[19726]: IsList (offset 287) */
+   /* _mesa_function_pool[19737]: IsList (offset 287) */
    "i\0"
    "glIsList\0"
    "\0"
-   /* _mesa_function_pool[19738]: ClearBufferiv (will be remapped) */
+   /* _mesa_function_pool[19749]: ClearBufferiv (will be remapped) */
    "iip\0"
    "glClearBufferiv\0"
    "\0"
-   /* _mesa_function_pool[19759]: GetIntegeri_v (will be remapped) */
+   /* _mesa_function_pool[19770]: GetIntegeri_v (will be remapped) */
    "iip\0"
    "glGetIntegerIndexedvEXT\0"
    "glGetIntegeri_v\0"
    "\0"
-   /* _mesa_function_pool[19804]: ProgramUniform2iv (will be remapped) */
+   /* _mesa_function_pool[19815]: ProgramUniform2iv (will be remapped) */
    "iiip\0"
    "glProgramUniform2iv\0"
    "\0"
-   /* _mesa_function_pool[19830]: VertexAttribs4svNV (will be remapped) */
+   /* _mesa_function_pool[19841]: VertexAttribs4svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4svNV\0"
    "\0"
-   /* _mesa_function_pool[19856]: FogCoordPointer (will be remapped) */
+   /* _mesa_function_pool[19867]: FogCoordPointer (will be remapped) */
    "iip\0"
    "glFogCoordPointer\0"
    "glFogCoordPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[19900]: SecondaryColor3us (will be remapped) */
+   /* _mesa_function_pool[19911]: SecondaryColor3us (will be remapped) */
    "iii\0"
    "glSecondaryColor3us\0"
    "glSecondaryColor3usEXT\0"
    "\0"
-   /* _mesa_function_pool[19948]: DeformationMap3dSGIX (dynamic) */
+   /* _mesa_function_pool[19959]: DeformationMap3dSGIX (dynamic) */
    "iddiiddiiddiip\0"
    "glDeformationMap3dSGIX\0"
    "\0"
-   /* _mesa_function_pool[19987]: TextureNormalEXT (dynamic) */
+   /* _mesa_function_pool[19998]: TextureNormalEXT (dynamic) */
    "i\0"
    "glTextureNormalEXT\0"
    "\0"
-   /* _mesa_function_pool[20009]: SecondaryColor3ub (will be remapped) */
+   /* _mesa_function_pool[20020]: SecondaryColor3ub (will be remapped) */
    "iii\0"
    "glSecondaryColor3ub\0"
    "glSecondaryColor3ubEXT\0"
    "\0"
-   /* _mesa_function_pool[20057]: SecondaryColor3ui (will be remapped) */
+   /* _mesa_function_pool[20068]: SecondaryColor3ui (will be remapped) */
    "iii\0"
    "glSecondaryColor3ui\0"
    "glSecondaryColor3uiEXT\0"
    "\0"
-   /* _mesa_function_pool[20105]: VertexAttribI3uivEXT (will be remapped) */
+   /* _mesa_function_pool[20116]: VertexAttribI3uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI3uivEXT\0"
    "glVertexAttribI3uiv\0"
    "\0"
-   /* _mesa_function_pool[20152]: Binormal3fvEXT (dynamic) */
+   /* _mesa_function_pool[20163]: Binormal3fvEXT (dynamic) */
    "p\0"
    "glBinormal3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[20172]: TexCoordPointervINTEL (dynamic) */
+   /* _mesa_function_pool[20183]: TexCoordPointervINTEL (dynamic) */
    "iip\0"
    "glTexCoordPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[20201]: VertexAttrib1sNV (will be remapped) */
+   /* _mesa_function_pool[20212]: VertexAttrib1sNV (will be remapped) */
    "ii\0"
    "glVertexAttrib1sNV\0"
    "\0"
-   /* _mesa_function_pool[20224]: Tangent3bEXT (dynamic) */
+   /* _mesa_function_pool[20235]: Tangent3bEXT (dynamic) */
    "iii\0"
    "glTangent3bEXT\0"
    "\0"
-   /* _mesa_function_pool[20244]: FragmentLightModelfSGIX (dynamic) */
+   /* _mesa_function_pool[20255]: FragmentLightModelfSGIX (dynamic) */
    "if\0"
    "glFragmentLightModelfSGIX\0"
    "\0"
-   /* _mesa_function_pool[20274]: InitNames (offset 197) */
+   /* _mesa_function_pool[20285]: InitNames (offset 197) */
    "\0"
    "glInitNames\0"
    "\0"
-   /* _mesa_function_pool[20288]: Normal3sv (offset 61) */
+   /* _mesa_function_pool[20299]: Normal3sv (offset 61) */
    "p\0"
    "glNormal3sv\0"
    "\0"
-   /* _mesa_function_pool[20303]: DeleteQueries (will be remapped) */
+   /* _mesa_function_pool[20314]: DeleteQueries (will be remapped) */
    "ip\0"
    "glDeleteQueries\0"
    "glDeleteQueriesARB\0"
    "\0"
-   /* _mesa_function_pool[20342]: InvalidateFramebuffer (will be remapped) */
+   /* _mesa_function_pool[20353]: InvalidateFramebuffer (will be remapped) */
    "iip\0"
    "glInvalidateFramebuffer\0"
    "\0"
-   /* _mesa_function_pool[20371]: Hint (offset 158) */
+   /* _mesa_function_pool[20382]: Hint (offset 158) */
    "ii\0"
    "glHint\0"
    "\0"
-   /* _mesa_function_pool[20382]: MemoryBarrier (will be remapped) */
+   /* _mesa_function_pool[20393]: MemoryBarrier (will be remapped) */
    "i\0"
    "glMemoryBarrier\0"
    "\0"
-   /* _mesa_function_pool[20401]: CopyColorSubTable (offset 347) */
+   /* _mesa_function_pool[20412]: CopyColorSubTable (offset 347) */
    "iiiii\0"
    "glCopyColorSubTable\0"
    "glCopyColorSubTableEXT\0"
    "\0"
-   /* _mesa_function_pool[20451]: WeightdvARB (dynamic) */
+   /* _mesa_function_pool[20462]: WeightdvARB (dynamic) */
    "ip\0"
    "glWeightdvARB\0"
    "\0"
-   /* _mesa_function_pool[20469]: GetObjectParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[20480]: GetObjectParameterfvARB (will be remapped) */
    "iip\0"
    "glGetObjectParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[20500]: GetTexEnvxv (will be remapped) */
+   /* _mesa_function_pool[20511]: GetTexEnvxv (will be remapped) */
    "iip\0"
    "glGetTexEnvxvOES\0"
    "glGetTexEnvxv\0"
    "\0"
-   /* _mesa_function_pool[20536]: DrawTexsvOES (will be remapped) */
+   /* _mesa_function_pool[20547]: DrawTexsvOES (will be remapped) */
    "p\0"
    "glDrawTexsvOES\0"
    "\0"
-   /* _mesa_function_pool[20554]: Disable (offset 214) */
+   /* _mesa_function_pool[20565]: Disable (offset 214) */
    "i\0"
    "glDisable\0"
    "\0"
-   /* _mesa_function_pool[20567]: ClearColor (offset 206) */
+   /* _mesa_function_pool[20578]: ClearColor (offset 206) */
    "ffff\0"
    "glClearColor\0"
    "\0"
-   /* _mesa_function_pool[20586]: WeightuivARB (dynamic) */
+   /* _mesa_function_pool[20597]: WeightuivARB (dynamic) */
    "ip\0"
    "glWeightuivARB\0"
    "\0"
-   /* _mesa_function_pool[20605]: RasterPos4iv (offset 83) */
+   /* _mesa_function_pool[20616]: RasterPos4iv (offset 83) */
    "p\0"
    "glRasterPos4iv\0"
    "\0"
-   /* _mesa_function_pool[20623]: VDPAUIsSurfaceNV (will be remapped) */
+   /* _mesa_function_pool[20634]: VDPAUIsSurfaceNV (will be remapped) */
    "i\0"
    "glVDPAUIsSurfaceNV\0"
    "\0"
-   /* _mesa_function_pool[20645]: ProgramUniformMatrix2x3fv (will be remapped) */
+   /* _mesa_function_pool[20656]: ProgramUniformMatrix2x3fv (will be remapped) */
    "iiiip\0"
    "glProgramUniformMatrix2x3fv\0"
    "\0"
-   /* _mesa_function_pool[20680]: BindVertexBuffer (will be remapped) */
+   /* _mesa_function_pool[20691]: BindVertexBuffer (will be remapped) */
    "iiii\0"
    "glBindVertexBuffer\0"
    "\0"
-   /* _mesa_function_pool[20705]: Binormal3iEXT (dynamic) */
+   /* _mesa_function_pool[20716]: Binormal3iEXT (dynamic) */
    "iii\0"
    "glBinormal3iEXT\0"
    "\0"
-   /* _mesa_function_pool[20726]: RasterPos4i (offset 82) */
+   /* _mesa_function_pool[20737]: RasterPos4i (offset 82) */
    "iiii\0"
    "glRasterPos4i\0"
    "\0"
-   /* _mesa_function_pool[20746]: RasterPos4d (offset 78) */
+   /* _mesa_function_pool[20757]: RasterPos4d (offset 78) */
    "dddd\0"
    "glRasterPos4d\0"
    "\0"
-   /* _mesa_function_pool[20766]: RasterPos4f (offset 80) */
+   /* _mesa_function_pool[20777]: RasterPos4f (offset 80) */
    "ffff\0"
    "glRasterPos4f\0"
    "\0"
-   /* _mesa_function_pool[20786]: GetQueryIndexediv (will be remapped) */
+   /* _mesa_function_pool[20797]: GetQueryIndexediv (will be remapped) */
    "iiip\0"
    "glGetQueryIndexediv\0"
    "\0"
-   /* _mesa_function_pool[20812]: RasterPos3dv (offset 71) */
+   /* _mesa_function_pool[20823]: RasterPos3dv (offset 71) */
    "p\0"
    "glRasterPos3dv\0"
    "\0"
-   /* _mesa_function_pool[20830]: GetProgramiv (will be remapped) */
+   /* _mesa_function_pool[20841]: GetProgramiv (will be remapped) */
    "iip\0"
    "glGetProgramiv\0"
    "\0"
-   /* _mesa_function_pool[20850]: GetDebugMessageLogARB (will be remapped) */
-   "iipppppp\0"
-   "glGetDebugMessageLogARB\0"
-   "\0"
-   /* _mesa_function_pool[20884]: TexCoord1iv (offset 99) */
+   /* _mesa_function_pool[20861]: TexCoord1iv (offset 99) */
    "p\0"
    "glTexCoord1iv\0"
    "\0"
-   /* _mesa_function_pool[20901]: RasterPos4s (offset 84) */
+   /* _mesa_function_pool[20878]: RasterPos4s (offset 84) */
    "iiii\0"
    "glRasterPos4s\0"
    "\0"
-   /* _mesa_function_pool[20921]: PixelTexGenParameterfvSGIS (dynamic) */
+   /* _mesa_function_pool[20898]: PixelTexGenParameterfvSGIS (dynamic) */
    "ip\0"
    "glPixelTexGenParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[20954]: VertexAttrib3dv (will be remapped) */
+   /* _mesa_function_pool[20931]: VertexAttrib3dv (will be remapped) */
    "ip\0"
    "glVertexAttrib3dv\0"
    "glVertexAttrib3dvARB\0"
    "\0"
-   /* _mesa_function_pool[20997]: Histogram (offset 367) */
+   /* _mesa_function_pool[20974]: Histogram (offset 367) */
    "iiii\0"
    "glHistogram\0"
    "glHistogramEXT\0"
    "\0"
-   /* _mesa_function_pool[21030]: Uniform2fv (will be remapped) */
+   /* _mesa_function_pool[21007]: Uniform2fv (will be remapped) */
    "iip\0"
    "glUniform2fv\0"
    "glUniform2fvARB\0"
    "\0"
-   /* _mesa_function_pool[21064]: TexImage4DSGIS (dynamic) */
+   /* _mesa_function_pool[21041]: TexImage4DSGIS (dynamic) */
    "iiiiiiiiiip\0"
    "glTexImage4DSGIS\0"
    "\0"
-   /* _mesa_function_pool[21094]: DrawBuffers (will be remapped) */
+   /* _mesa_function_pool[21071]: DrawBuffers (will be remapped) */
    "ip\0"
    "glDrawBuffers\0"
    "glDrawBuffersARB\0"
    "glDrawBuffersATI\0"
    "glDrawBuffersNV\0"
    "\0"
-   /* _mesa_function_pool[21162]: GetnPolygonStippleARB (will be remapped) */
+   /* _mesa_function_pool[21139]: GetnPolygonStippleARB (will be remapped) */
    "ip\0"
    "glGetnPolygonStippleARB\0"
    "\0"
-   /* _mesa_function_pool[21190]: Color3uiv (offset 22) */
+   /* _mesa_function_pool[21167]: Color3uiv (offset 22) */
    "p\0"
    "glColor3uiv\0"
    "\0"
-   /* _mesa_function_pool[21205]: EvalCoord2fv (offset 235) */
+   /* _mesa_function_pool[21182]: EvalCoord2fv (offset 235) */
    "p\0"
    "glEvalCoord2fv\0"
    "\0"
-   /* _mesa_function_pool[21223]: TextureStorage3DEXT (will be remapped) */
+   /* _mesa_function_pool[21200]: TextureStorage3DEXT (will be remapped) */
    "iiiiiii\0"
    "glTextureStorage3DEXT\0"
    "\0"
-   /* _mesa_function_pool[21254]: VertexAttrib2fARB (will be remapped) */
+   /* _mesa_function_pool[21231]: VertexAttrib2fARB (will be remapped) */
    "iff\0"
    "glVertexAttrib2f\0"
    "glVertexAttrib2fARB\0"
    "\0"
-   /* _mesa_function_pool[21296]: WindowPos2fv (will be remapped) */
+   /* _mesa_function_pool[21273]: WindowPos2fv (will be remapped) */
    "p\0"
    "glWindowPos2fv\0"
    "glWindowPos2fvARB\0"
    "glWindowPos2fvMESA\0"
    "\0"
-   /* _mesa_function_pool[21351]: Tangent3fEXT (dynamic) */
+   /* _mesa_function_pool[21328]: Tangent3fEXT (dynamic) */
    "fff\0"
    "glTangent3fEXT\0"
    "\0"
-   /* _mesa_function_pool[21371]: TexImage3D (offset 371) */
+   /* _mesa_function_pool[21348]: TexImage3D (offset 371) */
    "iiiiiiiiip\0"
    "glTexImage3D\0"
    "glTexImage3DEXT\0"
    "glTexImage3DOES\0"
    "\0"
-   /* _mesa_function_pool[21428]: BindFragDataLocation (will be remapped) */
+   /* _mesa_function_pool[21405]: BindFragDataLocation (will be remapped) */
    "iip\0"
    "glBindFragDataLocationEXT\0"
    "glBindFragDataLocation\0"
    "\0"
-   /* _mesa_function_pool[21482]: LightModeliv (offset 166) */
+   /* _mesa_function_pool[21459]: LightModeliv (offset 166) */
    "ip\0"
    "glLightModeliv\0"
    "\0"
-   /* _mesa_function_pool[21501]: Normal3bv (offset 53) */
+   /* _mesa_function_pool[21478]: Normal3bv (offset 53) */
    "p\0"
    "glNormal3bv\0"
    "\0"
-   /* _mesa_function_pool[21516]: BeginQueryIndexed (will be remapped) */
+   /* _mesa_function_pool[21493]: BeginQueryIndexed (will be remapped) */
    "iii\0"
    "glBeginQueryIndexed\0"
    "\0"
-   /* _mesa_function_pool[21541]: Vertex3iv (offset 139) */
+   /* _mesa_function_pool[21518]: Vertex3iv (offset 139) */
    "p\0"
    "glVertex3iv\0"
    "\0"
-   /* _mesa_function_pool[21556]: TexCoord3dv (offset 111) */
+   /* _mesa_function_pool[21533]: TexCoord3dv (offset 111) */
    "p\0"
    "glTexCoord3dv\0"
    "\0"
-   /* _mesa_function_pool[21573]: GetProgramStringARB (will be remapped) */
+   /* _mesa_function_pool[21550]: GetProgramStringARB (will be remapped) */
    "iip\0"
    "glGetProgramStringARB\0"
    "\0"
-   /* _mesa_function_pool[21600]: VertexP3ui (will be remapped) */
+   /* _mesa_function_pool[21577]: VertexP3ui (will be remapped) */
    "ii\0"
    "glVertexP3ui\0"
    "\0"
-   /* _mesa_function_pool[21617]: CreateProgramObjectARB (will be remapped) */
+   /* _mesa_function_pool[21594]: CreateProgramObjectARB (will be remapped) */
    "\0"
    "glCreateProgramObjectARB\0"
    "\0"
-   /* _mesa_function_pool[21644]: UniformMatrix3fv (will be remapped) */
+   /* _mesa_function_pool[21621]: UniformMatrix3fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3fv\0"
    "glUniformMatrix3fvARB\0"
    "\0"
-   /* _mesa_function_pool[21691]: PrioritizeTextures (offset 331) */
+   /* _mesa_function_pool[21668]: PrioritizeTextures (offset 331) */
    "ipp\0"
    "glPrioritizeTextures\0"
    "glPrioritizeTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[21741]: VertexAttribI3uiEXT (will be remapped) */
+   /* _mesa_function_pool[21718]: VertexAttribI3uiEXT (will be remapped) */
    "iiii\0"
    "glVertexAttribI3uiEXT\0"
    "glVertexAttribI3ui\0"
    "\0"
-   /* _mesa_function_pool[21788]: AsyncMarkerSGIX (dynamic) */
+   /* _mesa_function_pool[21765]: AsyncMarkerSGIX (dynamic) */
    "i\0"
    "glAsyncMarkerSGIX\0"
    "\0"
-   /* _mesa_function_pool[21809]: GetProgramNamedParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[21786]: GetProgramNamedParameterfvNV (will be remapped) */
    "iipp\0"
    "glGetProgramNamedParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[21846]: GetMaterialxv (will be remapped) */
+   /* _mesa_function_pool[21823]: GetMaterialxv (will be remapped) */
    "iip\0"
    "glGetMaterialxvOES\0"
    "glGetMaterialxv\0"
    "\0"
-   /* _mesa_function_pool[21886]: MatrixIndexusvARB (dynamic) */
+   /* _mesa_function_pool[21863]: MatrixIndexusvARB (dynamic) */
    "ip\0"
    "glMatrixIndexusvARB\0"
    "\0"
-   /* _mesa_function_pool[21910]: SecondaryColor3uiv (will be remapped) */
+   /* _mesa_function_pool[21887]: SecondaryColor3uiv (will be remapped) */
    "p\0"
    "glSecondaryColor3uiv\0"
    "glSecondaryColor3uivEXT\0"
    "\0"
-   /* _mesa_function_pool[21958]: EndConditionalRender (will be remapped) */
+   /* _mesa_function_pool[21935]: EndConditionalRender (will be remapped) */
    "\0"
    "glEndConditionalRender\0"
    "glEndConditionalRenderNV\0"
    "\0"
-   /* _mesa_function_pool[22008]: ProgramLocalParameter4dARB (will be remapped) */
+   /* _mesa_function_pool[21985]: ProgramLocalParameter4dARB (will be remapped) */
    "iidddd\0"
    "glProgramLocalParameter4dARB\0"
    "\0"
-   /* _mesa_function_pool[22045]: Color3sv (offset 18) */
+   /* _mesa_function_pool[22022]: Color3sv (offset 18) */
    "p\0"
    "glColor3sv\0"
    "\0"
-   /* _mesa_function_pool[22059]: GenFragmentShadersATI (will be remapped) */
+   /* _mesa_function_pool[22036]: GenFragmentShadersATI (will be remapped) */
    "i\0"
    "glGenFragmentShadersATI\0"
    "\0"
-   /* _mesa_function_pool[22086]: BlendEquationSeparateiARB (will be remapped) */
+   /* _mesa_function_pool[22063]: BlendEquationSeparateiARB (will be remapped) */
    "iii\0"
    "glBlendEquationSeparateiARB\0"
    "glBlendEquationSeparateIndexedAMD\0"
    "\0"
-   /* _mesa_function_pool[22153]: TestFenceNV (dynamic) */
+   /* _mesa_function_pool[22130]: TestFenceNV (dynamic) */
    "i\0"
    "glTestFenceNV\0"
    "\0"
-   /* _mesa_function_pool[22170]: MultiTexCoord1fvARB (offset 379) */
+   /* _mesa_function_pool[22147]: MultiTexCoord1fvARB (offset 379) */
    "ip\0"
    "glMultiTexCoord1fv\0"
    "glMultiTexCoord1fvARB\0"
    "\0"
-   /* _mesa_function_pool[22215]: TexStorage2D (will be remapped) */
+   /* _mesa_function_pool[22192]: TexStorage2D (will be remapped) */
    "iiiii\0"
    "glTexStorage2D\0"
    "\0"
-   /* _mesa_function_pool[22237]: GetPixelTexGenParameterivSGIS (dynamic) */
+   /* _mesa_function_pool[22214]: GetPixelTexGenParameterivSGIS (dynamic) */
    "ip\0"
    "glGetPixelTexGenParameterivSGIS\0"
    "\0"
-   /* _mesa_function_pool[22273]: FramebufferTexture2D (will be remapped) */
+   /* _mesa_function_pool[22250]: FramebufferTexture2D (will be remapped) */
    "iiiii\0"
    "glFramebufferTexture2D\0"
    "glFramebufferTexture2DEXT\0"
    "glFramebufferTexture2DOES\0"
    "\0"
-   /* _mesa_function_pool[22355]: GetSamplerParameterfv (will be remapped) */
+   /* _mesa_function_pool[22332]: GetSamplerParameterfv (will be remapped) */
    "iip\0"
    "glGetSamplerParameterfv\0"
    "\0"
-   /* _mesa_function_pool[22384]: VertexAttrib2dv (will be remapped) */
+   /* _mesa_function_pool[22361]: VertexAttrib2dv (will be remapped) */
    "ip\0"
    "glVertexAttrib2dv\0"
    "glVertexAttrib2dvARB\0"
    "\0"
-   /* _mesa_function_pool[22427]: Vertex4sv (offset 149) */
+   /* _mesa_function_pool[22404]: Vertex4sv (offset 149) */
    "p\0"
    "glVertex4sv\0"
    "\0"
-   /* _mesa_function_pool[22442]: GetQueryObjecti64v (will be remapped) */
+   /* _mesa_function_pool[22419]: GetQueryObjecti64v (will be remapped) */
    "iip\0"
    "glGetQueryObjecti64v\0"
    "glGetQueryObjecti64vEXT\0"
    "\0"
-   /* _mesa_function_pool[22492]: ClampColor (will be remapped) */
+   /* _mesa_function_pool[22469]: ClampColor (will be remapped) */
    "ii\0"
    "glClampColorARB\0"
    "glClampColor\0"
    "\0"
-   /* _mesa_function_pool[22525]: TextureRangeAPPLE (dynamic) */
+   /* _mesa_function_pool[22502]: TextureRangeAPPLE (dynamic) */
    "iip\0"
    "glTextureRangeAPPLE\0"
    "\0"
-   /* _mesa_function_pool[22550]: ConvolutionFilter1D (offset 348) */
+   /* _mesa_function_pool[22527]: ConvolutionFilter1D (offset 348) */
    "iiiiip\0"
    "glConvolutionFilter1D\0"
    "glConvolutionFilter1DEXT\0"
    "\0"
-   /* _mesa_function_pool[22605]: DrawElementsIndirect (will be remapped) */
+   /* _mesa_function_pool[22582]: DrawElementsIndirect (will be remapped) */
    "iip\0"
    "glDrawElementsIndirect\0"
    "\0"
-   /* _mesa_function_pool[22633]: WindowPos3sv (will be remapped) */
+   /* _mesa_function_pool[22610]: WindowPos3sv (will be remapped) */
    "p\0"
    "glWindowPos3sv\0"
    "glWindowPos3svARB\0"
    "glWindowPos3svMESA\0"
    "\0"
-   /* _mesa_function_pool[22688]: FragmentMaterialfvSGIX (dynamic) */
+   /* _mesa_function_pool[22665]: FragmentMaterialfvSGIX (dynamic) */
    "iip\0"
    "glFragmentMaterialfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[22718]: CallLists (offset 3) */
+   /* _mesa_function_pool[22695]: CallLists (offset 3) */
    "iip\0"
    "glCallLists\0"
    "\0"
-   /* _mesa_function_pool[22735]: AlphaFunc (offset 240) */
+   /* _mesa_function_pool[22712]: AlphaFunc (offset 240) */
    "if\0"
    "glAlphaFunc\0"
    "\0"
-   /* _mesa_function_pool[22751]: EdgeFlag (offset 41) */
+   /* _mesa_function_pool[22728]: EdgeFlag (offset 41) */
    "i\0"
    "glEdgeFlag\0"
    "\0"
-   /* _mesa_function_pool[22765]: TexCoord2fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[22742]: TexCoord2fNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[22803]: EdgeFlagv (offset 42) */
+   /* _mesa_function_pool[22780]: EdgeFlagv (offset 42) */
    "p\0"
    "glEdgeFlagv\0"
    "\0"
-   /* _mesa_function_pool[22818]: DepthRangex (will be remapped) */
+   /* _mesa_function_pool[22795]: DepthRangex (will be remapped) */
    "ii\0"
    "glDepthRangexOES\0"
    "glDepthRangex\0"
    "\0"
-   /* _mesa_function_pool[22853]: ReplacementCodeubvSUN (dynamic) */
+   /* _mesa_function_pool[22830]: ReplacementCodeubvSUN (dynamic) */
    "p\0"
    "glReplacementCodeubvSUN\0"
    "\0"
-   /* _mesa_function_pool[22880]: VDPAUInitNV (will be remapped) */
+   /* _mesa_function_pool[22857]: VDPAUInitNV (will be remapped) */
    "pp\0"
    "glVDPAUInitNV\0"
    "\0"
-   /* _mesa_function_pool[22898]: GetBufferParameteri64v (will be remapped) */
+   /* _mesa_function_pool[22875]: GetBufferParameteri64v (will be remapped) */
    "iip\0"
    "glGetBufferParameteri64v\0"
    "\0"
-   /* _mesa_function_pool[22928]: CreateProgram (will be remapped) */
+   /* _mesa_function_pool[22905]: CreateProgram (will be remapped) */
    "\0"
    "glCreateProgram\0"
    "\0"
-   /* _mesa_function_pool[22946]: DepthRangef (will be remapped) */
+   /* _mesa_function_pool[22923]: DepthRangef (will be remapped) */
    "ff\0"
    "glDepthRangef\0"
    "glDepthRangefOES\0"
    "\0"
-   /* _mesa_function_pool[22981]: GetSharpenTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[22958]: GetSharpenTexFuncSGIS (dynamic) */
    "ip\0"
    "glGetSharpenTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[23009]: ColorFragmentOp3ATI (will be remapped) */
+   /* _mesa_function_pool[22986]: ColorFragmentOp3ATI (will be remapped) */
    "iiiiiiiiiiiii\0"
    "glColorFragmentOp3ATI\0"
    "\0"
-   /* _mesa_function_pool[23046]: ValidateProgram (will be remapped) */
+   /* _mesa_function_pool[23023]: ValidateProgram (will be remapped) */
    "i\0"
    "glValidateProgram\0"
    "glValidateProgramARB\0"
    "\0"
-   /* _mesa_function_pool[23088]: VertexPointerEXT (will be remapped) */
+   /* _mesa_function_pool[23065]: VertexPointerEXT (will be remapped) */
    "iiiip\0"
    "glVertexPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[23114]: Scissor (offset 176) */
+   /* _mesa_function_pool[23091]: Scissor (offset 176) */
    "iiii\0"
    "glScissor\0"
    "\0"
-   /* _mesa_function_pool[23130]: BeginTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[23107]: BeginTransformFeedback (will be remapped) */
    "i\0"
    "glBeginTransformFeedback\0"
    "glBeginTransformFeedbackEXT\0"
    "\0"
-   /* _mesa_function_pool[23186]: TexCoord2i (offset 106) */
+   /* _mesa_function_pool[23163]: TexCoord2i (offset 106) */
    "ii\0"
    "glTexCoord2i\0"
    "\0"
-   /* _mesa_function_pool[23203]: Color4ui (offset 37) */
+   /* _mesa_function_pool[23180]: Color4ui (offset 37) */
    "iiii\0"
    "glColor4ui\0"
    "\0"
-   /* _mesa_function_pool[23220]: TexCoord2f (offset 104) */
+   /* _mesa_function_pool[23197]: TexCoord2f (offset 104) */
    "ff\0"
    "glTexCoord2f\0"
    "\0"
-   /* _mesa_function_pool[23237]: TexCoord2d (offset 102) */
+   /* _mesa_function_pool[23214]: TexCoord2d (offset 102) */
    "dd\0"
    "glTexCoord2d\0"
    "\0"
-   /* _mesa_function_pool[23254]: TexCoord2s (offset 108) */
+   /* _mesa_function_pool[23231]: TexCoord2s (offset 108) */
    "ii\0"
    "glTexCoord2s\0"
    "\0"
-   /* _mesa_function_pool[23271]: PointSizePointerOES (will be remapped) */
+   /* _mesa_function_pool[23248]: PointSizePointerOES (will be remapped) */
    "iip\0"
    "glPointSizePointerOES\0"
    "\0"
-   /* _mesa_function_pool[23298]: Color4us (offset 39) */
+   /* _mesa_function_pool[23275]: Color4us (offset 39) */
    "iiii\0"
    "glColor4us\0"
    "\0"
-   /* _mesa_function_pool[23315]: Color3bv (offset 10) */
+   /* _mesa_function_pool[23292]: Color3bv (offset 10) */
    "p\0"
    "glColor3bv\0"
    "\0"
-   /* _mesa_function_pool[23329]: PrimitiveRestartNV (will be remapped) */
+   /* _mesa_function_pool[23306]: PrimitiveRestartNV (will be remapped) */
    "\0"
    "glPrimitiveRestartNV\0"
    "\0"
-   /* _mesa_function_pool[23352]: BindBufferOffsetEXT (will be remapped) */
+   /* _mesa_function_pool[23329]: BindBufferOffsetEXT (will be remapped) */
    "iiii\0"
    "glBindBufferOffsetEXT\0"
    "\0"
-   /* _mesa_function_pool[23380]: ProvokingVertex (will be remapped) */
+   /* _mesa_function_pool[23357]: ProvokingVertex (will be remapped) */
    "i\0"
    "glProvokingVertexEXT\0"
    "glProvokingVertex\0"
    "\0"
-   /* _mesa_function_pool[23422]: VertexAttribs4fvNV (will be remapped) */
+   /* _mesa_function_pool[23399]: VertexAttribs4fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4fvNV\0"
    "\0"
-   /* _mesa_function_pool[23448]: MapControlPointsNV (dynamic) */
+   /* _mesa_function_pool[23425]: MapControlPointsNV (dynamic) */
    "iiiiiiiip\0"
    "glMapControlPointsNV\0"
    "\0"
-   /* _mesa_function_pool[23480]: Vertex2i (offset 130) */
+   /* _mesa_function_pool[23457]: Vertex2i (offset 130) */
    "ii\0"
    "glVertex2i\0"
    "\0"
-   /* _mesa_function_pool[23495]: HintPGI (dynamic) */
+   /* _mesa_function_pool[23472]: HintPGI (dynamic) */
    "ii\0"
    "glHintPGI\0"
    "\0"
-   /* _mesa_function_pool[23509]: InterleavedArrays (offset 317) */
+   /* _mesa_function_pool[23486]: InterleavedArrays (offset 317) */
    "iip\0"
    "glInterleavedArrays\0"
    "\0"
-   /* _mesa_function_pool[23534]: RasterPos2fv (offset 65) */
+   /* _mesa_function_pool[23511]: RasterPos2fv (offset 65) */
    "p\0"
    "glRasterPos2fv\0"
    "\0"
-   /* _mesa_function_pool[23552]: TexCoord1fv (offset 97) */
+   /* _mesa_function_pool[23529]: TexCoord1fv (offset 97) */
    "p\0"
    "glTexCoord1fv\0"
    "\0"
-   /* _mesa_function_pool[23569]: PixelTransferf (offset 247) */
+   /* _mesa_function_pool[23546]: PixelTransferf (offset 247) */
    "if\0"
    "glPixelTransferf\0"
    "\0"
-   /* _mesa_function_pool[23590]: MultiTexCoord4dv (offset 401) */
+   /* _mesa_function_pool[23567]: MultiTexCoord4dv (offset 401) */
    "ip\0"
    "glMultiTexCoord4dv\0"
    "glMultiTexCoord4dvARB\0"
    "\0"
-   /* _mesa_function_pool[23635]: ProgramEnvParameter4fvARB (will be remapped) */
+   /* _mesa_function_pool[23612]: ProgramEnvParameter4fvARB (will be remapped) */
    "iip\0"
    "glProgramEnvParameter4fvARB\0"
    "glProgramParameter4fvNV\0"
    "\0"
-   /* _mesa_function_pool[23692]: RasterPos4fv (offset 81) */
+   /* _mesa_function_pool[23669]: RasterPos4fv (offset 81) */
    "p\0"
    "glRasterPos4fv\0"
    "\0"
-   /* _mesa_function_pool[23710]: FragmentLightModeliSGIX (dynamic) */
+   /* _mesa_function_pool[23687]: FragmentLightModeliSGIX (dynamic) */
    "ii\0"
    "glFragmentLightModeliSGIX\0"
    "\0"
-   /* _mesa_function_pool[23740]: PushMatrix (offset 298) */
+   /* _mesa_function_pool[23717]: PushMatrix (offset 298) */
    "\0"
    "glPushMatrix\0"
    "\0"
-   /* _mesa_function_pool[23755]: EndList (offset 1) */
+   /* _mesa_function_pool[23732]: EndList (offset 1) */
    "\0"
    "glEndList\0"
    "\0"
-   /* _mesa_function_pool[23767]: DrawRangeElements (offset 338) */
+   /* _mesa_function_pool[23744]: DrawRangeElements (offset 338) */
    "iiiiip\0"
    "glDrawRangeElements\0"
    "glDrawRangeElementsEXT\0"
    "\0"
-   /* _mesa_function_pool[23818]: GetTexGenxvOES (will be remapped) */
+   /* _mesa_function_pool[23795]: GetTexGenxvOES (will be remapped) */
    "iip\0"
    "glGetTexGenxvOES\0"
    "\0"
-   /* _mesa_function_pool[23840]: GetHandleARB (will be remapped) */
+   /* _mesa_function_pool[23817]: GetHandleARB (will be remapped) */
    "i\0"
    "glGetHandleARB\0"
    "\0"
-   /* _mesa_function_pool[23858]: VertexPointer (offset 321) */
+   /* _mesa_function_pool[23835]: VertexPointer (offset 321) */
    "iiip\0"
    "glVertexPointer\0"
    "\0"
-   /* _mesa_function_pool[23880]: BlendFunciARB (will be remapped) */
+   /* _mesa_function_pool[23857]: BlendFunciARB (will be remapped) */
    "iii\0"
    "glBlendFunciARB\0"
    "glBlendFuncIndexedAMD\0"
    "\0"
-   /* _mesa_function_pool[23923]: GlobalAlphaFactorbSUN (dynamic) */
+   /* _mesa_function_pool[23900]: GlobalAlphaFactorbSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorbSUN\0"
    "\0"
-   /* _mesa_function_pool[23950]: Uniform2ui (will be remapped) */
+   /* _mesa_function_pool[23927]: Uniform2ui (will be remapped) */
    "iii\0"
    "glUniform2uiEXT\0"
    "glUniform2ui\0"
    "\0"
-   /* _mesa_function_pool[23984]: ScissorIndexed (will be remapped) */
+   /* _mesa_function_pool[23961]: ScissorIndexed (will be remapped) */
    "iiiii\0"
    "glScissorIndexed\0"
    "\0"
-   /* _mesa_function_pool[24008]: End (offset 43) */
+   /* _mesa_function_pool[23985]: End (offset 43) */
    "\0"
    "glEnd\0"
    "\0"
-   /* _mesa_function_pool[24016]: GetSamplerParameteriv (will be remapped) */
+   /* _mesa_function_pool[23993]: GetSamplerParameteriv (will be remapped) */
    "iip\0"
    "glGetSamplerParameteriv\0"
    "\0"
-   /* _mesa_function_pool[24045]: GenProgramPipelines (will be remapped) */
+   /* _mesa_function_pool[24022]: GenProgramPipelines (will be remapped) */
    "ip\0"
    "glGenProgramPipelines\0"
    "\0"
-   /* _mesa_function_pool[24071]: Enable (offset 215) */
+   /* _mesa_function_pool[24048]: Enable (offset 215) */
    "i\0"
    "glEnable\0"
    "\0"
-   /* _mesa_function_pool[24083]: IsProgramPipeline (will be remapped) */
+   /* _mesa_function_pool[24060]: IsProgramPipeline (will be remapped) */
    "i\0"
    "glIsProgramPipeline\0"
    "\0"
-   /* _mesa_function_pool[24106]: ShaderBinary (will be remapped) */
+   /* _mesa_function_pool[24083]: ShaderBinary (will be remapped) */
    "ipipi\0"
    "glShaderBinary\0"
    "\0"
-   /* _mesa_function_pool[24128]: GetFragmentMaterialivSGIX (dynamic) */
+   /* _mesa_function_pool[24105]: GetFragmentMaterialivSGIX (dynamic) */
    "iip\0"
    "glGetFragmentMaterialivSGIX\0"
    "\0"
-   /* _mesa_function_pool[24161]: WeightPointerARB (dynamic) */
+   /* _mesa_function_pool[24138]: WeightPointerARB (dynamic) */
    "iiip\0"
    "glWeightPointerARB\0"
    "glWeightPointerOES\0"
    "\0"
-   /* _mesa_function_pool[24205]: Normal3x (will be remapped) */
+   /* _mesa_function_pool[24182]: Normal3x (will be remapped) */
    "iii\0"
    "glNormal3xOES\0"
    "glNormal3x\0"
    "\0"
-   /* _mesa_function_pool[24235]: VertexAttrib4fARB (will be remapped) */
+   /* _mesa_function_pool[24212]: VertexAttrib4fARB (will be remapped) */
    "iffff\0"
    "glVertexAttrib4f\0"
    "glVertexAttrib4fARB\0"
    "\0"
-   /* _mesa_function_pool[24279]: ReadnPixelsARB (will be remapped) */
+   /* _mesa_function_pool[24256]: ReadnPixelsARB (will be remapped) */
    "iiiiiiip\0"
    "glReadnPixelsARB\0"
    "\0"
-   /* _mesa_function_pool[24306]: InvalidateTexSubImage (will be remapped) */
+   /* _mesa_function_pool[24283]: InvalidateTexSubImage (will be remapped) */
    "iiiiiiii\0"
    "glInvalidateTexSubImage\0"
    "\0"
-   /* _mesa_function_pool[24340]: Normal3s (offset 60) */
+   /* _mesa_function_pool[24317]: Normal3s (offset 60) */
    "iii\0"
    "glNormal3s\0"
    "\0"
-   /* _mesa_function_pool[24356]: Materialxv (will be remapped) */
+   /* _mesa_function_pool[24333]: Materialxv (will be remapped) */
    "iip\0"
    "glMaterialxvOES\0"
    "glMaterialxv\0"
    "\0"
-   /* _mesa_function_pool[24390]: Normal3i (offset 58) */
+   /* _mesa_function_pool[24367]: Normal3i (offset 58) */
    "iii\0"
    "glNormal3i\0"
    "\0"
-   /* _mesa_function_pool[24406]: ProgramNamedParameter4fvNV (will be remapped) */
+   /* _mesa_function_pool[24383]: ProgramNamedParameter4fvNV (will be remapped) */
    "iipp\0"
    "glProgramNamedParameter4fvNV\0"
    "\0"
-   /* _mesa_function_pool[24441]: Normal3b (offset 52) */
+   /* _mesa_function_pool[24418]: Normal3b (offset 52) */
    "iii\0"
    "glNormal3b\0"
    "\0"
-   /* _mesa_function_pool[24457]: Normal3d (offset 54) */
+   /* _mesa_function_pool[24434]: Normal3d (offset 54) */
    "ddd\0"
    "glNormal3d\0"
    "\0"
-   /* _mesa_function_pool[24473]: Normal3f (offset 56) */
+   /* _mesa_function_pool[24450]: Normal3f (offset 56) */
    "fff\0"
    "glNormal3f\0"
    "\0"
-   /* _mesa_function_pool[24489]: Indexi (offset 48) */
+   /* _mesa_function_pool[24466]: Indexi (offset 48) */
    "i\0"
    "glIndexi\0"
    "\0"
-   /* _mesa_function_pool[24501]: Uniform1uiv (will be remapped) */
+   /* _mesa_function_pool[24478]: Uniform1uiv (will be remapped) */
    "iip\0"
    "glUniform1uivEXT\0"
    "glUniform1uiv\0"
    "\0"
-   /* _mesa_function_pool[24537]: VertexAttribI2uiEXT (will be remapped) */
+   /* _mesa_function_pool[24514]: VertexAttribI2uiEXT (will be remapped) */
    "iii\0"
    "glVertexAttribI2uiEXT\0"
    "glVertexAttribI2ui\0"
    "\0"
-   /* _mesa_function_pool[24583]: IsRenderbuffer (will be remapped) */
+   /* _mesa_function_pool[24560]: IsRenderbuffer (will be remapped) */
    "i\0"
    "glIsRenderbuffer\0"
    "glIsRenderbufferEXT\0"
    "glIsRenderbufferOES\0"
    "\0"
-   /* _mesa_function_pool[24643]: NormalP3uiv (will be remapped) */
+   /* _mesa_function_pool[24620]: NormalP3uiv (will be remapped) */
    "ip\0"
    "glNormalP3uiv\0"
    "\0"
-   /* _mesa_function_pool[24661]: Indexf (offset 46) */
+   /* _mesa_function_pool[24638]: Indexf (offset 46) */
    "f\0"
    "glIndexf\0"
    "\0"
-   /* _mesa_function_pool[24673]: Indexd (offset 44) */
+   /* _mesa_function_pool[24650]: Indexd (offset 44) */
    "d\0"
    "glIndexd\0"
    "\0"
-   /* _mesa_function_pool[24685]: GetMaterialiv (offset 270) */
+   /* _mesa_function_pool[24662]: GetMaterialiv (offset 270) */
    "iip\0"
    "glGetMaterialiv\0"
    "\0"
-   /* _mesa_function_pool[24706]: Indexs (offset 50) */
+   /* _mesa_function_pool[24683]: Indexs (offset 50) */
    "i\0"
    "glIndexs\0"
    "\0"
-   /* _mesa_function_pool[24718]: MultiTexCoordP1uiv (will be remapped) */
+   /* _mesa_function_pool[24695]: MultiTexCoordP1uiv (will be remapped) */
    "iip\0"
    "glMultiTexCoordP1uiv\0"
    "\0"
-   /* _mesa_function_pool[24744]: ConvolutionFilter2D (offset 349) */
+   /* _mesa_function_pool[24721]: ConvolutionFilter2D (offset 349) */
    "iiiiiip\0"
    "glConvolutionFilter2D\0"
    "glConvolutionFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[24800]: Vertex2d (offset 126) */
+   /* _mesa_function_pool[24777]: Vertex2d (offset 126) */
    "dd\0"
    "glVertex2d\0"
    "\0"
-   /* _mesa_function_pool[24815]: Vertex2f (offset 128) */
+   /* _mesa_function_pool[24792]: Vertex2f (offset 128) */
    "ff\0"
    "glVertex2f\0"
    "\0"
-   /* _mesa_function_pool[24830]: Color4bv (offset 26) */
+   /* _mesa_function_pool[24807]: Color4bv (offset 26) */
    "p\0"
    "glColor4bv\0"
    "\0"
-   /* _mesa_function_pool[24844]: VertexAttrib2fvNV (will be remapped) */
+   /* _mesa_function_pool[24821]: VertexAttrib2fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2fvNV\0"
    "\0"
-   /* _mesa_function_pool[24868]: Vertex2s (offset 132) */
+   /* _mesa_function_pool[24845]: Vertex2s (offset 132) */
    "ii\0"
    "glVertex2s\0"
    "\0"
-   /* _mesa_function_pool[24883]: ActiveTexture (offset 374) */
+   /* _mesa_function_pool[24860]: ActiveTexture (offset 374) */
    "i\0"
    "glActiveTexture\0"
    "glActiveTextureARB\0"
    "\0"
-   /* _mesa_function_pool[24921]: GlobalAlphaFactorfSUN (dynamic) */
+   /* _mesa_function_pool[24898]: GlobalAlphaFactorfSUN (dynamic) */
    "f\0"
    "glGlobalAlphaFactorfSUN\0"
    "\0"
-   /* _mesa_function_pool[24948]: ColorP4uiv (will be remapped) */
+   /* _mesa_function_pool[24925]: ColorP4uiv (will be remapped) */
    "ip\0"
    "glColorP4uiv\0"
    "\0"
-   /* _mesa_function_pool[24965]: DrawTexxOES (will be remapped) */
+   /* _mesa_function_pool[24942]: DrawTexxOES (will be remapped) */
    "iiiii\0"
    "glDrawTexxOES\0"
    "\0"
-   /* _mesa_function_pool[24986]: SetFenceNV (dynamic) */
+   /* _mesa_function_pool[24963]: SetFenceNV (dynamic) */
    "ii\0"
    "glSetFenceNV\0"
    "\0"
-   /* _mesa_function_pool[25003]: PixelTexGenParameterivSGIS (dynamic) */
+   /* _mesa_function_pool[24980]: PixelTexGenParameterivSGIS (dynamic) */
    "ip\0"
    "glPixelTexGenParameterivSGIS\0"
    "\0"
-   /* _mesa_function_pool[25036]: MultiTexCoordP3ui (will be remapped) */
+   /* _mesa_function_pool[25013]: MultiTexCoordP3ui (will be remapped) */
    "iii\0"
    "glMultiTexCoordP3ui\0"
    "\0"
-   /* _mesa_function_pool[25061]: GetAttribLocation (will be remapped) */
+   /* _mesa_function_pool[25038]: GetAttribLocation (will be remapped) */
    "ip\0"
    "glGetAttribLocation\0"
    "glGetAttribLocationARB\0"
    "\0"
-   /* _mesa_function_pool[25108]: GetCombinerStageParameterfvNV (dynamic) */
+   /* _mesa_function_pool[25085]: GetCombinerStageParameterfvNV (dynamic) */
    "iip\0"
    "glGetCombinerStageParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[25145]: DrawBuffer (offset 202) */
+   /* _mesa_function_pool[25122]: DrawBuffer (offset 202) */
    "i\0"
    "glDrawBuffer\0"
    "\0"
-   /* _mesa_function_pool[25161]: MultiTexCoord2dv (offset 385) */
+   /* _mesa_function_pool[25138]: MultiTexCoord2dv (offset 385) */
    "ip\0"
    "glMultiTexCoord2dv\0"
    "glMultiTexCoord2dvARB\0"
    "\0"
-   /* _mesa_function_pool[25206]: IsSampler (will be remapped) */
+   /* _mesa_function_pool[25183]: IsSampler (will be remapped) */
    "i\0"
    "glIsSampler\0"
    "\0"
-   /* _mesa_function_pool[25221]: BlendFunc (offset 241) */
+   /* _mesa_function_pool[25198]: BlendFunc (offset 241) */
    "ii\0"
    "glBlendFunc\0"
    "\0"
-   /* _mesa_function_pool[25237]: LineStipple (offset 167) */
+   /* _mesa_function_pool[25214]: LineStipple (offset 167) */
    "ii\0"
    "glLineStipple\0"
    "\0"
-   /* _mesa_function_pool[25255]: Tangent3fvEXT (dynamic) */
+   /* _mesa_function_pool[25232]: Tangent3fvEXT (dynamic) */
    "p\0"
    "glTangent3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[25274]: ColorMaterial (offset 151) */
+   /* _mesa_function_pool[25251]: ColorMaterial (offset 151) */
    "ii\0"
    "glColorMaterial\0"
    "\0"
-   /* _mesa_function_pool[25294]: RasterPos3sv (offset 77) */
+   /* _mesa_function_pool[25271]: RasterPos3sv (offset 77) */
    "p\0"
    "glRasterPos3sv\0"
    "\0"
-   /* _mesa_function_pool[25312]: TexCoordP2ui (will be remapped) */
+   /* _mesa_function_pool[25289]: TexCoordP2ui (will be remapped) */
    "ii\0"
    "glTexCoordP2ui\0"
    "\0"
-   /* _mesa_function_pool[25331]: TexParameteriv (offset 181) */
+   /* _mesa_function_pool[25308]: TexParameteriv (offset 181) */
    "iip\0"
    "glTexParameteriv\0"
    "\0"
-   /* _mesa_function_pool[25353]: VertexAttrib3fvARB (will be remapped) */
+   /* _mesa_function_pool[25330]: VertexAttrib3fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3fv\0"
    "glVertexAttrib3fvARB\0"
    "\0"
-   /* _mesa_function_pool[25396]: ProgramUniformMatrix3x4fv (will be remapped) */
+   /* _mesa_function_pool[25373]: ProgramUniformMatrix3x4fv (will be remapped) */
    "iiiip\0"
    "glProgramUniformMatrix3x4fv\0"
    "\0"
-   /* _mesa_function_pool[25431]: PixelTransformParameterfEXT (dynamic) */
+   /* _mesa_function_pool[25408]: PixelTransformParameterfEXT (dynamic) */
    "iif\0"
    "glPixelTransformParameterfEXT\0"
    "\0"
-   /* _mesa_function_pool[25466]: TextureColorMaskSGIS (dynamic) */
+   /* _mesa_function_pool[25443]: TextureColorMaskSGIS (dynamic) */
    "iiii\0"
    "glTextureColorMaskSGIS\0"
    "\0"
-   /* _mesa_function_pool[25495]: GetColorTable (offset 343) */
+   /* _mesa_function_pool[25472]: GetColorTable (offset 343) */
    "iiip\0"
    "glGetColorTable\0"
    "glGetColorTableSGI\0"
    "glGetColorTableEXT\0"
    "\0"
-   /* _mesa_function_pool[25555]: TexCoord3i (offset 114) */
+   /* _mesa_function_pool[25532]: TexCoord3i (offset 114) */
    "iii\0"
    "glTexCoord3i\0"
    "\0"
-   /* _mesa_function_pool[25573]: CopyColorTable (offset 342) */
+   /* _mesa_function_pool[25550]: CopyColorTable (offset 342) */
    "iiiii\0"
    "glCopyColorTable\0"
    "glCopyColorTableSGI\0"
    "\0"
-   /* _mesa_function_pool[25617]: Frustum (offset 289) */
+   /* _mesa_function_pool[25594]: Frustum (offset 289) */
    "dddddd\0"
    "glFrustum\0"
    "\0"
-   /* _mesa_function_pool[25635]: TexCoord3d (offset 110) */
+   /* _mesa_function_pool[25612]: TexCoord3d (offset 110) */
    "ddd\0"
    "glTexCoord3d\0"
    "\0"
-   /* _mesa_function_pool[25653]: TexCoord3f (offset 112) */
+   /* _mesa_function_pool[25630]: TexCoord3f (offset 112) */
    "fff\0"
    "glTexCoord3f\0"
    "\0"
-   /* _mesa_function_pool[25671]: DepthRangeArrayv (will be remapped) */
+   /* _mesa_function_pool[25648]: DepthRangeArrayv (will be remapped) */
    "iip\0"
    "glDepthRangeArrayv\0"
    "\0"
-   /* _mesa_function_pool[25695]: DeleteTextures (offset 327) */
+   /* _mesa_function_pool[25672]: DeleteTextures (offset 327) */
    "ip\0"
    "glDeleteTextures\0"
    "glDeleteTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[25736]: TexCoordPointerEXT (will be remapped) */
+   /* _mesa_function_pool[25713]: TexCoordPointerEXT (will be remapped) */
    "iiiip\0"
    "glTexCoordPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[25764]: TexCoord3s (offset 116) */
+   /* _mesa_function_pool[25741]: TexCoord3s (offset 116) */
    "iii\0"
    "glTexCoord3s\0"
    "\0"
-   /* _mesa_function_pool[25782]: TexCoord4fVertex4fSUN (dynamic) */
+   /* _mesa_function_pool[25759]: TexCoord4fVertex4fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord4fVertex4fSUN\0"
    "\0"
-   /* _mesa_function_pool[25816]: CombinerStageParameterfvNV (dynamic) */
+   /* _mesa_function_pool[25793]: CombinerStageParameterfvNV (dynamic) */
    "iip\0"
    "glCombinerStageParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[25850]: GenPerfMonitorsAMD (will be remapped) */
+   /* _mesa_function_pool[25827]: GenPerfMonitorsAMD (will be remapped) */
    "ip\0"
    "glGenPerfMonitorsAMD\0"
    "\0"
-   /* _mesa_function_pool[25875]: ClearAccum (offset 204) */
+   /* _mesa_function_pool[25852]: ClearAccum (offset 204) */
    "ffff\0"
    "glClearAccum\0"
    "\0"
-   /* _mesa_function_pool[25894]: DeformSGIX (dynamic) */
+   /* _mesa_function_pool[25871]: DeformSGIX (dynamic) */
    "i\0"
    "glDeformSGIX\0"
    "\0"
-   /* _mesa_function_pool[25910]: TexCoord4iv (offset 123) */
+   /* _mesa_function_pool[25887]: TexCoord4iv (offset 123) */
    "p\0"
    "glTexCoord4iv\0"
    "\0"
-   /* _mesa_function_pool[25927]: TexStorage3D (will be remapped) */
+   /* _mesa_function_pool[25904]: TexStorage3D (will be remapped) */
    "iiiiii\0"
    "glTexStorage3D\0"
    "\0"
-   /* _mesa_function_pool[25950]: FramebufferTexture3D (will be remapped) */
+   /* _mesa_function_pool[25927]: FramebufferTexture3D (will be remapped) */
    "iiiiii\0"
    "glFramebufferTexture3D\0"
    "glFramebufferTexture3DEXT\0"
    "glFramebufferTexture3DOES\0"
    "\0"
-   /* _mesa_function_pool[26033]: FragmentLightModelfvSGIX (dynamic) */
+   /* _mesa_function_pool[26010]: FragmentLightModelfvSGIX (dynamic) */
    "ip\0"
    "glFragmentLightModelfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[26064]: GetBufferParameteriv (will be remapped) */
+   /* _mesa_function_pool[26041]: GetBufferParameteriv (will be remapped) */
    "iip\0"
    "glGetBufferParameteriv\0"
    "glGetBufferParameterivARB\0"
    "\0"
-   /* _mesa_function_pool[26118]: VertexAttrib2fNV (will be remapped) */
+   /* _mesa_function_pool[26095]: VertexAttrib2fNV (will be remapped) */
    "iff\0"
    "glVertexAttrib2fNV\0"
    "\0"
-   /* _mesa_function_pool[26142]: GetFragmentLightfvSGIX (dynamic) */
+   /* _mesa_function_pool[26119]: GetFragmentLightfvSGIX (dynamic) */
    "iip\0"
    "glGetFragmentLightfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[26172]: CopyTexImage2D (offset 324) */
+   /* _mesa_function_pool[26149]: CopyTexImage2D (offset 324) */
    "iiiiiiii\0"
    "glCopyTexImage2D\0"
    "glCopyTexImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[26219]: DebugMessageInsertARB (will be remapped) */
-   "iiiiip\0"
-   "glDebugMessageInsertARB\0"
-   "\0"
-   /* _mesa_function_pool[26251]: Vertex3fv (offset 137) */
+   /* _mesa_function_pool[26196]: Vertex3fv (offset 137) */
    "p\0"
    "glVertex3fv\0"
    "\0"
-   /* _mesa_function_pool[26266]: WindowPos4dvMESA (will be remapped) */
+   /* _mesa_function_pool[26211]: WindowPos4dvMESA (will be remapped) */
    "p\0"
    "glWindowPos4dvMESA\0"
    "\0"
-   /* _mesa_function_pool[26288]: CreateShaderProgramEXT (will be remapped) */
+   /* _mesa_function_pool[26233]: CreateShaderProgramEXT (will be remapped) */
    "ip\0"
    "glCreateShaderProgramEXT\0"
    "\0"
-   /* _mesa_function_pool[26317]: VertexAttribs1dvNV (will be remapped) */
+   /* _mesa_function_pool[26262]: VertexAttribs1dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1dvNV\0"
    "\0"
-   /* _mesa_function_pool[26343]: IsQuery (will be remapped) */
+   /* _mesa_function_pool[26288]: IsQuery (will be remapped) */
    "i\0"
    "glIsQuery\0"
    "glIsQueryARB\0"
    "\0"
-   /* _mesa_function_pool[26369]: EdgeFlagPointerEXT (will be remapped) */
+   /* _mesa_function_pool[26314]: EdgeFlagPointerEXT (will be remapped) */
    "iip\0"
    "glEdgeFlagPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[26395]: VertexAttribs2svNV (will be remapped) */
+   /* _mesa_function_pool[26340]: VertexAttribs2svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2svNV\0"
    "\0"
-   /* _mesa_function_pool[26421]: CreateShaderProgramv (will be remapped) */
+   /* _mesa_function_pool[26366]: CreateShaderProgramv (will be remapped) */
    "iip\0"
    "glCreateShaderProgramv\0"
    "\0"
-   /* _mesa_function_pool[26449]: BlendEquationiARB (will be remapped) */
+   /* _mesa_function_pool[26394]: BlendEquationiARB (will be remapped) */
    "ii\0"
    "glBlendEquationiARB\0"
    "glBlendEquationIndexedAMD\0"
    "\0"
-   /* _mesa_function_pool[26499]: VertexAttribI4uivEXT (will be remapped) */
+   /* _mesa_function_pool[26444]: VertexAttribI4uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4uivEXT\0"
    "glVertexAttribI4uiv\0"
    "\0"
-   /* _mesa_function_pool[26546]: PointSizex (will be remapped) */
+   /* _mesa_function_pool[26491]: PointSizex (will be remapped) */
    "i\0"
    "glPointSizexOES\0"
    "glPointSizex\0"
    "\0"
-   /* _mesa_function_pool[26578]: PolygonMode (offset 174) */
+   /* _mesa_function_pool[26523]: PolygonMode (offset 174) */
    "ii\0"
    "glPolygonMode\0"
    "\0"
-   /* _mesa_function_pool[26596]: SecondaryColor3iv (will be remapped) */
+   /* _mesa_function_pool[26541]: SecondaryColor3iv (will be remapped) */
    "p\0"
    "glSecondaryColor3iv\0"
    "glSecondaryColor3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[26642]: VertexAttribI1iEXT (will be remapped) */
+   /* _mesa_function_pool[26587]: VertexAttribI1iEXT (will be remapped) */
    "ii\0"
    "glVertexAttribI1iEXT\0"
    "glVertexAttribI1i\0"
    "\0"
-   /* _mesa_function_pool[26685]: VertexAttrib4Niv (will be remapped) */
+   /* _mesa_function_pool[26630]: VertexAttrib4Niv (will be remapped) */
    "ip\0"
    "glVertexAttrib4Niv\0"
    "glVertexAttrib4NivARB\0"
    "\0"
-   /* _mesa_function_pool[26730]: GetMapAttribParameterivNV (dynamic) */
+   /* _mesa_function_pool[26675]: GetMapAttribParameterivNV (dynamic) */
    "iiip\0"
    "glGetMapAttribParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[26764]: GetnUniformdvARB (will be remapped) */
+   /* _mesa_function_pool[26709]: GetnUniformdvARB (will be remapped) */
    "iiip\0"
    "glGetnUniformdvARB\0"
    "\0"
-   /* _mesa_function_pool[26789]: LinkProgram (will be remapped) */
+   /* _mesa_function_pool[26734]: LinkProgram (will be remapped) */
    "i\0"
    "glLinkProgram\0"
    "glLinkProgramARB\0"
    "\0"
-   /* _mesa_function_pool[26823]: ProgramUniform4f (will be remapped) */
+   /* _mesa_function_pool[26768]: ProgramUniform4f (will be remapped) */
    "iiffff\0"
    "glProgramUniform4f\0"
    "\0"
-   /* _mesa_function_pool[26850]: ProgramUniform4i (will be remapped) */
+   /* _mesa_function_pool[26795]: ProgramUniform4i (will be remapped) */
    "iiiiii\0"
    "glProgramUniform4i\0"
    "\0"
-   /* _mesa_function_pool[26877]: ListParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[26822]: ListParameterfvSGIX (dynamic) */
    "iip\0"
    "glListParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[26904]: VertexAttrib4d (will be remapped) */
+   /* _mesa_function_pool[26849]: VertexAttrib4d (will be remapped) */
    "idddd\0"
    "glVertexAttrib4d\0"
    "glVertexAttrib4dARB\0"
    "\0"
-   /* _mesa_function_pool[26948]: WindowPos4sMESA (will be remapped) */
+   /* _mesa_function_pool[26893]: WindowPos4sMESA (will be remapped) */
    "iiii\0"
    "glWindowPos4sMESA\0"
    "\0"
-   /* _mesa_function_pool[26972]: VertexAttrib4s (will be remapped) */
+   /* _mesa_function_pool[26917]: VertexAttrib4s (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4s\0"
    "glVertexAttrib4sARB\0"
    "\0"
-   /* _mesa_function_pool[27016]: VertexAttrib1dvNV (will be remapped) */
+   /* _mesa_function_pool[26961]: VertexAttrib1dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1dvNV\0"
    "\0"
-   /* _mesa_function_pool[27040]: ReplacementCodePointerSUN (dynamic) */
+   /* _mesa_function_pool[26985]: ReplacementCodePointerSUN (dynamic) */
    "iip\0"
    "glReplacementCodePointerSUN\0"
    "\0"
-   /* _mesa_function_pool[27073]: TexStorage3DMultisample (will be remapped) */
+   /* _mesa_function_pool[27018]: TexStorage3DMultisample (will be remapped) */
    "iiiiiii\0"
    "glTexStorage3DMultisample\0"
    "\0"
-   /* _mesa_function_pool[27108]: Binormal3bvEXT (dynamic) */
+   /* _mesa_function_pool[27053]: Binormal3bvEXT (dynamic) */
    "p\0"
    "glBinormal3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[27128]: SamplerParameteriv (will be remapped) */
+   /* _mesa_function_pool[27073]: SamplerParameteriv (will be remapped) */
    "iip\0"
    "glSamplerParameteriv\0"
    "\0"
-   /* _mesa_function_pool[27154]: VertexAttribP3uiv (will be remapped) */
+   /* _mesa_function_pool[27099]: VertexAttribP3uiv (will be remapped) */
    "iiip\0"
    "glVertexAttribP3uiv\0"
    "\0"
-   /* _mesa_function_pool[27180]: ScissorIndexedv (will be remapped) */
+   /* _mesa_function_pool[27125]: ScissorIndexedv (will be remapped) */
    "ip\0"
    "glScissorIndexedv\0"
    "\0"
-   /* _mesa_function_pool[27202]: Color4ubVertex2fSUN (dynamic) */
+   /* _mesa_function_pool[27147]: Color4ubVertex2fSUN (dynamic) */
    "iiiiff\0"
    "glColor4ubVertex2fSUN\0"
    "\0"
-   /* _mesa_function_pool[27232]: FragmentColorMaterialSGIX (dynamic) */
+   /* _mesa_function_pool[27177]: FragmentColorMaterialSGIX (dynamic) */
    "ii\0"
    "glFragmentColorMaterialSGIX\0"
    "\0"
-   /* _mesa_function_pool[27264]: GetStringi (will be remapped) */
+   /* _mesa_function_pool[27209]: GetStringi (will be remapped) */
    "ii\0"
    "glGetStringi\0"
    "\0"
-   /* _mesa_function_pool[27281]: VertexAttrib4dv (will be remapped) */
+   /* _mesa_function_pool[27226]: VertexAttrib4dv (will be remapped) */
    "ip\0"
    "glVertexAttrib4dv\0"
    "glVertexAttrib4dvARB\0"
    "\0"
-   /* _mesa_function_pool[27324]: EvalCoord2dv (offset 233) */
+   /* _mesa_function_pool[27269]: EvalCoord2dv (offset 233) */
    "p\0"
    "glEvalCoord2dv\0"
    "\0"
-   /* _mesa_function_pool[27342]: VertexAttrib1fNV (will be remapped) */
+   /* _mesa_function_pool[27287]: VertexAttrib1fNV (will be remapped) */
    "if\0"
    "glVertexAttrib1fNV\0"
    "\0"
-   /* _mesa_function_pool[27365]: CompressedTexSubImage1D (will be remapped) */
+   /* _mesa_function_pool[27310]: CompressedTexSubImage1D (will be remapped) */
    "iiiiiip\0"
    "glCompressedTexSubImage1D\0"
    "glCompressedTexSubImage1DARB\0"
    "\0"
-   /* _mesa_function_pool[27429]: GetSeparableFilter (offset 359) */
+   /* _mesa_function_pool[27374]: GetSeparableFilter (offset 359) */
    "iiippp\0"
    "glGetSeparableFilter\0"
    "glGetSeparableFilterEXT\0"
    "\0"
-   /* _mesa_function_pool[27482]: ReplacementCodeusSUN (dynamic) */
+   /* _mesa_function_pool[27427]: ReplacementCodeusSUN (dynamic) */
    "i\0"
    "glReplacementCodeusSUN\0"
    "\0"
-   /* _mesa_function_pool[27508]: FeedbackBuffer (offset 194) */
+   /* _mesa_function_pool[27453]: FeedbackBuffer (offset 194) */
    "iip\0"
    "glFeedbackBuffer\0"
    "\0"
-   /* _mesa_function_pool[27530]: RasterPos2iv (offset 67) */
+   /* _mesa_function_pool[27475]: RasterPos2iv (offset 67) */
    "p\0"
    "glRasterPos2iv\0"
    "\0"
-   /* _mesa_function_pool[27548]: TexImage1D (offset 182) */
+   /* _mesa_function_pool[27493]: TexImage1D (offset 182) */
    "iiiiiiip\0"
    "glTexImage1D\0"
    "\0"
-   /* _mesa_function_pool[27571]: MultiDrawElementsEXT (will be remapped) */
+   /* _mesa_function_pool[27516]: MultiDrawElementsEXT (will be remapped) */
    "ipipi\0"
    "glMultiDrawElements\0"
    "glMultiDrawElementsEXT\0"
    "\0"
-   /* _mesa_function_pool[27621]: GetnSeparableFilterARB (will be remapped) */
+   /* _mesa_function_pool[27566]: GetnSeparableFilterARB (will be remapped) */
    "iiiipipp\0"
    "glGetnSeparableFilterARB\0"
    "\0"
-   /* _mesa_function_pool[27656]: FrontFace (offset 157) */
+   /* _mesa_function_pool[27601]: FrontFace (offset 157) */
    "i\0"
    "glFrontFace\0"
    "\0"
-   /* _mesa_function_pool[27671]: MultiModeDrawArraysIBM (will be remapped) */
+   /* _mesa_function_pool[27616]: MultiModeDrawArraysIBM (will be remapped) */
    "pppii\0"
    "glMultiModeDrawArraysIBM\0"
    "\0"
-   /* _mesa_function_pool[27703]: Tangent3ivEXT (dynamic) */
+   /* _mesa_function_pool[27648]: Tangent3ivEXT (dynamic) */
    "p\0"
    "glTangent3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[27722]: LightEnviSGIX (dynamic) */
+   /* _mesa_function_pool[27667]: LightEnviSGIX (dynamic) */
    "ii\0"
    "glLightEnviSGIX\0"
    "\0"
-   /* _mesa_function_pool[27742]: Normal3dv (offset 55) */
+   /* _mesa_function_pool[27687]: Normal3dv (offset 55) */
    "p\0"
    "glNormal3dv\0"
    "\0"
-   /* _mesa_function_pool[27757]: Lightf (offset 159) */
+   /* _mesa_function_pool[27702]: Lightf (offset 159) */
    "iif\0"
    "glLightf\0"
    "\0"
-   /* _mesa_function_pool[27771]: MatrixMode (offset 293) */
+   /* _mesa_function_pool[27716]: MatrixMode (offset 293) */
    "i\0"
    "glMatrixMode\0"
    "\0"
-   /* _mesa_function_pool[27787]: GetPixelMapusv (offset 273) */
+   /* _mesa_function_pool[27732]: GetPixelMapusv (offset 273) */
    "ip\0"
    "glGetPixelMapusv\0"
    "\0"
-   /* _mesa_function_pool[27808]: Lighti (offset 161) */
+   /* _mesa_function_pool[27753]: Lighti (offset 161) */
    "iii\0"
    "glLighti\0"
    "\0"
-   /* _mesa_function_pool[27822]: VertexAttribPointerNV (will be remapped) */
+   /* _mesa_function_pool[27767]: VertexAttribPointerNV (will be remapped) */
    "iiiip\0"
    "glVertexAttribPointerNV\0"
    "\0"
-   /* _mesa_function_pool[27853]: GetFragDataIndex (will be remapped) */
+   /* _mesa_function_pool[27798]: GetFragDataIndex (will be remapped) */
    "ip\0"
    "glGetFragDataIndex\0"
    "\0"
-   /* _mesa_function_pool[27876]: Lightx (will be remapped) */
+   /* _mesa_function_pool[27821]: Lightx (will be remapped) */
    "iii\0"
    "glLightxOES\0"
    "glLightx\0"
    "\0"
-   /* _mesa_function_pool[27902]: ProgramUniform3fv (will be remapped) */
+   /* _mesa_function_pool[27847]: ProgramUniform3fv (will be remapped) */
    "iiip\0"
    "glProgramUniform3fv\0"
    "\0"
-   /* _mesa_function_pool[27928]: MultMatrixd (offset 295) */
+   /* _mesa_function_pool[27873]: MultMatrixd (offset 295) */
    "p\0"
    "glMultMatrixd\0"
    "\0"
-   /* _mesa_function_pool[27945]: MultMatrixf (offset 294) */
+   /* _mesa_function_pool[27890]: MultMatrixf (offset 294) */
    "p\0"
    "glMultMatrixf\0"
    "\0"
-   /* _mesa_function_pool[27962]: MultiTexCoord4fvARB (offset 403) */
+   /* _mesa_function_pool[27907]: MultiTexCoord4fvARB (offset 403) */
    "ip\0"
    "glMultiTexCoord4fv\0"
    "glMultiTexCoord4fvARB\0"
    "\0"
-   /* _mesa_function_pool[28007]: UniformMatrix2x3fv (will be remapped) */
+   /* _mesa_function_pool[27952]: UniformMatrix2x3fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix2x3fv\0"
    "\0"
-   /* _mesa_function_pool[28034]: TrackMatrixNV (will be remapped) */
+   /* _mesa_function_pool[27979]: TrackMatrixNV (will be remapped) */
    "iiii\0"
    "glTrackMatrixNV\0"
    "\0"
-   /* _mesa_function_pool[28056]: MultMatrixx (will be remapped) */
+   /* _mesa_function_pool[28001]: MultMatrixx (will be remapped) */
    "p\0"
    "glMultMatrixxOES\0"
    "glMultMatrixx\0"
    "\0"
-   /* _mesa_function_pool[28090]: PointParameterx (will be remapped) */
+   /* _mesa_function_pool[28035]: PointParameterx (will be remapped) */
    "ii\0"
    "glPointParameterxOES\0"
    "glPointParameterx\0"
    "\0"
-   /* _mesa_function_pool[28133]: DrawArrays (offset 310) */
+   /* _mesa_function_pool[28078]: DrawArrays (offset 310) */
    "iii\0"
    "glDrawArrays\0"
    "glDrawArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[28167]: PointParameteri (will be remapped) */
+   /* _mesa_function_pool[28112]: PointParameteri (will be remapped) */
    "ii\0"
    "glPointParameteri\0"
    "glPointParameteriNV\0"
    "\0"
-   /* _mesa_function_pool[28209]: PointParameterf (will be remapped) */
+   /* _mesa_function_pool[28154]: PointParameterf (will be remapped) */
    "if\0"
    "glPointParameterf\0"
    "glPointParameterfARB\0"
    "glPointParameterfEXT\0"
    "glPointParameterfSGIS\0"
    "\0"
-   /* _mesa_function_pool[28295]: GlobalAlphaFactorsSUN (dynamic) */
+   /* _mesa_function_pool[28240]: GlobalAlphaFactorsSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorsSUN\0"
    "\0"
-   /* _mesa_function_pool[28322]: VertexAttribBinding (will be remapped) */
+   /* _mesa_function_pool[28267]: VertexAttribBinding (will be remapped) */
    "ii\0"
    "glVertexAttribBinding\0"
    "\0"
-   /* _mesa_function_pool[28348]: ReplacementCodeuiTexCoord2fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[28293]: ReplacementCodeuiTexCoord2fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiTexCoord2fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[28395]: CreateShader (will be remapped) */
+   /* _mesa_function_pool[28340]: CreateShader (will be remapped) */
    "i\0"
    "glCreateShader\0"
    "\0"
-   /* _mesa_function_pool[28413]: GetProgramParameterdvNV (will be remapped) */
+   /* _mesa_function_pool[28358]: GetProgramParameterdvNV (will be remapped) */
    "iiip\0"
    "glGetProgramParameterdvNV\0"
    "\0"
-   /* _mesa_function_pool[28445]: GetProgramEnvParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[28390]: GetProgramEnvParameterfvARB (will be remapped) */
    "iip\0"
    "glGetProgramEnvParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[28480]: DeleteBuffers (will be remapped) */
+   /* _mesa_function_pool[28425]: DeleteBuffers (will be remapped) */
    "ip\0"
    "glDeleteBuffers\0"
    "glDeleteBuffersARB\0"
    "\0"
-   /* _mesa_function_pool[28519]: GetBufferSubData (will be remapped) */
+   /* _mesa_function_pool[28464]: GetBufferSubData (will be remapped) */
    "iiip\0"
    "glGetBufferSubData\0"
    "glGetBufferSubDataARB\0"
    "\0"
-   /* _mesa_function_pool[28566]: GetPerfMonitorGroupsAMD (will be remapped) */
+   /* _mesa_function_pool[28511]: GetPerfMonitorGroupsAMD (will be remapped) */
    "pip\0"
    "glGetPerfMonitorGroupsAMD\0"
    "\0"
-   /* _mesa_function_pool[28597]: FlushRasterSGIX (dynamic) */
+   /* _mesa_function_pool[28542]: FlushRasterSGIX (dynamic) */
    "\0"
    "glFlushRasterSGIX\0"
    "\0"
-   /* _mesa_function_pool[28617]: VertexAttribP2ui (will be remapped) */
+   /* _mesa_function_pool[28562]: VertexAttribP2ui (will be remapped) */
    "iiii\0"
    "glVertexAttribP2ui\0"
    "\0"
-   /* _mesa_function_pool[28642]: GetMinmaxParameteriv (offset 366) */
+   /* _mesa_function_pool[28587]: GetMinmaxParameteriv (offset 366) */
    "iip\0"
    "glGetMinmaxParameteriv\0"
    "glGetMinmaxParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[28696]: DrawTexivOES (will be remapped) */
+   /* _mesa_function_pool[28641]: DrawTexivOES (will be remapped) */
    "p\0"
    "glDrawTexivOES\0"
    "\0"
-   /* _mesa_function_pool[28714]: CopyTexImage1D (offset 323) */
+   /* _mesa_function_pool[28659]: CopyTexImage1D (offset 323) */
    "iiiiiii\0"
    "glCopyTexImage1D\0"
    "glCopyTexImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[28760]: GetnColorTableARB (will be remapped) */
+   /* _mesa_function_pool[28705]: GetnColorTableARB (will be remapped) */
    "iiiip\0"
    "glGetnColorTableARB\0"
    "\0"
-   /* _mesa_function_pool[28787]: VertexAttribFormat (will be remapped) */
+   /* _mesa_function_pool[28732]: VertexAttribFormat (will be remapped) */
    "iiiii\0"
    "glVertexAttribFormat\0"
    "\0"
-   /* _mesa_function_pool[28815]: Vertex3i (offset 138) */
+   /* _mesa_function_pool[28760]: Vertex3i (offset 138) */
    "iii\0"
    "glVertex3i\0"
    "\0"
-   /* _mesa_function_pool[28831]: Vertex3f (offset 136) */
+   /* _mesa_function_pool[28776]: Vertex3f (offset 136) */
    "fff\0"
    "glVertex3f\0"
    "\0"
-   /* _mesa_function_pool[28847]: Vertex3d (offset 134) */
+   /* _mesa_function_pool[28792]: Vertex3d (offset 134) */
    "ddd\0"
    "glVertex3d\0"
    "\0"
-   /* _mesa_function_pool[28863]: GetProgramPipelineiv (will be remapped) */
+   /* _mesa_function_pool[28808]: GetProgramPipelineiv (will be remapped) */
    "iip\0"
    "glGetProgramPipelineiv\0"
    "\0"
-   /* _mesa_function_pool[28891]: ReadBuffer (offset 254) */
+   /* _mesa_function_pool[28836]: ReadBuffer (offset 254) */
    "i\0"
    "glReadBuffer\0"
    "glReadBufferNV\0"
    "\0"
-   /* _mesa_function_pool[28922]: ConvolutionParameteri (offset 352) */
+   /* _mesa_function_pool[28867]: ConvolutionParameteri (offset 352) */
    "iii\0"
    "glConvolutionParameteri\0"
    "glConvolutionParameteriEXT\0"
    "\0"
-   /* _mesa_function_pool[28978]: GetTexParameterIiv (will be remapped) */
+   /* _mesa_function_pool[28923]: GetTexParameterIiv (will be remapped) */
    "iip\0"
    "glGetTexParameterIivEXT\0"
    "glGetTexParameterIiv\0"
    "\0"
-   /* _mesa_function_pool[29028]: Vertex3s (offset 140) */
+   /* _mesa_function_pool[28973]: Vertex3s (offset 140) */
    "iii\0"
    "glVertex3s\0"
    "\0"
-   /* _mesa_function_pool[29044]: ConvolutionParameterf (offset 350) */
+   /* _mesa_function_pool[28989]: ConvolutionParameterf (offset 350) */
    "iif\0"
    "glConvolutionParameterf\0"
    "glConvolutionParameterfEXT\0"
    "\0"
-   /* _mesa_function_pool[29100]: GetColorTableParameteriv (offset 345) */
+   /* _mesa_function_pool[29045]: GetColorTableParameteriv (offset 345) */
    "iip\0"
    "glGetColorTableParameteriv\0"
    "glGetColorTableParameterivSGI\0"
    "glGetColorTableParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[29192]: GetTransformFeedbackVarying (will be remapped) */
+   /* _mesa_function_pool[29137]: GetTransformFeedbackVarying (will be remapped) */
    "iiipppp\0"
    "glGetTransformFeedbackVarying\0"
    "glGetTransformFeedbackVaryingEXT\0"
    "\0"
-   /* _mesa_function_pool[29264]: TexCoord3fv (offset 113) */
+   /* _mesa_function_pool[29209]: TexCoord3fv (offset 113) */
    "p\0"
    "glTexCoord3fv\0"
    "\0"
-   /* _mesa_function_pool[29281]: TextureBarrierNV (will be remapped) */
+   /* _mesa_function_pool[29226]: TextureBarrierNV (will be remapped) */
    "\0"
    "glTextureBarrierNV\0"
    "\0"
-   /* _mesa_function_pool[29302]: ReplacementCodeuiColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[29247]: ReplacementCodeuiColor4fNormal3fVertex3fSUN (dynamic) */
    "iffffffffff\0"
    "glReplacementCodeuiColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[29361]: ProgramLocalParameter4fARB (will be remapped) */
+   /* _mesa_function_pool[29306]: ProgramLocalParameter4fARB (will be remapped) */
    "iiffff\0"
    "glProgramLocalParameter4fARB\0"
    "\0"
-   /* _mesa_function_pool[29398]: ObjectLabel (will be remapped) */
+   /* _mesa_function_pool[29343]: ObjectLabel (will be remapped) */
    "iiip\0"
    "glObjectLabel\0"
    "\0"
-   /* _mesa_function_pool[29418]: PauseTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[29363]: PauseTransformFeedback (will be remapped) */
    "\0"
    "glPauseTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[29445]: DeleteShader (will be remapped) */
+   /* _mesa_function_pool[29390]: DeleteShader (will be remapped) */
    "i\0"
    "glDeleteShader\0"
    "\0"
-   /* _mesa_function_pool[29463]: CompileShader (will be remapped) */
+   /* _mesa_function_pool[29408]: CompileShader (will be remapped) */
    "i\0"
    "glCompileShader\0"
    "glCompileShaderARB\0"
    "\0"
-   /* _mesa_function_pool[29501]: Vertex2iv (offset 131) */
+   /* _mesa_function_pool[29446]: Vertex2iv (offset 131) */
    "p\0"
    "glVertex2iv\0"
    "\0"
-   /* _mesa_function_pool[29516]: TexGendv (offset 189) */
+   /* _mesa_function_pool[29461]: TexGendv (offset 189) */
    "iip\0"
    "glTexGendv\0"
    "\0"
-   /* _mesa_function_pool[29532]: ProgramLocalParameters4fvEXT (will be remapped) */
+   /* _mesa_function_pool[29477]: ProgramLocalParameters4fvEXT (will be remapped) */
    "iiip\0"
    "glProgramLocalParameters4fvEXT\0"
    "\0"
-   /* _mesa_function_pool[29569]: ResetMinmax (offset 370) */
+   /* _mesa_function_pool[29514]: ResetMinmax (offset 370) */
    "i\0"
    "glResetMinmax\0"
    "glResetMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[29603]: SpriteParameterfSGIX (dynamic) */
+   /* _mesa_function_pool[29548]: SpriteParameterfSGIX (dynamic) */
    "if\0"
    "glSpriteParameterfSGIX\0"
    "\0"
-   /* _mesa_function_pool[29630]: DeleteProgramsARB (will be remapped) */
+   /* _mesa_function_pool[29575]: DeleteProgramsARB (will be remapped) */
    "ip\0"
    "glDeleteProgramsARB\0"
    "glDeleteProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[29673]: ShadeModel (offset 177) */
+   /* _mesa_function_pool[29618]: ShadeModel (offset 177) */
    "i\0"
    "glShadeModel\0"
    "\0"
-   /* _mesa_function_pool[29689]: VertexAttribs1fvNV (will be remapped) */
+   /* _mesa_function_pool[29634]: VertexAttribs1fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1fvNV\0"
    "\0"
-   /* _mesa_function_pool[29715]: FogFuncSGIS (dynamic) */
+   /* _mesa_function_pool[29660]: FogFuncSGIS (dynamic) */
    "ip\0"
    "glFogFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[29733]: GetTexLevelParameteriv (offset 285) */
+   /* _mesa_function_pool[29678]: GetTexLevelParameteriv (offset 285) */
    "iiip\0"
    "glGetTexLevelParameteriv\0"
    "\0"
-   /* _mesa_function_pool[29764]: MultiDrawArrays (will be remapped) */
+   /* _mesa_function_pool[29709]: MultiDrawArrays (will be remapped) */
    "ippi\0"
    "glMultiDrawArrays\0"
    "glMultiDrawArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[29809]: GetProgramLocalParameterdvARB (will be remapped) */
+   /* _mesa_function_pool[29754]: GetProgramLocalParameterdvARB (will be remapped) */
    "iip\0"
    "glGetProgramLocalParameterdvARB\0"
    "\0"
-   /* _mesa_function_pool[29846]: MapBufferRange (will be remapped) */
+   /* _mesa_function_pool[29791]: MapBufferRange (will be remapped) */
    "iiii\0"
    "glMapBufferRange\0"
    "glMapBufferRangeEXT\0"
    "\0"
-   /* _mesa_function_pool[29889]: DispatchCompute (will be remapped) */
+   /* _mesa_function_pool[29834]: DispatchCompute (will be remapped) */
    "iii\0"
    "glDispatchCompute\0"
    "\0"
-   /* _mesa_function_pool[29912]: UseProgramStages (will be remapped) */
+   /* _mesa_function_pool[29857]: UseProgramStages (will be remapped) */
    "iii\0"
    "glUseProgramStages\0"
    "\0"
-   /* _mesa_function_pool[29936]: ProgramUniformMatrix4fv (will be remapped) */
+   /* _mesa_function_pool[29881]: ProgramUniformMatrix4fv (will be remapped) */
    "iiiip\0"
    "glProgramUniformMatrix4fv\0"
    "\0"
-   /* _mesa_function_pool[29969]: FinishAsyncSGIX (dynamic) */
+   /* _mesa_function_pool[29914]: FinishAsyncSGIX (dynamic) */
    "p\0"
    "glFinishAsyncSGIX\0"
    "\0"
-   /* _mesa_function_pool[29990]: FramebufferRenderbuffer (will be remapped) */
+   /* _mesa_function_pool[29935]: FramebufferRenderbuffer (will be remapped) */
    "iiii\0"
    "glFramebufferRenderbuffer\0"
    "glFramebufferRenderbufferEXT\0"
    "glFramebufferRenderbufferOES\0"
    "\0"
-   /* _mesa_function_pool[30080]: IsProgramARB (will be remapped) */
+   /* _mesa_function_pool[30025]: IsProgramARB (will be remapped) */
    "i\0"
    "glIsProgramARB\0"
    "glIsProgramNV\0"
    "\0"
-   /* _mesa_function_pool[30112]: Map2d (offset 222) */
+   /* _mesa_function_pool[30057]: Map2d (offset 222) */
    "iddiiddiip\0"
    "glMap2d\0"
    "\0"
-   /* _mesa_function_pool[30132]: Map2f (offset 223) */
+   /* _mesa_function_pool[30077]: Map2f (offset 223) */
    "iffiiffiip\0"
    "glMap2f\0"
    "\0"
-   /* _mesa_function_pool[30152]: ProgramStringARB (will be remapped) */
+   /* _mesa_function_pool[30097]: ProgramStringARB (will be remapped) */
    "iiip\0"
    "glProgramStringARB\0"
    "\0"
-   /* _mesa_function_pool[30177]: MultiTexCoord4x (will be remapped) */
+   /* _mesa_function_pool[30122]: MultiTexCoord4x (will be remapped) */
    "iiiii\0"
    "glMultiTexCoord4xOES\0"
    "glMultiTexCoord4x\0"
    "\0"
-   /* _mesa_function_pool[30223]: MultiTexCoord4s (offset 406) */
+   /* _mesa_function_pool[30168]: MultiTexCoord4s (offset 406) */
    "iiiii\0"
    "glMultiTexCoord4s\0"
    "glMultiTexCoord4sARB\0"
    "\0"
-   /* _mesa_function_pool[30269]: ViewportIndexedf (will be remapped) */
+   /* _mesa_function_pool[30214]: ViewportIndexedf (will be remapped) */
    "iffff\0"
    "glViewportIndexedf\0"
    "\0"
-   /* _mesa_function_pool[30295]: MultiTexCoord4i (offset 404) */
+   /* _mesa_function_pool[30240]: MultiTexCoord4i (offset 404) */
    "iiiii\0"
    "glMultiTexCoord4i\0"
    "glMultiTexCoord4iARB\0"
    "\0"
-   /* _mesa_function_pool[30341]: ApplyTextureEXT (dynamic) */
+   /* _mesa_function_pool[30286]: ApplyTextureEXT (dynamic) */
    "i\0"
    "glApplyTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[30362]: DebugMessageControl (will be remapped) */
+   /* _mesa_function_pool[30307]: DebugMessageControl (will be remapped) */
    "iiiipi\0"
+   "glDebugMessageControlARB\0"
    "glDebugMessageControl\0"
    "\0"
-   /* _mesa_function_pool[30392]: MultiTexCoord4d (offset 400) */
+   /* _mesa_function_pool[30362]: MultiTexCoord4d (offset 400) */
    "idddd\0"
    "glMultiTexCoord4d\0"
    "glMultiTexCoord4dARB\0"
    "\0"
-   /* _mesa_function_pool[30438]: GetHistogram (offset 361) */
+   /* _mesa_function_pool[30408]: GetHistogram (offset 361) */
    "iiiip\0"
    "glGetHistogram\0"
    "glGetHistogramEXT\0"
    "\0"
-   /* _mesa_function_pool[30478]: Translatex (will be remapped) */
+   /* _mesa_function_pool[30448]: Translatex (will be remapped) */
    "iii\0"
    "glTranslatexOES\0"
    "glTranslatex\0"
    "\0"
-   /* _mesa_function_pool[30512]: IglooInterfaceSGIX (dynamic) */
+   /* _mesa_function_pool[30482]: IglooInterfaceSGIX (dynamic) */
    "ip\0"
    "glIglooInterfaceSGIX\0"
    "\0"
-   /* _mesa_function_pool[30537]: Indexsv (offset 51) */
+   /* _mesa_function_pool[30507]: Indexsv (offset 51) */
    "p\0"
    "glIndexsv\0"
    "\0"
-   /* _mesa_function_pool[30550]: VertexAttrib1fvARB (will be remapped) */
+   /* _mesa_function_pool[30520]: VertexAttrib1fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib1fv\0"
    "glVertexAttrib1fvARB\0"
    "\0"
-   /* _mesa_function_pool[30593]: TexCoord2dv (offset 103) */
+   /* _mesa_function_pool[30563]: TexCoord2dv (offset 103) */
    "p\0"
    "glTexCoord2dv\0"
    "\0"
-   /* _mesa_function_pool[30610]: Translated (offset 303) */
+   /* _mesa_function_pool[30580]: Translated (offset 303) */
    "ddd\0"
    "glTranslated\0"
    "\0"
-   /* _mesa_function_pool[30628]: Translatef (offset 304) */
+   /* _mesa_function_pool[30598]: Translatef (offset 304) */
    "fff\0"
    "glTranslatef\0"
    "\0"
-   /* _mesa_function_pool[30646]: MultTransposeMatrixd (will be remapped) */
+   /* _mesa_function_pool[30616]: MultTransposeMatrixd (will be remapped) */
    "p\0"
    "glMultTransposeMatrixd\0"
    "glMultTransposeMatrixdARB\0"
    "\0"
-   /* _mesa_function_pool[30698]: ProgramUniform4uiv (will be remapped) */
+   /* _mesa_function_pool[30668]: ProgramUniform4uiv (will be remapped) */
    "iiip\0"
    "glProgramUniform4uiv\0"
    "\0"
-   /* _mesa_function_pool[30725]: RenderMode (offset 196) */
+   /* _mesa_function_pool[30695]: RenderMode (offset 196) */
    "i\0"
    "glRenderMode\0"
    "\0"
-   /* _mesa_function_pool[30741]: MultiTexCoord1fARB (offset 378) */
+   /* _mesa_function_pool[30711]: MultiTexCoord1fARB (offset 378) */
    "if\0"
    "glMultiTexCoord1f\0"
    "glMultiTexCoord1fARB\0"
    "\0"
-   /* _mesa_function_pool[30784]: SecondaryColor3d (will be remapped) */
+   /* _mesa_function_pool[30754]: SecondaryColor3d (will be remapped) */
    "ddd\0"
    "glSecondaryColor3d\0"
    "glSecondaryColor3dEXT\0"
    "\0"
-   /* _mesa_function_pool[30830]: VertexAttribs4ubvNV (will be remapped) */
+   /* _mesa_function_pool[30800]: VertexAttribs4ubvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4ubvNV\0"
    "\0"
-   /* _mesa_function_pool[30857]: WeightsvARB (dynamic) */
+   /* _mesa_function_pool[30827]: WeightsvARB (dynamic) */
    "ip\0"
    "glWeightsvARB\0"
    "\0"
-   /* _mesa_function_pool[30875]: ProgramUniform4fv (will be remapped) */
+   /* _mesa_function_pool[30845]: ProgramUniform4fv (will be remapped) */
    "iiip\0"
    "glProgramUniform4fv\0"
    "\0"
-   /* _mesa_function_pool[30901]: LightModelxv (will be remapped) */
+   /* _mesa_function_pool[30871]: LightModelxv (will be remapped) */
    "ip\0"
    "glLightModelxvOES\0"
    "glLightModelxv\0"
    "\0"
-   /* _mesa_function_pool[30938]: CopyTexSubImage1D (offset 325) */
+   /* _mesa_function_pool[30908]: CopyTexSubImage1D (offset 325) */
    "iiiiii\0"
    "glCopyTexSubImage1D\0"
    "glCopyTexSubImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[30989]: PushDebugGroup (will be remapped) */
+   /* _mesa_function_pool[30959]: PushDebugGroup (will be remapped) */
    "iiip\0"
    "glPushDebugGroup\0"
    "\0"
-   /* _mesa_function_pool[31012]: StencilFunc (offset 243) */
+   /* _mesa_function_pool[30982]: StencilFunc (offset 243) */
    "iii\0"
    "glStencilFunc\0"
    "\0"
-   /* _mesa_function_pool[31031]: CopyPixels (offset 255) */
+   /* _mesa_function_pool[31001]: CopyPixels (offset 255) */
    "iiiii\0"
    "glCopyPixels\0"
    "\0"
-   /* _mesa_function_pool[31051]: TexGenxvOES (will be remapped) */
+   /* _mesa_function_pool[31021]: TexGenxvOES (will be remapped) */
    "iip\0"
    "glTexGenxvOES\0"
    "\0"
-   /* _mesa_function_pool[31070]: VertexAttrib4Nubv (will be remapped) */
+   /* _mesa_function_pool[31040]: VertexAttrib4Nubv (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nubv\0"
    "glVertexAttrib4NubvARB\0"
    "\0"
-   /* _mesa_function_pool[31117]: GetFogFuncSGIS (dynamic) */
+   /* _mesa_function_pool[31087]: GetFogFuncSGIS (dynamic) */
    "p\0"
    "glGetFogFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[31137]: VertexP2uiv (will be remapped) */
+   /* _mesa_function_pool[31107]: VertexP2uiv (will be remapped) */
    "ip\0"
    "glVertexP2uiv\0"
    "\0"
-   /* _mesa_function_pool[31155]: VertexAttribPointer (will be remapped) */
+   /* _mesa_function_pool[31125]: VertexAttribPointer (will be remapped) */
    "iiiiip\0"
    "glVertexAttribPointer\0"
    "glVertexAttribPointerARB\0"
    "\0"
-   /* _mesa_function_pool[31210]: IndexMask (offset 212) */
+   /* _mesa_function_pool[31180]: IndexMask (offset 212) */
    "i\0"
    "glIndexMask\0"
    "\0"
-   /* _mesa_function_pool[31225]: SharpenTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[31195]: SharpenTexFuncSGIS (dynamic) */
    "iip\0"
    "glSharpenTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[31251]: VertexAttribIFormat (will be remapped) */
+   /* _mesa_function_pool[31221]: VertexAttribIFormat (will be remapped) */
    "iiii\0"
    "glVertexAttribIFormat\0"
    "\0"
-   /* _mesa_function_pool[31279]: CombinerOutputNV (dynamic) */
+   /* _mesa_function_pool[31249]: CombinerOutputNV (dynamic) */
    "iiiiiiiiii\0"
    "glCombinerOutputNV\0"
    "\0"
-   /* _mesa_function_pool[31310]: DrawArraysInstancedBaseInstance (will be remapped) */
+   /* _mesa_function_pool[31280]: DrawArraysInstancedBaseInstance (will be remapped) */
    "iiiii\0"
    "glDrawArraysInstancedBaseInstance\0"
    "\0"
-   /* _mesa_function_pool[31351]: PopAttrib (offset 218) */
+   /* _mesa_function_pool[31321]: PopAttrib (offset 218) */
    "\0"
    "glPopAttrib\0"
    "\0"
-   /* _mesa_function_pool[31365]: SamplePatternSGIS (will be remapped) */
+   /* _mesa_function_pool[31335]: SamplePatternSGIS (will be remapped) */
    "i\0"
    "glSamplePatternSGIS\0"
    "glSamplePatternEXT\0"
    "\0"
-   /* _mesa_function_pool[31407]: Uniform3ui (will be remapped) */
+   /* _mesa_function_pool[31377]: Uniform3ui (will be remapped) */
    "iiii\0"
    "glUniform3uiEXT\0"
    "glUniform3ui\0"
    "\0"
-   /* _mesa_function_pool[31442]: DeletePerfMonitorsAMD (will be remapped) */
+   /* _mesa_function_pool[31412]: DeletePerfMonitorsAMD (will be remapped) */
    "ip\0"
    "glDeletePerfMonitorsAMD\0"
    "\0"
-   /* _mesa_function_pool[31470]: Color4dv (offset 28) */
+   /* _mesa_function_pool[31440]: Color4dv (offset 28) */
    "p\0"
    "glColor4dv\0"
    "\0"
-   /* _mesa_function_pool[31484]: AreProgramsResidentNV (will be remapped) */
+   /* _mesa_function_pool[31454]: AreProgramsResidentNV (will be remapped) */
    "ipp\0"
    "glAreProgramsResidentNV\0"
    "\0"
-   /* _mesa_function_pool[31513]: DisableVertexAttribArray (will be remapped) */
+   /* _mesa_function_pool[31483]: DisableVertexAttribArray (will be remapped) */
    "i\0"
    "glDisableVertexAttribArray\0"
    "glDisableVertexAttribArrayARB\0"
    "\0"
-   /* _mesa_function_pool[31573]: ProgramUniformMatrix3x2fv (will be remapped) */
+   /* _mesa_function_pool[31543]: ProgramUniformMatrix3x2fv (will be remapped) */
    "iiiip\0"
    "glProgramUniformMatrix3x2fv\0"
    "\0"
-   /* _mesa_function_pool[31608]: GetDoublei_v (will be remapped) */
+   /* _mesa_function_pool[31578]: GetDoublei_v (will be remapped) */
    "iip\0"
    "glGetDoublei_v\0"
    "\0"
-   /* _mesa_function_pool[31628]: IsTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[31598]: IsTransformFeedback (will be remapped) */
    "i\0"
    "glIsTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[31653]: ClipPlanex (will be remapped) */
+   /* _mesa_function_pool[31623]: ClipPlanex (will be remapped) */
    "ip\0"
    "glClipPlanexOES\0"
    "glClipPlanex\0"
    "\0"
-   /* _mesa_function_pool[31686]: ReplacementCodeuiColor3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[31656]: ReplacementCodeuiColor3fVertex3fSUN (dynamic) */
    "iffffff\0"
    "glReplacementCodeuiColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[31733]: GetLightfv (offset 264) */
+   /* _mesa_function_pool[31703]: GetLightfv (offset 264) */
    "iip\0"
    "glGetLightfv\0"
    "\0"
-   /* _mesa_function_pool[31751]: ClipPlanef (will be remapped) */
+   /* _mesa_function_pool[31721]: ClipPlanef (will be remapped) */
    "ip\0"
    "glClipPlanefOES\0"
    "glClipPlanef\0"
    "\0"
-   /* _mesa_function_pool[31784]: ProgramUniform1ui (will be remapped) */
+   /* _mesa_function_pool[31754]: ProgramUniform1ui (will be remapped) */
    "iii\0"
    "glProgramUniform1ui\0"
    "\0"
-   /* _mesa_function_pool[31809]: SecondaryColorPointer (will be remapped) */
+   /* _mesa_function_pool[31779]: SecondaryColorPointer (will be remapped) */
    "iiip\0"
    "glSecondaryColorPointer\0"
    "glSecondaryColorPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[31866]: Tangent3svEXT (dynamic) */
+   /* _mesa_function_pool[31836]: Tangent3svEXT (dynamic) */
    "p\0"
    "glTangent3svEXT\0"
    "\0"
-   /* _mesa_function_pool[31885]: Tangent3iEXT (dynamic) */
+   /* _mesa_function_pool[31855]: Tangent3iEXT (dynamic) */
    "iii\0"
    "glTangent3iEXT\0"
    "\0"
-   /* _mesa_function_pool[31905]: Indexub (offset 315) */
+   /* _mesa_function_pool[31875]: Indexub (offset 315) */
    "i\0"
    "glIndexub\0"
    "\0"
-   /* _mesa_function_pool[31918]: FragmentLightfSGIX (dynamic) */
+   /* _mesa_function_pool[31888]: FragmentLightfSGIX (dynamic) */
    "iif\0"
    "glFragmentLightfSGIX\0"
    "\0"
-   /* _mesa_function_pool[31944]: BeginFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[31914]: BeginFragmentShaderATI (will be remapped) */
    "\0"
    "glBeginFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[31971]: GenRenderbuffers (will be remapped) */
+   /* _mesa_function_pool[31941]: GenRenderbuffers (will be remapped) */
    "ip\0"
    "glGenRenderbuffers\0"
    "glGenRenderbuffersEXT\0"
    "glGenRenderbuffersOES\0"
    "\0"
-   /* _mesa_function_pool[32038]: GetMinmaxParameterfv (offset 365) */
+   /* _mesa_function_pool[32008]: GetMinmaxParameterfv (offset 365) */
    "iip\0"
    "glGetMinmaxParameterfv\0"
    "glGetMinmaxParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[32092]: IsEnabledi (will be remapped) */
+   /* _mesa_function_pool[32062]: IsEnabledi (will be remapped) */
    "ii\0"
    "glIsEnabledIndexedEXT\0"
    "glIsEnabledi\0"
    "\0"
-   /* _mesa_function_pool[32131]: FragmentMaterialivSGIX (dynamic) */
+   /* _mesa_function_pool[32101]: FragmentMaterialivSGIX (dynamic) */
    "iip\0"
    "glFragmentMaterialivSGIX\0"
    "\0"
-   /* _mesa_function_pool[32161]: WaitSync (will be remapped) */
+   /* _mesa_function_pool[32131]: WaitSync (will be remapped) */
    "iii\0"
    "glWaitSync\0"
    "\0"
-   /* _mesa_function_pool[32177]: GetVertexAttribPointerv (will be remapped) */
+   /* _mesa_function_pool[32147]: GetVertexAttribPointerv (will be remapped) */
    "iip\0"
    "glGetVertexAttribPointerv\0"
    "glGetVertexAttribPointervARB\0"
    "glGetVertexAttribPointervNV\0"
    "\0"
-   /* _mesa_function_pool[32265]: NewList (dynamic) */
+   /* _mesa_function_pool[32235]: NewList (dynamic) */
    "ii\0"
    "glNewList\0"
    "\0"
-   /* _mesa_function_pool[32279]: TexBuffer (will be remapped) */
+   /* _mesa_function_pool[32249]: TexBuffer (will be remapped) */
    "iii\0"
    "glTexBufferARB\0"
    "glTexBuffer\0"
    "\0"
-   /* _mesa_function_pool[32311]: TexCoord4sv (offset 125) */
+   /* _mesa_function_pool[32281]: TexCoord4sv (offset 125) */
    "p\0"
    "glTexCoord4sv\0"
    "\0"
-   /* _mesa_function_pool[32328]: TexCoord1f (offset 96) */
+   /* _mesa_function_pool[32298]: TexCoord1f (offset 96) */
    "f\0"
    "glTexCoord1f\0"
    "\0"
-   /* _mesa_function_pool[32344]: TexCoord1d (offset 94) */
+   /* _mesa_function_pool[32314]: TexCoord1d (offset 94) */
    "d\0"
    "glTexCoord1d\0"
    "\0"
-   /* _mesa_function_pool[32360]: TexCoord1i (offset 98) */
+   /* _mesa_function_pool[32330]: TexCoord1i (offset 98) */
    "i\0"
    "glTexCoord1i\0"
    "\0"
-   /* _mesa_function_pool[32376]: GetnUniformfvARB (will be remapped) */
+   /* _mesa_function_pool[32346]: GetnUniformfvARB (will be remapped) */
    "iiip\0"
    "glGetnUniformfvARB\0"
    "\0"
-   /* _mesa_function_pool[32401]: TexCoord1s (offset 100) */
+   /* _mesa_function_pool[32371]: TexCoord1s (offset 100) */
    "i\0"
    "glTexCoord1s\0"
    "\0"
-   /* _mesa_function_pool[32417]: GlobalAlphaFactoriSUN (dynamic) */
+   /* _mesa_function_pool[32387]: GlobalAlphaFactoriSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactoriSUN\0"
    "\0"
-   /* _mesa_function_pool[32444]: TexStorage1D (will be remapped) */
+   /* _mesa_function_pool[32414]: TexStorage1D (will be remapped) */
    "iiii\0"
    "glTexStorage1D\0"
    "\0"
-   /* _mesa_function_pool[32465]: BlitFramebuffer (will be remapped) */
+   /* _mesa_function_pool[32435]: BlitFramebuffer (will be remapped) */
    "iiiiiiiiii\0"
    "glBlitFramebuffer\0"
    "glBlitFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[32516]: FramebufferTexture1D (will be remapped) */
+   /* _mesa_function_pool[32486]: FramebufferTexture1D (will be remapped) */
    "iiiii\0"
    "glFramebufferTexture1D\0"
    "glFramebufferTexture1DEXT\0"
    "\0"
-   /* _mesa_function_pool[32572]: GetMapiv (offset 268) */
+   /* _mesa_function_pool[32542]: GetMapiv (offset 268) */
    "iip\0"
    "glGetMapiv\0"
    "\0"
-   /* _mesa_function_pool[32588]: TexCoordP4ui (will be remapped) */
+   /* _mesa_function_pool[32558]: TexCoordP4ui (will be remapped) */
    "ii\0"
    "glTexCoordP4ui\0"
    "\0"
-   /* _mesa_function_pool[32607]: VertexAttrib1sv (will be remapped) */
+   /* _mesa_function_pool[32577]: VertexAttrib1sv (will be remapped) */
    "ip\0"
    "glVertexAttrib1sv\0"
    "glVertexAttrib1svARB\0"
    "\0"
-   /* _mesa_function_pool[32650]: WindowPos4dMESA (will be remapped) */
+   /* _mesa_function_pool[32620]: WindowPos4dMESA (will be remapped) */
    "dddd\0"
    "glWindowPos4dMESA\0"
    "\0"
-   /* _mesa_function_pool[32674]: Vertex3dv (offset 135) */
+   /* _mesa_function_pool[32644]: Vertex3dv (offset 135) */
    "p\0"
    "glVertex3dv\0"
    "\0"
-   /* _mesa_function_pool[32689]: MultiTexCoordP2ui (will be remapped) */
+   /* _mesa_function_pool[32659]: MultiTexCoordP2ui (will be remapped) */
    "iii\0"
    "glMultiTexCoordP2ui\0"
    "\0"
-   /* _mesa_function_pool[32714]: GetnMapivARB (will be remapped) */
+   /* _mesa_function_pool[32684]: GetnMapivARB (will be remapped) */
    "iiip\0"
    "glGetnMapivARB\0"
    "\0"
-   /* _mesa_function_pool[32735]: MapParameterfvNV (dynamic) */
+   /* _mesa_function_pool[32705]: MapParameterfvNV (dynamic) */
    "iip\0"
    "glMapParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[32759]: GetVertexAttribfv (will be remapped) */
+   /* _mesa_function_pool[32729]: GetVertexAttribfv (will be remapped) */
    "iip\0"
    "glGetVertexAttribfv\0"
    "glGetVertexAttribfvARB\0"
    "\0"
-   /* _mesa_function_pool[32807]: MultiTexCoordP4uiv (will be remapped) */
+   /* _mesa_function_pool[32777]: MultiTexCoordP4uiv (will be remapped) */
    "iip\0"
    "glMultiTexCoordP4uiv\0"
    "\0"
-   /* _mesa_function_pool[32833]: TexGeniv (offset 193) */
+   /* _mesa_function_pool[32803]: TexGeniv (offset 193) */
    "iip\0"
    "glTexGeniv\0"
    "glTexGenivOES\0"
    "\0"
-   /* _mesa_function_pool[32863]: WeightubvARB (dynamic) */
+   /* _mesa_function_pool[32833]: WeightubvARB (dynamic) */
    "ip\0"
    "glWeightubvARB\0"
    "\0"
-   /* _mesa_function_pool[32882]: BlendColor (offset 336) */
+   /* _mesa_function_pool[32852]: BlendColor (offset 336) */
    "ffff\0"
    "glBlendColor\0"
    "glBlendColorEXT\0"
    "\0"
-   /* _mesa_function_pool[32917]: Materiali (offset 171) */
+   /* _mesa_function_pool[32887]: Materiali (offset 171) */
    "iii\0"
    "glMateriali\0"
    "\0"
-   /* _mesa_function_pool[32934]: VertexAttrib2dvNV (will be remapped) */
+   /* _mesa_function_pool[32904]: VertexAttrib2dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2dvNV\0"
    "\0"
-   /* _mesa_function_pool[32958]: ResetHistogram (offset 369) */
+   /* _mesa_function_pool[32928]: ResetHistogram (offset 369) */
    "i\0"
    "glResetHistogram\0"
    "glResetHistogramEXT\0"
    "\0"
-   /* _mesa_function_pool[32998]: CompressedTexSubImage2D (will be remapped) */
+   /* _mesa_function_pool[32968]: CompressedTexSubImage2D (will be remapped) */
    "iiiiiiiip\0"
    "glCompressedTexSubImage2D\0"
    "glCompressedTexSubImage2DARB\0"
    "\0"
-   /* _mesa_function_pool[33064]: TexCoord2sv (offset 109) */
+   /* _mesa_function_pool[33034]: TexCoord2sv (offset 109) */
    "p\0"
    "glTexCoord2sv\0"
    "\0"
-   /* _mesa_function_pool[33081]: StencilMaskSeparate (will be remapped) */
+   /* _mesa_function_pool[33051]: StencilMaskSeparate (will be remapped) */
    "ii\0"
    "glStencilMaskSeparate\0"
    "\0"
-   /* _mesa_function_pool[33107]: MultiTexCoord3sv (offset 399) */
+   /* _mesa_function_pool[33077]: MultiTexCoord3sv (offset 399) */
    "ip\0"
    "glMultiTexCoord3sv\0"
    "glMultiTexCoord3svARB\0"
    "\0"
-   /* _mesa_function_pool[33152]: GetMapParameterfvNV (dynamic) */
+   /* _mesa_function_pool[33122]: GetMapParameterfvNV (dynamic) */
    "iip\0"
    "glGetMapParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[33179]: TexCoord3iv (offset 115) */
+   /* _mesa_function_pool[33149]: TexCoord3iv (offset 115) */
    "p\0"
    "glTexCoord3iv\0"
    "\0"
-   /* _mesa_function_pool[33196]: MultiTexCoord4sv (offset 407) */
+   /* _mesa_function_pool[33166]: MultiTexCoord4sv (offset 407) */
    "ip\0"
    "glMultiTexCoord4sv\0"
    "glMultiTexCoord4svARB\0"
    "\0"
-   /* _mesa_function_pool[33241]: VertexBindingDivisor (will be remapped) */
+   /* _mesa_function_pool[33211]: VertexBindingDivisor (will be remapped) */
    "ii\0"
    "glVertexBindingDivisor\0"
    "\0"
-   /* _mesa_function_pool[33268]: GetPerfMonitorCounterInfoAMD (will be remapped) */
+   /* _mesa_function_pool[33238]: GetPerfMonitorCounterInfoAMD (will be remapped) */
    "iiip\0"
    "glGetPerfMonitorCounterInfoAMD\0"
    "\0"
-   /* _mesa_function_pool[33305]: UniformBlockBinding (will be remapped) */
+   /* _mesa_function_pool[33275]: UniformBlockBinding (will be remapped) */
    "iii\0"
    "glUniformBlockBinding\0"
    "\0"
-   /* _mesa_function_pool[33332]: FenceSync (will be remapped) */
+   /* _mesa_function_pool[33302]: FenceSync (will be remapped) */
    "ii\0"
    "glFenceSync\0"
    "\0"
-   /* _mesa_function_pool[33348]: VertexAttrib4Nusv (will be remapped) */
+   /* _mesa_function_pool[33318]: VertexAttrib4Nusv (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nusv\0"
    "glVertexAttrib4NusvARB\0"
    "\0"
-   /* _mesa_function_pool[33395]: SetFragmentShaderConstantATI (will be remapped) */
+   /* _mesa_function_pool[33365]: SetFragmentShaderConstantATI (will be remapped) */
    "ip\0"
    "glSetFragmentShaderConstantATI\0"
    "\0"
-   /* _mesa_function_pool[33430]: VertexP2ui (will be remapped) */
+   /* _mesa_function_pool[33400]: VertexP2ui (will be remapped) */
    "ii\0"
    "glVertexP2ui\0"
    "\0"
-   /* _mesa_function_pool[33447]: GetTexEnvfv (offset 276) */
+   /* _mesa_function_pool[33417]: GetTexEnvfv (offset 276) */
    "iip\0"
    "glGetTexEnvfv\0"
    "\0"
-   /* _mesa_function_pool[33466]: BindAttribLocation (will be remapped) */
+   /* _mesa_function_pool[33436]: BindAttribLocation (will be remapped) */
    "iip\0"
    "glBindAttribLocation\0"
    "glBindAttribLocationARB\0"
    "\0"
-   /* _mesa_function_pool[33516]: TextureStorage2DEXT (will be remapped) */
+   /* _mesa_function_pool[33486]: TextureStorage2DEXT (will be remapped) */
    "iiiiii\0"
    "glTextureStorage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[33546]: FragmentLightiSGIX (dynamic) */
+   /* _mesa_function_pool[33516]: FragmentLightiSGIX (dynamic) */
    "iii\0"
    "glFragmentLightiSGIX\0"
    "\0"
-   /* _mesa_function_pool[33572]: DrawTransformFeedbackInstanced (will be remapped) */
+   /* _mesa_function_pool[33542]: DrawTransformFeedbackInstanced (will be remapped) */
    "iii\0"
    "glDrawTransformFeedbackInstanced\0"
    "\0"
-   /* _mesa_function_pool[33610]: PollAsyncSGIX (dynamic) */
+   /* _mesa_function_pool[33580]: PollAsyncSGIX (dynamic) */
    "p\0"
    "glPollAsyncSGIX\0"
    "\0"
-   /* _mesa_function_pool[33629]: ResumeTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[33599]: ResumeTransformFeedback (will be remapped) */
    "\0"
    "glResumeTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[33657]: GetProgramNamedParameterdvNV (will be remapped) */
+   /* _mesa_function_pool[33627]: GetProgramNamedParameterdvNV (will be remapped) */
    "iipp\0"
    "glGetProgramNamedParameterdvNV\0"
    "\0"
-   /* _mesa_function_pool[33694]: VertexAttribI1iv (will be remapped) */
+   /* _mesa_function_pool[33664]: VertexAttribI1iv (will be remapped) */
    "ip\0"
    "glVertexAttribI1ivEXT\0"
    "glVertexAttribI1iv\0"
    "\0"
-   /* _mesa_function_pool[33739]: Vertex2dv (offset 127) */
+   /* _mesa_function_pool[33709]: Vertex2dv (offset 127) */
    "p\0"
    "glVertex2dv\0"
    "\0"
-   /* _mesa_function_pool[33754]: VertexAttribI2uivEXT (will be remapped) */
+   /* _mesa_function_pool[33724]: VertexAttribI2uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI2uivEXT\0"
    "glVertexAttribI2uiv\0"
    "\0"
-   /* _mesa_function_pool[33801]: SampleMaski (will be remapped) */
+   /* _mesa_function_pool[33771]: SampleMaski (will be remapped) */
    "ii\0"
    "glSampleMaski\0"
    "\0"
-   /* _mesa_function_pool[33819]: GetFloati_v (will be remapped) */
+   /* _mesa_function_pool[33789]: GetFloati_v (will be remapped) */
    "iip\0"
    "glGetFloati_v\0"
    "\0"
-   /* _mesa_function_pool[33838]: MultiTexCoord2iv (offset 389) */
+   /* _mesa_function_pool[33808]: MultiTexCoord2iv (offset 389) */
    "ip\0"
    "glMultiTexCoord2iv\0"
    "glMultiTexCoord2ivARB\0"
    "\0"
-   /* _mesa_function_pool[33883]: DrawPixels (offset 257) */
+   /* _mesa_function_pool[33853]: DrawPixels (offset 257) */
    "iiiip\0"
    "glDrawPixels\0"
    "\0"
-   /* _mesa_function_pool[33903]: ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[33873]: ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (dynamic) */
    "iffffffff\0"
    "glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[33963]: DrawTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[33933]: DrawTransformFeedback (will be remapped) */
    "ii\0"
    "glDrawTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[33991]: VertexAttribs3fvNV (will be remapped) */
+   /* _mesa_function_pool[33961]: VertexAttribs3fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs3fvNV\0"
    "\0"
-   /* _mesa_function_pool[34017]: GenLists (offset 5) */
+   /* _mesa_function_pool[33987]: GenLists (offset 5) */
    "i\0"
    "glGenLists\0"
    "\0"
-   /* _mesa_function_pool[34031]: MapGrid2d (offset 226) */
+   /* _mesa_function_pool[34001]: MapGrid2d (offset 226) */
    "iddidd\0"
    "glMapGrid2d\0"
    "\0"
-   /* _mesa_function_pool[34051]: MapGrid2f (offset 227) */
+   /* _mesa_function_pool[34021]: MapGrid2f (offset 227) */
    "iffiff\0"
    "glMapGrid2f\0"
    "\0"
-   /* _mesa_function_pool[34071]: SampleMapATI (will be remapped) */
+   /* _mesa_function_pool[34041]: SampleMapATI (will be remapped) */
    "iii\0"
    "glSampleMapATI\0"
    "\0"
-   /* _mesa_function_pool[34091]: TexBumpParameterfvATI (will be remapped) */
+   /* _mesa_function_pool[34061]: TexBumpParameterfvATI (will be remapped) */
    "ip\0"
    "glTexBumpParameterfvATI\0"
    "\0"
-   /* _mesa_function_pool[34119]: GetActiveAttrib (will be remapped) */
+   /* _mesa_function_pool[34089]: GetActiveAttrib (will be remapped) */
    "iiipppp\0"
    "glGetActiveAttrib\0"
    "glGetActiveAttribARB\0"
    "\0"
-   /* _mesa_function_pool[34167]: TexCoord2fColor4ubVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[34137]: TexCoord2fColor4ubVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fColor4ubVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[34205]: PixelMapfv (offset 251) */
+   /* _mesa_function_pool[34175]: PixelMapfv (offset 251) */
    "iip\0"
    "glPixelMapfv\0"
    "\0"
-   /* _mesa_function_pool[34223]: ClearBufferData (will be remapped) */
+   /* _mesa_function_pool[34193]: ClearBufferData (will be remapped) */
    "iiiip\0"
    "glClearBufferData\0"
    "\0"
-   /* _mesa_function_pool[34248]: Color3usv (offset 24) */
+   /* _mesa_function_pool[34218]: Color3usv (offset 24) */
    "p\0"
    "glColor3usv\0"
    "\0"
-   /* _mesa_function_pool[34263]: StencilOpSeparate (will be remapped) */
+   /* _mesa_function_pool[34233]: StencilOpSeparate (will be remapped) */
    "iiii\0"
    "glStencilOpSeparate\0"
    "glStencilOpSeparateATI\0"
    "\0"
-   /* _mesa_function_pool[34312]: GenSamplers (will be remapped) */
+   /* _mesa_function_pool[34282]: GenSamplers (will be remapped) */
    "ip\0"
    "glGenSamplers\0"
    "\0"
-   /* _mesa_function_pool[34330]: DrawTexfOES (will be remapped) */
+   /* _mesa_function_pool[34300]: DrawTexfOES (will be remapped) */
    "fffff\0"
    "glDrawTexfOES\0"
    "\0"
-   /* _mesa_function_pool[34351]: AttachObjectARB (will be remapped) */
+   /* _mesa_function_pool[34321]: AttachObjectARB (will be remapped) */
    "ii\0"
    "glAttachObjectARB\0"
    "\0"
-   /* _mesa_function_pool[34373]: GetFragmentLightivSGIX (dynamic) */
+   /* _mesa_function_pool[34343]: GetFragmentLightivSGIX (dynamic) */
    "iip\0"
    "glGetFragmentLightivSGIX\0"
    "\0"
-   /* _mesa_function_pool[34403]: Accum (offset 213) */
+   /* _mesa_function_pool[34373]: Accum (offset 213) */
    "if\0"
    "glAccum\0"
    "\0"
-   /* _mesa_function_pool[34415]: GetTexImage (offset 281) */
+   /* _mesa_function_pool[34385]: GetTexImage (offset 281) */
    "iiiip\0"
    "glGetTexImage\0"
    "\0"
-   /* _mesa_function_pool[34436]: Color4x (will be remapped) */
+   /* _mesa_function_pool[34406]: Color4x (will be remapped) */
    "iiii\0"
    "glColor4xOES\0"
    "glColor4x\0"
    "\0"
-   /* _mesa_function_pool[34465]: ConvolutionParameteriv (offset 353) */
+   /* _mesa_function_pool[34435]: ConvolutionParameteriv (offset 353) */
    "iip\0"
    "glConvolutionParameteriv\0"
    "glConvolutionParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[34523]: Color4s (offset 33) */
+   /* _mesa_function_pool[34493]: Color4s (offset 33) */
    "iiii\0"
    "glColor4s\0"
    "\0"
-   /* _mesa_function_pool[34539]: CullParameterdvEXT (dynamic) */
+   /* _mesa_function_pool[34509]: CullParameterdvEXT (dynamic) */
    "ip\0"
    "glCullParameterdvEXT\0"
    "\0"
-   /* _mesa_function_pool[34564]: GetUniformuiv (will be remapped) */
+   /* _mesa_function_pool[34534]: GetUniformuiv (will be remapped) */
    "iip\0"
    "glGetUniformuivEXT\0"
    "glGetUniformuiv\0"
    "\0"
-   /* _mesa_function_pool[34604]: Color4i (offset 31) */
+   /* _mesa_function_pool[34574]: Color4i (offset 31) */
    "iiii\0"
    "glColor4i\0"
    "\0"
-   /* _mesa_function_pool[34620]: Color4f (offset 29) */
+   /* _mesa_function_pool[34590]: Color4f (offset 29) */
    "ffff\0"
    "glColor4f\0"
    "\0"
-   /* _mesa_function_pool[34636]: Color4d (offset 27) */
+   /* _mesa_function_pool[34606]: Color4d (offset 27) */
    "dddd\0"
    "glColor4d\0"
    "\0"
-   /* _mesa_function_pool[34652]: Color4b (offset 25) */
+   /* _mesa_function_pool[34622]: Color4b (offset 25) */
    "iiii\0"
    "glColor4b\0"
    "\0"
-   /* _mesa_function_pool[34668]: LoadProgramNV (will be remapped) */
+   /* _mesa_function_pool[34638]: LoadProgramNV (will be remapped) */
    "iiip\0"
    "glLoadProgramNV\0"
    "\0"
-   /* _mesa_function_pool[34690]: GetAttachedObjectsARB (will be remapped) */
+   /* _mesa_function_pool[34660]: GetAttachedObjectsARB (will be remapped) */
    "iipp\0"
    "glGetAttachedObjectsARB\0"
    "\0"
-   /* _mesa_function_pool[34720]: EvalCoord1fv (offset 231) */
+   /* _mesa_function_pool[34690]: EvalCoord1fv (offset 231) */
    "p\0"
    "glEvalCoord1fv\0"
    "\0"
-   /* _mesa_function_pool[34738]: VertexAttribLFormat (will be remapped) */
+   /* _mesa_function_pool[34708]: VertexAttribLFormat (will be remapped) */
    "iiii\0"
    "glVertexAttribLFormat\0"
    "\0"
-   /* _mesa_function_pool[34766]: StencilFuncSeparate (will be remapped) */
+   /* _mesa_function_pool[34736]: StencilFuncSeparate (will be remapped) */
    "iiii\0"
    "glStencilFuncSeparate\0"
    "\0"
-   /* _mesa_function_pool[34794]: ShaderSource (will be remapped) */
+   /* _mesa_function_pool[34764]: ShaderSource (will be remapped) */
    "iipp\0"
    "glShaderSource\0"
    "glShaderSourceARB\0"
    "\0"
-   /* _mesa_function_pool[34833]: Normal3fv (offset 57) */
+   /* _mesa_function_pool[34803]: Normal3fv (offset 57) */
    "p\0"
    "glNormal3fv\0"
    "\0"
-   /* _mesa_function_pool[34848]: ImageTransformParameterfvHP (dynamic) */
+   /* _mesa_function_pool[34818]: ImageTransformParameterfvHP (dynamic) */
    "iip\0"
    "glImageTransformParameterfvHP\0"
    "\0"
-   /* _mesa_function_pool[34883]: NormalP3ui (will be remapped) */
+   /* _mesa_function_pool[34853]: NormalP3ui (will be remapped) */
    "ii\0"
    "glNormalP3ui\0"
    "\0"
-   /* _mesa_function_pool[34900]: MultiTexCoord3fvARB (offset 395) */
+   /* _mesa_function_pool[34870]: MultiTexCoord3fvARB (offset 395) */
    "ip\0"
    "glMultiTexCoord3fv\0"
    "glMultiTexCoord3fvARB\0"
    "\0"
-   /* _mesa_function_pool[34945]: GetProgramParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[34915]: GetProgramParameterfvNV (will be remapped) */
    "iiip\0"
    "glGetProgramParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[34977]: BufferData (will be remapped) */
+   /* _mesa_function_pool[34947]: BufferData (will be remapped) */
    "iipi\0"
    "glBufferData\0"
    "glBufferDataARB\0"
    "\0"
-   /* _mesa_function_pool[35012]: TexSubImage2D (offset 333) */
+   /* _mesa_function_pool[34982]: TexSubImage2D (offset 333) */
    "iiiiiiiip\0"
    "glTexSubImage2D\0"
    "glTexSubImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[35058]: FragmentLightivSGIX (dynamic) */
+   /* _mesa_function_pool[35028]: FragmentLightivSGIX (dynamic) */
    "iip\0"
    "glFragmentLightivSGIX\0"
    "\0"
-   /* _mesa_function_pool[35085]: GetTexParameterPointervAPPLE (dynamic) */
+   /* _mesa_function_pool[35055]: GetTexParameterPointervAPPLE (dynamic) */
    "iip\0"
    "glGetTexParameterPointervAPPLE\0"
    "\0"
-   /* _mesa_function_pool[35121]: TexGenfv (offset 191) */
+   /* _mesa_function_pool[35091]: TexGenfv (offset 191) */
    "iip\0"
    "glTexGenfv\0"
    "glTexGenfvOES\0"
    "\0"
-   /* _mesa_function_pool[35151]: GetVertexAttribiv (will be remapped) */
+   /* _mesa_function_pool[35121]: GetVertexAttribiv (will be remapped) */
    "iip\0"
    "glGetVertexAttribiv\0"
    "glGetVertexAttribivARB\0"
    "\0"
-   /* _mesa_function_pool[35199]: TexCoordP2uiv (will be remapped) */
+   /* _mesa_function_pool[35169]: TexCoordP2uiv (will be remapped) */
    "ip\0"
    "glTexCoordP2uiv\0"
    "\0"
-   /* _mesa_function_pool[35219]: ReplacementCodeuiColor3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[35189]: ReplacementCodeuiColor3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[35263]: Uniform3fv (will be remapped) */
+   /* _mesa_function_pool[35233]: Uniform3fv (will be remapped) */
    "iip\0"
    "glUniform3fv\0"
    "glUniform3fvARB\0"
    "\0"
-   /* _mesa_function_pool[35297]: BlendEquation (offset 337) */
+   /* _mesa_function_pool[35267]: BlendEquation (offset 337) */
    "i\0"
    "glBlendEquation\0"
    "glBlendEquationEXT\0"
    "glBlendEquationOES\0"
    "\0"
-   /* _mesa_function_pool[35354]: VertexAttrib3dNV (will be remapped) */
+   /* _mesa_function_pool[35324]: VertexAttrib3dNV (will be remapped) */
    "iddd\0"
    "glVertexAttrib3dNV\0"
    "\0"
-   /* _mesa_function_pool[35379]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[35349]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
    "ppppp\0"
    "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[35443]: IndexFuncEXT (dynamic) */
+   /* _mesa_function_pool[35413]: IndexFuncEXT (dynamic) */
    "if\0"
    "glIndexFuncEXT\0"
    "\0"
-   /* _mesa_function_pool[35462]: UseShaderProgramEXT (will be remapped) */
+   /* _mesa_function_pool[35432]: UseShaderProgramEXT (will be remapped) */
    "ii\0"
    "glUseShaderProgramEXT\0"
    "\0"
-   /* _mesa_function_pool[35488]: PushName (offset 201) */
+   /* _mesa_function_pool[35458]: PushName (offset 201) */
    "i\0"
    "glPushName\0"
    "\0"
-   /* _mesa_function_pool[35502]: GenFencesNV (dynamic) */
+   /* _mesa_function_pool[35472]: GenFencesNV (dynamic) */
    "ip\0"
    "glGenFencesNV\0"
    "\0"
-   /* _mesa_function_pool[35520]: CullParameterfvEXT (dynamic) */
+   /* _mesa_function_pool[35490]: CullParameterfvEXT (dynamic) */
    "ip\0"
    "glCullParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[35545]: DeleteRenderbuffers (will be remapped) */
+   /* _mesa_function_pool[35515]: DeleteRenderbuffers (will be remapped) */
    "ip\0"
    "glDeleteRenderbuffers\0"
    "glDeleteRenderbuffersEXT\0"
    "glDeleteRenderbuffersOES\0"
    "\0"
-   /* _mesa_function_pool[35621]: VertexAttrib1dv (will be remapped) */
+   /* _mesa_function_pool[35591]: VertexAttrib1dv (will be remapped) */
    "ip\0"
    "glVertexAttrib1dv\0"
    "glVertexAttrib1dvARB\0"
    "\0"
-   /* _mesa_function_pool[35664]: ImageTransformParameteriHP (dynamic) */
+   /* _mesa_function_pool[35634]: ImageTransformParameteriHP (dynamic) */
    "iii\0"
    "glImageTransformParameteriHP\0"
    "\0"
-   /* _mesa_function_pool[35698]: IsShader (will be remapped) */
+   /* _mesa_function_pool[35668]: IsShader (will be remapped) */
    "i\0"
    "glIsShader\0"
    "\0"
-   /* _mesa_function_pool[35712]: Rotated (offset 299) */
+   /* _mesa_function_pool[35682]: Rotated (offset 299) */
    "dddd\0"
    "glRotated\0"
    "\0"
-   /* _mesa_function_pool[35728]: Color4iv (offset 32) */
+   /* _mesa_function_pool[35698]: Color4iv (offset 32) */
    "p\0"
    "glColor4iv\0"
    "\0"
-   /* _mesa_function_pool[35742]: Disablei (will be remapped) */
+   /* _mesa_function_pool[35712]: Disablei (will be remapped) */
    "ii\0"
    "glDisableIndexedEXT\0"
    "glDisablei\0"
    "\0"
-   /* _mesa_function_pool[35777]: Rotatex (will be remapped) */
+   /* _mesa_function_pool[35747]: Rotatex (will be remapped) */
    "iiii\0"
    "glRotatexOES\0"
    "glRotatex\0"
    "\0"
-   /* _mesa_function_pool[35806]: FramebufferTextureLayer (will be remapped) */
+   /* _mesa_function_pool[35776]: FramebufferTextureLayer (will be remapped) */
    "iiiii\0"
    "glFramebufferTextureLayer\0"
    "glFramebufferTextureLayerARB\0"
    "glFramebufferTextureLayerEXT\0"
    "\0"
-   /* _mesa_function_pool[35897]: TexEnvfv (offset 185) */
+   /* _mesa_function_pool[35867]: TexEnvfv (offset 185) */
    "iip\0"
    "glTexEnvfv\0"
    "\0"
-   /* _mesa_function_pool[35913]: ProgramUniformMatrix3fv (will be remapped) */
+   /* _mesa_function_pool[35883]: ProgramUniformMatrix3fv (will be remapped) */
    "iiiip\0"
    "glProgramUniformMatrix3fv\0"
    "\0"
-   /* _mesa_function_pool[35946]: LoadMatrixf (offset 291) */
+   /* _mesa_function_pool[35916]: LoadMatrixf (offset 291) */
    "p\0"
    "glLoadMatrixf\0"
    "\0"
-   /* _mesa_function_pool[35963]: GetProgramLocalParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[35933]: GetProgramLocalParameterfvARB (will be remapped) */
    "iip\0"
    "glGetProgramLocalParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[36000]: LoadMatrixx (will be remapped) */
+   /* _mesa_function_pool[35970]: LoadMatrixx (will be remapped) */
    "p\0"
    "glLoadMatrixxOES\0"
    "glLoadMatrixx\0"
    "\0"
-   /* _mesa_function_pool[36034]: DrawRangeElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[36004]: DrawRangeElementsBaseVertex (will be remapped) */
    "iiiiipi\0"
    "glDrawRangeElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[36073]: MatrixIndexuivARB (dynamic) */
+   /* _mesa_function_pool[36043]: MatrixIndexuivARB (dynamic) */
    "ip\0"
    "glMatrixIndexuivARB\0"
    "\0"
-   /* _mesa_function_pool[36097]: Tangent3sEXT (dynamic) */
+   /* _mesa_function_pool[36067]: Tangent3sEXT (dynamic) */
    "iii\0"
    "glTangent3sEXT\0"
    "\0"
-   /* _mesa_function_pool[36117]: SecondaryColor3bv (will be remapped) */
+   /* _mesa_function_pool[36087]: SecondaryColor3bv (will be remapped) */
    "p\0"
    "glSecondaryColor3bv\0"
    "glSecondaryColor3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[36163]: GlobalAlphaFactorusSUN (dynamic) */
+   /* _mesa_function_pool[36133]: GlobalAlphaFactorusSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorusSUN\0"
    "\0"
-   /* _mesa_function_pool[36191]: GetCombinerOutputParameterivNV (dynamic) */
+   /* _mesa_function_pool[36161]: GetCombinerOutputParameterivNV (dynamic) */
    "iiip\0"
    "glGetCombinerOutputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[36230]: DrawTexxvOES (will be remapped) */
+   /* _mesa_function_pool[36200]: DrawTexxvOES (will be remapped) */
    "p\0"
    "glDrawTexxvOES\0"
    "\0"
-   /* _mesa_function_pool[36248]: TexParameterfv (offset 179) */
+   /* _mesa_function_pool[36218]: TexParameterfv (offset 179) */
    "iip\0"
    "glTexParameterfv\0"
    "\0"
-   /* _mesa_function_pool[36270]: Color4ubv (offset 36) */
+   /* _mesa_function_pool[36240]: Color4ubv (offset 36) */
    "p\0"
    "glColor4ubv\0"
    "\0"
-   /* _mesa_function_pool[36285]: TexCoord2fv (offset 105) */
+   /* _mesa_function_pool[36255]: TexCoord2fv (offset 105) */
    "p\0"
    "glTexCoord2fv\0"
    "\0"
-   /* _mesa_function_pool[36302]: FogCoorddv (will be remapped) */
+   /* _mesa_function_pool[36272]: FogCoorddv (will be remapped) */
    "p\0"
    "glFogCoorddv\0"
    "glFogCoorddvEXT\0"
    "\0"
-   /* _mesa_function_pool[36334]: VDPAUUnregisterSurfaceNV (will be remapped) */
+   /* _mesa_function_pool[36304]: VDPAUUnregisterSurfaceNV (will be remapped) */
    "i\0"
    "glVDPAUUnregisterSurfaceNV\0"
    "\0"
-   /* _mesa_function_pool[36364]: ColorP3ui (will be remapped) */
+   /* _mesa_function_pool[36334]: ColorP3ui (will be remapped) */
    "ii\0"
    "glColorP3ui\0"
    "\0"
-   /* _mesa_function_pool[36380]: ClearBufferuiv (will be remapped) */
+   /* _mesa_function_pool[36350]: ClearBufferuiv (will be remapped) */
    "iip\0"
    "glClearBufferuiv\0"
    "\0"
-   /* _mesa_function_pool[36402]: GetShaderPrecisionFormat (will be remapped) */
+   /* _mesa_function_pool[36372]: GetShaderPrecisionFormat (will be remapped) */
    "iipp\0"
    "glGetShaderPrecisionFormat\0"
    "\0"
-   /* _mesa_function_pool[36435]: ProgramNamedParameter4dvNV (will be remapped) */
+   /* _mesa_function_pool[36405]: ProgramNamedParameter4dvNV (will be remapped) */
    "iipp\0"
    "glProgramNamedParameter4dvNV\0"
    "\0"
-   /* _mesa_function_pool[36470]: Flush (offset 217) */
+   /* _mesa_function_pool[36440]: Flush (offset 217) */
    "\0"
    "glFlush\0"
    "\0"
-   /* _mesa_function_pool[36480]: VertexAttribI4iEXT (will be remapped) */
+   /* _mesa_function_pool[36450]: VertexAttribI4iEXT (will be remapped) */
    "iiiii\0"
    "glVertexAttribI4iEXT\0"
    "glVertexAttribI4i\0"
    "\0"
-   /* _mesa_function_pool[36526]: FogCoordd (will be remapped) */
+   /* _mesa_function_pool[36496]: FogCoordd (will be remapped) */
    "d\0"
    "glFogCoordd\0"
    "glFogCoorddEXT\0"
    "\0"
-   /* _mesa_function_pool[36556]: Uniform3iv (will be remapped) */
+   /* _mesa_function_pool[36526]: Uniform3iv (will be remapped) */
    "iip\0"
    "glUniform3iv\0"
    "glUniform3ivARB\0"
    "\0"
-   /* _mesa_function_pool[36590]: TexStorage2DMultisample (will be remapped) */
+   /* _mesa_function_pool[36560]: TexStorage2DMultisample (will be remapped) */
    "iiiiii\0"
    "glTexStorage2DMultisample\0"
    "\0"
-   /* _mesa_function_pool[36624]: UnlockArraysEXT (will be remapped) */
+   /* _mesa_function_pool[36594]: UnlockArraysEXT (will be remapped) */
    "\0"
    "glUnlockArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[36644]: VertexAttrib1svNV (will be remapped) */
+   /* _mesa_function_pool[36614]: VertexAttrib1svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1svNV\0"
    "\0"
-   /* _mesa_function_pool[36668]: VertexAttrib4iv (will be remapped) */
+   /* _mesa_function_pool[36638]: VertexAttrib4iv (will be remapped) */
    "ip\0"
    "glVertexAttrib4iv\0"
    "glVertexAttrib4ivARB\0"
    "\0"
-   /* _mesa_function_pool[36711]: CopyTexSubImage3D (offset 373) */
+   /* _mesa_function_pool[36681]: CopyTexSubImage3D (offset 373) */
    "iiiiiiiii\0"
    "glCopyTexSubImage3D\0"
    "glCopyTexSubImage3DEXT\0"
    "glCopyTexSubImage3DOES\0"
    "\0"
-   /* _mesa_function_pool[36788]: GetInteger64v (will be remapped) */
+   /* _mesa_function_pool[36758]: GetInteger64v (will be remapped) */
    "ip\0"
    "glGetInteger64v\0"
    "\0"
-   /* _mesa_function_pool[36808]: DetachObjectARB (will be remapped) */
+   /* _mesa_function_pool[36778]: DetachObjectARB (will be remapped) */
    "ii\0"
    "glDetachObjectARB\0"
    "\0"
-   /* _mesa_function_pool[36830]: Indexiv (offset 49) */
+   /* _mesa_function_pool[36800]: Indexiv (offset 49) */
    "p\0"
    "glIndexiv\0"
    "\0"
-   /* _mesa_function_pool[36843]: TexEnvi (offset 186) */
+   /* _mesa_function_pool[36813]: TexEnvi (offset 186) */
    "iii\0"
    "glTexEnvi\0"
    "\0"
-   /* _mesa_function_pool[36858]: TexEnvf (offset 184) */
+   /* _mesa_function_pool[36828]: TexEnvf (offset 184) */
    "iif\0"
    "glTexEnvf\0"
    "\0"
-   /* _mesa_function_pool[36873]: TexEnvx (will be remapped) */
+   /* _mesa_function_pool[36843]: TexEnvx (will be remapped) */
    "iii\0"
    "glTexEnvxOES\0"
    "glTexEnvx\0"
    "\0"
-   /* _mesa_function_pool[36901]: StopInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[36871]: StopInstrumentsSGIX (dynamic) */
    "i\0"
    "glStopInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[36926]: TexCoord4fColor4fNormal3fVertex4fSUN (dynamic) */
+   /* _mesa_function_pool[36896]: TexCoord4fColor4fNormal3fVertex4fSUN (dynamic) */
    "fffffffffffffff\0"
    "glTexCoord4fColor4fNormal3fVertex4fSUN\0"
    "\0"
-   /* _mesa_function_pool[36982]: InvalidateBufferSubData (will be remapped) */
+   /* _mesa_function_pool[36952]: InvalidateBufferSubData (will be remapped) */
    "iii\0"
    "glInvalidateBufferSubData\0"
    "\0"
-   /* _mesa_function_pool[37013]: UniformMatrix4x2fv (will be remapped) */
+   /* _mesa_function_pool[36983]: UniformMatrix4x2fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix4x2fv\0"
    "\0"
-   /* _mesa_function_pool[37040]: SamplerParameterIiv (will be remapped) */
+   /* _mesa_function_pool[37010]: SamplerParameterIiv (will be remapped) */
    "iip\0"
    "glSamplerParameterIiv\0"
    "\0"
-   /* _mesa_function_pool[37067]: PolygonOffset (offset 319) */
+   /* _mesa_function_pool[37037]: PolygonOffset (offset 319) */
    "ff\0"
    "glPolygonOffset\0"
    "\0"
-   /* _mesa_function_pool[37087]: NormalPointervINTEL (dynamic) */
+   /* _mesa_function_pool[37057]: NormalPointervINTEL (dynamic) */
    "ip\0"
    "glNormalPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[37113]: SamplerParameterfv (will be remapped) */
+   /* _mesa_function_pool[37083]: SamplerParameterfv (will be remapped) */
    "iip\0"
    "glSamplerParameterfv\0"
    "\0"
-   /* _mesa_function_pool[37139]: Normal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[37109]: Normal3fVertex3fSUN (dynamic) */
    "ffffff\0"
    "glNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[37169]: ProgramEnvParameter4fARB (will be remapped) */
+   /* _mesa_function_pool[37139]: ProgramEnvParameter4fARB (will be remapped) */
    "iiffff\0"
    "glProgramEnvParameter4fARB\0"
    "glProgramParameter4fNV\0"
    "\0"
-   /* _mesa_function_pool[37227]: ClearDepth (offset 208) */
+   /* _mesa_function_pool[37197]: ClearDepth (offset 208) */
    "d\0"
    "glClearDepth\0"
    "\0"
-   /* _mesa_function_pool[37243]: VertexAttrib3dvNV (will be remapped) */
+   /* _mesa_function_pool[37213]: VertexAttrib3dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3dvNV\0"
    "\0"
-   /* _mesa_function_pool[37267]: Color4fv (offset 30) */
+   /* _mesa_function_pool[37237]: Color4fv (offset 30) */
    "p\0"
    "glColor4fv\0"
    "\0"
-   /* _mesa_function_pool[37281]: GetnMinmaxARB (will be remapped) */
+   /* _mesa_function_pool[37251]: GetnMinmaxARB (will be remapped) */
    "iiiiip\0"
    "glGetnMinmaxARB\0"
    "\0"
-   /* _mesa_function_pool[37305]: ColorPointer (offset 308) */
+   /* _mesa_function_pool[37275]: ColorPointer (offset 308) */
    "iiip\0"
    "glColorPointer\0"
    "\0"
-   /* _mesa_function_pool[37326]: GetPointerv (offset 329) */
+   /* _mesa_function_pool[37296]: GetPointerv (offset 329) */
    "ip\0"
    "glGetPointerv\0"
    "glGetPointervEXT\0"
    "\0"
-   /* _mesa_function_pool[37361]: Lightiv (offset 162) */
+   /* _mesa_function_pool[37331]: Lightiv (offset 162) */
    "iip\0"
    "glLightiv\0"
    "\0"
-   /* _mesa_function_pool[37376]: GetTexParameteriv (offset 283) */
+   /* _mesa_function_pool[37346]: GetTexParameteriv (offset 283) */
    "iip\0"
    "glGetTexParameteriv\0"
    "\0"
-   /* _mesa_function_pool[37401]: TransformFeedbackVaryings (will be remapped) */
+   /* _mesa_function_pool[37371]: TransformFeedbackVaryings (will be remapped) */
    "iipi\0"
    "glTransformFeedbackVaryings\0"
    "glTransformFeedbackVaryingsEXT\0"
    "\0"
-   /* _mesa_function_pool[37466]: VertexAttrib3sv (will be remapped) */
+   /* _mesa_function_pool[37436]: VertexAttrib3sv (will be remapped) */
    "ip\0"
    "glVertexAttrib3sv\0"
    "glVertexAttrib3svARB\0"
    "\0"
-   /* _mesa_function_pool[37509]: IsVertexArray (will be remapped) */
+   /* _mesa_function_pool[37479]: IsVertexArray (will be remapped) */
    "i\0"
    "glIsVertexArray\0"
    "glIsVertexArrayAPPLE\0"
    "glIsVertexArrayOES\0"
    "\0"
-   /* _mesa_function_pool[37568]: PushClientAttrib (offset 335) */
+   /* _mesa_function_pool[37538]: PushClientAttrib (offset 335) */
    "i\0"
    "glPushClientAttrib\0"
    "\0"
-   /* _mesa_function_pool[37590]: ProgramUniform4ui (will be remapped) */
+   /* _mesa_function_pool[37560]: ProgramUniform4ui (will be remapped) */
    "iiiiii\0"
    "glProgramUniform4ui\0"
    "\0"
-   /* _mesa_function_pool[37618]: Uniform1f (will be remapped) */
+   /* _mesa_function_pool[37588]: Uniform1f (will be remapped) */
    "if\0"
    "glUniform1f\0"
    "glUniform1fARB\0"
    "\0"
-   /* _mesa_function_pool[37649]: FragmentMaterialfSGIX (dynamic) */
+   /* _mesa_function_pool[37619]: FragmentMaterialfSGIX (dynamic) */
    "iif\0"
    "glFragmentMaterialfSGIX\0"
    "\0"
-   /* _mesa_function_pool[37678]: Uniform1i (will be remapped) */
+   /* _mesa_function_pool[37648]: Uniform1i (will be remapped) */
    "ii\0"
    "glUniform1i\0"
    "glUniform1iARB\0"
    "\0"
-   /* _mesa_function_pool[37709]: GetPolygonStipple (offset 274) */
+   /* _mesa_function_pool[37679]: GetPolygonStipple (offset 274) */
    "p\0"
    "glGetPolygonStipple\0"
    "\0"
-   /* _mesa_function_pool[37732]: PixelTexGenSGIX (dynamic) */
+   /* _mesa_function_pool[37702]: PixelTexGenSGIX (dynamic) */
    "i\0"
    "glPixelTexGenSGIX\0"
    "\0"
-   /* _mesa_function_pool[37753]: TexGenxOES (will be remapped) */
+   /* _mesa_function_pool[37723]: TexGenxOES (will be remapped) */
    "iii\0"
    "glTexGenxOES\0"
    "\0"
-   /* _mesa_function_pool[37771]: UseProgram (will be remapped) */
+   /* _mesa_function_pool[37741]: UseProgram (will be remapped) */
    "i\0"
    "glUseProgram\0"
    "glUseProgramObjectARB\0"
    "\0"
-   /* _mesa_function_pool[37809]: StartInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[37779]: StartInstrumentsSGIX (dynamic) */
    "\0"
    "glStartInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[37834]: FlushMappedBufferRangeAPPLE (will be remapped) */
+   /* _mesa_function_pool[37804]: FlushMappedBufferRangeAPPLE (will be remapped) */
    "iii\0"
    "glFlushMappedBufferRangeAPPLE\0"
    "\0"
-   /* _mesa_function_pool[37869]: GetFragDataLocation (will be remapped) */
+   /* _mesa_function_pool[37839]: GetFragDataLocation (will be remapped) */
    "ip\0"
    "glGetFragDataLocationEXT\0"
    "glGetFragDataLocation\0"
    "\0"
-   /* _mesa_function_pool[37920]: PixelMapuiv (offset 252) */
+   /* _mesa_function_pool[37890]: PixelMapuiv (offset 252) */
    "iip\0"
    "glPixelMapuiv\0"
    "\0"
-   /* _mesa_function_pool[37939]: VertexWeightfvEXT (dynamic) */
+   /* _mesa_function_pool[37909]: VertexWeightfvEXT (dynamic) */
    "p\0"
    "glVertexWeightfvEXT\0"
    "\0"
-   /* _mesa_function_pool[37962]: GetFenceivNV (dynamic) */
+   /* _mesa_function_pool[37932]: GetFenceivNV (dynamic) */
    "iip\0"
    "glGetFenceivNV\0"
    "\0"
-   /* _mesa_function_pool[37982]: CurrentPaletteMatrixARB (dynamic) */
+   /* _mesa_function_pool[37952]: CurrentPaletteMatrixARB (dynamic) */
    "i\0"
    "glCurrentPaletteMatrixARB\0"
    "glCurrentPaletteMatrixOES\0"
    "\0"
-   /* _mesa_function_pool[38037]: GetInteger64i_v (will be remapped) */
+   /* _mesa_function_pool[38007]: GetInteger64i_v (will be remapped) */
    "iip\0"
    "glGetInteger64i_v\0"
    "\0"
-   /* _mesa_function_pool[38060]: TexCoord2fColor4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[38030]: TexCoord2fColor4ubVertex3fSUN (dynamic) */
    "ffiiiifff\0"
    "glTexCoord2fColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[38103]: TagSampleBufferSGIX (dynamic) */
+   /* _mesa_function_pool[38073]: TagSampleBufferSGIX (dynamic) */
    "\0"
    "glTagSampleBufferSGIX\0"
    "\0"
-   /* _mesa_function_pool[38127]: Color3s (offset 17) */
+   /* _mesa_function_pool[38097]: Color3s (offset 17) */
    "iii\0"
    "glColor3s\0"
    "\0"
-   /* _mesa_function_pool[38142]: TexCoordPointer (offset 320) */
+   /* _mesa_function_pool[38112]: TexCoordPointer (offset 320) */
    "iiip\0"
    "glTexCoordPointer\0"
    "\0"
-   /* _mesa_function_pool[38166]: Color3i (offset 15) */
+   /* _mesa_function_pool[38136]: Color3i (offset 15) */
    "iii\0"
    "glColor3i\0"
    "\0"
-   /* _mesa_function_pool[38181]: EvalCoord2d (offset 232) */
+   /* _mesa_function_pool[38151]: EvalCoord2d (offset 232) */
    "dd\0"
    "glEvalCoord2d\0"
    "\0"
-   /* _mesa_function_pool[38199]: EvalCoord2f (offset 234) */
+   /* _mesa_function_pool[38169]: EvalCoord2f (offset 234) */
    "ff\0"
    "glEvalCoord2f\0"
    "\0"
-   /* _mesa_function_pool[38217]: Color3b (offset 9) */
+   /* _mesa_function_pool[38187]: Color3b (offset 9) */
    "iii\0"
    "glColor3b\0"
    "\0"
-   /* _mesa_function_pool[38232]: ExecuteProgramNV (will be remapped) */
+   /* _mesa_function_pool[38202]: ExecuteProgramNV (will be remapped) */
    "iip\0"
    "glExecuteProgramNV\0"
    "\0"
-   /* _mesa_function_pool[38256]: Color3f (offset 13) */
+   /* _mesa_function_pool[38226]: Color3f (offset 13) */
    "fff\0"
    "glColor3f\0"
    "\0"
-   /* _mesa_function_pool[38271]: Color3d (offset 11) */
+   /* _mesa_function_pool[38241]: Color3d (offset 11) */
    "ddd\0"
    "glColor3d\0"
    "\0"
-   /* _mesa_function_pool[38286]: GetVertexAttribdv (will be remapped) */
+   /* _mesa_function_pool[38256]: GetVertexAttribdv (will be remapped) */
    "iip\0"
    "glGetVertexAttribdv\0"
    "glGetVertexAttribdvARB\0"
    "\0"
-   /* _mesa_function_pool[38334]: GetBufferPointerv (will be remapped) */
+   /* _mesa_function_pool[38304]: GetBufferPointerv (will be remapped) */
    "iip\0"
    "glGetBufferPointerv\0"
    "glGetBufferPointervARB\0"
    "glGetBufferPointervOES\0"
    "\0"
-   /* _mesa_function_pool[38405]: GenFramebuffers (will be remapped) */
+   /* _mesa_function_pool[38375]: GenFramebuffers (will be remapped) */
    "ip\0"
    "glGenFramebuffers\0"
    "glGenFramebuffersEXT\0"
    "glGenFramebuffersOES\0"
    "\0"
-   /* _mesa_function_pool[38469]: GenBuffers (will be remapped) */
+   /* _mesa_function_pool[38439]: GenBuffers (will be remapped) */
    "ip\0"
    "glGenBuffers\0"
    "glGenBuffersARB\0"
    "\0"
-   /* _mesa_function_pool[38502]: ClearDepthx (will be remapped) */
+   /* _mesa_function_pool[38472]: ClearDepthx (will be remapped) */
    "i\0"
    "glClearDepthxOES\0"
    "glClearDepthx\0"
    "\0"
-   /* _mesa_function_pool[38536]: BlendEquationSeparate (will be remapped) */
+   /* _mesa_function_pool[38506]: BlendEquationSeparate (will be remapped) */
    "ii\0"
    "glBlendEquationSeparate\0"
    "glBlendEquationSeparateEXT\0"
    "glBlendEquationSeparateATI\0"
    "glBlendEquationSeparateOES\0"
    "\0"
-   /* _mesa_function_pool[38645]: PixelTransformParameteriEXT (dynamic) */
+   /* _mesa_function_pool[38615]: PixelTransformParameteriEXT (dynamic) */
    "iii\0"
    "glPixelTransformParameteriEXT\0"
    "\0"
-   /* _mesa_function_pool[38680]: MultiTexCoordP4ui (will be remapped) */
+   /* _mesa_function_pool[38650]: MultiTexCoordP4ui (will be remapped) */
    "iii\0"
    "glMultiTexCoordP4ui\0"
    "\0"
-   /* _mesa_function_pool[38705]: VertexAttribIPointer (will be remapped) */
+   /* _mesa_function_pool[38675]: VertexAttribIPointer (will be remapped) */
    "iiiip\0"
    "glVertexAttribIPointerEXT\0"
    "glVertexAttribIPointer\0"
    "\0"
-   /* _mesa_function_pool[38761]: EnableVertexAttribArray (will be remapped) */
+   /* _mesa_function_pool[38731]: EnableVertexAttribArray (will be remapped) */
    "i\0"
    "glEnableVertexAttribArray\0"
    "glEnableVertexAttribArrayARB\0"
    "\0"
-   /* _mesa_function_pool[38819]: FrameZoomSGIX (dynamic) */
+   /* _mesa_function_pool[38789]: FrameZoomSGIX (dynamic) */
    "i\0"
    "glFrameZoomSGIX\0"
    "\0"
-   /* _mesa_function_pool[38838]: RasterPos4sv (offset 85) */
+   /* _mesa_function_pool[38808]: RasterPos4sv (offset 85) */
    "p\0"
    "glRasterPos4sv\0"
    "\0"
-   /* _mesa_function_pool[38856]: SelectBuffer (offset 195) */
+   /* _mesa_function_pool[38826]: SelectBuffer (offset 195) */
    "ip\0"
    "glSelectBuffer\0"
    "\0"
-   /* _mesa_function_pool[38875]: GetSynciv (will be remapped) */
+   /* _mesa_function_pool[38845]: GetSynciv (will be remapped) */
    "iiipp\0"
    "glGetSynciv\0"
    "\0"
-   /* _mesa_function_pool[38894]: TextureView (will be remapped) */
+   /* _mesa_function_pool[38864]: TextureView (will be remapped) */
    "iiiiiiii\0"
    "glTextureView\0"
    "\0"
-   /* _mesa_function_pool[38918]: TexEnviv (offset 187) */
+   /* _mesa_function_pool[38888]: TexEnviv (offset 187) */
    "iip\0"
    "glTexEnviv\0"
    "\0"
-   /* _mesa_function_pool[38934]: TexSubImage3D (offset 372) */
+   /* _mesa_function_pool[38904]: TexSubImage3D (offset 372) */
    "iiiiiiiiiip\0"
    "glTexSubImage3D\0"
    "glTexSubImage3DEXT\0"
    "glTexSubImage3DOES\0"
    "\0"
-   /* _mesa_function_pool[39001]: Bitmap (offset 8) */
+   /* _mesa_function_pool[38971]: Bitmap (offset 8) */
    "iiffffp\0"
    "glBitmap\0"
    "\0"
-   /* _mesa_function_pool[39019]: VertexAttribDivisor (will be remapped) */
+   /* _mesa_function_pool[38989]: VertexAttribDivisor (will be remapped) */
    "ii\0"
    "glVertexAttribDivisorARB\0"
    "glVertexAttribDivisor\0"
    "\0"
-   /* _mesa_function_pool[39070]: DrawTransformFeedbackStream (will be remapped) */
+   /* _mesa_function_pool[39040]: DrawTransformFeedbackStream (will be remapped) */
    "iii\0"
    "glDrawTransformFeedbackStream\0"
    "\0"
-   /* _mesa_function_pool[39105]: GetIntegerv (offset 263) */
+   /* _mesa_function_pool[39075]: GetIntegerv (offset 263) */
    "ip\0"
    "glGetIntegerv\0"
    "\0"
-   /* _mesa_function_pool[39123]: FragmentLightfvSGIX (dynamic) */
+   /* _mesa_function_pool[39093]: FragmentLightfvSGIX (dynamic) */
    "iip\0"
    "glFragmentLightfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[39150]: TexCoord2fColor3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[39120]: TexCoord2fColor3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[39187]: GetActiveUniform (will be remapped) */
+   /* _mesa_function_pool[39157]: GetActiveUniform (will be remapped) */
    "iiipppp\0"
    "glGetActiveUniform\0"
    "glGetActiveUniformARB\0"
    "\0"
-   /* _mesa_function_pool[39237]: AlphaFuncx (will be remapped) */
+   /* _mesa_function_pool[39207]: AlphaFuncx (will be remapped) */
    "ii\0"
    "glAlphaFuncxOES\0"
    "glAlphaFuncx\0"
    "\0"
-   /* _mesa_function_pool[39270]: VertexAttribI2ivEXT (will be remapped) */
+   /* _mesa_function_pool[39240]: VertexAttribI2ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI2ivEXT\0"
    "glVertexAttribI2iv\0"
    "\0"
-   /* _mesa_function_pool[39315]: VertexBlendARB (dynamic) */
+   /* _mesa_function_pool[39285]: VertexBlendARB (dynamic) */
    "i\0"
    "glVertexBlendARB\0"
    "\0"
-   /* _mesa_function_pool[39335]: Map1d (offset 220) */
+   /* _mesa_function_pool[39305]: Map1d (offset 220) */
    "iddiip\0"
    "glMap1d\0"
    "\0"
-   /* _mesa_function_pool[39351]: Map1f (offset 221) */
+   /* _mesa_function_pool[39321]: Map1f (offset 221) */
    "iffiip\0"
    "glMap1f\0"
    "\0"
-   /* _mesa_function_pool[39367]: AreTexturesResident (offset 322) */
+   /* _mesa_function_pool[39337]: AreTexturesResident (offset 322) */
    "ipp\0"
    "glAreTexturesResident\0"
    "glAreTexturesResidentEXT\0"
    "\0"
-   /* _mesa_function_pool[39419]: ProgramNamedParameter4fNV (will be remapped) */
+   /* _mesa_function_pool[39389]: ProgramNamedParameter4fNV (will be remapped) */
    "iipffff\0"
    "glProgramNamedParameter4fNV\0"
    "\0"
-   /* _mesa_function_pool[39456]: PixelTransferi (offset 248) */
+   /* _mesa_function_pool[39426]: PixelTransferi (offset 248) */
    "ii\0"
    "glPixelTransferi\0"
    "\0"
-   /* _mesa_function_pool[39477]: VertexAttrib3fvNV (will be remapped) */
+   /* _mesa_function_pool[39447]: VertexAttrib3fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3fvNV\0"
    "\0"
-   /* _mesa_function_pool[39501]: GetFinalCombinerInputParameterivNV (dynamic) */
+   /* _mesa_function_pool[39471]: GetFinalCombinerInputParameterivNV (dynamic) */
    "iip\0"
    "glGetFinalCombinerInputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[39543]: SecondaryColorP3ui (will be remapped) */
+   /* _mesa_function_pool[39513]: SecondaryColorP3ui (will be remapped) */
    "ii\0"
    "glSecondaryColorP3ui\0"
    "\0"
-   /* _mesa_function_pool[39568]: GetMapParameterivNV (dynamic) */
+   /* _mesa_function_pool[39538]: GetMapParameterivNV (dynamic) */
    "iip\0"
    "glGetMapParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[39595]: VertexAttrib4fvNV (will be remapped) */
+   /* _mesa_function_pool[39565]: VertexAttrib4fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4fvNV\0"
    "\0"
-   /* _mesa_function_pool[39619]: Rectiv (offset 91) */
+   /* _mesa_function_pool[39589]: Rectiv (offset 91) */
    "pp\0"
    "glRectiv\0"
    "\0"
-   /* _mesa_function_pool[39632]: MultiTexCoord1iv (offset 381) */
+   /* _mesa_function_pool[39602]: MultiTexCoord1iv (offset 381) */
    "ip\0"
    "glMultiTexCoord1iv\0"
    "glMultiTexCoord1ivARB\0"
    "\0"
-   /* _mesa_function_pool[39677]: PassTexCoordATI (will be remapped) */
+   /* _mesa_function_pool[39647]: PassTexCoordATI (will be remapped) */
    "iii\0"
    "glPassTexCoordATI\0"
    "\0"
-   /* _mesa_function_pool[39700]: Tangent3dEXT (dynamic) */
+   /* _mesa_function_pool[39670]: Tangent3dEXT (dynamic) */
    "ddd\0"
    "glTangent3dEXT\0"
    "\0"
-   /* _mesa_function_pool[39720]: Vertex2fv (offset 129) */
+   /* _mesa_function_pool[39690]: Vertex2fv (offset 129) */
    "p\0"
    "glVertex2fv\0"
    "\0"
-   /* _mesa_function_pool[39735]: BindRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[39705]: BindRenderbufferEXT (will be remapped) */
    "ii\0"
    "glBindRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[39761]: Vertex3sv (offset 141) */
+   /* _mesa_function_pool[39731]: Vertex3sv (offset 141) */
    "p\0"
    "glVertex3sv\0"
    "\0"
-   /* _mesa_function_pool[39776]: EvalMesh1 (offset 236) */
+   /* _mesa_function_pool[39746]: EvalMesh1 (offset 236) */
    "iii\0"
    "glEvalMesh1\0"
    "\0"
-   /* _mesa_function_pool[39793]: DiscardFramebufferEXT (will be remapped) */
+   /* _mesa_function_pool[39763]: DiscardFramebufferEXT (will be remapped) */
    "iip\0"
    "glDiscardFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[39822]: Uniform2f (will be remapped) */
+   /* _mesa_function_pool[39792]: Uniform2f (will be remapped) */
    "iff\0"
    "glUniform2f\0"
    "glUniform2fARB\0"
    "\0"
-   /* _mesa_function_pool[39854]: ColorPointerEXT (will be remapped) */
+   /* _mesa_function_pool[39824]: ColorPointerEXT (will be remapped) */
    "iiiip\0"
    "glColorPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[39879]: LineWidth (offset 168) */
+   /* _mesa_function_pool[39849]: LineWidth (offset 168) */
    "f\0"
    "glLineWidth\0"
    "\0"
-   /* _mesa_function_pool[39894]: Uniform2i (will be remapped) */
+   /* _mesa_function_pool[39864]: Uniform2i (will be remapped) */
    "iii\0"
    "glUniform2i\0"
    "glUniform2iARB\0"
    "\0"
-   /* _mesa_function_pool[39926]: MultiDrawElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[39896]: MultiDrawElementsBaseVertex (will be remapped) */
    "ipipip\0"
    "glMultiDrawElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[39964]: Lightxv (will be remapped) */
+   /* _mesa_function_pool[39934]: Lightxv (will be remapped) */
    "iip\0"
    "glLightxvOES\0"
    "glLightxv\0"
    "\0"
-   /* _mesa_function_pool[39992]: DepthRangeIndexed (will be remapped) */
+   /* _mesa_function_pool[39962]: DepthRangeIndexed (will be remapped) */
    "idd\0"
    "glDepthRangeIndexed\0"
    "\0"
-   /* _mesa_function_pool[40017]: GetConvolutionParameterfv (offset 357) */
+   /* _mesa_function_pool[39987]: GetConvolutionParameterfv (offset 357) */
    "iip\0"
    "glGetConvolutionParameterfv\0"
    "glGetConvolutionParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[40081]: GetTexBumpParameterfvATI (will be remapped) */
+   /* _mesa_function_pool[40051]: GetTexBumpParameterfvATI (will be remapped) */
    "ip\0"
    "glGetTexBumpParameterfvATI\0"
    "\0"
-   /* _mesa_function_pool[40112]: ProgramNamedParameter4dNV (will be remapped) */
+   /* _mesa_function_pool[40082]: ProgramNamedParameter4dNV (will be remapped) */
    "iipdddd\0"
    "glProgramNamedParameter4dNV\0"
    "\0"
-   /* _mesa_function_pool[40149]: GetMaterialfv (offset 269) */
+   /* _mesa_function_pool[40119]: GetMaterialfv (offset 269) */
    "iip\0"
    "glGetMaterialfv\0"
    "\0"
-   /* _mesa_function_pool[40170]: TexImage3DMultisample (will be remapped) */
+   /* _mesa_function_pool[40140]: TexImage3DMultisample (will be remapped) */
    "iiiiiii\0"
    "glTexImage3DMultisample\0"
    "\0"
-   /* _mesa_function_pool[40203]: VertexAttrib1fvNV (will be remapped) */
+   /* _mesa_function_pool[40173]: VertexAttrib1fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1fvNV\0"
    "\0"
-   /* _mesa_function_pool[40227]: GetUniformBlockIndex (will be remapped) */
+   /* _mesa_function_pool[40197]: GetUniformBlockIndex (will be remapped) */
    "ip\0"
    "glGetUniformBlockIndex\0"
    "\0"
-   /* _mesa_function_pool[40254]: DetachShader (will be remapped) */
+   /* _mesa_function_pool[40224]: DetachShader (will be remapped) */
    "ii\0"
    "glDetachShader\0"
    "\0"
-   /* _mesa_function_pool[40273]: CopyTexSubImage2D (offset 326) */
+   /* _mesa_function_pool[40243]: CopyTexSubImage2D (offset 326) */
    "iiiiiiii\0"
    "glCopyTexSubImage2D\0"
    "glCopyTexSubImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[40326]: SampleCoverage (will be remapped) */
+   /* _mesa_function_pool[40296]: SampleCoverage (will be remapped) */
    "fi\0"
    "glSampleCoverage\0"
    "glSampleCoverageARB\0"
    "\0"
-   /* _mesa_function_pool[40367]: GetObjectParameterivARB (will be remapped) */
+   /* _mesa_function_pool[40337]: GetObjectParameterivARB (will be remapped) */
    "iip\0"
    "glGetObjectParameterivARB\0"
    "\0"
-   /* _mesa_function_pool[40398]: Color3iv (offset 16) */
+   /* _mesa_function_pool[40368]: Color3iv (offset 16) */
    "p\0"
    "glColor3iv\0"
    "\0"
-   /* _mesa_function_pool[40412]: DrawElements (offset 311) */
+   /* _mesa_function_pool[40382]: DrawElements (offset 311) */
    "iiip\0"
    "glDrawElements\0"
    "\0"
-   /* _mesa_function_pool[40433]: ScissorArrayv (will be remapped) */
+   /* _mesa_function_pool[40403]: ScissorArrayv (will be remapped) */
    "iip\0"
    "glScissorArrayv\0"
    "\0"
-   /* _mesa_function_pool[40454]: GetInternalformativ (will be remapped) */
+   /* _mesa_function_pool[40424]: GetInternalformativ (will be remapped) */
    "iiiip\0"
    "glGetInternalformativ\0"
    "\0"
-   /* _mesa_function_pool[40483]: EvalPoint2 (offset 239) */
+   /* _mesa_function_pool[40453]: EvalPoint2 (offset 239) */
    "ii\0"
    "glEvalPoint2\0"
    "\0"
-   /* _mesa_function_pool[40500]: EvalPoint1 (offset 237) */
+   /* _mesa_function_pool[40470]: EvalPoint1 (offset 237) */
    "i\0"
    "glEvalPoint1\0"
    "\0"
-   /* _mesa_function_pool[40516]: PopMatrix (offset 297) */
+   /* _mesa_function_pool[40486]: PopMatrix (offset 297) */
    "\0"
    "glPopMatrix\0"
    "\0"
-   /* _mesa_function_pool[40530]: FinishFenceNV (dynamic) */
+   /* _mesa_function_pool[40500]: FinishFenceNV (dynamic) */
    "i\0"
    "glFinishFenceNV\0"
    "\0"
-   /* _mesa_function_pool[40549]: Tangent3bvEXT (dynamic) */
+   /* _mesa_function_pool[40519]: Tangent3bvEXT (dynamic) */
    "p\0"
    "glTangent3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[40568]: GetTexGeniv (offset 280) */
+   /* _mesa_function_pool[40538]: GetTexGeniv (offset 280) */
    "iip\0"
    "glGetTexGeniv\0"
    "glGetTexGenivOES\0"
    "\0"
-   /* _mesa_function_pool[40604]: ActiveProgramEXT (will be remapped) */
+   /* _mesa_function_pool[40574]: ActiveProgramEXT (will be remapped) */
    "i\0"
    "glActiveProgramEXT\0"
    "\0"
-   /* _mesa_function_pool[40626]: PixelTransformParameterivEXT (dynamic) */
+   /* _mesa_function_pool[40596]: PixelTransformParameterivEXT (dynamic) */
    "iip\0"
    "glPixelTransformParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[40662]: TexCoord4fVertex4fvSUN (dynamic) */
+   /* _mesa_function_pool[40632]: TexCoord4fVertex4fvSUN (dynamic) */
    "pp\0"
    "glTexCoord4fVertex4fvSUN\0"
    "\0"
-   /* _mesa_function_pool[40691]: UnmapBuffer (will be remapped) */
+   /* _mesa_function_pool[40661]: UnmapBuffer (will be remapped) */
    "i\0"
    "glUnmapBuffer\0"
    "glUnmapBufferARB\0"
    "glUnmapBufferOES\0"
    "\0"
-   /* _mesa_function_pool[40742]: EvalCoord1d (offset 228) */
+   /* _mesa_function_pool[40712]: EvalCoord1d (offset 228) */
    "d\0"
    "glEvalCoord1d\0"
    "\0"
-   /* _mesa_function_pool[40759]: EvalCoord1f (offset 230) */
+   /* _mesa_function_pool[40729]: EvalCoord1f (offset 230) */
    "f\0"
    "glEvalCoord1f\0"
    "\0"
-   /* _mesa_function_pool[40776]: IndexMaterialEXT (dynamic) */
+   /* _mesa_function_pool[40746]: IndexMaterialEXT (dynamic) */
    "ii\0"
    "glIndexMaterialEXT\0"
    "\0"
-   /* _mesa_function_pool[40799]: Materialf (offset 169) */
+   /* _mesa_function_pool[40769]: Materialf (offset 169) */
    "iif\0"
    "glMaterialf\0"
    "\0"
-   /* _mesa_function_pool[40816]: VertexAttribs2dvNV (will be remapped) */
+   /* _mesa_function_pool[40786]: VertexAttribs2dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2dvNV\0"
    "\0"
-   /* _mesa_function_pool[40842]: ProgramUniform1uiv (will be remapped) */
+   /* _mesa_function_pool[40812]: ProgramUniform1uiv (will be remapped) */
    "iiip\0"
    "glProgramUniform1uiv\0"
    "\0"
-   /* _mesa_function_pool[40869]: EvalCoord1dv (offset 229) */
+   /* _mesa_function_pool[40839]: EvalCoord1dv (offset 229) */
    "p\0"
    "glEvalCoord1dv\0"
    "\0"
-   /* _mesa_function_pool[40887]: Materialx (will be remapped) */
+   /* _mesa_function_pool[40857]: Materialx (will be remapped) */
    "iii\0"
    "glMaterialxOES\0"
    "glMaterialx\0"
    "\0"
-   /* _mesa_function_pool[40919]: GetLightiv (offset 265) */
+   /* _mesa_function_pool[40889]: GetLightiv (offset 265) */
    "iip\0"
    "glGetLightiv\0"
    "\0"
-   /* _mesa_function_pool[40937]: BindBuffer (will be remapped) */
+   /* _mesa_function_pool[40907]: BindBuffer (will be remapped) */
    "ii\0"
    "glBindBuffer\0"
    "glBindBufferARB\0"
    "\0"
-   /* _mesa_function_pool[40970]: ProgramUniform1i (will be remapped) */
+   /* _mesa_function_pool[40940]: ProgramUniform1i (will be remapped) */
    "iii\0"
    "glProgramUniform1i\0"
    "\0"
-   /* _mesa_function_pool[40994]: ProgramUniform1f (will be remapped) */
+   /* _mesa_function_pool[40964]: ProgramUniform1f (will be remapped) */
    "iif\0"
    "glProgramUniform1f\0"
    "\0"
-   /* _mesa_function_pool[41018]: WindowPos3iv (will be remapped) */
+   /* _mesa_function_pool[40988]: WindowPos3iv (will be remapped) */
    "p\0"
    "glWindowPos3iv\0"
    "glWindowPos3ivARB\0"
    "glWindowPos3ivMESA\0"
    "\0"
-   /* _mesa_function_pool[41073]: CopyConvolutionFilter2D (offset 355) */
+   /* _mesa_function_pool[41043]: CopyConvolutionFilter2D (offset 355) */
    "iiiiii\0"
    "glCopyConvolutionFilter2D\0"
    "glCopyConvolutionFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[41136]: CopyBufferSubData (will be remapped) */
+   /* _mesa_function_pool[41106]: CopyBufferSubData (will be remapped) */
    "iiiii\0"
    "glCopyBufferSubData\0"
    "\0"
-   /* _mesa_function_pool[41163]: WeightfvARB (dynamic) */
+   /* _mesa_function_pool[41133]: WeightfvARB (dynamic) */
    "ip\0"
    "glWeightfvARB\0"
    "\0"
-   /* _mesa_function_pool[41181]: UniformMatrix3x4fv (will be remapped) */
+   /* _mesa_function_pool[41151]: UniformMatrix3x4fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3x4fv\0"
    "\0"
-   /* _mesa_function_pool[41208]: Recti (offset 90) */
+   /* _mesa_function_pool[41178]: Recti (offset 90) */
    "iiii\0"
    "glRecti\0"
    "\0"
-   /* _mesa_function_pool[41222]: VertexAttribI3ivEXT (will be remapped) */
+   /* _mesa_function_pool[41192]: VertexAttribI3ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI3ivEXT\0"
    "glVertexAttribI3iv\0"
    "\0"
-   /* _mesa_function_pool[41267]: DeleteSamplers (will be remapped) */
+   /* _mesa_function_pool[41237]: DeleteSamplers (will be remapped) */
    "ip\0"
    "glDeleteSamplers\0"
    "\0"
-   /* _mesa_function_pool[41288]: SamplerParameteri (will be remapped) */
+   /* _mesa_function_pool[41258]: SamplerParameteri (will be remapped) */
    "iii\0"
    "glSamplerParameteri\0"
    "\0"
-   /* _mesa_function_pool[41313]: Rectf (offset 88) */
+   /* _mesa_function_pool[41283]: Rectf (offset 88) */
    "ffff\0"
    "glRectf\0"
    "\0"
-   /* _mesa_function_pool[41327]: Rectd (offset 86) */
+   /* _mesa_function_pool[41297]: Rectd (offset 86) */
    "dddd\0"
    "glRectd\0"
    "\0"
-   /* _mesa_function_pool[41341]: SamplerParameterf (will be remapped) */
+   /* _mesa_function_pool[41311]: SamplerParameterf (will be remapped) */
    "iif\0"
    "glSamplerParameterf\0"
    "\0"
-   /* _mesa_function_pool[41366]: Rects (offset 92) */
+   /* _mesa_function_pool[41336]: Rects (offset 92) */
    "iiii\0"
    "glRects\0"
    "\0"
-   /* _mesa_function_pool[41380]: CombinerParameterfNV (dynamic) */
+   /* _mesa_function_pool[41350]: CombinerParameterfNV (dynamic) */
    "if\0"
    "glCombinerParameterfNV\0"
    "\0"
-   /* _mesa_function_pool[41407]: GetVertexAttribIiv (will be remapped) */
+   /* _mesa_function_pool[41377]: GetVertexAttribIiv (will be remapped) */
    "iip\0"
    "glGetVertexAttribIivEXT\0"
    "glGetVertexAttribIiv\0"
    "\0"
-   /* _mesa_function_pool[41457]: ClientWaitSync (will be remapped) */
+   /* _mesa_function_pool[41427]: ClientWaitSync (will be remapped) */
    "iii\0"
    "glClientWaitSync\0"
    "\0"
-   /* _mesa_function_pool[41479]: TexCoord4s (offset 124) */
+   /* _mesa_function_pool[41449]: TexCoord4s (offset 124) */
    "iiii\0"
    "glTexCoord4s\0"
    "\0"
-   /* _mesa_function_pool[41498]: TexEnvxv (will be remapped) */
+   /* _mesa_function_pool[41468]: TexEnvxv (will be remapped) */
    "iip\0"
    "glTexEnvxvOES\0"
    "glTexEnvxv\0"
    "\0"
-   /* _mesa_function_pool[41528]: TexCoord4i (offset 122) */
+   /* _mesa_function_pool[41498]: TexCoord4i (offset 122) */
    "iiii\0"
    "glTexCoord4i\0"
    "\0"
-   /* _mesa_function_pool[41547]: ObjectPurgeableAPPLE (will be remapped) */
+   /* _mesa_function_pool[41517]: ObjectPurgeableAPPLE (will be remapped) */
    "iii\0"
    "glObjectPurgeableAPPLE\0"
    "\0"
-   /* _mesa_function_pool[41575]: TexCoord4d (offset 118) */
+   /* _mesa_function_pool[41545]: TexCoord4d (offset 118) */
    "dddd\0"
    "glTexCoord4d\0"
    "\0"
-   /* _mesa_function_pool[41594]: TexCoord4f (offset 120) */
+   /* _mesa_function_pool[41564]: TexCoord4f (offset 120) */
    "ffff\0"
    "glTexCoord4f\0"
    "\0"
-   /* _mesa_function_pool[41613]: GetBooleanv (offset 258) */
+   /* _mesa_function_pool[41583]: GetBooleanv (offset 258) */
    "ip\0"
    "glGetBooleanv\0"
    "\0"
-   /* _mesa_function_pool[41631]: IsAsyncMarkerSGIX (dynamic) */
+   /* _mesa_function_pool[41601]: IsAsyncMarkerSGIX (dynamic) */
    "i\0"
    "glIsAsyncMarkerSGIX\0"
    "\0"
-   /* _mesa_function_pool[41654]: LockArraysEXT (will be remapped) */
+   /* _mesa_function_pool[41624]: LockArraysEXT (will be remapped) */
    "ii\0"
    "glLockArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[41674]: GetActiveUniformBlockiv (will be remapped) */
+   /* _mesa_function_pool[41644]: GetActiveUniformBlockiv (will be remapped) */
    "iiip\0"
    "glGetActiveUniformBlockiv\0"
    "\0"
-   /* _mesa_function_pool[41706]: GetPerfMonitorCountersAMD (will be remapped) */
+   /* _mesa_function_pool[41676]: GetPerfMonitorCountersAMD (will be remapped) */
    "ippip\0"
    "glGetPerfMonitorCountersAMD\0"
    "\0"
-   /* _mesa_function_pool[41741]: ObjectPtrLabel (will be remapped) */
+   /* _mesa_function_pool[41711]: ObjectPtrLabel (will be remapped) */
    "pip\0"
    "glObjectPtrLabel\0"
    "\0"
-   /* _mesa_function_pool[41763]: Rectfv (offset 89) */
+   /* _mesa_function_pool[41733]: Rectfv (offset 89) */
    "pp\0"
    "glRectfv\0"
    "\0"
-   /* _mesa_function_pool[41776]: BindImageTexture (will be remapped) */
+   /* _mesa_function_pool[41746]: BindImageTexture (will be remapped) */
    "iiiiiii\0"
    "glBindImageTexture\0"
    "\0"
-   /* _mesa_function_pool[41804]: ClearDepthf (will be remapped) */
+   /* _mesa_function_pool[41774]: ClearDepthf (will be remapped) */
    "f\0"
    "glClearDepthf\0"
    "glClearDepthfOES\0"
    "\0"
-   /* _mesa_function_pool[41838]: VertexP4uiv (will be remapped) */
+   /* _mesa_function_pool[41808]: VertexP4uiv (will be remapped) */
    "ip\0"
    "glVertexP4uiv\0"
    "\0"
-   /* _mesa_function_pool[41856]: MinSampleShading (will be remapped) */
+   /* _mesa_function_pool[41826]: MinSampleShading (will be remapped) */
    "f\0"
    "glMinSampleShadingARB\0"
    "glMinSampleShading\0"
    "\0"
-   /* _mesa_function_pool[41900]: GetRenderbufferParameteriv (will be remapped) */
+   /* _mesa_function_pool[41870]: GetRenderbufferParameteriv (will be remapped) */
    "iip\0"
    "glGetRenderbufferParameteriv\0"
    "glGetRenderbufferParameterivEXT\0"
    "glGetRenderbufferParameterivOES\0"
    "\0"
-   /* _mesa_function_pool[41998]: EdgeFlagPointerListIBM (dynamic) */
+   /* _mesa_function_pool[41968]: EdgeFlagPointerListIBM (dynamic) */
    "ipi\0"
    "glEdgeFlagPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[42028]: WindowPos2sv (will be remapped) */
+   /* _mesa_function_pool[41998]: WindowPos2sv (will be remapped) */
    "p\0"
    "glWindowPos2sv\0"
    "glWindowPos2svARB\0"
    "glWindowPos2svMESA\0"
    "\0"
-   /* _mesa_function_pool[42083]: VertexArrayRangeNV (dynamic) */
+   /* _mesa_function_pool[42053]: VertexArrayRangeNV (dynamic) */
    "ip\0"
    "glVertexArrayRangeNV\0"
    "\0"
-   /* _mesa_function_pool[42108]: GetPerfMonitorCounterStringAMD (will be remapped) */
+   /* _mesa_function_pool[42078]: GetPerfMonitorCounterStringAMD (will be remapped) */
    "iiipp\0"
    "glGetPerfMonitorCounterStringAMD\0"
    "\0"
-   /* _mesa_function_pool[42148]: EndFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[42118]: EndFragmentShaderATI (will be remapped) */
    "\0"
    "glEndFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[42173]: Uniform4iv (will be remapped) */
+   /* _mesa_function_pool[42143]: Uniform4iv (will be remapped) */
    "iip\0"
    "glUniform4iv\0"
    "glUniform4ivARB\0"
@@ -5988,828 +5976,824 @@ static const char _mesa_function_pool[] =
 
 /* these functions need to be remapped */
 static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
-   { 17150, CompressedTexImage1D_remap_index },
-   { 14764, CompressedTexImage2D_remap_index },
-   { 10802, CompressedTexImage3D_remap_index },
-   { 27365, CompressedTexSubImage1D_remap_index },
-   { 32998, CompressedTexSubImage2D_remap_index },
-   {  5573, CompressedTexSubImage3D_remap_index },
-   {  3741, GetCompressedTexImage_remap_index },
-   { 16406, LoadTransposeMatrixd_remap_index },
-   { 16354, LoadTransposeMatrixf_remap_index },
-   { 30646, MultTransposeMatrixd_remap_index },
-   { 12086, MultTransposeMatrixf_remap_index },
-   { 40326, SampleCoverage_remap_index },
-   {  3042, BlendFuncSeparate_remap_index },
-   { 19856, FogCoordPointer_remap_index },
-   { 36526, FogCoordd_remap_index },
-   { 36302, FogCoorddv_remap_index },
-   { 29764, MultiDrawArrays_remap_index },
-   { 28209, PointParameterf_remap_index },
-   {  4283, PointParameterfv_remap_index },
-   { 28167, PointParameteri_remap_index },
-   {  7778, PointParameteriv_remap_index },
-   {  4705, SecondaryColor3b_remap_index },
-   { 36117, SecondaryColor3bv_remap_index },
-   { 30784, SecondaryColor3d_remap_index },
-   { 10935, SecondaryColor3dv_remap_index },
-   {  4801, SecondaryColor3i_remap_index },
-   { 26596, SecondaryColor3iv_remap_index },
-   {  4581, SecondaryColor3s_remap_index },
-   { 14074, SecondaryColor3sv_remap_index },
-   { 20009, SecondaryColor3ub_remap_index },
-   {  6466, SecondaryColor3ubv_remap_index },
-   { 20057, SecondaryColor3ui_remap_index },
-   { 21910, SecondaryColor3uiv_remap_index },
-   { 19900, SecondaryColor3us_remap_index },
-   {  8701, SecondaryColor3usv_remap_index },
-   { 31809, SecondaryColorPointer_remap_index },
-   { 10560, WindowPos2d_remap_index },
-   { 15446, WindowPos2dv_remap_index },
-   { 10507, WindowPos2f_remap_index },
-   { 21296, WindowPos2fv_remap_index },
-   { 10613, WindowPos2i_remap_index },
-   {  5827, WindowPos2iv_remap_index },
-   { 10666, WindowPos2s_remap_index },
-   { 42028, WindowPos2sv_remap_index },
-   { 14321, WindowPos3d_remap_index },
-   { 13842, WindowPos3dv_remap_index },
-   { 14408, WindowPos3f_remap_index },
-   {  7637, WindowPos3fv_remap_index },
-   { 14517, WindowPos3i_remap_index },
-   { 41018, WindowPos3iv_remap_index },
-   { 14633, WindowPos3s_remap_index },
-   { 22633, WindowPos3sv_remap_index },
-   {  5709, BeginQuery_remap_index },
-   { 40937, BindBuffer_remap_index },
-   { 34977, BufferData_remap_index },
-   {  9175, BufferSubData_remap_index },
-   { 28480, DeleteBuffers_remap_index },
-   { 20303, DeleteQueries_remap_index },
-   { 17973, EndQuery_remap_index },
-   { 38469, GenBuffers_remap_index },
+   { 17161, CompressedTexImage1D_remap_index },
+   { 14749, CompressedTexImage2D_remap_index },
+   { 10763, CompressedTexImage3D_remap_index },
+   { 27310, CompressedTexSubImage1D_remap_index },
+   { 32968, CompressedTexSubImage2D_remap_index },
+   {  5540, CompressedTexSubImage3D_remap_index },
+   {  3708, GetCompressedTexImage_remap_index },
+   { 16417, LoadTransposeMatrixd_remap_index },
+   { 16365, LoadTransposeMatrixf_remap_index },
+   { 30616, MultTransposeMatrixd_remap_index },
+   { 12047, MultTransposeMatrixf_remap_index },
+   { 40296, SampleCoverage_remap_index },
+   {  3009, BlendFuncSeparate_remap_index },
+   { 19867, FogCoordPointer_remap_index },
+   { 36496, FogCoordd_remap_index },
+   { 36272, FogCoorddv_remap_index },
+   { 29709, MultiDrawArrays_remap_index },
+   { 28154, PointParameterf_remap_index },
+   {  4250, PointParameterfv_remap_index },
+   { 28112, PointParameteri_remap_index },
+   {  7769, PointParameteriv_remap_index },
+   {  4672, SecondaryColor3b_remap_index },
+   { 36087, SecondaryColor3bv_remap_index },
+   { 30754, SecondaryColor3d_remap_index },
+   { 10896, SecondaryColor3dv_remap_index },
+   {  4768, SecondaryColor3i_remap_index },
+   { 26541, SecondaryColor3iv_remap_index },
+   {  4548, SecondaryColor3s_remap_index },
+   { 14035, SecondaryColor3sv_remap_index },
+   { 20020, SecondaryColor3ub_remap_index },
+   {  6433, SecondaryColor3ubv_remap_index },
+   { 20068, SecondaryColor3ui_remap_index },
+   { 21887, SecondaryColor3uiv_remap_index },
+   { 19911, SecondaryColor3us_remap_index },
+   {  8692, SecondaryColor3usv_remap_index },
+   { 31779, SecondaryColorPointer_remap_index },
+   { 10521, WindowPos2d_remap_index },
+   { 15457, WindowPos2dv_remap_index },
+   { 10468, WindowPos2f_remap_index },
+   { 21273, WindowPos2fv_remap_index },
+   { 10574, WindowPos2i_remap_index },
+   {  5794, WindowPos2iv_remap_index },
+   { 10627, WindowPos2s_remap_index },
+   { 41998, WindowPos2sv_remap_index },
+   { 14282, WindowPos3d_remap_index },
+   { 13803, WindowPos3dv_remap_index },
+   { 14369, WindowPos3f_remap_index },
+   {  7628, WindowPos3fv_remap_index },
+   { 14478, WindowPos3i_remap_index },
+   { 40988, WindowPos3iv_remap_index },
+   { 14594, WindowPos3s_remap_index },
+   { 22610, WindowPos3sv_remap_index },
+   {  5676, BeginQuery_remap_index },
+   { 40907, BindBuffer_remap_index },
+   { 34947, BufferData_remap_index },
+   {  9166, BufferSubData_remap_index },
+   { 28425, DeleteBuffers_remap_index },
+   { 20314, DeleteQueries_remap_index },
+   { 17984, EndQuery_remap_index },
+   { 38439, GenBuffers_remap_index },
    {  1755, GenQueries_remap_index },
-   { 26064, GetBufferParameteriv_remap_index },
-   { 38334, GetBufferPointerv_remap_index },
-   { 28519, GetBufferSubData_remap_index },
-   {  7347, GetQueryObjectiv_remap_index },
-   {  7047, GetQueryObjectuiv_remap_index },
-   { 11128, GetQueryiv_remap_index },
-   { 16840, IsBuffer_remap_index },
-   { 26343, IsQuery_remap_index },
-   { 11239, MapBuffer_remap_index },
-   { 40691, UnmapBuffer_remap_index },
+   { 26041, GetBufferParameteriv_remap_index },
+   { 38304, GetBufferPointerv_remap_index },
+   { 28464, GetBufferSubData_remap_index },
+   {  7338, GetQueryObjectiv_remap_index },
+   {  7038, GetQueryObjectuiv_remap_index },
+   { 11089, GetQueryiv_remap_index },
+   { 16851, IsBuffer_remap_index },
+   { 26288, IsQuery_remap_index },
+   { 11200, MapBuffer_remap_index },
+   { 40661, UnmapBuffer_remap_index },
    {   315, AttachShader_remap_index },
-   { 33466, BindAttribLocation_remap_index },
-   { 38536, BlendEquationSeparate_remap_index },
-   { 29463, CompileShader_remap_index },
-   { 22928, CreateProgram_remap_index },
-   { 28395, CreateShader_remap_index },
-   { 18770, DeleteProgram_remap_index },
-   { 29445, DeleteShader_remap_index },
-   { 40254, DetachShader_remap_index },
-   { 31513, DisableVertexAttribArray_remap_index },
-   { 21094, DrawBuffers_remap_index },
-   { 38761, EnableVertexAttribArray_remap_index },
-   { 34119, GetActiveAttrib_remap_index },
-   { 39187, GetActiveUniform_remap_index },
-   { 15993, GetAttachedShaders_remap_index },
-   { 25061, GetAttribLocation_remap_index },
-   { 10217, GetProgramInfoLog_remap_index },
-   { 20830, GetProgramiv_remap_index },
-   {  3507, GetShaderInfoLog_remap_index },
-   {  6769, GetShaderSource_remap_index },
-   { 15754, GetShaderiv_remap_index },
-   {  5760, GetUniformLocation_remap_index },
-   { 12239, GetUniformfv_remap_index },
+   { 33436, BindAttribLocation_remap_index },
+   { 38506, BlendEquationSeparate_remap_index },
+   { 29408, CompileShader_remap_index },
+   { 22905, CreateProgram_remap_index },
+   { 28340, CreateShader_remap_index },
+   { 18781, DeleteProgram_remap_index },
+   { 29390, DeleteShader_remap_index },
+   { 40224, DetachShader_remap_index },
+   { 31483, DisableVertexAttribArray_remap_index },
+   { 21071, DrawBuffers_remap_index },
+   { 38731, EnableVertexAttribArray_remap_index },
+   { 34089, GetActiveAttrib_remap_index },
+   { 39157, GetActiveUniform_remap_index },
+   { 16004, GetAttachedShaders_remap_index },
+   { 25038, GetAttribLocation_remap_index },
+   { 10208, GetProgramInfoLog_remap_index },
+   { 20841, GetProgramiv_remap_index },
+   {  3474, GetShaderInfoLog_remap_index },
+   {  6760, GetShaderSource_remap_index },
+   { 15765, GetShaderiv_remap_index },
+   {  5727, GetUniformLocation_remap_index },
+   { 12200, GetUniformfv_remap_index },
    {  1991, GetUniformiv_remap_index },
-   { 32177, GetVertexAttribPointerv_remap_index },
-   { 38286, GetVertexAttribdv_remap_index },
-   { 32759, GetVertexAttribfv_remap_index },
-   { 35151, GetVertexAttribiv_remap_index },
-   {  3927, IsProgram_remap_index },
-   { 35698, IsShader_remap_index },
-   { 26789, LinkProgram_remap_index },
-   { 34794, ShaderSource_remap_index },
-   { 34766, StencilFuncSeparate_remap_index },
-   { 33081, StencilMaskSeparate_remap_index },
-   { 34263, StencilOpSeparate_remap_index },
-   { 37618, Uniform1f_remap_index },
-   {  7523, Uniform1fv_remap_index },
-   { 37678, Uniform1i_remap_index },
-   { 17021, Uniform1iv_remap_index },
-   { 39822, Uniform2f_remap_index },
-   { 21030, Uniform2fv_remap_index },
-   { 39894, Uniform2i_remap_index },
-   { 19012, Uniform2iv_remap_index },
+   { 32147, GetVertexAttribPointerv_remap_index },
+   { 38256, GetVertexAttribdv_remap_index },
+   { 32729, GetVertexAttribfv_remap_index },
+   { 35121, GetVertexAttribiv_remap_index },
+   {  3894, IsProgram_remap_index },
+   { 35668, IsShader_remap_index },
+   { 26734, LinkProgram_remap_index },
+   { 34764, ShaderSource_remap_index },
+   { 34736, StencilFuncSeparate_remap_index },
+   { 33051, StencilMaskSeparate_remap_index },
+   { 34233, StencilOpSeparate_remap_index },
+   { 37588, Uniform1f_remap_index },
+   {  7514, Uniform1fv_remap_index },
+   { 37648, Uniform1i_remap_index },
+   { 17032, Uniform1iv_remap_index },
+   { 39792, Uniform2f_remap_index },
+   { 21007, Uniform2fv_remap_index },
+   { 39864, Uniform2i_remap_index },
+   { 19023, Uniform2iv_remap_index },
    {   858, Uniform3f_remap_index },
-   { 35263, Uniform3fv_remap_index },
+   { 35233, Uniform3fv_remap_index },
    {   771, Uniform3i_remap_index },
-   { 36556, Uniform3iv_remap_index },
-   {  4197, Uniform4f_remap_index },
-   {  8189, Uniform4fv_remap_index },
-   {  4134, Uniform4i_remap_index },
-   { 42173, Uniform4iv_remap_index },
-   {  9281, UniformMatrix2fv_remap_index },
-   { 21644, UniformMatrix3fv_remap_index },
-   {  9750, UniformMatrix4fv_remap_index },
-   { 37771, UseProgram_remap_index },
-   { 23046, ValidateProgram_remap_index },
-   { 17109, VertexAttrib1d_remap_index },
-   { 35621, VertexAttrib1dv_remap_index },
-   { 17232, VertexAttrib1s_remap_index },
-   { 32607, VertexAttrib1sv_remap_index },
-   {  7481, VertexAttrib2d_remap_index },
-   { 22384, VertexAttrib2dv_remap_index },
-   {  7393, VertexAttrib2s_remap_index },
-   { 13491, VertexAttrib2sv_remap_index },
-   { 11162, VertexAttrib3d_remap_index },
-   { 20954, VertexAttrib3dv_remap_index },
-   { 11037, VertexAttrib3s_remap_index },
-   { 37466, VertexAttrib3sv_remap_index },
-   { 11285, VertexAttrib4Nbv_remap_index },
-   { 26685, VertexAttrib4Niv_remap_index },
-   { 19315, VertexAttrib4Nsv_remap_index },
+   { 36526, Uniform3iv_remap_index },
+   {  4164, Uniform4f_remap_index },
+   {  8180, Uniform4fv_remap_index },
+   {  4101, Uniform4i_remap_index },
+   { 42143, Uniform4iv_remap_index },
+   {  9272, UniformMatrix2fv_remap_index },
+   { 21621, UniformMatrix3fv_remap_index },
+   {  9741, UniformMatrix4fv_remap_index },
+   { 37741, UseProgram_remap_index },
+   { 23023, ValidateProgram_remap_index },
+   { 17120, VertexAttrib1d_remap_index },
+   { 35591, VertexAttrib1dv_remap_index },
+   { 17243, VertexAttrib1s_remap_index },
+   { 32577, VertexAttrib1sv_remap_index },
+   {  7472, VertexAttrib2d_remap_index },
+   { 22361, VertexAttrib2dv_remap_index },
+   {  7384, VertexAttrib2s_remap_index },
+   { 13452, VertexAttrib2sv_remap_index },
+   { 11123, VertexAttrib3d_remap_index },
+   { 20931, VertexAttrib3dv_remap_index },
+   { 10998, VertexAttrib3s_remap_index },
+   { 37436, VertexAttrib3sv_remap_index },
+   { 11246, VertexAttrib4Nbv_remap_index },
+   { 26630, VertexAttrib4Niv_remap_index },
+   { 19326, VertexAttrib4Nsv_remap_index },
    {  1408, VertexAttrib4Nub_remap_index },
-   { 31070, VertexAttrib4Nubv_remap_index },
-   {  9824, VertexAttrib4Nuiv_remap_index },
-   { 33348, VertexAttrib4Nusv_remap_index },
-   {  8631, VertexAttrib4bv_remap_index },
-   { 26904, VertexAttrib4d_remap_index },
-   { 27281, VertexAttrib4dv_remap_index },
-   { 36668, VertexAttrib4iv_remap_index },
-   { 26972, VertexAttrib4s_remap_index },
-   { 18073, VertexAttrib4sv_remap_index },
-   {  9510, VertexAttrib4ubv_remap_index },
-   { 19270, VertexAttrib4uiv_remap_index },
+   { 31040, VertexAttrib4Nubv_remap_index },
+   {  9815, VertexAttrib4Nuiv_remap_index },
+   { 33318, VertexAttrib4Nusv_remap_index },
+   {  8622, VertexAttrib4bv_remap_index },
+   { 26849, VertexAttrib4d_remap_index },
+   { 27226, VertexAttrib4dv_remap_index },
+   { 36638, VertexAttrib4iv_remap_index },
+   { 26917, VertexAttrib4s_remap_index },
+   { 18084, VertexAttrib4sv_remap_index },
+   {  9501, VertexAttrib4ubv_remap_index },
+   { 19281, VertexAttrib4uiv_remap_index },
    {  1334, VertexAttrib4usv_remap_index },
-   { 31155, VertexAttribPointer_remap_index },
-   { 28007, UniformMatrix2x3fv_remap_index },
+   { 31125, VertexAttribPointer_remap_index },
+   { 27952, UniformMatrix2x3fv_remap_index },
    {   891, UniformMatrix2x4fv_remap_index },
-   {  9797, UniformMatrix3x2fv_remap_index },
-   { 41181, UniformMatrix3x4fv_remap_index },
-   { 37013, UniformMatrix4x2fv_remap_index },
-   { 11080, UniformMatrix4x3fv_remap_index },
-   { 15660, BeginConditionalRender_remap_index },
-   { 23130, BeginTransformFeedback_remap_index },
-   { 11961, BindBufferBase_remap_index },
-   {  7266, BindBufferRange_remap_index },
-   { 21428, BindFragDataLocation_remap_index },
-   { 22492, ClampColor_remap_index },
-   { 16020, ClearBufferfi_remap_index },
-   { 15869, ClearBufferfv_remap_index },
-   { 19738, ClearBufferiv_remap_index },
-   { 36380, ClearBufferuiv_remap_index },
-   { 12541, ColorMaski_remap_index },
-   { 35742, Disablei_remap_index },
-   { 14375, Enablei_remap_index },
-   { 21958, EndConditionalRender_remap_index },
-   { 18589, EndTransformFeedback_remap_index },
-   { 11473, GetBooleani_v_remap_index },
-   { 37869, GetFragDataLocation_remap_index },
-   { 19759, GetIntegeri_v_remap_index },
-   { 27264, GetStringi_remap_index },
-   { 28978, GetTexParameterIiv_remap_index },
-   { 12737, GetTexParameterIuiv_remap_index },
-   { 29192, GetTransformFeedbackVarying_remap_index },
-   { 34564, GetUniformuiv_remap_index },
-   { 41407, GetVertexAttribIiv_remap_index },
-   { 19570, GetVertexAttribIuiv_remap_index },
-   { 32092, IsEnabledi_remap_index },
-   { 18828, TexParameterIiv_remap_index },
-   { 15501, TexParameterIuiv_remap_index },
-   { 37401, TransformFeedbackVaryings_remap_index },
-   {  5196, Uniform1ui_remap_index },
-   { 24501, Uniform1uiv_remap_index },
-   { 23950, Uniform2ui_remap_index },
-   { 12583, Uniform2uiv_remap_index },
-   { 31407, Uniform3ui_remap_index },
-   { 18132, Uniform3uiv_remap_index },
-   { 11396, Uniform4ui_remap_index },
-   { 17055, Uniform4uiv_remap_index },
-   { 33694, VertexAttribI1iv_remap_index },
-   { 10888, VertexAttribI1uiv_remap_index },
-   {  7095, VertexAttribI4bv_remap_index },
-   {  9661, VertexAttribI4sv_remap_index },
-   {  7989, VertexAttribI4ubv_remap_index },
-   {  6608, VertexAttribI4usv_remap_index },
-   { 38705, VertexAttribIPointer_remap_index },
-   {  7936, PrimitiveRestartIndex_remap_index },
-   { 32279, TexBuffer_remap_index },
+   {  9788, UniformMatrix3x2fv_remap_index },
+   { 41151, UniformMatrix3x4fv_remap_index },
+   { 36983, UniformMatrix4x2fv_remap_index },
+   { 11041, UniformMatrix4x3fv_remap_index },
+   { 15671, BeginConditionalRender_remap_index },
+   { 23107, BeginTransformFeedback_remap_index },
+   { 11922, BindBufferBase_remap_index },
+   {  7257, BindBufferRange_remap_index },
+   { 21405, BindFragDataLocation_remap_index },
+   { 22469, ClampColor_remap_index },
+   { 16031, ClearBufferfi_remap_index },
+   { 15880, ClearBufferfv_remap_index },
+   { 19749, ClearBufferiv_remap_index },
+   { 36350, ClearBufferuiv_remap_index },
+   { 12502, ColorMaski_remap_index },
+   { 35712, Disablei_remap_index },
+   { 14336, Enablei_remap_index },
+   { 21935, EndConditionalRender_remap_index },
+   { 18600, EndTransformFeedback_remap_index },
+   { 11434, GetBooleani_v_remap_index },
+   { 37839, GetFragDataLocation_remap_index },
+   { 19770, GetIntegeri_v_remap_index },
+   { 27209, GetStringi_remap_index },
+   { 28923, GetTexParameterIiv_remap_index },
+   { 12698, GetTexParameterIuiv_remap_index },
+   { 29137, GetTransformFeedbackVarying_remap_index },
+   { 34534, GetUniformuiv_remap_index },
+   { 41377, GetVertexAttribIiv_remap_index },
+   { 19581, GetVertexAttribIuiv_remap_index },
+   { 32062, IsEnabledi_remap_index },
+   { 18839, TexParameterIiv_remap_index },
+   { 15512, TexParameterIuiv_remap_index },
+   { 37371, TransformFeedbackVaryings_remap_index },
+   {  5163, Uniform1ui_remap_index },
+   { 24478, Uniform1uiv_remap_index },
+   { 23927, Uniform2ui_remap_index },
+   { 12544, Uniform2uiv_remap_index },
+   { 31377, Uniform3ui_remap_index },
+   { 18143, Uniform3uiv_remap_index },
+   { 11357, Uniform4ui_remap_index },
+   { 17066, Uniform4uiv_remap_index },
+   { 33664, VertexAttribI1iv_remap_index },
+   { 10849, VertexAttribI1uiv_remap_index },
+   {  7086, VertexAttribI4bv_remap_index },
+   {  9652, VertexAttribI4sv_remap_index },
+   {  7980, VertexAttribI4ubv_remap_index },
+   {  6599, VertexAttribI4usv_remap_index },
+   { 38675, VertexAttribIPointer_remap_index },
+   {  7927, PrimitiveRestartIndex_remap_index },
+   { 32249, TexBuffer_remap_index },
    {   111, FramebufferTexture_remap_index },
-   { 22898, GetBufferParameteri64v_remap_index },
-   { 38037, GetInteger64i_v_remap_index },
-   { 39019, VertexAttribDivisor_remap_index },
-   { 41856, MinSampleShading_remap_index },
-   {  6814, BindProgramARB_remap_index },
-   { 29630, DeleteProgramsARB_remap_index },
-   { 14462, GenProgramsARB_remap_index },
-   { 13534, GetProgramEnvParameterdvARB_remap_index },
-   { 28445, GetProgramEnvParameterfvARB_remap_index },
-   { 29809, GetProgramLocalParameterdvARB_remap_index },
-   { 35963, GetProgramLocalParameterfvARB_remap_index },
-   { 21573, GetProgramStringARB_remap_index },
-   {  7822, GetProgramivARB_remap_index },
-   { 30080, IsProgramARB_remap_index },
-   { 16474, ProgramEnvParameter4dARB_remap_index },
+   { 22875, GetBufferParameteri64v_remap_index },
+   { 38007, GetInteger64i_v_remap_index },
+   { 38989, VertexAttribDivisor_remap_index },
+   { 41826, MinSampleShading_remap_index },
+   {  6805, BindProgramARB_remap_index },
+   { 29575, DeleteProgramsARB_remap_index },
+   { 14423, GenProgramsARB_remap_index },
+   { 13495, GetProgramEnvParameterdvARB_remap_index },
+   { 28390, GetProgramEnvParameterfvARB_remap_index },
+   { 29754, GetProgramLocalParameterdvARB_remap_index },
+   { 35933, GetProgramLocalParameterfvARB_remap_index },
+   { 21550, GetProgramStringARB_remap_index },
+   {  7813, GetProgramivARB_remap_index },
+   { 30025, IsProgramARB_remap_index },
+   { 16485, ProgramEnvParameter4dARB_remap_index },
    {  2502, ProgramEnvParameter4dvARB_remap_index },
-   { 37169, ProgramEnvParameter4fARB_remap_index },
-   { 23635, ProgramEnvParameter4fvARB_remap_index },
-   { 22008, ProgramLocalParameter4dARB_remap_index },
-   {  3797, ProgramLocalParameter4dvARB_remap_index },
-   { 29361, ProgramLocalParameter4fARB_remap_index },
-   { 18391, ProgramLocalParameter4fvARB_remap_index },
-   { 30152, ProgramStringARB_remap_index },
-   { 11432, VertexAttrib1fARB_remap_index },
-   { 30550, VertexAttrib1fvARB_remap_index },
-   { 21254, VertexAttrib2fARB_remap_index },
-   { 12834, VertexAttrib2fvARB_remap_index },
+   { 37139, ProgramEnvParameter4fARB_remap_index },
+   { 23612, ProgramEnvParameter4fvARB_remap_index },
+   { 21985, ProgramLocalParameter4dARB_remap_index },
+   {  3764, ProgramLocalParameter4dvARB_remap_index },
+   { 29306, ProgramLocalParameter4fARB_remap_index },
+   { 18402, ProgramLocalParameter4fvARB_remap_index },
+   { 30097, ProgramStringARB_remap_index },
+   { 11393, VertexAttrib1fARB_remap_index },
+   { 30520, VertexAttrib1fvARB_remap_index },
+   { 21231, VertexAttrib2fARB_remap_index },
+   { 12795, VertexAttrib2fvARB_remap_index },
    {   334, VertexAttrib3fARB_remap_index },
-   { 25353, VertexAttrib3fvARB_remap_index },
-   { 24235, VertexAttrib4fARB_remap_index },
-   { 13799, VertexAttrib4fvARB_remap_index },
-   { 34351, AttachObjectARB_remap_index },
-   { 21617, CreateProgramObjectARB_remap_index },
-   { 15918, CreateShaderObjectARB_remap_index },
-   { 14823, DeleteObjectARB_remap_index },
-   { 36808, DetachObjectARB_remap_index },
-   { 34690, GetAttachedObjectsARB_remap_index },
-   { 23840, GetHandleARB_remap_index },
-   { 19687, GetInfoLogARB_remap_index },
-   { 20469, GetObjectParameterfvARB_remap_index },
-   { 40367, GetObjectParameterivARB_remap_index },
-   {  5308, DrawArraysInstancedARB_remap_index },
-   {  6962, DrawElementsInstancedARB_remap_index },
-   { 13297, BindFramebuffer_remap_index },
-   {  7845, BindRenderbuffer_remap_index },
-   { 32465, BlitFramebuffer_remap_index },
-   {  6031, CheckFramebufferStatus_remap_index },
-   { 19171, DeleteFramebuffers_remap_index },
-   { 35545, DeleteRenderbuffers_remap_index },
-   { 29990, FramebufferRenderbuffer_remap_index },
-   { 32516, FramebufferTexture1D_remap_index },
-   { 22273, FramebufferTexture2D_remap_index },
-   { 25950, FramebufferTexture3D_remap_index },
-   { 35806, FramebufferTextureLayer_remap_index },
-   { 38405, GenFramebuffers_remap_index },
-   { 31971, GenRenderbuffers_remap_index },
-   {  7206, GenerateMipmap_remap_index },
-   {  5004, GetFramebufferAttachmentParameteriv_remap_index },
-   { 41900, GetRenderbufferParameteriv_remap_index },
-   {  6195, IsFramebuffer_remap_index },
-   { 24583, IsRenderbuffer_remap_index },
+   { 25330, VertexAttrib3fvARB_remap_index },
+   { 24212, VertexAttrib4fARB_remap_index },
+   { 13760, VertexAttrib4fvARB_remap_index },
+   { 34321, AttachObjectARB_remap_index },
+   { 21594, CreateProgramObjectARB_remap_index },
+   { 15929, CreateShaderObjectARB_remap_index },
+   { 14808, DeleteObjectARB_remap_index },
+   { 36778, DetachObjectARB_remap_index },
+   { 34660, GetAttachedObjectsARB_remap_index },
+   { 23817, GetHandleARB_remap_index },
+   { 19698, GetInfoLogARB_remap_index },
+   { 20480, GetObjectParameterfvARB_remap_index },
+   { 40337, GetObjectParameterivARB_remap_index },
+   {  5275, DrawArraysInstancedARB_remap_index },
+   {  6953, DrawElementsInstancedARB_remap_index },
+   { 13258, BindFramebuffer_remap_index },
+   {  7836, BindRenderbuffer_remap_index },
+   { 32435, BlitFramebuffer_remap_index },
+   {  5998, CheckFramebufferStatus_remap_index },
+   { 19182, DeleteFramebuffers_remap_index },
+   { 35515, DeleteRenderbuffers_remap_index },
+   { 29935, FramebufferRenderbuffer_remap_index },
+   { 32486, FramebufferTexture1D_remap_index },
+   { 22250, FramebufferTexture2D_remap_index },
+   { 25927, FramebufferTexture3D_remap_index },
+   { 35776, FramebufferTextureLayer_remap_index },
+   { 38375, GenFramebuffers_remap_index },
+   { 31941, GenRenderbuffers_remap_index },
+   {  7197, GenerateMipmap_remap_index },
+   {  4971, GetFramebufferAttachmentParameteriv_remap_index },
+   { 41870, GetRenderbufferParameteriv_remap_index },
+   {  6162, IsFramebuffer_remap_index },
+   { 24560, IsRenderbuffer_remap_index },
    {   629, RenderbufferStorage_remap_index },
-   { 14245, RenderbufferStorageMultisample_remap_index },
-   { 18323, FramebufferTextureFaceARB_remap_index },
-   {  4931, FlushMappedBufferRange_remap_index },
-   { 29846, MapBufferRange_remap_index },
-   { 12676, BindVertexArray_remap_index },
+   { 14206, RenderbufferStorageMultisample_remap_index },
+   { 18334, FramebufferTextureFaceARB_remap_index },
+   {  4898, FlushMappedBufferRange_remap_index },
+   { 29791, MapBufferRange_remap_index },
+   { 12637, BindVertexArray_remap_index },
    {  1102, DeleteVertexArrays_remap_index },
-   { 16748, GenVertexArrays_remap_index },
-   { 37509, IsVertexArray_remap_index },
-   { 12456, GetActiveUniformBlockName_remap_index },
-   { 41674, GetActiveUniformBlockiv_remap_index },
+   { 16759, GenVertexArrays_remap_index },
+   { 37479, IsVertexArray_remap_index },
+   { 12417, GetActiveUniformBlockName_remap_index },
+   { 41644, GetActiveUniformBlockiv_remap_index },
    {  2928, GetActiveUniformName_remap_index },
-   { 13462, GetActiveUniformsiv_remap_index },
-   { 40227, GetUniformBlockIndex_remap_index },
-   {  9921, GetUniformIndices_remap_index },
-   { 33305, UniformBlockBinding_remap_index },
-   { 41136, CopyBufferSubData_remap_index },
-   { 41457, ClientWaitSync_remap_index },
-   { 10764, DeleteSync_remap_index },
-   { 33332, FenceSync_remap_index },
-   { 36788, GetInteger64v_remap_index },
-   { 38875, GetSynciv_remap_index },
-   { 14844, IsSync_remap_index },
-   { 32161, WaitSync_remap_index },
-   { 12491, DrawElementsBaseVertex_remap_index },
-   { 16108, DrawElementsInstancedBaseVertex_remap_index },
-   { 36034, DrawRangeElementsBaseVertex_remap_index },
-   { 39926, MultiDrawElementsBaseVertex_remap_index },
-   { 23380, ProvokingVertex_remap_index },
-   {  5253, GetMultisamplefv_remap_index },
-   { 33801, SampleMaski_remap_index },
+   { 13423, GetActiveUniformsiv_remap_index },
+   { 40197, GetUniformBlockIndex_remap_index },
+   {  9912, GetUniformIndices_remap_index },
+   { 33275, UniformBlockBinding_remap_index },
+   { 41106, CopyBufferSubData_remap_index },
+   { 41427, ClientWaitSync_remap_index },
+   { 10725, DeleteSync_remap_index },
+   { 33302, FenceSync_remap_index },
+   { 36758, GetInteger64v_remap_index },
+   { 38845, GetSynciv_remap_index },
+   { 14829, IsSync_remap_index },
+   { 32131, WaitSync_remap_index },
+   { 12452, DrawElementsBaseVertex_remap_index },
+   { 16119, DrawElementsInstancedBaseVertex_remap_index },
+   { 36004, DrawRangeElementsBaseVertex_remap_index },
+   { 39896, MultiDrawElementsBaseVertex_remap_index },
+   { 23357, ProvokingVertex_remap_index },
+   {  5220, GetMultisamplefv_remap_index },
+   { 33771, SampleMaski_remap_index },
    {  1861, TexImage2DMultisample_remap_index },
-   { 40170, TexImage3DMultisample_remap_index },
-   { 22086, BlendEquationSeparateiARB_remap_index },
-   { 26449, BlendEquationiARB_remap_index },
-   {  3559, BlendFuncSeparateiARB_remap_index },
-   { 23880, BlendFunciARB_remap_index },
+   { 40140, TexImage3DMultisample_remap_index },
+   { 22063, BlendEquationSeparateiARB_remap_index },
+   { 26394, BlendEquationiARB_remap_index },
+   {  3526, BlendFuncSeparateiARB_remap_index },
+   { 23857, BlendFunciARB_remap_index },
    {  1626, BindFragDataLocationIndexed_remap_index },
-   { 27853, GetFragDataIndex_remap_index },
+   { 27798, GetFragDataIndex_remap_index },
    {  2649, BindSampler_remap_index },
-   { 41267, DeleteSamplers_remap_index },
-   { 34312, GenSamplers_remap_index },
+   { 41237, DeleteSamplers_remap_index },
+   { 34282, GenSamplers_remap_index },
    {  2369, GetSamplerParameterIiv_remap_index },
-   {  5497, GetSamplerParameterIuiv_remap_index },
-   { 22355, GetSamplerParameterfv_remap_index },
-   { 24016, GetSamplerParameteriv_remap_index },
-   { 25206, IsSampler_remap_index },
-   { 37040, SamplerParameterIiv_remap_index },
-   { 11800, SamplerParameterIuiv_remap_index },
-   { 41341, SamplerParameterf_remap_index },
-   { 37113, SamplerParameterfv_remap_index },
-   { 41288, SamplerParameteri_remap_index },
-   { 27128, SamplerParameteriv_remap_index },
-   { 22442, GetQueryObjecti64v_remap_index },
-   {  3849, GetQueryObjectui64v_remap_index },
-   { 12386, QueryCounter_remap_index },
-   { 36364, ColorP3ui_remap_index },
-   {  6350, ColorP3uiv_remap_index },
-   { 16868, ColorP4ui_remap_index },
-   { 24948, ColorP4uiv_remap_index },
-   { 13200, MultiTexCoordP1ui_remap_index },
-   { 24718, MultiTexCoordP1uiv_remap_index },
-   { 32689, MultiTexCoordP2ui_remap_index },
-   {  8511, MultiTexCoordP2uiv_remap_index },
-   { 25036, MultiTexCoordP3ui_remap_index },
+   {  5464, GetSamplerParameterIuiv_remap_index },
+   { 22332, GetSamplerParameterfv_remap_index },
+   { 23993, GetSamplerParameteriv_remap_index },
+   { 25183, IsSampler_remap_index },
+   { 37010, SamplerParameterIiv_remap_index },
+   { 11761, SamplerParameterIuiv_remap_index },
+   { 41311, SamplerParameterf_remap_index },
+   { 37083, SamplerParameterfv_remap_index },
+   { 41258, SamplerParameteri_remap_index },
+   { 27073, SamplerParameteriv_remap_index },
+   { 22419, GetQueryObjecti64v_remap_index },
+   {  3816, GetQueryObjectui64v_remap_index },
+   { 12347, QueryCounter_remap_index },
+   { 36334, ColorP3ui_remap_index },
+   {  6317, ColorP3uiv_remap_index },
+   { 16879, ColorP4ui_remap_index },
+   { 24925, ColorP4uiv_remap_index },
+   { 13161, MultiTexCoordP1ui_remap_index },
+   { 24695, MultiTexCoordP1uiv_remap_index },
+   { 32659, MultiTexCoordP2ui_remap_index },
+   {  8502, MultiTexCoordP2uiv_remap_index },
+   { 25013, MultiTexCoordP3ui_remap_index },
    {   391, MultiTexCoordP3uiv_remap_index },
-   { 38680, MultiTexCoordP4ui_remap_index },
-   { 32807, MultiTexCoordP4uiv_remap_index },
-   { 34883, NormalP3ui_remap_index },
-   { 24643, NormalP3uiv_remap_index },
-   { 39543, SecondaryColorP3ui_remap_index },
-   {  5445, SecondaryColorP3uiv_remap_index },
+   { 38650, MultiTexCoordP4ui_remap_index },
+   { 32777, MultiTexCoordP4uiv_remap_index },
+   { 34853, NormalP3ui_remap_index },
+   { 24620, NormalP3uiv_remap_index },
+   { 39513, SecondaryColorP3ui_remap_index },
+   {  5412, SecondaryColorP3uiv_remap_index },
    {   162, TexCoordP1ui_remap_index },
    {   609, TexCoordP1uiv_remap_index },
-   { 25312, TexCoordP2ui_remap_index },
-   { 35199, TexCoordP2uiv_remap_index },
-   { 14120, TexCoordP3ui_remap_index },
-   { 16911, TexCoordP3uiv_remap_index },
-   { 32588, TexCoordP4ui_remap_index },
+   { 25289, TexCoordP2ui_remap_index },
+   { 35169, TexCoordP2uiv_remap_index },
+   { 14081, TexCoordP3ui_remap_index },
+   { 16922, TexCoordP3uiv_remap_index },
+   { 32558, TexCoordP4ui_remap_index },
    {  1709, TexCoordP4uiv_remap_index },
-   { 14189, VertexAttribP1ui_remap_index },
-   {  3901, VertexAttribP1uiv_remap_index },
-   { 28617, VertexAttribP2ui_remap_index },
-   {  4627, VertexAttribP2uiv_remap_index },
+   { 14150, VertexAttribP1ui_remap_index },
+   {  3868, VertexAttribP1uiv_remap_index },
+   { 28562, VertexAttribP2ui_remap_index },
+   {  4594, VertexAttribP2uiv_remap_index },
    {  1456, VertexAttribP3ui_remap_index },
-   { 27154, VertexAttribP3uiv_remap_index },
-   {  4109, VertexAttribP4ui_remap_index },
-   { 15350, VertexAttribP4uiv_remap_index },
-   { 33430, VertexP2ui_remap_index },
-   { 31137, VertexP2uiv_remap_index },
-   { 21600, VertexP3ui_remap_index },
-   {  5742, VertexP3uiv_remap_index },
+   { 27099, VertexAttribP3uiv_remap_index },
+   {  4076, VertexAttribP4ui_remap_index },
+   { 15335, VertexAttribP4uiv_remap_index },
+   { 33400, VertexP2ui_remap_index },
+   { 31107, VertexP2uiv_remap_index },
+   { 21577, VertexP3ui_remap_index },
+   {  5709, VertexP3uiv_remap_index },
    {  2883, VertexP4ui_remap_index },
-   { 41838, VertexP4uiv_remap_index },
+   { 41808, VertexP4uiv_remap_index },
    {   746, DrawArraysIndirect_remap_index },
-   { 22605, DrawElementsIndirect_remap_index },
-   { 10243, BindTransformFeedback_remap_index },
-   { 10115, DeleteTransformFeedbacks_remap_index },
-   { 33963, DrawTransformFeedback_remap_index },
-   {  3695, GenTransformFeedbacks_remap_index },
-   { 31628, IsTransformFeedback_remap_index },
-   { 29418, PauseTransformFeedback_remap_index },
-   { 33629, ResumeTransformFeedback_remap_index },
-   { 21516, BeginQueryIndexed_remap_index },
-   { 39070, DrawTransformFeedbackStream_remap_index },
-   { 18222, EndQueryIndexed_remap_index },
-   { 20786, GetQueryIndexediv_remap_index },
-   { 41804, ClearDepthf_remap_index },
-   { 22946, DepthRangef_remap_index },
-   { 36402, GetShaderPrecisionFormat_remap_index },
-   {  3016, ReleaseShaderCompiler_remap_index },
-   { 24106, ShaderBinary_remap_index },
-   { 18666, GetProgramBinary_remap_index },
-   { 11330, ProgramBinary_remap_index },
-   { 11565, ProgramParameteri_remap_index },
-   { 25671, DepthRangeArrayv_remap_index },
-   { 39992, DepthRangeIndexed_remap_index },
-   { 31608, GetDoublei_v_remap_index },
-   { 33819, GetFloati_v_remap_index },
-   { 40433, ScissorArrayv_remap_index },
-   { 23984, ScissorIndexed_remap_index },
-   { 27180, ScissorIndexedv_remap_index },
-   { 17663, ViewportArrayv_remap_index },
-   { 30269, ViewportIndexedf_remap_index },
-   { 18714, ViewportIndexedfv_remap_index },
-   { 10355, DebugMessageCallbackARB_remap_index },
-   {  2958, DebugMessageControlARB_remap_index },
-   { 26219, DebugMessageInsertARB_remap_index },
-   { 20850, GetDebugMessageLogARB_remap_index },
-   {  8036, GetGraphicsResetStatusARB_remap_index },
-   { 28760, GetnColorTableARB_remap_index },
+   { 22582, DrawElementsIndirect_remap_index },
+   { 10234, BindTransformFeedback_remap_index },
+   { 10106, DeleteTransformFeedbacks_remap_index },
+   { 33933, DrawTransformFeedback_remap_index },
+   {  3662, GenTransformFeedbacks_remap_index },
+   { 31598, IsTransformFeedback_remap_index },
+   { 29363, PauseTransformFeedback_remap_index },
+   { 33599, ResumeTransformFeedback_remap_index },
+   { 21493, BeginQueryIndexed_remap_index },
+   { 39040, DrawTransformFeedbackStream_remap_index },
+   { 18233, EndQueryIndexed_remap_index },
+   { 20797, GetQueryIndexediv_remap_index },
+   { 41774, ClearDepthf_remap_index },
+   { 22923, DepthRangef_remap_index },
+   { 36372, GetShaderPrecisionFormat_remap_index },
+   {  2983, ReleaseShaderCompiler_remap_index },
+   { 24083, ShaderBinary_remap_index },
+   { 18677, GetProgramBinary_remap_index },
+   { 11291, ProgramBinary_remap_index },
+   { 11526, ProgramParameteri_remap_index },
+   { 25648, DepthRangeArrayv_remap_index },
+   { 39962, DepthRangeIndexed_remap_index },
+   { 31578, GetDoublei_v_remap_index },
+   { 33789, GetFloati_v_remap_index },
+   { 40403, ScissorArrayv_remap_index },
+   { 23961, ScissorIndexed_remap_index },
+   { 27125, ScissorIndexedv_remap_index },
+   { 17674, ViewportArrayv_remap_index },
+   { 30214, ViewportIndexedf_remap_index },
+   { 18725, ViewportIndexedfv_remap_index },
+   {  8027, GetGraphicsResetStatusARB_remap_index },
+   { 28705, GetnColorTableARB_remap_index },
    {  2615, GetnCompressedTexImageARB_remap_index },
    {  1202, GetnConvolutionFilterARB_remap_index },
-   {  4501, GetnHistogramARB_remap_index },
-   { 17548, GetnMapdvARB_remap_index },
-   { 11691, GetnMapfvARB_remap_index },
-   { 32714, GetnMapivARB_remap_index },
-   { 37281, GetnMinmaxARB_remap_index },
-   {  3412, GetnPixelMapfvARB_remap_index },
-   {  5471, GetnPixelMapuivARB_remap_index },
-   { 11011, GetnPixelMapusvARB_remap_index },
-   { 21162, GetnPolygonStippleARB_remap_index },
-   { 27621, GetnSeparableFilterARB_remap_index },
-   {  9555, GetnTexImageARB_remap_index },
-   { 26764, GetnUniformdvARB_remap_index },
-   { 32376, GetnUniformfvARB_remap_index },
-   {  2991, GetnUniformivARB_remap_index },
-   { 13060, GetnUniformuivARB_remap_index },
-   { 24279, ReadnPixelsARB_remap_index },
-   { 31310, DrawArraysInstancedBaseInstance_remap_index },
-   {  9706, DrawElementsInstancedBaseInstance_remap_index },
+   {  4468, GetnHistogramARB_remap_index },
+   { 17559, GetnMapdvARB_remap_index },
+   { 11652, GetnMapfvARB_remap_index },
+   { 32684, GetnMapivARB_remap_index },
+   { 37251, GetnMinmaxARB_remap_index },
+   {  3379, GetnPixelMapfvARB_remap_index },
+   {  5438, GetnPixelMapuivARB_remap_index },
+   { 10972, GetnPixelMapusvARB_remap_index },
+   { 21139, GetnPolygonStippleARB_remap_index },
+   { 27566, GetnSeparableFilterARB_remap_index },
+   {  9546, GetnTexImageARB_remap_index },
+   { 26709, GetnUniformdvARB_remap_index },
+   { 32346, GetnUniformfvARB_remap_index },
+   {  2958, GetnUniformivARB_remap_index },
+   { 13021, GetnUniformuivARB_remap_index },
+   { 24256, ReadnPixelsARB_remap_index },
+   { 31280, DrawArraysInstancedBaseInstance_remap_index },
+   {  9697, DrawElementsInstancedBaseInstance_remap_index },
    {  2447, DrawElementsInstancedBaseVertexBaseInstance_remap_index },
-   { 33572, DrawTransformFeedbackInstanced_remap_index },
-   { 12789, DrawTransformFeedbackStreamInstanced_remap_index },
-   { 40454, GetInternalformativ_remap_index },
-   { 18789, GetActiveAtomicCounterBufferiv_remap_index },
-   { 41776, BindImageTexture_remap_index },
-   { 20382, MemoryBarrier_remap_index },
-   { 32444, TexStorage1D_remap_index },
-   { 22215, TexStorage2D_remap_index },
-   { 25927, TexStorage3D_remap_index },
+   { 33542, DrawTransformFeedbackInstanced_remap_index },
+   { 12750, DrawTransformFeedbackStreamInstanced_remap_index },
+   { 40424, GetInternalformativ_remap_index },
+   { 18800, GetActiveAtomicCounterBufferiv_remap_index },
+   { 41746, BindImageTexture_remap_index },
+   { 20393, MemoryBarrier_remap_index },
+   { 32414, TexStorage1D_remap_index },
+   { 22192, TexStorage2D_remap_index },
+   { 25904, TexStorage3D_remap_index },
    {  1379, TextureStorage1DEXT_remap_index },
-   { 33516, TextureStorage2DEXT_remap_index },
-   { 21223, TextureStorage3DEXT_remap_index },
-   { 34223, ClearBufferData_remap_index },
+   { 33486, TextureStorage2DEXT_remap_index },
+   { 21200, TextureStorage3DEXT_remap_index },
+   { 34193, ClearBufferData_remap_index },
    {  2029, ClearBufferSubData_remap_index },
-   { 29889, DispatchCompute_remap_index },
-   {  6115, DispatchComputeIndirect_remap_index },
-   { 38894, TextureView_remap_index },
-   { 20680, BindVertexBuffer_remap_index },
-   { 28322, VertexAttribBinding_remap_index },
-   { 28787, VertexAttribFormat_remap_index },
-   { 31251, VertexAttribIFormat_remap_index },
-   { 34738, VertexAttribLFormat_remap_index },
-   { 33241, VertexBindingDivisor_remap_index },
-   {  3154, MultiDrawArraysIndirect_remap_index },
-   { 17273, MultiDrawElementsIndirect_remap_index },
-   { 17208, TexBufferRange_remap_index },
-   { 36590, TexStorage2DMultisample_remap_index },
-   { 27073, TexStorage3DMultisample_remap_index },
-   {  3186, BufferStorage_remap_index },
-   {  6144, InvalidateBufferData_remap_index },
-   { 36982, InvalidateBufferSubData_remap_index },
-   { 20342, InvalidateFramebuffer_remap_index },
-   { 15112, InvalidateSubFramebuffer_remap_index },
-   { 11371, InvalidateTexImage_remap_index },
-   { 24306, InvalidateTexSubImage_remap_index },
-   { 12138, PolygonOffsetEXT_remap_index },
-   { 34330, DrawTexfOES_remap_index },
-   {  3723, DrawTexfvOES_remap_index },
+   { 29834, DispatchCompute_remap_index },
+   {  6082, DispatchComputeIndirect_remap_index },
+   { 38864, TextureView_remap_index },
+   { 20691, BindVertexBuffer_remap_index },
+   { 28267, VertexAttribBinding_remap_index },
+   { 28732, VertexAttribFormat_remap_index },
+   { 31221, VertexAttribIFormat_remap_index },
+   { 34708, VertexAttribLFormat_remap_index },
+   { 33211, VertexBindingDivisor_remap_index },
+   {  3121, MultiDrawArraysIndirect_remap_index },
+   { 17284, MultiDrawElementsIndirect_remap_index },
+   { 17219, TexBufferRange_remap_index },
+   { 36560, TexStorage2DMultisample_remap_index },
+   { 27018, TexStorage3DMultisample_remap_index },
+   {  3153, BufferStorage_remap_index },
+   {  6111, InvalidateBufferData_remap_index },
+   { 36952, InvalidateBufferSubData_remap_index },
+   { 20353, InvalidateFramebuffer_remap_index },
+   { 15097, InvalidateSubFramebuffer_remap_index },
+   { 11332, InvalidateTexImage_remap_index },
+   { 24283, InvalidateTexSubImage_remap_index },
+   { 12099, PolygonOffsetEXT_remap_index },
+   { 34300, DrawTexfOES_remap_index },
+   {  3690, DrawTexfvOES_remap_index },
    {   955, DrawTexiOES_remap_index },
-   { 28696, DrawTexivOES_remap_index },
-   { 11518, DrawTexsOES_remap_index },
-   { 20536, DrawTexsvOES_remap_index },
-   { 24965, DrawTexxOES_remap_index },
-   { 36230, DrawTexxvOES_remap_index },
-   { 23271, PointSizePointerOES_remap_index },
+   { 28641, DrawTexivOES_remap_index },
+   { 11479, DrawTexsOES_remap_index },
+   { 20547, DrawTexsvOES_remap_index },
+   { 24942, DrawTexxOES_remap_index },
+   { 36200, DrawTexxvOES_remap_index },
+   { 23248, PointSizePointerOES_remap_index },
    {   918, QueryMatrixxOES_remap_index },
-   { 18286, SampleMaskSGIS_remap_index },
-   { 31365, SamplePatternSGIS_remap_index },
-   { 39854, ColorPointerEXT_remap_index },
-   { 26369, EdgeFlagPointerEXT_remap_index },
-   { 12215, IndexPointerEXT_remap_index },
-   { 12405, NormalPointerEXT_remap_index },
-   { 25736, TexCoordPointerEXT_remap_index },
-   { 23088, VertexPointerEXT_remap_index },
-   { 39793, DiscardFramebufferEXT_remap_index },
-   { 10089, ActiveShaderProgram_remap_index },
-   { 15325, BindProgramPipeline_remap_index },
-   { 26421, CreateShaderProgramv_remap_index },
-   {  3338, DeleteProgramPipelines_remap_index },
-   { 24045, GenProgramPipelines_remap_index },
-   {  7557, GetProgramPipelineInfoLog_remap_index },
-   { 28863, GetProgramPipelineiv_remap_index },
-   { 24083, IsProgramPipeline_remap_index },
-   { 41654, LockArraysEXT_remap_index },
-   { 40994, ProgramUniform1f_remap_index },
-   {  8900, ProgramUniform1fv_remap_index },
-   { 40970, ProgramUniform1i_remap_index },
-   { 14021, ProgramUniform1iv_remap_index },
-   { 31784, ProgramUniform1ui_remap_index },
-   { 40842, ProgramUniform1uiv_remap_index },
+   { 18297, SampleMaskSGIS_remap_index },
+   { 31335, SamplePatternSGIS_remap_index },
+   { 39824, ColorPointerEXT_remap_index },
+   { 26314, EdgeFlagPointerEXT_remap_index },
+   { 12176, IndexPointerEXT_remap_index },
+   { 12366, NormalPointerEXT_remap_index },
+   { 25713, TexCoordPointerEXT_remap_index },
+   { 23065, VertexPointerEXT_remap_index },
+   { 39763, DiscardFramebufferEXT_remap_index },
+   { 10080, ActiveShaderProgram_remap_index },
+   { 15310, BindProgramPipeline_remap_index },
+   { 26366, CreateShaderProgramv_remap_index },
+   {  3305, DeleteProgramPipelines_remap_index },
+   { 24022, GenProgramPipelines_remap_index },
+   {  7548, GetProgramPipelineInfoLog_remap_index },
+   { 28808, GetProgramPipelineiv_remap_index },
+   { 24060, IsProgramPipeline_remap_index },
+   { 41624, LockArraysEXT_remap_index },
+   { 40964, ProgramUniform1f_remap_index },
+   {  8891, ProgramUniform1fv_remap_index },
+   { 40940, ProgramUniform1i_remap_index },
+   { 13982, ProgramUniform1iv_remap_index },
+   { 31754, ProgramUniform1ui_remap_index },
+   { 40812, ProgramUniform1uiv_remap_index },
    {  2137, ProgramUniform2f_remap_index },
-   { 16645, ProgramUniform2fv_remap_index },
+   { 16656, ProgramUniform2fv_remap_index },
    {  2198, ProgramUniform2i_remap_index },
-   { 19804, ProgramUniform2iv_remap_index },
-   {  6687, ProgramUniform2ui_remap_index },
-   {  8343, ProgramUniform2uiv_remap_index },
-   {  4231, ProgramUniform3f_remap_index },
-   { 27902, ProgramUniform3fv_remap_index },
-   {  4257, ProgramUniform3i_remap_index },
-   { 12430, ProgramUniform3iv_remap_index },
-   { 14047, ProgramUniform3ui_remap_index },
-   { 16618, ProgramUniform3uiv_remap_index },
-   { 26823, ProgramUniform4f_remap_index },
-   { 30875, ProgramUniform4fv_remap_index },
-   { 26850, ProgramUniform4i_remap_index },
+   { 19815, ProgramUniform2iv_remap_index },
+   {  6678, ProgramUniform2ui_remap_index },
+   {  8334, ProgramUniform2uiv_remap_index },
+   {  4198, ProgramUniform3f_remap_index },
+   { 27847, ProgramUniform3fv_remap_index },
+   {  4224, ProgramUniform3i_remap_index },
+   { 12391, ProgramUniform3iv_remap_index },
+   { 14008, ProgramUniform3ui_remap_index },
+   { 16629, ProgramUniform3uiv_remap_index },
+   { 26768, ProgramUniform4f_remap_index },
+   { 30845, ProgramUniform4fv_remap_index },
+   { 26795, ProgramUniform4i_remap_index },
    {  1788, ProgramUniform4iv_remap_index },
-   { 37590, ProgramUniform4ui_remap_index },
-   { 30698, ProgramUniform4uiv_remap_index },
-   { 18358, ProgramUniformMatrix2fv_remap_index },
-   { 20645, ProgramUniformMatrix2x3fv_remap_index },
-   {  7312, ProgramUniformMatrix2x4fv_remap_index },
-   { 35913, ProgramUniformMatrix3fv_remap_index },
-   { 31573, ProgramUniformMatrix3x2fv_remap_index },
-   { 25396, ProgramUniformMatrix3x4fv_remap_index },
-   { 29936, ProgramUniformMatrix4fv_remap_index },
+   { 37560, ProgramUniform4ui_remap_index },
+   { 30668, ProgramUniform4uiv_remap_index },
+   { 18369, ProgramUniformMatrix2fv_remap_index },
+   { 20656, ProgramUniformMatrix2x3fv_remap_index },
+   {  7303, ProgramUniformMatrix2x4fv_remap_index },
+   { 35883, ProgramUniformMatrix3fv_remap_index },
+   { 31543, ProgramUniformMatrix3x2fv_remap_index },
+   { 25373, ProgramUniformMatrix3x4fv_remap_index },
+   { 29881, ProgramUniformMatrix4fv_remap_index },
    {  2102, ProgramUniformMatrix4x2fv_remap_index },
-   {  6907, ProgramUniformMatrix4x3fv_remap_index },
-   { 36624, UnlockArraysEXT_remap_index },
-   { 29912, UseProgramStages_remap_index },
+   {  6898, ProgramUniformMatrix4x3fv_remap_index },
+   { 36594, UnlockArraysEXT_remap_index },
+   { 29857, UseProgramStages_remap_index },
    {  1597, ValidateProgramPipeline_remap_index },
-   { 15376, DebugMessageCallback_remap_index },
-   { 30362, DebugMessageControl_remap_index },
-   { 14706, DebugMessageInsert_remap_index },
-   {  6514, GetDebugMessageLog_remap_index },
-   {  6305, GetObjectLabel_remap_index },
-   { 11539, GetObjectPtrLabel_remap_index },
-   { 29398, ObjectLabel_remap_index },
-   { 41741, ObjectPtrLabel_remap_index },
-   { 17091, PopDebugGroup_remap_index },
-   { 30989, PushDebugGroup_remap_index },
-   {  7890, SecondaryColor3fEXT_remap_index },
-   {  7435, SecondaryColor3fvEXT_remap_index },
-   { 27571, MultiDrawElementsEXT_remap_index },
-   { 10171, FogCoordfEXT_remap_index },
-   { 17308, FogCoordfvEXT_remap_index },
-   {  3974, ResizeBuffersMESA_remap_index },
-   { 32650, WindowPos4dMESA_remap_index },
-   { 26266, WindowPos4dvMESA_remap_index },
-   {  4059, WindowPos4fMESA_remap_index },
-   { 10780, WindowPos4fvMESA_remap_index },
-   {  8583, WindowPos4iMESA_remap_index },
-   {  3485, WindowPos4ivMESA_remap_index },
-   { 26948, WindowPos4sMESA_remap_index },
+   { 15361, DebugMessageCallback_remap_index },
+   { 30307, DebugMessageControl_remap_index },
+   { 14667, DebugMessageInsert_remap_index },
+   {  6481, GetDebugMessageLog_remap_index },
+   {  6272, GetObjectLabel_remap_index },
+   { 11500, GetObjectPtrLabel_remap_index },
+   { 29343, ObjectLabel_remap_index },
+   { 41711, ObjectPtrLabel_remap_index },
+   { 17102, PopDebugGroup_remap_index },
+   { 30959, PushDebugGroup_remap_index },
+   {  7881, SecondaryColor3fEXT_remap_index },
+   {  7426, SecondaryColor3fvEXT_remap_index },
+   { 27516, MultiDrawElementsEXT_remap_index },
+   { 10162, FogCoordfEXT_remap_index },
+   { 17319, FogCoordfvEXT_remap_index },
+   {  3941, ResizeBuffersMESA_remap_index },
+   { 32620, WindowPos4dMESA_remap_index },
+   { 26211, WindowPos4dvMESA_remap_index },
+   {  4026, WindowPos4fMESA_remap_index },
+   { 10741, WindowPos4fvMESA_remap_index },
+   {  8574, WindowPos4iMESA_remap_index },
+   {  3452, WindowPos4ivMESA_remap_index },
+   { 26893, WindowPos4sMESA_remap_index },
    {  1049, WindowPos4svMESA_remap_index },
-   { 27671, MultiModeDrawArraysIBM_remap_index },
-   { 18977, MultiModeDrawElementsIBM_remap_index },
-   { 31484, AreProgramsResidentNV_remap_index },
-   { 38232, ExecuteProgramNV_remap_index },
-   { 28413, GetProgramParameterdvNV_remap_index },
-   { 34945, GetProgramParameterfvNV_remap_index },
-   { 18426, GetProgramStringNV_remap_index },
-   { 15036, GetProgramivNV_remap_index },
-   { 17593, GetTrackMatrixivNV_remap_index },
-   { 18035, GetVertexAttribdvNV_remap_index },
-   { 16245, GetVertexAttribfvNV_remap_index },
-   { 15218, GetVertexAttribivNV_remap_index },
-   { 34668, LoadProgramNV_remap_index },
-   { 19077, ProgramParameters4dvNV_remap_index },
-   { 19656, ProgramParameters4fvNV_remap_index },
-   {  5926, RequestResidentProgramsNV_remap_index },
-   { 28034, TrackMatrixNV_remap_index },
-   { 13569, VertexAttrib1dNV_remap_index },
-   { 27016, VertexAttrib1dvNV_remap_index },
-   { 27342, VertexAttrib1fNV_remap_index },
-   { 40203, VertexAttrib1fvNV_remap_index },
-   { 20201, VertexAttrib1sNV_remap_index },
-   { 36644, VertexAttrib1svNV_remap_index },
-   { 17569, VertexAttrib2dNV_remap_index },
-   { 32934, VertexAttrib2dvNV_remap_index },
-   { 26118, VertexAttrib2fNV_remap_index },
-   { 24844, VertexAttrib2fvNV_remap_index },
-   { 12311, VertexAttrib2sNV_remap_index },
-   {  5421, VertexAttrib2svNV_remap_index },
-   { 35354, VertexAttrib3dNV_remap_index },
-   { 37243, VertexAttrib3dvNV_remap_index },
-   {  4680, VertexAttrib3fNV_remap_index },
-   { 39477, VertexAttrib3fvNV_remap_index },
-   {  6851, VertexAttrib3sNV_remap_index },
-   { 17620, VertexAttrib3svNV_remap_index },
-   {  8092, VertexAttrib4dNV_remap_index },
-   {  3263, VertexAttrib4dvNV_remap_index },
-   {  8163, VertexAttrib4fNV_remap_index },
-   { 39595, VertexAttrib4fvNV_remap_index },
-   { 16706, VertexAttrib4sNV_remap_index },
-   { 10385, VertexAttrib4svNV_remap_index },
+   { 27616, MultiModeDrawArraysIBM_remap_index },
+   { 18988, MultiModeDrawElementsIBM_remap_index },
+   { 31454, AreProgramsResidentNV_remap_index },
+   { 38202, ExecuteProgramNV_remap_index },
+   { 28358, GetProgramParameterdvNV_remap_index },
+   { 34915, GetProgramParameterfvNV_remap_index },
+   { 18437, GetProgramStringNV_remap_index },
+   { 15021, GetProgramivNV_remap_index },
+   { 17604, GetTrackMatrixivNV_remap_index },
+   { 18046, GetVertexAttribdvNV_remap_index },
+   { 16256, GetVertexAttribfvNV_remap_index },
+   { 15203, GetVertexAttribivNV_remap_index },
+   { 34638, LoadProgramNV_remap_index },
+   { 19088, ProgramParameters4dvNV_remap_index },
+   { 19667, ProgramParameters4fvNV_remap_index },
+   {  5893, RequestResidentProgramsNV_remap_index },
+   { 27979, TrackMatrixNV_remap_index },
+   { 13530, VertexAttrib1dNV_remap_index },
+   { 26961, VertexAttrib1dvNV_remap_index },
+   { 27287, VertexAttrib1fNV_remap_index },
+   { 40173, VertexAttrib1fvNV_remap_index },
+   { 20212, VertexAttrib1sNV_remap_index },
+   { 36614, VertexAttrib1svNV_remap_index },
+   { 17580, VertexAttrib2dNV_remap_index },
+   { 32904, VertexAttrib2dvNV_remap_index },
+   { 26095, VertexAttrib2fNV_remap_index },
+   { 24821, VertexAttrib2fvNV_remap_index },
+   { 12272, VertexAttrib2sNV_remap_index },
+   {  5388, VertexAttrib2svNV_remap_index },
+   { 35324, VertexAttrib3dNV_remap_index },
+   { 37213, VertexAttrib3dvNV_remap_index },
+   {  4647, VertexAttrib3fNV_remap_index },
+   { 39447, VertexAttrib3fvNV_remap_index },
+   {  6842, VertexAttrib3sNV_remap_index },
+   { 17631, VertexAttrib3svNV_remap_index },
+   {  8083, VertexAttrib4dNV_remap_index },
+   {  3230, VertexAttrib4dvNV_remap_index },
+   {  8154, VertexAttrib4fNV_remap_index },
+   { 39565, VertexAttrib4fvNV_remap_index },
+   { 16717, VertexAttrib4sNV_remap_index },
+   { 10346, VertexAttrib4svNV_remap_index },
    {  1570, VertexAttrib4ubNV_remap_index },
-   { 10146, VertexAttrib4ubvNV_remap_index },
-   { 27822, VertexAttribPointerNV_remap_index },
-   { 26317, VertexAttribs1dvNV_remap_index },
-   { 29689, VertexAttribs1fvNV_remap_index },
-   {  5900, VertexAttribs1svNV_remap_index },
-   { 40816, VertexAttribs2dvNV_remap_index },
-   {  4083, VertexAttribs2fvNV_remap_index },
-   { 26395, VertexAttribs2svNV_remap_index },
+   { 10137, VertexAttrib4ubvNV_remap_index },
+   { 27767, VertexAttribPointerNV_remap_index },
+   { 26262, VertexAttribs1dvNV_remap_index },
+   { 29634, VertexAttribs1fvNV_remap_index },
+   {  5867, VertexAttribs1svNV_remap_index },
+   { 40786, VertexAttribs2dvNV_remap_index },
+   {  4050, VertexAttribs2fvNV_remap_index },
+   { 26340, VertexAttribs2svNV_remap_index },
    {  1729, VertexAttribs3dvNV_remap_index },
-   { 33991, VertexAttribs3fvNV_remap_index },
-   { 13436, VertexAttribs3svNV_remap_index },
-   { 18640, VertexAttribs4dvNV_remap_index },
-   { 23422, VertexAttribs4fvNV_remap_index },
-   { 19830, VertexAttribs4svNV_remap_index },
-   { 30830, VertexAttribs4ubvNV_remap_index },
-   { 40081, GetTexBumpParameterfvATI_remap_index },
-   {  9947, GetTexBumpParameterivATI_remap_index },
-   { 34091, TexBumpParameterfvATI_remap_index },
-   {  8135, TexBumpParameterivATI_remap_index },
-   {  8783, AlphaFragmentOp1ATI_remap_index },
-   {  3287, AlphaFragmentOp2ATI_remap_index },
-   {  9216, AlphaFragmentOp3ATI_remap_index },
-   { 31944, BeginFragmentShaderATI_remap_index },
-   {  3532, BindFragmentShaderATI_remap_index },
-   {  6876, ColorFragmentOp1ATI_remap_index },
-   { 12277, ColorFragmentOp2ATI_remap_index },
-   { 23009, ColorFragmentOp3ATI_remap_index },
-   { 16060, DeleteFragmentShaderATI_remap_index },
-   { 42148, EndFragmentShaderATI_remap_index },
-   { 22059, GenFragmentShadersATI_remap_index },
-   { 39677, PassTexCoordATI_remap_index },
-   { 34071, SampleMapATI_remap_index },
-   { 33395, SetFragmentShaderConstantATI_remap_index },
-   {  8066, ActiveStencilFaceEXT_remap_index },
-   {  7692, BindVertexArrayAPPLE_remap_index },
-   { 15590, GenVertexArraysAPPLE_remap_index },
-   { 33657, GetProgramNamedParameterdvNV_remap_index },
-   { 21809, GetProgramNamedParameterfvNV_remap_index },
-   { 40112, ProgramNamedParameter4dNV_remap_index },
-   { 36435, ProgramNamedParameter4dvNV_remap_index },
-   { 39419, ProgramNamedParameter4fNV_remap_index },
-   { 24406, ProgramNamedParameter4fvNV_remap_index },
-   { 23329, PrimitiveRestartNV_remap_index },
-   { 23818, GetTexGenxvOES_remap_index },
-   { 37753, TexGenxOES_remap_index },
-   { 31051, TexGenxvOES_remap_index },
-   {  7616, DepthBoundsEXT_remap_index },
-   {  5670, BindFramebufferEXT_remap_index },
-   { 39735, BindRenderbufferEXT_remap_index },
-   {  4168, BufferParameteriAPPLE_remap_index },
-   { 37834, FlushMappedBufferRangeAPPLE_remap_index },
-   { 26642, VertexAttribI1iEXT_remap_index },
-   { 10719, VertexAttribI1uiEXT_remap_index },
-   { 19377, VertexAttribI2iEXT_remap_index },
-   { 39270, VertexAttribI2ivEXT_remap_index },
-   { 24537, VertexAttribI2uiEXT_remap_index },
-   { 33754, VertexAttribI2uivEXT_remap_index },
-   { 18507, VertexAttribI3iEXT_remap_index },
-   { 41222, VertexAttribI3ivEXT_remap_index },
-   { 21741, VertexAttribI3uiEXT_remap_index },
-   { 20105, VertexAttribI3uivEXT_remap_index },
-   { 36480, VertexAttribI4iEXT_remap_index },
-   {  6421, VertexAttribI4ivEXT_remap_index },
+   { 33961, VertexAttribs3fvNV_remap_index },
+   { 13397, VertexAttribs3svNV_remap_index },
+   { 18651, VertexAttribs4dvNV_remap_index },
+   { 23399, VertexAttribs4fvNV_remap_index },
+   { 19841, VertexAttribs4svNV_remap_index },
+   { 30800, VertexAttribs4ubvNV_remap_index },
+   { 40051, GetTexBumpParameterfvATI_remap_index },
+   {  9938, GetTexBumpParameterivATI_remap_index },
+   { 34061, TexBumpParameterfvATI_remap_index },
+   {  8126, TexBumpParameterivATI_remap_index },
+   {  8774, AlphaFragmentOp1ATI_remap_index },
+   {  3254, AlphaFragmentOp2ATI_remap_index },
+   {  9207, AlphaFragmentOp3ATI_remap_index },
+   { 31914, BeginFragmentShaderATI_remap_index },
+   {  3499, BindFragmentShaderATI_remap_index },
+   {  6867, ColorFragmentOp1ATI_remap_index },
+   { 12238, ColorFragmentOp2ATI_remap_index },
+   { 22986, ColorFragmentOp3ATI_remap_index },
+   { 16071, DeleteFragmentShaderATI_remap_index },
+   { 42118, EndFragmentShaderATI_remap_index },
+   { 22036, GenFragmentShadersATI_remap_index },
+   { 39647, PassTexCoordATI_remap_index },
+   { 34041, SampleMapATI_remap_index },
+   { 33365, SetFragmentShaderConstantATI_remap_index },
+   {  8057, ActiveStencilFaceEXT_remap_index },
+   {  7683, BindVertexArrayAPPLE_remap_index },
+   { 15601, GenVertexArraysAPPLE_remap_index },
+   { 33627, GetProgramNamedParameterdvNV_remap_index },
+   { 21786, GetProgramNamedParameterfvNV_remap_index },
+   { 40082, ProgramNamedParameter4dNV_remap_index },
+   { 36405, ProgramNamedParameter4dvNV_remap_index },
+   { 39389, ProgramNamedParameter4fNV_remap_index },
+   { 24383, ProgramNamedParameter4fvNV_remap_index },
+   { 23306, PrimitiveRestartNV_remap_index },
+   { 23795, GetTexGenxvOES_remap_index },
+   { 37723, TexGenxOES_remap_index },
+   { 31021, TexGenxvOES_remap_index },
+   {  7607, DepthBoundsEXT_remap_index },
+   {  5637, BindFramebufferEXT_remap_index },
+   { 39705, BindRenderbufferEXT_remap_index },
+   {  4135, BufferParameteriAPPLE_remap_index },
+   { 37804, FlushMappedBufferRangeAPPLE_remap_index },
+   { 26587, VertexAttribI1iEXT_remap_index },
+   { 10680, VertexAttribI1uiEXT_remap_index },
+   { 19388, VertexAttribI2iEXT_remap_index },
+   { 39240, VertexAttribI2ivEXT_remap_index },
+   { 24514, VertexAttribI2uiEXT_remap_index },
+   { 33724, VertexAttribI2uivEXT_remap_index },
+   { 18518, VertexAttribI3iEXT_remap_index },
+   { 41192, VertexAttribI3ivEXT_remap_index },
+   { 21718, VertexAttribI3uiEXT_remap_index },
+   { 20116, VertexAttribI3uivEXT_remap_index },
+   { 36450, VertexAttribI4iEXT_remap_index },
+   {  6388, VertexAttribI4ivEXT_remap_index },
    {  2399, VertexAttribI4uiEXT_remap_index },
-   { 26499, VertexAttribI4uivEXT_remap_index },
+   { 26444, VertexAttribI4uivEXT_remap_index },
    {  2805, ClearColorIiEXT_remap_index },
    {  1177, ClearColorIuiEXT_remap_index },
-   { 23352, BindBufferOffsetEXT_remap_index },
-   { 17340, BeginPerfMonitorAMD_remap_index },
-   { 31442, DeletePerfMonitorsAMD_remap_index },
-   {  5173, EndPerfMonitorAMD_remap_index },
-   { 25850, GenPerfMonitorsAMD_remap_index },
-   { 12003, GetPerfMonitorCounterDataAMD_remap_index },
-   { 33268, GetPerfMonitorCounterInfoAMD_remap_index },
-   { 42108, GetPerfMonitorCounterStringAMD_remap_index },
-   { 41706, GetPerfMonitorCountersAMD_remap_index },
-   { 13640, GetPerfMonitorGroupStringAMD_remap_index },
-   { 28566, GetPerfMonitorGroupsAMD_remap_index },
-   { 13259, SelectPerfMonitorCountersAMD_remap_index },
-   { 13737, GetObjectParameterivAPPLE_remap_index },
-   { 41547, ObjectPurgeableAPPLE_remap_index },
+   { 23329, BindBufferOffsetEXT_remap_index },
+   { 17351, BeginPerfMonitorAMD_remap_index },
+   { 31412, DeletePerfMonitorsAMD_remap_index },
+   {  5140, EndPerfMonitorAMD_remap_index },
+   { 25827, GenPerfMonitorsAMD_remap_index },
+   { 11964, GetPerfMonitorCounterDataAMD_remap_index },
+   { 33238, GetPerfMonitorCounterInfoAMD_remap_index },
+   { 42078, GetPerfMonitorCounterStringAMD_remap_index },
+   { 41676, GetPerfMonitorCountersAMD_remap_index },
+   { 13601, GetPerfMonitorGroupStringAMD_remap_index },
+   { 28511, GetPerfMonitorGroupsAMD_remap_index },
+   { 13220, SelectPerfMonitorCountersAMD_remap_index },
+   { 13698, GetObjectParameterivAPPLE_remap_index },
+   { 41517, ObjectPurgeableAPPLE_remap_index },
    {  1814, ObjectUnpurgeableAPPLE_remap_index },
-   { 40604, ActiveProgramEXT_remap_index },
-   { 26288, CreateShaderProgramEXT_remap_index },
-   { 35462, UseShaderProgramEXT_remap_index },
-   { 29281, TextureBarrierNV_remap_index },
+   { 40574, ActiveProgramEXT_remap_index },
+   { 26233, CreateShaderProgramEXT_remap_index },
+   { 35432, UseShaderProgramEXT_remap_index },
+   { 29226, TextureBarrierNV_remap_index },
    {  2059, VDPAUFiniNV_remap_index },
    {   804, VDPAUGetSurfaceivNV_remap_index },
-   { 22880, VDPAUInitNV_remap_index },
-   { 20623, VDPAUIsSurfaceNV_remap_index },
-   {  6170, VDPAUMapSurfacesNV_remap_index },
+   { 22857, VDPAUInitNV_remap_index },
+   { 20634, VDPAUIsSurfaceNV_remap_index },
+   {  6137, VDPAUMapSurfacesNV_remap_index },
    {  2846, VDPAURegisterOutputSurfaceNV_remap_index },
-   { 11872, VDPAURegisterVideoSurfaceNV_remap_index },
-   { 10458, VDPAUSurfaceAccessNV_remap_index },
-   {  4474, VDPAUUnmapSurfacesNV_remap_index },
-   { 36334, VDPAUUnregisterSurfaceNV_remap_index },
-   { 19539, StencilFuncSeparateATI_remap_index },
-   {  5386, ProgramEnvParameters4fvEXT_remap_index },
-   { 29532, ProgramLocalParameters4fvEXT_remap_index },
-   {  3652, EGLImageTargetRenderbufferStorageOES_remap_index },
-   {  3437, EGLImageTargetTexture2DOES_remap_index },
-   { 39237, AlphaFuncx_remap_index },
-   { 18552, ClearColorx_remap_index },
-   { 38502, ClearDepthx_remap_index },
-   { 34436, Color4x_remap_index },
-   { 22818, DepthRangex_remap_index },
+   { 11833, VDPAURegisterVideoSurfaceNV_remap_index },
+   { 10419, VDPAUSurfaceAccessNV_remap_index },
+   {  4441, VDPAUUnmapSurfacesNV_remap_index },
+   { 36304, VDPAUUnregisterSurfaceNV_remap_index },
+   { 19550, StencilFuncSeparateATI_remap_index },
+   {  5353, ProgramEnvParameters4fvEXT_remap_index },
+   { 29477, ProgramLocalParameters4fvEXT_remap_index },
+   {  3619, EGLImageTargetRenderbufferStorageOES_remap_index },
+   {  3404, EGLImageTargetTexture2DOES_remap_index },
+   { 39207, AlphaFuncx_remap_index },
+   { 18563, ClearColorx_remap_index },
+   { 38472, ClearDepthx_remap_index },
+   { 34406, Color4x_remap_index },
+   { 22795, DepthRangex_remap_index },
    {  2223, Fogx_remap_index },
-   { 14139, Fogxv_remap_index },
-   {  8310, Frustumf_remap_index },
-   {  8383, Frustumx_remap_index },
-   { 18472, LightModelx_remap_index },
-   { 30901, LightModelxv_remap_index },
-   { 27876, Lightx_remap_index },
-   { 39964, Lightxv_remap_index },
-   {  3367, LineWidthx_remap_index },
-   { 36000, LoadMatrixx_remap_index },
-   { 40887, Materialx_remap_index },
-   { 24356, Materialxv_remap_index },
-   { 28056, MultMatrixx_remap_index },
-   { 30177, MultiTexCoord4x_remap_index },
-   { 24205, Normal3x_remap_index },
-   { 14735, Orthof_remap_index },
-   { 14916, Orthox_remap_index },
-   { 26546, PointSizex_remap_index },
+   { 14100, Fogxv_remap_index },
+   {  8301, Frustumf_remap_index },
+   {  8374, Frustumx_remap_index },
+   { 18483, LightModelx_remap_index },
+   { 30871, LightModelxv_remap_index },
+   { 27821, Lightx_remap_index },
+   { 39934, Lightxv_remap_index },
+   {  3334, LineWidthx_remap_index },
+   { 35970, LoadMatrixx_remap_index },
+   { 40857, Materialx_remap_index },
+   { 24333, Materialxv_remap_index },
+   { 28001, MultMatrixx_remap_index },
+   { 30122, MultiTexCoord4x_remap_index },
+   { 24182, Normal3x_remap_index },
+   { 14720, Orthof_remap_index },
+   { 14901, Orthox_remap_index },
+   { 26491, PointSizex_remap_index },
    {    70, PolygonOffsetx_remap_index },
-   { 35777, Rotatex_remap_index },
-   { 19128, SampleCoveragex_remap_index },
-   { 12161, Scalex_remap_index },
-   { 36873, TexEnvx_remap_index },
-   { 41498, TexEnvxv_remap_index },
+   { 35747, Rotatex_remap_index },
+   { 19139, SampleCoveragex_remap_index },
+   { 12122, Scalex_remap_index },
+   { 36843, TexEnvx_remap_index },
+   { 41468, TexEnvxv_remap_index },
    {  1893, TexParameterx_remap_index },
-   { 30478, Translatex_remap_index },
-   { 31751, ClipPlanef_remap_index },
-   { 31653, ClipPlanex_remap_index },
+   { 30448, Translatex_remap_index },
+   { 31721, ClipPlanef_remap_index },
+   { 31623, ClipPlanex_remap_index },
    {   707, GetClipPlanef_remap_index },
    {   570, GetClipPlanex_remap_index },
-   { 19046, GetFixedv_remap_index },
+   { 19057, GetFixedv_remap_index },
    {  1236, GetLightxv_remap_index },
-   { 21846, GetMaterialxv_remap_index },
-   { 20500, GetTexEnvxv_remap_index },
-   { 15945, GetTexParameterxv_remap_index },
-   { 28090, PointParameterx_remap_index },
-   {  5528, PointParameterxv_remap_index },
-   { 18244, TexParameterxv_remap_index },
+   { 21823, GetMaterialxv_remap_index },
+   { 20511, GetTexEnvxv_remap_index },
+   { 15956, GetTexParameterxv_remap_index },
+   { 28035, PointParameterx_remap_index },
+   {  5495, PointParameterxv_remap_index },
+   { 18255, TexParameterxv_remap_index },
    {    -1, -1 }
 };
 
 /* these functions are in the ABI, but have alternative names */
 static const struct gl_function_remap MESA_alt_functions[] = {
    /* from GL_EXT_blend_color */
-   { 32882, _gloffset_BlendColor },
+   { 32852, _gloffset_BlendColor },
    /* from GL_EXT_blend_minmax */
-   { 35297, _gloffset_BlendEquation },
+   { 35267, _gloffset_BlendEquation },
    /* from GL_EXT_color_subtable */
-   {  5130, _gloffset_ColorSubTable },
-   { 20401, _gloffset_CopyColorSubTable },
+   {  5097, _gloffset_ColorSubTable },
+   { 20412, _gloffset_CopyColorSubTable },
    /* from GL_EXT_convolution */
    {  1270, _gloffset_GetConvolutionParameteriv },
-   { 13102, _gloffset_ConvolutionParameterfv },
-   { 15807, _gloffset_CopyConvolutionFilter1D },
-   { 17756, _gloffset_SeparableFilter2D },
-   { 18922, _gloffset_GetConvolutionFilter },
-   { 22550, _gloffset_ConvolutionFilter1D },
-   { 24744, _gloffset_ConvolutionFilter2D },
-   { 27429, _gloffset_GetSeparableFilter },
-   { 28922, _gloffset_ConvolutionParameteri },
-   { 29044, _gloffset_ConvolutionParameterf },
-   { 34465, _gloffset_ConvolutionParameteriv },
-   { 40017, _gloffset_GetConvolutionParameterfv },
-   { 41073, _gloffset_CopyConvolutionFilter2D },
+   { 13063, _gloffset_ConvolutionParameterfv },
+   { 15818, _gloffset_CopyConvolutionFilter1D },
+   { 17767, _gloffset_SeparableFilter2D },
+   { 18933, _gloffset_GetConvolutionFilter },
+   { 22527, _gloffset_ConvolutionFilter1D },
+   { 24721, _gloffset_ConvolutionFilter2D },
+   { 27374, _gloffset_GetSeparableFilter },
+   { 28867, _gloffset_ConvolutionParameteri },
+   { 28989, _gloffset_ConvolutionParameterf },
+   { 34435, _gloffset_ConvolutionParameteriv },
+   { 39987, _gloffset_GetConvolutionParameterfv },
+   { 41043, _gloffset_CopyConvolutionFilter2D },
    /* from GL_EXT_copy_texture */
-   { 26172, _gloffset_CopyTexImage2D },
-   { 28714, _gloffset_CopyTexImage1D },
-   { 30938, _gloffset_CopyTexSubImage1D },
-   { 36711, _gloffset_CopyTexSubImage3D },
-   { 40273, _gloffset_CopyTexSubImage2D },
+   { 26149, _gloffset_CopyTexImage2D },
+   { 28659, _gloffset_CopyTexImage1D },
+   { 30908, _gloffset_CopyTexSubImage1D },
+   { 36681, _gloffset_CopyTexSubImage3D },
+   { 40243, _gloffset_CopyTexSubImage2D },
    /* from GL_EXT_draw_range_elements */
-   { 23767, _gloffset_DrawRangeElements },
+   { 23744, _gloffset_DrawRangeElements },
    /* from GL_EXT_histogram */
-   {  4373, _gloffset_GetHistogramParameterfv },
-   {  7718, _gloffset_GetHistogramParameteriv },
-   {  9000, _gloffset_Minmax },
-   { 13376, _gloffset_GetMinmax },
-   { 20997, _gloffset_Histogram },
-   { 28642, _gloffset_GetMinmaxParameteriv },
-   { 29569, _gloffset_ResetMinmax },
-   { 30438, _gloffset_GetHistogram },
-   { 32038, _gloffset_GetMinmaxParameterfv },
-   { 32958, _gloffset_ResetHistogram },
+   {  4340, _gloffset_GetHistogramParameterfv },
+   {  7709, _gloffset_GetHistogramParameteriv },
+   {  8991, _gloffset_Minmax },
+   { 13337, _gloffset_GetMinmax },
+   { 20974, _gloffset_Histogram },
+   { 28587, _gloffset_GetMinmaxParameteriv },
+   { 29514, _gloffset_ResetMinmax },
+   { 30408, _gloffset_GetHistogram },
+   { 32008, _gloffset_GetMinmaxParameterfv },
+   { 32928, _gloffset_ResetHistogram },
    /* from GL_EXT_paletted_texture */
-   { 12964, _gloffset_ColorTable },
-   { 17365, _gloffset_GetColorTableParameterfv },
-   { 25495, _gloffset_GetColorTable },
-   { 29100, _gloffset_GetColorTableParameteriv },
+   { 12925, _gloffset_ColorTable },
+   { 17376, _gloffset_GetColorTableParameterfv },
+   { 25472, _gloffset_GetColorTable },
+   { 29045, _gloffset_GetColorTableParameteriv },
    /* from GL_EXT_subtexture */
    {  2255, _gloffset_TexSubImage1D },
-   { 35012, _gloffset_TexSubImage2D },
+   { 34982, _gloffset_TexSubImage2D },
    /* from GL_EXT_texture3D */
-   { 21371, _gloffset_TexImage3D },
-   { 38934, _gloffset_TexSubImage3D },
+   { 21348, _gloffset_TexImage3D },
+   { 38904, _gloffset_TexSubImage3D },
    /* from GL_EXT_texture_object */
-   {  3996, _gloffset_GenTextures },
-   {  8430, _gloffset_BindTexture },
-   { 16588, _gloffset_IsTexture },
-   { 21691, _gloffset_PrioritizeTextures },
-   { 25695, _gloffset_DeleteTextures },
-   { 39367, _gloffset_AreTexturesResident },
+   {  3963, _gloffset_GenTextures },
+   {  8421, _gloffset_BindTexture },
+   { 16599, _gloffset_IsTexture },
+   { 21668, _gloffset_PrioritizeTextures },
+   { 25672, _gloffset_DeleteTextures },
+   { 39337, _gloffset_AreTexturesResident },
    /* from GL_EXT_vertex_array */
-   { 17854, _gloffset_ArrayElement },
-   { 28133, _gloffset_DrawArrays },
-   { 37326, _gloffset_GetPointerv },
+   { 17865, _gloffset_ArrayElement },
+   { 28078, _gloffset_DrawArrays },
+   { 37296, _gloffset_GetPointerv },
    /* from GL_NV_read_buffer */
-   { 28891, _gloffset_ReadBuffer },
+   { 28836, _gloffset_ReadBuffer },
    /* from GL_OES_blend_subtract */
-   { 35297, _gloffset_BlendEquation },
+   { 35267, _gloffset_BlendEquation },
    /* from GL_OES_texture_3D */
-   { 21371, _gloffset_TexImage3D },
-   { 36711, _gloffset_CopyTexSubImage3D },
-   { 38934, _gloffset_TexSubImage3D },
+   { 21348, _gloffset_TexImage3D },
+   { 36681, _gloffset_CopyTexSubImage3D },
+   { 38904, _gloffset_TexSubImage3D },
    /* from GL_OES_texture_cube_map */
-   { 16174, _gloffset_TexGeni },
-   { 16202, _gloffset_TexGenf },
-   { 19455, _gloffset_GetTexGenfv },
-   { 32833, _gloffset_TexGeniv },
-   { 35121, _gloffset_TexGenfv },
-   { 40568, _gloffset_GetTexGeniv },
+   { 16185, _gloffset_TexGeni },
+   { 16213, _gloffset_TexGenf },
+   { 19466, _gloffset_GetTexGenfv },
+   { 32803, _gloffset_TexGeniv },
+   { 35091, _gloffset_TexGenfv },
+   { 40538, _gloffset_GetTexGeniv },
    /* from GL_SGI_color_table */
    {  2559, _gloffset_ColorTableParameteriv },
-   { 12964, _gloffset_ColorTable },
-   { 16532, _gloffset_ColorTableParameterfv },
-   { 17365, _gloffset_GetColorTableParameterfv },
-   { 25495, _gloffset_GetColorTable },
-   { 25573, _gloffset_CopyColorTable },
-   { 29100, _gloffset_GetColorTableParameteriv },
+   { 12925, _gloffset_ColorTable },
+   { 16543, _gloffset_ColorTableParameterfv },
+   { 17376, _gloffset_GetColorTableParameterfv },
+   { 25472, _gloffset_GetColorTable },
+   { 25550, _gloffset_CopyColorTable },
+   { 29045, _gloffset_GetColorTableParameteriv },
    {    -1, -1 }
 };
 
diff --git a/xorg-server/hw/kdrive/ephyr/Makefile.am b/xorg-server/hw/kdrive/ephyr/Makefile.am
index 6b790fddd..040993ce0 100644
--- a/xorg-server/hw/kdrive/ephyr/Makefile.am
+++ b/xorg-server/hw/kdrive/ephyr/Makefile.am
@@ -27,12 +27,20 @@ AM_CPPFLAGS = 			\
 	@XEPHYR_INCS@		\
 	@XEPHYR_CFLAGS@		\
 	-I$(top_srcdir)		\
+	-I$(top_srcdir)/glamor	\
 	-I$(top_srcdir)/exa
 
 if XV
 XV_SRCS = ephyrvideo.c
 endif
 
+if GLAMOR
+GLAMOR_SRCS = \
+	ephyr_glamor_glx.c \
+	ephyr_glamor_glx.h \
+	()
+endif
+
 if DRI
 DRI_SRCS =			\
 	ephyrdriext.c		\
@@ -59,14 +67,24 @@ Xephyr_SOURCES = \
 	hostx.h \
 	$(XV_SRCS) \
 	$(DRI_SRCS) \
+	$(GLAMOR_SRCS) \
 	$()
 
+if GLAMOR
+AM_CPPFLAGS += $(XLIB_CFLAGS)
+XEPHYR_GLAMOR_LIB = \
+	$(top_builddir)/glamor/libglamor.la \
+	$(top_builddir)/glamor/libglamor_egl_stubs.la \
+	$()
+endif
+
 Xephyr_LDADD = 						\
 	$(top_builddir)/exa/libexa.la			\
+	$(XEPHYR_GLAMOR_LIB)				\
 	@KDRIVE_LIBS@					\
 	@XEPHYR_LIBS@
 
-Xephyr_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@
+Xephyr_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@ $(XEPHYR_GLAMOR_LIB)
 
 Xephyr_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
 
diff --git a/xorg-server/hw/kdrive/ephyr/ephyr.c b/xorg-server/hw/kdrive/ephyr/ephyr.c
index ba22ba225..42629692b 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyr.c
+++ b/xorg-server/hw/kdrive/ephyr/ephyr.c
@@ -43,9 +43,15 @@
 #include "ephyrglxext.h"
 #endif                          /* XF86DRI */
 
+#ifdef GLAMOR
+#include "glamor.h"
+#endif
+#include "ephyr_glamor_glx.h"
+
 #include "xkbsrv.h"
 
 extern int KdTsPhyScreen;
+extern Bool ephyr_glamor;
 
 KdKeyboardInfo *ephyrKbd;
 KdPointerInfo *ephyrMouse;
@@ -329,15 +335,19 @@ ephyrInternalDamageRedisplay(ScreenPtr pScreen)
         int nbox;
         BoxPtr pbox;
 
-        nbox = RegionNumRects(pRegion);
-        pbox = RegionRects(pRegion);
-
-        while (nbox--) {
-            hostx_paint_rect(screen,
-                             pbox->x1, pbox->y1,
-                             pbox->x1, pbox->y1,
-                             pbox->x2 - pbox->x1, pbox->y2 - pbox->y1);
-            pbox++;
+        if (ephyr_glamor) {
+            ephyr_glamor_damage_redisplay(scrpriv->glamor, pRegion);
+        } else {
+            nbox = RegionNumRects(pRegion);
+            pbox = RegionRects(pRegion);
+
+            while (nbox--) {
+                hostx_paint_rect(screen,
+                                 pbox->x1, pbox->y1,
+                                 pbox->x1, pbox->y1,
+                                 pbox->x2 - pbox->x1, pbox->y2 - pbox->y1);
+                pbox++;
+            }
         }
         DamageEmpty(scrpriv->pDamage);
     }
@@ -665,6 +675,7 @@ ephyrInitScreen(ScreenPtr pScreen)
     return TRUE;
 }
 
+
 Bool
 ephyrFinishInitScreen(ScreenPtr pScreen)
 {
@@ -682,6 +693,12 @@ ephyrFinishInitScreen(ScreenPtr pScreen)
     return TRUE;
 }
 
+/**
+ * Called by kdrive after calling down the
+ * pScreen->CreateScreenResources() chain, this gives us a chance to
+ * make any pixmaps after the screen and all extensions have been
+ * initialized.
+ */
 Bool
 ephyrCreateResources(ScreenPtr pScreen)
 {
@@ -696,8 +713,13 @@ ephyrCreateResources(ScreenPtr pScreen)
         return KdShadowSet(pScreen,
                            scrpriv->randr,
                            ephyrShadowUpdate, ephyrWindowLinear);
-    else
+    else {
+#ifdef GLAMOR
+        if (ephyr_glamor)
+            ephyr_glamor_create_screen_resources(pScreen);
+#endif
         return ephyrSetInternalDamage(pScreen);
+    }
 }
 
 void
@@ -1212,6 +1234,9 @@ ephyrPoll(void)
             break;
         }
 
+        if (ephyr_glamor)
+            ephyr_glamor_process_event(xev);
+
         free(xev);
     }
 }
diff --git a/xorg-server/hw/kdrive/ephyr/ephyr.h b/xorg-server/hw/kdrive/ephyr/ephyr.h
index d66c76e1e..386143eff 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyr.h
+++ b/xorg-server/hw/kdrive/ephyr/ephyr.h
@@ -82,6 +82,12 @@ typedef struct _ephyrScrPriv {
 
     KdScreenInfo *screen;
     int mynum;                  /* Screen number */
+
+    /**
+     * Per-screen Xlib-using state for glamor (private to
+     * ephyr_glamor_glx.c)
+     */
+    struct ephyr_glamor *glamor;
 } EphyrScrPriv;
 
 extern KdCardFuncs ephyrFuncs;
@@ -207,6 +213,14 @@ void
 void
  ephyrDrawFini(ScreenPtr pScreen);
 
+/* hostx.c glamor support */
+Bool ephyr_glamor_init(ScreenPtr pScreen);
+Bool ephyr_glamor_create_screen_resources(ScreenPtr pScreen);
+void ephyr_glamor_enable(ScreenPtr pScreen);
+void ephyr_glamor_disable(ScreenPtr pScreen);
+void ephyr_glamor_fini(ScreenPtr pScreen);
+void ephyr_glamor_host_paint_rect(ScreenPtr pScreen);
+
 /*ephyvideo.c*/
 
 Bool ephyrInitVideo(ScreenPtr pScreen);
diff --git a/xorg-server/hw/kdrive/ephyr/ephyr_glamor_glx.c b/xorg-server/hw/kdrive/ephyr/ephyr_glamor_glx.c
new file mode 100644
index 000000000..d56907fe7
--- /dev/null
+++ b/xorg-server/hw/kdrive/ephyr/ephyr_glamor_glx.c
@@ -0,0 +1,331 @@
+/*
+ * Copyright © 2013 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+/** @file ephyr_glamor_glx.c
+ *
+ * Separate file for hiding Xlib and GLX-using parts of xephyr from
+ * the rest of the server-struct-aware build.
+ */
+
+#include <stdlib.h>
+#include <X11/Xlib.h>
+#include <X11/Xlibint.h>
+#undef Xcalloc
+#undef Xrealloc
+#undef Xfree
+#include <X11/Xlib-xcb.h>
+#include <xcb/xcb_aux.h>
+#include <pixman.h>
+#include <epoxy/glx.h>
+#include "ephyr_glamor_glx.h"
+#include "os.h"
+#include <X11/Xproto.h>
+
+/** @{
+ *
+ * global state for Xephyr with glamor.
+ *
+ * Xephyr can render with multiple windows, but all the windows have
+ * to be on the same X connection and all have to have the same
+ * visual.
+ */
+static Display *dpy;
+static XVisualInfo *visual_info;
+static GLXFBConfig fb_config;
+/** @} */
+
+/**
+ * Per-screen state for Xephyr with glamor.
+ */
+struct ephyr_glamor {
+    GLXContext ctx;
+    Window win;
+    GLXWindow glx_win;
+
+    GLuint tex;
+
+    GLuint texture_shader;
+    GLuint texture_shader_position_loc;
+    GLuint texture_shader_texcoord_loc;
+};
+
+static GLint
+ephyr_glamor_compile_glsl_prog(GLenum type, const char *source)
+{
+    GLint ok;
+    GLint prog;
+
+    prog = glCreateShader(type);
+    glShaderSource(prog, 1, (const GLchar **) &source, NULL);
+    glCompileShader(prog);
+    glGetShaderiv(prog, GL_COMPILE_STATUS, &ok);
+    if (!ok) {
+        GLchar *info;
+        GLint size;
+
+        glGetShaderiv(prog, GL_INFO_LOG_LENGTH, &size);
+        info = malloc(size);
+        if (info) {
+            glGetShaderInfoLog(prog, size, NULL, info);
+            ErrorF("Failed to compile %s: %s\n",
+                   type == GL_FRAGMENT_SHADER ? "FS" : "VS", info);
+            ErrorF("Program source:\n%s", source);
+            free(info);
+        }
+        else
+            ErrorF("Failed to get shader compilation info.\n");
+        FatalError("GLSL compile failure\n");
+    }
+
+    return prog;
+}
+
+static GLuint
+ephyr_glamor_build_glsl_prog(GLuint vs, GLuint fs)
+{
+    GLint ok;
+    GLuint prog;
+
+    prog = glCreateProgram();
+    glAttachShader(prog, vs);
+    glAttachShader(prog, fs);
+
+    glLinkProgram(prog);
+    glGetProgramiv(prog, GL_LINK_STATUS, &ok);
+    if (!ok) {
+        GLchar *info;
+        GLint size;
+
+        glGetProgramiv(prog, GL_INFO_LOG_LENGTH, &size);
+        info = malloc(size);
+
+        glGetProgramInfoLog(prog, size, NULL, info);
+        ErrorF("Failed to link: %s\n", info);
+        FatalError("GLSL link failure\n");
+    }
+
+    return prog;
+}
+
+static void
+ephyr_glamor_setup_texturing_shader(struct ephyr_glamor *glamor)
+{
+    const char *vs_source =
+        "attribute vec2 texcoord;\n"
+        "attribute vec2 position;\n"
+        "varying vec2 t;\n"
+        "\n"
+        "void main()\n"
+        "{\n"
+        "    t = texcoord;\n"
+        "    gl_Position = vec4(position, 0, 1);\n"
+        "}\n";
+
+    const char *fs_source =
+        "varying vec2 t;\n"
+        "uniform sampler2D s; /* initially 0 */\n"
+        "\n"
+        "void main()\n"
+        "{\n"
+        "    gl_FragColor = texture2D(s, t);\n"
+        "}\n";
+
+    GLuint fs, vs, prog;
+
+    vs = ephyr_glamor_compile_glsl_prog(GL_VERTEX_SHADER, vs_source);
+    fs = ephyr_glamor_compile_glsl_prog(GL_FRAGMENT_SHADER, fs_source);
+    prog = ephyr_glamor_build_glsl_prog(vs, fs);
+
+    glamor->texture_shader = prog;
+    glamor->texture_shader_position_loc = glGetAttribLocation(prog, "position");
+    assert(glamor->texture_shader_position_loc != -1);
+    glamor->texture_shader_texcoord_loc = glGetAttribLocation(prog, "texcoord");
+    assert(glamor->texture_shader_texcoord_loc != -1);
+}
+
+xcb_connection_t *
+ephyr_glamor_connect(void)
+{
+    dpy = XOpenDisplay(NULL);
+    if (!dpy)
+        return NULL;
+
+    XSetEventQueueOwner(dpy, XCBOwnsEventQueue);
+
+    return XGetXCBConnection(dpy);
+}
+
+void
+ephyr_glamor_set_texture(struct ephyr_glamor *glamor, uint32_t tex)
+{
+    glamor->tex = tex;
+}
+
+void
+ephyr_glamor_damage_redisplay(struct ephyr_glamor *glamor,
+                              struct pixman_region16 *damage)
+{
+    /* Redraw the whole screen, since glXSwapBuffers leaves the back
+     * buffer undefined.
+     */
+    static const float position[] = {
+        -1, -1,
+         1, -1,
+         1,  1,
+        -1,  1,
+    };
+    static const float texcoords[] = {
+        0, 1,
+        1, 1,
+        1, 0,
+        0, 0,
+    };
+
+    glXMakeCurrent(dpy, glamor->glx_win, glamor->ctx);
+
+    glBindFramebuffer(GL_FRAMEBUFFER, 0);
+    glUseProgram(glamor->texture_shader);
+
+    glVertexAttribPointer(glamor->texture_shader_position_loc,
+                          2, GL_FLOAT, FALSE, 0, position);
+    glVertexAttribPointer(glamor->texture_shader_texcoord_loc,
+                          2, GL_FLOAT, FALSE, 0, texcoords);
+    glEnableVertexAttribArray(glamor->texture_shader_position_loc);
+    glEnableVertexAttribArray(glamor->texture_shader_texcoord_loc);
+
+    glActiveTexture(GL_TEXTURE0);
+    glBindTexture(GL_TEXTURE_2D, glamor->tex);
+    glDrawArrays(GL_TRIANGLE_FAN, 0, 4);
+
+    glDisableVertexAttribArray(glamor->texture_shader_position_loc);
+    glDisableVertexAttribArray(glamor->texture_shader_texcoord_loc);
+
+    glXSwapBuffers(dpy, glamor->glx_win);
+}
+
+/**
+ * Xlib-based handling of xcb events for glamor.
+ *
+ * We need to let the Xlib event filtering run on the event so that
+ * Mesa's dri2_glx.c userspace event mangling gets run, and we
+ * correctly get our invalidate events propagated into the driver.
+ */
+void
+ephyr_glamor_process_event(xcb_generic_event_t *xev)
+{
+
+    uint32_t response_type = xev->response_type & 0x7f;
+    /* Note the types on wire_to_event: there's an Xlib XEvent (with
+     * the broken types) that it returns, and a protocol xEvent that
+     * it inspects.
+     */
+    Bool (*wire_to_event)(Display *dpy, XEvent *ret, xEvent *event);
+
+    XLockDisplay(dpy);
+    /* Set the event handler to NULL to get access to the current one. */
+    wire_to_event = XESetWireToEvent(dpy, response_type, NULL);
+    if (wire_to_event) {
+        XEvent processed_event;
+
+        /* OK they had an event handler.  Plug it back in, and call
+         * through to it.
+         */
+        XESetWireToEvent(dpy, response_type, wire_to_event);
+        xev->sequence = LastKnownRequestProcessed(dpy);
+        wire_to_event(dpy, &processed_event, (xEvent *)xev);
+    }
+    XUnlockDisplay(dpy);
+}
+
+struct ephyr_glamor *
+ephyr_glamor_glx_screen_init(xcb_window_t win)
+{
+    GLXContext ctx;
+    struct ephyr_glamor *glamor;
+    GLXWindow glx_win;
+
+    glamor = calloc(1, sizeof(struct ephyr_glamor));
+    if (!glamor) {
+        FatalError("malloc");
+        return NULL;
+    }
+
+    glx_win = glXCreateWindow(dpy, fb_config, win, NULL);
+
+    ctx = glXCreateContext(dpy, visual_info, NULL, True);
+    if (ctx == NULL)
+        FatalError("glXCreateContext failed\n");
+
+    if (!glXMakeCurrent(dpy, glx_win, ctx))
+        FatalError("glXMakeCurrent failed\n");
+
+    glamor->ctx = ctx;
+    glamor->win = win;
+    glamor->glx_win = glx_win;
+    ephyr_glamor_setup_texturing_shader(glamor);
+
+    return glamor;
+}
+
+void
+ephyr_glamor_glx_screen_fini(struct ephyr_glamor *glamor)
+{
+    glXMakeCurrent(dpy, None, NULL);
+    glXDestroyContext(dpy, glamor->ctx);
+    glXDestroyWindow(dpy, glamor->glx_win);
+
+    free(glamor);
+}
+
+xcb_visualtype_t *
+ephyr_glamor_get_visual(void)
+{
+    xcb_screen_t *xscreen =
+        xcb_aux_get_screen(XGetXCBConnection(dpy), DefaultScreen(dpy));
+    int attribs[] = {
+        GLX_RENDER_TYPE, GLX_RGBA_BIT,
+        GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT,
+        GLX_RED_SIZE, 1,
+        GLX_GREEN_SIZE, 1,
+        GLX_BLUE_SIZE, 1,
+        GLX_DOUBLEBUFFER, 1,
+        None
+    };
+    int event_base = 0, error_base = 0, nelements;
+    GLXFBConfig *fbconfigs;
+
+    if (!glXQueryExtension (dpy, &error_base, &event_base))
+        FatalError("Couldn't find GLX extension\n");
+
+    fbconfigs = glXChooseFBConfig(dpy, DefaultScreen(dpy), attribs, &nelements);
+    if (!nelements)
+        FatalError("Couldn't choose an FBConfig\n");
+    fb_config = fbconfigs[0];
+    free(fbconfigs);
+
+    visual_info = glXGetVisualFromFBConfig(dpy, fb_config);
+    if (visual_info == NULL)
+        FatalError("Couldn't get RGB visual\n");
+
+    return xcb_aux_find_visual_by_id(xscreen, visual_info->visualid);
+}
diff --git a/xorg-server/hw/kdrive/ephyr/ephyr_glamor_glx.h b/xorg-server/hw/kdrive/ephyr/ephyr_glamor_glx.h
new file mode 100644
index 000000000..8995e1eca
--- /dev/null
+++ b/xorg-server/hw/kdrive/ephyr/ephyr_glamor_glx.h
@@ -0,0 +1,73 @@
+/*
+ * Copyright © 2013 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+/**
+ * ephyr_glamor_glx.h
+ *
+ * Prototypes exposed by ephyr_glamor_glx.c, without including any
+ * server headers.
+ */
+
+#include <xcb/xcb.h>
+#include "dix-config.h"
+
+struct ephyr_glamor;
+struct pixman_region16;
+
+xcb_connection_t *
+ephyr_glamor_connect(void);
+
+void
+ephyr_glamor_set_texture(struct ephyr_glamor *ephyr_glamor, uint32_t tex);
+
+xcb_visualtype_t *
+ephyr_glamor_get_visual(void);
+
+struct ephyr_glamor *
+ephyr_glamor_glx_screen_init(xcb_window_t win);
+
+void
+ephyr_glamor_glx_screen_fini(struct ephyr_glamor *glamor);
+
+#ifdef GLAMOR
+void
+ephyr_glamor_damage_redisplay(struct ephyr_glamor *glamor,
+                              struct pixman_region16 *damage);
+
+void
+ephyr_glamor_process_event(xcb_generic_event_t *xev);
+
+#else /* !GLAMOR */
+
+static inline void
+ephyr_glamor_damage_redisplay(struct ephyr_glamor *glamor,
+                              struct pixman_region16 *damage)
+{
+}
+
+static inline void
+ephyr_glamor_process_event(xcb_generic_event_t *xev)
+{
+}
+
+#endif /* !GLAMOR */
diff --git a/xorg-server/hw/kdrive/ephyr/ephyrinit.c b/xorg-server/hw/kdrive/ephyr/ephyrinit.c
index 20e8033a9..5b8d09ff0 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyrinit.c
+++ b/xorg-server/hw/kdrive/ephyr/ephyrinit.c
@@ -35,6 +35,7 @@ extern Bool EphyrWantGrayScale;
 extern Bool EphyrWantResize;
 extern Bool kdHasPointer;
 extern Bool kdHasKbd;
+extern Bool ephyr_glamor;
 
 #ifdef GLXEXT
 extern Bool ephyrNoDRI;
@@ -139,6 +140,9 @@ ddxUseMsg(void)
     ErrorF("-fullscreen          Attempt to run Xephyr fullscreen\n");
     ErrorF("-grayscale           Simulate 8bit grayscale\n");
     ErrorF("-resizeable          Make Xephyr windows resizeable\n");
+#ifdef GLAMOR
+    ErrorF("-glamor              Enable 2D acceleration using glamor\n");
+#endif
     ErrorF
         ("-fakexa              Simulate acceleration using software rendering\n");
     ErrorF("-verbosity <level>   Set log verbosity level\n");
@@ -244,6 +248,16 @@ ddxProcessArgument(int argc, char **argv, int i)
         EphyrWantResize = 1;
         return 1;
     }
+#ifdef GLAMOR
+    else if (!strcmp (argv[i], "-glamor")) {
+        ephyr_glamor = TRUE;
+        ephyrFuncs.initAccel = ephyr_glamor_init;
+        ephyrFuncs.enableAccel = ephyr_glamor_enable;
+        ephyrFuncs.disableAccel = ephyr_glamor_disable;
+        ephyrFuncs.finiAccel = ephyr_glamor_fini;
+        return 1;
+    }
+#endif
     else if (!strcmp(argv[i], "-fakexa")) {
         ephyrFuncs.initAccel = ephyrDrawInit;
         ephyrFuncs.enableAccel = ephyrDrawEnable;
diff --git a/xorg-server/hw/kdrive/ephyr/hostx.c b/xorg-server/hw/kdrive/ephyr/hostx.c
index dcf7af006..1c3b57477 100644..100755
--- a/xorg-server/hw/kdrive/ephyr/hostx.c
+++ b/xorg-server/hw/kdrive/ephyr/hostx.c
@@ -36,6 +36,7 @@
 #include <string.h>             /* for memset */
 #include <errno.h>
 #include <time.h>
+#include <err.h>
 
 #ifndef _MSC_VER
 #include <sys/ipc.h>
@@ -56,6 +57,11 @@
 #include <xcb/xf86dri.h>
 #include <xcb/glx.h>
 #endif /* XF86DRI */
+#ifdef GLAMOR
+#include <epoxy/gl.h>
+#include "glamor.h"
+#include "ephyr_glamor_glx.h"
+#endif
 #include "ephyrlog.h"
 #include "ephyr.h"
 
@@ -92,6 +98,7 @@ extern Bool EphyrWantResize;
 char *ephyrResName = NULL;
 int ephyrResNameFromCmd = 0;
 char *ephyrTitle = NULL;
+Bool ephyr_glamor = FALSE;
 
 static void
  hostx_set_fullscreen_hint(void);
@@ -308,7 +315,12 @@ hostx_init(void)
         | XCB_EVENT_MASK_STRUCTURE_NOTIFY;
 
     EPHYR_DBG("mark");
-    HostX.conn = xcb_connect(NULL, &HostX.screen);
+#ifdef GLAMOR
+    if (ephyr_glamor)
+        HostX.conn = ephyr_glamor_connect();
+    else
+#endif
+        HostX.conn = xcb_connect(NULL, &HostX.screen);
     if (xcb_connection_has_error(HostX.conn)) {
         fprintf(stderr, "\nXephyr cannot open host display. Is DISPLAY set?\n");
         exit(1);
@@ -318,7 +330,12 @@ hostx_init(void)
     HostX.winroot = xscreen->root;
     HostX.gc = xcb_generate_id(HostX.conn);
     HostX.depth = xscreen->root_depth;
-    HostX.visual  = xcb_aux_find_visual_by_id(xscreen, xscreen->root_visual);
+#ifdef GLAMOR
+    if (ephyr_glamor)
+        HostX.visual = ephyr_glamor_get_visual();
+    else
+#endif
+        HostX.visual = xcb_aux_find_visual_by_id(xscreen,xscreen->root_visual);
 
     xcb_create_gc(HostX.conn, HostX.gc, HostX.winroot, 0, NULL);
     cookie_WINDOW_STATE = xcb_intern_atom(HostX.conn, FALSE,
@@ -656,7 +673,7 @@ hostx_screen_init(KdScreenInfo *screen,
         }
     }
 
-    if (HostX.have_shm) {
+    if (!ephyr_glamor && HostX.have_shm) {
 #ifdef _MSC_VER
 __asm int 3;
 #else
@@ -695,7 +712,7 @@ __asm int 3;
 #endif
     }
 
-    if (!shm_success) {
+    if (!ephyr_glamor && !shm_success) {
         EPHYR_DBG("Creating image %dx%d for screen scrpriv=%p\n",
                   width, buffer_height, scrpriv);
         scrpriv->ximg = xcb_image_create_native(HostX.conn,
@@ -729,7 +746,11 @@ __asm int 3;
     scrpriv->win_width = width;
     scrpriv->win_height = height;
 
-    if (host_depth_matches_server(scrpriv)) {
+    if (ephyr_glamor) {
+        *bytes_per_line = 0;
+        *bits_per_pixel = 0;
+        return NULL;
+    } else if (host_depth_matches_server(scrpriv)) {
         *bytes_per_line = scrpriv->ximg->stride;
         *bits_per_pixel = scrpriv->ximg->bpp;
 
@@ -760,6 +781,23 @@ hostx_paint_rect(KdScreenInfo *screen,
 
     EPHYR_DBG("painting in screen %d\n", scrpriv->mynum);
 
+#ifdef GLAMOR
+    if (ephyr_glamor) {
+        BoxRec box;
+        RegionRec region;
+
+        box.x1 = dx;
+        box.y1 = dy;
+        box.x2 = dx + width;
+        box.y2 = dy + height;
+
+        RegionInit(&region, &box, 1);
+        ephyr_glamor_damage_redisplay(scrpriv->glamor, &region);
+        RegionUninit(&region);
+        return;
+    }
+#endif
+
     /*
      *  Copy the image data updated by the shadow layer
      *  on to the window
@@ -1196,3 +1234,86 @@ hostx_get_resource_id_peer(int a_local_resource_id, int *a_remote_resource_id)
 }
 
 #endif                          /* XF86DRI */
+
+#ifdef GLAMOR
+Bool
+ephyr_glamor_init(ScreenPtr screen)
+{
+    KdScreenPriv(screen);
+    KdScreenInfo *kd_screen = pScreenPriv->screen;
+    EphyrScrPriv *scrpriv = kd_screen->driver;
+
+    scrpriv->glamor = ephyr_glamor_glx_screen_init(scrpriv->win);
+
+    glamor_init(screen,
+                GLAMOR_USE_SCREEN |
+                GLAMOR_USE_PICTURE_SCREEN |
+                GLAMOR_INVERTED_Y_AXIS);
+
+    return TRUE;
+}
+
+Bool
+ephyr_glamor_create_screen_resources(ScreenPtr pScreen)
+{
+    KdScreenPriv(pScreen);
+    KdScreenInfo *kd_screen = pScreenPriv->screen;
+    EphyrScrPriv *scrpriv = kd_screen->driver;
+    PixmapPtr screen_pixmap;
+    uint32_t tex;
+
+    if (!ephyr_glamor)
+        return TRUE;
+
+    if (!glamor_glyphs_init(pScreen))
+        return FALSE;
+
+    /* kdrive's fbSetupScreen() told mi to have
+     * miCreateScreenResources() (which is called before this) make a
+     * scratch pixmap wrapping ephyr-glamor's NULL
+     * KdScreenInfo->fb.framebuffer.
+     *
+     * We want a real (texture-based) screen pixmap at this point.
+     * This is what glamor will render into, and we'll then texture
+     * out of that into the host's window to present the results.
+     *
+     * Thus, delete the current screen pixmap, and put a fresh one in.
+     */
+    screen_pixmap = pScreen->GetScreenPixmap(pScreen);
+    pScreen->DestroyPixmap(screen_pixmap);
+
+    screen_pixmap = pScreen->CreatePixmap(pScreen,
+                                          pScreen->width,
+                                          pScreen->height,
+                                          pScreen->rootDepth, 0);
+    pScreen->SetScreenPixmap(screen_pixmap);
+
+    /* Tell the GLX code what to GL texture to read from. */
+    tex = glamor_get_pixmap_texture(screen_pixmap);
+    ephyr_glamor_set_texture(scrpriv->glamor, tex);
+
+    return TRUE;
+}
+
+void
+ephyr_glamor_enable(ScreenPtr screen)
+{
+}
+
+void
+ephyr_glamor_disable(ScreenPtr screen)
+{
+}
+
+void
+ephyr_glamor_fini(ScreenPtr screen)
+{
+    KdScreenPriv(screen);
+    KdScreenInfo *kd_screen = pScreenPriv->screen;
+    EphyrScrPriv *scrpriv = kd_screen->driver;
+
+    glamor_fini(screen);
+    ephyr_glamor_glx_screen_fini(scrpriv->glamor);
+    scrpriv->glamor = NULL;
+}
+#endif
diff --git a/xorg-server/hw/xfree86/Makefile.am b/xorg-server/hw/xfree86/Makefile.am
index 96729043d..73e1b4c1f 100644
--- a/xorg-server/hw/xfree86/Makefile.am
+++ b/xorg-server/hw/xfree86/Makefile.am
@@ -14,6 +14,10 @@ DRI3_BUILDDIR = $(top_builddir)/dri3
 DRI3_LIB = $(DRI3_BUILDDIR)/libdri3.la
 endif
 
+if GLAMOR_EGL
+GLAMOR_EGL_SUBDIR = glamor_egl
+endif
+
 if XF86UTILS
 XF86UTILS_SUBDIR = utils
 endif
@@ -33,7 +37,8 @@ endif
 SUBDIRS = common ddc x86emu $(INT10_SUBDIR) os-support parser \
 	  ramdac $(VGAHW_SUBDIR) loader modes $(DRI_SUBDIR) \
 	  $(DRI2_SUBDIR) . $(VBE_SUBDIR) i2c dixmods \
-	  fbdevhw shadowfb exa $(XF86UTILS_SUBDIR) doc man
+	  fbdevhw shadowfb exa $(XF86UTILS_SUBDIR) doc man \
+	  $(GLAMOR_EGL_SUBDIR)
 
 DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \
                parser ramdac shadowfb vbe vgahw \
diff --git a/xorg-server/hw/xfree86/common/xf86Events.c b/xorg-server/hw/xfree86/common/xf86Events.c
index 7b53949fa..06af73903 100644
--- a/xorg-server/hw/xfree86/common/xf86Events.c
+++ b/xorg-server/hw/xfree86/common/xf86Events.c
@@ -85,6 +85,8 @@
 #endif
 
 #include "xf86platformBus.h"
+#include "systemd-logind.h"
+
 /*
  * This is a toggling variable:
  *  FALSE = No VT switching keys have been pressed last time around
@@ -556,8 +558,11 @@ xf86VTEnter(void)
     /* Turn screen saver off when switching back */
     dixSaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);
 
-    for (pInfo = xf86InputDevs; pInfo; pInfo = pInfo->next)
-        xf86EnableInputDeviceForVTSwitch(pInfo);
+    /* If we use systemd-logind it will enable input devices for us */
+    if (!systemd_logind_controls_session())
+        for (pInfo = xf86InputDevs; pInfo; pInfo = pInfo->next)
+            xf86EnableInputDeviceForVTSwitch(pInfo);
+
     for (ih = InputHandlers; ih; ih = ih->next) {
         if (ih->is_input)
             xf86EnableInputHandler(ih);
@@ -589,10 +594,14 @@ xf86VTSwitch(void)
     /*
      * Since all screens are currently all in the same state it is sufficient
      * check the first.  This might change in future.
+     *
+     * VTLeave is always handled here (VT_PROCESS guarantees this is safe),
+     * if we use systemd_logind xf86VTEnter() gets called by systemd-logind.c
+     * once it has resumed all drm nodes.
      */
     if (xf86VTOwner())
         xf86VTLeave();
-    else
+    else if (!systemd_logind_controls_session())
         xf86VTEnter();
 }
 
diff --git a/xorg-server/hw/xfree86/common/xf86Init.c b/xorg-server/hw/xfree86/common/xf86Init.c
index ff4d38f28..4579ff591 100644
--- a/xorg-server/hw/xfree86/common/xf86Init.c
+++ b/xorg-server/hw/xfree86/common/xf86Init.c
@@ -54,6 +54,7 @@
 #include "site.h"
 #include "mi.h"
 #include "dbus-core.h"
+#include "systemd-logind.h"
 
 #include "compiler.h"
 
@@ -458,6 +459,7 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv)
             DoShowOptions();
 
         dbus_core_init();
+        systemd_logind_init();
 
         /* Do a general bus probe.  This will be a PCI probe for x86 platforms */
         xf86BusProbe();
@@ -1062,6 +1064,7 @@ ddxGiveUp(enum ExitCode error)
     if (xorgHWOpenConsole)
         xf86CloseConsole();
 
+    systemd_logind_fini();
     dbus_core_fini();
 
     xf86CloseLog(error);
diff --git a/xorg-server/hw/xfree86/common/xf86Module.h b/xorg-server/hw/xfree86/common/xf86Module.h
index b6ec19d13..e8c24f26c 100644
--- a/xorg-server/hw/xfree86/common/xf86Module.h
+++ b/xorg-server/hw/xfree86/common/xf86Module.h
@@ -80,8 +80,8 @@ typedef enum {
  * mask is 0xFFFF0000.
  */
 #define ABI_ANSIC_VERSION	SET_ABI_VERSION(0, 4)
-#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(15, 0)
-#define ABI_XINPUT_VERSION	SET_ABI_VERSION(20, 0)
+#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(16, 0)
+#define ABI_XINPUT_VERSION	SET_ABI_VERSION(21, 0)
 #define ABI_EXTENSION_VERSION	SET_ABI_VERSION(8, 0)
 #define ABI_FONT_VERSION	SET_ABI_VERSION(0, 6)
 
diff --git a/xorg-server/hw/xfree86/common/xf86Xinput.c b/xorg-server/hw/xfree86/common/xf86Xinput.c
index f6f2b90dd..7c3e479e5 100644
--- a/xorg-server/hw/xfree86/common/xf86Xinput.c
+++ b/xorg-server/hw/xfree86/common/xf86Xinput.c
@@ -63,6 +63,7 @@
 #include "mipointer.h"
 #include "extinit.h"
 #include "loaderProcs.h"
+#include "systemd-logind.h"
 
 #include "exevents.h"           /* AddInputDevice */
 #include "exglobals.h"
@@ -80,6 +81,7 @@
 
 #include <stdarg.h>
 #include <stdint.h>             /* for int64_t */
+#include <unistd.h>
 
 #include "mi.h"
 
@@ -103,6 +105,9 @@
 static int
  xf86InputDevicePostInit(DeviceIntPtr dev);
 
+static InputInfoPtr *new_input_devices;
+static int new_input_devices_count;
+
 /**
  * Eval config and modify DeviceVelocityRec accordingly
  */
@@ -773,6 +778,11 @@ xf86DeleteInput(InputInfoPtr pInp, int flags)
         /* Else the entry wasn't in the xf86InputDevs list (ignore this). */
     }
 
+    if (pInp->flags & XI86_SERVER_FD) {
+        systemd_logind_release_fd(pInp->major, pInp->minor);
+        close(pInp->fd);
+    }
+
     free((void *) pInp->driver);
     free((void *) pInp->name);
     xf86optionListFree(pInp->options);
@@ -816,6 +826,7 @@ xf86NewInputDevice(InputInfoPtr pInfo, DeviceIntPtr *pdev, BOOL enable)
 {
     InputDriverPtr drv = NULL;
     DeviceIntPtr dev = NULL;
+    Bool paused;
     int rval;
 
     /* Memory leak for every attached device if we don't
@@ -830,6 +841,26 @@ xf86NewInputDevice(InputInfoPtr pInfo, DeviceIntPtr *pdev, BOOL enable)
         goto unwind;
     }
 
+    if (drv->capabilities & XI86_DRV_CAP_SERVER_FD) {
+        int fd = systemd_logind_take_fd(pInfo->major, pInfo->minor,
+                                        pInfo->attrs->device, &paused);
+        if (fd != -1) {
+            if (paused) {
+                /* Put on new_input_devices list for delayed probe */
+                new_input_devices = xnfrealloc(new_input_devices,
+                            sizeof(pInfo) * (new_input_devices_count + 1));
+                new_input_devices[new_input_devices_count] = pInfo;
+                new_input_devices_count++;
+                systemd_logind_release_fd(pInfo->major, pInfo->minor);
+                close(fd);
+                return BadMatch;
+            }
+            pInfo->fd = fd;
+            pInfo->flags |= XI86_SERVER_FD;
+            pInfo->options = xf86ReplaceIntOption(pInfo->options, "fd", fd);
+        }
+    }
+
     xf86Msg(X_INFO, "Using input driver '%s' for '%s'\n", drv->driverName,
             pInfo->name);
 
@@ -949,6 +980,12 @@ NewInputDeviceRequest(InputOption *options, InputAttributes * attrs,
                 goto unwind;
             }
         }
+
+        if (strcmp(key, "major") == 0)
+            pInfo->major = atoi(value);
+
+        if (strcmp(key, "minor") == 0)
+            pInfo->minor = atoi(value);
     }
 
     nt_list_for_each_entry(option, options, list.next) {
@@ -1469,4 +1506,32 @@ xf86PostTouchEvent(DeviceIntPtr dev, uint32_t touchid, uint16_t type,
     QueueTouchEvents(dev, type, touchid, flags, mask);
 }
 
+void
+xf86InputEnableVTProbe(void)
+{
+    int i, is_auto = 0;
+    InputOption *option = NULL;
+    DeviceIntPtr pdev;
+
+    for (i = 0; i < new_input_devices_count; i++) {
+        InputInfoPtr pInfo = new_input_devices[i];
+
+        is_auto = 0;
+        nt_list_for_each_entry(option, pInfo->options, list.next) {
+            const char *key = input_option_get_key(option);
+            const char *value = input_option_get_value(option);
+
+            if (strcmp(key, "_source") == 0 &&
+                (strcmp(value, "server/hal") == 0 ||
+                 strcmp(value, "server/udev") == 0 ||
+                 strcmp(value, "server/wscons") == 0))
+                is_auto = 1;
+        }
+        xf86NewInputDevice(pInfo, &pdev,
+                                  (!is_auto ||
+                                   (is_auto && xf86Info.autoEnableDevices)));
+    }
+    new_input_devices_count = 0;
+}
+
 /* end of xf86Xinput.c */
diff --git a/xorg-server/hw/xfree86/common/xf86Xinput.h b/xorg-server/hw/xfree86/common/xf86Xinput.h
index b6d125128..9fe8c87b6 100644
--- a/xorg-server/hw/xfree86/common/xf86Xinput.h
+++ b/xorg-server/hw/xfree86/common/xf86Xinput.h
@@ -64,6 +64,10 @@
 /* 0x08 is reserved for legacy XI86_SEND_DRAG_EVENTS, do not use for now */
 /* server-internal only */
 #define XI86_DEVICE_DISABLED    0x10    /* device was disabled before vt switch */
+#define XI86_SERVER_FD		0x20	/* fd is managed by xserver */
+
+/* Input device driver capabilities */
+#define XI86_DRV_CAP_SERVER_FD	0x01
 
 /* This holds the input driver entry and module information. */
 typedef struct _InputDriverRec {
@@ -76,6 +80,7 @@ typedef struct _InputDriverRec {
                     struct _InputInfoRec * pInfo, int flags);
     void *module;
     const char **default_options;
+    int capabilities;
 } InputDriverRec, *InputDriverPtr;
 
 /* This is to input devices what the ScrnInfoRec is to screens. */
@@ -96,6 +101,8 @@ typedef struct _InputInfoRec {
       int *valuators, int first_valuator, int num_valuators);
 
     int fd;
+    int major;
+    int minor;
     DeviceIntPtr dev;
     void *private;
     const char *type_name;
@@ -172,6 +179,7 @@ extern _X_EXPORT void xf86AddEnabledDevice(InputInfoPtr pInfo);
 extern _X_EXPORT void xf86RemoveEnabledDevice(InputInfoPtr pInfo);
 extern _X_EXPORT void xf86DisableDevice(DeviceIntPtr dev, Bool panic);
 extern _X_EXPORT void xf86EnableDevice(DeviceIntPtr dev);
+extern _X_EXPORT void xf86InputEnableVTProbe(void);
 
 /* not exported */
 int xf86NewInputDevice(InputInfoPtr pInfo, DeviceIntPtr *pdev, BOOL is_auto);
diff --git a/xorg-server/hw/xfree86/common/xf86platformBus.c b/xorg-server/hw/xfree86/common/xf86platformBus.c
index 5875a9136..4447e19df 100644
--- a/xorg-server/hw/xfree86/common/xf86platformBus.c
+++ b/xorg-server/hw/xfree86/common/xf86platformBus.c
@@ -52,10 +52,10 @@ int platformSlotClaimed;
 
 int xf86_num_platform_devices;
 
-static struct xf86_platform_device *xf86_platform_devices;
+struct xf86_platform_device *xf86_platform_devices;
 
 int
-xf86_add_platform_device(struct OdevAttributes *attribs)
+xf86_add_platform_device(struct OdevAttributes *attribs, Bool unowned)
 {
     xf86_platform_devices = xnfrealloc(xf86_platform_devices,
                                    (sizeof(struct xf86_platform_device)
@@ -63,6 +63,8 @@ xf86_add_platform_device(struct OdevAttributes *attribs)
 
     xf86_platform_devices[xf86_num_platform_devices].attribs = attribs;
     xf86_platform_devices[xf86_num_platform_devices].pdev = NULL;
+    xf86_platform_devices[xf86_num_platform_devices].flags =
+        unowned ? XF86_PDEV_UNOWNED : 0;
 
     xf86_num_platform_devices++;
     return 0;
@@ -89,35 +91,55 @@ xf86_add_platform_device_attrib(int index, int attrib_id, char *attrib_name)
     return config_odev_add_attribute(device->attribs, attrib_id, attrib_name);
 }
 
+Bool
+xf86_add_platform_device_int_attrib(int index, int attrib_id, int attrib_value)
+{
+    return config_odev_add_int_attribute(xf86_platform_devices[index].attribs, attrib_id, attrib_value);
+}
+
 char *
 xf86_get_platform_attrib(int index, int attrib_id)
 {
-    struct xf86_platform_device *device = &xf86_platform_devices[index];
-    struct OdevAttribute *oa;
-
-    xorg_list_for_each_entry(oa, &device->attribs->list, member) {
-        if (oa->attrib_id == attrib_id)
-            return oa->attrib_name;
-    }
-    return NULL;
+    return config_odev_get_attribute(xf86_platform_devices[index].attribs, attrib_id);
 }
 
 char *
 xf86_get_platform_device_attrib(struct xf86_platform_device *device, int attrib_id)
 {
-    struct OdevAttribute *oa;
+    return config_odev_get_attribute(device->attribs, attrib_id);
+}
 
-    xorg_list_for_each_entry(oa, &device->attribs->list, member) {
-        if (oa->attrib_id == attrib_id)
-            return oa->attrib_name;
-    }
-    return NULL;
+int
+xf86_get_platform_int_attrib(int index, int attrib_id, int def)
+{
+    return config_odev_get_int_attribute(xf86_platform_devices[index].attribs, attrib_id, def);
+}
+
+int
+xf86_get_platform_device_int_attrib(struct xf86_platform_device *device, int attrib_id, int def)
+{
+    return config_odev_get_int_attribute(device->attribs, attrib_id, def);
 }
 
 Bool
 xf86_get_platform_device_unowned(int index)
 {
-    return xf86_platform_devices[index].attribs->unowned;
+    return (xf86_platform_devices[index].flags & XF86_PDEV_UNOWNED) ?
+        TRUE : FALSE;
+}
+
+struct xf86_platform_device *
+xf86_find_platform_device_by_devnum(int major, int minor)
+{
+    int i, attr_major, attr_minor;
+
+    for (i = 0; i < xf86_num_platform_devices; i++) {
+        attr_major = xf86_get_platform_int_attrib(i, ODEV_ATTRIB_MAJOR, 0);
+        attr_minor = xf86_get_platform_int_attrib(i, ODEV_ATTRIB_MINOR, 0);
+        if (attr_major == major && attr_minor == minor)
+            return &xf86_platform_devices[i];
+    }
+    return NULL;
 }
 
 /*
@@ -524,10 +546,10 @@ void xf86platformVTProbe(void)
     int i;
 
     for (i = 0; i < xf86_num_platform_devices; i++) {
-        if (xf86_platform_devices[i].attribs->unowned == FALSE)
+        if (!(xf86_platform_devices[i].flags & XF86_PDEV_UNOWNED))
             continue;
 
-        xf86_platform_devices[i].attribs->unowned = FALSE;
+        xf86_platform_devices[i].flags &= ~XF86_PDEV_UNOWNED;
         xf86PlatformReprobeDevice(i, xf86_platform_devices[i].attribs);
     }
 }
diff --git a/xorg-server/hw/xfree86/common/xf86platformBus.h b/xorg-server/hw/xfree86/common/xf86platformBus.h
index 4e1757854..78b5a5bea 100644
--- a/xorg-server/hw/xfree86/common/xf86platformBus.h
+++ b/xorg-server/hw/xfree86/common/xf86platformBus.h
@@ -30,23 +30,34 @@ struct xf86_platform_device {
     struct OdevAttributes *attribs;
     /* for PCI devices */
     struct pci_device *pdev;
+    int flags;
 };
 
+/* xf86_platform_device flags */
+#define XF86_PDEV_UNOWNED       0x01
+#define XF86_PDEV_SERVER_FD     0x02
+#define XF86_PDEV_PAUSED        0x04
+
 #ifdef XSERVER_PLATFORM_BUS
 int xf86platformProbe(void);
 int xf86platformProbeDev(DriverPtr drvp);
 
 extern int xf86_num_platform_devices;
+extern struct xf86_platform_device *xf86_platform_devices;
 
 extern char *
 xf86_get_platform_attrib(int index, int attrib_id);
 extern int
-xf86_add_platform_device(struct OdevAttributes *attribs);
+xf86_get_platform_int_attrib(int index, int attrib_id, int def);
+extern int
+xf86_add_platform_device(struct OdevAttributes *attribs, Bool unowned);
 extern int
 xf86_remove_platform_device(int dev_index);
 extern Bool
 xf86_add_platform_device_attrib(int index, int attrib_id, char *attrib_str);
 extern Bool
+xf86_add_platform_device_int_attrib(int index, int attrib_id, int attrib_value);
+extern Bool
 xf86_get_platform_device_unowned(int index);
 
 extern int
@@ -56,6 +67,8 @@ xf86platformRemoveDevice(int index);
 
 extern _X_EXPORT char *
 xf86_get_platform_device_attrib(struct xf86_platform_device *device, int attrib_id);
+extern _X_EXPORT int
+xf86_get_platform_device_int_attrib(struct xf86_platform_device *device, int attrib_id, int def);
 extern _X_EXPORT Bool
 xf86PlatformDeviceCheckBusID(struct xf86_platform_device *device, const char *busid);
 
diff --git a/xorg-server/hw/xfree86/glamor_egl/Makefile.am b/xorg-server/hw/xfree86/glamor_egl/Makefile.am
new file mode 100644
index 000000000..85e1c0c06
--- /dev/null
+++ b/xorg-server/hw/xfree86/glamor_egl/Makefile.am
@@ -0,0 +1,43 @@
+# Copyright © 2013 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+
+module_LTLIBRARIES = libglamoregl.la
+
+libglamoregl_la_SOURCES = \
+	$(top_srcdir)/glamor/glamor_egl.c \
+	$(top_srcdir)/glamor/glamor_eglmodule.c \
+	$(top_srcdir)/glamor/glamor_xv.c \
+	$()
+
+libglamoregl_la_LDFLAGS = \
+	-avoid-version \
+	$(GBM_LIBS) \
+	$()
+
+libglamoregl_la_LIBADD = \
+	$(top_builddir)/glamor/libglamor.la \
+	$()
+
+AM_CPPFLAGS = $(XORG_INCS) \
+	-I$(top_srcdir)/dri3 \
+	$()
+
+AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) $(GLAMOR_CFLAGS) $(GBM_CFLAGS)
diff --git a/xorg-server/hw/xfree86/os-support/linux/Makefile.am b/xorg-server/hw/xfree86/os-support/linux/Makefile.am
index 83e7e0027..1686dc2c1 100644
--- a/xorg-server/hw/xfree86/os-support/linux/Makefile.am
+++ b/xorg-server/hw/xfree86/os-support/linux/Makefile.am
@@ -21,6 +21,11 @@ APM_SRCS = lnx_apm.c
 XORG_CFLAGS += -DHAVE_APM
 endif
 
+if SYSTEMD_LOGIND
+LOGIND_SRCS = systemd-logind.c
+XORG_CFLAGS += $(DBUS_CFLAGS)
+endif
+
 liblinux_la_SOURCES = lnx_init.c lnx_video.c \
                      lnx_agp.c lnx_kmod.c lnx_bell.c lnx_platform.c \
                      $(srcdir)/../shared/bios_mmap.c \
@@ -30,6 +35,7 @@ liblinux_la_SOURCES = lnx_init.c lnx_video.c \
 		     $(srcdir)/../shared/sigio.c \
                      $(ACPI_SRCS) \
                      $(APM_SRCS) \
+                     $(LOGIND_SRCS) \
                      $(PLATFORM_PCI_SUPPORT)
 
 AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES)
diff --git a/xorg-server/hw/xfree86/os-support/linux/lnx_init.c b/xorg-server/hw/xfree86/os-support/linux/lnx_init.c
index 46438e655..85709c629 100644
--- a/xorg-server/hw/xfree86/os-support/linux/lnx_init.c
+++ b/xorg-server/hw/xfree86/os-support/linux/lnx_init.c
@@ -79,20 +79,15 @@ switch_to(int vt, const char *from)
 void
 xf86OpenConsole(void)
 {
-    int i, fd = -1, ret;
+    int i, fd = -1, ret, current_vt = -1;
     struct vt_mode VT;
     struct vt_stat vts;
+    struct stat st;
     MessageType from = X_PROBED;
     const char *tty0[] = { "/dev/tty0", "/dev/vc/0", NULL };
     const char *vcs[] = { "/dev/vc/%d", "/dev/tty%d", NULL };
 
     if (serverGeneration == 1) {
-
-        /* when KeepTty check if we're run with euid==0 */
-        if (KeepTty && geteuid() != 0)
-            FatalError("xf86OpenConsole:"
-                       " Server must be suid root for option \"KeepTTY\"\n");
-
         /*
          * setup the virtual terminal manager
          */
@@ -132,6 +127,22 @@ xf86OpenConsole(void)
 
         xf86Msg(from, "using VT number %d\n\n", xf86Info.vtno);
 
+        /* Some of stdin / stdout / stderr maybe redirected to a file */
+        for (i = STDIN_FILENO; i <= STDERR_FILENO; i++) {
+            ret = fstat(i, &st);
+            if (ret == 0 && S_ISCHR(st.st_mode) && major(st.st_rdev) == 4) {
+                current_vt = minor(st.st_rdev);
+                break;
+            }
+        }
+
+        if (!KeepTty && current_vt == xf86Info.vtno) {
+            xf86Msg(X_PROBED,
+                    "controlling tty is VT number %d, auto-enabling KeepTty\n",
+                    current_vt);
+            KeepTty = TRUE;
+        }
+
         if (!KeepTty) {
             pid_t ppid = getppid();
             pid_t ppgid;
diff --git a/xorg-server/hw/xfree86/os-support/linux/lnx_platform.c b/xorg-server/hw/xfree86/os-support/linux/lnx_platform.c
index 1865b31b9..109a9a774 100644
--- a/xorg-server/hw/xfree86/os-support/linux/lnx_platform.c
+++ b/xorg-server/hw/xfree86/os-support/linux/lnx_platform.c
@@ -18,16 +18,38 @@
 #include "xf86Bus.h"
 
 #include "hotplug.h"
+#include "systemd-logind.h"
 
 static Bool
 get_drm_info(struct OdevAttributes *attribs, char *path, int delayed_index)
 {
     drmSetVersion sv;
     char *buf;
-    int fd;
+    int major, minor, fd;
     int err = 0;
+    Bool paused, server_fd = FALSE;
+
+    major = config_odev_get_int_attribute(attribs, ODEV_ATTRIB_MAJOR, 0);
+    minor = config_odev_get_int_attribute(attribs, ODEV_ATTRIB_MINOR, 0);
+
+    fd = systemd_logind_take_fd(major, minor, path, &paused);
+    if (fd != -1) {
+        if (paused) {
+            LogMessage(X_ERROR,
+                    "Error systemd-logind returned paused fd for drm node\n");
+            systemd_logind_release_fd(major, minor);
+            return FALSE;
+        }
+        if (!config_odev_add_int_attribute(attribs, ODEV_ATTRIB_FD, fd)) {
+            systemd_logind_release_fd(major, minor);
+            return FALSE;
+        }
+        server_fd = TRUE;
+    }
+
+    if (fd == -1)
+        fd = open(path, O_RDWR, O_CLOEXEC);
 
-    fd = open(path, O_RDWR, O_CLOEXEC);
     if (fd == -1)
         return FALSE;
 
@@ -44,16 +66,20 @@ get_drm_info(struct OdevAttributes *attribs, char *path, int delayed_index)
 
     /* for a delayed probe we've already added the device */
     if (delayed_index == -1) {
-            xf86_add_platform_device(attribs);
+            xf86_add_platform_device(attribs, FALSE);
             delayed_index = xf86_num_platform_devices - 1;
     }
 
+    if (server_fd)
+        xf86_platform_devices[delayed_index].flags |= XF86_PDEV_SERVER_FD;
+
     buf = drmGetBusid(fd);
     xf86_add_platform_device_attrib(delayed_index,
                                     ODEV_ATTRIB_BUSID, buf);
     drmFreeBusid(buf);
 out:
-    close(fd);
+    if (!server_fd)
+        close(fd);
     return (err == 0);
 }
 
@@ -118,17 +144,11 @@ xf86PlatformReprobeDevice(int index, struct OdevAttributes *attribs)
 void
 xf86PlatformDeviceProbe(struct OdevAttributes *attribs)
 {
-    struct OdevAttribute *attrib;
     int i;
     char *path = NULL;
     Bool ret;
 
-    xorg_list_for_each_entry(attrib, &attribs->list, member) {
-        if (attrib->attrib_id == ODEV_ATTRIB_PATH) {
-            path = attrib->attrib_name;
-            break;
-        }
-    }
+    path = config_odev_get_attribute(attribs, ODEV_ATTRIB_PATH);
     if (!path)
         goto out_free;
 
@@ -148,8 +168,7 @@ xf86PlatformDeviceProbe(struct OdevAttributes *attribs)
     if (!xf86VTOwner()) {
             /* if we don't currently own the VT then don't probe the device,
                just mark it as unowned for later use */
-            attribs->unowned = TRUE;
-            xf86_add_platform_device(attribs);
+            xf86_add_platform_device(attribs, TRUE);
             return;
     }
 
diff --git a/xorg-server/hw/xfree86/os-support/linux/systemd-logind.c b/xorg-server/hw/xfree86/os-support/linux/systemd-logind.c
new file mode 100644
index 000000000..abb8e44d9
--- /dev/null
+++ b/xorg-server/hw/xfree86/os-support/linux/systemd-logind.c
@@ -0,0 +1,532 @@
+/*
+ * Copyright © 2013 Red Hat Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Author: Hans de Goede <hdegoede@redhat.com>
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#endif
+
+#include <dbus/dbus.h>
+#include <string.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+#include "os.h"
+#include "dbus-core.h"
+#include "xf86.h"
+#include "xf86platformBus.h"
+#include "xf86Xinput.h"
+
+#include "systemd-logind.h"
+
+#define DBUS_TIMEOUT 500 /* Wait max 0.5 seconds */
+
+struct systemd_logind_info {
+    DBusConnection *conn;
+    char *session;
+    Bool active;
+    Bool vt_active;
+};
+
+static struct systemd_logind_info logind_info;
+
+int
+systemd_logind_take_fd(int _major, int _minor, const char *path,
+                       Bool *paused_ret)
+{
+    struct systemd_logind_info *info = &logind_info;
+    DBusError error;
+    DBusMessage *msg = NULL;
+    DBusMessage *reply = NULL;
+    dbus_int32_t major = _major;
+    dbus_int32_t minor = _minor;
+    dbus_bool_t paused;
+    int fd = -1;
+
+    if (!info->session || major == 0)
+        return -1;
+
+    /* logind does not support mouse devs (with evdev we don't need them) */
+    if (strstr(path, "mouse"))
+        return -1;
+
+    dbus_error_init(&error);
+
+    msg = dbus_message_new_method_call("org.freedesktop.login1", info->session,
+            "org.freedesktop.login1.Session", "TakeDevice");
+    if (!msg) {
+        LogMessage(X_ERROR, "systemd-logind: out of memory\n");
+        goto cleanup;
+    }
+
+    if (!dbus_message_append_args(msg, DBUS_TYPE_UINT32, &major,
+                                       DBUS_TYPE_UINT32, &minor,
+                                       DBUS_TYPE_INVALID)) {
+        LogMessage(X_ERROR, "systemd-logind: out of memory\n");
+        goto cleanup;
+    }
+
+    reply = dbus_connection_send_with_reply_and_block(info->conn, msg,
+                                                      DBUS_TIMEOUT, &error);
+    if (!reply) {
+        LogMessage(X_ERROR, "systemd-logind: failed to take device %s: %s\n",
+                   path, error.message);
+        goto cleanup;
+    }
+
+    if (!dbus_message_get_args(reply, &error,
+                               DBUS_TYPE_UNIX_FD, &fd,
+                               DBUS_TYPE_BOOLEAN, &paused,
+                               DBUS_TYPE_INVALID)) {
+        LogMessage(X_ERROR, "systemd-logind: TakeDevice %s: %s\n",
+                   path, error.message);
+        goto cleanup;
+    }
+
+    *paused_ret = paused;
+
+    LogMessage(X_INFO, "systemd-logind: got fd for %s %u:%u fd %d paused %d\n",
+               path, major, minor, fd, paused);
+
+cleanup:
+    if (msg)
+        dbus_message_unref(msg);
+    if (reply)
+        dbus_message_unref(reply);
+    dbus_error_free(&error);
+
+    return fd;
+}
+
+void
+systemd_logind_release_fd(int _major, int _minor)
+{
+    struct systemd_logind_info *info = &logind_info;
+    DBusError error;
+    DBusMessage *msg = NULL;
+    DBusMessage *reply = NULL;
+    dbus_int32_t major = _major;
+    dbus_int32_t minor = _minor;
+
+    if (!info->session || major == 0)
+        return;
+
+    dbus_error_init(&error);
+
+    msg = dbus_message_new_method_call("org.freedesktop.login1", info->session,
+            "org.freedesktop.login1.Session", "ReleaseDevice");
+    if (!msg) {
+        LogMessage(X_ERROR, "systemd-logind: out of memory\n");
+        goto cleanup;
+    }
+
+    if (!dbus_message_append_args(msg, DBUS_TYPE_UINT32, &major,
+                                       DBUS_TYPE_UINT32, &minor,
+                                       DBUS_TYPE_INVALID)) {
+        LogMessage(X_ERROR, "systemd-logind: out of memory\n");
+        goto cleanup;
+    }
+
+    reply = dbus_connection_send_with_reply_and_block(info->conn, msg,
+                                                      DBUS_TIMEOUT, &error);
+    if (!reply)
+        LogMessage(X_ERROR, "systemd-logind: failed to release device: %s\n",
+                   error.message);
+
+cleanup:
+    if (msg)
+        dbus_message_unref(msg);
+    if (reply)
+        dbus_message_unref(reply);
+    dbus_error_free(&error);
+}
+
+int
+systemd_logind_controls_session(void)
+{
+    return logind_info.session ? 1 : 0;
+}
+
+void
+systemd_logind_vtenter(void)
+{
+    struct systemd_logind_info *info = &logind_info;
+    InputInfoPtr pInfo;
+    int i;
+
+    if (!info->session)
+        return; /* Not using systemd-logind */
+
+    if (!info->active)
+        return; /* Session not active */
+
+    if (info->vt_active)
+        return; /* Already did vtenter */
+
+    for (i = 0; i < xf86_num_platform_devices; i++) {
+        if (xf86_platform_devices[i].flags & XF86_PDEV_PAUSED)
+            break;
+    }
+    if (i != xf86_num_platform_devices)
+        return; /* Some drm nodes are still paused wait for resume */
+
+    xf86VTEnter();
+    info->vt_active = TRUE;
+
+    /* Activate any input devices which were resumed before the drm nodes */
+    for (pInfo = xf86InputDevs; pInfo; pInfo = pInfo->next)
+        if ((pInfo->flags & XI86_SERVER_FD) && pInfo->fd != -1)
+            xf86EnableInputDeviceForVTSwitch(pInfo);
+
+    /* Do delayed input probing, this must be done after the above enabling */
+    xf86InputEnableVTProbe();
+}
+
+static InputInfoPtr
+systemd_logind_find_info_ptr_by_devnum(int major, int minor)
+{
+    InputInfoPtr pInfo;
+
+    for (pInfo = xf86InputDevs; pInfo; pInfo = pInfo->next)
+        if (pInfo->major == major && pInfo->minor == minor &&
+                (pInfo->flags & XI86_SERVER_FD))
+            return pInfo;
+
+    return NULL;
+}
+
+static void
+systemd_logind_ack_pause(struct systemd_logind_info *info,
+                         dbus_int32_t minor, dbus_int32_t major)
+{
+    DBusError error;
+    DBusMessage *msg = NULL;
+    DBusMessage *reply = NULL;
+
+    dbus_error_init(&error);
+
+    msg = dbus_message_new_method_call("org.freedesktop.login1", info->session,
+            "org.freedesktop.login1.Session", "PauseDeviceComplete");
+    if (!msg) {
+        LogMessage(X_ERROR, "systemd-logind: out of memory\n");
+        goto cleanup;
+    }
+
+    if (!dbus_message_append_args(msg, DBUS_TYPE_UINT32, &major,
+                                       DBUS_TYPE_UINT32, &minor,
+                                       DBUS_TYPE_INVALID)) {
+        LogMessage(X_ERROR, "systemd-logind: out of memory\n");
+        goto cleanup;
+    }
+
+    reply = dbus_connection_send_with_reply_and_block(info->conn, msg,
+                                                      DBUS_TIMEOUT, &error);
+    if (!reply)
+        LogMessage(X_ERROR, "systemd-logind: failed to ack pause: %s\n",
+                   error.message);
+
+cleanup:
+    if (msg)
+        dbus_message_unref(msg);
+    if (reply)
+        dbus_message_unref(reply);
+    dbus_error_free(&error);
+}
+
+static DBusHandlerResult
+message_filter(DBusConnection * connection, DBusMessage * message, void *data)
+{
+    struct systemd_logind_info *info = data;
+    struct xf86_platform_device *pdev = NULL;
+    InputInfoPtr pInfo = NULL;
+    int ack = 0, pause = 0, fd = -1;
+    DBusError error;
+    dbus_int32_t major, minor;
+    char *pause_str;
+
+    if (strcmp(dbus_message_get_path(message), info->session) != 0)
+        return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+
+    dbus_error_init(&error);
+
+    if (dbus_message_is_signal(message, "org.freedesktop.login1.Session",
+                               "PauseDevice")) {
+        if (!dbus_message_get_args(message, &error,
+                               DBUS_TYPE_UINT32, &major,
+                               DBUS_TYPE_UINT32, &minor,
+                               DBUS_TYPE_STRING, &pause_str,
+                               DBUS_TYPE_INVALID)) {
+            LogMessage(X_ERROR, "systemd-logind: PauseDevice: %s\n",
+                       error.message);
+            dbus_error_free(&error);
+            return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+        }
+
+        if (strcmp(pause_str, "pause") == 0) {
+            pause = 1;
+            ack = 1;
+        }
+        else if (strcmp(pause_str, "force") == 0) {
+            pause = 1;
+        }
+        else if (strcmp(pause_str, "gone") == 0) {
+            /* Device removal is handled through udev */
+            return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+        }
+        else {
+            LogMessage(X_WARNING, "systemd-logind: unknown pause type: %s\n",
+                       pause_str);
+            return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+        }
+    }
+    else if (dbus_message_is_signal(message, "org.freedesktop.login1.Session",
+                                    "ResumeDevice")) {
+        if (!dbus_message_get_args(message, &error,
+                                   DBUS_TYPE_UINT32, &major,
+                                   DBUS_TYPE_UINT32, &minor,
+                                   DBUS_TYPE_UNIX_FD, &fd,
+                                   DBUS_TYPE_INVALID)) {
+            LogMessage(X_ERROR, "systemd-logind: ResumeDevice: %s\n",
+                       error.message);
+            dbus_error_free(&error);
+            return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+        }
+    } else
+        return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+
+    LogMessage(X_INFO, "systemd-logind: got %s for %u:%u\n",
+               pause ? "pause" : "resume", major, minor);
+
+    pdev = xf86_find_platform_device_by_devnum(major, minor);        
+    if (!pdev)
+        pInfo = systemd_logind_find_info_ptr_by_devnum(major, minor);
+    if (!pdev && !pInfo) {
+        LogMessage(X_WARNING, "systemd-logind: could not find dev %u:%u\n",
+                   major, minor);
+        return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+    }
+
+    if (pause) {
+        /* Our VT_PROCESS usage guarantees we've already given up the vt */
+        info->active = info->vt_active = FALSE;
+        /* Note the actual vtleave has already been handled by xf86Events.c */
+        if (pdev)
+            pdev->flags |= XF86_PDEV_PAUSED;
+        else {
+            close(pInfo->fd);
+            pInfo->fd = -1;
+            pInfo->options = xf86ReplaceIntOption(pInfo->options, "fd", -1);
+        }
+        if (ack)
+            systemd_logind_ack_pause(info, major, minor);
+    }
+    else {
+        /* info->vt_active gets set by systemd_logind_vtenter() */
+        info->active = TRUE;
+
+        if (pdev) {
+            pdev->flags &= ~XF86_PDEV_PAUSED;
+            systemd_logind_vtenter();
+        }
+        else {
+            pInfo->fd = fd;
+            pInfo->options = xf86ReplaceIntOption(pInfo->options, "fd", fd);
+            if (info->vt_active)
+                xf86EnableInputDeviceForVTSwitch(pInfo);
+        }
+    }
+    return DBUS_HANDLER_RESULT_HANDLED;
+}
+
+static void
+connect_hook(DBusConnection *connection, void *data)
+{
+    struct systemd_logind_info *info = data;
+    DBusError error;
+    DBusMessage *msg = NULL;
+    DBusMessage *reply = NULL;
+    dbus_int32_t arg;
+    char *session = NULL;
+
+    dbus_error_init(&error);
+
+    msg = dbus_message_new_method_call("org.freedesktop.login1",
+            "/org/freedesktop/login1", "org.freedesktop.login1.Manager",
+            "GetSessionByPID");
+    if (!msg) {
+        LogMessage(X_ERROR, "systemd-logind: out of memory\n");
+        goto cleanup;
+    }
+
+    arg = getpid();
+    if (!dbus_message_append_args(msg, DBUS_TYPE_UINT32, &arg,
+                                  DBUS_TYPE_INVALID)) {
+        LogMessage(X_ERROR, "systemd-logind: out of memory\n");
+        goto cleanup;
+    }
+
+    reply = dbus_connection_send_with_reply_and_block(connection, msg,
+                                                      DBUS_TIMEOUT, &error);
+    if (!reply) {
+        LogMessage(X_ERROR, "systemd-logind: failed to get session: %s\n",
+                   error.message);
+        goto cleanup;
+    }
+    dbus_message_unref(msg);
+
+    if (!dbus_message_get_args(reply, &error, DBUS_TYPE_OBJECT_PATH, &session,
+                               DBUS_TYPE_INVALID)) {
+        LogMessage(X_ERROR, "systemd-logind: GetSessionByPID: %s\n",
+                   error.message);
+        goto cleanup;
+    }
+    session = XNFstrdup(session);
+
+    dbus_message_unref(reply);
+    reply = NULL;
+
+
+    msg = dbus_message_new_method_call("org.freedesktop.login1",
+            session, "org.freedesktop.login1.Session", "TakeControl");
+    if (!msg) {
+        LogMessage(X_ERROR, "systemd-logind: out of memory\n");
+        goto cleanup;
+    }
+
+    arg = FALSE; /* Don't forcibly take over over the session */
+    if (!dbus_message_append_args(msg, DBUS_TYPE_BOOLEAN, &arg,
+                                  DBUS_TYPE_INVALID)) {
+        LogMessage(X_ERROR, "systemd-logind: out of memory\n");
+        goto cleanup;
+    }
+
+    reply = dbus_connection_send_with_reply_and_block(connection, msg,
+                                                      DBUS_TIMEOUT, &error);
+    if (!reply) {
+        LogMessage(X_ERROR, "systemd-logind: TakeControl failed: %s\n",
+                   error.message);
+        goto cleanup;
+    }
+
+    /*
+     * HdG: This is not useful with systemd <= 208 since the signal only
+     * contains invalidated property names there, rather than property, val
+     * pairs as it should.  Instead we just use the first resume / pause now.
+     */
+#if 0
+    snprintf(match, sizeof(match),
+        "type='signal',sender='org.freedesktop.login1',interface='org.freedesktop.DBus.Properties',member='PropertiesChanged',path='%s'",
+        session);
+    dbus_bus_add_match(connection, match, &error);
+    if (dbus_error_is_set(&error)) {
+        LogMessage(X_ERROR, "systemd-logind: could not add match: %s\n",
+                   error.message);
+        goto cleanup;
+    }
+#endif
+
+    if (!dbus_connection_add_filter(connection, message_filter, info, NULL)) {
+        LogMessage(X_ERROR, "systemd-logind: could not add filter: %s\n",
+                   error.message);
+        goto cleanup;
+    }
+
+    LogMessage(X_INFO, "systemd-logind: took control of session %s\n",
+               session);
+    info->conn = connection;
+    info->session = session;
+    info->vt_active = info->active = TRUE; /* The server owns the vt during init */
+    session = NULL;
+
+cleanup:
+    free(session);
+    if (msg)
+        dbus_message_unref(msg);
+    if (reply)
+        dbus_message_unref(reply);
+    dbus_error_free(&error);
+}
+
+static void
+systemd_logind_release_control(struct systemd_logind_info *info)
+{
+    DBusError error;
+    DBusMessage *msg = NULL;
+    DBusMessage *reply = NULL;
+
+    dbus_error_init(&error);
+
+    msg = dbus_message_new_method_call("org.freedesktop.login1",
+            info->session, "org.freedesktop.login1.Session", "ReleaseControl");
+    if (!msg) {
+        LogMessage(X_ERROR, "systemd-logind: out of memory\n");
+        goto cleanup;
+    }
+
+    reply = dbus_connection_send_with_reply_and_block(info->conn, msg,
+                                                      DBUS_TIMEOUT, &error);
+    if (!reply) {
+        LogMessage(X_ERROR, "systemd-logind: ReleaseControl failed: %s\n",
+                   error.message);
+        goto cleanup;
+    }
+
+cleanup:
+    if (msg)
+        dbus_message_unref(msg);
+    if (reply)
+        dbus_message_unref(reply);
+    dbus_error_free(&error);
+}
+
+static void
+disconnect_hook(void *data)
+{
+    struct systemd_logind_info *info = data;
+
+    free(info->session);
+    info->session = NULL;
+    info->conn = NULL;
+}
+
+static struct dbus_core_hook core_hook = {
+    .connect = connect_hook,
+    .disconnect = disconnect_hook,
+    .data = &logind_info,
+};
+
+int
+systemd_logind_init(void)
+{
+    return dbus_core_add_hook(&core_hook);
+}
+
+void
+systemd_logind_fini(void)
+{
+    if (logind_info.session)
+        systemd_logind_release_control(&logind_info);
+
+    dbus_core_remove_hook(&core_hook);
+}
diff --git a/xorg-server/hw/xfree86/os-support/shared/posix_tty.c b/xorg-server/hw/xfree86/os-support/shared/posix_tty.c
index 4d08c1e85..6e2af001a 100644
--- a/xorg-server/hw/xfree86/os-support/shared/posix_tty.c
+++ b/xorg-server/hw/xfree86/os-support/shared/posix_tty.c
@@ -124,7 +124,11 @@ xf86OpenSerial(XF86OptionPtr options)
         return -1;
     }
 
-    SYSCALL(fd = open(dev, O_RDWR | O_NONBLOCK));
+    fd = xf86CheckIntOption(options, "fd", -1);
+
+    if (fd == -1)
+        SYSCALL(fd = open(dev, O_RDWR | O_NONBLOCK));
+
     if (fd == -1) {
         xf86Msg(X_ERROR,
                 "xf86OpenSerial: Cannot open device %s\n\t%s.\n",
diff --git a/xorg-server/include/Makefile.am b/xorg-server/include/Makefile.am
index fa6da00ec..6578038a5 100644
--- a/xorg-server/include/Makefile.am
+++ b/xorg-server/include/Makefile.am
@@ -72,4 +72,5 @@ EXTRA_DIST = 	\
 	dix-config-apple-verbatim.h \
 	dixfontstubs.h eventconvert.h eventstr.h inpututils.h \
 	protocol-versions.h \
+	systemd-logind.h \
 	xsha1.h
diff --git a/xorg-server/include/dix-config.h.in b/xorg-server/include/dix-config.h.in
index 7c77956b1..06455a837 100644
--- a/xorg-server/include/dix-config.h.in
+++ b/xorg-server/include/dix-config.h.in
@@ -420,6 +420,9 @@
 /* Support HAL for hotplug */
 #undef CONFIG_HAL
 
+/* Enable systemd-logind integration */
+#undef SYSTEMD_LOGIND 1
+
 /* Have a monotonic clock from clock_gettime() */
 #undef MONOTONIC_CLOCK
 
@@ -481,4 +484,7 @@
 /* Build GLAMOR */
 #undef GLAMOR
 
+/* Build glamor's GBM-based EGL support */
+#undef GLAMOR_HAS_GBM
+
 #endif /* _DIX_CONFIG_H_ */
diff --git a/xorg-server/include/hotplug.h b/xorg-server/include/hotplug.h
index 29a22c4da..1d9364eee 100644
--- a/xorg-server/include/hotplug.h
+++ b/xorg-server/include/hotplug.h
@@ -32,15 +32,20 @@ extern _X_EXPORT void config_pre_init(void);
 extern _X_EXPORT void config_init(void);
 extern _X_EXPORT void config_fini(void);
 
+enum { ODEV_ATTRIB_STRING, ODEV_ATTRIB_INT };
+
 struct OdevAttribute {
     struct xorg_list member;
     int attrib_id;
-    char *attrib_name;
+    union {
+        char *attrib_name;
+        int attrib_value;
+    };
+    int attrib_type;
 };
 
 struct OdevAttributes {
     struct xorg_list list;
-    Bool unowned;
 };
 
 struct OdevAttributes *
@@ -53,6 +58,17 @@ Bool
 config_odev_add_attribute(struct OdevAttributes *attribs, int attrib,
                           const char *attrib_name);
 
+char *
+config_odev_get_attribute(struct OdevAttributes *attribs, int attrib_id);
+
+Bool
+config_odev_add_int_attribute(struct OdevAttributes *attribs, int attrib,
+                              int attrib_value);
+
+int
+config_odev_get_int_attribute(struct OdevAttributes *attribs, int attrib,
+                              int def);
+
 void
 config_odev_free_attributes(struct OdevAttributes *attribs);
 
@@ -62,6 +78,12 @@ config_odev_free_attributes(struct OdevAttributes *attribs);
 #define ODEV_ATTRIB_SYSPATH 2
 /* DRI-style bus id */
 #define ODEV_ATTRIB_BUSID 3
+/* Server managed FD */
+#define ODEV_ATTRIB_FD 4
+/* Major number of the device node pointed to by ODEV_ATTRIB_PATH */
+#define ODEV_ATTRIB_MAJOR 5
+/* Minor number of the device node pointed to by ODEV_ATTRIB_PATH */
+#define ODEV_ATTRIB_MINOR 6
 
 typedef void (*config_odev_probe_proc_ptr)(struct OdevAttributes *attribs);
 void config_odev_probe(config_odev_probe_proc_ptr probe_callback);
@@ -72,4 +94,8 @@ void DeleteGPUDeviceRequest(struct OdevAttributes *attribs);
 #endif
 
 #define ServerIsNotSeat0() (SeatId && strcmp(SeatId, "seat0"))
+
+struct xf86_platform_device *
+xf86_find_platform_device_by_devnum(int major, int minor);
+
 #endif                          /* HOTPLUG_H */
diff --git a/xorg-server/include/systemd-logind.h b/xorg-server/include/systemd-logind.h
new file mode 100644
index 000000000..8b0908186
--- /dev/null
+++ b/xorg-server/include/systemd-logind.h
@@ -0,0 +1,45 @@
+/*
+ * Copyright © 2013 Red Hat, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Author: Hans de Goede <hdegoede@redhat.com>
+ */
+
+#ifndef SYSTEMD_LOGIND_H
+#define SYSTEMD_LOGIND_H
+
+#ifdef SYSTEMD_LOGIND
+int systemd_logind_init(void);
+void systemd_logind_fini(void);
+int systemd_logind_take_fd(int major, int minor, const char *path, Bool *paus);
+void systemd_logind_release_fd(int major, int minor);
+int systemd_logind_controls_session(void);
+void systemd_logind_vtenter(void);
+#else
+#define systemd_logind_init()
+#define systemd_logind_fini()
+#define systemd_logind_take_fd(major, minor, path) -1
+#define systemd_logind_release_fd(dev)
+#define systemd_logind_controls_session() 0
+#define systemd_logind_vtenter()
+#endif
+
+#endif