fontconfig mesa xkeyboard-config xserver pixman git update 10 Apr 2012

91 files changed, 10830 insertions, 10969 deletions

diff --git a/fontconfig/Makefile.am b/fontconfig/Makefile.am
index 1b943672d..1738c3329 100644
--- a/fontconfig/Makefile.am
+++ b/fontconfig/Makefile.am
@@ -54,8 +54,11 @@ MAINTAINERCLEANFILES = \
 pkgconfigdir=$(libdir)/pkgconfig
 pkgconfig_DATA = fontconfig.pc
 
-configdir=$(CONFDIR)
-config_DATA=fonts.dtd
+baseconfigdir = $(BASECONFIGDIR)
+configdir = $(CONFIGDIR)
+
+xmldir = $(XMLDIR)
+xml_DATA = fonts.dtd
 
 if CROSS_COMPILING
   RUN_FC_CACHE_TEST=false
@@ -88,23 +91,24 @@ fonts.conf: fonts.conf.in Makefile
 		-e 's,@FC_CACHEDIR\@,$(FC_CACHEDIR),g' \
 		-e 's,@FC_DEFAULT_FONTS\@,$(FC_DEFAULT_FONTS),g' \
 		-e 's,@FC_FONTPATH\@,$(FC_FONTPATH),g' \
+		-e 's,@CONFIGDIR\@,$(CONFIGDIR),g' \
 		-e 's,@PACKAGE\@,$(PACKAGE),g' \
 		-e 's,@VERSION\@,$(VERSION),g' \
 		$(srcdir)/$@.in > $@.tmp && \
 	mv $@.tmp $@
 
 install-data-local: fonts.conf
-	$(mkinstalldirs) $(DESTDIR)$(configdir) $(DESTDIR)$(fc_cachedir)
-	if [ -f $(DESTDIR)$(configdir)/fonts.conf ]; then \
-	  echo "backing up existing $(DESTDIR)$(configdir)/fonts.conf"; \
-	  mv $(DESTDIR)$(configdir)/fonts.conf $(DESTDIR)$(configdir)/fonts.conf.bak; \
+	$(mkinstalldirs) $(DESTDIR)$(baseconfigdir) $(DESTDIR)$(fc_cachedir)
+	if [ -f $(DESTDIR)$(baseconfigdir)/fonts.conf ]; then \
+	  echo "backing up existing $(DESTDIR)$(baseconfigdir)/fonts.conf"; \
+	  mv $(DESTDIR)$(baseconfigdir)/fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf.bak; \
 	fi
 	if [ -f $(srcdir)/fonts.conf ]; then \
-	  echo " $(INSTALL_DATA) $(srcdir)/fonts.conf $(DESTDIR)$(configdir)/fonts.conf"; \
-	  $(INSTALL_DATA) $(srcdir)/fonts.conf $(DESTDIR)$(configdir)/fonts.conf; \
+	  echo " $(INSTALL_DATA) $(srcdir)/fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf"; \
+	  $(INSTALL_DATA) $(srcdir)/fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf; \
 	else if [ -f fonts.conf ]; then \
-	  echo " $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf"; \
-	  $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf; \
+	  echo " $(INSTALL_DATA) fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf"; \
+	  $(INSTALL_DATA) fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf; \
 	fi; fi
 	@(if $(RUN_FC_CACHE_TEST); then \
 	    echo "fc-cache$(EXEEXT) -s -f -v"; \
@@ -119,14 +123,14 @@ install-data-local: fonts.conf
 
 uninstall-local:
 	if [ -f $(srcdir)/fonts.conf ]; then \
-	  if cmp -s $(srcdir)/fonts.conf $(DESTDIR)$(configdir)/fonts.conf; then \
-	     echo " uninstall standard $(DESTDIR)$(configdir)/fonts.conf"; \
-	     $(RM) $(DESTDIR)$(configdir)/fonts.conf; \
+	  if cmp -s $(srcdir)/fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf; then \
+	     echo " uninstall standard $(DESTDIR)$(baseconfigdir)/fonts.conf"; \
+	     $(RM) $(DESTDIR)$(baseconfigdir)/fonts.conf; \
 	  fi; \
 	else if [ -f fonts.conf ]; then \
-	  if cmp -s fonts.conf $(DESTDIR)$(configdir)/fonts.conf; then \
-	     echo " uninstall standard $(DESTDIR)$(configdir)/fonts.conf"; \
-	     $(RM) $(DESTDIR)$(configdir)/fonts.conf; \
+	  if cmp -s fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf; then \
+	     echo " uninstall standard $(DESTDIR)$(baseconfigdir)/fonts.conf"; \
+	     $(RM) $(DESTDIR)$(baseconfigdir)/fonts.conf; \
 	  fi; \
 	fi; fi
 
diff --git a/fontconfig/conf.d/Makefile.am b/fontconfig/conf.d/Makefile.am
index 13f243bb3..93bf8d321 100644
--- a/fontconfig/conf.d/Makefile.am
+++ b/fontconfig/conf.d/Makefile.am
@@ -24,37 +24,6 @@
 DOC_FILES= \
 	README
 
-CONF_FILES = \
-	10-autohint.conf \
-	10-no-sub-pixel.conf \
-	10-sub-pixel-bgr.conf \
-	10-sub-pixel-rgb.conf \
-	10-sub-pixel-vbgr.conf \
-	10-sub-pixel-vrgb.conf \
-	10-unhinted.conf \
-	11-lcdfilter-default.conf \
-	11-lcdfilter-legacy.conf \
-	11-lcdfilter-light.conf \
-	20-fix-globaladvance.conf \
-	20-unhint-small-vera.conf \
-	25-unhint-nonlatin.conf \
-	30-urw-aliases.conf \
-	30-metric-aliases.conf \
-	40-nonlatin.conf \
-	45-latin.conf \
-	49-sansserif.conf \
-	50-user.conf \
-	51-local.conf \
-	60-latin.conf \
-	65-fonts-persian.conf \
-	65-khmer.conf \
-	65-nonlatin.conf \
-	69-unifont.conf \
-	70-no-bitmaps.conf \
-	70-yes-bitmaps.conf \
-	80-delicious.conf \
-	90-synthetic.conf
-
 CONF_LINKS = \
 	20-fix-globaladvance.conf \
 	20-unhint-small-vera.conf \
@@ -72,28 +41,56 @@ CONF_LINKS = \
 	80-delicious.conf \
 	90-synthetic.conf
 
-EXTRA_DIST = $(CONF_FILES) $(DOC_FILES)
+EXTRA_DIST = $(template_DATA) $(DOC_FILES)
 
-configdir=$(CONFDIR)
-confavaildir=$(configdir)/conf.avail
-confddir=$(configdir)/conf.d
+configdir=$(CONFIGDIR)
+config_DATA = $(DOC_FILES)
 
-confavail_DATA=$(CONF_FILES)
-confd_DATA=$(DOC_FILES)
+templatedir = $(TEMPLATEDIR)
+template_DATA =				\
+	10-autohint.conf		\
+	10-no-sub-pixel.conf		\
+	10-sub-pixel-bgr.conf		\
+	10-sub-pixel-rgb.conf		\
+	10-sub-pixel-vbgr.conf		\
+	10-sub-pixel-vrgb.conf		\
+	10-unhinted.conf		\
+	11-lcdfilter-default.conf	\
+	11-lcdfilter-legacy.conf	\
+	11-lcdfilter-light.conf		\
+	20-fix-globaladvance.conf	\
+	20-unhint-small-vera.conf	\
+	25-unhint-nonlatin.conf		\
+	30-urw-aliases.conf		\
+	30-metric-aliases.conf		\
+	40-nonlatin.conf		\
+	45-latin.conf			\
+	49-sansserif.conf		\
+	50-user.conf			\
+	51-local.conf			\
+	60-latin.conf			\
+	65-fonts-persian.conf		\
+	65-khmer.conf			\
+	65-nonlatin.conf		\
+	69-unifont.conf			\
+	70-no-bitmaps.conf		\
+	70-yes-bitmaps.conf		\
+	80-delicious.conf		\
+	90-synthetic.conf
 
 install-data-local:
-	mkdir -p ${DESTDIR}${confddir}
-	@(echo cd ${DESTDIR}${confddir}; \
-	 cd ${DESTDIR}${confddir}; \
-	 for i in ${CONF_LINKS}; do \
-		$(RM) $$i; \
-		echo $(RM) $$i";" ln -s ../conf.avail/$$i .; \
-		ln -s ../conf.avail/$$i .; \
-	 done)
+	mkdir -p $(DESTDIR)$(configdir)
+	@(echo cd $(DESTDIR)$(configdir);			\
+	  cd $(DESTDIR)$(configdir);				\
+	  for i in $(CONF_LINKS); do				\
+	    echo $(RM) $$i";" ln -s $(templatedir)/$$i .;	\
+	    $(RM) $$i;						\
+	    ln -s $(templatedir)/$$i .;				\
+	  done)
 uninstall-local:
-	@(echo cd ${DESTDIR}${confddir}; \
-	 cd ${DESTDIR}${confddir}; \
-	 for i in ${CONF_LINKS}; do \
-		echo $(RM) $$i; \
-		$(RM) $$i; \
-	 done)
+	@(echo cd $(DESTDIR)$(configdir);			\
+	  cd $(DESTDIR)$(configdir);				\
+	  for i in $(CONF_LINKS); do				\
+	    echo $(RM) $$i;					\
+	    $(RM) $$i;						\
+	  done)
diff --git a/fontconfig/configure.in b/fontconfig/configure.in
index e0aba1992..ea44c1422 100644
--- a/fontconfig/configure.in
+++ b/fontconfig/configure.in
@@ -63,6 +63,7 @@ AC_PROG_LN_S
 AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
 AC_PROG_MAKE_SET
+PKG_PROG_PKG_CONFIG
 
 AC_MSG_CHECKING([for RM macro])
 _predefined_rm=`make -p -f /dev/null 2>/dev/null|grep '^RM ='|sed -e 's/^RM = //'`
@@ -106,7 +107,11 @@ AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
 
 dnl ==========================================================================
 
-AC_ARG_WITH(arch,      [  --with-arch=ARCH      Force architecture to ARCH], arch="$withval", arch=auto)
+AC_ARG_WITH(arch,
+	[AC_HELP_STRING([--with-arch=ARCH],
+			[Force architecture to ARCH])],
+	,
+	arch="$withval", arch=auto)
 
 if test "x$arch" != xauto; then
 	AC_DEFINE_UNQUOTED([FC_ARCHITECTURE], "$arch", [Architecture prefix to use for cache file names])
@@ -166,20 +171,7 @@ AC_DEFINE_UNQUOTED(USE_ICONV,$use_iconv,[Use iconv.])
 #
 # Checks for FreeType
 #
-
-AC_ARG_WITH(freetype-config, [  --with-freetype-config=PROG   Use FreeType configuration program PROG], freetype_config=$withval, freetype_config=yes)
-
-if test "$freetype_config" = "yes"; then 
-	AC_PATH_PROG(ft_config,freetype-config,no)
-	if test "$ft_config" = "no"; then
-		AC_MSG_ERROR([You must have freetype installed; see http://www.freetype.org/])
-	fi
-else
-	ft_config="$freetype_config"
-fi
-
-FREETYPE_CFLAGS="`$ft_config --cflags`"
-FREETYPE_LIBS="`$ft_config --libs`"
+PKG_CHECK_MODULES(FREETYPE, freetype2)
 
 AC_SUBST(FREETYPE_LIBS)
 AC_SUBST(FREETYPE_CFLAGS)
@@ -202,123 +194,48 @@ LIBS="$fontconfig_save_libs"
 #
 # Check expat configuration
 #
-
-AC_ARG_WITH(expat,             [  --with-expat=DIR              Use Expat in DIR], expat=$withval, expat=yes)
-AC_ARG_WITH(expat-includes,    [  --with-expat-includes=DIR     Use Expat includes in DIR], expat_includes=$withval, expat_includes=yes)
-AC_ARG_WITH(expat-lib,         [  --with-expat-lib=DIR          Use Expat library in DIR], expat_lib=$withval, expat_lib=yes)
-
 if test "$enable_libxml2" != "yes"; then
-	case "$expat" in
-	no)
-	;;
-	*)
-		case "$expat_includes" in
-		yes)
-			case "$expat" in
-			yes)
-				;;
-			*)
-				EXPAT_CFLAGS="-I$expat/include"
-				;;
-			esac
-			;;
-		no)
-			EXPAT_CFLAGS=""
-			;;
-		*)
-			EXPAT_CFLAGS="-I$expat_includes"
-			;;
-		esac
-		case "$expat_lib" in
-		yes)
-			case "$expat" in
-			yes)
-				EXPAT_LIBS="-lexpat"
-				;;
-			*)
-				EXPAT_LIBS="-L$expat/lib -lexpat"
-				;;
-			esac
-			;;
-		no)
-			;;
-		*)
-			EXPAT_LIBS="-L$expat_lib -lexpat"
-			;;
-		esac
-
-		expatsaved_CPPFLAGS="$CPPFLAGS"
-		CPPFLAGS="$CPPFLAGS $EXPAT_CFLAGS"
-		expatsaved_LIBS="$LIBS"
-		LIBS="$LIBS $EXPAT_LIBS"
-
-		AC_CHECK_HEADER(expat.h)
-		case "$ac_cv_header_expat_h" in
-		no)
-			AC_CHECK_HEADER(xmlparse.h)
-			case "$ac_cv_header_xmlparse_h" in
-			no)
-				have_expat_header=no;
-				;;
-			yes)
-				HAVE_XMLPARSE_H=1
-				AC_SUBST(HAVE_XMLPARSE_H)
-				AC_DEFINE_UNQUOTED(HAVE_XMLPARSE_H,$HAVE_XMLPARSE_H,
+	# specify EXPAT_CFLAGS and/or EXPAT_LIBS if you like the old behavior
+	# with --with-expat-includes and --with-expat-lib.
+	PKG_CHECK_MODULES(EXPAT, expat)
+	expatsaved_CPPFLAGS="$CPPFLAGS"
+	expatsaved_LIBS="$LIBS"
+	CPPFLAGS="$CPPFLAGS $EXPAT_CFLAGS"
+	LIBS="$LIBS $EXPAT_LIBS"
+
+	AC_CHECK_HEADER(expat.h)
+	if test "$ac_cv_header_expat_h" = "no"; then
+		AC_CHECK_HEADER(xmlparse.h)
+		if test "$ac_cv_header_xmlparse_h" = "yes"; then
+			HAVE_XMLPARSE_H=1
+			AC_SUBST(HAVE_XMLPARSE_H)
+			AC_DEFINE_UNQUOTED(HAVE_XMLPARSE_H,$HAVE_XMLPARSE_H,
 				[Use xmlparse.h instead of expat.h])
-				have_expat_header=yes
-				;;
-			esac
-			;;
-		yes)
-			have_expat_header=yes
-			;;
-		esac
-		case "$have_expat_header" in
-		no)
-			expat=no
-			;;
-		yes)
-			AC_CHECK_FUNCS(XML_SetDoctypeDeclHandler)
-			case "$ac_cv_func_XML_SetDoctypeDeclHandler" in
-			yes)
-				HAVE_EXPAT=1
-				AC_SUBST(HAVE_EXPAT)
-				AC_DEFINE_UNQUOTED(HAVE_EXPAT,$HAVE_EXPAT,
-				[Found a useable expat library])
-				;;
-			*)
-				expat=no
-				;;
-			esac
-			;;
-		esac
-		CPPFLAGS="$expatsaved_CPPFLAGS"
-		LIBS="$expatsaved_LIBS"
-		;;
-	esac
-	
+		else
+			AC_MSG_ERROR([
+*** expat is required. or try to use --enable-libxml2])
+		fi
+	fi
+	AC_CHECK_FUNCS(XML_SetDoctypeDeclHandler)
+	if test "$ac_cv_func_XML_SetDoctypeDeclHandler" = "no"; then
+		AC_MSG_ERROR([
+*** expat is required. or try to use --enable-libxml2])
+	fi
+	CPPFLAGS="$expatsaved_CPPFLAGS"
+	LIBS="$expatsaved_LIBS"
+
 	AC_SUBST(EXPAT_CFLAGS)
 	AC_SUBST(EXPAT_LIBS)
-
-	case "$expat" in
-	no)
-		EXPAT_CFLAGS=""
-		EXPAT_LIBS=""
-
-		AC_MSG_WARN([Cannot find usable expat library. Trying to use libxml2 as fallback.])
-		;;
-	esac
 fi
 
 #
 # Check libxml2 configuration
 #
+AC_ARG_ENABLE(libxml2,
+	[AC_HELP_STRING([--enable-libxml2],
+			[Use libxml2 instead of Expat])])
 
-AC_ARG_ENABLE(libxml2,         [  --enable-libxml2              Use libxml2 instead of Expat])
-
-PKG_PROG_PKG_CONFIG
-
-if test "$enable_libxml2" = "yes" -o "$expat" = "no"; then
+if test "$enable_libxml2" = "yes"; then
     PKG_CHECK_MODULES([LIBXML2], [libxml-2.0 >= 2.6])
     AC_DEFINE_UNQUOTED(ENABLE_LIBXML2,1,[Use libxml2 instead of Expat])
 
@@ -330,7 +247,10 @@ fi
 # Set default font directory
 #
 
-AC_ARG_WITH(default-fonts,     [  --with-default-fonts=DIR      Use fonts from DIR when config is busted], default_fonts="$withval", default_fonts=yes)
+AC_ARG_WITH(default-fonts,
+	[AC_HELP_STRING([--with-default-fonts=DIR],
+			[Use fonts from DIR when config is busted])],
+	default_fonts="$withval", default_fonts=yes)
 
 case "$default_fonts" in
 yes)
@@ -358,7 +278,10 @@ AC_SUBST(FC_DEFAULT_FONTS)
 # with outline fonts; those with bitmaps can be added as desired in
 # local.conf or ~/.fonts.conf
 #
-AC_ARG_WITH(add-fonts,        [  --with-add-fonts=DIR1,DIR2,...Find additional fonts in DIR1,DIR2,... ], add_fonts="$withval", add_fonts=yes)
+AC_ARG_WITH(add-fonts,
+	[AC_HELP_STRING([--with-add-fonts=DIR1,DIR2,...],
+			[Find additional fonts in DIR1,DIR2,... ])],
+	add_fonts="$withval", add_fonts=yes)
 
 case "$add_fonts" in
 yes)
@@ -409,7 +332,10 @@ AC_SUBST(FC_FONTPATH)
 #
 # Set default cache directory path
 #
-AC_ARG_WITH(cache-dir,         [  --with-cache-dir=DIR           Use DIR to store cache files (default LOCALSTATEDIR/cache/fontconfig)], fc_cachedir="$withval", fc_cachedir=yes)
+AC_ARG_WITH(cache-dir,
+	[AC_HELP_STRING([--with-cache-dir=DIR],
+			[Use DIR to store cache files [default=LOCALSTATEDIR/cache/fontconfig]])],
+	fc_cachedir="$withval", fc_cachedir=yes)
 
 case $fc_cachedir in
 no|yes)
@@ -430,23 +356,72 @@ FC_FONTDATE=`LC_ALL=C date`
 
 AC_SUBST(FC_FONTDATE)
 
-AC_ARG_WITH(confdir,           [  --with-confdir=DIR            Use DIR to store configuration files (default SYSCONFDIR/fonts)], confdir="$withval", confdir=yes)
-
 #
-# Set CONFDIR and FONTCONFIG_PATH
+# Set configuration paths
 #
 
-case "$confdir" in
+AC_ARG_WITH(templatedir,
+	[AC_HELP_STRING([--with-templatedir=DIR],
+			[Use DIR to store the configuration template files [default=DATADIR/fontconfig/conf.avail]])],
+	[templatedir="$withval"],
+	[templatedir=yes])
+AC_ARG_WITH(baseconfigdir,
+	[AC_HELP_STRING([--with-baseconfigdir=DIR],
+			[Use DIR to store the base configuration files [default=SYSCONFDIR/fonts]])],
+	[baseconfigdir="$withval"],
+	[baseconfigdir=yes])
+AC_ARG_WITH(configdir,
+	[AC_HELP_STRING([--with-configdir=DIR],
+			[Use DIR to store active configuration files [default=BASECONFIGDIR/conf.d]])],
+	[configdir="$withval"],
+	[configdir=yes])
+AC_ARG_WITH(xmldir,
+	[AC_HELP_STRING([--with-xmldir=DIR],
+			[Use DIR to store XML schema files [default=DATADIR/xml/fontconfig]])],
+	[xmldir="$withval"],
+	[xmldir=yes])
+
+case "$templatedir" in
 no|yes)
-	confdir='${sysconfdir}'/fonts
+	templatedir='${datadir}'/fontconfig/conf.avail
 	;;
 *)
 	;;
 esac
-AC_SUBST(confdir)
-CONFDIR=${confdir}
-AC_DEFINE_UNQUOTED(CONFDIR, "$CONFDIR",[Font configuration directory])
-AC_SUBST(CONFDIR)
+case "$baseconfigdir" in
+no|yes)
+	baseconfigdir='${sysconfdir}'/fonts
+	;;
+*)
+	;;
+esac
+case "$configdir" in
+no|yes)
+	configdir='${baseconfigdir}'/conf.d
+	;;
+*)
+	;;
+esac
+case "$xmldir" in
+no|yes)
+	xmldir='${datadir}'/xml/fontconfig
+	;;
+*)
+	;;
+esac
+
+TEMPLATEDIR=${templatedir}
+BASECONFIGDIR=${baseconfigdir}
+CONFIGDIR=${configdir}
+XMLDIR=${xmldir}
+AC_SUBST(templatedir)
+AC_SUBST(TEMPLATEDIR)
+AC_SUBST(baseconfigdir)
+AC_SUBST(BASECONFIGDIR)
+AC_SUBST(configdir)
+AC_SUBST(CONFIGDIR)
+AC_SUBST(xmldir)
+AC_SUBST(XMLDIR)
 
 #
 # Let people not build/install docs if they don't have docbook
@@ -468,7 +443,11 @@ if test x$HASDOCBOOK = xno; then
 	fi
 fi
 
-AC_ARG_ENABLE(docs,           [  --disable-docs                Don't build and install documentation],,enable_docs=$default_docs)
+AC_ARG_ENABLE(docs,
+	[AC_HELP_STRING([--disable-docs],
+			[Don't build and install documentation])],
+	,
+	enable_docs=$default_docs)
 
 AM_CONDITIONAL(ENABLE_DOCS, test "x$enable_docs" = xyes)
 
diff --git a/fontconfig/doc/fontconfig-user.sgml b/fontconfig/doc/fontconfig-user.sgml
index d5da6c03a..14fdc79aa 100644
--- a/fontconfig/doc/fontconfig-user.sgml
+++ b/fontconfig/doc/fontconfig-user.sgml
@@ -392,8 +392,8 @@ build the fontconfig database.
   <refsect2><title><literal>&lt;test qual="any" name="property" target="default" compare="eq"&gt;</literal></title><para>
 This element contains a single value which is compared with the target
 ('pattern', 'font', 'scan' or 'default') property "property" (substitute any of the property names seen 
-above). 'compare' can be one of "eq", "not_eq", "less", "less_eq", "more", or
-"more_eq".  'qual' may either be the default, "any", in which case the match
+above). 'compare' can be one of "eq", "not_eq", "less", "less_eq", "more", "more_eq", "contains" or
+"not_contains".  'qual' may either be the default, "any", in which case the match
 succeeds if any value associated with the property matches the test value, or
 "all", in which case all of the values associated with the property must
 match the test value.  When used in a &lt;match target="font"&gt; element,
@@ -510,7 +510,7 @@ elements.  <literal>&lt;or&gt;</literal> and <literal>&lt;and&gt;</literal> are
       </para>
     </refsect2>
   <refsect2>
-    <title><literal>&lt;eq&gt;</literal>, <literal>&lt;not_eq&gt;</literal>, <literal>&lt;less&gt;</literal>, <literal>&lt;less_eq&gt;</literal>, <literal>&lt;more&gt;</literal>, <literal>&lt;more_eq&gt;</literal></title>
+    <title><literal>&lt;eq&gt;</literal>, <literal>&lt;not_eq&gt;</literal>, <literal>&lt;less&gt;</literal>, <literal>&lt;less_eq&gt;</literal>, <literal>&lt;more&gt;</literal>, <literal>&lt;more_eq&gt;</literal>, <literal>&lt;contains&gt;</literal>, <literal>&lt;not_contains</literal></title>
     <para>
 These elements compare two values, producing a boolean result.
   </para></refsect2>
diff --git a/fontconfig/fonts.conf.in b/fontconfig/fonts.conf.in
index a17c01eeb..533381b9d 100644
--- a/fontconfig/fonts.conf.in
+++ b/fontconfig/fonts.conf.in
@@ -66,7 +66,7 @@
 <!--
   Load local system customization file
 -->
-	<include ignore_missing="yes">conf.d</include>
+	<include ignore_missing="yes">@CONFIGDIR@</include>
 
 <!-- Font cache directory list -->
 
diff --git a/fontconfig/fonts.dtd b/fontconfig/fonts.dtd
index 5f072ee44..e1e8b7382 100644
--- a/fontconfig/fonts.dtd
+++ b/fontconfig/fonts.dtd
@@ -113,7 +113,7 @@
 <!ATTLIST patelt
 	  name CDATA	#REQUIRED>
 
-<!ELEMENT alias (family*, prefer?, accept?, default?)>
+<!ELEMENT alias (test?, family*, prefer?, accept?, default?)>
 <!ATTLIST alias
 	  binding (weak|strong|same) "weak">
 <!ELEMENT prefer (family)*>
diff --git a/fontconfig/src/Makefile.am b/fontconfig/src/Makefile.am
index fb30cd596..591fc1613 100644
--- a/fontconfig/src/Makefile.am
+++ b/fontconfig/src/Makefile.am
@@ -75,7 +75,7 @@ INCLUDES = 						\
 	$(EXPAT_CFLAGS)					\
 	$(WARN_CFLAGS)					\
 	-DFC_CACHEDIR='"$(FC_CACHEDIR)"'                \
-	-DFONTCONFIG_PATH='"$(CONFDIR)"'
+	-DFONTCONFIG_PATH='"$(BASECONFIGDIR)"'
 
 EXTRA_DIST = makealias
 
diff --git a/fontconfig/src/fcxml.c b/fontconfig/src/fcxml.c
index 0fb82b64b..79dfc0b8d 100644
--- a/fontconfig/src/fcxml.c
+++ b/fontconfig/src/fcxml.c
@@ -1583,7 +1583,7 @@ FcParseAlias (FcConfigParse *parse)
     FcExpr	*family = 0, *accept = 0, *prefer = 0, *def = 0, *new = 0;
     FcEdit	*edit = 0, *next;
     FcVStack	*vstack;
-    FcTest	*test;
+    FcTest	*test = NULL;
     FcValueBinding  binding;
 
     if (!FcConfigLexBinding (parse, FcConfigGetAttribute (parse, "binding"), &binding))
@@ -1626,6 +1626,11 @@ FcParseAlias (FcConfigParse *parse)
 	    def = vstack->u.expr;
 	    vstack->tag = FcVStackNone;
 	    break;
+	case FcVStackTest:
+	    vstack->u.test->next = test;
+	    test = vstack->u.test;
+	    vstack->tag = FcVStackNone;
+	    break;
 	default:
 	    FcConfigMessage (parse, FcSevereWarning, "bad alias");
 	    break;
@@ -1683,11 +1688,21 @@ FcParseAlias (FcConfigParse *parse)
     }
     if (edit)
     {
-	test = FcTestCreate (parse, FcMatchPattern,
-			     FcQualAny,
-			     (FcChar8 *) FC_FAMILY,
-			     FcOpEqual,
-			     family);
+	FcTest *t = FcTestCreate (parse, FcMatchPattern,
+				  FcQualAny,
+				  (FcChar8 *) FC_FAMILY,
+				  FcOpEqual,
+				  family);
+	if (test)
+	{
+	    FcTest *p = test;
+
+	    while (p->next)
+		p = p->next;
+	    p->next = t;
+	}
+	else
+	    test = t;
 	if (test)
 	    if (!FcConfigAddEdit (parse->config, test, edit, FcMatchPattern))
 		FcTestDestroy (test);
diff --git a/mesalib/configs/autoconf.in b/mesalib/configs/autoconf.in
index 296bf30d9..95cca6f23 100644
--- a/mesalib/configs/autoconf.in
+++ b/mesalib/configs/autoconf.in
@@ -169,6 +169,9 @@ DRI_DRIVER_SEARCH_DIR = @DRI_DRIVER_SEARCH_DIR@
 # EGL driver install directory
 EGL_DRIVER_INSTALL_DIR = @EGL_DRIVER_INSTALL_DIR@
 
+# XVMC library install directory
+XVMC_LIB_INSTALL_DIR=@XVMC_LIB_INSTALL_DIR@
+
 # VDPAU library install directory
 VDPAU_LIB_INSTALL_DIR=@VDPAU_LIB_INSTALL_DIR@
 
diff --git a/mesalib/configure.ac b/mesalib/configure.ac
index 1c437e7ba..21e4308fa 100644
--- a/mesalib/configure.ac
+++ b/mesalib/configure.ac
@@ -1779,6 +1779,13 @@ AC_ARG_ENABLE([gallium-llvm],
         [build gallium LLVM support @<:@default=enabled on x86/x86_64@:>@])],
     [enable_gallium_llvm="$enableval"],
     [enable_gallium_llvm=auto])
+
+AC_ARG_WITH([llvm-shared-libs],
+    [AS_HELP_STRING([--with-llvm-shared-libs],
+        [link with LLVM shared libraries @<:@default=disabled@:>@])],
+    [with_llvm_shared_libs=yes],
+    [with_llvm_shared_libs=no])
+
 if test "x$with_gallium_drivers" = x; then
     enable_gallium_llvm=no
 fi
@@ -1793,8 +1800,12 @@ if test "x$enable_gallium_llvm" = xyes; then
     if test "x$LLVM_CONFIG" != xno; then
 	LLVM_VERSION=`$LLVM_CONFIG --version | sed 's/svn.*//g'`
 	LLVM_CFLAGS=`$LLVM_CONFIG --cppflags|sed -e 's/-DNDEBUG\>//g' -e 's/-pedantic//g'`
-	LLVM_LIBS="`$LLVM_CONFIG --libs engine bitwriter`"
-
+	if test "x$with_llvm_shared_libs" = xyes; then
+	    dnl We can't use $LLVM_VERSION because it has 'svn' stripped out,
+	    LLVM_LIBS="-lLLVM-`$LLVM_CONFIG --version`"
+	else
+	    LLVM_LIBS="`$LLVM_CONFIG --libs engine bitwriter`"
+	fi
 	LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
 	DEFINES="$DEFINES -D__STDC_CONSTANT_MACROS"
 	MESA_LLVM=1
@@ -1805,6 +1816,14 @@ else
     MESA_LLVM=0
 fi
 
+dnl Directory for XVMC libs
+AC_ARG_WITH([xvmc-libdir],
+    [AS_HELP_STRING([--with-xvmc-libdir=DIR],
+        [directory for the XVMC libraries @<:@default=${libdir}@:>@])],
+    [XVMC_LIB_INSTALL_DIR="$withval"],
+    [XVMC_LIB_INSTALL_DIR='${libdir}'])
+AC_SUBST([XVMC_LIB_INSTALL_DIR])
+
 dnl Directory for VDPAU libs
 AC_ARG_WITH([vdpau-libdir],
     [AS_HELP_STRING([--with-vdpau-libdir=DIR],
diff --git a/mesalib/src/gallium/auxiliary/util/u_blitter.c b/mesalib/src/gallium/auxiliary/util/u_blitter.c
index 5784a7ceb..3e9cbffe9 100644
--- a/mesalib/src/gallium/auxiliary/util/u_blitter.c
+++ b/mesalib/src/gallium/auxiliary/util/u_blitter.c
@@ -47,6 +47,7 @@
 #include "util/u_simple_shaders.h"
 #include "util/u_surface.h"
 #include "util/u_texture.h"
+#include "util/u_upload_mgr.h"
 
 #define INVALID_PTR ((void*)~0)
 
@@ -54,7 +55,7 @@ struct blitter_context_priv
 {
    struct blitter_context base;
 
-   struct pipe_resource *vbuf;  /**< quad */
+   struct u_upload_mgr *upload;
 
    float vertices[4][2][4];   /**< {pos, color} or {pos, texcoord} */
 
@@ -275,11 +276,7 @@ struct blitter_context *util_blitter_create(struct pipe_context *pipe)
    for (i = 0; i < 4; i++)
       ctx->vertices[i][0][3] = 1; /*v.w*/
 
-   /* create the vertex buffer */
-   ctx->vbuf = pipe_user_buffer_create(ctx->base.pipe->screen,
-                                       ctx->vertices,
-                                       sizeof(ctx->vertices),
-                                       PIPE_BIND_VERTEX_BUFFER);
+   ctx->upload = u_upload_create(pipe, 65536, 128, PIPE_BIND_VERTEX_BUFFER);
 
    return &ctx->base;
 }
@@ -327,7 +324,7 @@ void util_blitter_destroy(struct blitter_context *blitter)
    }
 
    pipe->delete_sampler_state(pipe, ctx->sampler_state);
-   pipe_resource_reference(&ctx->vbuf, NULL);
+   u_upload_destroy(ctx->upload);
    FREE(ctx);
 }
 
@@ -721,6 +718,23 @@ void *blitter_get_fs_texfetch_depth(struct blitter_context_priv *ctx,
    return ctx->fs_texfetch_depth[tex_target];
 }
 
+static void blitter_draw(struct blitter_context_priv *ctx,
+                         unsigned x1, unsigned y1,
+                         unsigned x2, unsigned y2,
+                         float depth)
+{
+   struct pipe_resource *buf = NULL;
+   unsigned offset = 0;
+
+   blitter_set_rectangle(ctx, x1, y1, x2, y2, depth);
+
+   u_upload_data(ctx->upload, 0, sizeof(ctx->vertices), ctx->vertices,
+                 &offset, &buf);
+   u_upload_unmap(ctx->upload);
+   util_draw_vertex_buffer(ctx->base.pipe, NULL, buf, offset,
+                           PIPE_PRIM_TRIANGLE_FAN, 4, 2);
+}
+
 static void blitter_draw_rectangle(struct blitter_context *blitter,
                                    unsigned x1, unsigned y1,
                                    unsigned x2, unsigned y2,
@@ -742,11 +756,7 @@ static void blitter_draw_rectangle(struct blitter_context *blitter,
       default:;
    }
 
-   blitter_set_rectangle(ctx, x1, y1, x2, y2, depth);
-   ctx->base.pipe->redefine_user_buffer(ctx->base.pipe, ctx->vbuf,
-                                        0, ctx->vbuf->width0);
-   util_draw_vertex_buffer(ctx->base.pipe, NULL, ctx->vbuf, 0,
-                           PIPE_PRIM_TRIANGLE_FAN, 4, 2);
+   blitter_draw(ctx, x1, y1, x2, y2, depth);
 }
 
 static void util_blitter_clear_custom(struct blitter_context *blitter,
@@ -1047,12 +1057,7 @@ void util_blitter_copy_texture_view(struct blitter_context *blitter,
             assert(0);
          }
 
-         /* Draw. */
-         blitter_set_rectangle(ctx, dstx, dsty, dstx+width, dsty+height, 0);
-         ctx->base.pipe->redefine_user_buffer(ctx->base.pipe, ctx->vbuf,
-                                              0, ctx->vbuf->width0);
-         util_draw_vertex_buffer(ctx->base.pipe, NULL, ctx->vbuf, 0,
-                                 PIPE_PRIM_TRIANGLE_FAN, 4, 2);
+         blitter_draw(ctx, dstx, dsty, dstx+width, dsty+height, 0);
          break;
    }
 
diff --git a/mesalib/src/gallium/auxiliary/util/u_inlines.h b/mesalib/src/gallium/auxiliary/util/u_inlines.h
index 2fe680ff4..23658bc88 100644
--- a/mesalib/src/gallium/auxiliary/util/u_inlines.h
+++ b/mesalib/src/gallium/auxiliary/util/u_inlines.h
@@ -494,6 +494,36 @@ util_get_min_point_size(const struct pipe_rasterizer_state *state)
           !state->multisample ? 1.0f : 0.0f;
 }
 
+static INLINE void
+util_query_clear_result(union pipe_query_result *result, unsigned type)
+{
+   switch (type) {
+   case PIPE_QUERY_OCCLUSION_PREDICATE:
+   case PIPE_QUERY_SO_OVERFLOW_PREDICATE:
+   case PIPE_QUERY_GPU_FINISHED:
+      result->b = FALSE;
+      break;
+   case PIPE_QUERY_OCCLUSION_COUNTER:
+   case PIPE_QUERY_TIMESTAMP:
+   case PIPE_QUERY_TIME_ELAPSED:
+   case PIPE_QUERY_PRIMITIVES_GENERATED:
+   case PIPE_QUERY_PRIMITIVES_EMITTED:
+      result->u64 = 0;
+      break;
+   case PIPE_QUERY_SO_STATISTICS:
+      memset(&result->so_statistics, 0, sizeof(result->so_statistics));
+      break;
+   case PIPE_QUERY_TIMESTAMP_DISJOINT:
+      memset(&result->timestamp_disjoint, 0, sizeof(result->timestamp_disjoint));
+      break;
+   case PIPE_QUERY_PIPELINE_STATISTICS:
+      memset(&result->pipeline_statistics, 0, sizeof(result->pipeline_statistics));
+      break;
+   default:
+      assert(0);
+   }
+}
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/mesalib/src/glsl/ast.h b/mesalib/src/glsl/ast.h
index 1f78af87e..9b1e0b192 100644
--- a/mesalib/src/glsl/ast.h
+++ b/mesalib/src/glsl/ast.h
@@ -206,7 +206,7 @@ public:
       subexpressions[0] = NULL;
       subexpressions[1] = NULL;
       subexpressions[2] = NULL;
-      primary_expression.identifier = (char *) identifier;
+      primary_expression.identifier = identifier;
       this->non_lvalue_description = NULL;
    }
 
@@ -222,7 +222,7 @@ public:
    ast_expression *subexpressions[3];
 
    union {
-      char *identifier;
+      const char *identifier;
       int int_constant;
       float float_constant;
       unsigned uint_constant;
@@ -317,11 +317,11 @@ public:
 
 class ast_declaration : public ast_node {
 public:
-   ast_declaration(char *identifier, int is_array, ast_expression *array_size,
+   ast_declaration(const char *identifier, int is_array, ast_expression *array_size,
 		   ast_expression *initializer);
    virtual void print(void) const;
 
-   char *identifier;
+   const char *identifier;
    
    int is_array;
    ast_expression *array_size;
@@ -407,83 +407,23 @@ struct ast_type_qualifier {
 
 class ast_struct_specifier : public ast_node {
 public:
-   ast_struct_specifier(char *identifier, ast_node *declarator_list);
+   ast_struct_specifier(const char *identifier, ast_node *declarator_list);
    virtual void print(void) const;
 
    virtual ir_rvalue *hir(exec_list *instructions,
 			  struct _mesa_glsl_parse_state *state);
 
-   char *name;
+   const char *name;
    exec_list declarations;
 };
 
 
-enum ast_types {
-   ast_void,
-   ast_float,
-   ast_int,
-   ast_uint,
-   ast_bool,
-   ast_vec2,
-   ast_vec3,
-   ast_vec4,
-   ast_bvec2,
-   ast_bvec3,
-   ast_bvec4,
-   ast_ivec2,
-   ast_ivec3,
-   ast_ivec4,
-   ast_uvec2,
-   ast_uvec3,
-   ast_uvec4,
-   ast_mat2,
-   ast_mat2x3,
-   ast_mat2x4,
-   ast_mat3x2,
-   ast_mat3,
-   ast_mat3x4,
-   ast_mat4x2,
-   ast_mat4x3,
-   ast_mat4,
-   ast_sampler1d,
-   ast_sampler2d,
-   ast_sampler2drect,
-   ast_sampler3d,
-   ast_samplercube,
-   ast_samplerexternaloes,
-   ast_sampler1dshadow,
-   ast_sampler2dshadow,
-   ast_sampler2drectshadow,
-   ast_samplercubeshadow,
-   ast_sampler1darray,
-   ast_sampler2darray,
-   ast_sampler1darrayshadow,
-   ast_sampler2darrayshadow,
-   ast_isampler1d,
-   ast_isampler2d,
-   ast_isampler3d,
-   ast_isamplercube,
-   ast_isampler1darray,
-   ast_isampler2darray,
-   ast_usampler1d,
-   ast_usampler2d,
-   ast_usampler3d,
-   ast_usamplercube,
-   ast_usampler1darray,
-   ast_usampler2darray,
-
-   ast_struct,
-   ast_type_name
-};
-
 
 class ast_type_specifier : public ast_node {
 public:
-   ast_type_specifier(int specifier);
-
    /** Construct a type specifier from a type name */
    ast_type_specifier(const char *name) 
-      : type_specifier(ast_type_name), type_name(name), structure(NULL),
+      : type_name(name), structure(NULL),
 	is_array(false), array_size(NULL), precision(ast_precision_none),
 	is_precision_statement(false)
    {
@@ -492,7 +432,7 @@ public:
 
    /** Construct a type specifier from a structure definition */
    ast_type_specifier(ast_struct_specifier *s)
-      : type_specifier(ast_struct), type_name(s->name), structure(s),
+      : type_name(s->name), structure(s),
 	is_array(false), array_size(NULL), precision(ast_precision_none),
 	is_precision_statement(false)
    {
@@ -507,8 +447,6 @@ public:
 
    ir_rvalue *hir(exec_list *, struct _mesa_glsl_parse_state *);
 
-   enum ast_types type_specifier;
-
    const char *type_name;
    ast_struct_specifier *structure;
 
@@ -568,7 +506,7 @@ public:
 			  struct _mesa_glsl_parse_state *state);
 
    ast_fully_specified_type *type;
-   char *identifier;
+   const char *identifier;
    int is_array;
    ast_expression *array_size;
 
@@ -599,7 +537,7 @@ public:
 			  struct _mesa_glsl_parse_state *state);
 
    ast_fully_specified_type *return_type;
-   char *identifier;
+   const char *identifier;
 
    exec_list parameters;
 
diff --git a/mesalib/src/glsl/ast_function.cpp b/mesalib/src/glsl/ast_function.cpp
index 1c2e8613c..39401017b 100644
--- a/mesalib/src/glsl/ast_function.cpp
+++ b/mesalib/src/glsl/ast_function.cpp
@@ -83,7 +83,7 @@ prototype_string(const glsl_type *return_type, const char *name,
 
    const char *comma = "";
    foreach_list(node, parameters) {
-      const ir_instruction *const param = (ir_instruction *) node;
+      const ir_variable *const param = (ir_variable *) node;
 
       ralloc_asprintf_append(&str, "%s%s", comma, param->type->name);
       comma = ", ";
@@ -94,76 +94,116 @@ prototype_string(const glsl_type *return_type, const char *name,
 }
 
 /**
- * If a function call is generated, \c call_ir will point to it on exit.
- * Otherwise \c call_ir will be set to \c NULL.
+ * Verify that 'out' and 'inout' actual parameters are lvalues.  Also, verify
+ * that 'const_in' formal parameters (an extension in our IR) correspond to
+ * ir_constant actual parameters.
  */
-static ir_rvalue *
-generate_call(exec_list *instructions, ir_function_signature *sig,
-	      YYLTYPE *loc, exec_list *actual_parameters,
-	      ir_call **call_ir,
-	      struct _mesa_glsl_parse_state *state)
+static bool
+verify_parameter_modes(_mesa_glsl_parse_state *state,
+		       ir_function_signature *sig,
+		       exec_list &actual_ir_parameters,
+		       exec_list &actual_ast_parameters)
 {
-   void *ctx = state;
-   exec_list post_call_conversions;
+   exec_node *actual_ir_node  = actual_ir_parameters.head;
+   exec_node *actual_ast_node = actual_ast_parameters.head;
 
-   *call_ir = NULL;
+   foreach_list(formal_node, &sig->parameters) {
+      /* The lists must be the same length. */
+      assert(!actual_ir_node->is_tail_sentinel());
+      assert(!actual_ast_node->is_tail_sentinel());
 
-   /* Verify that 'out' and 'inout' actual parameters are lvalues.  This
-    * isn't done in ir_function::matching_signature because that function
-    * cannot generate the necessary diagnostics.
-    *
-    * Also, validate that 'const_in' formal parameters (an extension of our
-    * IR) correspond to ir_constant actual parameters.
-    *
-    * Also, perform implicit conversion of arguments.  Note: to implicitly
-    * convert out parameters, we need to place them in a temporary
-    * variable, and do the conversion after the call takes place.  Since we
-    * haven't emitted the call yet, we'll place the post-call conversions
-    * in a temporary exec_list, and emit them later.
-    */
-   exec_list_iterator actual_iter = actual_parameters->iterator();
-   exec_list_iterator formal_iter = sig->parameters.iterator();
-
-   while (actual_iter.has_next()) {
-      ir_rvalue *actual = (ir_rvalue *) actual_iter.get();
-      ir_variable *formal = (ir_variable *) formal_iter.get();
+      const ir_variable *const formal = (ir_variable *) formal_node;
+      const ir_rvalue *const actual = (ir_rvalue *) actual_ir_node;
+      const ast_expression *const actual_ast =
+	 exec_node_data(ast_expression, actual_ast_node, link);
 
-      assert(actual != NULL);
-      assert(formal != NULL);
+      /* FIXME: 'loc' is incorrect (as of 2011-01-21). It is always
+       * FIXME: 0:0(0).
+       */
+      YYLTYPE loc = actual_ast->get_location();
 
-      if (formal->mode == ir_var_const_in && !actual->as_constant()) {
-	 _mesa_glsl_error(loc, state,
-			  "parameter `%s' must be a constant expression",
+      /* Verify that 'const_in' parameters are ir_constants. */
+      if (formal->mode == ir_var_const_in &&
+	  actual->ir_type != ir_type_constant) {
+	 _mesa_glsl_error(&loc, state,
+			  "parameter `in %s' must be a constant expression",
 			  formal->name);
-	 return ir_call::get_error_instruction(ctx);
+	 return false;
       }
 
-      if ((formal->mode == ir_var_out)
-	  || (formal->mode == ir_var_inout)) {
+      /* Verify that 'out' and 'inout' actual parameters are lvalues. */
+      if (formal->mode == ir_var_out || formal->mode == ir_var_inout) {
 	 const char *mode = NULL;
 	 switch (formal->mode) {
 	 case ir_var_out:   mode = "out";   break;
 	 case ir_var_inout: mode = "inout"; break;
 	 default:           assert(false);  break;
 	 }
-	 /* FIXME: 'loc' is incorrect (as of 2011-01-21). It is always
-	  * FIXME: 0:0(0).
+
+	 /* This AST-based check catches errors like f(i++).  The IR-based
+	  * is_lvalue() is insufficient because the actual parameter at the
+	  * IR-level is just a temporary value, which is an l-value.
 	  */
+	 if (actual_ast->non_lvalue_description != NULL) {
+	    _mesa_glsl_error(&loc, state,
+			     "function parameter '%s %s' references a %s",
+			     mode, formal->name,
+			     actual_ast->non_lvalue_description);
+	    return false;
+	 }
+
 	 if (actual->variable_referenced()
 	     && actual->variable_referenced()->read_only) {
-	    _mesa_glsl_error(loc, state,
+	    _mesa_glsl_error(&loc, state,
 			     "function parameter '%s %s' references the "
 			     "read-only variable '%s'",
 			     mode, formal->name,
 			     actual->variable_referenced()->name);
-
+	    return false;
 	 } else if (!actual->is_lvalue()) {
-	    _mesa_glsl_error(loc, state,
+	    _mesa_glsl_error(&loc, state,
 			     "function parameter '%s %s' is not an lvalue",
 			     mode, formal->name);
+	    return false;
 	 }
       }
 
+      actual_ir_node  = actual_ir_node->next;
+      actual_ast_node = actual_ast_node->next;
+   }
+   return true;
+}
+
+/**
+ * If a function call is generated, \c call_ir will point to it on exit.
+ * Otherwise \c call_ir will be set to \c NULL.
+ */
+static ir_rvalue *
+generate_call(exec_list *instructions, ir_function_signature *sig,
+	      YYLTYPE *loc, exec_list *actual_parameters,
+	      ir_call **call_ir,
+	      struct _mesa_glsl_parse_state *state)
+{
+   void *ctx = state;
+   exec_list post_call_conversions;
+
+   *call_ir = NULL;
+
+   /* Perform implicit conversion of arguments.  For out parameters, we need
+    * to place them in a temporary variable and do the conversion after the
+    * call takes place.  Since we haven't emitted the call yet, we'll place
+    * the post-call conversions in a temporary exec_list, and emit them later.
+    */
+   exec_list_iterator actual_iter = actual_parameters->iterator();
+   exec_list_iterator formal_iter = sig->parameters.iterator();
+
+   while (actual_iter.has_next()) {
+      ir_rvalue *actual = (ir_rvalue *) actual_iter.get();
+      ir_variable *formal = (ir_variable *) formal_iter.get();
+
+      assert(actual != NULL);
+      assert(formal != NULL);
+
       if (formal->type->is_numeric() || formal->type->is_boolean()) {
 	 switch (formal->mode) {
 	 case ir_var_const_in:
@@ -229,29 +269,21 @@ generate_call(exec_list *instructions, ir_function_signature *sig,
       formal_iter.next();
    }
 
-   /* Always insert the call in the instruction stream, and return a deref
-    * of its return val if it returns a value, since we don't know if
-    * the rvalue is going to be assigned to anything or not.
+   /* If the function call is a constant expression, don't generate any
+    * instructions; just generate an ir_constant.
     *
-    * Also insert any out parameter conversions after the call.
+    * Function calls were first allowed to be constant expressions in GLSL 1.20.
     */
-   ir_call *call = new(ctx) ir_call(sig, actual_parameters);
-   ir_dereference_variable *deref;
-   if (!sig->return_type->is_void()) {
-      /* If the function call is a constant expression, don't
-       * generate the instructions to call it; just generate an
-       * ir_constant representing the constant value.
-       *
-       * Function calls can only be constant expressions starting
-       * in GLSL 1.20.
-       */
-      if (state->language_version >= 120) {
-	 ir_constant *const_val = call->constant_expression_value();
-	 if (const_val) {
-	    return const_val;
-	 }
+   if (state->language_version >= 120) {
+      ir_constant *value = sig->constant_expression_value(actual_parameters);
+      if (value != NULL) {
+	 return value;
       }
+   }
 
+   ir_dereference_variable *deref = NULL;
+   if (!sig->return_type->is_void()) {
+      /* Create a new temporary to hold the return value. */
       ir_variable *var;
 
       var = new(ctx) ir_variable(sig->return_type,
@@ -261,24 +293,22 @@ generate_call(exec_list *instructions, ir_function_signature *sig,
       instructions->push_tail(var);
 
       deref = new(ctx) ir_dereference_variable(var);
-      ir_assignment *assign = new(ctx) ir_assignment(deref, call, NULL);
-      instructions->push_tail(assign);
-      *call_ir = call;
-
-      deref = new(ctx) ir_dereference_variable(var);
-   } else {
-      instructions->push_tail(call);
-      *call_ir = call;
-      deref = NULL;
    }
+   ir_call *call = new(ctx) ir_call(sig, deref, actual_parameters);
+   instructions->push_tail(call);
+
+   /* Also emit any necessary out-parameter conversions. */
    instructions->append_list(&post_call_conversions);
-   return deref;
+
+   return deref ? deref->clone(ctx, NULL) : NULL;
 }
 
-static ir_rvalue *
-match_function_by_name(exec_list *instructions, const char *name,
-		       YYLTYPE *loc, exec_list *actual_parameters,
-		       ir_call **call_ir,
+/**
+ * Given a function name and parameter list, find the matching signature.
+ */
+static ir_function_signature *
+match_function_by_name(const char *name,
+		       exec_list *actual_parameters,
 		       struct _mesa_glsl_parse_state *state)
 {
    void *ctx = state;
@@ -350,43 +380,45 @@ done:
 	 }
 	 f->add_signature(sig->clone_prototype(f, NULL));
       }
+   }
+   return sig;
+}
 
-      /* Finally, generate a call instruction. */
-      return generate_call(instructions, sig, loc, actual_parameters,
-			   call_ir, state);
-   } else {
-      char *str = prototype_string(NULL, name, actual_parameters);
-
-      _mesa_glsl_error(loc, state, "no matching function for call to `%s'",
-		       str);
-      ralloc_free(str);
-
-      const char *prefix = "candidates are: ";
+/**
+ * Raise a "no matching function" error, listing all possible overloads the
+ * compiler considered so developers can figure out what went wrong.
+ */
+static void
+no_matching_function_error(const char *name,
+			   YYLTYPE *loc,
+			   exec_list *actual_parameters,
+			   _mesa_glsl_parse_state *state)
+{
+   char *str = prototype_string(NULL, name, actual_parameters);
+   _mesa_glsl_error(loc, state, "no matching function for call to `%s'", str);
+   ralloc_free(str);
 
-      for (int i = -1; i < (int) state->num_builtins_to_link; i++) {
-	 glsl_symbol_table *syms = i >= 0 ? state->builtins_to_link[i]->symbols
-					  : state->symbols;
-	 f = syms->get_function(name);
-	 if (f == NULL)
-	    continue;
+   const char *prefix = "candidates are: ";
 
-	 foreach_list (node, &f->signatures) {
-	    ir_function_signature *sig = (ir_function_signature *) node;
+   for (int i = -1; i < (int) state->num_builtins_to_link; i++) {
+      glsl_symbol_table *syms = i >= 0 ? state->builtins_to_link[i]->symbols
+				       : state->symbols;
+      ir_function *f = syms->get_function(name);
+      if (f == NULL)
+	 continue;
 
-	    str = prototype_string(sig->return_type, f->name, &sig->parameters);
-	    _mesa_glsl_error(loc, state, "%s%s", prefix, str);
-	    ralloc_free(str);
+      foreach_list (node, &f->signatures) {
+	 ir_function_signature *sig = (ir_function_signature *) node;
 
-	    prefix = "                ";
-	 }
+	 str = prototype_string(sig->return_type, f->name, &sig->parameters);
+	 _mesa_glsl_error(loc, state, "%s%s", prefix, str);
+	 ralloc_free(str);
 
+	 prefix = "                ";
       }
-
-      return ir_call::get_error_instruction(ctx);
    }
 }
 
-
 /**
  * Perform automatic type conversion of constructor parameters
  *
@@ -558,7 +590,7 @@ process_array_constructor(exec_list *instructions,
 		       "parameter%s",
 		       (constructor_type->length != 0) ? "at least" : "exactly",
 		       min_param, (min_param <= 1) ? "" : "s");
-      return ir_call::get_error_instruction(ctx);
+      return ir_rvalue::error_value(ctx);
    }
 
    if (constructor_type->length == 0) {
@@ -1195,7 +1227,7 @@ ast_function_expression::hir(exec_list *instructions,
 	 _mesa_glsl_error(& loc, state, "unknown type `%s' (structure name "
 			  "may be shadowed by a variable with the same name)",
 			  type->type_name);
-	 return ir_call::get_error_instruction(ctx);
+	 return ir_rvalue::error_value(ctx);
       }
 
 
@@ -1204,14 +1236,14 @@ ast_function_expression::hir(exec_list *instructions,
       if (constructor_type->is_sampler()) {
 	 _mesa_glsl_error(& loc, state, "cannot construct sampler type `%s'",
 			  constructor_type->name);
-	 return ir_call::get_error_instruction(ctx);
+	 return ir_rvalue::error_value(ctx);
       }
 
       if (constructor_type->is_array()) {
 	 if (state->language_version <= 110) {
 	    _mesa_glsl_error(& loc, state,
 			     "array constructors forbidden in GLSL 1.10");
-	    return ir_call::get_error_instruction(ctx);
+	    return ir_rvalue::error_value(ctx);
 	 }
 
 	 return process_array_constructor(instructions, constructor_type,
@@ -1242,7 +1274,7 @@ ast_function_expression::hir(exec_list *instructions,
 				"insufficient parameters to constructor "
 				"for `%s'",
 				constructor_type->name);
-	       return ir_call::get_error_instruction(ctx);
+	       return ir_rvalue::error_value(ctx);
 	    }
 
 	    if (apply_implicit_conversion(constructor_type->fields.structure[i].type,
@@ -1256,7 +1288,7 @@ ast_function_expression::hir(exec_list *instructions,
 				constructor_type->fields.structure[i].name,
 				ir->type->name,
 				constructor_type->fields.structure[i].type->name);
-	       return ir_call::get_error_instruction(ctx);;
+	       return ir_rvalue::error_value(ctx);;
 	    }
 
 	    node = node->next;
@@ -1265,7 +1297,7 @@ ast_function_expression::hir(exec_list *instructions,
 	 if (!node->is_tail_sentinel()) {
 	    _mesa_glsl_error(&loc, state, "too many parameters in constructor "
 			     "for `%s'", constructor_type->name);
-	    return ir_call::get_error_instruction(ctx);
+	    return ir_rvalue::error_value(ctx);
 	 }
 
 	 ir_rvalue *const constant =
@@ -1279,7 +1311,7 @@ ast_function_expression::hir(exec_list *instructions,
       }
 
       if (!constructor_type->is_numeric() && !constructor_type->is_boolean())
-	 return ir_call::get_error_instruction(ctx);
+	 return ir_rvalue::error_value(ctx);
 
       /* Total number of components of the type being constructed. */
       const unsigned type_components = constructor_type->components();
@@ -1306,14 +1338,14 @@ ast_function_expression::hir(exec_list *instructions,
 	    _mesa_glsl_error(& loc, state, "too many parameters to `%s' "
 			     "constructor",
 			     constructor_type->name);
-	    return ir_call::get_error_instruction(ctx);
+	    return ir_rvalue::error_value(ctx);
 	 }
 
 	 if (!result->type->is_numeric() && !result->type->is_boolean()) {
 	    _mesa_glsl_error(& loc, state, "cannot construct `%s' from a "
 			     "non-numeric data type",
 			     constructor_type->name);
-	    return ir_call::get_error_instruction(ctx);
+	    return ir_rvalue::error_value(ctx);
 	 }
 
 	 /* Count the number of matrix and nonmatrix parameters.  This
@@ -1338,7 +1370,7 @@ ast_function_expression::hir(exec_list *instructions,
 	 _mesa_glsl_error(& loc, state, "cannot construct `%s' from a "
 			  "matrix in GLSL 1.10",
 			  constructor_type->name);
-	 return ir_call::get_error_instruction(ctx);
+	 return ir_rvalue::error_value(ctx);
       }
 
       /* From page 50 (page 56 of the PDF) of the GLSL 1.50 spec:
@@ -1352,7 +1384,7 @@ ast_function_expression::hir(exec_list *instructions,
 	 _mesa_glsl_error(& loc, state, "for matrix `%s' constructor, "
 			  "matrix must be only parameter",
 			  constructor_type->name);
-	 return ir_call::get_error_instruction(ctx);
+	 return ir_rvalue::error_value(ctx);
       }
 
       /* From page 28 (page 34 of the PDF) of the GLSL 1.10 spec:
@@ -1366,7 +1398,7 @@ ast_function_expression::hir(exec_list *instructions,
 	 _mesa_glsl_error(& loc, state, "too few components to construct "
 			  "`%s'",
 			  constructor_type->name);
-	 return ir_call::get_error_instruction(ctx);
+	 return ir_rvalue::error_value(ctx);
       }
 
       /* Later, we cast each parameter to the same base type as the
@@ -1447,60 +1479,31 @@ ast_function_expression::hir(exec_list *instructions,
       }
    } else {
       const ast_expression *id = subexpressions[0];
+      const char *func_name = id->primary_expression.identifier;
       YYLTYPE loc = id->get_location();
       exec_list actual_parameters;
 
       process_parameters(instructions, &actual_parameters, &this->expressions,
 			 state);
 
-      ir_call *call = NULL;
-      ir_rvalue *const value =
-	 match_function_by_name(instructions,
-				id->primary_expression.identifier,
-				&loc, &actual_parameters, &call, state);
-
-      if (call != NULL) {
-	 /* If a function was found, make sure that none of the 'out' or 'inout'
-	  * parameters violate the extra l-value rules.
-	  */
-	 ir_function_signature *f = call->get_callee();
-	 assert(f != NULL);
-
-	 exec_node *formal_node = f->parameters.head;
+      ir_function_signature *sig =
+	 match_function_by_name(func_name, &actual_parameters, state);
 
-	 foreach_list (actual_node, &this->expressions) {
-	    /* Both parameter lists had better be the same length!
-	     */
-	    assert(!actual_node->is_tail_sentinel());
-
-	    const ir_variable *const formal_parameter =
-	       (ir_variable *) formal_node;
-	    const ast_expression *const actual_parameter =
-	       exec_node_data(ast_expression, actual_node, link);
-
-	    if ((formal_parameter->mode == ir_var_out
-		 || formal_parameter->mode == ir_var_inout)
-		&& actual_parameter->non_lvalue_description != NULL) {
-	       YYLTYPE loc = actual_parameter->get_location();
-
-	       _mesa_glsl_error(&loc, state,
-				"function parameter '%s %s' references a %s",
-				(formal_parameter->mode == ir_var_out)
-				? "out" : "inout",
-				formal_parameter->name,
-				actual_parameter->non_lvalue_description);
-	       return ir_call::get_error_instruction(ctx);
-	    }
-
-	    /* Only advance the formal_node pointer here because the
-	     * foreach_list business already advances actual_node.
-	     */
-	    formal_node = formal_node->next;
-	 }
+      ir_call *call = NULL;
+      ir_rvalue *value = NULL;
+      if (sig == NULL) {
+	 no_matching_function_error(func_name, &loc, &actual_parameters, state);
+	 value = ir_rvalue::error_value(ctx);
+      } else if (!verify_parameter_modes(state, sig, actual_parameters, this->expressions)) {
+	 /* an error has already been emitted */
+	 value = ir_rvalue::error_value(ctx);
+      } else {
+	 value = generate_call(instructions, sig, &loc, &actual_parameters,
+			       &call, state);
       }
 
       return value;
    }
 
-   return ir_call::get_error_instruction(ctx);
+   return ir_rvalue::error_value(ctx);
 }
diff --git a/mesalib/src/glsl/ast_to_hir.cpp b/mesalib/src/glsl/ast_to_hir.cpp
index ff56e33b7..f4dfc4ce3 100644
--- a/mesalib/src/glsl/ast_to_hir.cpp
+++ b/mesalib/src/glsl/ast_to_hir.cpp
@@ -1699,7 +1699,7 @@ ast_expression::hir(exec_list *instructions,
 	 _mesa_glsl_error(& loc, state, "`%s' undeclared",
 			  this->primary_expression.identifier);
 
-	 result = ir_call::get_error_instruction(ctx);
+	 result = ir_rvalue::error_value(ctx);
 	 error_emitted = true;
       }
       break;
@@ -3904,8 +3904,8 @@ ast_type_specifier::hir(exec_list *instructions,
                           "arrays");
          return NULL;
       }
-      if (this->type_specifier != ast_float
-          && this->type_specifier != ast_int) {
+      if (strcmp(this->type_name, "float") != 0 &&
+	  strcmp(this->type_name, "int") != 0) {
          _mesa_glsl_error(&loc, state,
                           "default precision statements apply only to types "
                           "float and int");
diff --git a/mesalib/src/glsl/ast_type.cpp b/mesalib/src/glsl/ast_type.cpp
index 79c43eefb..6c44f8c41 100644
--- a/mesalib/src/glsl/ast_type.cpp
+++ b/mesalib/src/glsl/ast_type.cpp
@@ -29,7 +29,7 @@ extern "C" {
 void
 ast_type_specifier::print(void) const
 {
-   if (type_specifier == ast_struct) {
+   if (structure) {
       structure->print();
    } else {
       printf("%s ", type_name);
@@ -46,72 +46,6 @@ ast_type_specifier::print(void) const
    }
 }
 
-ast_type_specifier::ast_type_specifier(int specifier)
-      : type_specifier(ast_types(specifier)), type_name(NULL), structure(NULL),
-	is_array(false), array_size(NULL), precision(ast_precision_none),
-	is_precision_statement(false)
-{
-   static const char *const names[] = {
-      "void",
-      "float",
-      "int",
-      "uint",
-      "bool",
-      "vec2",
-      "vec3",
-      "vec4",
-      "bvec2",
-      "bvec3",
-      "bvec4",
-      "ivec2",
-      "ivec3",
-      "ivec4",
-      "uvec2",
-      "uvec3",
-      "uvec4",
-      "mat2",
-      "mat2x3",
-      "mat2x4",
-      "mat3x2",
-      "mat3",
-      "mat3x4",
-      "mat4x2",
-      "mat4x3",
-      "mat4",
-      "sampler1D",
-      "sampler2D",
-      "sampler2DRect",
-      "sampler3D",
-      "samplerCube",
-      "samplerExternalOES",
-      "sampler1DShadow",
-      "sampler2DShadow",
-      "sampler2DRectShadow",
-      "samplerCubeShadow",
-      "sampler1DArray",
-      "sampler2DArray",
-      "sampler1DArrayShadow",
-      "sampler2DArrayShadow",
-      "isampler1D",
-      "isampler2D",
-      "isampler3D",
-      "isamplerCube",
-      "isampler1DArray",
-      "isampler2DArray",
-      "usampler1D",
-      "usampler2D",
-      "usampler3D",
-      "usamplerCube",
-      "usampler1DArray",
-      "usampler2DArray",
-
-      NULL, /* ast_struct */
-      NULL  /* ast_type_name */
-   };
-
-   type_name = names[specifier];
-}
-
 bool
 ast_fully_specified_type::has_qualifiers() const
 {
diff --git a/mesalib/src/glsl/glsl_parser.yy b/mesalib/src/glsl/glsl_parser.yy
index 64506b635..920213c30 100644
--- a/mesalib/src/glsl/glsl_parser.yy
+++ b/mesalib/src/glsl/glsl_parser.yy
@@ -58,7 +58,7 @@ static void yyerror(YYLTYPE *loc, _mesa_glsl_parse_state *st, const char *msg)
 %union {
    int n;
    float real;
-   char *identifier;
+   const char *identifier;
 
    struct ast_type_qualifier type_qualifier;
 
@@ -156,7 +156,7 @@ static void yyerror(YYLTYPE *loc, _mesa_glsl_parse_state *st, const char *msg)
 %type <type_specifier> type_specifier
 %type <type_specifier> type_specifier_no_prec
 %type <type_specifier> type_specifier_nonarray
-%type <n> basic_type_specifier_nonarray
+%type <identifier> basic_type_specifier_nonarray
 %type <fully_specified_type> fully_specified_type
 %type <function> function_prototype
 %type <function> function_header
@@ -1365,58 +1365,59 @@ type_specifier_nonarray:
 	;
 
 basic_type_specifier_nonarray:
-	VOID_TOK		{ $$ = ast_void; }
-	| FLOAT_TOK		{ $$ = ast_float; }
-	| INT_TOK		{ $$ = ast_int; }
-	| UINT_TOK		{ $$ = ast_uint; }
-	| BOOL_TOK		{ $$ = ast_bool; }
-	| VEC2			{ $$ = ast_vec2; }
-	| VEC3			{ $$ = ast_vec3; }
-	| VEC4			{ $$ = ast_vec4; }
-	| BVEC2			{ $$ = ast_bvec2; }
-	| BVEC3			{ $$ = ast_bvec3; }
-	| BVEC4			{ $$ = ast_bvec4; }
-	| IVEC2			{ $$ = ast_ivec2; }
-	| IVEC3			{ $$ = ast_ivec3; }
-	| IVEC4			{ $$ = ast_ivec4; }
-	| UVEC2			{ $$ = ast_uvec2; }
-	| UVEC3			{ $$ = ast_uvec3; }
-	| UVEC4			{ $$ = ast_uvec4; }
-	| MAT2X2		{ $$ = ast_mat2; }
-	| MAT2X3		{ $$ = ast_mat2x3; }
-	| MAT2X4		{ $$ = ast_mat2x4; }
-	| MAT3X2		{ $$ = ast_mat3x2; }
-	| MAT3X3		{ $$ = ast_mat3; }
-	| MAT3X4		{ $$ = ast_mat3x4; }
-	| MAT4X2		{ $$ = ast_mat4x2; }
-	| MAT4X3		{ $$ = ast_mat4x3; }
-	| MAT4X4		{ $$ = ast_mat4; }
-	| SAMPLER1D		{ $$ = ast_sampler1d; }
-	| SAMPLER2D		{ $$ = ast_sampler2d; }
-	| SAMPLER2DRECT		{ $$ = ast_sampler2drect; }
-	| SAMPLER3D		{ $$ = ast_sampler3d; }
-	| SAMPLERCUBE		{ $$ = ast_samplercube; }
-	| SAMPLEREXTERNALOES	{ $$ = ast_samplerexternaloes; }
-	| SAMPLER1DSHADOW	{ $$ = ast_sampler1dshadow; }
-	| SAMPLER2DSHADOW	{ $$ = ast_sampler2dshadow; }
-	| SAMPLER2DRECTSHADOW	{ $$ = ast_sampler2drectshadow; }
-	| SAMPLERCUBESHADOW	{ $$ = ast_samplercubeshadow; }
-	| SAMPLER1DARRAY	{ $$ = ast_sampler1darray; }
-	| SAMPLER2DARRAY	{ $$ = ast_sampler2darray; }
-	| SAMPLER1DARRAYSHADOW	{ $$ = ast_sampler1darrayshadow; }
-	| SAMPLER2DARRAYSHADOW	{ $$ = ast_sampler2darrayshadow; }
-	| ISAMPLER1D		{ $$ = ast_isampler1d; }
-	| ISAMPLER2D		{ $$ = ast_isampler2d; }
-	| ISAMPLER3D		{ $$ = ast_isampler3d; }
-	| ISAMPLERCUBE		{ $$ = ast_isamplercube; }
-	| ISAMPLER1DARRAY	{ $$ = ast_isampler1darray; }
-	| ISAMPLER2DARRAY	{ $$ = ast_isampler2darray; }
-	| USAMPLER1D		{ $$ = ast_usampler1d; }
-	| USAMPLER2D		{ $$ = ast_usampler2d; }
-	| USAMPLER3D		{ $$ = ast_usampler3d; }
-	| USAMPLERCUBE		{ $$ = ast_usamplercube; }
-	| USAMPLER1DARRAY	{ $$ = ast_usampler1darray; }
-	| USAMPLER2DARRAY	{ $$ = ast_usampler2darray; }
+	VOID_TOK		{ $$ = "void"; }
+	| FLOAT_TOK		{ $$ = "float"; }
+	| INT_TOK		{ $$ = "int"; }
+	| UINT_TOK		{ $$ = "uint"; }
+	| BOOL_TOK		{ $$ = "bool"; }
+	| VEC2			{ $$ = "vec2"; }
+	| VEC3			{ $$ = "vec3"; }
+	| VEC4			{ $$ = "vec4"; }
+	| BVEC2			{ $$ = "bvec2"; }
+	| BVEC3			{ $$ = "bvec3"; }
+	| BVEC4			{ $$ = "bvec4"; }
+	| IVEC2			{ $$ = "ivec2"; }
+	| IVEC3			{ $$ = "ivec3"; }
+	| IVEC4			{ $$ = "ivec4"; }
+	| UVEC2			{ $$ = "uvec2"; }
+	| UVEC3			{ $$ = "uvec3"; }
+	| UVEC4			{ $$ = "uvec4"; }
+	| MAT2X2		{ $$ = "mat2"; }
+	| MAT2X3		{ $$ = "mat2x3"; }
+	| MAT2X4		{ $$ = "mat2x4"; }
+	| MAT3X2		{ $$ = "mat3x2"; }
+	| MAT3X3		{ $$ = "mat3"; }
+	| MAT3X4		{ $$ = "mat3x4"; }
+	| MAT4X2		{ $$ = "mat4x2"; }
+	| MAT4X3		{ $$ = "mat4x3"; }
+	| MAT4X4		{ $$ = "mat4"; }
+	| SAMPLER1D		{ $$ = "sampler1D"; }
+	| SAMPLER2D		{ $$ = "sampler2D"; }
+	| SAMPLER2DRECT		{ $$ = "sampler2DRect"; }
+	| SAMPLER3D		{ $$ = "sampler3D"; }
+	| SAMPLERCUBE		{ $$ = "samplerCube"; }
+	| SAMPLEREXTERNALOES	{ $$ = "samplerExternalOES"; }
+	| SAMPLER1DSHADOW	{ $$ = "sampler1DShadow"; }
+	| SAMPLER2DSHADOW	{ $$ = "sampler2DShadow"; }
+	| SAMPLER2DRECTSHADOW	{ $$ = "sampler2DRectShadow"; }
+	| SAMPLERCUBESHADOW	{ $$ = "samplerCubeShadow"; }
+	| SAMPLER1DARRAY	{ $$ = "sampler1DArray"; }
+	| SAMPLER2DARRAY	{ $$ = "sampler2DArray"; }
+	| SAMPLER1DARRAYSHADOW	{ $$ = "sampler1DArrayShadow"; }
+	| SAMPLER2DARRAYSHADOW	{ $$ = "sampler2DArrayShadow"; }
+	| SAMPLERBUFFER		{ $$ = "samplerBuffer"; }
+	| ISAMPLER1D		{ $$ = "isampler1D"; }
+	| ISAMPLER2D		{ $$ = "isampler2D"; }
+	| ISAMPLER3D		{ $$ = "isampler3D"; }
+	| ISAMPLERCUBE		{ $$ = "isamplerCube"; }
+	| ISAMPLER1DARRAY	{ $$ = "isampler1DArray"; }
+	| ISAMPLER2DARRAY	{ $$ = "isampler2DArray"; }
+	| USAMPLER1D		{ $$ = "usampler1D"; }
+	| USAMPLER2D		{ $$ = "usampler2D"; }
+	| USAMPLER3D		{ $$ = "usampler3D"; }
+	| USAMPLERCUBE		{ $$ = "usamplerCube"; }
+	| USAMPLER1DARRAY	{ $$ = "usampler1DArray"; }
+	| USAMPLER2DARRAY	{ $$ = "usampler2DArray"; }
 	;
 
 precision_qualifier:
diff --git a/mesalib/src/glsl/glsl_parser_extras.cpp b/mesalib/src/glsl/glsl_parser_extras.cpp
index 21c3c6ec2..6547ad2d3 100644
--- a/mesalib/src/glsl/glsl_parser_extras.cpp
+++ b/mesalib/src/glsl/glsl_parser_extras.cpp
@@ -713,7 +713,7 @@ ast_declaration::print(void) const
 }
 
 
-ast_declaration::ast_declaration(char *identifier, int is_array,
+ast_declaration::ast_declaration(const char *identifier, int is_array,
 				 ast_expression *array_size,
 				 ast_expression *initializer)
 {
@@ -979,7 +979,7 @@ ast_struct_specifier::print(void) const
 }
 
 
-ast_struct_specifier::ast_struct_specifier(char *identifier,
+ast_struct_specifier::ast_struct_specifier(const char *identifier,
 					   ast_node *declarator_list)
 {
    if (identifier == NULL) {
diff --git a/mesalib/src/glsl/glsl_types.cpp b/mesalib/src/glsl/glsl_types.cpp
index 069ebd10d..8a34b8eb0 100644
--- a/mesalib/src/glsl/glsl_types.cpp
+++ b/mesalib/src/glsl/glsl_types.cpp
@@ -146,7 +146,6 @@ glsl_type::sampler_index() const
    case GLSL_SAMPLER_DIM_RECT:
       return TEXTURE_RECT_INDEX;
    case GLSL_SAMPLER_DIM_BUF:
-      assert(!"FINISHME: Implement ARB_texture_buffer_object");
       return TEXTURE_BUFFER_INDEX;
    case GLSL_SAMPLER_DIM_EXTERNAL:
       return TEXTURE_EXTERNAL_INDEX;
@@ -213,6 +212,10 @@ glsl_type::generate_140_types(glsl_symbol_table *symtab)
 
    add_types_to_symbol_table(symtab, builtin_140_types,
 			     Elements(builtin_140_types), false);
+
+   add_types_to_symbol_table(symtab, builtin_EXT_texture_buffer_object_types,
+			     Elements(builtin_EXT_texture_buffer_object_types),
+			     false);
 }
 
 
diff --git a/mesalib/src/glsl/hir_field_selection.cpp b/mesalib/src/glsl/hir_field_selection.cpp
index 3c33127b5..260b415a8 100644
--- a/mesalib/src/glsl/hir_field_selection.cpp
+++ b/mesalib/src/glsl/hir_field_selection.cpp
@@ -98,5 +98,5 @@ _mesa_ast_field_selection_to_hir(const ast_expression *expr,
 		       expr->primary_expression.identifier);
    }
 
-   return result ? result : ir_call::get_error_instruction(ctx);
+   return result ? result : ir_rvalue::error_value(ctx);
 }
diff --git a/mesalib/src/glsl/ir.cpp b/mesalib/src/glsl/ir.cpp
index 3c9d6e174..1ba87515e 100644
--- a/mesalib/src/glsl/ir.cpp
+++ b/mesalib/src/glsl/ir.cpp
@@ -1458,22 +1458,15 @@ ir_function::has_user_signature()
 }
 
 
-ir_call *
-ir_call::get_error_instruction(void *ctx)
+ir_rvalue *
+ir_rvalue::error_value(void *mem_ctx)
 {
-   ir_call *call = new(ctx) ir_call;
+   ir_rvalue *v = new(mem_ctx) ir_rvalue;
 
-   call->type = glsl_type::error_type;
-   return call;
+   v->type = glsl_type::error_type;
+   return v;
 }
 
-void
-ir_call::set_callee(ir_function_signature *sig)
-{
-   assert((this->type == NULL) || (this->type == sig->return_type));
-
-   this->callee = sig;
-}
 
 void
 visit_exec_list(exec_list *list, ir_visitor *visitor)
diff --git a/mesalib/src/glsl/ir.h b/mesalib/src/glsl/ir.h
index 1faae3c72..b1ae6db74 100644
--- a/mesalib/src/glsl/ir.h
+++ b/mesalib/src/glsl/ir.h
@@ -88,7 +88,6 @@ enum ir_node_type {
 class ir_instruction : public exec_node {
 public:
    enum ir_node_type ir_type;
-   const struct glsl_type *type;
 
    /** ir_print_visitor helper for debugging. */
    void print(void) const;
@@ -127,16 +126,27 @@ protected:
    ir_instruction()
    {
       ir_type = ir_type_unset;
-      type = NULL;
    }
 };
 
 
+/**
+ * The base class for all "values"/expression trees.
+ */
 class ir_rvalue : public ir_instruction {
 public:
-   virtual ir_rvalue *clone(void *mem_ctx, struct hash_table *) const = 0;
+   const struct glsl_type *type;
+
+   virtual ir_rvalue *clone(void *mem_ctx, struct hash_table *) const;
+
+   virtual void accept(ir_visitor *v)
+   {
+      v->visit(this);
+   }
 
-   virtual ir_constant *constant_expression_value() = 0;
+   virtual ir_visitor_status accept(ir_hierarchical_visitor *);
+
+   virtual ir_constant *constant_expression_value();
 
    virtual ir_rvalue * as_rvalue()
    {
@@ -209,6 +219,14 @@ public:
     */
    virtual bool is_negative_one() const;
 
+
+   /**
+    * Return a generic value of error_type.
+    *
+    * Allocation will be performed with 'mem_ctx' as ralloc owner.
+    */
+   static ir_rvalue *error_value(void *mem_ctx);
+
 protected:
    ir_rvalue();
 };
@@ -303,6 +321,11 @@ public:
    glsl_interp_qualifier determine_interpolation_mode(bool flat_shade);
 
    /**
+    * Declared type of the variable
+    */
+   const struct glsl_type *type;
+
+   /**
     * Delcared name of the variable
     */
    const char *name;
@@ -460,6 +483,12 @@ public:
    virtual ir_visitor_status accept(ir_hierarchical_visitor *);
 
    /**
+    * Attempt to evaluate this function as a constant expression, given
+    * a list of the actual parameters.  Returns NULL for non-built-ins.
+    */
+   ir_constant *constant_expression_value(exec_list *actual_parameters);
+
+   /**
     * Get the name of the function for which this is a signature
     */
    const char *function_name() const;
@@ -999,16 +1028,18 @@ public:
 
 
 /**
- * IR instruction representing a function call
+ * HIR instruction representing a high-level function call, containing a list
+ * of parameters and returning a value in the supplied temporary.
  */
-class ir_call : public ir_rvalue {
+class ir_call : public ir_instruction {
 public:
-   ir_call(ir_function_signature *callee, exec_list *actual_parameters)
-      : callee(callee)
+   ir_call(ir_function_signature *callee,
+	   ir_dereference_variable *return_deref,
+	   exec_list *actual_parameters)
+      : return_deref(return_deref), callee(callee)
    {
       ir_type = ir_type_call;
       assert(callee->return_type != NULL);
-      type = callee->return_type;
       actual_parameters->move_nodes_to(& this->actual_parameters);
       this->use_builtin = callee->is_builtin;
    }
@@ -1030,13 +1061,6 @@ public:
    virtual ir_visitor_status accept(ir_hierarchical_visitor *);
 
    /**
-    * Get a generic ir_call object when an error occurs
-    *
-    * Any allocation will be performed with 'ctx' as ralloc owner.
-    */
-   static ir_call *get_error_instruction(void *ctx);
-
-   /**
     * Get an iterator for the set of acutal parameters
     */
    exec_list_iterator iterator()
@@ -1053,38 +1077,27 @@ public:
    }
 
    /**
-    * Get the function signature bound to this function call
+    * Generates an inline version of the function before @ir,
+    * storing the return value in return_deref.
     */
-   ir_function_signature *get_callee()
-   {
-      return callee;
-   }
+   void generate_inline(ir_instruction *ir);
 
    /**
-    * Set the function call target
+    * Storage for the function's return value.
+    * This must be NULL if the return type is void.
     */
-   void set_callee(ir_function_signature *sig);
+   ir_dereference_variable *return_deref;
 
    /**
-    * Generates an inline version of the function before @ir,
-    * returning the return value of the function.
+    * The specific function signature being called.
     */
-   ir_rvalue *generate_inline(ir_instruction *ir);
+   ir_function_signature *callee;
 
    /* List of ir_rvalue of paramaters passed in this call. */
    exec_list actual_parameters;
 
    /** Should this call only bind to a built-in function? */
    bool use_builtin;
-
-private:
-   ir_call()
-      : callee(NULL)
-   {
-      this->ir_type = ir_type_call;
-   }
-
-   ir_function_signature *callee;
 };
 
 
diff --git a/mesalib/src/glsl/ir_basic_block.cpp b/mesalib/src/glsl/ir_basic_block.cpp
index a83382596..86e0cf795 100644
--- a/mesalib/src/glsl/ir_basic_block.cpp
+++ b/mesalib/src/glsl/ir_basic_block.cpp
@@ -32,31 +32,6 @@
 #include "ir_basic_block.h"
 #include "glsl_types.h"
 
-class ir_has_call_visitor : public ir_hierarchical_visitor {
-public:
-   ir_has_call_visitor()
-   {
-      has_call = false;
-   }
-
-   virtual ir_visitor_status visit_enter(ir_call *ir)
-   {
-      (void) ir;
-      has_call = true;
-      return visit_stop;
-   }
-
-   bool has_call;
-};
-
-bool
-ir_has_call(ir_instruction *ir)
-{
-   ir_has_call_visitor v;
-   ir->accept(&v);
-   return v.has_call;
-}
-
 /**
  * Calls a user function for every basic block in the instruction stream.
  *
@@ -122,24 +97,6 @@ void call_for_basic_blocks(exec_list *instructions,
 
 	    call_for_basic_blocks(&ir_sig->body, callback, data);
 	 }
-      } else if (ir->as_assignment()) {
-	 /* If there's a call in the expression tree being assigned,
-	  * then that ends the BB too.
-	  *
-	  * The assumption is that any consumer of the basic block
-	  * walker is fine with the fact that the call is somewhere in
-	  * the tree even if portions of the tree may be evaluated
-	  * after the call.
-	  *
-	  * A consumer that has an issue with this could not process
-	  * the last instruction of the basic block.  If doing so,
-	  * expression flattener may be useful before using the basic
-	  * block finder to get more maximal basic blocks out.
-	  */
-	 if (ir_has_call(ir)) {
-	    callback(leader, ir, data);
-	    leader = NULL;
-	 }
       }
       last = ir;
    }
diff --git a/mesalib/src/glsl/ir_clone.cpp b/mesalib/src/glsl/ir_clone.cpp
index c63615c7e..26b0d8f5f 100644
--- a/mesalib/src/glsl/ir_clone.cpp
+++ b/mesalib/src/glsl/ir_clone.cpp
@@ -27,6 +27,13 @@
 #include "glsl_types.h"
 #include "program/hash_table.h"
 
+ir_rvalue *
+ir_rvalue::clone(void *mem_ctx, struct hash_table *ht) const
+{
+   /* The only possible instantiation is the generic error value. */
+   return error_value(mem_ctx);
+}
+
 /**
  * Duplicate an IR variable
  *
@@ -160,8 +167,9 @@ ir_loop::clone(void *mem_ctx, struct hash_table *ht) const
 ir_call *
 ir_call::clone(void *mem_ctx, struct hash_table *ht) const
 {
-   if (this->type == glsl_type::error_type)
-      return ir_call::get_error_instruction(mem_ctx);
+   ir_dereference_variable *new_return_ref = NULL;
+   if (this->return_deref != NULL)
+      new_return_ref = this->return_deref->clone(mem_ctx, ht);
 
    exec_list new_parameters;
 
@@ -170,7 +178,7 @@ ir_call::clone(void *mem_ctx, struct hash_table *ht) const
       new_parameters.push_tail(ir->clone(mem_ctx, ht));
    }
 
-   return new(mem_ctx) ir_call(this->callee, &new_parameters);
+   return new(mem_ctx) ir_call(this->callee, new_return_ref, &new_parameters);
 }
 
 ir_expression *
@@ -390,9 +398,9 @@ public:
        * table.  If it is found, replace it with the value from the table.
        */
       ir_function_signature *sig =
-	 (ir_function_signature *) hash_table_find(this->ht, ir->get_callee());
+	 (ir_function_signature *) hash_table_find(this->ht, ir->callee);
       if (sig != NULL)
-	 ir->set_callee(sig);
+	 ir->callee = sig;
 
       /* Since this may be used before function call parameters are flattened,
        * the children also need to be processed.
diff --git a/mesalib/src/glsl/ir_constant_expression.cpp b/mesalib/src/glsl/ir_constant_expression.cpp
index adca62e8d..4e1714a84 100644
--- a/mesalib/src/glsl/ir_constant_expression.cpp
+++ b/mesalib/src/glsl/ir_constant_expression.cpp
@@ -71,6 +71,13 @@ dot(ir_constant *op0, ir_constant *op1)
 }
 
 ir_constant *
+ir_rvalue::constant_expression_value()
+{
+   assert(this->type->is_error());
+   return NULL;
+}
+
+ir_constant *
 ir_expression::constant_expression_value()
 {
    if (this->type->is_error())
@@ -1017,21 +1024,29 @@ ir_constant::constant_expression_value()
 ir_constant *
 ir_call::constant_expression_value()
 {
-   if (this->type == glsl_type::error_type)
+   return this->callee->constant_expression_value(&this->actual_parameters);
+}
+
+
+ir_constant *
+ir_function_signature::constant_expression_value(exec_list *actual_parameters)
+{
+   const glsl_type *type = this->return_type;
+   if (type == glsl_type::void_type)
       return NULL;
 
    /* From the GLSL 1.20 spec, page 23:
     * "Function calls to user-defined functions (non-built-in functions)
     *  cannot be used to form constant expressions."
     */
-   if (!this->callee->is_builtin)
+   if (!this->is_builtin)
       return NULL;
 
    unsigned num_parameters = 0;
 
    /* Check if all parameters are constant */
    ir_constant *op[3];
-   foreach_list(n, &this->actual_parameters) {
+   foreach_list(n, actual_parameters) {
       ir_constant *constant = ((ir_rvalue *) n)->constant_expression_value();
       if (constant == NULL)
 	 return NULL;
@@ -1053,7 +1068,7 @@ ir_call::constant_expression_value()
    ir_constant_data data;
    memset(&data, 0, sizeof(data));
 
-   const char *callee = this->callee_name();
+   const char *callee = this->function_name();
    if (strcmp(callee, "abs") == 0) {
       expr = new(mem_ctx) ir_expression(ir_unop_abs, type, op[0], NULL);
    } else if (strcmp(callee, "all") == 0) {
@@ -1101,7 +1116,7 @@ ir_call::constant_expression_value()
       for (unsigned c = 0; c < op[0]->type->components(); c++)
 	 data.f[c] = atanhf(op[0]->value.f[c]);
    } else if (strcmp(callee, "dFdx") == 0 || strcmp(callee, "dFdy") == 0) {
-      return ir_constant::zero(mem_ctx, this->type);
+      return ir_constant::zero(mem_ctx, type);
    } else if (strcmp(callee, "ceil") == 0) {
       expr = new(mem_ctx) ir_expression(ir_unop_ceil, type, op[0], NULL);
    } else if (strcmp(callee, "clamp") == 0) {
@@ -1192,7 +1207,7 @@ ir_call::constant_expression_value()
    } else if (strcmp(callee, "fract") == 0) {
       expr = new(mem_ctx) ir_expression(ir_unop_fract, type, op[0], NULL);
    } else if (strcmp(callee, "fwidth") == 0) {
-      return ir_constant::zero(mem_ctx, this->type);
+      return ir_constant::zero(mem_ctx, type);
    } else if (strcmp(callee, "greaterThan") == 0) {
       assert(op[0]->type->is_vector() && op[1] && op[1]->type->is_vector());
       for (unsigned c = 0; c < op[0]->type->components(); c++) {
@@ -1298,7 +1313,7 @@ ir_call::constant_expression_value()
       float length = sqrtf(dot(op[0], op[0]));
 
       if (length == 0)
-	 return ir_constant::zero(mem_ctx, this->type);
+	 return ir_constant::zero(mem_ctx, type);
 
       for (unsigned c = 0; c < op[0]->type->components(); c++)
 	 data.f[c] = op[0]->value.f[c] / length;
@@ -1349,7 +1364,7 @@ ir_call::constant_expression_value()
       const float dot_NI = dot(op[1], op[0]);
       const float k = 1.0F - eta * eta * (1.0F - dot_NI * dot_NI);
       if (k < 0.0) {
-	 return ir_constant::zero(mem_ctx, this->type);
+	 return ir_constant::zero(mem_ctx, type);
       } else {
 	 for (unsigned c = 0; c < type->components(); c++) {
 	    data.f[c] = eta * op[0]->value.f[c] - (eta * dot_NI + sqrtf(k))
@@ -1418,5 +1433,5 @@ ir_call::constant_expression_value()
    if (expr != NULL)
       return expr->constant_expression_value();
 
-   return new(mem_ctx) ir_constant(this->type, &data);
+   return new(mem_ctx) ir_constant(type, &data);
 }
diff --git a/mesalib/src/glsl/ir_expression_flattening.cpp b/mesalib/src/glsl/ir_expression_flattening.cpp
index bd4ac67bc..b44e68ca3 100644
--- a/mesalib/src/glsl/ir_expression_flattening.cpp
+++ b/mesalib/src/glsl/ir_expression_flattening.cpp
@@ -29,11 +29,6 @@
  *
  * This is used for breaking down matrix operations, where it's easier to
  * create a temporary and work on each of its vector components individually.
- *
- * It is also used for automatic function inlining, where we want to take
- * an expression containing a call and move the call out to its own
- * assignment so that we can inline it at the appropriate place in the
- * instruction stream.
  */
 
 #include "ir.h"
diff --git a/mesalib/src/glsl/ir_function.cpp b/mesalib/src/glsl/ir_function.cpp
index b34a50081..a525693ed 100644
--- a/mesalib/src/glsl/ir_function.cpp
+++ b/mesalib/src/glsl/ir_function.cpp
@@ -59,7 +59,7 @@ parameter_lists_match(const exec_list *list_a, const exec_list *list_b)
 
 
       const ir_variable *const param = (ir_variable *) node_a;
-      const ir_instruction *const actual = (ir_instruction *) node_b;
+      const ir_rvalue *const actual = (ir_rvalue *) node_b;
 
       if (param->type == actual->type)
 	 continue;
diff --git a/mesalib/src/glsl/ir_function_can_inline.cpp b/mesalib/src/glsl/ir_function_can_inline.cpp
index 2ed3aaa49..7b15d5df1 100644
--- a/mesalib/src/glsl/ir_function_can_inline.cpp
+++ b/mesalib/src/glsl/ir_function_can_inline.cpp
@@ -1,76 +1,76 @@
-/*

- * Copyright © 2010 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 ir_function_can_inline.cpp

- *

- * Determines if we can inline a function call using ir_function_inlining.cpp.

- *

- * The primary restriction is that we can't return from the function

- * other than as the last instruction.  We could potentially work

- * around this for some constructs by flattening control flow and

- * moving the return to the end, or by using breaks from a do {} while

- * (0) loop surrounding the function body.

- */

-

-#include "ir.h"

-

-class ir_function_can_inline_visitor : public ir_hierarchical_visitor {

-public:

-   ir_function_can_inline_visitor()

-   {

-      this->num_returns = 0;

-   }

-

-   virtual ir_visitor_status visit_enter(ir_return *);

-

-   int num_returns;

-};

-

-ir_visitor_status

-ir_function_can_inline_visitor::visit_enter(ir_return *ir)

-{

-   (void) ir;

-   this->num_returns++;

-   return visit_continue;

-}

-

-bool

-can_inline(ir_call *call)

-{

-   ir_function_can_inline_visitor v;

-   const ir_function_signature *callee = call->get_callee();

-   if (!callee->is_defined)

-      return false;

-

-   v.run((exec_list *) &callee->body);

-

-   /* If the function is empty (no last instruction) or does not end with a

-    * return statement, we need to count the implicit return.

-    */

-   ir_instruction *last = (ir_instruction *)callee->body.get_tail();

-   if (last == NULL || !last->as_return())

-      v.num_returns++;

-

-   return v.num_returns == 1;

-}

+/*
+ * Copyright © 2010 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 ir_function_can_inline.cpp
+ *
+ * Determines if we can inline a function call using ir_function_inlining.cpp.
+ *
+ * The primary restriction is that we can't return from the function
+ * other than as the last instruction.  We could potentially work
+ * around this for some constructs by flattening control flow and
+ * moving the return to the end, or by using breaks from a do {} while
+ * (0) loop surrounding the function body.
+ */
+
+#include "ir.h"
+
+class ir_function_can_inline_visitor : public ir_hierarchical_visitor {
+public:
+   ir_function_can_inline_visitor()
+   {
+      this->num_returns = 0;
+   }
+
+   virtual ir_visitor_status visit_enter(ir_return *);
+
+   int num_returns;
+};
+
+ir_visitor_status
+ir_function_can_inline_visitor::visit_enter(ir_return *ir)
+{
+   (void) ir;
+   this->num_returns++;
+   return visit_continue;
+}
+
+bool
+can_inline(ir_call *call)
+{
+   ir_function_can_inline_visitor v;
+   const ir_function_signature *callee = call->callee;
+   if (!callee->is_defined)
+      return false;
+
+   v.run((exec_list *) &callee->body);
+
+   /* If the function is empty (no last instruction) or does not end with a
+    * return statement, we need to count the implicit return.
+    */
+   ir_instruction *last = (ir_instruction *)callee->body.get_tail();
+   if (last == NULL || !last->as_return())
+      v.num_returns++;
+
+   return v.num_returns == 1;
+}
diff --git a/mesalib/src/glsl/ir_function_detect_recursion.cpp b/mesalib/src/glsl/ir_function_detect_recursion.cpp
index 890bc455f..0a5e647cd 100644
--- a/mesalib/src/glsl/ir_function_detect_recursion.cpp
+++ b/mesalib/src/glsl/ir_function_detect_recursion.cpp
@@ -217,7 +217,7 @@ public:
       if (this->current == NULL)
 	 return visit_continue;
 
-      function *const target = this->get_function(call->get_callee());
+      function *const target = this->get_function(call->callee);
 
       /* Create a link from the caller to the callee.
        */
diff --git a/mesalib/src/glsl/ir_hierarchical_visitor.cpp b/mesalib/src/glsl/ir_hierarchical_visitor.cpp
index b5eacd6d2..f24414046 100644
--- a/mesalib/src/glsl/ir_hierarchical_visitor.cpp
+++ b/mesalib/src/glsl/ir_hierarchical_visitor.cpp
@@ -33,6 +33,15 @@ ir_hierarchical_visitor::ir_hierarchical_visitor()
 }
 
 ir_visitor_status
+ir_hierarchical_visitor::visit(ir_rvalue *ir)
+{
+   if (this->callback != NULL)
+      this->callback(ir, this->data);
+
+   return visit_continue;
+}
+
+ir_visitor_status
 ir_hierarchical_visitor::visit(ir_variable *ir)
 {
    if (this->callback != NULL)
diff --git a/mesalib/src/glsl/ir_hierarchical_visitor.h b/mesalib/src/glsl/ir_hierarchical_visitor.h
index bba046db4..143eb7c88 100644
--- a/mesalib/src/glsl/ir_hierarchical_visitor.h
+++ b/mesalib/src/glsl/ir_hierarchical_visitor.h
@@ -82,6 +82,7 @@ public:
     * \name Visit methods for leaf-node classes
     */
    /*@{*/
+   virtual ir_visitor_status visit(class ir_rvalue *);
    virtual ir_visitor_status visit(class ir_variable *);
    virtual ir_visitor_status visit(class ir_constant *);
    virtual ir_visitor_status visit(class ir_loop_jump *);
diff --git a/mesalib/src/glsl/ir_hv_accept.cpp b/mesalib/src/glsl/ir_hv_accept.cpp
index 0e78fda81..3ce895924 100644
--- a/mesalib/src/glsl/ir_hv_accept.cpp
+++ b/mesalib/src/glsl/ir_hv_accept.cpp
@@ -66,6 +66,13 @@ visit_list_elements(ir_hierarchical_visitor *v, exec_list *l,
 
 
 ir_visitor_status
+ir_rvalue::accept(ir_hierarchical_visitor *v)
+{
+   return v->visit(this);
+}
+
+
+ir_visitor_status
 ir_variable::accept(ir_hierarchical_visitor *v)
 {
    return v->visit(this);
@@ -326,6 +333,14 @@ ir_call::accept(ir_hierarchical_visitor *v)
    if (s != visit_continue)
       return (s == visit_continue_with_parent) ? visit_continue : s;
 
+   if (this->return_deref != NULL) {
+      v->in_assignee = true;
+      s = this->return_deref->accept(v);
+      v->in_assignee = false;
+      if (s != visit_continue)
+	 return (s == visit_continue_with_parent) ? visit_continue : s;
+   }
+
    s = visit_list_elements(v, &this->actual_parameters, false);
    if (s == visit_stop)
       return s;
diff --git a/mesalib/src/glsl/ir_print_visitor.cpp b/mesalib/src/glsl/ir_print_visitor.cpp
index 1471355f3..8aa26e5d0 100644
--- a/mesalib/src/glsl/ir_print_visitor.cpp
+++ b/mesalib/src/glsl/ir_print_visitor.cpp
@@ -135,6 +135,10 @@ print_type(const glsl_type *t)
    }
 }
 
+void ir_print_visitor::visit(ir_rvalue *ir)
+{
+   printf("error");
+}
 
 void ir_print_visitor::visit(ir_variable *ir)
 {
@@ -404,7 +408,10 @@ void ir_print_visitor::visit(ir_constant *ir)
 void
 ir_print_visitor::visit(ir_call *ir)
 {
-   printf("(call %s (", ir->callee_name());
+   printf("(call %s ", ir->callee_name());
+   if (ir->return_deref)
+      ir->return_deref->accept(this);
+   printf(" (");
    foreach_iter(exec_list_iterator, iter, *ir) {
       ir_instruction *const inst = (ir_instruction *) iter.get();
 
diff --git a/mesalib/src/glsl/ir_print_visitor.h b/mesalib/src/glsl/ir_print_visitor.h
index c7136f11a..6c308f31e 100644
--- a/mesalib/src/glsl/ir_print_visitor.h
+++ b/mesalib/src/glsl/ir_print_visitor.h
@@ -54,6 +54,7 @@ public:
     * the hierarchy should not have \c visit methods.
     */
    /*@{*/
+   virtual void visit(ir_rvalue *);
    virtual void visit(ir_variable *);
    virtual void visit(ir_function_signature *);
    virtual void visit(ir_function *);
diff --git a/mesalib/src/glsl/ir_reader.cpp b/mesalib/src/glsl/ir_reader.cpp
index 6f50cc439..7ce683ef7 100644
--- a/mesalib/src/glsl/ir_reader.cpp
+++ b/mesalib/src/glsl/ir_reader.cpp
@@ -51,16 +51,17 @@ private:
    ir_variable *read_declaration(s_expression *);
    ir_if *read_if(s_expression *, ir_loop *);
    ir_loop *read_loop(s_expression *);
+   ir_call *read_call(s_expression *);
    ir_return *read_return(s_expression *);
    ir_rvalue *read_rvalue(s_expression *);
    ir_assignment *read_assignment(s_expression *);
    ir_expression *read_expression(s_expression *);
-   ir_call *read_call(s_expression *);
    ir_swizzle *read_swizzle(s_expression *);
    ir_constant *read_constant(s_expression *);
    ir_texture *read_texture(s_expression *);
 
    ir_dereference *read_dereference(s_expression *);
+   ir_dereference_variable *read_var_ref(s_expression *);
 };
 
 ir_reader::ir_reader(_mesa_glsl_parse_state *state) : state(state)
@@ -348,6 +349,8 @@ ir_reader::read_instruction(s_expression *expr, ir_loop *loop_ctx)
       inst = read_if(list, loop_ctx);
    } else if (strcmp(tag->value(), "loop") == 0) {
       inst = read_loop(list);
+   } else if (strcmp(tag->value(), "call") == 0) {
+      inst = read_call(list);
    } else if (strcmp(tag->value(), "return") == 0) {
       inst = read_return(list);
    } else if (strcmp(tag->value(), "function") == 0) {
@@ -521,8 +524,6 @@ ir_reader::read_rvalue(s_expression *expr)
       rvalue = read_swizzle(list);
    } else if (strcmp(tag->value(), "expression") == 0) {
       rvalue = read_expression(list);
-   } else if (strcmp(tag->value(), "call") == 0) {
-      rvalue = read_call(list);
    } else if (strcmp(tag->value(), "constant") == 0) {
       rvalue = read_constant(list);
    } else {
@@ -610,10 +611,20 @@ ir_reader::read_call(s_expression *expr)
 {
    s_symbol *name;
    s_list *params;
+   s_list *s_return = NULL;
 
-   s_pattern pat[] = { "call", name, params };
-   if (!MATCH(expr, pat)) {
-      ir_read_error(expr, "expected (call <name> (<param> ...))");
+   ir_dereference_variable *return_deref = NULL;
+
+   s_pattern void_pat[] = { "call", name, params };
+   s_pattern non_void_pat[] = { "call", name, s_return, params };
+   if (MATCH(expr, non_void_pat)) {
+      return_deref = read_var_ref(s_return);
+      if (return_deref == NULL) {
+	 ir_read_error(s_return, "when reading a call's return storage");
+	 return NULL;
+      }
+   } else if (!MATCH(expr, void_pat)) {
+      ir_read_error(expr, "expected (call <name> [<deref>] (<param> ...))");
       return NULL;
    }
 
@@ -643,7 +654,15 @@ ir_reader::read_call(s_expression *expr)
       return NULL;
    }
 
-   return new(mem_ctx) ir_call(callee, &parameters);
+   if (callee->return_type == glsl_type::void_type && return_deref) {
+      ir_read_error(expr, "call has return value storage but void type");
+      return NULL;
+   } else if (callee->return_type != glsl_type::void_type && !return_deref) {
+      ir_read_error(expr, "call has non-void type but no return value storage");
+      return NULL;
+   }
+
+   return new(mem_ctx) ir_call(callee, return_deref, &parameters);
 }
 
 ir_expression *
@@ -828,17 +847,11 @@ ir_reader::read_constant(s_expression *expr)
    return new(mem_ctx) ir_constant(type, &data);
 }
 
-ir_dereference *
-ir_reader::read_dereference(s_expression *expr)
+ir_dereference_variable *
+ir_reader::read_var_ref(s_expression *expr)
 {
    s_symbol *s_var;
-   s_expression *s_subject;
-   s_expression *s_index;
-   s_symbol *s_field;
-
    s_pattern var_pat[] = { "var_ref", s_var };
-   s_pattern array_pat[] = { "array_ref", s_subject, s_index };
-   s_pattern record_pat[] = { "record_ref", s_subject, s_field };
 
    if (MATCH(expr, var_pat)) {
       ir_variable *var = state->symbols->get_variable(s_var->value());
@@ -847,6 +860,23 @@ ir_reader::read_dereference(s_expression *expr)
 	 return NULL;
       }
       return new(mem_ctx) ir_dereference_variable(var);
+   }
+   return NULL;
+}
+
+ir_dereference *
+ir_reader::read_dereference(s_expression *expr)
+{
+   s_expression *s_subject;
+   s_expression *s_index;
+   s_symbol *s_field;
+
+   s_pattern array_pat[] = { "array_ref", s_subject, s_index };
+   s_pattern record_pat[] = { "record_ref", s_subject, s_field };
+
+   ir_dereference_variable *var_ref = read_var_ref(expr);
+   if (var_ref != NULL) {
+      return var_ref;
    } else if (MATCH(expr, array_pat)) {
       ir_rvalue *subject = read_rvalue(s_subject);
       if (subject == NULL) {
diff --git a/mesalib/src/glsl/ir_validate.cpp b/mesalib/src/glsl/ir_validate.cpp
index 101d9992d..7efb43477 100644
--- a/mesalib/src/glsl/ir_validate.cpp
+++ b/mesalib/src/glsl/ir_validate.cpp
@@ -541,13 +541,24 @@ ir_validate::visit_enter(ir_assignment *ir)
 ir_visitor_status
 ir_validate::visit_enter(ir_call *ir)
 {
-   ir_function_signature *const callee = ir->get_callee();
+   ir_function_signature *const callee = ir->callee;
 
    if (callee->ir_type != ir_type_function_signature) {
       printf("IR called by ir_call is not ir_function_signature!\n");
       abort();
    }
 
+   if (ir->return_deref) {
+      if (ir->return_deref->type != callee->return_type) {
+	 printf("callee type %s does not match return storage type %s\n",
+	        callee->return_type->name, ir->return_deref->type->name);
+	 abort();
+      }
+   } else if (callee->return_type != glsl_type::void_type) {
+      printf("ir_call has non-void callee but no return storage\n");
+      abort();
+   }
+
    const exec_node *formal_param_node = callee->parameters.head;
    const exec_node *actual_param_node = ir->actual_parameters.head;
    while (true) {
@@ -611,7 +622,9 @@ check_node_type(ir_instruction *ir, void *data)
       printf("Instruction node with unset type\n");
       ir->print(); printf("\n");
    }
-   assert(ir->type != glsl_type::error_type);
+   ir_rvalue *value = ir->as_rvalue();
+   if (value != NULL)
+      assert(value->type != glsl_type::error_type);
 }
 
 void
diff --git a/mesalib/src/glsl/ir_visitor.h b/mesalib/src/glsl/ir_visitor.h
index 7dd35fe1d..4a00155be 100644
--- a/mesalib/src/glsl/ir_visitor.h
+++ b/mesalib/src/glsl/ir_visitor.h
@@ -44,6 +44,7 @@ public:
     * the hierarchy should not have \c visit methods.
     */
    /*@{*/
+   virtual void visit(class ir_rvalue *) { assert(!"unhandled error_type"); }
    virtual void visit(class ir_variable *) = 0;
    virtual void visit(class ir_function_signature *) = 0;
    virtual void visit(class ir_function *) = 0;
diff --git a/mesalib/src/glsl/link_functions.cpp b/mesalib/src/glsl/link_functions.cpp
index acee32712..6b3e15448 100644
--- a/mesalib/src/glsl/link_functions.cpp
+++ b/mesalib/src/glsl/link_functions.cpp
@@ -68,7 +68,7 @@ public:
        * Doing so will modify the original shader.  This may prevent that
        * shader from being linkable in other programs.
        */
-      const ir_function_signature *const callee = ir->get_callee();
+      const ir_function_signature *const callee = ir->callee;
       assert(callee != NULL);
       const char *const name = callee->function_name();
 
@@ -79,7 +79,7 @@ public:
 	 find_matching_signature(name, &callee->parameters, &linked, 1,
 				 ir->use_builtin);
       if (sig != NULL) {
-	 ir->set_callee(sig);
+	 ir->callee = sig;
 	 return visit_continue;
       }
 
@@ -168,7 +168,7 @@ public:
        */
       linked_sig->accept(this);
 
-      ir->set_callee(linked_sig);
+      ir->callee = linked_sig;
 
       return visit_continue;
    }
diff --git a/mesalib/src/glsl/link_uniforms.cpp b/mesalib/src/glsl/link_uniforms.cpp
index 613c9b7ae..2f1c9f5f7 100644
--- a/mesalib/src/glsl/link_uniforms.cpp
+++ b/mesalib/src/glsl/link_uniforms.cpp
@@ -173,8 +173,7 @@ private:
       if (this->map->get(id, name))
 	 return;
 
-      char *key = strdup(name);
-      this->map->put(this->num_active_uniforms, key);
+      this->map->put(this->num_active_uniforms, name);
 
       /* Each leaf uniform occupies one entry in the list of active
        * uniforms.
diff --git a/mesalib/src/glsl/linker.cpp b/mesalib/src/glsl/linker.cpp
index 09ffdff63..49b6b8f4a 100644
--- a/mesalib/src/glsl/linker.cpp
+++ b/mesalib/src/glsl/linker.cpp
@@ -101,7 +101,7 @@ public:
 
    virtual ir_visitor_status visit_enter(ir_call *ir)
    {
-      exec_list_iterator sig_iter = ir->get_callee()->parameters.iterator();
+      exec_list_iterator sig_iter = ir->callee->parameters.iterator();
       foreach_iter(exec_list_iterator, iter, *ir) {
 	 ir_rvalue *param_rval = (ir_rvalue *)iter.get();
 	 ir_variable *sig_param = (ir_variable *)sig_iter.get();
@@ -117,6 +117,15 @@ public:
 	 sig_iter.next();
       }
 
+      if (ir->return_deref != NULL) {
+	 ir_variable *const var = ir->return_deref->variable_referenced();
+
+	 if (strcmp(name, var->name) == 0) {
+	    found = true;
+	    return visit_stop;
+	 }
+      }
+
       return visit_continue_with_parent;
    }
 
@@ -830,6 +839,7 @@ move_non_declarations(exec_list *instructions, exec_node *last,
 	 continue;
 
       assert(inst->as_assignment()
+             || inst->as_call()
 	     || ((var != NULL) && (var->mode == ir_var_temporary)));
 
       if (make_copies) {
diff --git a/mesalib/src/glsl/loop_analysis.cpp b/mesalib/src/glsl/loop_analysis.cpp
index 9bba6a97c..6a0e4da51 100644
--- a/mesalib/src/glsl/loop_analysis.cpp
+++ b/mesalib/src/glsl/loop_analysis.cpp
@@ -110,6 +110,8 @@ public:
    virtual ir_visitor_status visit(ir_loop_jump *);
    virtual ir_visitor_status visit(ir_dereference_variable *);
 
+   virtual ir_visitor_status visit_enter(ir_call *);
+
    virtual ir_visitor_status visit_enter(ir_loop *);
    virtual ir_visitor_status visit_leave(ir_loop *);
    virtual ir_visitor_status visit_enter(ir_assignment *);
@@ -153,6 +155,21 @@ loop_analysis::visit(ir_loop_jump *ir)
 
 
 ir_visitor_status
+loop_analysis::visit_enter(ir_call *ir)
+{
+   /* If we're not somewhere inside a loop, there's nothing to do. */
+   if (this->state.is_empty())
+      return visit_continue;
+
+   loop_variable_state *const ls =
+      (loop_variable_state *) this->state.get_head();
+
+   ls->contains_calls = true;
+   return visit_continue_with_parent;
+}
+
+
+ir_visitor_status
 loop_analysis::visit(ir_dereference_variable *ir)
 {
    /* If we're not somewhere inside a loop, there's nothing to do.
@@ -209,6 +226,17 @@ loop_analysis::visit_leave(ir_loop *ir)
    loop_variable_state *const ls =
       (loop_variable_state *) this->state.pop_head();
 
+   /* Function calls may contain side effects.  These could alter any of our
+    * variables in ways that cannot be known, and may even terminate shader
+    * execution (say, calling discard in the fragment shader).  So we can't
+    * rely on any of our analysis about assignments to variables.
+    *
+    * We could perform some conservative analysis (prove there's no statically
+    * possible assignment, etc.) but it isn't worth it for now; function
+    * inlining will allow us to unroll loops anyway.
+    */
+   if (ls->contains_calls)
+      return visit_continue;
 
    foreach_list(node, &ir->body_instructions) {
       /* Skip over declarations at the start of a loop.
diff --git a/mesalib/src/glsl/loop_analysis.h b/mesalib/src/glsl/loop_analysis.h
index 229730836..8bed1db02 100644
--- a/mesalib/src/glsl/loop_analysis.h
+++ b/mesalib/src/glsl/loop_analysis.h
@@ -122,10 +122,16 @@ public:
     */
    unsigned num_loop_jumps;
 
+   /**
+    * Whether this loop contains any function calls.
+    */
+   bool contains_calls;
+
    loop_variable_state()
    {
       this->max_iterations = -1;
       this->num_loop_jumps = 0;
+      this->contains_calls = false;
       this->var_hash = hash_table_ctor(0, hash_table_pointer_hash,
 				       hash_table_pointer_compare);
    }
diff --git a/mesalib/src/glsl/lower_clip_distance.cpp b/mesalib/src/glsl/lower_clip_distance.cpp
index 143e378f9..031691471 100644
--- a/mesalib/src/glsl/lower_clip_distance.cpp
+++ b/mesalib/src/glsl/lower_clip_distance.cpp
@@ -276,7 +276,7 @@ lower_clip_distance_visitor::visit_leave(ir_call *ir)
 {
    void *ctx = ralloc_parent(ir);
 
-   const exec_node *formal_param_node = ir->get_callee()->parameters.head;
+   const exec_node *formal_param_node = ir->callee->parameters.head;
    const exec_node *actual_param_node = ir->actual_parameters.head;
    while (!actual_param_node->is_tail_sentinel()) {
       ir_variable *formal_param = (ir_variable *) formal_param_node;
diff --git a/mesalib/src/glsl/lower_output_reads.cpp b/mesalib/src/glsl/lower_output_reads.cpp
index 415b541c3..90d71b04a 100644
--- a/mesalib/src/glsl/lower_output_reads.cpp
+++ b/mesalib/src/glsl/lower_output_reads.cpp
@@ -54,11 +54,27 @@ public:
    virtual ir_visitor_status visit_leave(class ir_function_signature *);
 };
 
+/**
+ * Hash function for the output variables - computes the hash of the name.
+ * NOTE: We're using the name string to ensure that the hash doesn't depend
+ * on any random factors, otherwise the output_read_remover could produce
+ * the random order of the assignments.
+ *
+ * NOTE: If you want to reuse this function please take into account that
+ * generally the names of the variables are non-unique.
+ */
+static unsigned
+hash_table_var_hash(const void *key)
+{
+   const ir_variable * var = static_cast<const ir_variable *>(key);
+   return hash_table_string_hash(var->name);
+}
+
 output_read_remover::output_read_remover()
 {
    mem_ctx = ralloc_context(NULL);
    replacements =
-      hash_table_ctor(0, hash_table_pointer_hash, hash_table_pointer_compare);
+      hash_table_ctor(0, hash_table_var_hash, hash_table_pointer_compare);
 }
 
 output_read_remover::~output_read_remover()
diff --git a/mesalib/src/glsl/lower_variable_index_to_cond_assign.cpp b/mesalib/src/glsl/lower_variable_index_to_cond_assign.cpp
index f8e4a1de4..57771074a 100644
--- a/mesalib/src/glsl/lower_variable_index_to_cond_assign.cpp
+++ b/mesalib/src/glsl/lower_variable_index_to_cond_assign.cpp
@@ -117,7 +117,7 @@ compare_index_block(exec_list *instructions, ir_variable *index,
 }
 
 static inline bool
-is_array_or_matrix(const ir_instruction *ir)
+is_array_or_matrix(const ir_rvalue *ir)
 {
    return (ir->type->is_array() || ir->type->is_matrix());
 }
diff --git a/mesalib/src/glsl/opt_constant_folding.cpp b/mesalib/src/glsl/opt_constant_folding.cpp
index 599b21525..dcad59997 100644
--- a/mesalib/src/glsl/opt_constant_folding.cpp
+++ b/mesalib/src/glsl/opt_constant_folding.cpp
@@ -117,7 +117,8 @@ ir_constant_folding_visitor::visit_enter(ir_assignment *ir)
 ir_visitor_status
 ir_constant_folding_visitor::visit_enter(ir_call *ir)
 {
-   exec_list_iterator sig_iter = ir->get_callee()->parameters.iterator();
+   /* Attempt to constant fold parameters */
+   exec_list_iterator sig_iter = ir->callee->parameters.iterator();
    foreach_iter(exec_list_iterator, iter, *ir) {
       ir_rvalue *param_rval = (ir_rvalue *)iter.get();
       ir_variable *sig_param = (ir_variable *)sig_iter.get();
@@ -133,6 +134,15 @@ ir_constant_folding_visitor::visit_enter(ir_call *ir)
       sig_iter.next();
    }
 
+   /* Next, see if the call can be replaced with an assignment of a constant */
+   ir_constant *const_val = ir->constant_expression_value();
+
+   if (const_val != NULL) {
+      ir_assignment *assignment =
+	 new(ralloc_parent(ir)) ir_assignment(ir->return_deref, const_val);
+      ir->replace_with(assignment);
+   }
+
    return visit_continue_with_parent;
 }
 
diff --git a/mesalib/src/glsl/opt_constant_propagation.cpp b/mesalib/src/glsl/opt_constant_propagation.cpp
index af77e4906..d3812637d 100644
--- a/mesalib/src/glsl/opt_constant_propagation.cpp
+++ b/mesalib/src/glsl/opt_constant_propagation.cpp
@@ -259,7 +259,7 @@ ir_visitor_status
 ir_constant_propagation_visitor::visit_enter(ir_call *ir)
 {
    /* Do constant propagation on call parameters, but skip any out params */
-   exec_list_iterator sig_param_iter = ir->get_callee()->parameters.iterator();
+   exec_list_iterator sig_param_iter = ir->callee->parameters.iterator();
    foreach_iter(exec_list_iterator, iter, ir->actual_parameters) {
       ir_variable *sig_param = (ir_variable *)sig_param_iter.get();
       ir_rvalue *param = (ir_rvalue *)iter.get();
diff --git a/mesalib/src/glsl/opt_constant_variable.cpp b/mesalib/src/glsl/opt_constant_variable.cpp
index 3fa7c3bad..f3bc8675e 100644
--- a/mesalib/src/glsl/opt_constant_variable.cpp
+++ b/mesalib/src/glsl/opt_constant_variable.cpp
@@ -127,7 +127,8 @@ ir_constant_variable_visitor::visit_enter(ir_assignment *ir)
 ir_visitor_status
 ir_constant_variable_visitor::visit_enter(ir_call *ir)
 {
-   exec_list_iterator sig_iter = ir->get_callee()->parameters.iterator();
+   /* Mark any out parameters as assigned to */
+   exec_list_iterator sig_iter = ir->callee->parameters.iterator();
    foreach_iter(exec_list_iterator, iter, *ir) {
       ir_rvalue *param_rval = (ir_rvalue *)iter.get();
       ir_variable *param = (ir_variable *)sig_iter.get();
@@ -143,6 +144,17 @@ ir_constant_variable_visitor::visit_enter(ir_call *ir)
       }
       sig_iter.next();
    }
+
+   /* Mark the return storage as having been assigned to */
+   if (ir->return_deref != NULL) {
+      ir_variable *var = ir->return_deref->variable_referenced();
+      struct assignment_entry *entry;
+
+      assert(var);
+      entry = get_assignment_entry(var, &this->list);
+      entry->assignment_count++;
+   }
+
    return visit_continue;
 }
 
diff --git a/mesalib/src/glsl/opt_copy_propagation.cpp b/mesalib/src/glsl/opt_copy_propagation.cpp
index efa3afda3..923619db4 100644
--- a/mesalib/src/glsl/opt_copy_propagation.cpp
+++ b/mesalib/src/glsl/opt_copy_propagation.cpp
@@ -181,7 +181,7 @@ ir_visitor_status
 ir_copy_propagation_visitor::visit_enter(ir_call *ir)
 {
    /* Do copy propagation on call parameters, but skip any out params */
-   exec_list_iterator sig_param_iter = ir->get_callee()->parameters.iterator();
+   exec_list_iterator sig_param_iter = ir->callee->parameters.iterator();
    foreach_iter(exec_list_iterator, iter, ir->actual_parameters) {
       ir_variable *sig_param = (ir_variable *)sig_param_iter.get();
       ir_instruction *ir = (ir_instruction *)iter.get();
diff --git a/mesalib/src/glsl/opt_copy_propagation_elements.cpp b/mesalib/src/glsl/opt_copy_propagation_elements.cpp
index ebfd4fd3f..314db4e18 100644
--- a/mesalib/src/glsl/opt_copy_propagation_elements.cpp
+++ b/mesalib/src/glsl/opt_copy_propagation_elements.cpp
@@ -288,7 +288,7 @@ ir_visitor_status
 ir_copy_propagation_elements_visitor::visit_enter(ir_call *ir)
 {
    /* Do copy propagation on call parameters, but skip any out params */
-   exec_list_iterator sig_param_iter = ir->get_callee()->parameters.iterator();
+   exec_list_iterator sig_param_iter = ir->callee->parameters.iterator();
    foreach_iter(exec_list_iterator, iter, ir->actual_parameters) {
       ir_variable *sig_param = (ir_variable *)sig_param_iter.get();
       ir_instruction *ir = (ir_instruction *)iter.get();
diff --git a/mesalib/src/glsl/opt_dead_code.cpp b/mesalib/src/glsl/opt_dead_code.cpp
index 22c7af1c2..0578f1737 100644
--- a/mesalib/src/glsl/opt_dead_code.cpp
+++ b/mesalib/src/glsl/opt_dead_code.cpp
@@ -78,8 +78,7 @@ do_dead_code(exec_list *instructions, bool uniform_locations_assigned)
 	  * Don't do so if it's a shader output, though.
 	  */
 	 if (entry->var->mode != ir_var_out &&
-	     entry->var->mode != ir_var_inout &&
-	     !ir_has_call(entry->assign)) {
+	     entry->var->mode != ir_var_inout) {
 	    entry->assign->remove();
 	    progress = true;
 
diff --git a/mesalib/src/glsl/opt_dead_code_local.cpp b/mesalib/src/glsl/opt_dead_code_local.cpp
index 39962bd60..a81a38fff 100644
--- a/mesalib/src/glsl/opt_dead_code_local.cpp
+++ b/mesalib/src/glsl/opt_dead_code_local.cpp
@@ -149,12 +149,7 @@ process_assignment(void *ctx, ir_assignment *ir, exec_list *assignments)
       }
    }
 
-   /* Add this instruction to the assignment list available to be removed.
-    * But not if the assignment has other side effects.
-    */
-   if (ir_has_call(ir))
-      return progress;
-
+   /* Add this instruction to the assignment list available to be removed. */
    assignment_entry *entry = new(ctx) assignment_entry(var, ir);
    assignments->push_tail(entry);
 
diff --git a/mesalib/src/glsl/opt_dead_functions.cpp b/mesalib/src/glsl/opt_dead_functions.cpp
index 51c77e3b9..017a28639 100644
--- a/mesalib/src/glsl/opt_dead_functions.cpp
+++ b/mesalib/src/glsl/opt_dead_functions.cpp
@@ -103,7 +103,7 @@ ir_dead_functions_visitor::visit_enter(ir_function_signature *ir)
 ir_visitor_status
 ir_dead_functions_visitor::visit_enter(ir_call *ir)
 {
-   signature_entry *entry = this->get_signature_entry(ir->get_callee());
+   signature_entry *entry = this->get_signature_entry(ir->callee);
 
    entry->used = true;
 
diff --git a/mesalib/src/glsl/opt_function_inlining.cpp b/mesalib/src/glsl/opt_function_inlining.cpp
index ec8b72c63..4ff4d97d9 100644
--- a/mesalib/src/glsl/opt_function_inlining.cpp
+++ b/mesalib/src/glsl/opt_function_inlining.cpp
@@ -53,7 +53,6 @@ public:
 
    virtual ir_visitor_status visit_enter(ir_expression *);
    virtual ir_visitor_status visit_enter(ir_call *);
-   virtual ir_visitor_status visit_enter(ir_assignment *);
    virtual ir_visitor_status visit_enter(ir_return *);
    virtual ir_visitor_status visit_enter(ir_texture *);
    virtual ir_visitor_status visit_enter(ir_swizzle *);
@@ -63,23 +62,10 @@ public:
 
 
 bool
-automatic_inlining_predicate(ir_instruction *ir)
-{
-   ir_call *call = ir->as_call();
-
-   if (call && can_inline(call))
-      return true;
-
-   return false;
-}
-
-bool
 do_function_inlining(exec_list *instructions)
 {
    ir_function_inlining_visitor v;
 
-   do_expression_flattening(instructions, automatic_inlining_predicate);
-
    v.run(instructions);
 
    return v.progress;
@@ -89,12 +75,12 @@ static void
 replace_return_with_assignment(ir_instruction *ir, void *data)
 {
    void *ctx = ralloc_parent(ir);
-   ir_variable *retval = (ir_variable *)data;
+   ir_dereference *orig_deref = (ir_dereference *) data;
    ir_return *ret = ir->as_return();
 
    if (ret) {
       if (ret->value) {
-	 ir_rvalue *lhs = new(ctx) ir_dereference_variable(retval);
+	 ir_rvalue *lhs = orig_deref->clone(ctx, NULL);
 	 ret->replace_with(new(ctx) ir_assignment(lhs, ret->value, NULL));
       } else {
 	 /* un-valued return has to be the last return, or we shouldn't
@@ -106,14 +92,13 @@ replace_return_with_assignment(ir_instruction *ir, void *data)
    }
 }
 
-ir_rvalue *
+void
 ir_call::generate_inline(ir_instruction *next_ir)
 {
    void *ctx = ralloc_parent(this);
    ir_variable **parameters;
    int num_parameters;
    int i;
-   ir_variable *retval = NULL;
    struct hash_table *ht;
 
    ht = hash_table_ctor(0, hash_table_pointer_hash, hash_table_pointer_compare);
@@ -124,13 +109,6 @@ ir_call::generate_inline(ir_instruction *next_ir)
 
    parameters = new ir_variable *[num_parameters];
 
-   /* Generate storage for the return value. */
-   if (!this->callee->return_type->is_void()) {
-      retval = new(ctx) ir_variable(this->callee->return_type, "_ret_val",
-				    ir_var_auto);
-      next_ir->insert_before(retval);
-   }
-
    /* Generate the declarations for the parameters to our inlined code,
     * and set up the mapping of real function body variables to ours.
     */
@@ -185,7 +163,7 @@ ir_call::generate_inline(ir_instruction *next_ir)
       ir_instruction *new_ir = ir->clone(ctx, ht);
 
       new_instructions.push_tail(new_ir);
-      visit_tree(new_ir, replace_return_with_assignment, retval);
+      visit_tree(new_ir, replace_return_with_assignment, this->return_deref);
    }
 
    /* If any samplers were passed in, replace any deref of the sampler
@@ -238,11 +216,6 @@ ir_call::generate_inline(ir_instruction *next_ir)
    delete [] parameters;
 
    hash_table_dtor(ht);
-
-   if (retval)
-      return new(ctx) ir_dereference_variable(retval);
-   else
-      return NULL;
 }
 
 
@@ -282,13 +255,7 @@ ir_visitor_status
 ir_function_inlining_visitor::visit_enter(ir_call *ir)
 {
    if (can_inline(ir)) {
-      /* If the call was part of some tree, then it should have been
-       * flattened out or we shouldn't have seen it because of a
-       * visit_continue_with_parent in this visitor.
-       */
-      assert(ir == base_ir);
-
-      (void) ir->generate_inline(ir);
+      ir->generate_inline(ir);
       ir->remove();
       this->progress = true;
    }
@@ -297,25 +264,6 @@ ir_function_inlining_visitor::visit_enter(ir_call *ir)
 }
 
 
-ir_visitor_status
-ir_function_inlining_visitor::visit_enter(ir_assignment *ir)
-{
-   ir_call *call = ir->rhs->as_call();
-   if (!call || !can_inline(call))
-      return visit_continue;
-
-   /* generates the parameter setup, function body, and returns the return
-    * value of the function
-    */
-   ir_rvalue *rhs = call->generate_inline(ir);
-   assert(rhs);
-
-   ir->rhs = rhs;
-   this->progress = true;
-
-   return visit_continue;
-}
-
 /**
  * Replaces references to the "sampler" variable with a clone of "deref."
  *
diff --git a/mesalib/src/glsl/opt_tree_grafting.cpp b/mesalib/src/glsl/opt_tree_grafting.cpp
index e2aff5f80..d86eab80e 100644
--- a/mesalib/src/glsl/opt_tree_grafting.cpp
+++ b/mesalib/src/glsl/opt_tree_grafting.cpp
@@ -202,7 +202,7 @@ ir_tree_grafting_visitor::visit_enter(ir_function_signature *ir)
 ir_visitor_status
 ir_tree_grafting_visitor::visit_enter(ir_call *ir)
 {
-   exec_list_iterator sig_iter = ir->get_callee()->parameters.iterator();
+   exec_list_iterator sig_iter = ir->callee->parameters.iterator();
    /* Reminder: iterating ir_call iterates its parameters. */
    foreach_iter(exec_list_iterator, iter, *ir) {
       ir_variable *sig_param = (ir_variable *)sig_iter.get();
@@ -222,6 +222,9 @@ ir_tree_grafting_visitor::visit_enter(ir_call *ir)
       sig_iter.next();
    }
 
+   if (ir->return_deref && check_graft(ir, ir->return_deref->var) == visit_stop)
+      return visit_stop;
+
    return visit_continue;
 }
 
diff --git a/mesalib/src/mapi/glapi/gen/GL3x.xml b/mesalib/src/mapi/glapi/gen/GL3x.xml
index 86a9a2c3d..ab4900c3e 100644
--- a/mesalib/src/mapi/glapi/gen/GL3x.xml
+++ b/mesalib/src/mapi/glapi/gen/GL3x.xml
@@ -521,7 +521,7 @@
     <param name="primcount" type="GLsizei"/>
   </function>
 
-  <function name="TexBuffer" offset="assign">
+  <function name="TexBuffer" offset="assign" alias="TexBufferARB">
     <param name="target" type="GLenum"/>
     <param name="internalFormat" type="GLenum"/>
     <param name="buffer" type="GLuint"/>
diff --git a/mesalib/src/mapi/glapi/glapi_gentable.c b/mesalib/src/mapi/glapi/glapi_gentable.c
index e4f75fe7b..cc083d985 100644
--- a/mesalib/src/mapi/glapi/glapi_gentable.c
+++ b/mesalib/src/mapi/glapi/glapi_gentable.c
@@ -3811,13 +3811,6 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) {
     }
 
 
-    if(!disp->TexBuffer) {
-        void ** procp = (void **) &disp->TexBuffer;
-        snprintf(symboln, sizeof(symboln), "%sTexBuffer", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-
     if(!disp->FramebufferTexture) {
         void ** procp = (void **) &disp->FramebufferTexture;
         snprintf(symboln, sizeof(symboln), "%sFramebufferTexture", symbol_prefix);
@@ -5659,6 +5652,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) {
     }
 
 
+    if(!disp->TexBufferARB) {
+        void ** procp = (void **) &disp->TexBufferARB;
+        snprintf(symboln, sizeof(symboln), "%sTexBuffer", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
     if(!disp->BindVertexArray) {
         void ** procp = (void **) &disp->BindVertexArray;
         snprintf(symboln, sizeof(symboln), "%sBindVertexArray", symbol_prefix);
diff --git a/mesalib/src/mapi/glapi/glapi_mapi_tmp.h b/mesalib/src/mapi/glapi/glapi_mapi_tmp.h
index dea5d875e..42293029d 100644
--- a/mesalib/src/mapi/glapi/glapi_mapi_tmp.h
+++ b/mesalib/src/mapi/glapi/glapi_mapi_tmp.h
@@ -527,7 +527,6 @@ GLAPI void APIENTRY GLAPI_PREFIX(ClearBufferfv)(GLenum buffer, GLint drawbuffer,
 GLAPI void APIENTRY GLAPI_PREFIX(ClearBufferiv)(GLenum buffer, GLint drawbuffer, const GLint *value);
 GLAPI void APIENTRY GLAPI_PREFIX(ClearBufferuiv)(GLenum buffer, GLint drawbuffer, const GLuint *value);
 GLAPI const GLubyte * APIENTRY GLAPI_PREFIX(GetStringi)(GLenum name, GLuint index);
-GLAPI void APIENTRY GLAPI_PREFIX(TexBuffer)(GLenum target, GLenum internalFormat, GLuint buffer);
 GLAPI void APIENTRY GLAPI_PREFIX(FramebufferTexture)(GLenum target, GLenum attachment, GLuint texture, GLint level);
 GLAPI void APIENTRY GLAPI_PREFIX(GetBufferParameteri64v)(GLenum target, GLenum pname, GLint64 *params);
 GLAPI void APIENTRY GLAPI_PREFIX(GetInteger64i_v)(GLenum cap, GLuint index, GLint64 *data);
@@ -791,6 +790,7 @@ GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribDivisorARB)(GLuint index, GLuint di
 GLAPI void APIENTRY GLAPI_PREFIX(FlushMappedBufferRange)(GLenum target, GLintptr offset, GLsizeiptr length);
 GLAPI GLvoid * APIENTRY GLAPI_PREFIX(MapBufferRange)(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
 GLAPI void APIENTRY GLAPI_PREFIX(TexBufferARB)(GLenum target, GLenum internalFormat, GLuint buffer);
+GLAPI void APIENTRY GLAPI_PREFIX(TexBuffer)(GLenum target, GLenum internalFormat, GLuint buffer);
 GLAPI void APIENTRY GLAPI_PREFIX(BindVertexArray)(GLuint array);
 GLAPI void APIENTRY GLAPI_PREFIX(GenVertexArrays)(GLsizei n, GLuint *arrays);
 GLAPI void APIENTRY GLAPI_PREFIX(CopyBufferSubData)(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
@@ -879,9 +879,9 @@ GLAPI void APIENTRY GLAPI_PREFIX(DepthRangef)(GLclampf zNear, GLclampf zFar);
 GLAPI void APIENTRY GLAPI_PREFIX(GetShaderPrecisionFormat)(GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision);
 GLAPI void APIENTRY GLAPI_PREFIX(ReleaseShaderCompiler)(void);
 GLAPI void APIENTRY GLAPI_PREFIX(ShaderBinary)(GLsizei n, const GLuint *shaders, GLenum binaryformat, const GLvoid *binary, GLsizei length);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_667)(GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, GLvoid *binary);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_668)(GLuint program, GLenum binaryFormat, const GLvoid *binary, GLsizei length);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_669)(GLuint program, GLenum pname, GLint value);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_666)(GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, GLvoid *binary);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_667)(GLuint program, GLenum binaryFormat, const GLvoid *binary, GLsizei length);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_668)(GLuint program, GLenum pname, GLint value);
 GLAPI void APIENTRY GLAPI_PREFIX(DebugMessageCallbackARB)(GLDEBUGPROCARB callback, GLvoid *userParam);
 GLAPI void APIENTRY GLAPI_PREFIX(DebugMessageControlARB)(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
 GLAPI void APIENTRY GLAPI_PREFIX(DebugMessageInsertARB)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLcharARB *buf);
@@ -913,24 +913,24 @@ GLAPI void APIENTRY GLAPI_PREFIX(TextureStorage1DEXT)(GLuint texture, GLenum tar
 GLAPI void APIENTRY GLAPI_PREFIX(TextureStorage2DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height);
 GLAPI void APIENTRY GLAPI_PREFIX(TextureStorage3DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth);
 GLAPI void APIENTRY GLAPI_PREFIX(PolygonOffsetEXT)(GLfloat factor, GLfloat bias);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_701)(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_702)(const GLfloat *coords);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_703)(GLint x, GLint y, GLint z, GLint width, GLint height);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_704)(const GLint *coords);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_705)(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_706)(const GLshort *coords);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_707)(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_708)(const GLfixed *coords);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_709)(GLenum type, GLsizei stride, const GLvoid *pointer);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_710)(GLenum pname, GLfloat *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_711)(GLenum pname, GLint *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_712)(GLenum pname, GLfloat param);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_713)(GLenum pname, const GLfloat *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_714)(GLenum pname, GLint param);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_715)(GLenum pname, const GLint *params);
-GLbitfield APIENTRY GLAPI_PREFIX(_dispatch_stub_716)(GLfixed *mantissa, GLint *exponent);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_717)(GLclampf value, GLboolean invert);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_718)(GLenum pattern);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_700)(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_701)(const GLfloat *coords);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_702)(GLint x, GLint y, GLint z, GLint width, GLint height);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_703)(const GLint *coords);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_704)(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_705)(const GLshort *coords);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_706)(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_707)(const GLfixed *coords);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_708)(GLenum type, GLsizei stride, const GLvoid *pointer);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_709)(GLenum pname, GLfloat *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_710)(GLenum pname, GLint *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_711)(GLenum pname, GLfloat param);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_712)(GLenum pname, const GLfloat *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_713)(GLenum pname, GLint param);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_714)(GLenum pname, const GLint *params);
+GLbitfield APIENTRY GLAPI_PREFIX(_dispatch_stub_715)(GLfixed *mantissa, GLint *exponent);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_716)(GLclampf value, GLboolean invert);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_717)(GLenum pattern);
 GLAPI void APIENTRY GLAPI_PREFIX(ColorPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
 GLAPI void APIENTRY GLAPI_PREFIX(EdgeFlagPointerEXT)(GLsizei stride, GLsizei count, const GLboolean *pointer);
 GLAPI void APIENTRY GLAPI_PREFIX(IndexPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer);
@@ -993,7 +993,7 @@ GLAPI void APIENTRY GLAPI_PREFIX(FogCoordfEXT)(GLfloat coord);
 GLAPI void APIENTRY GLAPI_PREFIX(FogCoordf)(GLfloat coord);
 GLAPI void APIENTRY GLAPI_PREFIX(FogCoordfvEXT)(const GLfloat *coord);
 GLAPI void APIENTRY GLAPI_PREFIX(FogCoordfv)(const GLfloat *coord);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_753)(GLenum mode);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_752)(GLenum mode);
 GLAPI void APIENTRY GLAPI_PREFIX(BlendFuncSeparateEXT)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
 GLAPI void APIENTRY GLAPI_PREFIX(BlendFuncSeparate)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
 GLAPI void APIENTRY GLAPI_PREFIX(FlushVertexArrayRangeNV)(void);
@@ -1068,15 +1068,15 @@ GLAPI void APIENTRY GLAPI_PREFIX(WindowPos4iMESA)(GLint x, GLint y, GLint z, GLi
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos4ivMESA)(const GLint *v);
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos4sMESA)(GLshort x, GLshort y, GLshort z, GLshort w);
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos4svMESA)(const GLshort *v);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_795)(const GLenum *mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_796)(const GLenum *mode, const GLsizei *count, GLenum type, const GLvoid * const *indices, GLsizei primcount, GLint modestride);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_797)(GLsizei n, const GLuint *fences);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_798)(GLuint fence);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_799)(GLsizei n, GLuint *fences);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_800)(GLuint fence, GLenum pname, GLint *params);
-GLboolean APIENTRY GLAPI_PREFIX(_dispatch_stub_801)(GLuint fence);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_802)(GLuint fence, GLenum condition);
-GLboolean APIENTRY GLAPI_PREFIX(_dispatch_stub_803)(GLuint fence);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_794)(const GLenum *mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_795)(const GLenum *mode, const GLsizei *count, GLenum type, const GLvoid * const *indices, GLsizei primcount, GLint modestride);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_796)(GLsizei n, const GLuint *fences);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_797)(GLuint fence);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_798)(GLsizei n, GLuint *fences);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_799)(GLuint fence, GLenum pname, GLint *params);
+GLboolean APIENTRY GLAPI_PREFIX(_dispatch_stub_800)(GLuint fence);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_801)(GLuint fence, GLenum condition);
+GLboolean APIENTRY GLAPI_PREFIX(_dispatch_stub_802)(GLuint fence);
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(AreProgramsResidentNV)(GLsizei n, const GLuint *ids, GLboolean *residences);
 GLAPI void APIENTRY GLAPI_PREFIX(BindProgramNV)(GLenum target, GLuint program);
 GLAPI void APIENTRY GLAPI_PREFIX(BindProgramARB)(GLenum target, GLuint program);
@@ -1165,12 +1165,12 @@ GLAPI void APIENTRY GLAPI_PREFIX(PointParameteriNV)(GLenum pname, GLint param);
 GLAPI void APIENTRY GLAPI_PREFIX(PointParameteri)(GLenum pname, GLint param);
 GLAPI void APIENTRY GLAPI_PREFIX(PointParameterivNV)(GLenum pname, const GLint *params);
 GLAPI void APIENTRY GLAPI_PREFIX(PointParameteriv)(GLenum pname, const GLint *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_884)(GLenum face);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_885)(GLuint array);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_886)(GLsizei n, const GLuint *arrays);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_883)(GLenum face);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_884)(GLuint array);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_885)(GLsizei n, const GLuint *arrays);
 GLAPI void APIENTRY GLAPI_PREFIX(DeleteVertexArrays)(GLsizei n, const GLuint *arrays);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_887)(GLsizei n, GLuint *arrays);
-GLboolean APIENTRY GLAPI_PREFIX(_dispatch_stub_888)(GLuint array);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_886)(GLsizei n, GLuint *arrays);
+GLboolean APIENTRY GLAPI_PREFIX(_dispatch_stub_887)(GLuint array);
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(IsVertexArray)(GLuint array);
 GLAPI void APIENTRY GLAPI_PREFIX(GetProgramNamedParameterdvNV)(GLuint id, GLsizei len, const GLubyte *name, GLdouble *params);
 GLAPI void APIENTRY GLAPI_PREFIX(GetProgramNamedParameterfvNV)(GLuint id, GLsizei len, const GLubyte *name, GLfloat *params);
@@ -1181,54 +1181,54 @@ GLAPI void APIENTRY GLAPI_PREFIX(ProgramNamedParameter4fvNV)(GLuint id, GLsizei
 GLAPI void APIENTRY GLAPI_PREFIX(PrimitiveRestartIndexNV)(GLuint index);
 GLAPI void APIENTRY GLAPI_PREFIX(PrimitiveRestartIndex)(GLuint index);
 GLAPI void APIENTRY GLAPI_PREFIX(PrimitiveRestartNV)(void);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_897)(GLenum func, GLclampx ref);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_898)(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_899)(GLclampx depth);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_900)(GLenum plane, const GLfixed *equation);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_901)(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_902)(GLclampx zNear, GLclampx zFar);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_903)(GLenum pname, GLfixed param);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_904)(GLenum pname, const GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_905)(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_906)(GLenum plane, GLfixed *equation);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_907)(GLenum pname, GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_908)(GLenum light, GLenum pname, GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_909)(GLenum face, GLenum pname, GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_910)(GLenum target, GLenum pname, GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_911)(GLenum coord, GLenum pname, GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_912)(GLenum target, GLenum pname, GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_913)(GLenum pname, GLfixed param);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_914)(GLenum pname, const GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_915)(GLenum light, GLenum pname, GLfixed param);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_916)(GLenum light, GLenum pname, const GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_917)(GLfixed width);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_918)(const GLfixed *m);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_919)(GLenum face, GLenum pname, GLfixed param);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_920)(GLenum face, GLenum pname, const GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_921)(const GLfixed *m);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_922)(GLenum target, GLfixed s, GLfixed t, GLfixed r, GLfixed q);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_923)(GLfixed nx, GLfixed ny, GLfixed nz);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_924)(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_925)(GLenum pname, GLfixed param);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_926)(GLenum pname, const GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_927)(GLfixed size);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_928)(GLfixed factor, GLfixed units);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_929)(GLfixed angle, GLfixed x, GLfixed y, GLfixed z);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_930)(GLclampx value, GLboolean invert);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_931)(GLfixed x, GLfixed y, GLfixed z);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_932)(GLenum target, GLenum pname, GLfixed param);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_933)(GLenum target, GLenum pname, const GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_934)(GLenum coord, GLenum pname, GLint param);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_935)(GLenum coord, GLenum pname, const GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_936)(GLenum target, GLenum pname, GLfixed param);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_937)(GLenum target, GLenum pname, const GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_938)(GLfixed x, GLfixed y, GLfixed z);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_939)(GLenum plane, const GLfloat *equation);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_940)(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_941)(GLenum plane, GLfloat *equation);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_942)(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_943)(GLclampd zmin, GLclampd zmax);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_944)(GLenum modeRGB, GLenum modeA);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_896)(GLenum func, GLclampx ref);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_897)(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_898)(GLclampx depth);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_899)(GLenum plane, const GLfixed *equation);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_900)(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_901)(GLclampx zNear, GLclampx zFar);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_902)(GLenum pname, GLfixed param);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_903)(GLenum pname, const GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_904)(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_905)(GLenum plane, GLfixed *equation);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_906)(GLenum pname, GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_907)(GLenum light, GLenum pname, GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_908)(GLenum face, GLenum pname, GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_909)(GLenum target, GLenum pname, GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_910)(GLenum coord, GLenum pname, GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_911)(GLenum target, GLenum pname, GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_912)(GLenum pname, GLfixed param);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_913)(GLenum pname, const GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_914)(GLenum light, GLenum pname, GLfixed param);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_915)(GLenum light, GLenum pname, const GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_916)(GLfixed width);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_917)(const GLfixed *m);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_918)(GLenum face, GLenum pname, GLfixed param);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_919)(GLenum face, GLenum pname, const GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_920)(const GLfixed *m);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_921)(GLenum target, GLfixed s, GLfixed t, GLfixed r, GLfixed q);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_922)(GLfixed nx, GLfixed ny, GLfixed nz);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_923)(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_924)(GLenum pname, GLfixed param);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_925)(GLenum pname, const GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_926)(GLfixed size);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_927)(GLfixed factor, GLfixed units);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_928)(GLfixed angle, GLfixed x, GLfixed y, GLfixed z);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_929)(GLclampx value, GLboolean invert);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_930)(GLfixed x, GLfixed y, GLfixed z);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_931)(GLenum target, GLenum pname, GLfixed param);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_932)(GLenum target, GLenum pname, const GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_933)(GLenum coord, GLenum pname, GLint param);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_934)(GLenum coord, GLenum pname, const GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_935)(GLenum target, GLenum pname, GLfixed param);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_936)(GLenum target, GLenum pname, const GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_937)(GLfixed x, GLfixed y, GLfixed z);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_938)(GLenum plane, const GLfloat *equation);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_939)(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_940)(GLenum plane, GLfloat *equation);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_941)(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_942)(GLclampd zmin, GLclampd zmax);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_943)(GLenum modeRGB, GLenum modeA);
 GLAPI void APIENTRY GLAPI_PREFIX(BlendEquationSeparate)(GLenum modeRGB, GLenum modeA);
 GLAPI void APIENTRY GLAPI_PREFIX(BindFramebufferEXT)(GLenum target, GLuint framebuffer);
 GLAPI void APIENTRY GLAPI_PREFIX(BindFramebuffer)(GLenum target, GLuint framebuffer);
@@ -1264,10 +1264,10 @@ GLAPI GLboolean APIENTRY GLAPI_PREFIX(IsRenderbufferEXT)(GLuint renderbuffer);
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(IsRenderbuffer)(GLuint renderbuffer);
 GLAPI void APIENTRY GLAPI_PREFIX(RenderbufferStorageEXT)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
 GLAPI void APIENTRY GLAPI_PREFIX(RenderbufferStorage)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_962)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_961)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
 GLAPI void APIENTRY GLAPI_PREFIX(BlitFramebuffer)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_963)(GLenum target, GLenum pname, GLint param);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_964)(GLenum target, GLintptr offset, GLsizeiptr size);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_962)(GLenum target, GLenum pname, GLint param);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_963)(GLenum target, GLintptr offset, GLsizeiptr size);
 GLAPI void APIENTRY GLAPI_PREFIX(BindFragDataLocationEXT)(GLuint program, GLuint colorNumber, const GLchar *name);
 GLAPI void APIENTRY GLAPI_PREFIX(BindFragDataLocation)(GLuint program, GLuint colorNumber, const GLchar *name);
 GLAPI GLint APIENTRY GLAPI_PREFIX(GetFragDataLocationEXT)(GLuint program, const GLchar *name);
@@ -1380,8 +1380,8 @@ GLAPI void APIENTRY GLAPI_PREFIX(TransformFeedbackVaryingsEXT)(GLuint program, G
 GLAPI void APIENTRY GLAPI_PREFIX(TransformFeedbackVaryings)(GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode);
 GLAPI void APIENTRY GLAPI_PREFIX(ProvokingVertexEXT)(GLenum mode);
 GLAPI void APIENTRY GLAPI_PREFIX(ProvokingVertex)(GLenum mode);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_1022)(GLenum target, GLenum pname, GLvoid **params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_1023)(GLenum target, GLsizei length, GLvoid *pointer);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_1021)(GLenum target, GLenum pname, GLvoid **params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_1022)(GLenum target, GLsizei length, GLvoid *pointer);
 GLAPI void APIENTRY GLAPI_PREFIX(GetObjectParameterivAPPLE)(GLenum objectType, GLuint name, GLenum pname, GLint *value);
 GLAPI GLenum APIENTRY GLAPI_PREFIX(ObjectPurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option);
 GLAPI GLenum APIENTRY GLAPI_PREFIX(ObjectUnpurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option);
@@ -1389,11 +1389,11 @@ GLAPI void APIENTRY GLAPI_PREFIX(ActiveProgramEXT)(GLuint program);
 GLAPI GLuint APIENTRY GLAPI_PREFIX(CreateShaderProgramEXT)(GLenum type, const GLchar *string);
 GLAPI void APIENTRY GLAPI_PREFIX(UseShaderProgramEXT)(GLenum type, GLuint program);
 GLAPI void APIENTRY GLAPI_PREFIX(TextureBarrierNV)(void);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_1031)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_1030)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_1031)(GLenum target, GLuint index, GLsizei count, const GLfloat *params);
 void APIENTRY GLAPI_PREFIX(_dispatch_stub_1032)(GLenum target, GLuint index, GLsizei count, const GLfloat *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_1033)(GLenum target, GLuint index, GLsizei count, const GLfloat *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_1034)(GLuint id, GLenum pname, GLint64EXT *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_1035)(GLuint id, GLenum pname, GLuint64EXT *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_1033)(GLuint id, GLenum pname, GLint64EXT *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_1034)(GLuint id, GLenum pname, GLuint64EXT *params);
 GLAPI void APIENTRY GLAPI_PREFIX(EGLImageTargetRenderbufferStorageOES)(GLenum target, GLvoid *writeOffset);
 GLAPI void APIENTRY GLAPI_PREFIX(EGLImageTargetTexture2DOES)(GLenum target, GLvoid *writeOffset);
 #undef MAPI_TMP_DEFINES
@@ -4879,5428 +4879,5428 @@ GLAPI const GLubyte * APIENTRY GLAPI_PREFIX(GetStringi)(GLenum name, GLuint inde
    return ((const GLubyte * (APIENTRY *)(GLenum name, GLuint index)) _func)(name, index);
 }
 
-GLAPI void APIENTRY GLAPI_PREFIX(TexBuffer)(GLenum target, GLenum internalFormat, GLuint buffer)
-{
-   const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[436];
-   ((void (APIENTRY *)(GLenum target, GLenum internalFormat, GLuint buffer)) _func)(target, internalFormat, buffer);
-}
-
 GLAPI void APIENTRY GLAPI_PREFIX(FramebufferTexture)(GLenum target, GLenum attachment, GLuint texture, GLint level)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[437];
+   mapi_func _func = ((const mapi_func *) _tbl)[436];
    ((void (APIENTRY *)(GLenum target, GLenum attachment, GLuint texture, GLint level)) _func)(target, attachment, texture, level);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetBufferParameteri64v)(GLenum target, GLenum pname, GLint64 *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[438];
+   mapi_func _func = ((const mapi_func *) _tbl)[437];
    ((void (APIENTRY *)(GLenum target, GLenum pname, GLint64 *params)) _func)(target, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetInteger64i_v)(GLenum cap, GLuint index, GLint64 *data)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[439];
+   mapi_func _func = ((const mapi_func *) _tbl)[438];
    ((void (APIENTRY *)(GLenum cap, GLuint index, GLint64 *data)) _func)(cap, index, data);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribDivisor)(GLuint index, GLuint divisor)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[440];
+   mapi_func _func = ((const mapi_func *) _tbl)[439];
    ((void (APIENTRY *)(GLuint index, GLuint divisor)) _func)(index, divisor);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(LoadTransposeMatrixdARB)(const GLdouble *m)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[441];
+   mapi_func _func = ((const mapi_func *) _tbl)[440];
    ((void (APIENTRY *)(const GLdouble *m)) _func)(m);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(LoadTransposeMatrixd)(const GLdouble *m)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[441];
+   mapi_func _func = ((const mapi_func *) _tbl)[440];
    ((void (APIENTRY *)(const GLdouble *m)) _func)(m);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(LoadTransposeMatrixfARB)(const GLfloat *m)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[442];
+   mapi_func _func = ((const mapi_func *) _tbl)[441];
    ((void (APIENTRY *)(const GLfloat *m)) _func)(m);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(LoadTransposeMatrixf)(const GLfloat *m)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[442];
+   mapi_func _func = ((const mapi_func *) _tbl)[441];
    ((void (APIENTRY *)(const GLfloat *m)) _func)(m);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(MultTransposeMatrixdARB)(const GLdouble *m)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[443];
+   mapi_func _func = ((const mapi_func *) _tbl)[442];
    ((void (APIENTRY *)(const GLdouble *m)) _func)(m);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(MultTransposeMatrixd)(const GLdouble *m)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[443];
+   mapi_func _func = ((const mapi_func *) _tbl)[442];
    ((void (APIENTRY *)(const GLdouble *m)) _func)(m);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(MultTransposeMatrixfARB)(const GLfloat *m)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[444];
+   mapi_func _func = ((const mapi_func *) _tbl)[443];
    ((void (APIENTRY *)(const GLfloat *m)) _func)(m);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(MultTransposeMatrixf)(const GLfloat *m)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[444];
+   mapi_func _func = ((const mapi_func *) _tbl)[443];
    ((void (APIENTRY *)(const GLfloat *m)) _func)(m);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SampleCoverageARB)(GLclampf value, GLboolean invert)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[445];
+   mapi_func _func = ((const mapi_func *) _tbl)[444];
    ((void (APIENTRY *)(GLclampf value, GLboolean invert)) _func)(value, invert);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SampleCoverage)(GLclampf value, GLboolean invert)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[445];
+   mapi_func _func = ((const mapi_func *) _tbl)[444];
    ((void (APIENTRY *)(GLclampf value, GLboolean invert)) _func)(value, invert);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(CompressedTexImage1DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[446];
+   mapi_func _func = ((const mapi_func *) _tbl)[445];
    ((void (APIENTRY *)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data)) _func)(target, level, internalformat, width, border, imageSize, data);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(CompressedTexImage1D)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[446];
+   mapi_func _func = ((const mapi_func *) _tbl)[445];
    ((void (APIENTRY *)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data)) _func)(target, level, internalformat, width, border, imageSize, data);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(CompressedTexImage2DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[447];
+   mapi_func _func = ((const mapi_func *) _tbl)[446];
    ((void (APIENTRY *)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data)) _func)(target, level, internalformat, width, height, border, imageSize, data);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(CompressedTexImage2D)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[447];
+   mapi_func _func = ((const mapi_func *) _tbl)[446];
    ((void (APIENTRY *)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data)) _func)(target, level, internalformat, width, height, border, imageSize, data);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(CompressedTexImage3DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[448];
+   mapi_func _func = ((const mapi_func *) _tbl)[447];
    ((void (APIENTRY *)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data)) _func)(target, level, internalformat, width, height, depth, border, imageSize, data);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(CompressedTexImage3D)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[448];
+   mapi_func _func = ((const mapi_func *) _tbl)[447];
    ((void (APIENTRY *)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data)) _func)(target, level, internalformat, width, height, depth, border, imageSize, data);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(CompressedTexSubImage1DARB)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[449];
+   mapi_func _func = ((const mapi_func *) _tbl)[448];
    ((void (APIENTRY *)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data)) _func)(target, level, xoffset, width, format, imageSize, data);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(CompressedTexSubImage1D)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[449];
+   mapi_func _func = ((const mapi_func *) _tbl)[448];
    ((void (APIENTRY *)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data)) _func)(target, level, xoffset, width, format, imageSize, data);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(CompressedTexSubImage2DARB)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[450];
+   mapi_func _func = ((const mapi_func *) _tbl)[449];
    ((void (APIENTRY *)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data)) _func)(target, level, xoffset, yoffset, width, height, format, imageSize, data);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(CompressedTexSubImage2D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[450];
+   mapi_func _func = ((const mapi_func *) _tbl)[449];
    ((void (APIENTRY *)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data)) _func)(target, level, xoffset, yoffset, width, height, format, imageSize, data);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(CompressedTexSubImage3DARB)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[451];
+   mapi_func _func = ((const mapi_func *) _tbl)[450];
    ((void (APIENTRY *)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data)) _func)(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(CompressedTexSubImage3D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[451];
+   mapi_func _func = ((const mapi_func *) _tbl)[450];
    ((void (APIENTRY *)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data)) _func)(target, level, xoffset, yoffset, zoffset, width, height, depth, format, imageSize, data);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetCompressedTexImageARB)(GLenum target, GLint level, GLvoid *img)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[452];
+   mapi_func _func = ((const mapi_func *) _tbl)[451];
    ((void (APIENTRY *)(GLenum target, GLint level, GLvoid *img)) _func)(target, level, img);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetCompressedTexImage)(GLenum target, GLint level, GLvoid *img)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[452];
+   mapi_func _func = ((const mapi_func *) _tbl)[451];
    ((void (APIENTRY *)(GLenum target, GLint level, GLvoid *img)) _func)(target, level, img);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DisableVertexAttribArrayARB)(GLuint index)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[453];
+   mapi_func _func = ((const mapi_func *) _tbl)[452];
    ((void (APIENTRY *)(GLuint index)) _func)(index);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DisableVertexAttribArray)(GLuint index)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[453];
+   mapi_func _func = ((const mapi_func *) _tbl)[452];
    ((void (APIENTRY *)(GLuint index)) _func)(index);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(EnableVertexAttribArrayARB)(GLuint index)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[454];
+   mapi_func _func = ((const mapi_func *) _tbl)[453];
    ((void (APIENTRY *)(GLuint index)) _func)(index);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(EnableVertexAttribArray)(GLuint index)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[454];
+   mapi_func _func = ((const mapi_func *) _tbl)[453];
    ((void (APIENTRY *)(GLuint index)) _func)(index);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetProgramEnvParameterdvARB)(GLenum target, GLuint index, GLdouble *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[455];
+   mapi_func _func = ((const mapi_func *) _tbl)[454];
    ((void (APIENTRY *)(GLenum target, GLuint index, GLdouble *params)) _func)(target, index, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetProgramEnvParameterfvARB)(GLenum target, GLuint index, GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[456];
+   mapi_func _func = ((const mapi_func *) _tbl)[455];
    ((void (APIENTRY *)(GLenum target, GLuint index, GLfloat *params)) _func)(target, index, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetProgramLocalParameterdvARB)(GLenum target, GLuint index, GLdouble *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[457];
+   mapi_func _func = ((const mapi_func *) _tbl)[456];
    ((void (APIENTRY *)(GLenum target, GLuint index, GLdouble *params)) _func)(target, index, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetProgramLocalParameterfvARB)(GLenum target, GLuint index, GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[458];
+   mapi_func _func = ((const mapi_func *) _tbl)[457];
    ((void (APIENTRY *)(GLenum target, GLuint index, GLfloat *params)) _func)(target, index, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetProgramStringARB)(GLenum target, GLenum pname, GLvoid *string)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[459];
+   mapi_func _func = ((const mapi_func *) _tbl)[458];
    ((void (APIENTRY *)(GLenum target, GLenum pname, GLvoid *string)) _func)(target, pname, string);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetProgramivARB)(GLenum target, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[460];
+   mapi_func _func = ((const mapi_func *) _tbl)[459];
    ((void (APIENTRY *)(GLenum target, GLenum pname, GLint *params)) _func)(target, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetVertexAttribdvARB)(GLuint index, GLenum pname, GLdouble *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[461];
+   mapi_func _func = ((const mapi_func *) _tbl)[460];
    ((void (APIENTRY *)(GLuint index, GLenum pname, GLdouble *params)) _func)(index, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetVertexAttribdv)(GLuint index, GLenum pname, GLdouble *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[461];
+   mapi_func _func = ((const mapi_func *) _tbl)[460];
    ((void (APIENTRY *)(GLuint index, GLenum pname, GLdouble *params)) _func)(index, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetVertexAttribfvARB)(GLuint index, GLenum pname, GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[462];
+   mapi_func _func = ((const mapi_func *) _tbl)[461];
    ((void (APIENTRY *)(GLuint index, GLenum pname, GLfloat *params)) _func)(index, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetVertexAttribfv)(GLuint index, GLenum pname, GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[462];
+   mapi_func _func = ((const mapi_func *) _tbl)[461];
    ((void (APIENTRY *)(GLuint index, GLenum pname, GLfloat *params)) _func)(index, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetVertexAttribivARB)(GLuint index, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[463];
+   mapi_func _func = ((const mapi_func *) _tbl)[462];
    ((void (APIENTRY *)(GLuint index, GLenum pname, GLint *params)) _func)(index, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetVertexAttribiv)(GLuint index, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[463];
+   mapi_func _func = ((const mapi_func *) _tbl)[462];
    ((void (APIENTRY *)(GLuint index, GLenum pname, GLint *params)) _func)(index, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ProgramEnvParameter4dARB)(GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[464];
+   mapi_func _func = ((const mapi_func *) _tbl)[463];
    ((void (APIENTRY *)(GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)) _func)(target, index, x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ProgramParameter4dNV)(GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[464];
+   mapi_func _func = ((const mapi_func *) _tbl)[463];
    ((void (APIENTRY *)(GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)) _func)(target, index, x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ProgramEnvParameter4dvARB)(GLenum target, GLuint index, const GLdouble *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[465];
+   mapi_func _func = ((const mapi_func *) _tbl)[464];
    ((void (APIENTRY *)(GLenum target, GLuint index, const GLdouble *params)) _func)(target, index, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ProgramParameter4dvNV)(GLenum target, GLuint index, const GLdouble *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[465];
+   mapi_func _func = ((const mapi_func *) _tbl)[464];
    ((void (APIENTRY *)(GLenum target, GLuint index, const GLdouble *params)) _func)(target, index, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ProgramEnvParameter4fARB)(GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[466];
+   mapi_func _func = ((const mapi_func *) _tbl)[465];
    ((void (APIENTRY *)(GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)) _func)(target, index, x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ProgramParameter4fNV)(GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[466];
+   mapi_func _func = ((const mapi_func *) _tbl)[465];
    ((void (APIENTRY *)(GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)) _func)(target, index, x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ProgramEnvParameter4fvARB)(GLenum target, GLuint index, const GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[467];
+   mapi_func _func = ((const mapi_func *) _tbl)[466];
    ((void (APIENTRY *)(GLenum target, GLuint index, const GLfloat *params)) _func)(target, index, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ProgramParameter4fvNV)(GLenum target, GLuint index, const GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[467];
+   mapi_func _func = ((const mapi_func *) _tbl)[466];
    ((void (APIENTRY *)(GLenum target, GLuint index, const GLfloat *params)) _func)(target, index, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ProgramLocalParameter4dARB)(GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[468];
+   mapi_func _func = ((const mapi_func *) _tbl)[467];
    ((void (APIENTRY *)(GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)) _func)(target, index, x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ProgramLocalParameter4dvARB)(GLenum target, GLuint index, const GLdouble *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[469];
+   mapi_func _func = ((const mapi_func *) _tbl)[468];
    ((void (APIENTRY *)(GLenum target, GLuint index, const GLdouble *params)) _func)(target, index, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ProgramLocalParameter4fARB)(GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[470];
+   mapi_func _func = ((const mapi_func *) _tbl)[469];
    ((void (APIENTRY *)(GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)) _func)(target, index, x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ProgramLocalParameter4fvARB)(GLenum target, GLuint index, const GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[471];
+   mapi_func _func = ((const mapi_func *) _tbl)[470];
    ((void (APIENTRY *)(GLenum target, GLuint index, const GLfloat *params)) _func)(target, index, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ProgramStringARB)(GLenum target, GLenum format, GLsizei len, const GLvoid *string)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[472];
+   mapi_func _func = ((const mapi_func *) _tbl)[471];
    ((void (APIENTRY *)(GLenum target, GLenum format, GLsizei len, const GLvoid *string)) _func)(target, format, len, string);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib1dARB)(GLuint index, GLdouble x)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[473];
+   mapi_func _func = ((const mapi_func *) _tbl)[472];
    ((void (APIENTRY *)(GLuint index, GLdouble x)) _func)(index, x);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib1d)(GLuint index, GLdouble x)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[473];
+   mapi_func _func = ((const mapi_func *) _tbl)[472];
    ((void (APIENTRY *)(GLuint index, GLdouble x)) _func)(index, x);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib1dvARB)(GLuint index, const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[474];
+   mapi_func _func = ((const mapi_func *) _tbl)[473];
    ((void (APIENTRY *)(GLuint index, const GLdouble *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib1dv)(GLuint index, const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[474];
+   mapi_func _func = ((const mapi_func *) _tbl)[473];
    ((void (APIENTRY *)(GLuint index, const GLdouble *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib1fARB)(GLuint index, GLfloat x)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[475];
+   mapi_func _func = ((const mapi_func *) _tbl)[474];
    ((void (APIENTRY *)(GLuint index, GLfloat x)) _func)(index, x);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib1f)(GLuint index, GLfloat x)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[475];
+   mapi_func _func = ((const mapi_func *) _tbl)[474];
    ((void (APIENTRY *)(GLuint index, GLfloat x)) _func)(index, x);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib1fvARB)(GLuint index, const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[476];
+   mapi_func _func = ((const mapi_func *) _tbl)[475];
    ((void (APIENTRY *)(GLuint index, const GLfloat *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib1fv)(GLuint index, const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[476];
+   mapi_func _func = ((const mapi_func *) _tbl)[475];
    ((void (APIENTRY *)(GLuint index, const GLfloat *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib1sARB)(GLuint index, GLshort x)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[477];
+   mapi_func _func = ((const mapi_func *) _tbl)[476];
    ((void (APIENTRY *)(GLuint index, GLshort x)) _func)(index, x);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib1s)(GLuint index, GLshort x)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[477];
+   mapi_func _func = ((const mapi_func *) _tbl)[476];
    ((void (APIENTRY *)(GLuint index, GLshort x)) _func)(index, x);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib1svARB)(GLuint index, const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[478];
+   mapi_func _func = ((const mapi_func *) _tbl)[477];
    ((void (APIENTRY *)(GLuint index, const GLshort *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib1sv)(GLuint index, const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[478];
+   mapi_func _func = ((const mapi_func *) _tbl)[477];
    ((void (APIENTRY *)(GLuint index, const GLshort *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib2dARB)(GLuint index, GLdouble x, GLdouble y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[479];
+   mapi_func _func = ((const mapi_func *) _tbl)[478];
    ((void (APIENTRY *)(GLuint index, GLdouble x, GLdouble y)) _func)(index, x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib2d)(GLuint index, GLdouble x, GLdouble y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[479];
+   mapi_func _func = ((const mapi_func *) _tbl)[478];
    ((void (APIENTRY *)(GLuint index, GLdouble x, GLdouble y)) _func)(index, x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib2dvARB)(GLuint index, const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[480];
+   mapi_func _func = ((const mapi_func *) _tbl)[479];
    ((void (APIENTRY *)(GLuint index, const GLdouble *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib2dv)(GLuint index, const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[480];
+   mapi_func _func = ((const mapi_func *) _tbl)[479];
    ((void (APIENTRY *)(GLuint index, const GLdouble *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib2fARB)(GLuint index, GLfloat x, GLfloat y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[481];
+   mapi_func _func = ((const mapi_func *) _tbl)[480];
    ((void (APIENTRY *)(GLuint index, GLfloat x, GLfloat y)) _func)(index, x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib2f)(GLuint index, GLfloat x, GLfloat y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[481];
+   mapi_func _func = ((const mapi_func *) _tbl)[480];
    ((void (APIENTRY *)(GLuint index, GLfloat x, GLfloat y)) _func)(index, x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib2fvARB)(GLuint index, const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[482];
+   mapi_func _func = ((const mapi_func *) _tbl)[481];
    ((void (APIENTRY *)(GLuint index, const GLfloat *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib2fv)(GLuint index, const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[482];
+   mapi_func _func = ((const mapi_func *) _tbl)[481];
    ((void (APIENTRY *)(GLuint index, const GLfloat *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib2sARB)(GLuint index, GLshort x, GLshort y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[483];
+   mapi_func _func = ((const mapi_func *) _tbl)[482];
    ((void (APIENTRY *)(GLuint index, GLshort x, GLshort y)) _func)(index, x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib2s)(GLuint index, GLshort x, GLshort y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[483];
+   mapi_func _func = ((const mapi_func *) _tbl)[482];
    ((void (APIENTRY *)(GLuint index, GLshort x, GLshort y)) _func)(index, x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib2svARB)(GLuint index, const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[484];
+   mapi_func _func = ((const mapi_func *) _tbl)[483];
    ((void (APIENTRY *)(GLuint index, const GLshort *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib2sv)(GLuint index, const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[484];
+   mapi_func _func = ((const mapi_func *) _tbl)[483];
    ((void (APIENTRY *)(GLuint index, const GLshort *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib3dARB)(GLuint index, GLdouble x, GLdouble y, GLdouble z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[485];
+   mapi_func _func = ((const mapi_func *) _tbl)[484];
    ((void (APIENTRY *)(GLuint index, GLdouble x, GLdouble y, GLdouble z)) _func)(index, x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib3d)(GLuint index, GLdouble x, GLdouble y, GLdouble z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[485];
+   mapi_func _func = ((const mapi_func *) _tbl)[484];
    ((void (APIENTRY *)(GLuint index, GLdouble x, GLdouble y, GLdouble z)) _func)(index, x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib3dvARB)(GLuint index, const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[486];
+   mapi_func _func = ((const mapi_func *) _tbl)[485];
    ((void (APIENTRY *)(GLuint index, const GLdouble *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib3dv)(GLuint index, const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[486];
+   mapi_func _func = ((const mapi_func *) _tbl)[485];
    ((void (APIENTRY *)(GLuint index, const GLdouble *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib3fARB)(GLuint index, GLfloat x, GLfloat y, GLfloat z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[487];
+   mapi_func _func = ((const mapi_func *) _tbl)[486];
    ((void (APIENTRY *)(GLuint index, GLfloat x, GLfloat y, GLfloat z)) _func)(index, x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib3f)(GLuint index, GLfloat x, GLfloat y, GLfloat z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[487];
+   mapi_func _func = ((const mapi_func *) _tbl)[486];
    ((void (APIENTRY *)(GLuint index, GLfloat x, GLfloat y, GLfloat z)) _func)(index, x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib3fvARB)(GLuint index, const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[488];
+   mapi_func _func = ((const mapi_func *) _tbl)[487];
    ((void (APIENTRY *)(GLuint index, const GLfloat *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib3fv)(GLuint index, const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[488];
+   mapi_func _func = ((const mapi_func *) _tbl)[487];
    ((void (APIENTRY *)(GLuint index, const GLfloat *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib3sARB)(GLuint index, GLshort x, GLshort y, GLshort z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[489];
+   mapi_func _func = ((const mapi_func *) _tbl)[488];
    ((void (APIENTRY *)(GLuint index, GLshort x, GLshort y, GLshort z)) _func)(index, x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib3s)(GLuint index, GLshort x, GLshort y, GLshort z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[489];
+   mapi_func _func = ((const mapi_func *) _tbl)[488];
    ((void (APIENTRY *)(GLuint index, GLshort x, GLshort y, GLshort z)) _func)(index, x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib3svARB)(GLuint index, const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[490];
+   mapi_func _func = ((const mapi_func *) _tbl)[489];
    ((void (APIENTRY *)(GLuint index, const GLshort *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib3sv)(GLuint index, const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[490];
+   mapi_func _func = ((const mapi_func *) _tbl)[489];
    ((void (APIENTRY *)(GLuint index, const GLshort *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4NbvARB)(GLuint index, const GLbyte *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[491];
+   mapi_func _func = ((const mapi_func *) _tbl)[490];
    ((void (APIENTRY *)(GLuint index, const GLbyte *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4Nbv)(GLuint index, const GLbyte *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[491];
+   mapi_func _func = ((const mapi_func *) _tbl)[490];
    ((void (APIENTRY *)(GLuint index, const GLbyte *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4NivARB)(GLuint index, const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[492];
+   mapi_func _func = ((const mapi_func *) _tbl)[491];
    ((void (APIENTRY *)(GLuint index, const GLint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4Niv)(GLuint index, const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[492];
+   mapi_func _func = ((const mapi_func *) _tbl)[491];
    ((void (APIENTRY *)(GLuint index, const GLint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4NsvARB)(GLuint index, const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[493];
+   mapi_func _func = ((const mapi_func *) _tbl)[492];
    ((void (APIENTRY *)(GLuint index, const GLshort *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4Nsv)(GLuint index, const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[493];
+   mapi_func _func = ((const mapi_func *) _tbl)[492];
    ((void (APIENTRY *)(GLuint index, const GLshort *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4NubARB)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[494];
+   mapi_func _func = ((const mapi_func *) _tbl)[493];
    ((void (APIENTRY *)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w)) _func)(index, x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4Nub)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[494];
+   mapi_func _func = ((const mapi_func *) _tbl)[493];
    ((void (APIENTRY *)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w)) _func)(index, x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4NubvARB)(GLuint index, const GLubyte *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[495];
+   mapi_func _func = ((const mapi_func *) _tbl)[494];
    ((void (APIENTRY *)(GLuint index, const GLubyte *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4Nubv)(GLuint index, const GLubyte *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[495];
+   mapi_func _func = ((const mapi_func *) _tbl)[494];
    ((void (APIENTRY *)(GLuint index, const GLubyte *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4NuivARB)(GLuint index, const GLuint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[496];
+   mapi_func _func = ((const mapi_func *) _tbl)[495];
    ((void (APIENTRY *)(GLuint index, const GLuint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4Nuiv)(GLuint index, const GLuint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[496];
+   mapi_func _func = ((const mapi_func *) _tbl)[495];
    ((void (APIENTRY *)(GLuint index, const GLuint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4NusvARB)(GLuint index, const GLushort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[497];
+   mapi_func _func = ((const mapi_func *) _tbl)[496];
    ((void (APIENTRY *)(GLuint index, const GLushort *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4Nusv)(GLuint index, const GLushort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[497];
+   mapi_func _func = ((const mapi_func *) _tbl)[496];
    ((void (APIENTRY *)(GLuint index, const GLushort *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4bvARB)(GLuint index, const GLbyte *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[498];
+   mapi_func _func = ((const mapi_func *) _tbl)[497];
    ((void (APIENTRY *)(GLuint index, const GLbyte *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4bv)(GLuint index, const GLbyte *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[498];
+   mapi_func _func = ((const mapi_func *) _tbl)[497];
    ((void (APIENTRY *)(GLuint index, const GLbyte *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4dARB)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[499];
+   mapi_func _func = ((const mapi_func *) _tbl)[498];
    ((void (APIENTRY *)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)) _func)(index, x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4d)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[499];
+   mapi_func _func = ((const mapi_func *) _tbl)[498];
    ((void (APIENTRY *)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)) _func)(index, x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4dvARB)(GLuint index, const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[500];
+   mapi_func _func = ((const mapi_func *) _tbl)[499];
    ((void (APIENTRY *)(GLuint index, const GLdouble *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4dv)(GLuint index, const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[500];
+   mapi_func _func = ((const mapi_func *) _tbl)[499];
    ((void (APIENTRY *)(GLuint index, const GLdouble *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4fARB)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[501];
+   mapi_func _func = ((const mapi_func *) _tbl)[500];
    ((void (APIENTRY *)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)) _func)(index, x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4f)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[501];
+   mapi_func _func = ((const mapi_func *) _tbl)[500];
    ((void (APIENTRY *)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)) _func)(index, x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4fvARB)(GLuint index, const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[502];
+   mapi_func _func = ((const mapi_func *) _tbl)[501];
    ((void (APIENTRY *)(GLuint index, const GLfloat *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4fv)(GLuint index, const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[502];
+   mapi_func _func = ((const mapi_func *) _tbl)[501];
    ((void (APIENTRY *)(GLuint index, const GLfloat *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4ivARB)(GLuint index, const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[503];
+   mapi_func _func = ((const mapi_func *) _tbl)[502];
    ((void (APIENTRY *)(GLuint index, const GLint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4iv)(GLuint index, const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[503];
+   mapi_func _func = ((const mapi_func *) _tbl)[502];
    ((void (APIENTRY *)(GLuint index, const GLint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4sARB)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[504];
+   mapi_func _func = ((const mapi_func *) _tbl)[503];
    ((void (APIENTRY *)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w)) _func)(index, x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4s)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[504];
+   mapi_func _func = ((const mapi_func *) _tbl)[503];
    ((void (APIENTRY *)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w)) _func)(index, x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4svARB)(GLuint index, const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[505];
+   mapi_func _func = ((const mapi_func *) _tbl)[504];
    ((void (APIENTRY *)(GLuint index, const GLshort *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4sv)(GLuint index, const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[505];
+   mapi_func _func = ((const mapi_func *) _tbl)[504];
    ((void (APIENTRY *)(GLuint index, const GLshort *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4ubvARB)(GLuint index, const GLubyte *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[506];
+   mapi_func _func = ((const mapi_func *) _tbl)[505];
    ((void (APIENTRY *)(GLuint index, const GLubyte *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4ubv)(GLuint index, const GLubyte *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[506];
+   mapi_func _func = ((const mapi_func *) _tbl)[505];
    ((void (APIENTRY *)(GLuint index, const GLubyte *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4uivARB)(GLuint index, const GLuint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[507];
+   mapi_func _func = ((const mapi_func *) _tbl)[506];
    ((void (APIENTRY *)(GLuint index, const GLuint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4uiv)(GLuint index, const GLuint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[507];
+   mapi_func _func = ((const mapi_func *) _tbl)[506];
    ((void (APIENTRY *)(GLuint index, const GLuint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4usvARB)(GLuint index, const GLushort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[508];
+   mapi_func _func = ((const mapi_func *) _tbl)[507];
    ((void (APIENTRY *)(GLuint index, const GLushort *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4usv)(GLuint index, const GLushort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[508];
+   mapi_func _func = ((const mapi_func *) _tbl)[507];
    ((void (APIENTRY *)(GLuint index, const GLushort *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribPointerARB)(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[509];
+   mapi_func _func = ((const mapi_func *) _tbl)[508];
    ((void (APIENTRY *)(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer)) _func)(index, size, type, normalized, stride, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribPointer)(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[509];
+   mapi_func _func = ((const mapi_func *) _tbl)[508];
    ((void (APIENTRY *)(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer)) _func)(index, size, type, normalized, stride, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindBufferARB)(GLenum target, GLuint buffer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[510];
+   mapi_func _func = ((const mapi_func *) _tbl)[509];
    ((void (APIENTRY *)(GLenum target, GLuint buffer)) _func)(target, buffer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindBuffer)(GLenum target, GLuint buffer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[510];
+   mapi_func _func = ((const mapi_func *) _tbl)[509];
    ((void (APIENTRY *)(GLenum target, GLuint buffer)) _func)(target, buffer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BufferDataARB)(GLenum target, GLsizeiptrARB size, const GLvoid *data, GLenum usage)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[511];
+   mapi_func _func = ((const mapi_func *) _tbl)[510];
    ((void (APIENTRY *)(GLenum target, GLsizeiptrARB size, const GLvoid *data, GLenum usage)) _func)(target, size, data, usage);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BufferData)(GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[511];
+   mapi_func _func = ((const mapi_func *) _tbl)[510];
    ((void (APIENTRY *)(GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage)) _func)(target, size, data, usage);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BufferSubDataARB)(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid *data)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[512];
+   mapi_func _func = ((const mapi_func *) _tbl)[511];
    ((void (APIENTRY *)(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid *data)) _func)(target, offset, size, data);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BufferSubData)(GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[512];
+   mapi_func _func = ((const mapi_func *) _tbl)[511];
    ((void (APIENTRY *)(GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data)) _func)(target, offset, size, data);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DeleteBuffersARB)(GLsizei n, const GLuint *buffer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[513];
+   mapi_func _func = ((const mapi_func *) _tbl)[512];
    ((void (APIENTRY *)(GLsizei n, const GLuint *buffer)) _func)(n, buffer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DeleteBuffers)(GLsizei n, const GLuint *buffer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[513];
+   mapi_func _func = ((const mapi_func *) _tbl)[512];
    ((void (APIENTRY *)(GLsizei n, const GLuint *buffer)) _func)(n, buffer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GenBuffersARB)(GLsizei n, GLuint *buffer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[514];
+   mapi_func _func = ((const mapi_func *) _tbl)[513];
    ((void (APIENTRY *)(GLsizei n, GLuint *buffer)) _func)(n, buffer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GenBuffers)(GLsizei n, GLuint *buffer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[514];
+   mapi_func _func = ((const mapi_func *) _tbl)[513];
    ((void (APIENTRY *)(GLsizei n, GLuint *buffer)) _func)(n, buffer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetBufferParameterivARB)(GLenum target, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[515];
+   mapi_func _func = ((const mapi_func *) _tbl)[514];
    ((void (APIENTRY *)(GLenum target, GLenum pname, GLint *params)) _func)(target, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetBufferParameteriv)(GLenum target, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[515];
+   mapi_func _func = ((const mapi_func *) _tbl)[514];
    ((void (APIENTRY *)(GLenum target, GLenum pname, GLint *params)) _func)(target, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetBufferPointervARB)(GLenum target, GLenum pname, GLvoid **params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[516];
+   mapi_func _func = ((const mapi_func *) _tbl)[515];
    ((void (APIENTRY *)(GLenum target, GLenum pname, GLvoid **params)) _func)(target, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetBufferPointerv)(GLenum target, GLenum pname, GLvoid **params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[516];
+   mapi_func _func = ((const mapi_func *) _tbl)[515];
    ((void (APIENTRY *)(GLenum target, GLenum pname, GLvoid **params)) _func)(target, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetBufferSubDataARB)(GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid *data)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[517];
+   mapi_func _func = ((const mapi_func *) _tbl)[516];
    ((void (APIENTRY *)(GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid *data)) _func)(target, offset, size, data);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetBufferSubData)(GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[517];
+   mapi_func _func = ((const mapi_func *) _tbl)[516];
    ((void (APIENTRY *)(GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data)) _func)(target, offset, size, data);
 }
 
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(IsBufferARB)(GLuint buffer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[518];
+   mapi_func _func = ((const mapi_func *) _tbl)[517];
    return ((GLboolean (APIENTRY *)(GLuint buffer)) _func)(buffer);
 }
 
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(IsBuffer)(GLuint buffer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[518];
+   mapi_func _func = ((const mapi_func *) _tbl)[517];
    return ((GLboolean (APIENTRY *)(GLuint buffer)) _func)(buffer);
 }
 
 GLAPI GLvoid * APIENTRY GLAPI_PREFIX(MapBufferARB)(GLenum target, GLenum access)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[519];
+   mapi_func _func = ((const mapi_func *) _tbl)[518];
    return ((GLvoid * (APIENTRY *)(GLenum target, GLenum access)) _func)(target, access);
 }
 
 GLAPI GLvoid * APIENTRY GLAPI_PREFIX(MapBuffer)(GLenum target, GLenum access)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[519];
+   mapi_func _func = ((const mapi_func *) _tbl)[518];
    return ((GLvoid * (APIENTRY *)(GLenum target, GLenum access)) _func)(target, access);
 }
 
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(UnmapBufferARB)(GLenum target)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[520];
+   mapi_func _func = ((const mapi_func *) _tbl)[519];
    return ((GLboolean (APIENTRY *)(GLenum target)) _func)(target);
 }
 
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(UnmapBuffer)(GLenum target)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[520];
+   mapi_func _func = ((const mapi_func *) _tbl)[519];
    return ((GLboolean (APIENTRY *)(GLenum target)) _func)(target);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BeginQueryARB)(GLenum target, GLuint id)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[521];
+   mapi_func _func = ((const mapi_func *) _tbl)[520];
    ((void (APIENTRY *)(GLenum target, GLuint id)) _func)(target, id);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BeginQuery)(GLenum target, GLuint id)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[521];
+   mapi_func _func = ((const mapi_func *) _tbl)[520];
    ((void (APIENTRY *)(GLenum target, GLuint id)) _func)(target, id);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DeleteQueriesARB)(GLsizei n, const GLuint *ids)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[522];
+   mapi_func _func = ((const mapi_func *) _tbl)[521];
    ((void (APIENTRY *)(GLsizei n, const GLuint *ids)) _func)(n, ids);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DeleteQueries)(GLsizei n, const GLuint *ids)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[522];
+   mapi_func _func = ((const mapi_func *) _tbl)[521];
    ((void (APIENTRY *)(GLsizei n, const GLuint *ids)) _func)(n, ids);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(EndQueryARB)(GLenum target)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[523];
+   mapi_func _func = ((const mapi_func *) _tbl)[522];
    ((void (APIENTRY *)(GLenum target)) _func)(target);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(EndQuery)(GLenum target)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[523];
+   mapi_func _func = ((const mapi_func *) _tbl)[522];
    ((void (APIENTRY *)(GLenum target)) _func)(target);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GenQueriesARB)(GLsizei n, GLuint *ids)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[524];
+   mapi_func _func = ((const mapi_func *) _tbl)[523];
    ((void (APIENTRY *)(GLsizei n, GLuint *ids)) _func)(n, ids);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GenQueries)(GLsizei n, GLuint *ids)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[524];
+   mapi_func _func = ((const mapi_func *) _tbl)[523];
    ((void (APIENTRY *)(GLsizei n, GLuint *ids)) _func)(n, ids);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetQueryObjectivARB)(GLuint id, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[525];
+   mapi_func _func = ((const mapi_func *) _tbl)[524];
    ((void (APIENTRY *)(GLuint id, GLenum pname, GLint *params)) _func)(id, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetQueryObjectiv)(GLuint id, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[525];
+   mapi_func _func = ((const mapi_func *) _tbl)[524];
    ((void (APIENTRY *)(GLuint id, GLenum pname, GLint *params)) _func)(id, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetQueryObjectuivARB)(GLuint id, GLenum pname, GLuint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[526];
+   mapi_func _func = ((const mapi_func *) _tbl)[525];
    ((void (APIENTRY *)(GLuint id, GLenum pname, GLuint *params)) _func)(id, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetQueryObjectuiv)(GLuint id, GLenum pname, GLuint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[526];
+   mapi_func _func = ((const mapi_func *) _tbl)[525];
    ((void (APIENTRY *)(GLuint id, GLenum pname, GLuint *params)) _func)(id, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetQueryivARB)(GLenum target, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[527];
+   mapi_func _func = ((const mapi_func *) _tbl)[526];
    ((void (APIENTRY *)(GLenum target, GLenum pname, GLint *params)) _func)(target, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetQueryiv)(GLenum target, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[527];
+   mapi_func _func = ((const mapi_func *) _tbl)[526];
    ((void (APIENTRY *)(GLenum target, GLenum pname, GLint *params)) _func)(target, pname, params);
 }
 
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(IsQueryARB)(GLuint id)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[528];
+   mapi_func _func = ((const mapi_func *) _tbl)[527];
    return ((GLboolean (APIENTRY *)(GLuint id)) _func)(id);
 }
 
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(IsQuery)(GLuint id)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[528];
+   mapi_func _func = ((const mapi_func *) _tbl)[527];
    return ((GLboolean (APIENTRY *)(GLuint id)) _func)(id);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(AttachObjectARB)(GLhandleARB containerObj, GLhandleARB obj)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[529];
+   mapi_func _func = ((const mapi_func *) _tbl)[528];
    ((void (APIENTRY *)(GLhandleARB containerObj, GLhandleARB obj)) _func)(containerObj, obj);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(CompileShaderARB)(GLhandleARB shader)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[530];
+   mapi_func _func = ((const mapi_func *) _tbl)[529];
    ((void (APIENTRY *)(GLhandleARB shader)) _func)(shader);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(CompileShader)(GLuint shader)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[530];
+   mapi_func _func = ((const mapi_func *) _tbl)[529];
    ((void (APIENTRY *)(GLuint shader)) _func)(shader);
 }
 
 GLAPI GLhandleARB APIENTRY GLAPI_PREFIX(CreateProgramObjectARB)(void)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[531];
+   mapi_func _func = ((const mapi_func *) _tbl)[530];
    return ((GLhandleARB (APIENTRY *)(void)) _func)();
 }
 
 GLAPI GLhandleARB APIENTRY GLAPI_PREFIX(CreateShaderObjectARB)(GLenum shaderType)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[532];
+   mapi_func _func = ((const mapi_func *) _tbl)[531];
    return ((GLhandleARB (APIENTRY *)(GLenum shaderType)) _func)(shaderType);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DeleteObjectARB)(GLhandleARB obj)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[533];
+   mapi_func _func = ((const mapi_func *) _tbl)[532];
    ((void (APIENTRY *)(GLhandleARB obj)) _func)(obj);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DetachObjectARB)(GLhandleARB containerObj, GLhandleARB attachedObj)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[534];
+   mapi_func _func = ((const mapi_func *) _tbl)[533];
    ((void (APIENTRY *)(GLhandleARB containerObj, GLhandleARB attachedObj)) _func)(containerObj, attachedObj);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetActiveUniformARB)(GLhandleARB program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[535];
+   mapi_func _func = ((const mapi_func *) _tbl)[534];
    ((void (APIENTRY *)(GLhandleARB program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name)) _func)(program, index, bufSize, length, size, type, name);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetActiveUniform)(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[535];
+   mapi_func _func = ((const mapi_func *) _tbl)[534];
    ((void (APIENTRY *)(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name)) _func)(program, index, bufSize, length, size, type, name);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetAttachedObjectsARB)(GLhandleARB containerObj, GLsizei maxLength, GLsizei *length, GLhandleARB *infoLog)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[536];
+   mapi_func _func = ((const mapi_func *) _tbl)[535];
    ((void (APIENTRY *)(GLhandleARB containerObj, GLsizei maxLength, GLsizei *length, GLhandleARB *infoLog)) _func)(containerObj, maxLength, length, infoLog);
 }
 
 GLAPI GLhandleARB APIENTRY GLAPI_PREFIX(GetHandleARB)(GLenum pname)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[537];
+   mapi_func _func = ((const mapi_func *) _tbl)[536];
    return ((GLhandleARB (APIENTRY *)(GLenum pname)) _func)(pname);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetInfoLogARB)(GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *infoLog)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[538];
+   mapi_func _func = ((const mapi_func *) _tbl)[537];
    ((void (APIENTRY *)(GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *infoLog)) _func)(obj, maxLength, length, infoLog);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetObjectParameterfvARB)(GLhandleARB obj, GLenum pname, GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[539];
+   mapi_func _func = ((const mapi_func *) _tbl)[538];
    ((void (APIENTRY *)(GLhandleARB obj, GLenum pname, GLfloat *params)) _func)(obj, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetObjectParameterivARB)(GLhandleARB obj, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[540];
+   mapi_func _func = ((const mapi_func *) _tbl)[539];
    ((void (APIENTRY *)(GLhandleARB obj, GLenum pname, GLint *params)) _func)(obj, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetShaderSourceARB)(GLhandleARB shader, GLsizei bufSize, GLsizei *length, GLcharARB *source)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[541];
+   mapi_func _func = ((const mapi_func *) _tbl)[540];
    ((void (APIENTRY *)(GLhandleARB shader, GLsizei bufSize, GLsizei *length, GLcharARB *source)) _func)(shader, bufSize, length, source);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetShaderSource)(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[541];
+   mapi_func _func = ((const mapi_func *) _tbl)[540];
    ((void (APIENTRY *)(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source)) _func)(shader, bufSize, length, source);
 }
 
 GLAPI GLint APIENTRY GLAPI_PREFIX(GetUniformLocationARB)(GLhandleARB program, const GLcharARB *name)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[542];
+   mapi_func _func = ((const mapi_func *) _tbl)[541];
    return ((GLint (APIENTRY *)(GLhandleARB program, const GLcharARB *name)) _func)(program, name);
 }
 
 GLAPI GLint APIENTRY GLAPI_PREFIX(GetUniformLocation)(GLuint program, const GLchar *name)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[542];
+   mapi_func _func = ((const mapi_func *) _tbl)[541];
    return ((GLint (APIENTRY *)(GLuint program, const GLchar *name)) _func)(program, name);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetUniformfvARB)(GLhandleARB program, GLint location, GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[543];
+   mapi_func _func = ((const mapi_func *) _tbl)[542];
    ((void (APIENTRY *)(GLhandleARB program, GLint location, GLfloat *params)) _func)(program, location, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetUniformfv)(GLuint program, GLint location, GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[543];
+   mapi_func _func = ((const mapi_func *) _tbl)[542];
    ((void (APIENTRY *)(GLuint program, GLint location, GLfloat *params)) _func)(program, location, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetUniformivARB)(GLhandleARB program, GLint location, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[544];
+   mapi_func _func = ((const mapi_func *) _tbl)[543];
    ((void (APIENTRY *)(GLhandleARB program, GLint location, GLint *params)) _func)(program, location, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetUniformiv)(GLuint program, GLint location, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[544];
+   mapi_func _func = ((const mapi_func *) _tbl)[543];
    ((void (APIENTRY *)(GLuint program, GLint location, GLint *params)) _func)(program, location, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(LinkProgramARB)(GLhandleARB program)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[545];
+   mapi_func _func = ((const mapi_func *) _tbl)[544];
    ((void (APIENTRY *)(GLhandleARB program)) _func)(program);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(LinkProgram)(GLuint program)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[545];
+   mapi_func _func = ((const mapi_func *) _tbl)[544];
    ((void (APIENTRY *)(GLuint program)) _func)(program);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ShaderSourceARB)(GLhandleARB shader, GLsizei count, const GLcharARB **string, const GLint *length)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[546];
+   mapi_func _func = ((const mapi_func *) _tbl)[545];
    ((void (APIENTRY *)(GLhandleARB shader, GLsizei count, const GLcharARB **string, const GLint *length)) _func)(shader, count, string, length);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ShaderSource)(GLuint shader, GLsizei count, const GLchar **string, const GLint *length)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[546];
+   mapi_func _func = ((const mapi_func *) _tbl)[545];
    ((void (APIENTRY *)(GLuint shader, GLsizei count, const GLchar **string, const GLint *length)) _func)(shader, count, string, length);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform1fARB)(GLint location, GLfloat v0)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[547];
+   mapi_func _func = ((const mapi_func *) _tbl)[546];
    ((void (APIENTRY *)(GLint location, GLfloat v0)) _func)(location, v0);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform1f)(GLint location, GLfloat v0)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[547];
+   mapi_func _func = ((const mapi_func *) _tbl)[546];
    ((void (APIENTRY *)(GLint location, GLfloat v0)) _func)(location, v0);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform1fvARB)(GLint location, GLsizei count, const GLfloat *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[548];
+   mapi_func _func = ((const mapi_func *) _tbl)[547];
    ((void (APIENTRY *)(GLint location, GLsizei count, const GLfloat *value)) _func)(location, count, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform1fv)(GLint location, GLsizei count, const GLfloat *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[548];
+   mapi_func _func = ((const mapi_func *) _tbl)[547];
    ((void (APIENTRY *)(GLint location, GLsizei count, const GLfloat *value)) _func)(location, count, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform1iARB)(GLint location, GLint v0)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[549];
+   mapi_func _func = ((const mapi_func *) _tbl)[548];
    ((void (APIENTRY *)(GLint location, GLint v0)) _func)(location, v0);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform1i)(GLint location, GLint v0)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[549];
+   mapi_func _func = ((const mapi_func *) _tbl)[548];
    ((void (APIENTRY *)(GLint location, GLint v0)) _func)(location, v0);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform1ivARB)(GLint location, GLsizei count, const GLint *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[550];
+   mapi_func _func = ((const mapi_func *) _tbl)[549];
    ((void (APIENTRY *)(GLint location, GLsizei count, const GLint *value)) _func)(location, count, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform1iv)(GLint location, GLsizei count, const GLint *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[550];
+   mapi_func _func = ((const mapi_func *) _tbl)[549];
    ((void (APIENTRY *)(GLint location, GLsizei count, const GLint *value)) _func)(location, count, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform2fARB)(GLint location, GLfloat v0, GLfloat v1)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[551];
+   mapi_func _func = ((const mapi_func *) _tbl)[550];
    ((void (APIENTRY *)(GLint location, GLfloat v0, GLfloat v1)) _func)(location, v0, v1);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform2f)(GLint location, GLfloat v0, GLfloat v1)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[551];
+   mapi_func _func = ((const mapi_func *) _tbl)[550];
    ((void (APIENTRY *)(GLint location, GLfloat v0, GLfloat v1)) _func)(location, v0, v1);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform2fvARB)(GLint location, GLsizei count, const GLfloat *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[552];
+   mapi_func _func = ((const mapi_func *) _tbl)[551];
    ((void (APIENTRY *)(GLint location, GLsizei count, const GLfloat *value)) _func)(location, count, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform2fv)(GLint location, GLsizei count, const GLfloat *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[552];
+   mapi_func _func = ((const mapi_func *) _tbl)[551];
    ((void (APIENTRY *)(GLint location, GLsizei count, const GLfloat *value)) _func)(location, count, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform2iARB)(GLint location, GLint v0, GLint v1)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[553];
+   mapi_func _func = ((const mapi_func *) _tbl)[552];
    ((void (APIENTRY *)(GLint location, GLint v0, GLint v1)) _func)(location, v0, v1);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform2i)(GLint location, GLint v0, GLint v1)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[553];
+   mapi_func _func = ((const mapi_func *) _tbl)[552];
    ((void (APIENTRY *)(GLint location, GLint v0, GLint v1)) _func)(location, v0, v1);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform2ivARB)(GLint location, GLsizei count, const GLint *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[554];
+   mapi_func _func = ((const mapi_func *) _tbl)[553];
    ((void (APIENTRY *)(GLint location, GLsizei count, const GLint *value)) _func)(location, count, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform2iv)(GLint location, GLsizei count, const GLint *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[554];
+   mapi_func _func = ((const mapi_func *) _tbl)[553];
    ((void (APIENTRY *)(GLint location, GLsizei count, const GLint *value)) _func)(location, count, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform3fARB)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[555];
+   mapi_func _func = ((const mapi_func *) _tbl)[554];
    ((void (APIENTRY *)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2)) _func)(location, v0, v1, v2);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform3f)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[555];
+   mapi_func _func = ((const mapi_func *) _tbl)[554];
    ((void (APIENTRY *)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2)) _func)(location, v0, v1, v2);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform3fvARB)(GLint location, GLsizei count, const GLfloat *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[556];
+   mapi_func _func = ((const mapi_func *) _tbl)[555];
    ((void (APIENTRY *)(GLint location, GLsizei count, const GLfloat *value)) _func)(location, count, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform3fv)(GLint location, GLsizei count, const GLfloat *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[556];
+   mapi_func _func = ((const mapi_func *) _tbl)[555];
    ((void (APIENTRY *)(GLint location, GLsizei count, const GLfloat *value)) _func)(location, count, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform3iARB)(GLint location, GLint v0, GLint v1, GLint v2)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[557];
+   mapi_func _func = ((const mapi_func *) _tbl)[556];
    ((void (APIENTRY *)(GLint location, GLint v0, GLint v1, GLint v2)) _func)(location, v0, v1, v2);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform3i)(GLint location, GLint v0, GLint v1, GLint v2)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[557];
+   mapi_func _func = ((const mapi_func *) _tbl)[556];
    ((void (APIENTRY *)(GLint location, GLint v0, GLint v1, GLint v2)) _func)(location, v0, v1, v2);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform3ivARB)(GLint location, GLsizei count, const GLint *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[558];
+   mapi_func _func = ((const mapi_func *) _tbl)[557];
    ((void (APIENTRY *)(GLint location, GLsizei count, const GLint *value)) _func)(location, count, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform3iv)(GLint location, GLsizei count, const GLint *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[558];
+   mapi_func _func = ((const mapi_func *) _tbl)[557];
    ((void (APIENTRY *)(GLint location, GLsizei count, const GLint *value)) _func)(location, count, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform4fARB)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[559];
+   mapi_func _func = ((const mapi_func *) _tbl)[558];
    ((void (APIENTRY *)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3)) _func)(location, v0, v1, v2, v3);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform4f)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[559];
+   mapi_func _func = ((const mapi_func *) _tbl)[558];
    ((void (APIENTRY *)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3)) _func)(location, v0, v1, v2, v3);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform4fvARB)(GLint location, GLsizei count, const GLfloat *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[560];
+   mapi_func _func = ((const mapi_func *) _tbl)[559];
    ((void (APIENTRY *)(GLint location, GLsizei count, const GLfloat *value)) _func)(location, count, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform4fv)(GLint location, GLsizei count, const GLfloat *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[560];
+   mapi_func _func = ((const mapi_func *) _tbl)[559];
    ((void (APIENTRY *)(GLint location, GLsizei count, const GLfloat *value)) _func)(location, count, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform4iARB)(GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[561];
+   mapi_func _func = ((const mapi_func *) _tbl)[560];
    ((void (APIENTRY *)(GLint location, GLint v0, GLint v1, GLint v2, GLint v3)) _func)(location, v0, v1, v2, v3);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform4i)(GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[561];
+   mapi_func _func = ((const mapi_func *) _tbl)[560];
    ((void (APIENTRY *)(GLint location, GLint v0, GLint v1, GLint v2, GLint v3)) _func)(location, v0, v1, v2, v3);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform4ivARB)(GLint location, GLsizei count, const GLint *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[562];
+   mapi_func _func = ((const mapi_func *) _tbl)[561];
    ((void (APIENTRY *)(GLint location, GLsizei count, const GLint *value)) _func)(location, count, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform4iv)(GLint location, GLsizei count, const GLint *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[562];
+   mapi_func _func = ((const mapi_func *) _tbl)[561];
    ((void (APIENTRY *)(GLint location, GLsizei count, const GLint *value)) _func)(location, count, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(UniformMatrix2fvARB)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[563];
+   mapi_func _func = ((const mapi_func *) _tbl)[562];
    ((void (APIENTRY *)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)) _func)(location, count, transpose, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(UniformMatrix2fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[563];
+   mapi_func _func = ((const mapi_func *) _tbl)[562];
    ((void (APIENTRY *)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)) _func)(location, count, transpose, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(UniformMatrix3fvARB)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[564];
+   mapi_func _func = ((const mapi_func *) _tbl)[563];
    ((void (APIENTRY *)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)) _func)(location, count, transpose, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(UniformMatrix3fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[564];
+   mapi_func _func = ((const mapi_func *) _tbl)[563];
    ((void (APIENTRY *)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)) _func)(location, count, transpose, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(UniformMatrix4fvARB)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[565];
+   mapi_func _func = ((const mapi_func *) _tbl)[564];
    ((void (APIENTRY *)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)) _func)(location, count, transpose, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(UniformMatrix4fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[565];
+   mapi_func _func = ((const mapi_func *) _tbl)[564];
    ((void (APIENTRY *)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value)) _func)(location, count, transpose, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(UseProgramObjectARB)(GLhandleARB program)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[566];
+   mapi_func _func = ((const mapi_func *) _tbl)[565];
    ((void (APIENTRY *)(GLhandleARB program)) _func)(program);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(UseProgram)(GLuint program)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[566];
+   mapi_func _func = ((const mapi_func *) _tbl)[565];
    ((void (APIENTRY *)(GLuint program)) _func)(program);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ValidateProgramARB)(GLhandleARB program)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[567];
+   mapi_func _func = ((const mapi_func *) _tbl)[566];
    ((void (APIENTRY *)(GLhandleARB program)) _func)(program);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ValidateProgram)(GLuint program)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[567];
+   mapi_func _func = ((const mapi_func *) _tbl)[566];
    ((void (APIENTRY *)(GLuint program)) _func)(program);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindAttribLocationARB)(GLhandleARB program, GLuint index, const GLcharARB *name)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[568];
+   mapi_func _func = ((const mapi_func *) _tbl)[567];
    ((void (APIENTRY *)(GLhandleARB program, GLuint index, const GLcharARB *name)) _func)(program, index, name);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindAttribLocation)(GLuint program, GLuint index, const GLchar *name)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[568];
+   mapi_func _func = ((const mapi_func *) _tbl)[567];
    ((void (APIENTRY *)(GLuint program, GLuint index, const GLchar *name)) _func)(program, index, name);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetActiveAttribARB)(GLhandleARB program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[569];
+   mapi_func _func = ((const mapi_func *) _tbl)[568];
    ((void (APIENTRY *)(GLhandleARB program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name)) _func)(program, index, bufSize, length, size, type, name);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetActiveAttrib)(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[569];
+   mapi_func _func = ((const mapi_func *) _tbl)[568];
    ((void (APIENTRY *)(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name)) _func)(program, index, bufSize, length, size, type, name);
 }
 
 GLAPI GLint APIENTRY GLAPI_PREFIX(GetAttribLocationARB)(GLhandleARB program, const GLcharARB *name)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[570];
+   mapi_func _func = ((const mapi_func *) _tbl)[569];
    return ((GLint (APIENTRY *)(GLhandleARB program, const GLcharARB *name)) _func)(program, name);
 }
 
 GLAPI GLint APIENTRY GLAPI_PREFIX(GetAttribLocation)(GLuint program, const GLchar *name)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[570];
+   mapi_func _func = ((const mapi_func *) _tbl)[569];
    return ((GLint (APIENTRY *)(GLuint program, const GLchar *name)) _func)(program, name);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DrawBuffersARB)(GLsizei n, const GLenum *bufs)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[571];
+   mapi_func _func = ((const mapi_func *) _tbl)[570];
    ((void (APIENTRY *)(GLsizei n, const GLenum *bufs)) _func)(n, bufs);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DrawBuffers)(GLsizei n, const GLenum *bufs)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[571];
+   mapi_func _func = ((const mapi_func *) _tbl)[570];
    ((void (APIENTRY *)(GLsizei n, const GLenum *bufs)) _func)(n, bufs);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DrawBuffersATI)(GLsizei n, const GLenum *bufs)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[571];
+   mapi_func _func = ((const mapi_func *) _tbl)[570];
    ((void (APIENTRY *)(GLsizei n, const GLenum *bufs)) _func)(n, bufs);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DrawBuffersNV)(GLsizei n, const GLenum *bufs)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[571];
+   mapi_func _func = ((const mapi_func *) _tbl)[570];
    ((void (APIENTRY *)(GLsizei n, const GLenum *bufs)) _func)(n, bufs);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ClampColorARB)(GLenum target, GLenum clamp)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[572];
+   mapi_func _func = ((const mapi_func *) _tbl)[571];
    ((void (APIENTRY *)(GLenum target, GLenum clamp)) _func)(target, clamp);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DrawArraysInstancedARB)(GLenum mode, GLint first, GLsizei count, GLsizei primcount)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[573];
+   mapi_func _func = ((const mapi_func *) _tbl)[572];
    ((void (APIENTRY *)(GLenum mode, GLint first, GLsizei count, GLsizei primcount)) _func)(mode, first, count, primcount);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DrawArraysInstanced)(GLenum mode, GLint first, GLsizei count, GLsizei primcount)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[573];
+   mapi_func _func = ((const mapi_func *) _tbl)[572];
    ((void (APIENTRY *)(GLenum mode, GLint first, GLsizei count, GLsizei primcount)) _func)(mode, first, count, primcount);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DrawArraysInstancedEXT)(GLenum mode, GLint first, GLsizei count, GLsizei primcount)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[573];
+   mapi_func _func = ((const mapi_func *) _tbl)[572];
    ((void (APIENTRY *)(GLenum mode, GLint first, GLsizei count, GLsizei primcount)) _func)(mode, first, count, primcount);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DrawElementsInstancedARB)(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[574];
+   mapi_func _func = ((const mapi_func *) _tbl)[573];
    ((void (APIENTRY *)(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount)) _func)(mode, count, type, indices, primcount);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DrawElementsInstanced)(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[574];
+   mapi_func _func = ((const mapi_func *) _tbl)[573];
    ((void (APIENTRY *)(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount)) _func)(mode, count, type, indices, primcount);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DrawElementsInstancedEXT)(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[574];
+   mapi_func _func = ((const mapi_func *) _tbl)[573];
    ((void (APIENTRY *)(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount)) _func)(mode, count, type, indices, primcount);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(RenderbufferStorageMultisample)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[575];
+   mapi_func _func = ((const mapi_func *) _tbl)[574];
    ((void (APIENTRY *)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height)) _func)(target, samples, internalformat, width, height);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(RenderbufferStorageMultisampleEXT)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[575];
+   mapi_func _func = ((const mapi_func *) _tbl)[574];
    ((void (APIENTRY *)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height)) _func)(target, samples, internalformat, width, height);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FramebufferTextureARB)(GLenum target, GLenum attachment, GLuint texture, GLint level)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[576];
+   mapi_func _func = ((const mapi_func *) _tbl)[575];
    ((void (APIENTRY *)(GLenum target, GLenum attachment, GLuint texture, GLint level)) _func)(target, attachment, texture, level);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FramebufferTextureFaceARB)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[577];
+   mapi_func _func = ((const mapi_func *) _tbl)[576];
    ((void (APIENTRY *)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face)) _func)(target, attachment, texture, level, face);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ProgramParameteriARB)(GLuint program, GLenum pname, GLint value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[578];
+   mapi_func _func = ((const mapi_func *) _tbl)[577];
    ((void (APIENTRY *)(GLuint program, GLenum pname, GLint value)) _func)(program, pname, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribDivisorARB)(GLuint index, GLuint divisor)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[579];
+   mapi_func _func = ((const mapi_func *) _tbl)[578];
    ((void (APIENTRY *)(GLuint index, GLuint divisor)) _func)(index, divisor);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FlushMappedBufferRange)(GLenum target, GLintptr offset, GLsizeiptr length)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[580];
+   mapi_func _func = ((const mapi_func *) _tbl)[579];
    ((void (APIENTRY *)(GLenum target, GLintptr offset, GLsizeiptr length)) _func)(target, offset, length);
 }
 
 GLAPI GLvoid * APIENTRY GLAPI_PREFIX(MapBufferRange)(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[581];
+   mapi_func _func = ((const mapi_func *) _tbl)[580];
    return ((GLvoid * (APIENTRY *)(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access)) _func)(target, offset, length, access);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TexBufferARB)(GLenum target, GLenum internalFormat, GLuint buffer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[582];
+   mapi_func _func = ((const mapi_func *) _tbl)[581];
+   ((void (APIENTRY *)(GLenum target, GLenum internalFormat, GLuint buffer)) _func)(target, internalFormat, buffer);
+}
+
+GLAPI void APIENTRY GLAPI_PREFIX(TexBuffer)(GLenum target, GLenum internalFormat, GLuint buffer)
+{
+   const struct mapi_table *_tbl = entry_current_get();
+   mapi_func _func = ((const mapi_func *) _tbl)[581];
    ((void (APIENTRY *)(GLenum target, GLenum internalFormat, GLuint buffer)) _func)(target, internalFormat, buffer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindVertexArray)(GLuint array)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[583];
+   mapi_func _func = ((const mapi_func *) _tbl)[582];
    ((void (APIENTRY *)(GLuint array)) _func)(array);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GenVertexArrays)(GLsizei n, GLuint *arrays)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[584];
+   mapi_func _func = ((const mapi_func *) _tbl)[583];
    ((void (APIENTRY *)(GLsizei n, GLuint *arrays)) _func)(n, arrays);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(CopyBufferSubData)(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[585];
+   mapi_func _func = ((const mapi_func *) _tbl)[584];
    ((void (APIENTRY *)(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size)) _func)(readTarget, writeTarget, readOffset, writeOffset, size);
 }
 
 GLAPI GLenum APIENTRY GLAPI_PREFIX(ClientWaitSync)(GLsync sync, GLbitfield flags, GLuint64 timeout)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[586];
+   mapi_func _func = ((const mapi_func *) _tbl)[585];
    return ((GLenum (APIENTRY *)(GLsync sync, GLbitfield flags, GLuint64 timeout)) _func)(sync, flags, timeout);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DeleteSync)(GLsync sync)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[587];
+   mapi_func _func = ((const mapi_func *) _tbl)[586];
    ((void (APIENTRY *)(GLsync sync)) _func)(sync);
 }
 
 GLAPI GLsync APIENTRY GLAPI_PREFIX(FenceSync)(GLenum condition, GLbitfield flags)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[588];
+   mapi_func _func = ((const mapi_func *) _tbl)[587];
    return ((GLsync (APIENTRY *)(GLenum condition, GLbitfield flags)) _func)(condition, flags);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetInteger64v)(GLenum pname, GLint64 *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[589];
+   mapi_func _func = ((const mapi_func *) _tbl)[588];
    ((void (APIENTRY *)(GLenum pname, GLint64 *params)) _func)(pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetSynciv)(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[590];
+   mapi_func _func = ((const mapi_func *) _tbl)[589];
    ((void (APIENTRY *)(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values)) _func)(sync, pname, bufSize, length, values);
 }
 
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(IsSync)(GLsync sync)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[591];
+   mapi_func _func = ((const mapi_func *) _tbl)[590];
    return ((GLboolean (APIENTRY *)(GLsync sync)) _func)(sync);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WaitSync)(GLsync sync, GLbitfield flags, GLuint64 timeout)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[592];
+   mapi_func _func = ((const mapi_func *) _tbl)[591];
    ((void (APIENTRY *)(GLsync sync, GLbitfield flags, GLuint64 timeout)) _func)(sync, flags, timeout);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DrawElementsBaseVertex)(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[593];
+   mapi_func _func = ((const mapi_func *) _tbl)[592];
    ((void (APIENTRY *)(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex)) _func)(mode, count, type, indices, basevertex);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DrawElementsInstancedBaseVertex)(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount, GLint basevertex)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[594];
+   mapi_func _func = ((const mapi_func *) _tbl)[593];
    ((void (APIENTRY *)(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount, GLint basevertex)) _func)(mode, count, type, indices, primcount, basevertex);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DrawRangeElementsBaseVertex)(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[595];
+   mapi_func _func = ((const mapi_func *) _tbl)[594];
    ((void (APIENTRY *)(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex)) _func)(mode, start, end, count, type, indices, basevertex);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(MultiDrawElementsBaseVertex)(GLenum mode, const GLsizei *count, GLenum type, const GLvoid **indices, GLsizei primcount, const GLint *basevertex)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[596];
+   mapi_func _func = ((const mapi_func *) _tbl)[595];
    ((void (APIENTRY *)(GLenum mode, const GLsizei *count, GLenum type, const GLvoid **indices, GLsizei primcount, const GLint *basevertex)) _func)(mode, count, type, indices, primcount, basevertex);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BlendEquationSeparateiARB)(GLuint buf, GLenum modeRGB, GLenum modeA)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[597];
+   mapi_func _func = ((const mapi_func *) _tbl)[596];
    ((void (APIENTRY *)(GLuint buf, GLenum modeRGB, GLenum modeA)) _func)(buf, modeRGB, modeA);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BlendEquationSeparateIndexedAMD)(GLuint buf, GLenum modeRGB, GLenum modeA)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[597];
+   mapi_func _func = ((const mapi_func *) _tbl)[596];
    ((void (APIENTRY *)(GLuint buf, GLenum modeRGB, GLenum modeA)) _func)(buf, modeRGB, modeA);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BlendEquationiARB)(GLuint buf, GLenum mode)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[598];
+   mapi_func _func = ((const mapi_func *) _tbl)[597];
    ((void (APIENTRY *)(GLuint buf, GLenum mode)) _func)(buf, mode);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BlendEquationIndexedAMD)(GLuint buf, GLenum mode)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[598];
+   mapi_func _func = ((const mapi_func *) _tbl)[597];
    ((void (APIENTRY *)(GLuint buf, GLenum mode)) _func)(buf, mode);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BlendFuncSeparateiARB)(GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcA, GLenum dstA)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[599];
+   mapi_func _func = ((const mapi_func *) _tbl)[598];
    ((void (APIENTRY *)(GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcA, GLenum dstA)) _func)(buf, srcRGB, dstRGB, srcA, dstA);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BlendFuncSeparateIndexedAMD)(GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcA, GLenum dstA)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[599];
+   mapi_func _func = ((const mapi_func *) _tbl)[598];
    ((void (APIENTRY *)(GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcA, GLenum dstA)) _func)(buf, srcRGB, dstRGB, srcA, dstA);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BlendFunciARB)(GLuint buf, GLenum src, GLenum dst)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[600];
+   mapi_func _func = ((const mapi_func *) _tbl)[599];
    ((void (APIENTRY *)(GLuint buf, GLenum src, GLenum dst)) _func)(buf, src, dst);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BlendFuncIndexedAMD)(GLuint buf, GLenum src, GLenum dst)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[600];
+   mapi_func _func = ((const mapi_func *) _tbl)[599];
    ((void (APIENTRY *)(GLuint buf, GLenum src, GLenum dst)) _func)(buf, src, dst);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindFragDataLocationIndexed)(GLuint program, GLuint colorNumber, GLuint index, const GLchar *name)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[601];
+   mapi_func _func = ((const mapi_func *) _tbl)[600];
    ((void (APIENTRY *)(GLuint program, GLuint colorNumber, GLuint index, const GLchar *name)) _func)(program, colorNumber, index, name);
 }
 
 GLAPI GLint APIENTRY GLAPI_PREFIX(GetFragDataIndex)(GLuint program, const GLchar *name)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[602];
+   mapi_func _func = ((const mapi_func *) _tbl)[601];
    return ((GLint (APIENTRY *)(GLuint program, const GLchar *name)) _func)(program, name);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindSampler)(GLuint unit, GLuint sampler)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[603];
+   mapi_func _func = ((const mapi_func *) _tbl)[602];
    ((void (APIENTRY *)(GLuint unit, GLuint sampler)) _func)(unit, sampler);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DeleteSamplers)(GLsizei count, const GLuint *samplers)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[604];
+   mapi_func _func = ((const mapi_func *) _tbl)[603];
    ((void (APIENTRY *)(GLsizei count, const GLuint *samplers)) _func)(count, samplers);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GenSamplers)(GLsizei count, GLuint *samplers)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[605];
+   mapi_func _func = ((const mapi_func *) _tbl)[604];
    ((void (APIENTRY *)(GLsizei count, GLuint *samplers)) _func)(count, samplers);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetSamplerParameterIiv)(GLuint sampler, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[606];
+   mapi_func _func = ((const mapi_func *) _tbl)[605];
    ((void (APIENTRY *)(GLuint sampler, GLenum pname, GLint *params)) _func)(sampler, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetSamplerParameterIuiv)(GLuint sampler, GLenum pname, GLuint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[607];
+   mapi_func _func = ((const mapi_func *) _tbl)[606];
    ((void (APIENTRY *)(GLuint sampler, GLenum pname, GLuint *params)) _func)(sampler, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetSamplerParameterfv)(GLuint sampler, GLenum pname, GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[608];
+   mapi_func _func = ((const mapi_func *) _tbl)[607];
    ((void (APIENTRY *)(GLuint sampler, GLenum pname, GLfloat *params)) _func)(sampler, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetSamplerParameteriv)(GLuint sampler, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[609];
+   mapi_func _func = ((const mapi_func *) _tbl)[608];
    ((void (APIENTRY *)(GLuint sampler, GLenum pname, GLint *params)) _func)(sampler, pname, params);
 }
 
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(IsSampler)(GLuint sampler)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[610];
+   mapi_func _func = ((const mapi_func *) _tbl)[609];
    return ((GLboolean (APIENTRY *)(GLuint sampler)) _func)(sampler);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SamplerParameterIiv)(GLuint sampler, GLenum pname, const GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[611];
+   mapi_func _func = ((const mapi_func *) _tbl)[610];
    ((void (APIENTRY *)(GLuint sampler, GLenum pname, const GLint *params)) _func)(sampler, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SamplerParameterIuiv)(GLuint sampler, GLenum pname, const GLuint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[612];
+   mapi_func _func = ((const mapi_func *) _tbl)[611];
    ((void (APIENTRY *)(GLuint sampler, GLenum pname, const GLuint *params)) _func)(sampler, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SamplerParameterf)(GLuint sampler, GLenum pname, GLfloat param)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[613];
+   mapi_func _func = ((const mapi_func *) _tbl)[612];
    ((void (APIENTRY *)(GLuint sampler, GLenum pname, GLfloat param)) _func)(sampler, pname, param);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SamplerParameterfv)(GLuint sampler, GLenum pname, const GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[614];
+   mapi_func _func = ((const mapi_func *) _tbl)[613];
    ((void (APIENTRY *)(GLuint sampler, GLenum pname, const GLfloat *params)) _func)(sampler, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SamplerParameteri)(GLuint sampler, GLenum pname, GLint param)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[615];
+   mapi_func _func = ((const mapi_func *) _tbl)[614];
    ((void (APIENTRY *)(GLuint sampler, GLenum pname, GLint param)) _func)(sampler, pname, param);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SamplerParameteriv)(GLuint sampler, GLenum pname, const GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[616];
+   mapi_func _func = ((const mapi_func *) _tbl)[615];
    ((void (APIENTRY *)(GLuint sampler, GLenum pname, const GLint *params)) _func)(sampler, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ColorP3ui)(GLenum type, GLuint color)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[617];
+   mapi_func _func = ((const mapi_func *) _tbl)[616];
    ((void (APIENTRY *)(GLenum type, GLuint color)) _func)(type, color);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ColorP3uiv)(GLenum type, const GLuint *color)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[618];
+   mapi_func _func = ((const mapi_func *) _tbl)[617];
    ((void (APIENTRY *)(GLenum type, const GLuint *color)) _func)(type, color);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ColorP4ui)(GLenum type, GLuint color)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[619];
+   mapi_func _func = ((const mapi_func *) _tbl)[618];
    ((void (APIENTRY *)(GLenum type, GLuint color)) _func)(type, color);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ColorP4uiv)(GLenum type, const GLuint *color)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[620];
+   mapi_func _func = ((const mapi_func *) _tbl)[619];
    ((void (APIENTRY *)(GLenum type, const GLuint *color)) _func)(type, color);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(MultiTexCoordP1ui)(GLenum texture, GLenum type, GLuint coords)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[621];
+   mapi_func _func = ((const mapi_func *) _tbl)[620];
    ((void (APIENTRY *)(GLenum texture, GLenum type, GLuint coords)) _func)(texture, type, coords);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(MultiTexCoordP1uiv)(GLenum texture, GLenum type, const GLuint *coords)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[622];
+   mapi_func _func = ((const mapi_func *) _tbl)[621];
    ((void (APIENTRY *)(GLenum texture, GLenum type, const GLuint *coords)) _func)(texture, type, coords);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(MultiTexCoordP2ui)(GLenum texture, GLenum type, GLuint coords)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[623];
+   mapi_func _func = ((const mapi_func *) _tbl)[622];
    ((void (APIENTRY *)(GLenum texture, GLenum type, GLuint coords)) _func)(texture, type, coords);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(MultiTexCoordP2uiv)(GLenum texture, GLenum type, const GLuint *coords)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[624];
+   mapi_func _func = ((const mapi_func *) _tbl)[623];
    ((void (APIENTRY *)(GLenum texture, GLenum type, const GLuint *coords)) _func)(texture, type, coords);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(MultiTexCoordP3ui)(GLenum texture, GLenum type, GLuint coords)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[625];
+   mapi_func _func = ((const mapi_func *) _tbl)[624];
    ((void (APIENTRY *)(GLenum texture, GLenum type, GLuint coords)) _func)(texture, type, coords);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(MultiTexCoordP3uiv)(GLenum texture, GLenum type, const GLuint *coords)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[626];
+   mapi_func _func = ((const mapi_func *) _tbl)[625];
    ((void (APIENTRY *)(GLenum texture, GLenum type, const GLuint *coords)) _func)(texture, type, coords);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(MultiTexCoordP4ui)(GLenum texture, GLenum type, GLuint coords)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[627];
+   mapi_func _func = ((const mapi_func *) _tbl)[626];
    ((void (APIENTRY *)(GLenum texture, GLenum type, GLuint coords)) _func)(texture, type, coords);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(MultiTexCoordP4uiv)(GLenum texture, GLenum type, const GLuint *coords)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[628];
+   mapi_func _func = ((const mapi_func *) _tbl)[627];
    ((void (APIENTRY *)(GLenum texture, GLenum type, const GLuint *coords)) _func)(texture, type, coords);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(NormalP3ui)(GLenum type, GLuint coords)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[629];
+   mapi_func _func = ((const mapi_func *) _tbl)[628];
    ((void (APIENTRY *)(GLenum type, GLuint coords)) _func)(type, coords);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(NormalP3uiv)(GLenum type, const GLuint *coords)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[630];
+   mapi_func _func = ((const mapi_func *) _tbl)[629];
    ((void (APIENTRY *)(GLenum type, const GLuint *coords)) _func)(type, coords);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColorP3ui)(GLenum type, GLuint color)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[631];
+   mapi_func _func = ((const mapi_func *) _tbl)[630];
    ((void (APIENTRY *)(GLenum type, GLuint color)) _func)(type, color);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColorP3uiv)(GLenum type, const GLuint *color)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[632];
+   mapi_func _func = ((const mapi_func *) _tbl)[631];
    ((void (APIENTRY *)(GLenum type, const GLuint *color)) _func)(type, color);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TexCoordP1ui)(GLenum type, GLuint coords)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[633];
+   mapi_func _func = ((const mapi_func *) _tbl)[632];
    ((void (APIENTRY *)(GLenum type, GLuint coords)) _func)(type, coords);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TexCoordP1uiv)(GLenum type, const GLuint *coords)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[634];
+   mapi_func _func = ((const mapi_func *) _tbl)[633];
    ((void (APIENTRY *)(GLenum type, const GLuint *coords)) _func)(type, coords);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TexCoordP2ui)(GLenum type, GLuint coords)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[635];
+   mapi_func _func = ((const mapi_func *) _tbl)[634];
    ((void (APIENTRY *)(GLenum type, GLuint coords)) _func)(type, coords);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TexCoordP2uiv)(GLenum type, const GLuint *coords)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[636];
+   mapi_func _func = ((const mapi_func *) _tbl)[635];
    ((void (APIENTRY *)(GLenum type, const GLuint *coords)) _func)(type, coords);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TexCoordP3ui)(GLenum type, GLuint coords)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[637];
+   mapi_func _func = ((const mapi_func *) _tbl)[636];
    ((void (APIENTRY *)(GLenum type, GLuint coords)) _func)(type, coords);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TexCoordP3uiv)(GLenum type, const GLuint *coords)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[638];
+   mapi_func _func = ((const mapi_func *) _tbl)[637];
    ((void (APIENTRY *)(GLenum type, const GLuint *coords)) _func)(type, coords);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TexCoordP4ui)(GLenum type, GLuint coords)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[639];
+   mapi_func _func = ((const mapi_func *) _tbl)[638];
    ((void (APIENTRY *)(GLenum type, GLuint coords)) _func)(type, coords);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TexCoordP4uiv)(GLenum type, const GLuint *coords)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[640];
+   mapi_func _func = ((const mapi_func *) _tbl)[639];
    ((void (APIENTRY *)(GLenum type, const GLuint *coords)) _func)(type, coords);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribP1ui)(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[641];
+   mapi_func _func = ((const mapi_func *) _tbl)[640];
    ((void (APIENTRY *)(GLuint index, GLenum type, GLboolean normalized, GLuint value)) _func)(index, type, normalized, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribP1uiv)(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[642];
+   mapi_func _func = ((const mapi_func *) _tbl)[641];
    ((void (APIENTRY *)(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)) _func)(index, type, normalized, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribP2ui)(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[643];
+   mapi_func _func = ((const mapi_func *) _tbl)[642];
    ((void (APIENTRY *)(GLuint index, GLenum type, GLboolean normalized, GLuint value)) _func)(index, type, normalized, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribP2uiv)(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[644];
+   mapi_func _func = ((const mapi_func *) _tbl)[643];
    ((void (APIENTRY *)(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)) _func)(index, type, normalized, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribP3ui)(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[645];
+   mapi_func _func = ((const mapi_func *) _tbl)[644];
    ((void (APIENTRY *)(GLuint index, GLenum type, GLboolean normalized, GLuint value)) _func)(index, type, normalized, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribP3uiv)(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[646];
+   mapi_func _func = ((const mapi_func *) _tbl)[645];
    ((void (APIENTRY *)(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)) _func)(index, type, normalized, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribP4ui)(GLuint index, GLenum type, GLboolean normalized, GLuint value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[647];
+   mapi_func _func = ((const mapi_func *) _tbl)[646];
    ((void (APIENTRY *)(GLuint index, GLenum type, GLboolean normalized, GLuint value)) _func)(index, type, normalized, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribP4uiv)(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[648];
+   mapi_func _func = ((const mapi_func *) _tbl)[647];
    ((void (APIENTRY *)(GLuint index, GLenum type, GLboolean normalized, const GLuint *value)) _func)(index, type, normalized, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexP2ui)(GLenum type, GLuint value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[649];
+   mapi_func _func = ((const mapi_func *) _tbl)[648];
    ((void (APIENTRY *)(GLenum type, GLuint value)) _func)(type, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexP2uiv)(GLenum type, const GLuint *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[650];
+   mapi_func _func = ((const mapi_func *) _tbl)[649];
    ((void (APIENTRY *)(GLenum type, const GLuint *value)) _func)(type, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexP3ui)(GLenum type, GLuint value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[651];
+   mapi_func _func = ((const mapi_func *) _tbl)[650];
    ((void (APIENTRY *)(GLenum type, GLuint value)) _func)(type, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexP3uiv)(GLenum type, const GLuint *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[652];
+   mapi_func _func = ((const mapi_func *) _tbl)[651];
    ((void (APIENTRY *)(GLenum type, const GLuint *value)) _func)(type, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexP4ui)(GLenum type, GLuint value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[653];
+   mapi_func _func = ((const mapi_func *) _tbl)[652];
    ((void (APIENTRY *)(GLenum type, GLuint value)) _func)(type, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexP4uiv)(GLenum type, const GLuint *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[654];
+   mapi_func _func = ((const mapi_func *) _tbl)[653];
    ((void (APIENTRY *)(GLenum type, const GLuint *value)) _func)(type, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindTransformFeedback)(GLenum target, GLuint id)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[655];
+   mapi_func _func = ((const mapi_func *) _tbl)[654];
    ((void (APIENTRY *)(GLenum target, GLuint id)) _func)(target, id);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DeleteTransformFeedbacks)(GLsizei n, const GLuint *ids)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[656];
+   mapi_func _func = ((const mapi_func *) _tbl)[655];
    ((void (APIENTRY *)(GLsizei n, const GLuint *ids)) _func)(n, ids);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DrawTransformFeedback)(GLenum mode, GLuint id)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[657];
+   mapi_func _func = ((const mapi_func *) _tbl)[656];
    ((void (APIENTRY *)(GLenum mode, GLuint id)) _func)(mode, id);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GenTransformFeedbacks)(GLsizei n, GLuint *ids)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[658];
+   mapi_func _func = ((const mapi_func *) _tbl)[657];
    ((void (APIENTRY *)(GLsizei n, GLuint *ids)) _func)(n, ids);
 }
 
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(IsTransformFeedback)(GLuint id)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[659];
+   mapi_func _func = ((const mapi_func *) _tbl)[658];
    return ((GLboolean (APIENTRY *)(GLuint id)) _func)(id);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(PauseTransformFeedback)(void)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[660];
+   mapi_func _func = ((const mapi_func *) _tbl)[659];
    ((void (APIENTRY *)(void)) _func)();
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ResumeTransformFeedback)(void)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[661];
+   mapi_func _func = ((const mapi_func *) _tbl)[660];
    ((void (APIENTRY *)(void)) _func)();
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ClearDepthf)(GLclampf depth)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[662];
+   mapi_func _func = ((const mapi_func *) _tbl)[661];
    ((void (APIENTRY *)(GLclampf depth)) _func)(depth);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DepthRangef)(GLclampf zNear, GLclampf zFar)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[663];
+   mapi_func _func = ((const mapi_func *) _tbl)[662];
    ((void (APIENTRY *)(GLclampf zNear, GLclampf zFar)) _func)(zNear, zFar);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetShaderPrecisionFormat)(GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[664];
+   mapi_func _func = ((const mapi_func *) _tbl)[663];
    ((void (APIENTRY *)(GLenum shadertype, GLenum precisiontype, GLint *range, GLint *precision)) _func)(shadertype, precisiontype, range, precision);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ReleaseShaderCompiler)(void)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[665];
+   mapi_func _func = ((const mapi_func *) _tbl)[664];
    ((void (APIENTRY *)(void)) _func)();
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ShaderBinary)(GLsizei n, const GLuint *shaders, GLenum binaryformat, const GLvoid *binary, GLsizei length)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[666];
+   mapi_func _func = ((const mapi_func *) _tbl)[665];
    ((void (APIENTRY *)(GLsizei n, const GLuint *shaders, GLenum binaryformat, const GLvoid *binary, GLsizei length)) _func)(n, shaders, binaryformat, binary, length);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DebugMessageCallbackARB)(GLDEBUGPROCARB callback, GLvoid *userParam)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[670];
+   mapi_func _func = ((const mapi_func *) _tbl)[669];
    ((void (APIENTRY *)(GLDEBUGPROCARB callback, GLvoid *userParam)) _func)(callback, userParam);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DebugMessageControlARB)(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[671];
+   mapi_func _func = ((const mapi_func *) _tbl)[670];
    ((void (APIENTRY *)(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled)) _func)(source, type, severity, count, ids, enabled);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DebugMessageInsertARB)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLcharARB *buf)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[672];
+   mapi_func _func = ((const mapi_func *) _tbl)[671];
    ((void (APIENTRY *)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLcharARB *buf)) _func)(source, type, id, severity, length, buf);
 }
 
 GLAPI GLuint APIENTRY GLAPI_PREFIX(GetDebugMessageLogARB)(GLuint count, GLsizei bufsize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLcharARB *messageLog)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[673];
+   mapi_func _func = ((const mapi_func *) _tbl)[672];
    return ((GLuint (APIENTRY *)(GLuint count, GLsizei bufsize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLcharARB *messageLog)) _func)(count, bufsize, sources, types, ids, severities, lengths, messageLog);
 }
 
 GLAPI GLenum APIENTRY GLAPI_PREFIX(GetGraphicsResetStatusARB)(void)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[674];
+   mapi_func _func = ((const mapi_func *) _tbl)[673];
    return ((GLenum (APIENTRY *)(void)) _func)();
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetnColorTableARB)(GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid *table)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[675];
+   mapi_func _func = ((const mapi_func *) _tbl)[674];
    ((void (APIENTRY *)(GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid *table)) _func)(target, format, type, bufSize, table);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetnCompressedTexImageARB)(GLenum target, GLint lod, GLsizei bufSize, GLvoid *img)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[676];
+   mapi_func _func = ((const mapi_func *) _tbl)[675];
    ((void (APIENTRY *)(GLenum target, GLint lod, GLsizei bufSize, GLvoid *img)) _func)(target, lod, bufSize, img);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetnConvolutionFilterARB)(GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid *image)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[677];
+   mapi_func _func = ((const mapi_func *) _tbl)[676];
    ((void (APIENTRY *)(GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid *image)) _func)(target, format, type, bufSize, image);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetnHistogramARB)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid *values)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[678];
+   mapi_func _func = ((const mapi_func *) _tbl)[677];
    ((void (APIENTRY *)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid *values)) _func)(target, reset, format, type, bufSize, values);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetnMapdvARB)(GLenum target, GLenum query, GLsizei bufSize, GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[679];
+   mapi_func _func = ((const mapi_func *) _tbl)[678];
    ((void (APIENTRY *)(GLenum target, GLenum query, GLsizei bufSize, GLdouble *v)) _func)(target, query, bufSize, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetnMapfvARB)(GLenum target, GLenum query, GLsizei bufSize, GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[680];
+   mapi_func _func = ((const mapi_func *) _tbl)[679];
    ((void (APIENTRY *)(GLenum target, GLenum query, GLsizei bufSize, GLfloat *v)) _func)(target, query, bufSize, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetnMapivARB)(GLenum target, GLenum query, GLsizei bufSize, GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[681];
+   mapi_func _func = ((const mapi_func *) _tbl)[680];
    ((void (APIENTRY *)(GLenum target, GLenum query, GLsizei bufSize, GLint *v)) _func)(target, query, bufSize, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetnMinmaxARB)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid *values)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[682];
+   mapi_func _func = ((const mapi_func *) _tbl)[681];
    ((void (APIENTRY *)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid *values)) _func)(target, reset, format, type, bufSize, values);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetnPixelMapfvARB)(GLenum map, GLsizei bufSize, GLfloat *values)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[683];
+   mapi_func _func = ((const mapi_func *) _tbl)[682];
    ((void (APIENTRY *)(GLenum map, GLsizei bufSize, GLfloat *values)) _func)(map, bufSize, values);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetnPixelMapuivARB)(GLenum map, GLsizei bufSize, GLuint *values)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[684];
+   mapi_func _func = ((const mapi_func *) _tbl)[683];
    ((void (APIENTRY *)(GLenum map, GLsizei bufSize, GLuint *values)) _func)(map, bufSize, values);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetnPixelMapusvARB)(GLenum map, GLsizei bufSize, GLushort *values)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[685];
+   mapi_func _func = ((const mapi_func *) _tbl)[684];
    ((void (APIENTRY *)(GLenum map, GLsizei bufSize, GLushort *values)) _func)(map, bufSize, values);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetnPolygonStippleARB)(GLsizei bufSize, GLubyte *pattern)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[686];
+   mapi_func _func = ((const mapi_func *) _tbl)[685];
    ((void (APIENTRY *)(GLsizei bufSize, GLubyte *pattern)) _func)(bufSize, pattern);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetnSeparableFilterARB)(GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, GLvoid *row, GLsizei columnBufSize, GLvoid *column, GLvoid *span)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[687];
+   mapi_func _func = ((const mapi_func *) _tbl)[686];
    ((void (APIENTRY *)(GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, GLvoid *row, GLsizei columnBufSize, GLvoid *column, GLvoid *span)) _func)(target, format, type, rowBufSize, row, columnBufSize, column, span);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetnTexImageARB)(GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, GLvoid *img)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[688];
+   mapi_func _func = ((const mapi_func *) _tbl)[687];
    ((void (APIENTRY *)(GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, GLvoid *img)) _func)(target, level, format, type, bufSize, img);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetnUniformdvARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLdouble *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[689];
+   mapi_func _func = ((const mapi_func *) _tbl)[688];
    ((void (APIENTRY *)(GLhandleARB program, GLint location, GLsizei bufSize, GLdouble *params)) _func)(program, location, bufSize, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetnUniformfvARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[690];
+   mapi_func _func = ((const mapi_func *) _tbl)[689];
    ((void (APIENTRY *)(GLhandleARB program, GLint location, GLsizei bufSize, GLfloat *params)) _func)(program, location, bufSize, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetnUniformivARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[691];
+   mapi_func _func = ((const mapi_func *) _tbl)[690];
    ((void (APIENTRY *)(GLhandleARB program, GLint location, GLsizei bufSize, GLint *params)) _func)(program, location, bufSize, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetnUniformuivARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLuint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[692];
+   mapi_func _func = ((const mapi_func *) _tbl)[691];
    ((void (APIENTRY *)(GLhandleARB program, GLint location, GLsizei bufSize, GLuint *params)) _func)(program, location, bufSize, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ReadnPixelsARB)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, GLvoid *data)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[693];
+   mapi_func _func = ((const mapi_func *) _tbl)[692];
    ((void (APIENTRY *)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, GLvoid *data)) _func)(x, y, width, height, format, type, bufSize, data);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TexStorage1D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[694];
+   mapi_func _func = ((const mapi_func *) _tbl)[693];
    ((void (APIENTRY *)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width)) _func)(target, levels, internalFormat, width);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TexStorage2D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[695];
+   mapi_func _func = ((const mapi_func *) _tbl)[694];
    ((void (APIENTRY *)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height)) _func)(target, levels, internalFormat, width, height);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TexStorage3D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[696];
+   mapi_func _func = ((const mapi_func *) _tbl)[695];
    ((void (APIENTRY *)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth)) _func)(target, levels, internalFormat, width, height, depth);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TextureStorage1DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[697];
+   mapi_func _func = ((const mapi_func *) _tbl)[696];
    ((void (APIENTRY *)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width)) _func)(texture, target, levels, internalFormat, width);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TextureStorage2DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[698];
+   mapi_func _func = ((const mapi_func *) _tbl)[697];
    ((void (APIENTRY *)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height)) _func)(texture, target, levels, internalFormat, width, height);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TextureStorage3DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[699];
+   mapi_func _func = ((const mapi_func *) _tbl)[698];
    ((void (APIENTRY *)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth)) _func)(texture, target, levels, internalFormat, width, height, depth);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(PolygonOffsetEXT)(GLfloat factor, GLfloat bias)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[700];
+   mapi_func _func = ((const mapi_func *) _tbl)[699];
    ((void (APIENTRY *)(GLfloat factor, GLfloat bias)) _func)(factor, bias);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ColorPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[719];
+   mapi_func _func = ((const mapi_func *) _tbl)[718];
    ((void (APIENTRY *)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer)) _func)(size, type, stride, count, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(EdgeFlagPointerEXT)(GLsizei stride, GLsizei count, const GLboolean *pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[720];
+   mapi_func _func = ((const mapi_func *) _tbl)[719];
    ((void (APIENTRY *)(GLsizei stride, GLsizei count, const GLboolean *pointer)) _func)(stride, count, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(IndexPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[721];
+   mapi_func _func = ((const mapi_func *) _tbl)[720];
    ((void (APIENTRY *)(GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer)) _func)(type, stride, count, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(NormalPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[722];
+   mapi_func _func = ((const mapi_func *) _tbl)[721];
    ((void (APIENTRY *)(GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer)) _func)(type, stride, count, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TexCoordPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[723];
+   mapi_func _func = ((const mapi_func *) _tbl)[722];
    ((void (APIENTRY *)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer)) _func)(size, type, stride, count, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[724];
+   mapi_func _func = ((const mapi_func *) _tbl)[723];
    ((void (APIENTRY *)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer)) _func)(size, type, stride, count, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(PointParameterfEXT)(GLenum pname, GLfloat param)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[725];
+   mapi_func _func = ((const mapi_func *) _tbl)[724];
    ((void (APIENTRY *)(GLenum pname, GLfloat param)) _func)(pname, param);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(PointParameterf)(GLenum pname, GLfloat param)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[725];
+   mapi_func _func = ((const mapi_func *) _tbl)[724];
    ((void (APIENTRY *)(GLenum pname, GLfloat param)) _func)(pname, param);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(PointParameterfARB)(GLenum pname, GLfloat param)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[725];
+   mapi_func _func = ((const mapi_func *) _tbl)[724];
    ((void (APIENTRY *)(GLenum pname, GLfloat param)) _func)(pname, param);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(PointParameterfvEXT)(GLenum pname, const GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[726];
+   mapi_func _func = ((const mapi_func *) _tbl)[725];
    ((void (APIENTRY *)(GLenum pname, const GLfloat *params)) _func)(pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(PointParameterfv)(GLenum pname, const GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[726];
+   mapi_func _func = ((const mapi_func *) _tbl)[725];
    ((void (APIENTRY *)(GLenum pname, const GLfloat *params)) _func)(pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(PointParameterfvARB)(GLenum pname, const GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[726];
+   mapi_func _func = ((const mapi_func *) _tbl)[725];
    ((void (APIENTRY *)(GLenum pname, const GLfloat *params)) _func)(pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(LockArraysEXT)(GLint first, GLsizei count)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[727];
+   mapi_func _func = ((const mapi_func *) _tbl)[726];
    ((void (APIENTRY *)(GLint first, GLsizei count)) _func)(first, count);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(UnlockArraysEXT)(void)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[728];
+   mapi_func _func = ((const mapi_func *) _tbl)[727];
    ((void (APIENTRY *)(void)) _func)();
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3bEXT)(GLbyte red, GLbyte green, GLbyte blue)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[729];
+   mapi_func _func = ((const mapi_func *) _tbl)[728];
    ((void (APIENTRY *)(GLbyte red, GLbyte green, GLbyte blue)) _func)(red, green, blue);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3b)(GLbyte red, GLbyte green, GLbyte blue)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[729];
+   mapi_func _func = ((const mapi_func *) _tbl)[728];
    ((void (APIENTRY *)(GLbyte red, GLbyte green, GLbyte blue)) _func)(red, green, blue);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3bvEXT)(const GLbyte *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[730];
+   mapi_func _func = ((const mapi_func *) _tbl)[729];
    ((void (APIENTRY *)(const GLbyte *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3bv)(const GLbyte *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[730];
+   mapi_func _func = ((const mapi_func *) _tbl)[729];
    ((void (APIENTRY *)(const GLbyte *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3dEXT)(GLdouble red, GLdouble green, GLdouble blue)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[731];
+   mapi_func _func = ((const mapi_func *) _tbl)[730];
    ((void (APIENTRY *)(GLdouble red, GLdouble green, GLdouble blue)) _func)(red, green, blue);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3d)(GLdouble red, GLdouble green, GLdouble blue)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[731];
+   mapi_func _func = ((const mapi_func *) _tbl)[730];
    ((void (APIENTRY *)(GLdouble red, GLdouble green, GLdouble blue)) _func)(red, green, blue);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3dvEXT)(const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[732];
+   mapi_func _func = ((const mapi_func *) _tbl)[731];
    ((void (APIENTRY *)(const GLdouble *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3dv)(const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[732];
+   mapi_func _func = ((const mapi_func *) _tbl)[731];
    ((void (APIENTRY *)(const GLdouble *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3fEXT)(GLfloat red, GLfloat green, GLfloat blue)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[733];
+   mapi_func _func = ((const mapi_func *) _tbl)[732];
    ((void (APIENTRY *)(GLfloat red, GLfloat green, GLfloat blue)) _func)(red, green, blue);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3f)(GLfloat red, GLfloat green, GLfloat blue)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[733];
+   mapi_func _func = ((const mapi_func *) _tbl)[732];
    ((void (APIENTRY *)(GLfloat red, GLfloat green, GLfloat blue)) _func)(red, green, blue);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3fvEXT)(const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[734];
+   mapi_func _func = ((const mapi_func *) _tbl)[733];
    ((void (APIENTRY *)(const GLfloat *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3fv)(const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[734];
+   mapi_func _func = ((const mapi_func *) _tbl)[733];
    ((void (APIENTRY *)(const GLfloat *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3iEXT)(GLint red, GLint green, GLint blue)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[735];
+   mapi_func _func = ((const mapi_func *) _tbl)[734];
    ((void (APIENTRY *)(GLint red, GLint green, GLint blue)) _func)(red, green, blue);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3i)(GLint red, GLint green, GLint blue)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[735];
+   mapi_func _func = ((const mapi_func *) _tbl)[734];
    ((void (APIENTRY *)(GLint red, GLint green, GLint blue)) _func)(red, green, blue);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3ivEXT)(const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[736];
+   mapi_func _func = ((const mapi_func *) _tbl)[735];
    ((void (APIENTRY *)(const GLint *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3iv)(const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[736];
+   mapi_func _func = ((const mapi_func *) _tbl)[735];
    ((void (APIENTRY *)(const GLint *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3sEXT)(GLshort red, GLshort green, GLshort blue)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[737];
+   mapi_func _func = ((const mapi_func *) _tbl)[736];
    ((void (APIENTRY *)(GLshort red, GLshort green, GLshort blue)) _func)(red, green, blue);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3s)(GLshort red, GLshort green, GLshort blue)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[737];
+   mapi_func _func = ((const mapi_func *) _tbl)[736];
    ((void (APIENTRY *)(GLshort red, GLshort green, GLshort blue)) _func)(red, green, blue);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3svEXT)(const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[738];
+   mapi_func _func = ((const mapi_func *) _tbl)[737];
    ((void (APIENTRY *)(const GLshort *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3sv)(const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[738];
+   mapi_func _func = ((const mapi_func *) _tbl)[737];
    ((void (APIENTRY *)(const GLshort *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3ubEXT)(GLubyte red, GLubyte green, GLubyte blue)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[739];
+   mapi_func _func = ((const mapi_func *) _tbl)[738];
    ((void (APIENTRY *)(GLubyte red, GLubyte green, GLubyte blue)) _func)(red, green, blue);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3ub)(GLubyte red, GLubyte green, GLubyte blue)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[739];
+   mapi_func _func = ((const mapi_func *) _tbl)[738];
    ((void (APIENTRY *)(GLubyte red, GLubyte green, GLubyte blue)) _func)(red, green, blue);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3ubvEXT)(const GLubyte *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[740];
+   mapi_func _func = ((const mapi_func *) _tbl)[739];
    ((void (APIENTRY *)(const GLubyte *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3ubv)(const GLubyte *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[740];
+   mapi_func _func = ((const mapi_func *) _tbl)[739];
    ((void (APIENTRY *)(const GLubyte *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3uiEXT)(GLuint red, GLuint green, GLuint blue)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[741];
+   mapi_func _func = ((const mapi_func *) _tbl)[740];
    ((void (APIENTRY *)(GLuint red, GLuint green, GLuint blue)) _func)(red, green, blue);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3ui)(GLuint red, GLuint green, GLuint blue)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[741];
+   mapi_func _func = ((const mapi_func *) _tbl)[740];
    ((void (APIENTRY *)(GLuint red, GLuint green, GLuint blue)) _func)(red, green, blue);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3uivEXT)(const GLuint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[742];
+   mapi_func _func = ((const mapi_func *) _tbl)[741];
    ((void (APIENTRY *)(const GLuint *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3uiv)(const GLuint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[742];
+   mapi_func _func = ((const mapi_func *) _tbl)[741];
    ((void (APIENTRY *)(const GLuint *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3usEXT)(GLushort red, GLushort green, GLushort blue)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[743];
+   mapi_func _func = ((const mapi_func *) _tbl)[742];
    ((void (APIENTRY *)(GLushort red, GLushort green, GLushort blue)) _func)(red, green, blue);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3us)(GLushort red, GLushort green, GLushort blue)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[743];
+   mapi_func _func = ((const mapi_func *) _tbl)[742];
    ((void (APIENTRY *)(GLushort red, GLushort green, GLushort blue)) _func)(red, green, blue);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3usvEXT)(const GLushort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[744];
+   mapi_func _func = ((const mapi_func *) _tbl)[743];
    ((void (APIENTRY *)(const GLushort *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColor3usv)(const GLushort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[744];
+   mapi_func _func = ((const mapi_func *) _tbl)[743];
    ((void (APIENTRY *)(const GLushort *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColorPointerEXT)(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[745];
+   mapi_func _func = ((const mapi_func *) _tbl)[744];
    ((void (APIENTRY *)(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)) _func)(size, type, stride, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SecondaryColorPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[745];
+   mapi_func _func = ((const mapi_func *) _tbl)[744];
    ((void (APIENTRY *)(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)) _func)(size, type, stride, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(MultiDrawArraysEXT)(GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[746];
+   mapi_func _func = ((const mapi_func *) _tbl)[745];
    ((void (APIENTRY *)(GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount)) _func)(mode, first, count, primcount);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(MultiDrawArrays)(GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[746];
+   mapi_func _func = ((const mapi_func *) _tbl)[745];
    ((void (APIENTRY *)(GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount)) _func)(mode, first, count, primcount);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(MultiDrawElementsEXT)(GLenum mode, const GLsizei *count, GLenum type, const GLvoid **indices, GLsizei primcount)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[747];
+   mapi_func _func = ((const mapi_func *) _tbl)[746];
    ((void (APIENTRY *)(GLenum mode, const GLsizei *count, GLenum type, const GLvoid **indices, GLsizei primcount)) _func)(mode, count, type, indices, primcount);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(MultiDrawElements)(GLenum mode, const GLsizei *count, GLenum type, const GLvoid **indices, GLsizei primcount)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[747];
+   mapi_func _func = ((const mapi_func *) _tbl)[746];
    ((void (APIENTRY *)(GLenum mode, const GLsizei *count, GLenum type, const GLvoid **indices, GLsizei primcount)) _func)(mode, count, type, indices, primcount);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FogCoordPointerEXT)(GLenum type, GLsizei stride, const GLvoid *pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[748];
+   mapi_func _func = ((const mapi_func *) _tbl)[747];
    ((void (APIENTRY *)(GLenum type, GLsizei stride, const GLvoid *pointer)) _func)(type, stride, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FogCoordPointer)(GLenum type, GLsizei stride, const GLvoid *pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[748];
+   mapi_func _func = ((const mapi_func *) _tbl)[747];
    ((void (APIENTRY *)(GLenum type, GLsizei stride, const GLvoid *pointer)) _func)(type, stride, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FogCoorddEXT)(GLdouble coord)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[749];
+   mapi_func _func = ((const mapi_func *) _tbl)[748];
    ((void (APIENTRY *)(GLdouble coord)) _func)(coord);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FogCoordd)(GLdouble coord)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[749];
+   mapi_func _func = ((const mapi_func *) _tbl)[748];
    ((void (APIENTRY *)(GLdouble coord)) _func)(coord);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FogCoorddvEXT)(const GLdouble *coord)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[750];
+   mapi_func _func = ((const mapi_func *) _tbl)[749];
    ((void (APIENTRY *)(const GLdouble *coord)) _func)(coord);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FogCoorddv)(const GLdouble *coord)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[750];
+   mapi_func _func = ((const mapi_func *) _tbl)[749];
    ((void (APIENTRY *)(const GLdouble *coord)) _func)(coord);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FogCoordfEXT)(GLfloat coord)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[751];
+   mapi_func _func = ((const mapi_func *) _tbl)[750];
    ((void (APIENTRY *)(GLfloat coord)) _func)(coord);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FogCoordf)(GLfloat coord)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[751];
+   mapi_func _func = ((const mapi_func *) _tbl)[750];
    ((void (APIENTRY *)(GLfloat coord)) _func)(coord);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FogCoordfvEXT)(const GLfloat *coord)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[752];
+   mapi_func _func = ((const mapi_func *) _tbl)[751];
    ((void (APIENTRY *)(const GLfloat *coord)) _func)(coord);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FogCoordfv)(const GLfloat *coord)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[752];
+   mapi_func _func = ((const mapi_func *) _tbl)[751];
    ((void (APIENTRY *)(const GLfloat *coord)) _func)(coord);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BlendFuncSeparateEXT)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[754];
+   mapi_func _func = ((const mapi_func *) _tbl)[753];
    ((void (APIENTRY *)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)) _func)(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BlendFuncSeparate)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[754];
+   mapi_func _func = ((const mapi_func *) _tbl)[753];
    ((void (APIENTRY *)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)) _func)(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FlushVertexArrayRangeNV)(void)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[755];
+   mapi_func _func = ((const mapi_func *) _tbl)[754];
    ((void (APIENTRY *)(void)) _func)();
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexArrayRangeNV)(GLsizei length, const GLvoid *pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[756];
+   mapi_func _func = ((const mapi_func *) _tbl)[755];
    ((void (APIENTRY *)(GLsizei length, const GLvoid *pointer)) _func)(length, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(CombinerInputNV)(GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[757];
+   mapi_func _func = ((const mapi_func *) _tbl)[756];
    ((void (APIENTRY *)(GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage)) _func)(stage, portion, variable, input, mapping, componentUsage);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(CombinerOutputNV)(GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[758];
+   mapi_func _func = ((const mapi_func *) _tbl)[757];
    ((void (APIENTRY *)(GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum)) _func)(stage, portion, abOutput, cdOutput, sumOutput, scale, bias, abDotProduct, cdDotProduct, muxSum);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(CombinerParameterfNV)(GLenum pname, GLfloat param)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[759];
+   mapi_func _func = ((const mapi_func *) _tbl)[758];
    ((void (APIENTRY *)(GLenum pname, GLfloat param)) _func)(pname, param);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(CombinerParameterfvNV)(GLenum pname, const GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[760];
+   mapi_func _func = ((const mapi_func *) _tbl)[759];
    ((void (APIENTRY *)(GLenum pname, const GLfloat *params)) _func)(pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(CombinerParameteriNV)(GLenum pname, GLint param)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[761];
+   mapi_func _func = ((const mapi_func *) _tbl)[760];
    ((void (APIENTRY *)(GLenum pname, GLint param)) _func)(pname, param);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(CombinerParameterivNV)(GLenum pname, const GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[762];
+   mapi_func _func = ((const mapi_func *) _tbl)[761];
    ((void (APIENTRY *)(GLenum pname, const GLint *params)) _func)(pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FinalCombinerInputNV)(GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[763];
+   mapi_func _func = ((const mapi_func *) _tbl)[762];
    ((void (APIENTRY *)(GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage)) _func)(variable, input, mapping, componentUsage);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetCombinerInputParameterfvNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[764];
+   mapi_func _func = ((const mapi_func *) _tbl)[763];
    ((void (APIENTRY *)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat *params)) _func)(stage, portion, variable, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetCombinerInputParameterivNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[765];
+   mapi_func _func = ((const mapi_func *) _tbl)[764];
    ((void (APIENTRY *)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint *params)) _func)(stage, portion, variable, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetCombinerOutputParameterfvNV)(GLenum stage, GLenum portion, GLenum pname, GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[766];
+   mapi_func _func = ((const mapi_func *) _tbl)[765];
    ((void (APIENTRY *)(GLenum stage, GLenum portion, GLenum pname, GLfloat *params)) _func)(stage, portion, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetCombinerOutputParameterivNV)(GLenum stage, GLenum portion, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[767];
+   mapi_func _func = ((const mapi_func *) _tbl)[766];
    ((void (APIENTRY *)(GLenum stage, GLenum portion, GLenum pname, GLint *params)) _func)(stage, portion, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetFinalCombinerInputParameterfvNV)(GLenum variable, GLenum pname, GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[768];
+   mapi_func _func = ((const mapi_func *) _tbl)[767];
    ((void (APIENTRY *)(GLenum variable, GLenum pname, GLfloat *params)) _func)(variable, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetFinalCombinerInputParameterivNV)(GLenum variable, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[769];
+   mapi_func _func = ((const mapi_func *) _tbl)[768];
    ((void (APIENTRY *)(GLenum variable, GLenum pname, GLint *params)) _func)(variable, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ResizeBuffersMESA)(void)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[770];
+   mapi_func _func = ((const mapi_func *) _tbl)[769];
    ((void (APIENTRY *)(void)) _func)();
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2dMESA)(GLdouble x, GLdouble y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[771];
+   mapi_func _func = ((const mapi_func *) _tbl)[770];
    ((void (APIENTRY *)(GLdouble x, GLdouble y)) _func)(x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2d)(GLdouble x, GLdouble y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[771];
+   mapi_func _func = ((const mapi_func *) _tbl)[770];
    ((void (APIENTRY *)(GLdouble x, GLdouble y)) _func)(x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2dARB)(GLdouble x, GLdouble y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[771];
+   mapi_func _func = ((const mapi_func *) _tbl)[770];
    ((void (APIENTRY *)(GLdouble x, GLdouble y)) _func)(x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2dvMESA)(const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[772];
+   mapi_func _func = ((const mapi_func *) _tbl)[771];
    ((void (APIENTRY *)(const GLdouble *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2dv)(const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[772];
+   mapi_func _func = ((const mapi_func *) _tbl)[771];
    ((void (APIENTRY *)(const GLdouble *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2dvARB)(const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[772];
+   mapi_func _func = ((const mapi_func *) _tbl)[771];
    ((void (APIENTRY *)(const GLdouble *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2fMESA)(GLfloat x, GLfloat y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[773];
+   mapi_func _func = ((const mapi_func *) _tbl)[772];
    ((void (APIENTRY *)(GLfloat x, GLfloat y)) _func)(x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2f)(GLfloat x, GLfloat y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[773];
+   mapi_func _func = ((const mapi_func *) _tbl)[772];
    ((void (APIENTRY *)(GLfloat x, GLfloat y)) _func)(x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2fARB)(GLfloat x, GLfloat y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[773];
+   mapi_func _func = ((const mapi_func *) _tbl)[772];
    ((void (APIENTRY *)(GLfloat x, GLfloat y)) _func)(x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2fvMESA)(const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[774];
+   mapi_func _func = ((const mapi_func *) _tbl)[773];
    ((void (APIENTRY *)(const GLfloat *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2fv)(const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[774];
+   mapi_func _func = ((const mapi_func *) _tbl)[773];
    ((void (APIENTRY *)(const GLfloat *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2fvARB)(const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[774];
+   mapi_func _func = ((const mapi_func *) _tbl)[773];
    ((void (APIENTRY *)(const GLfloat *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2iMESA)(GLint x, GLint y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[775];
+   mapi_func _func = ((const mapi_func *) _tbl)[774];
    ((void (APIENTRY *)(GLint x, GLint y)) _func)(x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2i)(GLint x, GLint y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[775];
+   mapi_func _func = ((const mapi_func *) _tbl)[774];
    ((void (APIENTRY *)(GLint x, GLint y)) _func)(x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2iARB)(GLint x, GLint y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[775];
+   mapi_func _func = ((const mapi_func *) _tbl)[774];
    ((void (APIENTRY *)(GLint x, GLint y)) _func)(x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2ivMESA)(const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[776];
+   mapi_func _func = ((const mapi_func *) _tbl)[775];
    ((void (APIENTRY *)(const GLint *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2iv)(const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[776];
+   mapi_func _func = ((const mapi_func *) _tbl)[775];
    ((void (APIENTRY *)(const GLint *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2ivARB)(const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[776];
+   mapi_func _func = ((const mapi_func *) _tbl)[775];
    ((void (APIENTRY *)(const GLint *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2sMESA)(GLshort x, GLshort y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[777];
+   mapi_func _func = ((const mapi_func *) _tbl)[776];
    ((void (APIENTRY *)(GLshort x, GLshort y)) _func)(x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2s)(GLshort x, GLshort y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[777];
+   mapi_func _func = ((const mapi_func *) _tbl)[776];
    ((void (APIENTRY *)(GLshort x, GLshort y)) _func)(x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2sARB)(GLshort x, GLshort y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[777];
+   mapi_func _func = ((const mapi_func *) _tbl)[776];
    ((void (APIENTRY *)(GLshort x, GLshort y)) _func)(x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2svMESA)(const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[778];
+   mapi_func _func = ((const mapi_func *) _tbl)[777];
    ((void (APIENTRY *)(const GLshort *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2sv)(const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[778];
+   mapi_func _func = ((const mapi_func *) _tbl)[777];
    ((void (APIENTRY *)(const GLshort *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos2svARB)(const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[778];
+   mapi_func _func = ((const mapi_func *) _tbl)[777];
    ((void (APIENTRY *)(const GLshort *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3dMESA)(GLdouble x, GLdouble y, GLdouble z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[779];
+   mapi_func _func = ((const mapi_func *) _tbl)[778];
    ((void (APIENTRY *)(GLdouble x, GLdouble y, GLdouble z)) _func)(x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3d)(GLdouble x, GLdouble y, GLdouble z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[779];
+   mapi_func _func = ((const mapi_func *) _tbl)[778];
    ((void (APIENTRY *)(GLdouble x, GLdouble y, GLdouble z)) _func)(x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3dARB)(GLdouble x, GLdouble y, GLdouble z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[779];
+   mapi_func _func = ((const mapi_func *) _tbl)[778];
    ((void (APIENTRY *)(GLdouble x, GLdouble y, GLdouble z)) _func)(x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3dvMESA)(const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[780];
+   mapi_func _func = ((const mapi_func *) _tbl)[779];
    ((void (APIENTRY *)(const GLdouble *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3dv)(const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[780];
+   mapi_func _func = ((const mapi_func *) _tbl)[779];
    ((void (APIENTRY *)(const GLdouble *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3dvARB)(const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[780];
+   mapi_func _func = ((const mapi_func *) _tbl)[779];
    ((void (APIENTRY *)(const GLdouble *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3fMESA)(GLfloat x, GLfloat y, GLfloat z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[781];
+   mapi_func _func = ((const mapi_func *) _tbl)[780];
    ((void (APIENTRY *)(GLfloat x, GLfloat y, GLfloat z)) _func)(x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3f)(GLfloat x, GLfloat y, GLfloat z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[781];
+   mapi_func _func = ((const mapi_func *) _tbl)[780];
    ((void (APIENTRY *)(GLfloat x, GLfloat y, GLfloat z)) _func)(x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3fARB)(GLfloat x, GLfloat y, GLfloat z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[781];
+   mapi_func _func = ((const mapi_func *) _tbl)[780];
    ((void (APIENTRY *)(GLfloat x, GLfloat y, GLfloat z)) _func)(x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3fvMESA)(const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[782];
+   mapi_func _func = ((const mapi_func *) _tbl)[781];
    ((void (APIENTRY *)(const GLfloat *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3fv)(const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[782];
+   mapi_func _func = ((const mapi_func *) _tbl)[781];
    ((void (APIENTRY *)(const GLfloat *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3fvARB)(const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[782];
+   mapi_func _func = ((const mapi_func *) _tbl)[781];
    ((void (APIENTRY *)(const GLfloat *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3iMESA)(GLint x, GLint y, GLint z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[783];
+   mapi_func _func = ((const mapi_func *) _tbl)[782];
    ((void (APIENTRY *)(GLint x, GLint y, GLint z)) _func)(x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3i)(GLint x, GLint y, GLint z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[783];
+   mapi_func _func = ((const mapi_func *) _tbl)[782];
    ((void (APIENTRY *)(GLint x, GLint y, GLint z)) _func)(x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3iARB)(GLint x, GLint y, GLint z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[783];
+   mapi_func _func = ((const mapi_func *) _tbl)[782];
    ((void (APIENTRY *)(GLint x, GLint y, GLint z)) _func)(x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3ivMESA)(const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[784];
+   mapi_func _func = ((const mapi_func *) _tbl)[783];
    ((void (APIENTRY *)(const GLint *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3iv)(const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[784];
+   mapi_func _func = ((const mapi_func *) _tbl)[783];
    ((void (APIENTRY *)(const GLint *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3ivARB)(const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[784];
+   mapi_func _func = ((const mapi_func *) _tbl)[783];
    ((void (APIENTRY *)(const GLint *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3sMESA)(GLshort x, GLshort y, GLshort z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[785];
+   mapi_func _func = ((const mapi_func *) _tbl)[784];
    ((void (APIENTRY *)(GLshort x, GLshort y, GLshort z)) _func)(x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3s)(GLshort x, GLshort y, GLshort z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[785];
+   mapi_func _func = ((const mapi_func *) _tbl)[784];
    ((void (APIENTRY *)(GLshort x, GLshort y, GLshort z)) _func)(x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3sARB)(GLshort x, GLshort y, GLshort z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[785];
+   mapi_func _func = ((const mapi_func *) _tbl)[784];
    ((void (APIENTRY *)(GLshort x, GLshort y, GLshort z)) _func)(x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3svMESA)(const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[786];
+   mapi_func _func = ((const mapi_func *) _tbl)[785];
    ((void (APIENTRY *)(const GLshort *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3sv)(const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[786];
+   mapi_func _func = ((const mapi_func *) _tbl)[785];
    ((void (APIENTRY *)(const GLshort *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos3svARB)(const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[786];
+   mapi_func _func = ((const mapi_func *) _tbl)[785];
    ((void (APIENTRY *)(const GLshort *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos4dMESA)(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[787];
+   mapi_func _func = ((const mapi_func *) _tbl)[786];
    ((void (APIENTRY *)(GLdouble x, GLdouble y, GLdouble z, GLdouble w)) _func)(x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos4dvMESA)(const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[788];
+   mapi_func _func = ((const mapi_func *) _tbl)[787];
    ((void (APIENTRY *)(const GLdouble *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos4fMESA)(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[789];
+   mapi_func _func = ((const mapi_func *) _tbl)[788];
    ((void (APIENTRY *)(GLfloat x, GLfloat y, GLfloat z, GLfloat w)) _func)(x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos4fvMESA)(const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[790];
+   mapi_func _func = ((const mapi_func *) _tbl)[789];
    ((void (APIENTRY *)(const GLfloat *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos4iMESA)(GLint x, GLint y, GLint z, GLint w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[791];
+   mapi_func _func = ((const mapi_func *) _tbl)[790];
    ((void (APIENTRY *)(GLint x, GLint y, GLint z, GLint w)) _func)(x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos4ivMESA)(const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[792];
+   mapi_func _func = ((const mapi_func *) _tbl)[791];
    ((void (APIENTRY *)(const GLint *v)) _func)(v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos4sMESA)(GLshort x, GLshort y, GLshort z, GLshort w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[793];
+   mapi_func _func = ((const mapi_func *) _tbl)[792];
    ((void (APIENTRY *)(GLshort x, GLshort y, GLshort z, GLshort w)) _func)(x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(WindowPos4svMESA)(const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[794];
+   mapi_func _func = ((const mapi_func *) _tbl)[793];
    ((void (APIENTRY *)(const GLshort *v)) _func)(v);
 }
 
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(AreProgramsResidentNV)(GLsizei n, const GLuint *ids, GLboolean *residences)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[804];
+   mapi_func _func = ((const mapi_func *) _tbl)[803];
    return ((GLboolean (APIENTRY *)(GLsizei n, const GLuint *ids, GLboolean *residences)) _func)(n, ids, residences);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindProgramNV)(GLenum target, GLuint program)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[805];
+   mapi_func _func = ((const mapi_func *) _tbl)[804];
    ((void (APIENTRY *)(GLenum target, GLuint program)) _func)(target, program);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindProgramARB)(GLenum target, GLuint program)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[805];
+   mapi_func _func = ((const mapi_func *) _tbl)[804];
    ((void (APIENTRY *)(GLenum target, GLuint program)) _func)(target, program);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DeleteProgramsNV)(GLsizei n, const GLuint *programs)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[806];
+   mapi_func _func = ((const mapi_func *) _tbl)[805];
    ((void (APIENTRY *)(GLsizei n, const GLuint *programs)) _func)(n, programs);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DeleteProgramsARB)(GLsizei n, const GLuint *programs)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[806];
+   mapi_func _func = ((const mapi_func *) _tbl)[805];
    ((void (APIENTRY *)(GLsizei n, const GLuint *programs)) _func)(n, programs);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ExecuteProgramNV)(GLenum target, GLuint id, const GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[807];
+   mapi_func _func = ((const mapi_func *) _tbl)[806];
    ((void (APIENTRY *)(GLenum target, GLuint id, const GLfloat *params)) _func)(target, id, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GenProgramsNV)(GLsizei n, GLuint *programs)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[808];
+   mapi_func _func = ((const mapi_func *) _tbl)[807];
    ((void (APIENTRY *)(GLsizei n, GLuint *programs)) _func)(n, programs);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GenProgramsARB)(GLsizei n, GLuint *programs)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[808];
+   mapi_func _func = ((const mapi_func *) _tbl)[807];
    ((void (APIENTRY *)(GLsizei n, GLuint *programs)) _func)(n, programs);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetProgramParameterdvNV)(GLenum target, GLuint index, GLenum pname, GLdouble *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[809];
+   mapi_func _func = ((const mapi_func *) _tbl)[808];
    ((void (APIENTRY *)(GLenum target, GLuint index, GLenum pname, GLdouble *params)) _func)(target, index, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetProgramParameterfvNV)(GLenum target, GLuint index, GLenum pname, GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[810];
+   mapi_func _func = ((const mapi_func *) _tbl)[809];
    ((void (APIENTRY *)(GLenum target, GLuint index, GLenum pname, GLfloat *params)) _func)(target, index, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetProgramStringNV)(GLuint id, GLenum pname, GLubyte *program)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[811];
+   mapi_func _func = ((const mapi_func *) _tbl)[810];
    ((void (APIENTRY *)(GLuint id, GLenum pname, GLubyte *program)) _func)(id, pname, program);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetProgramivNV)(GLuint id, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[812];
+   mapi_func _func = ((const mapi_func *) _tbl)[811];
    ((void (APIENTRY *)(GLuint id, GLenum pname, GLint *params)) _func)(id, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetTrackMatrixivNV)(GLenum target, GLuint address, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[813];
+   mapi_func _func = ((const mapi_func *) _tbl)[812];
    ((void (APIENTRY *)(GLenum target, GLuint address, GLenum pname, GLint *params)) _func)(target, address, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetVertexAttribPointervNV)(GLuint index, GLenum pname, GLvoid **pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[814];
+   mapi_func _func = ((const mapi_func *) _tbl)[813];
    ((void (APIENTRY *)(GLuint index, GLenum pname, GLvoid **pointer)) _func)(index, pname, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetVertexAttribPointerv)(GLuint index, GLenum pname, GLvoid **pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[814];
+   mapi_func _func = ((const mapi_func *) _tbl)[813];
    ((void (APIENTRY *)(GLuint index, GLenum pname, GLvoid **pointer)) _func)(index, pname, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetVertexAttribPointervARB)(GLuint index, GLenum pname, GLvoid **pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[814];
+   mapi_func _func = ((const mapi_func *) _tbl)[813];
    ((void (APIENTRY *)(GLuint index, GLenum pname, GLvoid **pointer)) _func)(index, pname, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetVertexAttribdvNV)(GLuint index, GLenum pname, GLdouble *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[815];
+   mapi_func _func = ((const mapi_func *) _tbl)[814];
    ((void (APIENTRY *)(GLuint index, GLenum pname, GLdouble *params)) _func)(index, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetVertexAttribfvNV)(GLuint index, GLenum pname, GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[816];
+   mapi_func _func = ((const mapi_func *) _tbl)[815];
    ((void (APIENTRY *)(GLuint index, GLenum pname, GLfloat *params)) _func)(index, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetVertexAttribivNV)(GLuint index, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[817];
+   mapi_func _func = ((const mapi_func *) _tbl)[816];
    ((void (APIENTRY *)(GLuint index, GLenum pname, GLint *params)) _func)(index, pname, params);
 }
 
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(IsProgramNV)(GLuint program)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[818];
+   mapi_func _func = ((const mapi_func *) _tbl)[817];
    return ((GLboolean (APIENTRY *)(GLuint program)) _func)(program);
 }
 
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(IsProgramARB)(GLuint program)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[818];
+   mapi_func _func = ((const mapi_func *) _tbl)[817];
    return ((GLboolean (APIENTRY *)(GLuint program)) _func)(program);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(LoadProgramNV)(GLenum target, GLuint id, GLsizei len, const GLubyte *program)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[819];
+   mapi_func _func = ((const mapi_func *) _tbl)[818];
    ((void (APIENTRY *)(GLenum target, GLuint id, GLsizei len, const GLubyte *program)) _func)(target, id, len, program);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ProgramParameters4dvNV)(GLenum target, GLuint index, GLsizei num, const GLdouble *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[820];
+   mapi_func _func = ((const mapi_func *) _tbl)[819];
    ((void (APIENTRY *)(GLenum target, GLuint index, GLsizei num, const GLdouble *params)) _func)(target, index, num, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ProgramParameters4fvNV)(GLenum target, GLuint index, GLsizei num, const GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[821];
+   mapi_func _func = ((const mapi_func *) _tbl)[820];
    ((void (APIENTRY *)(GLenum target, GLuint index, GLsizei num, const GLfloat *params)) _func)(target, index, num, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(RequestResidentProgramsNV)(GLsizei n, const GLuint *ids)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[822];
+   mapi_func _func = ((const mapi_func *) _tbl)[821];
    ((void (APIENTRY *)(GLsizei n, const GLuint *ids)) _func)(n, ids);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TrackMatrixNV)(GLenum target, GLuint address, GLenum matrix, GLenum transform)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[823];
+   mapi_func _func = ((const mapi_func *) _tbl)[822];
    ((void (APIENTRY *)(GLenum target, GLuint address, GLenum matrix, GLenum transform)) _func)(target, address, matrix, transform);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib1dNV)(GLuint index, GLdouble x)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[824];
+   mapi_func _func = ((const mapi_func *) _tbl)[823];
    ((void (APIENTRY *)(GLuint index, GLdouble x)) _func)(index, x);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib1dvNV)(GLuint index, const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[825];
+   mapi_func _func = ((const mapi_func *) _tbl)[824];
    ((void (APIENTRY *)(GLuint index, const GLdouble *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib1fNV)(GLuint index, GLfloat x)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[826];
+   mapi_func _func = ((const mapi_func *) _tbl)[825];
    ((void (APIENTRY *)(GLuint index, GLfloat x)) _func)(index, x);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib1fvNV)(GLuint index, const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[827];
+   mapi_func _func = ((const mapi_func *) _tbl)[826];
    ((void (APIENTRY *)(GLuint index, const GLfloat *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib1sNV)(GLuint index, GLshort x)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[828];
+   mapi_func _func = ((const mapi_func *) _tbl)[827];
    ((void (APIENTRY *)(GLuint index, GLshort x)) _func)(index, x);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib1svNV)(GLuint index, const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[829];
+   mapi_func _func = ((const mapi_func *) _tbl)[828];
    ((void (APIENTRY *)(GLuint index, const GLshort *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib2dNV)(GLuint index, GLdouble x, GLdouble y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[830];
+   mapi_func _func = ((const mapi_func *) _tbl)[829];
    ((void (APIENTRY *)(GLuint index, GLdouble x, GLdouble y)) _func)(index, x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib2dvNV)(GLuint index, const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[831];
+   mapi_func _func = ((const mapi_func *) _tbl)[830];
    ((void (APIENTRY *)(GLuint index, const GLdouble *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[832];
+   mapi_func _func = ((const mapi_func *) _tbl)[831];
    ((void (APIENTRY *)(GLuint index, GLfloat x, GLfloat y)) _func)(index, x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib2fvNV)(GLuint index, const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[833];
+   mapi_func _func = ((const mapi_func *) _tbl)[832];
    ((void (APIENTRY *)(GLuint index, const GLfloat *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib2sNV)(GLuint index, GLshort x, GLshort y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[834];
+   mapi_func _func = ((const mapi_func *) _tbl)[833];
    ((void (APIENTRY *)(GLuint index, GLshort x, GLshort y)) _func)(index, x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib2svNV)(GLuint index, const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[835];
+   mapi_func _func = ((const mapi_func *) _tbl)[834];
    ((void (APIENTRY *)(GLuint index, const GLshort *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib3dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[836];
+   mapi_func _func = ((const mapi_func *) _tbl)[835];
    ((void (APIENTRY *)(GLuint index, GLdouble x, GLdouble y, GLdouble z)) _func)(index, x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib3dvNV)(GLuint index, const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[837];
+   mapi_func _func = ((const mapi_func *) _tbl)[836];
    ((void (APIENTRY *)(GLuint index, const GLdouble *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[838];
+   mapi_func _func = ((const mapi_func *) _tbl)[837];
    ((void (APIENTRY *)(GLuint index, GLfloat x, GLfloat y, GLfloat z)) _func)(index, x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib3fvNV)(GLuint index, const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[839];
+   mapi_func _func = ((const mapi_func *) _tbl)[838];
    ((void (APIENTRY *)(GLuint index, const GLfloat *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib3sNV)(GLuint index, GLshort x, GLshort y, GLshort z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[840];
+   mapi_func _func = ((const mapi_func *) _tbl)[839];
    ((void (APIENTRY *)(GLuint index, GLshort x, GLshort y, GLshort z)) _func)(index, x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib3svNV)(GLuint index, const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[841];
+   mapi_func _func = ((const mapi_func *) _tbl)[840];
    ((void (APIENTRY *)(GLuint index, const GLshort *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[842];
+   mapi_func _func = ((const mapi_func *) _tbl)[841];
    ((void (APIENTRY *)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w)) _func)(index, x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4dvNV)(GLuint index, const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[843];
+   mapi_func _func = ((const mapi_func *) _tbl)[842];
    ((void (APIENTRY *)(GLuint index, const GLdouble *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[844];
+   mapi_func _func = ((const mapi_func *) _tbl)[843];
    ((void (APIENTRY *)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w)) _func)(index, x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4fvNV)(GLuint index, const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[845];
+   mapi_func _func = ((const mapi_func *) _tbl)[844];
    ((void (APIENTRY *)(GLuint index, const GLfloat *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4sNV)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[846];
+   mapi_func _func = ((const mapi_func *) _tbl)[845];
    ((void (APIENTRY *)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w)) _func)(index, x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4svNV)(GLuint index, const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[847];
+   mapi_func _func = ((const mapi_func *) _tbl)[846];
    ((void (APIENTRY *)(GLuint index, const GLshort *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4ubNV)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[848];
+   mapi_func _func = ((const mapi_func *) _tbl)[847];
    ((void (APIENTRY *)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w)) _func)(index, x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttrib4ubvNV)(GLuint index, const GLubyte *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[849];
+   mapi_func _func = ((const mapi_func *) _tbl)[848];
    ((void (APIENTRY *)(GLuint index, const GLubyte *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribPointerNV)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[850];
+   mapi_func _func = ((const mapi_func *) _tbl)[849];
    ((void (APIENTRY *)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)) _func)(index, size, type, stride, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribs1dvNV)(GLuint index, GLsizei n, const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[851];
+   mapi_func _func = ((const mapi_func *) _tbl)[850];
    ((void (APIENTRY *)(GLuint index, GLsizei n, const GLdouble *v)) _func)(index, n, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribs1fvNV)(GLuint index, GLsizei n, const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[852];
+   mapi_func _func = ((const mapi_func *) _tbl)[851];
    ((void (APIENTRY *)(GLuint index, GLsizei n, const GLfloat *v)) _func)(index, n, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribs1svNV)(GLuint index, GLsizei n, const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[853];
+   mapi_func _func = ((const mapi_func *) _tbl)[852];
    ((void (APIENTRY *)(GLuint index, GLsizei n, const GLshort *v)) _func)(index, n, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribs2dvNV)(GLuint index, GLsizei n, const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[854];
+   mapi_func _func = ((const mapi_func *) _tbl)[853];
    ((void (APIENTRY *)(GLuint index, GLsizei n, const GLdouble *v)) _func)(index, n, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribs2fvNV)(GLuint index, GLsizei n, const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[855];
+   mapi_func _func = ((const mapi_func *) _tbl)[854];
    ((void (APIENTRY *)(GLuint index, GLsizei n, const GLfloat *v)) _func)(index, n, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribs2svNV)(GLuint index, GLsizei n, const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[856];
+   mapi_func _func = ((const mapi_func *) _tbl)[855];
    ((void (APIENTRY *)(GLuint index, GLsizei n, const GLshort *v)) _func)(index, n, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribs3dvNV)(GLuint index, GLsizei n, const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[857];
+   mapi_func _func = ((const mapi_func *) _tbl)[856];
    ((void (APIENTRY *)(GLuint index, GLsizei n, const GLdouble *v)) _func)(index, n, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribs3fvNV)(GLuint index, GLsizei n, const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[858];
+   mapi_func _func = ((const mapi_func *) _tbl)[857];
    ((void (APIENTRY *)(GLuint index, GLsizei n, const GLfloat *v)) _func)(index, n, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribs3svNV)(GLuint index, GLsizei n, const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[859];
+   mapi_func _func = ((const mapi_func *) _tbl)[858];
    ((void (APIENTRY *)(GLuint index, GLsizei n, const GLshort *v)) _func)(index, n, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribs4dvNV)(GLuint index, GLsizei n, const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[860];
+   mapi_func _func = ((const mapi_func *) _tbl)[859];
    ((void (APIENTRY *)(GLuint index, GLsizei n, const GLdouble *v)) _func)(index, n, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribs4fvNV)(GLuint index, GLsizei n, const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[861];
+   mapi_func _func = ((const mapi_func *) _tbl)[860];
    ((void (APIENTRY *)(GLuint index, GLsizei n, const GLfloat *v)) _func)(index, n, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribs4svNV)(GLuint index, GLsizei n, const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[862];
+   mapi_func _func = ((const mapi_func *) _tbl)[861];
    ((void (APIENTRY *)(GLuint index, GLsizei n, const GLshort *v)) _func)(index, n, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribs4ubvNV)(GLuint index, GLsizei n, const GLubyte *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[863];
+   mapi_func _func = ((const mapi_func *) _tbl)[862];
    ((void (APIENTRY *)(GLuint index, GLsizei n, const GLubyte *v)) _func)(index, n, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetTexBumpParameterfvATI)(GLenum pname, GLfloat *param)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[864];
+   mapi_func _func = ((const mapi_func *) _tbl)[863];
    ((void (APIENTRY *)(GLenum pname, GLfloat *param)) _func)(pname, param);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetTexBumpParameterivATI)(GLenum pname, GLint *param)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[865];
+   mapi_func _func = ((const mapi_func *) _tbl)[864];
    ((void (APIENTRY *)(GLenum pname, GLint *param)) _func)(pname, param);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TexBumpParameterfvATI)(GLenum pname, const GLfloat *param)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[866];
+   mapi_func _func = ((const mapi_func *) _tbl)[865];
    ((void (APIENTRY *)(GLenum pname, const GLfloat *param)) _func)(pname, param);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TexBumpParameterivATI)(GLenum pname, const GLint *param)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[867];
+   mapi_func _func = ((const mapi_func *) _tbl)[866];
    ((void (APIENTRY *)(GLenum pname, const GLint *param)) _func)(pname, param);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(AlphaFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[868];
+   mapi_func _func = ((const mapi_func *) _tbl)[867];
    ((void (APIENTRY *)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod)) _func)(op, dst, dstMod, arg1, arg1Rep, arg1Mod);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(AlphaFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[869];
+   mapi_func _func = ((const mapi_func *) _tbl)[868];
    ((void (APIENTRY *)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod)) _func)(op, dst, dstMod, arg1, arg1Rep, arg1Mod, arg2, arg2Rep, arg2Mod);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(AlphaFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[870];
+   mapi_func _func = ((const mapi_func *) _tbl)[869];
    ((void (APIENTRY *)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod)) _func)(op, dst, dstMod, arg1, arg1Rep, arg1Mod, arg2, arg2Rep, arg2Mod, arg3, arg3Rep, arg3Mod);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BeginFragmentShaderATI)(void)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[871];
+   mapi_func _func = ((const mapi_func *) _tbl)[870];
    ((void (APIENTRY *)(void)) _func)();
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindFragmentShaderATI)(GLuint id)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[872];
+   mapi_func _func = ((const mapi_func *) _tbl)[871];
    ((void (APIENTRY *)(GLuint id)) _func)(id);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ColorFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[873];
+   mapi_func _func = ((const mapi_func *) _tbl)[872];
    ((void (APIENTRY *)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod)) _func)(op, dst, dstMask, dstMod, arg1, arg1Rep, arg1Mod);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ColorFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[874];
+   mapi_func _func = ((const mapi_func *) _tbl)[873];
    ((void (APIENTRY *)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod)) _func)(op, dst, dstMask, dstMod, arg1, arg1Rep, arg1Mod, arg2, arg2Rep, arg2Mod);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ColorFragmentOp3ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[875];
+   mapi_func _func = ((const mapi_func *) _tbl)[874];
    ((void (APIENTRY *)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod)) _func)(op, dst, dstMask, dstMod, arg1, arg1Rep, arg1Mod, arg2, arg2Rep, arg2Mod, arg3, arg3Rep, arg3Mod);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DeleteFragmentShaderATI)(GLuint id)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[876];
+   mapi_func _func = ((const mapi_func *) _tbl)[875];
    ((void (APIENTRY *)(GLuint id)) _func)(id);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(EndFragmentShaderATI)(void)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[877];
+   mapi_func _func = ((const mapi_func *) _tbl)[876];
    ((void (APIENTRY *)(void)) _func)();
 }
 
 GLAPI GLuint APIENTRY GLAPI_PREFIX(GenFragmentShadersATI)(GLuint range)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[878];
+   mapi_func _func = ((const mapi_func *) _tbl)[877];
    return ((GLuint (APIENTRY *)(GLuint range)) _func)(range);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(PassTexCoordATI)(GLuint dst, GLuint coord, GLenum swizzle)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[879];
+   mapi_func _func = ((const mapi_func *) _tbl)[878];
    ((void (APIENTRY *)(GLuint dst, GLuint coord, GLenum swizzle)) _func)(dst, coord, swizzle);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SampleMapATI)(GLuint dst, GLuint interp, GLenum swizzle)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[880];
+   mapi_func _func = ((const mapi_func *) _tbl)[879];
    ((void (APIENTRY *)(GLuint dst, GLuint interp, GLenum swizzle)) _func)(dst, interp, swizzle);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(SetFragmentShaderConstantATI)(GLuint dst, const GLfloat *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[881];
+   mapi_func _func = ((const mapi_func *) _tbl)[880];
    ((void (APIENTRY *)(GLuint dst, const GLfloat *value)) _func)(dst, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(PointParameteriNV)(GLenum pname, GLint param)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[882];
+   mapi_func _func = ((const mapi_func *) _tbl)[881];
    ((void (APIENTRY *)(GLenum pname, GLint param)) _func)(pname, param);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(PointParameteri)(GLenum pname, GLint param)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[882];
+   mapi_func _func = ((const mapi_func *) _tbl)[881];
    ((void (APIENTRY *)(GLenum pname, GLint param)) _func)(pname, param);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(PointParameterivNV)(GLenum pname, const GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[883];
+   mapi_func _func = ((const mapi_func *) _tbl)[882];
    ((void (APIENTRY *)(GLenum pname, const GLint *params)) _func)(pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(PointParameteriv)(GLenum pname, const GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[883];
+   mapi_func _func = ((const mapi_func *) _tbl)[882];
    ((void (APIENTRY *)(GLenum pname, const GLint *params)) _func)(pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DeleteVertexArrays)(GLsizei n, const GLuint *arrays)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[886];
+   mapi_func _func = ((const mapi_func *) _tbl)[885];
    ((void (APIENTRY *)(GLsizei n, const GLuint *arrays)) _func)(n, arrays);
 }
 
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(IsVertexArray)(GLuint array)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[888];
+   mapi_func _func = ((const mapi_func *) _tbl)[887];
    return ((GLboolean (APIENTRY *)(GLuint array)) _func)(array);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetProgramNamedParameterdvNV)(GLuint id, GLsizei len, const GLubyte *name, GLdouble *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[889];
+   mapi_func _func = ((const mapi_func *) _tbl)[888];
    ((void (APIENTRY *)(GLuint id, GLsizei len, const GLubyte *name, GLdouble *params)) _func)(id, len, name, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetProgramNamedParameterfvNV)(GLuint id, GLsizei len, const GLubyte *name, GLfloat *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[890];
+   mapi_func _func = ((const mapi_func *) _tbl)[889];
    ((void (APIENTRY *)(GLuint id, GLsizei len, const GLubyte *name, GLfloat *params)) _func)(id, len, name, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ProgramNamedParameter4dNV)(GLuint id, GLsizei len, const GLubyte *name, GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[891];
+   mapi_func _func = ((const mapi_func *) _tbl)[890];
    ((void (APIENTRY *)(GLuint id, GLsizei len, const GLubyte *name, GLdouble x, GLdouble y, GLdouble z, GLdouble w)) _func)(id, len, name, x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ProgramNamedParameter4dvNV)(GLuint id, GLsizei len, const GLubyte *name, const GLdouble *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[892];
+   mapi_func _func = ((const mapi_func *) _tbl)[891];
    ((void (APIENTRY *)(GLuint id, GLsizei len, const GLubyte *name, const GLdouble *v)) _func)(id, len, name, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ProgramNamedParameter4fNV)(GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[893];
+   mapi_func _func = ((const mapi_func *) _tbl)[892];
    ((void (APIENTRY *)(GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w)) _func)(id, len, name, x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ProgramNamedParameter4fvNV)(GLuint id, GLsizei len, const GLubyte *name, const GLfloat *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[894];
+   mapi_func _func = ((const mapi_func *) _tbl)[893];
    ((void (APIENTRY *)(GLuint id, GLsizei len, const GLubyte *name, const GLfloat *v)) _func)(id, len, name, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(PrimitiveRestartIndexNV)(GLuint index)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[895];
+   mapi_func _func = ((const mapi_func *) _tbl)[894];
    ((void (APIENTRY *)(GLuint index)) _func)(index);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(PrimitiveRestartIndex)(GLuint index)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[895];
+   mapi_func _func = ((const mapi_func *) _tbl)[894];
    ((void (APIENTRY *)(GLuint index)) _func)(index);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(PrimitiveRestartNV)(void)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[896];
+   mapi_func _func = ((const mapi_func *) _tbl)[895];
    ((void (APIENTRY *)(void)) _func)();
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BlendEquationSeparate)(GLenum modeRGB, GLenum modeA)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[944];
+   mapi_func _func = ((const mapi_func *) _tbl)[943];
    ((void (APIENTRY *)(GLenum modeRGB, GLenum modeA)) _func)(modeRGB, modeA);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindFramebufferEXT)(GLenum target, GLuint framebuffer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[945];
+   mapi_func _func = ((const mapi_func *) _tbl)[944];
    ((void (APIENTRY *)(GLenum target, GLuint framebuffer)) _func)(target, framebuffer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindFramebuffer)(GLenum target, GLuint framebuffer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[945];
+   mapi_func _func = ((const mapi_func *) _tbl)[944];
    ((void (APIENTRY *)(GLenum target, GLuint framebuffer)) _func)(target, framebuffer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindRenderbufferEXT)(GLenum target, GLuint renderbuffer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[946];
+   mapi_func _func = ((const mapi_func *) _tbl)[945];
    ((void (APIENTRY *)(GLenum target, GLuint renderbuffer)) _func)(target, renderbuffer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindRenderbuffer)(GLenum target, GLuint renderbuffer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[946];
+   mapi_func _func = ((const mapi_func *) _tbl)[945];
    ((void (APIENTRY *)(GLenum target, GLuint renderbuffer)) _func)(target, renderbuffer);
 }
 
 GLAPI GLenum APIENTRY GLAPI_PREFIX(CheckFramebufferStatusEXT)(GLenum target)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[947];
+   mapi_func _func = ((const mapi_func *) _tbl)[946];
    return ((GLenum (APIENTRY *)(GLenum target)) _func)(target);
 }
 
 GLAPI GLenum APIENTRY GLAPI_PREFIX(CheckFramebufferStatus)(GLenum target)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[947];
+   mapi_func _func = ((const mapi_func *) _tbl)[946];
    return ((GLenum (APIENTRY *)(GLenum target)) _func)(target);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DeleteFramebuffersEXT)(GLsizei n, const GLuint *framebuffers)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[948];
+   mapi_func _func = ((const mapi_func *) _tbl)[947];
    ((void (APIENTRY *)(GLsizei n, const GLuint *framebuffers)) _func)(n, framebuffers);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DeleteFramebuffers)(GLsizei n, const GLuint *framebuffers)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[948];
+   mapi_func _func = ((const mapi_func *) _tbl)[947];
    ((void (APIENTRY *)(GLsizei n, const GLuint *framebuffers)) _func)(n, framebuffers);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DeleteRenderbuffersEXT)(GLsizei n, const GLuint *renderbuffers)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[949];
+   mapi_func _func = ((const mapi_func *) _tbl)[948];
    ((void (APIENTRY *)(GLsizei n, const GLuint *renderbuffers)) _func)(n, renderbuffers);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DeleteRenderbuffers)(GLsizei n, const GLuint *renderbuffers)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[949];
+   mapi_func _func = ((const mapi_func *) _tbl)[948];
    ((void (APIENTRY *)(GLsizei n, const GLuint *renderbuffers)) _func)(n, renderbuffers);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FramebufferRenderbufferEXT)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[950];
+   mapi_func _func = ((const mapi_func *) _tbl)[949];
    ((void (APIENTRY *)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)) _func)(target, attachment, renderbuffertarget, renderbuffer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FramebufferRenderbuffer)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[950];
+   mapi_func _func = ((const mapi_func *) _tbl)[949];
    ((void (APIENTRY *)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)) _func)(target, attachment, renderbuffertarget, renderbuffer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FramebufferTexture1DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[951];
+   mapi_func _func = ((const mapi_func *) _tbl)[950];
    ((void (APIENTRY *)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)) _func)(target, attachment, textarget, texture, level);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FramebufferTexture1D)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[951];
+   mapi_func _func = ((const mapi_func *) _tbl)[950];
    ((void (APIENTRY *)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)) _func)(target, attachment, textarget, texture, level);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FramebufferTexture2DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[952];
+   mapi_func _func = ((const mapi_func *) _tbl)[951];
    ((void (APIENTRY *)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)) _func)(target, attachment, textarget, texture, level);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FramebufferTexture2D)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[952];
+   mapi_func _func = ((const mapi_func *) _tbl)[951];
    ((void (APIENTRY *)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)) _func)(target, attachment, textarget, texture, level);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FramebufferTexture3DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[953];
+   mapi_func _func = ((const mapi_func *) _tbl)[952];
    ((void (APIENTRY *)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset)) _func)(target, attachment, textarget, texture, level, zoffset);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FramebufferTexture3D)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[953];
+   mapi_func _func = ((const mapi_func *) _tbl)[952];
    ((void (APIENTRY *)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset)) _func)(target, attachment, textarget, texture, level, zoffset);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GenFramebuffersEXT)(GLsizei n, GLuint *framebuffers)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[954];
+   mapi_func _func = ((const mapi_func *) _tbl)[953];
    ((void (APIENTRY *)(GLsizei n, GLuint *framebuffers)) _func)(n, framebuffers);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GenFramebuffers)(GLsizei n, GLuint *framebuffers)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[954];
+   mapi_func _func = ((const mapi_func *) _tbl)[953];
    ((void (APIENTRY *)(GLsizei n, GLuint *framebuffers)) _func)(n, framebuffers);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GenRenderbuffersEXT)(GLsizei n, GLuint *renderbuffers)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[955];
+   mapi_func _func = ((const mapi_func *) _tbl)[954];
    ((void (APIENTRY *)(GLsizei n, GLuint *renderbuffers)) _func)(n, renderbuffers);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GenRenderbuffers)(GLsizei n, GLuint *renderbuffers)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[955];
+   mapi_func _func = ((const mapi_func *) _tbl)[954];
    ((void (APIENTRY *)(GLsizei n, GLuint *renderbuffers)) _func)(n, renderbuffers);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GenerateMipmapEXT)(GLenum target)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[956];
+   mapi_func _func = ((const mapi_func *) _tbl)[955];
    ((void (APIENTRY *)(GLenum target)) _func)(target);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GenerateMipmap)(GLenum target)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[956];
+   mapi_func _func = ((const mapi_func *) _tbl)[955];
    ((void (APIENTRY *)(GLenum target)) _func)(target);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetFramebufferAttachmentParameterivEXT)(GLenum target, GLenum attachment, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[957];
+   mapi_func _func = ((const mapi_func *) _tbl)[956];
    ((void (APIENTRY *)(GLenum target, GLenum attachment, GLenum pname, GLint *params)) _func)(target, attachment, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetFramebufferAttachmentParameteriv)(GLenum target, GLenum attachment, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[957];
+   mapi_func _func = ((const mapi_func *) _tbl)[956];
    ((void (APIENTRY *)(GLenum target, GLenum attachment, GLenum pname, GLint *params)) _func)(target, attachment, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetRenderbufferParameterivEXT)(GLenum target, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[958];
+   mapi_func _func = ((const mapi_func *) _tbl)[957];
    ((void (APIENTRY *)(GLenum target, GLenum pname, GLint *params)) _func)(target, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetRenderbufferParameteriv)(GLenum target, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[958];
+   mapi_func _func = ((const mapi_func *) _tbl)[957];
    ((void (APIENTRY *)(GLenum target, GLenum pname, GLint *params)) _func)(target, pname, params);
 }
 
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(IsFramebufferEXT)(GLuint framebuffer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[959];
+   mapi_func _func = ((const mapi_func *) _tbl)[958];
    return ((GLboolean (APIENTRY *)(GLuint framebuffer)) _func)(framebuffer);
 }
 
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(IsFramebuffer)(GLuint framebuffer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[959];
+   mapi_func _func = ((const mapi_func *) _tbl)[958];
    return ((GLboolean (APIENTRY *)(GLuint framebuffer)) _func)(framebuffer);
 }
 
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(IsRenderbufferEXT)(GLuint renderbuffer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[960];
+   mapi_func _func = ((const mapi_func *) _tbl)[959];
    return ((GLboolean (APIENTRY *)(GLuint renderbuffer)) _func)(renderbuffer);
 }
 
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(IsRenderbuffer)(GLuint renderbuffer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[960];
+   mapi_func _func = ((const mapi_func *) _tbl)[959];
    return ((GLboolean (APIENTRY *)(GLuint renderbuffer)) _func)(renderbuffer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(RenderbufferStorageEXT)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[961];
+   mapi_func _func = ((const mapi_func *) _tbl)[960];
    ((void (APIENTRY *)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height)) _func)(target, internalformat, width, height);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(RenderbufferStorage)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[961];
+   mapi_func _func = ((const mapi_func *) _tbl)[960];
    ((void (APIENTRY *)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height)) _func)(target, internalformat, width, height);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BlitFramebuffer)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[962];
+   mapi_func _func = ((const mapi_func *) _tbl)[961];
    ((void (APIENTRY *)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)) _func)(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindFragDataLocationEXT)(GLuint program, GLuint colorNumber, const GLchar *name)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[965];
+   mapi_func _func = ((const mapi_func *) _tbl)[964];
    ((void (APIENTRY *)(GLuint program, GLuint colorNumber, const GLchar *name)) _func)(program, colorNumber, name);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindFragDataLocation)(GLuint program, GLuint colorNumber, const GLchar *name)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[965];
+   mapi_func _func = ((const mapi_func *) _tbl)[964];
    ((void (APIENTRY *)(GLuint program, GLuint colorNumber, const GLchar *name)) _func)(program, colorNumber, name);
 }
 
 GLAPI GLint APIENTRY GLAPI_PREFIX(GetFragDataLocationEXT)(GLuint program, const GLchar *name)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[966];
+   mapi_func _func = ((const mapi_func *) _tbl)[965];
    return ((GLint (APIENTRY *)(GLuint program, const GLchar *name)) _func)(program, name);
 }
 
 GLAPI GLint APIENTRY GLAPI_PREFIX(GetFragDataLocation)(GLuint program, const GLchar *name)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[966];
+   mapi_func _func = ((const mapi_func *) _tbl)[965];
    return ((GLint (APIENTRY *)(GLuint program, const GLchar *name)) _func)(program, name);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetUniformuivEXT)(GLuint program, GLint location, GLuint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[967];
+   mapi_func _func = ((const mapi_func *) _tbl)[966];
    ((void (APIENTRY *)(GLuint program, GLint location, GLuint *params)) _func)(program, location, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetUniformuiv)(GLuint program, GLint location, GLuint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[967];
+   mapi_func _func = ((const mapi_func *) _tbl)[966];
    ((void (APIENTRY *)(GLuint program, GLint location, GLuint *params)) _func)(program, location, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetVertexAttribIivEXT)(GLuint index, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[968];
+   mapi_func _func = ((const mapi_func *) _tbl)[967];
    ((void (APIENTRY *)(GLuint index, GLenum pname, GLint *params)) _func)(index, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetVertexAttribIiv)(GLuint index, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[968];
+   mapi_func _func = ((const mapi_func *) _tbl)[967];
    ((void (APIENTRY *)(GLuint index, GLenum pname, GLint *params)) _func)(index, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetVertexAttribIuivEXT)(GLuint index, GLenum pname, GLuint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[969];
+   mapi_func _func = ((const mapi_func *) _tbl)[968];
    ((void (APIENTRY *)(GLuint index, GLenum pname, GLuint *params)) _func)(index, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetVertexAttribIuiv)(GLuint index, GLenum pname, GLuint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[969];
+   mapi_func _func = ((const mapi_func *) _tbl)[968];
    ((void (APIENTRY *)(GLuint index, GLenum pname, GLuint *params)) _func)(index, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform1uiEXT)(GLint location, GLuint x)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[970];
+   mapi_func _func = ((const mapi_func *) _tbl)[969];
    ((void (APIENTRY *)(GLint location, GLuint x)) _func)(location, x);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform1ui)(GLint location, GLuint x)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[970];
+   mapi_func _func = ((const mapi_func *) _tbl)[969];
    ((void (APIENTRY *)(GLint location, GLuint x)) _func)(location, x);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform1uivEXT)(GLint location, GLsizei count, const GLuint *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[971];
+   mapi_func _func = ((const mapi_func *) _tbl)[970];
    ((void (APIENTRY *)(GLint location, GLsizei count, const GLuint *value)) _func)(location, count, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform1uiv)(GLint location, GLsizei count, const GLuint *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[971];
+   mapi_func _func = ((const mapi_func *) _tbl)[970];
    ((void (APIENTRY *)(GLint location, GLsizei count, const GLuint *value)) _func)(location, count, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform2uiEXT)(GLint location, GLuint x, GLuint y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[972];
+   mapi_func _func = ((const mapi_func *) _tbl)[971];
    ((void (APIENTRY *)(GLint location, GLuint x, GLuint y)) _func)(location, x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform2ui)(GLint location, GLuint x, GLuint y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[972];
+   mapi_func _func = ((const mapi_func *) _tbl)[971];
    ((void (APIENTRY *)(GLint location, GLuint x, GLuint y)) _func)(location, x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform2uivEXT)(GLint location, GLsizei count, const GLuint *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[973];
+   mapi_func _func = ((const mapi_func *) _tbl)[972];
    ((void (APIENTRY *)(GLint location, GLsizei count, const GLuint *value)) _func)(location, count, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform2uiv)(GLint location, GLsizei count, const GLuint *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[973];
+   mapi_func _func = ((const mapi_func *) _tbl)[972];
    ((void (APIENTRY *)(GLint location, GLsizei count, const GLuint *value)) _func)(location, count, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform3uiEXT)(GLint location, GLuint x, GLuint y, GLuint z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[974];
+   mapi_func _func = ((const mapi_func *) _tbl)[973];
    ((void (APIENTRY *)(GLint location, GLuint x, GLuint y, GLuint z)) _func)(location, x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform3ui)(GLint location, GLuint x, GLuint y, GLuint z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[974];
+   mapi_func _func = ((const mapi_func *) _tbl)[973];
    ((void (APIENTRY *)(GLint location, GLuint x, GLuint y, GLuint z)) _func)(location, x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform3uivEXT)(GLint location, GLsizei count, const GLuint *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[975];
+   mapi_func _func = ((const mapi_func *) _tbl)[974];
    ((void (APIENTRY *)(GLint location, GLsizei count, const GLuint *value)) _func)(location, count, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform3uiv)(GLint location, GLsizei count, const GLuint *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[975];
+   mapi_func _func = ((const mapi_func *) _tbl)[974];
    ((void (APIENTRY *)(GLint location, GLsizei count, const GLuint *value)) _func)(location, count, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform4uiEXT)(GLint location, GLuint x, GLuint y, GLuint z, GLuint w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[976];
+   mapi_func _func = ((const mapi_func *) _tbl)[975];
    ((void (APIENTRY *)(GLint location, GLuint x, GLuint y, GLuint z, GLuint w)) _func)(location, x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform4ui)(GLint location, GLuint x, GLuint y, GLuint z, GLuint w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[976];
+   mapi_func _func = ((const mapi_func *) _tbl)[975];
    ((void (APIENTRY *)(GLint location, GLuint x, GLuint y, GLuint z, GLuint w)) _func)(location, x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform4uivEXT)(GLint location, GLsizei count, const GLuint *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[977];
+   mapi_func _func = ((const mapi_func *) _tbl)[976];
    ((void (APIENTRY *)(GLint location, GLsizei count, const GLuint *value)) _func)(location, count, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Uniform4uiv)(GLint location, GLsizei count, const GLuint *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[977];
+   mapi_func _func = ((const mapi_func *) _tbl)[976];
    ((void (APIENTRY *)(GLint location, GLsizei count, const GLuint *value)) _func)(location, count, value);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI1iEXT)(GLuint index, GLint x)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[978];
+   mapi_func _func = ((const mapi_func *) _tbl)[977];
    ((void (APIENTRY *)(GLuint index, GLint x)) _func)(index, x);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI1i)(GLuint index, GLint x)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[978];
+   mapi_func _func = ((const mapi_func *) _tbl)[977];
    ((void (APIENTRY *)(GLuint index, GLint x)) _func)(index, x);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI1ivEXT)(GLuint index, const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[979];
+   mapi_func _func = ((const mapi_func *) _tbl)[978];
    ((void (APIENTRY *)(GLuint index, const GLint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI1iv)(GLuint index, const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[979];
+   mapi_func _func = ((const mapi_func *) _tbl)[978];
    ((void (APIENTRY *)(GLuint index, const GLint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI1uiEXT)(GLuint index, GLuint x)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[980];
+   mapi_func _func = ((const mapi_func *) _tbl)[979];
    ((void (APIENTRY *)(GLuint index, GLuint x)) _func)(index, x);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI1ui)(GLuint index, GLuint x)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[980];
+   mapi_func _func = ((const mapi_func *) _tbl)[979];
    ((void (APIENTRY *)(GLuint index, GLuint x)) _func)(index, x);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI1uivEXT)(GLuint index, const GLuint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[981];
+   mapi_func _func = ((const mapi_func *) _tbl)[980];
    ((void (APIENTRY *)(GLuint index, const GLuint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI1uiv)(GLuint index, const GLuint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[981];
+   mapi_func _func = ((const mapi_func *) _tbl)[980];
    ((void (APIENTRY *)(GLuint index, const GLuint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI2iEXT)(GLuint index, GLint x, GLint y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[982];
+   mapi_func _func = ((const mapi_func *) _tbl)[981];
    ((void (APIENTRY *)(GLuint index, GLint x, GLint y)) _func)(index, x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI2i)(GLuint index, GLint x, GLint y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[982];
+   mapi_func _func = ((const mapi_func *) _tbl)[981];
    ((void (APIENTRY *)(GLuint index, GLint x, GLint y)) _func)(index, x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI2ivEXT)(GLuint index, const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[983];
+   mapi_func _func = ((const mapi_func *) _tbl)[982];
    ((void (APIENTRY *)(GLuint index, const GLint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI2iv)(GLuint index, const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[983];
+   mapi_func _func = ((const mapi_func *) _tbl)[982];
    ((void (APIENTRY *)(GLuint index, const GLint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI2uiEXT)(GLuint index, GLuint x, GLuint y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[984];
+   mapi_func _func = ((const mapi_func *) _tbl)[983];
    ((void (APIENTRY *)(GLuint index, GLuint x, GLuint y)) _func)(index, x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI2ui)(GLuint index, GLuint x, GLuint y)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[984];
+   mapi_func _func = ((const mapi_func *) _tbl)[983];
    ((void (APIENTRY *)(GLuint index, GLuint x, GLuint y)) _func)(index, x, y);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI2uivEXT)(GLuint index, const GLuint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[985];
+   mapi_func _func = ((const mapi_func *) _tbl)[984];
    ((void (APIENTRY *)(GLuint index, const GLuint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI2uiv)(GLuint index, const GLuint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[985];
+   mapi_func _func = ((const mapi_func *) _tbl)[984];
    ((void (APIENTRY *)(GLuint index, const GLuint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI3iEXT)(GLuint index, GLint x, GLint y, GLint z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[986];
+   mapi_func _func = ((const mapi_func *) _tbl)[985];
    ((void (APIENTRY *)(GLuint index, GLint x, GLint y, GLint z)) _func)(index, x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI3i)(GLuint index, GLint x, GLint y, GLint z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[986];
+   mapi_func _func = ((const mapi_func *) _tbl)[985];
    ((void (APIENTRY *)(GLuint index, GLint x, GLint y, GLint z)) _func)(index, x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI3ivEXT)(GLuint index, const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[987];
+   mapi_func _func = ((const mapi_func *) _tbl)[986];
    ((void (APIENTRY *)(GLuint index, const GLint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI3iv)(GLuint index, const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[987];
+   mapi_func _func = ((const mapi_func *) _tbl)[986];
    ((void (APIENTRY *)(GLuint index, const GLint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI3uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[988];
+   mapi_func _func = ((const mapi_func *) _tbl)[987];
    ((void (APIENTRY *)(GLuint index, GLuint x, GLuint y, GLuint z)) _func)(index, x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI3ui)(GLuint index, GLuint x, GLuint y, GLuint z)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[988];
+   mapi_func _func = ((const mapi_func *) _tbl)[987];
    ((void (APIENTRY *)(GLuint index, GLuint x, GLuint y, GLuint z)) _func)(index, x, y, z);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI3uivEXT)(GLuint index, const GLuint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[989];
+   mapi_func _func = ((const mapi_func *) _tbl)[988];
    ((void (APIENTRY *)(GLuint index, const GLuint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI3uiv)(GLuint index, const GLuint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[989];
+   mapi_func _func = ((const mapi_func *) _tbl)[988];
    ((void (APIENTRY *)(GLuint index, const GLuint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI4bvEXT)(GLuint index, const GLbyte *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[990];
+   mapi_func _func = ((const mapi_func *) _tbl)[989];
    ((void (APIENTRY *)(GLuint index, const GLbyte *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI4bv)(GLuint index, const GLbyte *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[990];
+   mapi_func _func = ((const mapi_func *) _tbl)[989];
    ((void (APIENTRY *)(GLuint index, const GLbyte *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI4iEXT)(GLuint index, GLint x, GLint y, GLint z, GLint w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[991];
+   mapi_func _func = ((const mapi_func *) _tbl)[990];
    ((void (APIENTRY *)(GLuint index, GLint x, GLint y, GLint z, GLint w)) _func)(index, x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI4i)(GLuint index, GLint x, GLint y, GLint z, GLint w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[991];
+   mapi_func _func = ((const mapi_func *) _tbl)[990];
    ((void (APIENTRY *)(GLuint index, GLint x, GLint y, GLint z, GLint w)) _func)(index, x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI4ivEXT)(GLuint index, const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[992];
+   mapi_func _func = ((const mapi_func *) _tbl)[991];
    ((void (APIENTRY *)(GLuint index, const GLint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI4iv)(GLuint index, const GLint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[992];
+   mapi_func _func = ((const mapi_func *) _tbl)[991];
    ((void (APIENTRY *)(GLuint index, const GLint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI4svEXT)(GLuint index, const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[993];
+   mapi_func _func = ((const mapi_func *) _tbl)[992];
    ((void (APIENTRY *)(GLuint index, const GLshort *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI4sv)(GLuint index, const GLshort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[993];
+   mapi_func _func = ((const mapi_func *) _tbl)[992];
    ((void (APIENTRY *)(GLuint index, const GLshort *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI4ubvEXT)(GLuint index, const GLubyte *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[994];
+   mapi_func _func = ((const mapi_func *) _tbl)[993];
    ((void (APIENTRY *)(GLuint index, const GLubyte *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI4ubv)(GLuint index, const GLubyte *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[994];
+   mapi_func _func = ((const mapi_func *) _tbl)[993];
    ((void (APIENTRY *)(GLuint index, const GLubyte *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI4uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[995];
+   mapi_func _func = ((const mapi_func *) _tbl)[994];
    ((void (APIENTRY *)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)) _func)(index, x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI4ui)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[995];
+   mapi_func _func = ((const mapi_func *) _tbl)[994];
    ((void (APIENTRY *)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)) _func)(index, x, y, z, w);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI4uivEXT)(GLuint index, const GLuint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[996];
+   mapi_func _func = ((const mapi_func *) _tbl)[995];
    ((void (APIENTRY *)(GLuint index, const GLuint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI4uiv)(GLuint index, const GLuint *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[996];
+   mapi_func _func = ((const mapi_func *) _tbl)[995];
    ((void (APIENTRY *)(GLuint index, const GLuint *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI4usvEXT)(GLuint index, const GLushort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[997];
+   mapi_func _func = ((const mapi_func *) _tbl)[996];
    ((void (APIENTRY *)(GLuint index, const GLushort *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribI4usv)(GLuint index, const GLushort *v)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[997];
+   mapi_func _func = ((const mapi_func *) _tbl)[996];
    ((void (APIENTRY *)(GLuint index, const GLushort *v)) _func)(index, v);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribIPointerEXT)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[998];
+   mapi_func _func = ((const mapi_func *) _tbl)[997];
    ((void (APIENTRY *)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)) _func)(index, size, type, stride, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(VertexAttribIPointer)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[998];
+   mapi_func _func = ((const mapi_func *) _tbl)[997];
    ((void (APIENTRY *)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer)) _func)(index, size, type, stride, pointer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FramebufferTextureLayerEXT)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[999];
+   mapi_func _func = ((const mapi_func *) _tbl)[998];
    ((void (APIENTRY *)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)) _func)(target, attachment, texture, level, layer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FramebufferTextureLayer)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[999];
+   mapi_func _func = ((const mapi_func *) _tbl)[998];
    ((void (APIENTRY *)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)) _func)(target, attachment, texture, level, layer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(FramebufferTextureLayerARB)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[999];
+   mapi_func _func = ((const mapi_func *) _tbl)[998];
    ((void (APIENTRY *)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)) _func)(target, attachment, texture, level, layer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ColorMaskIndexedEXT)(GLuint buf, GLboolean r, GLboolean g, GLboolean b, GLboolean a)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1000];
+   mapi_func _func = ((const mapi_func *) _tbl)[999];
    ((void (APIENTRY *)(GLuint buf, GLboolean r, GLboolean g, GLboolean b, GLboolean a)) _func)(buf, r, g, b, a);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ColorMaski)(GLuint buf, GLboolean r, GLboolean g, GLboolean b, GLboolean a)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1000];
+   mapi_func _func = ((const mapi_func *) _tbl)[999];
    ((void (APIENTRY *)(GLuint buf, GLboolean r, GLboolean g, GLboolean b, GLboolean a)) _func)(buf, r, g, b, a);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(DisableIndexedEXT)(GLenum target, GLuint index)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1001];
+   mapi_func _func = ((const mapi_func *) _tbl)[1000];
    ((void (APIENTRY *)(GLenum target, GLuint index)) _func)(target, index);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Disablei)(GLenum target, GLuint index)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1001];
+   mapi_func _func = ((const mapi_func *) _tbl)[1000];
    ((void (APIENTRY *)(GLenum target, GLuint index)) _func)(target, index);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(EnableIndexedEXT)(GLenum target, GLuint index)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1002];
+   mapi_func _func = ((const mapi_func *) _tbl)[1001];
    ((void (APIENTRY *)(GLenum target, GLuint index)) _func)(target, index);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(Enablei)(GLenum target, GLuint index)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1002];
+   mapi_func _func = ((const mapi_func *) _tbl)[1001];
    ((void (APIENTRY *)(GLenum target, GLuint index)) _func)(target, index);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetBooleanIndexedvEXT)(GLenum value, GLuint index, GLboolean *data)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1003];
+   mapi_func _func = ((const mapi_func *) _tbl)[1002];
    ((void (APIENTRY *)(GLenum value, GLuint index, GLboolean *data)) _func)(value, index, data);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetBooleani_v)(GLenum value, GLuint index, GLboolean *data)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1003];
+   mapi_func _func = ((const mapi_func *) _tbl)[1002];
    ((void (APIENTRY *)(GLenum value, GLuint index, GLboolean *data)) _func)(value, index, data);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetIntegerIndexedvEXT)(GLenum value, GLuint index, GLint *data)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1004];
+   mapi_func _func = ((const mapi_func *) _tbl)[1003];
    ((void (APIENTRY *)(GLenum value, GLuint index, GLint *data)) _func)(value, index, data);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetIntegeri_v)(GLenum value, GLuint index, GLint *data)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1004];
+   mapi_func _func = ((const mapi_func *) _tbl)[1003];
    ((void (APIENTRY *)(GLenum value, GLuint index, GLint *data)) _func)(value, index, data);
 }
 
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(IsEnabledIndexedEXT)(GLenum target, GLuint index)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1005];
+   mapi_func _func = ((const mapi_func *) _tbl)[1004];
    return ((GLboolean (APIENTRY *)(GLenum target, GLuint index)) _func)(target, index);
 }
 
 GLAPI GLboolean APIENTRY GLAPI_PREFIX(IsEnabledi)(GLenum target, GLuint index)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1005];
+   mapi_func _func = ((const mapi_func *) _tbl)[1004];
    return ((GLboolean (APIENTRY *)(GLenum target, GLuint index)) _func)(target, index);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ClearColorIiEXT)(GLint r, GLint g, GLint b, GLint a)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1006];
+   mapi_func _func = ((const mapi_func *) _tbl)[1005];
    ((void (APIENTRY *)(GLint r, GLint g, GLint b, GLint a)) _func)(r, g, b, a);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ClearColorIuiEXT)(GLuint r, GLuint g, GLuint b, GLuint a)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1007];
+   mapi_func _func = ((const mapi_func *) _tbl)[1006];
    ((void (APIENTRY *)(GLuint r, GLuint g, GLuint b, GLuint a)) _func)(r, g, b, a);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetTexParameterIivEXT)(GLenum target, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1008];
+   mapi_func _func = ((const mapi_func *) _tbl)[1007];
    ((void (APIENTRY *)(GLenum target, GLenum pname, GLint *params)) _func)(target, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetTexParameterIiv)(GLenum target, GLenum pname, GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1008];
+   mapi_func _func = ((const mapi_func *) _tbl)[1007];
    ((void (APIENTRY *)(GLenum target, GLenum pname, GLint *params)) _func)(target, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetTexParameterIuivEXT)(GLenum target, GLenum pname, GLuint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1009];
+   mapi_func _func = ((const mapi_func *) _tbl)[1008];
    ((void (APIENTRY *)(GLenum target, GLenum pname, GLuint *params)) _func)(target, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetTexParameterIuiv)(GLenum target, GLenum pname, GLuint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1009];
+   mapi_func _func = ((const mapi_func *) _tbl)[1008];
    ((void (APIENTRY *)(GLenum target, GLenum pname, GLuint *params)) _func)(target, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TexParameterIivEXT)(GLenum target, GLenum pname, const GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1010];
+   mapi_func _func = ((const mapi_func *) _tbl)[1009];
    ((void (APIENTRY *)(GLenum target, GLenum pname, const GLint *params)) _func)(target, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TexParameterIiv)(GLenum target, GLenum pname, const GLint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1010];
+   mapi_func _func = ((const mapi_func *) _tbl)[1009];
    ((void (APIENTRY *)(GLenum target, GLenum pname, const GLint *params)) _func)(target, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TexParameterIuivEXT)(GLenum target, GLenum pname, const GLuint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1011];
+   mapi_func _func = ((const mapi_func *) _tbl)[1010];
    ((void (APIENTRY *)(GLenum target, GLenum pname, const GLuint *params)) _func)(target, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TexParameterIuiv)(GLenum target, GLenum pname, const GLuint *params)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1011];
+   mapi_func _func = ((const mapi_func *) _tbl)[1010];
    ((void (APIENTRY *)(GLenum target, GLenum pname, const GLuint *params)) _func)(target, pname, params);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BeginConditionalRenderNV)(GLuint query, GLenum mode)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1012];
+   mapi_func _func = ((const mapi_func *) _tbl)[1011];
    ((void (APIENTRY *)(GLuint query, GLenum mode)) _func)(query, mode);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BeginConditionalRender)(GLuint query, GLenum mode)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1012];
+   mapi_func _func = ((const mapi_func *) _tbl)[1011];
    ((void (APIENTRY *)(GLuint query, GLenum mode)) _func)(query, mode);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(EndConditionalRenderNV)(void)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1013];
+   mapi_func _func = ((const mapi_func *) _tbl)[1012];
    ((void (APIENTRY *)(void)) _func)();
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(EndConditionalRender)(void)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1013];
+   mapi_func _func = ((const mapi_func *) _tbl)[1012];
    ((void (APIENTRY *)(void)) _func)();
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BeginTransformFeedbackEXT)(GLenum mode)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1014];
+   mapi_func _func = ((const mapi_func *) _tbl)[1013];
    ((void (APIENTRY *)(GLenum mode)) _func)(mode);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BeginTransformFeedback)(GLenum mode)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1014];
+   mapi_func _func = ((const mapi_func *) _tbl)[1013];
    ((void (APIENTRY *)(GLenum mode)) _func)(mode);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindBufferBaseEXT)(GLenum target, GLuint index, GLuint buffer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1015];
+   mapi_func _func = ((const mapi_func *) _tbl)[1014];
    ((void (APIENTRY *)(GLenum target, GLuint index, GLuint buffer)) _func)(target, index, buffer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindBufferBase)(GLenum target, GLuint index, GLuint buffer)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1015];
+   mapi_func _func = ((const mapi_func *) _tbl)[1014];
    ((void (APIENTRY *)(GLenum target, GLuint index, GLuint buffer)) _func)(target, index, buffer);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindBufferOffsetEXT)(GLenum target, GLuint index, GLuint buffer, GLintptr offset)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1016];
+   mapi_func _func = ((const mapi_func *) _tbl)[1015];
    ((void (APIENTRY *)(GLenum target, GLuint index, GLuint buffer, GLintptr offset)) _func)(target, index, buffer, offset);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindBufferRangeEXT)(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1017];
+   mapi_func _func = ((const mapi_func *) _tbl)[1016];
    ((void (APIENTRY *)(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size)) _func)(target, index, buffer, offset, size);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(BindBufferRange)(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1017];
+   mapi_func _func = ((const mapi_func *) _tbl)[1016];
    ((void (APIENTRY *)(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size)) _func)(target, index, buffer, offset, size);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(EndTransformFeedbackEXT)(void)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1018];
+   mapi_func _func = ((const mapi_func *) _tbl)[1017];
    ((void (APIENTRY *)(void)) _func)();
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(EndTransformFeedback)(void)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1018];
+   mapi_func _func = ((const mapi_func *) _tbl)[1017];
    ((void (APIENTRY *)(void)) _func)();
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetTransformFeedbackVaryingEXT)(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1019];
+   mapi_func _func = ((const mapi_func *) _tbl)[1018];
    ((void (APIENTRY *)(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name)) _func)(program, index, bufSize, length, size, type, name);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetTransformFeedbackVarying)(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1019];
+   mapi_func _func = ((const mapi_func *) _tbl)[1018];
    ((void (APIENTRY *)(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name)) _func)(program, index, bufSize, length, size, type, name);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TransformFeedbackVaryingsEXT)(GLuint program, GLsizei count, const char **varyings, GLenum bufferMode)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1020];
+   mapi_func _func = ((const mapi_func *) _tbl)[1019];
    ((void (APIENTRY *)(GLuint program, GLsizei count, const char **varyings, GLenum bufferMode)) _func)(program, count, varyings, bufferMode);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TransformFeedbackVaryings)(GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1020];
+   mapi_func _func = ((const mapi_func *) _tbl)[1019];
    ((void (APIENTRY *)(GLuint program, GLsizei count, const GLchar* *varyings, GLenum bufferMode)) _func)(program, count, varyings, bufferMode);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ProvokingVertexEXT)(GLenum mode)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1021];
+   mapi_func _func = ((const mapi_func *) _tbl)[1020];
    ((void (APIENTRY *)(GLenum mode)) _func)(mode);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ProvokingVertex)(GLenum mode)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1021];
+   mapi_func _func = ((const mapi_func *) _tbl)[1020];
    ((void (APIENTRY *)(GLenum mode)) _func)(mode);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(GetObjectParameterivAPPLE)(GLenum objectType, GLuint name, GLenum pname, GLint *value)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1024];
+   mapi_func _func = ((const mapi_func *) _tbl)[1023];
    ((void (APIENTRY *)(GLenum objectType, GLuint name, GLenum pname, GLint *value)) _func)(objectType, name, pname, value);
 }
 
 GLAPI GLenum APIENTRY GLAPI_PREFIX(ObjectPurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1025];
+   mapi_func _func = ((const mapi_func *) _tbl)[1024];
    return ((GLenum (APIENTRY *)(GLenum objectType, GLuint name, GLenum option)) _func)(objectType, name, option);
 }
 
 GLAPI GLenum APIENTRY GLAPI_PREFIX(ObjectUnpurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1026];
+   mapi_func _func = ((const mapi_func *) _tbl)[1025];
    return ((GLenum (APIENTRY *)(GLenum objectType, GLuint name, GLenum option)) _func)(objectType, name, option);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(ActiveProgramEXT)(GLuint program)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1027];
+   mapi_func _func = ((const mapi_func *) _tbl)[1026];
    ((void (APIENTRY *)(GLuint program)) _func)(program);
 }
 
 GLAPI GLuint APIENTRY GLAPI_PREFIX(CreateShaderProgramEXT)(GLenum type, const GLchar *string)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1028];
+   mapi_func _func = ((const mapi_func *) _tbl)[1027];
    return ((GLuint (APIENTRY *)(GLenum type, const GLchar *string)) _func)(type, string);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(UseShaderProgramEXT)(GLenum type, GLuint program)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1029];
+   mapi_func _func = ((const mapi_func *) _tbl)[1028];
    ((void (APIENTRY *)(GLenum type, GLuint program)) _func)(type, program);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(TextureBarrierNV)(void)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1030];
+   mapi_func _func = ((const mapi_func *) _tbl)[1029];
    ((void (APIENTRY *)(void)) _func)();
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(EGLImageTargetRenderbufferStorageOES)(GLenum target, GLvoid *writeOffset)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1036];
+   mapi_func _func = ((const mapi_func *) _tbl)[1035];
    ((void (APIENTRY *)(GLenum target, GLvoid *writeOffset)) _func)(target, writeOffset);
 }
 
 GLAPI void APIENTRY GLAPI_PREFIX(EGLImageTargetTexture2DOES)(GLenum target, GLvoid *writeOffset)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[1037];
+   mapi_func _func = ((const mapi_func *) _tbl)[1036];
    ((void (APIENTRY *)(GLenum target, GLvoid *writeOffset)) _func)(target, writeOffset);
 }
 
@@ -11809,740 +11809,737 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ClearBufferuiv))"\n"
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetStringi))"\n"
 "\t"STUB_ASM_CODE("435")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexBuffer))"\n"
-"\t"STUB_ASM_CODE("436")"\n"
-
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(FramebufferTexture))"\n"
-"\t"STUB_ASM_CODE("437")"\n"
+"\t"STUB_ASM_CODE("436")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetBufferParameteri64v))"\n"
-"\t"STUB_ASM_CODE("438")"\n"
+"\t"STUB_ASM_CODE("437")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetInteger64i_v))"\n"
-"\t"STUB_ASM_CODE("439")"\n"
+"\t"STUB_ASM_CODE("438")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribDivisor))"\n"
-"\t"STUB_ASM_CODE("440")"\n"
+"\t"STUB_ASM_CODE("439")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(LoadTransposeMatrixdARB))"\n"
-"\t"STUB_ASM_CODE("441")"\n"
+"\t"STUB_ASM_CODE("440")"\n"
 
 ".globl "GLAPI_PREFIX_STR(LoadTransposeMatrixd)"\n"
 ".set "GLAPI_PREFIX_STR(LoadTransposeMatrixd)", "GLAPI_PREFIX_STR(LoadTransposeMatrixdARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(LoadTransposeMatrixfARB))"\n"
-"\t"STUB_ASM_CODE("442")"\n"
+"\t"STUB_ASM_CODE("441")"\n"
 
 ".globl "GLAPI_PREFIX_STR(LoadTransposeMatrixf)"\n"
 ".set "GLAPI_PREFIX_STR(LoadTransposeMatrixf)", "GLAPI_PREFIX_STR(LoadTransposeMatrixfARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(MultTransposeMatrixdARB))"\n"
-"\t"STUB_ASM_CODE("443")"\n"
+"\t"STUB_ASM_CODE("442")"\n"
 
 ".globl "GLAPI_PREFIX_STR(MultTransposeMatrixd)"\n"
 ".set "GLAPI_PREFIX_STR(MultTransposeMatrixd)", "GLAPI_PREFIX_STR(MultTransposeMatrixdARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(MultTransposeMatrixfARB))"\n"
-"\t"STUB_ASM_CODE("444")"\n"
+"\t"STUB_ASM_CODE("443")"\n"
 
 ".globl "GLAPI_PREFIX_STR(MultTransposeMatrixf)"\n"
 ".set "GLAPI_PREFIX_STR(MultTransposeMatrixf)", "GLAPI_PREFIX_STR(MultTransposeMatrixfARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SampleCoverageARB))"\n"
-"\t"STUB_ASM_CODE("445")"\n"
+"\t"STUB_ASM_CODE("444")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SampleCoverage)"\n"
 ".set "GLAPI_PREFIX_STR(SampleCoverage)", "GLAPI_PREFIX_STR(SampleCoverageARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(CompressedTexImage1DARB))"\n"
-"\t"STUB_ASM_CODE("446")"\n"
+"\t"STUB_ASM_CODE("445")"\n"
 
 ".globl "GLAPI_PREFIX_STR(CompressedTexImage1D)"\n"
 ".set "GLAPI_PREFIX_STR(CompressedTexImage1D)", "GLAPI_PREFIX_STR(CompressedTexImage1DARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(CompressedTexImage2DARB))"\n"
-"\t"STUB_ASM_CODE("447")"\n"
+"\t"STUB_ASM_CODE("446")"\n"
 
 ".globl "GLAPI_PREFIX_STR(CompressedTexImage2D)"\n"
 ".set "GLAPI_PREFIX_STR(CompressedTexImage2D)", "GLAPI_PREFIX_STR(CompressedTexImage2DARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(CompressedTexImage3DARB))"\n"
-"\t"STUB_ASM_CODE("448")"\n"
+"\t"STUB_ASM_CODE("447")"\n"
 
 ".globl "GLAPI_PREFIX_STR(CompressedTexImage3D)"\n"
 ".set "GLAPI_PREFIX_STR(CompressedTexImage3D)", "GLAPI_PREFIX_STR(CompressedTexImage3DARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(CompressedTexSubImage1DARB))"\n"
-"\t"STUB_ASM_CODE("449")"\n"
+"\t"STUB_ASM_CODE("448")"\n"
 
 ".globl "GLAPI_PREFIX_STR(CompressedTexSubImage1D)"\n"
 ".set "GLAPI_PREFIX_STR(CompressedTexSubImage1D)", "GLAPI_PREFIX_STR(CompressedTexSubImage1DARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(CompressedTexSubImage2DARB))"\n"
-"\t"STUB_ASM_CODE("450")"\n"
+"\t"STUB_ASM_CODE("449")"\n"
 
 ".globl "GLAPI_PREFIX_STR(CompressedTexSubImage2D)"\n"
 ".set "GLAPI_PREFIX_STR(CompressedTexSubImage2D)", "GLAPI_PREFIX_STR(CompressedTexSubImage2DARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(CompressedTexSubImage3DARB))"\n"
-"\t"STUB_ASM_CODE("451")"\n"
+"\t"STUB_ASM_CODE("450")"\n"
 
 ".globl "GLAPI_PREFIX_STR(CompressedTexSubImage3D)"\n"
 ".set "GLAPI_PREFIX_STR(CompressedTexSubImage3D)", "GLAPI_PREFIX_STR(CompressedTexSubImage3DARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetCompressedTexImageARB))"\n"
-"\t"STUB_ASM_CODE("452")"\n"
+"\t"STUB_ASM_CODE("451")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetCompressedTexImage)"\n"
 ".set "GLAPI_PREFIX_STR(GetCompressedTexImage)", "GLAPI_PREFIX_STR(GetCompressedTexImageARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DisableVertexAttribArrayARB))"\n"
-"\t"STUB_ASM_CODE("453")"\n"
+"\t"STUB_ASM_CODE("452")"\n"
 
 ".globl "GLAPI_PREFIX_STR(DisableVertexAttribArray)"\n"
 ".set "GLAPI_PREFIX_STR(DisableVertexAttribArray)", "GLAPI_PREFIX_STR(DisableVertexAttribArrayARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(EnableVertexAttribArrayARB))"\n"
-"\t"STUB_ASM_CODE("454")"\n"
+"\t"STUB_ASM_CODE("453")"\n"
 
 ".globl "GLAPI_PREFIX_STR(EnableVertexAttribArray)"\n"
 ".set "GLAPI_PREFIX_STR(EnableVertexAttribArray)", "GLAPI_PREFIX_STR(EnableVertexAttribArrayARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetProgramEnvParameterdvARB))"\n"
-"\t"STUB_ASM_CODE("455")"\n"
+"\t"STUB_ASM_CODE("454")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetProgramEnvParameterfvARB))"\n"
-"\t"STUB_ASM_CODE("456")"\n"
+"\t"STUB_ASM_CODE("455")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetProgramLocalParameterdvARB))"\n"
-"\t"STUB_ASM_CODE("457")"\n"
+"\t"STUB_ASM_CODE("456")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetProgramLocalParameterfvARB))"\n"
-"\t"STUB_ASM_CODE("458")"\n"
+"\t"STUB_ASM_CODE("457")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetProgramStringARB))"\n"
-"\t"STUB_ASM_CODE("459")"\n"
+"\t"STUB_ASM_CODE("458")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetProgramivARB))"\n"
-"\t"STUB_ASM_CODE("460")"\n"
+"\t"STUB_ASM_CODE("459")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetVertexAttribdvARB))"\n"
-"\t"STUB_ASM_CODE("461")"\n"
+"\t"STUB_ASM_CODE("460")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetVertexAttribdv)"\n"
 ".set "GLAPI_PREFIX_STR(GetVertexAttribdv)", "GLAPI_PREFIX_STR(GetVertexAttribdvARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetVertexAttribfvARB))"\n"
-"\t"STUB_ASM_CODE("462")"\n"
+"\t"STUB_ASM_CODE("461")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetVertexAttribfv)"\n"
 ".set "GLAPI_PREFIX_STR(GetVertexAttribfv)", "GLAPI_PREFIX_STR(GetVertexAttribfvARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetVertexAttribivARB))"\n"
-"\t"STUB_ASM_CODE("463")"\n"
+"\t"STUB_ASM_CODE("462")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetVertexAttribiv)"\n"
 ".set "GLAPI_PREFIX_STR(GetVertexAttribiv)", "GLAPI_PREFIX_STR(GetVertexAttribivARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ProgramEnvParameter4dARB))"\n"
-"\t"STUB_ASM_CODE("464")"\n"
+"\t"STUB_ASM_CODE("463")"\n"
 
 ".globl "GLAPI_PREFIX_STR(ProgramParameter4dNV)"\n"
 ".set "GLAPI_PREFIX_STR(ProgramParameter4dNV)", "GLAPI_PREFIX_STR(ProgramEnvParameter4dARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ProgramEnvParameter4dvARB))"\n"
-"\t"STUB_ASM_CODE("465")"\n"
+"\t"STUB_ASM_CODE("464")"\n"
 
 ".globl "GLAPI_PREFIX_STR(ProgramParameter4dvNV)"\n"
 ".set "GLAPI_PREFIX_STR(ProgramParameter4dvNV)", "GLAPI_PREFIX_STR(ProgramEnvParameter4dvARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ProgramEnvParameter4fARB))"\n"
-"\t"STUB_ASM_CODE("466")"\n"
+"\t"STUB_ASM_CODE("465")"\n"
 
 ".globl "GLAPI_PREFIX_STR(ProgramParameter4fNV)"\n"
 ".set "GLAPI_PREFIX_STR(ProgramParameter4fNV)", "GLAPI_PREFIX_STR(ProgramEnvParameter4fARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ProgramEnvParameter4fvARB))"\n"
-"\t"STUB_ASM_CODE("467")"\n"
+"\t"STUB_ASM_CODE("466")"\n"
 
 ".globl "GLAPI_PREFIX_STR(ProgramParameter4fvNV)"\n"
 ".set "GLAPI_PREFIX_STR(ProgramParameter4fvNV)", "GLAPI_PREFIX_STR(ProgramEnvParameter4fvARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ProgramLocalParameter4dARB))"\n"
-"\t"STUB_ASM_CODE("468")"\n"
+"\t"STUB_ASM_CODE("467")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ProgramLocalParameter4dvARB))"\n"
-"\t"STUB_ASM_CODE("469")"\n"
+"\t"STUB_ASM_CODE("468")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ProgramLocalParameter4fARB))"\n"
-"\t"STUB_ASM_CODE("470")"\n"
+"\t"STUB_ASM_CODE("469")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ProgramLocalParameter4fvARB))"\n"
-"\t"STUB_ASM_CODE("471")"\n"
+"\t"STUB_ASM_CODE("470")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ProgramStringARB))"\n"
-"\t"STUB_ASM_CODE("472")"\n"
+"\t"STUB_ASM_CODE("471")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib1dARB))"\n"
-"\t"STUB_ASM_CODE("473")"\n"
+"\t"STUB_ASM_CODE("472")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttrib1d)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttrib1d)", "GLAPI_PREFIX_STR(VertexAttrib1dARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib1dvARB))"\n"
-"\t"STUB_ASM_CODE("474")"\n"
+"\t"STUB_ASM_CODE("473")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttrib1dv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttrib1dv)", "GLAPI_PREFIX_STR(VertexAttrib1dvARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib1fARB))"\n"
-"\t"STUB_ASM_CODE("475")"\n"
+"\t"STUB_ASM_CODE("474")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttrib1f)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttrib1f)", "GLAPI_PREFIX_STR(VertexAttrib1fARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib1fvARB))"\n"
-"\t"STUB_ASM_CODE("476")"\n"
+"\t"STUB_ASM_CODE("475")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttrib1fv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttrib1fv)", "GLAPI_PREFIX_STR(VertexAttrib1fvARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib1sARB))"\n"
-"\t"STUB_ASM_CODE("477")"\n"
+"\t"STUB_ASM_CODE("476")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttrib1s)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttrib1s)", "GLAPI_PREFIX_STR(VertexAttrib1sARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib1svARB))"\n"
-"\t"STUB_ASM_CODE("478")"\n"
+"\t"STUB_ASM_CODE("477")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttrib1sv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttrib1sv)", "GLAPI_PREFIX_STR(VertexAttrib1svARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib2dARB))"\n"
-"\t"STUB_ASM_CODE("479")"\n"
+"\t"STUB_ASM_CODE("478")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttrib2d)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttrib2d)", "GLAPI_PREFIX_STR(VertexAttrib2dARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib2dvARB))"\n"
-"\t"STUB_ASM_CODE("480")"\n"
+"\t"STUB_ASM_CODE("479")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttrib2dv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttrib2dv)", "GLAPI_PREFIX_STR(VertexAttrib2dvARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib2fARB))"\n"
-"\t"STUB_ASM_CODE("481")"\n"
+"\t"STUB_ASM_CODE("480")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttrib2f)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttrib2f)", "GLAPI_PREFIX_STR(VertexAttrib2fARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib2fvARB))"\n"
-"\t"STUB_ASM_CODE("482")"\n"
+"\t"STUB_ASM_CODE("481")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttrib2fv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttrib2fv)", "GLAPI_PREFIX_STR(VertexAttrib2fvARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib2sARB))"\n"
-"\t"STUB_ASM_CODE("483")"\n"
+"\t"STUB_ASM_CODE("482")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttrib2s)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttrib2s)", "GLAPI_PREFIX_STR(VertexAttrib2sARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib2svARB))"\n"
-"\t"STUB_ASM_CODE("484")"\n"
+"\t"STUB_ASM_CODE("483")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttrib2sv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttrib2sv)", "GLAPI_PREFIX_STR(VertexAttrib2svARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib3dARB))"\n"
-"\t"STUB_ASM_CODE("485")"\n"
+"\t"STUB_ASM_CODE("484")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttrib3d)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttrib3d)", "GLAPI_PREFIX_STR(VertexAttrib3dARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib3dvARB))"\n"
-"\t"STUB_ASM_CODE("486")"\n"
+"\t"STUB_ASM_CODE("485")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttrib3dv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttrib3dv)", "GLAPI_PREFIX_STR(VertexAttrib3dvARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib3fARB))"\n"
-"\t"STUB_ASM_CODE("487")"\n"
+"\t"STUB_ASM_CODE("486")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttrib3f)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttrib3f)", "GLAPI_PREFIX_STR(VertexAttrib3fARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib3fvARB))"\n"
-"\t"STUB_ASM_CODE("488")"\n"
+"\t"STUB_ASM_CODE("487")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttrib3fv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttrib3fv)", "GLAPI_PREFIX_STR(VertexAttrib3fvARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib3sARB))"\n"
-"\t"STUB_ASM_CODE("489")"\n"
+"\t"STUB_ASM_CODE("488")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttrib3s)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttrib3s)", "GLAPI_PREFIX_STR(VertexAttrib3sARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib3svARB))"\n"
-"\t"STUB_ASM_CODE("490")"\n"
+"\t"STUB_ASM_CODE("489")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttrib3sv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttrib3sv)", "GLAPI_PREFIX_STR(VertexAttrib3svARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib4NbvARB))"\n"
-"\t"STUB_ASM_CODE("491")"\n"
+"\t"STUB_ASM_CODE("490")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttrib4Nbv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttrib4Nbv)", "GLAPI_PREFIX_STR(VertexAttrib4NbvARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib4NivARB))"\n"
-"\t"STUB_ASM_CODE("492")"\n"
+"\t"STUB_ASM_CODE("491")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttrib4Niv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttrib4Niv)", "GLAPI_PREFIX_STR(VertexAttrib4NivARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib4NsvARB))"\n"
-"\t"STUB_ASM_CODE("493")"\n"
+"\t"STUB_ASM_CODE("492")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttrib4Nsv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttrib4Nsv)", "GLAPI_PREFIX_STR(VertexAttrib4NsvARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib4NubARB))"\n"
-"\t"STUB_ASM_CODE("494")"\n"
+"\t"STUB_ASM_CODE("493")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttrib4Nub)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttrib4Nub)", "GLAPI_PREFIX_STR(VertexAttrib4NubARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib4NubvARB))"\n"
-"\t"STUB_ASM_CODE("495")"\n"
+"\t"STUB_ASM_CODE("494")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttrib4Nubv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttrib4Nubv)", "GLAPI_PREFIX_STR(VertexAttrib4NubvARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib4NuivARB))"\n"
-"\t"STUB_ASM_CODE("496")"\n"
+"\t"STUB_ASM_CODE("495")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttrib4Nuiv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttrib4Nuiv)", "GLAPI_PREFIX_STR(VertexAttrib4NuivARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib4NusvARB))"\n"
-"\t"STUB_ASM_CODE("497")"\n"
+"\t"STUB_ASM_CODE("496")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttrib4Nusv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttrib4Nusv)", "GLAPI_PREFIX_STR(VertexAttrib4NusvARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib4bvARB))"\n"
-"\t"STUB_ASM_CODE("498")"\n"
+"\t"STUB_ASM_CODE("497")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttrib4bv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttrib4bv)", "GLAPI_PREFIX_STR(VertexAttrib4bvARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib4dARB))"\n"
-"\t"STUB_ASM_CODE("499")"\n"
+"\t"STUB_ASM_CODE("498")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttrib4d)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttrib4d)", "GLAPI_PREFIX_STR(VertexAttrib4dARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib4dvARB))"\n"
-"\t"STUB_ASM_CODE("500")"\n"
+"\t"STUB_ASM_CODE("499")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttrib4dv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttrib4dv)", "GLAPI_PREFIX_STR(VertexAttrib4dvARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib4fARB))"\n"
-"\t"STUB_ASM_CODE("501")"\n"
+"\t"STUB_ASM_CODE("500")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttrib4f)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttrib4f)", "GLAPI_PREFIX_STR(VertexAttrib4fARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib4fvARB))"\n"
-"\t"STUB_ASM_CODE("502")"\n"
+"\t"STUB_ASM_CODE("501")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttrib4fv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttrib4fv)", "GLAPI_PREFIX_STR(VertexAttrib4fvARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib4ivARB))"\n"
-"\t"STUB_ASM_CODE("503")"\n"
+"\t"STUB_ASM_CODE("502")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttrib4iv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttrib4iv)", "GLAPI_PREFIX_STR(VertexAttrib4ivARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib4sARB))"\n"
-"\t"STUB_ASM_CODE("504")"\n"
+"\t"STUB_ASM_CODE("503")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttrib4s)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttrib4s)", "GLAPI_PREFIX_STR(VertexAttrib4sARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib4svARB))"\n"
-"\t"STUB_ASM_CODE("505")"\n"
+"\t"STUB_ASM_CODE("504")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttrib4sv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttrib4sv)", "GLAPI_PREFIX_STR(VertexAttrib4svARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib4ubvARB))"\n"
-"\t"STUB_ASM_CODE("506")"\n"
+"\t"STUB_ASM_CODE("505")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttrib4ubv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttrib4ubv)", "GLAPI_PREFIX_STR(VertexAttrib4ubvARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib4uivARB))"\n"
-"\t"STUB_ASM_CODE("507")"\n"
+"\t"STUB_ASM_CODE("506")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttrib4uiv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttrib4uiv)", "GLAPI_PREFIX_STR(VertexAttrib4uivARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib4usvARB))"\n"
-"\t"STUB_ASM_CODE("508")"\n"
+"\t"STUB_ASM_CODE("507")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttrib4usv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttrib4usv)", "GLAPI_PREFIX_STR(VertexAttrib4usvARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribPointerARB))"\n"
-"\t"STUB_ASM_CODE("509")"\n"
+"\t"STUB_ASM_CODE("508")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribPointer)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribPointer)", "GLAPI_PREFIX_STR(VertexAttribPointerARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BindBufferARB))"\n"
-"\t"STUB_ASM_CODE("510")"\n"
+"\t"STUB_ASM_CODE("509")"\n"
 
 ".globl "GLAPI_PREFIX_STR(BindBuffer)"\n"
 ".set "GLAPI_PREFIX_STR(BindBuffer)", "GLAPI_PREFIX_STR(BindBufferARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BufferDataARB))"\n"
-"\t"STUB_ASM_CODE("511")"\n"
+"\t"STUB_ASM_CODE("510")"\n"
 
 ".globl "GLAPI_PREFIX_STR(BufferData)"\n"
 ".set "GLAPI_PREFIX_STR(BufferData)", "GLAPI_PREFIX_STR(BufferDataARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BufferSubDataARB))"\n"
-"\t"STUB_ASM_CODE("512")"\n"
+"\t"STUB_ASM_CODE("511")"\n"
 
 ".globl "GLAPI_PREFIX_STR(BufferSubData)"\n"
 ".set "GLAPI_PREFIX_STR(BufferSubData)", "GLAPI_PREFIX_STR(BufferSubDataARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DeleteBuffersARB))"\n"
-"\t"STUB_ASM_CODE("513")"\n"
+"\t"STUB_ASM_CODE("512")"\n"
 
 ".globl "GLAPI_PREFIX_STR(DeleteBuffers)"\n"
 ".set "GLAPI_PREFIX_STR(DeleteBuffers)", "GLAPI_PREFIX_STR(DeleteBuffersARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GenBuffersARB))"\n"
-"\t"STUB_ASM_CODE("514")"\n"
+"\t"STUB_ASM_CODE("513")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GenBuffers)"\n"
 ".set "GLAPI_PREFIX_STR(GenBuffers)", "GLAPI_PREFIX_STR(GenBuffersARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetBufferParameterivARB))"\n"
-"\t"STUB_ASM_CODE("515")"\n"
+"\t"STUB_ASM_CODE("514")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetBufferParameteriv)"\n"
 ".set "GLAPI_PREFIX_STR(GetBufferParameteriv)", "GLAPI_PREFIX_STR(GetBufferParameterivARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetBufferPointervARB))"\n"
-"\t"STUB_ASM_CODE("516")"\n"
+"\t"STUB_ASM_CODE("515")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetBufferPointerv)"\n"
 ".set "GLAPI_PREFIX_STR(GetBufferPointerv)", "GLAPI_PREFIX_STR(GetBufferPointervARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetBufferSubDataARB))"\n"
-"\t"STUB_ASM_CODE("517")"\n"
+"\t"STUB_ASM_CODE("516")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetBufferSubData)"\n"
 ".set "GLAPI_PREFIX_STR(GetBufferSubData)", "GLAPI_PREFIX_STR(GetBufferSubDataARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(IsBufferARB))"\n"
-"\t"STUB_ASM_CODE("518")"\n"
+"\t"STUB_ASM_CODE("517")"\n"
 
 ".globl "GLAPI_PREFIX_STR(IsBuffer)"\n"
 ".set "GLAPI_PREFIX_STR(IsBuffer)", "GLAPI_PREFIX_STR(IsBufferARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(MapBufferARB))"\n"
-"\t"STUB_ASM_CODE("519")"\n"
+"\t"STUB_ASM_CODE("518")"\n"
 
 ".globl "GLAPI_PREFIX_STR(MapBuffer)"\n"
 ".set "GLAPI_PREFIX_STR(MapBuffer)", "GLAPI_PREFIX_STR(MapBufferARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(UnmapBufferARB))"\n"
-"\t"STUB_ASM_CODE("520")"\n"
+"\t"STUB_ASM_CODE("519")"\n"
 
 ".globl "GLAPI_PREFIX_STR(UnmapBuffer)"\n"
 ".set "GLAPI_PREFIX_STR(UnmapBuffer)", "GLAPI_PREFIX_STR(UnmapBufferARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BeginQueryARB))"\n"
-"\t"STUB_ASM_CODE("521")"\n"
+"\t"STUB_ASM_CODE("520")"\n"
 
 ".globl "GLAPI_PREFIX_STR(BeginQuery)"\n"
 ".set "GLAPI_PREFIX_STR(BeginQuery)", "GLAPI_PREFIX_STR(BeginQueryARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DeleteQueriesARB))"\n"
-"\t"STUB_ASM_CODE("522")"\n"
+"\t"STUB_ASM_CODE("521")"\n"
 
 ".globl "GLAPI_PREFIX_STR(DeleteQueries)"\n"
 ".set "GLAPI_PREFIX_STR(DeleteQueries)", "GLAPI_PREFIX_STR(DeleteQueriesARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(EndQueryARB))"\n"
-"\t"STUB_ASM_CODE("523")"\n"
+"\t"STUB_ASM_CODE("522")"\n"
 
 ".globl "GLAPI_PREFIX_STR(EndQuery)"\n"
 ".set "GLAPI_PREFIX_STR(EndQuery)", "GLAPI_PREFIX_STR(EndQueryARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GenQueriesARB))"\n"
-"\t"STUB_ASM_CODE("524")"\n"
+"\t"STUB_ASM_CODE("523")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GenQueries)"\n"
 ".set "GLAPI_PREFIX_STR(GenQueries)", "GLAPI_PREFIX_STR(GenQueriesARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetQueryObjectivARB))"\n"
-"\t"STUB_ASM_CODE("525")"\n"
+"\t"STUB_ASM_CODE("524")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetQueryObjectiv)"\n"
 ".set "GLAPI_PREFIX_STR(GetQueryObjectiv)", "GLAPI_PREFIX_STR(GetQueryObjectivARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetQueryObjectuivARB))"\n"
-"\t"STUB_ASM_CODE("526")"\n"
+"\t"STUB_ASM_CODE("525")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetQueryObjectuiv)"\n"
 ".set "GLAPI_PREFIX_STR(GetQueryObjectuiv)", "GLAPI_PREFIX_STR(GetQueryObjectuivARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetQueryivARB))"\n"
-"\t"STUB_ASM_CODE("527")"\n"
+"\t"STUB_ASM_CODE("526")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetQueryiv)"\n"
 ".set "GLAPI_PREFIX_STR(GetQueryiv)", "GLAPI_PREFIX_STR(GetQueryivARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(IsQueryARB))"\n"
-"\t"STUB_ASM_CODE("528")"\n"
+"\t"STUB_ASM_CODE("527")"\n"
 
 ".globl "GLAPI_PREFIX_STR(IsQuery)"\n"
 ".set "GLAPI_PREFIX_STR(IsQuery)", "GLAPI_PREFIX_STR(IsQueryARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(AttachObjectARB))"\n"
-"\t"STUB_ASM_CODE("529")"\n"
+"\t"STUB_ASM_CODE("528")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(CompileShaderARB))"\n"
-"\t"STUB_ASM_CODE("530")"\n"
+"\t"STUB_ASM_CODE("529")"\n"
 
 ".globl "GLAPI_PREFIX_STR(CompileShader)"\n"
 ".set "GLAPI_PREFIX_STR(CompileShader)", "GLAPI_PREFIX_STR(CompileShaderARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(CreateProgramObjectARB))"\n"
-"\t"STUB_ASM_CODE("531")"\n"
+"\t"STUB_ASM_CODE("530")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(CreateShaderObjectARB))"\n"
-"\t"STUB_ASM_CODE("532")"\n"
+"\t"STUB_ASM_CODE("531")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DeleteObjectARB))"\n"
-"\t"STUB_ASM_CODE("533")"\n"
+"\t"STUB_ASM_CODE("532")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DetachObjectARB))"\n"
-"\t"STUB_ASM_CODE("534")"\n"
+"\t"STUB_ASM_CODE("533")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetActiveUniformARB))"\n"
-"\t"STUB_ASM_CODE("535")"\n"
+"\t"STUB_ASM_CODE("534")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetActiveUniform)"\n"
 ".set "GLAPI_PREFIX_STR(GetActiveUniform)", "GLAPI_PREFIX_STR(GetActiveUniformARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetAttachedObjectsARB))"\n"
-"\t"STUB_ASM_CODE("536")"\n"
+"\t"STUB_ASM_CODE("535")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetHandleARB))"\n"
-"\t"STUB_ASM_CODE("537")"\n"
+"\t"STUB_ASM_CODE("536")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetInfoLogARB))"\n"
-"\t"STUB_ASM_CODE("538")"\n"
+"\t"STUB_ASM_CODE("537")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetObjectParameterfvARB))"\n"
-"\t"STUB_ASM_CODE("539")"\n"
+"\t"STUB_ASM_CODE("538")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetObjectParameterivARB))"\n"
-"\t"STUB_ASM_CODE("540")"\n"
+"\t"STUB_ASM_CODE("539")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetShaderSourceARB))"\n"
-"\t"STUB_ASM_CODE("541")"\n"
+"\t"STUB_ASM_CODE("540")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetShaderSource)"\n"
 ".set "GLAPI_PREFIX_STR(GetShaderSource)", "GLAPI_PREFIX_STR(GetShaderSourceARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetUniformLocationARB))"\n"
-"\t"STUB_ASM_CODE("542")"\n"
+"\t"STUB_ASM_CODE("541")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetUniformLocation)"\n"
 ".set "GLAPI_PREFIX_STR(GetUniformLocation)", "GLAPI_PREFIX_STR(GetUniformLocationARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetUniformfvARB))"\n"
-"\t"STUB_ASM_CODE("543")"\n"
+"\t"STUB_ASM_CODE("542")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetUniformfv)"\n"
 ".set "GLAPI_PREFIX_STR(GetUniformfv)", "GLAPI_PREFIX_STR(GetUniformfvARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetUniformivARB))"\n"
-"\t"STUB_ASM_CODE("544")"\n"
+"\t"STUB_ASM_CODE("543")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetUniformiv)"\n"
 ".set "GLAPI_PREFIX_STR(GetUniformiv)", "GLAPI_PREFIX_STR(GetUniformivARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(LinkProgramARB))"\n"
-"\t"STUB_ASM_CODE("545")"\n"
+"\t"STUB_ASM_CODE("544")"\n"
 
 ".globl "GLAPI_PREFIX_STR(LinkProgram)"\n"
 ".set "GLAPI_PREFIX_STR(LinkProgram)", "GLAPI_PREFIX_STR(LinkProgramARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ShaderSourceARB))"\n"
-"\t"STUB_ASM_CODE("546")"\n"
+"\t"STUB_ASM_CODE("545")"\n"
 
 ".globl "GLAPI_PREFIX_STR(ShaderSource)"\n"
 ".set "GLAPI_PREFIX_STR(ShaderSource)", "GLAPI_PREFIX_STR(ShaderSourceARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(Uniform1fARB))"\n"
-"\t"STUB_ASM_CODE("547")"\n"
+"\t"STUB_ASM_CODE("546")"\n"
 
 ".globl "GLAPI_PREFIX_STR(Uniform1f)"\n"
 ".set "GLAPI_PREFIX_STR(Uniform1f)", "GLAPI_PREFIX_STR(Uniform1fARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(Uniform1fvARB))"\n"
-"\t"STUB_ASM_CODE("548")"\n"
+"\t"STUB_ASM_CODE("547")"\n"
 
 ".globl "GLAPI_PREFIX_STR(Uniform1fv)"\n"
 ".set "GLAPI_PREFIX_STR(Uniform1fv)", "GLAPI_PREFIX_STR(Uniform1fvARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(Uniform1iARB))"\n"
-"\t"STUB_ASM_CODE("549")"\n"
+"\t"STUB_ASM_CODE("548")"\n"
 
 ".globl "GLAPI_PREFIX_STR(Uniform1i)"\n"
 ".set "GLAPI_PREFIX_STR(Uniform1i)", "GLAPI_PREFIX_STR(Uniform1iARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(Uniform1ivARB))"\n"
-"\t"STUB_ASM_CODE("550")"\n"
+"\t"STUB_ASM_CODE("549")"\n"
 
 ".globl "GLAPI_PREFIX_STR(Uniform1iv)"\n"
 ".set "GLAPI_PREFIX_STR(Uniform1iv)", "GLAPI_PREFIX_STR(Uniform1ivARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(Uniform2fARB))"\n"
-"\t"STUB_ASM_CODE("551")"\n"
+"\t"STUB_ASM_CODE("550")"\n"
 
 ".globl "GLAPI_PREFIX_STR(Uniform2f)"\n"
 ".set "GLAPI_PREFIX_STR(Uniform2f)", "GLAPI_PREFIX_STR(Uniform2fARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(Uniform2fvARB))"\n"
-"\t"STUB_ASM_CODE("552")"\n"
+"\t"STUB_ASM_CODE("551")"\n"
 
 ".globl "GLAPI_PREFIX_STR(Uniform2fv)"\n"
 ".set "GLAPI_PREFIX_STR(Uniform2fv)", "GLAPI_PREFIX_STR(Uniform2fvARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(Uniform2iARB))"\n"
-"\t"STUB_ASM_CODE("553")"\n"
+"\t"STUB_ASM_CODE("552")"\n"
 
 ".globl "GLAPI_PREFIX_STR(Uniform2i)"\n"
 ".set "GLAPI_PREFIX_STR(Uniform2i)", "GLAPI_PREFIX_STR(Uniform2iARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(Uniform2ivARB))"\n"
-"\t"STUB_ASM_CODE("554")"\n"
+"\t"STUB_ASM_CODE("553")"\n"
 
 ".globl "GLAPI_PREFIX_STR(Uniform2iv)"\n"
 ".set "GLAPI_PREFIX_STR(Uniform2iv)", "GLAPI_PREFIX_STR(Uniform2ivARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(Uniform3fARB))"\n"
-"\t"STUB_ASM_CODE("555")"\n"
+"\t"STUB_ASM_CODE("554")"\n"
 
 ".globl "GLAPI_PREFIX_STR(Uniform3f)"\n"
 ".set "GLAPI_PREFIX_STR(Uniform3f)", "GLAPI_PREFIX_STR(Uniform3fARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(Uniform3fvARB))"\n"
-"\t"STUB_ASM_CODE("556")"\n"
+"\t"STUB_ASM_CODE("555")"\n"
 
 ".globl "GLAPI_PREFIX_STR(Uniform3fv)"\n"
 ".set "GLAPI_PREFIX_STR(Uniform3fv)", "GLAPI_PREFIX_STR(Uniform3fvARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(Uniform3iARB))"\n"
-"\t"STUB_ASM_CODE("557")"\n"
+"\t"STUB_ASM_CODE("556")"\n"
 
 ".globl "GLAPI_PREFIX_STR(Uniform3i)"\n"
 ".set "GLAPI_PREFIX_STR(Uniform3i)", "GLAPI_PREFIX_STR(Uniform3iARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(Uniform3ivARB))"\n"
-"\t"STUB_ASM_CODE("558")"\n"
+"\t"STUB_ASM_CODE("557")"\n"
 
 ".globl "GLAPI_PREFIX_STR(Uniform3iv)"\n"
 ".set "GLAPI_PREFIX_STR(Uniform3iv)", "GLAPI_PREFIX_STR(Uniform3ivARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(Uniform4fARB))"\n"
-"\t"STUB_ASM_CODE("559")"\n"
+"\t"STUB_ASM_CODE("558")"\n"
 
 ".globl "GLAPI_PREFIX_STR(Uniform4f)"\n"
 ".set "GLAPI_PREFIX_STR(Uniform4f)", "GLAPI_PREFIX_STR(Uniform4fARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(Uniform4fvARB))"\n"
-"\t"STUB_ASM_CODE("560")"\n"
+"\t"STUB_ASM_CODE("559")"\n"
 
 ".globl "GLAPI_PREFIX_STR(Uniform4fv)"\n"
 ".set "GLAPI_PREFIX_STR(Uniform4fv)", "GLAPI_PREFIX_STR(Uniform4fvARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(Uniform4iARB))"\n"
-"\t"STUB_ASM_CODE("561")"\n"
+"\t"STUB_ASM_CODE("560")"\n"
 
 ".globl "GLAPI_PREFIX_STR(Uniform4i)"\n"
 ".set "GLAPI_PREFIX_STR(Uniform4i)", "GLAPI_PREFIX_STR(Uniform4iARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(Uniform4ivARB))"\n"
-"\t"STUB_ASM_CODE("562")"\n"
+"\t"STUB_ASM_CODE("561")"\n"
 
 ".globl "GLAPI_PREFIX_STR(Uniform4iv)"\n"
 ".set "GLAPI_PREFIX_STR(Uniform4iv)", "GLAPI_PREFIX_STR(Uniform4ivARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(UniformMatrix2fvARB))"\n"
-"\t"STUB_ASM_CODE("563")"\n"
+"\t"STUB_ASM_CODE("562")"\n"
 
 ".globl "GLAPI_PREFIX_STR(UniformMatrix2fv)"\n"
 ".set "GLAPI_PREFIX_STR(UniformMatrix2fv)", "GLAPI_PREFIX_STR(UniformMatrix2fvARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(UniformMatrix3fvARB))"\n"
-"\t"STUB_ASM_CODE("564")"\n"
+"\t"STUB_ASM_CODE("563")"\n"
 
 ".globl "GLAPI_PREFIX_STR(UniformMatrix3fv)"\n"
 ".set "GLAPI_PREFIX_STR(UniformMatrix3fv)", "GLAPI_PREFIX_STR(UniformMatrix3fvARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(UniformMatrix4fvARB))"\n"
-"\t"STUB_ASM_CODE("565")"\n"
+"\t"STUB_ASM_CODE("564")"\n"
 
 ".globl "GLAPI_PREFIX_STR(UniformMatrix4fv)"\n"
 ".set "GLAPI_PREFIX_STR(UniformMatrix4fv)", "GLAPI_PREFIX_STR(UniformMatrix4fvARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(UseProgramObjectARB))"\n"
-"\t"STUB_ASM_CODE("566")"\n"
+"\t"STUB_ASM_CODE("565")"\n"
 
 ".globl "GLAPI_PREFIX_STR(UseProgram)"\n"
 ".set "GLAPI_PREFIX_STR(UseProgram)", "GLAPI_PREFIX_STR(UseProgramObjectARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ValidateProgramARB))"\n"
-"\t"STUB_ASM_CODE("567")"\n"
+"\t"STUB_ASM_CODE("566")"\n"
 
 ".globl "GLAPI_PREFIX_STR(ValidateProgram)"\n"
 ".set "GLAPI_PREFIX_STR(ValidateProgram)", "GLAPI_PREFIX_STR(ValidateProgramARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BindAttribLocationARB))"\n"
-"\t"STUB_ASM_CODE("568")"\n"
+"\t"STUB_ASM_CODE("567")"\n"
 
 ".globl "GLAPI_PREFIX_STR(BindAttribLocation)"\n"
 ".set "GLAPI_PREFIX_STR(BindAttribLocation)", "GLAPI_PREFIX_STR(BindAttribLocationARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetActiveAttribARB))"\n"
-"\t"STUB_ASM_CODE("569")"\n"
+"\t"STUB_ASM_CODE("568")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetActiveAttrib)"\n"
 ".set "GLAPI_PREFIX_STR(GetActiveAttrib)", "GLAPI_PREFIX_STR(GetActiveAttribARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetAttribLocationARB))"\n"
-"\t"STUB_ASM_CODE("570")"\n"
+"\t"STUB_ASM_CODE("569")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetAttribLocation)"\n"
 ".set "GLAPI_PREFIX_STR(GetAttribLocation)", "GLAPI_PREFIX_STR(GetAttribLocationARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DrawBuffersARB))"\n"
-"\t"STUB_ASM_CODE("571")"\n"
+"\t"STUB_ASM_CODE("570")"\n"
 
 ".globl "GLAPI_PREFIX_STR(DrawBuffers)"\n"
 ".set "GLAPI_PREFIX_STR(DrawBuffers)", "GLAPI_PREFIX_STR(DrawBuffersARB)"\n"
@@ -12554,10 +12551,10 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DrawBuffersARB))"\n"
 ".set "GLAPI_PREFIX_STR(DrawBuffersNV)", "GLAPI_PREFIX_STR(DrawBuffersARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ClampColorARB))"\n"
-"\t"STUB_ASM_CODE("572")"\n"
+"\t"STUB_ASM_CODE("571")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DrawArraysInstancedARB))"\n"
-"\t"STUB_ASM_CODE("573")"\n"
+"\t"STUB_ASM_CODE("572")"\n"
 
 ".globl "GLAPI_PREFIX_STR(DrawArraysInstanced)"\n"
 ".set "GLAPI_PREFIX_STR(DrawArraysInstanced)", "GLAPI_PREFIX_STR(DrawArraysInstancedARB)"\n"
@@ -12566,7 +12563,7 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DrawArraysInstancedARB))"\n"
 ".set "GLAPI_PREFIX_STR(DrawArraysInstancedEXT)", "GLAPI_PREFIX_STR(DrawArraysInstancedARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DrawElementsInstancedARB))"\n"
-"\t"STUB_ASM_CODE("574")"\n"
+"\t"STUB_ASM_CODE("573")"\n"
 
 ".globl "GLAPI_PREFIX_STR(DrawElementsInstanced)"\n"
 ".set "GLAPI_PREFIX_STR(DrawElementsInstanced)", "GLAPI_PREFIX_STR(DrawElementsInstancedARB)"\n"
@@ -12575,409 +12572,412 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DrawElementsInstancedARB))"\n"
 ".set "GLAPI_PREFIX_STR(DrawElementsInstancedEXT)", "GLAPI_PREFIX_STR(DrawElementsInstancedARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(RenderbufferStorageMultisample))"\n"
-"\t"STUB_ASM_CODE("575")"\n"
+"\t"STUB_ASM_CODE("574")"\n"
 
 ".globl "GLAPI_PREFIX_STR(RenderbufferStorageMultisampleEXT)"\n"
 ".set "GLAPI_PREFIX_STR(RenderbufferStorageMultisampleEXT)", "GLAPI_PREFIX_STR(RenderbufferStorageMultisample)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(FramebufferTextureARB))"\n"
-"\t"STUB_ASM_CODE("576")"\n"
+"\t"STUB_ASM_CODE("575")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(FramebufferTextureFaceARB))"\n"
-"\t"STUB_ASM_CODE("577")"\n"
+"\t"STUB_ASM_CODE("576")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ProgramParameteriARB))"\n"
-"\t"STUB_ASM_CODE("578")"\n"
+"\t"STUB_ASM_CODE("577")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribDivisorARB))"\n"
-"\t"STUB_ASM_CODE("579")"\n"
+"\t"STUB_ASM_CODE("578")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(FlushMappedBufferRange))"\n"
-"\t"STUB_ASM_CODE("580")"\n"
+"\t"STUB_ASM_CODE("579")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(MapBufferRange))"\n"
-"\t"STUB_ASM_CODE("581")"\n"
+"\t"STUB_ASM_CODE("580")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexBufferARB))"\n"
-"\t"STUB_ASM_CODE("582")"\n"
+"\t"STUB_ASM_CODE("581")"\n"
+
+".globl "GLAPI_PREFIX_STR(TexBuffer)"\n"
+".set "GLAPI_PREFIX_STR(TexBuffer)", "GLAPI_PREFIX_STR(TexBufferARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BindVertexArray))"\n"
-"\t"STUB_ASM_CODE("583")"\n"
+"\t"STUB_ASM_CODE("582")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GenVertexArrays))"\n"
-"\t"STUB_ASM_CODE("584")"\n"
+"\t"STUB_ASM_CODE("583")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(CopyBufferSubData))"\n"
-"\t"STUB_ASM_CODE("585")"\n"
+"\t"STUB_ASM_CODE("584")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ClientWaitSync))"\n"
-"\t"STUB_ASM_CODE("586")"\n"
+"\t"STUB_ASM_CODE("585")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DeleteSync))"\n"
-"\t"STUB_ASM_CODE("587")"\n"
+"\t"STUB_ASM_CODE("586")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(FenceSync))"\n"
-"\t"STUB_ASM_CODE("588")"\n"
+"\t"STUB_ASM_CODE("587")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetInteger64v))"\n"
-"\t"STUB_ASM_CODE("589")"\n"
+"\t"STUB_ASM_CODE("588")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetSynciv))"\n"
-"\t"STUB_ASM_CODE("590")"\n"
+"\t"STUB_ASM_CODE("589")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(IsSync))"\n"
-"\t"STUB_ASM_CODE("591")"\n"
+"\t"STUB_ASM_CODE("590")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WaitSync))"\n"
-"\t"STUB_ASM_CODE("592")"\n"
+"\t"STUB_ASM_CODE("591")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DrawElementsBaseVertex))"\n"
-"\t"STUB_ASM_CODE("593")"\n"
+"\t"STUB_ASM_CODE("592")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DrawElementsInstancedBaseVertex))"\n"
-"\t"STUB_ASM_CODE("594")"\n"
+"\t"STUB_ASM_CODE("593")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DrawRangeElementsBaseVertex))"\n"
-"\t"STUB_ASM_CODE("595")"\n"
+"\t"STUB_ASM_CODE("594")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(MultiDrawElementsBaseVertex))"\n"
-"\t"STUB_ASM_CODE("596")"\n"
+"\t"STUB_ASM_CODE("595")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BlendEquationSeparateiARB))"\n"
-"\t"STUB_ASM_CODE("597")"\n"
+"\t"STUB_ASM_CODE("596")"\n"
 
 ".globl "GLAPI_PREFIX_STR(BlendEquationSeparateIndexedAMD)"\n"
 ".set "GLAPI_PREFIX_STR(BlendEquationSeparateIndexedAMD)", "GLAPI_PREFIX_STR(BlendEquationSeparateiARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BlendEquationiARB))"\n"
-"\t"STUB_ASM_CODE("598")"\n"
+"\t"STUB_ASM_CODE("597")"\n"
 
 ".globl "GLAPI_PREFIX_STR(BlendEquationIndexedAMD)"\n"
 ".set "GLAPI_PREFIX_STR(BlendEquationIndexedAMD)", "GLAPI_PREFIX_STR(BlendEquationiARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BlendFuncSeparateiARB))"\n"
-"\t"STUB_ASM_CODE("599")"\n"
+"\t"STUB_ASM_CODE("598")"\n"
 
 ".globl "GLAPI_PREFIX_STR(BlendFuncSeparateIndexedAMD)"\n"
 ".set "GLAPI_PREFIX_STR(BlendFuncSeparateIndexedAMD)", "GLAPI_PREFIX_STR(BlendFuncSeparateiARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BlendFunciARB))"\n"
-"\t"STUB_ASM_CODE("600")"\n"
+"\t"STUB_ASM_CODE("599")"\n"
 
 ".globl "GLAPI_PREFIX_STR(BlendFuncIndexedAMD)"\n"
 ".set "GLAPI_PREFIX_STR(BlendFuncIndexedAMD)", "GLAPI_PREFIX_STR(BlendFunciARB)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BindFragDataLocationIndexed))"\n"
-"\t"STUB_ASM_CODE("601")"\n"
+"\t"STUB_ASM_CODE("600")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetFragDataIndex))"\n"
-"\t"STUB_ASM_CODE("602")"\n"
+"\t"STUB_ASM_CODE("601")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BindSampler))"\n"
-"\t"STUB_ASM_CODE("603")"\n"
+"\t"STUB_ASM_CODE("602")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DeleteSamplers))"\n"
-"\t"STUB_ASM_CODE("604")"\n"
+"\t"STUB_ASM_CODE("603")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GenSamplers))"\n"
-"\t"STUB_ASM_CODE("605")"\n"
+"\t"STUB_ASM_CODE("604")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetSamplerParameterIiv))"\n"
-"\t"STUB_ASM_CODE("606")"\n"
+"\t"STUB_ASM_CODE("605")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetSamplerParameterIuiv))"\n"
-"\t"STUB_ASM_CODE("607")"\n"
+"\t"STUB_ASM_CODE("606")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetSamplerParameterfv))"\n"
-"\t"STUB_ASM_CODE("608")"\n"
+"\t"STUB_ASM_CODE("607")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetSamplerParameteriv))"\n"
-"\t"STUB_ASM_CODE("609")"\n"
+"\t"STUB_ASM_CODE("608")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(IsSampler))"\n"
-"\t"STUB_ASM_CODE("610")"\n"
+"\t"STUB_ASM_CODE("609")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SamplerParameterIiv))"\n"
-"\t"STUB_ASM_CODE("611")"\n"
+"\t"STUB_ASM_CODE("610")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SamplerParameterIuiv))"\n"
-"\t"STUB_ASM_CODE("612")"\n"
+"\t"STUB_ASM_CODE("611")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SamplerParameterf))"\n"
-"\t"STUB_ASM_CODE("613")"\n"
+"\t"STUB_ASM_CODE("612")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SamplerParameterfv))"\n"
-"\t"STUB_ASM_CODE("614")"\n"
+"\t"STUB_ASM_CODE("613")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SamplerParameteri))"\n"
-"\t"STUB_ASM_CODE("615")"\n"
+"\t"STUB_ASM_CODE("614")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SamplerParameteriv))"\n"
-"\t"STUB_ASM_CODE("616")"\n"
+"\t"STUB_ASM_CODE("615")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ColorP3ui))"\n"
-"\t"STUB_ASM_CODE("617")"\n"
+"\t"STUB_ASM_CODE("616")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ColorP3uiv))"\n"
-"\t"STUB_ASM_CODE("618")"\n"
+"\t"STUB_ASM_CODE("617")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ColorP4ui))"\n"
-"\t"STUB_ASM_CODE("619")"\n"
+"\t"STUB_ASM_CODE("618")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ColorP4uiv))"\n"
-"\t"STUB_ASM_CODE("620")"\n"
+"\t"STUB_ASM_CODE("619")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(MultiTexCoordP1ui))"\n"
-"\t"STUB_ASM_CODE("621")"\n"
+"\t"STUB_ASM_CODE("620")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(MultiTexCoordP1uiv))"\n"
-"\t"STUB_ASM_CODE("622")"\n"
+"\t"STUB_ASM_CODE("621")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(MultiTexCoordP2ui))"\n"
-"\t"STUB_ASM_CODE("623")"\n"
+"\t"STUB_ASM_CODE("622")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(MultiTexCoordP2uiv))"\n"
-"\t"STUB_ASM_CODE("624")"\n"
+"\t"STUB_ASM_CODE("623")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(MultiTexCoordP3ui))"\n"
-"\t"STUB_ASM_CODE("625")"\n"
+"\t"STUB_ASM_CODE("624")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(MultiTexCoordP3uiv))"\n"
-"\t"STUB_ASM_CODE("626")"\n"
+"\t"STUB_ASM_CODE("625")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(MultiTexCoordP4ui))"\n"
-"\t"STUB_ASM_CODE("627")"\n"
+"\t"STUB_ASM_CODE("626")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(MultiTexCoordP4uiv))"\n"
-"\t"STUB_ASM_CODE("628")"\n"
+"\t"STUB_ASM_CODE("627")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(NormalP3ui))"\n"
-"\t"STUB_ASM_CODE("629")"\n"
+"\t"STUB_ASM_CODE("628")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(NormalP3uiv))"\n"
-"\t"STUB_ASM_CODE("630")"\n"
+"\t"STUB_ASM_CODE("629")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColorP3ui))"\n"
-"\t"STUB_ASM_CODE("631")"\n"
+"\t"STUB_ASM_CODE("630")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColorP3uiv))"\n"
-"\t"STUB_ASM_CODE("632")"\n"
+"\t"STUB_ASM_CODE("631")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexCoordP1ui))"\n"
-"\t"STUB_ASM_CODE("633")"\n"
+"\t"STUB_ASM_CODE("632")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexCoordP1uiv))"\n"
-"\t"STUB_ASM_CODE("634")"\n"
+"\t"STUB_ASM_CODE("633")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexCoordP2ui))"\n"
-"\t"STUB_ASM_CODE("635")"\n"
+"\t"STUB_ASM_CODE("634")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexCoordP2uiv))"\n"
-"\t"STUB_ASM_CODE("636")"\n"
+"\t"STUB_ASM_CODE("635")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexCoordP3ui))"\n"
-"\t"STUB_ASM_CODE("637")"\n"
+"\t"STUB_ASM_CODE("636")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexCoordP3uiv))"\n"
-"\t"STUB_ASM_CODE("638")"\n"
+"\t"STUB_ASM_CODE("637")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexCoordP4ui))"\n"
-"\t"STUB_ASM_CODE("639")"\n"
+"\t"STUB_ASM_CODE("638")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexCoordP4uiv))"\n"
-"\t"STUB_ASM_CODE("640")"\n"
+"\t"STUB_ASM_CODE("639")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribP1ui))"\n"
-"\t"STUB_ASM_CODE("641")"\n"
+"\t"STUB_ASM_CODE("640")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribP1uiv))"\n"
-"\t"STUB_ASM_CODE("642")"\n"
+"\t"STUB_ASM_CODE("641")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribP2ui))"\n"
-"\t"STUB_ASM_CODE("643")"\n"
+"\t"STUB_ASM_CODE("642")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribP2uiv))"\n"
-"\t"STUB_ASM_CODE("644")"\n"
+"\t"STUB_ASM_CODE("643")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribP3ui))"\n"
-"\t"STUB_ASM_CODE("645")"\n"
+"\t"STUB_ASM_CODE("644")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribP3uiv))"\n"
-"\t"STUB_ASM_CODE("646")"\n"
+"\t"STUB_ASM_CODE("645")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribP4ui))"\n"
-"\t"STUB_ASM_CODE("647")"\n"
+"\t"STUB_ASM_CODE("646")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribP4uiv))"\n"
-"\t"STUB_ASM_CODE("648")"\n"
+"\t"STUB_ASM_CODE("647")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexP2ui))"\n"
-"\t"STUB_ASM_CODE("649")"\n"
+"\t"STUB_ASM_CODE("648")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexP2uiv))"\n"
-"\t"STUB_ASM_CODE("650")"\n"
+"\t"STUB_ASM_CODE("649")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexP3ui))"\n"
-"\t"STUB_ASM_CODE("651")"\n"
+"\t"STUB_ASM_CODE("650")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexP3uiv))"\n"
-"\t"STUB_ASM_CODE("652")"\n"
+"\t"STUB_ASM_CODE("651")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexP4ui))"\n"
-"\t"STUB_ASM_CODE("653")"\n"
+"\t"STUB_ASM_CODE("652")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexP4uiv))"\n"
-"\t"STUB_ASM_CODE("654")"\n"
+"\t"STUB_ASM_CODE("653")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BindTransformFeedback))"\n"
-"\t"STUB_ASM_CODE("655")"\n"
+"\t"STUB_ASM_CODE("654")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DeleteTransformFeedbacks))"\n"
-"\t"STUB_ASM_CODE("656")"\n"
+"\t"STUB_ASM_CODE("655")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DrawTransformFeedback))"\n"
-"\t"STUB_ASM_CODE("657")"\n"
+"\t"STUB_ASM_CODE("656")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GenTransformFeedbacks))"\n"
-"\t"STUB_ASM_CODE("658")"\n"
+"\t"STUB_ASM_CODE("657")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(IsTransformFeedback))"\n"
-"\t"STUB_ASM_CODE("659")"\n"
+"\t"STUB_ASM_CODE("658")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(PauseTransformFeedback))"\n"
-"\t"STUB_ASM_CODE("660")"\n"
+"\t"STUB_ASM_CODE("659")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ResumeTransformFeedback))"\n"
-"\t"STUB_ASM_CODE("661")"\n"
+"\t"STUB_ASM_CODE("660")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ClearDepthf))"\n"
-"\t"STUB_ASM_CODE("662")"\n"
+"\t"STUB_ASM_CODE("661")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DepthRangef))"\n"
-"\t"STUB_ASM_CODE("663")"\n"
+"\t"STUB_ASM_CODE("662")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetShaderPrecisionFormat))"\n"
-"\t"STUB_ASM_CODE("664")"\n"
+"\t"STUB_ASM_CODE("663")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ReleaseShaderCompiler))"\n"
-"\t"STUB_ASM_CODE("665")"\n"
+"\t"STUB_ASM_CODE("664")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ShaderBinary))"\n"
-"\t"STUB_ASM_CODE("666")"\n"
+"\t"STUB_ASM_CODE("665")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DebugMessageCallbackARB))"\n"
-"\t"STUB_ASM_CODE("670")"\n"
+"\t"STUB_ASM_CODE("669")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DebugMessageControlARB))"\n"
-"\t"STUB_ASM_CODE("671")"\n"
+"\t"STUB_ASM_CODE("670")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DebugMessageInsertARB))"\n"
-"\t"STUB_ASM_CODE("672")"\n"
+"\t"STUB_ASM_CODE("671")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetDebugMessageLogARB))"\n"
-"\t"STUB_ASM_CODE("673")"\n"
+"\t"STUB_ASM_CODE("672")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetGraphicsResetStatusARB))"\n"
-"\t"STUB_ASM_CODE("674")"\n"
+"\t"STUB_ASM_CODE("673")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnColorTableARB))"\n"
-"\t"STUB_ASM_CODE("675")"\n"
+"\t"STUB_ASM_CODE("674")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnCompressedTexImageARB))"\n"
-"\t"STUB_ASM_CODE("676")"\n"
+"\t"STUB_ASM_CODE("675")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnConvolutionFilterARB))"\n"
-"\t"STUB_ASM_CODE("677")"\n"
+"\t"STUB_ASM_CODE("676")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnHistogramARB))"\n"
-"\t"STUB_ASM_CODE("678")"\n"
+"\t"STUB_ASM_CODE("677")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnMapdvARB))"\n"
-"\t"STUB_ASM_CODE("679")"\n"
+"\t"STUB_ASM_CODE("678")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnMapfvARB))"\n"
-"\t"STUB_ASM_CODE("680")"\n"
+"\t"STUB_ASM_CODE("679")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnMapivARB))"\n"
-"\t"STUB_ASM_CODE("681")"\n"
+"\t"STUB_ASM_CODE("680")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnMinmaxARB))"\n"
-"\t"STUB_ASM_CODE("682")"\n"
+"\t"STUB_ASM_CODE("681")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnPixelMapfvARB))"\n"
-"\t"STUB_ASM_CODE("683")"\n"
+"\t"STUB_ASM_CODE("682")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnPixelMapuivARB))"\n"
-"\t"STUB_ASM_CODE("684")"\n"
+"\t"STUB_ASM_CODE("683")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnPixelMapusvARB))"\n"
-"\t"STUB_ASM_CODE("685")"\n"
+"\t"STUB_ASM_CODE("684")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnPolygonStippleARB))"\n"
-"\t"STUB_ASM_CODE("686")"\n"
+"\t"STUB_ASM_CODE("685")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnSeparableFilterARB))"\n"
-"\t"STUB_ASM_CODE("687")"\n"
+"\t"STUB_ASM_CODE("686")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnTexImageARB))"\n"
-"\t"STUB_ASM_CODE("688")"\n"
+"\t"STUB_ASM_CODE("687")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnUniformdvARB))"\n"
-"\t"STUB_ASM_CODE("689")"\n"
+"\t"STUB_ASM_CODE("688")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnUniformfvARB))"\n"
-"\t"STUB_ASM_CODE("690")"\n"
+"\t"STUB_ASM_CODE("689")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnUniformivARB))"\n"
-"\t"STUB_ASM_CODE("691")"\n"
+"\t"STUB_ASM_CODE("690")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnUniformuivARB))"\n"
-"\t"STUB_ASM_CODE("692")"\n"
+"\t"STUB_ASM_CODE("691")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ReadnPixelsARB))"\n"
-"\t"STUB_ASM_CODE("693")"\n"
+"\t"STUB_ASM_CODE("692")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexStorage1D))"\n"
-"\t"STUB_ASM_CODE("694")"\n"
+"\t"STUB_ASM_CODE("693")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexStorage2D))"\n"
-"\t"STUB_ASM_CODE("695")"\n"
+"\t"STUB_ASM_CODE("694")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexStorage3D))"\n"
-"\t"STUB_ASM_CODE("696")"\n"
+"\t"STUB_ASM_CODE("695")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TextureStorage1DEXT))"\n"
-"\t"STUB_ASM_CODE("697")"\n"
+"\t"STUB_ASM_CODE("696")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TextureStorage2DEXT))"\n"
-"\t"STUB_ASM_CODE("698")"\n"
+"\t"STUB_ASM_CODE("697")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TextureStorage3DEXT))"\n"
-"\t"STUB_ASM_CODE("699")"\n"
+"\t"STUB_ASM_CODE("698")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(PolygonOffsetEXT))"\n"
-"\t"STUB_ASM_CODE("700")"\n"
+"\t"STUB_ASM_CODE("699")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ColorPointerEXT))"\n"
-"\t"STUB_ASM_CODE("719")"\n"
+"\t"STUB_ASM_CODE("718")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(EdgeFlagPointerEXT))"\n"
-"\t"STUB_ASM_CODE("720")"\n"
+"\t"STUB_ASM_CODE("719")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(IndexPointerEXT))"\n"
-"\t"STUB_ASM_CODE("721")"\n"
+"\t"STUB_ASM_CODE("720")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(NormalPointerEXT))"\n"
-"\t"STUB_ASM_CODE("722")"\n"
+"\t"STUB_ASM_CODE("721")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexCoordPointerEXT))"\n"
-"\t"STUB_ASM_CODE("723")"\n"
+"\t"STUB_ASM_CODE("722")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexPointerEXT))"\n"
-"\t"STUB_ASM_CODE("724")"\n"
+"\t"STUB_ASM_CODE("723")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(PointParameterfEXT))"\n"
-"\t"STUB_ASM_CODE("725")"\n"
+"\t"STUB_ASM_CODE("724")"\n"
 
 ".globl "GLAPI_PREFIX_STR(PointParameterf)"\n"
 ".set "GLAPI_PREFIX_STR(PointParameterf)", "GLAPI_PREFIX_STR(PointParameterfEXT)"\n"
@@ -12986,7 +12986,7 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(PointParameterfEXT))"\n"
 ".set "GLAPI_PREFIX_STR(PointParameterfARB)", "GLAPI_PREFIX_STR(PointParameterfEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(PointParameterfvEXT))"\n"
-"\t"STUB_ASM_CODE("726")"\n"
+"\t"STUB_ASM_CODE("725")"\n"
 
 ".globl "GLAPI_PREFIX_STR(PointParameterfv)"\n"
 ".set "GLAPI_PREFIX_STR(PointParameterfv)", "GLAPI_PREFIX_STR(PointParameterfvEXT)"\n"
@@ -12995,211 +12995,211 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(PointParameterfvEXT))"\n"
 ".set "GLAPI_PREFIX_STR(PointParameterfvARB)", "GLAPI_PREFIX_STR(PointParameterfvEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(LockArraysEXT))"\n"
-"\t"STUB_ASM_CODE("727")"\n"
+"\t"STUB_ASM_CODE("726")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(UnlockArraysEXT))"\n"
-"\t"STUB_ASM_CODE("728")"\n"
+"\t"STUB_ASM_CODE("727")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColor3bEXT))"\n"
-"\t"STUB_ASM_CODE("729")"\n"
+"\t"STUB_ASM_CODE("728")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColor3b)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColor3b)", "GLAPI_PREFIX_STR(SecondaryColor3bEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColor3bvEXT))"\n"
-"\t"STUB_ASM_CODE("730")"\n"
+"\t"STUB_ASM_CODE("729")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColor3bv)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColor3bv)", "GLAPI_PREFIX_STR(SecondaryColor3bvEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColor3dEXT))"\n"
-"\t"STUB_ASM_CODE("731")"\n"
+"\t"STUB_ASM_CODE("730")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColor3d)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColor3d)", "GLAPI_PREFIX_STR(SecondaryColor3dEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColor3dvEXT))"\n"
-"\t"STUB_ASM_CODE("732")"\n"
+"\t"STUB_ASM_CODE("731")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColor3dv)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColor3dv)", "GLAPI_PREFIX_STR(SecondaryColor3dvEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColor3fEXT))"\n"
-"\t"STUB_ASM_CODE("733")"\n"
+"\t"STUB_ASM_CODE("732")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColor3f)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColor3f)", "GLAPI_PREFIX_STR(SecondaryColor3fEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColor3fvEXT))"\n"
-"\t"STUB_ASM_CODE("734")"\n"
+"\t"STUB_ASM_CODE("733")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColor3fv)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColor3fv)", "GLAPI_PREFIX_STR(SecondaryColor3fvEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColor3iEXT))"\n"
-"\t"STUB_ASM_CODE("735")"\n"
+"\t"STUB_ASM_CODE("734")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColor3i)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColor3i)", "GLAPI_PREFIX_STR(SecondaryColor3iEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColor3ivEXT))"\n"
-"\t"STUB_ASM_CODE("736")"\n"
+"\t"STUB_ASM_CODE("735")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColor3iv)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColor3iv)", "GLAPI_PREFIX_STR(SecondaryColor3ivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColor3sEXT))"\n"
-"\t"STUB_ASM_CODE("737")"\n"
+"\t"STUB_ASM_CODE("736")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColor3s)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColor3s)", "GLAPI_PREFIX_STR(SecondaryColor3sEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColor3svEXT))"\n"
-"\t"STUB_ASM_CODE("738")"\n"
+"\t"STUB_ASM_CODE("737")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColor3sv)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColor3sv)", "GLAPI_PREFIX_STR(SecondaryColor3svEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColor3ubEXT))"\n"
-"\t"STUB_ASM_CODE("739")"\n"
+"\t"STUB_ASM_CODE("738")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColor3ub)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColor3ub)", "GLAPI_PREFIX_STR(SecondaryColor3ubEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColor3ubvEXT))"\n"
-"\t"STUB_ASM_CODE("740")"\n"
+"\t"STUB_ASM_CODE("739")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColor3ubv)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColor3ubv)", "GLAPI_PREFIX_STR(SecondaryColor3ubvEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColor3uiEXT))"\n"
-"\t"STUB_ASM_CODE("741")"\n"
+"\t"STUB_ASM_CODE("740")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColor3ui)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColor3ui)", "GLAPI_PREFIX_STR(SecondaryColor3uiEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColor3uivEXT))"\n"
-"\t"STUB_ASM_CODE("742")"\n"
+"\t"STUB_ASM_CODE("741")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColor3uiv)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColor3uiv)", "GLAPI_PREFIX_STR(SecondaryColor3uivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColor3usEXT))"\n"
-"\t"STUB_ASM_CODE("743")"\n"
+"\t"STUB_ASM_CODE("742")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColor3us)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColor3us)", "GLAPI_PREFIX_STR(SecondaryColor3usEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColor3usvEXT))"\n"
-"\t"STUB_ASM_CODE("744")"\n"
+"\t"STUB_ASM_CODE("743")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColor3usv)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColor3usv)", "GLAPI_PREFIX_STR(SecondaryColor3usvEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColorPointerEXT))"\n"
-"\t"STUB_ASM_CODE("745")"\n"
+"\t"STUB_ASM_CODE("744")"\n"
 
 ".globl "GLAPI_PREFIX_STR(SecondaryColorPointer)"\n"
 ".set "GLAPI_PREFIX_STR(SecondaryColorPointer)", "GLAPI_PREFIX_STR(SecondaryColorPointerEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(MultiDrawArraysEXT))"\n"
-"\t"STUB_ASM_CODE("746")"\n"
+"\t"STUB_ASM_CODE("745")"\n"
 
 ".globl "GLAPI_PREFIX_STR(MultiDrawArrays)"\n"
 ".set "GLAPI_PREFIX_STR(MultiDrawArrays)", "GLAPI_PREFIX_STR(MultiDrawArraysEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(MultiDrawElementsEXT))"\n"
-"\t"STUB_ASM_CODE("747")"\n"
+"\t"STUB_ASM_CODE("746")"\n"
 
 ".globl "GLAPI_PREFIX_STR(MultiDrawElements)"\n"
 ".set "GLAPI_PREFIX_STR(MultiDrawElements)", "GLAPI_PREFIX_STR(MultiDrawElementsEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(FogCoordPointerEXT))"\n"
-"\t"STUB_ASM_CODE("748")"\n"
+"\t"STUB_ASM_CODE("747")"\n"
 
 ".globl "GLAPI_PREFIX_STR(FogCoordPointer)"\n"
 ".set "GLAPI_PREFIX_STR(FogCoordPointer)", "GLAPI_PREFIX_STR(FogCoordPointerEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(FogCoorddEXT))"\n"
-"\t"STUB_ASM_CODE("749")"\n"
+"\t"STUB_ASM_CODE("748")"\n"
 
 ".globl "GLAPI_PREFIX_STR(FogCoordd)"\n"
 ".set "GLAPI_PREFIX_STR(FogCoordd)", "GLAPI_PREFIX_STR(FogCoorddEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(FogCoorddvEXT))"\n"
-"\t"STUB_ASM_CODE("750")"\n"
+"\t"STUB_ASM_CODE("749")"\n"
 
 ".globl "GLAPI_PREFIX_STR(FogCoorddv)"\n"
 ".set "GLAPI_PREFIX_STR(FogCoorddv)", "GLAPI_PREFIX_STR(FogCoorddvEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(FogCoordfEXT))"\n"
-"\t"STUB_ASM_CODE("751")"\n"
+"\t"STUB_ASM_CODE("750")"\n"
 
 ".globl "GLAPI_PREFIX_STR(FogCoordf)"\n"
 ".set "GLAPI_PREFIX_STR(FogCoordf)", "GLAPI_PREFIX_STR(FogCoordfEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(FogCoordfvEXT))"\n"
-"\t"STUB_ASM_CODE("752")"\n"
+"\t"STUB_ASM_CODE("751")"\n"
 
 ".globl "GLAPI_PREFIX_STR(FogCoordfv)"\n"
 ".set "GLAPI_PREFIX_STR(FogCoordfv)", "GLAPI_PREFIX_STR(FogCoordfvEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BlendFuncSeparateEXT))"\n"
-"\t"STUB_ASM_CODE("754")"\n"
+"\t"STUB_ASM_CODE("753")"\n"
 
 ".globl "GLAPI_PREFIX_STR(BlendFuncSeparate)"\n"
 ".set "GLAPI_PREFIX_STR(BlendFuncSeparate)", "GLAPI_PREFIX_STR(BlendFuncSeparateEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(FlushVertexArrayRangeNV))"\n"
-"\t"STUB_ASM_CODE("755")"\n"
+"\t"STUB_ASM_CODE("754")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexArrayRangeNV))"\n"
-"\t"STUB_ASM_CODE("756")"\n"
+"\t"STUB_ASM_CODE("755")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(CombinerInputNV))"\n"
-"\t"STUB_ASM_CODE("757")"\n"
+"\t"STUB_ASM_CODE("756")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(CombinerOutputNV))"\n"
-"\t"STUB_ASM_CODE("758")"\n"
+"\t"STUB_ASM_CODE("757")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(CombinerParameterfNV))"\n"
-"\t"STUB_ASM_CODE("759")"\n"
+"\t"STUB_ASM_CODE("758")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(CombinerParameterfvNV))"\n"
-"\t"STUB_ASM_CODE("760")"\n"
+"\t"STUB_ASM_CODE("759")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(CombinerParameteriNV))"\n"
-"\t"STUB_ASM_CODE("761")"\n"
+"\t"STUB_ASM_CODE("760")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(CombinerParameterivNV))"\n"
-"\t"STUB_ASM_CODE("762")"\n"
+"\t"STUB_ASM_CODE("761")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(FinalCombinerInputNV))"\n"
-"\t"STUB_ASM_CODE("763")"\n"
+"\t"STUB_ASM_CODE("762")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetCombinerInputParameterfvNV))"\n"
-"\t"STUB_ASM_CODE("764")"\n"
+"\t"STUB_ASM_CODE("763")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetCombinerInputParameterivNV))"\n"
-"\t"STUB_ASM_CODE("765")"\n"
+"\t"STUB_ASM_CODE("764")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetCombinerOutputParameterfvNV))"\n"
-"\t"STUB_ASM_CODE("766")"\n"
+"\t"STUB_ASM_CODE("765")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetCombinerOutputParameterivNV))"\n"
-"\t"STUB_ASM_CODE("767")"\n"
+"\t"STUB_ASM_CODE("766")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetFinalCombinerInputParameterfvNV))"\n"
-"\t"STUB_ASM_CODE("768")"\n"
+"\t"STUB_ASM_CODE("767")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetFinalCombinerInputParameterivNV))"\n"
-"\t"STUB_ASM_CODE("769")"\n"
+"\t"STUB_ASM_CODE("768")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ResizeBuffersMESA))"\n"
-"\t"STUB_ASM_CODE("770")"\n"
+"\t"STUB_ASM_CODE("769")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos2dMESA))"\n"
-"\t"STUB_ASM_CODE("771")"\n"
+"\t"STUB_ASM_CODE("770")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos2d)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2d)", "GLAPI_PREFIX_STR(WindowPos2dMESA)"\n"
@@ -13208,7 +13208,7 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos2dMESA))"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2dARB)", "GLAPI_PREFIX_STR(WindowPos2dMESA)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos2dvMESA))"\n"
-"\t"STUB_ASM_CODE("772")"\n"
+"\t"STUB_ASM_CODE("771")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos2dv)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2dv)", "GLAPI_PREFIX_STR(WindowPos2dvMESA)"\n"
@@ -13217,7 +13217,7 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos2dvMESA))"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2dvARB)", "GLAPI_PREFIX_STR(WindowPos2dvMESA)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos2fMESA))"\n"
-"\t"STUB_ASM_CODE("773")"\n"
+"\t"STUB_ASM_CODE("772")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos2f)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2f)", "GLAPI_PREFIX_STR(WindowPos2fMESA)"\n"
@@ -13226,7 +13226,7 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos2fMESA))"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2fARB)", "GLAPI_PREFIX_STR(WindowPos2fMESA)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos2fvMESA))"\n"
-"\t"STUB_ASM_CODE("774")"\n"
+"\t"STUB_ASM_CODE("773")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos2fv)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2fv)", "GLAPI_PREFIX_STR(WindowPos2fvMESA)"\n"
@@ -13235,7 +13235,7 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos2fvMESA))"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2fvARB)", "GLAPI_PREFIX_STR(WindowPos2fvMESA)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos2iMESA))"\n"
-"\t"STUB_ASM_CODE("775")"\n"
+"\t"STUB_ASM_CODE("774")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos2i)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2i)", "GLAPI_PREFIX_STR(WindowPos2iMESA)"\n"
@@ -13244,7 +13244,7 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos2iMESA))"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2iARB)", "GLAPI_PREFIX_STR(WindowPos2iMESA)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos2ivMESA))"\n"
-"\t"STUB_ASM_CODE("776")"\n"
+"\t"STUB_ASM_CODE("775")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos2iv)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2iv)", "GLAPI_PREFIX_STR(WindowPos2ivMESA)"\n"
@@ -13253,7 +13253,7 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos2ivMESA))"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2ivARB)", "GLAPI_PREFIX_STR(WindowPos2ivMESA)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos2sMESA))"\n"
-"\t"STUB_ASM_CODE("777")"\n"
+"\t"STUB_ASM_CODE("776")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos2s)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2s)", "GLAPI_PREFIX_STR(WindowPos2sMESA)"\n"
@@ -13262,7 +13262,7 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos2sMESA))"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2sARB)", "GLAPI_PREFIX_STR(WindowPos2sMESA)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos2svMESA))"\n"
-"\t"STUB_ASM_CODE("778")"\n"
+"\t"STUB_ASM_CODE("777")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos2sv)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2sv)", "GLAPI_PREFIX_STR(WindowPos2svMESA)"\n"
@@ -13271,7 +13271,7 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos2svMESA))"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2svARB)", "GLAPI_PREFIX_STR(WindowPos2svMESA)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos3dMESA))"\n"
-"\t"STUB_ASM_CODE("779")"\n"
+"\t"STUB_ASM_CODE("778")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos3d)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3d)", "GLAPI_PREFIX_STR(WindowPos3dMESA)"\n"
@@ -13280,7 +13280,7 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos3dMESA))"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3dARB)", "GLAPI_PREFIX_STR(WindowPos3dMESA)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos3dvMESA))"\n"
-"\t"STUB_ASM_CODE("780")"\n"
+"\t"STUB_ASM_CODE("779")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos3dv)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3dv)", "GLAPI_PREFIX_STR(WindowPos3dvMESA)"\n"
@@ -13289,7 +13289,7 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos3dvMESA))"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3dvARB)", "GLAPI_PREFIX_STR(WindowPos3dvMESA)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos3fMESA))"\n"
-"\t"STUB_ASM_CODE("781")"\n"
+"\t"STUB_ASM_CODE("780")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos3f)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3f)", "GLAPI_PREFIX_STR(WindowPos3fMESA)"\n"
@@ -13298,7 +13298,7 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos3fMESA))"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3fARB)", "GLAPI_PREFIX_STR(WindowPos3fMESA)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos3fvMESA))"\n"
-"\t"STUB_ASM_CODE("782")"\n"
+"\t"STUB_ASM_CODE("781")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos3fv)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3fv)", "GLAPI_PREFIX_STR(WindowPos3fvMESA)"\n"
@@ -13307,7 +13307,7 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos3fvMESA))"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3fvARB)", "GLAPI_PREFIX_STR(WindowPos3fvMESA)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos3iMESA))"\n"
-"\t"STUB_ASM_CODE("783")"\n"
+"\t"STUB_ASM_CODE("782")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos3i)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3i)", "GLAPI_PREFIX_STR(WindowPos3iMESA)"\n"
@@ -13316,7 +13316,7 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos3iMESA))"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3iARB)", "GLAPI_PREFIX_STR(WindowPos3iMESA)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos3ivMESA))"\n"
-"\t"STUB_ASM_CODE("784")"\n"
+"\t"STUB_ASM_CODE("783")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos3iv)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3iv)", "GLAPI_PREFIX_STR(WindowPos3ivMESA)"\n"
@@ -13325,7 +13325,7 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos3ivMESA))"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3ivARB)", "GLAPI_PREFIX_STR(WindowPos3ivMESA)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos3sMESA))"\n"
-"\t"STUB_ASM_CODE("785")"\n"
+"\t"STUB_ASM_CODE("784")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos3s)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3s)", "GLAPI_PREFIX_STR(WindowPos3sMESA)"\n"
@@ -13334,7 +13334,7 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos3sMESA))"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3sARB)", "GLAPI_PREFIX_STR(WindowPos3sMESA)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos3svMESA))"\n"
-"\t"STUB_ASM_CODE("786")"\n"
+"\t"STUB_ASM_CODE("785")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos3sv)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3sv)", "GLAPI_PREFIX_STR(WindowPos3svMESA)"\n"
@@ -13343,70 +13343,70 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos3svMESA))"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3svARB)", "GLAPI_PREFIX_STR(WindowPos3svMESA)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos4dMESA))"\n"
-"\t"STUB_ASM_CODE("787")"\n"
+"\t"STUB_ASM_CODE("786")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos4dvMESA))"\n"
-"\t"STUB_ASM_CODE("788")"\n"
+"\t"STUB_ASM_CODE("787")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos4fMESA))"\n"
-"\t"STUB_ASM_CODE("789")"\n"
+"\t"STUB_ASM_CODE("788")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos4fvMESA))"\n"
-"\t"STUB_ASM_CODE("790")"\n"
+"\t"STUB_ASM_CODE("789")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos4iMESA))"\n"
-"\t"STUB_ASM_CODE("791")"\n"
+"\t"STUB_ASM_CODE("790")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos4ivMESA))"\n"
-"\t"STUB_ASM_CODE("792")"\n"
+"\t"STUB_ASM_CODE("791")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos4sMESA))"\n"
-"\t"STUB_ASM_CODE("793")"\n"
+"\t"STUB_ASM_CODE("792")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos4svMESA))"\n"
-"\t"STUB_ASM_CODE("794")"\n"
+"\t"STUB_ASM_CODE("793")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(AreProgramsResidentNV))"\n"
-"\t"STUB_ASM_CODE("804")"\n"
+"\t"STUB_ASM_CODE("803")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BindProgramNV))"\n"
-"\t"STUB_ASM_CODE("805")"\n"
+"\t"STUB_ASM_CODE("804")"\n"
 
 ".globl "GLAPI_PREFIX_STR(BindProgramARB)"\n"
 ".set "GLAPI_PREFIX_STR(BindProgramARB)", "GLAPI_PREFIX_STR(BindProgramNV)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DeleteProgramsNV))"\n"
-"\t"STUB_ASM_CODE("806")"\n"
+"\t"STUB_ASM_CODE("805")"\n"
 
 ".globl "GLAPI_PREFIX_STR(DeleteProgramsARB)"\n"
 ".set "GLAPI_PREFIX_STR(DeleteProgramsARB)", "GLAPI_PREFIX_STR(DeleteProgramsNV)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ExecuteProgramNV))"\n"
-"\t"STUB_ASM_CODE("807")"\n"
+"\t"STUB_ASM_CODE("806")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GenProgramsNV))"\n"
-"\t"STUB_ASM_CODE("808")"\n"
+"\t"STUB_ASM_CODE("807")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GenProgramsARB)"\n"
 ".set "GLAPI_PREFIX_STR(GenProgramsARB)", "GLAPI_PREFIX_STR(GenProgramsNV)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetProgramParameterdvNV))"\n"
-"\t"STUB_ASM_CODE("809")"\n"
+"\t"STUB_ASM_CODE("808")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetProgramParameterfvNV))"\n"
-"\t"STUB_ASM_CODE("810")"\n"
+"\t"STUB_ASM_CODE("809")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetProgramStringNV))"\n"
-"\t"STUB_ASM_CODE("811")"\n"
+"\t"STUB_ASM_CODE("810")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetProgramivNV))"\n"
-"\t"STUB_ASM_CODE("812")"\n"
+"\t"STUB_ASM_CODE("811")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetTrackMatrixivNV))"\n"
-"\t"STUB_ASM_CODE("813")"\n"
+"\t"STUB_ASM_CODE("812")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetVertexAttribPointervNV))"\n"
-"\t"STUB_ASM_CODE("814")"\n"
+"\t"STUB_ASM_CODE("813")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetVertexAttribPointerv)"\n"
 ".set "GLAPI_PREFIX_STR(GetVertexAttribPointerv)", "GLAPI_PREFIX_STR(GetVertexAttribPointervNV)"\n"
@@ -13415,568 +13415,568 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetVertexAttribPointervNV))"\n"
 ".set "GLAPI_PREFIX_STR(GetVertexAttribPointervARB)", "GLAPI_PREFIX_STR(GetVertexAttribPointervNV)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetVertexAttribdvNV))"\n"
-"\t"STUB_ASM_CODE("815")"\n"
+"\t"STUB_ASM_CODE("814")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetVertexAttribfvNV))"\n"
-"\t"STUB_ASM_CODE("816")"\n"
+"\t"STUB_ASM_CODE("815")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetVertexAttribivNV))"\n"
-"\t"STUB_ASM_CODE("817")"\n"
+"\t"STUB_ASM_CODE("816")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(IsProgramNV))"\n"
-"\t"STUB_ASM_CODE("818")"\n"
+"\t"STUB_ASM_CODE("817")"\n"
 
 ".globl "GLAPI_PREFIX_STR(IsProgramARB)"\n"
 ".set "GLAPI_PREFIX_STR(IsProgramARB)", "GLAPI_PREFIX_STR(IsProgramNV)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(LoadProgramNV))"\n"
-"\t"STUB_ASM_CODE("819")"\n"
+"\t"STUB_ASM_CODE("818")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ProgramParameters4dvNV))"\n"
-"\t"STUB_ASM_CODE("820")"\n"
+"\t"STUB_ASM_CODE("819")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ProgramParameters4fvNV))"\n"
-"\t"STUB_ASM_CODE("821")"\n"
+"\t"STUB_ASM_CODE("820")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(RequestResidentProgramsNV))"\n"
-"\t"STUB_ASM_CODE("822")"\n"
+"\t"STUB_ASM_CODE("821")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TrackMatrixNV))"\n"
-"\t"STUB_ASM_CODE("823")"\n"
+"\t"STUB_ASM_CODE("822")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib1dNV))"\n"
-"\t"STUB_ASM_CODE("824")"\n"
+"\t"STUB_ASM_CODE("823")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib1dvNV))"\n"
-"\t"STUB_ASM_CODE("825")"\n"
+"\t"STUB_ASM_CODE("824")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib1fNV))"\n"
-"\t"STUB_ASM_CODE("826")"\n"
+"\t"STUB_ASM_CODE("825")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib1fvNV))"\n"
-"\t"STUB_ASM_CODE("827")"\n"
+"\t"STUB_ASM_CODE("826")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib1sNV))"\n"
-"\t"STUB_ASM_CODE("828")"\n"
+"\t"STUB_ASM_CODE("827")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib1svNV))"\n"
-"\t"STUB_ASM_CODE("829")"\n"
+"\t"STUB_ASM_CODE("828")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib2dNV))"\n"
-"\t"STUB_ASM_CODE("830")"\n"
+"\t"STUB_ASM_CODE("829")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib2dvNV))"\n"
-"\t"STUB_ASM_CODE("831")"\n"
+"\t"STUB_ASM_CODE("830")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib2fNV))"\n"
-"\t"STUB_ASM_CODE("832")"\n"
+"\t"STUB_ASM_CODE("831")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib2fvNV))"\n"
-"\t"STUB_ASM_CODE("833")"\n"
+"\t"STUB_ASM_CODE("832")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib2sNV))"\n"
-"\t"STUB_ASM_CODE("834")"\n"
+"\t"STUB_ASM_CODE("833")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib2svNV))"\n"
-"\t"STUB_ASM_CODE("835")"\n"
+"\t"STUB_ASM_CODE("834")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib3dNV))"\n"
-"\t"STUB_ASM_CODE("836")"\n"
+"\t"STUB_ASM_CODE("835")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib3dvNV))"\n"
-"\t"STUB_ASM_CODE("837")"\n"
+"\t"STUB_ASM_CODE("836")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib3fNV))"\n"
-"\t"STUB_ASM_CODE("838")"\n"
+"\t"STUB_ASM_CODE("837")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib3fvNV))"\n"
-"\t"STUB_ASM_CODE("839")"\n"
+"\t"STUB_ASM_CODE("838")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib3sNV))"\n"
-"\t"STUB_ASM_CODE("840")"\n"
+"\t"STUB_ASM_CODE("839")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib3svNV))"\n"
-"\t"STUB_ASM_CODE("841")"\n"
+"\t"STUB_ASM_CODE("840")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib4dNV))"\n"
-"\t"STUB_ASM_CODE("842")"\n"
+"\t"STUB_ASM_CODE("841")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib4dvNV))"\n"
-"\t"STUB_ASM_CODE("843")"\n"
+"\t"STUB_ASM_CODE("842")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib4fNV))"\n"
-"\t"STUB_ASM_CODE("844")"\n"
+"\t"STUB_ASM_CODE("843")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib4fvNV))"\n"
-"\t"STUB_ASM_CODE("845")"\n"
+"\t"STUB_ASM_CODE("844")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib4sNV))"\n"
-"\t"STUB_ASM_CODE("846")"\n"
+"\t"STUB_ASM_CODE("845")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib4svNV))"\n"
-"\t"STUB_ASM_CODE("847")"\n"
+"\t"STUB_ASM_CODE("846")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib4ubNV))"\n"
-"\t"STUB_ASM_CODE("848")"\n"
+"\t"STUB_ASM_CODE("847")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib4ubvNV))"\n"
-"\t"STUB_ASM_CODE("849")"\n"
+"\t"STUB_ASM_CODE("848")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribPointerNV))"\n"
-"\t"STUB_ASM_CODE("850")"\n"
+"\t"STUB_ASM_CODE("849")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs1dvNV))"\n"
-"\t"STUB_ASM_CODE("851")"\n"
+"\t"STUB_ASM_CODE("850")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs1fvNV))"\n"
-"\t"STUB_ASM_CODE("852")"\n"
+"\t"STUB_ASM_CODE("851")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs1svNV))"\n"
-"\t"STUB_ASM_CODE("853")"\n"
+"\t"STUB_ASM_CODE("852")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs2dvNV))"\n"
-"\t"STUB_ASM_CODE("854")"\n"
+"\t"STUB_ASM_CODE("853")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs2fvNV))"\n"
-"\t"STUB_ASM_CODE("855")"\n"
+"\t"STUB_ASM_CODE("854")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs2svNV))"\n"
-"\t"STUB_ASM_CODE("856")"\n"
+"\t"STUB_ASM_CODE("855")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs3dvNV))"\n"
-"\t"STUB_ASM_CODE("857")"\n"
+"\t"STUB_ASM_CODE("856")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs3fvNV))"\n"
-"\t"STUB_ASM_CODE("858")"\n"
+"\t"STUB_ASM_CODE("857")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs3svNV))"\n"
-"\t"STUB_ASM_CODE("859")"\n"
+"\t"STUB_ASM_CODE("858")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs4dvNV))"\n"
-"\t"STUB_ASM_CODE("860")"\n"
+"\t"STUB_ASM_CODE("859")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs4fvNV))"\n"
-"\t"STUB_ASM_CODE("861")"\n"
+"\t"STUB_ASM_CODE("860")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs4svNV))"\n"
-"\t"STUB_ASM_CODE("862")"\n"
+"\t"STUB_ASM_CODE("861")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs4ubvNV))"\n"
-"\t"STUB_ASM_CODE("863")"\n"
+"\t"STUB_ASM_CODE("862")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetTexBumpParameterfvATI))"\n"
-"\t"STUB_ASM_CODE("864")"\n"
+"\t"STUB_ASM_CODE("863")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetTexBumpParameterivATI))"\n"
-"\t"STUB_ASM_CODE("865")"\n"
+"\t"STUB_ASM_CODE("864")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexBumpParameterfvATI))"\n"
-"\t"STUB_ASM_CODE("866")"\n"
+"\t"STUB_ASM_CODE("865")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexBumpParameterivATI))"\n"
-"\t"STUB_ASM_CODE("867")"\n"
+"\t"STUB_ASM_CODE("866")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(AlphaFragmentOp1ATI))"\n"
-"\t"STUB_ASM_CODE("868")"\n"
+"\t"STUB_ASM_CODE("867")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(AlphaFragmentOp2ATI))"\n"
-"\t"STUB_ASM_CODE("869")"\n"
+"\t"STUB_ASM_CODE("868")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(AlphaFragmentOp3ATI))"\n"
-"\t"STUB_ASM_CODE("870")"\n"
+"\t"STUB_ASM_CODE("869")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BeginFragmentShaderATI))"\n"
-"\t"STUB_ASM_CODE("871")"\n"
+"\t"STUB_ASM_CODE("870")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BindFragmentShaderATI))"\n"
-"\t"STUB_ASM_CODE("872")"\n"
+"\t"STUB_ASM_CODE("871")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ColorFragmentOp1ATI))"\n"
-"\t"STUB_ASM_CODE("873")"\n"
+"\t"STUB_ASM_CODE("872")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ColorFragmentOp2ATI))"\n"
-"\t"STUB_ASM_CODE("874")"\n"
+"\t"STUB_ASM_CODE("873")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ColorFragmentOp3ATI))"\n"
-"\t"STUB_ASM_CODE("875")"\n"
+"\t"STUB_ASM_CODE("874")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DeleteFragmentShaderATI))"\n"
-"\t"STUB_ASM_CODE("876")"\n"
+"\t"STUB_ASM_CODE("875")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(EndFragmentShaderATI))"\n"
-"\t"STUB_ASM_CODE("877")"\n"
+"\t"STUB_ASM_CODE("876")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GenFragmentShadersATI))"\n"
-"\t"STUB_ASM_CODE("878")"\n"
+"\t"STUB_ASM_CODE("877")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(PassTexCoordATI))"\n"
-"\t"STUB_ASM_CODE("879")"\n"
+"\t"STUB_ASM_CODE("878")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SampleMapATI))"\n"
-"\t"STUB_ASM_CODE("880")"\n"
+"\t"STUB_ASM_CODE("879")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SetFragmentShaderConstantATI))"\n"
-"\t"STUB_ASM_CODE("881")"\n"
+"\t"STUB_ASM_CODE("880")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(PointParameteriNV))"\n"
-"\t"STUB_ASM_CODE("882")"\n"
+"\t"STUB_ASM_CODE("881")"\n"
 
 ".globl "GLAPI_PREFIX_STR(PointParameteri)"\n"
 ".set "GLAPI_PREFIX_STR(PointParameteri)", "GLAPI_PREFIX_STR(PointParameteriNV)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(PointParameterivNV))"\n"
-"\t"STUB_ASM_CODE("883")"\n"
+"\t"STUB_ASM_CODE("882")"\n"
 
 ".globl "GLAPI_PREFIX_STR(PointParameteriv)"\n"
 ".set "GLAPI_PREFIX_STR(PointParameteriv)", "GLAPI_PREFIX_STR(PointParameterivNV)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DeleteVertexArrays))"\n"
-"\t"STUB_ASM_CODE("886")"\n"
+"\t"STUB_ASM_CODE("885")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(IsVertexArray))"\n"
-"\t"STUB_ASM_CODE("888")"\n"
+"\t"STUB_ASM_CODE("887")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetProgramNamedParameterdvNV))"\n"
-"\t"STUB_ASM_CODE("889")"\n"
+"\t"STUB_ASM_CODE("888")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetProgramNamedParameterfvNV))"\n"
-"\t"STUB_ASM_CODE("890")"\n"
+"\t"STUB_ASM_CODE("889")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ProgramNamedParameter4dNV))"\n"
-"\t"STUB_ASM_CODE("891")"\n"
+"\t"STUB_ASM_CODE("890")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ProgramNamedParameter4dvNV))"\n"
-"\t"STUB_ASM_CODE("892")"\n"
+"\t"STUB_ASM_CODE("891")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ProgramNamedParameter4fNV))"\n"
-"\t"STUB_ASM_CODE("893")"\n"
+"\t"STUB_ASM_CODE("892")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ProgramNamedParameter4fvNV))"\n"
-"\t"STUB_ASM_CODE("894")"\n"
+"\t"STUB_ASM_CODE("893")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(PrimitiveRestartIndexNV))"\n"
-"\t"STUB_ASM_CODE("895")"\n"
+"\t"STUB_ASM_CODE("894")"\n"
 
 ".globl "GLAPI_PREFIX_STR(PrimitiveRestartIndex)"\n"
 ".set "GLAPI_PREFIX_STR(PrimitiveRestartIndex)", "GLAPI_PREFIX_STR(PrimitiveRestartIndexNV)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(PrimitiveRestartNV))"\n"
-"\t"STUB_ASM_CODE("896")"\n"
+"\t"STUB_ASM_CODE("895")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BlendEquationSeparate))"\n"
-"\t"STUB_ASM_CODE("944")"\n"
+"\t"STUB_ASM_CODE("943")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BindFramebufferEXT))"\n"
-"\t"STUB_ASM_CODE("945")"\n"
+"\t"STUB_ASM_CODE("944")"\n"
 
 ".globl "GLAPI_PREFIX_STR(BindFramebuffer)"\n"
 ".set "GLAPI_PREFIX_STR(BindFramebuffer)", "GLAPI_PREFIX_STR(BindFramebufferEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BindRenderbufferEXT))"\n"
-"\t"STUB_ASM_CODE("946")"\n"
+"\t"STUB_ASM_CODE("945")"\n"
 
 ".globl "GLAPI_PREFIX_STR(BindRenderbuffer)"\n"
 ".set "GLAPI_PREFIX_STR(BindRenderbuffer)", "GLAPI_PREFIX_STR(BindRenderbufferEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(CheckFramebufferStatusEXT))"\n"
-"\t"STUB_ASM_CODE("947")"\n"
+"\t"STUB_ASM_CODE("946")"\n"
 
 ".globl "GLAPI_PREFIX_STR(CheckFramebufferStatus)"\n"
 ".set "GLAPI_PREFIX_STR(CheckFramebufferStatus)", "GLAPI_PREFIX_STR(CheckFramebufferStatusEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DeleteFramebuffersEXT))"\n"
-"\t"STUB_ASM_CODE("948")"\n"
+"\t"STUB_ASM_CODE("947")"\n"
 
 ".globl "GLAPI_PREFIX_STR(DeleteFramebuffers)"\n"
 ".set "GLAPI_PREFIX_STR(DeleteFramebuffers)", "GLAPI_PREFIX_STR(DeleteFramebuffersEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DeleteRenderbuffersEXT))"\n"
-"\t"STUB_ASM_CODE("949")"\n"
+"\t"STUB_ASM_CODE("948")"\n"
 
 ".globl "GLAPI_PREFIX_STR(DeleteRenderbuffers)"\n"
 ".set "GLAPI_PREFIX_STR(DeleteRenderbuffers)", "GLAPI_PREFIX_STR(DeleteRenderbuffersEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(FramebufferRenderbufferEXT))"\n"
-"\t"STUB_ASM_CODE("950")"\n"
+"\t"STUB_ASM_CODE("949")"\n"
 
 ".globl "GLAPI_PREFIX_STR(FramebufferRenderbuffer)"\n"
 ".set "GLAPI_PREFIX_STR(FramebufferRenderbuffer)", "GLAPI_PREFIX_STR(FramebufferRenderbufferEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(FramebufferTexture1DEXT))"\n"
-"\t"STUB_ASM_CODE("951")"\n"
+"\t"STUB_ASM_CODE("950")"\n"
 
 ".globl "GLAPI_PREFIX_STR(FramebufferTexture1D)"\n"
 ".set "GLAPI_PREFIX_STR(FramebufferTexture1D)", "GLAPI_PREFIX_STR(FramebufferTexture1DEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(FramebufferTexture2DEXT))"\n"
-"\t"STUB_ASM_CODE("952")"\n"
+"\t"STUB_ASM_CODE("951")"\n"
 
 ".globl "GLAPI_PREFIX_STR(FramebufferTexture2D)"\n"
 ".set "GLAPI_PREFIX_STR(FramebufferTexture2D)", "GLAPI_PREFIX_STR(FramebufferTexture2DEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(FramebufferTexture3DEXT))"\n"
-"\t"STUB_ASM_CODE("953")"\n"
+"\t"STUB_ASM_CODE("952")"\n"
 
 ".globl "GLAPI_PREFIX_STR(FramebufferTexture3D)"\n"
 ".set "GLAPI_PREFIX_STR(FramebufferTexture3D)", "GLAPI_PREFIX_STR(FramebufferTexture3DEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GenFramebuffersEXT))"\n"
-"\t"STUB_ASM_CODE("954")"\n"
+"\t"STUB_ASM_CODE("953")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GenFramebuffers)"\n"
 ".set "GLAPI_PREFIX_STR(GenFramebuffers)", "GLAPI_PREFIX_STR(GenFramebuffersEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GenRenderbuffersEXT))"\n"
-"\t"STUB_ASM_CODE("955")"\n"
+"\t"STUB_ASM_CODE("954")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GenRenderbuffers)"\n"
 ".set "GLAPI_PREFIX_STR(GenRenderbuffers)", "GLAPI_PREFIX_STR(GenRenderbuffersEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GenerateMipmapEXT))"\n"
-"\t"STUB_ASM_CODE("956")"\n"
+"\t"STUB_ASM_CODE("955")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GenerateMipmap)"\n"
 ".set "GLAPI_PREFIX_STR(GenerateMipmap)", "GLAPI_PREFIX_STR(GenerateMipmapEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetFramebufferAttachmentParameterivEXT))"\n"
-"\t"STUB_ASM_CODE("957")"\n"
+"\t"STUB_ASM_CODE("956")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetFramebufferAttachmentParameteriv)"\n"
 ".set "GLAPI_PREFIX_STR(GetFramebufferAttachmentParameteriv)", "GLAPI_PREFIX_STR(GetFramebufferAttachmentParameterivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetRenderbufferParameterivEXT))"\n"
-"\t"STUB_ASM_CODE("958")"\n"
+"\t"STUB_ASM_CODE("957")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetRenderbufferParameteriv)"\n"
 ".set "GLAPI_PREFIX_STR(GetRenderbufferParameteriv)", "GLAPI_PREFIX_STR(GetRenderbufferParameterivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(IsFramebufferEXT))"\n"
-"\t"STUB_ASM_CODE("959")"\n"
+"\t"STUB_ASM_CODE("958")"\n"
 
 ".globl "GLAPI_PREFIX_STR(IsFramebuffer)"\n"
 ".set "GLAPI_PREFIX_STR(IsFramebuffer)", "GLAPI_PREFIX_STR(IsFramebufferEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(IsRenderbufferEXT))"\n"
-"\t"STUB_ASM_CODE("960")"\n"
+"\t"STUB_ASM_CODE("959")"\n"
 
 ".globl "GLAPI_PREFIX_STR(IsRenderbuffer)"\n"
 ".set "GLAPI_PREFIX_STR(IsRenderbuffer)", "GLAPI_PREFIX_STR(IsRenderbufferEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(RenderbufferStorageEXT))"\n"
-"\t"STUB_ASM_CODE("961")"\n"
+"\t"STUB_ASM_CODE("960")"\n"
 
 ".globl "GLAPI_PREFIX_STR(RenderbufferStorage)"\n"
 ".set "GLAPI_PREFIX_STR(RenderbufferStorage)", "GLAPI_PREFIX_STR(RenderbufferStorageEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BlitFramebuffer))"\n"
-"\t"STUB_ASM_CODE("962")"\n"
+"\t"STUB_ASM_CODE("961")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BindFragDataLocationEXT))"\n"
-"\t"STUB_ASM_CODE("965")"\n"
+"\t"STUB_ASM_CODE("964")"\n"
 
 ".globl "GLAPI_PREFIX_STR(BindFragDataLocation)"\n"
 ".set "GLAPI_PREFIX_STR(BindFragDataLocation)", "GLAPI_PREFIX_STR(BindFragDataLocationEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetFragDataLocationEXT))"\n"
-"\t"STUB_ASM_CODE("966")"\n"
+"\t"STUB_ASM_CODE("965")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetFragDataLocation)"\n"
 ".set "GLAPI_PREFIX_STR(GetFragDataLocation)", "GLAPI_PREFIX_STR(GetFragDataLocationEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetUniformuivEXT))"\n"
-"\t"STUB_ASM_CODE("967")"\n"
+"\t"STUB_ASM_CODE("966")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetUniformuiv)"\n"
 ".set "GLAPI_PREFIX_STR(GetUniformuiv)", "GLAPI_PREFIX_STR(GetUniformuivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetVertexAttribIivEXT))"\n"
-"\t"STUB_ASM_CODE("968")"\n"
+"\t"STUB_ASM_CODE("967")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetVertexAttribIiv)"\n"
 ".set "GLAPI_PREFIX_STR(GetVertexAttribIiv)", "GLAPI_PREFIX_STR(GetVertexAttribIivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetVertexAttribIuivEXT))"\n"
-"\t"STUB_ASM_CODE("969")"\n"
+"\t"STUB_ASM_CODE("968")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetVertexAttribIuiv)"\n"
 ".set "GLAPI_PREFIX_STR(GetVertexAttribIuiv)", "GLAPI_PREFIX_STR(GetVertexAttribIuivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(Uniform1uiEXT))"\n"
-"\t"STUB_ASM_CODE("970")"\n"
+"\t"STUB_ASM_CODE("969")"\n"
 
 ".globl "GLAPI_PREFIX_STR(Uniform1ui)"\n"
 ".set "GLAPI_PREFIX_STR(Uniform1ui)", "GLAPI_PREFIX_STR(Uniform1uiEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(Uniform1uivEXT))"\n"
-"\t"STUB_ASM_CODE("971")"\n"
+"\t"STUB_ASM_CODE("970")"\n"
 
 ".globl "GLAPI_PREFIX_STR(Uniform1uiv)"\n"
 ".set "GLAPI_PREFIX_STR(Uniform1uiv)", "GLAPI_PREFIX_STR(Uniform1uivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(Uniform2uiEXT))"\n"
-"\t"STUB_ASM_CODE("972")"\n"
+"\t"STUB_ASM_CODE("971")"\n"
 
 ".globl "GLAPI_PREFIX_STR(Uniform2ui)"\n"
 ".set "GLAPI_PREFIX_STR(Uniform2ui)", "GLAPI_PREFIX_STR(Uniform2uiEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(Uniform2uivEXT))"\n"
-"\t"STUB_ASM_CODE("973")"\n"
+"\t"STUB_ASM_CODE("972")"\n"
 
 ".globl "GLAPI_PREFIX_STR(Uniform2uiv)"\n"
 ".set "GLAPI_PREFIX_STR(Uniform2uiv)", "GLAPI_PREFIX_STR(Uniform2uivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(Uniform3uiEXT))"\n"
-"\t"STUB_ASM_CODE("974")"\n"
+"\t"STUB_ASM_CODE("973")"\n"
 
 ".globl "GLAPI_PREFIX_STR(Uniform3ui)"\n"
 ".set "GLAPI_PREFIX_STR(Uniform3ui)", "GLAPI_PREFIX_STR(Uniform3uiEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(Uniform3uivEXT))"\n"
-"\t"STUB_ASM_CODE("975")"\n"
+"\t"STUB_ASM_CODE("974")"\n"
 
 ".globl "GLAPI_PREFIX_STR(Uniform3uiv)"\n"
 ".set "GLAPI_PREFIX_STR(Uniform3uiv)", "GLAPI_PREFIX_STR(Uniform3uivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(Uniform4uiEXT))"\n"
-"\t"STUB_ASM_CODE("976")"\n"
+"\t"STUB_ASM_CODE("975")"\n"
 
 ".globl "GLAPI_PREFIX_STR(Uniform4ui)"\n"
 ".set "GLAPI_PREFIX_STR(Uniform4ui)", "GLAPI_PREFIX_STR(Uniform4uiEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(Uniform4uivEXT))"\n"
-"\t"STUB_ASM_CODE("977")"\n"
+"\t"STUB_ASM_CODE("976")"\n"
 
 ".globl "GLAPI_PREFIX_STR(Uniform4uiv)"\n"
 ".set "GLAPI_PREFIX_STR(Uniform4uiv)", "GLAPI_PREFIX_STR(Uniform4uivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI1iEXT))"\n"
-"\t"STUB_ASM_CODE("978")"\n"
+"\t"STUB_ASM_CODE("977")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI1i)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI1i)", "GLAPI_PREFIX_STR(VertexAttribI1iEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI1ivEXT))"\n"
-"\t"STUB_ASM_CODE("979")"\n"
+"\t"STUB_ASM_CODE("978")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI1iv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI1iv)", "GLAPI_PREFIX_STR(VertexAttribI1ivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI1uiEXT))"\n"
-"\t"STUB_ASM_CODE("980")"\n"
+"\t"STUB_ASM_CODE("979")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI1ui)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI1ui)", "GLAPI_PREFIX_STR(VertexAttribI1uiEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI1uivEXT))"\n"
-"\t"STUB_ASM_CODE("981")"\n"
+"\t"STUB_ASM_CODE("980")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI1uiv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI1uiv)", "GLAPI_PREFIX_STR(VertexAttribI1uivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI2iEXT))"\n"
-"\t"STUB_ASM_CODE("982")"\n"
+"\t"STUB_ASM_CODE("981")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI2i)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI2i)", "GLAPI_PREFIX_STR(VertexAttribI2iEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI2ivEXT))"\n"
-"\t"STUB_ASM_CODE("983")"\n"
+"\t"STUB_ASM_CODE("982")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI2iv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI2iv)", "GLAPI_PREFIX_STR(VertexAttribI2ivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI2uiEXT))"\n"
-"\t"STUB_ASM_CODE("984")"\n"
+"\t"STUB_ASM_CODE("983")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI2ui)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI2ui)", "GLAPI_PREFIX_STR(VertexAttribI2uiEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI2uivEXT))"\n"
-"\t"STUB_ASM_CODE("985")"\n"
+"\t"STUB_ASM_CODE("984")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI2uiv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI2uiv)", "GLAPI_PREFIX_STR(VertexAttribI2uivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI3iEXT))"\n"
-"\t"STUB_ASM_CODE("986")"\n"
+"\t"STUB_ASM_CODE("985")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI3i)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI3i)", "GLAPI_PREFIX_STR(VertexAttribI3iEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI3ivEXT))"\n"
-"\t"STUB_ASM_CODE("987")"\n"
+"\t"STUB_ASM_CODE("986")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI3iv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI3iv)", "GLAPI_PREFIX_STR(VertexAttribI3ivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI3uiEXT))"\n"
-"\t"STUB_ASM_CODE("988")"\n"
+"\t"STUB_ASM_CODE("987")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI3ui)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI3ui)", "GLAPI_PREFIX_STR(VertexAttribI3uiEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI3uivEXT))"\n"
-"\t"STUB_ASM_CODE("989")"\n"
+"\t"STUB_ASM_CODE("988")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI3uiv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI3uiv)", "GLAPI_PREFIX_STR(VertexAttribI3uivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI4bvEXT))"\n"
-"\t"STUB_ASM_CODE("990")"\n"
+"\t"STUB_ASM_CODE("989")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI4bv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI4bv)", "GLAPI_PREFIX_STR(VertexAttribI4bvEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI4iEXT))"\n"
-"\t"STUB_ASM_CODE("991")"\n"
+"\t"STUB_ASM_CODE("990")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI4i)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI4i)", "GLAPI_PREFIX_STR(VertexAttribI4iEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI4ivEXT))"\n"
-"\t"STUB_ASM_CODE("992")"\n"
+"\t"STUB_ASM_CODE("991")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI4iv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI4iv)", "GLAPI_PREFIX_STR(VertexAttribI4ivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI4svEXT))"\n"
-"\t"STUB_ASM_CODE("993")"\n"
+"\t"STUB_ASM_CODE("992")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI4sv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI4sv)", "GLAPI_PREFIX_STR(VertexAttribI4svEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI4ubvEXT))"\n"
-"\t"STUB_ASM_CODE("994")"\n"
+"\t"STUB_ASM_CODE("993")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI4ubv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI4ubv)", "GLAPI_PREFIX_STR(VertexAttribI4ubvEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI4uiEXT))"\n"
-"\t"STUB_ASM_CODE("995")"\n"
+"\t"STUB_ASM_CODE("994")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI4ui)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI4ui)", "GLAPI_PREFIX_STR(VertexAttribI4uiEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI4uivEXT))"\n"
-"\t"STUB_ASM_CODE("996")"\n"
+"\t"STUB_ASM_CODE("995")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI4uiv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI4uiv)", "GLAPI_PREFIX_STR(VertexAttribI4uivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribI4usvEXT))"\n"
-"\t"STUB_ASM_CODE("997")"\n"
+"\t"STUB_ASM_CODE("996")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribI4usv)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribI4usv)", "GLAPI_PREFIX_STR(VertexAttribI4usvEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribIPointerEXT))"\n"
-"\t"STUB_ASM_CODE("998")"\n"
+"\t"STUB_ASM_CODE("997")"\n"
 
 ".globl "GLAPI_PREFIX_STR(VertexAttribIPointer)"\n"
 ".set "GLAPI_PREFIX_STR(VertexAttribIPointer)", "GLAPI_PREFIX_STR(VertexAttribIPointerEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(FramebufferTextureLayerEXT))"\n"
-"\t"STUB_ASM_CODE("999")"\n"
+"\t"STUB_ASM_CODE("998")"\n"
 
 ".globl "GLAPI_PREFIX_STR(FramebufferTextureLayer)"\n"
 ".set "GLAPI_PREFIX_STR(FramebufferTextureLayer)", "GLAPI_PREFIX_STR(FramebufferTextureLayerEXT)"\n"
@@ -13985,154 +13985,154 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(FramebufferTextureLayerEXT))"\n"
 ".set "GLAPI_PREFIX_STR(FramebufferTextureLayerARB)", "GLAPI_PREFIX_STR(FramebufferTextureLayerEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ColorMaskIndexedEXT))"\n"
-"\t"STUB_ASM_CODE("1000")"\n"
+"\t"STUB_ASM_CODE("999")"\n"
 
 ".globl "GLAPI_PREFIX_STR(ColorMaski)"\n"
 ".set "GLAPI_PREFIX_STR(ColorMaski)", "GLAPI_PREFIX_STR(ColorMaskIndexedEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DisableIndexedEXT))"\n"
-"\t"STUB_ASM_CODE("1001")"\n"
+"\t"STUB_ASM_CODE("1000")"\n"
 
 ".globl "GLAPI_PREFIX_STR(Disablei)"\n"
 ".set "GLAPI_PREFIX_STR(Disablei)", "GLAPI_PREFIX_STR(DisableIndexedEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(EnableIndexedEXT))"\n"
-"\t"STUB_ASM_CODE("1002")"\n"
+"\t"STUB_ASM_CODE("1001")"\n"
 
 ".globl "GLAPI_PREFIX_STR(Enablei)"\n"
 ".set "GLAPI_PREFIX_STR(Enablei)", "GLAPI_PREFIX_STR(EnableIndexedEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetBooleanIndexedvEXT))"\n"
-"\t"STUB_ASM_CODE("1003")"\n"
+"\t"STUB_ASM_CODE("1002")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetBooleani_v)"\n"
 ".set "GLAPI_PREFIX_STR(GetBooleani_v)", "GLAPI_PREFIX_STR(GetBooleanIndexedvEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetIntegerIndexedvEXT))"\n"
-"\t"STUB_ASM_CODE("1004")"\n"
+"\t"STUB_ASM_CODE("1003")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetIntegeri_v)"\n"
 ".set "GLAPI_PREFIX_STR(GetIntegeri_v)", "GLAPI_PREFIX_STR(GetIntegerIndexedvEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(IsEnabledIndexedEXT))"\n"
-"\t"STUB_ASM_CODE("1005")"\n"
+"\t"STUB_ASM_CODE("1004")"\n"
 
 ".globl "GLAPI_PREFIX_STR(IsEnabledi)"\n"
 ".set "GLAPI_PREFIX_STR(IsEnabledi)", "GLAPI_PREFIX_STR(IsEnabledIndexedEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ClearColorIiEXT))"\n"
-"\t"STUB_ASM_CODE("1006")"\n"
+"\t"STUB_ASM_CODE("1005")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ClearColorIuiEXT))"\n"
-"\t"STUB_ASM_CODE("1007")"\n"
+"\t"STUB_ASM_CODE("1006")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetTexParameterIivEXT))"\n"
-"\t"STUB_ASM_CODE("1008")"\n"
+"\t"STUB_ASM_CODE("1007")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetTexParameterIiv)"\n"
 ".set "GLAPI_PREFIX_STR(GetTexParameterIiv)", "GLAPI_PREFIX_STR(GetTexParameterIivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetTexParameterIuivEXT))"\n"
-"\t"STUB_ASM_CODE("1009")"\n"
+"\t"STUB_ASM_CODE("1008")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetTexParameterIuiv)"\n"
 ".set "GLAPI_PREFIX_STR(GetTexParameterIuiv)", "GLAPI_PREFIX_STR(GetTexParameterIuivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexParameterIivEXT))"\n"
-"\t"STUB_ASM_CODE("1010")"\n"
+"\t"STUB_ASM_CODE("1009")"\n"
 
 ".globl "GLAPI_PREFIX_STR(TexParameterIiv)"\n"
 ".set "GLAPI_PREFIX_STR(TexParameterIiv)", "GLAPI_PREFIX_STR(TexParameterIivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexParameterIuivEXT))"\n"
-"\t"STUB_ASM_CODE("1011")"\n"
+"\t"STUB_ASM_CODE("1010")"\n"
 
 ".globl "GLAPI_PREFIX_STR(TexParameterIuiv)"\n"
 ".set "GLAPI_PREFIX_STR(TexParameterIuiv)", "GLAPI_PREFIX_STR(TexParameterIuivEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BeginConditionalRenderNV))"\n"
-"\t"STUB_ASM_CODE("1012")"\n"
+"\t"STUB_ASM_CODE("1011")"\n"
 
 ".globl "GLAPI_PREFIX_STR(BeginConditionalRender)"\n"
 ".set "GLAPI_PREFIX_STR(BeginConditionalRender)", "GLAPI_PREFIX_STR(BeginConditionalRenderNV)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(EndConditionalRenderNV))"\n"
-"\t"STUB_ASM_CODE("1013")"\n"
+"\t"STUB_ASM_CODE("1012")"\n"
 
 ".globl "GLAPI_PREFIX_STR(EndConditionalRender)"\n"
 ".set "GLAPI_PREFIX_STR(EndConditionalRender)", "GLAPI_PREFIX_STR(EndConditionalRenderNV)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BeginTransformFeedbackEXT))"\n"
-"\t"STUB_ASM_CODE("1014")"\n"
+"\t"STUB_ASM_CODE("1013")"\n"
 
 ".globl "GLAPI_PREFIX_STR(BeginTransformFeedback)"\n"
 ".set "GLAPI_PREFIX_STR(BeginTransformFeedback)", "GLAPI_PREFIX_STR(BeginTransformFeedbackEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BindBufferBaseEXT))"\n"
-"\t"STUB_ASM_CODE("1015")"\n"
+"\t"STUB_ASM_CODE("1014")"\n"
 
 ".globl "GLAPI_PREFIX_STR(BindBufferBase)"\n"
 ".set "GLAPI_PREFIX_STR(BindBufferBase)", "GLAPI_PREFIX_STR(BindBufferBaseEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BindBufferOffsetEXT))"\n"
-"\t"STUB_ASM_CODE("1016")"\n"
+"\t"STUB_ASM_CODE("1015")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BindBufferRangeEXT))"\n"
-"\t"STUB_ASM_CODE("1017")"\n"
+"\t"STUB_ASM_CODE("1016")"\n"
 
 ".globl "GLAPI_PREFIX_STR(BindBufferRange)"\n"
 ".set "GLAPI_PREFIX_STR(BindBufferRange)", "GLAPI_PREFIX_STR(BindBufferRangeEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(EndTransformFeedbackEXT))"\n"
-"\t"STUB_ASM_CODE("1018")"\n"
+"\t"STUB_ASM_CODE("1017")"\n"
 
 ".globl "GLAPI_PREFIX_STR(EndTransformFeedback)"\n"
 ".set "GLAPI_PREFIX_STR(EndTransformFeedback)", "GLAPI_PREFIX_STR(EndTransformFeedbackEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetTransformFeedbackVaryingEXT))"\n"
-"\t"STUB_ASM_CODE("1019")"\n"
+"\t"STUB_ASM_CODE("1018")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetTransformFeedbackVarying)"\n"
 ".set "GLAPI_PREFIX_STR(GetTransformFeedbackVarying)", "GLAPI_PREFIX_STR(GetTransformFeedbackVaryingEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TransformFeedbackVaryingsEXT))"\n"
-"\t"STUB_ASM_CODE("1020")"\n"
+"\t"STUB_ASM_CODE("1019")"\n"
 
 ".globl "GLAPI_PREFIX_STR(TransformFeedbackVaryings)"\n"
 ".set "GLAPI_PREFIX_STR(TransformFeedbackVaryings)", "GLAPI_PREFIX_STR(TransformFeedbackVaryingsEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ProvokingVertexEXT))"\n"
-"\t"STUB_ASM_CODE("1021")"\n"
+"\t"STUB_ASM_CODE("1020")"\n"
 
 ".globl "GLAPI_PREFIX_STR(ProvokingVertex)"\n"
 ".set "GLAPI_PREFIX_STR(ProvokingVertex)", "GLAPI_PREFIX_STR(ProvokingVertexEXT)"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetObjectParameterivAPPLE))"\n"
-"\t"STUB_ASM_CODE("1024")"\n"
+"\t"STUB_ASM_CODE("1023")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ObjectPurgeableAPPLE))"\n"
-"\t"STUB_ASM_CODE("1025")"\n"
+"\t"STUB_ASM_CODE("1024")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ObjectUnpurgeableAPPLE))"\n"
-"\t"STUB_ASM_CODE("1026")"\n"
+"\t"STUB_ASM_CODE("1025")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ActiveProgramEXT))"\n"
-"\t"STUB_ASM_CODE("1027")"\n"
+"\t"STUB_ASM_CODE("1026")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(CreateShaderProgramEXT))"\n"
-"\t"STUB_ASM_CODE("1028")"\n"
+"\t"STUB_ASM_CODE("1027")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(UseShaderProgramEXT))"\n"
-"\t"STUB_ASM_CODE("1029")"\n"
+"\t"STUB_ASM_CODE("1028")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TextureBarrierNV))"\n"
-"\t"STUB_ASM_CODE("1030")"\n"
+"\t"STUB_ASM_CODE("1029")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(EGLImageTargetRenderbufferStorageOES))"\n"
-"\t"STUB_ASM_CODE("1036")"\n"
+"\t"STUB_ASM_CODE("1035")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(EGLImageTargetTexture2DOES))"\n"
-"\t"STUB_ASM_CODE("1037")"\n"
+"\t"STUB_ASM_CODE("1036")"\n"
 
 );
 #undef MAPI_TMP_STUB_ASM_GCC_NO_HIDDEN
diff --git a/mesalib/src/mapi/glapi/glapi_sparc.S b/mesalib/src/mapi/glapi/glapi_sparc.S
index 48b792fce..e290a049b 100644
--- a/mesalib/src/mapi/glapi/glapi_sparc.S
+++ b/mesalib/src/mapi/glapi/glapi_sparc.S
@@ -631,268 +631,269 @@ gl_dispatch_functions_start:
 	GL_STUB(glClearBufferiv, 433)
 	GL_STUB(glClearBufferuiv, 434)
 	GL_STUB(glGetStringi, 435)
-	GL_STUB(glTexBuffer, 436)
-	GL_STUB(glFramebufferTexture, 437)
-	GL_STUB(glGetBufferParameteri64v, 438)
-	GL_STUB(glGetInteger64i_v, 439)
-	GL_STUB(glVertexAttribDivisor, 440)
-	GL_STUB(glLoadTransposeMatrixdARB, 441)
-	GL_STUB(glLoadTransposeMatrixfARB, 442)
-	GL_STUB(glMultTransposeMatrixdARB, 443)
-	GL_STUB(glMultTransposeMatrixfARB, 444)
-	GL_STUB(glSampleCoverageARB, 445)
-	GL_STUB(glCompressedTexImage1DARB, 446)
-	GL_STUB(glCompressedTexImage2DARB, 447)
-	GL_STUB(glCompressedTexImage3DARB, 448)
-	GL_STUB(glCompressedTexSubImage1DARB, 449)
-	GL_STUB(glCompressedTexSubImage2DARB, 450)
-	GL_STUB(glCompressedTexSubImage3DARB, 451)
-	GL_STUB(glGetCompressedTexImageARB, 452)
-	GL_STUB(glDisableVertexAttribArrayARB, 453)
-	GL_STUB(glEnableVertexAttribArrayARB, 454)
-	GL_STUB(glGetProgramEnvParameterdvARB, 455)
-	GL_STUB(glGetProgramEnvParameterfvARB, 456)
-	GL_STUB(glGetProgramLocalParameterdvARB, 457)
-	GL_STUB(glGetProgramLocalParameterfvARB, 458)
-	GL_STUB(glGetProgramStringARB, 459)
-	GL_STUB(glGetProgramivARB, 460)
-	GL_STUB(glGetVertexAttribdvARB, 461)
-	GL_STUB(glGetVertexAttribfvARB, 462)
-	GL_STUB(glGetVertexAttribivARB, 463)
-	GL_STUB(glProgramEnvParameter4dARB, 464)
-	GL_STUB(glProgramEnvParameter4dvARB, 465)
-	GL_STUB(glProgramEnvParameter4fARB, 466)
-	GL_STUB(glProgramEnvParameter4fvARB, 467)
-	GL_STUB(glProgramLocalParameter4dARB, 468)
-	GL_STUB(glProgramLocalParameter4dvARB, 469)
-	GL_STUB(glProgramLocalParameter4fARB, 470)
-	GL_STUB(glProgramLocalParameter4fvARB, 471)
-	GL_STUB(glProgramStringARB, 472)
-	GL_STUB(glVertexAttrib1dARB, 473)
-	GL_STUB(glVertexAttrib1dvARB, 474)
-	GL_STUB(glVertexAttrib1fARB, 475)
-	GL_STUB(glVertexAttrib1fvARB, 476)
-	GL_STUB(glVertexAttrib1sARB, 477)
-	GL_STUB(glVertexAttrib1svARB, 478)
-	GL_STUB(glVertexAttrib2dARB, 479)
-	GL_STUB(glVertexAttrib2dvARB, 480)
-	GL_STUB(glVertexAttrib2fARB, 481)
-	GL_STUB(glVertexAttrib2fvARB, 482)
-	GL_STUB(glVertexAttrib2sARB, 483)
-	GL_STUB(glVertexAttrib2svARB, 484)
-	GL_STUB(glVertexAttrib3dARB, 485)
-	GL_STUB(glVertexAttrib3dvARB, 486)
-	GL_STUB(glVertexAttrib3fARB, 487)
-	GL_STUB(glVertexAttrib3fvARB, 488)
-	GL_STUB(glVertexAttrib3sARB, 489)
-	GL_STUB(glVertexAttrib3svARB, 490)
-	GL_STUB(glVertexAttrib4NbvARB, 491)
-	GL_STUB(glVertexAttrib4NivARB, 492)
-	GL_STUB(glVertexAttrib4NsvARB, 493)
-	GL_STUB(glVertexAttrib4NubARB, 494)
-	GL_STUB(glVertexAttrib4NubvARB, 495)
-	GL_STUB(glVertexAttrib4NuivARB, 496)
-	GL_STUB(glVertexAttrib4NusvARB, 497)
-	GL_STUB(glVertexAttrib4bvARB, 498)
-	GL_STUB(glVertexAttrib4dARB, 499)
-	GL_STUB(glVertexAttrib4dvARB, 500)
-	GL_STUB(glVertexAttrib4fARB, 501)
-	GL_STUB(glVertexAttrib4fvARB, 502)
-	GL_STUB(glVertexAttrib4ivARB, 503)
-	GL_STUB(glVertexAttrib4sARB, 504)
-	GL_STUB(glVertexAttrib4svARB, 505)
-	GL_STUB(glVertexAttrib4ubvARB, 506)
-	GL_STUB(glVertexAttrib4uivARB, 507)
-	GL_STUB(glVertexAttrib4usvARB, 508)
-	GL_STUB(glVertexAttribPointerARB, 509)
-	GL_STUB(glBindBufferARB, 510)
-	GL_STUB(glBufferDataARB, 511)
-	GL_STUB(glBufferSubDataARB, 512)
-	GL_STUB(glDeleteBuffersARB, 513)
-	GL_STUB(glGenBuffersARB, 514)
-	GL_STUB(glGetBufferParameterivARB, 515)
-	GL_STUB(glGetBufferPointervARB, 516)
-	GL_STUB(glGetBufferSubDataARB, 517)
-	GL_STUB(glIsBufferARB, 518)
-	GL_STUB(glMapBufferARB, 519)
-	GL_STUB(glUnmapBufferARB, 520)
-	GL_STUB(glBeginQueryARB, 521)
-	GL_STUB(glDeleteQueriesARB, 522)
-	GL_STUB(glEndQueryARB, 523)
-	GL_STUB(glGenQueriesARB, 524)
-	GL_STUB(glGetQueryObjectivARB, 525)
-	GL_STUB(glGetQueryObjectuivARB, 526)
-	GL_STUB(glGetQueryivARB, 527)
-	GL_STUB(glIsQueryARB, 528)
-	GL_STUB(glAttachObjectARB, 529)
-	GL_STUB(glCompileShaderARB, 530)
-	GL_STUB(glCreateProgramObjectARB, 531)
-	GL_STUB(glCreateShaderObjectARB, 532)
-	GL_STUB(glDeleteObjectARB, 533)
-	GL_STUB(glDetachObjectARB, 534)
-	GL_STUB(glGetActiveUniformARB, 535)
-	GL_STUB(glGetAttachedObjectsARB, 536)
-	GL_STUB(glGetHandleARB, 537)
-	GL_STUB(glGetInfoLogARB, 538)
-	GL_STUB(glGetObjectParameterfvARB, 539)
-	GL_STUB(glGetObjectParameterivARB, 540)
-	GL_STUB(glGetShaderSourceARB, 541)
-	GL_STUB(glGetUniformLocationARB, 542)
-	GL_STUB(glGetUniformfvARB, 543)
-	GL_STUB(glGetUniformivARB, 544)
-	GL_STUB(glLinkProgramARB, 545)
-	GL_STUB(glShaderSourceARB, 546)
-	GL_STUB(glUniform1fARB, 547)
-	GL_STUB(glUniform1fvARB, 548)
-	GL_STUB(glUniform1iARB, 549)
-	GL_STUB(glUniform1ivARB, 550)
-	GL_STUB(glUniform2fARB, 551)
-	GL_STUB(glUniform2fvARB, 552)
-	GL_STUB(glUniform2iARB, 553)
-	GL_STUB(glUniform2ivARB, 554)
-	GL_STUB(glUniform3fARB, 555)
-	GL_STUB(glUniform3fvARB, 556)
-	GL_STUB(glUniform3iARB, 557)
-	GL_STUB(glUniform3ivARB, 558)
-	GL_STUB(glUniform4fARB, 559)
-	GL_STUB(glUniform4fvARB, 560)
-	GL_STUB(glUniform4iARB, 561)
-	GL_STUB(glUniform4ivARB, 562)
-	GL_STUB(glUniformMatrix2fvARB, 563)
-	GL_STUB(glUniformMatrix3fvARB, 564)
-	GL_STUB(glUniformMatrix4fvARB, 565)
-	GL_STUB(glUseProgramObjectARB, 566)
-	GL_STUB(glValidateProgramARB, 567)
-	GL_STUB(glBindAttribLocationARB, 568)
-	GL_STUB(glGetActiveAttribARB, 569)
-	GL_STUB(glGetAttribLocationARB, 570)
-	GL_STUB(glDrawBuffersARB, 571)
-	GL_STUB(glClampColorARB, 572)
-	GL_STUB(glDrawArraysInstancedARB, 573)
-	GL_STUB(glDrawElementsInstancedARB, 574)
-	GL_STUB(glRenderbufferStorageMultisample, 575)
-	GL_STUB(glFramebufferTextureARB, 576)
-	GL_STUB(glFramebufferTextureFaceARB, 577)
-	GL_STUB(glProgramParameteriARB, 578)
-	GL_STUB(glVertexAttribDivisorARB, 579)
-	GL_STUB(glFlushMappedBufferRange, 580)
-	GL_STUB(glMapBufferRange, 581)
-	GL_STUB(glTexBufferARB, 582)
-	GL_STUB(glBindVertexArray, 583)
-	GL_STUB(glGenVertexArrays, 584)
-	GL_STUB(glCopyBufferSubData, 585)
-	GL_STUB(glClientWaitSync, 586)
-	GL_STUB(glDeleteSync, 587)
-	GL_STUB(glFenceSync, 588)
-	GL_STUB(glGetInteger64v, 589)
-	GL_STUB(glGetSynciv, 590)
-	GL_STUB(glIsSync, 591)
-	GL_STUB(glWaitSync, 592)
-	GL_STUB(glDrawElementsBaseVertex, 593)
-	GL_STUB(glDrawElementsInstancedBaseVertex, 594)
-	GL_STUB(glDrawRangeElementsBaseVertex, 595)
-	GL_STUB(glMultiDrawElementsBaseVertex, 596)
-	GL_STUB(glBlendEquationSeparateiARB, 597)
-	GL_STUB(glBlendEquationiARB, 598)
-	GL_STUB(glBlendFuncSeparateiARB, 599)
-	GL_STUB(glBlendFunciARB, 600)
-	GL_STUB(glBindFragDataLocationIndexed, 601)
-	GL_STUB(glGetFragDataIndex, 602)
-	GL_STUB(glBindSampler, 603)
-	GL_STUB(glDeleteSamplers, 604)
-	GL_STUB(glGenSamplers, 605)
-	GL_STUB(glGetSamplerParameterIiv, 606)
-	GL_STUB(glGetSamplerParameterIuiv, 607)
-	GL_STUB(glGetSamplerParameterfv, 608)
-	GL_STUB(glGetSamplerParameteriv, 609)
-	GL_STUB(glIsSampler, 610)
-	GL_STUB(glSamplerParameterIiv, 611)
-	GL_STUB(glSamplerParameterIuiv, 612)
-	GL_STUB(glSamplerParameterf, 613)
-	GL_STUB(glSamplerParameterfv, 614)
-	GL_STUB(glSamplerParameteri, 615)
-	GL_STUB(glSamplerParameteriv, 616)
-	GL_STUB(glColorP3ui, 617)
-	GL_STUB(glColorP3uiv, 618)
-	GL_STUB(glColorP4ui, 619)
-	GL_STUB(glColorP4uiv, 620)
-	GL_STUB(glMultiTexCoordP1ui, 621)
-	GL_STUB(glMultiTexCoordP1uiv, 622)
-	GL_STUB(glMultiTexCoordP2ui, 623)
-	GL_STUB(glMultiTexCoordP2uiv, 624)
-	GL_STUB(glMultiTexCoordP3ui, 625)
-	GL_STUB(glMultiTexCoordP3uiv, 626)
-	GL_STUB(glMultiTexCoordP4ui, 627)
-	GL_STUB(glMultiTexCoordP4uiv, 628)
-	GL_STUB(glNormalP3ui, 629)
-	GL_STUB(glNormalP3uiv, 630)
-	GL_STUB(glSecondaryColorP3ui, 631)
-	GL_STUB(glSecondaryColorP3uiv, 632)
-	GL_STUB(glTexCoordP1ui, 633)
-	GL_STUB(glTexCoordP1uiv, 634)
-	GL_STUB(glTexCoordP2ui, 635)
-	GL_STUB(glTexCoordP2uiv, 636)
-	GL_STUB(glTexCoordP3ui, 637)
-	GL_STUB(glTexCoordP3uiv, 638)
-	GL_STUB(glTexCoordP4ui, 639)
-	GL_STUB(glTexCoordP4uiv, 640)
-	GL_STUB(glVertexAttribP1ui, 641)
-	GL_STUB(glVertexAttribP1uiv, 642)
-	GL_STUB(glVertexAttribP2ui, 643)
-	GL_STUB(glVertexAttribP2uiv, 644)
-	GL_STUB(glVertexAttribP3ui, 645)
-	GL_STUB(glVertexAttribP3uiv, 646)
-	GL_STUB(glVertexAttribP4ui, 647)
-	GL_STUB(glVertexAttribP4uiv, 648)
-	GL_STUB(glVertexP2ui, 649)
-	GL_STUB(glVertexP2uiv, 650)
-	GL_STUB(glVertexP3ui, 651)
-	GL_STUB(glVertexP3uiv, 652)
-	GL_STUB(glVertexP4ui, 653)
-	GL_STUB(glVertexP4uiv, 654)
-	GL_STUB(glBindTransformFeedback, 655)
-	GL_STUB(glDeleteTransformFeedbacks, 656)
-	GL_STUB(glDrawTransformFeedback, 657)
-	GL_STUB(glGenTransformFeedbacks, 658)
-	GL_STUB(glIsTransformFeedback, 659)
-	GL_STUB(glPauseTransformFeedback, 660)
-	GL_STUB(glResumeTransformFeedback, 661)
-	GL_STUB(glClearDepthf, 662)
-	GL_STUB(glDepthRangef, 663)
-	GL_STUB(glGetShaderPrecisionFormat, 664)
-	GL_STUB(glReleaseShaderCompiler, 665)
-	GL_STUB(glShaderBinary, 666)
-	GL_STUB(glDebugMessageCallbackARB, 667)
-	GL_STUB(glDebugMessageControlARB, 668)
-	GL_STUB(glDebugMessageInsertARB, 669)
-	GL_STUB(glGetDebugMessageLogARB, 670)
-	GL_STUB(glGetGraphicsResetStatusARB, 671)
-	GL_STUB(glGetnColorTableARB, 672)
-	GL_STUB(glGetnCompressedTexImageARB, 673)
-	GL_STUB(glGetnConvolutionFilterARB, 674)
-	GL_STUB(glGetnHistogramARB, 675)
-	GL_STUB(glGetnMapdvARB, 676)
-	GL_STUB(glGetnMapfvARB, 677)
-	GL_STUB(glGetnMapivARB, 678)
-	GL_STUB(glGetnMinmaxARB, 679)
-	GL_STUB(glGetnPixelMapfvARB, 680)
-	GL_STUB(glGetnPixelMapuivARB, 681)
-	GL_STUB(glGetnPixelMapusvARB, 682)
-	GL_STUB(glGetnPolygonStippleARB, 683)
-	GL_STUB(glGetnSeparableFilterARB, 684)
-	GL_STUB(glGetnTexImageARB, 685)
-	GL_STUB(glGetnUniformdvARB, 686)
-	GL_STUB(glGetnUniformfvARB, 687)
-	GL_STUB(glGetnUniformivARB, 688)
-	GL_STUB(glGetnUniformuivARB, 689)
-	GL_STUB(glReadnPixelsARB, 690)
-	GL_STUB(glTexStorage1D, 691)
-	GL_STUB(glTexStorage2D, 692)
-	GL_STUB(glTexStorage3D, 693)
-	GL_STUB(glTextureStorage1DEXT, 694)
-	GL_STUB(glTextureStorage2DEXT, 695)
-	GL_STUB(glTextureStorage3DEXT, 696)
-	GL_STUB(glPolygonOffsetEXT, 697)
+	GL_STUB(glFramebufferTexture, 436)
+	GL_STUB(glGetBufferParameteri64v, 437)
+	GL_STUB(glGetInteger64i_v, 438)
+	GL_STUB(glVertexAttribDivisor, 439)
+	GL_STUB(glLoadTransposeMatrixdARB, 440)
+	GL_STUB(glLoadTransposeMatrixfARB, 441)
+	GL_STUB(glMultTransposeMatrixdARB, 442)
+	GL_STUB(glMultTransposeMatrixfARB, 443)
+	GL_STUB(glSampleCoverageARB, 444)
+	GL_STUB(glCompressedTexImage1DARB, 445)
+	GL_STUB(glCompressedTexImage2DARB, 446)
+	GL_STUB(glCompressedTexImage3DARB, 447)
+	GL_STUB(glCompressedTexSubImage1DARB, 448)
+	GL_STUB(glCompressedTexSubImage2DARB, 449)
+	GL_STUB(glCompressedTexSubImage3DARB, 450)
+	GL_STUB(glGetCompressedTexImageARB, 451)
+	GL_STUB(glDisableVertexAttribArrayARB, 452)
+	GL_STUB(glEnableVertexAttribArrayARB, 453)
+	GL_STUB(glGetProgramEnvParameterdvARB, 454)
+	GL_STUB(glGetProgramEnvParameterfvARB, 455)
+	GL_STUB(glGetProgramLocalParameterdvARB, 456)
+	GL_STUB(glGetProgramLocalParameterfvARB, 457)
+	GL_STUB(glGetProgramStringARB, 458)
+	GL_STUB(glGetProgramivARB, 459)
+	GL_STUB(glGetVertexAttribdvARB, 460)
+	GL_STUB(glGetVertexAttribfvARB, 461)
+	GL_STUB(glGetVertexAttribivARB, 462)
+	GL_STUB(glProgramEnvParameter4dARB, 463)
+	GL_STUB(glProgramEnvParameter4dvARB, 464)
+	GL_STUB(glProgramEnvParameter4fARB, 465)
+	GL_STUB(glProgramEnvParameter4fvARB, 466)
+	GL_STUB(glProgramLocalParameter4dARB, 467)
+	GL_STUB(glProgramLocalParameter4dvARB, 468)
+	GL_STUB(glProgramLocalParameter4fARB, 469)
+	GL_STUB(glProgramLocalParameter4fvARB, 470)
+	GL_STUB(glProgramStringARB, 471)
+	GL_STUB(glVertexAttrib1dARB, 472)
+	GL_STUB(glVertexAttrib1dvARB, 473)
+	GL_STUB(glVertexAttrib1fARB, 474)
+	GL_STUB(glVertexAttrib1fvARB, 475)
+	GL_STUB(glVertexAttrib1sARB, 476)
+	GL_STUB(glVertexAttrib1svARB, 477)
+	GL_STUB(glVertexAttrib2dARB, 478)
+	GL_STUB(glVertexAttrib2dvARB, 479)
+	GL_STUB(glVertexAttrib2fARB, 480)
+	GL_STUB(glVertexAttrib2fvARB, 481)
+	GL_STUB(glVertexAttrib2sARB, 482)
+	GL_STUB(glVertexAttrib2svARB, 483)
+	GL_STUB(glVertexAttrib3dARB, 484)
+	GL_STUB(glVertexAttrib3dvARB, 485)
+	GL_STUB(glVertexAttrib3fARB, 486)
+	GL_STUB(glVertexAttrib3fvARB, 487)
+	GL_STUB(glVertexAttrib3sARB, 488)
+	GL_STUB(glVertexAttrib3svARB, 489)
+	GL_STUB(glVertexAttrib4NbvARB, 490)
+	GL_STUB(glVertexAttrib4NivARB, 491)
+	GL_STUB(glVertexAttrib4NsvARB, 492)
+	GL_STUB(glVertexAttrib4NubARB, 493)
+	GL_STUB(glVertexAttrib4NubvARB, 494)
+	GL_STUB(glVertexAttrib4NuivARB, 495)
+	GL_STUB(glVertexAttrib4NusvARB, 496)
+	GL_STUB(glVertexAttrib4bvARB, 497)
+	GL_STUB(glVertexAttrib4dARB, 498)
+	GL_STUB(glVertexAttrib4dvARB, 499)
+	GL_STUB(glVertexAttrib4fARB, 500)
+	GL_STUB(glVertexAttrib4fvARB, 501)
+	GL_STUB(glVertexAttrib4ivARB, 502)
+	GL_STUB(glVertexAttrib4sARB, 503)
+	GL_STUB(glVertexAttrib4svARB, 504)
+	GL_STUB(glVertexAttrib4ubvARB, 505)
+	GL_STUB(glVertexAttrib4uivARB, 506)
+	GL_STUB(glVertexAttrib4usvARB, 507)
+	GL_STUB(glVertexAttribPointerARB, 508)
+	GL_STUB(glBindBufferARB, 509)
+	GL_STUB(glBufferDataARB, 510)
+	GL_STUB(glBufferSubDataARB, 511)
+	GL_STUB(glDeleteBuffersARB, 512)
+	GL_STUB(glGenBuffersARB, 513)
+	GL_STUB(glGetBufferParameterivARB, 514)
+	GL_STUB(glGetBufferPointervARB, 515)
+	GL_STUB(glGetBufferSubDataARB, 516)
+	GL_STUB(glIsBufferARB, 517)
+	GL_STUB(glMapBufferARB, 518)
+	GL_STUB(glUnmapBufferARB, 519)
+	GL_STUB(glBeginQueryARB, 520)
+	GL_STUB(glDeleteQueriesARB, 521)
+	GL_STUB(glEndQueryARB, 522)
+	GL_STUB(glGenQueriesARB, 523)
+	GL_STUB(glGetQueryObjectivARB, 524)
+	GL_STUB(glGetQueryObjectuivARB, 525)
+	GL_STUB(glGetQueryivARB, 526)
+	GL_STUB(glIsQueryARB, 527)
+	GL_STUB(glAttachObjectARB, 528)
+	GL_STUB(glCompileShaderARB, 529)
+	GL_STUB(glCreateProgramObjectARB, 530)
+	GL_STUB(glCreateShaderObjectARB, 531)
+	GL_STUB(glDeleteObjectARB, 532)
+	GL_STUB(glDetachObjectARB, 533)
+	GL_STUB(glGetActiveUniformARB, 534)
+	GL_STUB(glGetAttachedObjectsARB, 535)
+	GL_STUB(glGetHandleARB, 536)
+	GL_STUB(glGetInfoLogARB, 537)
+	GL_STUB(glGetObjectParameterfvARB, 538)
+	GL_STUB(glGetObjectParameterivARB, 539)
+	GL_STUB(glGetShaderSourceARB, 540)
+	GL_STUB(glGetUniformLocationARB, 541)
+	GL_STUB(glGetUniformfvARB, 542)
+	GL_STUB(glGetUniformivARB, 543)
+	GL_STUB(glLinkProgramARB, 544)
+	GL_STUB(glShaderSourceARB, 545)
+	GL_STUB(glUniform1fARB, 546)
+	GL_STUB(glUniform1fvARB, 547)
+	GL_STUB(glUniform1iARB, 548)
+	GL_STUB(glUniform1ivARB, 549)
+	GL_STUB(glUniform2fARB, 550)
+	GL_STUB(glUniform2fvARB, 551)
+	GL_STUB(glUniform2iARB, 552)
+	GL_STUB(glUniform2ivARB, 553)
+	GL_STUB(glUniform3fARB, 554)
+	GL_STUB(glUniform3fvARB, 555)
+	GL_STUB(glUniform3iARB, 556)
+	GL_STUB(glUniform3ivARB, 557)
+	GL_STUB(glUniform4fARB, 558)
+	GL_STUB(glUniform4fvARB, 559)
+	GL_STUB(glUniform4iARB, 560)
+	GL_STUB(glUniform4ivARB, 561)
+	GL_STUB(glUniformMatrix2fvARB, 562)
+	GL_STUB(glUniformMatrix3fvARB, 563)
+	GL_STUB(glUniformMatrix4fvARB, 564)
+	GL_STUB(glUseProgramObjectARB, 565)
+	GL_STUB(glValidateProgramARB, 566)
+	GL_STUB(glBindAttribLocationARB, 567)
+	GL_STUB(glGetActiveAttribARB, 568)
+	GL_STUB(glGetAttribLocationARB, 569)
+	GL_STUB(glDrawBuffersARB, 570)
+	GL_STUB(glClampColorARB, 571)
+	GL_STUB(glDrawArraysInstancedARB, 572)
+	GL_STUB(glDrawElementsInstancedARB, 573)
+	GL_STUB(glRenderbufferStorageMultisample, 574)
+	GL_STUB(glFramebufferTextureARB, 575)
+	GL_STUB(glFramebufferTextureFaceARB, 576)
+	GL_STUB(glProgramParameteriARB, 577)
+	GL_STUB(glVertexAttribDivisorARB, 578)
+	GL_STUB(glFlushMappedBufferRange, 579)
+	GL_STUB(glMapBufferRange, 580)
+	GL_STUB(glTexBufferARB, 581)
+	GL_STUB(glBindVertexArray, 582)
+	GL_STUB(glGenVertexArrays, 583)
+	GL_STUB(glCopyBufferSubData, 584)
+	GL_STUB(glClientWaitSync, 585)
+	GL_STUB(glDeleteSync, 586)
+	GL_STUB(glFenceSync, 587)
+	GL_STUB(glGetInteger64v, 588)
+	GL_STUB(glGetSynciv, 589)
+	GL_STUB(glIsSync, 590)
+	GL_STUB(glWaitSync, 591)
+	GL_STUB(glDrawElementsBaseVertex, 592)
+	GL_STUB(glDrawElementsInstancedBaseVertex, 593)
+	GL_STUB(glDrawRangeElementsBaseVertex, 594)
+	GL_STUB(glMultiDrawElementsBaseVertex, 595)
+	GL_STUB(glBlendEquationSeparateiARB, 596)
+	GL_STUB(glBlendEquationiARB, 597)
+	GL_STUB(glBlendFuncSeparateiARB, 598)
+	GL_STUB(glBlendFunciARB, 599)
+	GL_STUB(glBindFragDataLocationIndexed, 600)
+	GL_STUB(glGetFragDataIndex, 601)
+	GL_STUB(glBindSampler, 602)
+	GL_STUB(glDeleteSamplers, 603)
+	GL_STUB(glGenSamplers, 604)
+	GL_STUB(glGetSamplerParameterIiv, 605)
+	GL_STUB(glGetSamplerParameterIuiv, 606)
+	GL_STUB(glGetSamplerParameterfv, 607)
+	GL_STUB(glGetSamplerParameteriv, 608)
+	GL_STUB(glIsSampler, 609)
+	GL_STUB(glSamplerParameterIiv, 610)
+	GL_STUB(glSamplerParameterIuiv, 611)
+	GL_STUB(glSamplerParameterf, 612)
+	GL_STUB(glSamplerParameterfv, 613)
+	GL_STUB(glSamplerParameteri, 614)
+	GL_STUB(glSamplerParameteriv, 615)
+	GL_STUB(glColorP3ui, 616)
+	GL_STUB(glColorP3uiv, 617)
+	GL_STUB(glColorP4ui, 618)
+	GL_STUB(glColorP4uiv, 619)
+	GL_STUB(glMultiTexCoordP1ui, 620)
+	GL_STUB(glMultiTexCoordP1uiv, 621)
+	GL_STUB(glMultiTexCoordP2ui, 622)
+	GL_STUB(glMultiTexCoordP2uiv, 623)
+	GL_STUB(glMultiTexCoordP3ui, 624)
+	GL_STUB(glMultiTexCoordP3uiv, 625)
+	GL_STUB(glMultiTexCoordP4ui, 626)
+	GL_STUB(glMultiTexCoordP4uiv, 627)
+	GL_STUB(glNormalP3ui, 628)
+	GL_STUB(glNormalP3uiv, 629)
+	GL_STUB(glSecondaryColorP3ui, 630)
+	GL_STUB(glSecondaryColorP3uiv, 631)
+	GL_STUB(glTexCoordP1ui, 632)
+	GL_STUB(glTexCoordP1uiv, 633)
+	GL_STUB(glTexCoordP2ui, 634)
+	GL_STUB(glTexCoordP2uiv, 635)
+	GL_STUB(glTexCoordP3ui, 636)
+	GL_STUB(glTexCoordP3uiv, 637)
+	GL_STUB(glTexCoordP4ui, 638)
+	GL_STUB(glTexCoordP4uiv, 639)
+	GL_STUB(glVertexAttribP1ui, 640)
+	GL_STUB(glVertexAttribP1uiv, 641)
+	GL_STUB(glVertexAttribP2ui, 642)
+	GL_STUB(glVertexAttribP2uiv, 643)
+	GL_STUB(glVertexAttribP3ui, 644)
+	GL_STUB(glVertexAttribP3uiv, 645)
+	GL_STUB(glVertexAttribP4ui, 646)
+	GL_STUB(glVertexAttribP4uiv, 647)
+	GL_STUB(glVertexP2ui, 648)
+	GL_STUB(glVertexP2uiv, 649)
+	GL_STUB(glVertexP3ui, 650)
+	GL_STUB(glVertexP3uiv, 651)
+	GL_STUB(glVertexP4ui, 652)
+	GL_STUB(glVertexP4uiv, 653)
+	GL_STUB(glBindTransformFeedback, 654)
+	GL_STUB(glDeleteTransformFeedbacks, 655)
+	GL_STUB(glDrawTransformFeedback, 656)
+	GL_STUB(glGenTransformFeedbacks, 657)
+	GL_STUB(glIsTransformFeedback, 658)
+	GL_STUB(glPauseTransformFeedback, 659)
+	GL_STUB(glResumeTransformFeedback, 660)
+	GL_STUB(glClearDepthf, 661)
+	GL_STUB(glDepthRangef, 662)
+	GL_STUB(glGetShaderPrecisionFormat, 663)
+	GL_STUB(glReleaseShaderCompiler, 664)
+	GL_STUB(glShaderBinary, 665)
+	GL_STUB(glDebugMessageCallbackARB, 666)
+	GL_STUB(glDebugMessageControlARB, 667)
+	GL_STUB(glDebugMessageInsertARB, 668)
+	GL_STUB(glGetDebugMessageLogARB, 669)
+	GL_STUB(glGetGraphicsResetStatusARB, 670)
+	GL_STUB(glGetnColorTableARB, 671)
+	GL_STUB(glGetnCompressedTexImageARB, 672)
+	GL_STUB(glGetnConvolutionFilterARB, 673)
+	GL_STUB(glGetnHistogramARB, 674)
+	GL_STUB(glGetnMapdvARB, 675)
+	GL_STUB(glGetnMapfvARB, 676)
+	GL_STUB(glGetnMapivARB, 677)
+	GL_STUB(glGetnMinmaxARB, 678)
+	GL_STUB(glGetnPixelMapfvARB, 679)
+	GL_STUB(glGetnPixelMapuivARB, 680)
+	GL_STUB(glGetnPixelMapusvARB, 681)
+	GL_STUB(glGetnPolygonStippleARB, 682)
+	GL_STUB(glGetnSeparableFilterARB, 683)
+	GL_STUB(glGetnTexImageARB, 684)
+	GL_STUB(glGetnUniformdvARB, 685)
+	GL_STUB(glGetnUniformfvARB, 686)
+	GL_STUB(glGetnUniformivARB, 687)
+	GL_STUB(glGetnUniformuivARB, 688)
+	GL_STUB(glReadnPixelsARB, 689)
+	GL_STUB(glTexStorage1D, 690)
+	GL_STUB(glTexStorage2D, 691)
+	GL_STUB(glTexStorage3D, 692)
+	GL_STUB(glTextureStorage1DEXT, 693)
+	GL_STUB(glTextureStorage2DEXT, 694)
+	GL_STUB(glTextureStorage3DEXT, 695)
+	GL_STUB(glPolygonOffsetEXT, 696)
+	GL_STUB(gl_dispatch_stub_697, 697)
+	HIDDEN(gl_dispatch_stub_697)
 	GL_STUB(gl_dispatch_stub_698, 698)
 	HIDDEN(gl_dispatch_stub_698)
 	GL_STUB(gl_dispatch_stub_699, 699)
@@ -907,85 +908,85 @@ gl_dispatch_functions_start:
 	HIDDEN(gl_dispatch_stub_703)
 	GL_STUB(gl_dispatch_stub_704, 704)
 	HIDDEN(gl_dispatch_stub_704)
-	GL_STUB(gl_dispatch_stub_705, 705)
-	HIDDEN(gl_dispatch_stub_705)
-	GL_STUB(glColorPointerEXT, 706)
-	GL_STUB(glEdgeFlagPointerEXT, 707)
-	GL_STUB(glIndexPointerEXT, 708)
-	GL_STUB(glNormalPointerEXT, 709)
-	GL_STUB(glTexCoordPointerEXT, 710)
-	GL_STUB(glVertexPointerEXT, 711)
-	GL_STUB(glPointParameterfEXT, 712)
-	GL_STUB(glPointParameterfvEXT, 713)
-	GL_STUB(glLockArraysEXT, 714)
-	GL_STUB(glUnlockArraysEXT, 715)
-	GL_STUB(glSecondaryColor3bEXT, 716)
-	GL_STUB(glSecondaryColor3bvEXT, 717)
-	GL_STUB(glSecondaryColor3dEXT, 718)
-	GL_STUB(glSecondaryColor3dvEXT, 719)
-	GL_STUB(glSecondaryColor3fEXT, 720)
-	GL_STUB(glSecondaryColor3fvEXT, 721)
-	GL_STUB(glSecondaryColor3iEXT, 722)
-	GL_STUB(glSecondaryColor3ivEXT, 723)
-	GL_STUB(glSecondaryColor3sEXT, 724)
-	GL_STUB(glSecondaryColor3svEXT, 725)
-	GL_STUB(glSecondaryColor3ubEXT, 726)
-	GL_STUB(glSecondaryColor3ubvEXT, 727)
-	GL_STUB(glSecondaryColor3uiEXT, 728)
-	GL_STUB(glSecondaryColor3uivEXT, 729)
-	GL_STUB(glSecondaryColor3usEXT, 730)
-	GL_STUB(glSecondaryColor3usvEXT, 731)
-	GL_STUB(glSecondaryColorPointerEXT, 732)
-	GL_STUB(glMultiDrawArraysEXT, 733)
-	GL_STUB(glMultiDrawElementsEXT, 734)
-	GL_STUB(glFogCoordPointerEXT, 735)
-	GL_STUB(glFogCoorddEXT, 736)
-	GL_STUB(glFogCoorddvEXT, 737)
-	GL_STUB(glFogCoordfEXT, 738)
-	GL_STUB(glFogCoordfvEXT, 739)
-	GL_STUB(gl_dispatch_stub_740, 740)
-	HIDDEN(gl_dispatch_stub_740)
-	GL_STUB(glBlendFuncSeparateEXT, 741)
-	GL_STUB(glFlushVertexArrayRangeNV, 742)
-	GL_STUB(glVertexArrayRangeNV, 743)
-	GL_STUB(glCombinerInputNV, 744)
-	GL_STUB(glCombinerOutputNV, 745)
-	GL_STUB(glCombinerParameterfNV, 746)
-	GL_STUB(glCombinerParameterfvNV, 747)
-	GL_STUB(glCombinerParameteriNV, 748)
-	GL_STUB(glCombinerParameterivNV, 749)
-	GL_STUB(glFinalCombinerInputNV, 750)
-	GL_STUB(glGetCombinerInputParameterfvNV, 751)
-	GL_STUB(glGetCombinerInputParameterivNV, 752)
-	GL_STUB(glGetCombinerOutputParameterfvNV, 753)
-	GL_STUB(glGetCombinerOutputParameterivNV, 754)
-	GL_STUB(glGetFinalCombinerInputParameterfvNV, 755)
-	GL_STUB(glGetFinalCombinerInputParameterivNV, 756)
-	GL_STUB(glResizeBuffersMESA, 757)
-	GL_STUB(glWindowPos2dMESA, 758)
-	GL_STUB(glWindowPos2dvMESA, 759)
-	GL_STUB(glWindowPos2fMESA, 760)
-	GL_STUB(glWindowPos2fvMESA, 761)
-	GL_STUB(glWindowPos2iMESA, 762)
-	GL_STUB(glWindowPos2ivMESA, 763)
-	GL_STUB(glWindowPos2sMESA, 764)
-	GL_STUB(glWindowPos2svMESA, 765)
-	GL_STUB(glWindowPos3dMESA, 766)
-	GL_STUB(glWindowPos3dvMESA, 767)
-	GL_STUB(glWindowPos3fMESA, 768)
-	GL_STUB(glWindowPos3fvMESA, 769)
-	GL_STUB(glWindowPos3iMESA, 770)
-	GL_STUB(glWindowPos3ivMESA, 771)
-	GL_STUB(glWindowPos3sMESA, 772)
-	GL_STUB(glWindowPos3svMESA, 773)
-	GL_STUB(glWindowPos4dMESA, 774)
-	GL_STUB(glWindowPos4dvMESA, 775)
-	GL_STUB(glWindowPos4fMESA, 776)
-	GL_STUB(glWindowPos4fvMESA, 777)
-	GL_STUB(glWindowPos4iMESA, 778)
-	GL_STUB(glWindowPos4ivMESA, 779)
-	GL_STUB(glWindowPos4sMESA, 780)
-	GL_STUB(glWindowPos4svMESA, 781)
+	GL_STUB(glColorPointerEXT, 705)
+	GL_STUB(glEdgeFlagPointerEXT, 706)
+	GL_STUB(glIndexPointerEXT, 707)
+	GL_STUB(glNormalPointerEXT, 708)
+	GL_STUB(glTexCoordPointerEXT, 709)
+	GL_STUB(glVertexPointerEXT, 710)
+	GL_STUB(glPointParameterfEXT, 711)
+	GL_STUB(glPointParameterfvEXT, 712)
+	GL_STUB(glLockArraysEXT, 713)
+	GL_STUB(glUnlockArraysEXT, 714)
+	GL_STUB(glSecondaryColor3bEXT, 715)
+	GL_STUB(glSecondaryColor3bvEXT, 716)
+	GL_STUB(glSecondaryColor3dEXT, 717)
+	GL_STUB(glSecondaryColor3dvEXT, 718)
+	GL_STUB(glSecondaryColor3fEXT, 719)
+	GL_STUB(glSecondaryColor3fvEXT, 720)
+	GL_STUB(glSecondaryColor3iEXT, 721)
+	GL_STUB(glSecondaryColor3ivEXT, 722)
+	GL_STUB(glSecondaryColor3sEXT, 723)
+	GL_STUB(glSecondaryColor3svEXT, 724)
+	GL_STUB(glSecondaryColor3ubEXT, 725)
+	GL_STUB(glSecondaryColor3ubvEXT, 726)
+	GL_STUB(glSecondaryColor3uiEXT, 727)
+	GL_STUB(glSecondaryColor3uivEXT, 728)
+	GL_STUB(glSecondaryColor3usEXT, 729)
+	GL_STUB(glSecondaryColor3usvEXT, 730)
+	GL_STUB(glSecondaryColorPointerEXT, 731)
+	GL_STUB(glMultiDrawArraysEXT, 732)
+	GL_STUB(glMultiDrawElementsEXT, 733)
+	GL_STUB(glFogCoordPointerEXT, 734)
+	GL_STUB(glFogCoorddEXT, 735)
+	GL_STUB(glFogCoorddvEXT, 736)
+	GL_STUB(glFogCoordfEXT, 737)
+	GL_STUB(glFogCoordfvEXT, 738)
+	GL_STUB(gl_dispatch_stub_739, 739)
+	HIDDEN(gl_dispatch_stub_739)
+	GL_STUB(glBlendFuncSeparateEXT, 740)
+	GL_STUB(glFlushVertexArrayRangeNV, 741)
+	GL_STUB(glVertexArrayRangeNV, 742)
+	GL_STUB(glCombinerInputNV, 743)
+	GL_STUB(glCombinerOutputNV, 744)
+	GL_STUB(glCombinerParameterfNV, 745)
+	GL_STUB(glCombinerParameterfvNV, 746)
+	GL_STUB(glCombinerParameteriNV, 747)
+	GL_STUB(glCombinerParameterivNV, 748)
+	GL_STUB(glFinalCombinerInputNV, 749)
+	GL_STUB(glGetCombinerInputParameterfvNV, 750)
+	GL_STUB(glGetCombinerInputParameterivNV, 751)
+	GL_STUB(glGetCombinerOutputParameterfvNV, 752)
+	GL_STUB(glGetCombinerOutputParameterivNV, 753)
+	GL_STUB(glGetFinalCombinerInputParameterfvNV, 754)
+	GL_STUB(glGetFinalCombinerInputParameterivNV, 755)
+	GL_STUB(glResizeBuffersMESA, 756)
+	GL_STUB(glWindowPos2dMESA, 757)
+	GL_STUB(glWindowPos2dvMESA, 758)
+	GL_STUB(glWindowPos2fMESA, 759)
+	GL_STUB(glWindowPos2fvMESA, 760)
+	GL_STUB(glWindowPos2iMESA, 761)
+	GL_STUB(glWindowPos2ivMESA, 762)
+	GL_STUB(glWindowPos2sMESA, 763)
+	GL_STUB(glWindowPos2svMESA, 764)
+	GL_STUB(glWindowPos3dMESA, 765)
+	GL_STUB(glWindowPos3dvMESA, 766)
+	GL_STUB(glWindowPos3fMESA, 767)
+	GL_STUB(glWindowPos3fvMESA, 768)
+	GL_STUB(glWindowPos3iMESA, 769)
+	GL_STUB(glWindowPos3ivMESA, 770)
+	GL_STUB(glWindowPos3sMESA, 771)
+	GL_STUB(glWindowPos3svMESA, 772)
+	GL_STUB(glWindowPos4dMESA, 773)
+	GL_STUB(glWindowPos4dvMESA, 774)
+	GL_STUB(glWindowPos4fMESA, 775)
+	GL_STUB(glWindowPos4fvMESA, 776)
+	GL_STUB(glWindowPos4iMESA, 777)
+	GL_STUB(glWindowPos4ivMESA, 778)
+	GL_STUB(glWindowPos4sMESA, 779)
+	GL_STUB(glWindowPos4svMESA, 780)
+	GL_STUB(gl_dispatch_stub_781, 781)
+	HIDDEN(gl_dispatch_stub_781)
 	GL_STUB(gl_dispatch_stub_782, 782)
 	HIDDEN(gl_dispatch_stub_782)
 	GL_STUB(gl_dispatch_stub_783, 783)
@@ -1002,88 +1003,88 @@ gl_dispatch_functions_start:
 	HIDDEN(gl_dispatch_stub_788)
 	GL_STUB(gl_dispatch_stub_789, 789)
 	HIDDEN(gl_dispatch_stub_789)
-	GL_STUB(gl_dispatch_stub_790, 790)
-	HIDDEN(gl_dispatch_stub_790)
-	GL_STUB(glAreProgramsResidentNV, 791)
-	GL_STUB(glBindProgramNV, 792)
-	GL_STUB(glDeleteProgramsNV, 793)
-	GL_STUB(glExecuteProgramNV, 794)
-	GL_STUB(glGenProgramsNV, 795)
-	GL_STUB(glGetProgramParameterdvNV, 796)
-	GL_STUB(glGetProgramParameterfvNV, 797)
-	GL_STUB(glGetProgramStringNV, 798)
-	GL_STUB(glGetProgramivNV, 799)
-	GL_STUB(glGetTrackMatrixivNV, 800)
-	GL_STUB(glGetVertexAttribPointervNV, 801)
-	GL_STUB(glGetVertexAttribdvNV, 802)
-	GL_STUB(glGetVertexAttribfvNV, 803)
-	GL_STUB(glGetVertexAttribivNV, 804)
-	GL_STUB(glIsProgramNV, 805)
-	GL_STUB(glLoadProgramNV, 806)
-	GL_STUB(glProgramParameters4dvNV, 807)
-	GL_STUB(glProgramParameters4fvNV, 808)
-	GL_STUB(glRequestResidentProgramsNV, 809)
-	GL_STUB(glTrackMatrixNV, 810)
-	GL_STUB(glVertexAttrib1dNV, 811)
-	GL_STUB(glVertexAttrib1dvNV, 812)
-	GL_STUB(glVertexAttrib1fNV, 813)
-	GL_STUB(glVertexAttrib1fvNV, 814)
-	GL_STUB(glVertexAttrib1sNV, 815)
-	GL_STUB(glVertexAttrib1svNV, 816)
-	GL_STUB(glVertexAttrib2dNV, 817)
-	GL_STUB(glVertexAttrib2dvNV, 818)
-	GL_STUB(glVertexAttrib2fNV, 819)
-	GL_STUB(glVertexAttrib2fvNV, 820)
-	GL_STUB(glVertexAttrib2sNV, 821)
-	GL_STUB(glVertexAttrib2svNV, 822)
-	GL_STUB(glVertexAttrib3dNV, 823)
-	GL_STUB(glVertexAttrib3dvNV, 824)
-	GL_STUB(glVertexAttrib3fNV, 825)
-	GL_STUB(glVertexAttrib3fvNV, 826)
-	GL_STUB(glVertexAttrib3sNV, 827)
-	GL_STUB(glVertexAttrib3svNV, 828)
-	GL_STUB(glVertexAttrib4dNV, 829)
-	GL_STUB(glVertexAttrib4dvNV, 830)
-	GL_STUB(glVertexAttrib4fNV, 831)
-	GL_STUB(glVertexAttrib4fvNV, 832)
-	GL_STUB(glVertexAttrib4sNV, 833)
-	GL_STUB(glVertexAttrib4svNV, 834)
-	GL_STUB(glVertexAttrib4ubNV, 835)
-	GL_STUB(glVertexAttrib4ubvNV, 836)
-	GL_STUB(glVertexAttribPointerNV, 837)
-	GL_STUB(glVertexAttribs1dvNV, 838)
-	GL_STUB(glVertexAttribs1fvNV, 839)
-	GL_STUB(glVertexAttribs1svNV, 840)
-	GL_STUB(glVertexAttribs2dvNV, 841)
-	GL_STUB(glVertexAttribs2fvNV, 842)
-	GL_STUB(glVertexAttribs2svNV, 843)
-	GL_STUB(glVertexAttribs3dvNV, 844)
-	GL_STUB(glVertexAttribs3fvNV, 845)
-	GL_STUB(glVertexAttribs3svNV, 846)
-	GL_STUB(glVertexAttribs4dvNV, 847)
-	GL_STUB(glVertexAttribs4fvNV, 848)
-	GL_STUB(glVertexAttribs4svNV, 849)
-	GL_STUB(glVertexAttribs4ubvNV, 850)
-	GL_STUB(glGetTexBumpParameterfvATI, 851)
-	GL_STUB(glGetTexBumpParameterivATI, 852)
-	GL_STUB(glTexBumpParameterfvATI, 853)
-	GL_STUB(glTexBumpParameterivATI, 854)
-	GL_STUB(glAlphaFragmentOp1ATI, 855)
-	GL_STUB(glAlphaFragmentOp2ATI, 856)
-	GL_STUB(glAlphaFragmentOp3ATI, 857)
-	GL_STUB(glBeginFragmentShaderATI, 858)
-	GL_STUB(glBindFragmentShaderATI, 859)
-	GL_STUB(glColorFragmentOp1ATI, 860)
-	GL_STUB(glColorFragmentOp2ATI, 861)
-	GL_STUB(glColorFragmentOp3ATI, 862)
-	GL_STUB(glDeleteFragmentShaderATI, 863)
-	GL_STUB(glEndFragmentShaderATI, 864)
-	GL_STUB(glGenFragmentShadersATI, 865)
-	GL_STUB(glPassTexCoordATI, 866)
-	GL_STUB(glSampleMapATI, 867)
-	GL_STUB(glSetFragmentShaderConstantATI, 868)
-	GL_STUB(glPointParameteriNV, 869)
-	GL_STUB(glPointParameterivNV, 870)
+	GL_STUB(glAreProgramsResidentNV, 790)
+	GL_STUB(glBindProgramNV, 791)
+	GL_STUB(glDeleteProgramsNV, 792)
+	GL_STUB(glExecuteProgramNV, 793)
+	GL_STUB(glGenProgramsNV, 794)
+	GL_STUB(glGetProgramParameterdvNV, 795)
+	GL_STUB(glGetProgramParameterfvNV, 796)
+	GL_STUB(glGetProgramStringNV, 797)
+	GL_STUB(glGetProgramivNV, 798)
+	GL_STUB(glGetTrackMatrixivNV, 799)
+	GL_STUB(glGetVertexAttribPointervNV, 800)
+	GL_STUB(glGetVertexAttribdvNV, 801)
+	GL_STUB(glGetVertexAttribfvNV, 802)
+	GL_STUB(glGetVertexAttribivNV, 803)
+	GL_STUB(glIsProgramNV, 804)
+	GL_STUB(glLoadProgramNV, 805)
+	GL_STUB(glProgramParameters4dvNV, 806)
+	GL_STUB(glProgramParameters4fvNV, 807)
+	GL_STUB(glRequestResidentProgramsNV, 808)
+	GL_STUB(glTrackMatrixNV, 809)
+	GL_STUB(glVertexAttrib1dNV, 810)
+	GL_STUB(glVertexAttrib1dvNV, 811)
+	GL_STUB(glVertexAttrib1fNV, 812)
+	GL_STUB(glVertexAttrib1fvNV, 813)
+	GL_STUB(glVertexAttrib1sNV, 814)
+	GL_STUB(glVertexAttrib1svNV, 815)
+	GL_STUB(glVertexAttrib2dNV, 816)
+	GL_STUB(glVertexAttrib2dvNV, 817)
+	GL_STUB(glVertexAttrib2fNV, 818)
+	GL_STUB(glVertexAttrib2fvNV, 819)
+	GL_STUB(glVertexAttrib2sNV, 820)
+	GL_STUB(glVertexAttrib2svNV, 821)
+	GL_STUB(glVertexAttrib3dNV, 822)
+	GL_STUB(glVertexAttrib3dvNV, 823)
+	GL_STUB(glVertexAttrib3fNV, 824)
+	GL_STUB(glVertexAttrib3fvNV, 825)
+	GL_STUB(glVertexAttrib3sNV, 826)
+	GL_STUB(glVertexAttrib3svNV, 827)
+	GL_STUB(glVertexAttrib4dNV, 828)
+	GL_STUB(glVertexAttrib4dvNV, 829)
+	GL_STUB(glVertexAttrib4fNV, 830)
+	GL_STUB(glVertexAttrib4fvNV, 831)
+	GL_STUB(glVertexAttrib4sNV, 832)
+	GL_STUB(glVertexAttrib4svNV, 833)
+	GL_STUB(glVertexAttrib4ubNV, 834)
+	GL_STUB(glVertexAttrib4ubvNV, 835)
+	GL_STUB(glVertexAttribPointerNV, 836)
+	GL_STUB(glVertexAttribs1dvNV, 837)
+	GL_STUB(glVertexAttribs1fvNV, 838)
+	GL_STUB(glVertexAttribs1svNV, 839)
+	GL_STUB(glVertexAttribs2dvNV, 840)
+	GL_STUB(glVertexAttribs2fvNV, 841)
+	GL_STUB(glVertexAttribs2svNV, 842)
+	GL_STUB(glVertexAttribs3dvNV, 843)
+	GL_STUB(glVertexAttribs3fvNV, 844)
+	GL_STUB(glVertexAttribs3svNV, 845)
+	GL_STUB(glVertexAttribs4dvNV, 846)
+	GL_STUB(glVertexAttribs4fvNV, 847)
+	GL_STUB(glVertexAttribs4svNV, 848)
+	GL_STUB(glVertexAttribs4ubvNV, 849)
+	GL_STUB(glGetTexBumpParameterfvATI, 850)
+	GL_STUB(glGetTexBumpParameterivATI, 851)
+	GL_STUB(glTexBumpParameterfvATI, 852)
+	GL_STUB(glTexBumpParameterivATI, 853)
+	GL_STUB(glAlphaFragmentOp1ATI, 854)
+	GL_STUB(glAlphaFragmentOp2ATI, 855)
+	GL_STUB(glAlphaFragmentOp3ATI, 856)
+	GL_STUB(glBeginFragmentShaderATI, 857)
+	GL_STUB(glBindFragmentShaderATI, 858)
+	GL_STUB(glColorFragmentOp1ATI, 859)
+	GL_STUB(glColorFragmentOp2ATI, 860)
+	GL_STUB(glColorFragmentOp3ATI, 861)
+	GL_STUB(glDeleteFragmentShaderATI, 862)
+	GL_STUB(glEndFragmentShaderATI, 863)
+	GL_STUB(glGenFragmentShadersATI, 864)
+	GL_STUB(glPassTexCoordATI, 865)
+	GL_STUB(glSampleMapATI, 866)
+	GL_STUB(glSetFragmentShaderConstantATI, 867)
+	GL_STUB(glPointParameteriNV, 868)
+	GL_STUB(glPointParameterivNV, 869)
+	GL_STUB(gl_dispatch_stub_870, 870)
+	HIDDEN(gl_dispatch_stub_870)
 	GL_STUB(gl_dispatch_stub_871, 871)
 	HIDDEN(gl_dispatch_stub_871)
 	GL_STUB(gl_dispatch_stub_872, 872)
@@ -1092,111 +1093,111 @@ gl_dispatch_functions_start:
 	HIDDEN(gl_dispatch_stub_873)
 	GL_STUB(gl_dispatch_stub_874, 874)
 	HIDDEN(gl_dispatch_stub_874)
-	GL_STUB(gl_dispatch_stub_875, 875)
-	HIDDEN(gl_dispatch_stub_875)
-	GL_STUB(glGetProgramNamedParameterdvNV, 876)
-	GL_STUB(glGetProgramNamedParameterfvNV, 877)
-	GL_STUB(glProgramNamedParameter4dNV, 878)
-	GL_STUB(glProgramNamedParameter4dvNV, 879)
-	GL_STUB(glProgramNamedParameter4fNV, 880)
-	GL_STUB(glProgramNamedParameter4fvNV, 881)
-	GL_STUB(glPrimitiveRestartIndexNV, 882)
-	GL_STUB(glPrimitiveRestartNV, 883)
+	GL_STUB(glGetProgramNamedParameterdvNV, 875)
+	GL_STUB(glGetProgramNamedParameterfvNV, 876)
+	GL_STUB(glProgramNamedParameter4dNV, 877)
+	GL_STUB(glProgramNamedParameter4dvNV, 878)
+	GL_STUB(glProgramNamedParameter4fNV, 879)
+	GL_STUB(glProgramNamedParameter4fvNV, 880)
+	GL_STUB(glPrimitiveRestartIndexNV, 881)
+	GL_STUB(glPrimitiveRestartNV, 882)
+	GL_STUB(gl_dispatch_stub_883, 883)
+	HIDDEN(gl_dispatch_stub_883)
 	GL_STUB(gl_dispatch_stub_884, 884)
 	HIDDEN(gl_dispatch_stub_884)
-	GL_STUB(gl_dispatch_stub_885, 885)
-	HIDDEN(gl_dispatch_stub_885)
-	GL_STUB(glBindFramebufferEXT, 886)
-	GL_STUB(glBindRenderbufferEXT, 887)
-	GL_STUB(glCheckFramebufferStatusEXT, 888)
-	GL_STUB(glDeleteFramebuffersEXT, 889)
-	GL_STUB(glDeleteRenderbuffersEXT, 890)
-	GL_STUB(glFramebufferRenderbufferEXT, 891)
-	GL_STUB(glFramebufferTexture1DEXT, 892)
-	GL_STUB(glFramebufferTexture2DEXT, 893)
-	GL_STUB(glFramebufferTexture3DEXT, 894)
-	GL_STUB(glGenFramebuffersEXT, 895)
-	GL_STUB(glGenRenderbuffersEXT, 896)
-	GL_STUB(glGenerateMipmapEXT, 897)
-	GL_STUB(glGetFramebufferAttachmentParameterivEXT, 898)
-	GL_STUB(glGetRenderbufferParameterivEXT, 899)
-	GL_STUB(glIsFramebufferEXT, 900)
-	GL_STUB(glIsRenderbufferEXT, 901)
-	GL_STUB(glRenderbufferStorageEXT, 902)
+	GL_STUB(glBindFramebufferEXT, 885)
+	GL_STUB(glBindRenderbufferEXT, 886)
+	GL_STUB(glCheckFramebufferStatusEXT, 887)
+	GL_STUB(glDeleteFramebuffersEXT, 888)
+	GL_STUB(glDeleteRenderbuffersEXT, 889)
+	GL_STUB(glFramebufferRenderbufferEXT, 890)
+	GL_STUB(glFramebufferTexture1DEXT, 891)
+	GL_STUB(glFramebufferTexture2DEXT, 892)
+	GL_STUB(glFramebufferTexture3DEXT, 893)
+	GL_STUB(glGenFramebuffersEXT, 894)
+	GL_STUB(glGenRenderbuffersEXT, 895)
+	GL_STUB(glGenerateMipmapEXT, 896)
+	GL_STUB(glGetFramebufferAttachmentParameterivEXT, 897)
+	GL_STUB(glGetRenderbufferParameterivEXT, 898)
+	GL_STUB(glIsFramebufferEXT, 899)
+	GL_STUB(glIsRenderbufferEXT, 900)
+	GL_STUB(glRenderbufferStorageEXT, 901)
+	GL_STUB(gl_dispatch_stub_902, 902)
+	HIDDEN(gl_dispatch_stub_902)
 	GL_STUB(gl_dispatch_stub_903, 903)
 	HIDDEN(gl_dispatch_stub_903)
 	GL_STUB(gl_dispatch_stub_904, 904)
 	HIDDEN(gl_dispatch_stub_904)
-	GL_STUB(gl_dispatch_stub_905, 905)
-	HIDDEN(gl_dispatch_stub_905)
-	GL_STUB(glBindFragDataLocationEXT, 906)
-	GL_STUB(glGetFragDataLocationEXT, 907)
-	GL_STUB(glGetUniformuivEXT, 908)
-	GL_STUB(glGetVertexAttribIivEXT, 909)
-	GL_STUB(glGetVertexAttribIuivEXT, 910)
-	GL_STUB(glUniform1uiEXT, 911)
-	GL_STUB(glUniform1uivEXT, 912)
-	GL_STUB(glUniform2uiEXT, 913)
-	GL_STUB(glUniform2uivEXT, 914)
-	GL_STUB(glUniform3uiEXT, 915)
-	GL_STUB(glUniform3uivEXT, 916)
-	GL_STUB(glUniform4uiEXT, 917)
-	GL_STUB(glUniform4uivEXT, 918)
-	GL_STUB(glVertexAttribI1iEXT, 919)
-	GL_STUB(glVertexAttribI1ivEXT, 920)
-	GL_STUB(glVertexAttribI1uiEXT, 921)
-	GL_STUB(glVertexAttribI1uivEXT, 922)
-	GL_STUB(glVertexAttribI2iEXT, 923)
-	GL_STUB(glVertexAttribI2ivEXT, 924)
-	GL_STUB(glVertexAttribI2uiEXT, 925)
-	GL_STUB(glVertexAttribI2uivEXT, 926)
-	GL_STUB(glVertexAttribI3iEXT, 927)
-	GL_STUB(glVertexAttribI3ivEXT, 928)
-	GL_STUB(glVertexAttribI3uiEXT, 929)
-	GL_STUB(glVertexAttribI3uivEXT, 930)
-	GL_STUB(glVertexAttribI4bvEXT, 931)
-	GL_STUB(glVertexAttribI4iEXT, 932)
-	GL_STUB(glVertexAttribI4ivEXT, 933)
-	GL_STUB(glVertexAttribI4svEXT, 934)
-	GL_STUB(glVertexAttribI4ubvEXT, 935)
-	GL_STUB(glVertexAttribI4uiEXT, 936)
-	GL_STUB(glVertexAttribI4uivEXT, 937)
-	GL_STUB(glVertexAttribI4usvEXT, 938)
-	GL_STUB(glVertexAttribIPointerEXT, 939)
-	GL_STUB(glFramebufferTextureLayerEXT, 940)
-	GL_STUB(glColorMaskIndexedEXT, 941)
-	GL_STUB(glDisableIndexedEXT, 942)
-	GL_STUB(glEnableIndexedEXT, 943)
-	GL_STUB(glGetBooleanIndexedvEXT, 944)
-	GL_STUB(glGetIntegerIndexedvEXT, 945)
-	GL_STUB(glIsEnabledIndexedEXT, 946)
-	GL_STUB(glClearColorIiEXT, 947)
-	GL_STUB(glClearColorIuiEXT, 948)
-	GL_STUB(glGetTexParameterIivEXT, 949)
-	GL_STUB(glGetTexParameterIuivEXT, 950)
-	GL_STUB(glTexParameterIivEXT, 951)
-	GL_STUB(glTexParameterIuivEXT, 952)
-	GL_STUB(glBeginConditionalRenderNV, 953)
-	GL_STUB(glEndConditionalRenderNV, 954)
-	GL_STUB(glBeginTransformFeedbackEXT, 955)
-	GL_STUB(glBindBufferBaseEXT, 956)
-	GL_STUB(glBindBufferOffsetEXT, 957)
-	GL_STUB(glBindBufferRangeEXT, 958)
-	GL_STUB(glEndTransformFeedbackEXT, 959)
-	GL_STUB(glGetTransformFeedbackVaryingEXT, 960)
-	GL_STUB(glTransformFeedbackVaryingsEXT, 961)
-	GL_STUB(glProvokingVertexEXT, 962)
+	GL_STUB(glBindFragDataLocationEXT, 905)
+	GL_STUB(glGetFragDataLocationEXT, 906)
+	GL_STUB(glGetUniformuivEXT, 907)
+	GL_STUB(glGetVertexAttribIivEXT, 908)
+	GL_STUB(glGetVertexAttribIuivEXT, 909)
+	GL_STUB(glUniform1uiEXT, 910)
+	GL_STUB(glUniform1uivEXT, 911)
+	GL_STUB(glUniform2uiEXT, 912)
+	GL_STUB(glUniform2uivEXT, 913)
+	GL_STUB(glUniform3uiEXT, 914)
+	GL_STUB(glUniform3uivEXT, 915)
+	GL_STUB(glUniform4uiEXT, 916)
+	GL_STUB(glUniform4uivEXT, 917)
+	GL_STUB(glVertexAttribI1iEXT, 918)
+	GL_STUB(glVertexAttribI1ivEXT, 919)
+	GL_STUB(glVertexAttribI1uiEXT, 920)
+	GL_STUB(glVertexAttribI1uivEXT, 921)
+	GL_STUB(glVertexAttribI2iEXT, 922)
+	GL_STUB(glVertexAttribI2ivEXT, 923)
+	GL_STUB(glVertexAttribI2uiEXT, 924)
+	GL_STUB(glVertexAttribI2uivEXT, 925)
+	GL_STUB(glVertexAttribI3iEXT, 926)
+	GL_STUB(glVertexAttribI3ivEXT, 927)
+	GL_STUB(glVertexAttribI3uiEXT, 928)
+	GL_STUB(glVertexAttribI3uivEXT, 929)
+	GL_STUB(glVertexAttribI4bvEXT, 930)
+	GL_STUB(glVertexAttribI4iEXT, 931)
+	GL_STUB(glVertexAttribI4ivEXT, 932)
+	GL_STUB(glVertexAttribI4svEXT, 933)
+	GL_STUB(glVertexAttribI4ubvEXT, 934)
+	GL_STUB(glVertexAttribI4uiEXT, 935)
+	GL_STUB(glVertexAttribI4uivEXT, 936)
+	GL_STUB(glVertexAttribI4usvEXT, 937)
+	GL_STUB(glVertexAttribIPointerEXT, 938)
+	GL_STUB(glFramebufferTextureLayerEXT, 939)
+	GL_STUB(glColorMaskIndexedEXT, 940)
+	GL_STUB(glDisableIndexedEXT, 941)
+	GL_STUB(glEnableIndexedEXT, 942)
+	GL_STUB(glGetBooleanIndexedvEXT, 943)
+	GL_STUB(glGetIntegerIndexedvEXT, 944)
+	GL_STUB(glIsEnabledIndexedEXT, 945)
+	GL_STUB(glClearColorIiEXT, 946)
+	GL_STUB(glClearColorIuiEXT, 947)
+	GL_STUB(glGetTexParameterIivEXT, 948)
+	GL_STUB(glGetTexParameterIuivEXT, 949)
+	GL_STUB(glTexParameterIivEXT, 950)
+	GL_STUB(glTexParameterIuivEXT, 951)
+	GL_STUB(glBeginConditionalRenderNV, 952)
+	GL_STUB(glEndConditionalRenderNV, 953)
+	GL_STUB(glBeginTransformFeedbackEXT, 954)
+	GL_STUB(glBindBufferBaseEXT, 955)
+	GL_STUB(glBindBufferOffsetEXT, 956)
+	GL_STUB(glBindBufferRangeEXT, 957)
+	GL_STUB(glEndTransformFeedbackEXT, 958)
+	GL_STUB(glGetTransformFeedbackVaryingEXT, 959)
+	GL_STUB(glTransformFeedbackVaryingsEXT, 960)
+	GL_STUB(glProvokingVertexEXT, 961)
+	GL_STUB(gl_dispatch_stub_962, 962)
+	HIDDEN(gl_dispatch_stub_962)
 	GL_STUB(gl_dispatch_stub_963, 963)
 	HIDDEN(gl_dispatch_stub_963)
-	GL_STUB(gl_dispatch_stub_964, 964)
-	HIDDEN(gl_dispatch_stub_964)
-	GL_STUB(glGetObjectParameterivAPPLE, 965)
-	GL_STUB(glObjectPurgeableAPPLE, 966)
-	GL_STUB(glObjectUnpurgeableAPPLE, 967)
-	GL_STUB(glActiveProgramEXT, 968)
-	GL_STUB(glCreateShaderProgramEXT, 969)
-	GL_STUB(glUseShaderProgramEXT, 970)
-	GL_STUB(glTextureBarrierNV, 971)
+	GL_STUB(glGetObjectParameterivAPPLE, 964)
+	GL_STUB(glObjectPurgeableAPPLE, 965)
+	GL_STUB(glObjectUnpurgeableAPPLE, 966)
+	GL_STUB(glActiveProgramEXT, 967)
+	GL_STUB(glCreateShaderProgramEXT, 968)
+	GL_STUB(glUseShaderProgramEXT, 969)
+	GL_STUB(glTextureBarrierNV, 970)
+	GL_STUB(gl_dispatch_stub_971, 971)
+	HIDDEN(gl_dispatch_stub_971)
 	GL_STUB(gl_dispatch_stub_972, 972)
 	HIDDEN(gl_dispatch_stub_972)
 	GL_STUB(gl_dispatch_stub_973, 973)
@@ -1205,10 +1206,8 @@ gl_dispatch_functions_start:
 	HIDDEN(gl_dispatch_stub_974)
 	GL_STUB(gl_dispatch_stub_975, 975)
 	HIDDEN(gl_dispatch_stub_975)
-	GL_STUB(gl_dispatch_stub_976, 976)
-	HIDDEN(gl_dispatch_stub_976)
-	GL_STUB(glEGLImageTargetRenderbufferStorageOES, 977)
-	GL_STUB(glEGLImageTargetTexture2DOES, 978)
+	GL_STUB(glEGLImageTargetRenderbufferStorageOES, 976)
+	GL_STUB(glEGLImageTargetTexture2DOES, 977)
 	GL_STUB_ALIAS(glArrayElementEXT, glArrayElement)
 	GL_STUB_ALIAS(glBindTextureEXT, glBindTexture)
 	GL_STUB_ALIAS(glDrawArraysEXT, glDrawArrays)
@@ -1458,6 +1457,7 @@ gl_dispatch_functions_start:
 	GL_STUB_ALIAS(glDrawElementsInstancedEXT, glDrawElementsInstancedARB)
 	GL_STUB_ALIAS(glDrawElementsInstanced, glDrawElementsInstancedARB)
 	GL_STUB_ALIAS(glRenderbufferStorageMultisampleEXT, glRenderbufferStorageMultisample)
+	GL_STUB_ALIAS(glTexBuffer, glTexBufferARB)
 	GL_STUB_ALIAS(glBlendEquationSeparateIndexedAMD, glBlendEquationSeparateiARB)
 	GL_STUB_ALIAS(glBlendEquationIndexedAMD, glBlendEquationiARB)
 	GL_STUB_ALIAS(glBlendFuncSeparateIndexedAMD, glBlendFuncSeparateiARB)
diff --git a/mesalib/src/mapi/glapi/glapi_x86-64.S b/mesalib/src/mapi/glapi/glapi_x86-64.S
index afcd2638f..b22fb6767 100644
--- a/mesalib/src/mapi/glapi/glapi_x86-64.S
+++ b/mesalib/src/mapi/glapi/glapi_x86-64.S
@@ -16232,49 +16232,12 @@ GL_PREFIX(GetStringi):
 	.size	GL_PREFIX(GetStringi), .-GL_PREFIX(GetStringi)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(TexBuffer)
-	.type	GL_PREFIX(TexBuffer), @function
-GL_PREFIX(TexBuffer):
-#if defined(GLX_USE_TLS)
-	call	_x86_64_get_dispatch@PLT
-	movq	3488(%rax), %r11
-	jmp	*%r11
-#elif defined(PTHREADS)
-	pushq	%rdi
-	pushq	%rsi
-	pushq	%rdx
-	call	_x86_64_get_dispatch@PLT
-	popq	%rdx
-	popq	%rsi
-	popq	%rdi
-	movq	3488(%rax), %r11
-	jmp	*%r11
-#else
-	movq	_glapi_Dispatch(%rip), %rax
-	testq	%rax, %rax
-	je	1f
-	movq	3488(%rax), %r11
-	jmp	*%r11
-1:
-	pushq	%rdi
-	pushq	%rsi
-	pushq	%rdx
-	call	_glapi_get_dispatch
-	popq	%rdx
-	popq	%rsi
-	popq	%rdi
-	movq	3488(%rax), %r11
-	jmp	*%r11
-#endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(TexBuffer), .-GL_PREFIX(TexBuffer)
-
-	.p2align	4,,15
 	.globl	GL_PREFIX(FramebufferTexture)
 	.type	GL_PREFIX(FramebufferTexture), @function
 GL_PREFIX(FramebufferTexture):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3496(%rax), %r11
+	movq	3488(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -16288,13 +16251,13 @@ GL_PREFIX(FramebufferTexture):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3496(%rax), %r11
+	movq	3488(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3496(%rax), %r11
+	movq	3488(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -16308,7 +16271,7 @@ GL_PREFIX(FramebufferTexture):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3496(%rax), %r11
+	movq	3488(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTexture), .-GL_PREFIX(FramebufferTexture)
@@ -16319,7 +16282,7 @@ GL_PREFIX(FramebufferTexture):
 GL_PREFIX(GetBufferParameteri64v):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3504(%rax), %r11
+	movq	3496(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -16329,13 +16292,13 @@ GL_PREFIX(GetBufferParameteri64v):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3504(%rax), %r11
+	movq	3496(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3504(%rax), %r11
+	movq	3496(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -16345,7 +16308,7 @@ GL_PREFIX(GetBufferParameteri64v):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3504(%rax), %r11
+	movq	3496(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetBufferParameteri64v), .-GL_PREFIX(GetBufferParameteri64v)
@@ -16356,7 +16319,7 @@ GL_PREFIX(GetBufferParameteri64v):
 GL_PREFIX(GetInteger64i_v):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3512(%rax), %r11
+	movq	3504(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -16366,13 +16329,13 @@ GL_PREFIX(GetInteger64i_v):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3512(%rax), %r11
+	movq	3504(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3512(%rax), %r11
+	movq	3504(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -16382,7 +16345,7 @@ GL_PREFIX(GetInteger64i_v):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3512(%rax), %r11
+	movq	3504(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetInteger64i_v), .-GL_PREFIX(GetInteger64i_v)
@@ -16393,7 +16356,7 @@ GL_PREFIX(GetInteger64i_v):
 GL_PREFIX(VertexAttribDivisor):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3520(%rax), %r11
+	movq	3512(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -16403,13 +16366,13 @@ GL_PREFIX(VertexAttribDivisor):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	3520(%rax), %r11
+	movq	3512(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3520(%rax), %r11
+	movq	3512(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -16419,7 +16382,7 @@ GL_PREFIX(VertexAttribDivisor):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	3520(%rax), %r11
+	movq	3512(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribDivisor), .-GL_PREFIX(VertexAttribDivisor)
@@ -16430,25 +16393,25 @@ GL_PREFIX(VertexAttribDivisor):
 GL_PREFIX(LoadTransposeMatrixdARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3528(%rax), %r11
+	movq	3520(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	3528(%rax), %r11
+	movq	3520(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3528(%rax), %r11
+	movq	3520(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	3528(%rax), %r11
+	movq	3520(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(LoadTransposeMatrixdARB), .-GL_PREFIX(LoadTransposeMatrixdARB)
@@ -16459,25 +16422,25 @@ GL_PREFIX(LoadTransposeMatrixdARB):
 GL_PREFIX(LoadTransposeMatrixfARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3536(%rax), %r11
+	movq	3528(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	3536(%rax), %r11
+	movq	3528(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3536(%rax), %r11
+	movq	3528(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	3536(%rax), %r11
+	movq	3528(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(LoadTransposeMatrixfARB), .-GL_PREFIX(LoadTransposeMatrixfARB)
@@ -16488,25 +16451,25 @@ GL_PREFIX(LoadTransposeMatrixfARB):
 GL_PREFIX(MultTransposeMatrixdARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3544(%rax), %r11
+	movq	3536(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	3544(%rax), %r11
+	movq	3536(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3544(%rax), %r11
+	movq	3536(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	3544(%rax), %r11
+	movq	3536(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(MultTransposeMatrixdARB), .-GL_PREFIX(MultTransposeMatrixdARB)
@@ -16517,25 +16480,25 @@ GL_PREFIX(MultTransposeMatrixdARB):
 GL_PREFIX(MultTransposeMatrixfARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3552(%rax), %r11
+	movq	3544(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	3552(%rax), %r11
+	movq	3544(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3552(%rax), %r11
+	movq	3544(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	3552(%rax), %r11
+	movq	3544(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(MultTransposeMatrixfARB), .-GL_PREFIX(MultTransposeMatrixfARB)
@@ -16546,7 +16509,7 @@ GL_PREFIX(MultTransposeMatrixfARB):
 GL_PREFIX(SampleCoverageARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3560(%rax), %r11
+	movq	3552(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -16556,13 +16519,13 @@ GL_PREFIX(SampleCoverageARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	3560(%rax), %r11
+	movq	3552(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3560(%rax), %r11
+	movq	3552(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -16572,7 +16535,7 @@ GL_PREFIX(SampleCoverageARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	3560(%rax), %r11
+	movq	3552(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SampleCoverageARB), .-GL_PREFIX(SampleCoverageARB)
@@ -16583,7 +16546,7 @@ GL_PREFIX(SampleCoverageARB):
 GL_PREFIX(CompressedTexImage1DARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3568(%rax), %r11
+	movq	3560(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -16601,13 +16564,13 @@ GL_PREFIX(CompressedTexImage1DARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3568(%rax), %r11
+	movq	3560(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3568(%rax), %r11
+	movq	3560(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -16625,7 +16588,7 @@ GL_PREFIX(CompressedTexImage1DARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3568(%rax), %r11
+	movq	3560(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CompressedTexImage1DARB), .-GL_PREFIX(CompressedTexImage1DARB)
@@ -16636,7 +16599,7 @@ GL_PREFIX(CompressedTexImage1DARB):
 GL_PREFIX(CompressedTexImage2DARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3576(%rax), %r11
+	movq	3568(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -16654,13 +16617,13 @@ GL_PREFIX(CompressedTexImage2DARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3576(%rax), %r11
+	movq	3568(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3576(%rax), %r11
+	movq	3568(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -16678,7 +16641,7 @@ GL_PREFIX(CompressedTexImage2DARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3576(%rax), %r11
+	movq	3568(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CompressedTexImage2DARB), .-GL_PREFIX(CompressedTexImage2DARB)
@@ -16689,7 +16652,7 @@ GL_PREFIX(CompressedTexImage2DARB):
 GL_PREFIX(CompressedTexImage3DARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3584(%rax), %r11
+	movq	3576(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -16707,13 +16670,13 @@ GL_PREFIX(CompressedTexImage3DARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3584(%rax), %r11
+	movq	3576(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3584(%rax), %r11
+	movq	3576(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -16731,7 +16694,7 @@ GL_PREFIX(CompressedTexImage3DARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3584(%rax), %r11
+	movq	3576(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CompressedTexImage3DARB), .-GL_PREFIX(CompressedTexImage3DARB)
@@ -16742,7 +16705,7 @@ GL_PREFIX(CompressedTexImage3DARB):
 GL_PREFIX(CompressedTexSubImage1DARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3592(%rax), %r11
+	movq	3584(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -16760,13 +16723,13 @@ GL_PREFIX(CompressedTexSubImage1DARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3592(%rax), %r11
+	movq	3584(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3592(%rax), %r11
+	movq	3584(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -16784,7 +16747,7 @@ GL_PREFIX(CompressedTexSubImage1DARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3592(%rax), %r11
+	movq	3584(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CompressedTexSubImage1DARB), .-GL_PREFIX(CompressedTexSubImage1DARB)
@@ -16795,7 +16758,7 @@ GL_PREFIX(CompressedTexSubImage1DARB):
 GL_PREFIX(CompressedTexSubImage2DARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3600(%rax), %r11
+	movq	3592(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -16813,13 +16776,13 @@ GL_PREFIX(CompressedTexSubImage2DARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3600(%rax), %r11
+	movq	3592(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3600(%rax), %r11
+	movq	3592(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -16837,7 +16800,7 @@ GL_PREFIX(CompressedTexSubImage2DARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3600(%rax), %r11
+	movq	3592(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CompressedTexSubImage2DARB), .-GL_PREFIX(CompressedTexSubImage2DARB)
@@ -16848,7 +16811,7 @@ GL_PREFIX(CompressedTexSubImage2DARB):
 GL_PREFIX(CompressedTexSubImage3DARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3608(%rax), %r11
+	movq	3600(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -16866,13 +16829,13 @@ GL_PREFIX(CompressedTexSubImage3DARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3608(%rax), %r11
+	movq	3600(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3608(%rax), %r11
+	movq	3600(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -16890,7 +16853,7 @@ GL_PREFIX(CompressedTexSubImage3DARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3608(%rax), %r11
+	movq	3600(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CompressedTexSubImage3DARB), .-GL_PREFIX(CompressedTexSubImage3DARB)
@@ -16901,7 +16864,7 @@ GL_PREFIX(CompressedTexSubImage3DARB):
 GL_PREFIX(GetCompressedTexImageARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3616(%rax), %r11
+	movq	3608(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -16911,13 +16874,13 @@ GL_PREFIX(GetCompressedTexImageARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3616(%rax), %r11
+	movq	3608(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3616(%rax), %r11
+	movq	3608(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -16927,7 +16890,7 @@ GL_PREFIX(GetCompressedTexImageARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3616(%rax), %r11
+	movq	3608(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetCompressedTexImageARB), .-GL_PREFIX(GetCompressedTexImageARB)
@@ -16938,25 +16901,25 @@ GL_PREFIX(GetCompressedTexImageARB):
 GL_PREFIX(DisableVertexAttribArrayARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3624(%rax), %r11
+	movq	3616(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	3624(%rax), %r11
+	movq	3616(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3624(%rax), %r11
+	movq	3616(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	3624(%rax), %r11
+	movq	3616(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DisableVertexAttribArrayARB), .-GL_PREFIX(DisableVertexAttribArrayARB)
@@ -16967,25 +16930,25 @@ GL_PREFIX(DisableVertexAttribArrayARB):
 GL_PREFIX(EnableVertexAttribArrayARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3632(%rax), %r11
+	movq	3624(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	3632(%rax), %r11
+	movq	3624(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3632(%rax), %r11
+	movq	3624(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	3632(%rax), %r11
+	movq	3624(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(EnableVertexAttribArrayARB), .-GL_PREFIX(EnableVertexAttribArrayARB)
@@ -16996,7 +16959,7 @@ GL_PREFIX(EnableVertexAttribArrayARB):
 GL_PREFIX(GetProgramEnvParameterdvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3640(%rax), %r11
+	movq	3632(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -17006,13 +16969,13 @@ GL_PREFIX(GetProgramEnvParameterdvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3640(%rax), %r11
+	movq	3632(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3640(%rax), %r11
+	movq	3632(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -17022,7 +16985,7 @@ GL_PREFIX(GetProgramEnvParameterdvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3640(%rax), %r11
+	movq	3632(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramEnvParameterdvARB), .-GL_PREFIX(GetProgramEnvParameterdvARB)
@@ -17033,7 +16996,7 @@ GL_PREFIX(GetProgramEnvParameterdvARB):
 GL_PREFIX(GetProgramEnvParameterfvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3648(%rax), %r11
+	movq	3640(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -17043,13 +17006,13 @@ GL_PREFIX(GetProgramEnvParameterfvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3648(%rax), %r11
+	movq	3640(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3648(%rax), %r11
+	movq	3640(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -17059,7 +17022,7 @@ GL_PREFIX(GetProgramEnvParameterfvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3648(%rax), %r11
+	movq	3640(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramEnvParameterfvARB), .-GL_PREFIX(GetProgramEnvParameterfvARB)
@@ -17070,7 +17033,7 @@ GL_PREFIX(GetProgramEnvParameterfvARB):
 GL_PREFIX(GetProgramLocalParameterdvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3656(%rax), %r11
+	movq	3648(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -17080,13 +17043,13 @@ GL_PREFIX(GetProgramLocalParameterdvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3656(%rax), %r11
+	movq	3648(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3656(%rax), %r11
+	movq	3648(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -17096,7 +17059,7 @@ GL_PREFIX(GetProgramLocalParameterdvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3656(%rax), %r11
+	movq	3648(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramLocalParameterdvARB), .-GL_PREFIX(GetProgramLocalParameterdvARB)
@@ -17107,7 +17070,7 @@ GL_PREFIX(GetProgramLocalParameterdvARB):
 GL_PREFIX(GetProgramLocalParameterfvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3664(%rax), %r11
+	movq	3656(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -17117,13 +17080,13 @@ GL_PREFIX(GetProgramLocalParameterfvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3664(%rax), %r11
+	movq	3656(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3664(%rax), %r11
+	movq	3656(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -17133,7 +17096,7 @@ GL_PREFIX(GetProgramLocalParameterfvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3664(%rax), %r11
+	movq	3656(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramLocalParameterfvARB), .-GL_PREFIX(GetProgramLocalParameterfvARB)
@@ -17144,7 +17107,7 @@ GL_PREFIX(GetProgramLocalParameterfvARB):
 GL_PREFIX(GetProgramStringARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3672(%rax), %r11
+	movq	3664(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -17154,13 +17117,13 @@ GL_PREFIX(GetProgramStringARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3672(%rax), %r11
+	movq	3664(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3672(%rax), %r11
+	movq	3664(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -17170,7 +17133,7 @@ GL_PREFIX(GetProgramStringARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3672(%rax), %r11
+	movq	3664(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramStringARB), .-GL_PREFIX(GetProgramStringARB)
@@ -17181,7 +17144,7 @@ GL_PREFIX(GetProgramStringARB):
 GL_PREFIX(GetProgramivARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3680(%rax), %r11
+	movq	3672(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -17191,13 +17154,13 @@ GL_PREFIX(GetProgramivARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3680(%rax), %r11
+	movq	3672(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3680(%rax), %r11
+	movq	3672(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -17207,7 +17170,7 @@ GL_PREFIX(GetProgramivARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3680(%rax), %r11
+	movq	3672(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramivARB), .-GL_PREFIX(GetProgramivARB)
@@ -17218,7 +17181,7 @@ GL_PREFIX(GetProgramivARB):
 GL_PREFIX(GetVertexAttribdvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3688(%rax), %r11
+	movq	3680(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -17228,13 +17191,13 @@ GL_PREFIX(GetVertexAttribdvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3688(%rax), %r11
+	movq	3680(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3688(%rax), %r11
+	movq	3680(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -17244,7 +17207,7 @@ GL_PREFIX(GetVertexAttribdvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3688(%rax), %r11
+	movq	3680(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribdvARB), .-GL_PREFIX(GetVertexAttribdvARB)
@@ -17255,7 +17218,7 @@ GL_PREFIX(GetVertexAttribdvARB):
 GL_PREFIX(GetVertexAttribfvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3696(%rax), %r11
+	movq	3688(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -17265,13 +17228,13 @@ GL_PREFIX(GetVertexAttribfvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3696(%rax), %r11
+	movq	3688(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3696(%rax), %r11
+	movq	3688(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -17281,7 +17244,7 @@ GL_PREFIX(GetVertexAttribfvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3696(%rax), %r11
+	movq	3688(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribfvARB), .-GL_PREFIX(GetVertexAttribfvARB)
@@ -17292,7 +17255,7 @@ GL_PREFIX(GetVertexAttribfvARB):
 GL_PREFIX(GetVertexAttribivARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3704(%rax), %r11
+	movq	3696(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -17302,13 +17265,13 @@ GL_PREFIX(GetVertexAttribivARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3704(%rax), %r11
+	movq	3696(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3704(%rax), %r11
+	movq	3696(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -17318,7 +17281,7 @@ GL_PREFIX(GetVertexAttribivARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3704(%rax), %r11
+	movq	3696(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribivARB), .-GL_PREFIX(GetVertexAttribivARB)
@@ -17329,7 +17292,7 @@ GL_PREFIX(GetVertexAttribivARB):
 GL_PREFIX(ProgramEnvParameter4dARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3712(%rax), %r11
+	movq	3704(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$56, %rsp
@@ -17347,13 +17310,13 @@ GL_PREFIX(ProgramEnvParameter4dARB):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	3712(%rax), %r11
+	movq	3704(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3712(%rax), %r11
+	movq	3704(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$56, %rsp
@@ -17371,7 +17334,7 @@ GL_PREFIX(ProgramEnvParameter4dARB):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	3712(%rax), %r11
+	movq	3704(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramEnvParameter4dARB), .-GL_PREFIX(ProgramEnvParameter4dARB)
@@ -17382,7 +17345,7 @@ GL_PREFIX(ProgramEnvParameter4dARB):
 GL_PREFIX(ProgramEnvParameter4dvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3720(%rax), %r11
+	movq	3712(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -17392,13 +17355,13 @@ GL_PREFIX(ProgramEnvParameter4dvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3720(%rax), %r11
+	movq	3712(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3720(%rax), %r11
+	movq	3712(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -17408,7 +17371,7 @@ GL_PREFIX(ProgramEnvParameter4dvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3720(%rax), %r11
+	movq	3712(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramEnvParameter4dvARB), .-GL_PREFIX(ProgramEnvParameter4dvARB)
@@ -17419,7 +17382,7 @@ GL_PREFIX(ProgramEnvParameter4dvARB):
 GL_PREFIX(ProgramEnvParameter4fARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3728(%rax), %r11
+	movq	3720(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$56, %rsp
@@ -17437,13 +17400,13 @@ GL_PREFIX(ProgramEnvParameter4fARB):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	3728(%rax), %r11
+	movq	3720(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3728(%rax), %r11
+	movq	3720(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$56, %rsp
@@ -17461,7 +17424,7 @@ GL_PREFIX(ProgramEnvParameter4fARB):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	3728(%rax), %r11
+	movq	3720(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramEnvParameter4fARB), .-GL_PREFIX(ProgramEnvParameter4fARB)
@@ -17472,7 +17435,7 @@ GL_PREFIX(ProgramEnvParameter4fARB):
 GL_PREFIX(ProgramEnvParameter4fvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3736(%rax), %r11
+	movq	3728(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -17482,13 +17445,13 @@ GL_PREFIX(ProgramEnvParameter4fvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3736(%rax), %r11
+	movq	3728(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3736(%rax), %r11
+	movq	3728(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -17498,7 +17461,7 @@ GL_PREFIX(ProgramEnvParameter4fvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3736(%rax), %r11
+	movq	3728(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramEnvParameter4fvARB), .-GL_PREFIX(ProgramEnvParameter4fvARB)
@@ -17509,7 +17472,7 @@ GL_PREFIX(ProgramEnvParameter4fvARB):
 GL_PREFIX(ProgramLocalParameter4dARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3744(%rax), %r11
+	movq	3736(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$56, %rsp
@@ -17527,13 +17490,13 @@ GL_PREFIX(ProgramLocalParameter4dARB):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	3744(%rax), %r11
+	movq	3736(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3744(%rax), %r11
+	movq	3736(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$56, %rsp
@@ -17551,7 +17514,7 @@ GL_PREFIX(ProgramLocalParameter4dARB):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	3744(%rax), %r11
+	movq	3736(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramLocalParameter4dARB), .-GL_PREFIX(ProgramLocalParameter4dARB)
@@ -17562,7 +17525,7 @@ GL_PREFIX(ProgramLocalParameter4dARB):
 GL_PREFIX(ProgramLocalParameter4dvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3752(%rax), %r11
+	movq	3744(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -17572,13 +17535,13 @@ GL_PREFIX(ProgramLocalParameter4dvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3752(%rax), %r11
+	movq	3744(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3752(%rax), %r11
+	movq	3744(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -17588,7 +17551,7 @@ GL_PREFIX(ProgramLocalParameter4dvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3752(%rax), %r11
+	movq	3744(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramLocalParameter4dvARB), .-GL_PREFIX(ProgramLocalParameter4dvARB)
@@ -17599,7 +17562,7 @@ GL_PREFIX(ProgramLocalParameter4dvARB):
 GL_PREFIX(ProgramLocalParameter4fARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3760(%rax), %r11
+	movq	3752(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$56, %rsp
@@ -17617,13 +17580,13 @@ GL_PREFIX(ProgramLocalParameter4fARB):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	3760(%rax), %r11
+	movq	3752(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3760(%rax), %r11
+	movq	3752(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$56, %rsp
@@ -17641,7 +17604,7 @@ GL_PREFIX(ProgramLocalParameter4fARB):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	3760(%rax), %r11
+	movq	3752(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramLocalParameter4fARB), .-GL_PREFIX(ProgramLocalParameter4fARB)
@@ -17652,7 +17615,7 @@ GL_PREFIX(ProgramLocalParameter4fARB):
 GL_PREFIX(ProgramLocalParameter4fvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3768(%rax), %r11
+	movq	3760(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -17662,13 +17625,13 @@ GL_PREFIX(ProgramLocalParameter4fvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3768(%rax), %r11
+	movq	3760(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3768(%rax), %r11
+	movq	3760(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -17678,7 +17641,7 @@ GL_PREFIX(ProgramLocalParameter4fvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3768(%rax), %r11
+	movq	3760(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramLocalParameter4fvARB), .-GL_PREFIX(ProgramLocalParameter4fvARB)
@@ -17689,7 +17652,7 @@ GL_PREFIX(ProgramLocalParameter4fvARB):
 GL_PREFIX(ProgramStringARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3776(%rax), %r11
+	movq	3768(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -17703,13 +17666,13 @@ GL_PREFIX(ProgramStringARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3776(%rax), %r11
+	movq	3768(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3776(%rax), %r11
+	movq	3768(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -17723,7 +17686,7 @@ GL_PREFIX(ProgramStringARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3776(%rax), %r11
+	movq	3768(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramStringARB), .-GL_PREFIX(ProgramStringARB)
@@ -17734,7 +17697,7 @@ GL_PREFIX(ProgramStringARB):
 GL_PREFIX(VertexAttrib1dARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3784(%rax), %r11
+	movq	3776(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -17744,13 +17707,13 @@ GL_PREFIX(VertexAttrib1dARB):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	3784(%rax), %r11
+	movq	3776(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3784(%rax), %r11
+	movq	3776(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -17760,7 +17723,7 @@ GL_PREFIX(VertexAttrib1dARB):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	3784(%rax), %r11
+	movq	3776(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1dARB), .-GL_PREFIX(VertexAttrib1dARB)
@@ -17771,7 +17734,7 @@ GL_PREFIX(VertexAttrib1dARB):
 GL_PREFIX(VertexAttrib1dvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3792(%rax), %r11
+	movq	3784(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -17781,13 +17744,13 @@ GL_PREFIX(VertexAttrib1dvARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	3792(%rax), %r11
+	movq	3784(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3792(%rax), %r11
+	movq	3784(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -17797,7 +17760,7 @@ GL_PREFIX(VertexAttrib1dvARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	3792(%rax), %r11
+	movq	3784(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1dvARB), .-GL_PREFIX(VertexAttrib1dvARB)
@@ -17808,7 +17771,7 @@ GL_PREFIX(VertexAttrib1dvARB):
 GL_PREFIX(VertexAttrib1fARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3800(%rax), %r11
+	movq	3792(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -17818,13 +17781,13 @@ GL_PREFIX(VertexAttrib1fARB):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	3800(%rax), %r11
+	movq	3792(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3800(%rax), %r11
+	movq	3792(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -17834,7 +17797,7 @@ GL_PREFIX(VertexAttrib1fARB):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	3800(%rax), %r11
+	movq	3792(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1fARB), .-GL_PREFIX(VertexAttrib1fARB)
@@ -17845,7 +17808,7 @@ GL_PREFIX(VertexAttrib1fARB):
 GL_PREFIX(VertexAttrib1fvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3808(%rax), %r11
+	movq	3800(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -17855,13 +17818,13 @@ GL_PREFIX(VertexAttrib1fvARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	3808(%rax), %r11
+	movq	3800(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3808(%rax), %r11
+	movq	3800(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -17871,7 +17834,7 @@ GL_PREFIX(VertexAttrib1fvARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	3808(%rax), %r11
+	movq	3800(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1fvARB), .-GL_PREFIX(VertexAttrib1fvARB)
@@ -17882,7 +17845,7 @@ GL_PREFIX(VertexAttrib1fvARB):
 GL_PREFIX(VertexAttrib1sARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3816(%rax), %r11
+	movq	3808(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -17892,13 +17855,13 @@ GL_PREFIX(VertexAttrib1sARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	3816(%rax), %r11
+	movq	3808(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3816(%rax), %r11
+	movq	3808(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -17908,7 +17871,7 @@ GL_PREFIX(VertexAttrib1sARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	3816(%rax), %r11
+	movq	3808(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1sARB), .-GL_PREFIX(VertexAttrib1sARB)
@@ -17919,7 +17882,7 @@ GL_PREFIX(VertexAttrib1sARB):
 GL_PREFIX(VertexAttrib1svARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3824(%rax), %r11
+	movq	3816(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -17929,13 +17892,13 @@ GL_PREFIX(VertexAttrib1svARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	3824(%rax), %r11
+	movq	3816(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3824(%rax), %r11
+	movq	3816(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -17945,7 +17908,7 @@ GL_PREFIX(VertexAttrib1svARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	3824(%rax), %r11
+	movq	3816(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1svARB), .-GL_PREFIX(VertexAttrib1svARB)
@@ -17956,7 +17919,7 @@ GL_PREFIX(VertexAttrib1svARB):
 GL_PREFIX(VertexAttrib2dARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3832(%rax), %r11
+	movq	3824(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -17968,13 +17931,13 @@ GL_PREFIX(VertexAttrib2dARB):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	3832(%rax), %r11
+	movq	3824(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3832(%rax), %r11
+	movq	3824(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -17986,7 +17949,7 @@ GL_PREFIX(VertexAttrib2dARB):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	3832(%rax), %r11
+	movq	3824(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2dARB), .-GL_PREFIX(VertexAttrib2dARB)
@@ -17997,7 +17960,7 @@ GL_PREFIX(VertexAttrib2dARB):
 GL_PREFIX(VertexAttrib2dvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3840(%rax), %r11
+	movq	3832(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -18007,13 +17970,13 @@ GL_PREFIX(VertexAttrib2dvARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	3840(%rax), %r11
+	movq	3832(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3840(%rax), %r11
+	movq	3832(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -18023,7 +17986,7 @@ GL_PREFIX(VertexAttrib2dvARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	3840(%rax), %r11
+	movq	3832(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2dvARB), .-GL_PREFIX(VertexAttrib2dvARB)
@@ -18034,7 +17997,7 @@ GL_PREFIX(VertexAttrib2dvARB):
 GL_PREFIX(VertexAttrib2fARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3848(%rax), %r11
+	movq	3840(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -18046,13 +18009,13 @@ GL_PREFIX(VertexAttrib2fARB):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	3848(%rax), %r11
+	movq	3840(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3848(%rax), %r11
+	movq	3840(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -18064,7 +18027,7 @@ GL_PREFIX(VertexAttrib2fARB):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	3848(%rax), %r11
+	movq	3840(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2fARB), .-GL_PREFIX(VertexAttrib2fARB)
@@ -18075,7 +18038,7 @@ GL_PREFIX(VertexAttrib2fARB):
 GL_PREFIX(VertexAttrib2fvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3856(%rax), %r11
+	movq	3848(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -18085,13 +18048,13 @@ GL_PREFIX(VertexAttrib2fvARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	3856(%rax), %r11
+	movq	3848(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3856(%rax), %r11
+	movq	3848(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -18101,7 +18064,7 @@ GL_PREFIX(VertexAttrib2fvARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	3856(%rax), %r11
+	movq	3848(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2fvARB), .-GL_PREFIX(VertexAttrib2fvARB)
@@ -18112,7 +18075,7 @@ GL_PREFIX(VertexAttrib2fvARB):
 GL_PREFIX(VertexAttrib2sARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3864(%rax), %r11
+	movq	3856(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -18122,13 +18085,13 @@ GL_PREFIX(VertexAttrib2sARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3864(%rax), %r11
+	movq	3856(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3864(%rax), %r11
+	movq	3856(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -18138,7 +18101,7 @@ GL_PREFIX(VertexAttrib2sARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3864(%rax), %r11
+	movq	3856(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2sARB), .-GL_PREFIX(VertexAttrib2sARB)
@@ -18149,7 +18112,7 @@ GL_PREFIX(VertexAttrib2sARB):
 GL_PREFIX(VertexAttrib2svARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3872(%rax), %r11
+	movq	3864(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -18159,13 +18122,13 @@ GL_PREFIX(VertexAttrib2svARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	3872(%rax), %r11
+	movq	3864(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3872(%rax), %r11
+	movq	3864(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -18175,7 +18138,7 @@ GL_PREFIX(VertexAttrib2svARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	3872(%rax), %r11
+	movq	3864(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2svARB), .-GL_PREFIX(VertexAttrib2svARB)
@@ -18186,7 +18149,7 @@ GL_PREFIX(VertexAttrib2svARB):
 GL_PREFIX(VertexAttrib3dARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3880(%rax), %r11
+	movq	3872(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -18200,13 +18163,13 @@ GL_PREFIX(VertexAttrib3dARB):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	3880(%rax), %r11
+	movq	3872(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3880(%rax), %r11
+	movq	3872(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -18220,7 +18183,7 @@ GL_PREFIX(VertexAttrib3dARB):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	3880(%rax), %r11
+	movq	3872(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3dARB), .-GL_PREFIX(VertexAttrib3dARB)
@@ -18231,7 +18194,7 @@ GL_PREFIX(VertexAttrib3dARB):
 GL_PREFIX(VertexAttrib3dvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3888(%rax), %r11
+	movq	3880(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -18241,13 +18204,13 @@ GL_PREFIX(VertexAttrib3dvARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	3888(%rax), %r11
+	movq	3880(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3888(%rax), %r11
+	movq	3880(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -18257,7 +18220,7 @@ GL_PREFIX(VertexAttrib3dvARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	3888(%rax), %r11
+	movq	3880(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3dvARB), .-GL_PREFIX(VertexAttrib3dvARB)
@@ -18268,7 +18231,7 @@ GL_PREFIX(VertexAttrib3dvARB):
 GL_PREFIX(VertexAttrib3fARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3896(%rax), %r11
+	movq	3888(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -18282,13 +18245,13 @@ GL_PREFIX(VertexAttrib3fARB):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	3896(%rax), %r11
+	movq	3888(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3896(%rax), %r11
+	movq	3888(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -18302,7 +18265,7 @@ GL_PREFIX(VertexAttrib3fARB):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	3896(%rax), %r11
+	movq	3888(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3fARB), .-GL_PREFIX(VertexAttrib3fARB)
@@ -18313,7 +18276,7 @@ GL_PREFIX(VertexAttrib3fARB):
 GL_PREFIX(VertexAttrib3fvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3904(%rax), %r11
+	movq	3896(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -18323,13 +18286,13 @@ GL_PREFIX(VertexAttrib3fvARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	3904(%rax), %r11
+	movq	3896(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3904(%rax), %r11
+	movq	3896(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -18339,7 +18302,7 @@ GL_PREFIX(VertexAttrib3fvARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	3904(%rax), %r11
+	movq	3896(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3fvARB), .-GL_PREFIX(VertexAttrib3fvARB)
@@ -18350,7 +18313,7 @@ GL_PREFIX(VertexAttrib3fvARB):
 GL_PREFIX(VertexAttrib3sARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3912(%rax), %r11
+	movq	3904(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -18364,13 +18327,13 @@ GL_PREFIX(VertexAttrib3sARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3912(%rax), %r11
+	movq	3904(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3912(%rax), %r11
+	movq	3904(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -18384,7 +18347,7 @@ GL_PREFIX(VertexAttrib3sARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3912(%rax), %r11
+	movq	3904(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3sARB), .-GL_PREFIX(VertexAttrib3sARB)
@@ -18395,7 +18358,7 @@ GL_PREFIX(VertexAttrib3sARB):
 GL_PREFIX(VertexAttrib3svARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3920(%rax), %r11
+	movq	3912(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -18405,13 +18368,13 @@ GL_PREFIX(VertexAttrib3svARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	3920(%rax), %r11
+	movq	3912(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3920(%rax), %r11
+	movq	3912(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -18421,7 +18384,7 @@ GL_PREFIX(VertexAttrib3svARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	3920(%rax), %r11
+	movq	3912(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3svARB), .-GL_PREFIX(VertexAttrib3svARB)
@@ -18432,7 +18395,7 @@ GL_PREFIX(VertexAttrib3svARB):
 GL_PREFIX(VertexAttrib4NbvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3928(%rax), %r11
+	movq	3920(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -18442,13 +18405,13 @@ GL_PREFIX(VertexAttrib4NbvARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	3928(%rax), %r11
+	movq	3920(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3928(%rax), %r11
+	movq	3920(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -18458,7 +18421,7 @@ GL_PREFIX(VertexAttrib4NbvARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	3928(%rax), %r11
+	movq	3920(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4NbvARB), .-GL_PREFIX(VertexAttrib4NbvARB)
@@ -18469,7 +18432,7 @@ GL_PREFIX(VertexAttrib4NbvARB):
 GL_PREFIX(VertexAttrib4NivARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3936(%rax), %r11
+	movq	3928(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -18479,13 +18442,13 @@ GL_PREFIX(VertexAttrib4NivARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	3936(%rax), %r11
+	movq	3928(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3936(%rax), %r11
+	movq	3928(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -18495,7 +18458,7 @@ GL_PREFIX(VertexAttrib4NivARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	3936(%rax), %r11
+	movq	3928(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4NivARB), .-GL_PREFIX(VertexAttrib4NivARB)
@@ -18506,7 +18469,7 @@ GL_PREFIX(VertexAttrib4NivARB):
 GL_PREFIX(VertexAttrib4NsvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3944(%rax), %r11
+	movq	3936(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -18516,13 +18479,13 @@ GL_PREFIX(VertexAttrib4NsvARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	3944(%rax), %r11
+	movq	3936(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3944(%rax), %r11
+	movq	3936(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -18532,7 +18495,7 @@ GL_PREFIX(VertexAttrib4NsvARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	3944(%rax), %r11
+	movq	3936(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4NsvARB), .-GL_PREFIX(VertexAttrib4NsvARB)
@@ -18543,7 +18506,7 @@ GL_PREFIX(VertexAttrib4NsvARB):
 GL_PREFIX(VertexAttrib4NubARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3952(%rax), %r11
+	movq	3944(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -18557,13 +18520,13 @@ GL_PREFIX(VertexAttrib4NubARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3952(%rax), %r11
+	movq	3944(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3952(%rax), %r11
+	movq	3944(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -18577,7 +18540,7 @@ GL_PREFIX(VertexAttrib4NubARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	3952(%rax), %r11
+	movq	3944(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4NubARB), .-GL_PREFIX(VertexAttrib4NubARB)
@@ -18588,7 +18551,7 @@ GL_PREFIX(VertexAttrib4NubARB):
 GL_PREFIX(VertexAttrib4NubvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3960(%rax), %r11
+	movq	3952(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -18598,13 +18561,13 @@ GL_PREFIX(VertexAttrib4NubvARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	3960(%rax), %r11
+	movq	3952(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3960(%rax), %r11
+	movq	3952(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -18614,7 +18577,7 @@ GL_PREFIX(VertexAttrib4NubvARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	3960(%rax), %r11
+	movq	3952(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4NubvARB), .-GL_PREFIX(VertexAttrib4NubvARB)
@@ -18625,7 +18588,7 @@ GL_PREFIX(VertexAttrib4NubvARB):
 GL_PREFIX(VertexAttrib4NuivARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3968(%rax), %r11
+	movq	3960(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -18635,13 +18598,13 @@ GL_PREFIX(VertexAttrib4NuivARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	3968(%rax), %r11
+	movq	3960(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3968(%rax), %r11
+	movq	3960(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -18651,7 +18614,7 @@ GL_PREFIX(VertexAttrib4NuivARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	3968(%rax), %r11
+	movq	3960(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4NuivARB), .-GL_PREFIX(VertexAttrib4NuivARB)
@@ -18662,7 +18625,7 @@ GL_PREFIX(VertexAttrib4NuivARB):
 GL_PREFIX(VertexAttrib4NusvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3976(%rax), %r11
+	movq	3968(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -18672,13 +18635,13 @@ GL_PREFIX(VertexAttrib4NusvARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	3976(%rax), %r11
+	movq	3968(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3976(%rax), %r11
+	movq	3968(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -18688,7 +18651,7 @@ GL_PREFIX(VertexAttrib4NusvARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	3976(%rax), %r11
+	movq	3968(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4NusvARB), .-GL_PREFIX(VertexAttrib4NusvARB)
@@ -18699,7 +18662,7 @@ GL_PREFIX(VertexAttrib4NusvARB):
 GL_PREFIX(VertexAttrib4bvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3984(%rax), %r11
+	movq	3976(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -18709,13 +18672,13 @@ GL_PREFIX(VertexAttrib4bvARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	3984(%rax), %r11
+	movq	3976(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3984(%rax), %r11
+	movq	3976(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -18725,7 +18688,7 @@ GL_PREFIX(VertexAttrib4bvARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	3984(%rax), %r11
+	movq	3976(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4bvARB), .-GL_PREFIX(VertexAttrib4bvARB)
@@ -18736,7 +18699,7 @@ GL_PREFIX(VertexAttrib4bvARB):
 GL_PREFIX(VertexAttrib4dARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	3992(%rax), %r11
+	movq	3984(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -18752,13 +18715,13 @@ GL_PREFIX(VertexAttrib4dARB):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	3992(%rax), %r11
+	movq	3984(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	3992(%rax), %r11
+	movq	3984(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -18774,7 +18737,7 @@ GL_PREFIX(VertexAttrib4dARB):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	3992(%rax), %r11
+	movq	3984(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4dARB), .-GL_PREFIX(VertexAttrib4dARB)
@@ -18785,7 +18748,7 @@ GL_PREFIX(VertexAttrib4dARB):
 GL_PREFIX(VertexAttrib4dvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4000(%rax), %r11
+	movq	3992(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -18795,13 +18758,13 @@ GL_PREFIX(VertexAttrib4dvARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4000(%rax), %r11
+	movq	3992(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4000(%rax), %r11
+	movq	3992(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -18811,7 +18774,7 @@ GL_PREFIX(VertexAttrib4dvARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4000(%rax), %r11
+	movq	3992(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4dvARB), .-GL_PREFIX(VertexAttrib4dvARB)
@@ -18822,7 +18785,7 @@ GL_PREFIX(VertexAttrib4dvARB):
 GL_PREFIX(VertexAttrib4fARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4008(%rax), %r11
+	movq	4000(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -18838,13 +18801,13 @@ GL_PREFIX(VertexAttrib4fARB):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	4008(%rax), %r11
+	movq	4000(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4008(%rax), %r11
+	movq	4000(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -18860,7 +18823,7 @@ GL_PREFIX(VertexAttrib4fARB):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	4008(%rax), %r11
+	movq	4000(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4fARB), .-GL_PREFIX(VertexAttrib4fARB)
@@ -18871,7 +18834,7 @@ GL_PREFIX(VertexAttrib4fARB):
 GL_PREFIX(VertexAttrib4fvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4016(%rax), %r11
+	movq	4008(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -18881,13 +18844,13 @@ GL_PREFIX(VertexAttrib4fvARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4016(%rax), %r11
+	movq	4008(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4016(%rax), %r11
+	movq	4008(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -18897,7 +18860,7 @@ GL_PREFIX(VertexAttrib4fvARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4016(%rax), %r11
+	movq	4008(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4fvARB), .-GL_PREFIX(VertexAttrib4fvARB)
@@ -18908,7 +18871,7 @@ GL_PREFIX(VertexAttrib4fvARB):
 GL_PREFIX(VertexAttrib4ivARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4024(%rax), %r11
+	movq	4016(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -18918,13 +18881,13 @@ GL_PREFIX(VertexAttrib4ivARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4024(%rax), %r11
+	movq	4016(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4024(%rax), %r11
+	movq	4016(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -18934,7 +18897,7 @@ GL_PREFIX(VertexAttrib4ivARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4024(%rax), %r11
+	movq	4016(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4ivARB), .-GL_PREFIX(VertexAttrib4ivARB)
@@ -18945,7 +18908,7 @@ GL_PREFIX(VertexAttrib4ivARB):
 GL_PREFIX(VertexAttrib4sARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4032(%rax), %r11
+	movq	4024(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -18959,13 +18922,13 @@ GL_PREFIX(VertexAttrib4sARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4032(%rax), %r11
+	movq	4024(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4032(%rax), %r11
+	movq	4024(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -18979,7 +18942,7 @@ GL_PREFIX(VertexAttrib4sARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4032(%rax), %r11
+	movq	4024(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4sARB), .-GL_PREFIX(VertexAttrib4sARB)
@@ -18990,7 +18953,7 @@ GL_PREFIX(VertexAttrib4sARB):
 GL_PREFIX(VertexAttrib4svARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4040(%rax), %r11
+	movq	4032(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -19000,13 +18963,13 @@ GL_PREFIX(VertexAttrib4svARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4040(%rax), %r11
+	movq	4032(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4040(%rax), %r11
+	movq	4032(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -19016,7 +18979,7 @@ GL_PREFIX(VertexAttrib4svARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4040(%rax), %r11
+	movq	4032(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4svARB), .-GL_PREFIX(VertexAttrib4svARB)
@@ -19027,7 +18990,7 @@ GL_PREFIX(VertexAttrib4svARB):
 GL_PREFIX(VertexAttrib4ubvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4048(%rax), %r11
+	movq	4040(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -19037,13 +19000,13 @@ GL_PREFIX(VertexAttrib4ubvARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4048(%rax), %r11
+	movq	4040(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4048(%rax), %r11
+	movq	4040(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -19053,7 +19016,7 @@ GL_PREFIX(VertexAttrib4ubvARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4048(%rax), %r11
+	movq	4040(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4ubvARB), .-GL_PREFIX(VertexAttrib4ubvARB)
@@ -19064,7 +19027,7 @@ GL_PREFIX(VertexAttrib4ubvARB):
 GL_PREFIX(VertexAttrib4uivARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4056(%rax), %r11
+	movq	4048(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -19074,13 +19037,13 @@ GL_PREFIX(VertexAttrib4uivARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4056(%rax), %r11
+	movq	4048(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4056(%rax), %r11
+	movq	4048(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -19090,7 +19053,7 @@ GL_PREFIX(VertexAttrib4uivARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4056(%rax), %r11
+	movq	4048(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4uivARB), .-GL_PREFIX(VertexAttrib4uivARB)
@@ -19101,7 +19064,7 @@ GL_PREFIX(VertexAttrib4uivARB):
 GL_PREFIX(VertexAttrib4usvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4064(%rax), %r11
+	movq	4056(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -19111,13 +19074,13 @@ GL_PREFIX(VertexAttrib4usvARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4064(%rax), %r11
+	movq	4056(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4064(%rax), %r11
+	movq	4056(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -19127,7 +19090,7 @@ GL_PREFIX(VertexAttrib4usvARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4064(%rax), %r11
+	movq	4056(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4usvARB), .-GL_PREFIX(VertexAttrib4usvARB)
@@ -19138,7 +19101,7 @@ GL_PREFIX(VertexAttrib4usvARB):
 GL_PREFIX(VertexAttribPointerARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4072(%rax), %r11
+	movq	4064(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -19156,13 +19119,13 @@ GL_PREFIX(VertexAttribPointerARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4072(%rax), %r11
+	movq	4064(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4072(%rax), %r11
+	movq	4064(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -19180,7 +19143,7 @@ GL_PREFIX(VertexAttribPointerARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4072(%rax), %r11
+	movq	4064(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribPointerARB), .-GL_PREFIX(VertexAttribPointerARB)
@@ -19191,7 +19154,7 @@ GL_PREFIX(VertexAttribPointerARB):
 GL_PREFIX(BindBufferARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4080(%rax), %r11
+	movq	4072(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -19201,13 +19164,13 @@ GL_PREFIX(BindBufferARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4080(%rax), %r11
+	movq	4072(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4080(%rax), %r11
+	movq	4072(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -19217,7 +19180,7 @@ GL_PREFIX(BindBufferARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4080(%rax), %r11
+	movq	4072(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindBufferARB), .-GL_PREFIX(BindBufferARB)
@@ -19228,7 +19191,7 @@ GL_PREFIX(BindBufferARB):
 GL_PREFIX(BufferDataARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4088(%rax), %r11
+	movq	4080(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -19242,13 +19205,13 @@ GL_PREFIX(BufferDataARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4088(%rax), %r11
+	movq	4080(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4088(%rax), %r11
+	movq	4080(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -19262,7 +19225,7 @@ GL_PREFIX(BufferDataARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4088(%rax), %r11
+	movq	4080(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BufferDataARB), .-GL_PREFIX(BufferDataARB)
@@ -19273,7 +19236,7 @@ GL_PREFIX(BufferDataARB):
 GL_PREFIX(BufferSubDataARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4096(%rax), %r11
+	movq	4088(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -19287,13 +19250,13 @@ GL_PREFIX(BufferSubDataARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4096(%rax), %r11
+	movq	4088(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4096(%rax), %r11
+	movq	4088(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -19307,7 +19270,7 @@ GL_PREFIX(BufferSubDataARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4096(%rax), %r11
+	movq	4088(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BufferSubDataARB), .-GL_PREFIX(BufferSubDataARB)
@@ -19318,7 +19281,7 @@ GL_PREFIX(BufferSubDataARB):
 GL_PREFIX(DeleteBuffersARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4104(%rax), %r11
+	movq	4096(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -19328,13 +19291,13 @@ GL_PREFIX(DeleteBuffersARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4104(%rax), %r11
+	movq	4096(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4104(%rax), %r11
+	movq	4096(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -19344,7 +19307,7 @@ GL_PREFIX(DeleteBuffersARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4104(%rax), %r11
+	movq	4096(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteBuffersARB), .-GL_PREFIX(DeleteBuffersARB)
@@ -19355,7 +19318,7 @@ GL_PREFIX(DeleteBuffersARB):
 GL_PREFIX(GenBuffersARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4112(%rax), %r11
+	movq	4104(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -19365,13 +19328,13 @@ GL_PREFIX(GenBuffersARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4112(%rax), %r11
+	movq	4104(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4112(%rax), %r11
+	movq	4104(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -19381,7 +19344,7 @@ GL_PREFIX(GenBuffersARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4112(%rax), %r11
+	movq	4104(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenBuffersARB), .-GL_PREFIX(GenBuffersARB)
@@ -19392,7 +19355,7 @@ GL_PREFIX(GenBuffersARB):
 GL_PREFIX(GetBufferParameterivARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4120(%rax), %r11
+	movq	4112(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -19402,13 +19365,13 @@ GL_PREFIX(GetBufferParameterivARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4120(%rax), %r11
+	movq	4112(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4120(%rax), %r11
+	movq	4112(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -19418,7 +19381,7 @@ GL_PREFIX(GetBufferParameterivARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4120(%rax), %r11
+	movq	4112(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetBufferParameterivARB), .-GL_PREFIX(GetBufferParameterivARB)
@@ -19429,7 +19392,7 @@ GL_PREFIX(GetBufferParameterivARB):
 GL_PREFIX(GetBufferPointervARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4128(%rax), %r11
+	movq	4120(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -19439,13 +19402,13 @@ GL_PREFIX(GetBufferPointervARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4128(%rax), %r11
+	movq	4120(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4128(%rax), %r11
+	movq	4120(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -19455,7 +19418,7 @@ GL_PREFIX(GetBufferPointervARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4128(%rax), %r11
+	movq	4120(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetBufferPointervARB), .-GL_PREFIX(GetBufferPointervARB)
@@ -19466,7 +19429,7 @@ GL_PREFIX(GetBufferPointervARB):
 GL_PREFIX(GetBufferSubDataARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4136(%rax), %r11
+	movq	4128(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -19480,13 +19443,13 @@ GL_PREFIX(GetBufferSubDataARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4136(%rax), %r11
+	movq	4128(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4136(%rax), %r11
+	movq	4128(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -19500,7 +19463,7 @@ GL_PREFIX(GetBufferSubDataARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4136(%rax), %r11
+	movq	4128(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetBufferSubDataARB), .-GL_PREFIX(GetBufferSubDataARB)
@@ -19511,25 +19474,25 @@ GL_PREFIX(GetBufferSubDataARB):
 GL_PREFIX(IsBufferARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4144(%rax), %r11
+	movq	4136(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4144(%rax), %r11
+	movq	4136(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4144(%rax), %r11
+	movq	4136(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4144(%rax), %r11
+	movq	4136(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IsBufferARB), .-GL_PREFIX(IsBufferARB)
@@ -19540,7 +19503,7 @@ GL_PREFIX(IsBufferARB):
 GL_PREFIX(MapBufferARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4152(%rax), %r11
+	movq	4144(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -19550,13 +19513,13 @@ GL_PREFIX(MapBufferARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4152(%rax), %r11
+	movq	4144(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4152(%rax), %r11
+	movq	4144(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -19566,7 +19529,7 @@ GL_PREFIX(MapBufferARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4152(%rax), %r11
+	movq	4144(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(MapBufferARB), .-GL_PREFIX(MapBufferARB)
@@ -19577,25 +19540,25 @@ GL_PREFIX(MapBufferARB):
 GL_PREFIX(UnmapBufferARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4160(%rax), %r11
+	movq	4152(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4160(%rax), %r11
+	movq	4152(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4160(%rax), %r11
+	movq	4152(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4160(%rax), %r11
+	movq	4152(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(UnmapBufferARB), .-GL_PREFIX(UnmapBufferARB)
@@ -19606,7 +19569,7 @@ GL_PREFIX(UnmapBufferARB):
 GL_PREFIX(BeginQueryARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4168(%rax), %r11
+	movq	4160(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -19616,13 +19579,13 @@ GL_PREFIX(BeginQueryARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4168(%rax), %r11
+	movq	4160(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4168(%rax), %r11
+	movq	4160(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -19632,7 +19595,7 @@ GL_PREFIX(BeginQueryARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4168(%rax), %r11
+	movq	4160(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BeginQueryARB), .-GL_PREFIX(BeginQueryARB)
@@ -19643,7 +19606,7 @@ GL_PREFIX(BeginQueryARB):
 GL_PREFIX(DeleteQueriesARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4176(%rax), %r11
+	movq	4168(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -19653,13 +19616,13 @@ GL_PREFIX(DeleteQueriesARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4176(%rax), %r11
+	movq	4168(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4176(%rax), %r11
+	movq	4168(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -19669,7 +19632,7 @@ GL_PREFIX(DeleteQueriesARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4176(%rax), %r11
+	movq	4168(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteQueriesARB), .-GL_PREFIX(DeleteQueriesARB)
@@ -19680,25 +19643,25 @@ GL_PREFIX(DeleteQueriesARB):
 GL_PREFIX(EndQueryARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4184(%rax), %r11
+	movq	4176(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4184(%rax), %r11
+	movq	4176(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4184(%rax), %r11
+	movq	4176(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4184(%rax), %r11
+	movq	4176(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(EndQueryARB), .-GL_PREFIX(EndQueryARB)
@@ -19709,7 +19672,7 @@ GL_PREFIX(EndQueryARB):
 GL_PREFIX(GenQueriesARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4192(%rax), %r11
+	movq	4184(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -19719,13 +19682,13 @@ GL_PREFIX(GenQueriesARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4192(%rax), %r11
+	movq	4184(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4192(%rax), %r11
+	movq	4184(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -19735,7 +19698,7 @@ GL_PREFIX(GenQueriesARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4192(%rax), %r11
+	movq	4184(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenQueriesARB), .-GL_PREFIX(GenQueriesARB)
@@ -19746,7 +19709,7 @@ GL_PREFIX(GenQueriesARB):
 GL_PREFIX(GetQueryObjectivARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4200(%rax), %r11
+	movq	4192(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -19756,13 +19719,13 @@ GL_PREFIX(GetQueryObjectivARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4200(%rax), %r11
+	movq	4192(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4200(%rax), %r11
+	movq	4192(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -19772,7 +19735,7 @@ GL_PREFIX(GetQueryObjectivARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4200(%rax), %r11
+	movq	4192(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetQueryObjectivARB), .-GL_PREFIX(GetQueryObjectivARB)
@@ -19783,7 +19746,7 @@ GL_PREFIX(GetQueryObjectivARB):
 GL_PREFIX(GetQueryObjectuivARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4208(%rax), %r11
+	movq	4200(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -19793,13 +19756,13 @@ GL_PREFIX(GetQueryObjectuivARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4208(%rax), %r11
+	movq	4200(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4208(%rax), %r11
+	movq	4200(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -19809,7 +19772,7 @@ GL_PREFIX(GetQueryObjectuivARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4208(%rax), %r11
+	movq	4200(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetQueryObjectuivARB), .-GL_PREFIX(GetQueryObjectuivARB)
@@ -19820,7 +19783,7 @@ GL_PREFIX(GetQueryObjectuivARB):
 GL_PREFIX(GetQueryivARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4216(%rax), %r11
+	movq	4208(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -19830,13 +19793,13 @@ GL_PREFIX(GetQueryivARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4216(%rax), %r11
+	movq	4208(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4216(%rax), %r11
+	movq	4208(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -19846,7 +19809,7 @@ GL_PREFIX(GetQueryivARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4216(%rax), %r11
+	movq	4208(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetQueryivARB), .-GL_PREFIX(GetQueryivARB)
@@ -19857,25 +19820,25 @@ GL_PREFIX(GetQueryivARB):
 GL_PREFIX(IsQueryARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4224(%rax), %r11
+	movq	4216(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4224(%rax), %r11
+	movq	4216(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4224(%rax), %r11
+	movq	4216(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4224(%rax), %r11
+	movq	4216(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IsQueryARB), .-GL_PREFIX(IsQueryARB)
@@ -19886,7 +19849,7 @@ GL_PREFIX(IsQueryARB):
 GL_PREFIX(AttachObjectARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4232(%rax), %r11
+	movq	4224(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -19896,13 +19859,13 @@ GL_PREFIX(AttachObjectARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4232(%rax), %r11
+	movq	4224(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4232(%rax), %r11
+	movq	4224(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -19912,7 +19875,7 @@ GL_PREFIX(AttachObjectARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4232(%rax), %r11
+	movq	4224(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(AttachObjectARB), .-GL_PREFIX(AttachObjectARB)
@@ -19923,25 +19886,25 @@ GL_PREFIX(AttachObjectARB):
 GL_PREFIX(CompileShaderARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4240(%rax), %r11
+	movq	4232(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4240(%rax), %r11
+	movq	4232(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4240(%rax), %r11
+	movq	4232(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4240(%rax), %r11
+	movq	4232(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CompileShaderARB), .-GL_PREFIX(CompileShaderARB)
@@ -19952,25 +19915,25 @@ GL_PREFIX(CompileShaderARB):
 GL_PREFIX(CreateProgramObjectARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4248(%rax), %r11
+	movq	4240(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	4248(%rax), %r11
+	movq	4240(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4248(%rax), %r11
+	movq	4240(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	4248(%rax), %r11
+	movq	4240(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CreateProgramObjectARB), .-GL_PREFIX(CreateProgramObjectARB)
@@ -19981,25 +19944,25 @@ GL_PREFIX(CreateProgramObjectARB):
 GL_PREFIX(CreateShaderObjectARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4256(%rax), %r11
+	movq	4248(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4256(%rax), %r11
+	movq	4248(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4256(%rax), %r11
+	movq	4248(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4256(%rax), %r11
+	movq	4248(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CreateShaderObjectARB), .-GL_PREFIX(CreateShaderObjectARB)
@@ -20010,25 +19973,25 @@ GL_PREFIX(CreateShaderObjectARB):
 GL_PREFIX(DeleteObjectARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4264(%rax), %r11
+	movq	4256(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4264(%rax), %r11
+	movq	4256(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4264(%rax), %r11
+	movq	4256(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4264(%rax), %r11
+	movq	4256(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteObjectARB), .-GL_PREFIX(DeleteObjectARB)
@@ -20039,7 +20002,7 @@ GL_PREFIX(DeleteObjectARB):
 GL_PREFIX(DetachObjectARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4272(%rax), %r11
+	movq	4264(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -20049,13 +20012,13 @@ GL_PREFIX(DetachObjectARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4272(%rax), %r11
+	movq	4264(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4272(%rax), %r11
+	movq	4264(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -20065,7 +20028,7 @@ GL_PREFIX(DetachObjectARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4272(%rax), %r11
+	movq	4264(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DetachObjectARB), .-GL_PREFIX(DetachObjectARB)
@@ -20076,7 +20039,7 @@ GL_PREFIX(DetachObjectARB):
 GL_PREFIX(GetActiveUniformARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4280(%rax), %r11
+	movq	4272(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -20094,13 +20057,13 @@ GL_PREFIX(GetActiveUniformARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4280(%rax), %r11
+	movq	4272(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4280(%rax), %r11
+	movq	4272(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -20118,7 +20081,7 @@ GL_PREFIX(GetActiveUniformARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4280(%rax), %r11
+	movq	4272(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetActiveUniformARB), .-GL_PREFIX(GetActiveUniformARB)
@@ -20129,7 +20092,7 @@ GL_PREFIX(GetActiveUniformARB):
 GL_PREFIX(GetAttachedObjectsARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4288(%rax), %r11
+	movq	4280(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -20143,13 +20106,13 @@ GL_PREFIX(GetAttachedObjectsARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4288(%rax), %r11
+	movq	4280(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4288(%rax), %r11
+	movq	4280(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -20163,7 +20126,7 @@ GL_PREFIX(GetAttachedObjectsARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4288(%rax), %r11
+	movq	4280(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetAttachedObjectsARB), .-GL_PREFIX(GetAttachedObjectsARB)
@@ -20174,25 +20137,25 @@ GL_PREFIX(GetAttachedObjectsARB):
 GL_PREFIX(GetHandleARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4296(%rax), %r11
+	movq	4288(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4296(%rax), %r11
+	movq	4288(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4296(%rax), %r11
+	movq	4288(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4296(%rax), %r11
+	movq	4288(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetHandleARB), .-GL_PREFIX(GetHandleARB)
@@ -20203,7 +20166,7 @@ GL_PREFIX(GetHandleARB):
 GL_PREFIX(GetInfoLogARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4304(%rax), %r11
+	movq	4296(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -20217,13 +20180,13 @@ GL_PREFIX(GetInfoLogARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4304(%rax), %r11
+	movq	4296(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4304(%rax), %r11
+	movq	4296(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -20237,7 +20200,7 @@ GL_PREFIX(GetInfoLogARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4304(%rax), %r11
+	movq	4296(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetInfoLogARB), .-GL_PREFIX(GetInfoLogARB)
@@ -20248,7 +20211,7 @@ GL_PREFIX(GetInfoLogARB):
 GL_PREFIX(GetObjectParameterfvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4312(%rax), %r11
+	movq	4304(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -20258,13 +20221,13 @@ GL_PREFIX(GetObjectParameterfvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4312(%rax), %r11
+	movq	4304(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4312(%rax), %r11
+	movq	4304(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -20274,7 +20237,7 @@ GL_PREFIX(GetObjectParameterfvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4312(%rax), %r11
+	movq	4304(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetObjectParameterfvARB), .-GL_PREFIX(GetObjectParameterfvARB)
@@ -20285,7 +20248,7 @@ GL_PREFIX(GetObjectParameterfvARB):
 GL_PREFIX(GetObjectParameterivARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4320(%rax), %r11
+	movq	4312(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -20295,13 +20258,13 @@ GL_PREFIX(GetObjectParameterivARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4320(%rax), %r11
+	movq	4312(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4320(%rax), %r11
+	movq	4312(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -20311,7 +20274,7 @@ GL_PREFIX(GetObjectParameterivARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4320(%rax), %r11
+	movq	4312(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetObjectParameterivARB), .-GL_PREFIX(GetObjectParameterivARB)
@@ -20322,7 +20285,7 @@ GL_PREFIX(GetObjectParameterivARB):
 GL_PREFIX(GetShaderSourceARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4328(%rax), %r11
+	movq	4320(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -20336,13 +20299,13 @@ GL_PREFIX(GetShaderSourceARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4328(%rax), %r11
+	movq	4320(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4328(%rax), %r11
+	movq	4320(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -20356,7 +20319,7 @@ GL_PREFIX(GetShaderSourceARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4328(%rax), %r11
+	movq	4320(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetShaderSourceARB), .-GL_PREFIX(GetShaderSourceARB)
@@ -20367,7 +20330,7 @@ GL_PREFIX(GetShaderSourceARB):
 GL_PREFIX(GetUniformLocationARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4336(%rax), %r11
+	movq	4328(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -20377,13 +20340,13 @@ GL_PREFIX(GetUniformLocationARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4336(%rax), %r11
+	movq	4328(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4336(%rax), %r11
+	movq	4328(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -20393,7 +20356,7 @@ GL_PREFIX(GetUniformLocationARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4336(%rax), %r11
+	movq	4328(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetUniformLocationARB), .-GL_PREFIX(GetUniformLocationARB)
@@ -20404,7 +20367,7 @@ GL_PREFIX(GetUniformLocationARB):
 GL_PREFIX(GetUniformfvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4344(%rax), %r11
+	movq	4336(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -20414,13 +20377,13 @@ GL_PREFIX(GetUniformfvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4344(%rax), %r11
+	movq	4336(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4344(%rax), %r11
+	movq	4336(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -20430,7 +20393,7 @@ GL_PREFIX(GetUniformfvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4344(%rax), %r11
+	movq	4336(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetUniformfvARB), .-GL_PREFIX(GetUniformfvARB)
@@ -20441,7 +20404,7 @@ GL_PREFIX(GetUniformfvARB):
 GL_PREFIX(GetUniformivARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4352(%rax), %r11
+	movq	4344(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -20451,13 +20414,13 @@ GL_PREFIX(GetUniformivARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4352(%rax), %r11
+	movq	4344(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4352(%rax), %r11
+	movq	4344(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -20467,7 +20430,7 @@ GL_PREFIX(GetUniformivARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4352(%rax), %r11
+	movq	4344(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetUniformivARB), .-GL_PREFIX(GetUniformivARB)
@@ -20478,25 +20441,25 @@ GL_PREFIX(GetUniformivARB):
 GL_PREFIX(LinkProgramARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4360(%rax), %r11
+	movq	4352(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4360(%rax), %r11
+	movq	4352(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4360(%rax), %r11
+	movq	4352(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4360(%rax), %r11
+	movq	4352(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(LinkProgramARB), .-GL_PREFIX(LinkProgramARB)
@@ -20507,7 +20470,7 @@ GL_PREFIX(LinkProgramARB):
 GL_PREFIX(ShaderSourceARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4368(%rax), %r11
+	movq	4360(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -20521,13 +20484,13 @@ GL_PREFIX(ShaderSourceARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4368(%rax), %r11
+	movq	4360(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4368(%rax), %r11
+	movq	4360(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -20541,7 +20504,7 @@ GL_PREFIX(ShaderSourceARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4368(%rax), %r11
+	movq	4360(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ShaderSourceARB), .-GL_PREFIX(ShaderSourceARB)
@@ -20552,7 +20515,7 @@ GL_PREFIX(ShaderSourceARB):
 GL_PREFIX(Uniform1fARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4376(%rax), %r11
+	movq	4368(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -20562,13 +20525,13 @@ GL_PREFIX(Uniform1fARB):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	4376(%rax), %r11
+	movq	4368(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4376(%rax), %r11
+	movq	4368(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -20578,7 +20541,7 @@ GL_PREFIX(Uniform1fARB):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	4376(%rax), %r11
+	movq	4368(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(Uniform1fARB), .-GL_PREFIX(Uniform1fARB)
@@ -20589,7 +20552,7 @@ GL_PREFIX(Uniform1fARB):
 GL_PREFIX(Uniform1fvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4384(%rax), %r11
+	movq	4376(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -20599,13 +20562,13 @@ GL_PREFIX(Uniform1fvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4384(%rax), %r11
+	movq	4376(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4384(%rax), %r11
+	movq	4376(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -20615,7 +20578,7 @@ GL_PREFIX(Uniform1fvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4384(%rax), %r11
+	movq	4376(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(Uniform1fvARB), .-GL_PREFIX(Uniform1fvARB)
@@ -20626,7 +20589,7 @@ GL_PREFIX(Uniform1fvARB):
 GL_PREFIX(Uniform1iARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4392(%rax), %r11
+	movq	4384(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -20636,13 +20599,13 @@ GL_PREFIX(Uniform1iARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4392(%rax), %r11
+	movq	4384(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4392(%rax), %r11
+	movq	4384(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -20652,7 +20615,7 @@ GL_PREFIX(Uniform1iARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4392(%rax), %r11
+	movq	4384(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(Uniform1iARB), .-GL_PREFIX(Uniform1iARB)
@@ -20663,7 +20626,7 @@ GL_PREFIX(Uniform1iARB):
 GL_PREFIX(Uniform1ivARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4400(%rax), %r11
+	movq	4392(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -20673,13 +20636,13 @@ GL_PREFIX(Uniform1ivARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4400(%rax), %r11
+	movq	4392(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4400(%rax), %r11
+	movq	4392(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -20689,7 +20652,7 @@ GL_PREFIX(Uniform1ivARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4400(%rax), %r11
+	movq	4392(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(Uniform1ivARB), .-GL_PREFIX(Uniform1ivARB)
@@ -20700,7 +20663,7 @@ GL_PREFIX(Uniform1ivARB):
 GL_PREFIX(Uniform2fARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4408(%rax), %r11
+	movq	4400(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -20712,13 +20675,13 @@ GL_PREFIX(Uniform2fARB):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	4408(%rax), %r11
+	movq	4400(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4408(%rax), %r11
+	movq	4400(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -20730,7 +20693,7 @@ GL_PREFIX(Uniform2fARB):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	4408(%rax), %r11
+	movq	4400(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(Uniform2fARB), .-GL_PREFIX(Uniform2fARB)
@@ -20741,7 +20704,7 @@ GL_PREFIX(Uniform2fARB):
 GL_PREFIX(Uniform2fvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4416(%rax), %r11
+	movq	4408(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -20751,13 +20714,13 @@ GL_PREFIX(Uniform2fvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4416(%rax), %r11
+	movq	4408(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4416(%rax), %r11
+	movq	4408(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -20767,7 +20730,7 @@ GL_PREFIX(Uniform2fvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4416(%rax), %r11
+	movq	4408(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(Uniform2fvARB), .-GL_PREFIX(Uniform2fvARB)
@@ -20778,7 +20741,7 @@ GL_PREFIX(Uniform2fvARB):
 GL_PREFIX(Uniform2iARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4424(%rax), %r11
+	movq	4416(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -20788,13 +20751,13 @@ GL_PREFIX(Uniform2iARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4424(%rax), %r11
+	movq	4416(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4424(%rax), %r11
+	movq	4416(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -20804,7 +20767,7 @@ GL_PREFIX(Uniform2iARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4424(%rax), %r11
+	movq	4416(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(Uniform2iARB), .-GL_PREFIX(Uniform2iARB)
@@ -20815,7 +20778,7 @@ GL_PREFIX(Uniform2iARB):
 GL_PREFIX(Uniform2ivARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4432(%rax), %r11
+	movq	4424(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -20825,13 +20788,13 @@ GL_PREFIX(Uniform2ivARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4432(%rax), %r11
+	movq	4424(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4432(%rax), %r11
+	movq	4424(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -20841,7 +20804,7 @@ GL_PREFIX(Uniform2ivARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4432(%rax), %r11
+	movq	4424(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(Uniform2ivARB), .-GL_PREFIX(Uniform2ivARB)
@@ -20852,7 +20815,7 @@ GL_PREFIX(Uniform2ivARB):
 GL_PREFIX(Uniform3fARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4440(%rax), %r11
+	movq	4432(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -20866,13 +20829,13 @@ GL_PREFIX(Uniform3fARB):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	4440(%rax), %r11
+	movq	4432(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4440(%rax), %r11
+	movq	4432(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -20886,7 +20849,7 @@ GL_PREFIX(Uniform3fARB):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	4440(%rax), %r11
+	movq	4432(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(Uniform3fARB), .-GL_PREFIX(Uniform3fARB)
@@ -20897,7 +20860,7 @@ GL_PREFIX(Uniform3fARB):
 GL_PREFIX(Uniform3fvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4448(%rax), %r11
+	movq	4440(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -20907,13 +20870,13 @@ GL_PREFIX(Uniform3fvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4448(%rax), %r11
+	movq	4440(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4448(%rax), %r11
+	movq	4440(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -20923,7 +20886,7 @@ GL_PREFIX(Uniform3fvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4448(%rax), %r11
+	movq	4440(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(Uniform3fvARB), .-GL_PREFIX(Uniform3fvARB)
@@ -20934,7 +20897,7 @@ GL_PREFIX(Uniform3fvARB):
 GL_PREFIX(Uniform3iARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4456(%rax), %r11
+	movq	4448(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -20948,13 +20911,13 @@ GL_PREFIX(Uniform3iARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4456(%rax), %r11
+	movq	4448(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4456(%rax), %r11
+	movq	4448(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -20968,7 +20931,7 @@ GL_PREFIX(Uniform3iARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4456(%rax), %r11
+	movq	4448(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(Uniform3iARB), .-GL_PREFIX(Uniform3iARB)
@@ -20979,7 +20942,7 @@ GL_PREFIX(Uniform3iARB):
 GL_PREFIX(Uniform3ivARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4464(%rax), %r11
+	movq	4456(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -20989,13 +20952,13 @@ GL_PREFIX(Uniform3ivARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4464(%rax), %r11
+	movq	4456(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4464(%rax), %r11
+	movq	4456(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21005,7 +20968,7 @@ GL_PREFIX(Uniform3ivARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4464(%rax), %r11
+	movq	4456(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(Uniform3ivARB), .-GL_PREFIX(Uniform3ivARB)
@@ -21016,7 +20979,7 @@ GL_PREFIX(Uniform3ivARB):
 GL_PREFIX(Uniform4fARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4472(%rax), %r11
+	movq	4464(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -21032,13 +20995,13 @@ GL_PREFIX(Uniform4fARB):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	4472(%rax), %r11
+	movq	4464(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4472(%rax), %r11
+	movq	4464(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -21054,7 +21017,7 @@ GL_PREFIX(Uniform4fARB):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	4472(%rax), %r11
+	movq	4464(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(Uniform4fARB), .-GL_PREFIX(Uniform4fARB)
@@ -21065,7 +21028,7 @@ GL_PREFIX(Uniform4fARB):
 GL_PREFIX(Uniform4fvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4480(%rax), %r11
+	movq	4472(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21075,13 +21038,13 @@ GL_PREFIX(Uniform4fvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4480(%rax), %r11
+	movq	4472(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4480(%rax), %r11
+	movq	4472(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21091,7 +21054,7 @@ GL_PREFIX(Uniform4fvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4480(%rax), %r11
+	movq	4472(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(Uniform4fvARB), .-GL_PREFIX(Uniform4fvARB)
@@ -21102,7 +21065,7 @@ GL_PREFIX(Uniform4fvARB):
 GL_PREFIX(Uniform4iARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4488(%rax), %r11
+	movq	4480(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21116,13 +21079,13 @@ GL_PREFIX(Uniform4iARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4488(%rax), %r11
+	movq	4480(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4488(%rax), %r11
+	movq	4480(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21136,7 +21099,7 @@ GL_PREFIX(Uniform4iARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4488(%rax), %r11
+	movq	4480(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(Uniform4iARB), .-GL_PREFIX(Uniform4iARB)
@@ -21147,7 +21110,7 @@ GL_PREFIX(Uniform4iARB):
 GL_PREFIX(Uniform4ivARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4496(%rax), %r11
+	movq	4488(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21157,13 +21120,13 @@ GL_PREFIX(Uniform4ivARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4496(%rax), %r11
+	movq	4488(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4496(%rax), %r11
+	movq	4488(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21173,7 +21136,7 @@ GL_PREFIX(Uniform4ivARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4496(%rax), %r11
+	movq	4488(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(Uniform4ivARB), .-GL_PREFIX(Uniform4ivARB)
@@ -21184,7 +21147,7 @@ GL_PREFIX(Uniform4ivARB):
 GL_PREFIX(UniformMatrix2fvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4504(%rax), %r11
+	movq	4496(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21198,13 +21161,13 @@ GL_PREFIX(UniformMatrix2fvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4504(%rax), %r11
+	movq	4496(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4504(%rax), %r11
+	movq	4496(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21218,7 +21181,7 @@ GL_PREFIX(UniformMatrix2fvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4504(%rax), %r11
+	movq	4496(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(UniformMatrix2fvARB), .-GL_PREFIX(UniformMatrix2fvARB)
@@ -21229,7 +21192,7 @@ GL_PREFIX(UniformMatrix2fvARB):
 GL_PREFIX(UniformMatrix3fvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4512(%rax), %r11
+	movq	4504(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21243,13 +21206,13 @@ GL_PREFIX(UniformMatrix3fvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4512(%rax), %r11
+	movq	4504(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4512(%rax), %r11
+	movq	4504(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21263,7 +21226,7 @@ GL_PREFIX(UniformMatrix3fvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4512(%rax), %r11
+	movq	4504(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(UniformMatrix3fvARB), .-GL_PREFIX(UniformMatrix3fvARB)
@@ -21274,7 +21237,7 @@ GL_PREFIX(UniformMatrix3fvARB):
 GL_PREFIX(UniformMatrix4fvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4520(%rax), %r11
+	movq	4512(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21288,13 +21251,13 @@ GL_PREFIX(UniformMatrix4fvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4520(%rax), %r11
+	movq	4512(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4520(%rax), %r11
+	movq	4512(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21308,7 +21271,7 @@ GL_PREFIX(UniformMatrix4fvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4520(%rax), %r11
+	movq	4512(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(UniformMatrix4fvARB), .-GL_PREFIX(UniformMatrix4fvARB)
@@ -21319,25 +21282,25 @@ GL_PREFIX(UniformMatrix4fvARB):
 GL_PREFIX(UseProgramObjectARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4528(%rax), %r11
+	movq	4520(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4528(%rax), %r11
+	movq	4520(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4528(%rax), %r11
+	movq	4520(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4528(%rax), %r11
+	movq	4520(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(UseProgramObjectARB), .-GL_PREFIX(UseProgramObjectARB)
@@ -21348,25 +21311,25 @@ GL_PREFIX(UseProgramObjectARB):
 GL_PREFIX(ValidateProgramARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4536(%rax), %r11
+	movq	4528(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4536(%rax), %r11
+	movq	4528(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4536(%rax), %r11
+	movq	4528(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4536(%rax), %r11
+	movq	4528(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ValidateProgramARB), .-GL_PREFIX(ValidateProgramARB)
@@ -21377,7 +21340,7 @@ GL_PREFIX(ValidateProgramARB):
 GL_PREFIX(BindAttribLocationARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4544(%rax), %r11
+	movq	4536(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21387,13 +21350,13 @@ GL_PREFIX(BindAttribLocationARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4544(%rax), %r11
+	movq	4536(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4544(%rax), %r11
+	movq	4536(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21403,7 +21366,7 @@ GL_PREFIX(BindAttribLocationARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4544(%rax), %r11
+	movq	4536(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindAttribLocationARB), .-GL_PREFIX(BindAttribLocationARB)
@@ -21414,7 +21377,7 @@ GL_PREFIX(BindAttribLocationARB):
 GL_PREFIX(GetActiveAttribARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4552(%rax), %r11
+	movq	4544(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21432,13 +21395,13 @@ GL_PREFIX(GetActiveAttribARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4552(%rax), %r11
+	movq	4544(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4552(%rax), %r11
+	movq	4544(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21456,7 +21419,7 @@ GL_PREFIX(GetActiveAttribARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4552(%rax), %r11
+	movq	4544(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetActiveAttribARB), .-GL_PREFIX(GetActiveAttribARB)
@@ -21467,7 +21430,7 @@ GL_PREFIX(GetActiveAttribARB):
 GL_PREFIX(GetAttribLocationARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4560(%rax), %r11
+	movq	4552(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21477,13 +21440,13 @@ GL_PREFIX(GetAttribLocationARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4560(%rax), %r11
+	movq	4552(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4560(%rax), %r11
+	movq	4552(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21493,7 +21456,7 @@ GL_PREFIX(GetAttribLocationARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4560(%rax), %r11
+	movq	4552(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetAttribLocationARB), .-GL_PREFIX(GetAttribLocationARB)
@@ -21504,7 +21467,7 @@ GL_PREFIX(GetAttribLocationARB):
 GL_PREFIX(DrawBuffersARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4568(%rax), %r11
+	movq	4560(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21514,13 +21477,13 @@ GL_PREFIX(DrawBuffersARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4568(%rax), %r11
+	movq	4560(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4568(%rax), %r11
+	movq	4560(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21530,7 +21493,7 @@ GL_PREFIX(DrawBuffersARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4568(%rax), %r11
+	movq	4560(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DrawBuffersARB), .-GL_PREFIX(DrawBuffersARB)
@@ -21541,7 +21504,7 @@ GL_PREFIX(DrawBuffersARB):
 GL_PREFIX(ClampColorARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4576(%rax), %r11
+	movq	4568(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21551,13 +21514,13 @@ GL_PREFIX(ClampColorARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4576(%rax), %r11
+	movq	4568(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4576(%rax), %r11
+	movq	4568(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21567,7 +21530,7 @@ GL_PREFIX(ClampColorARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4576(%rax), %r11
+	movq	4568(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ClampColorARB), .-GL_PREFIX(ClampColorARB)
@@ -21578,7 +21541,7 @@ GL_PREFIX(ClampColorARB):
 GL_PREFIX(DrawArraysInstancedARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4584(%rax), %r11
+	movq	4576(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21592,13 +21555,13 @@ GL_PREFIX(DrawArraysInstancedARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4584(%rax), %r11
+	movq	4576(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4584(%rax), %r11
+	movq	4576(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21612,7 +21575,7 @@ GL_PREFIX(DrawArraysInstancedARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4584(%rax), %r11
+	movq	4576(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DrawArraysInstancedARB), .-GL_PREFIX(DrawArraysInstancedARB)
@@ -21623,7 +21586,7 @@ GL_PREFIX(DrawArraysInstancedARB):
 GL_PREFIX(DrawElementsInstancedARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4592(%rax), %r11
+	movq	4584(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21637,13 +21600,13 @@ GL_PREFIX(DrawElementsInstancedARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4592(%rax), %r11
+	movq	4584(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4592(%rax), %r11
+	movq	4584(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21657,7 +21620,7 @@ GL_PREFIX(DrawElementsInstancedARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4592(%rax), %r11
+	movq	4584(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DrawElementsInstancedARB), .-GL_PREFIX(DrawElementsInstancedARB)
@@ -21668,7 +21631,7 @@ GL_PREFIX(DrawElementsInstancedARB):
 GL_PREFIX(RenderbufferStorageMultisample):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4600(%rax), %r11
+	movq	4592(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21682,13 +21645,13 @@ GL_PREFIX(RenderbufferStorageMultisample):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4600(%rax), %r11
+	movq	4592(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4600(%rax), %r11
+	movq	4592(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21702,7 +21665,7 @@ GL_PREFIX(RenderbufferStorageMultisample):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4600(%rax), %r11
+	movq	4592(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(RenderbufferStorageMultisample), .-GL_PREFIX(RenderbufferStorageMultisample)
@@ -21713,7 +21676,7 @@ GL_PREFIX(RenderbufferStorageMultisample):
 GL_PREFIX(FramebufferTextureARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4608(%rax), %r11
+	movq	4600(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21727,13 +21690,13 @@ GL_PREFIX(FramebufferTextureARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4608(%rax), %r11
+	movq	4600(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4608(%rax), %r11
+	movq	4600(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21747,7 +21710,7 @@ GL_PREFIX(FramebufferTextureARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4608(%rax), %r11
+	movq	4600(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTextureARB), .-GL_PREFIX(FramebufferTextureARB)
@@ -21758,7 +21721,7 @@ GL_PREFIX(FramebufferTextureARB):
 GL_PREFIX(FramebufferTextureFaceARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4616(%rax), %r11
+	movq	4608(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21772,13 +21735,13 @@ GL_PREFIX(FramebufferTextureFaceARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4616(%rax), %r11
+	movq	4608(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4616(%rax), %r11
+	movq	4608(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21792,7 +21755,7 @@ GL_PREFIX(FramebufferTextureFaceARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4616(%rax), %r11
+	movq	4608(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTextureFaceARB), .-GL_PREFIX(FramebufferTextureFaceARB)
@@ -21803,7 +21766,7 @@ GL_PREFIX(FramebufferTextureFaceARB):
 GL_PREFIX(ProgramParameteriARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4624(%rax), %r11
+	movq	4616(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21813,13 +21776,13 @@ GL_PREFIX(ProgramParameteriARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4624(%rax), %r11
+	movq	4616(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4624(%rax), %r11
+	movq	4616(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21829,7 +21792,7 @@ GL_PREFIX(ProgramParameteriARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4624(%rax), %r11
+	movq	4616(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramParameteriARB), .-GL_PREFIX(ProgramParameteriARB)
@@ -21840,7 +21803,7 @@ GL_PREFIX(ProgramParameteriARB):
 GL_PREFIX(VertexAttribDivisorARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4632(%rax), %r11
+	movq	4624(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21850,13 +21813,13 @@ GL_PREFIX(VertexAttribDivisorARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4632(%rax), %r11
+	movq	4624(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4632(%rax), %r11
+	movq	4624(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21866,7 +21829,7 @@ GL_PREFIX(VertexAttribDivisorARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4632(%rax), %r11
+	movq	4624(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribDivisorARB), .-GL_PREFIX(VertexAttribDivisorARB)
@@ -21877,7 +21840,7 @@ GL_PREFIX(VertexAttribDivisorARB):
 GL_PREFIX(FlushMappedBufferRange):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4640(%rax), %r11
+	movq	4632(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21887,13 +21850,13 @@ GL_PREFIX(FlushMappedBufferRange):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4640(%rax), %r11
+	movq	4632(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4640(%rax), %r11
+	movq	4632(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21903,7 +21866,7 @@ GL_PREFIX(FlushMappedBufferRange):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4640(%rax), %r11
+	movq	4632(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FlushMappedBufferRange), .-GL_PREFIX(FlushMappedBufferRange)
@@ -21914,7 +21877,7 @@ GL_PREFIX(FlushMappedBufferRange):
 GL_PREFIX(MapBufferRange):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4648(%rax), %r11
+	movq	4640(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21928,13 +21891,13 @@ GL_PREFIX(MapBufferRange):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4648(%rax), %r11
+	movq	4640(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4648(%rax), %r11
+	movq	4640(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21948,7 +21911,7 @@ GL_PREFIX(MapBufferRange):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4648(%rax), %r11
+	movq	4640(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(MapBufferRange), .-GL_PREFIX(MapBufferRange)
@@ -21959,7 +21922,7 @@ GL_PREFIX(MapBufferRange):
 GL_PREFIX(TexBufferARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4656(%rax), %r11
+	movq	4648(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -21969,13 +21932,13 @@ GL_PREFIX(TexBufferARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4656(%rax), %r11
+	movq	4648(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4656(%rax), %r11
+	movq	4648(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -21985,7 +21948,7 @@ GL_PREFIX(TexBufferARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4656(%rax), %r11
+	movq	4648(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexBufferARB), .-GL_PREFIX(TexBufferARB)
@@ -21996,25 +21959,25 @@ GL_PREFIX(TexBufferARB):
 GL_PREFIX(BindVertexArray):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4664(%rax), %r11
+	movq	4656(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4664(%rax), %r11
+	movq	4656(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4664(%rax), %r11
+	movq	4656(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4664(%rax), %r11
+	movq	4656(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindVertexArray), .-GL_PREFIX(BindVertexArray)
@@ -22025,7 +21988,7 @@ GL_PREFIX(BindVertexArray):
 GL_PREFIX(GenVertexArrays):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4672(%rax), %r11
+	movq	4664(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22035,13 +21998,13 @@ GL_PREFIX(GenVertexArrays):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4672(%rax), %r11
+	movq	4664(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4672(%rax), %r11
+	movq	4664(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22051,7 +22014,7 @@ GL_PREFIX(GenVertexArrays):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4672(%rax), %r11
+	movq	4664(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenVertexArrays), .-GL_PREFIX(GenVertexArrays)
@@ -22062,7 +22025,7 @@ GL_PREFIX(GenVertexArrays):
 GL_PREFIX(CopyBufferSubData):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4680(%rax), %r11
+	movq	4672(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22076,13 +22039,13 @@ GL_PREFIX(CopyBufferSubData):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4680(%rax), %r11
+	movq	4672(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4680(%rax), %r11
+	movq	4672(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22096,7 +22059,7 @@ GL_PREFIX(CopyBufferSubData):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4680(%rax), %r11
+	movq	4672(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CopyBufferSubData), .-GL_PREFIX(CopyBufferSubData)
@@ -22107,7 +22070,7 @@ GL_PREFIX(CopyBufferSubData):
 GL_PREFIX(ClientWaitSync):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4688(%rax), %r11
+	movq	4680(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22117,13 +22080,13 @@ GL_PREFIX(ClientWaitSync):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4688(%rax), %r11
+	movq	4680(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4688(%rax), %r11
+	movq	4680(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22133,7 +22096,7 @@ GL_PREFIX(ClientWaitSync):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4688(%rax), %r11
+	movq	4680(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ClientWaitSync), .-GL_PREFIX(ClientWaitSync)
@@ -22144,25 +22107,25 @@ GL_PREFIX(ClientWaitSync):
 GL_PREFIX(DeleteSync):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4696(%rax), %r11
+	movq	4688(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4696(%rax), %r11
+	movq	4688(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4696(%rax), %r11
+	movq	4688(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4696(%rax), %r11
+	movq	4688(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteSync), .-GL_PREFIX(DeleteSync)
@@ -22173,7 +22136,7 @@ GL_PREFIX(DeleteSync):
 GL_PREFIX(FenceSync):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4704(%rax), %r11
+	movq	4696(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22183,13 +22146,13 @@ GL_PREFIX(FenceSync):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4704(%rax), %r11
+	movq	4696(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4704(%rax), %r11
+	movq	4696(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22199,7 +22162,7 @@ GL_PREFIX(FenceSync):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4704(%rax), %r11
+	movq	4696(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FenceSync), .-GL_PREFIX(FenceSync)
@@ -22210,7 +22173,7 @@ GL_PREFIX(FenceSync):
 GL_PREFIX(GetInteger64v):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4712(%rax), %r11
+	movq	4704(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22220,13 +22183,13 @@ GL_PREFIX(GetInteger64v):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4712(%rax), %r11
+	movq	4704(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4712(%rax), %r11
+	movq	4704(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22236,7 +22199,7 @@ GL_PREFIX(GetInteger64v):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4712(%rax), %r11
+	movq	4704(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetInteger64v), .-GL_PREFIX(GetInteger64v)
@@ -22247,7 +22210,7 @@ GL_PREFIX(GetInteger64v):
 GL_PREFIX(GetSynciv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4720(%rax), %r11
+	movq	4712(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22261,13 +22224,13 @@ GL_PREFIX(GetSynciv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4720(%rax), %r11
+	movq	4712(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4720(%rax), %r11
+	movq	4712(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22281,7 +22244,7 @@ GL_PREFIX(GetSynciv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4720(%rax), %r11
+	movq	4712(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetSynciv), .-GL_PREFIX(GetSynciv)
@@ -22292,25 +22255,25 @@ GL_PREFIX(GetSynciv):
 GL_PREFIX(IsSync):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4728(%rax), %r11
+	movq	4720(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4728(%rax), %r11
+	movq	4720(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4728(%rax), %r11
+	movq	4720(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4728(%rax), %r11
+	movq	4720(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IsSync), .-GL_PREFIX(IsSync)
@@ -22321,7 +22284,7 @@ GL_PREFIX(IsSync):
 GL_PREFIX(WaitSync):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4736(%rax), %r11
+	movq	4728(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22331,13 +22294,13 @@ GL_PREFIX(WaitSync):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4736(%rax), %r11
+	movq	4728(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4736(%rax), %r11
+	movq	4728(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22347,7 +22310,7 @@ GL_PREFIX(WaitSync):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4736(%rax), %r11
+	movq	4728(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WaitSync), .-GL_PREFIX(WaitSync)
@@ -22358,7 +22321,7 @@ GL_PREFIX(WaitSync):
 GL_PREFIX(DrawElementsBaseVertex):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4744(%rax), %r11
+	movq	4736(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22372,13 +22335,13 @@ GL_PREFIX(DrawElementsBaseVertex):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4744(%rax), %r11
+	movq	4736(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4744(%rax), %r11
+	movq	4736(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22392,7 +22355,7 @@ GL_PREFIX(DrawElementsBaseVertex):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4744(%rax), %r11
+	movq	4736(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DrawElementsBaseVertex), .-GL_PREFIX(DrawElementsBaseVertex)
@@ -22403,7 +22366,7 @@ GL_PREFIX(DrawElementsBaseVertex):
 GL_PREFIX(DrawElementsInstancedBaseVertex):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4752(%rax), %r11
+	movq	4744(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22421,13 +22384,13 @@ GL_PREFIX(DrawElementsInstancedBaseVertex):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4752(%rax), %r11
+	movq	4744(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4752(%rax), %r11
+	movq	4744(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22445,7 +22408,7 @@ GL_PREFIX(DrawElementsInstancedBaseVertex):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4752(%rax), %r11
+	movq	4744(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DrawElementsInstancedBaseVertex), .-GL_PREFIX(DrawElementsInstancedBaseVertex)
@@ -22456,7 +22419,7 @@ GL_PREFIX(DrawElementsInstancedBaseVertex):
 GL_PREFIX(DrawRangeElementsBaseVertex):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4760(%rax), %r11
+	movq	4752(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22474,13 +22437,13 @@ GL_PREFIX(DrawRangeElementsBaseVertex):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4760(%rax), %r11
+	movq	4752(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4760(%rax), %r11
+	movq	4752(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22498,7 +22461,7 @@ GL_PREFIX(DrawRangeElementsBaseVertex):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4760(%rax), %r11
+	movq	4752(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DrawRangeElementsBaseVertex), .-GL_PREFIX(DrawRangeElementsBaseVertex)
@@ -22509,7 +22472,7 @@ GL_PREFIX(DrawRangeElementsBaseVertex):
 GL_PREFIX(MultiDrawElementsBaseVertex):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4768(%rax), %r11
+	movq	4760(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22527,13 +22490,13 @@ GL_PREFIX(MultiDrawElementsBaseVertex):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4768(%rax), %r11
+	movq	4760(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4768(%rax), %r11
+	movq	4760(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22551,7 +22514,7 @@ GL_PREFIX(MultiDrawElementsBaseVertex):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4768(%rax), %r11
+	movq	4760(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(MultiDrawElementsBaseVertex), .-GL_PREFIX(MultiDrawElementsBaseVertex)
@@ -22562,7 +22525,7 @@ GL_PREFIX(MultiDrawElementsBaseVertex):
 GL_PREFIX(BlendEquationSeparateiARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4776(%rax), %r11
+	movq	4768(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22572,13 +22535,13 @@ GL_PREFIX(BlendEquationSeparateiARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4776(%rax), %r11
+	movq	4768(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4776(%rax), %r11
+	movq	4768(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22588,7 +22551,7 @@ GL_PREFIX(BlendEquationSeparateiARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4776(%rax), %r11
+	movq	4768(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BlendEquationSeparateiARB), .-GL_PREFIX(BlendEquationSeparateiARB)
@@ -22599,7 +22562,7 @@ GL_PREFIX(BlendEquationSeparateiARB):
 GL_PREFIX(BlendEquationiARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4784(%rax), %r11
+	movq	4776(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22609,13 +22572,13 @@ GL_PREFIX(BlendEquationiARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4784(%rax), %r11
+	movq	4776(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4784(%rax), %r11
+	movq	4776(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22625,7 +22588,7 @@ GL_PREFIX(BlendEquationiARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4784(%rax), %r11
+	movq	4776(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BlendEquationiARB), .-GL_PREFIX(BlendEquationiARB)
@@ -22636,7 +22599,7 @@ GL_PREFIX(BlendEquationiARB):
 GL_PREFIX(BlendFuncSeparateiARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4792(%rax), %r11
+	movq	4784(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22650,13 +22613,13 @@ GL_PREFIX(BlendFuncSeparateiARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4792(%rax), %r11
+	movq	4784(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4792(%rax), %r11
+	movq	4784(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22670,7 +22633,7 @@ GL_PREFIX(BlendFuncSeparateiARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4792(%rax), %r11
+	movq	4784(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BlendFuncSeparateiARB), .-GL_PREFIX(BlendFuncSeparateiARB)
@@ -22681,7 +22644,7 @@ GL_PREFIX(BlendFuncSeparateiARB):
 GL_PREFIX(BlendFunciARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4800(%rax), %r11
+	movq	4792(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22691,13 +22654,13 @@ GL_PREFIX(BlendFunciARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4800(%rax), %r11
+	movq	4792(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4800(%rax), %r11
+	movq	4792(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22707,7 +22670,7 @@ GL_PREFIX(BlendFunciARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4800(%rax), %r11
+	movq	4792(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BlendFunciARB), .-GL_PREFIX(BlendFunciARB)
@@ -22718,7 +22681,7 @@ GL_PREFIX(BlendFunciARB):
 GL_PREFIX(BindFragDataLocationIndexed):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4808(%rax), %r11
+	movq	4800(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22732,13 +22695,13 @@ GL_PREFIX(BindFragDataLocationIndexed):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4808(%rax), %r11
+	movq	4800(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4808(%rax), %r11
+	movq	4800(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22752,7 +22715,7 @@ GL_PREFIX(BindFragDataLocationIndexed):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4808(%rax), %r11
+	movq	4800(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindFragDataLocationIndexed), .-GL_PREFIX(BindFragDataLocationIndexed)
@@ -22763,7 +22726,7 @@ GL_PREFIX(BindFragDataLocationIndexed):
 GL_PREFIX(GetFragDataIndex):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4816(%rax), %r11
+	movq	4808(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22773,13 +22736,13 @@ GL_PREFIX(GetFragDataIndex):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4816(%rax), %r11
+	movq	4808(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4816(%rax), %r11
+	movq	4808(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22789,7 +22752,7 @@ GL_PREFIX(GetFragDataIndex):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4816(%rax), %r11
+	movq	4808(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetFragDataIndex), .-GL_PREFIX(GetFragDataIndex)
@@ -22800,7 +22763,7 @@ GL_PREFIX(GetFragDataIndex):
 GL_PREFIX(BindSampler):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4824(%rax), %r11
+	movq	4816(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22810,13 +22773,13 @@ GL_PREFIX(BindSampler):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4824(%rax), %r11
+	movq	4816(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4824(%rax), %r11
+	movq	4816(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22826,7 +22789,7 @@ GL_PREFIX(BindSampler):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4824(%rax), %r11
+	movq	4816(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindSampler), .-GL_PREFIX(BindSampler)
@@ -22837,7 +22800,7 @@ GL_PREFIX(BindSampler):
 GL_PREFIX(DeleteSamplers):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4832(%rax), %r11
+	movq	4824(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22847,13 +22810,13 @@ GL_PREFIX(DeleteSamplers):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4832(%rax), %r11
+	movq	4824(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4832(%rax), %r11
+	movq	4824(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22863,7 +22826,7 @@ GL_PREFIX(DeleteSamplers):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4832(%rax), %r11
+	movq	4824(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteSamplers), .-GL_PREFIX(DeleteSamplers)
@@ -22874,7 +22837,7 @@ GL_PREFIX(DeleteSamplers):
 GL_PREFIX(GenSamplers):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4840(%rax), %r11
+	movq	4832(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22884,13 +22847,13 @@ GL_PREFIX(GenSamplers):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4840(%rax), %r11
+	movq	4832(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4840(%rax), %r11
+	movq	4832(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22900,7 +22863,7 @@ GL_PREFIX(GenSamplers):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4840(%rax), %r11
+	movq	4832(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenSamplers), .-GL_PREFIX(GenSamplers)
@@ -22911,7 +22874,7 @@ GL_PREFIX(GenSamplers):
 GL_PREFIX(GetSamplerParameterIiv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4848(%rax), %r11
+	movq	4840(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22921,13 +22884,13 @@ GL_PREFIX(GetSamplerParameterIiv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4848(%rax), %r11
+	movq	4840(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4848(%rax), %r11
+	movq	4840(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22937,7 +22900,7 @@ GL_PREFIX(GetSamplerParameterIiv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4848(%rax), %r11
+	movq	4840(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetSamplerParameterIiv), .-GL_PREFIX(GetSamplerParameterIiv)
@@ -22948,7 +22911,7 @@ GL_PREFIX(GetSamplerParameterIiv):
 GL_PREFIX(GetSamplerParameterIuiv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4856(%rax), %r11
+	movq	4848(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22958,13 +22921,13 @@ GL_PREFIX(GetSamplerParameterIuiv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4856(%rax), %r11
+	movq	4848(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4856(%rax), %r11
+	movq	4848(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -22974,7 +22937,7 @@ GL_PREFIX(GetSamplerParameterIuiv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4856(%rax), %r11
+	movq	4848(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetSamplerParameterIuiv), .-GL_PREFIX(GetSamplerParameterIuiv)
@@ -22985,7 +22948,7 @@ GL_PREFIX(GetSamplerParameterIuiv):
 GL_PREFIX(GetSamplerParameterfv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4864(%rax), %r11
+	movq	4856(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -22995,13 +22958,13 @@ GL_PREFIX(GetSamplerParameterfv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4864(%rax), %r11
+	movq	4856(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4864(%rax), %r11
+	movq	4856(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23011,7 +22974,7 @@ GL_PREFIX(GetSamplerParameterfv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4864(%rax), %r11
+	movq	4856(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetSamplerParameterfv), .-GL_PREFIX(GetSamplerParameterfv)
@@ -23022,7 +22985,7 @@ GL_PREFIX(GetSamplerParameterfv):
 GL_PREFIX(GetSamplerParameteriv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4872(%rax), %r11
+	movq	4864(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23032,13 +22995,13 @@ GL_PREFIX(GetSamplerParameteriv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4872(%rax), %r11
+	movq	4864(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4872(%rax), %r11
+	movq	4864(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23048,7 +23011,7 @@ GL_PREFIX(GetSamplerParameteriv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4872(%rax), %r11
+	movq	4864(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetSamplerParameteriv), .-GL_PREFIX(GetSamplerParameteriv)
@@ -23059,25 +23022,25 @@ GL_PREFIX(GetSamplerParameteriv):
 GL_PREFIX(IsSampler):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4880(%rax), %r11
+	movq	4872(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	4880(%rax), %r11
+	movq	4872(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4880(%rax), %r11
+	movq	4872(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	4880(%rax), %r11
+	movq	4872(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IsSampler), .-GL_PREFIX(IsSampler)
@@ -23088,7 +23051,7 @@ GL_PREFIX(IsSampler):
 GL_PREFIX(SamplerParameterIiv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4888(%rax), %r11
+	movq	4880(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23098,13 +23061,13 @@ GL_PREFIX(SamplerParameterIiv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4888(%rax), %r11
+	movq	4880(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4888(%rax), %r11
+	movq	4880(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23114,7 +23077,7 @@ GL_PREFIX(SamplerParameterIiv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4888(%rax), %r11
+	movq	4880(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SamplerParameterIiv), .-GL_PREFIX(SamplerParameterIiv)
@@ -23125,7 +23088,7 @@ GL_PREFIX(SamplerParameterIiv):
 GL_PREFIX(SamplerParameterIuiv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4896(%rax), %r11
+	movq	4888(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23135,13 +23098,13 @@ GL_PREFIX(SamplerParameterIuiv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4896(%rax), %r11
+	movq	4888(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4896(%rax), %r11
+	movq	4888(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23151,7 +23114,7 @@ GL_PREFIX(SamplerParameterIuiv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4896(%rax), %r11
+	movq	4888(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SamplerParameterIuiv), .-GL_PREFIX(SamplerParameterIuiv)
@@ -23162,7 +23125,7 @@ GL_PREFIX(SamplerParameterIuiv):
 GL_PREFIX(SamplerParameterf):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4904(%rax), %r11
+	movq	4896(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -23174,13 +23137,13 @@ GL_PREFIX(SamplerParameterf):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	4904(%rax), %r11
+	movq	4896(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4904(%rax), %r11
+	movq	4896(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -23192,7 +23155,7 @@ GL_PREFIX(SamplerParameterf):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	4904(%rax), %r11
+	movq	4896(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SamplerParameterf), .-GL_PREFIX(SamplerParameterf)
@@ -23203,7 +23166,7 @@ GL_PREFIX(SamplerParameterf):
 GL_PREFIX(SamplerParameterfv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4912(%rax), %r11
+	movq	4904(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23213,13 +23176,13 @@ GL_PREFIX(SamplerParameterfv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4912(%rax), %r11
+	movq	4904(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4912(%rax), %r11
+	movq	4904(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23229,7 +23192,7 @@ GL_PREFIX(SamplerParameterfv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4912(%rax), %r11
+	movq	4904(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SamplerParameterfv), .-GL_PREFIX(SamplerParameterfv)
@@ -23240,7 +23203,7 @@ GL_PREFIX(SamplerParameterfv):
 GL_PREFIX(SamplerParameteri):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4920(%rax), %r11
+	movq	4912(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23250,13 +23213,13 @@ GL_PREFIX(SamplerParameteri):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4920(%rax), %r11
+	movq	4912(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4920(%rax), %r11
+	movq	4912(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23266,7 +23229,7 @@ GL_PREFIX(SamplerParameteri):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4920(%rax), %r11
+	movq	4912(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SamplerParameteri), .-GL_PREFIX(SamplerParameteri)
@@ -23277,7 +23240,7 @@ GL_PREFIX(SamplerParameteri):
 GL_PREFIX(SamplerParameteriv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4928(%rax), %r11
+	movq	4920(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23287,13 +23250,13 @@ GL_PREFIX(SamplerParameteriv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4928(%rax), %r11
+	movq	4920(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4928(%rax), %r11
+	movq	4920(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23303,7 +23266,7 @@ GL_PREFIX(SamplerParameteriv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4928(%rax), %r11
+	movq	4920(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SamplerParameteriv), .-GL_PREFIX(SamplerParameteriv)
@@ -23314,7 +23277,7 @@ GL_PREFIX(SamplerParameteriv):
 GL_PREFIX(ColorP3ui):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4936(%rax), %r11
+	movq	4928(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23324,13 +23287,13 @@ GL_PREFIX(ColorP3ui):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4936(%rax), %r11
+	movq	4928(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4936(%rax), %r11
+	movq	4928(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23340,7 +23303,7 @@ GL_PREFIX(ColorP3ui):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4936(%rax), %r11
+	movq	4928(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorP3ui), .-GL_PREFIX(ColorP3ui)
@@ -23351,7 +23314,7 @@ GL_PREFIX(ColorP3ui):
 GL_PREFIX(ColorP3uiv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4944(%rax), %r11
+	movq	4936(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23361,13 +23324,13 @@ GL_PREFIX(ColorP3uiv):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4944(%rax), %r11
+	movq	4936(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4944(%rax), %r11
+	movq	4936(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23377,7 +23340,7 @@ GL_PREFIX(ColorP3uiv):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4944(%rax), %r11
+	movq	4936(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorP3uiv), .-GL_PREFIX(ColorP3uiv)
@@ -23388,7 +23351,7 @@ GL_PREFIX(ColorP3uiv):
 GL_PREFIX(ColorP4ui):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4952(%rax), %r11
+	movq	4944(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23398,13 +23361,13 @@ GL_PREFIX(ColorP4ui):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4952(%rax), %r11
+	movq	4944(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4952(%rax), %r11
+	movq	4944(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23414,7 +23377,7 @@ GL_PREFIX(ColorP4ui):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4952(%rax), %r11
+	movq	4944(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorP4ui), .-GL_PREFIX(ColorP4ui)
@@ -23425,7 +23388,7 @@ GL_PREFIX(ColorP4ui):
 GL_PREFIX(ColorP4uiv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4960(%rax), %r11
+	movq	4952(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23435,13 +23398,13 @@ GL_PREFIX(ColorP4uiv):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4960(%rax), %r11
+	movq	4952(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4960(%rax), %r11
+	movq	4952(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23451,7 +23414,7 @@ GL_PREFIX(ColorP4uiv):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	4960(%rax), %r11
+	movq	4952(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorP4uiv), .-GL_PREFIX(ColorP4uiv)
@@ -23462,7 +23425,7 @@ GL_PREFIX(ColorP4uiv):
 GL_PREFIX(MultiTexCoordP1ui):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4968(%rax), %r11
+	movq	4960(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23472,13 +23435,13 @@ GL_PREFIX(MultiTexCoordP1ui):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4968(%rax), %r11
+	movq	4960(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4968(%rax), %r11
+	movq	4960(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23488,7 +23451,7 @@ GL_PREFIX(MultiTexCoordP1ui):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4968(%rax), %r11
+	movq	4960(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(MultiTexCoordP1ui), .-GL_PREFIX(MultiTexCoordP1ui)
@@ -23499,7 +23462,7 @@ GL_PREFIX(MultiTexCoordP1ui):
 GL_PREFIX(MultiTexCoordP1uiv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4976(%rax), %r11
+	movq	4968(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23509,13 +23472,13 @@ GL_PREFIX(MultiTexCoordP1uiv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4976(%rax), %r11
+	movq	4968(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4976(%rax), %r11
+	movq	4968(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23525,7 +23488,7 @@ GL_PREFIX(MultiTexCoordP1uiv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4976(%rax), %r11
+	movq	4968(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(MultiTexCoordP1uiv), .-GL_PREFIX(MultiTexCoordP1uiv)
@@ -23536,7 +23499,7 @@ GL_PREFIX(MultiTexCoordP1uiv):
 GL_PREFIX(MultiTexCoordP2ui):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4984(%rax), %r11
+	movq	4976(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23546,13 +23509,13 @@ GL_PREFIX(MultiTexCoordP2ui):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4984(%rax), %r11
+	movq	4976(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4984(%rax), %r11
+	movq	4976(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23562,7 +23525,7 @@ GL_PREFIX(MultiTexCoordP2ui):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4984(%rax), %r11
+	movq	4976(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(MultiTexCoordP2ui), .-GL_PREFIX(MultiTexCoordP2ui)
@@ -23573,7 +23536,7 @@ GL_PREFIX(MultiTexCoordP2ui):
 GL_PREFIX(MultiTexCoordP2uiv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	4992(%rax), %r11
+	movq	4984(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23583,13 +23546,13 @@ GL_PREFIX(MultiTexCoordP2uiv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4992(%rax), %r11
+	movq	4984(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	4992(%rax), %r11
+	movq	4984(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23599,7 +23562,7 @@ GL_PREFIX(MultiTexCoordP2uiv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	4992(%rax), %r11
+	movq	4984(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(MultiTexCoordP2uiv), .-GL_PREFIX(MultiTexCoordP2uiv)
@@ -23610,7 +23573,7 @@ GL_PREFIX(MultiTexCoordP2uiv):
 GL_PREFIX(MultiTexCoordP3ui):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5000(%rax), %r11
+	movq	4992(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23620,13 +23583,13 @@ GL_PREFIX(MultiTexCoordP3ui):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5000(%rax), %r11
+	movq	4992(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5000(%rax), %r11
+	movq	4992(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23636,7 +23599,7 @@ GL_PREFIX(MultiTexCoordP3ui):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5000(%rax), %r11
+	movq	4992(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(MultiTexCoordP3ui), .-GL_PREFIX(MultiTexCoordP3ui)
@@ -23647,7 +23610,7 @@ GL_PREFIX(MultiTexCoordP3ui):
 GL_PREFIX(MultiTexCoordP3uiv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5008(%rax), %r11
+	movq	5000(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23657,13 +23620,13 @@ GL_PREFIX(MultiTexCoordP3uiv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5008(%rax), %r11
+	movq	5000(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5008(%rax), %r11
+	movq	5000(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23673,7 +23636,7 @@ GL_PREFIX(MultiTexCoordP3uiv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5008(%rax), %r11
+	movq	5000(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(MultiTexCoordP3uiv), .-GL_PREFIX(MultiTexCoordP3uiv)
@@ -23684,7 +23647,7 @@ GL_PREFIX(MultiTexCoordP3uiv):
 GL_PREFIX(MultiTexCoordP4ui):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5016(%rax), %r11
+	movq	5008(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23694,13 +23657,13 @@ GL_PREFIX(MultiTexCoordP4ui):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5016(%rax), %r11
+	movq	5008(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5016(%rax), %r11
+	movq	5008(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23710,7 +23673,7 @@ GL_PREFIX(MultiTexCoordP4ui):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5016(%rax), %r11
+	movq	5008(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(MultiTexCoordP4ui), .-GL_PREFIX(MultiTexCoordP4ui)
@@ -23721,7 +23684,7 @@ GL_PREFIX(MultiTexCoordP4ui):
 GL_PREFIX(MultiTexCoordP4uiv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5024(%rax), %r11
+	movq	5016(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23731,13 +23694,13 @@ GL_PREFIX(MultiTexCoordP4uiv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5024(%rax), %r11
+	movq	5016(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5024(%rax), %r11
+	movq	5016(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23747,7 +23710,7 @@ GL_PREFIX(MultiTexCoordP4uiv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5024(%rax), %r11
+	movq	5016(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(MultiTexCoordP4uiv), .-GL_PREFIX(MultiTexCoordP4uiv)
@@ -23758,7 +23721,7 @@ GL_PREFIX(MultiTexCoordP4uiv):
 GL_PREFIX(NormalP3ui):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5032(%rax), %r11
+	movq	5024(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23768,13 +23731,13 @@ GL_PREFIX(NormalP3ui):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5032(%rax), %r11
+	movq	5024(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5032(%rax), %r11
+	movq	5024(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23784,7 +23747,7 @@ GL_PREFIX(NormalP3ui):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5032(%rax), %r11
+	movq	5024(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(NormalP3ui), .-GL_PREFIX(NormalP3ui)
@@ -23795,7 +23758,7 @@ GL_PREFIX(NormalP3ui):
 GL_PREFIX(NormalP3uiv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5040(%rax), %r11
+	movq	5032(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23805,13 +23768,13 @@ GL_PREFIX(NormalP3uiv):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5040(%rax), %r11
+	movq	5032(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5040(%rax), %r11
+	movq	5032(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23821,7 +23784,7 @@ GL_PREFIX(NormalP3uiv):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5040(%rax), %r11
+	movq	5032(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(NormalP3uiv), .-GL_PREFIX(NormalP3uiv)
@@ -23832,7 +23795,7 @@ GL_PREFIX(NormalP3uiv):
 GL_PREFIX(SecondaryColorP3ui):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5048(%rax), %r11
+	movq	5040(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23842,13 +23805,13 @@ GL_PREFIX(SecondaryColorP3ui):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5048(%rax), %r11
+	movq	5040(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5048(%rax), %r11
+	movq	5040(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23858,7 +23821,7 @@ GL_PREFIX(SecondaryColorP3ui):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5048(%rax), %r11
+	movq	5040(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColorP3ui), .-GL_PREFIX(SecondaryColorP3ui)
@@ -23869,7 +23832,7 @@ GL_PREFIX(SecondaryColorP3ui):
 GL_PREFIX(SecondaryColorP3uiv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5056(%rax), %r11
+	movq	5048(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23879,13 +23842,13 @@ GL_PREFIX(SecondaryColorP3uiv):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5056(%rax), %r11
+	movq	5048(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5056(%rax), %r11
+	movq	5048(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23895,7 +23858,7 @@ GL_PREFIX(SecondaryColorP3uiv):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5056(%rax), %r11
+	movq	5048(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColorP3uiv), .-GL_PREFIX(SecondaryColorP3uiv)
@@ -23906,7 +23869,7 @@ GL_PREFIX(SecondaryColorP3uiv):
 GL_PREFIX(TexCoordP1ui):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5064(%rax), %r11
+	movq	5056(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23916,13 +23879,13 @@ GL_PREFIX(TexCoordP1ui):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5064(%rax), %r11
+	movq	5056(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5064(%rax), %r11
+	movq	5056(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23932,7 +23895,7 @@ GL_PREFIX(TexCoordP1ui):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5064(%rax), %r11
+	movq	5056(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexCoordP1ui), .-GL_PREFIX(TexCoordP1ui)
@@ -23943,7 +23906,7 @@ GL_PREFIX(TexCoordP1ui):
 GL_PREFIX(TexCoordP1uiv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5072(%rax), %r11
+	movq	5064(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23953,13 +23916,13 @@ GL_PREFIX(TexCoordP1uiv):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5072(%rax), %r11
+	movq	5064(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5072(%rax), %r11
+	movq	5064(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -23969,7 +23932,7 @@ GL_PREFIX(TexCoordP1uiv):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5072(%rax), %r11
+	movq	5064(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexCoordP1uiv), .-GL_PREFIX(TexCoordP1uiv)
@@ -23980,7 +23943,7 @@ GL_PREFIX(TexCoordP1uiv):
 GL_PREFIX(TexCoordP2ui):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5080(%rax), %r11
+	movq	5072(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -23990,13 +23953,13 @@ GL_PREFIX(TexCoordP2ui):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5080(%rax), %r11
+	movq	5072(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5080(%rax), %r11
+	movq	5072(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24006,7 +23969,7 @@ GL_PREFIX(TexCoordP2ui):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5080(%rax), %r11
+	movq	5072(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexCoordP2ui), .-GL_PREFIX(TexCoordP2ui)
@@ -24017,7 +23980,7 @@ GL_PREFIX(TexCoordP2ui):
 GL_PREFIX(TexCoordP2uiv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5088(%rax), %r11
+	movq	5080(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24027,13 +23990,13 @@ GL_PREFIX(TexCoordP2uiv):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5088(%rax), %r11
+	movq	5080(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5088(%rax), %r11
+	movq	5080(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24043,7 +24006,7 @@ GL_PREFIX(TexCoordP2uiv):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5088(%rax), %r11
+	movq	5080(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexCoordP2uiv), .-GL_PREFIX(TexCoordP2uiv)
@@ -24054,7 +24017,7 @@ GL_PREFIX(TexCoordP2uiv):
 GL_PREFIX(TexCoordP3ui):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5096(%rax), %r11
+	movq	5088(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24064,13 +24027,13 @@ GL_PREFIX(TexCoordP3ui):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5096(%rax), %r11
+	movq	5088(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5096(%rax), %r11
+	movq	5088(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24080,7 +24043,7 @@ GL_PREFIX(TexCoordP3ui):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5096(%rax), %r11
+	movq	5088(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexCoordP3ui), .-GL_PREFIX(TexCoordP3ui)
@@ -24091,7 +24054,7 @@ GL_PREFIX(TexCoordP3ui):
 GL_PREFIX(TexCoordP3uiv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5104(%rax), %r11
+	movq	5096(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24101,13 +24064,13 @@ GL_PREFIX(TexCoordP3uiv):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5104(%rax), %r11
+	movq	5096(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5104(%rax), %r11
+	movq	5096(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24117,7 +24080,7 @@ GL_PREFIX(TexCoordP3uiv):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5104(%rax), %r11
+	movq	5096(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexCoordP3uiv), .-GL_PREFIX(TexCoordP3uiv)
@@ -24128,7 +24091,7 @@ GL_PREFIX(TexCoordP3uiv):
 GL_PREFIX(TexCoordP4ui):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5112(%rax), %r11
+	movq	5104(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24138,13 +24101,13 @@ GL_PREFIX(TexCoordP4ui):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5112(%rax), %r11
+	movq	5104(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5112(%rax), %r11
+	movq	5104(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24154,7 +24117,7 @@ GL_PREFIX(TexCoordP4ui):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5112(%rax), %r11
+	movq	5104(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexCoordP4ui), .-GL_PREFIX(TexCoordP4ui)
@@ -24165,7 +24128,7 @@ GL_PREFIX(TexCoordP4ui):
 GL_PREFIX(TexCoordP4uiv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5120(%rax), %r11
+	movq	5112(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24175,13 +24138,13 @@ GL_PREFIX(TexCoordP4uiv):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5120(%rax), %r11
+	movq	5112(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5120(%rax), %r11
+	movq	5112(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24191,7 +24154,7 @@ GL_PREFIX(TexCoordP4uiv):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5120(%rax), %r11
+	movq	5112(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexCoordP4uiv), .-GL_PREFIX(TexCoordP4uiv)
@@ -24202,7 +24165,7 @@ GL_PREFIX(TexCoordP4uiv):
 GL_PREFIX(VertexAttribP1ui):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5128(%rax), %r11
+	movq	5120(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24216,13 +24179,13 @@ GL_PREFIX(VertexAttribP1ui):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5128(%rax), %r11
+	movq	5120(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5128(%rax), %r11
+	movq	5120(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24236,7 +24199,7 @@ GL_PREFIX(VertexAttribP1ui):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5128(%rax), %r11
+	movq	5120(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribP1ui), .-GL_PREFIX(VertexAttribP1ui)
@@ -24247,7 +24210,7 @@ GL_PREFIX(VertexAttribP1ui):
 GL_PREFIX(VertexAttribP1uiv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5136(%rax), %r11
+	movq	5128(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24261,13 +24224,13 @@ GL_PREFIX(VertexAttribP1uiv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5136(%rax), %r11
+	movq	5128(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5136(%rax), %r11
+	movq	5128(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24281,7 +24244,7 @@ GL_PREFIX(VertexAttribP1uiv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5136(%rax), %r11
+	movq	5128(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribP1uiv), .-GL_PREFIX(VertexAttribP1uiv)
@@ -24292,7 +24255,7 @@ GL_PREFIX(VertexAttribP1uiv):
 GL_PREFIX(VertexAttribP2ui):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5144(%rax), %r11
+	movq	5136(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24306,13 +24269,13 @@ GL_PREFIX(VertexAttribP2ui):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5144(%rax), %r11
+	movq	5136(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5144(%rax), %r11
+	movq	5136(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24326,7 +24289,7 @@ GL_PREFIX(VertexAttribP2ui):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5144(%rax), %r11
+	movq	5136(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribP2ui), .-GL_PREFIX(VertexAttribP2ui)
@@ -24337,7 +24300,7 @@ GL_PREFIX(VertexAttribP2ui):
 GL_PREFIX(VertexAttribP2uiv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5152(%rax), %r11
+	movq	5144(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24351,13 +24314,13 @@ GL_PREFIX(VertexAttribP2uiv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5152(%rax), %r11
+	movq	5144(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5152(%rax), %r11
+	movq	5144(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24371,7 +24334,7 @@ GL_PREFIX(VertexAttribP2uiv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5152(%rax), %r11
+	movq	5144(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribP2uiv), .-GL_PREFIX(VertexAttribP2uiv)
@@ -24382,7 +24345,7 @@ GL_PREFIX(VertexAttribP2uiv):
 GL_PREFIX(VertexAttribP3ui):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5160(%rax), %r11
+	movq	5152(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24396,13 +24359,13 @@ GL_PREFIX(VertexAttribP3ui):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5160(%rax), %r11
+	movq	5152(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5160(%rax), %r11
+	movq	5152(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24416,7 +24379,7 @@ GL_PREFIX(VertexAttribP3ui):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5160(%rax), %r11
+	movq	5152(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribP3ui), .-GL_PREFIX(VertexAttribP3ui)
@@ -24427,7 +24390,7 @@ GL_PREFIX(VertexAttribP3ui):
 GL_PREFIX(VertexAttribP3uiv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5168(%rax), %r11
+	movq	5160(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24441,13 +24404,13 @@ GL_PREFIX(VertexAttribP3uiv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5168(%rax), %r11
+	movq	5160(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5168(%rax), %r11
+	movq	5160(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24461,7 +24424,7 @@ GL_PREFIX(VertexAttribP3uiv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5168(%rax), %r11
+	movq	5160(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribP3uiv), .-GL_PREFIX(VertexAttribP3uiv)
@@ -24472,7 +24435,7 @@ GL_PREFIX(VertexAttribP3uiv):
 GL_PREFIX(VertexAttribP4ui):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5176(%rax), %r11
+	movq	5168(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24486,13 +24449,13 @@ GL_PREFIX(VertexAttribP4ui):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5176(%rax), %r11
+	movq	5168(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5176(%rax), %r11
+	movq	5168(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24506,7 +24469,7 @@ GL_PREFIX(VertexAttribP4ui):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5176(%rax), %r11
+	movq	5168(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribP4ui), .-GL_PREFIX(VertexAttribP4ui)
@@ -24517,7 +24480,7 @@ GL_PREFIX(VertexAttribP4ui):
 GL_PREFIX(VertexAttribP4uiv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5184(%rax), %r11
+	movq	5176(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24531,13 +24494,13 @@ GL_PREFIX(VertexAttribP4uiv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5184(%rax), %r11
+	movq	5176(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5184(%rax), %r11
+	movq	5176(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24551,7 +24514,7 @@ GL_PREFIX(VertexAttribP4uiv):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5184(%rax), %r11
+	movq	5176(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribP4uiv), .-GL_PREFIX(VertexAttribP4uiv)
@@ -24562,7 +24525,7 @@ GL_PREFIX(VertexAttribP4uiv):
 GL_PREFIX(VertexP2ui):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5192(%rax), %r11
+	movq	5184(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24572,13 +24535,13 @@ GL_PREFIX(VertexP2ui):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5192(%rax), %r11
+	movq	5184(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5192(%rax), %r11
+	movq	5184(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24588,7 +24551,7 @@ GL_PREFIX(VertexP2ui):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5192(%rax), %r11
+	movq	5184(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexP2ui), .-GL_PREFIX(VertexP2ui)
@@ -24599,7 +24562,7 @@ GL_PREFIX(VertexP2ui):
 GL_PREFIX(VertexP2uiv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5200(%rax), %r11
+	movq	5192(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24609,13 +24572,13 @@ GL_PREFIX(VertexP2uiv):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5200(%rax), %r11
+	movq	5192(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5200(%rax), %r11
+	movq	5192(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24625,7 +24588,7 @@ GL_PREFIX(VertexP2uiv):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5200(%rax), %r11
+	movq	5192(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexP2uiv), .-GL_PREFIX(VertexP2uiv)
@@ -24636,7 +24599,7 @@ GL_PREFIX(VertexP2uiv):
 GL_PREFIX(VertexP3ui):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5208(%rax), %r11
+	movq	5200(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24646,13 +24609,13 @@ GL_PREFIX(VertexP3ui):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5208(%rax), %r11
+	movq	5200(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5208(%rax), %r11
+	movq	5200(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24662,7 +24625,7 @@ GL_PREFIX(VertexP3ui):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5208(%rax), %r11
+	movq	5200(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexP3ui), .-GL_PREFIX(VertexP3ui)
@@ -24673,7 +24636,7 @@ GL_PREFIX(VertexP3ui):
 GL_PREFIX(VertexP3uiv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5216(%rax), %r11
+	movq	5208(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24683,13 +24646,13 @@ GL_PREFIX(VertexP3uiv):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5216(%rax), %r11
+	movq	5208(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5216(%rax), %r11
+	movq	5208(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24699,7 +24662,7 @@ GL_PREFIX(VertexP3uiv):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5216(%rax), %r11
+	movq	5208(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexP3uiv), .-GL_PREFIX(VertexP3uiv)
@@ -24710,7 +24673,7 @@ GL_PREFIX(VertexP3uiv):
 GL_PREFIX(VertexP4ui):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5224(%rax), %r11
+	movq	5216(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24720,13 +24683,13 @@ GL_PREFIX(VertexP4ui):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5224(%rax), %r11
+	movq	5216(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5224(%rax), %r11
+	movq	5216(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24736,7 +24699,7 @@ GL_PREFIX(VertexP4ui):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5224(%rax), %r11
+	movq	5216(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexP4ui), .-GL_PREFIX(VertexP4ui)
@@ -24747,7 +24710,7 @@ GL_PREFIX(VertexP4ui):
 GL_PREFIX(VertexP4uiv):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5232(%rax), %r11
+	movq	5224(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24757,13 +24720,13 @@ GL_PREFIX(VertexP4uiv):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5232(%rax), %r11
+	movq	5224(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5232(%rax), %r11
+	movq	5224(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24773,7 +24736,7 @@ GL_PREFIX(VertexP4uiv):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5232(%rax), %r11
+	movq	5224(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexP4uiv), .-GL_PREFIX(VertexP4uiv)
@@ -24784,7 +24747,7 @@ GL_PREFIX(VertexP4uiv):
 GL_PREFIX(BindTransformFeedback):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5240(%rax), %r11
+	movq	5232(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24794,13 +24757,13 @@ GL_PREFIX(BindTransformFeedback):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5240(%rax), %r11
+	movq	5232(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5240(%rax), %r11
+	movq	5232(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24810,7 +24773,7 @@ GL_PREFIX(BindTransformFeedback):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5240(%rax), %r11
+	movq	5232(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindTransformFeedback), .-GL_PREFIX(BindTransformFeedback)
@@ -24821,7 +24784,7 @@ GL_PREFIX(BindTransformFeedback):
 GL_PREFIX(DeleteTransformFeedbacks):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5248(%rax), %r11
+	movq	5240(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24831,13 +24794,13 @@ GL_PREFIX(DeleteTransformFeedbacks):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5248(%rax), %r11
+	movq	5240(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5248(%rax), %r11
+	movq	5240(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24847,7 +24810,7 @@ GL_PREFIX(DeleteTransformFeedbacks):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5248(%rax), %r11
+	movq	5240(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteTransformFeedbacks), .-GL_PREFIX(DeleteTransformFeedbacks)
@@ -24858,7 +24821,7 @@ GL_PREFIX(DeleteTransformFeedbacks):
 GL_PREFIX(DrawTransformFeedback):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5256(%rax), %r11
+	movq	5248(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24868,13 +24831,13 @@ GL_PREFIX(DrawTransformFeedback):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5256(%rax), %r11
+	movq	5248(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5256(%rax), %r11
+	movq	5248(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24884,7 +24847,7 @@ GL_PREFIX(DrawTransformFeedback):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5256(%rax), %r11
+	movq	5248(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DrawTransformFeedback), .-GL_PREFIX(DrawTransformFeedback)
@@ -24895,7 +24858,7 @@ GL_PREFIX(DrawTransformFeedback):
 GL_PREFIX(GenTransformFeedbacks):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5264(%rax), %r11
+	movq	5256(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -24905,13 +24868,13 @@ GL_PREFIX(GenTransformFeedbacks):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5264(%rax), %r11
+	movq	5256(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5264(%rax), %r11
+	movq	5256(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -24921,7 +24884,7 @@ GL_PREFIX(GenTransformFeedbacks):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5264(%rax), %r11
+	movq	5256(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenTransformFeedbacks), .-GL_PREFIX(GenTransformFeedbacks)
@@ -24932,25 +24895,25 @@ GL_PREFIX(GenTransformFeedbacks):
 GL_PREFIX(IsTransformFeedback):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5272(%rax), %r11
+	movq	5264(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5272(%rax), %r11
+	movq	5264(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5272(%rax), %r11
+	movq	5264(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5272(%rax), %r11
+	movq	5264(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IsTransformFeedback), .-GL_PREFIX(IsTransformFeedback)
@@ -24961,25 +24924,25 @@ GL_PREFIX(IsTransformFeedback):
 GL_PREFIX(PauseTransformFeedback):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5280(%rax), %r11
+	movq	5272(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	5280(%rax), %r11
+	movq	5272(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5280(%rax), %r11
+	movq	5272(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	5280(%rax), %r11
+	movq	5272(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PauseTransformFeedback), .-GL_PREFIX(PauseTransformFeedback)
@@ -24990,25 +24953,25 @@ GL_PREFIX(PauseTransformFeedback):
 GL_PREFIX(ResumeTransformFeedback):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5288(%rax), %r11
+	movq	5280(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	5288(%rax), %r11
+	movq	5280(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5288(%rax), %r11
+	movq	5280(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	5288(%rax), %r11
+	movq	5280(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ResumeTransformFeedback), .-GL_PREFIX(ResumeTransformFeedback)
@@ -25019,25 +24982,25 @@ GL_PREFIX(ResumeTransformFeedback):
 GL_PREFIX(ClearDepthf):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5296(%rax), %r11
+	movq	5288(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5296(%rax), %r11
+	movq	5288(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5296(%rax), %r11
+	movq	5288(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5296(%rax), %r11
+	movq	5288(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ClearDepthf), .-GL_PREFIX(ClearDepthf)
@@ -25048,7 +25011,7 @@ GL_PREFIX(ClearDepthf):
 GL_PREFIX(DepthRangef):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5304(%rax), %r11
+	movq	5296(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25058,13 +25021,13 @@ GL_PREFIX(DepthRangef):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5304(%rax), %r11
+	movq	5296(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5304(%rax), %r11
+	movq	5296(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25074,7 +25037,7 @@ GL_PREFIX(DepthRangef):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5304(%rax), %r11
+	movq	5296(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DepthRangef), .-GL_PREFIX(DepthRangef)
@@ -25085,7 +25048,7 @@ GL_PREFIX(DepthRangef):
 GL_PREFIX(GetShaderPrecisionFormat):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5312(%rax), %r11
+	movq	5304(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25099,13 +25062,13 @@ GL_PREFIX(GetShaderPrecisionFormat):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5312(%rax), %r11
+	movq	5304(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5312(%rax), %r11
+	movq	5304(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25119,7 +25082,7 @@ GL_PREFIX(GetShaderPrecisionFormat):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5312(%rax), %r11
+	movq	5304(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetShaderPrecisionFormat), .-GL_PREFIX(GetShaderPrecisionFormat)
@@ -25130,25 +25093,25 @@ GL_PREFIX(GetShaderPrecisionFormat):
 GL_PREFIX(ReleaseShaderCompiler):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5320(%rax), %r11
+	movq	5312(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	5320(%rax), %r11
+	movq	5312(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5320(%rax), %r11
+	movq	5312(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	5320(%rax), %r11
+	movq	5312(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ReleaseShaderCompiler), .-GL_PREFIX(ReleaseShaderCompiler)
@@ -25159,7 +25122,7 @@ GL_PREFIX(ReleaseShaderCompiler):
 GL_PREFIX(ShaderBinary):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5328(%rax), %r11
+	movq	5320(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25173,13 +25136,13 @@ GL_PREFIX(ShaderBinary):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5328(%rax), %r11
+	movq	5320(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5328(%rax), %r11
+	movq	5320(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25193,7 +25156,7 @@ GL_PREFIX(ShaderBinary):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5328(%rax), %r11
+	movq	5320(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ShaderBinary), .-GL_PREFIX(ShaderBinary)
@@ -25204,7 +25167,7 @@ GL_PREFIX(ShaderBinary):
 GL_PREFIX(DebugMessageCallbackARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5336(%rax), %r11
+	movq	5328(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25214,13 +25177,13 @@ GL_PREFIX(DebugMessageCallbackARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5336(%rax), %r11
+	movq	5328(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5336(%rax), %r11
+	movq	5328(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25230,7 +25193,7 @@ GL_PREFIX(DebugMessageCallbackARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5336(%rax), %r11
+	movq	5328(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DebugMessageCallbackARB), .-GL_PREFIX(DebugMessageCallbackARB)
@@ -25241,7 +25204,7 @@ GL_PREFIX(DebugMessageCallbackARB):
 GL_PREFIX(DebugMessageControlARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5344(%rax), %r11
+	movq	5336(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25259,13 +25222,13 @@ GL_PREFIX(DebugMessageControlARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5344(%rax), %r11
+	movq	5336(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5344(%rax), %r11
+	movq	5336(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25283,7 +25246,7 @@ GL_PREFIX(DebugMessageControlARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5344(%rax), %r11
+	movq	5336(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DebugMessageControlARB), .-GL_PREFIX(DebugMessageControlARB)
@@ -25294,7 +25257,7 @@ GL_PREFIX(DebugMessageControlARB):
 GL_PREFIX(DebugMessageInsertARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5352(%rax), %r11
+	movq	5344(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25312,13 +25275,13 @@ GL_PREFIX(DebugMessageInsertARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5352(%rax), %r11
+	movq	5344(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5352(%rax), %r11
+	movq	5344(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25336,7 +25299,7 @@ GL_PREFIX(DebugMessageInsertARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5352(%rax), %r11
+	movq	5344(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DebugMessageInsertARB), .-GL_PREFIX(DebugMessageInsertARB)
@@ -25347,7 +25310,7 @@ GL_PREFIX(DebugMessageInsertARB):
 GL_PREFIX(GetDebugMessageLogARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5360(%rax), %r11
+	movq	5352(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25365,13 +25328,13 @@ GL_PREFIX(GetDebugMessageLogARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5360(%rax), %r11
+	movq	5352(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5360(%rax), %r11
+	movq	5352(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25389,7 +25352,7 @@ GL_PREFIX(GetDebugMessageLogARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5360(%rax), %r11
+	movq	5352(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetDebugMessageLogARB), .-GL_PREFIX(GetDebugMessageLogARB)
@@ -25400,25 +25363,25 @@ GL_PREFIX(GetDebugMessageLogARB):
 GL_PREFIX(GetGraphicsResetStatusARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5368(%rax), %r11
+	movq	5360(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	5368(%rax), %r11
+	movq	5360(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5368(%rax), %r11
+	movq	5360(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	5368(%rax), %r11
+	movq	5360(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetGraphicsResetStatusARB), .-GL_PREFIX(GetGraphicsResetStatusARB)
@@ -25429,7 +25392,7 @@ GL_PREFIX(GetGraphicsResetStatusARB):
 GL_PREFIX(GetnColorTableARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5376(%rax), %r11
+	movq	5368(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25443,13 +25406,13 @@ GL_PREFIX(GetnColorTableARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5376(%rax), %r11
+	movq	5368(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5376(%rax), %r11
+	movq	5368(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25463,7 +25426,7 @@ GL_PREFIX(GetnColorTableARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5376(%rax), %r11
+	movq	5368(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnColorTableARB), .-GL_PREFIX(GetnColorTableARB)
@@ -25474,7 +25437,7 @@ GL_PREFIX(GetnColorTableARB):
 GL_PREFIX(GetnCompressedTexImageARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5384(%rax), %r11
+	movq	5376(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25488,13 +25451,13 @@ GL_PREFIX(GetnCompressedTexImageARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5384(%rax), %r11
+	movq	5376(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5384(%rax), %r11
+	movq	5376(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25508,7 +25471,7 @@ GL_PREFIX(GetnCompressedTexImageARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5384(%rax), %r11
+	movq	5376(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnCompressedTexImageARB), .-GL_PREFIX(GetnCompressedTexImageARB)
@@ -25519,7 +25482,7 @@ GL_PREFIX(GetnCompressedTexImageARB):
 GL_PREFIX(GetnConvolutionFilterARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5392(%rax), %r11
+	movq	5384(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25533,13 +25496,13 @@ GL_PREFIX(GetnConvolutionFilterARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5392(%rax), %r11
+	movq	5384(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5392(%rax), %r11
+	movq	5384(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25553,7 +25516,7 @@ GL_PREFIX(GetnConvolutionFilterARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5392(%rax), %r11
+	movq	5384(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnConvolutionFilterARB), .-GL_PREFIX(GetnConvolutionFilterARB)
@@ -25564,7 +25527,7 @@ GL_PREFIX(GetnConvolutionFilterARB):
 GL_PREFIX(GetnHistogramARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5400(%rax), %r11
+	movq	5392(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25582,13 +25545,13 @@ GL_PREFIX(GetnHistogramARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5400(%rax), %r11
+	movq	5392(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5400(%rax), %r11
+	movq	5392(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25606,7 +25569,7 @@ GL_PREFIX(GetnHistogramARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5400(%rax), %r11
+	movq	5392(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnHistogramARB), .-GL_PREFIX(GetnHistogramARB)
@@ -25617,7 +25580,7 @@ GL_PREFIX(GetnHistogramARB):
 GL_PREFIX(GetnMapdvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5408(%rax), %r11
+	movq	5400(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25631,13 +25594,13 @@ GL_PREFIX(GetnMapdvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5408(%rax), %r11
+	movq	5400(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5408(%rax), %r11
+	movq	5400(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25651,7 +25614,7 @@ GL_PREFIX(GetnMapdvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5408(%rax), %r11
+	movq	5400(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnMapdvARB), .-GL_PREFIX(GetnMapdvARB)
@@ -25662,7 +25625,7 @@ GL_PREFIX(GetnMapdvARB):
 GL_PREFIX(GetnMapfvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5416(%rax), %r11
+	movq	5408(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25676,13 +25639,13 @@ GL_PREFIX(GetnMapfvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5416(%rax), %r11
+	movq	5408(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5416(%rax), %r11
+	movq	5408(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25696,7 +25659,7 @@ GL_PREFIX(GetnMapfvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5416(%rax), %r11
+	movq	5408(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnMapfvARB), .-GL_PREFIX(GetnMapfvARB)
@@ -25707,7 +25670,7 @@ GL_PREFIX(GetnMapfvARB):
 GL_PREFIX(GetnMapivARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5424(%rax), %r11
+	movq	5416(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25721,13 +25684,13 @@ GL_PREFIX(GetnMapivARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5424(%rax), %r11
+	movq	5416(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5424(%rax), %r11
+	movq	5416(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25741,7 +25704,7 @@ GL_PREFIX(GetnMapivARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5424(%rax), %r11
+	movq	5416(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnMapivARB), .-GL_PREFIX(GetnMapivARB)
@@ -25752,7 +25715,7 @@ GL_PREFIX(GetnMapivARB):
 GL_PREFIX(GetnMinmaxARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5432(%rax), %r11
+	movq	5424(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25770,13 +25733,13 @@ GL_PREFIX(GetnMinmaxARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5432(%rax), %r11
+	movq	5424(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5432(%rax), %r11
+	movq	5424(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25794,7 +25757,7 @@ GL_PREFIX(GetnMinmaxARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5432(%rax), %r11
+	movq	5424(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnMinmaxARB), .-GL_PREFIX(GetnMinmaxARB)
@@ -25805,7 +25768,7 @@ GL_PREFIX(GetnMinmaxARB):
 GL_PREFIX(GetnPixelMapfvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5440(%rax), %r11
+	movq	5432(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25815,13 +25778,13 @@ GL_PREFIX(GetnPixelMapfvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5440(%rax), %r11
+	movq	5432(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5440(%rax), %r11
+	movq	5432(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25831,7 +25794,7 @@ GL_PREFIX(GetnPixelMapfvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5440(%rax), %r11
+	movq	5432(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnPixelMapfvARB), .-GL_PREFIX(GetnPixelMapfvARB)
@@ -25842,7 +25805,7 @@ GL_PREFIX(GetnPixelMapfvARB):
 GL_PREFIX(GetnPixelMapuivARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5448(%rax), %r11
+	movq	5440(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25852,13 +25815,13 @@ GL_PREFIX(GetnPixelMapuivARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5448(%rax), %r11
+	movq	5440(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5448(%rax), %r11
+	movq	5440(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25868,7 +25831,7 @@ GL_PREFIX(GetnPixelMapuivARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5448(%rax), %r11
+	movq	5440(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnPixelMapuivARB), .-GL_PREFIX(GetnPixelMapuivARB)
@@ -25879,7 +25842,7 @@ GL_PREFIX(GetnPixelMapuivARB):
 GL_PREFIX(GetnPixelMapusvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5456(%rax), %r11
+	movq	5448(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25889,13 +25852,13 @@ GL_PREFIX(GetnPixelMapusvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5456(%rax), %r11
+	movq	5448(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5456(%rax), %r11
+	movq	5448(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25905,7 +25868,7 @@ GL_PREFIX(GetnPixelMapusvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5456(%rax), %r11
+	movq	5448(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnPixelMapusvARB), .-GL_PREFIX(GetnPixelMapusvARB)
@@ -25916,7 +25879,7 @@ GL_PREFIX(GetnPixelMapusvARB):
 GL_PREFIX(GetnPolygonStippleARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5464(%rax), %r11
+	movq	5456(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25926,13 +25889,13 @@ GL_PREFIX(GetnPolygonStippleARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5464(%rax), %r11
+	movq	5456(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5464(%rax), %r11
+	movq	5456(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25942,7 +25905,7 @@ GL_PREFIX(GetnPolygonStippleARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5464(%rax), %r11
+	movq	5456(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnPolygonStippleARB), .-GL_PREFIX(GetnPolygonStippleARB)
@@ -25953,7 +25916,7 @@ GL_PREFIX(GetnPolygonStippleARB):
 GL_PREFIX(GetnSeparableFilterARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5472(%rax), %r11
+	movq	5464(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25971,13 +25934,13 @@ GL_PREFIX(GetnSeparableFilterARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5472(%rax), %r11
+	movq	5464(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5472(%rax), %r11
+	movq	5464(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25995,7 +25958,7 @@ GL_PREFIX(GetnSeparableFilterARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5472(%rax), %r11
+	movq	5464(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnSeparableFilterARB), .-GL_PREFIX(GetnSeparableFilterARB)
@@ -26006,7 +25969,7 @@ GL_PREFIX(GetnSeparableFilterARB):
 GL_PREFIX(GetnTexImageARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5480(%rax), %r11
+	movq	5472(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26024,13 +25987,13 @@ GL_PREFIX(GetnTexImageARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5480(%rax), %r11
+	movq	5472(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5480(%rax), %r11
+	movq	5472(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26048,7 +26011,7 @@ GL_PREFIX(GetnTexImageARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5480(%rax), %r11
+	movq	5472(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnTexImageARB), .-GL_PREFIX(GetnTexImageARB)
@@ -26059,7 +26022,7 @@ GL_PREFIX(GetnTexImageARB):
 GL_PREFIX(GetnUniformdvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5488(%rax), %r11
+	movq	5480(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26073,13 +26036,13 @@ GL_PREFIX(GetnUniformdvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5488(%rax), %r11
+	movq	5480(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5488(%rax), %r11
+	movq	5480(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26093,7 +26056,7 @@ GL_PREFIX(GetnUniformdvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5488(%rax), %r11
+	movq	5480(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnUniformdvARB), .-GL_PREFIX(GetnUniformdvARB)
@@ -26104,7 +26067,7 @@ GL_PREFIX(GetnUniformdvARB):
 GL_PREFIX(GetnUniformfvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5496(%rax), %r11
+	movq	5488(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26118,13 +26081,13 @@ GL_PREFIX(GetnUniformfvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5496(%rax), %r11
+	movq	5488(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5496(%rax), %r11
+	movq	5488(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26138,7 +26101,7 @@ GL_PREFIX(GetnUniformfvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5496(%rax), %r11
+	movq	5488(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnUniformfvARB), .-GL_PREFIX(GetnUniformfvARB)
@@ -26149,7 +26112,7 @@ GL_PREFIX(GetnUniformfvARB):
 GL_PREFIX(GetnUniformivARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5504(%rax), %r11
+	movq	5496(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26163,13 +26126,13 @@ GL_PREFIX(GetnUniformivARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5504(%rax), %r11
+	movq	5496(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5504(%rax), %r11
+	movq	5496(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26183,7 +26146,7 @@ GL_PREFIX(GetnUniformivARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5504(%rax), %r11
+	movq	5496(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnUniformivARB), .-GL_PREFIX(GetnUniformivARB)
@@ -26194,7 +26157,7 @@ GL_PREFIX(GetnUniformivARB):
 GL_PREFIX(GetnUniformuivARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5512(%rax), %r11
+	movq	5504(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26208,13 +26171,13 @@ GL_PREFIX(GetnUniformuivARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5512(%rax), %r11
+	movq	5504(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5512(%rax), %r11
+	movq	5504(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26228,7 +26191,7 @@ GL_PREFIX(GetnUniformuivARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5512(%rax), %r11
+	movq	5504(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnUniformuivARB), .-GL_PREFIX(GetnUniformuivARB)
@@ -26239,7 +26202,7 @@ GL_PREFIX(GetnUniformuivARB):
 GL_PREFIX(ReadnPixelsARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5520(%rax), %r11
+	movq	5512(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26257,13 +26220,13 @@ GL_PREFIX(ReadnPixelsARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5520(%rax), %r11
+	movq	5512(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5520(%rax), %r11
+	movq	5512(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26281,7 +26244,7 @@ GL_PREFIX(ReadnPixelsARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5520(%rax), %r11
+	movq	5512(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ReadnPixelsARB), .-GL_PREFIX(ReadnPixelsARB)
@@ -26292,7 +26255,7 @@ GL_PREFIX(ReadnPixelsARB):
 GL_PREFIX(TexStorage1D):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5528(%rax), %r11
+	movq	5520(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26306,13 +26269,13 @@ GL_PREFIX(TexStorage1D):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5528(%rax), %r11
+	movq	5520(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5528(%rax), %r11
+	movq	5520(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26326,7 +26289,7 @@ GL_PREFIX(TexStorage1D):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5528(%rax), %r11
+	movq	5520(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexStorage1D), .-GL_PREFIX(TexStorage1D)
@@ -26337,7 +26300,7 @@ GL_PREFIX(TexStorage1D):
 GL_PREFIX(TexStorage2D):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5536(%rax), %r11
+	movq	5528(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26351,13 +26314,13 @@ GL_PREFIX(TexStorage2D):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5536(%rax), %r11
+	movq	5528(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5536(%rax), %r11
+	movq	5528(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26371,7 +26334,7 @@ GL_PREFIX(TexStorage2D):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5536(%rax), %r11
+	movq	5528(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexStorage2D), .-GL_PREFIX(TexStorage2D)
@@ -26382,7 +26345,7 @@ GL_PREFIX(TexStorage2D):
 GL_PREFIX(TexStorage3D):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5544(%rax), %r11
+	movq	5536(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26400,13 +26363,13 @@ GL_PREFIX(TexStorage3D):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5544(%rax), %r11
+	movq	5536(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5544(%rax), %r11
+	movq	5536(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26424,7 +26387,7 @@ GL_PREFIX(TexStorage3D):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5544(%rax), %r11
+	movq	5536(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexStorage3D), .-GL_PREFIX(TexStorage3D)
@@ -26435,7 +26398,7 @@ GL_PREFIX(TexStorage3D):
 GL_PREFIX(TextureStorage1DEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5552(%rax), %r11
+	movq	5544(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26449,13 +26412,13 @@ GL_PREFIX(TextureStorage1DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5552(%rax), %r11
+	movq	5544(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5552(%rax), %r11
+	movq	5544(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26469,7 +26432,7 @@ GL_PREFIX(TextureStorage1DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5552(%rax), %r11
+	movq	5544(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TextureStorage1DEXT), .-GL_PREFIX(TextureStorage1DEXT)
@@ -26480,7 +26443,7 @@ GL_PREFIX(TextureStorage1DEXT):
 GL_PREFIX(TextureStorage2DEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5560(%rax), %r11
+	movq	5552(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26498,13 +26461,13 @@ GL_PREFIX(TextureStorage2DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5560(%rax), %r11
+	movq	5552(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5560(%rax), %r11
+	movq	5552(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26522,7 +26485,7 @@ GL_PREFIX(TextureStorage2DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5560(%rax), %r11
+	movq	5552(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TextureStorage2DEXT), .-GL_PREFIX(TextureStorage2DEXT)
@@ -26533,7 +26496,7 @@ GL_PREFIX(TextureStorage2DEXT):
 GL_PREFIX(TextureStorage3DEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5568(%rax), %r11
+	movq	5560(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26551,13 +26514,13 @@ GL_PREFIX(TextureStorage3DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5568(%rax), %r11
+	movq	5560(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5568(%rax), %r11
+	movq	5560(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26575,7 +26538,7 @@ GL_PREFIX(TextureStorage3DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5568(%rax), %r11
+	movq	5560(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TextureStorage3DEXT), .-GL_PREFIX(TextureStorage3DEXT)
@@ -26586,7 +26549,7 @@ GL_PREFIX(TextureStorage3DEXT):
 GL_PREFIX(PolygonOffsetEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5576(%rax), %r11
+	movq	5568(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -26596,13 +26559,13 @@ GL_PREFIX(PolygonOffsetEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5576(%rax), %r11
+	movq	5568(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5576(%rax), %r11
+	movq	5568(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -26612,12 +26575,50 @@ GL_PREFIX(PolygonOffsetEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5576(%rax), %r11
+	movq	5568(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PolygonOffsetEXT), .-GL_PREFIX(PolygonOffsetEXT)
 
 	.p2align	4,,15
+	.globl	GL_PREFIX(_dispatch_stub_697)
+	.type	GL_PREFIX(_dispatch_stub_697), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_697))
+GL_PREFIX(_dispatch_stub_697):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	5576(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
+	call	_x86_64_get_dispatch@PLT
+	popq	%rbp
+	popq	%rsi
+	popq	%rdi
+	movq	5576(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	5576(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
+	call	_glapi_get_dispatch
+	popq	%rbp
+	popq	%rsi
+	popq	%rdi
+	movq	5576(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(_dispatch_stub_697), .-GL_PREFIX(_dispatch_stub_697)
+
+	.p2align	4,,15
 	.globl	GL_PREFIX(_dispatch_stub_698)
 	.type	GL_PREFIX(_dispatch_stub_698), @function
 	HIDDEN(GL_PREFIX(_dispatch_stub_698))
@@ -26665,13 +26666,13 @@ GL_PREFIX(_dispatch_stub_699):
 	movq	5592(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
-	pushq	%rdi
-	pushq	%rsi
-	pushq	%rbp
+	subq	$24, %rsp
+	movq	%rdi, (%rsp)
+	movq	%xmm0, 8(%rsp)
 	call	_x86_64_get_dispatch@PLT
-	popq	%rbp
-	popq	%rsi
-	popq	%rdi
+	movq	8(%rsp), %xmm0
+	movq	(%rsp), %rdi
+	addq	$24, %rsp
 	movq	5592(%rax), %r11
 	jmp	*%r11
 #else
@@ -26681,13 +26682,13 @@ GL_PREFIX(_dispatch_stub_699):
 	movq	5592(%rax), %r11
 	jmp	*%r11
 1:
-	pushq	%rdi
-	pushq	%rsi
-	pushq	%rbp
+	subq	$24, %rsp
+	movq	%rdi, (%rsp)
+	movq	%xmm0, 8(%rsp)
 	call	_glapi_get_dispatch
-	popq	%rbp
-	popq	%rsi
-	popq	%rdi
+	movq	8(%rsp), %xmm0
+	movq	(%rsp), %rdi
+	addq	$24, %rsp
 	movq	5592(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
@@ -26703,13 +26704,13 @@ GL_PREFIX(_dispatch_stub_700):
 	movq	5600(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
-	subq	$24, %rsp
-	movq	%rdi, (%rsp)
-	movq	%xmm0, 8(%rsp)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
-	movq	8(%rsp), %xmm0
-	movq	(%rsp), %rdi
-	addq	$24, %rsp
+	popq	%rbp
+	popq	%rsi
+	popq	%rdi
 	movq	5600(%rax), %r11
 	jmp	*%r11
 #else
@@ -26719,13 +26720,13 @@ GL_PREFIX(_dispatch_stub_700):
 	movq	5600(%rax), %r11
 	jmp	*%r11
 1:
-	subq	$24, %rsp
-	movq	%rdi, (%rsp)
-	movq	%xmm0, 8(%rsp)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
 	call	_glapi_get_dispatch
-	movq	8(%rsp), %xmm0
-	movq	(%rsp), %rdi
-	addq	$24, %rsp
+	popq	%rbp
+	popq	%rsi
+	popq	%rdi
 	movq	5600(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
@@ -26856,11 +26857,7 @@ GL_PREFIX(_dispatch_stub_704):
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
-	pushq	%rsi
-	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
-	popq	%rbp
-	popq	%rsi
 	popq	%rdi
 	movq	5632(%rax), %r11
 	jmp	*%r11
@@ -26872,11 +26869,7 @@ GL_PREFIX(_dispatch_stub_704):
 	jmp	*%r11
 1:
 	pushq	%rdi
-	pushq	%rsi
-	pushq	%rbp
 	call	_glapi_get_dispatch
-	popq	%rbp
-	popq	%rsi
 	popq	%rdi
 	movq	5632(%rax), %r11
 	jmp	*%r11
@@ -26884,42 +26877,12 @@ GL_PREFIX(_dispatch_stub_704):
 	.size	GL_PREFIX(_dispatch_stub_704), .-GL_PREFIX(_dispatch_stub_704)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_705)
-	.type	GL_PREFIX(_dispatch_stub_705), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_705))
-GL_PREFIX(_dispatch_stub_705):
-#if defined(GLX_USE_TLS)
-	call	_x86_64_get_dispatch@PLT
-	movq	5640(%rax), %r11
-	jmp	*%r11
-#elif defined(PTHREADS)
-	pushq	%rdi
-	call	_x86_64_get_dispatch@PLT
-	popq	%rdi
-	movq	5640(%rax), %r11
-	jmp	*%r11
-#else
-	movq	_glapi_Dispatch(%rip), %rax
-	testq	%rax, %rax
-	je	1f
-	movq	5640(%rax), %r11
-	jmp	*%r11
-1:
-	pushq	%rdi
-	call	_glapi_get_dispatch
-	popq	%rdi
-	movq	5640(%rax), %r11
-	jmp	*%r11
-#endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_705), .-GL_PREFIX(_dispatch_stub_705)
-
-	.p2align	4,,15
 	.globl	GL_PREFIX(ColorPointerEXT)
 	.type	GL_PREFIX(ColorPointerEXT), @function
 GL_PREFIX(ColorPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5648(%rax), %r11
+	movq	5640(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26933,13 +26896,13 @@ GL_PREFIX(ColorPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5648(%rax), %r11
+	movq	5640(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5648(%rax), %r11
+	movq	5640(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26953,7 +26916,7 @@ GL_PREFIX(ColorPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5648(%rax), %r11
+	movq	5640(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorPointerEXT), .-GL_PREFIX(ColorPointerEXT)
@@ -26964,7 +26927,7 @@ GL_PREFIX(ColorPointerEXT):
 GL_PREFIX(EdgeFlagPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5656(%rax), %r11
+	movq	5648(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26974,13 +26937,13 @@ GL_PREFIX(EdgeFlagPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5656(%rax), %r11
+	movq	5648(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5656(%rax), %r11
+	movq	5648(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26990,7 +26953,7 @@ GL_PREFIX(EdgeFlagPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5656(%rax), %r11
+	movq	5648(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(EdgeFlagPointerEXT), .-GL_PREFIX(EdgeFlagPointerEXT)
@@ -27001,7 +26964,7 @@ GL_PREFIX(EdgeFlagPointerEXT):
 GL_PREFIX(IndexPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5664(%rax), %r11
+	movq	5656(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27015,13 +26978,13 @@ GL_PREFIX(IndexPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5664(%rax), %r11
+	movq	5656(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5664(%rax), %r11
+	movq	5656(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27035,7 +26998,7 @@ GL_PREFIX(IndexPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5664(%rax), %r11
+	movq	5656(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IndexPointerEXT), .-GL_PREFIX(IndexPointerEXT)
@@ -27046,7 +27009,7 @@ GL_PREFIX(IndexPointerEXT):
 GL_PREFIX(NormalPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5672(%rax), %r11
+	movq	5664(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27060,13 +27023,13 @@ GL_PREFIX(NormalPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5672(%rax), %r11
+	movq	5664(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5672(%rax), %r11
+	movq	5664(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27080,7 +27043,7 @@ GL_PREFIX(NormalPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5672(%rax), %r11
+	movq	5664(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(NormalPointerEXT), .-GL_PREFIX(NormalPointerEXT)
@@ -27091,7 +27054,7 @@ GL_PREFIX(NormalPointerEXT):
 GL_PREFIX(TexCoordPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5680(%rax), %r11
+	movq	5672(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27105,13 +27068,13 @@ GL_PREFIX(TexCoordPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5680(%rax), %r11
+	movq	5672(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5680(%rax), %r11
+	movq	5672(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27125,7 +27088,7 @@ GL_PREFIX(TexCoordPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5680(%rax), %r11
+	movq	5672(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexCoordPointerEXT), .-GL_PREFIX(TexCoordPointerEXT)
@@ -27136,7 +27099,7 @@ GL_PREFIX(TexCoordPointerEXT):
 GL_PREFIX(VertexPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5688(%rax), %r11
+	movq	5680(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27150,13 +27113,13 @@ GL_PREFIX(VertexPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5688(%rax), %r11
+	movq	5680(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5688(%rax), %r11
+	movq	5680(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27170,7 +27133,7 @@ GL_PREFIX(VertexPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5688(%rax), %r11
+	movq	5680(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexPointerEXT), .-GL_PREFIX(VertexPointerEXT)
@@ -27181,7 +27144,7 @@ GL_PREFIX(VertexPointerEXT):
 GL_PREFIX(PointParameterfEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5696(%rax), %r11
+	movq	5688(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -27191,13 +27154,13 @@ GL_PREFIX(PointParameterfEXT):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5696(%rax), %r11
+	movq	5688(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5696(%rax), %r11
+	movq	5688(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -27207,7 +27170,7 @@ GL_PREFIX(PointParameterfEXT):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5696(%rax), %r11
+	movq	5688(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PointParameterfEXT), .-GL_PREFIX(PointParameterfEXT)
@@ -27218,7 +27181,7 @@ GL_PREFIX(PointParameterfEXT):
 GL_PREFIX(PointParameterfvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5704(%rax), %r11
+	movq	5696(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27228,13 +27191,13 @@ GL_PREFIX(PointParameterfvEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5704(%rax), %r11
+	movq	5696(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5704(%rax), %r11
+	movq	5696(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27244,7 +27207,7 @@ GL_PREFIX(PointParameterfvEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5704(%rax), %r11
+	movq	5696(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PointParameterfvEXT), .-GL_PREFIX(PointParameterfvEXT)
@@ -27255,7 +27218,7 @@ GL_PREFIX(PointParameterfvEXT):
 GL_PREFIX(LockArraysEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5712(%rax), %r11
+	movq	5704(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27265,13 +27228,13 @@ GL_PREFIX(LockArraysEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5712(%rax), %r11
+	movq	5704(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5712(%rax), %r11
+	movq	5704(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27281,7 +27244,7 @@ GL_PREFIX(LockArraysEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5712(%rax), %r11
+	movq	5704(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(LockArraysEXT), .-GL_PREFIX(LockArraysEXT)
@@ -27292,25 +27255,25 @@ GL_PREFIX(LockArraysEXT):
 GL_PREFIX(UnlockArraysEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5720(%rax), %r11
+	movq	5712(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	5720(%rax), %r11
+	movq	5712(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5720(%rax), %r11
+	movq	5712(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	5720(%rax), %r11
+	movq	5712(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(UnlockArraysEXT), .-GL_PREFIX(UnlockArraysEXT)
@@ -27321,7 +27284,7 @@ GL_PREFIX(UnlockArraysEXT):
 GL_PREFIX(SecondaryColor3bEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5728(%rax), %r11
+	movq	5720(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27331,13 +27294,13 @@ GL_PREFIX(SecondaryColor3bEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5728(%rax), %r11
+	movq	5720(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5728(%rax), %r11
+	movq	5720(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27347,7 +27310,7 @@ GL_PREFIX(SecondaryColor3bEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5728(%rax), %r11
+	movq	5720(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3bEXT), .-GL_PREFIX(SecondaryColor3bEXT)
@@ -27358,25 +27321,25 @@ GL_PREFIX(SecondaryColor3bEXT):
 GL_PREFIX(SecondaryColor3bvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5736(%rax), %r11
+	movq	5728(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5736(%rax), %r11
+	movq	5728(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5736(%rax), %r11
+	movq	5728(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5736(%rax), %r11
+	movq	5728(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3bvEXT), .-GL_PREFIX(SecondaryColor3bvEXT)
@@ -27387,7 +27350,7 @@ GL_PREFIX(SecondaryColor3bvEXT):
 GL_PREFIX(SecondaryColor3dEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5744(%rax), %r11
+	movq	5736(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -27399,13 +27362,13 @@ GL_PREFIX(SecondaryColor3dEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5744(%rax), %r11
+	movq	5736(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5744(%rax), %r11
+	movq	5736(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -27417,7 +27380,7 @@ GL_PREFIX(SecondaryColor3dEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5744(%rax), %r11
+	movq	5736(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3dEXT), .-GL_PREFIX(SecondaryColor3dEXT)
@@ -27428,25 +27391,25 @@ GL_PREFIX(SecondaryColor3dEXT):
 GL_PREFIX(SecondaryColor3dvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5752(%rax), %r11
+	movq	5744(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5752(%rax), %r11
+	movq	5744(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5752(%rax), %r11
+	movq	5744(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5752(%rax), %r11
+	movq	5744(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3dvEXT), .-GL_PREFIX(SecondaryColor3dvEXT)
@@ -27457,7 +27420,7 @@ GL_PREFIX(SecondaryColor3dvEXT):
 GL_PREFIX(SecondaryColor3fEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5760(%rax), %r11
+	movq	5752(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -27469,13 +27432,13 @@ GL_PREFIX(SecondaryColor3fEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5760(%rax), %r11
+	movq	5752(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5760(%rax), %r11
+	movq	5752(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -27487,7 +27450,7 @@ GL_PREFIX(SecondaryColor3fEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5760(%rax), %r11
+	movq	5752(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3fEXT), .-GL_PREFIX(SecondaryColor3fEXT)
@@ -27498,25 +27461,25 @@ GL_PREFIX(SecondaryColor3fEXT):
 GL_PREFIX(SecondaryColor3fvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5768(%rax), %r11
+	movq	5760(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5768(%rax), %r11
+	movq	5760(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5768(%rax), %r11
+	movq	5760(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5768(%rax), %r11
+	movq	5760(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3fvEXT), .-GL_PREFIX(SecondaryColor3fvEXT)
@@ -27527,7 +27490,7 @@ GL_PREFIX(SecondaryColor3fvEXT):
 GL_PREFIX(SecondaryColor3iEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5776(%rax), %r11
+	movq	5768(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27537,13 +27500,13 @@ GL_PREFIX(SecondaryColor3iEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5776(%rax), %r11
+	movq	5768(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5776(%rax), %r11
+	movq	5768(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27553,7 +27516,7 @@ GL_PREFIX(SecondaryColor3iEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5776(%rax), %r11
+	movq	5768(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3iEXT), .-GL_PREFIX(SecondaryColor3iEXT)
@@ -27564,25 +27527,25 @@ GL_PREFIX(SecondaryColor3iEXT):
 GL_PREFIX(SecondaryColor3ivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5784(%rax), %r11
+	movq	5776(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5784(%rax), %r11
+	movq	5776(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5784(%rax), %r11
+	movq	5776(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5784(%rax), %r11
+	movq	5776(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3ivEXT), .-GL_PREFIX(SecondaryColor3ivEXT)
@@ -27593,7 +27556,7 @@ GL_PREFIX(SecondaryColor3ivEXT):
 GL_PREFIX(SecondaryColor3sEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5792(%rax), %r11
+	movq	5784(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27603,13 +27566,13 @@ GL_PREFIX(SecondaryColor3sEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5792(%rax), %r11
+	movq	5784(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5792(%rax), %r11
+	movq	5784(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27619,7 +27582,7 @@ GL_PREFIX(SecondaryColor3sEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5792(%rax), %r11
+	movq	5784(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3sEXT), .-GL_PREFIX(SecondaryColor3sEXT)
@@ -27630,25 +27593,25 @@ GL_PREFIX(SecondaryColor3sEXT):
 GL_PREFIX(SecondaryColor3svEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5800(%rax), %r11
+	movq	5792(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5800(%rax), %r11
+	movq	5792(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5800(%rax), %r11
+	movq	5792(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5800(%rax), %r11
+	movq	5792(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3svEXT), .-GL_PREFIX(SecondaryColor3svEXT)
@@ -27659,7 +27622,7 @@ GL_PREFIX(SecondaryColor3svEXT):
 GL_PREFIX(SecondaryColor3ubEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5808(%rax), %r11
+	movq	5800(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27669,13 +27632,13 @@ GL_PREFIX(SecondaryColor3ubEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5808(%rax), %r11
+	movq	5800(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5808(%rax), %r11
+	movq	5800(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27685,7 +27648,7 @@ GL_PREFIX(SecondaryColor3ubEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5808(%rax), %r11
+	movq	5800(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3ubEXT), .-GL_PREFIX(SecondaryColor3ubEXT)
@@ -27696,25 +27659,25 @@ GL_PREFIX(SecondaryColor3ubEXT):
 GL_PREFIX(SecondaryColor3ubvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5816(%rax), %r11
+	movq	5808(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5816(%rax), %r11
+	movq	5808(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5816(%rax), %r11
+	movq	5808(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5816(%rax), %r11
+	movq	5808(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3ubvEXT), .-GL_PREFIX(SecondaryColor3ubvEXT)
@@ -27725,7 +27688,7 @@ GL_PREFIX(SecondaryColor3ubvEXT):
 GL_PREFIX(SecondaryColor3uiEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5824(%rax), %r11
+	movq	5816(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27735,13 +27698,13 @@ GL_PREFIX(SecondaryColor3uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5824(%rax), %r11
+	movq	5816(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5824(%rax), %r11
+	movq	5816(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27751,7 +27714,7 @@ GL_PREFIX(SecondaryColor3uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5824(%rax), %r11
+	movq	5816(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3uiEXT), .-GL_PREFIX(SecondaryColor3uiEXT)
@@ -27762,25 +27725,25 @@ GL_PREFIX(SecondaryColor3uiEXT):
 GL_PREFIX(SecondaryColor3uivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5832(%rax), %r11
+	movq	5824(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5832(%rax), %r11
+	movq	5824(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5832(%rax), %r11
+	movq	5824(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5832(%rax), %r11
+	movq	5824(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3uivEXT), .-GL_PREFIX(SecondaryColor3uivEXT)
@@ -27791,7 +27754,7 @@ GL_PREFIX(SecondaryColor3uivEXT):
 GL_PREFIX(SecondaryColor3usEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5840(%rax), %r11
+	movq	5832(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27801,13 +27764,13 @@ GL_PREFIX(SecondaryColor3usEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5840(%rax), %r11
+	movq	5832(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5840(%rax), %r11
+	movq	5832(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27817,7 +27780,7 @@ GL_PREFIX(SecondaryColor3usEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5840(%rax), %r11
+	movq	5832(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3usEXT), .-GL_PREFIX(SecondaryColor3usEXT)
@@ -27828,25 +27791,25 @@ GL_PREFIX(SecondaryColor3usEXT):
 GL_PREFIX(SecondaryColor3usvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5848(%rax), %r11
+	movq	5840(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5848(%rax), %r11
+	movq	5840(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5848(%rax), %r11
+	movq	5840(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5848(%rax), %r11
+	movq	5840(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3usvEXT), .-GL_PREFIX(SecondaryColor3usvEXT)
@@ -27857,7 +27820,7 @@ GL_PREFIX(SecondaryColor3usvEXT):
 GL_PREFIX(SecondaryColorPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5856(%rax), %r11
+	movq	5848(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27871,13 +27834,13 @@ GL_PREFIX(SecondaryColorPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5856(%rax), %r11
+	movq	5848(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5856(%rax), %r11
+	movq	5848(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27891,7 +27854,7 @@ GL_PREFIX(SecondaryColorPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5856(%rax), %r11
+	movq	5848(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColorPointerEXT), .-GL_PREFIX(SecondaryColorPointerEXT)
@@ -27902,7 +27865,7 @@ GL_PREFIX(SecondaryColorPointerEXT):
 GL_PREFIX(MultiDrawArraysEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5864(%rax), %r11
+	movq	5856(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27916,13 +27879,13 @@ GL_PREFIX(MultiDrawArraysEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5864(%rax), %r11
+	movq	5856(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5864(%rax), %r11
+	movq	5856(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27936,7 +27899,7 @@ GL_PREFIX(MultiDrawArraysEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5864(%rax), %r11
+	movq	5856(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(MultiDrawArraysEXT), .-GL_PREFIX(MultiDrawArraysEXT)
@@ -27947,7 +27910,7 @@ GL_PREFIX(MultiDrawArraysEXT):
 GL_PREFIX(MultiDrawElementsEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5872(%rax), %r11
+	movq	5864(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27961,13 +27924,13 @@ GL_PREFIX(MultiDrawElementsEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5872(%rax), %r11
+	movq	5864(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5872(%rax), %r11
+	movq	5864(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27981,7 +27944,7 @@ GL_PREFIX(MultiDrawElementsEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5872(%rax), %r11
+	movq	5864(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(MultiDrawElementsEXT), .-GL_PREFIX(MultiDrawElementsEXT)
@@ -27992,7 +27955,7 @@ GL_PREFIX(MultiDrawElementsEXT):
 GL_PREFIX(FogCoordPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5880(%rax), %r11
+	movq	5872(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28002,13 +27965,13 @@ GL_PREFIX(FogCoordPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5880(%rax), %r11
+	movq	5872(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5880(%rax), %r11
+	movq	5872(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28018,7 +27981,7 @@ GL_PREFIX(FogCoordPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5880(%rax), %r11
+	movq	5872(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FogCoordPointerEXT), .-GL_PREFIX(FogCoordPointerEXT)
@@ -28029,7 +27992,7 @@ GL_PREFIX(FogCoordPointerEXT):
 GL_PREFIX(FogCoorddEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5888(%rax), %r11
+	movq	5880(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$8, %rsp
@@ -28037,13 +28000,13 @@ GL_PREFIX(FogCoorddEXT):
 	call	_x86_64_get_dispatch@PLT
 	movq	(%rsp), %xmm0
 	addq	$8, %rsp
-	movq	5888(%rax), %r11
+	movq	5880(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5888(%rax), %r11
+	movq	5880(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$8, %rsp
@@ -28051,7 +28014,7 @@ GL_PREFIX(FogCoorddEXT):
 	call	_glapi_get_dispatch
 	movq	(%rsp), %xmm0
 	addq	$8, %rsp
-	movq	5888(%rax), %r11
+	movq	5880(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FogCoorddEXT), .-GL_PREFIX(FogCoorddEXT)
@@ -28062,25 +28025,25 @@ GL_PREFIX(FogCoorddEXT):
 GL_PREFIX(FogCoorddvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5896(%rax), %r11
+	movq	5888(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5896(%rax), %r11
+	movq	5888(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5896(%rax), %r11
+	movq	5888(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5896(%rax), %r11
+	movq	5888(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FogCoorddvEXT), .-GL_PREFIX(FogCoorddvEXT)
@@ -28091,7 +28054,7 @@ GL_PREFIX(FogCoorddvEXT):
 GL_PREFIX(FogCoordfEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5904(%rax), %r11
+	movq	5896(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$8, %rsp
@@ -28099,13 +28062,13 @@ GL_PREFIX(FogCoordfEXT):
 	call	_x86_64_get_dispatch@PLT
 	movq	(%rsp), %xmm0
 	addq	$8, %rsp
-	movq	5904(%rax), %r11
+	movq	5896(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5904(%rax), %r11
+	movq	5896(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$8, %rsp
@@ -28113,7 +28076,7 @@ GL_PREFIX(FogCoordfEXT):
 	call	_glapi_get_dispatch
 	movq	(%rsp), %xmm0
 	addq	$8, %rsp
-	movq	5904(%rax), %r11
+	movq	5896(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FogCoordfEXT), .-GL_PREFIX(FogCoordfEXT)
@@ -28124,58 +28087,58 @@ GL_PREFIX(FogCoordfEXT):
 GL_PREFIX(FogCoordfvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5912(%rax), %r11
+	movq	5904(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5912(%rax), %r11
+	movq	5904(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5912(%rax), %r11
+	movq	5904(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5912(%rax), %r11
+	movq	5904(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FogCoordfvEXT), .-GL_PREFIX(FogCoordfvEXT)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_740)
-	.type	GL_PREFIX(_dispatch_stub_740), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_740))
-GL_PREFIX(_dispatch_stub_740):
+	.globl	GL_PREFIX(_dispatch_stub_739)
+	.type	GL_PREFIX(_dispatch_stub_739), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_739))
+GL_PREFIX(_dispatch_stub_739):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5920(%rax), %r11
+	movq	5912(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5920(%rax), %r11
+	movq	5912(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5920(%rax), %r11
+	movq	5912(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5920(%rax), %r11
+	movq	5912(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_740), .-GL_PREFIX(_dispatch_stub_740)
+	.size	GL_PREFIX(_dispatch_stub_739), .-GL_PREFIX(_dispatch_stub_739)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(BlendFuncSeparateEXT)
@@ -28183,7 +28146,7 @@ GL_PREFIX(_dispatch_stub_740):
 GL_PREFIX(BlendFuncSeparateEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5928(%rax), %r11
+	movq	5920(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28197,13 +28160,13 @@ GL_PREFIX(BlendFuncSeparateEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5928(%rax), %r11
+	movq	5920(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5928(%rax), %r11
+	movq	5920(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28217,7 +28180,7 @@ GL_PREFIX(BlendFuncSeparateEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5928(%rax), %r11
+	movq	5920(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BlendFuncSeparateEXT), .-GL_PREFIX(BlendFuncSeparateEXT)
@@ -28228,25 +28191,25 @@ GL_PREFIX(BlendFuncSeparateEXT):
 GL_PREFIX(FlushVertexArrayRangeNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5936(%rax), %r11
+	movq	5928(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	5936(%rax), %r11
+	movq	5928(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5936(%rax), %r11
+	movq	5928(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	5936(%rax), %r11
+	movq	5928(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FlushVertexArrayRangeNV), .-GL_PREFIX(FlushVertexArrayRangeNV)
@@ -28257,7 +28220,7 @@ GL_PREFIX(FlushVertexArrayRangeNV):
 GL_PREFIX(VertexArrayRangeNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5944(%rax), %r11
+	movq	5936(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28267,13 +28230,13 @@ GL_PREFIX(VertexArrayRangeNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5944(%rax), %r11
+	movq	5936(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5944(%rax), %r11
+	movq	5936(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28283,7 +28246,7 @@ GL_PREFIX(VertexArrayRangeNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5944(%rax), %r11
+	movq	5936(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexArrayRangeNV), .-GL_PREFIX(VertexArrayRangeNV)
@@ -28294,7 +28257,7 @@ GL_PREFIX(VertexArrayRangeNV):
 GL_PREFIX(CombinerInputNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5952(%rax), %r11
+	movq	5944(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28312,13 +28275,13 @@ GL_PREFIX(CombinerInputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5952(%rax), %r11
+	movq	5944(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5952(%rax), %r11
+	movq	5944(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28336,7 +28299,7 @@ GL_PREFIX(CombinerInputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5952(%rax), %r11
+	movq	5944(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerInputNV), .-GL_PREFIX(CombinerInputNV)
@@ -28347,7 +28310,7 @@ GL_PREFIX(CombinerInputNV):
 GL_PREFIX(CombinerOutputNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5960(%rax), %r11
+	movq	5952(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28365,13 +28328,13 @@ GL_PREFIX(CombinerOutputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5960(%rax), %r11
+	movq	5952(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5960(%rax), %r11
+	movq	5952(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28389,7 +28352,7 @@ GL_PREFIX(CombinerOutputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5960(%rax), %r11
+	movq	5952(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerOutputNV), .-GL_PREFIX(CombinerOutputNV)
@@ -28400,7 +28363,7 @@ GL_PREFIX(CombinerOutputNV):
 GL_PREFIX(CombinerParameterfNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5968(%rax), %r11
+	movq	5960(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -28410,13 +28373,13 @@ GL_PREFIX(CombinerParameterfNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5968(%rax), %r11
+	movq	5960(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5968(%rax), %r11
+	movq	5960(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -28426,7 +28389,7 @@ GL_PREFIX(CombinerParameterfNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5968(%rax), %r11
+	movq	5960(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerParameterfNV), .-GL_PREFIX(CombinerParameterfNV)
@@ -28437,7 +28400,7 @@ GL_PREFIX(CombinerParameterfNV):
 GL_PREFIX(CombinerParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5976(%rax), %r11
+	movq	5968(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28447,13 +28410,13 @@ GL_PREFIX(CombinerParameterfvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5976(%rax), %r11
+	movq	5968(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5976(%rax), %r11
+	movq	5968(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28463,7 +28426,7 @@ GL_PREFIX(CombinerParameterfvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5976(%rax), %r11
+	movq	5968(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerParameterfvNV), .-GL_PREFIX(CombinerParameterfvNV)
@@ -28474,7 +28437,7 @@ GL_PREFIX(CombinerParameterfvNV):
 GL_PREFIX(CombinerParameteriNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5984(%rax), %r11
+	movq	5976(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28484,13 +28447,13 @@ GL_PREFIX(CombinerParameteriNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5984(%rax), %r11
+	movq	5976(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5984(%rax), %r11
+	movq	5976(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28500,7 +28463,7 @@ GL_PREFIX(CombinerParameteriNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5984(%rax), %r11
+	movq	5976(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerParameteriNV), .-GL_PREFIX(CombinerParameteriNV)
@@ -28511,7 +28474,7 @@ GL_PREFIX(CombinerParameteriNV):
 GL_PREFIX(CombinerParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5992(%rax), %r11
+	movq	5984(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28521,13 +28484,13 @@ GL_PREFIX(CombinerParameterivNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5992(%rax), %r11
+	movq	5984(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5992(%rax), %r11
+	movq	5984(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28537,7 +28500,7 @@ GL_PREFIX(CombinerParameterivNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5992(%rax), %r11
+	movq	5984(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerParameterivNV), .-GL_PREFIX(CombinerParameterivNV)
@@ -28548,7 +28511,7 @@ GL_PREFIX(CombinerParameterivNV):
 GL_PREFIX(FinalCombinerInputNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6000(%rax), %r11
+	movq	5992(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28562,13 +28525,13 @@ GL_PREFIX(FinalCombinerInputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6000(%rax), %r11
+	movq	5992(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6000(%rax), %r11
+	movq	5992(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28582,7 +28545,7 @@ GL_PREFIX(FinalCombinerInputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6000(%rax), %r11
+	movq	5992(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FinalCombinerInputNV), .-GL_PREFIX(FinalCombinerInputNV)
@@ -28593,7 +28556,7 @@ GL_PREFIX(FinalCombinerInputNV):
 GL_PREFIX(GetCombinerInputParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6008(%rax), %r11
+	movq	6000(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28607,13 +28570,13 @@ GL_PREFIX(GetCombinerInputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6008(%rax), %r11
+	movq	6000(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6008(%rax), %r11
+	movq	6000(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28627,7 +28590,7 @@ GL_PREFIX(GetCombinerInputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6008(%rax), %r11
+	movq	6000(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetCombinerInputParameterfvNV), .-GL_PREFIX(GetCombinerInputParameterfvNV)
@@ -28638,7 +28601,7 @@ GL_PREFIX(GetCombinerInputParameterfvNV):
 GL_PREFIX(GetCombinerInputParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6016(%rax), %r11
+	movq	6008(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28652,13 +28615,13 @@ GL_PREFIX(GetCombinerInputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6016(%rax), %r11
+	movq	6008(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6016(%rax), %r11
+	movq	6008(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28672,7 +28635,7 @@ GL_PREFIX(GetCombinerInputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6016(%rax), %r11
+	movq	6008(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetCombinerInputParameterivNV), .-GL_PREFIX(GetCombinerInputParameterivNV)
@@ -28683,7 +28646,7 @@ GL_PREFIX(GetCombinerInputParameterivNV):
 GL_PREFIX(GetCombinerOutputParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6024(%rax), %r11
+	movq	6016(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28697,13 +28660,13 @@ GL_PREFIX(GetCombinerOutputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6024(%rax), %r11
+	movq	6016(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6024(%rax), %r11
+	movq	6016(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28717,7 +28680,7 @@ GL_PREFIX(GetCombinerOutputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6024(%rax), %r11
+	movq	6016(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetCombinerOutputParameterfvNV), .-GL_PREFIX(GetCombinerOutputParameterfvNV)
@@ -28728,7 +28691,7 @@ GL_PREFIX(GetCombinerOutputParameterfvNV):
 GL_PREFIX(GetCombinerOutputParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6032(%rax), %r11
+	movq	6024(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28742,13 +28705,13 @@ GL_PREFIX(GetCombinerOutputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6032(%rax), %r11
+	movq	6024(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6032(%rax), %r11
+	movq	6024(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28762,7 +28725,7 @@ GL_PREFIX(GetCombinerOutputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6032(%rax), %r11
+	movq	6024(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetCombinerOutputParameterivNV), .-GL_PREFIX(GetCombinerOutputParameterivNV)
@@ -28773,7 +28736,7 @@ GL_PREFIX(GetCombinerOutputParameterivNV):
 GL_PREFIX(GetFinalCombinerInputParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6040(%rax), %r11
+	movq	6032(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28783,13 +28746,13 @@ GL_PREFIX(GetFinalCombinerInputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6040(%rax), %r11
+	movq	6032(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6040(%rax), %r11
+	movq	6032(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28799,7 +28762,7 @@ GL_PREFIX(GetFinalCombinerInputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6040(%rax), %r11
+	movq	6032(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetFinalCombinerInputParameterfvNV), .-GL_PREFIX(GetFinalCombinerInputParameterfvNV)
@@ -28810,7 +28773,7 @@ GL_PREFIX(GetFinalCombinerInputParameterfvNV):
 GL_PREFIX(GetFinalCombinerInputParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6048(%rax), %r11
+	movq	6040(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28820,13 +28783,13 @@ GL_PREFIX(GetFinalCombinerInputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6048(%rax), %r11
+	movq	6040(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6048(%rax), %r11
+	movq	6040(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28836,7 +28799,7 @@ GL_PREFIX(GetFinalCombinerInputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6048(%rax), %r11
+	movq	6040(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetFinalCombinerInputParameterivNV), .-GL_PREFIX(GetFinalCombinerInputParameterivNV)
@@ -28847,25 +28810,25 @@ GL_PREFIX(GetFinalCombinerInputParameterivNV):
 GL_PREFIX(ResizeBuffersMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6056(%rax), %r11
+	movq	6048(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	6056(%rax), %r11
+	movq	6048(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6056(%rax), %r11
+	movq	6048(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	6056(%rax), %r11
+	movq	6048(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ResizeBuffersMESA), .-GL_PREFIX(ResizeBuffersMESA)
@@ -28876,7 +28839,7 @@ GL_PREFIX(ResizeBuffersMESA):
 GL_PREFIX(WindowPos2dMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6064(%rax), %r11
+	movq	6056(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -28886,13 +28849,13 @@ GL_PREFIX(WindowPos2dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	6064(%rax), %r11
+	movq	6056(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6064(%rax), %r11
+	movq	6056(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -28902,7 +28865,7 @@ GL_PREFIX(WindowPos2dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	6064(%rax), %r11
+	movq	6056(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2dMESA), .-GL_PREFIX(WindowPos2dMESA)
@@ -28913,25 +28876,25 @@ GL_PREFIX(WindowPos2dMESA):
 GL_PREFIX(WindowPos2dvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6072(%rax), %r11
+	movq	6064(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6072(%rax), %r11
+	movq	6064(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6072(%rax), %r11
+	movq	6064(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6072(%rax), %r11
+	movq	6064(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2dvMESA), .-GL_PREFIX(WindowPos2dvMESA)
@@ -28942,7 +28905,7 @@ GL_PREFIX(WindowPos2dvMESA):
 GL_PREFIX(WindowPos2fMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6080(%rax), %r11
+	movq	6072(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -28952,13 +28915,13 @@ GL_PREFIX(WindowPos2fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	6080(%rax), %r11
+	movq	6072(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6080(%rax), %r11
+	movq	6072(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -28968,7 +28931,7 @@ GL_PREFIX(WindowPos2fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	6080(%rax), %r11
+	movq	6072(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2fMESA), .-GL_PREFIX(WindowPos2fMESA)
@@ -28979,25 +28942,25 @@ GL_PREFIX(WindowPos2fMESA):
 GL_PREFIX(WindowPos2fvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6088(%rax), %r11
+	movq	6080(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6088(%rax), %r11
+	movq	6080(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6088(%rax), %r11
+	movq	6080(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6088(%rax), %r11
+	movq	6080(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2fvMESA), .-GL_PREFIX(WindowPos2fvMESA)
@@ -29008,7 +28971,7 @@ GL_PREFIX(WindowPos2fvMESA):
 GL_PREFIX(WindowPos2iMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6096(%rax), %r11
+	movq	6088(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29018,13 +28981,13 @@ GL_PREFIX(WindowPos2iMESA):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6096(%rax), %r11
+	movq	6088(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6096(%rax), %r11
+	movq	6088(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29034,7 +28997,7 @@ GL_PREFIX(WindowPos2iMESA):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6096(%rax), %r11
+	movq	6088(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2iMESA), .-GL_PREFIX(WindowPos2iMESA)
@@ -29045,25 +29008,25 @@ GL_PREFIX(WindowPos2iMESA):
 GL_PREFIX(WindowPos2ivMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6104(%rax), %r11
+	movq	6096(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6104(%rax), %r11
+	movq	6096(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6104(%rax), %r11
+	movq	6096(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6104(%rax), %r11
+	movq	6096(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2ivMESA), .-GL_PREFIX(WindowPos2ivMESA)
@@ -29074,7 +29037,7 @@ GL_PREFIX(WindowPos2ivMESA):
 GL_PREFIX(WindowPos2sMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6112(%rax), %r11
+	movq	6104(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29084,13 +29047,13 @@ GL_PREFIX(WindowPos2sMESA):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6112(%rax), %r11
+	movq	6104(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6112(%rax), %r11
+	movq	6104(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29100,7 +29063,7 @@ GL_PREFIX(WindowPos2sMESA):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6112(%rax), %r11
+	movq	6104(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2sMESA), .-GL_PREFIX(WindowPos2sMESA)
@@ -29111,25 +29074,25 @@ GL_PREFIX(WindowPos2sMESA):
 GL_PREFIX(WindowPos2svMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6120(%rax), %r11
+	movq	6112(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6120(%rax), %r11
+	movq	6112(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6120(%rax), %r11
+	movq	6112(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6120(%rax), %r11
+	movq	6112(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2svMESA), .-GL_PREFIX(WindowPos2svMESA)
@@ -29140,7 +29103,7 @@ GL_PREFIX(WindowPos2svMESA):
 GL_PREFIX(WindowPos3dMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6128(%rax), %r11
+	movq	6120(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -29152,13 +29115,13 @@ GL_PREFIX(WindowPos3dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	6128(%rax), %r11
+	movq	6120(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6128(%rax), %r11
+	movq	6120(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -29170,7 +29133,7 @@ GL_PREFIX(WindowPos3dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	6128(%rax), %r11
+	movq	6120(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3dMESA), .-GL_PREFIX(WindowPos3dMESA)
@@ -29181,25 +29144,25 @@ GL_PREFIX(WindowPos3dMESA):
 GL_PREFIX(WindowPos3dvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6136(%rax), %r11
+	movq	6128(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6136(%rax), %r11
+	movq	6128(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6136(%rax), %r11
+	movq	6128(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6136(%rax), %r11
+	movq	6128(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3dvMESA), .-GL_PREFIX(WindowPos3dvMESA)
@@ -29210,7 +29173,7 @@ GL_PREFIX(WindowPos3dvMESA):
 GL_PREFIX(WindowPos3fMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6144(%rax), %r11
+	movq	6136(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -29222,13 +29185,13 @@ GL_PREFIX(WindowPos3fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	6144(%rax), %r11
+	movq	6136(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6144(%rax), %r11
+	movq	6136(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -29240,7 +29203,7 @@ GL_PREFIX(WindowPos3fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	6144(%rax), %r11
+	movq	6136(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3fMESA), .-GL_PREFIX(WindowPos3fMESA)
@@ -29251,25 +29214,25 @@ GL_PREFIX(WindowPos3fMESA):
 GL_PREFIX(WindowPos3fvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6152(%rax), %r11
+	movq	6144(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6152(%rax), %r11
+	movq	6144(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6152(%rax), %r11
+	movq	6144(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6152(%rax), %r11
+	movq	6144(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3fvMESA), .-GL_PREFIX(WindowPos3fvMESA)
@@ -29280,7 +29243,7 @@ GL_PREFIX(WindowPos3fvMESA):
 GL_PREFIX(WindowPos3iMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6160(%rax), %r11
+	movq	6152(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29290,13 +29253,13 @@ GL_PREFIX(WindowPos3iMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6160(%rax), %r11
+	movq	6152(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6160(%rax), %r11
+	movq	6152(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29306,7 +29269,7 @@ GL_PREFIX(WindowPos3iMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6160(%rax), %r11
+	movq	6152(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3iMESA), .-GL_PREFIX(WindowPos3iMESA)
@@ -29317,25 +29280,25 @@ GL_PREFIX(WindowPos3iMESA):
 GL_PREFIX(WindowPos3ivMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6168(%rax), %r11
+	movq	6160(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6168(%rax), %r11
+	movq	6160(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6168(%rax), %r11
+	movq	6160(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6168(%rax), %r11
+	movq	6160(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3ivMESA), .-GL_PREFIX(WindowPos3ivMESA)
@@ -29346,7 +29309,7 @@ GL_PREFIX(WindowPos3ivMESA):
 GL_PREFIX(WindowPos3sMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6176(%rax), %r11
+	movq	6168(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29356,13 +29319,13 @@ GL_PREFIX(WindowPos3sMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6176(%rax), %r11
+	movq	6168(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6176(%rax), %r11
+	movq	6168(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29372,7 +29335,7 @@ GL_PREFIX(WindowPos3sMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6176(%rax), %r11
+	movq	6168(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3sMESA), .-GL_PREFIX(WindowPos3sMESA)
@@ -29383,25 +29346,25 @@ GL_PREFIX(WindowPos3sMESA):
 GL_PREFIX(WindowPos3svMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6184(%rax), %r11
+	movq	6176(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6184(%rax), %r11
+	movq	6176(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6184(%rax), %r11
+	movq	6176(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6184(%rax), %r11
+	movq	6176(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3svMESA), .-GL_PREFIX(WindowPos3svMESA)
@@ -29412,7 +29375,7 @@ GL_PREFIX(WindowPos3svMESA):
 GL_PREFIX(WindowPos4dMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6192(%rax), %r11
+	movq	6184(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -29426,13 +29389,13 @@ GL_PREFIX(WindowPos4dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$40, %rsp
-	movq	6192(%rax), %r11
+	movq	6184(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6192(%rax), %r11
+	movq	6184(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -29446,7 +29409,7 @@ GL_PREFIX(WindowPos4dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$40, %rsp
-	movq	6192(%rax), %r11
+	movq	6184(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4dMESA), .-GL_PREFIX(WindowPos4dMESA)
@@ -29457,25 +29420,25 @@ GL_PREFIX(WindowPos4dMESA):
 GL_PREFIX(WindowPos4dvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6200(%rax), %r11
+	movq	6192(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6200(%rax), %r11
+	movq	6192(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6200(%rax), %r11
+	movq	6192(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6200(%rax), %r11
+	movq	6192(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4dvMESA), .-GL_PREFIX(WindowPos4dvMESA)
@@ -29486,7 +29449,7 @@ GL_PREFIX(WindowPos4dvMESA):
 GL_PREFIX(WindowPos4fMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6208(%rax), %r11
+	movq	6200(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -29500,13 +29463,13 @@ GL_PREFIX(WindowPos4fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$40, %rsp
-	movq	6208(%rax), %r11
+	movq	6200(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6208(%rax), %r11
+	movq	6200(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -29520,7 +29483,7 @@ GL_PREFIX(WindowPos4fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$40, %rsp
-	movq	6208(%rax), %r11
+	movq	6200(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4fMESA), .-GL_PREFIX(WindowPos4fMESA)
@@ -29531,25 +29494,25 @@ GL_PREFIX(WindowPos4fMESA):
 GL_PREFIX(WindowPos4fvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6216(%rax), %r11
+	movq	6208(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6216(%rax), %r11
+	movq	6208(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6216(%rax), %r11
+	movq	6208(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6216(%rax), %r11
+	movq	6208(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4fvMESA), .-GL_PREFIX(WindowPos4fvMESA)
@@ -29560,7 +29523,7 @@ GL_PREFIX(WindowPos4fvMESA):
 GL_PREFIX(WindowPos4iMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6224(%rax), %r11
+	movq	6216(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29574,13 +29537,13 @@ GL_PREFIX(WindowPos4iMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6224(%rax), %r11
+	movq	6216(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6224(%rax), %r11
+	movq	6216(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29594,7 +29557,7 @@ GL_PREFIX(WindowPos4iMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6224(%rax), %r11
+	movq	6216(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4iMESA), .-GL_PREFIX(WindowPos4iMESA)
@@ -29605,25 +29568,25 @@ GL_PREFIX(WindowPos4iMESA):
 GL_PREFIX(WindowPos4ivMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6232(%rax), %r11
+	movq	6224(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6232(%rax), %r11
+	movq	6224(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6232(%rax), %r11
+	movq	6224(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6232(%rax), %r11
+	movq	6224(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4ivMESA), .-GL_PREFIX(WindowPos4ivMESA)
@@ -29634,7 +29597,7 @@ GL_PREFIX(WindowPos4ivMESA):
 GL_PREFIX(WindowPos4sMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6240(%rax), %r11
+	movq	6232(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29648,13 +29611,13 @@ GL_PREFIX(WindowPos4sMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6240(%rax), %r11
+	movq	6232(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6240(%rax), %r11
+	movq	6232(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29668,7 +29631,7 @@ GL_PREFIX(WindowPos4sMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6240(%rax), %r11
+	movq	6232(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4sMESA), .-GL_PREFIX(WindowPos4sMESA)
@@ -29679,11 +29642,49 @@ GL_PREFIX(WindowPos4sMESA):
 GL_PREFIX(WindowPos4svMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
+	movq	6240(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	call	_x86_64_get_dispatch@PLT
+	popq	%rdi
+	movq	6240(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	6240(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	call	_glapi_get_dispatch
+	popq	%rdi
+	movq	6240(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(WindowPos4svMESA), .-GL_PREFIX(WindowPos4svMESA)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(_dispatch_stub_781)
+	.type	GL_PREFIX(_dispatch_stub_781), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_781))
+GL_PREFIX(_dispatch_stub_781):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
 	movq	6248(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	pushq	%rcx
+	pushq	%r8
 	call	_x86_64_get_dispatch@PLT
+	popq	%r8
+	popq	%rcx
+	popq	%rdx
+	popq	%rsi
 	popq	%rdi
 	movq	6248(%rax), %r11
 	jmp	*%r11
@@ -29695,12 +29696,20 @@ GL_PREFIX(WindowPos4svMESA):
 	jmp	*%r11
 1:
 	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	pushq	%rcx
+	pushq	%r8
 	call	_glapi_get_dispatch
+	popq	%r8
+	popq	%rcx
+	popq	%rdx
+	popq	%rsi
 	popq	%rdi
 	movq	6248(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(WindowPos4svMESA), .-GL_PREFIX(WindowPos4svMESA)
+	.size	GL_PREFIX(_dispatch_stub_781), .-GL_PREFIX(_dispatch_stub_781)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(_dispatch_stub_782)
@@ -29717,7 +29726,11 @@ GL_PREFIX(_dispatch_stub_782):
 	pushq	%rdx
 	pushq	%rcx
 	pushq	%r8
+	pushq	%r9
+	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
+	popq	%rbp
+	popq	%r9
 	popq	%r8
 	popq	%rcx
 	popq	%rdx
@@ -29737,7 +29750,11 @@ GL_PREFIX(_dispatch_stub_782):
 	pushq	%rdx
 	pushq	%rcx
 	pushq	%r8
+	pushq	%r9
+	pushq	%rbp
 	call	_glapi_get_dispatch
+	popq	%rbp
+	popq	%r9
 	popq	%r8
 	popq	%rcx
 	popq	%rdx
@@ -29760,17 +29777,9 @@ GL_PREFIX(_dispatch_stub_783):
 #elif defined(PTHREADS)
 	pushq	%rdi
 	pushq	%rsi
-	pushq	%rdx
-	pushq	%rcx
-	pushq	%r8
-	pushq	%r9
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	popq	%r9
-	popq	%r8
-	popq	%rcx
-	popq	%rdx
 	popq	%rsi
 	popq	%rdi
 	movq	6264(%rax), %r11
@@ -29784,17 +29793,9 @@ GL_PREFIX(_dispatch_stub_783):
 1:
 	pushq	%rdi
 	pushq	%rsi
-	pushq	%rdx
-	pushq	%rcx
-	pushq	%r8
-	pushq	%r9
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	popq	%r9
-	popq	%r8
-	popq	%rcx
-	popq	%rdx
 	popq	%rsi
 	popq	%rdi
 	movq	6264(%rax), %r11
@@ -29813,11 +29814,7 @@ GL_PREFIX(_dispatch_stub_784):
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
-	pushq	%rsi
-	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
-	popq	%rbp
-	popq	%rsi
 	popq	%rdi
 	movq	6272(%rax), %r11
 	jmp	*%r11
@@ -29829,11 +29826,7 @@ GL_PREFIX(_dispatch_stub_784):
 	jmp	*%r11
 1:
 	pushq	%rdi
-	pushq	%rsi
-	pushq	%rbp
 	call	_glapi_get_dispatch
-	popq	%rbp
-	popq	%rsi
 	popq	%rdi
 	movq	6272(%rax), %r11
 	jmp	*%r11
@@ -29851,7 +29844,11 @@ GL_PREFIX(_dispatch_stub_785):
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
+	popq	%rbp
+	popq	%rsi
 	popq	%rdi
 	movq	6280(%rax), %r11
 	jmp	*%r11
@@ -29863,7 +29860,11 @@ GL_PREFIX(_dispatch_stub_785):
 	jmp	*%r11
 1:
 	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
 	call	_glapi_get_dispatch
+	popq	%rbp
+	popq	%rsi
 	popq	%rdi
 	movq	6280(%rax), %r11
 	jmp	*%r11
@@ -29882,9 +29883,9 @@ GL_PREFIX(_dispatch_stub_786):
 #elif defined(PTHREADS)
 	pushq	%rdi
 	pushq	%rsi
-	pushq	%rbp
+	pushq	%rdx
 	call	_x86_64_get_dispatch@PLT
-	popq	%rbp
+	popq	%rdx
 	popq	%rsi
 	popq	%rdi
 	movq	6288(%rax), %r11
@@ -29898,9 +29899,9 @@ GL_PREFIX(_dispatch_stub_786):
 1:
 	pushq	%rdi
 	pushq	%rsi
-	pushq	%rbp
+	pushq	%rdx
 	call	_glapi_get_dispatch
-	popq	%rbp
+	popq	%rdx
 	popq	%rsi
 	popq	%rdi
 	movq	6288(%rax), %r11
@@ -29919,11 +29920,7 @@ GL_PREFIX(_dispatch_stub_787):
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
-	pushq	%rsi
-	pushq	%rdx
 	call	_x86_64_get_dispatch@PLT
-	popq	%rdx
-	popq	%rsi
 	popq	%rdi
 	movq	6296(%rax), %r11
 	jmp	*%r11
@@ -29935,11 +29932,7 @@ GL_PREFIX(_dispatch_stub_787):
 	jmp	*%r11
 1:
 	pushq	%rdi
-	pushq	%rsi
-	pushq	%rdx
 	call	_glapi_get_dispatch
-	popq	%rdx
-	popq	%rsi
 	popq	%rdi
 	movq	6296(%rax), %r11
 	jmp	*%r11
@@ -29957,7 +29950,11 @@ GL_PREFIX(_dispatch_stub_788):
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
+	popq	%rbp
+	popq	%rsi
 	popq	%rdi
 	movq	6304(%rax), %r11
 	jmp	*%r11
@@ -29969,7 +29966,11 @@ GL_PREFIX(_dispatch_stub_788):
 	jmp	*%r11
 1:
 	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
 	call	_glapi_get_dispatch
+	popq	%rbp
+	popq	%rsi
 	popq	%rdi
 	movq	6304(%rax), %r11
 	jmp	*%r11
@@ -29987,11 +29988,7 @@ GL_PREFIX(_dispatch_stub_789):
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
-	pushq	%rsi
-	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
-	popq	%rbp
-	popq	%rsi
 	popq	%rdi
 	movq	6312(%rax), %r11
 	jmp	*%r11
@@ -30003,11 +30000,7 @@ GL_PREFIX(_dispatch_stub_789):
 	jmp	*%r11
 1:
 	pushq	%rdi
-	pushq	%rsi
-	pushq	%rbp
 	call	_glapi_get_dispatch
-	popq	%rbp
-	popq	%rsi
 	popq	%rdi
 	movq	6312(%rax), %r11
 	jmp	*%r11
@@ -30015,42 +30008,12 @@ GL_PREFIX(_dispatch_stub_789):
 	.size	GL_PREFIX(_dispatch_stub_789), .-GL_PREFIX(_dispatch_stub_789)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_790)
-	.type	GL_PREFIX(_dispatch_stub_790), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_790))
-GL_PREFIX(_dispatch_stub_790):
-#if defined(GLX_USE_TLS)
-	call	_x86_64_get_dispatch@PLT
-	movq	6320(%rax), %r11
-	jmp	*%r11
-#elif defined(PTHREADS)
-	pushq	%rdi
-	call	_x86_64_get_dispatch@PLT
-	popq	%rdi
-	movq	6320(%rax), %r11
-	jmp	*%r11
-#else
-	movq	_glapi_Dispatch(%rip), %rax
-	testq	%rax, %rax
-	je	1f
-	movq	6320(%rax), %r11
-	jmp	*%r11
-1:
-	pushq	%rdi
-	call	_glapi_get_dispatch
-	popq	%rdi
-	movq	6320(%rax), %r11
-	jmp	*%r11
-#endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_790), .-GL_PREFIX(_dispatch_stub_790)
-
-	.p2align	4,,15
 	.globl	GL_PREFIX(AreProgramsResidentNV)
 	.type	GL_PREFIX(AreProgramsResidentNV), @function
 GL_PREFIX(AreProgramsResidentNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6328(%rax), %r11
+	movq	6320(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30060,13 +30023,13 @@ GL_PREFIX(AreProgramsResidentNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6328(%rax), %r11
+	movq	6320(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6328(%rax), %r11
+	movq	6320(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30076,7 +30039,7 @@ GL_PREFIX(AreProgramsResidentNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6328(%rax), %r11
+	movq	6320(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(AreProgramsResidentNV), .-GL_PREFIX(AreProgramsResidentNV)
@@ -30087,7 +30050,7 @@ GL_PREFIX(AreProgramsResidentNV):
 GL_PREFIX(BindProgramNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6336(%rax), %r11
+	movq	6328(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30097,13 +30060,13 @@ GL_PREFIX(BindProgramNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6336(%rax), %r11
+	movq	6328(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6336(%rax), %r11
+	movq	6328(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30113,7 +30076,7 @@ GL_PREFIX(BindProgramNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6336(%rax), %r11
+	movq	6328(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindProgramNV), .-GL_PREFIX(BindProgramNV)
@@ -30124,7 +30087,7 @@ GL_PREFIX(BindProgramNV):
 GL_PREFIX(DeleteProgramsNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6344(%rax), %r11
+	movq	6336(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30134,13 +30097,13 @@ GL_PREFIX(DeleteProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6344(%rax), %r11
+	movq	6336(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6344(%rax), %r11
+	movq	6336(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30150,7 +30113,7 @@ GL_PREFIX(DeleteProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6344(%rax), %r11
+	movq	6336(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteProgramsNV), .-GL_PREFIX(DeleteProgramsNV)
@@ -30161,7 +30124,7 @@ GL_PREFIX(DeleteProgramsNV):
 GL_PREFIX(ExecuteProgramNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6352(%rax), %r11
+	movq	6344(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30171,13 +30134,13 @@ GL_PREFIX(ExecuteProgramNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6352(%rax), %r11
+	movq	6344(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6352(%rax), %r11
+	movq	6344(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30187,7 +30150,7 @@ GL_PREFIX(ExecuteProgramNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6352(%rax), %r11
+	movq	6344(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ExecuteProgramNV), .-GL_PREFIX(ExecuteProgramNV)
@@ -30198,7 +30161,7 @@ GL_PREFIX(ExecuteProgramNV):
 GL_PREFIX(GenProgramsNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6360(%rax), %r11
+	movq	6352(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30208,13 +30171,13 @@ GL_PREFIX(GenProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6360(%rax), %r11
+	movq	6352(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6360(%rax), %r11
+	movq	6352(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30224,7 +30187,7 @@ GL_PREFIX(GenProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6360(%rax), %r11
+	movq	6352(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenProgramsNV), .-GL_PREFIX(GenProgramsNV)
@@ -30235,7 +30198,7 @@ GL_PREFIX(GenProgramsNV):
 GL_PREFIX(GetProgramParameterdvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6368(%rax), %r11
+	movq	6360(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30249,13 +30212,13 @@ GL_PREFIX(GetProgramParameterdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6368(%rax), %r11
+	movq	6360(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6368(%rax), %r11
+	movq	6360(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30269,7 +30232,7 @@ GL_PREFIX(GetProgramParameterdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6368(%rax), %r11
+	movq	6360(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramParameterdvNV), .-GL_PREFIX(GetProgramParameterdvNV)
@@ -30280,7 +30243,7 @@ GL_PREFIX(GetProgramParameterdvNV):
 GL_PREFIX(GetProgramParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6376(%rax), %r11
+	movq	6368(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30294,13 +30257,13 @@ GL_PREFIX(GetProgramParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6376(%rax), %r11
+	movq	6368(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6376(%rax), %r11
+	movq	6368(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30314,7 +30277,7 @@ GL_PREFIX(GetProgramParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6376(%rax), %r11
+	movq	6368(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramParameterfvNV), .-GL_PREFIX(GetProgramParameterfvNV)
@@ -30325,7 +30288,7 @@ GL_PREFIX(GetProgramParameterfvNV):
 GL_PREFIX(GetProgramStringNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6384(%rax), %r11
+	movq	6376(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30335,13 +30298,13 @@ GL_PREFIX(GetProgramStringNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6384(%rax), %r11
+	movq	6376(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6384(%rax), %r11
+	movq	6376(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30351,7 +30314,7 @@ GL_PREFIX(GetProgramStringNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6384(%rax), %r11
+	movq	6376(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramStringNV), .-GL_PREFIX(GetProgramStringNV)
@@ -30362,7 +30325,7 @@ GL_PREFIX(GetProgramStringNV):
 GL_PREFIX(GetProgramivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6392(%rax), %r11
+	movq	6384(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30372,13 +30335,13 @@ GL_PREFIX(GetProgramivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6392(%rax), %r11
+	movq	6384(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6392(%rax), %r11
+	movq	6384(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30388,7 +30351,7 @@ GL_PREFIX(GetProgramivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6392(%rax), %r11
+	movq	6384(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramivNV), .-GL_PREFIX(GetProgramivNV)
@@ -30399,7 +30362,7 @@ GL_PREFIX(GetProgramivNV):
 GL_PREFIX(GetTrackMatrixivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6400(%rax), %r11
+	movq	6392(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30413,13 +30376,13 @@ GL_PREFIX(GetTrackMatrixivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6400(%rax), %r11
+	movq	6392(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6400(%rax), %r11
+	movq	6392(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30433,7 +30396,7 @@ GL_PREFIX(GetTrackMatrixivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6400(%rax), %r11
+	movq	6392(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetTrackMatrixivNV), .-GL_PREFIX(GetTrackMatrixivNV)
@@ -30444,7 +30407,7 @@ GL_PREFIX(GetTrackMatrixivNV):
 GL_PREFIX(GetVertexAttribPointervNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6408(%rax), %r11
+	movq	6400(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30454,13 +30417,13 @@ GL_PREFIX(GetVertexAttribPointervNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6408(%rax), %r11
+	movq	6400(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6408(%rax), %r11
+	movq	6400(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30470,7 +30433,7 @@ GL_PREFIX(GetVertexAttribPointervNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6408(%rax), %r11
+	movq	6400(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribPointervNV), .-GL_PREFIX(GetVertexAttribPointervNV)
@@ -30481,7 +30444,7 @@ GL_PREFIX(GetVertexAttribPointervNV):
 GL_PREFIX(GetVertexAttribdvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6416(%rax), %r11
+	movq	6408(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30491,13 +30454,13 @@ GL_PREFIX(GetVertexAttribdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6416(%rax), %r11
+	movq	6408(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6416(%rax), %r11
+	movq	6408(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30507,7 +30470,7 @@ GL_PREFIX(GetVertexAttribdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6416(%rax), %r11
+	movq	6408(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribdvNV), .-GL_PREFIX(GetVertexAttribdvNV)
@@ -30518,7 +30481,7 @@ GL_PREFIX(GetVertexAttribdvNV):
 GL_PREFIX(GetVertexAttribfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6424(%rax), %r11
+	movq	6416(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30528,13 +30491,13 @@ GL_PREFIX(GetVertexAttribfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6424(%rax), %r11
+	movq	6416(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6424(%rax), %r11
+	movq	6416(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30544,7 +30507,7 @@ GL_PREFIX(GetVertexAttribfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6424(%rax), %r11
+	movq	6416(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribfvNV), .-GL_PREFIX(GetVertexAttribfvNV)
@@ -30555,7 +30518,7 @@ GL_PREFIX(GetVertexAttribfvNV):
 GL_PREFIX(GetVertexAttribivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6432(%rax), %r11
+	movq	6424(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30565,13 +30528,13 @@ GL_PREFIX(GetVertexAttribivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6432(%rax), %r11
+	movq	6424(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6432(%rax), %r11
+	movq	6424(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30581,7 +30544,7 @@ GL_PREFIX(GetVertexAttribivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6432(%rax), %r11
+	movq	6424(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribivNV), .-GL_PREFIX(GetVertexAttribivNV)
@@ -30592,25 +30555,25 @@ GL_PREFIX(GetVertexAttribivNV):
 GL_PREFIX(IsProgramNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6440(%rax), %r11
+	movq	6432(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6440(%rax), %r11
+	movq	6432(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6440(%rax), %r11
+	movq	6432(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6440(%rax), %r11
+	movq	6432(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IsProgramNV), .-GL_PREFIX(IsProgramNV)
@@ -30621,7 +30584,7 @@ GL_PREFIX(IsProgramNV):
 GL_PREFIX(LoadProgramNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6448(%rax), %r11
+	movq	6440(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30635,13 +30598,13 @@ GL_PREFIX(LoadProgramNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6448(%rax), %r11
+	movq	6440(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6448(%rax), %r11
+	movq	6440(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30655,7 +30618,7 @@ GL_PREFIX(LoadProgramNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6448(%rax), %r11
+	movq	6440(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(LoadProgramNV), .-GL_PREFIX(LoadProgramNV)
@@ -30666,7 +30629,7 @@ GL_PREFIX(LoadProgramNV):
 GL_PREFIX(ProgramParameters4dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6456(%rax), %r11
+	movq	6448(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30680,13 +30643,13 @@ GL_PREFIX(ProgramParameters4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6456(%rax), %r11
+	movq	6448(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6456(%rax), %r11
+	movq	6448(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30700,7 +30663,7 @@ GL_PREFIX(ProgramParameters4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6456(%rax), %r11
+	movq	6448(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramParameters4dvNV), .-GL_PREFIX(ProgramParameters4dvNV)
@@ -30711,7 +30674,7 @@ GL_PREFIX(ProgramParameters4dvNV):
 GL_PREFIX(ProgramParameters4fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6464(%rax), %r11
+	movq	6456(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30725,13 +30688,13 @@ GL_PREFIX(ProgramParameters4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6464(%rax), %r11
+	movq	6456(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6464(%rax), %r11
+	movq	6456(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30745,7 +30708,7 @@ GL_PREFIX(ProgramParameters4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6464(%rax), %r11
+	movq	6456(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramParameters4fvNV), .-GL_PREFIX(ProgramParameters4fvNV)
@@ -30756,7 +30719,7 @@ GL_PREFIX(ProgramParameters4fvNV):
 GL_PREFIX(RequestResidentProgramsNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6472(%rax), %r11
+	movq	6464(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30766,13 +30729,13 @@ GL_PREFIX(RequestResidentProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6472(%rax), %r11
+	movq	6464(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6472(%rax), %r11
+	movq	6464(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30782,7 +30745,7 @@ GL_PREFIX(RequestResidentProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6472(%rax), %r11
+	movq	6464(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(RequestResidentProgramsNV), .-GL_PREFIX(RequestResidentProgramsNV)
@@ -30793,7 +30756,7 @@ GL_PREFIX(RequestResidentProgramsNV):
 GL_PREFIX(TrackMatrixNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6480(%rax), %r11
+	movq	6472(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30807,13 +30770,13 @@ GL_PREFIX(TrackMatrixNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6480(%rax), %r11
+	movq	6472(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6480(%rax), %r11
+	movq	6472(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30827,7 +30790,7 @@ GL_PREFIX(TrackMatrixNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6480(%rax), %r11
+	movq	6472(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TrackMatrixNV), .-GL_PREFIX(TrackMatrixNV)
@@ -30838,7 +30801,7 @@ GL_PREFIX(TrackMatrixNV):
 GL_PREFIX(VertexAttrib1dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6488(%rax), %r11
+	movq	6480(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -30848,13 +30811,13 @@ GL_PREFIX(VertexAttrib1dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	6488(%rax), %r11
+	movq	6480(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6488(%rax), %r11
+	movq	6480(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -30864,7 +30827,7 @@ GL_PREFIX(VertexAttrib1dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	6488(%rax), %r11
+	movq	6480(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1dNV), .-GL_PREFIX(VertexAttrib1dNV)
@@ -30875,7 +30838,7 @@ GL_PREFIX(VertexAttrib1dNV):
 GL_PREFIX(VertexAttrib1dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6496(%rax), %r11
+	movq	6488(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30885,13 +30848,13 @@ GL_PREFIX(VertexAttrib1dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6496(%rax), %r11
+	movq	6488(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6496(%rax), %r11
+	movq	6488(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30901,7 +30864,7 @@ GL_PREFIX(VertexAttrib1dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6496(%rax), %r11
+	movq	6488(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1dvNV), .-GL_PREFIX(VertexAttrib1dvNV)
@@ -30912,7 +30875,7 @@ GL_PREFIX(VertexAttrib1dvNV):
 GL_PREFIX(VertexAttrib1fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6504(%rax), %r11
+	movq	6496(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -30922,13 +30885,13 @@ GL_PREFIX(VertexAttrib1fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	6504(%rax), %r11
+	movq	6496(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6504(%rax), %r11
+	movq	6496(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -30938,7 +30901,7 @@ GL_PREFIX(VertexAttrib1fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	6504(%rax), %r11
+	movq	6496(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1fNV), .-GL_PREFIX(VertexAttrib1fNV)
@@ -30949,7 +30912,7 @@ GL_PREFIX(VertexAttrib1fNV):
 GL_PREFIX(VertexAttrib1fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6512(%rax), %r11
+	movq	6504(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30959,13 +30922,13 @@ GL_PREFIX(VertexAttrib1fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6512(%rax), %r11
+	movq	6504(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6512(%rax), %r11
+	movq	6504(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30975,7 +30938,7 @@ GL_PREFIX(VertexAttrib1fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6512(%rax), %r11
+	movq	6504(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1fvNV), .-GL_PREFIX(VertexAttrib1fvNV)
@@ -30986,7 +30949,7 @@ GL_PREFIX(VertexAttrib1fvNV):
 GL_PREFIX(VertexAttrib1sNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6520(%rax), %r11
+	movq	6512(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30996,13 +30959,13 @@ GL_PREFIX(VertexAttrib1sNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6520(%rax), %r11
+	movq	6512(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6520(%rax), %r11
+	movq	6512(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31012,7 +30975,7 @@ GL_PREFIX(VertexAttrib1sNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6520(%rax), %r11
+	movq	6512(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1sNV), .-GL_PREFIX(VertexAttrib1sNV)
@@ -31023,7 +30986,7 @@ GL_PREFIX(VertexAttrib1sNV):
 GL_PREFIX(VertexAttrib1svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6528(%rax), %r11
+	movq	6520(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31033,13 +30996,13 @@ GL_PREFIX(VertexAttrib1svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6528(%rax), %r11
+	movq	6520(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6528(%rax), %r11
+	movq	6520(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31049,7 +31012,7 @@ GL_PREFIX(VertexAttrib1svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6528(%rax), %r11
+	movq	6520(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1svNV), .-GL_PREFIX(VertexAttrib1svNV)
@@ -31060,7 +31023,7 @@ GL_PREFIX(VertexAttrib1svNV):
 GL_PREFIX(VertexAttrib2dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6536(%rax), %r11
+	movq	6528(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -31072,13 +31035,13 @@ GL_PREFIX(VertexAttrib2dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	6536(%rax), %r11
+	movq	6528(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6536(%rax), %r11
+	movq	6528(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -31090,7 +31053,7 @@ GL_PREFIX(VertexAttrib2dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	6536(%rax), %r11
+	movq	6528(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2dNV), .-GL_PREFIX(VertexAttrib2dNV)
@@ -31101,7 +31064,7 @@ GL_PREFIX(VertexAttrib2dNV):
 GL_PREFIX(VertexAttrib2dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6544(%rax), %r11
+	movq	6536(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31111,13 +31074,13 @@ GL_PREFIX(VertexAttrib2dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6544(%rax), %r11
+	movq	6536(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6544(%rax), %r11
+	movq	6536(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31127,7 +31090,7 @@ GL_PREFIX(VertexAttrib2dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6544(%rax), %r11
+	movq	6536(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2dvNV), .-GL_PREFIX(VertexAttrib2dvNV)
@@ -31138,7 +31101,7 @@ GL_PREFIX(VertexAttrib2dvNV):
 GL_PREFIX(VertexAttrib2fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6552(%rax), %r11
+	movq	6544(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -31150,13 +31113,13 @@ GL_PREFIX(VertexAttrib2fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	6552(%rax), %r11
+	movq	6544(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6552(%rax), %r11
+	movq	6544(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -31168,7 +31131,7 @@ GL_PREFIX(VertexAttrib2fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	6552(%rax), %r11
+	movq	6544(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2fNV), .-GL_PREFIX(VertexAttrib2fNV)
@@ -31179,7 +31142,7 @@ GL_PREFIX(VertexAttrib2fNV):
 GL_PREFIX(VertexAttrib2fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6560(%rax), %r11
+	movq	6552(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31189,13 +31152,13 @@ GL_PREFIX(VertexAttrib2fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6560(%rax), %r11
+	movq	6552(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6560(%rax), %r11
+	movq	6552(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31205,7 +31168,7 @@ GL_PREFIX(VertexAttrib2fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6560(%rax), %r11
+	movq	6552(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2fvNV), .-GL_PREFIX(VertexAttrib2fvNV)
@@ -31216,7 +31179,7 @@ GL_PREFIX(VertexAttrib2fvNV):
 GL_PREFIX(VertexAttrib2sNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6568(%rax), %r11
+	movq	6560(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31226,13 +31189,13 @@ GL_PREFIX(VertexAttrib2sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6568(%rax), %r11
+	movq	6560(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6568(%rax), %r11
+	movq	6560(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31242,7 +31205,7 @@ GL_PREFIX(VertexAttrib2sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6568(%rax), %r11
+	movq	6560(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2sNV), .-GL_PREFIX(VertexAttrib2sNV)
@@ -31253,7 +31216,7 @@ GL_PREFIX(VertexAttrib2sNV):
 GL_PREFIX(VertexAttrib2svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6576(%rax), %r11
+	movq	6568(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31263,13 +31226,13 @@ GL_PREFIX(VertexAttrib2svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6576(%rax), %r11
+	movq	6568(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6576(%rax), %r11
+	movq	6568(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31279,7 +31242,7 @@ GL_PREFIX(VertexAttrib2svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6576(%rax), %r11
+	movq	6568(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2svNV), .-GL_PREFIX(VertexAttrib2svNV)
@@ -31290,7 +31253,7 @@ GL_PREFIX(VertexAttrib2svNV):
 GL_PREFIX(VertexAttrib3dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6584(%rax), %r11
+	movq	6576(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -31304,13 +31267,13 @@ GL_PREFIX(VertexAttrib3dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	6584(%rax), %r11
+	movq	6576(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6584(%rax), %r11
+	movq	6576(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -31324,7 +31287,7 @@ GL_PREFIX(VertexAttrib3dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	6584(%rax), %r11
+	movq	6576(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3dNV), .-GL_PREFIX(VertexAttrib3dNV)
@@ -31335,7 +31298,7 @@ GL_PREFIX(VertexAttrib3dNV):
 GL_PREFIX(VertexAttrib3dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6592(%rax), %r11
+	movq	6584(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31345,13 +31308,13 @@ GL_PREFIX(VertexAttrib3dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6592(%rax), %r11
+	movq	6584(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6592(%rax), %r11
+	movq	6584(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31361,7 +31324,7 @@ GL_PREFIX(VertexAttrib3dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6592(%rax), %r11
+	movq	6584(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3dvNV), .-GL_PREFIX(VertexAttrib3dvNV)
@@ -31372,7 +31335,7 @@ GL_PREFIX(VertexAttrib3dvNV):
 GL_PREFIX(VertexAttrib3fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6600(%rax), %r11
+	movq	6592(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -31386,13 +31349,13 @@ GL_PREFIX(VertexAttrib3fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	6600(%rax), %r11
+	movq	6592(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6600(%rax), %r11
+	movq	6592(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -31406,7 +31369,7 @@ GL_PREFIX(VertexAttrib3fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	6600(%rax), %r11
+	movq	6592(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3fNV), .-GL_PREFIX(VertexAttrib3fNV)
@@ -31417,7 +31380,7 @@ GL_PREFIX(VertexAttrib3fNV):
 GL_PREFIX(VertexAttrib3fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6608(%rax), %r11
+	movq	6600(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31427,13 +31390,13 @@ GL_PREFIX(VertexAttrib3fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6608(%rax), %r11
+	movq	6600(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6608(%rax), %r11
+	movq	6600(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31443,7 +31406,7 @@ GL_PREFIX(VertexAttrib3fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6608(%rax), %r11
+	movq	6600(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3fvNV), .-GL_PREFIX(VertexAttrib3fvNV)
@@ -31454,7 +31417,7 @@ GL_PREFIX(VertexAttrib3fvNV):
 GL_PREFIX(VertexAttrib3sNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6616(%rax), %r11
+	movq	6608(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31468,13 +31431,13 @@ GL_PREFIX(VertexAttrib3sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6616(%rax), %r11
+	movq	6608(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6616(%rax), %r11
+	movq	6608(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31488,7 +31451,7 @@ GL_PREFIX(VertexAttrib3sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6616(%rax), %r11
+	movq	6608(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3sNV), .-GL_PREFIX(VertexAttrib3sNV)
@@ -31499,7 +31462,7 @@ GL_PREFIX(VertexAttrib3sNV):
 GL_PREFIX(VertexAttrib3svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6624(%rax), %r11
+	movq	6616(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31509,13 +31472,13 @@ GL_PREFIX(VertexAttrib3svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6624(%rax), %r11
+	movq	6616(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6624(%rax), %r11
+	movq	6616(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31525,7 +31488,7 @@ GL_PREFIX(VertexAttrib3svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6624(%rax), %r11
+	movq	6616(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3svNV), .-GL_PREFIX(VertexAttrib3svNV)
@@ -31536,7 +31499,7 @@ GL_PREFIX(VertexAttrib3svNV):
 GL_PREFIX(VertexAttrib4dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6632(%rax), %r11
+	movq	6624(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -31552,13 +31515,13 @@ GL_PREFIX(VertexAttrib4dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	6632(%rax), %r11
+	movq	6624(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6632(%rax), %r11
+	movq	6624(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -31574,7 +31537,7 @@ GL_PREFIX(VertexAttrib4dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	6632(%rax), %r11
+	movq	6624(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4dNV), .-GL_PREFIX(VertexAttrib4dNV)
@@ -31585,7 +31548,7 @@ GL_PREFIX(VertexAttrib4dNV):
 GL_PREFIX(VertexAttrib4dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6640(%rax), %r11
+	movq	6632(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31595,13 +31558,13 @@ GL_PREFIX(VertexAttrib4dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6640(%rax), %r11
+	movq	6632(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6640(%rax), %r11
+	movq	6632(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31611,7 +31574,7 @@ GL_PREFIX(VertexAttrib4dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6640(%rax), %r11
+	movq	6632(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4dvNV), .-GL_PREFIX(VertexAttrib4dvNV)
@@ -31622,7 +31585,7 @@ GL_PREFIX(VertexAttrib4dvNV):
 GL_PREFIX(VertexAttrib4fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6648(%rax), %r11
+	movq	6640(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -31638,13 +31601,13 @@ GL_PREFIX(VertexAttrib4fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	6648(%rax), %r11
+	movq	6640(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6648(%rax), %r11
+	movq	6640(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -31660,7 +31623,7 @@ GL_PREFIX(VertexAttrib4fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	6648(%rax), %r11
+	movq	6640(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4fNV), .-GL_PREFIX(VertexAttrib4fNV)
@@ -31671,7 +31634,7 @@ GL_PREFIX(VertexAttrib4fNV):
 GL_PREFIX(VertexAttrib4fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6656(%rax), %r11
+	movq	6648(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31681,13 +31644,13 @@ GL_PREFIX(VertexAttrib4fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6656(%rax), %r11
+	movq	6648(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6656(%rax), %r11
+	movq	6648(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31697,7 +31660,7 @@ GL_PREFIX(VertexAttrib4fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6656(%rax), %r11
+	movq	6648(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4fvNV), .-GL_PREFIX(VertexAttrib4fvNV)
@@ -31708,7 +31671,7 @@ GL_PREFIX(VertexAttrib4fvNV):
 GL_PREFIX(VertexAttrib4sNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6664(%rax), %r11
+	movq	6656(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31722,13 +31685,13 @@ GL_PREFIX(VertexAttrib4sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6664(%rax), %r11
+	movq	6656(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6664(%rax), %r11
+	movq	6656(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31742,7 +31705,7 @@ GL_PREFIX(VertexAttrib4sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6664(%rax), %r11
+	movq	6656(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4sNV), .-GL_PREFIX(VertexAttrib4sNV)
@@ -31753,7 +31716,7 @@ GL_PREFIX(VertexAttrib4sNV):
 GL_PREFIX(VertexAttrib4svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6672(%rax), %r11
+	movq	6664(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31763,13 +31726,13 @@ GL_PREFIX(VertexAttrib4svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6672(%rax), %r11
+	movq	6664(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6672(%rax), %r11
+	movq	6664(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31779,7 +31742,7 @@ GL_PREFIX(VertexAttrib4svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6672(%rax), %r11
+	movq	6664(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4svNV), .-GL_PREFIX(VertexAttrib4svNV)
@@ -31790,7 +31753,7 @@ GL_PREFIX(VertexAttrib4svNV):
 GL_PREFIX(VertexAttrib4ubNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6680(%rax), %r11
+	movq	6672(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31804,13 +31767,13 @@ GL_PREFIX(VertexAttrib4ubNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6680(%rax), %r11
+	movq	6672(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6680(%rax), %r11
+	movq	6672(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31824,7 +31787,7 @@ GL_PREFIX(VertexAttrib4ubNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6680(%rax), %r11
+	movq	6672(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4ubNV), .-GL_PREFIX(VertexAttrib4ubNV)
@@ -31835,7 +31798,7 @@ GL_PREFIX(VertexAttrib4ubNV):
 GL_PREFIX(VertexAttrib4ubvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6688(%rax), %r11
+	movq	6680(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31845,13 +31808,13 @@ GL_PREFIX(VertexAttrib4ubvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6688(%rax), %r11
+	movq	6680(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6688(%rax), %r11
+	movq	6680(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31861,7 +31824,7 @@ GL_PREFIX(VertexAttrib4ubvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6688(%rax), %r11
+	movq	6680(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4ubvNV), .-GL_PREFIX(VertexAttrib4ubvNV)
@@ -31872,7 +31835,7 @@ GL_PREFIX(VertexAttrib4ubvNV):
 GL_PREFIX(VertexAttribPointerNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6696(%rax), %r11
+	movq	6688(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31886,13 +31849,13 @@ GL_PREFIX(VertexAttribPointerNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6696(%rax), %r11
+	movq	6688(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6696(%rax), %r11
+	movq	6688(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31906,7 +31869,7 @@ GL_PREFIX(VertexAttribPointerNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6696(%rax), %r11
+	movq	6688(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribPointerNV), .-GL_PREFIX(VertexAttribPointerNV)
@@ -31917,7 +31880,7 @@ GL_PREFIX(VertexAttribPointerNV):
 GL_PREFIX(VertexAttribs1dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6704(%rax), %r11
+	movq	6696(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31927,13 +31890,13 @@ GL_PREFIX(VertexAttribs1dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6704(%rax), %r11
+	movq	6696(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6704(%rax), %r11
+	movq	6696(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31943,7 +31906,7 @@ GL_PREFIX(VertexAttribs1dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6704(%rax), %r11
+	movq	6696(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs1dvNV), .-GL_PREFIX(VertexAttribs1dvNV)
@@ -31954,7 +31917,7 @@ GL_PREFIX(VertexAttribs1dvNV):
 GL_PREFIX(VertexAttribs1fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6712(%rax), %r11
+	movq	6704(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31964,13 +31927,13 @@ GL_PREFIX(VertexAttribs1fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6712(%rax), %r11
+	movq	6704(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6712(%rax), %r11
+	movq	6704(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31980,7 +31943,7 @@ GL_PREFIX(VertexAttribs1fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6712(%rax), %r11
+	movq	6704(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs1fvNV), .-GL_PREFIX(VertexAttribs1fvNV)
@@ -31991,7 +31954,7 @@ GL_PREFIX(VertexAttribs1fvNV):
 GL_PREFIX(VertexAttribs1svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6720(%rax), %r11
+	movq	6712(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32001,13 +31964,13 @@ GL_PREFIX(VertexAttribs1svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6720(%rax), %r11
+	movq	6712(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6720(%rax), %r11
+	movq	6712(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32017,7 +31980,7 @@ GL_PREFIX(VertexAttribs1svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6720(%rax), %r11
+	movq	6712(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs1svNV), .-GL_PREFIX(VertexAttribs1svNV)
@@ -32028,7 +31991,7 @@ GL_PREFIX(VertexAttribs1svNV):
 GL_PREFIX(VertexAttribs2dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6728(%rax), %r11
+	movq	6720(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32038,13 +32001,13 @@ GL_PREFIX(VertexAttribs2dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6728(%rax), %r11
+	movq	6720(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6728(%rax), %r11
+	movq	6720(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32054,7 +32017,7 @@ GL_PREFIX(VertexAttribs2dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6728(%rax), %r11
+	movq	6720(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs2dvNV), .-GL_PREFIX(VertexAttribs2dvNV)
@@ -32065,7 +32028,7 @@ GL_PREFIX(VertexAttribs2dvNV):
 GL_PREFIX(VertexAttribs2fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6736(%rax), %r11
+	movq	6728(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32075,13 +32038,13 @@ GL_PREFIX(VertexAttribs2fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6736(%rax), %r11
+	movq	6728(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6736(%rax), %r11
+	movq	6728(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32091,7 +32054,7 @@ GL_PREFIX(VertexAttribs2fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6736(%rax), %r11
+	movq	6728(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs2fvNV), .-GL_PREFIX(VertexAttribs2fvNV)
@@ -32102,7 +32065,7 @@ GL_PREFIX(VertexAttribs2fvNV):
 GL_PREFIX(VertexAttribs2svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6744(%rax), %r11
+	movq	6736(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32112,13 +32075,13 @@ GL_PREFIX(VertexAttribs2svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6744(%rax), %r11
+	movq	6736(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6744(%rax), %r11
+	movq	6736(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32128,7 +32091,7 @@ GL_PREFIX(VertexAttribs2svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6744(%rax), %r11
+	movq	6736(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs2svNV), .-GL_PREFIX(VertexAttribs2svNV)
@@ -32139,7 +32102,7 @@ GL_PREFIX(VertexAttribs2svNV):
 GL_PREFIX(VertexAttribs3dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6752(%rax), %r11
+	movq	6744(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32149,13 +32112,13 @@ GL_PREFIX(VertexAttribs3dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6752(%rax), %r11
+	movq	6744(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6752(%rax), %r11
+	movq	6744(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32165,7 +32128,7 @@ GL_PREFIX(VertexAttribs3dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6752(%rax), %r11
+	movq	6744(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs3dvNV), .-GL_PREFIX(VertexAttribs3dvNV)
@@ -32176,7 +32139,7 @@ GL_PREFIX(VertexAttribs3dvNV):
 GL_PREFIX(VertexAttribs3fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6760(%rax), %r11
+	movq	6752(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32186,13 +32149,13 @@ GL_PREFIX(VertexAttribs3fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6760(%rax), %r11
+	movq	6752(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6760(%rax), %r11
+	movq	6752(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32202,7 +32165,7 @@ GL_PREFIX(VertexAttribs3fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6760(%rax), %r11
+	movq	6752(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs3fvNV), .-GL_PREFIX(VertexAttribs3fvNV)
@@ -32213,7 +32176,7 @@ GL_PREFIX(VertexAttribs3fvNV):
 GL_PREFIX(VertexAttribs3svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6768(%rax), %r11
+	movq	6760(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32223,13 +32186,13 @@ GL_PREFIX(VertexAttribs3svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6768(%rax), %r11
+	movq	6760(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6768(%rax), %r11
+	movq	6760(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32239,7 +32202,7 @@ GL_PREFIX(VertexAttribs3svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6768(%rax), %r11
+	movq	6760(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs3svNV), .-GL_PREFIX(VertexAttribs3svNV)
@@ -32250,7 +32213,7 @@ GL_PREFIX(VertexAttribs3svNV):
 GL_PREFIX(VertexAttribs4dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6776(%rax), %r11
+	movq	6768(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32260,13 +32223,13 @@ GL_PREFIX(VertexAttribs4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6776(%rax), %r11
+	movq	6768(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6776(%rax), %r11
+	movq	6768(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32276,7 +32239,7 @@ GL_PREFIX(VertexAttribs4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6776(%rax), %r11
+	movq	6768(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs4dvNV), .-GL_PREFIX(VertexAttribs4dvNV)
@@ -32287,7 +32250,7 @@ GL_PREFIX(VertexAttribs4dvNV):
 GL_PREFIX(VertexAttribs4fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6784(%rax), %r11
+	movq	6776(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32297,13 +32260,13 @@ GL_PREFIX(VertexAttribs4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6784(%rax), %r11
+	movq	6776(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6784(%rax), %r11
+	movq	6776(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32313,7 +32276,7 @@ GL_PREFIX(VertexAttribs4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6784(%rax), %r11
+	movq	6776(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs4fvNV), .-GL_PREFIX(VertexAttribs4fvNV)
@@ -32324,7 +32287,7 @@ GL_PREFIX(VertexAttribs4fvNV):
 GL_PREFIX(VertexAttribs4svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6792(%rax), %r11
+	movq	6784(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32334,13 +32297,13 @@ GL_PREFIX(VertexAttribs4svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6792(%rax), %r11
+	movq	6784(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6792(%rax), %r11
+	movq	6784(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32350,7 +32313,7 @@ GL_PREFIX(VertexAttribs4svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6792(%rax), %r11
+	movq	6784(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs4svNV), .-GL_PREFIX(VertexAttribs4svNV)
@@ -32361,7 +32324,7 @@ GL_PREFIX(VertexAttribs4svNV):
 GL_PREFIX(VertexAttribs4ubvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6800(%rax), %r11
+	movq	6792(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32371,13 +32334,13 @@ GL_PREFIX(VertexAttribs4ubvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6800(%rax), %r11
+	movq	6792(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6800(%rax), %r11
+	movq	6792(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32387,7 +32350,7 @@ GL_PREFIX(VertexAttribs4ubvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6800(%rax), %r11
+	movq	6792(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs4ubvNV), .-GL_PREFIX(VertexAttribs4ubvNV)
@@ -32398,7 +32361,7 @@ GL_PREFIX(VertexAttribs4ubvNV):
 GL_PREFIX(GetTexBumpParameterfvATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6808(%rax), %r11
+	movq	6800(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32408,13 +32371,13 @@ GL_PREFIX(GetTexBumpParameterfvATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6808(%rax), %r11
+	movq	6800(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6808(%rax), %r11
+	movq	6800(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32424,7 +32387,7 @@ GL_PREFIX(GetTexBumpParameterfvATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6808(%rax), %r11
+	movq	6800(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetTexBumpParameterfvATI), .-GL_PREFIX(GetTexBumpParameterfvATI)
@@ -32435,7 +32398,7 @@ GL_PREFIX(GetTexBumpParameterfvATI):
 GL_PREFIX(GetTexBumpParameterivATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6816(%rax), %r11
+	movq	6808(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32445,13 +32408,13 @@ GL_PREFIX(GetTexBumpParameterivATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6816(%rax), %r11
+	movq	6808(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6816(%rax), %r11
+	movq	6808(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32461,7 +32424,7 @@ GL_PREFIX(GetTexBumpParameterivATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6816(%rax), %r11
+	movq	6808(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetTexBumpParameterivATI), .-GL_PREFIX(GetTexBumpParameterivATI)
@@ -32472,7 +32435,7 @@ GL_PREFIX(GetTexBumpParameterivATI):
 GL_PREFIX(TexBumpParameterfvATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6824(%rax), %r11
+	movq	6816(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32482,13 +32445,13 @@ GL_PREFIX(TexBumpParameterfvATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6824(%rax), %r11
+	movq	6816(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6824(%rax), %r11
+	movq	6816(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32498,7 +32461,7 @@ GL_PREFIX(TexBumpParameterfvATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6824(%rax), %r11
+	movq	6816(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexBumpParameterfvATI), .-GL_PREFIX(TexBumpParameterfvATI)
@@ -32509,7 +32472,7 @@ GL_PREFIX(TexBumpParameterfvATI):
 GL_PREFIX(TexBumpParameterivATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6832(%rax), %r11
+	movq	6824(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32519,13 +32482,13 @@ GL_PREFIX(TexBumpParameterivATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6832(%rax), %r11
+	movq	6824(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6832(%rax), %r11
+	movq	6824(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32535,7 +32498,7 @@ GL_PREFIX(TexBumpParameterivATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6832(%rax), %r11
+	movq	6824(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexBumpParameterivATI), .-GL_PREFIX(TexBumpParameterivATI)
@@ -32546,7 +32509,7 @@ GL_PREFIX(TexBumpParameterivATI):
 GL_PREFIX(AlphaFragmentOp1ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6840(%rax), %r11
+	movq	6832(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32564,13 +32527,13 @@ GL_PREFIX(AlphaFragmentOp1ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6840(%rax), %r11
+	movq	6832(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6840(%rax), %r11
+	movq	6832(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32588,7 +32551,7 @@ GL_PREFIX(AlphaFragmentOp1ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6840(%rax), %r11
+	movq	6832(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(AlphaFragmentOp1ATI), .-GL_PREFIX(AlphaFragmentOp1ATI)
@@ -32599,7 +32562,7 @@ GL_PREFIX(AlphaFragmentOp1ATI):
 GL_PREFIX(AlphaFragmentOp2ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6848(%rax), %r11
+	movq	6840(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32617,13 +32580,13 @@ GL_PREFIX(AlphaFragmentOp2ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6848(%rax), %r11
+	movq	6840(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6848(%rax), %r11
+	movq	6840(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32641,7 +32604,7 @@ GL_PREFIX(AlphaFragmentOp2ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6848(%rax), %r11
+	movq	6840(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(AlphaFragmentOp2ATI), .-GL_PREFIX(AlphaFragmentOp2ATI)
@@ -32652,7 +32615,7 @@ GL_PREFIX(AlphaFragmentOp2ATI):
 GL_PREFIX(AlphaFragmentOp3ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6856(%rax), %r11
+	movq	6848(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32670,13 +32633,13 @@ GL_PREFIX(AlphaFragmentOp3ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6856(%rax), %r11
+	movq	6848(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6856(%rax), %r11
+	movq	6848(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32694,7 +32657,7 @@ GL_PREFIX(AlphaFragmentOp3ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6856(%rax), %r11
+	movq	6848(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(AlphaFragmentOp3ATI), .-GL_PREFIX(AlphaFragmentOp3ATI)
@@ -32705,25 +32668,25 @@ GL_PREFIX(AlphaFragmentOp3ATI):
 GL_PREFIX(BeginFragmentShaderATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6864(%rax), %r11
+	movq	6856(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	6864(%rax), %r11
+	movq	6856(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6864(%rax), %r11
+	movq	6856(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	6864(%rax), %r11
+	movq	6856(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BeginFragmentShaderATI), .-GL_PREFIX(BeginFragmentShaderATI)
@@ -32734,25 +32697,25 @@ GL_PREFIX(BeginFragmentShaderATI):
 GL_PREFIX(BindFragmentShaderATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6872(%rax), %r11
+	movq	6864(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6872(%rax), %r11
+	movq	6864(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6872(%rax), %r11
+	movq	6864(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6872(%rax), %r11
+	movq	6864(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindFragmentShaderATI), .-GL_PREFIX(BindFragmentShaderATI)
@@ -32763,7 +32726,7 @@ GL_PREFIX(BindFragmentShaderATI):
 GL_PREFIX(ColorFragmentOp1ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6880(%rax), %r11
+	movq	6872(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32781,13 +32744,13 @@ GL_PREFIX(ColorFragmentOp1ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6880(%rax), %r11
+	movq	6872(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6880(%rax), %r11
+	movq	6872(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32805,7 +32768,7 @@ GL_PREFIX(ColorFragmentOp1ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6880(%rax), %r11
+	movq	6872(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorFragmentOp1ATI), .-GL_PREFIX(ColorFragmentOp1ATI)
@@ -32816,7 +32779,7 @@ GL_PREFIX(ColorFragmentOp1ATI):
 GL_PREFIX(ColorFragmentOp2ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6888(%rax), %r11
+	movq	6880(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32834,13 +32797,13 @@ GL_PREFIX(ColorFragmentOp2ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6888(%rax), %r11
+	movq	6880(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6888(%rax), %r11
+	movq	6880(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32858,7 +32821,7 @@ GL_PREFIX(ColorFragmentOp2ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6888(%rax), %r11
+	movq	6880(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorFragmentOp2ATI), .-GL_PREFIX(ColorFragmentOp2ATI)
@@ -32869,7 +32832,7 @@ GL_PREFIX(ColorFragmentOp2ATI):
 GL_PREFIX(ColorFragmentOp3ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6896(%rax), %r11
+	movq	6888(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32887,13 +32850,13 @@ GL_PREFIX(ColorFragmentOp3ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6896(%rax), %r11
+	movq	6888(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6896(%rax), %r11
+	movq	6888(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32911,7 +32874,7 @@ GL_PREFIX(ColorFragmentOp3ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6896(%rax), %r11
+	movq	6888(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorFragmentOp3ATI), .-GL_PREFIX(ColorFragmentOp3ATI)
@@ -32922,25 +32885,25 @@ GL_PREFIX(ColorFragmentOp3ATI):
 GL_PREFIX(DeleteFragmentShaderATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6904(%rax), %r11
+	movq	6896(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6904(%rax), %r11
+	movq	6896(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6904(%rax), %r11
+	movq	6896(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6904(%rax), %r11
+	movq	6896(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteFragmentShaderATI), .-GL_PREFIX(DeleteFragmentShaderATI)
@@ -32951,25 +32914,25 @@ GL_PREFIX(DeleteFragmentShaderATI):
 GL_PREFIX(EndFragmentShaderATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6912(%rax), %r11
+	movq	6904(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	6912(%rax), %r11
+	movq	6904(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6912(%rax), %r11
+	movq	6904(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	6912(%rax), %r11
+	movq	6904(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(EndFragmentShaderATI), .-GL_PREFIX(EndFragmentShaderATI)
@@ -32980,25 +32943,25 @@ GL_PREFIX(EndFragmentShaderATI):
 GL_PREFIX(GenFragmentShadersATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6920(%rax), %r11
+	movq	6912(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6920(%rax), %r11
+	movq	6912(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6920(%rax), %r11
+	movq	6912(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6920(%rax), %r11
+	movq	6912(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenFragmentShadersATI), .-GL_PREFIX(GenFragmentShadersATI)
@@ -33009,7 +32972,7 @@ GL_PREFIX(GenFragmentShadersATI):
 GL_PREFIX(PassTexCoordATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6928(%rax), %r11
+	movq	6920(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33019,13 +32982,13 @@ GL_PREFIX(PassTexCoordATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6928(%rax), %r11
+	movq	6920(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6928(%rax), %r11
+	movq	6920(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33035,7 +32998,7 @@ GL_PREFIX(PassTexCoordATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6928(%rax), %r11
+	movq	6920(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PassTexCoordATI), .-GL_PREFIX(PassTexCoordATI)
@@ -33046,7 +33009,7 @@ GL_PREFIX(PassTexCoordATI):
 GL_PREFIX(SampleMapATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6936(%rax), %r11
+	movq	6928(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33056,13 +33019,13 @@ GL_PREFIX(SampleMapATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6936(%rax), %r11
+	movq	6928(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6936(%rax), %r11
+	movq	6928(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33072,7 +33035,7 @@ GL_PREFIX(SampleMapATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6936(%rax), %r11
+	movq	6928(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SampleMapATI), .-GL_PREFIX(SampleMapATI)
@@ -33083,7 +33046,7 @@ GL_PREFIX(SampleMapATI):
 GL_PREFIX(SetFragmentShaderConstantATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6944(%rax), %r11
+	movq	6936(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33093,13 +33056,13 @@ GL_PREFIX(SetFragmentShaderConstantATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6944(%rax), %r11
+	movq	6936(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6944(%rax), %r11
+	movq	6936(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33109,7 +33072,7 @@ GL_PREFIX(SetFragmentShaderConstantATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6944(%rax), %r11
+	movq	6936(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SetFragmentShaderConstantATI), .-GL_PREFIX(SetFragmentShaderConstantATI)
@@ -33120,7 +33083,7 @@ GL_PREFIX(SetFragmentShaderConstantATI):
 GL_PREFIX(PointParameteriNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6952(%rax), %r11
+	movq	6944(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33130,13 +33093,13 @@ GL_PREFIX(PointParameteriNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6952(%rax), %r11
+	movq	6944(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6952(%rax), %r11
+	movq	6944(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33146,7 +33109,7 @@ GL_PREFIX(PointParameteriNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6952(%rax), %r11
+	movq	6944(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PointParameteriNV), .-GL_PREFIX(PointParameteriNV)
@@ -33157,7 +33120,7 @@ GL_PREFIX(PointParameteriNV):
 GL_PREFIX(PointParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6960(%rax), %r11
+	movq	6952(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33167,13 +33130,13 @@ GL_PREFIX(PointParameterivNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6960(%rax), %r11
+	movq	6952(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6960(%rax), %r11
+	movq	6952(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33183,12 +33146,42 @@ GL_PREFIX(PointParameterivNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6960(%rax), %r11
+	movq	6952(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PointParameterivNV), .-GL_PREFIX(PointParameterivNV)
 
 	.p2align	4,,15
+	.globl	GL_PREFIX(_dispatch_stub_870)
+	.type	GL_PREFIX(_dispatch_stub_870), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_870))
+GL_PREFIX(_dispatch_stub_870):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	6960(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rdi
+	call	_x86_64_get_dispatch@PLT
+	popq	%rdi
+	movq	6960(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	6960(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	call	_glapi_get_dispatch
+	popq	%rdi
+	movq	6960(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(_dispatch_stub_870), .-GL_PREFIX(_dispatch_stub_870)
+
+	.p2align	4,,15
 	.globl	GL_PREFIX(_dispatch_stub_871)
 	.type	GL_PREFIX(_dispatch_stub_871), @function
 	HIDDEN(GL_PREFIX(_dispatch_stub_871))
@@ -33229,7 +33222,11 @@ GL_PREFIX(_dispatch_stub_872):
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
+	popq	%rbp
+	popq	%rsi
 	popq	%rdi
 	movq	6976(%rax), %r11
 	jmp	*%r11
@@ -33241,7 +33238,11 @@ GL_PREFIX(_dispatch_stub_872):
 	jmp	*%r11
 1:
 	pushq	%rdi
+	pushq	%rsi
+	pushq	%rbp
 	call	_glapi_get_dispatch
+	popq	%rbp
+	popq	%rsi
 	popq	%rdi
 	movq	6976(%rax), %r11
 	jmp	*%r11
@@ -33297,11 +33298,7 @@ GL_PREFIX(_dispatch_stub_874):
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
-	pushq	%rsi
-	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
-	popq	%rbp
-	popq	%rsi
 	popq	%rdi
 	movq	6992(%rax), %r11
 	jmp	*%r11
@@ -33313,11 +33310,7 @@ GL_PREFIX(_dispatch_stub_874):
 	jmp	*%r11
 1:
 	pushq	%rdi
-	pushq	%rsi
-	pushq	%rbp
 	call	_glapi_get_dispatch
-	popq	%rbp
-	popq	%rsi
 	popq	%rdi
 	movq	6992(%rax), %r11
 	jmp	*%r11
@@ -33325,42 +33318,12 @@ GL_PREFIX(_dispatch_stub_874):
 	.size	GL_PREFIX(_dispatch_stub_874), .-GL_PREFIX(_dispatch_stub_874)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_875)
-	.type	GL_PREFIX(_dispatch_stub_875), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_875))
-GL_PREFIX(_dispatch_stub_875):
-#if defined(GLX_USE_TLS)
-	call	_x86_64_get_dispatch@PLT
-	movq	7000(%rax), %r11
-	jmp	*%r11
-#elif defined(PTHREADS)
-	pushq	%rdi
-	call	_x86_64_get_dispatch@PLT
-	popq	%rdi
-	movq	7000(%rax), %r11
-	jmp	*%r11
-#else
-	movq	_glapi_Dispatch(%rip), %rax
-	testq	%rax, %rax
-	je	1f
-	movq	7000(%rax), %r11
-	jmp	*%r11
-1:
-	pushq	%rdi
-	call	_glapi_get_dispatch
-	popq	%rdi
-	movq	7000(%rax), %r11
-	jmp	*%r11
-#endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_875), .-GL_PREFIX(_dispatch_stub_875)
-
-	.p2align	4,,15
 	.globl	GL_PREFIX(GetProgramNamedParameterdvNV)
 	.type	GL_PREFIX(GetProgramNamedParameterdvNV), @function
 GL_PREFIX(GetProgramNamedParameterdvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7008(%rax), %r11
+	movq	7000(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33374,13 +33337,13 @@ GL_PREFIX(GetProgramNamedParameterdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7008(%rax), %r11
+	movq	7000(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7008(%rax), %r11
+	movq	7000(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33394,7 +33357,7 @@ GL_PREFIX(GetProgramNamedParameterdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7008(%rax), %r11
+	movq	7000(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramNamedParameterdvNV), .-GL_PREFIX(GetProgramNamedParameterdvNV)
@@ -33405,7 +33368,7 @@ GL_PREFIX(GetProgramNamedParameterdvNV):
 GL_PREFIX(GetProgramNamedParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7016(%rax), %r11
+	movq	7008(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33419,13 +33382,13 @@ GL_PREFIX(GetProgramNamedParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7016(%rax), %r11
+	movq	7008(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7016(%rax), %r11
+	movq	7008(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33439,7 +33402,7 @@ GL_PREFIX(GetProgramNamedParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7016(%rax), %r11
+	movq	7008(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramNamedParameterfvNV), .-GL_PREFIX(GetProgramNamedParameterfvNV)
@@ -33450,7 +33413,7 @@ GL_PREFIX(GetProgramNamedParameterfvNV):
 GL_PREFIX(ProgramNamedParameter4dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7024(%rax), %r11
+	movq	7016(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$56, %rsp
@@ -33470,13 +33433,13 @@ GL_PREFIX(ProgramNamedParameter4dNV):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	7024(%rax), %r11
+	movq	7016(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7024(%rax), %r11
+	movq	7016(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$56, %rsp
@@ -33496,7 +33459,7 @@ GL_PREFIX(ProgramNamedParameter4dNV):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	7024(%rax), %r11
+	movq	7016(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramNamedParameter4dNV), .-GL_PREFIX(ProgramNamedParameter4dNV)
@@ -33507,7 +33470,7 @@ GL_PREFIX(ProgramNamedParameter4dNV):
 GL_PREFIX(ProgramNamedParameter4dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7032(%rax), %r11
+	movq	7024(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33521,13 +33484,13 @@ GL_PREFIX(ProgramNamedParameter4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7032(%rax), %r11
+	movq	7024(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7032(%rax), %r11
+	movq	7024(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33541,7 +33504,7 @@ GL_PREFIX(ProgramNamedParameter4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7032(%rax), %r11
+	movq	7024(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramNamedParameter4dvNV), .-GL_PREFIX(ProgramNamedParameter4dvNV)
@@ -33552,7 +33515,7 @@ GL_PREFIX(ProgramNamedParameter4dvNV):
 GL_PREFIX(ProgramNamedParameter4fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7040(%rax), %r11
+	movq	7032(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$56, %rsp
@@ -33572,13 +33535,13 @@ GL_PREFIX(ProgramNamedParameter4fNV):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	7040(%rax), %r11
+	movq	7032(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7040(%rax), %r11
+	movq	7032(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$56, %rsp
@@ -33598,7 +33561,7 @@ GL_PREFIX(ProgramNamedParameter4fNV):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	7040(%rax), %r11
+	movq	7032(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramNamedParameter4fNV), .-GL_PREFIX(ProgramNamedParameter4fNV)
@@ -33609,7 +33572,7 @@ GL_PREFIX(ProgramNamedParameter4fNV):
 GL_PREFIX(ProgramNamedParameter4fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7048(%rax), %r11
+	movq	7040(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33623,13 +33586,13 @@ GL_PREFIX(ProgramNamedParameter4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7048(%rax), %r11
+	movq	7040(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7048(%rax), %r11
+	movq	7040(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33643,7 +33606,7 @@ GL_PREFIX(ProgramNamedParameter4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7048(%rax), %r11
+	movq	7040(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramNamedParameter4fvNV), .-GL_PREFIX(ProgramNamedParameter4fvNV)
@@ -33654,25 +33617,25 @@ GL_PREFIX(ProgramNamedParameter4fvNV):
 GL_PREFIX(PrimitiveRestartIndexNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7056(%rax), %r11
+	movq	7048(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	7056(%rax), %r11
+	movq	7048(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7056(%rax), %r11
+	movq	7048(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	7056(%rax), %r11
+	movq	7048(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PrimitiveRestartIndexNV), .-GL_PREFIX(PrimitiveRestartIndexNV)
@@ -33683,37 +33646,37 @@ GL_PREFIX(PrimitiveRestartIndexNV):
 GL_PREFIX(PrimitiveRestartNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7064(%rax), %r11
+	movq	7056(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	7064(%rax), %r11
+	movq	7056(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7064(%rax), %r11
+	movq	7056(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	7064(%rax), %r11
+	movq	7056(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PrimitiveRestartNV), .-GL_PREFIX(PrimitiveRestartNV)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_884)
-	.type	GL_PREFIX(_dispatch_stub_884), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_884))
-GL_PREFIX(_dispatch_stub_884):
+	.globl	GL_PREFIX(_dispatch_stub_883)
+	.type	GL_PREFIX(_dispatch_stub_883), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_883))
+GL_PREFIX(_dispatch_stub_883):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7072(%rax), %r11
+	movq	7064(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33723,13 +33686,13 @@ GL_PREFIX(_dispatch_stub_884):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7072(%rax), %r11
+	movq	7064(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7072(%rax), %r11
+	movq	7064(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33739,19 +33702,19 @@ GL_PREFIX(_dispatch_stub_884):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7072(%rax), %r11
+	movq	7064(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_884), .-GL_PREFIX(_dispatch_stub_884)
+	.size	GL_PREFIX(_dispatch_stub_883), .-GL_PREFIX(_dispatch_stub_883)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_885)
-	.type	GL_PREFIX(_dispatch_stub_885), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_885))
-GL_PREFIX(_dispatch_stub_885):
+	.globl	GL_PREFIX(_dispatch_stub_884)
+	.type	GL_PREFIX(_dispatch_stub_884), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_884))
+GL_PREFIX(_dispatch_stub_884):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7080(%rax), %r11
+	movq	7072(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33761,13 +33724,13 @@ GL_PREFIX(_dispatch_stub_885):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7080(%rax), %r11
+	movq	7072(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7080(%rax), %r11
+	movq	7072(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33777,10 +33740,10 @@ GL_PREFIX(_dispatch_stub_885):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7080(%rax), %r11
+	movq	7072(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_885), .-GL_PREFIX(_dispatch_stub_885)
+	.size	GL_PREFIX(_dispatch_stub_884), .-GL_PREFIX(_dispatch_stub_884)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(BindFramebufferEXT)
@@ -33788,7 +33751,7 @@ GL_PREFIX(_dispatch_stub_885):
 GL_PREFIX(BindFramebufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7088(%rax), %r11
+	movq	7080(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33798,13 +33761,13 @@ GL_PREFIX(BindFramebufferEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7088(%rax), %r11
+	movq	7080(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7088(%rax), %r11
+	movq	7080(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33814,7 +33777,7 @@ GL_PREFIX(BindFramebufferEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7088(%rax), %r11
+	movq	7080(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindFramebufferEXT), .-GL_PREFIX(BindFramebufferEXT)
@@ -33825,7 +33788,7 @@ GL_PREFIX(BindFramebufferEXT):
 GL_PREFIX(BindRenderbufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7096(%rax), %r11
+	movq	7088(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33835,13 +33798,13 @@ GL_PREFIX(BindRenderbufferEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7096(%rax), %r11
+	movq	7088(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7096(%rax), %r11
+	movq	7088(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33851,7 +33814,7 @@ GL_PREFIX(BindRenderbufferEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7096(%rax), %r11
+	movq	7088(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindRenderbufferEXT), .-GL_PREFIX(BindRenderbufferEXT)
@@ -33862,25 +33825,25 @@ GL_PREFIX(BindRenderbufferEXT):
 GL_PREFIX(CheckFramebufferStatusEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7104(%rax), %r11
+	movq	7096(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	7104(%rax), %r11
+	movq	7096(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7104(%rax), %r11
+	movq	7096(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	7104(%rax), %r11
+	movq	7096(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CheckFramebufferStatusEXT), .-GL_PREFIX(CheckFramebufferStatusEXT)
@@ -33891,7 +33854,7 @@ GL_PREFIX(CheckFramebufferStatusEXT):
 GL_PREFIX(DeleteFramebuffersEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7112(%rax), %r11
+	movq	7104(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33901,13 +33864,13 @@ GL_PREFIX(DeleteFramebuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7112(%rax), %r11
+	movq	7104(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7112(%rax), %r11
+	movq	7104(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33917,7 +33880,7 @@ GL_PREFIX(DeleteFramebuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7112(%rax), %r11
+	movq	7104(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteFramebuffersEXT), .-GL_PREFIX(DeleteFramebuffersEXT)
@@ -33928,7 +33891,7 @@ GL_PREFIX(DeleteFramebuffersEXT):
 GL_PREFIX(DeleteRenderbuffersEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7120(%rax), %r11
+	movq	7112(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33938,13 +33901,13 @@ GL_PREFIX(DeleteRenderbuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7120(%rax), %r11
+	movq	7112(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7120(%rax), %r11
+	movq	7112(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33954,7 +33917,7 @@ GL_PREFIX(DeleteRenderbuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7120(%rax), %r11
+	movq	7112(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteRenderbuffersEXT), .-GL_PREFIX(DeleteRenderbuffersEXT)
@@ -33965,7 +33928,7 @@ GL_PREFIX(DeleteRenderbuffersEXT):
 GL_PREFIX(FramebufferRenderbufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7128(%rax), %r11
+	movq	7120(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33979,13 +33942,13 @@ GL_PREFIX(FramebufferRenderbufferEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7128(%rax), %r11
+	movq	7120(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7128(%rax), %r11
+	movq	7120(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33999,7 +33962,7 @@ GL_PREFIX(FramebufferRenderbufferEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7128(%rax), %r11
+	movq	7120(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferRenderbufferEXT), .-GL_PREFIX(FramebufferRenderbufferEXT)
@@ -34010,7 +33973,7 @@ GL_PREFIX(FramebufferRenderbufferEXT):
 GL_PREFIX(FramebufferTexture1DEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7136(%rax), %r11
+	movq	7128(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34024,13 +33987,13 @@ GL_PREFIX(FramebufferTexture1DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7136(%rax), %r11
+	movq	7128(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7136(%rax), %r11
+	movq	7128(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34044,7 +34007,7 @@ GL_PREFIX(FramebufferTexture1DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7136(%rax), %r11
+	movq	7128(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTexture1DEXT), .-GL_PREFIX(FramebufferTexture1DEXT)
@@ -34055,7 +34018,7 @@ GL_PREFIX(FramebufferTexture1DEXT):
 GL_PREFIX(FramebufferTexture2DEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7144(%rax), %r11
+	movq	7136(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34069,13 +34032,13 @@ GL_PREFIX(FramebufferTexture2DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7144(%rax), %r11
+	movq	7136(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7144(%rax), %r11
+	movq	7136(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34089,7 +34052,7 @@ GL_PREFIX(FramebufferTexture2DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7144(%rax), %r11
+	movq	7136(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTexture2DEXT), .-GL_PREFIX(FramebufferTexture2DEXT)
@@ -34100,7 +34063,7 @@ GL_PREFIX(FramebufferTexture2DEXT):
 GL_PREFIX(FramebufferTexture3DEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7152(%rax), %r11
+	movq	7144(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34118,13 +34081,13 @@ GL_PREFIX(FramebufferTexture3DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7152(%rax), %r11
+	movq	7144(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7152(%rax), %r11
+	movq	7144(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34142,7 +34105,7 @@ GL_PREFIX(FramebufferTexture3DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7152(%rax), %r11
+	movq	7144(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTexture3DEXT), .-GL_PREFIX(FramebufferTexture3DEXT)
@@ -34153,7 +34116,7 @@ GL_PREFIX(FramebufferTexture3DEXT):
 GL_PREFIX(GenFramebuffersEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7160(%rax), %r11
+	movq	7152(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34163,13 +34126,13 @@ GL_PREFIX(GenFramebuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7160(%rax), %r11
+	movq	7152(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7160(%rax), %r11
+	movq	7152(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34179,7 +34142,7 @@ GL_PREFIX(GenFramebuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7160(%rax), %r11
+	movq	7152(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenFramebuffersEXT), .-GL_PREFIX(GenFramebuffersEXT)
@@ -34190,7 +34153,7 @@ GL_PREFIX(GenFramebuffersEXT):
 GL_PREFIX(GenRenderbuffersEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7168(%rax), %r11
+	movq	7160(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34200,13 +34163,13 @@ GL_PREFIX(GenRenderbuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7168(%rax), %r11
+	movq	7160(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7168(%rax), %r11
+	movq	7160(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34216,7 +34179,7 @@ GL_PREFIX(GenRenderbuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7168(%rax), %r11
+	movq	7160(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenRenderbuffersEXT), .-GL_PREFIX(GenRenderbuffersEXT)
@@ -34227,25 +34190,25 @@ GL_PREFIX(GenRenderbuffersEXT):
 GL_PREFIX(GenerateMipmapEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7176(%rax), %r11
+	movq	7168(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	7176(%rax), %r11
+	movq	7168(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7176(%rax), %r11
+	movq	7168(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	7176(%rax), %r11
+	movq	7168(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenerateMipmapEXT), .-GL_PREFIX(GenerateMipmapEXT)
@@ -34256,7 +34219,7 @@ GL_PREFIX(GenerateMipmapEXT):
 GL_PREFIX(GetFramebufferAttachmentParameterivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7184(%rax), %r11
+	movq	7176(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34270,13 +34233,13 @@ GL_PREFIX(GetFramebufferAttachmentParameterivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7184(%rax), %r11
+	movq	7176(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7184(%rax), %r11
+	movq	7176(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34290,7 +34253,7 @@ GL_PREFIX(GetFramebufferAttachmentParameterivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7184(%rax), %r11
+	movq	7176(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetFramebufferAttachmentParameterivEXT), .-GL_PREFIX(GetFramebufferAttachmentParameterivEXT)
@@ -34301,7 +34264,7 @@ GL_PREFIX(GetFramebufferAttachmentParameterivEXT):
 GL_PREFIX(GetRenderbufferParameterivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7192(%rax), %r11
+	movq	7184(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34311,13 +34274,13 @@ GL_PREFIX(GetRenderbufferParameterivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7192(%rax), %r11
+	movq	7184(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7192(%rax), %r11
+	movq	7184(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34327,7 +34290,7 @@ GL_PREFIX(GetRenderbufferParameterivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7192(%rax), %r11
+	movq	7184(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetRenderbufferParameterivEXT), .-GL_PREFIX(GetRenderbufferParameterivEXT)
@@ -34338,25 +34301,25 @@ GL_PREFIX(GetRenderbufferParameterivEXT):
 GL_PREFIX(IsFramebufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7200(%rax), %r11
+	movq	7192(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	7200(%rax), %r11
+	movq	7192(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7200(%rax), %r11
+	movq	7192(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	7200(%rax), %r11
+	movq	7192(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IsFramebufferEXT), .-GL_PREFIX(IsFramebufferEXT)
@@ -34367,25 +34330,25 @@ GL_PREFIX(IsFramebufferEXT):
 GL_PREFIX(IsRenderbufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7208(%rax), %r11
+	movq	7200(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	7208(%rax), %r11
+	movq	7200(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7208(%rax), %r11
+	movq	7200(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	7208(%rax), %r11
+	movq	7200(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IsRenderbufferEXT), .-GL_PREFIX(IsRenderbufferEXT)
@@ -34396,7 +34359,7 @@ GL_PREFIX(IsRenderbufferEXT):
 GL_PREFIX(RenderbufferStorageEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7216(%rax), %r11
+	movq	7208(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34410,13 +34373,13 @@ GL_PREFIX(RenderbufferStorageEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7216(%rax), %r11
+	movq	7208(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7216(%rax), %r11
+	movq	7208(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34430,19 +34393,19 @@ GL_PREFIX(RenderbufferStorageEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7216(%rax), %r11
+	movq	7208(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(RenderbufferStorageEXT), .-GL_PREFIX(RenderbufferStorageEXT)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_903)
-	.type	GL_PREFIX(_dispatch_stub_903), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_903))
-GL_PREFIX(_dispatch_stub_903):
+	.globl	GL_PREFIX(_dispatch_stub_902)
+	.type	GL_PREFIX(_dispatch_stub_902), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_902))
+GL_PREFIX(_dispatch_stub_902):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7224(%rax), %r11
+	movq	7216(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34460,13 +34423,13 @@ GL_PREFIX(_dispatch_stub_903):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7224(%rax), %r11
+	movq	7216(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7224(%rax), %r11
+	movq	7216(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34484,19 +34447,19 @@ GL_PREFIX(_dispatch_stub_903):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7224(%rax), %r11
+	movq	7216(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_903), .-GL_PREFIX(_dispatch_stub_903)
+	.size	GL_PREFIX(_dispatch_stub_902), .-GL_PREFIX(_dispatch_stub_902)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_904)
-	.type	GL_PREFIX(_dispatch_stub_904), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_904))
-GL_PREFIX(_dispatch_stub_904):
+	.globl	GL_PREFIX(_dispatch_stub_903)
+	.type	GL_PREFIX(_dispatch_stub_903), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_903))
+GL_PREFIX(_dispatch_stub_903):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7232(%rax), %r11
+	movq	7224(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34506,13 +34469,13 @@ GL_PREFIX(_dispatch_stub_904):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7232(%rax), %r11
+	movq	7224(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7232(%rax), %r11
+	movq	7224(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34522,19 +34485,19 @@ GL_PREFIX(_dispatch_stub_904):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7232(%rax), %r11
+	movq	7224(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_904), .-GL_PREFIX(_dispatch_stub_904)
+	.size	GL_PREFIX(_dispatch_stub_903), .-GL_PREFIX(_dispatch_stub_903)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_905)
-	.type	GL_PREFIX(_dispatch_stub_905), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_905))
-GL_PREFIX(_dispatch_stub_905):
+	.globl	GL_PREFIX(_dispatch_stub_904)
+	.type	GL_PREFIX(_dispatch_stub_904), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_904))
+GL_PREFIX(_dispatch_stub_904):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7240(%rax), %r11
+	movq	7232(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34544,13 +34507,13 @@ GL_PREFIX(_dispatch_stub_905):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7240(%rax), %r11
+	movq	7232(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7240(%rax), %r11
+	movq	7232(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34560,10 +34523,10 @@ GL_PREFIX(_dispatch_stub_905):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7240(%rax), %r11
+	movq	7232(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_905), .-GL_PREFIX(_dispatch_stub_905)
+	.size	GL_PREFIX(_dispatch_stub_904), .-GL_PREFIX(_dispatch_stub_904)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(BindFragDataLocationEXT)
@@ -34571,7 +34534,7 @@ GL_PREFIX(_dispatch_stub_905):
 GL_PREFIX(BindFragDataLocationEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7248(%rax), %r11
+	movq	7240(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34581,13 +34544,13 @@ GL_PREFIX(BindFragDataLocationEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7248(%rax), %r11
+	movq	7240(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7248(%rax), %r11
+	movq	7240(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34597,7 +34560,7 @@ GL_PREFIX(BindFragDataLocationEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7248(%rax), %r11
+	movq	7240(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindFragDataLocationEXT), .-GL_PREFIX(BindFragDataLocationEXT)
@@ -34608,7 +34571,7 @@ GL_PREFIX(BindFragDataLocationEXT):
 GL_PREFIX(GetFragDataLocationEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7256(%rax), %r11
+	movq	7248(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34618,13 +34581,13 @@ GL_PREFIX(GetFragDataLocationEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7256(%rax), %r11
+	movq	7248(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7256(%rax), %r11
+	movq	7248(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34634,7 +34597,7 @@ GL_PREFIX(GetFragDataLocationEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7256(%rax), %r11
+	movq	7248(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetFragDataLocationEXT), .-GL_PREFIX(GetFragDataLocationEXT)
@@ -34645,7 +34608,7 @@ GL_PREFIX(GetFragDataLocationEXT):
 GL_PREFIX(GetUniformuivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7264(%rax), %r11
+	movq	7256(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34655,13 +34618,13 @@ GL_PREFIX(GetUniformuivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7264(%rax), %r11
+	movq	7256(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7264(%rax), %r11
+	movq	7256(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34671,7 +34634,7 @@ GL_PREFIX(GetUniformuivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7264(%rax), %r11
+	movq	7256(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetUniformuivEXT), .-GL_PREFIX(GetUniformuivEXT)
@@ -34682,7 +34645,7 @@ GL_PREFIX(GetUniformuivEXT):
 GL_PREFIX(GetVertexAttribIivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7272(%rax), %r11
+	movq	7264(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34692,13 +34655,13 @@ GL_PREFIX(GetVertexAttribIivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7272(%rax), %r11
+	movq	7264(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7272(%rax), %r11
+	movq	7264(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34708,7 +34671,7 @@ GL_PREFIX(GetVertexAttribIivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7272(%rax), %r11
+	movq	7264(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribIivEXT), .-GL_PREFIX(GetVertexAttribIivEXT)
@@ -34719,7 +34682,7 @@ GL_PREFIX(GetVertexAttribIivEXT):
 GL_PREFIX(GetVertexAttribIuivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7280(%rax), %r11
+	movq	7272(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34729,13 +34692,13 @@ GL_PREFIX(GetVertexAttribIuivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7280(%rax), %r11
+	movq	7272(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7280(%rax), %r11
+	movq	7272(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34745,7 +34708,7 @@ GL_PREFIX(GetVertexAttribIuivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7280(%rax), %r11
+	movq	7272(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribIuivEXT), .-GL_PREFIX(GetVertexAttribIuivEXT)
@@ -34756,7 +34719,7 @@ GL_PREFIX(GetVertexAttribIuivEXT):
 GL_PREFIX(Uniform1uiEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7288(%rax), %r11
+	movq	7280(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34766,13 +34729,13 @@ GL_PREFIX(Uniform1uiEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7288(%rax), %r11
+	movq	7280(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7288(%rax), %r11
+	movq	7280(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34782,7 +34745,7 @@ GL_PREFIX(Uniform1uiEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7288(%rax), %r11
+	movq	7280(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(Uniform1uiEXT), .-GL_PREFIX(Uniform1uiEXT)
@@ -34793,7 +34756,7 @@ GL_PREFIX(Uniform1uiEXT):
 GL_PREFIX(Uniform1uivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7296(%rax), %r11
+	movq	7288(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34803,13 +34766,13 @@ GL_PREFIX(Uniform1uivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7296(%rax), %r11
+	movq	7288(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7296(%rax), %r11
+	movq	7288(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34819,7 +34782,7 @@ GL_PREFIX(Uniform1uivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7296(%rax), %r11
+	movq	7288(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(Uniform1uivEXT), .-GL_PREFIX(Uniform1uivEXT)
@@ -34830,7 +34793,7 @@ GL_PREFIX(Uniform1uivEXT):
 GL_PREFIX(Uniform2uiEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7304(%rax), %r11
+	movq	7296(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34840,13 +34803,13 @@ GL_PREFIX(Uniform2uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7304(%rax), %r11
+	movq	7296(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7304(%rax), %r11
+	movq	7296(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34856,7 +34819,7 @@ GL_PREFIX(Uniform2uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7304(%rax), %r11
+	movq	7296(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(Uniform2uiEXT), .-GL_PREFIX(Uniform2uiEXT)
@@ -34867,7 +34830,7 @@ GL_PREFIX(Uniform2uiEXT):
 GL_PREFIX(Uniform2uivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7312(%rax), %r11
+	movq	7304(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34877,13 +34840,13 @@ GL_PREFIX(Uniform2uivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7312(%rax), %r11
+	movq	7304(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7312(%rax), %r11
+	movq	7304(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34893,7 +34856,7 @@ GL_PREFIX(Uniform2uivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7312(%rax), %r11
+	movq	7304(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(Uniform2uivEXT), .-GL_PREFIX(Uniform2uivEXT)
@@ -34904,7 +34867,7 @@ GL_PREFIX(Uniform2uivEXT):
 GL_PREFIX(Uniform3uiEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7320(%rax), %r11
+	movq	7312(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34918,13 +34881,13 @@ GL_PREFIX(Uniform3uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7320(%rax), %r11
+	movq	7312(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7320(%rax), %r11
+	movq	7312(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34938,7 +34901,7 @@ GL_PREFIX(Uniform3uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7320(%rax), %r11
+	movq	7312(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(Uniform3uiEXT), .-GL_PREFIX(Uniform3uiEXT)
@@ -34949,7 +34912,7 @@ GL_PREFIX(Uniform3uiEXT):
 GL_PREFIX(Uniform3uivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7328(%rax), %r11
+	movq	7320(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34959,13 +34922,13 @@ GL_PREFIX(Uniform3uivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7328(%rax), %r11
+	movq	7320(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7328(%rax), %r11
+	movq	7320(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34975,7 +34938,7 @@ GL_PREFIX(Uniform3uivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7328(%rax), %r11
+	movq	7320(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(Uniform3uivEXT), .-GL_PREFIX(Uniform3uivEXT)
@@ -34986,7 +34949,7 @@ GL_PREFIX(Uniform3uivEXT):
 GL_PREFIX(Uniform4uiEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7336(%rax), %r11
+	movq	7328(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35000,13 +34963,13 @@ GL_PREFIX(Uniform4uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7336(%rax), %r11
+	movq	7328(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7336(%rax), %r11
+	movq	7328(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35020,7 +34983,7 @@ GL_PREFIX(Uniform4uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7336(%rax), %r11
+	movq	7328(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(Uniform4uiEXT), .-GL_PREFIX(Uniform4uiEXT)
@@ -35031,7 +34994,7 @@ GL_PREFIX(Uniform4uiEXT):
 GL_PREFIX(Uniform4uivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7344(%rax), %r11
+	movq	7336(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35041,13 +35004,13 @@ GL_PREFIX(Uniform4uivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7344(%rax), %r11
+	movq	7336(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7344(%rax), %r11
+	movq	7336(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35057,7 +35020,7 @@ GL_PREFIX(Uniform4uivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7344(%rax), %r11
+	movq	7336(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(Uniform4uivEXT), .-GL_PREFIX(Uniform4uivEXT)
@@ -35068,7 +35031,7 @@ GL_PREFIX(Uniform4uivEXT):
 GL_PREFIX(VertexAttribI1iEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7352(%rax), %r11
+	movq	7344(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35078,13 +35041,13 @@ GL_PREFIX(VertexAttribI1iEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7352(%rax), %r11
+	movq	7344(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7352(%rax), %r11
+	movq	7344(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35094,7 +35057,7 @@ GL_PREFIX(VertexAttribI1iEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7352(%rax), %r11
+	movq	7344(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI1iEXT), .-GL_PREFIX(VertexAttribI1iEXT)
@@ -35105,7 +35068,7 @@ GL_PREFIX(VertexAttribI1iEXT):
 GL_PREFIX(VertexAttribI1ivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7360(%rax), %r11
+	movq	7352(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35115,13 +35078,13 @@ GL_PREFIX(VertexAttribI1ivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7360(%rax), %r11
+	movq	7352(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7360(%rax), %r11
+	movq	7352(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35131,7 +35094,7 @@ GL_PREFIX(VertexAttribI1ivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7360(%rax), %r11
+	movq	7352(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI1ivEXT), .-GL_PREFIX(VertexAttribI1ivEXT)
@@ -35142,7 +35105,7 @@ GL_PREFIX(VertexAttribI1ivEXT):
 GL_PREFIX(VertexAttribI1uiEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7368(%rax), %r11
+	movq	7360(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35152,13 +35115,13 @@ GL_PREFIX(VertexAttribI1uiEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7368(%rax), %r11
+	movq	7360(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7368(%rax), %r11
+	movq	7360(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35168,7 +35131,7 @@ GL_PREFIX(VertexAttribI1uiEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7368(%rax), %r11
+	movq	7360(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI1uiEXT), .-GL_PREFIX(VertexAttribI1uiEXT)
@@ -35179,7 +35142,7 @@ GL_PREFIX(VertexAttribI1uiEXT):
 GL_PREFIX(VertexAttribI1uivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7376(%rax), %r11
+	movq	7368(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35189,13 +35152,13 @@ GL_PREFIX(VertexAttribI1uivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7376(%rax), %r11
+	movq	7368(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7376(%rax), %r11
+	movq	7368(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35205,7 +35168,7 @@ GL_PREFIX(VertexAttribI1uivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7376(%rax), %r11
+	movq	7368(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI1uivEXT), .-GL_PREFIX(VertexAttribI1uivEXT)
@@ -35216,7 +35179,7 @@ GL_PREFIX(VertexAttribI1uivEXT):
 GL_PREFIX(VertexAttribI2iEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7384(%rax), %r11
+	movq	7376(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35226,13 +35189,13 @@ GL_PREFIX(VertexAttribI2iEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7384(%rax), %r11
+	movq	7376(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7384(%rax), %r11
+	movq	7376(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35242,7 +35205,7 @@ GL_PREFIX(VertexAttribI2iEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7384(%rax), %r11
+	movq	7376(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI2iEXT), .-GL_PREFIX(VertexAttribI2iEXT)
@@ -35253,7 +35216,7 @@ GL_PREFIX(VertexAttribI2iEXT):
 GL_PREFIX(VertexAttribI2ivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7392(%rax), %r11
+	movq	7384(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35263,13 +35226,13 @@ GL_PREFIX(VertexAttribI2ivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7392(%rax), %r11
+	movq	7384(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7392(%rax), %r11
+	movq	7384(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35279,7 +35242,7 @@ GL_PREFIX(VertexAttribI2ivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7392(%rax), %r11
+	movq	7384(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI2ivEXT), .-GL_PREFIX(VertexAttribI2ivEXT)
@@ -35290,7 +35253,7 @@ GL_PREFIX(VertexAttribI2ivEXT):
 GL_PREFIX(VertexAttribI2uiEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7400(%rax), %r11
+	movq	7392(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35300,13 +35263,13 @@ GL_PREFIX(VertexAttribI2uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7400(%rax), %r11
+	movq	7392(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7400(%rax), %r11
+	movq	7392(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35316,7 +35279,7 @@ GL_PREFIX(VertexAttribI2uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7400(%rax), %r11
+	movq	7392(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI2uiEXT), .-GL_PREFIX(VertexAttribI2uiEXT)
@@ -35327,7 +35290,7 @@ GL_PREFIX(VertexAttribI2uiEXT):
 GL_PREFIX(VertexAttribI2uivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7408(%rax), %r11
+	movq	7400(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35337,13 +35300,13 @@ GL_PREFIX(VertexAttribI2uivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7408(%rax), %r11
+	movq	7400(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7408(%rax), %r11
+	movq	7400(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35353,7 +35316,7 @@ GL_PREFIX(VertexAttribI2uivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7408(%rax), %r11
+	movq	7400(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI2uivEXT), .-GL_PREFIX(VertexAttribI2uivEXT)
@@ -35364,7 +35327,7 @@ GL_PREFIX(VertexAttribI2uivEXT):
 GL_PREFIX(VertexAttribI3iEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7416(%rax), %r11
+	movq	7408(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35378,13 +35341,13 @@ GL_PREFIX(VertexAttribI3iEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7416(%rax), %r11
+	movq	7408(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7416(%rax), %r11
+	movq	7408(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35398,7 +35361,7 @@ GL_PREFIX(VertexAttribI3iEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7416(%rax), %r11
+	movq	7408(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI3iEXT), .-GL_PREFIX(VertexAttribI3iEXT)
@@ -35409,7 +35372,7 @@ GL_PREFIX(VertexAttribI3iEXT):
 GL_PREFIX(VertexAttribI3ivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7424(%rax), %r11
+	movq	7416(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35419,13 +35382,13 @@ GL_PREFIX(VertexAttribI3ivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7424(%rax), %r11
+	movq	7416(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7424(%rax), %r11
+	movq	7416(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35435,7 +35398,7 @@ GL_PREFIX(VertexAttribI3ivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7424(%rax), %r11
+	movq	7416(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI3ivEXT), .-GL_PREFIX(VertexAttribI3ivEXT)
@@ -35446,7 +35409,7 @@ GL_PREFIX(VertexAttribI3ivEXT):
 GL_PREFIX(VertexAttribI3uiEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7432(%rax), %r11
+	movq	7424(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35460,13 +35423,13 @@ GL_PREFIX(VertexAttribI3uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7432(%rax), %r11
+	movq	7424(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7432(%rax), %r11
+	movq	7424(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35480,7 +35443,7 @@ GL_PREFIX(VertexAttribI3uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7432(%rax), %r11
+	movq	7424(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI3uiEXT), .-GL_PREFIX(VertexAttribI3uiEXT)
@@ -35491,7 +35454,7 @@ GL_PREFIX(VertexAttribI3uiEXT):
 GL_PREFIX(VertexAttribI3uivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7440(%rax), %r11
+	movq	7432(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35501,13 +35464,13 @@ GL_PREFIX(VertexAttribI3uivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7440(%rax), %r11
+	movq	7432(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7440(%rax), %r11
+	movq	7432(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35517,7 +35480,7 @@ GL_PREFIX(VertexAttribI3uivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7440(%rax), %r11
+	movq	7432(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI3uivEXT), .-GL_PREFIX(VertexAttribI3uivEXT)
@@ -35528,7 +35491,7 @@ GL_PREFIX(VertexAttribI3uivEXT):
 GL_PREFIX(VertexAttribI4bvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7448(%rax), %r11
+	movq	7440(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35538,13 +35501,13 @@ GL_PREFIX(VertexAttribI4bvEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7448(%rax), %r11
+	movq	7440(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7448(%rax), %r11
+	movq	7440(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35554,7 +35517,7 @@ GL_PREFIX(VertexAttribI4bvEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7448(%rax), %r11
+	movq	7440(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI4bvEXT), .-GL_PREFIX(VertexAttribI4bvEXT)
@@ -35565,7 +35528,7 @@ GL_PREFIX(VertexAttribI4bvEXT):
 GL_PREFIX(VertexAttribI4iEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7456(%rax), %r11
+	movq	7448(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35579,13 +35542,13 @@ GL_PREFIX(VertexAttribI4iEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7456(%rax), %r11
+	movq	7448(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7456(%rax), %r11
+	movq	7448(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35599,7 +35562,7 @@ GL_PREFIX(VertexAttribI4iEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7456(%rax), %r11
+	movq	7448(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI4iEXT), .-GL_PREFIX(VertexAttribI4iEXT)
@@ -35610,7 +35573,7 @@ GL_PREFIX(VertexAttribI4iEXT):
 GL_PREFIX(VertexAttribI4ivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7464(%rax), %r11
+	movq	7456(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35620,13 +35583,13 @@ GL_PREFIX(VertexAttribI4ivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7464(%rax), %r11
+	movq	7456(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7464(%rax), %r11
+	movq	7456(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35636,7 +35599,7 @@ GL_PREFIX(VertexAttribI4ivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7464(%rax), %r11
+	movq	7456(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI4ivEXT), .-GL_PREFIX(VertexAttribI4ivEXT)
@@ -35647,7 +35610,7 @@ GL_PREFIX(VertexAttribI4ivEXT):
 GL_PREFIX(VertexAttribI4svEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7472(%rax), %r11
+	movq	7464(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35657,13 +35620,13 @@ GL_PREFIX(VertexAttribI4svEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7472(%rax), %r11
+	movq	7464(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7472(%rax), %r11
+	movq	7464(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35673,7 +35636,7 @@ GL_PREFIX(VertexAttribI4svEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7472(%rax), %r11
+	movq	7464(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI4svEXT), .-GL_PREFIX(VertexAttribI4svEXT)
@@ -35684,7 +35647,7 @@ GL_PREFIX(VertexAttribI4svEXT):
 GL_PREFIX(VertexAttribI4ubvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7480(%rax), %r11
+	movq	7472(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35694,13 +35657,13 @@ GL_PREFIX(VertexAttribI4ubvEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7480(%rax), %r11
+	movq	7472(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7480(%rax), %r11
+	movq	7472(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35710,7 +35673,7 @@ GL_PREFIX(VertexAttribI4ubvEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7480(%rax), %r11
+	movq	7472(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI4ubvEXT), .-GL_PREFIX(VertexAttribI4ubvEXT)
@@ -35721,7 +35684,7 @@ GL_PREFIX(VertexAttribI4ubvEXT):
 GL_PREFIX(VertexAttribI4uiEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7488(%rax), %r11
+	movq	7480(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35735,13 +35698,13 @@ GL_PREFIX(VertexAttribI4uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7488(%rax), %r11
+	movq	7480(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7488(%rax), %r11
+	movq	7480(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35755,7 +35718,7 @@ GL_PREFIX(VertexAttribI4uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7488(%rax), %r11
+	movq	7480(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI4uiEXT), .-GL_PREFIX(VertexAttribI4uiEXT)
@@ -35766,7 +35729,7 @@ GL_PREFIX(VertexAttribI4uiEXT):
 GL_PREFIX(VertexAttribI4uivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7496(%rax), %r11
+	movq	7488(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35776,13 +35739,13 @@ GL_PREFIX(VertexAttribI4uivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7496(%rax), %r11
+	movq	7488(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7496(%rax), %r11
+	movq	7488(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35792,7 +35755,7 @@ GL_PREFIX(VertexAttribI4uivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7496(%rax), %r11
+	movq	7488(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI4uivEXT), .-GL_PREFIX(VertexAttribI4uivEXT)
@@ -35803,7 +35766,7 @@ GL_PREFIX(VertexAttribI4uivEXT):
 GL_PREFIX(VertexAttribI4usvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7504(%rax), %r11
+	movq	7496(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35813,13 +35776,13 @@ GL_PREFIX(VertexAttribI4usvEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7504(%rax), %r11
+	movq	7496(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7504(%rax), %r11
+	movq	7496(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35829,7 +35792,7 @@ GL_PREFIX(VertexAttribI4usvEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7504(%rax), %r11
+	movq	7496(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI4usvEXT), .-GL_PREFIX(VertexAttribI4usvEXT)
@@ -35840,7 +35803,7 @@ GL_PREFIX(VertexAttribI4usvEXT):
 GL_PREFIX(VertexAttribIPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7512(%rax), %r11
+	movq	7504(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35854,13 +35817,13 @@ GL_PREFIX(VertexAttribIPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7512(%rax), %r11
+	movq	7504(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7512(%rax), %r11
+	movq	7504(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35874,7 +35837,7 @@ GL_PREFIX(VertexAttribIPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7512(%rax), %r11
+	movq	7504(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribIPointerEXT), .-GL_PREFIX(VertexAttribIPointerEXT)
@@ -35885,7 +35848,7 @@ GL_PREFIX(VertexAttribIPointerEXT):
 GL_PREFIX(FramebufferTextureLayerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7520(%rax), %r11
+	movq	7512(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35899,13 +35862,13 @@ GL_PREFIX(FramebufferTextureLayerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7520(%rax), %r11
+	movq	7512(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7520(%rax), %r11
+	movq	7512(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35919,7 +35882,7 @@ GL_PREFIX(FramebufferTextureLayerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7520(%rax), %r11
+	movq	7512(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTextureLayerEXT), .-GL_PREFIX(FramebufferTextureLayerEXT)
@@ -35930,7 +35893,7 @@ GL_PREFIX(FramebufferTextureLayerEXT):
 GL_PREFIX(ColorMaskIndexedEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7528(%rax), %r11
+	movq	7520(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35944,13 +35907,13 @@ GL_PREFIX(ColorMaskIndexedEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7528(%rax), %r11
+	movq	7520(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7528(%rax), %r11
+	movq	7520(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35964,7 +35927,7 @@ GL_PREFIX(ColorMaskIndexedEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7528(%rax), %r11
+	movq	7520(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorMaskIndexedEXT), .-GL_PREFIX(ColorMaskIndexedEXT)
@@ -35975,7 +35938,7 @@ GL_PREFIX(ColorMaskIndexedEXT):
 GL_PREFIX(DisableIndexedEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7536(%rax), %r11
+	movq	7528(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35985,13 +35948,13 @@ GL_PREFIX(DisableIndexedEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7536(%rax), %r11
+	movq	7528(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7536(%rax), %r11
+	movq	7528(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36001,7 +35964,7 @@ GL_PREFIX(DisableIndexedEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7536(%rax), %r11
+	movq	7528(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DisableIndexedEXT), .-GL_PREFIX(DisableIndexedEXT)
@@ -36012,7 +35975,7 @@ GL_PREFIX(DisableIndexedEXT):
 GL_PREFIX(EnableIndexedEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7544(%rax), %r11
+	movq	7536(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36022,13 +35985,13 @@ GL_PREFIX(EnableIndexedEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7544(%rax), %r11
+	movq	7536(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7544(%rax), %r11
+	movq	7536(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36038,7 +36001,7 @@ GL_PREFIX(EnableIndexedEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7544(%rax), %r11
+	movq	7536(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(EnableIndexedEXT), .-GL_PREFIX(EnableIndexedEXT)
@@ -36049,7 +36012,7 @@ GL_PREFIX(EnableIndexedEXT):
 GL_PREFIX(GetBooleanIndexedvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7552(%rax), %r11
+	movq	7544(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36059,13 +36022,13 @@ GL_PREFIX(GetBooleanIndexedvEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7552(%rax), %r11
+	movq	7544(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7552(%rax), %r11
+	movq	7544(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36075,7 +36038,7 @@ GL_PREFIX(GetBooleanIndexedvEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7552(%rax), %r11
+	movq	7544(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetBooleanIndexedvEXT), .-GL_PREFIX(GetBooleanIndexedvEXT)
@@ -36086,7 +36049,7 @@ GL_PREFIX(GetBooleanIndexedvEXT):
 GL_PREFIX(GetIntegerIndexedvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7560(%rax), %r11
+	movq	7552(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36096,13 +36059,13 @@ GL_PREFIX(GetIntegerIndexedvEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7560(%rax), %r11
+	movq	7552(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7560(%rax), %r11
+	movq	7552(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36112,7 +36075,7 @@ GL_PREFIX(GetIntegerIndexedvEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7560(%rax), %r11
+	movq	7552(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetIntegerIndexedvEXT), .-GL_PREFIX(GetIntegerIndexedvEXT)
@@ -36123,7 +36086,7 @@ GL_PREFIX(GetIntegerIndexedvEXT):
 GL_PREFIX(IsEnabledIndexedEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7568(%rax), %r11
+	movq	7560(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36133,13 +36096,13 @@ GL_PREFIX(IsEnabledIndexedEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7568(%rax), %r11
+	movq	7560(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7568(%rax), %r11
+	movq	7560(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36149,7 +36112,7 @@ GL_PREFIX(IsEnabledIndexedEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7568(%rax), %r11
+	movq	7560(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IsEnabledIndexedEXT), .-GL_PREFIX(IsEnabledIndexedEXT)
@@ -36160,7 +36123,7 @@ GL_PREFIX(IsEnabledIndexedEXT):
 GL_PREFIX(ClearColorIiEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7576(%rax), %r11
+	movq	7568(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36174,13 +36137,13 @@ GL_PREFIX(ClearColorIiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7576(%rax), %r11
+	movq	7568(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7576(%rax), %r11
+	movq	7568(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36194,7 +36157,7 @@ GL_PREFIX(ClearColorIiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7576(%rax), %r11
+	movq	7568(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ClearColorIiEXT), .-GL_PREFIX(ClearColorIiEXT)
@@ -36205,7 +36168,7 @@ GL_PREFIX(ClearColorIiEXT):
 GL_PREFIX(ClearColorIuiEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7584(%rax), %r11
+	movq	7576(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36219,13 +36182,13 @@ GL_PREFIX(ClearColorIuiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7584(%rax), %r11
+	movq	7576(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7584(%rax), %r11
+	movq	7576(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36239,7 +36202,7 @@ GL_PREFIX(ClearColorIuiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7584(%rax), %r11
+	movq	7576(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ClearColorIuiEXT), .-GL_PREFIX(ClearColorIuiEXT)
@@ -36250,7 +36213,7 @@ GL_PREFIX(ClearColorIuiEXT):
 GL_PREFIX(GetTexParameterIivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7592(%rax), %r11
+	movq	7584(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36260,13 +36223,13 @@ GL_PREFIX(GetTexParameterIivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7592(%rax), %r11
+	movq	7584(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7592(%rax), %r11
+	movq	7584(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36276,7 +36239,7 @@ GL_PREFIX(GetTexParameterIivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7592(%rax), %r11
+	movq	7584(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetTexParameterIivEXT), .-GL_PREFIX(GetTexParameterIivEXT)
@@ -36287,7 +36250,7 @@ GL_PREFIX(GetTexParameterIivEXT):
 GL_PREFIX(GetTexParameterIuivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7600(%rax), %r11
+	movq	7592(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36297,13 +36260,13 @@ GL_PREFIX(GetTexParameterIuivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7600(%rax), %r11
+	movq	7592(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7600(%rax), %r11
+	movq	7592(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36313,7 +36276,7 @@ GL_PREFIX(GetTexParameterIuivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7600(%rax), %r11
+	movq	7592(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetTexParameterIuivEXT), .-GL_PREFIX(GetTexParameterIuivEXT)
@@ -36324,7 +36287,7 @@ GL_PREFIX(GetTexParameterIuivEXT):
 GL_PREFIX(TexParameterIivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7608(%rax), %r11
+	movq	7600(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36334,13 +36297,13 @@ GL_PREFIX(TexParameterIivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7608(%rax), %r11
+	movq	7600(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7608(%rax), %r11
+	movq	7600(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36350,7 +36313,7 @@ GL_PREFIX(TexParameterIivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7608(%rax), %r11
+	movq	7600(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexParameterIivEXT), .-GL_PREFIX(TexParameterIivEXT)
@@ -36361,7 +36324,7 @@ GL_PREFIX(TexParameterIivEXT):
 GL_PREFIX(TexParameterIuivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7616(%rax), %r11
+	movq	7608(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36371,13 +36334,13 @@ GL_PREFIX(TexParameterIuivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7616(%rax), %r11
+	movq	7608(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7616(%rax), %r11
+	movq	7608(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36387,7 +36350,7 @@ GL_PREFIX(TexParameterIuivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7616(%rax), %r11
+	movq	7608(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexParameterIuivEXT), .-GL_PREFIX(TexParameterIuivEXT)
@@ -36398,7 +36361,7 @@ GL_PREFIX(TexParameterIuivEXT):
 GL_PREFIX(BeginConditionalRenderNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7624(%rax), %r11
+	movq	7616(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36408,13 +36371,13 @@ GL_PREFIX(BeginConditionalRenderNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7624(%rax), %r11
+	movq	7616(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7624(%rax), %r11
+	movq	7616(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36424,7 +36387,7 @@ GL_PREFIX(BeginConditionalRenderNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7624(%rax), %r11
+	movq	7616(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BeginConditionalRenderNV), .-GL_PREFIX(BeginConditionalRenderNV)
@@ -36435,25 +36398,25 @@ GL_PREFIX(BeginConditionalRenderNV):
 GL_PREFIX(EndConditionalRenderNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7632(%rax), %r11
+	movq	7624(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	7632(%rax), %r11
+	movq	7624(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7632(%rax), %r11
+	movq	7624(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	7632(%rax), %r11
+	movq	7624(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(EndConditionalRenderNV), .-GL_PREFIX(EndConditionalRenderNV)
@@ -36464,25 +36427,25 @@ GL_PREFIX(EndConditionalRenderNV):
 GL_PREFIX(BeginTransformFeedbackEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7640(%rax), %r11
+	movq	7632(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	7640(%rax), %r11
+	movq	7632(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7640(%rax), %r11
+	movq	7632(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	7640(%rax), %r11
+	movq	7632(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BeginTransformFeedbackEXT), .-GL_PREFIX(BeginTransformFeedbackEXT)
@@ -36493,7 +36456,7 @@ GL_PREFIX(BeginTransformFeedbackEXT):
 GL_PREFIX(BindBufferBaseEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7648(%rax), %r11
+	movq	7640(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36503,13 +36466,13 @@ GL_PREFIX(BindBufferBaseEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7648(%rax), %r11
+	movq	7640(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7648(%rax), %r11
+	movq	7640(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36519,7 +36482,7 @@ GL_PREFIX(BindBufferBaseEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7648(%rax), %r11
+	movq	7640(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindBufferBaseEXT), .-GL_PREFIX(BindBufferBaseEXT)
@@ -36530,7 +36493,7 @@ GL_PREFIX(BindBufferBaseEXT):
 GL_PREFIX(BindBufferOffsetEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7656(%rax), %r11
+	movq	7648(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36544,13 +36507,13 @@ GL_PREFIX(BindBufferOffsetEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7656(%rax), %r11
+	movq	7648(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7656(%rax), %r11
+	movq	7648(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36564,7 +36527,7 @@ GL_PREFIX(BindBufferOffsetEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7656(%rax), %r11
+	movq	7648(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindBufferOffsetEXT), .-GL_PREFIX(BindBufferOffsetEXT)
@@ -36575,7 +36538,7 @@ GL_PREFIX(BindBufferOffsetEXT):
 GL_PREFIX(BindBufferRangeEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7664(%rax), %r11
+	movq	7656(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36589,13 +36552,13 @@ GL_PREFIX(BindBufferRangeEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7664(%rax), %r11
+	movq	7656(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7664(%rax), %r11
+	movq	7656(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36609,7 +36572,7 @@ GL_PREFIX(BindBufferRangeEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7664(%rax), %r11
+	movq	7656(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindBufferRangeEXT), .-GL_PREFIX(BindBufferRangeEXT)
@@ -36620,25 +36583,25 @@ GL_PREFIX(BindBufferRangeEXT):
 GL_PREFIX(EndTransformFeedbackEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7672(%rax), %r11
+	movq	7664(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	7672(%rax), %r11
+	movq	7664(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7672(%rax), %r11
+	movq	7664(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	7672(%rax), %r11
+	movq	7664(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(EndTransformFeedbackEXT), .-GL_PREFIX(EndTransformFeedbackEXT)
@@ -36649,7 +36612,7 @@ GL_PREFIX(EndTransformFeedbackEXT):
 GL_PREFIX(GetTransformFeedbackVaryingEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7680(%rax), %r11
+	movq	7672(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36667,13 +36630,13 @@ GL_PREFIX(GetTransformFeedbackVaryingEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7680(%rax), %r11
+	movq	7672(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7680(%rax), %r11
+	movq	7672(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36691,7 +36654,7 @@ GL_PREFIX(GetTransformFeedbackVaryingEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7680(%rax), %r11
+	movq	7672(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetTransformFeedbackVaryingEXT), .-GL_PREFIX(GetTransformFeedbackVaryingEXT)
@@ -36702,7 +36665,7 @@ GL_PREFIX(GetTransformFeedbackVaryingEXT):
 GL_PREFIX(TransformFeedbackVaryingsEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7688(%rax), %r11
+	movq	7680(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36716,13 +36679,13 @@ GL_PREFIX(TransformFeedbackVaryingsEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7688(%rax), %r11
+	movq	7680(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7688(%rax), %r11
+	movq	7680(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36736,7 +36699,7 @@ GL_PREFIX(TransformFeedbackVaryingsEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7688(%rax), %r11
+	movq	7680(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TransformFeedbackVaryingsEXT), .-GL_PREFIX(TransformFeedbackVaryingsEXT)
@@ -36747,37 +36710,37 @@ GL_PREFIX(TransformFeedbackVaryingsEXT):
 GL_PREFIX(ProvokingVertexEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7696(%rax), %r11
+	movq	7688(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	7696(%rax), %r11
+	movq	7688(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7696(%rax), %r11
+	movq	7688(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	7696(%rax), %r11
+	movq	7688(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProvokingVertexEXT), .-GL_PREFIX(ProvokingVertexEXT)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_963)
-	.type	GL_PREFIX(_dispatch_stub_963), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_963))
-GL_PREFIX(_dispatch_stub_963):
+	.globl	GL_PREFIX(_dispatch_stub_962)
+	.type	GL_PREFIX(_dispatch_stub_962), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_962))
+GL_PREFIX(_dispatch_stub_962):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7704(%rax), %r11
+	movq	7696(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36787,13 +36750,13 @@ GL_PREFIX(_dispatch_stub_963):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7704(%rax), %r11
+	movq	7696(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7704(%rax), %r11
+	movq	7696(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36803,19 +36766,19 @@ GL_PREFIX(_dispatch_stub_963):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7704(%rax), %r11
+	movq	7696(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_963), .-GL_PREFIX(_dispatch_stub_963)
+	.size	GL_PREFIX(_dispatch_stub_962), .-GL_PREFIX(_dispatch_stub_962)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_964)
-	.type	GL_PREFIX(_dispatch_stub_964), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_964))
-GL_PREFIX(_dispatch_stub_964):
+	.globl	GL_PREFIX(_dispatch_stub_963)
+	.type	GL_PREFIX(_dispatch_stub_963), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_963))
+GL_PREFIX(_dispatch_stub_963):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7712(%rax), %r11
+	movq	7704(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36825,13 +36788,13 @@ GL_PREFIX(_dispatch_stub_964):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7712(%rax), %r11
+	movq	7704(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7712(%rax), %r11
+	movq	7704(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36841,10 +36804,10 @@ GL_PREFIX(_dispatch_stub_964):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7712(%rax), %r11
+	movq	7704(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_964), .-GL_PREFIX(_dispatch_stub_964)
+	.size	GL_PREFIX(_dispatch_stub_963), .-GL_PREFIX(_dispatch_stub_963)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(GetObjectParameterivAPPLE)
@@ -36852,7 +36815,7 @@ GL_PREFIX(_dispatch_stub_964):
 GL_PREFIX(GetObjectParameterivAPPLE):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7720(%rax), %r11
+	movq	7712(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36866,13 +36829,13 @@ GL_PREFIX(GetObjectParameterivAPPLE):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7720(%rax), %r11
+	movq	7712(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7720(%rax), %r11
+	movq	7712(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36886,7 +36849,7 @@ GL_PREFIX(GetObjectParameterivAPPLE):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7720(%rax), %r11
+	movq	7712(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetObjectParameterivAPPLE), .-GL_PREFIX(GetObjectParameterivAPPLE)
@@ -36897,7 +36860,7 @@ GL_PREFIX(GetObjectParameterivAPPLE):
 GL_PREFIX(ObjectPurgeableAPPLE):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7728(%rax), %r11
+	movq	7720(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36907,13 +36870,13 @@ GL_PREFIX(ObjectPurgeableAPPLE):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7728(%rax), %r11
+	movq	7720(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7728(%rax), %r11
+	movq	7720(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36923,7 +36886,7 @@ GL_PREFIX(ObjectPurgeableAPPLE):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7728(%rax), %r11
+	movq	7720(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ObjectPurgeableAPPLE), .-GL_PREFIX(ObjectPurgeableAPPLE)
@@ -36934,7 +36897,7 @@ GL_PREFIX(ObjectPurgeableAPPLE):
 GL_PREFIX(ObjectUnpurgeableAPPLE):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7736(%rax), %r11
+	movq	7728(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36944,13 +36907,13 @@ GL_PREFIX(ObjectUnpurgeableAPPLE):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7736(%rax), %r11
+	movq	7728(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7736(%rax), %r11
+	movq	7728(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36960,7 +36923,7 @@ GL_PREFIX(ObjectUnpurgeableAPPLE):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7736(%rax), %r11
+	movq	7728(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ObjectUnpurgeableAPPLE), .-GL_PREFIX(ObjectUnpurgeableAPPLE)
@@ -36971,25 +36934,25 @@ GL_PREFIX(ObjectUnpurgeableAPPLE):
 GL_PREFIX(ActiveProgramEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7744(%rax), %r11
+	movq	7736(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	7744(%rax), %r11
+	movq	7736(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7744(%rax), %r11
+	movq	7736(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	7744(%rax), %r11
+	movq	7736(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ActiveProgramEXT), .-GL_PREFIX(ActiveProgramEXT)
@@ -37000,7 +36963,7 @@ GL_PREFIX(ActiveProgramEXT):
 GL_PREFIX(CreateShaderProgramEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7752(%rax), %r11
+	movq	7744(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -37010,13 +36973,13 @@ GL_PREFIX(CreateShaderProgramEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7752(%rax), %r11
+	movq	7744(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7752(%rax), %r11
+	movq	7744(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -37026,7 +36989,7 @@ GL_PREFIX(CreateShaderProgramEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7752(%rax), %r11
+	movq	7744(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CreateShaderProgramEXT), .-GL_PREFIX(CreateShaderProgramEXT)
@@ -37037,7 +37000,7 @@ GL_PREFIX(CreateShaderProgramEXT):
 GL_PREFIX(UseShaderProgramEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7760(%rax), %r11
+	movq	7752(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -37047,13 +37010,13 @@ GL_PREFIX(UseShaderProgramEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7760(%rax), %r11
+	movq	7752(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7760(%rax), %r11
+	movq	7752(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -37063,7 +37026,7 @@ GL_PREFIX(UseShaderProgramEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7760(%rax), %r11
+	movq	7752(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(UseShaderProgramEXT), .-GL_PREFIX(UseShaderProgramEXT)
@@ -37074,12 +37037,50 @@ GL_PREFIX(UseShaderProgramEXT):
 GL_PREFIX(TextureBarrierNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
+	movq	7760(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rbp
+	call	_x86_64_get_dispatch@PLT
+	popq	%rbp
+	movq	7760(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	7760(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rbp
+	call	_glapi_get_dispatch
+	popq	%rbp
+	movq	7760(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(TextureBarrierNV), .-GL_PREFIX(TextureBarrierNV)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(_dispatch_stub_971)
+	.type	GL_PREFIX(_dispatch_stub_971), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_971))
+GL_PREFIX(_dispatch_stub_971):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
 	movq	7768(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	pushq	%rcx
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
+	popq	%rcx
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
 	movq	7768(%rax), %r11
 	jmp	*%r11
 #else
@@ -37089,13 +37090,21 @@ GL_PREFIX(TextureBarrierNV):
 	movq	7768(%rax), %r11
 	jmp	*%r11
 1:
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	pushq	%rcx
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
+	popq	%rcx
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
 	movq	7768(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(TextureBarrierNV), .-GL_PREFIX(TextureBarrierNV)
+	.size	GL_PREFIX(_dispatch_stub_971), .-GL_PREFIX(_dispatch_stub_971)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(_dispatch_stub_972)
@@ -37202,11 +37211,7 @@ GL_PREFIX(_dispatch_stub_974):
 	pushq	%rdi
 	pushq	%rsi
 	pushq	%rdx
-	pushq	%rcx
-	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
-	popq	%rbp
-	popq	%rcx
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
@@ -37222,11 +37227,7 @@ GL_PREFIX(_dispatch_stub_974):
 	pushq	%rdi
 	pushq	%rsi
 	pushq	%rdx
-	pushq	%rcx
-	pushq	%rbp
 	call	_glapi_get_dispatch
-	popq	%rbp
-	popq	%rcx
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
@@ -37274,50 +37275,12 @@ GL_PREFIX(_dispatch_stub_975):
 	.size	GL_PREFIX(_dispatch_stub_975), .-GL_PREFIX(_dispatch_stub_975)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_976)
-	.type	GL_PREFIX(_dispatch_stub_976), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_976))
-GL_PREFIX(_dispatch_stub_976):
-#if defined(GLX_USE_TLS)
-	call	_x86_64_get_dispatch@PLT
-	movq	7808(%rax), %r11
-	jmp	*%r11
-#elif defined(PTHREADS)
-	pushq	%rdi
-	pushq	%rsi
-	pushq	%rdx
-	call	_x86_64_get_dispatch@PLT
-	popq	%rdx
-	popq	%rsi
-	popq	%rdi
-	movq	7808(%rax), %r11
-	jmp	*%r11
-#else
-	movq	_glapi_Dispatch(%rip), %rax
-	testq	%rax, %rax
-	je	1f
-	movq	7808(%rax), %r11
-	jmp	*%r11
-1:
-	pushq	%rdi
-	pushq	%rsi
-	pushq	%rdx
-	call	_glapi_get_dispatch
-	popq	%rdx
-	popq	%rsi
-	popq	%rdi
-	movq	7808(%rax), %r11
-	jmp	*%r11
-#endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_976), .-GL_PREFIX(_dispatch_stub_976)
-
-	.p2align	4,,15
 	.globl	GL_PREFIX(EGLImageTargetRenderbufferStorageOES)
 	.type	GL_PREFIX(EGLImageTargetRenderbufferStorageOES), @function
 GL_PREFIX(EGLImageTargetRenderbufferStorageOES):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7816(%rax), %r11
+	movq	7808(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -37327,13 +37290,13 @@ GL_PREFIX(EGLImageTargetRenderbufferStorageOES):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7816(%rax), %r11
+	movq	7808(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7816(%rax), %r11
+	movq	7808(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -37343,7 +37306,7 @@ GL_PREFIX(EGLImageTargetRenderbufferStorageOES):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7816(%rax), %r11
+	movq	7808(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(EGLImageTargetRenderbufferStorageOES), .-GL_PREFIX(EGLImageTargetRenderbufferStorageOES)
@@ -37354,7 +37317,7 @@ GL_PREFIX(EGLImageTargetRenderbufferStorageOES):
 GL_PREFIX(EGLImageTargetTexture2DOES):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7824(%rax), %r11
+	movq	7816(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -37364,13 +37327,13 @@ GL_PREFIX(EGLImageTargetTexture2DOES):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7824(%rax), %r11
+	movq	7816(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7824(%rax), %r11
+	movq	7816(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -37380,7 +37343,7 @@ GL_PREFIX(EGLImageTargetTexture2DOES):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7824(%rax), %r11
+	movq	7816(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(EGLImageTargetTexture2DOES), .-GL_PREFIX(EGLImageTargetTexture2DOES)
@@ -37575,6 +37538,7 @@ GL_PREFIX(EGLImageTargetTexture2DOES):
 	.globl GL_PREFIX(DrawElementsInstancedEXT) ; .set GL_PREFIX(DrawElementsInstancedEXT), GL_PREFIX(DrawElementsInstancedARB)
 	.globl GL_PREFIX(DrawElementsInstanced) ; .set GL_PREFIX(DrawElementsInstanced), GL_PREFIX(DrawElementsInstancedARB)
 	.globl GL_PREFIX(RenderbufferStorageMultisampleEXT) ; .set GL_PREFIX(RenderbufferStorageMultisampleEXT), GL_PREFIX(RenderbufferStorageMultisample)
+	.globl GL_PREFIX(TexBuffer) ; .set GL_PREFIX(TexBuffer), GL_PREFIX(TexBufferARB)
 	.globl GL_PREFIX(BlendEquationSeparateIndexedAMD) ; .set GL_PREFIX(BlendEquationSeparateIndexedAMD), GL_PREFIX(BlendEquationSeparateiARB)
 	.globl GL_PREFIX(BlendEquationIndexedAMD) ; .set GL_PREFIX(BlendEquationIndexedAMD), GL_PREFIX(BlendEquationiARB)
 	.globl GL_PREFIX(BlendFuncSeparateIndexedAMD) ; .set GL_PREFIX(BlendFuncSeparateIndexedAMD), GL_PREFIX(BlendFuncSeparateiARB)
@@ -37648,10 +37612,10 @@ GL_PREFIX(EGLImageTargetTexture2DOES):
 	.globl GL_PREFIX(IsProgramARB) ; .set GL_PREFIX(IsProgramARB), GL_PREFIX(IsProgramNV)
 	.globl GL_PREFIX(PointParameteri) ; .set GL_PREFIX(PointParameteri), GL_PREFIX(PointParameteriNV)
 	.globl GL_PREFIX(PointParameteriv) ; .set GL_PREFIX(PointParameteriv), GL_PREFIX(PointParameterivNV)
-	.globl GL_PREFIX(DeleteVertexArrays) ; .set GL_PREFIX(DeleteVertexArrays), GL_PREFIX(_dispatch_stub_873)
-	.globl GL_PREFIX(IsVertexArray) ; .set GL_PREFIX(IsVertexArray), GL_PREFIX(_dispatch_stub_875)
+	.globl GL_PREFIX(DeleteVertexArrays) ; .set GL_PREFIX(DeleteVertexArrays), GL_PREFIX(_dispatch_stub_872)
+	.globl GL_PREFIX(IsVertexArray) ; .set GL_PREFIX(IsVertexArray), GL_PREFIX(_dispatch_stub_874)
 	.globl GL_PREFIX(PrimitiveRestartIndex) ; .set GL_PREFIX(PrimitiveRestartIndex), GL_PREFIX(PrimitiveRestartIndexNV)
-	.globl GL_PREFIX(BlendEquationSeparate) ; .set GL_PREFIX(BlendEquationSeparate), GL_PREFIX(_dispatch_stub_885)
+	.globl GL_PREFIX(BlendEquationSeparate) ; .set GL_PREFIX(BlendEquationSeparate), GL_PREFIX(_dispatch_stub_884)
 	.globl GL_PREFIX(BindFramebuffer) ; .set GL_PREFIX(BindFramebuffer), GL_PREFIX(BindFramebufferEXT)
 	.globl GL_PREFIX(BindRenderbuffer) ; .set GL_PREFIX(BindRenderbuffer), GL_PREFIX(BindRenderbufferEXT)
 	.globl GL_PREFIX(CheckFramebufferStatus) ; .set GL_PREFIX(CheckFramebufferStatus), GL_PREFIX(CheckFramebufferStatusEXT)
@@ -37669,7 +37633,7 @@ GL_PREFIX(EGLImageTargetTexture2DOES):
 	.globl GL_PREFIX(IsFramebuffer) ; .set GL_PREFIX(IsFramebuffer), GL_PREFIX(IsFramebufferEXT)
 	.globl GL_PREFIX(IsRenderbuffer) ; .set GL_PREFIX(IsRenderbuffer), GL_PREFIX(IsRenderbufferEXT)
 	.globl GL_PREFIX(RenderbufferStorage) ; .set GL_PREFIX(RenderbufferStorage), GL_PREFIX(RenderbufferStorageEXT)
-	.globl GL_PREFIX(BlitFramebuffer) ; .set GL_PREFIX(BlitFramebuffer), GL_PREFIX(_dispatch_stub_903)
+	.globl GL_PREFIX(BlitFramebuffer) ; .set GL_PREFIX(BlitFramebuffer), GL_PREFIX(_dispatch_stub_902)
 	.globl GL_PREFIX(BindFragDataLocation) ; .set GL_PREFIX(BindFragDataLocation), GL_PREFIX(BindFragDataLocationEXT)
 	.globl GL_PREFIX(GetFragDataLocation) ; .set GL_PREFIX(GetFragDataLocation), GL_PREFIX(GetFragDataLocationEXT)
 	.globl GL_PREFIX(GetUniformuiv) ; .set GL_PREFIX(GetUniformuiv), GL_PREFIX(GetUniformuivEXT)
diff --git a/mesalib/src/mapi/glapi/glapi_x86.S b/mesalib/src/mapi/glapi/glapi_x86.S
index 8d0bbf7f9..1568b635e 100644
--- a/mesalib/src/mapi/glapi/glapi_x86.S
+++ b/mesalib/src/mapi/glapi/glapi_x86.S
@@ -586,268 +586,269 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(ClearBufferiv, 433, ClearBufferiv@12)
 	GL_STUB(ClearBufferuiv, 434, ClearBufferuiv@12)
 	GL_STUB(GetStringi, 435, GetStringi@8)
-	GL_STUB(TexBuffer, 436, TexBuffer@12)
-	GL_STUB(FramebufferTexture, 437, FramebufferTexture@16)
-	GL_STUB(GetBufferParameteri64v, 438, GetBufferParameteri64v@12)
-	GL_STUB(GetInteger64i_v, 439, GetInteger64i_v@12)
-	GL_STUB(VertexAttribDivisor, 440, VertexAttribDivisor@8)
-	GL_STUB(LoadTransposeMatrixdARB, 441, LoadTransposeMatrixdARB@4)
-	GL_STUB(LoadTransposeMatrixfARB, 442, LoadTransposeMatrixfARB@4)
-	GL_STUB(MultTransposeMatrixdARB, 443, MultTransposeMatrixdARB@4)
-	GL_STUB(MultTransposeMatrixfARB, 444, MultTransposeMatrixfARB@4)
-	GL_STUB(SampleCoverageARB, 445, SampleCoverageARB@8)
-	GL_STUB(CompressedTexImage1DARB, 446, CompressedTexImage1DARB@28)
-	GL_STUB(CompressedTexImage2DARB, 447, CompressedTexImage2DARB@32)
-	GL_STUB(CompressedTexImage3DARB, 448, CompressedTexImage3DARB@36)
-	GL_STUB(CompressedTexSubImage1DARB, 449, CompressedTexSubImage1DARB@28)
-	GL_STUB(CompressedTexSubImage2DARB, 450, CompressedTexSubImage2DARB@36)
-	GL_STUB(CompressedTexSubImage3DARB, 451, CompressedTexSubImage3DARB@44)
-	GL_STUB(GetCompressedTexImageARB, 452, GetCompressedTexImageARB@12)
-	GL_STUB(DisableVertexAttribArrayARB, 453, DisableVertexAttribArrayARB@4)
-	GL_STUB(EnableVertexAttribArrayARB, 454, EnableVertexAttribArrayARB@4)
-	GL_STUB(GetProgramEnvParameterdvARB, 455, GetProgramEnvParameterdvARB@12)
-	GL_STUB(GetProgramEnvParameterfvARB, 456, GetProgramEnvParameterfvARB@12)
-	GL_STUB(GetProgramLocalParameterdvARB, 457, GetProgramLocalParameterdvARB@12)
-	GL_STUB(GetProgramLocalParameterfvARB, 458, GetProgramLocalParameterfvARB@12)
-	GL_STUB(GetProgramStringARB, 459, GetProgramStringARB@12)
-	GL_STUB(GetProgramivARB, 460, GetProgramivARB@12)
-	GL_STUB(GetVertexAttribdvARB, 461, GetVertexAttribdvARB@12)
-	GL_STUB(GetVertexAttribfvARB, 462, GetVertexAttribfvARB@12)
-	GL_STUB(GetVertexAttribivARB, 463, GetVertexAttribivARB@12)
-	GL_STUB(ProgramEnvParameter4dARB, 464, ProgramEnvParameter4dARB@40)
-	GL_STUB(ProgramEnvParameter4dvARB, 465, ProgramEnvParameter4dvARB@12)
-	GL_STUB(ProgramEnvParameter4fARB, 466, ProgramEnvParameter4fARB@24)
-	GL_STUB(ProgramEnvParameter4fvARB, 467, ProgramEnvParameter4fvARB@12)
-	GL_STUB(ProgramLocalParameter4dARB, 468, ProgramLocalParameter4dARB@40)
-	GL_STUB(ProgramLocalParameter4dvARB, 469, ProgramLocalParameter4dvARB@12)
-	GL_STUB(ProgramLocalParameter4fARB, 470, ProgramLocalParameter4fARB@24)
-	GL_STUB(ProgramLocalParameter4fvARB, 471, ProgramLocalParameter4fvARB@12)
-	GL_STUB(ProgramStringARB, 472, ProgramStringARB@16)
-	GL_STUB(VertexAttrib1dARB, 473, VertexAttrib1dARB@12)
-	GL_STUB(VertexAttrib1dvARB, 474, VertexAttrib1dvARB@8)
-	GL_STUB(VertexAttrib1fARB, 475, VertexAttrib1fARB@8)
-	GL_STUB(VertexAttrib1fvARB, 476, VertexAttrib1fvARB@8)
-	GL_STUB(VertexAttrib1sARB, 477, VertexAttrib1sARB@8)
-	GL_STUB(VertexAttrib1svARB, 478, VertexAttrib1svARB@8)
-	GL_STUB(VertexAttrib2dARB, 479, VertexAttrib2dARB@20)
-	GL_STUB(VertexAttrib2dvARB, 480, VertexAttrib2dvARB@8)
-	GL_STUB(VertexAttrib2fARB, 481, VertexAttrib2fARB@12)
-	GL_STUB(VertexAttrib2fvARB, 482, VertexAttrib2fvARB@8)
-	GL_STUB(VertexAttrib2sARB, 483, VertexAttrib2sARB@12)
-	GL_STUB(VertexAttrib2svARB, 484, VertexAttrib2svARB@8)
-	GL_STUB(VertexAttrib3dARB, 485, VertexAttrib3dARB@28)
-	GL_STUB(VertexAttrib3dvARB, 486, VertexAttrib3dvARB@8)
-	GL_STUB(VertexAttrib3fARB, 487, VertexAttrib3fARB@16)
-	GL_STUB(VertexAttrib3fvARB, 488, VertexAttrib3fvARB@8)
-	GL_STUB(VertexAttrib3sARB, 489, VertexAttrib3sARB@16)
-	GL_STUB(VertexAttrib3svARB, 490, VertexAttrib3svARB@8)
-	GL_STUB(VertexAttrib4NbvARB, 491, VertexAttrib4NbvARB@8)
-	GL_STUB(VertexAttrib4NivARB, 492, VertexAttrib4NivARB@8)
-	GL_STUB(VertexAttrib4NsvARB, 493, VertexAttrib4NsvARB@8)
-	GL_STUB(VertexAttrib4NubARB, 494, VertexAttrib4NubARB@20)
-	GL_STUB(VertexAttrib4NubvARB, 495, VertexAttrib4NubvARB@8)
-	GL_STUB(VertexAttrib4NuivARB, 496, VertexAttrib4NuivARB@8)
-	GL_STUB(VertexAttrib4NusvARB, 497, VertexAttrib4NusvARB@8)
-	GL_STUB(VertexAttrib4bvARB, 498, VertexAttrib4bvARB@8)
-	GL_STUB(VertexAttrib4dARB, 499, VertexAttrib4dARB@36)
-	GL_STUB(VertexAttrib4dvARB, 500, VertexAttrib4dvARB@8)
-	GL_STUB(VertexAttrib4fARB, 501, VertexAttrib4fARB@20)
-	GL_STUB(VertexAttrib4fvARB, 502, VertexAttrib4fvARB@8)
-	GL_STUB(VertexAttrib4ivARB, 503, VertexAttrib4ivARB@8)
-	GL_STUB(VertexAttrib4sARB, 504, VertexAttrib4sARB@20)
-	GL_STUB(VertexAttrib4svARB, 505, VertexAttrib4svARB@8)
-	GL_STUB(VertexAttrib4ubvARB, 506, VertexAttrib4ubvARB@8)
-	GL_STUB(VertexAttrib4uivARB, 507, VertexAttrib4uivARB@8)
-	GL_STUB(VertexAttrib4usvARB, 508, VertexAttrib4usvARB@8)
-	GL_STUB(VertexAttribPointerARB, 509, VertexAttribPointerARB@24)
-	GL_STUB(BindBufferARB, 510, BindBufferARB@8)
-	GL_STUB(BufferDataARB, 511, BufferDataARB@16)
-	GL_STUB(BufferSubDataARB, 512, BufferSubDataARB@16)
-	GL_STUB(DeleteBuffersARB, 513, DeleteBuffersARB@8)
-	GL_STUB(GenBuffersARB, 514, GenBuffersARB@8)
-	GL_STUB(GetBufferParameterivARB, 515, GetBufferParameterivARB@12)
-	GL_STUB(GetBufferPointervARB, 516, GetBufferPointervARB@12)
-	GL_STUB(GetBufferSubDataARB, 517, GetBufferSubDataARB@16)
-	GL_STUB(IsBufferARB, 518, IsBufferARB@4)
-	GL_STUB(MapBufferARB, 519, MapBufferARB@8)
-	GL_STUB(UnmapBufferARB, 520, UnmapBufferARB@4)
-	GL_STUB(BeginQueryARB, 521, BeginQueryARB@8)
-	GL_STUB(DeleteQueriesARB, 522, DeleteQueriesARB@8)
-	GL_STUB(EndQueryARB, 523, EndQueryARB@4)
-	GL_STUB(GenQueriesARB, 524, GenQueriesARB@8)
-	GL_STUB(GetQueryObjectivARB, 525, GetQueryObjectivARB@12)
-	GL_STUB(GetQueryObjectuivARB, 526, GetQueryObjectuivARB@12)
-	GL_STUB(GetQueryivARB, 527, GetQueryivARB@12)
-	GL_STUB(IsQueryARB, 528, IsQueryARB@4)
-	GL_STUB(AttachObjectARB, 529, AttachObjectARB@8)
-	GL_STUB(CompileShaderARB, 530, CompileShaderARB@4)
-	GL_STUB(CreateProgramObjectARB, 531, CreateProgramObjectARB@0)
-	GL_STUB(CreateShaderObjectARB, 532, CreateShaderObjectARB@4)
-	GL_STUB(DeleteObjectARB, 533, DeleteObjectARB@4)
-	GL_STUB(DetachObjectARB, 534, DetachObjectARB@8)
-	GL_STUB(GetActiveUniformARB, 535, GetActiveUniformARB@28)
-	GL_STUB(GetAttachedObjectsARB, 536, GetAttachedObjectsARB@16)
-	GL_STUB(GetHandleARB, 537, GetHandleARB@4)
-	GL_STUB(GetInfoLogARB, 538, GetInfoLogARB@16)
-	GL_STUB(GetObjectParameterfvARB, 539, GetObjectParameterfvARB@12)
-	GL_STUB(GetObjectParameterivARB, 540, GetObjectParameterivARB@12)
-	GL_STUB(GetShaderSourceARB, 541, GetShaderSourceARB@16)
-	GL_STUB(GetUniformLocationARB, 542, GetUniformLocationARB@8)
-	GL_STUB(GetUniformfvARB, 543, GetUniformfvARB@12)
-	GL_STUB(GetUniformivARB, 544, GetUniformivARB@12)
-	GL_STUB(LinkProgramARB, 545, LinkProgramARB@4)
-	GL_STUB(ShaderSourceARB, 546, ShaderSourceARB@16)
-	GL_STUB(Uniform1fARB, 547, Uniform1fARB@8)
-	GL_STUB(Uniform1fvARB, 548, Uniform1fvARB@12)
-	GL_STUB(Uniform1iARB, 549, Uniform1iARB@8)
-	GL_STUB(Uniform1ivARB, 550, Uniform1ivARB@12)
-	GL_STUB(Uniform2fARB, 551, Uniform2fARB@12)
-	GL_STUB(Uniform2fvARB, 552, Uniform2fvARB@12)
-	GL_STUB(Uniform2iARB, 553, Uniform2iARB@12)
-	GL_STUB(Uniform2ivARB, 554, Uniform2ivARB@12)
-	GL_STUB(Uniform3fARB, 555, Uniform3fARB@16)
-	GL_STUB(Uniform3fvARB, 556, Uniform3fvARB@12)
-	GL_STUB(Uniform3iARB, 557, Uniform3iARB@16)
-	GL_STUB(Uniform3ivARB, 558, Uniform3ivARB@12)
-	GL_STUB(Uniform4fARB, 559, Uniform4fARB@20)
-	GL_STUB(Uniform4fvARB, 560, Uniform4fvARB@12)
-	GL_STUB(Uniform4iARB, 561, Uniform4iARB@20)
-	GL_STUB(Uniform4ivARB, 562, Uniform4ivARB@12)
-	GL_STUB(UniformMatrix2fvARB, 563, UniformMatrix2fvARB@16)
-	GL_STUB(UniformMatrix3fvARB, 564, UniformMatrix3fvARB@16)
-	GL_STUB(UniformMatrix4fvARB, 565, UniformMatrix4fvARB@16)
-	GL_STUB(UseProgramObjectARB, 566, UseProgramObjectARB@4)
-	GL_STUB(ValidateProgramARB, 567, ValidateProgramARB@4)
-	GL_STUB(BindAttribLocationARB, 568, BindAttribLocationARB@12)
-	GL_STUB(GetActiveAttribARB, 569, GetActiveAttribARB@28)
-	GL_STUB(GetAttribLocationARB, 570, GetAttribLocationARB@8)
-	GL_STUB(DrawBuffersARB, 571, DrawBuffersARB@8)
-	GL_STUB(ClampColorARB, 572, ClampColorARB@8)
-	GL_STUB(DrawArraysInstancedARB, 573, DrawArraysInstancedARB@16)
-	GL_STUB(DrawElementsInstancedARB, 574, DrawElementsInstancedARB@20)
-	GL_STUB(RenderbufferStorageMultisample, 575, RenderbufferStorageMultisample@20)
-	GL_STUB(FramebufferTextureARB, 576, FramebufferTextureARB@16)
-	GL_STUB(FramebufferTextureFaceARB, 577, FramebufferTextureFaceARB@20)
-	GL_STUB(ProgramParameteriARB, 578, ProgramParameteriARB@12)
-	GL_STUB(VertexAttribDivisorARB, 579, VertexAttribDivisorARB@8)
-	GL_STUB(FlushMappedBufferRange, 580, FlushMappedBufferRange@12)
-	GL_STUB(MapBufferRange, 581, MapBufferRange@16)
-	GL_STUB(TexBufferARB, 582, TexBufferARB@12)
-	GL_STUB(BindVertexArray, 583, BindVertexArray@4)
-	GL_STUB(GenVertexArrays, 584, GenVertexArrays@8)
-	GL_STUB(CopyBufferSubData, 585, CopyBufferSubData@20)
-	GL_STUB(ClientWaitSync, 586, ClientWaitSync@12)
-	GL_STUB(DeleteSync, 587, DeleteSync@4)
-	GL_STUB(FenceSync, 588, FenceSync@8)
-	GL_STUB(GetInteger64v, 589, GetInteger64v@8)
-	GL_STUB(GetSynciv, 590, GetSynciv@20)
-	GL_STUB(IsSync, 591, IsSync@4)
-	GL_STUB(WaitSync, 592, WaitSync@12)
-	GL_STUB(DrawElementsBaseVertex, 593, DrawElementsBaseVertex@20)
-	GL_STUB(DrawElementsInstancedBaseVertex, 594, DrawElementsInstancedBaseVertex@24)
-	GL_STUB(DrawRangeElementsBaseVertex, 595, DrawRangeElementsBaseVertex@28)
-	GL_STUB(MultiDrawElementsBaseVertex, 596, MultiDrawElementsBaseVertex@24)
-	GL_STUB(BlendEquationSeparateiARB, 597, BlendEquationSeparateiARB@12)
-	GL_STUB(BlendEquationiARB, 598, BlendEquationiARB@8)
-	GL_STUB(BlendFuncSeparateiARB, 599, BlendFuncSeparateiARB@20)
-	GL_STUB(BlendFunciARB, 600, BlendFunciARB@12)
-	GL_STUB(BindFragDataLocationIndexed, 601, BindFragDataLocationIndexed@16)
-	GL_STUB(GetFragDataIndex, 602, GetFragDataIndex@8)
-	GL_STUB(BindSampler, 603, BindSampler@8)
-	GL_STUB(DeleteSamplers, 604, DeleteSamplers@8)
-	GL_STUB(GenSamplers, 605, GenSamplers@8)
-	GL_STUB(GetSamplerParameterIiv, 606, GetSamplerParameterIiv@12)
-	GL_STUB(GetSamplerParameterIuiv, 607, GetSamplerParameterIuiv@12)
-	GL_STUB(GetSamplerParameterfv, 608, GetSamplerParameterfv@12)
-	GL_STUB(GetSamplerParameteriv, 609, GetSamplerParameteriv@12)
-	GL_STUB(IsSampler, 610, IsSampler@4)
-	GL_STUB(SamplerParameterIiv, 611, SamplerParameterIiv@12)
-	GL_STUB(SamplerParameterIuiv, 612, SamplerParameterIuiv@12)
-	GL_STUB(SamplerParameterf, 613, SamplerParameterf@12)
-	GL_STUB(SamplerParameterfv, 614, SamplerParameterfv@12)
-	GL_STUB(SamplerParameteri, 615, SamplerParameteri@12)
-	GL_STUB(SamplerParameteriv, 616, SamplerParameteriv@12)
-	GL_STUB(ColorP3ui, 617, ColorP3ui@8)
-	GL_STUB(ColorP3uiv, 618, ColorP3uiv@8)
-	GL_STUB(ColorP4ui, 619, ColorP4ui@8)
-	GL_STUB(ColorP4uiv, 620, ColorP4uiv@8)
-	GL_STUB(MultiTexCoordP1ui, 621, MultiTexCoordP1ui@12)
-	GL_STUB(MultiTexCoordP1uiv, 622, MultiTexCoordP1uiv@12)
-	GL_STUB(MultiTexCoordP2ui, 623, MultiTexCoordP2ui@12)
-	GL_STUB(MultiTexCoordP2uiv, 624, MultiTexCoordP2uiv@12)
-	GL_STUB(MultiTexCoordP3ui, 625, MultiTexCoordP3ui@12)
-	GL_STUB(MultiTexCoordP3uiv, 626, MultiTexCoordP3uiv@12)
-	GL_STUB(MultiTexCoordP4ui, 627, MultiTexCoordP4ui@12)
-	GL_STUB(MultiTexCoordP4uiv, 628, MultiTexCoordP4uiv@12)
-	GL_STUB(NormalP3ui, 629, NormalP3ui@8)
-	GL_STUB(NormalP3uiv, 630, NormalP3uiv@8)
-	GL_STUB(SecondaryColorP3ui, 631, SecondaryColorP3ui@8)
-	GL_STUB(SecondaryColorP3uiv, 632, SecondaryColorP3uiv@8)
-	GL_STUB(TexCoordP1ui, 633, TexCoordP1ui@8)
-	GL_STUB(TexCoordP1uiv, 634, TexCoordP1uiv@8)
-	GL_STUB(TexCoordP2ui, 635, TexCoordP2ui@8)
-	GL_STUB(TexCoordP2uiv, 636, TexCoordP2uiv@8)
-	GL_STUB(TexCoordP3ui, 637, TexCoordP3ui@8)
-	GL_STUB(TexCoordP3uiv, 638, TexCoordP3uiv@8)
-	GL_STUB(TexCoordP4ui, 639, TexCoordP4ui@8)
-	GL_STUB(TexCoordP4uiv, 640, TexCoordP4uiv@8)
-	GL_STUB(VertexAttribP1ui, 641, VertexAttribP1ui@16)
-	GL_STUB(VertexAttribP1uiv, 642, VertexAttribP1uiv@16)
-	GL_STUB(VertexAttribP2ui, 643, VertexAttribP2ui@16)
-	GL_STUB(VertexAttribP2uiv, 644, VertexAttribP2uiv@16)
-	GL_STUB(VertexAttribP3ui, 645, VertexAttribP3ui@16)
-	GL_STUB(VertexAttribP3uiv, 646, VertexAttribP3uiv@16)
-	GL_STUB(VertexAttribP4ui, 647, VertexAttribP4ui@16)
-	GL_STUB(VertexAttribP4uiv, 648, VertexAttribP4uiv@16)
-	GL_STUB(VertexP2ui, 649, VertexP2ui@8)
-	GL_STUB(VertexP2uiv, 650, VertexP2uiv@8)
-	GL_STUB(VertexP3ui, 651, VertexP3ui@8)
-	GL_STUB(VertexP3uiv, 652, VertexP3uiv@8)
-	GL_STUB(VertexP4ui, 653, VertexP4ui@8)
-	GL_STUB(VertexP4uiv, 654, VertexP4uiv@8)
-	GL_STUB(BindTransformFeedback, 655, BindTransformFeedback@8)
-	GL_STUB(DeleteTransformFeedbacks, 656, DeleteTransformFeedbacks@8)
-	GL_STUB(DrawTransformFeedback, 657, DrawTransformFeedback@8)
-	GL_STUB(GenTransformFeedbacks, 658, GenTransformFeedbacks@8)
-	GL_STUB(IsTransformFeedback, 659, IsTransformFeedback@4)
-	GL_STUB(PauseTransformFeedback, 660, PauseTransformFeedback@0)
-	GL_STUB(ResumeTransformFeedback, 661, ResumeTransformFeedback@0)
-	GL_STUB(ClearDepthf, 662, ClearDepthf@4)
-	GL_STUB(DepthRangef, 663, DepthRangef@8)
-	GL_STUB(GetShaderPrecisionFormat, 664, GetShaderPrecisionFormat@16)
-	GL_STUB(ReleaseShaderCompiler, 665, ReleaseShaderCompiler@0)
-	GL_STUB(ShaderBinary, 666, ShaderBinary@20)
-	GL_STUB(DebugMessageCallbackARB, 667, DebugMessageCallbackARB@8)
-	GL_STUB(DebugMessageControlARB, 668, DebugMessageControlARB@24)
-	GL_STUB(DebugMessageInsertARB, 669, DebugMessageInsertARB@24)
-	GL_STUB(GetDebugMessageLogARB, 670, GetDebugMessageLogARB@32)
-	GL_STUB(GetGraphicsResetStatusARB, 671, GetGraphicsResetStatusARB@0)
-	GL_STUB(GetnColorTableARB, 672, GetnColorTableARB@20)
-	GL_STUB(GetnCompressedTexImageARB, 673, GetnCompressedTexImageARB@16)
-	GL_STUB(GetnConvolutionFilterARB, 674, GetnConvolutionFilterARB@20)
-	GL_STUB(GetnHistogramARB, 675, GetnHistogramARB@24)
-	GL_STUB(GetnMapdvARB, 676, GetnMapdvARB@16)
-	GL_STUB(GetnMapfvARB, 677, GetnMapfvARB@16)
-	GL_STUB(GetnMapivARB, 678, GetnMapivARB@16)
-	GL_STUB(GetnMinmaxARB, 679, GetnMinmaxARB@24)
-	GL_STUB(GetnPixelMapfvARB, 680, GetnPixelMapfvARB@12)
-	GL_STUB(GetnPixelMapuivARB, 681, GetnPixelMapuivARB@12)
-	GL_STUB(GetnPixelMapusvARB, 682, GetnPixelMapusvARB@12)
-	GL_STUB(GetnPolygonStippleARB, 683, GetnPolygonStippleARB@8)
-	GL_STUB(GetnSeparableFilterARB, 684, GetnSeparableFilterARB@32)
-	GL_STUB(GetnTexImageARB, 685, GetnTexImageARB@24)
-	GL_STUB(GetnUniformdvARB, 686, GetnUniformdvARB@16)
-	GL_STUB(GetnUniformfvARB, 687, GetnUniformfvARB@16)
-	GL_STUB(GetnUniformivARB, 688, GetnUniformivARB@16)
-	GL_STUB(GetnUniformuivARB, 689, GetnUniformuivARB@16)
-	GL_STUB(ReadnPixelsARB, 690, ReadnPixelsARB@32)
-	GL_STUB(TexStorage1D, 691, TexStorage1D@16)
-	GL_STUB(TexStorage2D, 692, TexStorage2D@20)
-	GL_STUB(TexStorage3D, 693, TexStorage3D@24)
-	GL_STUB(TextureStorage1DEXT, 694, TextureStorage1DEXT@20)
-	GL_STUB(TextureStorage2DEXT, 695, TextureStorage2DEXT@24)
-	GL_STUB(TextureStorage3DEXT, 696, TextureStorage3DEXT@28)
-	GL_STUB(PolygonOffsetEXT, 697, PolygonOffsetEXT@8)
+	GL_STUB(FramebufferTexture, 436, FramebufferTexture@16)
+	GL_STUB(GetBufferParameteri64v, 437, GetBufferParameteri64v@12)
+	GL_STUB(GetInteger64i_v, 438, GetInteger64i_v@12)
+	GL_STUB(VertexAttribDivisor, 439, VertexAttribDivisor@8)
+	GL_STUB(LoadTransposeMatrixdARB, 440, LoadTransposeMatrixdARB@4)
+	GL_STUB(LoadTransposeMatrixfARB, 441, LoadTransposeMatrixfARB@4)
+	GL_STUB(MultTransposeMatrixdARB, 442, MultTransposeMatrixdARB@4)
+	GL_STUB(MultTransposeMatrixfARB, 443, MultTransposeMatrixfARB@4)
+	GL_STUB(SampleCoverageARB, 444, SampleCoverageARB@8)
+	GL_STUB(CompressedTexImage1DARB, 445, CompressedTexImage1DARB@28)
+	GL_STUB(CompressedTexImage2DARB, 446, CompressedTexImage2DARB@32)
+	GL_STUB(CompressedTexImage3DARB, 447, CompressedTexImage3DARB@36)
+	GL_STUB(CompressedTexSubImage1DARB, 448, CompressedTexSubImage1DARB@28)
+	GL_STUB(CompressedTexSubImage2DARB, 449, CompressedTexSubImage2DARB@36)
+	GL_STUB(CompressedTexSubImage3DARB, 450, CompressedTexSubImage3DARB@44)
+	GL_STUB(GetCompressedTexImageARB, 451, GetCompressedTexImageARB@12)
+	GL_STUB(DisableVertexAttribArrayARB, 452, DisableVertexAttribArrayARB@4)
+	GL_STUB(EnableVertexAttribArrayARB, 453, EnableVertexAttribArrayARB@4)
+	GL_STUB(GetProgramEnvParameterdvARB, 454, GetProgramEnvParameterdvARB@12)
+	GL_STUB(GetProgramEnvParameterfvARB, 455, GetProgramEnvParameterfvARB@12)
+	GL_STUB(GetProgramLocalParameterdvARB, 456, GetProgramLocalParameterdvARB@12)
+	GL_STUB(GetProgramLocalParameterfvARB, 457, GetProgramLocalParameterfvARB@12)
+	GL_STUB(GetProgramStringARB, 458, GetProgramStringARB@12)
+	GL_STUB(GetProgramivARB, 459, GetProgramivARB@12)
+	GL_STUB(GetVertexAttribdvARB, 460, GetVertexAttribdvARB@12)
+	GL_STUB(GetVertexAttribfvARB, 461, GetVertexAttribfvARB@12)
+	GL_STUB(GetVertexAttribivARB, 462, GetVertexAttribivARB@12)
+	GL_STUB(ProgramEnvParameter4dARB, 463, ProgramEnvParameter4dARB@40)
+	GL_STUB(ProgramEnvParameter4dvARB, 464, ProgramEnvParameter4dvARB@12)
+	GL_STUB(ProgramEnvParameter4fARB, 465, ProgramEnvParameter4fARB@24)
+	GL_STUB(ProgramEnvParameter4fvARB, 466, ProgramEnvParameter4fvARB@12)
+	GL_STUB(ProgramLocalParameter4dARB, 467, ProgramLocalParameter4dARB@40)
+	GL_STUB(ProgramLocalParameter4dvARB, 468, ProgramLocalParameter4dvARB@12)
+	GL_STUB(ProgramLocalParameter4fARB, 469, ProgramLocalParameter4fARB@24)
+	GL_STUB(ProgramLocalParameter4fvARB, 470, ProgramLocalParameter4fvARB@12)
+	GL_STUB(ProgramStringARB, 471, ProgramStringARB@16)
+	GL_STUB(VertexAttrib1dARB, 472, VertexAttrib1dARB@12)
+	GL_STUB(VertexAttrib1dvARB, 473, VertexAttrib1dvARB@8)
+	GL_STUB(VertexAttrib1fARB, 474, VertexAttrib1fARB@8)
+	GL_STUB(VertexAttrib1fvARB, 475, VertexAttrib1fvARB@8)
+	GL_STUB(VertexAttrib1sARB, 476, VertexAttrib1sARB@8)
+	GL_STUB(VertexAttrib1svARB, 477, VertexAttrib1svARB@8)
+	GL_STUB(VertexAttrib2dARB, 478, VertexAttrib2dARB@20)
+	GL_STUB(VertexAttrib2dvARB, 479, VertexAttrib2dvARB@8)
+	GL_STUB(VertexAttrib2fARB, 480, VertexAttrib2fARB@12)
+	GL_STUB(VertexAttrib2fvARB, 481, VertexAttrib2fvARB@8)
+	GL_STUB(VertexAttrib2sARB, 482, VertexAttrib2sARB@12)
+	GL_STUB(VertexAttrib2svARB, 483, VertexAttrib2svARB@8)
+	GL_STUB(VertexAttrib3dARB, 484, VertexAttrib3dARB@28)
+	GL_STUB(VertexAttrib3dvARB, 485, VertexAttrib3dvARB@8)
+	GL_STUB(VertexAttrib3fARB, 486, VertexAttrib3fARB@16)
+	GL_STUB(VertexAttrib3fvARB, 487, VertexAttrib3fvARB@8)
+	GL_STUB(VertexAttrib3sARB, 488, VertexAttrib3sARB@16)
+	GL_STUB(VertexAttrib3svARB, 489, VertexAttrib3svARB@8)
+	GL_STUB(VertexAttrib4NbvARB, 490, VertexAttrib4NbvARB@8)
+	GL_STUB(VertexAttrib4NivARB, 491, VertexAttrib4NivARB@8)
+	GL_STUB(VertexAttrib4NsvARB, 492, VertexAttrib4NsvARB@8)
+	GL_STUB(VertexAttrib4NubARB, 493, VertexAttrib4NubARB@20)
+	GL_STUB(VertexAttrib4NubvARB, 494, VertexAttrib4NubvARB@8)
+	GL_STUB(VertexAttrib4NuivARB, 495, VertexAttrib4NuivARB@8)
+	GL_STUB(VertexAttrib4NusvARB, 496, VertexAttrib4NusvARB@8)
+	GL_STUB(VertexAttrib4bvARB, 497, VertexAttrib4bvARB@8)
+	GL_STUB(VertexAttrib4dARB, 498, VertexAttrib4dARB@36)
+	GL_STUB(VertexAttrib4dvARB, 499, VertexAttrib4dvARB@8)
+	GL_STUB(VertexAttrib4fARB, 500, VertexAttrib4fARB@20)
+	GL_STUB(VertexAttrib4fvARB, 501, VertexAttrib4fvARB@8)
+	GL_STUB(VertexAttrib4ivARB, 502, VertexAttrib4ivARB@8)
+	GL_STUB(VertexAttrib4sARB, 503, VertexAttrib4sARB@20)
+	GL_STUB(VertexAttrib4svARB, 504, VertexAttrib4svARB@8)
+	GL_STUB(VertexAttrib4ubvARB, 505, VertexAttrib4ubvARB@8)
+	GL_STUB(VertexAttrib4uivARB, 506, VertexAttrib4uivARB@8)
+	GL_STUB(VertexAttrib4usvARB, 507, VertexAttrib4usvARB@8)
+	GL_STUB(VertexAttribPointerARB, 508, VertexAttribPointerARB@24)
+	GL_STUB(BindBufferARB, 509, BindBufferARB@8)
+	GL_STUB(BufferDataARB, 510, BufferDataARB@16)
+	GL_STUB(BufferSubDataARB, 511, BufferSubDataARB@16)
+	GL_STUB(DeleteBuffersARB, 512, DeleteBuffersARB@8)
+	GL_STUB(GenBuffersARB, 513, GenBuffersARB@8)
+	GL_STUB(GetBufferParameterivARB, 514, GetBufferParameterivARB@12)
+	GL_STUB(GetBufferPointervARB, 515, GetBufferPointervARB@12)
+	GL_STUB(GetBufferSubDataARB, 516, GetBufferSubDataARB@16)
+	GL_STUB(IsBufferARB, 517, IsBufferARB@4)
+	GL_STUB(MapBufferARB, 518, MapBufferARB@8)
+	GL_STUB(UnmapBufferARB, 519, UnmapBufferARB@4)
+	GL_STUB(BeginQueryARB, 520, BeginQueryARB@8)
+	GL_STUB(DeleteQueriesARB, 521, DeleteQueriesARB@8)
+	GL_STUB(EndQueryARB, 522, EndQueryARB@4)
+	GL_STUB(GenQueriesARB, 523, GenQueriesARB@8)
+	GL_STUB(GetQueryObjectivARB, 524, GetQueryObjectivARB@12)
+	GL_STUB(GetQueryObjectuivARB, 525, GetQueryObjectuivARB@12)
+	GL_STUB(GetQueryivARB, 526, GetQueryivARB@12)
+	GL_STUB(IsQueryARB, 527, IsQueryARB@4)
+	GL_STUB(AttachObjectARB, 528, AttachObjectARB@8)
+	GL_STUB(CompileShaderARB, 529, CompileShaderARB@4)
+	GL_STUB(CreateProgramObjectARB, 530, CreateProgramObjectARB@0)
+	GL_STUB(CreateShaderObjectARB, 531, CreateShaderObjectARB@4)
+	GL_STUB(DeleteObjectARB, 532, DeleteObjectARB@4)
+	GL_STUB(DetachObjectARB, 533, DetachObjectARB@8)
+	GL_STUB(GetActiveUniformARB, 534, GetActiveUniformARB@28)
+	GL_STUB(GetAttachedObjectsARB, 535, GetAttachedObjectsARB@16)
+	GL_STUB(GetHandleARB, 536, GetHandleARB@4)
+	GL_STUB(GetInfoLogARB, 537, GetInfoLogARB@16)
+	GL_STUB(GetObjectParameterfvARB, 538, GetObjectParameterfvARB@12)
+	GL_STUB(GetObjectParameterivARB, 539, GetObjectParameterivARB@12)
+	GL_STUB(GetShaderSourceARB, 540, GetShaderSourceARB@16)
+	GL_STUB(GetUniformLocationARB, 541, GetUniformLocationARB@8)
+	GL_STUB(GetUniformfvARB, 542, GetUniformfvARB@12)
+	GL_STUB(GetUniformivARB, 543, GetUniformivARB@12)
+	GL_STUB(LinkProgramARB, 544, LinkProgramARB@4)
+	GL_STUB(ShaderSourceARB, 545, ShaderSourceARB@16)
+	GL_STUB(Uniform1fARB, 546, Uniform1fARB@8)
+	GL_STUB(Uniform1fvARB, 547, Uniform1fvARB@12)
+	GL_STUB(Uniform1iARB, 548, Uniform1iARB@8)
+	GL_STUB(Uniform1ivARB, 549, Uniform1ivARB@12)
+	GL_STUB(Uniform2fARB, 550, Uniform2fARB@12)
+	GL_STUB(Uniform2fvARB, 551, Uniform2fvARB@12)
+	GL_STUB(Uniform2iARB, 552, Uniform2iARB@12)
+	GL_STUB(Uniform2ivARB, 553, Uniform2ivARB@12)
+	GL_STUB(Uniform3fARB, 554, Uniform3fARB@16)
+	GL_STUB(Uniform3fvARB, 555, Uniform3fvARB@12)
+	GL_STUB(Uniform3iARB, 556, Uniform3iARB@16)
+	GL_STUB(Uniform3ivARB, 557, Uniform3ivARB@12)
+	GL_STUB(Uniform4fARB, 558, Uniform4fARB@20)
+	GL_STUB(Uniform4fvARB, 559, Uniform4fvARB@12)
+	GL_STUB(Uniform4iARB, 560, Uniform4iARB@20)
+	GL_STUB(Uniform4ivARB, 561, Uniform4ivARB@12)
+	GL_STUB(UniformMatrix2fvARB, 562, UniformMatrix2fvARB@16)
+	GL_STUB(UniformMatrix3fvARB, 563, UniformMatrix3fvARB@16)
+	GL_STUB(UniformMatrix4fvARB, 564, UniformMatrix4fvARB@16)
+	GL_STUB(UseProgramObjectARB, 565, UseProgramObjectARB@4)
+	GL_STUB(ValidateProgramARB, 566, ValidateProgramARB@4)
+	GL_STUB(BindAttribLocationARB, 567, BindAttribLocationARB@12)
+	GL_STUB(GetActiveAttribARB, 568, GetActiveAttribARB@28)
+	GL_STUB(GetAttribLocationARB, 569, GetAttribLocationARB@8)
+	GL_STUB(DrawBuffersARB, 570, DrawBuffersARB@8)
+	GL_STUB(ClampColorARB, 571, ClampColorARB@8)
+	GL_STUB(DrawArraysInstancedARB, 572, DrawArraysInstancedARB@16)
+	GL_STUB(DrawElementsInstancedARB, 573, DrawElementsInstancedARB@20)
+	GL_STUB(RenderbufferStorageMultisample, 574, RenderbufferStorageMultisample@20)
+	GL_STUB(FramebufferTextureARB, 575, FramebufferTextureARB@16)
+	GL_STUB(FramebufferTextureFaceARB, 576, FramebufferTextureFaceARB@20)
+	GL_STUB(ProgramParameteriARB, 577, ProgramParameteriARB@12)
+	GL_STUB(VertexAttribDivisorARB, 578, VertexAttribDivisorARB@8)
+	GL_STUB(FlushMappedBufferRange, 579, FlushMappedBufferRange@12)
+	GL_STUB(MapBufferRange, 580, MapBufferRange@16)
+	GL_STUB(TexBufferARB, 581, TexBufferARB@12)
+	GL_STUB(BindVertexArray, 582, BindVertexArray@4)
+	GL_STUB(GenVertexArrays, 583, GenVertexArrays@8)
+	GL_STUB(CopyBufferSubData, 584, CopyBufferSubData@20)
+	GL_STUB(ClientWaitSync, 585, ClientWaitSync@12)
+	GL_STUB(DeleteSync, 586, DeleteSync@4)
+	GL_STUB(FenceSync, 587, FenceSync@8)
+	GL_STUB(GetInteger64v, 588, GetInteger64v@8)
+	GL_STUB(GetSynciv, 589, GetSynciv@20)
+	GL_STUB(IsSync, 590, IsSync@4)
+	GL_STUB(WaitSync, 591, WaitSync@12)
+	GL_STUB(DrawElementsBaseVertex, 592, DrawElementsBaseVertex@20)
+	GL_STUB(DrawElementsInstancedBaseVertex, 593, DrawElementsInstancedBaseVertex@24)
+	GL_STUB(DrawRangeElementsBaseVertex, 594, DrawRangeElementsBaseVertex@28)
+	GL_STUB(MultiDrawElementsBaseVertex, 595, MultiDrawElementsBaseVertex@24)
+	GL_STUB(BlendEquationSeparateiARB, 596, BlendEquationSeparateiARB@12)
+	GL_STUB(BlendEquationiARB, 597, BlendEquationiARB@8)
+	GL_STUB(BlendFuncSeparateiARB, 598, BlendFuncSeparateiARB@20)
+	GL_STUB(BlendFunciARB, 599, BlendFunciARB@12)
+	GL_STUB(BindFragDataLocationIndexed, 600, BindFragDataLocationIndexed@16)
+	GL_STUB(GetFragDataIndex, 601, GetFragDataIndex@8)
+	GL_STUB(BindSampler, 602, BindSampler@8)
+	GL_STUB(DeleteSamplers, 603, DeleteSamplers@8)
+	GL_STUB(GenSamplers, 604, GenSamplers@8)
+	GL_STUB(GetSamplerParameterIiv, 605, GetSamplerParameterIiv@12)
+	GL_STUB(GetSamplerParameterIuiv, 606, GetSamplerParameterIuiv@12)
+	GL_STUB(GetSamplerParameterfv, 607, GetSamplerParameterfv@12)
+	GL_STUB(GetSamplerParameteriv, 608, GetSamplerParameteriv@12)
+	GL_STUB(IsSampler, 609, IsSampler@4)
+	GL_STUB(SamplerParameterIiv, 610, SamplerParameterIiv@12)
+	GL_STUB(SamplerParameterIuiv, 611, SamplerParameterIuiv@12)
+	GL_STUB(SamplerParameterf, 612, SamplerParameterf@12)
+	GL_STUB(SamplerParameterfv, 613, SamplerParameterfv@12)
+	GL_STUB(SamplerParameteri, 614, SamplerParameteri@12)
+	GL_STUB(SamplerParameteriv, 615, SamplerParameteriv@12)
+	GL_STUB(ColorP3ui, 616, ColorP3ui@8)
+	GL_STUB(ColorP3uiv, 617, ColorP3uiv@8)
+	GL_STUB(ColorP4ui, 618, ColorP4ui@8)
+	GL_STUB(ColorP4uiv, 619, ColorP4uiv@8)
+	GL_STUB(MultiTexCoordP1ui, 620, MultiTexCoordP1ui@12)
+	GL_STUB(MultiTexCoordP1uiv, 621, MultiTexCoordP1uiv@12)
+	GL_STUB(MultiTexCoordP2ui, 622, MultiTexCoordP2ui@12)
+	GL_STUB(MultiTexCoordP2uiv, 623, MultiTexCoordP2uiv@12)
+	GL_STUB(MultiTexCoordP3ui, 624, MultiTexCoordP3ui@12)
+	GL_STUB(MultiTexCoordP3uiv, 625, MultiTexCoordP3uiv@12)
+	GL_STUB(MultiTexCoordP4ui, 626, MultiTexCoordP4ui@12)
+	GL_STUB(MultiTexCoordP4uiv, 627, MultiTexCoordP4uiv@12)
+	GL_STUB(NormalP3ui, 628, NormalP3ui@8)
+	GL_STUB(NormalP3uiv, 629, NormalP3uiv@8)
+	GL_STUB(SecondaryColorP3ui, 630, SecondaryColorP3ui@8)
+	GL_STUB(SecondaryColorP3uiv, 631, SecondaryColorP3uiv@8)
+	GL_STUB(TexCoordP1ui, 632, TexCoordP1ui@8)
+	GL_STUB(TexCoordP1uiv, 633, TexCoordP1uiv@8)
+	GL_STUB(TexCoordP2ui, 634, TexCoordP2ui@8)
+	GL_STUB(TexCoordP2uiv, 635, TexCoordP2uiv@8)
+	GL_STUB(TexCoordP3ui, 636, TexCoordP3ui@8)
+	GL_STUB(TexCoordP3uiv, 637, TexCoordP3uiv@8)
+	GL_STUB(TexCoordP4ui, 638, TexCoordP4ui@8)
+	GL_STUB(TexCoordP4uiv, 639, TexCoordP4uiv@8)
+	GL_STUB(VertexAttribP1ui, 640, VertexAttribP1ui@16)
+	GL_STUB(VertexAttribP1uiv, 641, VertexAttribP1uiv@16)
+	GL_STUB(VertexAttribP2ui, 642, VertexAttribP2ui@16)
+	GL_STUB(VertexAttribP2uiv, 643, VertexAttribP2uiv@16)
+	GL_STUB(VertexAttribP3ui, 644, VertexAttribP3ui@16)
+	GL_STUB(VertexAttribP3uiv, 645, VertexAttribP3uiv@16)
+	GL_STUB(VertexAttribP4ui, 646, VertexAttribP4ui@16)
+	GL_STUB(VertexAttribP4uiv, 647, VertexAttribP4uiv@16)
+	GL_STUB(VertexP2ui, 648, VertexP2ui@8)
+	GL_STUB(VertexP2uiv, 649, VertexP2uiv@8)
+	GL_STUB(VertexP3ui, 650, VertexP3ui@8)
+	GL_STUB(VertexP3uiv, 651, VertexP3uiv@8)
+	GL_STUB(VertexP4ui, 652, VertexP4ui@8)
+	GL_STUB(VertexP4uiv, 653, VertexP4uiv@8)
+	GL_STUB(BindTransformFeedback, 654, BindTransformFeedback@8)
+	GL_STUB(DeleteTransformFeedbacks, 655, DeleteTransformFeedbacks@8)
+	GL_STUB(DrawTransformFeedback, 656, DrawTransformFeedback@8)
+	GL_STUB(GenTransformFeedbacks, 657, GenTransformFeedbacks@8)
+	GL_STUB(IsTransformFeedback, 658, IsTransformFeedback@4)
+	GL_STUB(PauseTransformFeedback, 659, PauseTransformFeedback@0)
+	GL_STUB(ResumeTransformFeedback, 660, ResumeTransformFeedback@0)
+	GL_STUB(ClearDepthf, 661, ClearDepthf@4)
+	GL_STUB(DepthRangef, 662, DepthRangef@8)
+	GL_STUB(GetShaderPrecisionFormat, 663, GetShaderPrecisionFormat@16)
+	GL_STUB(ReleaseShaderCompiler, 664, ReleaseShaderCompiler@0)
+	GL_STUB(ShaderBinary, 665, ShaderBinary@20)
+	GL_STUB(DebugMessageCallbackARB, 666, DebugMessageCallbackARB@8)
+	GL_STUB(DebugMessageControlARB, 667, DebugMessageControlARB@24)
+	GL_STUB(DebugMessageInsertARB, 668, DebugMessageInsertARB@24)
+	GL_STUB(GetDebugMessageLogARB, 669, GetDebugMessageLogARB@32)
+	GL_STUB(GetGraphicsResetStatusARB, 670, GetGraphicsResetStatusARB@0)
+	GL_STUB(GetnColorTableARB, 671, GetnColorTableARB@20)
+	GL_STUB(GetnCompressedTexImageARB, 672, GetnCompressedTexImageARB@16)
+	GL_STUB(GetnConvolutionFilterARB, 673, GetnConvolutionFilterARB@20)
+	GL_STUB(GetnHistogramARB, 674, GetnHistogramARB@24)
+	GL_STUB(GetnMapdvARB, 675, GetnMapdvARB@16)
+	GL_STUB(GetnMapfvARB, 676, GetnMapfvARB@16)
+	GL_STUB(GetnMapivARB, 677, GetnMapivARB@16)
+	GL_STUB(GetnMinmaxARB, 678, GetnMinmaxARB@24)
+	GL_STUB(GetnPixelMapfvARB, 679, GetnPixelMapfvARB@12)
+	GL_STUB(GetnPixelMapuivARB, 680, GetnPixelMapuivARB@12)
+	GL_STUB(GetnPixelMapusvARB, 681, GetnPixelMapusvARB@12)
+	GL_STUB(GetnPolygonStippleARB, 682, GetnPolygonStippleARB@8)
+	GL_STUB(GetnSeparableFilterARB, 683, GetnSeparableFilterARB@32)
+	GL_STUB(GetnTexImageARB, 684, GetnTexImageARB@24)
+	GL_STUB(GetnUniformdvARB, 685, GetnUniformdvARB@16)
+	GL_STUB(GetnUniformfvARB, 686, GetnUniformfvARB@16)
+	GL_STUB(GetnUniformivARB, 687, GetnUniformivARB@16)
+	GL_STUB(GetnUniformuivARB, 688, GetnUniformuivARB@16)
+	GL_STUB(ReadnPixelsARB, 689, ReadnPixelsARB@32)
+	GL_STUB(TexStorage1D, 690, TexStorage1D@16)
+	GL_STUB(TexStorage2D, 691, TexStorage2D@20)
+	GL_STUB(TexStorage3D, 692, TexStorage3D@24)
+	GL_STUB(TextureStorage1DEXT, 693, TextureStorage1DEXT@20)
+	GL_STUB(TextureStorage2DEXT, 694, TextureStorage2DEXT@24)
+	GL_STUB(TextureStorage3DEXT, 695, TextureStorage3DEXT@28)
+	GL_STUB(PolygonOffsetEXT, 696, PolygonOffsetEXT@8)
+	GL_STUB(_dispatch_stub_697, 697, _dispatch_stub_697@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_697, _dispatch_stub_697@8))
 	GL_STUB(_dispatch_stub_698, 698, _dispatch_stub_698@8)
 	HIDDEN(GL_PREFIX(_dispatch_stub_698, _dispatch_stub_698@8))
 	GL_STUB(_dispatch_stub_699, 699, _dispatch_stub_699@8)
@@ -860,310 +861,308 @@ GLNAME(gl_dispatch_functions_start):
 	HIDDEN(GL_PREFIX(_dispatch_stub_702, _dispatch_stub_702@8))
 	GL_STUB(_dispatch_stub_703, 703, _dispatch_stub_703@8)
 	HIDDEN(GL_PREFIX(_dispatch_stub_703, _dispatch_stub_703@8))
-	GL_STUB(_dispatch_stub_704, 704, _dispatch_stub_704@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_704, _dispatch_stub_704@8))
-	GL_STUB(_dispatch_stub_705, 705, _dispatch_stub_705@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_705, _dispatch_stub_705@4))
-	GL_STUB(ColorPointerEXT, 706, ColorPointerEXT@20)
-	GL_STUB(EdgeFlagPointerEXT, 707, EdgeFlagPointerEXT@12)
-	GL_STUB(IndexPointerEXT, 708, IndexPointerEXT@16)
-	GL_STUB(NormalPointerEXT, 709, NormalPointerEXT@16)
-	GL_STUB(TexCoordPointerEXT, 710, TexCoordPointerEXT@20)
-	GL_STUB(VertexPointerEXT, 711, VertexPointerEXT@20)
-	GL_STUB(PointParameterfEXT, 712, PointParameterfEXT@8)
-	GL_STUB(PointParameterfvEXT, 713, PointParameterfvEXT@8)
-	GL_STUB(LockArraysEXT, 714, LockArraysEXT@8)
-	GL_STUB(UnlockArraysEXT, 715, UnlockArraysEXT@0)
-	GL_STUB(SecondaryColor3bEXT, 716, SecondaryColor3bEXT@12)
-	GL_STUB(SecondaryColor3bvEXT, 717, SecondaryColor3bvEXT@4)
-	GL_STUB(SecondaryColor3dEXT, 718, SecondaryColor3dEXT@24)
-	GL_STUB(SecondaryColor3dvEXT, 719, SecondaryColor3dvEXT@4)
-	GL_STUB(SecondaryColor3fEXT, 720, SecondaryColor3fEXT@12)
-	GL_STUB(SecondaryColor3fvEXT, 721, SecondaryColor3fvEXT@4)
-	GL_STUB(SecondaryColor3iEXT, 722, SecondaryColor3iEXT@12)
-	GL_STUB(SecondaryColor3ivEXT, 723, SecondaryColor3ivEXT@4)
-	GL_STUB(SecondaryColor3sEXT, 724, SecondaryColor3sEXT@12)
-	GL_STUB(SecondaryColor3svEXT, 725, SecondaryColor3svEXT@4)
-	GL_STUB(SecondaryColor3ubEXT, 726, SecondaryColor3ubEXT@12)
-	GL_STUB(SecondaryColor3ubvEXT, 727, SecondaryColor3ubvEXT@4)
-	GL_STUB(SecondaryColor3uiEXT, 728, SecondaryColor3uiEXT@12)
-	GL_STUB(SecondaryColor3uivEXT, 729, SecondaryColor3uivEXT@4)
-	GL_STUB(SecondaryColor3usEXT, 730, SecondaryColor3usEXT@12)
-	GL_STUB(SecondaryColor3usvEXT, 731, SecondaryColor3usvEXT@4)
-	GL_STUB(SecondaryColorPointerEXT, 732, SecondaryColorPointerEXT@16)
-	GL_STUB(MultiDrawArraysEXT, 733, MultiDrawArraysEXT@16)
-	GL_STUB(MultiDrawElementsEXT, 734, MultiDrawElementsEXT@20)
-	GL_STUB(FogCoordPointerEXT, 735, FogCoordPointerEXT@12)
-	GL_STUB(FogCoorddEXT, 736, FogCoorddEXT@8)
-	GL_STUB(FogCoorddvEXT, 737, FogCoorddvEXT@4)
-	GL_STUB(FogCoordfEXT, 738, FogCoordfEXT@4)
-	GL_STUB(FogCoordfvEXT, 739, FogCoordfvEXT@4)
-	GL_STUB(_dispatch_stub_740, 740, _dispatch_stub_740@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_740, _dispatch_stub_740@4))
-	GL_STUB(BlendFuncSeparateEXT, 741, BlendFuncSeparateEXT@16)
-	GL_STUB(FlushVertexArrayRangeNV, 742, FlushVertexArrayRangeNV@0)
-	GL_STUB(VertexArrayRangeNV, 743, VertexArrayRangeNV@8)
-	GL_STUB(CombinerInputNV, 744, CombinerInputNV@24)
-	GL_STUB(CombinerOutputNV, 745, CombinerOutputNV@40)
-	GL_STUB(CombinerParameterfNV, 746, CombinerParameterfNV@8)
-	GL_STUB(CombinerParameterfvNV, 747, CombinerParameterfvNV@8)
-	GL_STUB(CombinerParameteriNV, 748, CombinerParameteriNV@8)
-	GL_STUB(CombinerParameterivNV, 749, CombinerParameterivNV@8)
-	GL_STUB(FinalCombinerInputNV, 750, FinalCombinerInputNV@16)
-	GL_STUB(GetCombinerInputParameterfvNV, 751, GetCombinerInputParameterfvNV@20)
-	GL_STUB(GetCombinerInputParameterivNV, 752, GetCombinerInputParameterivNV@20)
-	GL_STUB(GetCombinerOutputParameterfvNV, 753, GetCombinerOutputParameterfvNV@16)
-	GL_STUB(GetCombinerOutputParameterivNV, 754, GetCombinerOutputParameterivNV@16)
-	GL_STUB(GetFinalCombinerInputParameterfvNV, 755, GetFinalCombinerInputParameterfvNV@12)
-	GL_STUB(GetFinalCombinerInputParameterivNV, 756, GetFinalCombinerInputParameterivNV@12)
-	GL_STUB(ResizeBuffersMESA, 757, ResizeBuffersMESA@0)
-	GL_STUB(WindowPos2dMESA, 758, WindowPos2dMESA@16)
-	GL_STUB(WindowPos2dvMESA, 759, WindowPos2dvMESA@4)
-	GL_STUB(WindowPos2fMESA, 760, WindowPos2fMESA@8)
-	GL_STUB(WindowPos2fvMESA, 761, WindowPos2fvMESA@4)
-	GL_STUB(WindowPos2iMESA, 762, WindowPos2iMESA@8)
-	GL_STUB(WindowPos2ivMESA, 763, WindowPos2ivMESA@4)
-	GL_STUB(WindowPos2sMESA, 764, WindowPos2sMESA@8)
-	GL_STUB(WindowPos2svMESA, 765, WindowPos2svMESA@4)
-	GL_STUB(WindowPos3dMESA, 766, WindowPos3dMESA@24)
-	GL_STUB(WindowPos3dvMESA, 767, WindowPos3dvMESA@4)
-	GL_STUB(WindowPos3fMESA, 768, WindowPos3fMESA@12)
-	GL_STUB(WindowPos3fvMESA, 769, WindowPos3fvMESA@4)
-	GL_STUB(WindowPos3iMESA, 770, WindowPos3iMESA@12)
-	GL_STUB(WindowPos3ivMESA, 771, WindowPos3ivMESA@4)
-	GL_STUB(WindowPos3sMESA, 772, WindowPos3sMESA@12)
-	GL_STUB(WindowPos3svMESA, 773, WindowPos3svMESA@4)
-	GL_STUB(WindowPos4dMESA, 774, WindowPos4dMESA@32)
-	GL_STUB(WindowPos4dvMESA, 775, WindowPos4dvMESA@4)
-	GL_STUB(WindowPos4fMESA, 776, WindowPos4fMESA@16)
-	GL_STUB(WindowPos4fvMESA, 777, WindowPos4fvMESA@4)
-	GL_STUB(WindowPos4iMESA, 778, WindowPos4iMESA@16)
-	GL_STUB(WindowPos4ivMESA, 779, WindowPos4ivMESA@4)
-	GL_STUB(WindowPos4sMESA, 780, WindowPos4sMESA@16)
-	GL_STUB(WindowPos4svMESA, 781, WindowPos4svMESA@4)
-	GL_STUB(_dispatch_stub_782, 782, _dispatch_stub_782@20)
-	HIDDEN(GL_PREFIX(_dispatch_stub_782, _dispatch_stub_782@20))
-	GL_STUB(_dispatch_stub_783, 783, _dispatch_stub_783@24)
-	HIDDEN(GL_PREFIX(_dispatch_stub_783, _dispatch_stub_783@24))
-	GL_STUB(_dispatch_stub_784, 784, _dispatch_stub_784@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_784, _dispatch_stub_784@8))
-	GL_STUB(_dispatch_stub_785, 785, _dispatch_stub_785@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_785, _dispatch_stub_785@4))
-	GL_STUB(_dispatch_stub_786, 786, _dispatch_stub_786@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_786, _dispatch_stub_786@8))
-	GL_STUB(_dispatch_stub_787, 787, _dispatch_stub_787@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_787, _dispatch_stub_787@12))
-	GL_STUB(_dispatch_stub_788, 788, _dispatch_stub_788@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_788, _dispatch_stub_788@4))
-	GL_STUB(_dispatch_stub_789, 789, _dispatch_stub_789@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_789, _dispatch_stub_789@8))
-	GL_STUB(_dispatch_stub_790, 790, _dispatch_stub_790@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_790, _dispatch_stub_790@4))
-	GL_STUB(AreProgramsResidentNV, 791, AreProgramsResidentNV@12)
-	GL_STUB(BindProgramNV, 792, BindProgramNV@8)
-	GL_STUB(DeleteProgramsNV, 793, DeleteProgramsNV@8)
-	GL_STUB(ExecuteProgramNV, 794, ExecuteProgramNV@12)
-	GL_STUB(GenProgramsNV, 795, GenProgramsNV@8)
-	GL_STUB(GetProgramParameterdvNV, 796, GetProgramParameterdvNV@16)
-	GL_STUB(GetProgramParameterfvNV, 797, GetProgramParameterfvNV@16)
-	GL_STUB(GetProgramStringNV, 798, GetProgramStringNV@12)
-	GL_STUB(GetProgramivNV, 799, GetProgramivNV@12)
-	GL_STUB(GetTrackMatrixivNV, 800, GetTrackMatrixivNV@16)
-	GL_STUB(GetVertexAttribPointervNV, 801, GetVertexAttribPointervNV@12)
-	GL_STUB(GetVertexAttribdvNV, 802, GetVertexAttribdvNV@12)
-	GL_STUB(GetVertexAttribfvNV, 803, GetVertexAttribfvNV@12)
-	GL_STUB(GetVertexAttribivNV, 804, GetVertexAttribivNV@12)
-	GL_STUB(IsProgramNV, 805, IsProgramNV@4)
-	GL_STUB(LoadProgramNV, 806, LoadProgramNV@16)
-	GL_STUB(ProgramParameters4dvNV, 807, ProgramParameters4dvNV@16)
-	GL_STUB(ProgramParameters4fvNV, 808, ProgramParameters4fvNV@16)
-	GL_STUB(RequestResidentProgramsNV, 809, RequestResidentProgramsNV@8)
-	GL_STUB(TrackMatrixNV, 810, TrackMatrixNV@16)
-	GL_STUB(VertexAttrib1dNV, 811, VertexAttrib1dNV@12)
-	GL_STUB(VertexAttrib1dvNV, 812, VertexAttrib1dvNV@8)
-	GL_STUB(VertexAttrib1fNV, 813, VertexAttrib1fNV@8)
-	GL_STUB(VertexAttrib1fvNV, 814, VertexAttrib1fvNV@8)
-	GL_STUB(VertexAttrib1sNV, 815, VertexAttrib1sNV@8)
-	GL_STUB(VertexAttrib1svNV, 816, VertexAttrib1svNV@8)
-	GL_STUB(VertexAttrib2dNV, 817, VertexAttrib2dNV@20)
-	GL_STUB(VertexAttrib2dvNV, 818, VertexAttrib2dvNV@8)
-	GL_STUB(VertexAttrib2fNV, 819, VertexAttrib2fNV@12)
-	GL_STUB(VertexAttrib2fvNV, 820, VertexAttrib2fvNV@8)
-	GL_STUB(VertexAttrib2sNV, 821, VertexAttrib2sNV@12)
-	GL_STUB(VertexAttrib2svNV, 822, VertexAttrib2svNV@8)
-	GL_STUB(VertexAttrib3dNV, 823, VertexAttrib3dNV@28)
-	GL_STUB(VertexAttrib3dvNV, 824, VertexAttrib3dvNV@8)
-	GL_STUB(VertexAttrib3fNV, 825, VertexAttrib3fNV@16)
-	GL_STUB(VertexAttrib3fvNV, 826, VertexAttrib3fvNV@8)
-	GL_STUB(VertexAttrib3sNV, 827, VertexAttrib3sNV@16)
-	GL_STUB(VertexAttrib3svNV, 828, VertexAttrib3svNV@8)
-	GL_STUB(VertexAttrib4dNV, 829, VertexAttrib4dNV@36)
-	GL_STUB(VertexAttrib4dvNV, 830, VertexAttrib4dvNV@8)
-	GL_STUB(VertexAttrib4fNV, 831, VertexAttrib4fNV@20)
-	GL_STUB(VertexAttrib4fvNV, 832, VertexAttrib4fvNV@8)
-	GL_STUB(VertexAttrib4sNV, 833, VertexAttrib4sNV@20)
-	GL_STUB(VertexAttrib4svNV, 834, VertexAttrib4svNV@8)
-	GL_STUB(VertexAttrib4ubNV, 835, VertexAttrib4ubNV@20)
-	GL_STUB(VertexAttrib4ubvNV, 836, VertexAttrib4ubvNV@8)
-	GL_STUB(VertexAttribPointerNV, 837, VertexAttribPointerNV@20)
-	GL_STUB(VertexAttribs1dvNV, 838, VertexAttribs1dvNV@12)
-	GL_STUB(VertexAttribs1fvNV, 839, VertexAttribs1fvNV@12)
-	GL_STUB(VertexAttribs1svNV, 840, VertexAttribs1svNV@12)
-	GL_STUB(VertexAttribs2dvNV, 841, VertexAttribs2dvNV@12)
-	GL_STUB(VertexAttribs2fvNV, 842, VertexAttribs2fvNV@12)
-	GL_STUB(VertexAttribs2svNV, 843, VertexAttribs2svNV@12)
-	GL_STUB(VertexAttribs3dvNV, 844, VertexAttribs3dvNV@12)
-	GL_STUB(VertexAttribs3fvNV, 845, VertexAttribs3fvNV@12)
-	GL_STUB(VertexAttribs3svNV, 846, VertexAttribs3svNV@12)
-	GL_STUB(VertexAttribs4dvNV, 847, VertexAttribs4dvNV@12)
-	GL_STUB(VertexAttribs4fvNV, 848, VertexAttribs4fvNV@12)
-	GL_STUB(VertexAttribs4svNV, 849, VertexAttribs4svNV@12)
-	GL_STUB(VertexAttribs4ubvNV, 850, VertexAttribs4ubvNV@12)
-	GL_STUB(GetTexBumpParameterfvATI, 851, GetTexBumpParameterfvATI@8)
-	GL_STUB(GetTexBumpParameterivATI, 852, GetTexBumpParameterivATI@8)
-	GL_STUB(TexBumpParameterfvATI, 853, TexBumpParameterfvATI@8)
-	GL_STUB(TexBumpParameterivATI, 854, TexBumpParameterivATI@8)
-	GL_STUB(AlphaFragmentOp1ATI, 855, AlphaFragmentOp1ATI@24)
-	GL_STUB(AlphaFragmentOp2ATI, 856, AlphaFragmentOp2ATI@36)
-	GL_STUB(AlphaFragmentOp3ATI, 857, AlphaFragmentOp3ATI@48)
-	GL_STUB(BeginFragmentShaderATI, 858, BeginFragmentShaderATI@0)
-	GL_STUB(BindFragmentShaderATI, 859, BindFragmentShaderATI@4)
-	GL_STUB(ColorFragmentOp1ATI, 860, ColorFragmentOp1ATI@28)
-	GL_STUB(ColorFragmentOp2ATI, 861, ColorFragmentOp2ATI@40)
-	GL_STUB(ColorFragmentOp3ATI, 862, ColorFragmentOp3ATI@52)
-	GL_STUB(DeleteFragmentShaderATI, 863, DeleteFragmentShaderATI@4)
-	GL_STUB(EndFragmentShaderATI, 864, EndFragmentShaderATI@0)
-	GL_STUB(GenFragmentShadersATI, 865, GenFragmentShadersATI@4)
-	GL_STUB(PassTexCoordATI, 866, PassTexCoordATI@12)
-	GL_STUB(SampleMapATI, 867, SampleMapATI@12)
-	GL_STUB(SetFragmentShaderConstantATI, 868, SetFragmentShaderConstantATI@8)
-	GL_STUB(PointParameteriNV, 869, PointParameteriNV@8)
-	GL_STUB(PointParameterivNV, 870, PointParameterivNV@8)
+	GL_STUB(_dispatch_stub_704, 704, _dispatch_stub_704@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_704, _dispatch_stub_704@4))
+	GL_STUB(ColorPointerEXT, 705, ColorPointerEXT@20)
+	GL_STUB(EdgeFlagPointerEXT, 706, EdgeFlagPointerEXT@12)
+	GL_STUB(IndexPointerEXT, 707, IndexPointerEXT@16)
+	GL_STUB(NormalPointerEXT, 708, NormalPointerEXT@16)
+	GL_STUB(TexCoordPointerEXT, 709, TexCoordPointerEXT@20)
+	GL_STUB(VertexPointerEXT, 710, VertexPointerEXT@20)
+	GL_STUB(PointParameterfEXT, 711, PointParameterfEXT@8)
+	GL_STUB(PointParameterfvEXT, 712, PointParameterfvEXT@8)
+	GL_STUB(LockArraysEXT, 713, LockArraysEXT@8)
+	GL_STUB(UnlockArraysEXT, 714, UnlockArraysEXT@0)
+	GL_STUB(SecondaryColor3bEXT, 715, SecondaryColor3bEXT@12)
+	GL_STUB(SecondaryColor3bvEXT, 716, SecondaryColor3bvEXT@4)
+	GL_STUB(SecondaryColor3dEXT, 717, SecondaryColor3dEXT@24)
+	GL_STUB(SecondaryColor3dvEXT, 718, SecondaryColor3dvEXT@4)
+	GL_STUB(SecondaryColor3fEXT, 719, SecondaryColor3fEXT@12)
+	GL_STUB(SecondaryColor3fvEXT, 720, SecondaryColor3fvEXT@4)
+	GL_STUB(SecondaryColor3iEXT, 721, SecondaryColor3iEXT@12)
+	GL_STUB(SecondaryColor3ivEXT, 722, SecondaryColor3ivEXT@4)
+	GL_STUB(SecondaryColor3sEXT, 723, SecondaryColor3sEXT@12)
+	GL_STUB(SecondaryColor3svEXT, 724, SecondaryColor3svEXT@4)
+	GL_STUB(SecondaryColor3ubEXT, 725, SecondaryColor3ubEXT@12)
+	GL_STUB(SecondaryColor3ubvEXT, 726, SecondaryColor3ubvEXT@4)
+	GL_STUB(SecondaryColor3uiEXT, 727, SecondaryColor3uiEXT@12)
+	GL_STUB(SecondaryColor3uivEXT, 728, SecondaryColor3uivEXT@4)
+	GL_STUB(SecondaryColor3usEXT, 729, SecondaryColor3usEXT@12)
+	GL_STUB(SecondaryColor3usvEXT, 730, SecondaryColor3usvEXT@4)
+	GL_STUB(SecondaryColorPointerEXT, 731, SecondaryColorPointerEXT@16)
+	GL_STUB(MultiDrawArraysEXT, 732, MultiDrawArraysEXT@16)
+	GL_STUB(MultiDrawElementsEXT, 733, MultiDrawElementsEXT@20)
+	GL_STUB(FogCoordPointerEXT, 734, FogCoordPointerEXT@12)
+	GL_STUB(FogCoorddEXT, 735, FogCoorddEXT@8)
+	GL_STUB(FogCoorddvEXT, 736, FogCoorddvEXT@4)
+	GL_STUB(FogCoordfEXT, 737, FogCoordfEXT@4)
+	GL_STUB(FogCoordfvEXT, 738, FogCoordfvEXT@4)
+	GL_STUB(_dispatch_stub_739, 739, _dispatch_stub_739@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_739, _dispatch_stub_739@4))
+	GL_STUB(BlendFuncSeparateEXT, 740, BlendFuncSeparateEXT@16)
+	GL_STUB(FlushVertexArrayRangeNV, 741, FlushVertexArrayRangeNV@0)
+	GL_STUB(VertexArrayRangeNV, 742, VertexArrayRangeNV@8)
+	GL_STUB(CombinerInputNV, 743, CombinerInputNV@24)
+	GL_STUB(CombinerOutputNV, 744, CombinerOutputNV@40)
+	GL_STUB(CombinerParameterfNV, 745, CombinerParameterfNV@8)
+	GL_STUB(CombinerParameterfvNV, 746, CombinerParameterfvNV@8)
+	GL_STUB(CombinerParameteriNV, 747, CombinerParameteriNV@8)
+	GL_STUB(CombinerParameterivNV, 748, CombinerParameterivNV@8)
+	GL_STUB(FinalCombinerInputNV, 749, FinalCombinerInputNV@16)
+	GL_STUB(GetCombinerInputParameterfvNV, 750, GetCombinerInputParameterfvNV@20)
+	GL_STUB(GetCombinerInputParameterivNV, 751, GetCombinerInputParameterivNV@20)
+	GL_STUB(GetCombinerOutputParameterfvNV, 752, GetCombinerOutputParameterfvNV@16)
+	GL_STUB(GetCombinerOutputParameterivNV, 753, GetCombinerOutputParameterivNV@16)
+	GL_STUB(GetFinalCombinerInputParameterfvNV, 754, GetFinalCombinerInputParameterfvNV@12)
+	GL_STUB(GetFinalCombinerInputParameterivNV, 755, GetFinalCombinerInputParameterivNV@12)
+	GL_STUB(ResizeBuffersMESA, 756, ResizeBuffersMESA@0)
+	GL_STUB(WindowPos2dMESA, 757, WindowPos2dMESA@16)
+	GL_STUB(WindowPos2dvMESA, 758, WindowPos2dvMESA@4)
+	GL_STUB(WindowPos2fMESA, 759, WindowPos2fMESA@8)
+	GL_STUB(WindowPos2fvMESA, 760, WindowPos2fvMESA@4)
+	GL_STUB(WindowPos2iMESA, 761, WindowPos2iMESA@8)
+	GL_STUB(WindowPos2ivMESA, 762, WindowPos2ivMESA@4)
+	GL_STUB(WindowPos2sMESA, 763, WindowPos2sMESA@8)
+	GL_STUB(WindowPos2svMESA, 764, WindowPos2svMESA@4)
+	GL_STUB(WindowPos3dMESA, 765, WindowPos3dMESA@24)
+	GL_STUB(WindowPos3dvMESA, 766, WindowPos3dvMESA@4)
+	GL_STUB(WindowPos3fMESA, 767, WindowPos3fMESA@12)
+	GL_STUB(WindowPos3fvMESA, 768, WindowPos3fvMESA@4)
+	GL_STUB(WindowPos3iMESA, 769, WindowPos3iMESA@12)
+	GL_STUB(WindowPos3ivMESA, 770, WindowPos3ivMESA@4)
+	GL_STUB(WindowPos3sMESA, 771, WindowPos3sMESA@12)
+	GL_STUB(WindowPos3svMESA, 772, WindowPos3svMESA@4)
+	GL_STUB(WindowPos4dMESA, 773, WindowPos4dMESA@32)
+	GL_STUB(WindowPos4dvMESA, 774, WindowPos4dvMESA@4)
+	GL_STUB(WindowPos4fMESA, 775, WindowPos4fMESA@16)
+	GL_STUB(WindowPos4fvMESA, 776, WindowPos4fvMESA@4)
+	GL_STUB(WindowPos4iMESA, 777, WindowPos4iMESA@16)
+	GL_STUB(WindowPos4ivMESA, 778, WindowPos4ivMESA@4)
+	GL_STUB(WindowPos4sMESA, 779, WindowPos4sMESA@16)
+	GL_STUB(WindowPos4svMESA, 780, WindowPos4svMESA@4)
+	GL_STUB(_dispatch_stub_781, 781, _dispatch_stub_781@20)
+	HIDDEN(GL_PREFIX(_dispatch_stub_781, _dispatch_stub_781@20))
+	GL_STUB(_dispatch_stub_782, 782, _dispatch_stub_782@24)
+	HIDDEN(GL_PREFIX(_dispatch_stub_782, _dispatch_stub_782@24))
+	GL_STUB(_dispatch_stub_783, 783, _dispatch_stub_783@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_783, _dispatch_stub_783@8))
+	GL_STUB(_dispatch_stub_784, 784, _dispatch_stub_784@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_784, _dispatch_stub_784@4))
+	GL_STUB(_dispatch_stub_785, 785, _dispatch_stub_785@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_785, _dispatch_stub_785@8))
+	GL_STUB(_dispatch_stub_786, 786, _dispatch_stub_786@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_786, _dispatch_stub_786@12))
+	GL_STUB(_dispatch_stub_787, 787, _dispatch_stub_787@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_787, _dispatch_stub_787@4))
+	GL_STUB(_dispatch_stub_788, 788, _dispatch_stub_788@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_788, _dispatch_stub_788@8))
+	GL_STUB(_dispatch_stub_789, 789, _dispatch_stub_789@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_789, _dispatch_stub_789@4))
+	GL_STUB(AreProgramsResidentNV, 790, AreProgramsResidentNV@12)
+	GL_STUB(BindProgramNV, 791, BindProgramNV@8)
+	GL_STUB(DeleteProgramsNV, 792, DeleteProgramsNV@8)
+	GL_STUB(ExecuteProgramNV, 793, ExecuteProgramNV@12)
+	GL_STUB(GenProgramsNV, 794, GenProgramsNV@8)
+	GL_STUB(GetProgramParameterdvNV, 795, GetProgramParameterdvNV@16)
+	GL_STUB(GetProgramParameterfvNV, 796, GetProgramParameterfvNV@16)
+	GL_STUB(GetProgramStringNV, 797, GetProgramStringNV@12)
+	GL_STUB(GetProgramivNV, 798, GetProgramivNV@12)
+	GL_STUB(GetTrackMatrixivNV, 799, GetTrackMatrixivNV@16)
+	GL_STUB(GetVertexAttribPointervNV, 800, GetVertexAttribPointervNV@12)
+	GL_STUB(GetVertexAttribdvNV, 801, GetVertexAttribdvNV@12)
+	GL_STUB(GetVertexAttribfvNV, 802, GetVertexAttribfvNV@12)
+	GL_STUB(GetVertexAttribivNV, 803, GetVertexAttribivNV@12)
+	GL_STUB(IsProgramNV, 804, IsProgramNV@4)
+	GL_STUB(LoadProgramNV, 805, LoadProgramNV@16)
+	GL_STUB(ProgramParameters4dvNV, 806, ProgramParameters4dvNV@16)
+	GL_STUB(ProgramParameters4fvNV, 807, ProgramParameters4fvNV@16)
+	GL_STUB(RequestResidentProgramsNV, 808, RequestResidentProgramsNV@8)
+	GL_STUB(TrackMatrixNV, 809, TrackMatrixNV@16)
+	GL_STUB(VertexAttrib1dNV, 810, VertexAttrib1dNV@12)
+	GL_STUB(VertexAttrib1dvNV, 811, VertexAttrib1dvNV@8)
+	GL_STUB(VertexAttrib1fNV, 812, VertexAttrib1fNV@8)
+	GL_STUB(VertexAttrib1fvNV, 813, VertexAttrib1fvNV@8)
+	GL_STUB(VertexAttrib1sNV, 814, VertexAttrib1sNV@8)
+	GL_STUB(VertexAttrib1svNV, 815, VertexAttrib1svNV@8)
+	GL_STUB(VertexAttrib2dNV, 816, VertexAttrib2dNV@20)
+	GL_STUB(VertexAttrib2dvNV, 817, VertexAttrib2dvNV@8)
+	GL_STUB(VertexAttrib2fNV, 818, VertexAttrib2fNV@12)
+	GL_STUB(VertexAttrib2fvNV, 819, VertexAttrib2fvNV@8)
+	GL_STUB(VertexAttrib2sNV, 820, VertexAttrib2sNV@12)
+	GL_STUB(VertexAttrib2svNV, 821, VertexAttrib2svNV@8)
+	GL_STUB(VertexAttrib3dNV, 822, VertexAttrib3dNV@28)
+	GL_STUB(VertexAttrib3dvNV, 823, VertexAttrib3dvNV@8)
+	GL_STUB(VertexAttrib3fNV, 824, VertexAttrib3fNV@16)
+	GL_STUB(VertexAttrib3fvNV, 825, VertexAttrib3fvNV@8)
+	GL_STUB(VertexAttrib3sNV, 826, VertexAttrib3sNV@16)
+	GL_STUB(VertexAttrib3svNV, 827, VertexAttrib3svNV@8)
+	GL_STUB(VertexAttrib4dNV, 828, VertexAttrib4dNV@36)
+	GL_STUB(VertexAttrib4dvNV, 829, VertexAttrib4dvNV@8)
+	GL_STUB(VertexAttrib4fNV, 830, VertexAttrib4fNV@20)
+	GL_STUB(VertexAttrib4fvNV, 831, VertexAttrib4fvNV@8)
+	GL_STUB(VertexAttrib4sNV, 832, VertexAttrib4sNV@20)
+	GL_STUB(VertexAttrib4svNV, 833, VertexAttrib4svNV@8)
+	GL_STUB(VertexAttrib4ubNV, 834, VertexAttrib4ubNV@20)
+	GL_STUB(VertexAttrib4ubvNV, 835, VertexAttrib4ubvNV@8)
+	GL_STUB(VertexAttribPointerNV, 836, VertexAttribPointerNV@20)
+	GL_STUB(VertexAttribs1dvNV, 837, VertexAttribs1dvNV@12)
+	GL_STUB(VertexAttribs1fvNV, 838, VertexAttribs1fvNV@12)
+	GL_STUB(VertexAttribs1svNV, 839, VertexAttribs1svNV@12)
+	GL_STUB(VertexAttribs2dvNV, 840, VertexAttribs2dvNV@12)
+	GL_STUB(VertexAttribs2fvNV, 841, VertexAttribs2fvNV@12)
+	GL_STUB(VertexAttribs2svNV, 842, VertexAttribs2svNV@12)
+	GL_STUB(VertexAttribs3dvNV, 843, VertexAttribs3dvNV@12)
+	GL_STUB(VertexAttribs3fvNV, 844, VertexAttribs3fvNV@12)
+	GL_STUB(VertexAttribs3svNV, 845, VertexAttribs3svNV@12)
+	GL_STUB(VertexAttribs4dvNV, 846, VertexAttribs4dvNV@12)
+	GL_STUB(VertexAttribs4fvNV, 847, VertexAttribs4fvNV@12)
+	GL_STUB(VertexAttribs4svNV, 848, VertexAttribs4svNV@12)
+	GL_STUB(VertexAttribs4ubvNV, 849, VertexAttribs4ubvNV@12)
+	GL_STUB(GetTexBumpParameterfvATI, 850, GetTexBumpParameterfvATI@8)
+	GL_STUB(GetTexBumpParameterivATI, 851, GetTexBumpParameterivATI@8)
+	GL_STUB(TexBumpParameterfvATI, 852, TexBumpParameterfvATI@8)
+	GL_STUB(TexBumpParameterivATI, 853, TexBumpParameterivATI@8)
+	GL_STUB(AlphaFragmentOp1ATI, 854, AlphaFragmentOp1ATI@24)
+	GL_STUB(AlphaFragmentOp2ATI, 855, AlphaFragmentOp2ATI@36)
+	GL_STUB(AlphaFragmentOp3ATI, 856, AlphaFragmentOp3ATI@48)
+	GL_STUB(BeginFragmentShaderATI, 857, BeginFragmentShaderATI@0)
+	GL_STUB(BindFragmentShaderATI, 858, BindFragmentShaderATI@4)
+	GL_STUB(ColorFragmentOp1ATI, 859, ColorFragmentOp1ATI@28)
+	GL_STUB(ColorFragmentOp2ATI, 860, ColorFragmentOp2ATI@40)
+	GL_STUB(ColorFragmentOp3ATI, 861, ColorFragmentOp3ATI@52)
+	GL_STUB(DeleteFragmentShaderATI, 862, DeleteFragmentShaderATI@4)
+	GL_STUB(EndFragmentShaderATI, 863, EndFragmentShaderATI@0)
+	GL_STUB(GenFragmentShadersATI, 864, GenFragmentShadersATI@4)
+	GL_STUB(PassTexCoordATI, 865, PassTexCoordATI@12)
+	GL_STUB(SampleMapATI, 866, SampleMapATI@12)
+	GL_STUB(SetFragmentShaderConstantATI, 867, SetFragmentShaderConstantATI@8)
+	GL_STUB(PointParameteriNV, 868, PointParameteriNV@8)
+	GL_STUB(PointParameterivNV, 869, PointParameterivNV@8)
+	GL_STUB(_dispatch_stub_870, 870, _dispatch_stub_870@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_870, _dispatch_stub_870@4))
 	GL_STUB(_dispatch_stub_871, 871, _dispatch_stub_871@4)
 	HIDDEN(GL_PREFIX(_dispatch_stub_871, _dispatch_stub_871@4))
-	GL_STUB(_dispatch_stub_872, 872, _dispatch_stub_872@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_872, _dispatch_stub_872@4))
+	GL_STUB(_dispatch_stub_872, 872, _dispatch_stub_872@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_872, _dispatch_stub_872@8))
 	GL_STUB(_dispatch_stub_873, 873, _dispatch_stub_873@8)
 	HIDDEN(GL_PREFIX(_dispatch_stub_873, _dispatch_stub_873@8))
-	GL_STUB(_dispatch_stub_874, 874, _dispatch_stub_874@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_874, _dispatch_stub_874@8))
-	GL_STUB(_dispatch_stub_875, 875, _dispatch_stub_875@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_875, _dispatch_stub_875@4))
-	GL_STUB(GetProgramNamedParameterdvNV, 876, GetProgramNamedParameterdvNV@16)
-	GL_STUB(GetProgramNamedParameterfvNV, 877, GetProgramNamedParameterfvNV@16)
-	GL_STUB(ProgramNamedParameter4dNV, 878, ProgramNamedParameter4dNV@44)
-	GL_STUB(ProgramNamedParameter4dvNV, 879, ProgramNamedParameter4dvNV@16)
-	GL_STUB(ProgramNamedParameter4fNV, 880, ProgramNamedParameter4fNV@28)
-	GL_STUB(ProgramNamedParameter4fvNV, 881, ProgramNamedParameter4fvNV@16)
-	GL_STUB(PrimitiveRestartIndexNV, 882, PrimitiveRestartIndexNV@4)
-	GL_STUB(PrimitiveRestartNV, 883, PrimitiveRestartNV@0)
-	GL_STUB(_dispatch_stub_884, 884, _dispatch_stub_884@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_884, _dispatch_stub_884@16))
-	GL_STUB(_dispatch_stub_885, 885, _dispatch_stub_885@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_885, _dispatch_stub_885@8))
-	GL_STUB(BindFramebufferEXT, 886, BindFramebufferEXT@8)
-	GL_STUB(BindRenderbufferEXT, 887, BindRenderbufferEXT@8)
-	GL_STUB(CheckFramebufferStatusEXT, 888, CheckFramebufferStatusEXT@4)
-	GL_STUB(DeleteFramebuffersEXT, 889, DeleteFramebuffersEXT@8)
-	GL_STUB(DeleteRenderbuffersEXT, 890, DeleteRenderbuffersEXT@8)
-	GL_STUB(FramebufferRenderbufferEXT, 891, FramebufferRenderbufferEXT@16)
-	GL_STUB(FramebufferTexture1DEXT, 892, FramebufferTexture1DEXT@20)
-	GL_STUB(FramebufferTexture2DEXT, 893, FramebufferTexture2DEXT@20)
-	GL_STUB(FramebufferTexture3DEXT, 894, FramebufferTexture3DEXT@24)
-	GL_STUB(GenFramebuffersEXT, 895, GenFramebuffersEXT@8)
-	GL_STUB(GenRenderbuffersEXT, 896, GenRenderbuffersEXT@8)
-	GL_STUB(GenerateMipmapEXT, 897, GenerateMipmapEXT@4)
-	GL_STUB(GetFramebufferAttachmentParameterivEXT, 898, GetFramebufferAttachmentParameterivEXT@16)
-	GL_STUB(GetRenderbufferParameterivEXT, 899, GetRenderbufferParameterivEXT@12)
-	GL_STUB(IsFramebufferEXT, 900, IsFramebufferEXT@4)
-	GL_STUB(IsRenderbufferEXT, 901, IsRenderbufferEXT@4)
-	GL_STUB(RenderbufferStorageEXT, 902, RenderbufferStorageEXT@16)
-	GL_STUB(_dispatch_stub_903, 903, _dispatch_stub_903@40)
-	HIDDEN(GL_PREFIX(_dispatch_stub_903, _dispatch_stub_903@40))
+	GL_STUB(_dispatch_stub_874, 874, _dispatch_stub_874@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_874, _dispatch_stub_874@4))
+	GL_STUB(GetProgramNamedParameterdvNV, 875, GetProgramNamedParameterdvNV@16)
+	GL_STUB(GetProgramNamedParameterfvNV, 876, GetProgramNamedParameterfvNV@16)
+	GL_STUB(ProgramNamedParameter4dNV, 877, ProgramNamedParameter4dNV@44)
+	GL_STUB(ProgramNamedParameter4dvNV, 878, ProgramNamedParameter4dvNV@16)
+	GL_STUB(ProgramNamedParameter4fNV, 879, ProgramNamedParameter4fNV@28)
+	GL_STUB(ProgramNamedParameter4fvNV, 880, ProgramNamedParameter4fvNV@16)
+	GL_STUB(PrimitiveRestartIndexNV, 881, PrimitiveRestartIndexNV@4)
+	GL_STUB(PrimitiveRestartNV, 882, PrimitiveRestartNV@0)
+	GL_STUB(_dispatch_stub_883, 883, _dispatch_stub_883@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_883, _dispatch_stub_883@16))
+	GL_STUB(_dispatch_stub_884, 884, _dispatch_stub_884@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_884, _dispatch_stub_884@8))
+	GL_STUB(BindFramebufferEXT, 885, BindFramebufferEXT@8)
+	GL_STUB(BindRenderbufferEXT, 886, BindRenderbufferEXT@8)
+	GL_STUB(CheckFramebufferStatusEXT, 887, CheckFramebufferStatusEXT@4)
+	GL_STUB(DeleteFramebuffersEXT, 888, DeleteFramebuffersEXT@8)
+	GL_STUB(DeleteRenderbuffersEXT, 889, DeleteRenderbuffersEXT@8)
+	GL_STUB(FramebufferRenderbufferEXT, 890, FramebufferRenderbufferEXT@16)
+	GL_STUB(FramebufferTexture1DEXT, 891, FramebufferTexture1DEXT@20)
+	GL_STUB(FramebufferTexture2DEXT, 892, FramebufferTexture2DEXT@20)
+	GL_STUB(FramebufferTexture3DEXT, 893, FramebufferTexture3DEXT@24)
+	GL_STUB(GenFramebuffersEXT, 894, GenFramebuffersEXT@8)
+	GL_STUB(GenRenderbuffersEXT, 895, GenRenderbuffersEXT@8)
+	GL_STUB(GenerateMipmapEXT, 896, GenerateMipmapEXT@4)
+	GL_STUB(GetFramebufferAttachmentParameterivEXT, 897, GetFramebufferAttachmentParameterivEXT@16)
+	GL_STUB(GetRenderbufferParameterivEXT, 898, GetRenderbufferParameterivEXT@12)
+	GL_STUB(IsFramebufferEXT, 899, IsFramebufferEXT@4)
+	GL_STUB(IsRenderbufferEXT, 900, IsRenderbufferEXT@4)
+	GL_STUB(RenderbufferStorageEXT, 901, RenderbufferStorageEXT@16)
+	GL_STUB(_dispatch_stub_902, 902, _dispatch_stub_902@40)
+	HIDDEN(GL_PREFIX(_dispatch_stub_902, _dispatch_stub_902@40))
+	GL_STUB(_dispatch_stub_903, 903, _dispatch_stub_903@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_903, _dispatch_stub_903@12))
 	GL_STUB(_dispatch_stub_904, 904, _dispatch_stub_904@12)
 	HIDDEN(GL_PREFIX(_dispatch_stub_904, _dispatch_stub_904@12))
-	GL_STUB(_dispatch_stub_905, 905, _dispatch_stub_905@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_905, _dispatch_stub_905@12))
-	GL_STUB(BindFragDataLocationEXT, 906, BindFragDataLocationEXT@12)
-	GL_STUB(GetFragDataLocationEXT, 907, GetFragDataLocationEXT@8)
-	GL_STUB(GetUniformuivEXT, 908, GetUniformuivEXT@12)
-	GL_STUB(GetVertexAttribIivEXT, 909, GetVertexAttribIivEXT@12)
-	GL_STUB(GetVertexAttribIuivEXT, 910, GetVertexAttribIuivEXT@12)
-	GL_STUB(Uniform1uiEXT, 911, Uniform1uiEXT@8)
-	GL_STUB(Uniform1uivEXT, 912, Uniform1uivEXT@12)
-	GL_STUB(Uniform2uiEXT, 913, Uniform2uiEXT@12)
-	GL_STUB(Uniform2uivEXT, 914, Uniform2uivEXT@12)
-	GL_STUB(Uniform3uiEXT, 915, Uniform3uiEXT@16)
-	GL_STUB(Uniform3uivEXT, 916, Uniform3uivEXT@12)
-	GL_STUB(Uniform4uiEXT, 917, Uniform4uiEXT@20)
-	GL_STUB(Uniform4uivEXT, 918, Uniform4uivEXT@12)
-	GL_STUB(VertexAttribI1iEXT, 919, VertexAttribI1iEXT@8)
-	GL_STUB(VertexAttribI1ivEXT, 920, VertexAttribI1ivEXT@8)
-	GL_STUB(VertexAttribI1uiEXT, 921, VertexAttribI1uiEXT@8)
-	GL_STUB(VertexAttribI1uivEXT, 922, VertexAttribI1uivEXT@8)
-	GL_STUB(VertexAttribI2iEXT, 923, VertexAttribI2iEXT@12)
-	GL_STUB(VertexAttribI2ivEXT, 924, VertexAttribI2ivEXT@8)
-	GL_STUB(VertexAttribI2uiEXT, 925, VertexAttribI2uiEXT@12)
-	GL_STUB(VertexAttribI2uivEXT, 926, VertexAttribI2uivEXT@8)
-	GL_STUB(VertexAttribI3iEXT, 927, VertexAttribI3iEXT@16)
-	GL_STUB(VertexAttribI3ivEXT, 928, VertexAttribI3ivEXT@8)
-	GL_STUB(VertexAttribI3uiEXT, 929, VertexAttribI3uiEXT@16)
-	GL_STUB(VertexAttribI3uivEXT, 930, VertexAttribI3uivEXT@8)
-	GL_STUB(VertexAttribI4bvEXT, 931, VertexAttribI4bvEXT@8)
-	GL_STUB(VertexAttribI4iEXT, 932, VertexAttribI4iEXT@20)
-	GL_STUB(VertexAttribI4ivEXT, 933, VertexAttribI4ivEXT@8)
-	GL_STUB(VertexAttribI4svEXT, 934, VertexAttribI4svEXT@8)
-	GL_STUB(VertexAttribI4ubvEXT, 935, VertexAttribI4ubvEXT@8)
-	GL_STUB(VertexAttribI4uiEXT, 936, VertexAttribI4uiEXT@20)
-	GL_STUB(VertexAttribI4uivEXT, 937, VertexAttribI4uivEXT@8)
-	GL_STUB(VertexAttribI4usvEXT, 938, VertexAttribI4usvEXT@8)
-	GL_STUB(VertexAttribIPointerEXT, 939, VertexAttribIPointerEXT@20)
-	GL_STUB(FramebufferTextureLayerEXT, 940, FramebufferTextureLayerEXT@20)
-	GL_STUB(ColorMaskIndexedEXT, 941, ColorMaskIndexedEXT@20)
-	GL_STUB(DisableIndexedEXT, 942, DisableIndexedEXT@8)
-	GL_STUB(EnableIndexedEXT, 943, EnableIndexedEXT@8)
-	GL_STUB(GetBooleanIndexedvEXT, 944, GetBooleanIndexedvEXT@12)
-	GL_STUB(GetIntegerIndexedvEXT, 945, GetIntegerIndexedvEXT@12)
-	GL_STUB(IsEnabledIndexedEXT, 946, IsEnabledIndexedEXT@8)
-	GL_STUB(ClearColorIiEXT, 947, ClearColorIiEXT@16)
-	GL_STUB(ClearColorIuiEXT, 948, ClearColorIuiEXT@16)
-	GL_STUB(GetTexParameterIivEXT, 949, GetTexParameterIivEXT@12)
-	GL_STUB(GetTexParameterIuivEXT, 950, GetTexParameterIuivEXT@12)
-	GL_STUB(TexParameterIivEXT, 951, TexParameterIivEXT@12)
-	GL_STUB(TexParameterIuivEXT, 952, TexParameterIuivEXT@12)
-	GL_STUB(BeginConditionalRenderNV, 953, BeginConditionalRenderNV@8)
-	GL_STUB(EndConditionalRenderNV, 954, EndConditionalRenderNV@0)
-	GL_STUB(BeginTransformFeedbackEXT, 955, BeginTransformFeedbackEXT@4)
-	GL_STUB(BindBufferBaseEXT, 956, BindBufferBaseEXT@12)
-	GL_STUB(BindBufferOffsetEXT, 957, BindBufferOffsetEXT@16)
-	GL_STUB(BindBufferRangeEXT, 958, BindBufferRangeEXT@20)
-	GL_STUB(EndTransformFeedbackEXT, 959, EndTransformFeedbackEXT@0)
-	GL_STUB(GetTransformFeedbackVaryingEXT, 960, GetTransformFeedbackVaryingEXT@28)
-	GL_STUB(TransformFeedbackVaryingsEXT, 961, TransformFeedbackVaryingsEXT@16)
-	GL_STUB(ProvokingVertexEXT, 962, ProvokingVertexEXT@4)
+	GL_STUB(BindFragDataLocationEXT, 905, BindFragDataLocationEXT@12)
+	GL_STUB(GetFragDataLocationEXT, 906, GetFragDataLocationEXT@8)
+	GL_STUB(GetUniformuivEXT, 907, GetUniformuivEXT@12)
+	GL_STUB(GetVertexAttribIivEXT, 908, GetVertexAttribIivEXT@12)
+	GL_STUB(GetVertexAttribIuivEXT, 909, GetVertexAttribIuivEXT@12)
+	GL_STUB(Uniform1uiEXT, 910, Uniform1uiEXT@8)
+	GL_STUB(Uniform1uivEXT, 911, Uniform1uivEXT@12)
+	GL_STUB(Uniform2uiEXT, 912, Uniform2uiEXT@12)
+	GL_STUB(Uniform2uivEXT, 913, Uniform2uivEXT@12)
+	GL_STUB(Uniform3uiEXT, 914, Uniform3uiEXT@16)
+	GL_STUB(Uniform3uivEXT, 915, Uniform3uivEXT@12)
+	GL_STUB(Uniform4uiEXT, 916, Uniform4uiEXT@20)
+	GL_STUB(Uniform4uivEXT, 917, Uniform4uivEXT@12)
+	GL_STUB(VertexAttribI1iEXT, 918, VertexAttribI1iEXT@8)
+	GL_STUB(VertexAttribI1ivEXT, 919, VertexAttribI1ivEXT@8)
+	GL_STUB(VertexAttribI1uiEXT, 920, VertexAttribI1uiEXT@8)
+	GL_STUB(VertexAttribI1uivEXT, 921, VertexAttribI1uivEXT@8)
+	GL_STUB(VertexAttribI2iEXT, 922, VertexAttribI2iEXT@12)
+	GL_STUB(VertexAttribI2ivEXT, 923, VertexAttribI2ivEXT@8)
+	GL_STUB(VertexAttribI2uiEXT, 924, VertexAttribI2uiEXT@12)
+	GL_STUB(VertexAttribI2uivEXT, 925, VertexAttribI2uivEXT@8)
+	GL_STUB(VertexAttribI3iEXT, 926, VertexAttribI3iEXT@16)
+	GL_STUB(VertexAttribI3ivEXT, 927, VertexAttribI3ivEXT@8)
+	GL_STUB(VertexAttribI3uiEXT, 928, VertexAttribI3uiEXT@16)
+	GL_STUB(VertexAttribI3uivEXT, 929, VertexAttribI3uivEXT@8)
+	GL_STUB(VertexAttribI4bvEXT, 930, VertexAttribI4bvEXT@8)
+	GL_STUB(VertexAttribI4iEXT, 931, VertexAttribI4iEXT@20)
+	GL_STUB(VertexAttribI4ivEXT, 932, VertexAttribI4ivEXT@8)
+	GL_STUB(VertexAttribI4svEXT, 933, VertexAttribI4svEXT@8)
+	GL_STUB(VertexAttribI4ubvEXT, 934, VertexAttribI4ubvEXT@8)
+	GL_STUB(VertexAttribI4uiEXT, 935, VertexAttribI4uiEXT@20)
+	GL_STUB(VertexAttribI4uivEXT, 936, VertexAttribI4uivEXT@8)
+	GL_STUB(VertexAttribI4usvEXT, 937, VertexAttribI4usvEXT@8)
+	GL_STUB(VertexAttribIPointerEXT, 938, VertexAttribIPointerEXT@20)
+	GL_STUB(FramebufferTextureLayerEXT, 939, FramebufferTextureLayerEXT@20)
+	GL_STUB(ColorMaskIndexedEXT, 940, ColorMaskIndexedEXT@20)
+	GL_STUB(DisableIndexedEXT, 941, DisableIndexedEXT@8)
+	GL_STUB(EnableIndexedEXT, 942, EnableIndexedEXT@8)
+	GL_STUB(GetBooleanIndexedvEXT, 943, GetBooleanIndexedvEXT@12)
+	GL_STUB(GetIntegerIndexedvEXT, 944, GetIntegerIndexedvEXT@12)
+	GL_STUB(IsEnabledIndexedEXT, 945, IsEnabledIndexedEXT@8)
+	GL_STUB(ClearColorIiEXT, 946, ClearColorIiEXT@16)
+	GL_STUB(ClearColorIuiEXT, 947, ClearColorIuiEXT@16)
+	GL_STUB(GetTexParameterIivEXT, 948, GetTexParameterIivEXT@12)
+	GL_STUB(GetTexParameterIuivEXT, 949, GetTexParameterIuivEXT@12)
+	GL_STUB(TexParameterIivEXT, 950, TexParameterIivEXT@12)
+	GL_STUB(TexParameterIuivEXT, 951, TexParameterIuivEXT@12)
+	GL_STUB(BeginConditionalRenderNV, 952, BeginConditionalRenderNV@8)
+	GL_STUB(EndConditionalRenderNV, 953, EndConditionalRenderNV@0)
+	GL_STUB(BeginTransformFeedbackEXT, 954, BeginTransformFeedbackEXT@4)
+	GL_STUB(BindBufferBaseEXT, 955, BindBufferBaseEXT@12)
+	GL_STUB(BindBufferOffsetEXT, 956, BindBufferOffsetEXT@16)
+	GL_STUB(BindBufferRangeEXT, 957, BindBufferRangeEXT@20)
+	GL_STUB(EndTransformFeedbackEXT, 958, EndTransformFeedbackEXT@0)
+	GL_STUB(GetTransformFeedbackVaryingEXT, 959, GetTransformFeedbackVaryingEXT@28)
+	GL_STUB(TransformFeedbackVaryingsEXT, 960, TransformFeedbackVaryingsEXT@16)
+	GL_STUB(ProvokingVertexEXT, 961, ProvokingVertexEXT@4)
+	GL_STUB(_dispatch_stub_962, 962, _dispatch_stub_962@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_962, _dispatch_stub_962@12))
 	GL_STUB(_dispatch_stub_963, 963, _dispatch_stub_963@12)
 	HIDDEN(GL_PREFIX(_dispatch_stub_963, _dispatch_stub_963@12))
-	GL_STUB(_dispatch_stub_964, 964, _dispatch_stub_964@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_964, _dispatch_stub_964@12))
-	GL_STUB(GetObjectParameterivAPPLE, 965, GetObjectParameterivAPPLE@16)
-	GL_STUB(ObjectPurgeableAPPLE, 966, ObjectPurgeableAPPLE@12)
-	GL_STUB(ObjectUnpurgeableAPPLE, 967, ObjectUnpurgeableAPPLE@12)
-	GL_STUB(ActiveProgramEXT, 968, ActiveProgramEXT@4)
-	GL_STUB(CreateShaderProgramEXT, 969, CreateShaderProgramEXT@8)
-	GL_STUB(UseShaderProgramEXT, 970, UseShaderProgramEXT@8)
-	GL_STUB(TextureBarrierNV, 971, TextureBarrierNV@0)
+	GL_STUB(GetObjectParameterivAPPLE, 964, GetObjectParameterivAPPLE@16)
+	GL_STUB(ObjectPurgeableAPPLE, 965, ObjectPurgeableAPPLE@12)
+	GL_STUB(ObjectUnpurgeableAPPLE, 966, ObjectUnpurgeableAPPLE@12)
+	GL_STUB(ActiveProgramEXT, 967, ActiveProgramEXT@4)
+	GL_STUB(CreateShaderProgramEXT, 968, CreateShaderProgramEXT@8)
+	GL_STUB(UseShaderProgramEXT, 969, UseShaderProgramEXT@8)
+	GL_STUB(TextureBarrierNV, 970, TextureBarrierNV@0)
+	GL_STUB(_dispatch_stub_971, 971, _dispatch_stub_971@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_971, _dispatch_stub_971@16))
 	GL_STUB(_dispatch_stub_972, 972, _dispatch_stub_972@16)
 	HIDDEN(GL_PREFIX(_dispatch_stub_972, _dispatch_stub_972@16))
 	GL_STUB(_dispatch_stub_973, 973, _dispatch_stub_973@16)
 	HIDDEN(GL_PREFIX(_dispatch_stub_973, _dispatch_stub_973@16))
-	GL_STUB(_dispatch_stub_974, 974, _dispatch_stub_974@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_974, _dispatch_stub_974@16))
+	GL_STUB(_dispatch_stub_974, 974, _dispatch_stub_974@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_974, _dispatch_stub_974@12))
 	GL_STUB(_dispatch_stub_975, 975, _dispatch_stub_975@12)
 	HIDDEN(GL_PREFIX(_dispatch_stub_975, _dispatch_stub_975@12))
-	GL_STUB(_dispatch_stub_976, 976, _dispatch_stub_976@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_976, _dispatch_stub_976@12))
-	GL_STUB(EGLImageTargetRenderbufferStorageOES, 977, EGLImageTargetRenderbufferStorageOES@8)
-	GL_STUB(EGLImageTargetTexture2DOES, 978, EGLImageTargetTexture2DOES@8)
+	GL_STUB(EGLImageTargetRenderbufferStorageOES, 976, EGLImageTargetRenderbufferStorageOES@8)
+	GL_STUB(EGLImageTargetTexture2DOES, 977, EGLImageTargetTexture2DOES@8)
 	GL_STUB_ALIAS(ArrayElementEXT, 306, ArrayElementEXT@4, ArrayElement, ArrayElement@4)
 	GL_STUB_ALIAS(BindTextureEXT, 307, BindTextureEXT@8, BindTexture, BindTexture@8)
 	GL_STUB_ALIAS(DrawArraysEXT, 310, DrawArraysEXT@12, DrawArrays, DrawArrays@12)
@@ -1237,273 +1236,274 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB_ALIAS(MultiTexCoord4iv, 405, MultiTexCoord4iv@8, MultiTexCoord4ivARB, MultiTexCoord4ivARB@8)
 	GL_STUB_ALIAS(MultiTexCoord4s, 406, MultiTexCoord4s@20, MultiTexCoord4sARB, MultiTexCoord4sARB@20)
 	GL_STUB_ALIAS(MultiTexCoord4sv, 407, MultiTexCoord4sv@8, MultiTexCoord4svARB, MultiTexCoord4svARB@8)
-	GL_STUB_ALIAS(LoadTransposeMatrixd, 441, LoadTransposeMatrixd@4, LoadTransposeMatrixdARB, LoadTransposeMatrixdARB@4)
-	GL_STUB_ALIAS(LoadTransposeMatrixf, 442, LoadTransposeMatrixf@4, LoadTransposeMatrixfARB, LoadTransposeMatrixfARB@4)
-	GL_STUB_ALIAS(MultTransposeMatrixd, 443, MultTransposeMatrixd@4, MultTransposeMatrixdARB, MultTransposeMatrixdARB@4)
-	GL_STUB_ALIAS(MultTransposeMatrixf, 444, MultTransposeMatrixf@4, MultTransposeMatrixfARB, MultTransposeMatrixfARB@4)
-	GL_STUB_ALIAS(SampleCoverage, 445, SampleCoverage@8, SampleCoverageARB, SampleCoverageARB@8)
-	GL_STUB_ALIAS(CompressedTexImage1D, 446, CompressedTexImage1D@28, CompressedTexImage1DARB, CompressedTexImage1DARB@28)
-	GL_STUB_ALIAS(CompressedTexImage2D, 447, CompressedTexImage2D@32, CompressedTexImage2DARB, CompressedTexImage2DARB@32)
-	GL_STUB_ALIAS(CompressedTexImage3D, 448, CompressedTexImage3D@36, CompressedTexImage3DARB, CompressedTexImage3DARB@36)
-	GL_STUB_ALIAS(CompressedTexSubImage1D, 449, CompressedTexSubImage1D@28, CompressedTexSubImage1DARB, CompressedTexSubImage1DARB@28)
-	GL_STUB_ALIAS(CompressedTexSubImage2D, 450, CompressedTexSubImage2D@36, CompressedTexSubImage2DARB, CompressedTexSubImage2DARB@36)
-	GL_STUB_ALIAS(CompressedTexSubImage3D, 451, CompressedTexSubImage3D@44, CompressedTexSubImage3DARB, CompressedTexSubImage3DARB@44)
-	GL_STUB_ALIAS(GetCompressedTexImage, 452, GetCompressedTexImage@12, GetCompressedTexImageARB, GetCompressedTexImageARB@12)
-	GL_STUB_ALIAS(DisableVertexAttribArray, 453, DisableVertexAttribArray@4, DisableVertexAttribArrayARB, DisableVertexAttribArrayARB@4)
-	GL_STUB_ALIAS(EnableVertexAttribArray, 454, EnableVertexAttribArray@4, EnableVertexAttribArrayARB, EnableVertexAttribArrayARB@4)
-	GL_STUB_ALIAS(GetVertexAttribdv, 461, GetVertexAttribdv@12, GetVertexAttribdvARB, GetVertexAttribdvARB@12)
-	GL_STUB_ALIAS(GetVertexAttribfv, 462, GetVertexAttribfv@12, GetVertexAttribfvARB, GetVertexAttribfvARB@12)
-	GL_STUB_ALIAS(GetVertexAttribiv, 463, GetVertexAttribiv@12, GetVertexAttribivARB, GetVertexAttribivARB@12)
-	GL_STUB_ALIAS(ProgramParameter4dNV, 464, ProgramParameter4dNV@40, ProgramEnvParameter4dARB, ProgramEnvParameter4dARB@40)
-	GL_STUB_ALIAS(ProgramParameter4dvNV, 465, ProgramParameter4dvNV@12, ProgramEnvParameter4dvARB, ProgramEnvParameter4dvARB@12)
-	GL_STUB_ALIAS(ProgramParameter4fNV, 466, ProgramParameter4fNV@24, ProgramEnvParameter4fARB, ProgramEnvParameter4fARB@24)
-	GL_STUB_ALIAS(ProgramParameter4fvNV, 467, ProgramParameter4fvNV@12, ProgramEnvParameter4fvARB, ProgramEnvParameter4fvARB@12)
-	GL_STUB_ALIAS(VertexAttrib1d, 473, VertexAttrib1d@12, VertexAttrib1dARB, VertexAttrib1dARB@12)
-	GL_STUB_ALIAS(VertexAttrib1dv, 474, VertexAttrib1dv@8, VertexAttrib1dvARB, VertexAttrib1dvARB@8)
-	GL_STUB_ALIAS(VertexAttrib1f, 475, VertexAttrib1f@8, VertexAttrib1fARB, VertexAttrib1fARB@8)
-	GL_STUB_ALIAS(VertexAttrib1fv, 476, VertexAttrib1fv@8, VertexAttrib1fvARB, VertexAttrib1fvARB@8)
-	GL_STUB_ALIAS(VertexAttrib1s, 477, VertexAttrib1s@8, VertexAttrib1sARB, VertexAttrib1sARB@8)
-	GL_STUB_ALIAS(VertexAttrib1sv, 478, VertexAttrib1sv@8, VertexAttrib1svARB, VertexAttrib1svARB@8)
-	GL_STUB_ALIAS(VertexAttrib2d, 479, VertexAttrib2d@20, VertexAttrib2dARB, VertexAttrib2dARB@20)
-	GL_STUB_ALIAS(VertexAttrib2dv, 480, VertexAttrib2dv@8, VertexAttrib2dvARB, VertexAttrib2dvARB@8)
-	GL_STUB_ALIAS(VertexAttrib2f, 481, VertexAttrib2f@12, VertexAttrib2fARB, VertexAttrib2fARB@12)
-	GL_STUB_ALIAS(VertexAttrib2fv, 482, VertexAttrib2fv@8, VertexAttrib2fvARB, VertexAttrib2fvARB@8)
-	GL_STUB_ALIAS(VertexAttrib2s, 483, VertexAttrib2s@12, VertexAttrib2sARB, VertexAttrib2sARB@12)
-	GL_STUB_ALIAS(VertexAttrib2sv, 484, VertexAttrib2sv@8, VertexAttrib2svARB, VertexAttrib2svARB@8)
-	GL_STUB_ALIAS(VertexAttrib3d, 485, VertexAttrib3d@28, VertexAttrib3dARB, VertexAttrib3dARB@28)
-	GL_STUB_ALIAS(VertexAttrib3dv, 486, VertexAttrib3dv@8, VertexAttrib3dvARB, VertexAttrib3dvARB@8)
-	GL_STUB_ALIAS(VertexAttrib3f, 487, VertexAttrib3f@16, VertexAttrib3fARB, VertexAttrib3fARB@16)
-	GL_STUB_ALIAS(VertexAttrib3fv, 488, VertexAttrib3fv@8, VertexAttrib3fvARB, VertexAttrib3fvARB@8)
-	GL_STUB_ALIAS(VertexAttrib3s, 489, VertexAttrib3s@16, VertexAttrib3sARB, VertexAttrib3sARB@16)
-	GL_STUB_ALIAS(VertexAttrib3sv, 490, VertexAttrib3sv@8, VertexAttrib3svARB, VertexAttrib3svARB@8)
-	GL_STUB_ALIAS(VertexAttrib4Nbv, 491, VertexAttrib4Nbv@8, VertexAttrib4NbvARB, VertexAttrib4NbvARB@8)
-	GL_STUB_ALIAS(VertexAttrib4Niv, 492, VertexAttrib4Niv@8, VertexAttrib4NivARB, VertexAttrib4NivARB@8)
-	GL_STUB_ALIAS(VertexAttrib4Nsv, 493, VertexAttrib4Nsv@8, VertexAttrib4NsvARB, VertexAttrib4NsvARB@8)
-	GL_STUB_ALIAS(VertexAttrib4Nub, 494, VertexAttrib4Nub@20, VertexAttrib4NubARB, VertexAttrib4NubARB@20)
-	GL_STUB_ALIAS(VertexAttrib4Nubv, 495, VertexAttrib4Nubv@8, VertexAttrib4NubvARB, VertexAttrib4NubvARB@8)
-	GL_STUB_ALIAS(VertexAttrib4Nuiv, 496, VertexAttrib4Nuiv@8, VertexAttrib4NuivARB, VertexAttrib4NuivARB@8)
-	GL_STUB_ALIAS(VertexAttrib4Nusv, 497, VertexAttrib4Nusv@8, VertexAttrib4NusvARB, VertexAttrib4NusvARB@8)
-	GL_STUB_ALIAS(VertexAttrib4bv, 498, VertexAttrib4bv@8, VertexAttrib4bvARB, VertexAttrib4bvARB@8)
-	GL_STUB_ALIAS(VertexAttrib4d, 499, VertexAttrib4d@36, VertexAttrib4dARB, VertexAttrib4dARB@36)
-	GL_STUB_ALIAS(VertexAttrib4dv, 500, VertexAttrib4dv@8, VertexAttrib4dvARB, VertexAttrib4dvARB@8)
-	GL_STUB_ALIAS(VertexAttrib4f, 501, VertexAttrib4f@20, VertexAttrib4fARB, VertexAttrib4fARB@20)
-	GL_STUB_ALIAS(VertexAttrib4fv, 502, VertexAttrib4fv@8, VertexAttrib4fvARB, VertexAttrib4fvARB@8)
-	GL_STUB_ALIAS(VertexAttrib4iv, 503, VertexAttrib4iv@8, VertexAttrib4ivARB, VertexAttrib4ivARB@8)
-	GL_STUB_ALIAS(VertexAttrib4s, 504, VertexAttrib4s@20, VertexAttrib4sARB, VertexAttrib4sARB@20)
-	GL_STUB_ALIAS(VertexAttrib4sv, 505, VertexAttrib4sv@8, VertexAttrib4svARB, VertexAttrib4svARB@8)
-	GL_STUB_ALIAS(VertexAttrib4ubv, 506, VertexAttrib4ubv@8, VertexAttrib4ubvARB, VertexAttrib4ubvARB@8)
-	GL_STUB_ALIAS(VertexAttrib4uiv, 507, VertexAttrib4uiv@8, VertexAttrib4uivARB, VertexAttrib4uivARB@8)
-	GL_STUB_ALIAS(VertexAttrib4usv, 508, VertexAttrib4usv@8, VertexAttrib4usvARB, VertexAttrib4usvARB@8)
-	GL_STUB_ALIAS(VertexAttribPointer, 509, VertexAttribPointer@24, VertexAttribPointerARB, VertexAttribPointerARB@24)
-	GL_STUB_ALIAS(BindBuffer, 510, BindBuffer@8, BindBufferARB, BindBufferARB@8)
-	GL_STUB_ALIAS(BufferData, 511, BufferData@16, BufferDataARB, BufferDataARB@16)
-	GL_STUB_ALIAS(BufferSubData, 512, BufferSubData@16, BufferSubDataARB, BufferSubDataARB@16)
-	GL_STUB_ALIAS(DeleteBuffers, 513, DeleteBuffers@8, DeleteBuffersARB, DeleteBuffersARB@8)
-	GL_STUB_ALIAS(GenBuffers, 514, GenBuffers@8, GenBuffersARB, GenBuffersARB@8)
-	GL_STUB_ALIAS(GetBufferParameteriv, 515, GetBufferParameteriv@12, GetBufferParameterivARB, GetBufferParameterivARB@12)
-	GL_STUB_ALIAS(GetBufferPointerv, 516, GetBufferPointerv@12, GetBufferPointervARB, GetBufferPointervARB@12)
-	GL_STUB_ALIAS(GetBufferSubData, 517, GetBufferSubData@16, GetBufferSubDataARB, GetBufferSubDataARB@16)
-	GL_STUB_ALIAS(IsBuffer, 518, IsBuffer@4, IsBufferARB, IsBufferARB@4)
-	GL_STUB_ALIAS(MapBuffer, 519, MapBuffer@8, MapBufferARB, MapBufferARB@8)
-	GL_STUB_ALIAS(UnmapBuffer, 520, UnmapBuffer@4, UnmapBufferARB, UnmapBufferARB@4)
-	GL_STUB_ALIAS(BeginQuery, 521, BeginQuery@8, BeginQueryARB, BeginQueryARB@8)
-	GL_STUB_ALIAS(DeleteQueries, 522, DeleteQueries@8, DeleteQueriesARB, DeleteQueriesARB@8)
-	GL_STUB_ALIAS(EndQuery, 523, EndQuery@4, EndQueryARB, EndQueryARB@4)
-	GL_STUB_ALIAS(GenQueries, 524, GenQueries@8, GenQueriesARB, GenQueriesARB@8)
-	GL_STUB_ALIAS(GetQueryObjectiv, 525, GetQueryObjectiv@12, GetQueryObjectivARB, GetQueryObjectivARB@12)
-	GL_STUB_ALIAS(GetQueryObjectuiv, 526, GetQueryObjectuiv@12, GetQueryObjectuivARB, GetQueryObjectuivARB@12)
-	GL_STUB_ALIAS(GetQueryiv, 527, GetQueryiv@12, GetQueryivARB, GetQueryivARB@12)
-	GL_STUB_ALIAS(IsQuery, 528, IsQuery@4, IsQueryARB, IsQueryARB@4)
-	GL_STUB_ALIAS(CompileShader, 530, CompileShader@4, CompileShaderARB, CompileShaderARB@4)
-	GL_STUB_ALIAS(GetActiveUniform, 535, GetActiveUniform@28, GetActiveUniformARB, GetActiveUniformARB@28)
-	GL_STUB_ALIAS(GetShaderSource, 541, GetShaderSource@16, GetShaderSourceARB, GetShaderSourceARB@16)
-	GL_STUB_ALIAS(GetUniformLocation, 542, GetUniformLocation@8, GetUniformLocationARB, GetUniformLocationARB@8)
-	GL_STUB_ALIAS(GetUniformfv, 543, GetUniformfv@12, GetUniformfvARB, GetUniformfvARB@12)
-	GL_STUB_ALIAS(GetUniformiv, 544, GetUniformiv@12, GetUniformivARB, GetUniformivARB@12)
-	GL_STUB_ALIAS(LinkProgram, 545, LinkProgram@4, LinkProgramARB, LinkProgramARB@4)
-	GL_STUB_ALIAS(ShaderSource, 546, ShaderSource@16, ShaderSourceARB, ShaderSourceARB@16)
-	GL_STUB_ALIAS(Uniform1f, 547, Uniform1f@8, Uniform1fARB, Uniform1fARB@8)
-	GL_STUB_ALIAS(Uniform1fv, 548, Uniform1fv@12, Uniform1fvARB, Uniform1fvARB@12)
-	GL_STUB_ALIAS(Uniform1i, 549, Uniform1i@8, Uniform1iARB, Uniform1iARB@8)
-	GL_STUB_ALIAS(Uniform1iv, 550, Uniform1iv@12, Uniform1ivARB, Uniform1ivARB@12)
-	GL_STUB_ALIAS(Uniform2f, 551, Uniform2f@12, Uniform2fARB, Uniform2fARB@12)
-	GL_STUB_ALIAS(Uniform2fv, 552, Uniform2fv@12, Uniform2fvARB, Uniform2fvARB@12)
-	GL_STUB_ALIAS(Uniform2i, 553, Uniform2i@12, Uniform2iARB, Uniform2iARB@12)
-	GL_STUB_ALIAS(Uniform2iv, 554, Uniform2iv@12, Uniform2ivARB, Uniform2ivARB@12)
-	GL_STUB_ALIAS(Uniform3f, 555, Uniform3f@16, Uniform3fARB, Uniform3fARB@16)
-	GL_STUB_ALIAS(Uniform3fv, 556, Uniform3fv@12, Uniform3fvARB, Uniform3fvARB@12)
-	GL_STUB_ALIAS(Uniform3i, 557, Uniform3i@16, Uniform3iARB, Uniform3iARB@16)
-	GL_STUB_ALIAS(Uniform3iv, 558, Uniform3iv@12, Uniform3ivARB, Uniform3ivARB@12)
-	GL_STUB_ALIAS(Uniform4f, 559, Uniform4f@20, Uniform4fARB, Uniform4fARB@20)
-	GL_STUB_ALIAS(Uniform4fv, 560, Uniform4fv@12, Uniform4fvARB, Uniform4fvARB@12)
-	GL_STUB_ALIAS(Uniform4i, 561, Uniform4i@20, Uniform4iARB, Uniform4iARB@20)
-	GL_STUB_ALIAS(Uniform4iv, 562, Uniform4iv@12, Uniform4ivARB, Uniform4ivARB@12)
-	GL_STUB_ALIAS(UniformMatrix2fv, 563, UniformMatrix2fv@16, UniformMatrix2fvARB, UniformMatrix2fvARB@16)
-	GL_STUB_ALIAS(UniformMatrix3fv, 564, UniformMatrix3fv@16, UniformMatrix3fvARB, UniformMatrix3fvARB@16)
-	GL_STUB_ALIAS(UniformMatrix4fv, 565, UniformMatrix4fv@16, UniformMatrix4fvARB, UniformMatrix4fvARB@16)
-	GL_STUB_ALIAS(UseProgram, 566, UseProgram@4, UseProgramObjectARB, UseProgramObjectARB@4)
-	GL_STUB_ALIAS(ValidateProgram, 567, ValidateProgram@4, ValidateProgramARB, ValidateProgramARB@4)
-	GL_STUB_ALIAS(BindAttribLocation, 568, BindAttribLocation@12, BindAttribLocationARB, BindAttribLocationARB@12)
-	GL_STUB_ALIAS(GetActiveAttrib, 569, GetActiveAttrib@28, GetActiveAttribARB, GetActiveAttribARB@28)
-	GL_STUB_ALIAS(GetAttribLocation, 570, GetAttribLocation@8, GetAttribLocationARB, GetAttribLocationARB@8)
-	GL_STUB_ALIAS(DrawBuffers, 571, DrawBuffers@8, DrawBuffersARB, DrawBuffersARB@8)
-	GL_STUB_ALIAS(DrawBuffersATI, 571, DrawBuffersATI@8, DrawBuffersARB, DrawBuffersARB@8)
-	GL_STUB_ALIAS(DrawBuffersNV, 571, DrawBuffersNV@8, DrawBuffersARB, DrawBuffersARB@8)
-	GL_STUB_ALIAS(DrawArraysInstancedEXT, 573, DrawArraysInstancedEXT@16, DrawArraysInstancedARB, DrawArraysInstancedARB@16)
-	GL_STUB_ALIAS(DrawArraysInstanced, 573, DrawArraysInstanced@16, DrawArraysInstancedARB, DrawArraysInstancedARB@16)
-	GL_STUB_ALIAS(DrawElementsInstancedEXT, 574, DrawElementsInstancedEXT@20, DrawElementsInstancedARB, DrawElementsInstancedARB@20)
-	GL_STUB_ALIAS(DrawElementsInstanced, 574, DrawElementsInstanced@20, DrawElementsInstancedARB, DrawElementsInstancedARB@20)
-	GL_STUB_ALIAS(RenderbufferStorageMultisampleEXT, 575, RenderbufferStorageMultisampleEXT@20, RenderbufferStorageMultisample, RenderbufferStorageMultisample@20)
-	GL_STUB_ALIAS(BlendEquationSeparateIndexedAMD, 597, BlendEquationSeparateIndexedAMD@12, BlendEquationSeparateiARB, BlendEquationSeparateiARB@12)
-	GL_STUB_ALIAS(BlendEquationIndexedAMD, 598, BlendEquationIndexedAMD@8, BlendEquationiARB, BlendEquationiARB@8)
-	GL_STUB_ALIAS(BlendFuncSeparateIndexedAMD, 599, BlendFuncSeparateIndexedAMD@20, BlendFuncSeparateiARB, BlendFuncSeparateiARB@20)
-	GL_STUB_ALIAS(BlendFuncIndexedAMD, 600, BlendFuncIndexedAMD@12, BlendFunciARB, BlendFunciARB@12)
-	GL_STUB_ALIAS(PointParameterf, 712, PointParameterf@8, PointParameterfEXT, PointParameterfEXT@8)
-	GL_STUB_ALIAS(PointParameterfARB, 712, PointParameterfARB@8, PointParameterfEXT, PointParameterfEXT@8)
-	GL_STUB_ALIAS(PointParameterfv, 713, PointParameterfv@8, PointParameterfvEXT, PointParameterfvEXT@8)
-	GL_STUB_ALIAS(PointParameterfvARB, 713, PointParameterfvARB@8, PointParameterfvEXT, PointParameterfvEXT@8)
-	GL_STUB_ALIAS(SecondaryColor3b, 716, SecondaryColor3b@12, SecondaryColor3bEXT, SecondaryColor3bEXT@12)
-	GL_STUB_ALIAS(SecondaryColor3bv, 717, SecondaryColor3bv@4, SecondaryColor3bvEXT, SecondaryColor3bvEXT@4)
-	GL_STUB_ALIAS(SecondaryColor3d, 718, SecondaryColor3d@24, SecondaryColor3dEXT, SecondaryColor3dEXT@24)
-	GL_STUB_ALIAS(SecondaryColor3dv, 719, SecondaryColor3dv@4, SecondaryColor3dvEXT, SecondaryColor3dvEXT@4)
-	GL_STUB_ALIAS(SecondaryColor3f, 720, SecondaryColor3f@12, SecondaryColor3fEXT, SecondaryColor3fEXT@12)
-	GL_STUB_ALIAS(SecondaryColor3fv, 721, SecondaryColor3fv@4, SecondaryColor3fvEXT, SecondaryColor3fvEXT@4)
-	GL_STUB_ALIAS(SecondaryColor3i, 722, SecondaryColor3i@12, SecondaryColor3iEXT, SecondaryColor3iEXT@12)
-	GL_STUB_ALIAS(SecondaryColor3iv, 723, SecondaryColor3iv@4, SecondaryColor3ivEXT, SecondaryColor3ivEXT@4)
-	GL_STUB_ALIAS(SecondaryColor3s, 724, SecondaryColor3s@12, SecondaryColor3sEXT, SecondaryColor3sEXT@12)
-	GL_STUB_ALIAS(SecondaryColor3sv, 725, SecondaryColor3sv@4, SecondaryColor3svEXT, SecondaryColor3svEXT@4)
-	GL_STUB_ALIAS(SecondaryColor3ub, 726, SecondaryColor3ub@12, SecondaryColor3ubEXT, SecondaryColor3ubEXT@12)
-	GL_STUB_ALIAS(SecondaryColor3ubv, 727, SecondaryColor3ubv@4, SecondaryColor3ubvEXT, SecondaryColor3ubvEXT@4)
-	GL_STUB_ALIAS(SecondaryColor3ui, 728, SecondaryColor3ui@12, SecondaryColor3uiEXT, SecondaryColor3uiEXT@12)
-	GL_STUB_ALIAS(SecondaryColor3uiv, 729, SecondaryColor3uiv@4, SecondaryColor3uivEXT, SecondaryColor3uivEXT@4)
-	GL_STUB_ALIAS(SecondaryColor3us, 730, SecondaryColor3us@12, SecondaryColor3usEXT, SecondaryColor3usEXT@12)
-	GL_STUB_ALIAS(SecondaryColor3usv, 731, SecondaryColor3usv@4, SecondaryColor3usvEXT, SecondaryColor3usvEXT@4)
-	GL_STUB_ALIAS(SecondaryColorPointer, 732, SecondaryColorPointer@16, SecondaryColorPointerEXT, SecondaryColorPointerEXT@16)
-	GL_STUB_ALIAS(MultiDrawArrays, 733, MultiDrawArrays@16, MultiDrawArraysEXT, MultiDrawArraysEXT@16)
-	GL_STUB_ALIAS(MultiDrawElements, 734, MultiDrawElements@20, MultiDrawElementsEXT, MultiDrawElementsEXT@20)
-	GL_STUB_ALIAS(FogCoordPointer, 735, FogCoordPointer@12, FogCoordPointerEXT, FogCoordPointerEXT@12)
-	GL_STUB_ALIAS(FogCoordd, 736, FogCoordd@8, FogCoorddEXT, FogCoorddEXT@8)
-	GL_STUB_ALIAS(FogCoorddv, 737, FogCoorddv@4, FogCoorddvEXT, FogCoorddvEXT@4)
-	GL_STUB_ALIAS(FogCoordf, 738, FogCoordf@4, FogCoordfEXT, FogCoordfEXT@4)
-	GL_STUB_ALIAS(FogCoordfv, 739, FogCoordfv@4, FogCoordfvEXT, FogCoordfvEXT@4)
-	GL_STUB_ALIAS(BlendFuncSeparate, 741, BlendFuncSeparate@16, BlendFuncSeparateEXT, BlendFuncSeparateEXT@16)
-	GL_STUB_ALIAS(WindowPos2d, 758, WindowPos2d@16, WindowPos2dMESA, WindowPos2dMESA@16)
-	GL_STUB_ALIAS(WindowPos2dARB, 758, WindowPos2dARB@16, WindowPos2dMESA, WindowPos2dMESA@16)
-	GL_STUB_ALIAS(WindowPos2dv, 759, WindowPos2dv@4, WindowPos2dvMESA, WindowPos2dvMESA@4)
-	GL_STUB_ALIAS(WindowPos2dvARB, 759, WindowPos2dvARB@4, WindowPos2dvMESA, WindowPos2dvMESA@4)
-	GL_STUB_ALIAS(WindowPos2f, 760, WindowPos2f@8, WindowPos2fMESA, WindowPos2fMESA@8)
-	GL_STUB_ALIAS(WindowPos2fARB, 760, WindowPos2fARB@8, WindowPos2fMESA, WindowPos2fMESA@8)
-	GL_STUB_ALIAS(WindowPos2fv, 761, WindowPos2fv@4, WindowPos2fvMESA, WindowPos2fvMESA@4)
-	GL_STUB_ALIAS(WindowPos2fvARB, 761, WindowPos2fvARB@4, WindowPos2fvMESA, WindowPos2fvMESA@4)
-	GL_STUB_ALIAS(WindowPos2i, 762, WindowPos2i@8, WindowPos2iMESA, WindowPos2iMESA@8)
-	GL_STUB_ALIAS(WindowPos2iARB, 762, WindowPos2iARB@8, WindowPos2iMESA, WindowPos2iMESA@8)
-	GL_STUB_ALIAS(WindowPos2iv, 763, WindowPos2iv@4, WindowPos2ivMESA, WindowPos2ivMESA@4)
-	GL_STUB_ALIAS(WindowPos2ivARB, 763, WindowPos2ivARB@4, WindowPos2ivMESA, WindowPos2ivMESA@4)
-	GL_STUB_ALIAS(WindowPos2s, 764, WindowPos2s@8, WindowPos2sMESA, WindowPos2sMESA@8)
-	GL_STUB_ALIAS(WindowPos2sARB, 764, WindowPos2sARB@8, WindowPos2sMESA, WindowPos2sMESA@8)
-	GL_STUB_ALIAS(WindowPos2sv, 765, WindowPos2sv@4, WindowPos2svMESA, WindowPos2svMESA@4)
-	GL_STUB_ALIAS(WindowPos2svARB, 765, WindowPos2svARB@4, WindowPos2svMESA, WindowPos2svMESA@4)
-	GL_STUB_ALIAS(WindowPos3d, 766, WindowPos3d@24, WindowPos3dMESA, WindowPos3dMESA@24)
-	GL_STUB_ALIAS(WindowPos3dARB, 766, WindowPos3dARB@24, WindowPos3dMESA, WindowPos3dMESA@24)
-	GL_STUB_ALIAS(WindowPos3dv, 767, WindowPos3dv@4, WindowPos3dvMESA, WindowPos3dvMESA@4)
-	GL_STUB_ALIAS(WindowPos3dvARB, 767, WindowPos3dvARB@4, WindowPos3dvMESA, WindowPos3dvMESA@4)
-	GL_STUB_ALIAS(WindowPos3f, 768, WindowPos3f@12, WindowPos3fMESA, WindowPos3fMESA@12)
-	GL_STUB_ALIAS(WindowPos3fARB, 768, WindowPos3fARB@12, WindowPos3fMESA, WindowPos3fMESA@12)
-	GL_STUB_ALIAS(WindowPos3fv, 769, WindowPos3fv@4, WindowPos3fvMESA, WindowPos3fvMESA@4)
-	GL_STUB_ALIAS(WindowPos3fvARB, 769, WindowPos3fvARB@4, WindowPos3fvMESA, WindowPos3fvMESA@4)
-	GL_STUB_ALIAS(WindowPos3i, 770, WindowPos3i@12, WindowPos3iMESA, WindowPos3iMESA@12)
-	GL_STUB_ALIAS(WindowPos3iARB, 770, WindowPos3iARB@12, WindowPos3iMESA, WindowPos3iMESA@12)
-	GL_STUB_ALIAS(WindowPos3iv, 771, WindowPos3iv@4, WindowPos3ivMESA, WindowPos3ivMESA@4)
-	GL_STUB_ALIAS(WindowPos3ivARB, 771, WindowPos3ivARB@4, WindowPos3ivMESA, WindowPos3ivMESA@4)
-	GL_STUB_ALIAS(WindowPos3s, 772, WindowPos3s@12, WindowPos3sMESA, WindowPos3sMESA@12)
-	GL_STUB_ALIAS(WindowPos3sARB, 772, WindowPos3sARB@12, WindowPos3sMESA, WindowPos3sMESA@12)
-	GL_STUB_ALIAS(WindowPos3sv, 773, WindowPos3sv@4, WindowPos3svMESA, WindowPos3svMESA@4)
-	GL_STUB_ALIAS(WindowPos3svARB, 773, WindowPos3svARB@4, WindowPos3svMESA, WindowPos3svMESA@4)
-	GL_STUB_ALIAS(BindProgramARB, 792, BindProgramARB@8, BindProgramNV, BindProgramNV@8)
-	GL_STUB_ALIAS(DeleteProgramsARB, 793, DeleteProgramsARB@8, DeleteProgramsNV, DeleteProgramsNV@8)
-	GL_STUB_ALIAS(GenProgramsARB, 795, GenProgramsARB@8, GenProgramsNV, GenProgramsNV@8)
-	GL_STUB_ALIAS(GetVertexAttribPointerv, 801, GetVertexAttribPointerv@12, GetVertexAttribPointervNV, GetVertexAttribPointervNV@12)
-	GL_STUB_ALIAS(GetVertexAttribPointervARB, 801, GetVertexAttribPointervARB@12, GetVertexAttribPointervNV, GetVertexAttribPointervNV@12)
-	GL_STUB_ALIAS(IsProgramARB, 805, IsProgramARB@4, IsProgramNV, IsProgramNV@4)
-	GL_STUB_ALIAS(PointParameteri, 869, PointParameteri@8, PointParameteriNV, PointParameteriNV@8)
-	GL_STUB_ALIAS(PointParameteriv, 870, PointParameteriv@8, PointParameterivNV, PointParameterivNV@8)
-	GL_STUB_ALIAS(DeleteVertexArrays, 873, DeleteVertexArrays@8, _dispatch_stub_873, _dispatch_stub_873@8)
-	GL_STUB_ALIAS(IsVertexArray, 875, IsVertexArray@4, _dispatch_stub_875, _dispatch_stub_875@4)
-	GL_STUB_ALIAS(PrimitiveRestartIndex, 882, PrimitiveRestartIndex@4, PrimitiveRestartIndexNV, PrimitiveRestartIndexNV@4)
-	GL_STUB_ALIAS(BlendEquationSeparate, 885, BlendEquationSeparate@8, _dispatch_stub_885, _dispatch_stub_885@8)
-	GL_STUB_ALIAS(BindFramebuffer, 886, BindFramebuffer@8, BindFramebufferEXT, BindFramebufferEXT@8)
-	GL_STUB_ALIAS(BindRenderbuffer, 887, BindRenderbuffer@8, BindRenderbufferEXT, BindRenderbufferEXT@8)
-	GL_STUB_ALIAS(CheckFramebufferStatus, 888, CheckFramebufferStatus@4, CheckFramebufferStatusEXT, CheckFramebufferStatusEXT@4)
-	GL_STUB_ALIAS(DeleteFramebuffers, 889, DeleteFramebuffers@8, DeleteFramebuffersEXT, DeleteFramebuffersEXT@8)
-	GL_STUB_ALIAS(DeleteRenderbuffers, 890, DeleteRenderbuffers@8, DeleteRenderbuffersEXT, DeleteRenderbuffersEXT@8)
-	GL_STUB_ALIAS(FramebufferRenderbuffer, 891, FramebufferRenderbuffer@16, FramebufferRenderbufferEXT, FramebufferRenderbufferEXT@16)
-	GL_STUB_ALIAS(FramebufferTexture1D, 892, FramebufferTexture1D@20, FramebufferTexture1DEXT, FramebufferTexture1DEXT@20)
-	GL_STUB_ALIAS(FramebufferTexture2D, 893, FramebufferTexture2D@20, FramebufferTexture2DEXT, FramebufferTexture2DEXT@20)
-	GL_STUB_ALIAS(FramebufferTexture3D, 894, FramebufferTexture3D@24, FramebufferTexture3DEXT, FramebufferTexture3DEXT@24)
-	GL_STUB_ALIAS(GenFramebuffers, 895, GenFramebuffers@8, GenFramebuffersEXT, GenFramebuffersEXT@8)
-	GL_STUB_ALIAS(GenRenderbuffers, 896, GenRenderbuffers@8, GenRenderbuffersEXT, GenRenderbuffersEXT@8)
-	GL_STUB_ALIAS(GenerateMipmap, 897, GenerateMipmap@4, GenerateMipmapEXT, GenerateMipmapEXT@4)
-	GL_STUB_ALIAS(GetFramebufferAttachmentParameteriv, 898, GetFramebufferAttachmentParameteriv@16, GetFramebufferAttachmentParameterivEXT, GetFramebufferAttachmentParameterivEXT@16)
-	GL_STUB_ALIAS(GetRenderbufferParameteriv, 899, GetRenderbufferParameteriv@12, GetRenderbufferParameterivEXT, GetRenderbufferParameterivEXT@12)
-	GL_STUB_ALIAS(IsFramebuffer, 900, IsFramebuffer@4, IsFramebufferEXT, IsFramebufferEXT@4)
-	GL_STUB_ALIAS(IsRenderbuffer, 901, IsRenderbuffer@4, IsRenderbufferEXT, IsRenderbufferEXT@4)
-	GL_STUB_ALIAS(RenderbufferStorage, 902, RenderbufferStorage@16, RenderbufferStorageEXT, RenderbufferStorageEXT@16)
-	GL_STUB_ALIAS(BlitFramebuffer, 903, BlitFramebuffer@40, _dispatch_stub_903, _dispatch_stub_903@40)
-	GL_STUB_ALIAS(BindFragDataLocation, 906, BindFragDataLocation@12, BindFragDataLocationEXT, BindFragDataLocationEXT@12)
-	GL_STUB_ALIAS(GetFragDataLocation, 907, GetFragDataLocation@8, GetFragDataLocationEXT, GetFragDataLocationEXT@8)
-	GL_STUB_ALIAS(GetUniformuiv, 908, GetUniformuiv@12, GetUniformuivEXT, GetUniformuivEXT@12)
-	GL_STUB_ALIAS(GetVertexAttribIiv, 909, GetVertexAttribIiv@12, GetVertexAttribIivEXT, GetVertexAttribIivEXT@12)
-	GL_STUB_ALIAS(GetVertexAttribIuiv, 910, GetVertexAttribIuiv@12, GetVertexAttribIuivEXT, GetVertexAttribIuivEXT@12)
-	GL_STUB_ALIAS(Uniform1ui, 911, Uniform1ui@8, Uniform1uiEXT, Uniform1uiEXT@8)
-	GL_STUB_ALIAS(Uniform1uiv, 912, Uniform1uiv@12, Uniform1uivEXT, Uniform1uivEXT@12)
-	GL_STUB_ALIAS(Uniform2ui, 913, Uniform2ui@12, Uniform2uiEXT, Uniform2uiEXT@12)
-	GL_STUB_ALIAS(Uniform2uiv, 914, Uniform2uiv@12, Uniform2uivEXT, Uniform2uivEXT@12)
-	GL_STUB_ALIAS(Uniform3ui, 915, Uniform3ui@16, Uniform3uiEXT, Uniform3uiEXT@16)
-	GL_STUB_ALIAS(Uniform3uiv, 916, Uniform3uiv@12, Uniform3uivEXT, Uniform3uivEXT@12)
-	GL_STUB_ALIAS(Uniform4ui, 917, Uniform4ui@20, Uniform4uiEXT, Uniform4uiEXT@20)
-	GL_STUB_ALIAS(Uniform4uiv, 918, Uniform4uiv@12, Uniform4uivEXT, Uniform4uivEXT@12)
-	GL_STUB_ALIAS(VertexAttribI1i, 919, VertexAttribI1i@8, VertexAttribI1iEXT, VertexAttribI1iEXT@8)
-	GL_STUB_ALIAS(VertexAttribI1iv, 920, VertexAttribI1iv@8, VertexAttribI1ivEXT, VertexAttribI1ivEXT@8)
-	GL_STUB_ALIAS(VertexAttribI1ui, 921, VertexAttribI1ui@8, VertexAttribI1uiEXT, VertexAttribI1uiEXT@8)
-	GL_STUB_ALIAS(VertexAttribI1uiv, 922, VertexAttribI1uiv@8, VertexAttribI1uivEXT, VertexAttribI1uivEXT@8)
-	GL_STUB_ALIAS(VertexAttribI2i, 923, VertexAttribI2i@12, VertexAttribI2iEXT, VertexAttribI2iEXT@12)
-	GL_STUB_ALIAS(VertexAttribI2iv, 924, VertexAttribI2iv@8, VertexAttribI2ivEXT, VertexAttribI2ivEXT@8)
-	GL_STUB_ALIAS(VertexAttribI2ui, 925, VertexAttribI2ui@12, VertexAttribI2uiEXT, VertexAttribI2uiEXT@12)
-	GL_STUB_ALIAS(VertexAttribI2uiv, 926, VertexAttribI2uiv@8, VertexAttribI2uivEXT, VertexAttribI2uivEXT@8)
-	GL_STUB_ALIAS(VertexAttribI3i, 927, VertexAttribI3i@16, VertexAttribI3iEXT, VertexAttribI3iEXT@16)
-	GL_STUB_ALIAS(VertexAttribI3iv, 928, VertexAttribI3iv@8, VertexAttribI3ivEXT, VertexAttribI3ivEXT@8)
-	GL_STUB_ALIAS(VertexAttribI3ui, 929, VertexAttribI3ui@16, VertexAttribI3uiEXT, VertexAttribI3uiEXT@16)
-	GL_STUB_ALIAS(VertexAttribI3uiv, 930, VertexAttribI3uiv@8, VertexAttribI3uivEXT, VertexAttribI3uivEXT@8)
-	GL_STUB_ALIAS(VertexAttribI4bv, 931, VertexAttribI4bv@8, VertexAttribI4bvEXT, VertexAttribI4bvEXT@8)
-	GL_STUB_ALIAS(VertexAttribI4i, 932, VertexAttribI4i@20, VertexAttribI4iEXT, VertexAttribI4iEXT@20)
-	GL_STUB_ALIAS(VertexAttribI4iv, 933, VertexAttribI4iv@8, VertexAttribI4ivEXT, VertexAttribI4ivEXT@8)
-	GL_STUB_ALIAS(VertexAttribI4sv, 934, VertexAttribI4sv@8, VertexAttribI4svEXT, VertexAttribI4svEXT@8)
-	GL_STUB_ALIAS(VertexAttribI4ubv, 935, VertexAttribI4ubv@8, VertexAttribI4ubvEXT, VertexAttribI4ubvEXT@8)
-	GL_STUB_ALIAS(VertexAttribI4ui, 936, VertexAttribI4ui@20, VertexAttribI4uiEXT, VertexAttribI4uiEXT@20)
-	GL_STUB_ALIAS(VertexAttribI4uiv, 937, VertexAttribI4uiv@8, VertexAttribI4uivEXT, VertexAttribI4uivEXT@8)
-	GL_STUB_ALIAS(VertexAttribI4usv, 938, VertexAttribI4usv@8, VertexAttribI4usvEXT, VertexAttribI4usvEXT@8)
-	GL_STUB_ALIAS(VertexAttribIPointer, 939, VertexAttribIPointer@20, VertexAttribIPointerEXT, VertexAttribIPointerEXT@20)
-	GL_STUB_ALIAS(FramebufferTextureLayer, 940, FramebufferTextureLayer@20, FramebufferTextureLayerEXT, FramebufferTextureLayerEXT@20)
-	GL_STUB_ALIAS(FramebufferTextureLayerARB, 940, FramebufferTextureLayerARB@20, FramebufferTextureLayerEXT, FramebufferTextureLayerEXT@20)
-	GL_STUB_ALIAS(ColorMaski, 941, ColorMaski@20, ColorMaskIndexedEXT, ColorMaskIndexedEXT@20)
-	GL_STUB_ALIAS(Disablei, 942, Disablei@8, DisableIndexedEXT, DisableIndexedEXT@8)
-	GL_STUB_ALIAS(Enablei, 943, Enablei@8, EnableIndexedEXT, EnableIndexedEXT@8)
-	GL_STUB_ALIAS(GetBooleani_v, 944, GetBooleani_v@12, GetBooleanIndexedvEXT, GetBooleanIndexedvEXT@12)
-	GL_STUB_ALIAS(GetIntegeri_v, 945, GetIntegeri_v@12, GetIntegerIndexedvEXT, GetIntegerIndexedvEXT@12)
-	GL_STUB_ALIAS(IsEnabledi, 946, IsEnabledi@8, IsEnabledIndexedEXT, IsEnabledIndexedEXT@8)
-	GL_STUB_ALIAS(GetTexParameterIiv, 949, GetTexParameterIiv@12, GetTexParameterIivEXT, GetTexParameterIivEXT@12)
-	GL_STUB_ALIAS(GetTexParameterIuiv, 950, GetTexParameterIuiv@12, GetTexParameterIuivEXT, GetTexParameterIuivEXT@12)
-	GL_STUB_ALIAS(TexParameterIiv, 951, TexParameterIiv@12, TexParameterIivEXT, TexParameterIivEXT@12)
-	GL_STUB_ALIAS(TexParameterIuiv, 952, TexParameterIuiv@12, TexParameterIuivEXT, TexParameterIuivEXT@12)
-	GL_STUB_ALIAS(BeginConditionalRender, 953, BeginConditionalRender@8, BeginConditionalRenderNV, BeginConditionalRenderNV@8)
-	GL_STUB_ALIAS(EndConditionalRender, 954, EndConditionalRender@0, EndConditionalRenderNV, EndConditionalRenderNV@0)
-	GL_STUB_ALIAS(BeginTransformFeedback, 955, BeginTransformFeedback@4, BeginTransformFeedbackEXT, BeginTransformFeedbackEXT@4)
-	GL_STUB_ALIAS(BindBufferBase, 956, BindBufferBase@12, BindBufferBaseEXT, BindBufferBaseEXT@12)
-	GL_STUB_ALIAS(BindBufferRange, 958, BindBufferRange@20, BindBufferRangeEXT, BindBufferRangeEXT@20)
-	GL_STUB_ALIAS(EndTransformFeedback, 959, EndTransformFeedback@0, EndTransformFeedbackEXT, EndTransformFeedbackEXT@0)
-	GL_STUB_ALIAS(GetTransformFeedbackVarying, 960, GetTransformFeedbackVarying@28, GetTransformFeedbackVaryingEXT, GetTransformFeedbackVaryingEXT@28)
-	GL_STUB_ALIAS(TransformFeedbackVaryings, 961, TransformFeedbackVaryings@16, TransformFeedbackVaryingsEXT, TransformFeedbackVaryingsEXT@16)
-	GL_STUB_ALIAS(ProvokingVertex, 962, ProvokingVertex@4, ProvokingVertexEXT, ProvokingVertexEXT@4)
+	GL_STUB_ALIAS(LoadTransposeMatrixd, 440, LoadTransposeMatrixd@4, LoadTransposeMatrixdARB, LoadTransposeMatrixdARB@4)
+	GL_STUB_ALIAS(LoadTransposeMatrixf, 441, LoadTransposeMatrixf@4, LoadTransposeMatrixfARB, LoadTransposeMatrixfARB@4)
+	GL_STUB_ALIAS(MultTransposeMatrixd, 442, MultTransposeMatrixd@4, MultTransposeMatrixdARB, MultTransposeMatrixdARB@4)
+	GL_STUB_ALIAS(MultTransposeMatrixf, 443, MultTransposeMatrixf@4, MultTransposeMatrixfARB, MultTransposeMatrixfARB@4)
+	GL_STUB_ALIAS(SampleCoverage, 444, SampleCoverage@8, SampleCoverageARB, SampleCoverageARB@8)
+	GL_STUB_ALIAS(CompressedTexImage1D, 445, CompressedTexImage1D@28, CompressedTexImage1DARB, CompressedTexImage1DARB@28)
+	GL_STUB_ALIAS(CompressedTexImage2D, 446, CompressedTexImage2D@32, CompressedTexImage2DARB, CompressedTexImage2DARB@32)
+	GL_STUB_ALIAS(CompressedTexImage3D, 447, CompressedTexImage3D@36, CompressedTexImage3DARB, CompressedTexImage3DARB@36)
+	GL_STUB_ALIAS(CompressedTexSubImage1D, 448, CompressedTexSubImage1D@28, CompressedTexSubImage1DARB, CompressedTexSubImage1DARB@28)
+	GL_STUB_ALIAS(CompressedTexSubImage2D, 449, CompressedTexSubImage2D@36, CompressedTexSubImage2DARB, CompressedTexSubImage2DARB@36)
+	GL_STUB_ALIAS(CompressedTexSubImage3D, 450, CompressedTexSubImage3D@44, CompressedTexSubImage3DARB, CompressedTexSubImage3DARB@44)
+	GL_STUB_ALIAS(GetCompressedTexImage, 451, GetCompressedTexImage@12, GetCompressedTexImageARB, GetCompressedTexImageARB@12)
+	GL_STUB_ALIAS(DisableVertexAttribArray, 452, DisableVertexAttribArray@4, DisableVertexAttribArrayARB, DisableVertexAttribArrayARB@4)
+	GL_STUB_ALIAS(EnableVertexAttribArray, 453, EnableVertexAttribArray@4, EnableVertexAttribArrayARB, EnableVertexAttribArrayARB@4)
+	GL_STUB_ALIAS(GetVertexAttribdv, 460, GetVertexAttribdv@12, GetVertexAttribdvARB, GetVertexAttribdvARB@12)
+	GL_STUB_ALIAS(GetVertexAttribfv, 461, GetVertexAttribfv@12, GetVertexAttribfvARB, GetVertexAttribfvARB@12)
+	GL_STUB_ALIAS(GetVertexAttribiv, 462, GetVertexAttribiv@12, GetVertexAttribivARB, GetVertexAttribivARB@12)
+	GL_STUB_ALIAS(ProgramParameter4dNV, 463, ProgramParameter4dNV@40, ProgramEnvParameter4dARB, ProgramEnvParameter4dARB@40)
+	GL_STUB_ALIAS(ProgramParameter4dvNV, 464, ProgramParameter4dvNV@12, ProgramEnvParameter4dvARB, ProgramEnvParameter4dvARB@12)
+	GL_STUB_ALIAS(ProgramParameter4fNV, 465, ProgramParameter4fNV@24, ProgramEnvParameter4fARB, ProgramEnvParameter4fARB@24)
+	GL_STUB_ALIAS(ProgramParameter4fvNV, 466, ProgramParameter4fvNV@12, ProgramEnvParameter4fvARB, ProgramEnvParameter4fvARB@12)
+	GL_STUB_ALIAS(VertexAttrib1d, 472, VertexAttrib1d@12, VertexAttrib1dARB, VertexAttrib1dARB@12)
+	GL_STUB_ALIAS(VertexAttrib1dv, 473, VertexAttrib1dv@8, VertexAttrib1dvARB, VertexAttrib1dvARB@8)
+	GL_STUB_ALIAS(VertexAttrib1f, 474, VertexAttrib1f@8, VertexAttrib1fARB, VertexAttrib1fARB@8)
+	GL_STUB_ALIAS(VertexAttrib1fv, 475, VertexAttrib1fv@8, VertexAttrib1fvARB, VertexAttrib1fvARB@8)
+	GL_STUB_ALIAS(VertexAttrib1s, 476, VertexAttrib1s@8, VertexAttrib1sARB, VertexAttrib1sARB@8)
+	GL_STUB_ALIAS(VertexAttrib1sv, 477, VertexAttrib1sv@8, VertexAttrib1svARB, VertexAttrib1svARB@8)
+	GL_STUB_ALIAS(VertexAttrib2d, 478, VertexAttrib2d@20, VertexAttrib2dARB, VertexAttrib2dARB@20)
+	GL_STUB_ALIAS(VertexAttrib2dv, 479, VertexAttrib2dv@8, VertexAttrib2dvARB, VertexAttrib2dvARB@8)
+	GL_STUB_ALIAS(VertexAttrib2f, 480, VertexAttrib2f@12, VertexAttrib2fARB, VertexAttrib2fARB@12)
+	GL_STUB_ALIAS(VertexAttrib2fv, 481, VertexAttrib2fv@8, VertexAttrib2fvARB, VertexAttrib2fvARB@8)
+	GL_STUB_ALIAS(VertexAttrib2s, 482, VertexAttrib2s@12, VertexAttrib2sARB, VertexAttrib2sARB@12)
+	GL_STUB_ALIAS(VertexAttrib2sv, 483, VertexAttrib2sv@8, VertexAttrib2svARB, VertexAttrib2svARB@8)
+	GL_STUB_ALIAS(VertexAttrib3d, 484, VertexAttrib3d@28, VertexAttrib3dARB, VertexAttrib3dARB@28)
+	GL_STUB_ALIAS(VertexAttrib3dv, 485, VertexAttrib3dv@8, VertexAttrib3dvARB, VertexAttrib3dvARB@8)
+	GL_STUB_ALIAS(VertexAttrib3f, 486, VertexAttrib3f@16, VertexAttrib3fARB, VertexAttrib3fARB@16)
+	GL_STUB_ALIAS(VertexAttrib3fv, 487, VertexAttrib3fv@8, VertexAttrib3fvARB, VertexAttrib3fvARB@8)
+	GL_STUB_ALIAS(VertexAttrib3s, 488, VertexAttrib3s@16, VertexAttrib3sARB, VertexAttrib3sARB@16)
+	GL_STUB_ALIAS(VertexAttrib3sv, 489, VertexAttrib3sv@8, VertexAttrib3svARB, VertexAttrib3svARB@8)
+	GL_STUB_ALIAS(VertexAttrib4Nbv, 490, VertexAttrib4Nbv@8, VertexAttrib4NbvARB, VertexAttrib4NbvARB@8)
+	GL_STUB_ALIAS(VertexAttrib4Niv, 491, VertexAttrib4Niv@8, VertexAttrib4NivARB, VertexAttrib4NivARB@8)
+	GL_STUB_ALIAS(VertexAttrib4Nsv, 492, VertexAttrib4Nsv@8, VertexAttrib4NsvARB, VertexAttrib4NsvARB@8)
+	GL_STUB_ALIAS(VertexAttrib4Nub, 493, VertexAttrib4Nub@20, VertexAttrib4NubARB, VertexAttrib4NubARB@20)
+	GL_STUB_ALIAS(VertexAttrib4Nubv, 494, VertexAttrib4Nubv@8, VertexAttrib4NubvARB, VertexAttrib4NubvARB@8)
+	GL_STUB_ALIAS(VertexAttrib4Nuiv, 495, VertexAttrib4Nuiv@8, VertexAttrib4NuivARB, VertexAttrib4NuivARB@8)
+	GL_STUB_ALIAS(VertexAttrib4Nusv, 496, VertexAttrib4Nusv@8, VertexAttrib4NusvARB, VertexAttrib4NusvARB@8)
+	GL_STUB_ALIAS(VertexAttrib4bv, 497, VertexAttrib4bv@8, VertexAttrib4bvARB, VertexAttrib4bvARB@8)
+	GL_STUB_ALIAS(VertexAttrib4d, 498, VertexAttrib4d@36, VertexAttrib4dARB, VertexAttrib4dARB@36)
+	GL_STUB_ALIAS(VertexAttrib4dv, 499, VertexAttrib4dv@8, VertexAttrib4dvARB, VertexAttrib4dvARB@8)
+	GL_STUB_ALIAS(VertexAttrib4f, 500, VertexAttrib4f@20, VertexAttrib4fARB, VertexAttrib4fARB@20)
+	GL_STUB_ALIAS(VertexAttrib4fv, 501, VertexAttrib4fv@8, VertexAttrib4fvARB, VertexAttrib4fvARB@8)
+	GL_STUB_ALIAS(VertexAttrib4iv, 502, VertexAttrib4iv@8, VertexAttrib4ivARB, VertexAttrib4ivARB@8)
+	GL_STUB_ALIAS(VertexAttrib4s, 503, VertexAttrib4s@20, VertexAttrib4sARB, VertexAttrib4sARB@20)
+	GL_STUB_ALIAS(VertexAttrib4sv, 504, VertexAttrib4sv@8, VertexAttrib4svARB, VertexAttrib4svARB@8)
+	GL_STUB_ALIAS(VertexAttrib4ubv, 505, VertexAttrib4ubv@8, VertexAttrib4ubvARB, VertexAttrib4ubvARB@8)
+	GL_STUB_ALIAS(VertexAttrib4uiv, 506, VertexAttrib4uiv@8, VertexAttrib4uivARB, VertexAttrib4uivARB@8)
+	GL_STUB_ALIAS(VertexAttrib4usv, 507, VertexAttrib4usv@8, VertexAttrib4usvARB, VertexAttrib4usvARB@8)
+	GL_STUB_ALIAS(VertexAttribPointer, 508, VertexAttribPointer@24, VertexAttribPointerARB, VertexAttribPointerARB@24)
+	GL_STUB_ALIAS(BindBuffer, 509, BindBuffer@8, BindBufferARB, BindBufferARB@8)
+	GL_STUB_ALIAS(BufferData, 510, BufferData@16, BufferDataARB, BufferDataARB@16)
+	GL_STUB_ALIAS(BufferSubData, 511, BufferSubData@16, BufferSubDataARB, BufferSubDataARB@16)
+	GL_STUB_ALIAS(DeleteBuffers, 512, DeleteBuffers@8, DeleteBuffersARB, DeleteBuffersARB@8)
+	GL_STUB_ALIAS(GenBuffers, 513, GenBuffers@8, GenBuffersARB, GenBuffersARB@8)
+	GL_STUB_ALIAS(GetBufferParameteriv, 514, GetBufferParameteriv@12, GetBufferParameterivARB, GetBufferParameterivARB@12)
+	GL_STUB_ALIAS(GetBufferPointerv, 515, GetBufferPointerv@12, GetBufferPointervARB, GetBufferPointervARB@12)
+	GL_STUB_ALIAS(GetBufferSubData, 516, GetBufferSubData@16, GetBufferSubDataARB, GetBufferSubDataARB@16)
+	GL_STUB_ALIAS(IsBuffer, 517, IsBuffer@4, IsBufferARB, IsBufferARB@4)
+	GL_STUB_ALIAS(MapBuffer, 518, MapBuffer@8, MapBufferARB, MapBufferARB@8)
+	GL_STUB_ALIAS(UnmapBuffer, 519, UnmapBuffer@4, UnmapBufferARB, UnmapBufferARB@4)
+	GL_STUB_ALIAS(BeginQuery, 520, BeginQuery@8, BeginQueryARB, BeginQueryARB@8)
+	GL_STUB_ALIAS(DeleteQueries, 521, DeleteQueries@8, DeleteQueriesARB, DeleteQueriesARB@8)
+	GL_STUB_ALIAS(EndQuery, 522, EndQuery@4, EndQueryARB, EndQueryARB@4)
+	GL_STUB_ALIAS(GenQueries, 523, GenQueries@8, GenQueriesARB, GenQueriesARB@8)
+	GL_STUB_ALIAS(GetQueryObjectiv, 524, GetQueryObjectiv@12, GetQueryObjectivARB, GetQueryObjectivARB@12)
+	GL_STUB_ALIAS(GetQueryObjectuiv, 525, GetQueryObjectuiv@12, GetQueryObjectuivARB, GetQueryObjectuivARB@12)
+	GL_STUB_ALIAS(GetQueryiv, 526, GetQueryiv@12, GetQueryivARB, GetQueryivARB@12)
+	GL_STUB_ALIAS(IsQuery, 527, IsQuery@4, IsQueryARB, IsQueryARB@4)
+	GL_STUB_ALIAS(CompileShader, 529, CompileShader@4, CompileShaderARB, CompileShaderARB@4)
+	GL_STUB_ALIAS(GetActiveUniform, 534, GetActiveUniform@28, GetActiveUniformARB, GetActiveUniformARB@28)
+	GL_STUB_ALIAS(GetShaderSource, 540, GetShaderSource@16, GetShaderSourceARB, GetShaderSourceARB@16)
+	GL_STUB_ALIAS(GetUniformLocation, 541, GetUniformLocation@8, GetUniformLocationARB, GetUniformLocationARB@8)
+	GL_STUB_ALIAS(GetUniformfv, 542, GetUniformfv@12, GetUniformfvARB, GetUniformfvARB@12)
+	GL_STUB_ALIAS(GetUniformiv, 543, GetUniformiv@12, GetUniformivARB, GetUniformivARB@12)
+	GL_STUB_ALIAS(LinkProgram, 544, LinkProgram@4, LinkProgramARB, LinkProgramARB@4)
+	GL_STUB_ALIAS(ShaderSource, 545, ShaderSource@16, ShaderSourceARB, ShaderSourceARB@16)
+	GL_STUB_ALIAS(Uniform1f, 546, Uniform1f@8, Uniform1fARB, Uniform1fARB@8)
+	GL_STUB_ALIAS(Uniform1fv, 547, Uniform1fv@12, Uniform1fvARB, Uniform1fvARB@12)
+	GL_STUB_ALIAS(Uniform1i, 548, Uniform1i@8, Uniform1iARB, Uniform1iARB@8)
+	GL_STUB_ALIAS(Uniform1iv, 549, Uniform1iv@12, Uniform1ivARB, Uniform1ivARB@12)
+	GL_STUB_ALIAS(Uniform2f, 550, Uniform2f@12, Uniform2fARB, Uniform2fARB@12)
+	GL_STUB_ALIAS(Uniform2fv, 551, Uniform2fv@12, Uniform2fvARB, Uniform2fvARB@12)
+	GL_STUB_ALIAS(Uniform2i, 552, Uniform2i@12, Uniform2iARB, Uniform2iARB@12)
+	GL_STUB_ALIAS(Uniform2iv, 553, Uniform2iv@12, Uniform2ivARB, Uniform2ivARB@12)
+	GL_STUB_ALIAS(Uniform3f, 554, Uniform3f@16, Uniform3fARB, Uniform3fARB@16)
+	GL_STUB_ALIAS(Uniform3fv, 555, Uniform3fv@12, Uniform3fvARB, Uniform3fvARB@12)
+	GL_STUB_ALIAS(Uniform3i, 556, Uniform3i@16, Uniform3iARB, Uniform3iARB@16)
+	GL_STUB_ALIAS(Uniform3iv, 557, Uniform3iv@12, Uniform3ivARB, Uniform3ivARB@12)
+	GL_STUB_ALIAS(Uniform4f, 558, Uniform4f@20, Uniform4fARB, Uniform4fARB@20)
+	GL_STUB_ALIAS(Uniform4fv, 559, Uniform4fv@12, Uniform4fvARB, Uniform4fvARB@12)
+	GL_STUB_ALIAS(Uniform4i, 560, Uniform4i@20, Uniform4iARB, Uniform4iARB@20)
+	GL_STUB_ALIAS(Uniform4iv, 561, Uniform4iv@12, Uniform4ivARB, Uniform4ivARB@12)
+	GL_STUB_ALIAS(UniformMatrix2fv, 562, UniformMatrix2fv@16, UniformMatrix2fvARB, UniformMatrix2fvARB@16)
+	GL_STUB_ALIAS(UniformMatrix3fv, 563, UniformMatrix3fv@16, UniformMatrix3fvARB, UniformMatrix3fvARB@16)
+	GL_STUB_ALIAS(UniformMatrix4fv, 564, UniformMatrix4fv@16, UniformMatrix4fvARB, UniformMatrix4fvARB@16)
+	GL_STUB_ALIAS(UseProgram, 565, UseProgram@4, UseProgramObjectARB, UseProgramObjectARB@4)
+	GL_STUB_ALIAS(ValidateProgram, 566, ValidateProgram@4, ValidateProgramARB, ValidateProgramARB@4)
+	GL_STUB_ALIAS(BindAttribLocation, 567, BindAttribLocation@12, BindAttribLocationARB, BindAttribLocationARB@12)
+	GL_STUB_ALIAS(GetActiveAttrib, 568, GetActiveAttrib@28, GetActiveAttribARB, GetActiveAttribARB@28)
+	GL_STUB_ALIAS(GetAttribLocation, 569, GetAttribLocation@8, GetAttribLocationARB, GetAttribLocationARB@8)
+	GL_STUB_ALIAS(DrawBuffers, 570, DrawBuffers@8, DrawBuffersARB, DrawBuffersARB@8)
+	GL_STUB_ALIAS(DrawBuffersATI, 570, DrawBuffersATI@8, DrawBuffersARB, DrawBuffersARB@8)
+	GL_STUB_ALIAS(DrawBuffersNV, 570, DrawBuffersNV@8, DrawBuffersARB, DrawBuffersARB@8)
+	GL_STUB_ALIAS(DrawArraysInstancedEXT, 572, DrawArraysInstancedEXT@16, DrawArraysInstancedARB, DrawArraysInstancedARB@16)
+	GL_STUB_ALIAS(DrawArraysInstanced, 572, DrawArraysInstanced@16, DrawArraysInstancedARB, DrawArraysInstancedARB@16)
+	GL_STUB_ALIAS(DrawElementsInstancedEXT, 573, DrawElementsInstancedEXT@20, DrawElementsInstancedARB, DrawElementsInstancedARB@20)
+	GL_STUB_ALIAS(DrawElementsInstanced, 573, DrawElementsInstanced@20, DrawElementsInstancedARB, DrawElementsInstancedARB@20)
+	GL_STUB_ALIAS(RenderbufferStorageMultisampleEXT, 574, RenderbufferStorageMultisampleEXT@20, RenderbufferStorageMultisample, RenderbufferStorageMultisample@20)
+	GL_STUB_ALIAS(TexBuffer, 581, TexBuffer@12, TexBufferARB, TexBufferARB@12)
+	GL_STUB_ALIAS(BlendEquationSeparateIndexedAMD, 596, BlendEquationSeparateIndexedAMD@12, BlendEquationSeparateiARB, BlendEquationSeparateiARB@12)
+	GL_STUB_ALIAS(BlendEquationIndexedAMD, 597, BlendEquationIndexedAMD@8, BlendEquationiARB, BlendEquationiARB@8)
+	GL_STUB_ALIAS(BlendFuncSeparateIndexedAMD, 598, BlendFuncSeparateIndexedAMD@20, BlendFuncSeparateiARB, BlendFuncSeparateiARB@20)
+	GL_STUB_ALIAS(BlendFuncIndexedAMD, 599, BlendFuncIndexedAMD@12, BlendFunciARB, BlendFunciARB@12)
+	GL_STUB_ALIAS(PointParameterf, 711, PointParameterf@8, PointParameterfEXT, PointParameterfEXT@8)
+	GL_STUB_ALIAS(PointParameterfARB, 711, PointParameterfARB@8, PointParameterfEXT, PointParameterfEXT@8)
+	GL_STUB_ALIAS(PointParameterfv, 712, PointParameterfv@8, PointParameterfvEXT, PointParameterfvEXT@8)
+	GL_STUB_ALIAS(PointParameterfvARB, 712, PointParameterfvARB@8, PointParameterfvEXT, PointParameterfvEXT@8)
+	GL_STUB_ALIAS(SecondaryColor3b, 715, SecondaryColor3b@12, SecondaryColor3bEXT, SecondaryColor3bEXT@12)
+	GL_STUB_ALIAS(SecondaryColor3bv, 716, SecondaryColor3bv@4, SecondaryColor3bvEXT, SecondaryColor3bvEXT@4)
+	GL_STUB_ALIAS(SecondaryColor3d, 717, SecondaryColor3d@24, SecondaryColor3dEXT, SecondaryColor3dEXT@24)
+	GL_STUB_ALIAS(SecondaryColor3dv, 718, SecondaryColor3dv@4, SecondaryColor3dvEXT, SecondaryColor3dvEXT@4)
+	GL_STUB_ALIAS(SecondaryColor3f, 719, SecondaryColor3f@12, SecondaryColor3fEXT, SecondaryColor3fEXT@12)
+	GL_STUB_ALIAS(SecondaryColor3fv, 720, SecondaryColor3fv@4, SecondaryColor3fvEXT, SecondaryColor3fvEXT@4)
+	GL_STUB_ALIAS(SecondaryColor3i, 721, SecondaryColor3i@12, SecondaryColor3iEXT, SecondaryColor3iEXT@12)
+	GL_STUB_ALIAS(SecondaryColor3iv, 722, SecondaryColor3iv@4, SecondaryColor3ivEXT, SecondaryColor3ivEXT@4)
+	GL_STUB_ALIAS(SecondaryColor3s, 723, SecondaryColor3s@12, SecondaryColor3sEXT, SecondaryColor3sEXT@12)
+	GL_STUB_ALIAS(SecondaryColor3sv, 724, SecondaryColor3sv@4, SecondaryColor3svEXT, SecondaryColor3svEXT@4)
+	GL_STUB_ALIAS(SecondaryColor3ub, 725, SecondaryColor3ub@12, SecondaryColor3ubEXT, SecondaryColor3ubEXT@12)
+	GL_STUB_ALIAS(SecondaryColor3ubv, 726, SecondaryColor3ubv@4, SecondaryColor3ubvEXT, SecondaryColor3ubvEXT@4)
+	GL_STUB_ALIAS(SecondaryColor3ui, 727, SecondaryColor3ui@12, SecondaryColor3uiEXT, SecondaryColor3uiEXT@12)
+	GL_STUB_ALIAS(SecondaryColor3uiv, 728, SecondaryColor3uiv@4, SecondaryColor3uivEXT, SecondaryColor3uivEXT@4)
+	GL_STUB_ALIAS(SecondaryColor3us, 729, SecondaryColor3us@12, SecondaryColor3usEXT, SecondaryColor3usEXT@12)
+	GL_STUB_ALIAS(SecondaryColor3usv, 730, SecondaryColor3usv@4, SecondaryColor3usvEXT, SecondaryColor3usvEXT@4)
+	GL_STUB_ALIAS(SecondaryColorPointer, 731, SecondaryColorPointer@16, SecondaryColorPointerEXT, SecondaryColorPointerEXT@16)
+	GL_STUB_ALIAS(MultiDrawArrays, 732, MultiDrawArrays@16, MultiDrawArraysEXT, MultiDrawArraysEXT@16)
+	GL_STUB_ALIAS(MultiDrawElements, 733, MultiDrawElements@20, MultiDrawElementsEXT, MultiDrawElementsEXT@20)
+	GL_STUB_ALIAS(FogCoordPointer, 734, FogCoordPointer@12, FogCoordPointerEXT, FogCoordPointerEXT@12)
+	GL_STUB_ALIAS(FogCoordd, 735, FogCoordd@8, FogCoorddEXT, FogCoorddEXT@8)
+	GL_STUB_ALIAS(FogCoorddv, 736, FogCoorddv@4, FogCoorddvEXT, FogCoorddvEXT@4)
+	GL_STUB_ALIAS(FogCoordf, 737, FogCoordf@4, FogCoordfEXT, FogCoordfEXT@4)
+	GL_STUB_ALIAS(FogCoordfv, 738, FogCoordfv@4, FogCoordfvEXT, FogCoordfvEXT@4)
+	GL_STUB_ALIAS(BlendFuncSeparate, 740, BlendFuncSeparate@16, BlendFuncSeparateEXT, BlendFuncSeparateEXT@16)
+	GL_STUB_ALIAS(WindowPos2d, 757, WindowPos2d@16, WindowPos2dMESA, WindowPos2dMESA@16)
+	GL_STUB_ALIAS(WindowPos2dARB, 757, WindowPos2dARB@16, WindowPos2dMESA, WindowPos2dMESA@16)
+	GL_STUB_ALIAS(WindowPos2dv, 758, WindowPos2dv@4, WindowPos2dvMESA, WindowPos2dvMESA@4)
+	GL_STUB_ALIAS(WindowPos2dvARB, 758, WindowPos2dvARB@4, WindowPos2dvMESA, WindowPos2dvMESA@4)
+	GL_STUB_ALIAS(WindowPos2f, 759, WindowPos2f@8, WindowPos2fMESA, WindowPos2fMESA@8)
+	GL_STUB_ALIAS(WindowPos2fARB, 759, WindowPos2fARB@8, WindowPos2fMESA, WindowPos2fMESA@8)
+	GL_STUB_ALIAS(WindowPos2fv, 760, WindowPos2fv@4, WindowPos2fvMESA, WindowPos2fvMESA@4)
+	GL_STUB_ALIAS(WindowPos2fvARB, 760, WindowPos2fvARB@4, WindowPos2fvMESA, WindowPos2fvMESA@4)
+	GL_STUB_ALIAS(WindowPos2i, 761, WindowPos2i@8, WindowPos2iMESA, WindowPos2iMESA@8)
+	GL_STUB_ALIAS(WindowPos2iARB, 761, WindowPos2iARB@8, WindowPos2iMESA, WindowPos2iMESA@8)
+	GL_STUB_ALIAS(WindowPos2iv, 762, WindowPos2iv@4, WindowPos2ivMESA, WindowPos2ivMESA@4)
+	GL_STUB_ALIAS(WindowPos2ivARB, 762, WindowPos2ivARB@4, WindowPos2ivMESA, WindowPos2ivMESA@4)
+	GL_STUB_ALIAS(WindowPos2s, 763, WindowPos2s@8, WindowPos2sMESA, WindowPos2sMESA@8)
+	GL_STUB_ALIAS(WindowPos2sARB, 763, WindowPos2sARB@8, WindowPos2sMESA, WindowPos2sMESA@8)
+	GL_STUB_ALIAS(WindowPos2sv, 764, WindowPos2sv@4, WindowPos2svMESA, WindowPos2svMESA@4)
+	GL_STUB_ALIAS(WindowPos2svARB, 764, WindowPos2svARB@4, WindowPos2svMESA, WindowPos2svMESA@4)
+	GL_STUB_ALIAS(WindowPos3d, 765, WindowPos3d@24, WindowPos3dMESA, WindowPos3dMESA@24)
+	GL_STUB_ALIAS(WindowPos3dARB, 765, WindowPos3dARB@24, WindowPos3dMESA, WindowPos3dMESA@24)
+	GL_STUB_ALIAS(WindowPos3dv, 766, WindowPos3dv@4, WindowPos3dvMESA, WindowPos3dvMESA@4)
+	GL_STUB_ALIAS(WindowPos3dvARB, 766, WindowPos3dvARB@4, WindowPos3dvMESA, WindowPos3dvMESA@4)
+	GL_STUB_ALIAS(WindowPos3f, 767, WindowPos3f@12, WindowPos3fMESA, WindowPos3fMESA@12)
+	GL_STUB_ALIAS(WindowPos3fARB, 767, WindowPos3fARB@12, WindowPos3fMESA, WindowPos3fMESA@12)
+	GL_STUB_ALIAS(WindowPos3fv, 768, WindowPos3fv@4, WindowPos3fvMESA, WindowPos3fvMESA@4)
+	GL_STUB_ALIAS(WindowPos3fvARB, 768, WindowPos3fvARB@4, WindowPos3fvMESA, WindowPos3fvMESA@4)
+	GL_STUB_ALIAS(WindowPos3i, 769, WindowPos3i@12, WindowPos3iMESA, WindowPos3iMESA@12)
+	GL_STUB_ALIAS(WindowPos3iARB, 769, WindowPos3iARB@12, WindowPos3iMESA, WindowPos3iMESA@12)
+	GL_STUB_ALIAS(WindowPos3iv, 770, WindowPos3iv@4, WindowPos3ivMESA, WindowPos3ivMESA@4)
+	GL_STUB_ALIAS(WindowPos3ivARB, 770, WindowPos3ivARB@4, WindowPos3ivMESA, WindowPos3ivMESA@4)
+	GL_STUB_ALIAS(WindowPos3s, 771, WindowPos3s@12, WindowPos3sMESA, WindowPos3sMESA@12)
+	GL_STUB_ALIAS(WindowPos3sARB, 771, WindowPos3sARB@12, WindowPos3sMESA, WindowPos3sMESA@12)
+	GL_STUB_ALIAS(WindowPos3sv, 772, WindowPos3sv@4, WindowPos3svMESA, WindowPos3svMESA@4)
+	GL_STUB_ALIAS(WindowPos3svARB, 772, WindowPos3svARB@4, WindowPos3svMESA, WindowPos3svMESA@4)
+	GL_STUB_ALIAS(BindProgramARB, 791, BindProgramARB@8, BindProgramNV, BindProgramNV@8)
+	GL_STUB_ALIAS(DeleteProgramsARB, 792, DeleteProgramsARB@8, DeleteProgramsNV, DeleteProgramsNV@8)
+	GL_STUB_ALIAS(GenProgramsARB, 794, GenProgramsARB@8, GenProgramsNV, GenProgramsNV@8)
+	GL_STUB_ALIAS(GetVertexAttribPointerv, 800, GetVertexAttribPointerv@12, GetVertexAttribPointervNV, GetVertexAttribPointervNV@12)
+	GL_STUB_ALIAS(GetVertexAttribPointervARB, 800, GetVertexAttribPointervARB@12, GetVertexAttribPointervNV, GetVertexAttribPointervNV@12)
+	GL_STUB_ALIAS(IsProgramARB, 804, IsProgramARB@4, IsProgramNV, IsProgramNV@4)
+	GL_STUB_ALIAS(PointParameteri, 868, PointParameteri@8, PointParameteriNV, PointParameteriNV@8)
+	GL_STUB_ALIAS(PointParameteriv, 869, PointParameteriv@8, PointParameterivNV, PointParameterivNV@8)
+	GL_STUB_ALIAS(DeleteVertexArrays, 872, DeleteVertexArrays@8, _dispatch_stub_872, _dispatch_stub_872@8)
+	GL_STUB_ALIAS(IsVertexArray, 874, IsVertexArray@4, _dispatch_stub_874, _dispatch_stub_874@4)
+	GL_STUB_ALIAS(PrimitiveRestartIndex, 881, PrimitiveRestartIndex@4, PrimitiveRestartIndexNV, PrimitiveRestartIndexNV@4)
+	GL_STUB_ALIAS(BlendEquationSeparate, 884, BlendEquationSeparate@8, _dispatch_stub_884, _dispatch_stub_884@8)
+	GL_STUB_ALIAS(BindFramebuffer, 885, BindFramebuffer@8, BindFramebufferEXT, BindFramebufferEXT@8)
+	GL_STUB_ALIAS(BindRenderbuffer, 886, BindRenderbuffer@8, BindRenderbufferEXT, BindRenderbufferEXT@8)
+	GL_STUB_ALIAS(CheckFramebufferStatus, 887, CheckFramebufferStatus@4, CheckFramebufferStatusEXT, CheckFramebufferStatusEXT@4)
+	GL_STUB_ALIAS(DeleteFramebuffers, 888, DeleteFramebuffers@8, DeleteFramebuffersEXT, DeleteFramebuffersEXT@8)
+	GL_STUB_ALIAS(DeleteRenderbuffers, 889, DeleteRenderbuffers@8, DeleteRenderbuffersEXT, DeleteRenderbuffersEXT@8)
+	GL_STUB_ALIAS(FramebufferRenderbuffer, 890, FramebufferRenderbuffer@16, FramebufferRenderbufferEXT, FramebufferRenderbufferEXT@16)
+	GL_STUB_ALIAS(FramebufferTexture1D, 891, FramebufferTexture1D@20, FramebufferTexture1DEXT, FramebufferTexture1DEXT@20)
+	GL_STUB_ALIAS(FramebufferTexture2D, 892, FramebufferTexture2D@20, FramebufferTexture2DEXT, FramebufferTexture2DEXT@20)
+	GL_STUB_ALIAS(FramebufferTexture3D, 893, FramebufferTexture3D@24, FramebufferTexture3DEXT, FramebufferTexture3DEXT@24)
+	GL_STUB_ALIAS(GenFramebuffers, 894, GenFramebuffers@8, GenFramebuffersEXT, GenFramebuffersEXT@8)
+	GL_STUB_ALIAS(GenRenderbuffers, 895, GenRenderbuffers@8, GenRenderbuffersEXT, GenRenderbuffersEXT@8)
+	GL_STUB_ALIAS(GenerateMipmap, 896, GenerateMipmap@4, GenerateMipmapEXT, GenerateMipmapEXT@4)
+	GL_STUB_ALIAS(GetFramebufferAttachmentParameteriv, 897, GetFramebufferAttachmentParameteriv@16, GetFramebufferAttachmentParameterivEXT, GetFramebufferAttachmentParameterivEXT@16)
+	GL_STUB_ALIAS(GetRenderbufferParameteriv, 898, GetRenderbufferParameteriv@12, GetRenderbufferParameterivEXT, GetRenderbufferParameterivEXT@12)
+	GL_STUB_ALIAS(IsFramebuffer, 899, IsFramebuffer@4, IsFramebufferEXT, IsFramebufferEXT@4)
+	GL_STUB_ALIAS(IsRenderbuffer, 900, IsRenderbuffer@4, IsRenderbufferEXT, IsRenderbufferEXT@4)
+	GL_STUB_ALIAS(RenderbufferStorage, 901, RenderbufferStorage@16, RenderbufferStorageEXT, RenderbufferStorageEXT@16)
+	GL_STUB_ALIAS(BlitFramebuffer, 902, BlitFramebuffer@40, _dispatch_stub_902, _dispatch_stub_902@40)
+	GL_STUB_ALIAS(BindFragDataLocation, 905, BindFragDataLocation@12, BindFragDataLocationEXT, BindFragDataLocationEXT@12)
+	GL_STUB_ALIAS(GetFragDataLocation, 906, GetFragDataLocation@8, GetFragDataLocationEXT, GetFragDataLocationEXT@8)
+	GL_STUB_ALIAS(GetUniformuiv, 907, GetUniformuiv@12, GetUniformuivEXT, GetUniformuivEXT@12)
+	GL_STUB_ALIAS(GetVertexAttribIiv, 908, GetVertexAttribIiv@12, GetVertexAttribIivEXT, GetVertexAttribIivEXT@12)
+	GL_STUB_ALIAS(GetVertexAttribIuiv, 909, GetVertexAttribIuiv@12, GetVertexAttribIuivEXT, GetVertexAttribIuivEXT@12)
+	GL_STUB_ALIAS(Uniform1ui, 910, Uniform1ui@8, Uniform1uiEXT, Uniform1uiEXT@8)
+	GL_STUB_ALIAS(Uniform1uiv, 911, Uniform1uiv@12, Uniform1uivEXT, Uniform1uivEXT@12)
+	GL_STUB_ALIAS(Uniform2ui, 912, Uniform2ui@12, Uniform2uiEXT, Uniform2uiEXT@12)
+	GL_STUB_ALIAS(Uniform2uiv, 913, Uniform2uiv@12, Uniform2uivEXT, Uniform2uivEXT@12)
+	GL_STUB_ALIAS(Uniform3ui, 914, Uniform3ui@16, Uniform3uiEXT, Uniform3uiEXT@16)
+	GL_STUB_ALIAS(Uniform3uiv, 915, Uniform3uiv@12, Uniform3uivEXT, Uniform3uivEXT@12)
+	GL_STUB_ALIAS(Uniform4ui, 916, Uniform4ui@20, Uniform4uiEXT, Uniform4uiEXT@20)
+	GL_STUB_ALIAS(Uniform4uiv, 917, Uniform4uiv@12, Uniform4uivEXT, Uniform4uivEXT@12)
+	GL_STUB_ALIAS(VertexAttribI1i, 918, VertexAttribI1i@8, VertexAttribI1iEXT, VertexAttribI1iEXT@8)
+	GL_STUB_ALIAS(VertexAttribI1iv, 919, VertexAttribI1iv@8, VertexAttribI1ivEXT, VertexAttribI1ivEXT@8)
+	GL_STUB_ALIAS(VertexAttribI1ui, 920, VertexAttribI1ui@8, VertexAttribI1uiEXT, VertexAttribI1uiEXT@8)
+	GL_STUB_ALIAS(VertexAttribI1uiv, 921, VertexAttribI1uiv@8, VertexAttribI1uivEXT, VertexAttribI1uivEXT@8)
+	GL_STUB_ALIAS(VertexAttribI2i, 922, VertexAttribI2i@12, VertexAttribI2iEXT, VertexAttribI2iEXT@12)
+	GL_STUB_ALIAS(VertexAttribI2iv, 923, VertexAttribI2iv@8, VertexAttribI2ivEXT, VertexAttribI2ivEXT@8)
+	GL_STUB_ALIAS(VertexAttribI2ui, 924, VertexAttribI2ui@12, VertexAttribI2uiEXT, VertexAttribI2uiEXT@12)
+	GL_STUB_ALIAS(VertexAttribI2uiv, 925, VertexAttribI2uiv@8, VertexAttribI2uivEXT, VertexAttribI2uivEXT@8)
+	GL_STUB_ALIAS(VertexAttribI3i, 926, VertexAttribI3i@16, VertexAttribI3iEXT, VertexAttribI3iEXT@16)
+	GL_STUB_ALIAS(VertexAttribI3iv, 927, VertexAttribI3iv@8, VertexAttribI3ivEXT, VertexAttribI3ivEXT@8)
+	GL_STUB_ALIAS(VertexAttribI3ui, 928, VertexAttribI3ui@16, VertexAttribI3uiEXT, VertexAttribI3uiEXT@16)
+	GL_STUB_ALIAS(VertexAttribI3uiv, 929, VertexAttribI3uiv@8, VertexAttribI3uivEXT, VertexAttribI3uivEXT@8)
+	GL_STUB_ALIAS(VertexAttribI4bv, 930, VertexAttribI4bv@8, VertexAttribI4bvEXT, VertexAttribI4bvEXT@8)
+	GL_STUB_ALIAS(VertexAttribI4i, 931, VertexAttribI4i@20, VertexAttribI4iEXT, VertexAttribI4iEXT@20)
+	GL_STUB_ALIAS(VertexAttribI4iv, 932, VertexAttribI4iv@8, VertexAttribI4ivEXT, VertexAttribI4ivEXT@8)
+	GL_STUB_ALIAS(VertexAttribI4sv, 933, VertexAttribI4sv@8, VertexAttribI4svEXT, VertexAttribI4svEXT@8)
+	GL_STUB_ALIAS(VertexAttribI4ubv, 934, VertexAttribI4ubv@8, VertexAttribI4ubvEXT, VertexAttribI4ubvEXT@8)
+	GL_STUB_ALIAS(VertexAttribI4ui, 935, VertexAttribI4ui@20, VertexAttribI4uiEXT, VertexAttribI4uiEXT@20)
+	GL_STUB_ALIAS(VertexAttribI4uiv, 936, VertexAttribI4uiv@8, VertexAttribI4uivEXT, VertexAttribI4uivEXT@8)
+	GL_STUB_ALIAS(VertexAttribI4usv, 937, VertexAttribI4usv@8, VertexAttribI4usvEXT, VertexAttribI4usvEXT@8)
+	GL_STUB_ALIAS(VertexAttribIPointer, 938, VertexAttribIPointer@20, VertexAttribIPointerEXT, VertexAttribIPointerEXT@20)
+	GL_STUB_ALIAS(FramebufferTextureLayer, 939, FramebufferTextureLayer@20, FramebufferTextureLayerEXT, FramebufferTextureLayerEXT@20)
+	GL_STUB_ALIAS(FramebufferTextureLayerARB, 939, FramebufferTextureLayerARB@20, FramebufferTextureLayerEXT, FramebufferTextureLayerEXT@20)
+	GL_STUB_ALIAS(ColorMaski, 940, ColorMaski@20, ColorMaskIndexedEXT, ColorMaskIndexedEXT@20)
+	GL_STUB_ALIAS(Disablei, 941, Disablei@8, DisableIndexedEXT, DisableIndexedEXT@8)
+	GL_STUB_ALIAS(Enablei, 942, Enablei@8, EnableIndexedEXT, EnableIndexedEXT@8)
+	GL_STUB_ALIAS(GetBooleani_v, 943, GetBooleani_v@12, GetBooleanIndexedvEXT, GetBooleanIndexedvEXT@12)
+	GL_STUB_ALIAS(GetIntegeri_v, 944, GetIntegeri_v@12, GetIntegerIndexedvEXT, GetIntegerIndexedvEXT@12)
+	GL_STUB_ALIAS(IsEnabledi, 945, IsEnabledi@8, IsEnabledIndexedEXT, IsEnabledIndexedEXT@8)
+	GL_STUB_ALIAS(GetTexParameterIiv, 948, GetTexParameterIiv@12, GetTexParameterIivEXT, GetTexParameterIivEXT@12)
+	GL_STUB_ALIAS(GetTexParameterIuiv, 949, GetTexParameterIuiv@12, GetTexParameterIuivEXT, GetTexParameterIuivEXT@12)
+	GL_STUB_ALIAS(TexParameterIiv, 950, TexParameterIiv@12, TexParameterIivEXT, TexParameterIivEXT@12)
+	GL_STUB_ALIAS(TexParameterIuiv, 951, TexParameterIuiv@12, TexParameterIuivEXT, TexParameterIuivEXT@12)
+	GL_STUB_ALIAS(BeginConditionalRender, 952, BeginConditionalRender@8, BeginConditionalRenderNV, BeginConditionalRenderNV@8)
+	GL_STUB_ALIAS(EndConditionalRender, 953, EndConditionalRender@0, EndConditionalRenderNV, EndConditionalRenderNV@0)
+	GL_STUB_ALIAS(BeginTransformFeedback, 954, BeginTransformFeedback@4, BeginTransformFeedbackEXT, BeginTransformFeedbackEXT@4)
+	GL_STUB_ALIAS(BindBufferBase, 955, BindBufferBase@12, BindBufferBaseEXT, BindBufferBaseEXT@12)
+	GL_STUB_ALIAS(BindBufferRange, 957, BindBufferRange@20, BindBufferRangeEXT, BindBufferRangeEXT@20)
+	GL_STUB_ALIAS(EndTransformFeedback, 958, EndTransformFeedback@0, EndTransformFeedbackEXT, EndTransformFeedbackEXT@0)
+	GL_STUB_ALIAS(GetTransformFeedbackVarying, 959, GetTransformFeedbackVarying@28, GetTransformFeedbackVaryingEXT, GetTransformFeedbackVaryingEXT@28)
+	GL_STUB_ALIAS(TransformFeedbackVaryings, 960, TransformFeedbackVaryings@16, TransformFeedbackVaryingsEXT, TransformFeedbackVaryingsEXT@16)
+	GL_STUB_ALIAS(ProvokingVertex, 961, ProvokingVertex@4, ProvokingVertexEXT, ProvokingVertexEXT@4)
 
 		GLOBL	GLNAME(gl_dispatch_functions_end)
 		HIDDEN(GLNAME(gl_dispatch_functions_end))
diff --git a/mesalib/src/mapi/glapi/glapitable.h b/mesalib/src/mapi/glapi/glapitable.h
index 857aef35a..87b52913b 100644
--- a/mesalib/src/mapi/glapi/glapitable.h
+++ b/mesalib/src/mapi/glapi/glapitable.h
@@ -476,549 +476,548 @@ struct _glapi_table
    void (GLAPIENTRYP ClearBufferiv)(GLenum buffer, GLint drawbuffer, const GLint * value); /* 433 */
    void (GLAPIENTRYP ClearBufferuiv)(GLenum buffer, GLint drawbuffer, const GLuint * value); /* 434 */
    const GLubyte * (GLAPIENTRYP GetStringi)(GLenum name, GLuint index); /* 435 */
-   void (GLAPIENTRYP TexBuffer)(GLenum target, GLenum internalFormat, GLuint buffer); /* 436 */
-   void (GLAPIENTRYP FramebufferTexture)(GLenum target, GLenum attachment, GLuint texture, GLint level); /* 437 */
-   void (GLAPIENTRYP GetBufferParameteri64v)(GLenum target, GLenum pname, GLint64 * params); /* 438 */
-   void (GLAPIENTRYP GetInteger64i_v)(GLenum cap, GLuint index, GLint64 * data); /* 439 */
-   void (GLAPIENTRYP VertexAttribDivisor)(GLuint index, GLuint divisor); /* 440 */
-   void (GLAPIENTRYP LoadTransposeMatrixdARB)(const GLdouble * m); /* 441 */
-   void (GLAPIENTRYP LoadTransposeMatrixfARB)(const GLfloat * m); /* 442 */
-   void (GLAPIENTRYP MultTransposeMatrixdARB)(const GLdouble * m); /* 443 */
-   void (GLAPIENTRYP MultTransposeMatrixfARB)(const GLfloat * m); /* 444 */
-   void (GLAPIENTRYP SampleCoverageARB)(GLclampf value, GLboolean invert); /* 445 */
-   void (GLAPIENTRYP CompressedTexImage1DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid * data); /* 446 */
-   void (GLAPIENTRYP CompressedTexImage2DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid * data); /* 447 */
-   void (GLAPIENTRYP CompressedTexImage3DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid * data); /* 448 */
-   void (GLAPIENTRYP CompressedTexSubImage1DARB)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid * data); /* 449 */
-   void (GLAPIENTRYP CompressedTexSubImage2DARB)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid * data); /* 450 */
-   void (GLAPIENTRYP CompressedTexSubImage3DARB)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid * data); /* 451 */
-   void (GLAPIENTRYP GetCompressedTexImageARB)(GLenum target, GLint level, GLvoid * img); /* 452 */
-   void (GLAPIENTRYP DisableVertexAttribArrayARB)(GLuint index); /* 453 */
-   void (GLAPIENTRYP EnableVertexAttribArrayARB)(GLuint index); /* 454 */
-   void (GLAPIENTRYP GetProgramEnvParameterdvARB)(GLenum target, GLuint index, GLdouble * params); /* 455 */
-   void (GLAPIENTRYP GetProgramEnvParameterfvARB)(GLenum target, GLuint index, GLfloat * params); /* 456 */
-   void (GLAPIENTRYP GetProgramLocalParameterdvARB)(GLenum target, GLuint index, GLdouble * params); /* 457 */
-   void (GLAPIENTRYP GetProgramLocalParameterfvARB)(GLenum target, GLuint index, GLfloat * params); /* 458 */
-   void (GLAPIENTRYP GetProgramStringARB)(GLenum target, GLenum pname, GLvoid * string); /* 459 */
-   void (GLAPIENTRYP GetProgramivARB)(GLenum target, GLenum pname, GLint * params); /* 460 */
-   void (GLAPIENTRYP GetVertexAttribdvARB)(GLuint index, GLenum pname, GLdouble * params); /* 461 */
-   void (GLAPIENTRYP GetVertexAttribfvARB)(GLuint index, GLenum pname, GLfloat * params); /* 462 */
-   void (GLAPIENTRYP GetVertexAttribivARB)(GLuint index, GLenum pname, GLint * params); /* 463 */
-   void (GLAPIENTRYP ProgramEnvParameter4dARB)(GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 464 */
-   void (GLAPIENTRYP ProgramEnvParameter4dvARB)(GLenum target, GLuint index, const GLdouble * params); /* 465 */
-   void (GLAPIENTRYP ProgramEnvParameter4fARB)(GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 466 */
-   void (GLAPIENTRYP ProgramEnvParameter4fvARB)(GLenum target, GLuint index, const GLfloat * params); /* 467 */
-   void (GLAPIENTRYP ProgramLocalParameter4dARB)(GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 468 */
-   void (GLAPIENTRYP ProgramLocalParameter4dvARB)(GLenum target, GLuint index, const GLdouble * params); /* 469 */
-   void (GLAPIENTRYP ProgramLocalParameter4fARB)(GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 470 */
-   void (GLAPIENTRYP ProgramLocalParameter4fvARB)(GLenum target, GLuint index, const GLfloat * params); /* 471 */
-   void (GLAPIENTRYP ProgramStringARB)(GLenum target, GLenum format, GLsizei len, const GLvoid * string); /* 472 */
-   void (GLAPIENTRYP VertexAttrib1dARB)(GLuint index, GLdouble x); /* 473 */
-   void (GLAPIENTRYP VertexAttrib1dvARB)(GLuint index, const GLdouble * v); /* 474 */
-   void (GLAPIENTRYP VertexAttrib1fARB)(GLuint index, GLfloat x); /* 475 */
-   void (GLAPIENTRYP VertexAttrib1fvARB)(GLuint index, const GLfloat * v); /* 476 */
-   void (GLAPIENTRYP VertexAttrib1sARB)(GLuint index, GLshort x); /* 477 */
-   void (GLAPIENTRYP VertexAttrib1svARB)(GLuint index, const GLshort * v); /* 478 */
-   void (GLAPIENTRYP VertexAttrib2dARB)(GLuint index, GLdouble x, GLdouble y); /* 479 */
-   void (GLAPIENTRYP VertexAttrib2dvARB)(GLuint index, const GLdouble * v); /* 480 */
-   void (GLAPIENTRYP VertexAttrib2fARB)(GLuint index, GLfloat x, GLfloat y); /* 481 */
-   void (GLAPIENTRYP VertexAttrib2fvARB)(GLuint index, const GLfloat * v); /* 482 */
-   void (GLAPIENTRYP VertexAttrib2sARB)(GLuint index, GLshort x, GLshort y); /* 483 */
-   void (GLAPIENTRYP VertexAttrib2svARB)(GLuint index, const GLshort * v); /* 484 */
-   void (GLAPIENTRYP VertexAttrib3dARB)(GLuint index, GLdouble x, GLdouble y, GLdouble z); /* 485 */
-   void (GLAPIENTRYP VertexAttrib3dvARB)(GLuint index, const GLdouble * v); /* 486 */
-   void (GLAPIENTRYP VertexAttrib3fARB)(GLuint index, GLfloat x, GLfloat y, GLfloat z); /* 487 */
-   void (GLAPIENTRYP VertexAttrib3fvARB)(GLuint index, const GLfloat * v); /* 488 */
-   void (GLAPIENTRYP VertexAttrib3sARB)(GLuint index, GLshort x, GLshort y, GLshort z); /* 489 */
-   void (GLAPIENTRYP VertexAttrib3svARB)(GLuint index, const GLshort * v); /* 490 */
-   void (GLAPIENTRYP VertexAttrib4NbvARB)(GLuint index, const GLbyte * v); /* 491 */
-   void (GLAPIENTRYP VertexAttrib4NivARB)(GLuint index, const GLint * v); /* 492 */
-   void (GLAPIENTRYP VertexAttrib4NsvARB)(GLuint index, const GLshort * v); /* 493 */
-   void (GLAPIENTRYP VertexAttrib4NubARB)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); /* 494 */
-   void (GLAPIENTRYP VertexAttrib4NubvARB)(GLuint index, const GLubyte * v); /* 495 */
-   void (GLAPIENTRYP VertexAttrib4NuivARB)(GLuint index, const GLuint * v); /* 496 */
-   void (GLAPIENTRYP VertexAttrib4NusvARB)(GLuint index, const GLushort * v); /* 497 */
-   void (GLAPIENTRYP VertexAttrib4bvARB)(GLuint index, const GLbyte * v); /* 498 */
-   void (GLAPIENTRYP VertexAttrib4dARB)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 499 */
-   void (GLAPIENTRYP VertexAttrib4dvARB)(GLuint index, const GLdouble * v); /* 500 */
-   void (GLAPIENTRYP VertexAttrib4fARB)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 501 */
-   void (GLAPIENTRYP VertexAttrib4fvARB)(GLuint index, const GLfloat * v); /* 502 */
-   void (GLAPIENTRYP VertexAttrib4ivARB)(GLuint index, const GLint * v); /* 503 */
-   void (GLAPIENTRYP VertexAttrib4sARB)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); /* 504 */
-   void (GLAPIENTRYP VertexAttrib4svARB)(GLuint index, const GLshort * v); /* 505 */
-   void (GLAPIENTRYP VertexAttrib4ubvARB)(GLuint index, const GLubyte * v); /* 506 */
-   void (GLAPIENTRYP VertexAttrib4uivARB)(GLuint index, const GLuint * v); /* 507 */
-   void (GLAPIENTRYP VertexAttrib4usvARB)(GLuint index, const GLushort * v); /* 508 */
-   void (GLAPIENTRYP VertexAttribPointerARB)(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid * pointer); /* 509 */
-   void (GLAPIENTRYP BindBufferARB)(GLenum target, GLuint buffer); /* 510 */
-   void (GLAPIENTRYP BufferDataARB)(GLenum target, GLsizeiptrARB size, const GLvoid * data, GLenum usage); /* 511 */
-   void (GLAPIENTRYP BufferSubDataARB)(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid * data); /* 512 */
-   void (GLAPIENTRYP DeleteBuffersARB)(GLsizei n, const GLuint * buffer); /* 513 */
-   void (GLAPIENTRYP GenBuffersARB)(GLsizei n, GLuint * buffer); /* 514 */
-   void (GLAPIENTRYP GetBufferParameterivARB)(GLenum target, GLenum pname, GLint * params); /* 515 */
-   void (GLAPIENTRYP GetBufferPointervARB)(GLenum target, GLenum pname, GLvoid ** params); /* 516 */
-   void (GLAPIENTRYP GetBufferSubDataARB)(GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid * data); /* 517 */
-   GLboolean (GLAPIENTRYP IsBufferARB)(GLuint buffer); /* 518 */
-   GLvoid * (GLAPIENTRYP MapBufferARB)(GLenum target, GLenum access); /* 519 */
-   GLboolean (GLAPIENTRYP UnmapBufferARB)(GLenum target); /* 520 */
-   void (GLAPIENTRYP BeginQueryARB)(GLenum target, GLuint id); /* 521 */
-   void (GLAPIENTRYP DeleteQueriesARB)(GLsizei n, const GLuint * ids); /* 522 */
-   void (GLAPIENTRYP EndQueryARB)(GLenum target); /* 523 */
-   void (GLAPIENTRYP GenQueriesARB)(GLsizei n, GLuint * ids); /* 524 */
-   void (GLAPIENTRYP GetQueryObjectivARB)(GLuint id, GLenum pname, GLint * params); /* 525 */
-   void (GLAPIENTRYP GetQueryObjectuivARB)(GLuint id, GLenum pname, GLuint * params); /* 526 */
-   void (GLAPIENTRYP GetQueryivARB)(GLenum target, GLenum pname, GLint * params); /* 527 */
-   GLboolean (GLAPIENTRYP IsQueryARB)(GLuint id); /* 528 */
-   void (GLAPIENTRYP AttachObjectARB)(GLhandleARB containerObj, GLhandleARB obj); /* 529 */
-   void (GLAPIENTRYP CompileShaderARB)(GLhandleARB shader); /* 530 */
-   GLhandleARB (GLAPIENTRYP CreateProgramObjectARB)(void); /* 531 */
-   GLhandleARB (GLAPIENTRYP CreateShaderObjectARB)(GLenum shaderType); /* 532 */
-   void (GLAPIENTRYP DeleteObjectARB)(GLhandleARB obj); /* 533 */
-   void (GLAPIENTRYP DetachObjectARB)(GLhandleARB containerObj, GLhandleARB attachedObj); /* 534 */
-   void (GLAPIENTRYP GetActiveUniformARB)(GLhandleARB program, GLuint index, GLsizei bufSize, GLsizei * length, GLint * size, GLenum * type, GLcharARB * name); /* 535 */
-   void (GLAPIENTRYP GetAttachedObjectsARB)(GLhandleARB containerObj, GLsizei maxLength, GLsizei * length, GLhandleARB * infoLog); /* 536 */
-   GLhandleARB (GLAPIENTRYP GetHandleARB)(GLenum pname); /* 537 */
-   void (GLAPIENTRYP GetInfoLogARB)(GLhandleARB obj, GLsizei maxLength, GLsizei * length, GLcharARB * infoLog); /* 538 */
-   void (GLAPIENTRYP GetObjectParameterfvARB)(GLhandleARB obj, GLenum pname, GLfloat * params); /* 539 */
-   void (GLAPIENTRYP GetObjectParameterivARB)(GLhandleARB obj, GLenum pname, GLint * params); /* 540 */
-   void (GLAPIENTRYP GetShaderSourceARB)(GLhandleARB shader, GLsizei bufSize, GLsizei * length, GLcharARB * source); /* 541 */
-   GLint (GLAPIENTRYP GetUniformLocationARB)(GLhandleARB program, const GLcharARB * name); /* 542 */
-   void (GLAPIENTRYP GetUniformfvARB)(GLhandleARB program, GLint location, GLfloat * params); /* 543 */
-   void (GLAPIENTRYP GetUniformivARB)(GLhandleARB program, GLint location, GLint * params); /* 544 */
-   void (GLAPIENTRYP LinkProgramARB)(GLhandleARB program); /* 545 */
-   void (GLAPIENTRYP ShaderSourceARB)(GLhandleARB shader, GLsizei count, const GLcharARB ** string, const GLint * length); /* 546 */
-   void (GLAPIENTRYP Uniform1fARB)(GLint location, GLfloat v0); /* 547 */
-   void (GLAPIENTRYP Uniform1fvARB)(GLint location, GLsizei count, const GLfloat * value); /* 548 */
-   void (GLAPIENTRYP Uniform1iARB)(GLint location, GLint v0); /* 549 */
-   void (GLAPIENTRYP Uniform1ivARB)(GLint location, GLsizei count, const GLint * value); /* 550 */
-   void (GLAPIENTRYP Uniform2fARB)(GLint location, GLfloat v0, GLfloat v1); /* 551 */
-   void (GLAPIENTRYP Uniform2fvARB)(GLint location, GLsizei count, const GLfloat * value); /* 552 */
-   void (GLAPIENTRYP Uniform2iARB)(GLint location, GLint v0, GLint v1); /* 553 */
-   void (GLAPIENTRYP Uniform2ivARB)(GLint location, GLsizei count, const GLint * value); /* 554 */
-   void (GLAPIENTRYP Uniform3fARB)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2); /* 555 */
-   void (GLAPIENTRYP Uniform3fvARB)(GLint location, GLsizei count, const GLfloat * value); /* 556 */
-   void (GLAPIENTRYP Uniform3iARB)(GLint location, GLint v0, GLint v1, GLint v2); /* 557 */
-   void (GLAPIENTRYP Uniform3ivARB)(GLint location, GLsizei count, const GLint * value); /* 558 */
-   void (GLAPIENTRYP Uniform4fARB)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); /* 559 */
-   void (GLAPIENTRYP Uniform4fvARB)(GLint location, GLsizei count, const GLfloat * value); /* 560 */
-   void (GLAPIENTRYP Uniform4iARB)(GLint location, GLint v0, GLint v1, GLint v2, GLint v3); /* 561 */
-   void (GLAPIENTRYP Uniform4ivARB)(GLint location, GLsizei count, const GLint * value); /* 562 */
-   void (GLAPIENTRYP UniformMatrix2fvARB)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 563 */
-   void (GLAPIENTRYP UniformMatrix3fvARB)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 564 */
-   void (GLAPIENTRYP UniformMatrix4fvARB)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 565 */
-   void (GLAPIENTRYP UseProgramObjectARB)(GLhandleARB program); /* 566 */
-   void (GLAPIENTRYP ValidateProgramARB)(GLhandleARB program); /* 567 */
-   void (GLAPIENTRYP BindAttribLocationARB)(GLhandleARB program, GLuint index, const GLcharARB * name); /* 568 */
-   void (GLAPIENTRYP GetActiveAttribARB)(GLhandleARB program, GLuint index, GLsizei bufSize, GLsizei * length, GLint * size, GLenum * type, GLcharARB * name); /* 569 */
-   GLint (GLAPIENTRYP GetAttribLocationARB)(GLhandleARB program, const GLcharARB * name); /* 570 */
-   void (GLAPIENTRYP DrawBuffersARB)(GLsizei n, const GLenum * bufs); /* 571 */
-   void (GLAPIENTRYP ClampColorARB)(GLenum target, GLenum clamp); /* 572 */
-   void (GLAPIENTRYP DrawArraysInstancedARB)(GLenum mode, GLint first, GLsizei count, GLsizei primcount); /* 573 */
-   void (GLAPIENTRYP DrawElementsInstancedARB)(GLenum mode, GLsizei count, GLenum type, const GLvoid * indices, GLsizei primcount); /* 574 */
-   void (GLAPIENTRYP RenderbufferStorageMultisample)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); /* 575 */
-   void (GLAPIENTRYP FramebufferTextureARB)(GLenum target, GLenum attachment, GLuint texture, GLint level); /* 576 */
-   void (GLAPIENTRYP FramebufferTextureFaceARB)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face); /* 577 */
-   void (GLAPIENTRYP ProgramParameteriARB)(GLuint program, GLenum pname, GLint value); /* 578 */
-   void (GLAPIENTRYP VertexAttribDivisorARB)(GLuint index, GLuint divisor); /* 579 */
-   void (GLAPIENTRYP FlushMappedBufferRange)(GLenum target, GLintptr offset, GLsizeiptr length); /* 580 */
-   GLvoid * (GLAPIENTRYP MapBufferRange)(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access); /* 581 */
-   void (GLAPIENTRYP TexBufferARB)(GLenum target, GLenum internalFormat, GLuint buffer); /* 582 */
-   void (GLAPIENTRYP BindVertexArray)(GLuint array); /* 583 */
-   void (GLAPIENTRYP GenVertexArrays)(GLsizei n, GLuint * arrays); /* 584 */
-   void (GLAPIENTRYP CopyBufferSubData)(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); /* 585 */
-   GLenum (GLAPIENTRYP ClientWaitSync)(GLsync sync, GLbitfield flags, GLuint64 timeout); /* 586 */
-   void (GLAPIENTRYP DeleteSync)(GLsync sync); /* 587 */
-   GLsync (GLAPIENTRYP FenceSync)(GLenum condition, GLbitfield flags); /* 588 */
-   void (GLAPIENTRYP GetInteger64v)(GLenum pname, GLint64 * params); /* 589 */
-   void (GLAPIENTRYP GetSynciv)(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * values); /* 590 */
-   GLboolean (GLAPIENTRYP IsSync)(GLsync sync); /* 591 */
-   void (GLAPIENTRYP WaitSync)(GLsync sync, GLbitfield flags, GLuint64 timeout); /* 592 */
-   void (GLAPIENTRYP DrawElementsBaseVertex)(GLenum mode, GLsizei count, GLenum type, const GLvoid * indices, GLint basevertex); /* 593 */
-   void (GLAPIENTRYP DrawElementsInstancedBaseVertex)(GLenum mode, GLsizei count, GLenum type, const GLvoid * indices, GLsizei primcount, GLint basevertex); /* 594 */
-   void (GLAPIENTRYP DrawRangeElementsBaseVertex)(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid * indices, GLint basevertex); /* 595 */
-   void (GLAPIENTRYP MultiDrawElementsBaseVertex)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid ** indices, GLsizei primcount, const GLint * basevertex); /* 596 */
-   void (GLAPIENTRYP BlendEquationSeparateiARB)(GLuint buf, GLenum modeRGB, GLenum modeA); /* 597 */
-   void (GLAPIENTRYP BlendEquationiARB)(GLuint buf, GLenum mode); /* 598 */
-   void (GLAPIENTRYP BlendFuncSeparateiARB)(GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcA, GLenum dstA); /* 599 */
-   void (GLAPIENTRYP BlendFunciARB)(GLuint buf, GLenum src, GLenum dst); /* 600 */
-   void (GLAPIENTRYP BindFragDataLocationIndexed)(GLuint program, GLuint colorNumber, GLuint index, const GLchar * name); /* 601 */
-   GLint (GLAPIENTRYP GetFragDataIndex)(GLuint program, const GLchar * name); /* 602 */
-   void (GLAPIENTRYP BindSampler)(GLuint unit, GLuint sampler); /* 603 */
-   void (GLAPIENTRYP DeleteSamplers)(GLsizei count, const GLuint * samplers); /* 604 */
-   void (GLAPIENTRYP GenSamplers)(GLsizei count, GLuint * samplers); /* 605 */
-   void (GLAPIENTRYP GetSamplerParameterIiv)(GLuint sampler, GLenum pname, GLint * params); /* 606 */
-   void (GLAPIENTRYP GetSamplerParameterIuiv)(GLuint sampler, GLenum pname, GLuint * params); /* 607 */
-   void (GLAPIENTRYP GetSamplerParameterfv)(GLuint sampler, GLenum pname, GLfloat * params); /* 608 */
-   void (GLAPIENTRYP GetSamplerParameteriv)(GLuint sampler, GLenum pname, GLint * params); /* 609 */
-   GLboolean (GLAPIENTRYP IsSampler)(GLuint sampler); /* 610 */
-   void (GLAPIENTRYP SamplerParameterIiv)(GLuint sampler, GLenum pname, const GLint * params); /* 611 */
-   void (GLAPIENTRYP SamplerParameterIuiv)(GLuint sampler, GLenum pname, const GLuint * params); /* 612 */
-   void (GLAPIENTRYP SamplerParameterf)(GLuint sampler, GLenum pname, GLfloat param); /* 613 */
-   void (GLAPIENTRYP SamplerParameterfv)(GLuint sampler, GLenum pname, const GLfloat * params); /* 614 */
-   void (GLAPIENTRYP SamplerParameteri)(GLuint sampler, GLenum pname, GLint param); /* 615 */
-   void (GLAPIENTRYP SamplerParameteriv)(GLuint sampler, GLenum pname, const GLint * params); /* 616 */
-   void (GLAPIENTRYP ColorP3ui)(GLenum type, GLuint color); /* 617 */
-   void (GLAPIENTRYP ColorP3uiv)(GLenum type, const GLuint * color); /* 618 */
-   void (GLAPIENTRYP ColorP4ui)(GLenum type, GLuint color); /* 619 */
-   void (GLAPIENTRYP ColorP4uiv)(GLenum type, const GLuint * color); /* 620 */
-   void (GLAPIENTRYP MultiTexCoordP1ui)(GLenum texture, GLenum type, GLuint coords); /* 621 */
-   void (GLAPIENTRYP MultiTexCoordP1uiv)(GLenum texture, GLenum type, const GLuint * coords); /* 622 */
-   void (GLAPIENTRYP MultiTexCoordP2ui)(GLenum texture, GLenum type, GLuint coords); /* 623 */
-   void (GLAPIENTRYP MultiTexCoordP2uiv)(GLenum texture, GLenum type, const GLuint * coords); /* 624 */
-   void (GLAPIENTRYP MultiTexCoordP3ui)(GLenum texture, GLenum type, GLuint coords); /* 625 */
-   void (GLAPIENTRYP MultiTexCoordP3uiv)(GLenum texture, GLenum type, const GLuint * coords); /* 626 */
-   void (GLAPIENTRYP MultiTexCoordP4ui)(GLenum texture, GLenum type, GLuint coords); /* 627 */
-   void (GLAPIENTRYP MultiTexCoordP4uiv)(GLenum texture, GLenum type, const GLuint * coords); /* 628 */
-   void (GLAPIENTRYP NormalP3ui)(GLenum type, GLuint coords); /* 629 */
-   void (GLAPIENTRYP NormalP3uiv)(GLenum type, const GLuint * coords); /* 630 */
-   void (GLAPIENTRYP SecondaryColorP3ui)(GLenum type, GLuint color); /* 631 */
-   void (GLAPIENTRYP SecondaryColorP3uiv)(GLenum type, const GLuint * color); /* 632 */
-   void (GLAPIENTRYP TexCoordP1ui)(GLenum type, GLuint coords); /* 633 */
-   void (GLAPIENTRYP TexCoordP1uiv)(GLenum type, const GLuint * coords); /* 634 */
-   void (GLAPIENTRYP TexCoordP2ui)(GLenum type, GLuint coords); /* 635 */
-   void (GLAPIENTRYP TexCoordP2uiv)(GLenum type, const GLuint * coords); /* 636 */
-   void (GLAPIENTRYP TexCoordP3ui)(GLenum type, GLuint coords); /* 637 */
-   void (GLAPIENTRYP TexCoordP3uiv)(GLenum type, const GLuint * coords); /* 638 */
-   void (GLAPIENTRYP TexCoordP4ui)(GLenum type, GLuint coords); /* 639 */
-   void (GLAPIENTRYP TexCoordP4uiv)(GLenum type, const GLuint * coords); /* 640 */
-   void (GLAPIENTRYP VertexAttribP1ui)(GLuint index, GLenum type, GLboolean normalized, GLuint value); /* 641 */
-   void (GLAPIENTRYP VertexAttribP1uiv)(GLuint index, GLenum type, GLboolean normalized, const GLuint * value); /* 642 */
-   void (GLAPIENTRYP VertexAttribP2ui)(GLuint index, GLenum type, GLboolean normalized, GLuint value); /* 643 */
-   void (GLAPIENTRYP VertexAttribP2uiv)(GLuint index, GLenum type, GLboolean normalized, const GLuint * value); /* 644 */
-   void (GLAPIENTRYP VertexAttribP3ui)(GLuint index, GLenum type, GLboolean normalized, GLuint value); /* 645 */
-   void (GLAPIENTRYP VertexAttribP3uiv)(GLuint index, GLenum type, GLboolean normalized, const GLuint * value); /* 646 */
-   void (GLAPIENTRYP VertexAttribP4ui)(GLuint index, GLenum type, GLboolean normalized, GLuint value); /* 647 */
-   void (GLAPIENTRYP VertexAttribP4uiv)(GLuint index, GLenum type, GLboolean normalized, const GLuint * value); /* 648 */
-   void (GLAPIENTRYP VertexP2ui)(GLenum type, GLuint value); /* 649 */
-   void (GLAPIENTRYP VertexP2uiv)(GLenum type, const GLuint * value); /* 650 */
-   void (GLAPIENTRYP VertexP3ui)(GLenum type, GLuint value); /* 651 */
-   void (GLAPIENTRYP VertexP3uiv)(GLenum type, const GLuint * value); /* 652 */
-   void (GLAPIENTRYP VertexP4ui)(GLenum type, GLuint value); /* 653 */
-   void (GLAPIENTRYP VertexP4uiv)(GLenum type, const GLuint * value); /* 654 */
-   void (GLAPIENTRYP BindTransformFeedback)(GLenum target, GLuint id); /* 655 */
-   void (GLAPIENTRYP DeleteTransformFeedbacks)(GLsizei n, const GLuint * ids); /* 656 */
-   void (GLAPIENTRYP DrawTransformFeedback)(GLenum mode, GLuint id); /* 657 */
-   void (GLAPIENTRYP GenTransformFeedbacks)(GLsizei n, GLuint * ids); /* 658 */
-   GLboolean (GLAPIENTRYP IsTransformFeedback)(GLuint id); /* 659 */
-   void (GLAPIENTRYP PauseTransformFeedback)(void); /* 660 */
-   void (GLAPIENTRYP ResumeTransformFeedback)(void); /* 661 */
-   void (GLAPIENTRYP ClearDepthf)(GLclampf depth); /* 662 */
-   void (GLAPIENTRYP DepthRangef)(GLclampf zNear, GLclampf zFar); /* 663 */
-   void (GLAPIENTRYP GetShaderPrecisionFormat)(GLenum shadertype, GLenum precisiontype, GLint * range, GLint * precision); /* 664 */
-   void (GLAPIENTRYP ReleaseShaderCompiler)(void); /* 665 */
-   void (GLAPIENTRYP ShaderBinary)(GLsizei n, const GLuint * shaders, GLenum binaryformat, const GLvoid * binary, GLsizei length); /* 666 */
-   void (GLAPIENTRYP DebugMessageCallbackARB)(GLDEBUGPROCARB callback, GLvoid * userParam); /* 667 */
-   void (GLAPIENTRYP DebugMessageControlARB)(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint * ids, GLboolean enabled); /* 668 */
-   void (GLAPIENTRYP DebugMessageInsertARB)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLcharARB * buf); /* 669 */
-   GLuint (GLAPIENTRYP GetDebugMessageLogARB)(GLuint count, GLsizei bufsize, GLenum * sources, GLenum * types, GLuint * ids, GLenum * severities, GLsizei * lengths, GLcharARB * messageLog); /* 670 */
-   GLenum (GLAPIENTRYP GetGraphicsResetStatusARB)(void); /* 671 */
-   void (GLAPIENTRYP GetnColorTableARB)(GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid * table); /* 672 */
-   void (GLAPIENTRYP GetnCompressedTexImageARB)(GLenum target, GLint lod, GLsizei bufSize, GLvoid * img); /* 673 */
-   void (GLAPIENTRYP GetnConvolutionFilterARB)(GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid * image); /* 674 */
-   void (GLAPIENTRYP GetnHistogramARB)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid * values); /* 675 */
-   void (GLAPIENTRYP GetnMapdvARB)(GLenum target, GLenum query, GLsizei bufSize, GLdouble * v); /* 676 */
-   void (GLAPIENTRYP GetnMapfvARB)(GLenum target, GLenum query, GLsizei bufSize, GLfloat * v); /* 677 */
-   void (GLAPIENTRYP GetnMapivARB)(GLenum target, GLenum query, GLsizei bufSize, GLint * v); /* 678 */
-   void (GLAPIENTRYP GetnMinmaxARB)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid * values); /* 679 */
-   void (GLAPIENTRYP GetnPixelMapfvARB)(GLenum map, GLsizei bufSize, GLfloat * values); /* 680 */
-   void (GLAPIENTRYP GetnPixelMapuivARB)(GLenum map, GLsizei bufSize, GLuint * values); /* 681 */
-   void (GLAPIENTRYP GetnPixelMapusvARB)(GLenum map, GLsizei bufSize, GLushort * values); /* 682 */
-   void (GLAPIENTRYP GetnPolygonStippleARB)(GLsizei bufSize, GLubyte * pattern); /* 683 */
-   void (GLAPIENTRYP GetnSeparableFilterARB)(GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, GLvoid * row, GLsizei columnBufSize, GLvoid * column, GLvoid * span); /* 684 */
-   void (GLAPIENTRYP GetnTexImageARB)(GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, GLvoid * img); /* 685 */
-   void (GLAPIENTRYP GetnUniformdvARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLdouble * params); /* 686 */
-   void (GLAPIENTRYP GetnUniformfvARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLfloat * params); /* 687 */
-   void (GLAPIENTRYP GetnUniformivARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLint * params); /* 688 */
-   void (GLAPIENTRYP GetnUniformuivARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLuint * params); /* 689 */
-   void (GLAPIENTRYP ReadnPixelsARB)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, GLvoid * data); /* 690 */
-   void (GLAPIENTRYP TexStorage1D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width); /* 691 */
-   void (GLAPIENTRYP TexStorage2D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height); /* 692 */
-   void (GLAPIENTRYP TexStorage3D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth); /* 693 */
-   void (GLAPIENTRYP TextureStorage1DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width); /* 694 */
-   void (GLAPIENTRYP TextureStorage2DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height); /* 695 */
-   void (GLAPIENTRYP TextureStorage3DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth); /* 696 */
-   void (GLAPIENTRYP PolygonOffsetEXT)(GLfloat factor, GLfloat bias); /* 697 */
-   void (GLAPIENTRYP GetPixelTexGenParameterfvSGIS)(GLenum pname, GLfloat * params); /* 698 */
-   void (GLAPIENTRYP GetPixelTexGenParameterivSGIS)(GLenum pname, GLint * params); /* 699 */
-   void (GLAPIENTRYP PixelTexGenParameterfSGIS)(GLenum pname, GLfloat param); /* 700 */
-   void (GLAPIENTRYP PixelTexGenParameterfvSGIS)(GLenum pname, const GLfloat * params); /* 701 */
-   void (GLAPIENTRYP PixelTexGenParameteriSGIS)(GLenum pname, GLint param); /* 702 */
-   void (GLAPIENTRYP PixelTexGenParameterivSGIS)(GLenum pname, const GLint * params); /* 703 */
-   void (GLAPIENTRYP SampleMaskSGIS)(GLclampf value, GLboolean invert); /* 704 */
-   void (GLAPIENTRYP SamplePatternSGIS)(GLenum pattern); /* 705 */
-   void (GLAPIENTRYP ColorPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 706 */
-   void (GLAPIENTRYP EdgeFlagPointerEXT)(GLsizei stride, GLsizei count, const GLboolean * pointer); /* 707 */
-   void (GLAPIENTRYP IndexPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 708 */
-   void (GLAPIENTRYP NormalPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 709 */
-   void (GLAPIENTRYP TexCoordPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 710 */
-   void (GLAPIENTRYP VertexPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 711 */
-   void (GLAPIENTRYP PointParameterfEXT)(GLenum pname, GLfloat param); /* 712 */
-   void (GLAPIENTRYP PointParameterfvEXT)(GLenum pname, const GLfloat * params); /* 713 */
-   void (GLAPIENTRYP LockArraysEXT)(GLint first, GLsizei count); /* 714 */
-   void (GLAPIENTRYP UnlockArraysEXT)(void); /* 715 */
-   void (GLAPIENTRYP SecondaryColor3bEXT)(GLbyte red, GLbyte green, GLbyte blue); /* 716 */
-   void (GLAPIENTRYP SecondaryColor3bvEXT)(const GLbyte * v); /* 717 */
-   void (GLAPIENTRYP SecondaryColor3dEXT)(GLdouble red, GLdouble green, GLdouble blue); /* 718 */
-   void (GLAPIENTRYP SecondaryColor3dvEXT)(const GLdouble * v); /* 719 */
-   void (GLAPIENTRYP SecondaryColor3fEXT)(GLfloat red, GLfloat green, GLfloat blue); /* 720 */
-   void (GLAPIENTRYP SecondaryColor3fvEXT)(const GLfloat * v); /* 721 */
-   void (GLAPIENTRYP SecondaryColor3iEXT)(GLint red, GLint green, GLint blue); /* 722 */
-   void (GLAPIENTRYP SecondaryColor3ivEXT)(const GLint * v); /* 723 */
-   void (GLAPIENTRYP SecondaryColor3sEXT)(GLshort red, GLshort green, GLshort blue); /* 724 */
-   void (GLAPIENTRYP SecondaryColor3svEXT)(const GLshort * v); /* 725 */
-   void (GLAPIENTRYP SecondaryColor3ubEXT)(GLubyte red, GLubyte green, GLubyte blue); /* 726 */
-   void (GLAPIENTRYP SecondaryColor3ubvEXT)(const GLubyte * v); /* 727 */
-   void (GLAPIENTRYP SecondaryColor3uiEXT)(GLuint red, GLuint green, GLuint blue); /* 728 */
-   void (GLAPIENTRYP SecondaryColor3uivEXT)(const GLuint * v); /* 729 */
-   void (GLAPIENTRYP SecondaryColor3usEXT)(GLushort red, GLushort green, GLushort blue); /* 730 */
-   void (GLAPIENTRYP SecondaryColor3usvEXT)(const GLushort * v); /* 731 */
-   void (GLAPIENTRYP SecondaryColorPointerEXT)(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 732 */
-   void (GLAPIENTRYP MultiDrawArraysEXT)(GLenum mode, const GLint * first, const GLsizei * count, GLsizei primcount); /* 733 */
-   void (GLAPIENTRYP MultiDrawElementsEXT)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid ** indices, GLsizei primcount); /* 734 */
-   void (GLAPIENTRYP FogCoordPointerEXT)(GLenum type, GLsizei stride, const GLvoid * pointer); /* 735 */
-   void (GLAPIENTRYP FogCoorddEXT)(GLdouble coord); /* 736 */
-   void (GLAPIENTRYP FogCoorddvEXT)(const GLdouble * coord); /* 737 */
-   void (GLAPIENTRYP FogCoordfEXT)(GLfloat coord); /* 738 */
-   void (GLAPIENTRYP FogCoordfvEXT)(const GLfloat * coord); /* 739 */
-   void (GLAPIENTRYP PixelTexGenSGIX)(GLenum mode); /* 740 */
-   void (GLAPIENTRYP BlendFuncSeparateEXT)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); /* 741 */
-   void (GLAPIENTRYP FlushVertexArrayRangeNV)(void); /* 742 */
-   void (GLAPIENTRYP VertexArrayRangeNV)(GLsizei length, const GLvoid * pointer); /* 743 */
-   void (GLAPIENTRYP CombinerInputNV)(GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); /* 744 */
-   void (GLAPIENTRYP CombinerOutputNV)(GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum); /* 745 */
-   void (GLAPIENTRYP CombinerParameterfNV)(GLenum pname, GLfloat param); /* 746 */
-   void (GLAPIENTRYP CombinerParameterfvNV)(GLenum pname, const GLfloat * params); /* 747 */
-   void (GLAPIENTRYP CombinerParameteriNV)(GLenum pname, GLint param); /* 748 */
-   void (GLAPIENTRYP CombinerParameterivNV)(GLenum pname, const GLint * params); /* 749 */
-   void (GLAPIENTRYP FinalCombinerInputNV)(GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); /* 750 */
-   void (GLAPIENTRYP GetCombinerInputParameterfvNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat * params); /* 751 */
-   void (GLAPIENTRYP GetCombinerInputParameterivNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint * params); /* 752 */
-   void (GLAPIENTRYP GetCombinerOutputParameterfvNV)(GLenum stage, GLenum portion, GLenum pname, GLfloat * params); /* 753 */
-   void (GLAPIENTRYP GetCombinerOutputParameterivNV)(GLenum stage, GLenum portion, GLenum pname, GLint * params); /* 754 */
-   void (GLAPIENTRYP GetFinalCombinerInputParameterfvNV)(GLenum variable, GLenum pname, GLfloat * params); /* 755 */
-   void (GLAPIENTRYP GetFinalCombinerInputParameterivNV)(GLenum variable, GLenum pname, GLint * params); /* 756 */
-   void (GLAPIENTRYP ResizeBuffersMESA)(void); /* 757 */
-   void (GLAPIENTRYP WindowPos2dMESA)(GLdouble x, GLdouble y); /* 758 */
-   void (GLAPIENTRYP WindowPos2dvMESA)(const GLdouble * v); /* 759 */
-   void (GLAPIENTRYP WindowPos2fMESA)(GLfloat x, GLfloat y); /* 760 */
-   void (GLAPIENTRYP WindowPos2fvMESA)(const GLfloat * v); /* 761 */
-   void (GLAPIENTRYP WindowPos2iMESA)(GLint x, GLint y); /* 762 */
-   void (GLAPIENTRYP WindowPos2ivMESA)(const GLint * v); /* 763 */
-   void (GLAPIENTRYP WindowPos2sMESA)(GLshort x, GLshort y); /* 764 */
-   void (GLAPIENTRYP WindowPos2svMESA)(const GLshort * v); /* 765 */
-   void (GLAPIENTRYP WindowPos3dMESA)(GLdouble x, GLdouble y, GLdouble z); /* 766 */
-   void (GLAPIENTRYP WindowPos3dvMESA)(const GLdouble * v); /* 767 */
-   void (GLAPIENTRYP WindowPos3fMESA)(GLfloat x, GLfloat y, GLfloat z); /* 768 */
-   void (GLAPIENTRYP WindowPos3fvMESA)(const GLfloat * v); /* 769 */
-   void (GLAPIENTRYP WindowPos3iMESA)(GLint x, GLint y, GLint z); /* 770 */
-   void (GLAPIENTRYP WindowPos3ivMESA)(const GLint * v); /* 771 */
-   void (GLAPIENTRYP WindowPos3sMESA)(GLshort x, GLshort y, GLshort z); /* 772 */
-   void (GLAPIENTRYP WindowPos3svMESA)(const GLshort * v); /* 773 */
-   void (GLAPIENTRYP WindowPos4dMESA)(GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 774 */
-   void (GLAPIENTRYP WindowPos4dvMESA)(const GLdouble * v); /* 775 */
-   void (GLAPIENTRYP WindowPos4fMESA)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 776 */
-   void (GLAPIENTRYP WindowPos4fvMESA)(const GLfloat * v); /* 777 */
-   void (GLAPIENTRYP WindowPos4iMESA)(GLint x, GLint y, GLint z, GLint w); /* 778 */
-   void (GLAPIENTRYP WindowPos4ivMESA)(const GLint * v); /* 779 */
-   void (GLAPIENTRYP WindowPos4sMESA)(GLshort x, GLshort y, GLshort z, GLshort w); /* 780 */
-   void (GLAPIENTRYP WindowPos4svMESA)(const GLshort * v); /* 781 */
-   void (GLAPIENTRYP MultiModeDrawArraysIBM)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride); /* 782 */
-   void (GLAPIENTRYP MultiModeDrawElementsIBM)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride); /* 783 */
-   void (GLAPIENTRYP DeleteFencesNV)(GLsizei n, const GLuint * fences); /* 784 */
-   void (GLAPIENTRYP FinishFenceNV)(GLuint fence); /* 785 */
-   void (GLAPIENTRYP GenFencesNV)(GLsizei n, GLuint * fences); /* 786 */
-   void (GLAPIENTRYP GetFenceivNV)(GLuint fence, GLenum pname, GLint * params); /* 787 */
-   GLboolean (GLAPIENTRYP IsFenceNV)(GLuint fence); /* 788 */
-   void (GLAPIENTRYP SetFenceNV)(GLuint fence, GLenum condition); /* 789 */
-   GLboolean (GLAPIENTRYP TestFenceNV)(GLuint fence); /* 790 */
-   GLboolean (GLAPIENTRYP AreProgramsResidentNV)(GLsizei n, const GLuint * ids, GLboolean * residences); /* 791 */
-   void (GLAPIENTRYP BindProgramNV)(GLenum target, GLuint program); /* 792 */
-   void (GLAPIENTRYP DeleteProgramsNV)(GLsizei n, const GLuint * programs); /* 793 */
-   void (GLAPIENTRYP ExecuteProgramNV)(GLenum target, GLuint id, const GLfloat * params); /* 794 */
-   void (GLAPIENTRYP GenProgramsNV)(GLsizei n, GLuint * programs); /* 795 */
-   void (GLAPIENTRYP GetProgramParameterdvNV)(GLenum target, GLuint index, GLenum pname, GLdouble * params); /* 796 */
-   void (GLAPIENTRYP GetProgramParameterfvNV)(GLenum target, GLuint index, GLenum pname, GLfloat * params); /* 797 */
-   void (GLAPIENTRYP GetProgramStringNV)(GLuint id, GLenum pname, GLubyte * program); /* 798 */
-   void (GLAPIENTRYP GetProgramivNV)(GLuint id, GLenum pname, GLint * params); /* 799 */
-   void (GLAPIENTRYP GetTrackMatrixivNV)(GLenum target, GLuint address, GLenum pname, GLint * params); /* 800 */
-   void (GLAPIENTRYP GetVertexAttribPointervNV)(GLuint index, GLenum pname, GLvoid ** pointer); /* 801 */
-   void (GLAPIENTRYP GetVertexAttribdvNV)(GLuint index, GLenum pname, GLdouble * params); /* 802 */
-   void (GLAPIENTRYP GetVertexAttribfvNV)(GLuint index, GLenum pname, GLfloat * params); /* 803 */
-   void (GLAPIENTRYP GetVertexAttribivNV)(GLuint index, GLenum pname, GLint * params); /* 804 */
-   GLboolean (GLAPIENTRYP IsProgramNV)(GLuint program); /* 805 */
-   void (GLAPIENTRYP LoadProgramNV)(GLenum target, GLuint id, GLsizei len, const GLubyte * program); /* 806 */
-   void (GLAPIENTRYP ProgramParameters4dvNV)(GLenum target, GLuint index, GLsizei num, const GLdouble * params); /* 807 */
-   void (GLAPIENTRYP ProgramParameters4fvNV)(GLenum target, GLuint index, GLsizei num, const GLfloat * params); /* 808 */
-   void (GLAPIENTRYP RequestResidentProgramsNV)(GLsizei n, const GLuint * ids); /* 809 */
-   void (GLAPIENTRYP TrackMatrixNV)(GLenum target, GLuint address, GLenum matrix, GLenum transform); /* 810 */
-   void (GLAPIENTRYP VertexAttrib1dNV)(GLuint index, GLdouble x); /* 811 */
-   void (GLAPIENTRYP VertexAttrib1dvNV)(GLuint index, const GLdouble * v); /* 812 */
-   void (GLAPIENTRYP VertexAttrib1fNV)(GLuint index, GLfloat x); /* 813 */
-   void (GLAPIENTRYP VertexAttrib1fvNV)(GLuint index, const GLfloat * v); /* 814 */
-   void (GLAPIENTRYP VertexAttrib1sNV)(GLuint index, GLshort x); /* 815 */
-   void (GLAPIENTRYP VertexAttrib1svNV)(GLuint index, const GLshort * v); /* 816 */
-   void (GLAPIENTRYP VertexAttrib2dNV)(GLuint index, GLdouble x, GLdouble y); /* 817 */
-   void (GLAPIENTRYP VertexAttrib2dvNV)(GLuint index, const GLdouble * v); /* 818 */
-   void (GLAPIENTRYP VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y); /* 819 */
-   void (GLAPIENTRYP VertexAttrib2fvNV)(GLuint index, const GLfloat * v); /* 820 */
-   void (GLAPIENTRYP VertexAttrib2sNV)(GLuint index, GLshort x, GLshort y); /* 821 */
-   void (GLAPIENTRYP VertexAttrib2svNV)(GLuint index, const GLshort * v); /* 822 */
-   void (GLAPIENTRYP VertexAttrib3dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z); /* 823 */
-   void (GLAPIENTRYP VertexAttrib3dvNV)(GLuint index, const GLdouble * v); /* 824 */
-   void (GLAPIENTRYP VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z); /* 825 */
-   void (GLAPIENTRYP VertexAttrib3fvNV)(GLuint index, const GLfloat * v); /* 826 */
-   void (GLAPIENTRYP VertexAttrib3sNV)(GLuint index, GLshort x, GLshort y, GLshort z); /* 827 */
-   void (GLAPIENTRYP VertexAttrib3svNV)(GLuint index, const GLshort * v); /* 828 */
-   void (GLAPIENTRYP VertexAttrib4dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 829 */
-   void (GLAPIENTRYP VertexAttrib4dvNV)(GLuint index, const GLdouble * v); /* 830 */
-   void (GLAPIENTRYP VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 831 */
-   void (GLAPIENTRYP VertexAttrib4fvNV)(GLuint index, const GLfloat * v); /* 832 */
-   void (GLAPIENTRYP VertexAttrib4sNV)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); /* 833 */
-   void (GLAPIENTRYP VertexAttrib4svNV)(GLuint index, const GLshort * v); /* 834 */
-   void (GLAPIENTRYP VertexAttrib4ubNV)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); /* 835 */
-   void (GLAPIENTRYP VertexAttrib4ubvNV)(GLuint index, const GLubyte * v); /* 836 */
-   void (GLAPIENTRYP VertexAttribPointerNV)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 837 */
-   void (GLAPIENTRYP VertexAttribs1dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 838 */
-   void (GLAPIENTRYP VertexAttribs1fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 839 */
-   void (GLAPIENTRYP VertexAttribs1svNV)(GLuint index, GLsizei n, const GLshort * v); /* 840 */
-   void (GLAPIENTRYP VertexAttribs2dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 841 */
-   void (GLAPIENTRYP VertexAttribs2fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 842 */
-   void (GLAPIENTRYP VertexAttribs2svNV)(GLuint index, GLsizei n, const GLshort * v); /* 843 */
-   void (GLAPIENTRYP VertexAttribs3dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 844 */
-   void (GLAPIENTRYP VertexAttribs3fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 845 */
-   void (GLAPIENTRYP VertexAttribs3svNV)(GLuint index, GLsizei n, const GLshort * v); /* 846 */
-   void (GLAPIENTRYP VertexAttribs4dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 847 */
-   void (GLAPIENTRYP VertexAttribs4fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 848 */
-   void (GLAPIENTRYP VertexAttribs4svNV)(GLuint index, GLsizei n, const GLshort * v); /* 849 */
-   void (GLAPIENTRYP VertexAttribs4ubvNV)(GLuint index, GLsizei n, const GLubyte * v); /* 850 */
-   void (GLAPIENTRYP GetTexBumpParameterfvATI)(GLenum pname, GLfloat * param); /* 851 */
-   void (GLAPIENTRYP GetTexBumpParameterivATI)(GLenum pname, GLint * param); /* 852 */
-   void (GLAPIENTRYP TexBumpParameterfvATI)(GLenum pname, const GLfloat * param); /* 853 */
-   void (GLAPIENTRYP TexBumpParameterivATI)(GLenum pname, const GLint * param); /* 854 */
-   void (GLAPIENTRYP AlphaFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 855 */
-   void (GLAPIENTRYP AlphaFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 856 */
-   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); /* 857 */
-   void (GLAPIENTRYP BeginFragmentShaderATI)(void); /* 858 */
-   void (GLAPIENTRYP BindFragmentShaderATI)(GLuint id); /* 859 */
-   void (GLAPIENTRYP ColorFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 860 */
-   void (GLAPIENTRYP ColorFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 861 */
-   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); /* 862 */
-   void (GLAPIENTRYP DeleteFragmentShaderATI)(GLuint id); /* 863 */
-   void (GLAPIENTRYP EndFragmentShaderATI)(void); /* 864 */
-   GLuint (GLAPIENTRYP GenFragmentShadersATI)(GLuint range); /* 865 */
-   void (GLAPIENTRYP PassTexCoordATI)(GLuint dst, GLuint coord, GLenum swizzle); /* 866 */
-   void (GLAPIENTRYP SampleMapATI)(GLuint dst, GLuint interp, GLenum swizzle); /* 867 */
-   void (GLAPIENTRYP SetFragmentShaderConstantATI)(GLuint dst, const GLfloat * value); /* 868 */
-   void (GLAPIENTRYP PointParameteriNV)(GLenum pname, GLint param); /* 869 */
-   void (GLAPIENTRYP PointParameterivNV)(GLenum pname, const GLint * params); /* 870 */
-   void (GLAPIENTRYP ActiveStencilFaceEXT)(GLenum face); /* 871 */
-   void (GLAPIENTRYP BindVertexArrayAPPLE)(GLuint array); /* 872 */
-   void (GLAPIENTRYP DeleteVertexArraysAPPLE)(GLsizei n, const GLuint * arrays); /* 873 */
-   void (GLAPIENTRYP GenVertexArraysAPPLE)(GLsizei n, GLuint * arrays); /* 874 */
-   GLboolean (GLAPIENTRYP IsVertexArrayAPPLE)(GLuint array); /* 875 */
-   void (GLAPIENTRYP GetProgramNamedParameterdvNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble * params); /* 876 */
-   void (GLAPIENTRYP GetProgramNamedParameterfvNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat * params); /* 877 */
-   void (GLAPIENTRYP ProgramNamedParameter4dNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 878 */
-   void (GLAPIENTRYP ProgramNamedParameter4dvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLdouble * v); /* 879 */
-   void (GLAPIENTRYP ProgramNamedParameter4fNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 880 */
-   void (GLAPIENTRYP ProgramNamedParameter4fvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLfloat * v); /* 881 */
-   void (GLAPIENTRYP PrimitiveRestartIndexNV)(GLuint index); /* 882 */
-   void (GLAPIENTRYP PrimitiveRestartNV)(void); /* 883 */
-   void (GLAPIENTRYP DepthBoundsEXT)(GLclampd zmin, GLclampd zmax); /* 884 */
-   void (GLAPIENTRYP BlendEquationSeparateEXT)(GLenum modeRGB, GLenum modeA); /* 885 */
-   void (GLAPIENTRYP BindFramebufferEXT)(GLenum target, GLuint framebuffer); /* 886 */
-   void (GLAPIENTRYP BindRenderbufferEXT)(GLenum target, GLuint renderbuffer); /* 887 */
-   GLenum (GLAPIENTRYP CheckFramebufferStatusEXT)(GLenum target); /* 888 */
-   void (GLAPIENTRYP DeleteFramebuffersEXT)(GLsizei n, const GLuint * framebuffers); /* 889 */
-   void (GLAPIENTRYP DeleteRenderbuffersEXT)(GLsizei n, const GLuint * renderbuffers); /* 890 */
-   void (GLAPIENTRYP FramebufferRenderbufferEXT)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); /* 891 */
-   void (GLAPIENTRYP FramebufferTexture1DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 892 */
-   void (GLAPIENTRYP FramebufferTexture2DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 893 */
-   void (GLAPIENTRYP FramebufferTexture3DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); /* 894 */
-   void (GLAPIENTRYP GenFramebuffersEXT)(GLsizei n, GLuint * framebuffers); /* 895 */
-   void (GLAPIENTRYP GenRenderbuffersEXT)(GLsizei n, GLuint * renderbuffers); /* 896 */
-   void (GLAPIENTRYP GenerateMipmapEXT)(GLenum target); /* 897 */
-   void (GLAPIENTRYP GetFramebufferAttachmentParameterivEXT)(GLenum target, GLenum attachment, GLenum pname, GLint * params); /* 898 */
-   void (GLAPIENTRYP GetRenderbufferParameterivEXT)(GLenum target, GLenum pname, GLint * params); /* 899 */
-   GLboolean (GLAPIENTRYP IsFramebufferEXT)(GLuint framebuffer); /* 900 */
-   GLboolean (GLAPIENTRYP IsRenderbufferEXT)(GLuint renderbuffer); /* 901 */
-   void (GLAPIENTRYP RenderbufferStorageEXT)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height); /* 902 */
-   void (GLAPIENTRYP BlitFramebufferEXT)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); /* 903 */
-   void (GLAPIENTRYP BufferParameteriAPPLE)(GLenum target, GLenum pname, GLint param); /* 904 */
-   void (GLAPIENTRYP FlushMappedBufferRangeAPPLE)(GLenum target, GLintptr offset, GLsizeiptr size); /* 905 */
-   void (GLAPIENTRYP BindFragDataLocationEXT)(GLuint program, GLuint colorNumber, const GLchar * name); /* 906 */
-   GLint (GLAPIENTRYP GetFragDataLocationEXT)(GLuint program, const GLchar * name); /* 907 */
-   void (GLAPIENTRYP GetUniformuivEXT)(GLuint program, GLint location, GLuint * params); /* 908 */
-   void (GLAPIENTRYP GetVertexAttribIivEXT)(GLuint index, GLenum pname, GLint * params); /* 909 */
-   void (GLAPIENTRYP GetVertexAttribIuivEXT)(GLuint index, GLenum pname, GLuint * params); /* 910 */
-   void (GLAPIENTRYP Uniform1uiEXT)(GLint location, GLuint x); /* 911 */
-   void (GLAPIENTRYP Uniform1uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 912 */
-   void (GLAPIENTRYP Uniform2uiEXT)(GLint location, GLuint x, GLuint y); /* 913 */
-   void (GLAPIENTRYP Uniform2uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 914 */
-   void (GLAPIENTRYP Uniform3uiEXT)(GLint location, GLuint x, GLuint y, GLuint z); /* 915 */
-   void (GLAPIENTRYP Uniform3uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 916 */
-   void (GLAPIENTRYP Uniform4uiEXT)(GLint location, GLuint x, GLuint y, GLuint z, GLuint w); /* 917 */
-   void (GLAPIENTRYP Uniform4uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 918 */
-   void (GLAPIENTRYP VertexAttribI1iEXT)(GLuint index, GLint x); /* 919 */
-   void (GLAPIENTRYP VertexAttribI1ivEXT)(GLuint index, const GLint * v); /* 920 */
-   void (GLAPIENTRYP VertexAttribI1uiEXT)(GLuint index, GLuint x); /* 921 */
-   void (GLAPIENTRYP VertexAttribI1uivEXT)(GLuint index, const GLuint * v); /* 922 */
-   void (GLAPIENTRYP VertexAttribI2iEXT)(GLuint index, GLint x, GLint y); /* 923 */
-   void (GLAPIENTRYP VertexAttribI2ivEXT)(GLuint index, const GLint * v); /* 924 */
-   void (GLAPIENTRYP VertexAttribI2uiEXT)(GLuint index, GLuint x, GLuint y); /* 925 */
-   void (GLAPIENTRYP VertexAttribI2uivEXT)(GLuint index, const GLuint * v); /* 926 */
-   void (GLAPIENTRYP VertexAttribI3iEXT)(GLuint index, GLint x, GLint y, GLint z); /* 927 */
-   void (GLAPIENTRYP VertexAttribI3ivEXT)(GLuint index, const GLint * v); /* 928 */
-   void (GLAPIENTRYP VertexAttribI3uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z); /* 929 */
-   void (GLAPIENTRYP VertexAttribI3uivEXT)(GLuint index, const GLuint * v); /* 930 */
-   void (GLAPIENTRYP VertexAttribI4bvEXT)(GLuint index, const GLbyte * v); /* 931 */
-   void (GLAPIENTRYP VertexAttribI4iEXT)(GLuint index, GLint x, GLint y, GLint z, GLint w); /* 932 */
-   void (GLAPIENTRYP VertexAttribI4ivEXT)(GLuint index, const GLint * v); /* 933 */
-   void (GLAPIENTRYP VertexAttribI4svEXT)(GLuint index, const GLshort * v); /* 934 */
-   void (GLAPIENTRYP VertexAttribI4ubvEXT)(GLuint index, const GLubyte * v); /* 935 */
-   void (GLAPIENTRYP VertexAttribI4uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); /* 936 */
-   void (GLAPIENTRYP VertexAttribI4uivEXT)(GLuint index, const GLuint * v); /* 937 */
-   void (GLAPIENTRYP VertexAttribI4usvEXT)(GLuint index, const GLushort * v); /* 938 */
-   void (GLAPIENTRYP VertexAttribIPointerEXT)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 939 */
-   void (GLAPIENTRYP FramebufferTextureLayerEXT)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); /* 940 */
-   void (GLAPIENTRYP ColorMaskIndexedEXT)(GLuint buf, GLboolean r, GLboolean g, GLboolean b, GLboolean a); /* 941 */
-   void (GLAPIENTRYP DisableIndexedEXT)(GLenum target, GLuint index); /* 942 */
-   void (GLAPIENTRYP EnableIndexedEXT)(GLenum target, GLuint index); /* 943 */
-   void (GLAPIENTRYP GetBooleanIndexedvEXT)(GLenum value, GLuint index, GLboolean * data); /* 944 */
-   void (GLAPIENTRYP GetIntegerIndexedvEXT)(GLenum value, GLuint index, GLint * data); /* 945 */
-   GLboolean (GLAPIENTRYP IsEnabledIndexedEXT)(GLenum target, GLuint index); /* 946 */
-   void (GLAPIENTRYP ClearColorIiEXT)(GLint r, GLint g, GLint b, GLint a); /* 947 */
-   void (GLAPIENTRYP ClearColorIuiEXT)(GLuint r, GLuint g, GLuint b, GLuint a); /* 948 */
-   void (GLAPIENTRYP GetTexParameterIivEXT)(GLenum target, GLenum pname, GLint * params); /* 949 */
-   void (GLAPIENTRYP GetTexParameterIuivEXT)(GLenum target, GLenum pname, GLuint * params); /* 950 */
-   void (GLAPIENTRYP TexParameterIivEXT)(GLenum target, GLenum pname, const GLint * params); /* 951 */
-   void (GLAPIENTRYP TexParameterIuivEXT)(GLenum target, GLenum pname, const GLuint * params); /* 952 */
-   void (GLAPIENTRYP BeginConditionalRenderNV)(GLuint query, GLenum mode); /* 953 */
-   void (GLAPIENTRYP EndConditionalRenderNV)(void); /* 954 */
-   void (GLAPIENTRYP BeginTransformFeedbackEXT)(GLenum mode); /* 955 */
-   void (GLAPIENTRYP BindBufferBaseEXT)(GLenum target, GLuint index, GLuint buffer); /* 956 */
-   void (GLAPIENTRYP BindBufferOffsetEXT)(GLenum target, GLuint index, GLuint buffer, GLintptr offset); /* 957 */
-   void (GLAPIENTRYP BindBufferRangeEXT)(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); /* 958 */
-   void (GLAPIENTRYP EndTransformFeedbackEXT)(void); /* 959 */
-   void (GLAPIENTRYP GetTransformFeedbackVaryingEXT)(GLuint program, GLuint index, GLsizei bufSize, GLsizei * length, GLsizei * size, GLenum * type, GLchar * name); /* 960 */
-   void (GLAPIENTRYP TransformFeedbackVaryingsEXT)(GLuint program, GLsizei count, const char ** varyings, GLenum bufferMode); /* 961 */
-   void (GLAPIENTRYP ProvokingVertexEXT)(GLenum mode); /* 962 */
-   void (GLAPIENTRYP GetTexParameterPointervAPPLE)(GLenum target, GLenum pname, GLvoid ** params); /* 963 */
-   void (GLAPIENTRYP TextureRangeAPPLE)(GLenum target, GLsizei length, GLvoid * pointer); /* 964 */
-   void (GLAPIENTRYP GetObjectParameterivAPPLE)(GLenum objectType, GLuint name, GLenum pname, GLint * value); /* 965 */
-   GLenum (GLAPIENTRYP ObjectPurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 966 */
-   GLenum (GLAPIENTRYP ObjectUnpurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 967 */
-   void (GLAPIENTRYP ActiveProgramEXT)(GLuint program); /* 968 */
-   GLuint (GLAPIENTRYP CreateShaderProgramEXT)(GLenum type, const GLchar * string); /* 969 */
-   void (GLAPIENTRYP UseShaderProgramEXT)(GLenum type, GLuint program); /* 970 */
-   void (GLAPIENTRYP TextureBarrierNV)(void); /* 971 */
-   void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 972 */
-   void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 973 */
-   void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 974 */
-   void (GLAPIENTRYP GetQueryObjecti64vEXT)(GLuint id, GLenum pname, GLint64EXT * params); /* 975 */
-   void (GLAPIENTRYP GetQueryObjectui64vEXT)(GLuint id, GLenum pname, GLuint64EXT * params); /* 976 */
-   void (GLAPIENTRYP EGLImageTargetRenderbufferStorageOES)(GLenum target, GLvoid * writeOffset); /* 977 */
-   void (GLAPIENTRYP EGLImageTargetTexture2DOES)(GLenum target, GLvoid * writeOffset); /* 978 */
+   void (GLAPIENTRYP FramebufferTexture)(GLenum target, GLenum attachment, GLuint texture, GLint level); /* 436 */
+   void (GLAPIENTRYP GetBufferParameteri64v)(GLenum target, GLenum pname, GLint64 * params); /* 437 */
+   void (GLAPIENTRYP GetInteger64i_v)(GLenum cap, GLuint index, GLint64 * data); /* 438 */
+   void (GLAPIENTRYP VertexAttribDivisor)(GLuint index, GLuint divisor); /* 439 */
+   void (GLAPIENTRYP LoadTransposeMatrixdARB)(const GLdouble * m); /* 440 */
+   void (GLAPIENTRYP LoadTransposeMatrixfARB)(const GLfloat * m); /* 441 */
+   void (GLAPIENTRYP MultTransposeMatrixdARB)(const GLdouble * m); /* 442 */
+   void (GLAPIENTRYP MultTransposeMatrixfARB)(const GLfloat * m); /* 443 */
+   void (GLAPIENTRYP SampleCoverageARB)(GLclampf value, GLboolean invert); /* 444 */
+   void (GLAPIENTRYP CompressedTexImage1DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid * data); /* 445 */
+   void (GLAPIENTRYP CompressedTexImage2DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid * data); /* 446 */
+   void (GLAPIENTRYP CompressedTexImage3DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid * data); /* 447 */
+   void (GLAPIENTRYP CompressedTexSubImage1DARB)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid * data); /* 448 */
+   void (GLAPIENTRYP CompressedTexSubImage2DARB)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid * data); /* 449 */
+   void (GLAPIENTRYP CompressedTexSubImage3DARB)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid * data); /* 450 */
+   void (GLAPIENTRYP GetCompressedTexImageARB)(GLenum target, GLint level, GLvoid * img); /* 451 */
+   void (GLAPIENTRYP DisableVertexAttribArrayARB)(GLuint index); /* 452 */
+   void (GLAPIENTRYP EnableVertexAttribArrayARB)(GLuint index); /* 453 */
+   void (GLAPIENTRYP GetProgramEnvParameterdvARB)(GLenum target, GLuint index, GLdouble * params); /* 454 */
+   void (GLAPIENTRYP GetProgramEnvParameterfvARB)(GLenum target, GLuint index, GLfloat * params); /* 455 */
+   void (GLAPIENTRYP GetProgramLocalParameterdvARB)(GLenum target, GLuint index, GLdouble * params); /* 456 */
+   void (GLAPIENTRYP GetProgramLocalParameterfvARB)(GLenum target, GLuint index, GLfloat * params); /* 457 */
+   void (GLAPIENTRYP GetProgramStringARB)(GLenum target, GLenum pname, GLvoid * string); /* 458 */
+   void (GLAPIENTRYP GetProgramivARB)(GLenum target, GLenum pname, GLint * params); /* 459 */
+   void (GLAPIENTRYP GetVertexAttribdvARB)(GLuint index, GLenum pname, GLdouble * params); /* 460 */
+   void (GLAPIENTRYP GetVertexAttribfvARB)(GLuint index, GLenum pname, GLfloat * params); /* 461 */
+   void (GLAPIENTRYP GetVertexAttribivARB)(GLuint index, GLenum pname, GLint * params); /* 462 */
+   void (GLAPIENTRYP ProgramEnvParameter4dARB)(GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 463 */
+   void (GLAPIENTRYP ProgramEnvParameter4dvARB)(GLenum target, GLuint index, const GLdouble * params); /* 464 */
+   void (GLAPIENTRYP ProgramEnvParameter4fARB)(GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 465 */
+   void (GLAPIENTRYP ProgramEnvParameter4fvARB)(GLenum target, GLuint index, const GLfloat * params); /* 466 */
+   void (GLAPIENTRYP ProgramLocalParameter4dARB)(GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 467 */
+   void (GLAPIENTRYP ProgramLocalParameter4dvARB)(GLenum target, GLuint index, const GLdouble * params); /* 468 */
+   void (GLAPIENTRYP ProgramLocalParameter4fARB)(GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 469 */
+   void (GLAPIENTRYP ProgramLocalParameter4fvARB)(GLenum target, GLuint index, const GLfloat * params); /* 470 */
+   void (GLAPIENTRYP ProgramStringARB)(GLenum target, GLenum format, GLsizei len, const GLvoid * string); /* 471 */
+   void (GLAPIENTRYP VertexAttrib1dARB)(GLuint index, GLdouble x); /* 472 */
+   void (GLAPIENTRYP VertexAttrib1dvARB)(GLuint index, const GLdouble * v); /* 473 */
+   void (GLAPIENTRYP VertexAttrib1fARB)(GLuint index, GLfloat x); /* 474 */
+   void (GLAPIENTRYP VertexAttrib1fvARB)(GLuint index, const GLfloat * v); /* 475 */
+   void (GLAPIENTRYP VertexAttrib1sARB)(GLuint index, GLshort x); /* 476 */
+   void (GLAPIENTRYP VertexAttrib1svARB)(GLuint index, const GLshort * v); /* 477 */
+   void (GLAPIENTRYP VertexAttrib2dARB)(GLuint index, GLdouble x, GLdouble y); /* 478 */
+   void (GLAPIENTRYP VertexAttrib2dvARB)(GLuint index, const GLdouble * v); /* 479 */
+   void (GLAPIENTRYP VertexAttrib2fARB)(GLuint index, GLfloat x, GLfloat y); /* 480 */
+   void (GLAPIENTRYP VertexAttrib2fvARB)(GLuint index, const GLfloat * v); /* 481 */
+   void (GLAPIENTRYP VertexAttrib2sARB)(GLuint index, GLshort x, GLshort y); /* 482 */
+   void (GLAPIENTRYP VertexAttrib2svARB)(GLuint index, const GLshort * v); /* 483 */
+   void (GLAPIENTRYP VertexAttrib3dARB)(GLuint index, GLdouble x, GLdouble y, GLdouble z); /* 484 */
+   void (GLAPIENTRYP VertexAttrib3dvARB)(GLuint index, const GLdouble * v); /* 485 */
+   void (GLAPIENTRYP VertexAttrib3fARB)(GLuint index, GLfloat x, GLfloat y, GLfloat z); /* 486 */
+   void (GLAPIENTRYP VertexAttrib3fvARB)(GLuint index, const GLfloat * v); /* 487 */
+   void (GLAPIENTRYP VertexAttrib3sARB)(GLuint index, GLshort x, GLshort y, GLshort z); /* 488 */
+   void (GLAPIENTRYP VertexAttrib3svARB)(GLuint index, const GLshort * v); /* 489 */
+   void (GLAPIENTRYP VertexAttrib4NbvARB)(GLuint index, const GLbyte * v); /* 490 */
+   void (GLAPIENTRYP VertexAttrib4NivARB)(GLuint index, const GLint * v); /* 491 */
+   void (GLAPIENTRYP VertexAttrib4NsvARB)(GLuint index, const GLshort * v); /* 492 */
+   void (GLAPIENTRYP VertexAttrib4NubARB)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); /* 493 */
+   void (GLAPIENTRYP VertexAttrib4NubvARB)(GLuint index, const GLubyte * v); /* 494 */
+   void (GLAPIENTRYP VertexAttrib4NuivARB)(GLuint index, const GLuint * v); /* 495 */
+   void (GLAPIENTRYP VertexAttrib4NusvARB)(GLuint index, const GLushort * v); /* 496 */
+   void (GLAPIENTRYP VertexAttrib4bvARB)(GLuint index, const GLbyte * v); /* 497 */
+   void (GLAPIENTRYP VertexAttrib4dARB)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 498 */
+   void (GLAPIENTRYP VertexAttrib4dvARB)(GLuint index, const GLdouble * v); /* 499 */
+   void (GLAPIENTRYP VertexAttrib4fARB)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 500 */
+   void (GLAPIENTRYP VertexAttrib4fvARB)(GLuint index, const GLfloat * v); /* 501 */
+   void (GLAPIENTRYP VertexAttrib4ivARB)(GLuint index, const GLint * v); /* 502 */
+   void (GLAPIENTRYP VertexAttrib4sARB)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); /* 503 */
+   void (GLAPIENTRYP VertexAttrib4svARB)(GLuint index, const GLshort * v); /* 504 */
+   void (GLAPIENTRYP VertexAttrib4ubvARB)(GLuint index, const GLubyte * v); /* 505 */
+   void (GLAPIENTRYP VertexAttrib4uivARB)(GLuint index, const GLuint * v); /* 506 */
+   void (GLAPIENTRYP VertexAttrib4usvARB)(GLuint index, const GLushort * v); /* 507 */
+   void (GLAPIENTRYP VertexAttribPointerARB)(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid * pointer); /* 508 */
+   void (GLAPIENTRYP BindBufferARB)(GLenum target, GLuint buffer); /* 509 */
+   void (GLAPIENTRYP BufferDataARB)(GLenum target, GLsizeiptrARB size, const GLvoid * data, GLenum usage); /* 510 */
+   void (GLAPIENTRYP BufferSubDataARB)(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid * data); /* 511 */
+   void (GLAPIENTRYP DeleteBuffersARB)(GLsizei n, const GLuint * buffer); /* 512 */
+   void (GLAPIENTRYP GenBuffersARB)(GLsizei n, GLuint * buffer); /* 513 */
+   void (GLAPIENTRYP GetBufferParameterivARB)(GLenum target, GLenum pname, GLint * params); /* 514 */
+   void (GLAPIENTRYP GetBufferPointervARB)(GLenum target, GLenum pname, GLvoid ** params); /* 515 */
+   void (GLAPIENTRYP GetBufferSubDataARB)(GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid * data); /* 516 */
+   GLboolean (GLAPIENTRYP IsBufferARB)(GLuint buffer); /* 517 */
+   GLvoid * (GLAPIENTRYP MapBufferARB)(GLenum target, GLenum access); /* 518 */
+   GLboolean (GLAPIENTRYP UnmapBufferARB)(GLenum target); /* 519 */
+   void (GLAPIENTRYP BeginQueryARB)(GLenum target, GLuint id); /* 520 */
+   void (GLAPIENTRYP DeleteQueriesARB)(GLsizei n, const GLuint * ids); /* 521 */
+   void (GLAPIENTRYP EndQueryARB)(GLenum target); /* 522 */
+   void (GLAPIENTRYP GenQueriesARB)(GLsizei n, GLuint * ids); /* 523 */
+   void (GLAPIENTRYP GetQueryObjectivARB)(GLuint id, GLenum pname, GLint * params); /* 524 */
+   void (GLAPIENTRYP GetQueryObjectuivARB)(GLuint id, GLenum pname, GLuint * params); /* 525 */
+   void (GLAPIENTRYP GetQueryivARB)(GLenum target, GLenum pname, GLint * params); /* 526 */
+   GLboolean (GLAPIENTRYP IsQueryARB)(GLuint id); /* 527 */
+   void (GLAPIENTRYP AttachObjectARB)(GLhandleARB containerObj, GLhandleARB obj); /* 528 */
+   void (GLAPIENTRYP CompileShaderARB)(GLhandleARB shader); /* 529 */
+   GLhandleARB (GLAPIENTRYP CreateProgramObjectARB)(void); /* 530 */
+   GLhandleARB (GLAPIENTRYP CreateShaderObjectARB)(GLenum shaderType); /* 531 */
+   void (GLAPIENTRYP DeleteObjectARB)(GLhandleARB obj); /* 532 */
+   void (GLAPIENTRYP DetachObjectARB)(GLhandleARB containerObj, GLhandleARB attachedObj); /* 533 */
+   void (GLAPIENTRYP GetActiveUniformARB)(GLhandleARB program, GLuint index, GLsizei bufSize, GLsizei * length, GLint * size, GLenum * type, GLcharARB * name); /* 534 */
+   void (GLAPIENTRYP GetAttachedObjectsARB)(GLhandleARB containerObj, GLsizei maxLength, GLsizei * length, GLhandleARB * infoLog); /* 535 */
+   GLhandleARB (GLAPIENTRYP GetHandleARB)(GLenum pname); /* 536 */
+   void (GLAPIENTRYP GetInfoLogARB)(GLhandleARB obj, GLsizei maxLength, GLsizei * length, GLcharARB * infoLog); /* 537 */
+   void (GLAPIENTRYP GetObjectParameterfvARB)(GLhandleARB obj, GLenum pname, GLfloat * params); /* 538 */
+   void (GLAPIENTRYP GetObjectParameterivARB)(GLhandleARB obj, GLenum pname, GLint * params); /* 539 */
+   void (GLAPIENTRYP GetShaderSourceARB)(GLhandleARB shader, GLsizei bufSize, GLsizei * length, GLcharARB * source); /* 540 */
+   GLint (GLAPIENTRYP GetUniformLocationARB)(GLhandleARB program, const GLcharARB * name); /* 541 */
+   void (GLAPIENTRYP GetUniformfvARB)(GLhandleARB program, GLint location, GLfloat * params); /* 542 */
+   void (GLAPIENTRYP GetUniformivARB)(GLhandleARB program, GLint location, GLint * params); /* 543 */
+   void (GLAPIENTRYP LinkProgramARB)(GLhandleARB program); /* 544 */
+   void (GLAPIENTRYP ShaderSourceARB)(GLhandleARB shader, GLsizei count, const GLcharARB ** string, const GLint * length); /* 545 */
+   void (GLAPIENTRYP Uniform1fARB)(GLint location, GLfloat v0); /* 546 */
+   void (GLAPIENTRYP Uniform1fvARB)(GLint location, GLsizei count, const GLfloat * value); /* 547 */
+   void (GLAPIENTRYP Uniform1iARB)(GLint location, GLint v0); /* 548 */
+   void (GLAPIENTRYP Uniform1ivARB)(GLint location, GLsizei count, const GLint * value); /* 549 */
+   void (GLAPIENTRYP Uniform2fARB)(GLint location, GLfloat v0, GLfloat v1); /* 550 */
+   void (GLAPIENTRYP Uniform2fvARB)(GLint location, GLsizei count, const GLfloat * value); /* 551 */
+   void (GLAPIENTRYP Uniform2iARB)(GLint location, GLint v0, GLint v1); /* 552 */
+   void (GLAPIENTRYP Uniform2ivARB)(GLint location, GLsizei count, const GLint * value); /* 553 */
+   void (GLAPIENTRYP Uniform3fARB)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2); /* 554 */
+   void (GLAPIENTRYP Uniform3fvARB)(GLint location, GLsizei count, const GLfloat * value); /* 555 */
+   void (GLAPIENTRYP Uniform3iARB)(GLint location, GLint v0, GLint v1, GLint v2); /* 556 */
+   void (GLAPIENTRYP Uniform3ivARB)(GLint location, GLsizei count, const GLint * value); /* 557 */
+   void (GLAPIENTRYP Uniform4fARB)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); /* 558 */
+   void (GLAPIENTRYP Uniform4fvARB)(GLint location, GLsizei count, const GLfloat * value); /* 559 */
+   void (GLAPIENTRYP Uniform4iARB)(GLint location, GLint v0, GLint v1, GLint v2, GLint v3); /* 560 */
+   void (GLAPIENTRYP Uniform4ivARB)(GLint location, GLsizei count, const GLint * value); /* 561 */
+   void (GLAPIENTRYP UniformMatrix2fvARB)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 562 */
+   void (GLAPIENTRYP UniformMatrix3fvARB)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 563 */
+   void (GLAPIENTRYP UniformMatrix4fvARB)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 564 */
+   void (GLAPIENTRYP UseProgramObjectARB)(GLhandleARB program); /* 565 */
+   void (GLAPIENTRYP ValidateProgramARB)(GLhandleARB program); /* 566 */
+   void (GLAPIENTRYP BindAttribLocationARB)(GLhandleARB program, GLuint index, const GLcharARB * name); /* 567 */
+   void (GLAPIENTRYP GetActiveAttribARB)(GLhandleARB program, GLuint index, GLsizei bufSize, GLsizei * length, GLint * size, GLenum * type, GLcharARB * name); /* 568 */
+   GLint (GLAPIENTRYP GetAttribLocationARB)(GLhandleARB program, const GLcharARB * name); /* 569 */
+   void (GLAPIENTRYP DrawBuffersARB)(GLsizei n, const GLenum * bufs); /* 570 */
+   void (GLAPIENTRYP ClampColorARB)(GLenum target, GLenum clamp); /* 571 */
+   void (GLAPIENTRYP DrawArraysInstancedARB)(GLenum mode, GLint first, GLsizei count, GLsizei primcount); /* 572 */
+   void (GLAPIENTRYP DrawElementsInstancedARB)(GLenum mode, GLsizei count, GLenum type, const GLvoid * indices, GLsizei primcount); /* 573 */
+   void (GLAPIENTRYP RenderbufferStorageMultisample)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); /* 574 */
+   void (GLAPIENTRYP FramebufferTextureARB)(GLenum target, GLenum attachment, GLuint texture, GLint level); /* 575 */
+   void (GLAPIENTRYP FramebufferTextureFaceARB)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face); /* 576 */
+   void (GLAPIENTRYP ProgramParameteriARB)(GLuint program, GLenum pname, GLint value); /* 577 */
+   void (GLAPIENTRYP VertexAttribDivisorARB)(GLuint index, GLuint divisor); /* 578 */
+   void (GLAPIENTRYP FlushMappedBufferRange)(GLenum target, GLintptr offset, GLsizeiptr length); /* 579 */
+   GLvoid * (GLAPIENTRYP MapBufferRange)(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access); /* 580 */
+   void (GLAPIENTRYP TexBufferARB)(GLenum target, GLenum internalFormat, GLuint buffer); /* 581 */
+   void (GLAPIENTRYP BindVertexArray)(GLuint array); /* 582 */
+   void (GLAPIENTRYP GenVertexArrays)(GLsizei n, GLuint * arrays); /* 583 */
+   void (GLAPIENTRYP CopyBufferSubData)(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); /* 584 */
+   GLenum (GLAPIENTRYP ClientWaitSync)(GLsync sync, GLbitfield flags, GLuint64 timeout); /* 585 */
+   void (GLAPIENTRYP DeleteSync)(GLsync sync); /* 586 */
+   GLsync (GLAPIENTRYP FenceSync)(GLenum condition, GLbitfield flags); /* 587 */
+   void (GLAPIENTRYP GetInteger64v)(GLenum pname, GLint64 * params); /* 588 */
+   void (GLAPIENTRYP GetSynciv)(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * values); /* 589 */
+   GLboolean (GLAPIENTRYP IsSync)(GLsync sync); /* 590 */
+   void (GLAPIENTRYP WaitSync)(GLsync sync, GLbitfield flags, GLuint64 timeout); /* 591 */
+   void (GLAPIENTRYP DrawElementsBaseVertex)(GLenum mode, GLsizei count, GLenum type, const GLvoid * indices, GLint basevertex); /* 592 */
+   void (GLAPIENTRYP DrawElementsInstancedBaseVertex)(GLenum mode, GLsizei count, GLenum type, const GLvoid * indices, GLsizei primcount, GLint basevertex); /* 593 */
+   void (GLAPIENTRYP DrawRangeElementsBaseVertex)(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid * indices, GLint basevertex); /* 594 */
+   void (GLAPIENTRYP MultiDrawElementsBaseVertex)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid ** indices, GLsizei primcount, const GLint * basevertex); /* 595 */
+   void (GLAPIENTRYP BlendEquationSeparateiARB)(GLuint buf, GLenum modeRGB, GLenum modeA); /* 596 */
+   void (GLAPIENTRYP BlendEquationiARB)(GLuint buf, GLenum mode); /* 597 */
+   void (GLAPIENTRYP BlendFuncSeparateiARB)(GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcA, GLenum dstA); /* 598 */
+   void (GLAPIENTRYP BlendFunciARB)(GLuint buf, GLenum src, GLenum dst); /* 599 */
+   void (GLAPIENTRYP BindFragDataLocationIndexed)(GLuint program, GLuint colorNumber, GLuint index, const GLchar * name); /* 600 */
+   GLint (GLAPIENTRYP GetFragDataIndex)(GLuint program, const GLchar * name); /* 601 */
+   void (GLAPIENTRYP BindSampler)(GLuint unit, GLuint sampler); /* 602 */
+   void (GLAPIENTRYP DeleteSamplers)(GLsizei count, const GLuint * samplers); /* 603 */
+   void (GLAPIENTRYP GenSamplers)(GLsizei count, GLuint * samplers); /* 604 */
+   void (GLAPIENTRYP GetSamplerParameterIiv)(GLuint sampler, GLenum pname, GLint * params); /* 605 */
+   void (GLAPIENTRYP GetSamplerParameterIuiv)(GLuint sampler, GLenum pname, GLuint * params); /* 606 */
+   void (GLAPIENTRYP GetSamplerParameterfv)(GLuint sampler, GLenum pname, GLfloat * params); /* 607 */
+   void (GLAPIENTRYP GetSamplerParameteriv)(GLuint sampler, GLenum pname, GLint * params); /* 608 */
+   GLboolean (GLAPIENTRYP IsSampler)(GLuint sampler); /* 609 */
+   void (GLAPIENTRYP SamplerParameterIiv)(GLuint sampler, GLenum pname, const GLint * params); /* 610 */
+   void (GLAPIENTRYP SamplerParameterIuiv)(GLuint sampler, GLenum pname, const GLuint * params); /* 611 */
+   void (GLAPIENTRYP SamplerParameterf)(GLuint sampler, GLenum pname, GLfloat param); /* 612 */
+   void (GLAPIENTRYP SamplerParameterfv)(GLuint sampler, GLenum pname, const GLfloat * params); /* 613 */
+   void (GLAPIENTRYP SamplerParameteri)(GLuint sampler, GLenum pname, GLint param); /* 614 */
+   void (GLAPIENTRYP SamplerParameteriv)(GLuint sampler, GLenum pname, const GLint * params); /* 615 */
+   void (GLAPIENTRYP ColorP3ui)(GLenum type, GLuint color); /* 616 */
+   void (GLAPIENTRYP ColorP3uiv)(GLenum type, const GLuint * color); /* 617 */
+   void (GLAPIENTRYP ColorP4ui)(GLenum type, GLuint color); /* 618 */
+   void (GLAPIENTRYP ColorP4uiv)(GLenum type, const GLuint * color); /* 619 */
+   void (GLAPIENTRYP MultiTexCoordP1ui)(GLenum texture, GLenum type, GLuint coords); /* 620 */
+   void (GLAPIENTRYP MultiTexCoordP1uiv)(GLenum texture, GLenum type, const GLuint * coords); /* 621 */
+   void (GLAPIENTRYP MultiTexCoordP2ui)(GLenum texture, GLenum type, GLuint coords); /* 622 */
+   void (GLAPIENTRYP MultiTexCoordP2uiv)(GLenum texture, GLenum type, const GLuint * coords); /* 623 */
+   void (GLAPIENTRYP MultiTexCoordP3ui)(GLenum texture, GLenum type, GLuint coords); /* 624 */
+   void (GLAPIENTRYP MultiTexCoordP3uiv)(GLenum texture, GLenum type, const GLuint * coords); /* 625 */
+   void (GLAPIENTRYP MultiTexCoordP4ui)(GLenum texture, GLenum type, GLuint coords); /* 626 */
+   void (GLAPIENTRYP MultiTexCoordP4uiv)(GLenum texture, GLenum type, const GLuint * coords); /* 627 */
+   void (GLAPIENTRYP NormalP3ui)(GLenum type, GLuint coords); /* 628 */
+   void (GLAPIENTRYP NormalP3uiv)(GLenum type, const GLuint * coords); /* 629 */
+   void (GLAPIENTRYP SecondaryColorP3ui)(GLenum type, GLuint color); /* 630 */
+   void (GLAPIENTRYP SecondaryColorP3uiv)(GLenum type, const GLuint * color); /* 631 */
+   void (GLAPIENTRYP TexCoordP1ui)(GLenum type, GLuint coords); /* 632 */
+   void (GLAPIENTRYP TexCoordP1uiv)(GLenum type, const GLuint * coords); /* 633 */
+   void (GLAPIENTRYP TexCoordP2ui)(GLenum type, GLuint coords); /* 634 */
+   void (GLAPIENTRYP TexCoordP2uiv)(GLenum type, const GLuint * coords); /* 635 */
+   void (GLAPIENTRYP TexCoordP3ui)(GLenum type, GLuint coords); /* 636 */
+   void (GLAPIENTRYP TexCoordP3uiv)(GLenum type, const GLuint * coords); /* 637 */
+   void (GLAPIENTRYP TexCoordP4ui)(GLenum type, GLuint coords); /* 638 */
+   void (GLAPIENTRYP TexCoordP4uiv)(GLenum type, const GLuint * coords); /* 639 */
+   void (GLAPIENTRYP VertexAttribP1ui)(GLuint index, GLenum type, GLboolean normalized, GLuint value); /* 640 */
+   void (GLAPIENTRYP VertexAttribP1uiv)(GLuint index, GLenum type, GLboolean normalized, const GLuint * value); /* 641 */
+   void (GLAPIENTRYP VertexAttribP2ui)(GLuint index, GLenum type, GLboolean normalized, GLuint value); /* 642 */
+   void (GLAPIENTRYP VertexAttribP2uiv)(GLuint index, GLenum type, GLboolean normalized, const GLuint * value); /* 643 */
+   void (GLAPIENTRYP VertexAttribP3ui)(GLuint index, GLenum type, GLboolean normalized, GLuint value); /* 644 */
+   void (GLAPIENTRYP VertexAttribP3uiv)(GLuint index, GLenum type, GLboolean normalized, const GLuint * value); /* 645 */
+   void (GLAPIENTRYP VertexAttribP4ui)(GLuint index, GLenum type, GLboolean normalized, GLuint value); /* 646 */
+   void (GLAPIENTRYP VertexAttribP4uiv)(GLuint index, GLenum type, GLboolean normalized, const GLuint * value); /* 647 */
+   void (GLAPIENTRYP VertexP2ui)(GLenum type, GLuint value); /* 648 */
+   void (GLAPIENTRYP VertexP2uiv)(GLenum type, const GLuint * value); /* 649 */
+   void (GLAPIENTRYP VertexP3ui)(GLenum type, GLuint value); /* 650 */
+   void (GLAPIENTRYP VertexP3uiv)(GLenum type, const GLuint * value); /* 651 */
+   void (GLAPIENTRYP VertexP4ui)(GLenum type, GLuint value); /* 652 */
+   void (GLAPIENTRYP VertexP4uiv)(GLenum type, const GLuint * value); /* 653 */
+   void (GLAPIENTRYP BindTransformFeedback)(GLenum target, GLuint id); /* 654 */
+   void (GLAPIENTRYP DeleteTransformFeedbacks)(GLsizei n, const GLuint * ids); /* 655 */
+   void (GLAPIENTRYP DrawTransformFeedback)(GLenum mode, GLuint id); /* 656 */
+   void (GLAPIENTRYP GenTransformFeedbacks)(GLsizei n, GLuint * ids); /* 657 */
+   GLboolean (GLAPIENTRYP IsTransformFeedback)(GLuint id); /* 658 */
+   void (GLAPIENTRYP PauseTransformFeedback)(void); /* 659 */
+   void (GLAPIENTRYP ResumeTransformFeedback)(void); /* 660 */
+   void (GLAPIENTRYP ClearDepthf)(GLclampf depth); /* 661 */
+   void (GLAPIENTRYP DepthRangef)(GLclampf zNear, GLclampf zFar); /* 662 */
+   void (GLAPIENTRYP GetShaderPrecisionFormat)(GLenum shadertype, GLenum precisiontype, GLint * range, GLint * precision); /* 663 */
+   void (GLAPIENTRYP ReleaseShaderCompiler)(void); /* 664 */
+   void (GLAPIENTRYP ShaderBinary)(GLsizei n, const GLuint * shaders, GLenum binaryformat, const GLvoid * binary, GLsizei length); /* 665 */
+   void (GLAPIENTRYP DebugMessageCallbackARB)(GLDEBUGPROCARB callback, GLvoid * userParam); /* 666 */
+   void (GLAPIENTRYP DebugMessageControlARB)(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint * ids, GLboolean enabled); /* 667 */
+   void (GLAPIENTRYP DebugMessageInsertARB)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLcharARB * buf); /* 668 */
+   GLuint (GLAPIENTRYP GetDebugMessageLogARB)(GLuint count, GLsizei bufsize, GLenum * sources, GLenum * types, GLuint * ids, GLenum * severities, GLsizei * lengths, GLcharARB * messageLog); /* 669 */
+   GLenum (GLAPIENTRYP GetGraphicsResetStatusARB)(void); /* 670 */
+   void (GLAPIENTRYP GetnColorTableARB)(GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid * table); /* 671 */
+   void (GLAPIENTRYP GetnCompressedTexImageARB)(GLenum target, GLint lod, GLsizei bufSize, GLvoid * img); /* 672 */
+   void (GLAPIENTRYP GetnConvolutionFilterARB)(GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid * image); /* 673 */
+   void (GLAPIENTRYP GetnHistogramARB)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid * values); /* 674 */
+   void (GLAPIENTRYP GetnMapdvARB)(GLenum target, GLenum query, GLsizei bufSize, GLdouble * v); /* 675 */
+   void (GLAPIENTRYP GetnMapfvARB)(GLenum target, GLenum query, GLsizei bufSize, GLfloat * v); /* 676 */
+   void (GLAPIENTRYP GetnMapivARB)(GLenum target, GLenum query, GLsizei bufSize, GLint * v); /* 677 */
+   void (GLAPIENTRYP GetnMinmaxARB)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid * values); /* 678 */
+   void (GLAPIENTRYP GetnPixelMapfvARB)(GLenum map, GLsizei bufSize, GLfloat * values); /* 679 */
+   void (GLAPIENTRYP GetnPixelMapuivARB)(GLenum map, GLsizei bufSize, GLuint * values); /* 680 */
+   void (GLAPIENTRYP GetnPixelMapusvARB)(GLenum map, GLsizei bufSize, GLushort * values); /* 681 */
+   void (GLAPIENTRYP GetnPolygonStippleARB)(GLsizei bufSize, GLubyte * pattern); /* 682 */
+   void (GLAPIENTRYP GetnSeparableFilterARB)(GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, GLvoid * row, GLsizei columnBufSize, GLvoid * column, GLvoid * span); /* 683 */
+   void (GLAPIENTRYP GetnTexImageARB)(GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, GLvoid * img); /* 684 */
+   void (GLAPIENTRYP GetnUniformdvARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLdouble * params); /* 685 */
+   void (GLAPIENTRYP GetnUniformfvARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLfloat * params); /* 686 */
+   void (GLAPIENTRYP GetnUniformivARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLint * params); /* 687 */
+   void (GLAPIENTRYP GetnUniformuivARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLuint * params); /* 688 */
+   void (GLAPIENTRYP ReadnPixelsARB)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, GLvoid * data); /* 689 */
+   void (GLAPIENTRYP TexStorage1D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width); /* 690 */
+   void (GLAPIENTRYP TexStorage2D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height); /* 691 */
+   void (GLAPIENTRYP TexStorage3D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth); /* 692 */
+   void (GLAPIENTRYP TextureStorage1DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width); /* 693 */
+   void (GLAPIENTRYP TextureStorage2DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height); /* 694 */
+   void (GLAPIENTRYP TextureStorage3DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth); /* 695 */
+   void (GLAPIENTRYP PolygonOffsetEXT)(GLfloat factor, GLfloat bias); /* 696 */
+   void (GLAPIENTRYP GetPixelTexGenParameterfvSGIS)(GLenum pname, GLfloat * params); /* 697 */
+   void (GLAPIENTRYP GetPixelTexGenParameterivSGIS)(GLenum pname, GLint * params); /* 698 */
+   void (GLAPIENTRYP PixelTexGenParameterfSGIS)(GLenum pname, GLfloat param); /* 699 */
+   void (GLAPIENTRYP PixelTexGenParameterfvSGIS)(GLenum pname, const GLfloat * params); /* 700 */
+   void (GLAPIENTRYP PixelTexGenParameteriSGIS)(GLenum pname, GLint param); /* 701 */
+   void (GLAPIENTRYP PixelTexGenParameterivSGIS)(GLenum pname, const GLint * params); /* 702 */
+   void (GLAPIENTRYP SampleMaskSGIS)(GLclampf value, GLboolean invert); /* 703 */
+   void (GLAPIENTRYP SamplePatternSGIS)(GLenum pattern); /* 704 */
+   void (GLAPIENTRYP ColorPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 705 */
+   void (GLAPIENTRYP EdgeFlagPointerEXT)(GLsizei stride, GLsizei count, const GLboolean * pointer); /* 706 */
+   void (GLAPIENTRYP IndexPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 707 */
+   void (GLAPIENTRYP NormalPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 708 */
+   void (GLAPIENTRYP TexCoordPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 709 */
+   void (GLAPIENTRYP VertexPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 710 */
+   void (GLAPIENTRYP PointParameterfEXT)(GLenum pname, GLfloat param); /* 711 */
+   void (GLAPIENTRYP PointParameterfvEXT)(GLenum pname, const GLfloat * params); /* 712 */
+   void (GLAPIENTRYP LockArraysEXT)(GLint first, GLsizei count); /* 713 */
+   void (GLAPIENTRYP UnlockArraysEXT)(void); /* 714 */
+   void (GLAPIENTRYP SecondaryColor3bEXT)(GLbyte red, GLbyte green, GLbyte blue); /* 715 */
+   void (GLAPIENTRYP SecondaryColor3bvEXT)(const GLbyte * v); /* 716 */
+   void (GLAPIENTRYP SecondaryColor3dEXT)(GLdouble red, GLdouble green, GLdouble blue); /* 717 */
+   void (GLAPIENTRYP SecondaryColor3dvEXT)(const GLdouble * v); /* 718 */
+   void (GLAPIENTRYP SecondaryColor3fEXT)(GLfloat red, GLfloat green, GLfloat blue); /* 719 */
+   void (GLAPIENTRYP SecondaryColor3fvEXT)(const GLfloat * v); /* 720 */
+   void (GLAPIENTRYP SecondaryColor3iEXT)(GLint red, GLint green, GLint blue); /* 721 */
+   void (GLAPIENTRYP SecondaryColor3ivEXT)(const GLint * v); /* 722 */
+   void (GLAPIENTRYP SecondaryColor3sEXT)(GLshort red, GLshort green, GLshort blue); /* 723 */
+   void (GLAPIENTRYP SecondaryColor3svEXT)(const GLshort * v); /* 724 */
+   void (GLAPIENTRYP SecondaryColor3ubEXT)(GLubyte red, GLubyte green, GLubyte blue); /* 725 */
+   void (GLAPIENTRYP SecondaryColor3ubvEXT)(const GLubyte * v); /* 726 */
+   void (GLAPIENTRYP SecondaryColor3uiEXT)(GLuint red, GLuint green, GLuint blue); /* 727 */
+   void (GLAPIENTRYP SecondaryColor3uivEXT)(const GLuint * v); /* 728 */
+   void (GLAPIENTRYP SecondaryColor3usEXT)(GLushort red, GLushort green, GLushort blue); /* 729 */
+   void (GLAPIENTRYP SecondaryColor3usvEXT)(const GLushort * v); /* 730 */
+   void (GLAPIENTRYP SecondaryColorPointerEXT)(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 731 */
+   void (GLAPIENTRYP MultiDrawArraysEXT)(GLenum mode, const GLint * first, const GLsizei * count, GLsizei primcount); /* 732 */
+   void (GLAPIENTRYP MultiDrawElementsEXT)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid ** indices, GLsizei primcount); /* 733 */
+   void (GLAPIENTRYP FogCoordPointerEXT)(GLenum type, GLsizei stride, const GLvoid * pointer); /* 734 */
+   void (GLAPIENTRYP FogCoorddEXT)(GLdouble coord); /* 735 */
+   void (GLAPIENTRYP FogCoorddvEXT)(const GLdouble * coord); /* 736 */
+   void (GLAPIENTRYP FogCoordfEXT)(GLfloat coord); /* 737 */
+   void (GLAPIENTRYP FogCoordfvEXT)(const GLfloat * coord); /* 738 */
+   void (GLAPIENTRYP PixelTexGenSGIX)(GLenum mode); /* 739 */
+   void (GLAPIENTRYP BlendFuncSeparateEXT)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); /* 740 */
+   void (GLAPIENTRYP FlushVertexArrayRangeNV)(void); /* 741 */
+   void (GLAPIENTRYP VertexArrayRangeNV)(GLsizei length, const GLvoid * pointer); /* 742 */
+   void (GLAPIENTRYP CombinerInputNV)(GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); /* 743 */
+   void (GLAPIENTRYP CombinerOutputNV)(GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum); /* 744 */
+   void (GLAPIENTRYP CombinerParameterfNV)(GLenum pname, GLfloat param); /* 745 */
+   void (GLAPIENTRYP CombinerParameterfvNV)(GLenum pname, const GLfloat * params); /* 746 */
+   void (GLAPIENTRYP CombinerParameteriNV)(GLenum pname, GLint param); /* 747 */
+   void (GLAPIENTRYP CombinerParameterivNV)(GLenum pname, const GLint * params); /* 748 */
+   void (GLAPIENTRYP FinalCombinerInputNV)(GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); /* 749 */
+   void (GLAPIENTRYP GetCombinerInputParameterfvNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat * params); /* 750 */
+   void (GLAPIENTRYP GetCombinerInputParameterivNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint * params); /* 751 */
+   void (GLAPIENTRYP GetCombinerOutputParameterfvNV)(GLenum stage, GLenum portion, GLenum pname, GLfloat * params); /* 752 */
+   void (GLAPIENTRYP GetCombinerOutputParameterivNV)(GLenum stage, GLenum portion, GLenum pname, GLint * params); /* 753 */
+   void (GLAPIENTRYP GetFinalCombinerInputParameterfvNV)(GLenum variable, GLenum pname, GLfloat * params); /* 754 */
+   void (GLAPIENTRYP GetFinalCombinerInputParameterivNV)(GLenum variable, GLenum pname, GLint * params); /* 755 */
+   void (GLAPIENTRYP ResizeBuffersMESA)(void); /* 756 */
+   void (GLAPIENTRYP WindowPos2dMESA)(GLdouble x, GLdouble y); /* 757 */
+   void (GLAPIENTRYP WindowPos2dvMESA)(const GLdouble * v); /* 758 */
+   void (GLAPIENTRYP WindowPos2fMESA)(GLfloat x, GLfloat y); /* 759 */
+   void (GLAPIENTRYP WindowPos2fvMESA)(const GLfloat * v); /* 760 */
+   void (GLAPIENTRYP WindowPos2iMESA)(GLint x, GLint y); /* 761 */
+   void (GLAPIENTRYP WindowPos2ivMESA)(const GLint * v); /* 762 */
+   void (GLAPIENTRYP WindowPos2sMESA)(GLshort x, GLshort y); /* 763 */
+   void (GLAPIENTRYP WindowPos2svMESA)(const GLshort * v); /* 764 */
+   void (GLAPIENTRYP WindowPos3dMESA)(GLdouble x, GLdouble y, GLdouble z); /* 765 */
+   void (GLAPIENTRYP WindowPos3dvMESA)(const GLdouble * v); /* 766 */
+   void (GLAPIENTRYP WindowPos3fMESA)(GLfloat x, GLfloat y, GLfloat z); /* 767 */
+   void (GLAPIENTRYP WindowPos3fvMESA)(const GLfloat * v); /* 768 */
+   void (GLAPIENTRYP WindowPos3iMESA)(GLint x, GLint y, GLint z); /* 769 */
+   void (GLAPIENTRYP WindowPos3ivMESA)(const GLint * v); /* 770 */
+   void (GLAPIENTRYP WindowPos3sMESA)(GLshort x, GLshort y, GLshort z); /* 771 */
+   void (GLAPIENTRYP WindowPos3svMESA)(const GLshort * v); /* 772 */
+   void (GLAPIENTRYP WindowPos4dMESA)(GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 773 */
+   void (GLAPIENTRYP WindowPos4dvMESA)(const GLdouble * v); /* 774 */
+   void (GLAPIENTRYP WindowPos4fMESA)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 775 */
+   void (GLAPIENTRYP WindowPos4fvMESA)(const GLfloat * v); /* 776 */
+   void (GLAPIENTRYP WindowPos4iMESA)(GLint x, GLint y, GLint z, GLint w); /* 777 */
+   void (GLAPIENTRYP WindowPos4ivMESA)(const GLint * v); /* 778 */
+   void (GLAPIENTRYP WindowPos4sMESA)(GLshort x, GLshort y, GLshort z, GLshort w); /* 779 */
+   void (GLAPIENTRYP WindowPos4svMESA)(const GLshort * v); /* 780 */
+   void (GLAPIENTRYP MultiModeDrawArraysIBM)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride); /* 781 */
+   void (GLAPIENTRYP MultiModeDrawElementsIBM)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride); /* 782 */
+   void (GLAPIENTRYP DeleteFencesNV)(GLsizei n, const GLuint * fences); /* 783 */
+   void (GLAPIENTRYP FinishFenceNV)(GLuint fence); /* 784 */
+   void (GLAPIENTRYP GenFencesNV)(GLsizei n, GLuint * fences); /* 785 */
+   void (GLAPIENTRYP GetFenceivNV)(GLuint fence, GLenum pname, GLint * params); /* 786 */
+   GLboolean (GLAPIENTRYP IsFenceNV)(GLuint fence); /* 787 */
+   void (GLAPIENTRYP SetFenceNV)(GLuint fence, GLenum condition); /* 788 */
+   GLboolean (GLAPIENTRYP TestFenceNV)(GLuint fence); /* 789 */
+   GLboolean (GLAPIENTRYP AreProgramsResidentNV)(GLsizei n, const GLuint * ids, GLboolean * residences); /* 790 */
+   void (GLAPIENTRYP BindProgramNV)(GLenum target, GLuint program); /* 791 */
+   void (GLAPIENTRYP DeleteProgramsNV)(GLsizei n, const GLuint * programs); /* 792 */
+   void (GLAPIENTRYP ExecuteProgramNV)(GLenum target, GLuint id, const GLfloat * params); /* 793 */
+   void (GLAPIENTRYP GenProgramsNV)(GLsizei n, GLuint * programs); /* 794 */
+   void (GLAPIENTRYP GetProgramParameterdvNV)(GLenum target, GLuint index, GLenum pname, GLdouble * params); /* 795 */
+   void (GLAPIENTRYP GetProgramParameterfvNV)(GLenum target, GLuint index, GLenum pname, GLfloat * params); /* 796 */
+   void (GLAPIENTRYP GetProgramStringNV)(GLuint id, GLenum pname, GLubyte * program); /* 797 */
+   void (GLAPIENTRYP GetProgramivNV)(GLuint id, GLenum pname, GLint * params); /* 798 */
+   void (GLAPIENTRYP GetTrackMatrixivNV)(GLenum target, GLuint address, GLenum pname, GLint * params); /* 799 */
+   void (GLAPIENTRYP GetVertexAttribPointervNV)(GLuint index, GLenum pname, GLvoid ** pointer); /* 800 */
+   void (GLAPIENTRYP GetVertexAttribdvNV)(GLuint index, GLenum pname, GLdouble * params); /* 801 */
+   void (GLAPIENTRYP GetVertexAttribfvNV)(GLuint index, GLenum pname, GLfloat * params); /* 802 */
+   void (GLAPIENTRYP GetVertexAttribivNV)(GLuint index, GLenum pname, GLint * params); /* 803 */
+   GLboolean (GLAPIENTRYP IsProgramNV)(GLuint program); /* 804 */
+   void (GLAPIENTRYP LoadProgramNV)(GLenum target, GLuint id, GLsizei len, const GLubyte * program); /* 805 */
+   void (GLAPIENTRYP ProgramParameters4dvNV)(GLenum target, GLuint index, GLsizei num, const GLdouble * params); /* 806 */
+   void (GLAPIENTRYP ProgramParameters4fvNV)(GLenum target, GLuint index, GLsizei num, const GLfloat * params); /* 807 */
+   void (GLAPIENTRYP RequestResidentProgramsNV)(GLsizei n, const GLuint * ids); /* 808 */
+   void (GLAPIENTRYP TrackMatrixNV)(GLenum target, GLuint address, GLenum matrix, GLenum transform); /* 809 */
+   void (GLAPIENTRYP VertexAttrib1dNV)(GLuint index, GLdouble x); /* 810 */
+   void (GLAPIENTRYP VertexAttrib1dvNV)(GLuint index, const GLdouble * v); /* 811 */
+   void (GLAPIENTRYP VertexAttrib1fNV)(GLuint index, GLfloat x); /* 812 */
+   void (GLAPIENTRYP VertexAttrib1fvNV)(GLuint index, const GLfloat * v); /* 813 */
+   void (GLAPIENTRYP VertexAttrib1sNV)(GLuint index, GLshort x); /* 814 */
+   void (GLAPIENTRYP VertexAttrib1svNV)(GLuint index, const GLshort * v); /* 815 */
+   void (GLAPIENTRYP VertexAttrib2dNV)(GLuint index, GLdouble x, GLdouble y); /* 816 */
+   void (GLAPIENTRYP VertexAttrib2dvNV)(GLuint index, const GLdouble * v); /* 817 */
+   void (GLAPIENTRYP VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y); /* 818 */
+   void (GLAPIENTRYP VertexAttrib2fvNV)(GLuint index, const GLfloat * v); /* 819 */
+   void (GLAPIENTRYP VertexAttrib2sNV)(GLuint index, GLshort x, GLshort y); /* 820 */
+   void (GLAPIENTRYP VertexAttrib2svNV)(GLuint index, const GLshort * v); /* 821 */
+   void (GLAPIENTRYP VertexAttrib3dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z); /* 822 */
+   void (GLAPIENTRYP VertexAttrib3dvNV)(GLuint index, const GLdouble * v); /* 823 */
+   void (GLAPIENTRYP VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z); /* 824 */
+   void (GLAPIENTRYP VertexAttrib3fvNV)(GLuint index, const GLfloat * v); /* 825 */
+   void (GLAPIENTRYP VertexAttrib3sNV)(GLuint index, GLshort x, GLshort y, GLshort z); /* 826 */
+   void (GLAPIENTRYP VertexAttrib3svNV)(GLuint index, const GLshort * v); /* 827 */
+   void (GLAPIENTRYP VertexAttrib4dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 828 */
+   void (GLAPIENTRYP VertexAttrib4dvNV)(GLuint index, const GLdouble * v); /* 829 */
+   void (GLAPIENTRYP VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 830 */
+   void (GLAPIENTRYP VertexAttrib4fvNV)(GLuint index, const GLfloat * v); /* 831 */
+   void (GLAPIENTRYP VertexAttrib4sNV)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); /* 832 */
+   void (GLAPIENTRYP VertexAttrib4svNV)(GLuint index, const GLshort * v); /* 833 */
+   void (GLAPIENTRYP VertexAttrib4ubNV)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); /* 834 */
+   void (GLAPIENTRYP VertexAttrib4ubvNV)(GLuint index, const GLubyte * v); /* 835 */
+   void (GLAPIENTRYP VertexAttribPointerNV)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 836 */
+   void (GLAPIENTRYP VertexAttribs1dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 837 */
+   void (GLAPIENTRYP VertexAttribs1fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 838 */
+   void (GLAPIENTRYP VertexAttribs1svNV)(GLuint index, GLsizei n, const GLshort * v); /* 839 */
+   void (GLAPIENTRYP VertexAttribs2dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 840 */
+   void (GLAPIENTRYP VertexAttribs2fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 841 */
+   void (GLAPIENTRYP VertexAttribs2svNV)(GLuint index, GLsizei n, const GLshort * v); /* 842 */
+   void (GLAPIENTRYP VertexAttribs3dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 843 */
+   void (GLAPIENTRYP VertexAttribs3fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 844 */
+   void (GLAPIENTRYP VertexAttribs3svNV)(GLuint index, GLsizei n, const GLshort * v); /* 845 */
+   void (GLAPIENTRYP VertexAttribs4dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 846 */
+   void (GLAPIENTRYP VertexAttribs4fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 847 */
+   void (GLAPIENTRYP VertexAttribs4svNV)(GLuint index, GLsizei n, const GLshort * v); /* 848 */
+   void (GLAPIENTRYP VertexAttribs4ubvNV)(GLuint index, GLsizei n, const GLubyte * v); /* 849 */
+   void (GLAPIENTRYP GetTexBumpParameterfvATI)(GLenum pname, GLfloat * param); /* 850 */
+   void (GLAPIENTRYP GetTexBumpParameterivATI)(GLenum pname, GLint * param); /* 851 */
+   void (GLAPIENTRYP TexBumpParameterfvATI)(GLenum pname, const GLfloat * param); /* 852 */
+   void (GLAPIENTRYP TexBumpParameterivATI)(GLenum pname, const GLint * param); /* 853 */
+   void (GLAPIENTRYP AlphaFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 854 */
+   void (GLAPIENTRYP AlphaFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 855 */
+   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); /* 856 */
+   void (GLAPIENTRYP BeginFragmentShaderATI)(void); /* 857 */
+   void (GLAPIENTRYP BindFragmentShaderATI)(GLuint id); /* 858 */
+   void (GLAPIENTRYP ColorFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 859 */
+   void (GLAPIENTRYP ColorFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 860 */
+   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); /* 861 */
+   void (GLAPIENTRYP DeleteFragmentShaderATI)(GLuint id); /* 862 */
+   void (GLAPIENTRYP EndFragmentShaderATI)(void); /* 863 */
+   GLuint (GLAPIENTRYP GenFragmentShadersATI)(GLuint range); /* 864 */
+   void (GLAPIENTRYP PassTexCoordATI)(GLuint dst, GLuint coord, GLenum swizzle); /* 865 */
+   void (GLAPIENTRYP SampleMapATI)(GLuint dst, GLuint interp, GLenum swizzle); /* 866 */
+   void (GLAPIENTRYP SetFragmentShaderConstantATI)(GLuint dst, const GLfloat * value); /* 867 */
+   void (GLAPIENTRYP PointParameteriNV)(GLenum pname, GLint param); /* 868 */
+   void (GLAPIENTRYP PointParameterivNV)(GLenum pname, const GLint * params); /* 869 */
+   void (GLAPIENTRYP ActiveStencilFaceEXT)(GLenum face); /* 870 */
+   void (GLAPIENTRYP BindVertexArrayAPPLE)(GLuint array); /* 871 */
+   void (GLAPIENTRYP DeleteVertexArraysAPPLE)(GLsizei n, const GLuint * arrays); /* 872 */
+   void (GLAPIENTRYP GenVertexArraysAPPLE)(GLsizei n, GLuint * arrays); /* 873 */
+   GLboolean (GLAPIENTRYP IsVertexArrayAPPLE)(GLuint array); /* 874 */
+   void (GLAPIENTRYP GetProgramNamedParameterdvNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble * params); /* 875 */
+   void (GLAPIENTRYP GetProgramNamedParameterfvNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat * params); /* 876 */
+   void (GLAPIENTRYP ProgramNamedParameter4dNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 877 */
+   void (GLAPIENTRYP ProgramNamedParameter4dvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLdouble * v); /* 878 */
+   void (GLAPIENTRYP ProgramNamedParameter4fNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 879 */
+   void (GLAPIENTRYP ProgramNamedParameter4fvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLfloat * v); /* 880 */
+   void (GLAPIENTRYP PrimitiveRestartIndexNV)(GLuint index); /* 881 */
+   void (GLAPIENTRYP PrimitiveRestartNV)(void); /* 882 */
+   void (GLAPIENTRYP DepthBoundsEXT)(GLclampd zmin, GLclampd zmax); /* 883 */
+   void (GLAPIENTRYP BlendEquationSeparateEXT)(GLenum modeRGB, GLenum modeA); /* 884 */
+   void (GLAPIENTRYP BindFramebufferEXT)(GLenum target, GLuint framebuffer); /* 885 */
+   void (GLAPIENTRYP BindRenderbufferEXT)(GLenum target, GLuint renderbuffer); /* 886 */
+   GLenum (GLAPIENTRYP CheckFramebufferStatusEXT)(GLenum target); /* 887 */
+   void (GLAPIENTRYP DeleteFramebuffersEXT)(GLsizei n, const GLuint * framebuffers); /* 888 */
+   void (GLAPIENTRYP DeleteRenderbuffersEXT)(GLsizei n, const GLuint * renderbuffers); /* 889 */
+   void (GLAPIENTRYP FramebufferRenderbufferEXT)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); /* 890 */
+   void (GLAPIENTRYP FramebufferTexture1DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 891 */
+   void (GLAPIENTRYP FramebufferTexture2DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 892 */
+   void (GLAPIENTRYP FramebufferTexture3DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); /* 893 */
+   void (GLAPIENTRYP GenFramebuffersEXT)(GLsizei n, GLuint * framebuffers); /* 894 */
+   void (GLAPIENTRYP GenRenderbuffersEXT)(GLsizei n, GLuint * renderbuffers); /* 895 */
+   void (GLAPIENTRYP GenerateMipmapEXT)(GLenum target); /* 896 */
+   void (GLAPIENTRYP GetFramebufferAttachmentParameterivEXT)(GLenum target, GLenum attachment, GLenum pname, GLint * params); /* 897 */
+   void (GLAPIENTRYP GetRenderbufferParameterivEXT)(GLenum target, GLenum pname, GLint * params); /* 898 */
+   GLboolean (GLAPIENTRYP IsFramebufferEXT)(GLuint framebuffer); /* 899 */
+   GLboolean (GLAPIENTRYP IsRenderbufferEXT)(GLuint renderbuffer); /* 900 */
+   void (GLAPIENTRYP RenderbufferStorageEXT)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height); /* 901 */
+   void (GLAPIENTRYP BlitFramebufferEXT)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); /* 902 */
+   void (GLAPIENTRYP BufferParameteriAPPLE)(GLenum target, GLenum pname, GLint param); /* 903 */
+   void (GLAPIENTRYP FlushMappedBufferRangeAPPLE)(GLenum target, GLintptr offset, GLsizeiptr size); /* 904 */
+   void (GLAPIENTRYP BindFragDataLocationEXT)(GLuint program, GLuint colorNumber, const GLchar * name); /* 905 */
+   GLint (GLAPIENTRYP GetFragDataLocationEXT)(GLuint program, const GLchar * name); /* 906 */
+   void (GLAPIENTRYP GetUniformuivEXT)(GLuint program, GLint location, GLuint * params); /* 907 */
+   void (GLAPIENTRYP GetVertexAttribIivEXT)(GLuint index, GLenum pname, GLint * params); /* 908 */
+   void (GLAPIENTRYP GetVertexAttribIuivEXT)(GLuint index, GLenum pname, GLuint * params); /* 909 */
+   void (GLAPIENTRYP Uniform1uiEXT)(GLint location, GLuint x); /* 910 */
+   void (GLAPIENTRYP Uniform1uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 911 */
+   void (GLAPIENTRYP Uniform2uiEXT)(GLint location, GLuint x, GLuint y); /* 912 */
+   void (GLAPIENTRYP Uniform2uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 913 */
+   void (GLAPIENTRYP Uniform3uiEXT)(GLint location, GLuint x, GLuint y, GLuint z); /* 914 */
+   void (GLAPIENTRYP Uniform3uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 915 */
+   void (GLAPIENTRYP Uniform4uiEXT)(GLint location, GLuint x, GLuint y, GLuint z, GLuint w); /* 916 */
+   void (GLAPIENTRYP Uniform4uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 917 */
+   void (GLAPIENTRYP VertexAttribI1iEXT)(GLuint index, GLint x); /* 918 */
+   void (GLAPIENTRYP VertexAttribI1ivEXT)(GLuint index, const GLint * v); /* 919 */
+   void (GLAPIENTRYP VertexAttribI1uiEXT)(GLuint index, GLuint x); /* 920 */
+   void (GLAPIENTRYP VertexAttribI1uivEXT)(GLuint index, const GLuint * v); /* 921 */
+   void (GLAPIENTRYP VertexAttribI2iEXT)(GLuint index, GLint x, GLint y); /* 922 */
+   void (GLAPIENTRYP VertexAttribI2ivEXT)(GLuint index, const GLint * v); /* 923 */
+   void (GLAPIENTRYP VertexAttribI2uiEXT)(GLuint index, GLuint x, GLuint y); /* 924 */
+   void (GLAPIENTRYP VertexAttribI2uivEXT)(GLuint index, const GLuint * v); /* 925 */
+   void (GLAPIENTRYP VertexAttribI3iEXT)(GLuint index, GLint x, GLint y, GLint z); /* 926 */
+   void (GLAPIENTRYP VertexAttribI3ivEXT)(GLuint index, const GLint * v); /* 927 */
+   void (GLAPIENTRYP VertexAttribI3uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z); /* 928 */
+   void (GLAPIENTRYP VertexAttribI3uivEXT)(GLuint index, const GLuint * v); /* 929 */
+   void (GLAPIENTRYP VertexAttribI4bvEXT)(GLuint index, const GLbyte * v); /* 930 */
+   void (GLAPIENTRYP VertexAttribI4iEXT)(GLuint index, GLint x, GLint y, GLint z, GLint w); /* 931 */
+   void (GLAPIENTRYP VertexAttribI4ivEXT)(GLuint index, const GLint * v); /* 932 */
+   void (GLAPIENTRYP VertexAttribI4svEXT)(GLuint index, const GLshort * v); /* 933 */
+   void (GLAPIENTRYP VertexAttribI4ubvEXT)(GLuint index, const GLubyte * v); /* 934 */
+   void (GLAPIENTRYP VertexAttribI4uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); /* 935 */
+   void (GLAPIENTRYP VertexAttribI4uivEXT)(GLuint index, const GLuint * v); /* 936 */
+   void (GLAPIENTRYP VertexAttribI4usvEXT)(GLuint index, const GLushort * v); /* 937 */
+   void (GLAPIENTRYP VertexAttribIPointerEXT)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 938 */
+   void (GLAPIENTRYP FramebufferTextureLayerEXT)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); /* 939 */
+   void (GLAPIENTRYP ColorMaskIndexedEXT)(GLuint buf, GLboolean r, GLboolean g, GLboolean b, GLboolean a); /* 940 */
+   void (GLAPIENTRYP DisableIndexedEXT)(GLenum target, GLuint index); /* 941 */
+   void (GLAPIENTRYP EnableIndexedEXT)(GLenum target, GLuint index); /* 942 */
+   void (GLAPIENTRYP GetBooleanIndexedvEXT)(GLenum value, GLuint index, GLboolean * data); /* 943 */
+   void (GLAPIENTRYP GetIntegerIndexedvEXT)(GLenum value, GLuint index, GLint * data); /* 944 */
+   GLboolean (GLAPIENTRYP IsEnabledIndexedEXT)(GLenum target, GLuint index); /* 945 */
+   void (GLAPIENTRYP ClearColorIiEXT)(GLint r, GLint g, GLint b, GLint a); /* 946 */
+   void (GLAPIENTRYP ClearColorIuiEXT)(GLuint r, GLuint g, GLuint b, GLuint a); /* 947 */
+   void (GLAPIENTRYP GetTexParameterIivEXT)(GLenum target, GLenum pname, GLint * params); /* 948 */
+   void (GLAPIENTRYP GetTexParameterIuivEXT)(GLenum target, GLenum pname, GLuint * params); /* 949 */
+   void (GLAPIENTRYP TexParameterIivEXT)(GLenum target, GLenum pname, const GLint * params); /* 950 */
+   void (GLAPIENTRYP TexParameterIuivEXT)(GLenum target, GLenum pname, const GLuint * params); /* 951 */
+   void (GLAPIENTRYP BeginConditionalRenderNV)(GLuint query, GLenum mode); /* 952 */
+   void (GLAPIENTRYP EndConditionalRenderNV)(void); /* 953 */
+   void (GLAPIENTRYP BeginTransformFeedbackEXT)(GLenum mode); /* 954 */
+   void (GLAPIENTRYP BindBufferBaseEXT)(GLenum target, GLuint index, GLuint buffer); /* 955 */
+   void (GLAPIENTRYP BindBufferOffsetEXT)(GLenum target, GLuint index, GLuint buffer, GLintptr offset); /* 956 */
+   void (GLAPIENTRYP BindBufferRangeEXT)(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); /* 957 */
+   void (GLAPIENTRYP EndTransformFeedbackEXT)(void); /* 958 */
+   void (GLAPIENTRYP GetTransformFeedbackVaryingEXT)(GLuint program, GLuint index, GLsizei bufSize, GLsizei * length, GLsizei * size, GLenum * type, GLchar * name); /* 959 */
+   void (GLAPIENTRYP TransformFeedbackVaryingsEXT)(GLuint program, GLsizei count, const char ** varyings, GLenum bufferMode); /* 960 */
+   void (GLAPIENTRYP ProvokingVertexEXT)(GLenum mode); /* 961 */
+   void (GLAPIENTRYP GetTexParameterPointervAPPLE)(GLenum target, GLenum pname, GLvoid ** params); /* 962 */
+   void (GLAPIENTRYP TextureRangeAPPLE)(GLenum target, GLsizei length, GLvoid * pointer); /* 963 */
+   void (GLAPIENTRYP GetObjectParameterivAPPLE)(GLenum objectType, GLuint name, GLenum pname, GLint * value); /* 964 */
+   GLenum (GLAPIENTRYP ObjectPurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 965 */
+   GLenum (GLAPIENTRYP ObjectUnpurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 966 */
+   void (GLAPIENTRYP ActiveProgramEXT)(GLuint program); /* 967 */
+   GLuint (GLAPIENTRYP CreateShaderProgramEXT)(GLenum type, const GLchar * string); /* 968 */
+   void (GLAPIENTRYP UseShaderProgramEXT)(GLenum type, GLuint program); /* 969 */
+   void (GLAPIENTRYP TextureBarrierNV)(void); /* 970 */
+   void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 971 */
+   void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 972 */
+   void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 973 */
+   void (GLAPIENTRYP GetQueryObjecti64vEXT)(GLuint id, GLenum pname, GLint64EXT * params); /* 974 */
+   void (GLAPIENTRYP GetQueryObjectui64vEXT)(GLuint id, GLenum pname, GLuint64EXT * params); /* 975 */
+   void (GLAPIENTRYP EGLImageTargetRenderbufferStorageOES)(GLenum target, GLvoid * writeOffset); /* 976 */
+   void (GLAPIENTRYP EGLImageTargetTexture2DOES)(GLenum target, GLvoid * writeOffset); /* 977 */
 };
 
 #endif /* !defined( _GLAPI_TABLE_H_ ) */
diff --git a/mesalib/src/mapi/glapi/glapitemp.h b/mesalib/src/mapi/glapi/glapitemp.h
index b159a9e45..54beb5b43 100644
--- a/mesalib/src/mapi/glapi/glapitemp.h
+++ b/mesalib/src/mapi/glapi/glapitemp.h
@@ -3157,12 +3157,6 @@ KEYWORD1 const GLubyte * KEYWORD2 NAME(GetStringi)(GLenum name, GLuint index)
    RETURN_DISPATCH(GetStringi, (name, index), (F, "glGetStringi(0x%x, %d);\n", name, index));
 }
 
-KEYWORD1 void KEYWORD2 NAME(TexBuffer)(GLenum target, GLenum internalFormat, GLuint buffer)
-{
-    (void) target; (void) internalFormat; (void) buffer;
-   DISPATCH(TexBuffer, (target, internalFormat, buffer), (F, "glTexBuffer(0x%x, 0x%x, %d);\n", target, internalFormat, buffer));
-}
-
 KEYWORD1 void KEYWORD2 NAME(FramebufferTexture)(GLenum target, GLenum attachment, GLuint texture, GLint level)
 {
     (void) target; (void) attachment; (void) texture; (void) level;
@@ -4740,6 +4734,12 @@ KEYWORD1 void KEYWORD2 NAME(TexBufferARB)(GLenum target, GLenum internalFormat,
    DISPATCH(TexBufferARB, (target, internalFormat, buffer), (F, "glTexBufferARB(0x%x, 0x%x, %d);\n", target, internalFormat, buffer));
 }
 
+KEYWORD1 void KEYWORD2 NAME(TexBuffer)(GLenum target, GLenum internalFormat, GLuint buffer)
+{
+    (void) target; (void) internalFormat; (void) buffer;
+   DISPATCH(TexBufferARB, (target, internalFormat, buffer), (F, "glTexBuffer(0x%x, 0x%x, %d);\n", target, internalFormat, buffer));
+}
+
 KEYWORD1 void KEYWORD2 NAME(BindVertexArray)(GLuint array)
 {
     (void) array;
@@ -5450,65 +5450,65 @@ KEYWORD1 void KEYWORD2 NAME(PolygonOffsetEXT)(GLfloat factor, GLfloat bias)
    DISPATCH(PolygonOffsetEXT, (factor, bias), (F, "glPolygonOffsetEXT(%f, %f);\n", factor, bias));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_698)(GLenum pname, GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_697)(GLenum pname, GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_698)(GLenum pname, GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_697)(GLenum pname, GLfloat * params)
 {
     (void) pname; (void) params;
    DISPATCH(GetPixelTexGenParameterfvSGIS, (pname, params), (F, "glGetPixelTexGenParameterfvSGIS(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_699)(GLenum pname, GLint * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_698)(GLenum pname, GLint * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_699)(GLenum pname, GLint * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_698)(GLenum pname, GLint * params)
 {
     (void) pname; (void) params;
    DISPATCH(GetPixelTexGenParameterivSGIS, (pname, params), (F, "glGetPixelTexGenParameterivSGIS(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_700)(GLenum pname, GLfloat param);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_699)(GLenum pname, GLfloat param);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_700)(GLenum pname, GLfloat param)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_699)(GLenum pname, GLfloat param)
 {
     (void) pname; (void) param;
    DISPATCH(PixelTexGenParameterfSGIS, (pname, param), (F, "glPixelTexGenParameterfSGIS(0x%x, %f);\n", pname, param));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_701)(GLenum pname, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_700)(GLenum pname, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_701)(GLenum pname, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_700)(GLenum pname, const GLfloat * params)
 {
     (void) pname; (void) params;
    DISPATCH(PixelTexGenParameterfvSGIS, (pname, params), (F, "glPixelTexGenParameterfvSGIS(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_702)(GLenum pname, GLint param);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_701)(GLenum pname, GLint param);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_702)(GLenum pname, GLint param)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_701)(GLenum pname, GLint param)
 {
     (void) pname; (void) param;
    DISPATCH(PixelTexGenParameteriSGIS, (pname, param), (F, "glPixelTexGenParameteriSGIS(0x%x, %d);\n", pname, param));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_703)(GLenum pname, const GLint * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_702)(GLenum pname, const GLint * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_703)(GLenum pname, const GLint * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_702)(GLenum pname, const GLint * params)
 {
     (void) pname; (void) params;
    DISPATCH(PixelTexGenParameterivSGIS, (pname, params), (F, "glPixelTexGenParameterivSGIS(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_704)(GLclampf value, GLboolean invert);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_703)(GLclampf value, GLboolean invert);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_704)(GLclampf value, GLboolean invert)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_703)(GLclampf value, GLboolean invert)
 {
     (void) value; (void) invert;
    DISPATCH(SampleMaskSGIS, (value, invert), (F, "glSampleMaskSGIS(%f, %d);\n", value, invert));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_705)(GLenum pattern);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_704)(GLenum pattern);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_705)(GLenum pattern)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_704)(GLenum pattern)
 {
     (void) pattern;
    DISPATCH(SamplePatternSGIS, (pattern), (F, "glSamplePatternSGIS(0x%x);\n", pattern));
@@ -5568,9 +5568,9 @@ KEYWORD1 void KEYWORD2 NAME(PointParameterfEXT)(GLenum pname, GLfloat param)
    DISPATCH(PointParameterfEXT, (pname, param), (F, "glPointParameterfEXT(0x%x, %f);\n", pname, param));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_712)(GLenum pname, GLfloat param);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_711)(GLenum pname, GLfloat param);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_712)(GLenum pname, GLfloat param)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_711)(GLenum pname, GLfloat param)
 {
     (void) pname; (void) param;
    DISPATCH(PointParameterfEXT, (pname, param), (F, "glPointParameterfSGIS(0x%x, %f);\n", pname, param));
@@ -5594,9 +5594,9 @@ KEYWORD1 void KEYWORD2 NAME(PointParameterfvEXT)(GLenum pname, const GLfloat * p
    DISPATCH(PointParameterfvEXT, (pname, params), (F, "glPointParameterfvEXT(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_713)(GLenum pname, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_712)(GLenum pname, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_713)(GLenum pname, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_712)(GLenum pname, const GLfloat * params)
 {
     (void) pname; (void) params;
    DISPATCH(PointParameterfvEXT, (pname, params), (F, "glPointParameterfvSGIS(0x%x, %p);\n", pname, (const void *) params));
@@ -5901,9 +5901,9 @@ KEYWORD1 void KEYWORD2 NAME(FogCoordfvEXT)(const GLfloat * coord)
    DISPATCH(FogCoordfvEXT, (coord), (F, "glFogCoordfvEXT(%p);\n", (const void *) coord));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_740)(GLenum mode);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_739)(GLenum mode);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_740)(GLenum mode)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_739)(GLenum mode)
 {
     (void) mode;
    DISPATCH(PixelTexGenSGIX, (mode), (F, "glPixelTexGenSGIX(0x%x);\n", mode));
@@ -5921,9 +5921,9 @@ KEYWORD1 void KEYWORD2 NAME(BlendFuncSeparateEXT)(GLenum sfactorRGB, GLenum dfac
    DISPATCH(BlendFuncSeparateEXT, (sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha), (F, "glBlendFuncSeparateEXT(0x%x, 0x%x, 0x%x, 0x%x);\n", sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_741)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_740)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_741)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_740)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
 {
     (void) sfactorRGB; (void) dfactorRGB; (void) sfactorAlpha; (void) dfactorAlpha;
    DISPATCH(BlendFuncSeparateEXT, (sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha), (F, "glBlendFuncSeparateINGR(0x%x, 0x%x, 0x%x, 0x%x);\n", sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha));
@@ -6359,73 +6359,73 @@ KEYWORD1 void KEYWORD2 NAME(WindowPos4svMESA)(const GLshort * v)
    DISPATCH(WindowPos4svMESA, (v), (F, "glWindowPos4svMESA(%p);\n", (const void *) v));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_782)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_781)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_782)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_781)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride)
 {
     (void) mode; (void) first; (void) count; (void) primcount; (void) modestride;
    DISPATCH(MultiModeDrawArraysIBM, (mode, first, count, primcount, modestride), (F, "glMultiModeDrawArraysIBM(%p, %p, %p, %d, %d);\n", (const void *) mode, (const void *) first, (const void *) count, primcount, modestride));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_783)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_782)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_783)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_782)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride)
 {
     (void) mode; (void) count; (void) type; (void) indices; (void) primcount; (void) modestride;
    DISPATCH(MultiModeDrawElementsIBM, (mode, count, type, indices, primcount, modestride), (F, "glMultiModeDrawElementsIBM(%p, %p, 0x%x, %p, %d, %d);\n", (const void *) mode, (const void *) count, type, (const void *) indices, primcount, modestride));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_784)(GLsizei n, const GLuint * fences);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_783)(GLsizei n, const GLuint * fences);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_784)(GLsizei n, const GLuint * fences)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_783)(GLsizei n, const GLuint * fences)
 {
     (void) n; (void) fences;
    DISPATCH(DeleteFencesNV, (n, fences), (F, "glDeleteFencesNV(%d, %p);\n", n, (const void *) fences));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_785)(GLuint fence);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_784)(GLuint fence);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_785)(GLuint fence)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_784)(GLuint fence)
 {
     (void) fence;
    DISPATCH(FinishFenceNV, (fence), (F, "glFinishFenceNV(%d);\n", fence));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_786)(GLsizei n, GLuint * fences);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_785)(GLsizei n, GLuint * fences);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_786)(GLsizei n, GLuint * fences)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_785)(GLsizei n, GLuint * fences)
 {
     (void) n; (void) fences;
    DISPATCH(GenFencesNV, (n, fences), (F, "glGenFencesNV(%d, %p);\n", n, (const void *) fences));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_787)(GLuint fence, GLenum pname, GLint * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_786)(GLuint fence, GLenum pname, GLint * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_787)(GLuint fence, GLenum pname, GLint * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_786)(GLuint fence, GLenum pname, GLint * params)
 {
     (void) fence; (void) pname; (void) params;
    DISPATCH(GetFenceivNV, (fence, pname, params), (F, "glGetFenceivNV(%d, 0x%x, %p);\n", fence, pname, (const void *) params));
 }
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_788)(GLuint fence);
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_787)(GLuint fence);
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_788)(GLuint fence)
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_787)(GLuint fence)
 {
     (void) fence;
    RETURN_DISPATCH(IsFenceNV, (fence), (F, "glIsFenceNV(%d);\n", fence));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_789)(GLuint fence, GLenum condition);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_788)(GLuint fence, GLenum condition);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_789)(GLuint fence, GLenum condition)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_788)(GLuint fence, GLenum condition)
 {
     (void) fence; (void) condition;
    DISPATCH(SetFenceNV, (fence, condition), (F, "glSetFenceNV(%d, 0x%x);\n", fence, condition));
 }
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_790)(GLuint fence);
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_789)(GLuint fence);
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_790)(GLuint fence)
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_789)(GLuint fence)
 {
     (void) fence;
    RETURN_DISPATCH(TestFenceNV, (fence), (F, "glTestFenceNV(%d);\n", fence));
@@ -6957,17 +6957,17 @@ KEYWORD1 void KEYWORD2 NAME(PointParameterivNV)(GLenum pname, const GLint * para
    DISPATCH(PointParameterivNV, (pname, params), (F, "glPointParameterivNV(0x%x, %p);\n", pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_871)(GLenum face);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_870)(GLenum face);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_871)(GLenum face)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_870)(GLenum face)
 {
     (void) face;
    DISPATCH(ActiveStencilFaceEXT, (face), (F, "glActiveStencilFaceEXT(0x%x);\n", face));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_872)(GLuint array);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_871)(GLuint array);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_872)(GLuint array)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_871)(GLuint array)
 {
     (void) array;
    DISPATCH(BindVertexArrayAPPLE, (array), (F, "glBindVertexArrayAPPLE(%d);\n", array));
@@ -6979,17 +6979,17 @@ KEYWORD1 void KEYWORD2 NAME(DeleteVertexArrays)(GLsizei n, const GLuint * arrays
    DISPATCH(DeleteVertexArraysAPPLE, (n, arrays), (F, "glDeleteVertexArrays(%d, %p);\n", n, (const void *) arrays));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_873)(GLsizei n, const GLuint * arrays);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_872)(GLsizei n, const GLuint * arrays);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_873)(GLsizei n, const GLuint * arrays)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_872)(GLsizei n, const GLuint * arrays)
 {
     (void) n; (void) arrays;
    DISPATCH(DeleteVertexArraysAPPLE, (n, arrays), (F, "glDeleteVertexArraysAPPLE(%d, %p);\n", n, (const void *) arrays));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_874)(GLsizei n, GLuint * arrays);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_873)(GLsizei n, GLuint * arrays);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_874)(GLsizei n, GLuint * arrays)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_873)(GLsizei n, GLuint * arrays)
 {
     (void) n; (void) arrays;
    DISPATCH(GenVertexArraysAPPLE, (n, arrays), (F, "glGenVertexArraysAPPLE(%d, %p);\n", n, (const void *) arrays));
@@ -7001,9 +7001,9 @@ KEYWORD1 GLboolean KEYWORD2 NAME(IsVertexArray)(GLuint array)
    RETURN_DISPATCH(IsVertexArrayAPPLE, (array), (F, "glIsVertexArray(%d);\n", array));
 }
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_875)(GLuint array);
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_874)(GLuint array);
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_875)(GLuint array)
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_874)(GLuint array)
 {
     (void) array;
    RETURN_DISPATCH(IsVertexArrayAPPLE, (array), (F, "glIsVertexArrayAPPLE(%d);\n", array));
@@ -7062,9 +7062,9 @@ KEYWORD1 void KEYWORD2 NAME(PrimitiveRestartNV)(void)
    DISPATCH(PrimitiveRestartNV, (), (F, "glPrimitiveRestartNV();\n"));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_884)(GLclampd zmin, GLclampd zmax);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_883)(GLclampd zmin, GLclampd zmax);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_884)(GLclampd zmin, GLclampd zmax)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_883)(GLclampd zmin, GLclampd zmax)
 {
     (void) zmin; (void) zmax;
    DISPATCH(DepthBoundsEXT, (zmin, zmax), (F, "glDepthBoundsEXT(%f, %f);\n", zmin, zmax));
@@ -7076,9 +7076,9 @@ KEYWORD1 void KEYWORD2 NAME(BlendEquationSeparate)(GLenum modeRGB, GLenum modeA)
    DISPATCH(BlendEquationSeparateEXT, (modeRGB, modeA), (F, "glBlendEquationSeparate(0x%x, 0x%x);\n", modeRGB, modeA));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_885)(GLenum modeRGB, GLenum modeA);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_884)(GLenum modeRGB, GLenum modeA);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_885)(GLenum modeRGB, GLenum modeA)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_884)(GLenum modeRGB, GLenum modeA)
 {
     (void) modeRGB; (void) modeA;
    DISPATCH(BlendEquationSeparateEXT, (modeRGB, modeA), (F, "glBlendEquationSeparateEXT(0x%x, 0x%x);\n", modeRGB, modeA));
@@ -7294,25 +7294,25 @@ KEYWORD1 void KEYWORD2 NAME(BlitFramebuffer)(GLint srcX0, GLint srcY0, GLint src
    DISPATCH(BlitFramebufferEXT, (srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter), (F, "glBlitFramebuffer(%d, %d, %d, %d, %d, %d, %d, %d, %d, 0x%x);\n", srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_903)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_902)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_903)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_902)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
 {
     (void) srcX0; (void) srcY0; (void) srcX1; (void) srcY1; (void) dstX0; (void) dstY0; (void) dstX1; (void) dstY1; (void) mask; (void) filter;
    DISPATCH(BlitFramebufferEXT, (srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter), (F, "glBlitFramebufferEXT(%d, %d, %d, %d, %d, %d, %d, %d, %d, 0x%x);\n", srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_904)(GLenum target, GLenum pname, GLint param);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_903)(GLenum target, GLenum pname, GLint param);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_904)(GLenum target, GLenum pname, GLint param)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_903)(GLenum target, GLenum pname, GLint param)
 {
     (void) target; (void) pname; (void) param;
    DISPATCH(BufferParameteriAPPLE, (target, pname, param), (F, "glBufferParameteriAPPLE(0x%x, 0x%x, %d);\n", target, pname, param));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_905)(GLenum target, GLintptr offset, GLsizeiptr size);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_904)(GLenum target, GLintptr offset, GLsizeiptr size);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_905)(GLenum target, GLintptr offset, GLsizeiptr size)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_904)(GLenum target, GLintptr offset, GLsizeiptr size)
 {
     (void) target; (void) offset; (void) size;
    DISPATCH(FlushMappedBufferRangeAPPLE, (target, offset, size), (F, "glFlushMappedBufferRangeAPPLE(0x%x, %d, %d);\n", target, offset, size));
@@ -7986,17 +7986,17 @@ KEYWORD1 void KEYWORD2 NAME(ProvokingVertex)(GLenum mode)
    DISPATCH(ProvokingVertexEXT, (mode), (F, "glProvokingVertex(0x%x);\n", mode));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_963)(GLenum target, GLenum pname, GLvoid ** params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_962)(GLenum target, GLenum pname, GLvoid ** params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_963)(GLenum target, GLenum pname, GLvoid ** params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_962)(GLenum target, GLenum pname, GLvoid ** params)
 {
     (void) target; (void) pname; (void) params;
    DISPATCH(GetTexParameterPointervAPPLE, (target, pname, params), (F, "glGetTexParameterPointervAPPLE(0x%x, 0x%x, %p);\n", target, pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_964)(GLenum target, GLsizei length, GLvoid * pointer);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_963)(GLenum target, GLsizei length, GLvoid * pointer);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_964)(GLenum target, GLsizei length, GLvoid * pointer)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_963)(GLenum target, GLsizei length, GLvoid * pointer)
 {
     (void) target; (void) length; (void) pointer;
    DISPATCH(TextureRangeAPPLE, (target, length, pointer), (F, "glTextureRangeAPPLE(0x%x, %d, %p);\n", target, length, (const void *) pointer));
@@ -8043,41 +8043,41 @@ KEYWORD1 void KEYWORD2 NAME(TextureBarrierNV)(void)
    DISPATCH(TextureBarrierNV, (), (F, "glTextureBarrierNV();\n"));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_972)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_971)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_972)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_971)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask)
 {
     (void) frontfunc; (void) backfunc; (void) ref; (void) mask;
    DISPATCH(StencilFuncSeparateATI, (frontfunc, backfunc, ref, mask), (F, "glStencilFuncSeparateATI(0x%x, 0x%x, %d, %d);\n", frontfunc, backfunc, ref, mask));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_973)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_972)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_973)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_972)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
 {
     (void) target; (void) index; (void) count; (void) params;
    DISPATCH(ProgramEnvParameters4fvEXT, (target, index, count, params), (F, "glProgramEnvParameters4fvEXT(0x%x, %d, %d, %p);\n", target, index, count, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_974)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_973)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_974)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_973)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
 {
     (void) target; (void) index; (void) count; (void) params;
    DISPATCH(ProgramLocalParameters4fvEXT, (target, index, count, params), (F, "glProgramLocalParameters4fvEXT(0x%x, %d, %d, %p);\n", target, index, count, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_975)(GLuint id, GLenum pname, GLint64EXT * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_974)(GLuint id, GLenum pname, GLint64EXT * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_975)(GLuint id, GLenum pname, GLint64EXT * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_974)(GLuint id, GLenum pname, GLint64EXT * params)
 {
     (void) id; (void) pname; (void) params;
    DISPATCH(GetQueryObjecti64vEXT, (id, pname, params), (F, "glGetQueryObjecti64vEXT(%d, 0x%x, %p);\n", id, pname, (const void *) params));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_976)(GLuint id, GLenum pname, GLuint64EXT * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_975)(GLuint id, GLenum pname, GLuint64EXT * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_976)(GLuint id, GLenum pname, GLuint64EXT * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_975)(GLuint id, GLenum pname, GLuint64EXT * params)
 {
     (void) id; (void) pname; (void) params;
    DISPATCH(GetQueryObjectui64vEXT, (id, pname, params), (F, "glGetQueryObjectui64vEXT(%d, 0x%x, %p);\n", id, pname, (const void *) params));
@@ -8704,7 +8704,6 @@ _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(ClearBufferiv),
    TABLE_ENTRY(ClearBufferuiv),
    TABLE_ENTRY(GetStringi),
-   TABLE_ENTRY(TexBuffer),
    TABLE_ENTRY(FramebufferTexture),
    TABLE_ENTRY(GetBufferParameteri64v),
    TABLE_ENTRY(GetInteger64i_v),
@@ -8966,6 +8965,7 @@ _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(TextureStorage2DEXT),
    TABLE_ENTRY(TextureStorage3DEXT),
    TABLE_ENTRY(PolygonOffsetEXT),
+   TABLE_ENTRY(_dispatch_stub_697),
    TABLE_ENTRY(_dispatch_stub_698),
    TABLE_ENTRY(_dispatch_stub_699),
    TABLE_ENTRY(_dispatch_stub_700),
@@ -8973,7 +8973,6 @@ _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(_dispatch_stub_702),
    TABLE_ENTRY(_dispatch_stub_703),
    TABLE_ENTRY(_dispatch_stub_704),
-   TABLE_ENTRY(_dispatch_stub_705),
    TABLE_ENTRY(ColorPointerEXT),
    TABLE_ENTRY(EdgeFlagPointerEXT),
    TABLE_ENTRY(IndexPointerEXT),
@@ -9008,7 +9007,7 @@ _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(FogCoorddvEXT),
    TABLE_ENTRY(FogCoordfEXT),
    TABLE_ENTRY(FogCoordfvEXT),
-   TABLE_ENTRY(_dispatch_stub_740),
+   TABLE_ENTRY(_dispatch_stub_739),
    TABLE_ENTRY(BlendFuncSeparateEXT),
    TABLE_ENTRY(FlushVertexArrayRangeNV),
    TABLE_ENTRY(VertexArrayRangeNV),
@@ -9050,6 +9049,7 @@ _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(WindowPos4ivMESA),
    TABLE_ENTRY(WindowPos4sMESA),
    TABLE_ENTRY(WindowPos4svMESA),
+   TABLE_ENTRY(_dispatch_stub_781),
    TABLE_ENTRY(_dispatch_stub_782),
    TABLE_ENTRY(_dispatch_stub_783),
    TABLE_ENTRY(_dispatch_stub_784),
@@ -9058,7 +9058,6 @@ _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(_dispatch_stub_787),
    TABLE_ENTRY(_dispatch_stub_788),
    TABLE_ENTRY(_dispatch_stub_789),
-   TABLE_ENTRY(_dispatch_stub_790),
    TABLE_ENTRY(AreProgramsResidentNV),
    TABLE_ENTRY(BindProgramNV),
    TABLE_ENTRY(DeleteProgramsNV),
@@ -9139,11 +9138,11 @@ _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(SetFragmentShaderConstantATI),
    TABLE_ENTRY(PointParameteriNV),
    TABLE_ENTRY(PointParameterivNV),
+   TABLE_ENTRY(_dispatch_stub_870),
    TABLE_ENTRY(_dispatch_stub_871),
    TABLE_ENTRY(_dispatch_stub_872),
    TABLE_ENTRY(_dispatch_stub_873),
    TABLE_ENTRY(_dispatch_stub_874),
-   TABLE_ENTRY(_dispatch_stub_875),
    TABLE_ENTRY(GetProgramNamedParameterdvNV),
    TABLE_ENTRY(GetProgramNamedParameterfvNV),
    TABLE_ENTRY(ProgramNamedParameter4dNV),
@@ -9152,8 +9151,8 @@ _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(ProgramNamedParameter4fvNV),
    TABLE_ENTRY(PrimitiveRestartIndexNV),
    TABLE_ENTRY(PrimitiveRestartNV),
+   TABLE_ENTRY(_dispatch_stub_883),
    TABLE_ENTRY(_dispatch_stub_884),
-   TABLE_ENTRY(_dispatch_stub_885),
    TABLE_ENTRY(BindFramebufferEXT),
    TABLE_ENTRY(BindRenderbufferEXT),
    TABLE_ENTRY(CheckFramebufferStatusEXT),
@@ -9171,9 +9170,9 @@ _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(IsFramebufferEXT),
    TABLE_ENTRY(IsRenderbufferEXT),
    TABLE_ENTRY(RenderbufferStorageEXT),
+   TABLE_ENTRY(_dispatch_stub_902),
    TABLE_ENTRY(_dispatch_stub_903),
    TABLE_ENTRY(_dispatch_stub_904),
-   TABLE_ENTRY(_dispatch_stub_905),
    TABLE_ENTRY(BindFragDataLocationEXT),
    TABLE_ENTRY(GetFragDataLocationEXT),
    TABLE_ENTRY(GetUniformuivEXT),
@@ -9231,8 +9230,8 @@ _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(GetTransformFeedbackVaryingEXT),
    TABLE_ENTRY(TransformFeedbackVaryingsEXT),
    TABLE_ENTRY(ProvokingVertexEXT),
+   TABLE_ENTRY(_dispatch_stub_962),
    TABLE_ENTRY(_dispatch_stub_963),
-   TABLE_ENTRY(_dispatch_stub_964),
    TABLE_ENTRY(GetObjectParameterivAPPLE),
    TABLE_ENTRY(ObjectPurgeableAPPLE),
    TABLE_ENTRY(ObjectUnpurgeableAPPLE),
@@ -9240,11 +9239,11 @@ _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(CreateShaderProgramEXT),
    TABLE_ENTRY(UseShaderProgramEXT),
    TABLE_ENTRY(TextureBarrierNV),
+   TABLE_ENTRY(_dispatch_stub_971),
    TABLE_ENTRY(_dispatch_stub_972),
    TABLE_ENTRY(_dispatch_stub_973),
    TABLE_ENTRY(_dispatch_stub_974),
    TABLE_ENTRY(_dispatch_stub_975),
-   TABLE_ENTRY(_dispatch_stub_976),
    TABLE_ENTRY(EGLImageTargetRenderbufferStorageOES),
    TABLE_ENTRY(EGLImageTargetTexture2DOES),
    /* A whole bunch of no-op functions.  These might be called
@@ -9550,16 +9549,17 @@ _glapi_proc UNUSED_TABLE_NAME[] = {
    TABLE_ENTRY(DrawElementsInstancedEXT),
    TABLE_ENTRY(DrawElementsInstanced),
    TABLE_ENTRY(RenderbufferStorageMultisampleEXT),
+   TABLE_ENTRY(TexBuffer),
    TABLE_ENTRY(BlendEquationSeparateIndexedAMD),
    TABLE_ENTRY(BlendEquationIndexedAMD),
    TABLE_ENTRY(BlendFuncSeparateIndexedAMD),
    TABLE_ENTRY(BlendFuncIndexedAMD),
    TABLE_ENTRY(PointParameterf),
    TABLE_ENTRY(PointParameterfARB),
-   TABLE_ENTRY(_dispatch_stub_712),
+   TABLE_ENTRY(_dispatch_stub_711),
    TABLE_ENTRY(PointParameterfv),
    TABLE_ENTRY(PointParameterfvARB),
-   TABLE_ENTRY(_dispatch_stub_713),
+   TABLE_ENTRY(_dispatch_stub_712),
    TABLE_ENTRY(SecondaryColor3b),
    TABLE_ENTRY(SecondaryColor3bv),
    TABLE_ENTRY(SecondaryColor3d),
@@ -9585,7 +9585,7 @@ _glapi_proc UNUSED_TABLE_NAME[] = {
    TABLE_ENTRY(FogCoordf),
    TABLE_ENTRY(FogCoordfv),
    TABLE_ENTRY(BlendFuncSeparate),
-   TABLE_ENTRY(_dispatch_stub_741),
+   TABLE_ENTRY(_dispatch_stub_740),
    TABLE_ENTRY(WindowPos2d),
    TABLE_ENTRY(WindowPos2dARB),
    TABLE_ENTRY(WindowPos2dv),
diff --git a/mesalib/src/mapi/glapi/glprocs.h b/mesalib/src/mapi/glapi/glprocs.h
index 10c69c850..09595b57d 100644
--- a/mesalib/src/mapi/glapi/glprocs.h
+++ b/mesalib/src/mapi/glapi/glprocs.h
@@ -488,7 +488,6 @@ static const char gl_string_table[] =
     "glClearBufferiv\0"
     "glClearBufferuiv\0"
     "glGetStringi\0"
-    "glTexBuffer\0"
     "glFramebufferTexture\0"
     "glGetBufferParameteri64v\0"
     "glGetInteger64i_v\0"
@@ -1240,6 +1239,7 @@ static const char gl_string_table[] =
     "glDrawElementsInstancedEXT\0"
     "glDrawElementsInstanced\0"
     "glRenderbufferStorageMultisampleEXT\0"
+    "glTexBuffer\0"
     "glBlendEquationSeparateIndexedAMD\0"
     "glBlendEquationIndexedAMD\0"
     "glBlendFuncSeparateIndexedAMD\0"
@@ -1413,6 +1413,7 @@ static const char gl_string_table[] =
 #define gl_dispatch_stub_364 mgl_dispatch_stub_364
 #define gl_dispatch_stub_365 mgl_dispatch_stub_365
 #define gl_dispatch_stub_366 mgl_dispatch_stub_366
+#define gl_dispatch_stub_697 mgl_dispatch_stub_697
 #define gl_dispatch_stub_698 mgl_dispatch_stub_698
 #define gl_dispatch_stub_699 mgl_dispatch_stub_699
 #define gl_dispatch_stub_700 mgl_dispatch_stub_700
@@ -1420,8 +1421,8 @@ static const char gl_string_table[] =
 #define gl_dispatch_stub_702 mgl_dispatch_stub_702
 #define gl_dispatch_stub_703 mgl_dispatch_stub_703
 #define gl_dispatch_stub_704 mgl_dispatch_stub_704
-#define gl_dispatch_stub_705 mgl_dispatch_stub_705
-#define gl_dispatch_stub_740 mgl_dispatch_stub_740
+#define gl_dispatch_stub_739 mgl_dispatch_stub_739
+#define gl_dispatch_stub_781 mgl_dispatch_stub_781
 #define gl_dispatch_stub_782 mgl_dispatch_stub_782
 #define gl_dispatch_stub_783 mgl_dispatch_stub_783
 #define gl_dispatch_stub_784 mgl_dispatch_stub_784
@@ -1430,24 +1431,23 @@ static const char gl_string_table[] =
 #define gl_dispatch_stub_787 mgl_dispatch_stub_787
 #define gl_dispatch_stub_788 mgl_dispatch_stub_788
 #define gl_dispatch_stub_789 mgl_dispatch_stub_789
-#define gl_dispatch_stub_790 mgl_dispatch_stub_790
+#define gl_dispatch_stub_870 mgl_dispatch_stub_870
 #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_883 mgl_dispatch_stub_883
 #define gl_dispatch_stub_884 mgl_dispatch_stub_884
-#define gl_dispatch_stub_885 mgl_dispatch_stub_885
+#define gl_dispatch_stub_902 mgl_dispatch_stub_902
 #define gl_dispatch_stub_903 mgl_dispatch_stub_903
 #define gl_dispatch_stub_904 mgl_dispatch_stub_904
-#define gl_dispatch_stub_905 mgl_dispatch_stub_905
+#define gl_dispatch_stub_962 mgl_dispatch_stub_962
 #define gl_dispatch_stub_963 mgl_dispatch_stub_963
-#define gl_dispatch_stub_964 mgl_dispatch_stub_964
+#define gl_dispatch_stub_971 mgl_dispatch_stub_971
 #define gl_dispatch_stub_972 mgl_dispatch_stub_972
 #define gl_dispatch_stub_973 mgl_dispatch_stub_973
 #define gl_dispatch_stub_974 mgl_dispatch_stub_974
 #define gl_dispatch_stub_975 mgl_dispatch_stub_975
-#define gl_dispatch_stub_976 mgl_dispatch_stub_976
 #endif /* USE_MGL_NAMESPACE */
 
 
@@ -1465,41 +1465,41 @@ void GLAPIENTRY gl_dispatch_stub_363(GLenum target, GLenum pname, GLint * params
 void GLAPIENTRY gl_dispatch_stub_364(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid * values);
 void GLAPIENTRY gl_dispatch_stub_365(GLenum target, GLenum pname, GLfloat * params);
 void GLAPIENTRY gl_dispatch_stub_366(GLenum target, GLenum pname, GLint * params);
-void GLAPIENTRY gl_dispatch_stub_698(GLenum pname, GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_699(GLenum pname, GLint * params);
-void GLAPIENTRY gl_dispatch_stub_700(GLenum pname, GLfloat param);
-void GLAPIENTRY gl_dispatch_stub_701(GLenum pname, const GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_702(GLenum pname, GLint param);
-void GLAPIENTRY gl_dispatch_stub_703(GLenum pname, const GLint * params);
-void GLAPIENTRY gl_dispatch_stub_704(GLclampf value, GLboolean invert);
-void GLAPIENTRY gl_dispatch_stub_705(GLenum pattern);
-void GLAPIENTRY gl_dispatch_stub_740(GLenum mode);
-void GLAPIENTRY gl_dispatch_stub_782(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
-void GLAPIENTRY gl_dispatch_stub_783(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
-void GLAPIENTRY gl_dispatch_stub_784(GLsizei n, const GLuint * fences);
-void GLAPIENTRY gl_dispatch_stub_785(GLuint fence);
-void GLAPIENTRY gl_dispatch_stub_786(GLsizei n, GLuint * fences);
-void GLAPIENTRY gl_dispatch_stub_787(GLuint fence, GLenum pname, GLint * params);
-GLboolean GLAPIENTRY gl_dispatch_stub_788(GLuint fence);
-void GLAPIENTRY gl_dispatch_stub_789(GLuint fence, GLenum condition);
-GLboolean GLAPIENTRY gl_dispatch_stub_790(GLuint fence);
-void GLAPIENTRY gl_dispatch_stub_871(GLenum face);
-void GLAPIENTRY gl_dispatch_stub_872(GLuint array);
-void GLAPIENTRY gl_dispatch_stub_873(GLsizei n, const GLuint * arrays);
-void GLAPIENTRY gl_dispatch_stub_874(GLsizei n, GLuint * arrays);
-GLboolean GLAPIENTRY gl_dispatch_stub_875(GLuint array);
-void GLAPIENTRY gl_dispatch_stub_884(GLclampd zmin, GLclampd zmax);
-void GLAPIENTRY gl_dispatch_stub_885(GLenum modeRGB, GLenum modeA);
-void GLAPIENTRY gl_dispatch_stub_903(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-void GLAPIENTRY gl_dispatch_stub_904(GLenum target, GLenum pname, GLint param);
-void GLAPIENTRY gl_dispatch_stub_905(GLenum target, GLintptr offset, GLsizeiptr size);
-void GLAPIENTRY gl_dispatch_stub_963(GLenum target, GLenum pname, GLvoid ** params);
-void GLAPIENTRY gl_dispatch_stub_964(GLenum target, GLsizei length, GLvoid * pointer);
-void GLAPIENTRY gl_dispatch_stub_972(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+void GLAPIENTRY gl_dispatch_stub_697(GLenum pname, GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_698(GLenum pname, GLint * params);
+void GLAPIENTRY gl_dispatch_stub_699(GLenum pname, GLfloat param);
+void GLAPIENTRY gl_dispatch_stub_700(GLenum pname, const GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_701(GLenum pname, GLint param);
+void GLAPIENTRY gl_dispatch_stub_702(GLenum pname, const GLint * params);
+void GLAPIENTRY gl_dispatch_stub_703(GLclampf value, GLboolean invert);
+void GLAPIENTRY gl_dispatch_stub_704(GLenum pattern);
+void GLAPIENTRY gl_dispatch_stub_739(GLenum mode);
+void GLAPIENTRY gl_dispatch_stub_781(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
+void GLAPIENTRY gl_dispatch_stub_782(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
+void GLAPIENTRY gl_dispatch_stub_783(GLsizei n, const GLuint * fences);
+void GLAPIENTRY gl_dispatch_stub_784(GLuint fence);
+void GLAPIENTRY gl_dispatch_stub_785(GLsizei n, GLuint * fences);
+void GLAPIENTRY gl_dispatch_stub_786(GLuint fence, GLenum pname, GLint * params);
+GLboolean GLAPIENTRY gl_dispatch_stub_787(GLuint fence);
+void GLAPIENTRY gl_dispatch_stub_788(GLuint fence, GLenum condition);
+GLboolean GLAPIENTRY gl_dispatch_stub_789(GLuint fence);
+void GLAPIENTRY gl_dispatch_stub_870(GLenum face);
+void GLAPIENTRY gl_dispatch_stub_871(GLuint array);
+void GLAPIENTRY gl_dispatch_stub_872(GLsizei n, const GLuint * arrays);
+void GLAPIENTRY gl_dispatch_stub_873(GLsizei n, GLuint * arrays);
+GLboolean GLAPIENTRY gl_dispatch_stub_874(GLuint array);
+void GLAPIENTRY gl_dispatch_stub_883(GLclampd zmin, GLclampd zmax);
+void GLAPIENTRY gl_dispatch_stub_884(GLenum modeRGB, GLenum modeA);
+void GLAPIENTRY gl_dispatch_stub_902(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+void GLAPIENTRY gl_dispatch_stub_903(GLenum target, GLenum pname, GLint param);
+void GLAPIENTRY gl_dispatch_stub_904(GLenum target, GLintptr offset, GLsizeiptr size);
+void GLAPIENTRY gl_dispatch_stub_962(GLenum target, GLenum pname, GLvoid ** params);
+void GLAPIENTRY gl_dispatch_stub_963(GLenum target, GLsizei length, GLvoid * pointer);
+void GLAPIENTRY gl_dispatch_stub_971(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+void GLAPIENTRY gl_dispatch_stub_972(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
 void GLAPIENTRY gl_dispatch_stub_973(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_974(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_975(GLuint id, GLenum pname, GLint64EXT * params);
-void GLAPIENTRY gl_dispatch_stub_976(GLuint id, GLenum pname, GLuint64EXT * params);
+void GLAPIENTRY gl_dispatch_stub_974(GLuint id, GLenum pname, GLint64EXT * params);
+void GLAPIENTRY gl_dispatch_stub_975(GLuint id, GLenum pname, GLuint64EXT * params);
 #endif /* defined(NEED_FUNCTION_POINTER) || defined(GLX_INDIRECT_RENDERING) */
 
 static const glprocs_table_t static_functions[] = {
@@ -1939,914 +1939,914 @@ static const glprocs_table_t static_functions[] = {
     NAME_FUNC_OFFSET( 6208, glClearBufferiv, glClearBufferiv, NULL, 433),
     NAME_FUNC_OFFSET( 6224, glClearBufferuiv, glClearBufferuiv, NULL, 434),
     NAME_FUNC_OFFSET( 6241, glGetStringi, glGetStringi, NULL, 435),
-    NAME_FUNC_OFFSET( 6254, glTexBuffer, glTexBuffer, NULL, 436),
-    NAME_FUNC_OFFSET( 6266, glFramebufferTexture, glFramebufferTexture, NULL, 437),
-    NAME_FUNC_OFFSET( 6287, glGetBufferParameteri64v, glGetBufferParameteri64v, NULL, 438),
-    NAME_FUNC_OFFSET( 6312, glGetInteger64i_v, glGetInteger64i_v, NULL, 439),
-    NAME_FUNC_OFFSET( 6330, glVertexAttribDivisor, glVertexAttribDivisor, NULL, 440),
-    NAME_FUNC_OFFSET( 6352, glLoadTransposeMatrixdARB, glLoadTransposeMatrixdARB, NULL, 441),
-    NAME_FUNC_OFFSET( 6378, glLoadTransposeMatrixfARB, glLoadTransposeMatrixfARB, NULL, 442),
-    NAME_FUNC_OFFSET( 6404, glMultTransposeMatrixdARB, glMultTransposeMatrixdARB, NULL, 443),
-    NAME_FUNC_OFFSET( 6430, glMultTransposeMatrixfARB, glMultTransposeMatrixfARB, NULL, 444),
-    NAME_FUNC_OFFSET( 6456, glSampleCoverageARB, glSampleCoverageARB, NULL, 445),
-    NAME_FUNC_OFFSET( 6476, glCompressedTexImage1DARB, glCompressedTexImage1DARB, NULL, 446),
-    NAME_FUNC_OFFSET( 6502, glCompressedTexImage2DARB, glCompressedTexImage2DARB, NULL, 447),
-    NAME_FUNC_OFFSET( 6528, glCompressedTexImage3DARB, glCompressedTexImage3DARB, NULL, 448),
-    NAME_FUNC_OFFSET( 6554, glCompressedTexSubImage1DARB, glCompressedTexSubImage1DARB, NULL, 449),
-    NAME_FUNC_OFFSET( 6583, glCompressedTexSubImage2DARB, glCompressedTexSubImage2DARB, NULL, 450),
-    NAME_FUNC_OFFSET( 6612, glCompressedTexSubImage3DARB, glCompressedTexSubImage3DARB, NULL, 451),
-    NAME_FUNC_OFFSET( 6641, glGetCompressedTexImageARB, glGetCompressedTexImageARB, NULL, 452),
-    NAME_FUNC_OFFSET( 6668, glDisableVertexAttribArrayARB, glDisableVertexAttribArrayARB, NULL, 453),
-    NAME_FUNC_OFFSET( 6698, glEnableVertexAttribArrayARB, glEnableVertexAttribArrayARB, NULL, 454),
-    NAME_FUNC_OFFSET( 6727, glGetProgramEnvParameterdvARB, glGetProgramEnvParameterdvARB, NULL, 455),
-    NAME_FUNC_OFFSET( 6757, glGetProgramEnvParameterfvARB, glGetProgramEnvParameterfvARB, NULL, 456),
-    NAME_FUNC_OFFSET( 6787, glGetProgramLocalParameterdvARB, glGetProgramLocalParameterdvARB, NULL, 457),
-    NAME_FUNC_OFFSET( 6819, glGetProgramLocalParameterfvARB, glGetProgramLocalParameterfvARB, NULL, 458),
-    NAME_FUNC_OFFSET( 6851, glGetProgramStringARB, glGetProgramStringARB, NULL, 459),
-    NAME_FUNC_OFFSET( 6873, glGetProgramivARB, glGetProgramivARB, NULL, 460),
-    NAME_FUNC_OFFSET( 6891, glGetVertexAttribdvARB, glGetVertexAttribdvARB, NULL, 461),
-    NAME_FUNC_OFFSET( 6914, glGetVertexAttribfvARB, glGetVertexAttribfvARB, NULL, 462),
-    NAME_FUNC_OFFSET( 6937, glGetVertexAttribivARB, glGetVertexAttribivARB, NULL, 463),
-    NAME_FUNC_OFFSET( 6960, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, 464),
-    NAME_FUNC_OFFSET( 6987, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, 465),
-    NAME_FUNC_OFFSET( 7015, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, 466),
-    NAME_FUNC_OFFSET( 7042, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, 467),
-    NAME_FUNC_OFFSET( 7070, glProgramLocalParameter4dARB, glProgramLocalParameter4dARB, NULL, 468),
-    NAME_FUNC_OFFSET( 7099, glProgramLocalParameter4dvARB, glProgramLocalParameter4dvARB, NULL, 469),
-    NAME_FUNC_OFFSET( 7129, glProgramLocalParameter4fARB, glProgramLocalParameter4fARB, NULL, 470),
-    NAME_FUNC_OFFSET( 7158, glProgramLocalParameter4fvARB, glProgramLocalParameter4fvARB, NULL, 471),
-    NAME_FUNC_OFFSET( 7188, glProgramStringARB, glProgramStringARB, NULL, 472),
-    NAME_FUNC_OFFSET( 7207, glVertexAttrib1dARB, glVertexAttrib1dARB, NULL, 473),
-    NAME_FUNC_OFFSET( 7227, glVertexAttrib1dvARB, glVertexAttrib1dvARB, NULL, 474),
-    NAME_FUNC_OFFSET( 7248, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, 475),
-    NAME_FUNC_OFFSET( 7268, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, 476),
-    NAME_FUNC_OFFSET( 7289, glVertexAttrib1sARB, glVertexAttrib1sARB, NULL, 477),
-    NAME_FUNC_OFFSET( 7309, glVertexAttrib1svARB, glVertexAttrib1svARB, NULL, 478),
-    NAME_FUNC_OFFSET( 7330, glVertexAttrib2dARB, glVertexAttrib2dARB, NULL, 479),
-    NAME_FUNC_OFFSET( 7350, glVertexAttrib2dvARB, glVertexAttrib2dvARB, NULL, 480),
-    NAME_FUNC_OFFSET( 7371, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, 481),
-    NAME_FUNC_OFFSET( 7391, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, 482),
-    NAME_FUNC_OFFSET( 7412, glVertexAttrib2sARB, glVertexAttrib2sARB, NULL, 483),
-    NAME_FUNC_OFFSET( 7432, glVertexAttrib2svARB, glVertexAttrib2svARB, NULL, 484),
-    NAME_FUNC_OFFSET( 7453, glVertexAttrib3dARB, glVertexAttrib3dARB, NULL, 485),
-    NAME_FUNC_OFFSET( 7473, glVertexAttrib3dvARB, glVertexAttrib3dvARB, NULL, 486),
-    NAME_FUNC_OFFSET( 7494, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, 487),
-    NAME_FUNC_OFFSET( 7514, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, 488),
-    NAME_FUNC_OFFSET( 7535, glVertexAttrib3sARB, glVertexAttrib3sARB, NULL, 489),
-    NAME_FUNC_OFFSET( 7555, glVertexAttrib3svARB, glVertexAttrib3svARB, NULL, 490),
-    NAME_FUNC_OFFSET( 7576, glVertexAttrib4NbvARB, glVertexAttrib4NbvARB, NULL, 491),
-    NAME_FUNC_OFFSET( 7598, glVertexAttrib4NivARB, glVertexAttrib4NivARB, NULL, 492),
-    NAME_FUNC_OFFSET( 7620, glVertexAttrib4NsvARB, glVertexAttrib4NsvARB, NULL, 493),
-    NAME_FUNC_OFFSET( 7642, glVertexAttrib4NubARB, glVertexAttrib4NubARB, NULL, 494),
-    NAME_FUNC_OFFSET( 7664, glVertexAttrib4NubvARB, glVertexAttrib4NubvARB, NULL, 495),
-    NAME_FUNC_OFFSET( 7687, glVertexAttrib4NuivARB, glVertexAttrib4NuivARB, NULL, 496),
-    NAME_FUNC_OFFSET( 7710, glVertexAttrib4NusvARB, glVertexAttrib4NusvARB, NULL, 497),
-    NAME_FUNC_OFFSET( 7733, glVertexAttrib4bvARB, glVertexAttrib4bvARB, NULL, 498),
-    NAME_FUNC_OFFSET( 7754, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL, 499),
-    NAME_FUNC_OFFSET( 7774, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL, 500),
-    NAME_FUNC_OFFSET( 7795, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, 501),
-    NAME_FUNC_OFFSET( 7815, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, 502),
-    NAME_FUNC_OFFSET( 7836, glVertexAttrib4ivARB, glVertexAttrib4ivARB, NULL, 503),
-    NAME_FUNC_OFFSET( 7857, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL, 504),
-    NAME_FUNC_OFFSET( 7877, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL, 505),
-    NAME_FUNC_OFFSET( 7898, glVertexAttrib4ubvARB, glVertexAttrib4ubvARB, NULL, 506),
-    NAME_FUNC_OFFSET( 7920, glVertexAttrib4uivARB, glVertexAttrib4uivARB, NULL, 507),
-    NAME_FUNC_OFFSET( 7942, glVertexAttrib4usvARB, glVertexAttrib4usvARB, NULL, 508),
-    NAME_FUNC_OFFSET( 7964, glVertexAttribPointerARB, glVertexAttribPointerARB, NULL, 509),
-    NAME_FUNC_OFFSET( 7989, glBindBufferARB, glBindBufferARB, NULL, 510),
-    NAME_FUNC_OFFSET( 8005, glBufferDataARB, glBufferDataARB, NULL, 511),
-    NAME_FUNC_OFFSET( 8021, glBufferSubDataARB, glBufferSubDataARB, NULL, 512),
-    NAME_FUNC_OFFSET( 8040, glDeleteBuffersARB, glDeleteBuffersARB, NULL, 513),
-    NAME_FUNC_OFFSET( 8059, glGenBuffersARB, glGenBuffersARB, NULL, 514),
-    NAME_FUNC_OFFSET( 8075, glGetBufferParameterivARB, glGetBufferParameterivARB, NULL, 515),
-    NAME_FUNC_OFFSET( 8101, glGetBufferPointervARB, glGetBufferPointervARB, NULL, 516),
-    NAME_FUNC_OFFSET( 8124, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL, 517),
-    NAME_FUNC_OFFSET( 8146, glIsBufferARB, glIsBufferARB, NULL, 518),
-    NAME_FUNC_OFFSET( 8160, glMapBufferARB, glMapBufferARB, NULL, 519),
-    NAME_FUNC_OFFSET( 8175, glUnmapBufferARB, glUnmapBufferARB, NULL, 520),
-    NAME_FUNC_OFFSET( 8192, glBeginQueryARB, glBeginQueryARB, NULL, 521),
-    NAME_FUNC_OFFSET( 8208, glDeleteQueriesARB, glDeleteQueriesARB, NULL, 522),
-    NAME_FUNC_OFFSET( 8227, glEndQueryARB, glEndQueryARB, NULL, 523),
-    NAME_FUNC_OFFSET( 8241, glGenQueriesARB, glGenQueriesARB, NULL, 524),
-    NAME_FUNC_OFFSET( 8257, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL, 525),
-    NAME_FUNC_OFFSET( 8279, glGetQueryObjectuivARB, glGetQueryObjectuivARB, NULL, 526),
-    NAME_FUNC_OFFSET( 8302, glGetQueryivARB, glGetQueryivARB, NULL, 527),
-    NAME_FUNC_OFFSET( 8318, glIsQueryARB, glIsQueryARB, NULL, 528),
-    NAME_FUNC_OFFSET( 8331, glAttachObjectARB, glAttachObjectARB, NULL, 529),
-    NAME_FUNC_OFFSET( 8349, glCompileShaderARB, glCompileShaderARB, NULL, 530),
-    NAME_FUNC_OFFSET( 8368, glCreateProgramObjectARB, glCreateProgramObjectARB, NULL, 531),
-    NAME_FUNC_OFFSET( 8393, glCreateShaderObjectARB, glCreateShaderObjectARB, NULL, 532),
-    NAME_FUNC_OFFSET( 8417, glDeleteObjectARB, glDeleteObjectARB, NULL, 533),
-    NAME_FUNC_OFFSET( 8435, glDetachObjectARB, glDetachObjectARB, NULL, 534),
-    NAME_FUNC_OFFSET( 8453, glGetActiveUniformARB, glGetActiveUniformARB, NULL, 535),
-    NAME_FUNC_OFFSET( 8475, glGetAttachedObjectsARB, glGetAttachedObjectsARB, NULL, 536),
-    NAME_FUNC_OFFSET( 8499, glGetHandleARB, glGetHandleARB, NULL, 537),
-    NAME_FUNC_OFFSET( 8514, glGetInfoLogARB, glGetInfoLogARB, NULL, 538),
-    NAME_FUNC_OFFSET( 8530, glGetObjectParameterfvARB, glGetObjectParameterfvARB, NULL, 539),
-    NAME_FUNC_OFFSET( 8556, glGetObjectParameterivARB, glGetObjectParameterivARB, NULL, 540),
-    NAME_FUNC_OFFSET( 8582, glGetShaderSourceARB, glGetShaderSourceARB, NULL, 541),
-    NAME_FUNC_OFFSET( 8603, glGetUniformLocationARB, glGetUniformLocationARB, NULL, 542),
-    NAME_FUNC_OFFSET( 8627, glGetUniformfvARB, glGetUniformfvARB, NULL, 543),
-    NAME_FUNC_OFFSET( 8645, glGetUniformivARB, glGetUniformivARB, NULL, 544),
-    NAME_FUNC_OFFSET( 8663, glLinkProgramARB, glLinkProgramARB, NULL, 545),
-    NAME_FUNC_OFFSET( 8680, glShaderSourceARB, glShaderSourceARB, NULL, 546),
-    NAME_FUNC_OFFSET( 8698, glUniform1fARB, glUniform1fARB, NULL, 547),
-    NAME_FUNC_OFFSET( 8713, glUniform1fvARB, glUniform1fvARB, NULL, 548),
-    NAME_FUNC_OFFSET( 8729, glUniform1iARB, glUniform1iARB, NULL, 549),
-    NAME_FUNC_OFFSET( 8744, glUniform1ivARB, glUniform1ivARB, NULL, 550),
-    NAME_FUNC_OFFSET( 8760, glUniform2fARB, glUniform2fARB, NULL, 551),
-    NAME_FUNC_OFFSET( 8775, glUniform2fvARB, glUniform2fvARB, NULL, 552),
-    NAME_FUNC_OFFSET( 8791, glUniform2iARB, glUniform2iARB, NULL, 553),
-    NAME_FUNC_OFFSET( 8806, glUniform2ivARB, glUniform2ivARB, NULL, 554),
-    NAME_FUNC_OFFSET( 8822, glUniform3fARB, glUniform3fARB, NULL, 555),
-    NAME_FUNC_OFFSET( 8837, glUniform3fvARB, glUniform3fvARB, NULL, 556),
-    NAME_FUNC_OFFSET( 8853, glUniform3iARB, glUniform3iARB, NULL, 557),
-    NAME_FUNC_OFFSET( 8868, glUniform3ivARB, glUniform3ivARB, NULL, 558),
-    NAME_FUNC_OFFSET( 8884, glUniform4fARB, glUniform4fARB, NULL, 559),
-    NAME_FUNC_OFFSET( 8899, glUniform4fvARB, glUniform4fvARB, NULL, 560),
-    NAME_FUNC_OFFSET( 8915, glUniform4iARB, glUniform4iARB, NULL, 561),
-    NAME_FUNC_OFFSET( 8930, glUniform4ivARB, glUniform4ivARB, NULL, 562),
-    NAME_FUNC_OFFSET( 8946, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL, 563),
-    NAME_FUNC_OFFSET( 8968, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL, 564),
-    NAME_FUNC_OFFSET( 8990, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL, 565),
-    NAME_FUNC_OFFSET( 9012, glUseProgramObjectARB, glUseProgramObjectARB, NULL, 566),
-    NAME_FUNC_OFFSET( 9034, glValidateProgramARB, glValidateProgramARB, NULL, 567),
-    NAME_FUNC_OFFSET( 9055, glBindAttribLocationARB, glBindAttribLocationARB, NULL, 568),
-    NAME_FUNC_OFFSET( 9079, glGetActiveAttribARB, glGetActiveAttribARB, NULL, 569),
-    NAME_FUNC_OFFSET( 9100, glGetAttribLocationARB, glGetAttribLocationARB, NULL, 570),
-    NAME_FUNC_OFFSET( 9123, glDrawBuffersARB, glDrawBuffersARB, NULL, 571),
-    NAME_FUNC_OFFSET( 9140, glClampColorARB, glClampColorARB, NULL, 572),
-    NAME_FUNC_OFFSET( 9156, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 573),
-    NAME_FUNC_OFFSET( 9181, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 574),
-    NAME_FUNC_OFFSET( 9208, glRenderbufferStorageMultisample, glRenderbufferStorageMultisample, NULL, 575),
-    NAME_FUNC_OFFSET( 9241, glFramebufferTextureARB, glFramebufferTextureARB, NULL, 576),
-    NAME_FUNC_OFFSET( 9265, glFramebufferTextureFaceARB, glFramebufferTextureFaceARB, NULL, 577),
-    NAME_FUNC_OFFSET( 9293, glProgramParameteriARB, glProgramParameteriARB, NULL, 578),
-    NAME_FUNC_OFFSET( 9316, glVertexAttribDivisorARB, glVertexAttribDivisorARB, NULL, 579),
-    NAME_FUNC_OFFSET( 9341, glFlushMappedBufferRange, glFlushMappedBufferRange, NULL, 580),
-    NAME_FUNC_OFFSET( 9366, glMapBufferRange, glMapBufferRange, NULL, 581),
-    NAME_FUNC_OFFSET( 9383, glTexBufferARB, glTexBufferARB, NULL, 582),
-    NAME_FUNC_OFFSET( 9398, glBindVertexArray, glBindVertexArray, NULL, 583),
-    NAME_FUNC_OFFSET( 9416, glGenVertexArrays, glGenVertexArrays, NULL, 584),
-    NAME_FUNC_OFFSET( 9434, glCopyBufferSubData, glCopyBufferSubData, NULL, 585),
-    NAME_FUNC_OFFSET( 9454, glClientWaitSync, glClientWaitSync, NULL, 586),
-    NAME_FUNC_OFFSET( 9471, glDeleteSync, glDeleteSync, NULL, 587),
-    NAME_FUNC_OFFSET( 9484, glFenceSync, glFenceSync, NULL, 588),
-    NAME_FUNC_OFFSET( 9496, glGetInteger64v, glGetInteger64v, NULL, 589),
-    NAME_FUNC_OFFSET( 9512, glGetSynciv, glGetSynciv, NULL, 590),
-    NAME_FUNC_OFFSET( 9524, glIsSync, glIsSync, NULL, 591),
-    NAME_FUNC_OFFSET( 9533, glWaitSync, glWaitSync, NULL, 592),
-    NAME_FUNC_OFFSET( 9544, glDrawElementsBaseVertex, glDrawElementsBaseVertex, NULL, 593),
-    NAME_FUNC_OFFSET( 9569, glDrawElementsInstancedBaseVertex, glDrawElementsInstancedBaseVertex, NULL, 594),
-    NAME_FUNC_OFFSET( 9603, glDrawRangeElementsBaseVertex, glDrawRangeElementsBaseVertex, NULL, 595),
-    NAME_FUNC_OFFSET( 9633, glMultiDrawElementsBaseVertex, glMultiDrawElementsBaseVertex, NULL, 596),
-    NAME_FUNC_OFFSET( 9663, glBlendEquationSeparateiARB, glBlendEquationSeparateiARB, NULL, 597),
-    NAME_FUNC_OFFSET( 9691, glBlendEquationiARB, glBlendEquationiARB, NULL, 598),
-    NAME_FUNC_OFFSET( 9711, glBlendFuncSeparateiARB, glBlendFuncSeparateiARB, NULL, 599),
-    NAME_FUNC_OFFSET( 9735, glBlendFunciARB, glBlendFunciARB, NULL, 600),
-    NAME_FUNC_OFFSET( 9751, glBindFragDataLocationIndexed, glBindFragDataLocationIndexed, NULL, 601),
-    NAME_FUNC_OFFSET( 9781, glGetFragDataIndex, glGetFragDataIndex, NULL, 602),
-    NAME_FUNC_OFFSET( 9800, glBindSampler, glBindSampler, NULL, 603),
-    NAME_FUNC_OFFSET( 9814, glDeleteSamplers, glDeleteSamplers, NULL, 604),
-    NAME_FUNC_OFFSET( 9831, glGenSamplers, glGenSamplers, NULL, 605),
-    NAME_FUNC_OFFSET( 9845, glGetSamplerParameterIiv, glGetSamplerParameterIiv, NULL, 606),
-    NAME_FUNC_OFFSET( 9870, glGetSamplerParameterIuiv, glGetSamplerParameterIuiv, NULL, 607),
-    NAME_FUNC_OFFSET( 9896, glGetSamplerParameterfv, glGetSamplerParameterfv, NULL, 608),
-    NAME_FUNC_OFFSET( 9920, glGetSamplerParameteriv, glGetSamplerParameteriv, NULL, 609),
-    NAME_FUNC_OFFSET( 9944, glIsSampler, glIsSampler, NULL, 610),
-    NAME_FUNC_OFFSET( 9956, glSamplerParameterIiv, glSamplerParameterIiv, NULL, 611),
-    NAME_FUNC_OFFSET( 9978, glSamplerParameterIuiv, glSamplerParameterIuiv, NULL, 612),
-    NAME_FUNC_OFFSET(10001, glSamplerParameterf, glSamplerParameterf, NULL, 613),
-    NAME_FUNC_OFFSET(10021, glSamplerParameterfv, glSamplerParameterfv, NULL, 614),
-    NAME_FUNC_OFFSET(10042, glSamplerParameteri, glSamplerParameteri, NULL, 615),
-    NAME_FUNC_OFFSET(10062, glSamplerParameteriv, glSamplerParameteriv, NULL, 616),
-    NAME_FUNC_OFFSET(10083, glColorP3ui, glColorP3ui, NULL, 617),
-    NAME_FUNC_OFFSET(10095, glColorP3uiv, glColorP3uiv, NULL, 618),
-    NAME_FUNC_OFFSET(10108, glColorP4ui, glColorP4ui, NULL, 619),
-    NAME_FUNC_OFFSET(10120, glColorP4uiv, glColorP4uiv, NULL, 620),
-    NAME_FUNC_OFFSET(10133, glMultiTexCoordP1ui, glMultiTexCoordP1ui, NULL, 621),
-    NAME_FUNC_OFFSET(10153, glMultiTexCoordP1uiv, glMultiTexCoordP1uiv, NULL, 622),
-    NAME_FUNC_OFFSET(10174, glMultiTexCoordP2ui, glMultiTexCoordP2ui, NULL, 623),
-    NAME_FUNC_OFFSET(10194, glMultiTexCoordP2uiv, glMultiTexCoordP2uiv, NULL, 624),
-    NAME_FUNC_OFFSET(10215, glMultiTexCoordP3ui, glMultiTexCoordP3ui, NULL, 625),
-    NAME_FUNC_OFFSET(10235, glMultiTexCoordP3uiv, glMultiTexCoordP3uiv, NULL, 626),
-    NAME_FUNC_OFFSET(10256, glMultiTexCoordP4ui, glMultiTexCoordP4ui, NULL, 627),
-    NAME_FUNC_OFFSET(10276, glMultiTexCoordP4uiv, glMultiTexCoordP4uiv, NULL, 628),
-    NAME_FUNC_OFFSET(10297, glNormalP3ui, glNormalP3ui, NULL, 629),
-    NAME_FUNC_OFFSET(10310, glNormalP3uiv, glNormalP3uiv, NULL, 630),
-    NAME_FUNC_OFFSET(10324, glSecondaryColorP3ui, glSecondaryColorP3ui, NULL, 631),
-    NAME_FUNC_OFFSET(10345, glSecondaryColorP3uiv, glSecondaryColorP3uiv, NULL, 632),
-    NAME_FUNC_OFFSET(10367, glTexCoordP1ui, glTexCoordP1ui, NULL, 633),
-    NAME_FUNC_OFFSET(10382, glTexCoordP1uiv, glTexCoordP1uiv, NULL, 634),
-    NAME_FUNC_OFFSET(10398, glTexCoordP2ui, glTexCoordP2ui, NULL, 635),
-    NAME_FUNC_OFFSET(10413, glTexCoordP2uiv, glTexCoordP2uiv, NULL, 636),
-    NAME_FUNC_OFFSET(10429, glTexCoordP3ui, glTexCoordP3ui, NULL, 637),
-    NAME_FUNC_OFFSET(10444, glTexCoordP3uiv, glTexCoordP3uiv, NULL, 638),
-    NAME_FUNC_OFFSET(10460, glTexCoordP4ui, glTexCoordP4ui, NULL, 639),
-    NAME_FUNC_OFFSET(10475, glTexCoordP4uiv, glTexCoordP4uiv, NULL, 640),
-    NAME_FUNC_OFFSET(10491, glVertexAttribP1ui, glVertexAttribP1ui, NULL, 641),
-    NAME_FUNC_OFFSET(10510, glVertexAttribP1uiv, glVertexAttribP1uiv, NULL, 642),
-    NAME_FUNC_OFFSET(10530, glVertexAttribP2ui, glVertexAttribP2ui, NULL, 643),
-    NAME_FUNC_OFFSET(10549, glVertexAttribP2uiv, glVertexAttribP2uiv, NULL, 644),
-    NAME_FUNC_OFFSET(10569, glVertexAttribP3ui, glVertexAttribP3ui, NULL, 645),
-    NAME_FUNC_OFFSET(10588, glVertexAttribP3uiv, glVertexAttribP3uiv, NULL, 646),
-    NAME_FUNC_OFFSET(10608, glVertexAttribP4ui, glVertexAttribP4ui, NULL, 647),
-    NAME_FUNC_OFFSET(10627, glVertexAttribP4uiv, glVertexAttribP4uiv, NULL, 648),
-    NAME_FUNC_OFFSET(10647, glVertexP2ui, glVertexP2ui, NULL, 649),
-    NAME_FUNC_OFFSET(10660, glVertexP2uiv, glVertexP2uiv, NULL, 650),
-    NAME_FUNC_OFFSET(10674, glVertexP3ui, glVertexP3ui, NULL, 651),
-    NAME_FUNC_OFFSET(10687, glVertexP3uiv, glVertexP3uiv, NULL, 652),
-    NAME_FUNC_OFFSET(10701, glVertexP4ui, glVertexP4ui, NULL, 653),
-    NAME_FUNC_OFFSET(10714, glVertexP4uiv, glVertexP4uiv, NULL, 654),
-    NAME_FUNC_OFFSET(10728, glBindTransformFeedback, glBindTransformFeedback, NULL, 655),
-    NAME_FUNC_OFFSET(10752, glDeleteTransformFeedbacks, glDeleteTransformFeedbacks, NULL, 656),
-    NAME_FUNC_OFFSET(10779, glDrawTransformFeedback, glDrawTransformFeedback, NULL, 657),
-    NAME_FUNC_OFFSET(10803, glGenTransformFeedbacks, glGenTransformFeedbacks, NULL, 658),
-    NAME_FUNC_OFFSET(10827, glIsTransformFeedback, glIsTransformFeedback, NULL, 659),
-    NAME_FUNC_OFFSET(10849, glPauseTransformFeedback, glPauseTransformFeedback, NULL, 660),
-    NAME_FUNC_OFFSET(10874, glResumeTransformFeedback, glResumeTransformFeedback, NULL, 661),
-    NAME_FUNC_OFFSET(10900, glClearDepthf, glClearDepthf, NULL, 662),
-    NAME_FUNC_OFFSET(10914, glDepthRangef, glDepthRangef, NULL, 663),
-    NAME_FUNC_OFFSET(10928, glGetShaderPrecisionFormat, glGetShaderPrecisionFormat, NULL, 664),
-    NAME_FUNC_OFFSET(10955, glReleaseShaderCompiler, glReleaseShaderCompiler, NULL, 665),
-    NAME_FUNC_OFFSET(10979, glShaderBinary, glShaderBinary, NULL, 666),
-    NAME_FUNC_OFFSET(10994, glDebugMessageCallbackARB, glDebugMessageCallbackARB, NULL, 667),
-    NAME_FUNC_OFFSET(11020, glDebugMessageControlARB, glDebugMessageControlARB, NULL, 668),
-    NAME_FUNC_OFFSET(11045, glDebugMessageInsertARB, glDebugMessageInsertARB, NULL, 669),
-    NAME_FUNC_OFFSET(11069, glGetDebugMessageLogARB, glGetDebugMessageLogARB, NULL, 670),
-    NAME_FUNC_OFFSET(11093, glGetGraphicsResetStatusARB, glGetGraphicsResetStatusARB, NULL, 671),
-    NAME_FUNC_OFFSET(11121, glGetnColorTableARB, glGetnColorTableARB, NULL, 672),
-    NAME_FUNC_OFFSET(11141, glGetnCompressedTexImageARB, glGetnCompressedTexImageARB, NULL, 673),
-    NAME_FUNC_OFFSET(11169, glGetnConvolutionFilterARB, glGetnConvolutionFilterARB, NULL, 674),
-    NAME_FUNC_OFFSET(11196, glGetnHistogramARB, glGetnHistogramARB, NULL, 675),
-    NAME_FUNC_OFFSET(11215, glGetnMapdvARB, glGetnMapdvARB, NULL, 676),
-    NAME_FUNC_OFFSET(11230, glGetnMapfvARB, glGetnMapfvARB, NULL, 677),
-    NAME_FUNC_OFFSET(11245, glGetnMapivARB, glGetnMapivARB, NULL, 678),
-    NAME_FUNC_OFFSET(11260, glGetnMinmaxARB, glGetnMinmaxARB, NULL, 679),
-    NAME_FUNC_OFFSET(11276, glGetnPixelMapfvARB, glGetnPixelMapfvARB, NULL, 680),
-    NAME_FUNC_OFFSET(11296, glGetnPixelMapuivARB, glGetnPixelMapuivARB, NULL, 681),
-    NAME_FUNC_OFFSET(11317, glGetnPixelMapusvARB, glGetnPixelMapusvARB, NULL, 682),
-    NAME_FUNC_OFFSET(11338, glGetnPolygonStippleARB, glGetnPolygonStippleARB, NULL, 683),
-    NAME_FUNC_OFFSET(11362, glGetnSeparableFilterARB, glGetnSeparableFilterARB, NULL, 684),
-    NAME_FUNC_OFFSET(11387, glGetnTexImageARB, glGetnTexImageARB, NULL, 685),
-    NAME_FUNC_OFFSET(11405, glGetnUniformdvARB, glGetnUniformdvARB, NULL, 686),
-    NAME_FUNC_OFFSET(11424, glGetnUniformfvARB, glGetnUniformfvARB, NULL, 687),
-    NAME_FUNC_OFFSET(11443, glGetnUniformivARB, glGetnUniformivARB, NULL, 688),
-    NAME_FUNC_OFFSET(11462, glGetnUniformuivARB, glGetnUniformuivARB, NULL, 689),
-    NAME_FUNC_OFFSET(11482, glReadnPixelsARB, glReadnPixelsARB, NULL, 690),
-    NAME_FUNC_OFFSET(11499, glTexStorage1D, glTexStorage1D, NULL, 691),
-    NAME_FUNC_OFFSET(11514, glTexStorage2D, glTexStorage2D, NULL, 692),
-    NAME_FUNC_OFFSET(11529, glTexStorage3D, glTexStorage3D, NULL, 693),
-    NAME_FUNC_OFFSET(11544, glTextureStorage1DEXT, glTextureStorage1DEXT, NULL, 694),
-    NAME_FUNC_OFFSET(11566, glTextureStorage2DEXT, glTextureStorage2DEXT, NULL, 695),
-    NAME_FUNC_OFFSET(11588, glTextureStorage3DEXT, glTextureStorage3DEXT, NULL, 696),
-    NAME_FUNC_OFFSET(11610, glPolygonOffsetEXT, glPolygonOffsetEXT, NULL, 697),
-    NAME_FUNC_OFFSET(11629, gl_dispatch_stub_698, gl_dispatch_stub_698, NULL, 698),
-    NAME_FUNC_OFFSET(11661, gl_dispatch_stub_699, gl_dispatch_stub_699, NULL, 699),
-    NAME_FUNC_OFFSET(11693, gl_dispatch_stub_700, gl_dispatch_stub_700, NULL, 700),
-    NAME_FUNC_OFFSET(11721, gl_dispatch_stub_701, gl_dispatch_stub_701, NULL, 701),
-    NAME_FUNC_OFFSET(11750, gl_dispatch_stub_702, gl_dispatch_stub_702, NULL, 702),
-    NAME_FUNC_OFFSET(11778, gl_dispatch_stub_703, gl_dispatch_stub_703, NULL, 703),
-    NAME_FUNC_OFFSET(11807, gl_dispatch_stub_704, gl_dispatch_stub_704, NULL, 704),
-    NAME_FUNC_OFFSET(11824, gl_dispatch_stub_705, gl_dispatch_stub_705, NULL, 705),
-    NAME_FUNC_OFFSET(11844, glColorPointerEXT, glColorPointerEXT, NULL, 706),
-    NAME_FUNC_OFFSET(11862, glEdgeFlagPointerEXT, glEdgeFlagPointerEXT, NULL, 707),
-    NAME_FUNC_OFFSET(11883, glIndexPointerEXT, glIndexPointerEXT, NULL, 708),
-    NAME_FUNC_OFFSET(11901, glNormalPointerEXT, glNormalPointerEXT, NULL, 709),
-    NAME_FUNC_OFFSET(11920, glTexCoordPointerEXT, glTexCoordPointerEXT, NULL, 710),
-    NAME_FUNC_OFFSET(11941, glVertexPointerEXT, glVertexPointerEXT, NULL, 711),
-    NAME_FUNC_OFFSET(11960, glPointParameterfEXT, glPointParameterfEXT, NULL, 712),
-    NAME_FUNC_OFFSET(11981, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 713),
-    NAME_FUNC_OFFSET(12003, glLockArraysEXT, glLockArraysEXT, NULL, 714),
-    NAME_FUNC_OFFSET(12019, glUnlockArraysEXT, glUnlockArraysEXT, NULL, 715),
-    NAME_FUNC_OFFSET(12037, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, 716),
-    NAME_FUNC_OFFSET(12059, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, 717),
-    NAME_FUNC_OFFSET(12082, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, 718),
-    NAME_FUNC_OFFSET(12104, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, 719),
-    NAME_FUNC_OFFSET(12127, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, 720),
-    NAME_FUNC_OFFSET(12149, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, 721),
-    NAME_FUNC_OFFSET(12172, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, 722),
-    NAME_FUNC_OFFSET(12194, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, 723),
-    NAME_FUNC_OFFSET(12217, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, 724),
-    NAME_FUNC_OFFSET(12239, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, 725),
-    NAME_FUNC_OFFSET(12262, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, 726),
-    NAME_FUNC_OFFSET(12285, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, 727),
-    NAME_FUNC_OFFSET(12309, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, 728),
-    NAME_FUNC_OFFSET(12332, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, 729),
-    NAME_FUNC_OFFSET(12356, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, 730),
-    NAME_FUNC_OFFSET(12379, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, 731),
-    NAME_FUNC_OFFSET(12403, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, 732),
-    NAME_FUNC_OFFSET(12430, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, 733),
-    NAME_FUNC_OFFSET(12451, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, 734),
-    NAME_FUNC_OFFSET(12474, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, 735),
-    NAME_FUNC_OFFSET(12495, glFogCoorddEXT, glFogCoorddEXT, NULL, 736),
-    NAME_FUNC_OFFSET(12510, glFogCoorddvEXT, glFogCoorddvEXT, NULL, 737),
-    NAME_FUNC_OFFSET(12526, glFogCoordfEXT, glFogCoordfEXT, NULL, 738),
-    NAME_FUNC_OFFSET(12541, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 739),
-    NAME_FUNC_OFFSET(12557, gl_dispatch_stub_740, gl_dispatch_stub_740, NULL, 740),
-    NAME_FUNC_OFFSET(12575, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, 741),
-    NAME_FUNC_OFFSET(12598, glFlushVertexArrayRangeNV, glFlushVertexArrayRangeNV, NULL, 742),
-    NAME_FUNC_OFFSET(12624, glVertexArrayRangeNV, glVertexArrayRangeNV, NULL, 743),
-    NAME_FUNC_OFFSET(12645, glCombinerInputNV, glCombinerInputNV, NULL, 744),
-    NAME_FUNC_OFFSET(12663, glCombinerOutputNV, glCombinerOutputNV, NULL, 745),
-    NAME_FUNC_OFFSET(12682, glCombinerParameterfNV, glCombinerParameterfNV, NULL, 746),
-    NAME_FUNC_OFFSET(12705, glCombinerParameterfvNV, glCombinerParameterfvNV, NULL, 747),
-    NAME_FUNC_OFFSET(12729, glCombinerParameteriNV, glCombinerParameteriNV, NULL, 748),
-    NAME_FUNC_OFFSET(12752, glCombinerParameterivNV, glCombinerParameterivNV, NULL, 749),
-    NAME_FUNC_OFFSET(12776, glFinalCombinerInputNV, glFinalCombinerInputNV, NULL, 750),
-    NAME_FUNC_OFFSET(12799, glGetCombinerInputParameterfvNV, glGetCombinerInputParameterfvNV, NULL, 751),
-    NAME_FUNC_OFFSET(12831, glGetCombinerInputParameterivNV, glGetCombinerInputParameterivNV, NULL, 752),
-    NAME_FUNC_OFFSET(12863, glGetCombinerOutputParameterfvNV, glGetCombinerOutputParameterfvNV, NULL, 753),
-    NAME_FUNC_OFFSET(12896, glGetCombinerOutputParameterivNV, glGetCombinerOutputParameterivNV, NULL, 754),
-    NAME_FUNC_OFFSET(12929, glGetFinalCombinerInputParameterfvNV, glGetFinalCombinerInputParameterfvNV, NULL, 755),
-    NAME_FUNC_OFFSET(12966, glGetFinalCombinerInputParameterivNV, glGetFinalCombinerInputParameterivNV, NULL, 756),
-    NAME_FUNC_OFFSET(13003, glResizeBuffersMESA, glResizeBuffersMESA, NULL, 757),
-    NAME_FUNC_OFFSET(13023, glWindowPos2dMESA, glWindowPos2dMESA, NULL, 758),
-    NAME_FUNC_OFFSET(13041, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, 759),
-    NAME_FUNC_OFFSET(13060, glWindowPos2fMESA, glWindowPos2fMESA, NULL, 760),
-    NAME_FUNC_OFFSET(13078, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, 761),
-    NAME_FUNC_OFFSET(13097, glWindowPos2iMESA, glWindowPos2iMESA, NULL, 762),
-    NAME_FUNC_OFFSET(13115, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, 763),
-    NAME_FUNC_OFFSET(13134, glWindowPos2sMESA, glWindowPos2sMESA, NULL, 764),
-    NAME_FUNC_OFFSET(13152, glWindowPos2svMESA, glWindowPos2svMESA, NULL, 765),
-    NAME_FUNC_OFFSET(13171, glWindowPos3dMESA, glWindowPos3dMESA, NULL, 766),
-    NAME_FUNC_OFFSET(13189, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, 767),
-    NAME_FUNC_OFFSET(13208, glWindowPos3fMESA, glWindowPos3fMESA, NULL, 768),
-    NAME_FUNC_OFFSET(13226, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, 769),
-    NAME_FUNC_OFFSET(13245, glWindowPos3iMESA, glWindowPos3iMESA, NULL, 770),
-    NAME_FUNC_OFFSET(13263, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, 771),
-    NAME_FUNC_OFFSET(13282, glWindowPos3sMESA, glWindowPos3sMESA, NULL, 772),
-    NAME_FUNC_OFFSET(13300, glWindowPos3svMESA, glWindowPos3svMESA, NULL, 773),
-    NAME_FUNC_OFFSET(13319, glWindowPos4dMESA, glWindowPos4dMESA, NULL, 774),
-    NAME_FUNC_OFFSET(13337, glWindowPos4dvMESA, glWindowPos4dvMESA, NULL, 775),
-    NAME_FUNC_OFFSET(13356, glWindowPos4fMESA, glWindowPos4fMESA, NULL, 776),
-    NAME_FUNC_OFFSET(13374, glWindowPos4fvMESA, glWindowPos4fvMESA, NULL, 777),
-    NAME_FUNC_OFFSET(13393, glWindowPos4iMESA, glWindowPos4iMESA, NULL, 778),
-    NAME_FUNC_OFFSET(13411, glWindowPos4ivMESA, glWindowPos4ivMESA, NULL, 779),
-    NAME_FUNC_OFFSET(13430, glWindowPos4sMESA, glWindowPos4sMESA, NULL, 780),
-    NAME_FUNC_OFFSET(13448, glWindowPos4svMESA, glWindowPos4svMESA, NULL, 781),
-    NAME_FUNC_OFFSET(13467, gl_dispatch_stub_782, gl_dispatch_stub_782, NULL, 782),
-    NAME_FUNC_OFFSET(13492, gl_dispatch_stub_783, gl_dispatch_stub_783, NULL, 783),
-    NAME_FUNC_OFFSET(13519, gl_dispatch_stub_784, gl_dispatch_stub_784, NULL, 784),
-    NAME_FUNC_OFFSET(13536, gl_dispatch_stub_785, gl_dispatch_stub_785, NULL, 785),
-    NAME_FUNC_OFFSET(13552, gl_dispatch_stub_786, gl_dispatch_stub_786, NULL, 786),
-    NAME_FUNC_OFFSET(13566, gl_dispatch_stub_787, gl_dispatch_stub_787, NULL, 787),
+    NAME_FUNC_OFFSET( 6254, glFramebufferTexture, glFramebufferTexture, NULL, 436),
+    NAME_FUNC_OFFSET( 6275, glGetBufferParameteri64v, glGetBufferParameteri64v, NULL, 437),
+    NAME_FUNC_OFFSET( 6300, glGetInteger64i_v, glGetInteger64i_v, NULL, 438),
+    NAME_FUNC_OFFSET( 6318, glVertexAttribDivisor, glVertexAttribDivisor, NULL, 439),
+    NAME_FUNC_OFFSET( 6340, glLoadTransposeMatrixdARB, glLoadTransposeMatrixdARB, NULL, 440),
+    NAME_FUNC_OFFSET( 6366, glLoadTransposeMatrixfARB, glLoadTransposeMatrixfARB, NULL, 441),
+    NAME_FUNC_OFFSET( 6392, glMultTransposeMatrixdARB, glMultTransposeMatrixdARB, NULL, 442),
+    NAME_FUNC_OFFSET( 6418, glMultTransposeMatrixfARB, glMultTransposeMatrixfARB, NULL, 443),
+    NAME_FUNC_OFFSET( 6444, glSampleCoverageARB, glSampleCoverageARB, NULL, 444),
+    NAME_FUNC_OFFSET( 6464, glCompressedTexImage1DARB, glCompressedTexImage1DARB, NULL, 445),
+    NAME_FUNC_OFFSET( 6490, glCompressedTexImage2DARB, glCompressedTexImage2DARB, NULL, 446),
+    NAME_FUNC_OFFSET( 6516, glCompressedTexImage3DARB, glCompressedTexImage3DARB, NULL, 447),
+    NAME_FUNC_OFFSET( 6542, glCompressedTexSubImage1DARB, glCompressedTexSubImage1DARB, NULL, 448),
+    NAME_FUNC_OFFSET( 6571, glCompressedTexSubImage2DARB, glCompressedTexSubImage2DARB, NULL, 449),
+    NAME_FUNC_OFFSET( 6600, glCompressedTexSubImage3DARB, glCompressedTexSubImage3DARB, NULL, 450),
+    NAME_FUNC_OFFSET( 6629, glGetCompressedTexImageARB, glGetCompressedTexImageARB, NULL, 451),
+    NAME_FUNC_OFFSET( 6656, glDisableVertexAttribArrayARB, glDisableVertexAttribArrayARB, NULL, 452),
+    NAME_FUNC_OFFSET( 6686, glEnableVertexAttribArrayARB, glEnableVertexAttribArrayARB, NULL, 453),
+    NAME_FUNC_OFFSET( 6715, glGetProgramEnvParameterdvARB, glGetProgramEnvParameterdvARB, NULL, 454),
+    NAME_FUNC_OFFSET( 6745, glGetProgramEnvParameterfvARB, glGetProgramEnvParameterfvARB, NULL, 455),
+    NAME_FUNC_OFFSET( 6775, glGetProgramLocalParameterdvARB, glGetProgramLocalParameterdvARB, NULL, 456),
+    NAME_FUNC_OFFSET( 6807, glGetProgramLocalParameterfvARB, glGetProgramLocalParameterfvARB, NULL, 457),
+    NAME_FUNC_OFFSET( 6839, glGetProgramStringARB, glGetProgramStringARB, NULL, 458),
+    NAME_FUNC_OFFSET( 6861, glGetProgramivARB, glGetProgramivARB, NULL, 459),
+    NAME_FUNC_OFFSET( 6879, glGetVertexAttribdvARB, glGetVertexAttribdvARB, NULL, 460),
+    NAME_FUNC_OFFSET( 6902, glGetVertexAttribfvARB, glGetVertexAttribfvARB, NULL, 461),
+    NAME_FUNC_OFFSET( 6925, glGetVertexAttribivARB, glGetVertexAttribivARB, NULL, 462),
+    NAME_FUNC_OFFSET( 6948, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, 463),
+    NAME_FUNC_OFFSET( 6975, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, 464),
+    NAME_FUNC_OFFSET( 7003, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, 465),
+    NAME_FUNC_OFFSET( 7030, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, 466),
+    NAME_FUNC_OFFSET( 7058, glProgramLocalParameter4dARB, glProgramLocalParameter4dARB, NULL, 467),
+    NAME_FUNC_OFFSET( 7087, glProgramLocalParameter4dvARB, glProgramLocalParameter4dvARB, NULL, 468),
+    NAME_FUNC_OFFSET( 7117, glProgramLocalParameter4fARB, glProgramLocalParameter4fARB, NULL, 469),
+    NAME_FUNC_OFFSET( 7146, glProgramLocalParameter4fvARB, glProgramLocalParameter4fvARB, NULL, 470),
+    NAME_FUNC_OFFSET( 7176, glProgramStringARB, glProgramStringARB, NULL, 471),
+    NAME_FUNC_OFFSET( 7195, glVertexAttrib1dARB, glVertexAttrib1dARB, NULL, 472),
+    NAME_FUNC_OFFSET( 7215, glVertexAttrib1dvARB, glVertexAttrib1dvARB, NULL, 473),
+    NAME_FUNC_OFFSET( 7236, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, 474),
+    NAME_FUNC_OFFSET( 7256, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, 475),
+    NAME_FUNC_OFFSET( 7277, glVertexAttrib1sARB, glVertexAttrib1sARB, NULL, 476),
+    NAME_FUNC_OFFSET( 7297, glVertexAttrib1svARB, glVertexAttrib1svARB, NULL, 477),
+    NAME_FUNC_OFFSET( 7318, glVertexAttrib2dARB, glVertexAttrib2dARB, NULL, 478),
+    NAME_FUNC_OFFSET( 7338, glVertexAttrib2dvARB, glVertexAttrib2dvARB, NULL, 479),
+    NAME_FUNC_OFFSET( 7359, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, 480),
+    NAME_FUNC_OFFSET( 7379, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, 481),
+    NAME_FUNC_OFFSET( 7400, glVertexAttrib2sARB, glVertexAttrib2sARB, NULL, 482),
+    NAME_FUNC_OFFSET( 7420, glVertexAttrib2svARB, glVertexAttrib2svARB, NULL, 483),
+    NAME_FUNC_OFFSET( 7441, glVertexAttrib3dARB, glVertexAttrib3dARB, NULL, 484),
+    NAME_FUNC_OFFSET( 7461, glVertexAttrib3dvARB, glVertexAttrib3dvARB, NULL, 485),
+    NAME_FUNC_OFFSET( 7482, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, 486),
+    NAME_FUNC_OFFSET( 7502, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, 487),
+    NAME_FUNC_OFFSET( 7523, glVertexAttrib3sARB, glVertexAttrib3sARB, NULL, 488),
+    NAME_FUNC_OFFSET( 7543, glVertexAttrib3svARB, glVertexAttrib3svARB, NULL, 489),
+    NAME_FUNC_OFFSET( 7564, glVertexAttrib4NbvARB, glVertexAttrib4NbvARB, NULL, 490),
+    NAME_FUNC_OFFSET( 7586, glVertexAttrib4NivARB, glVertexAttrib4NivARB, NULL, 491),
+    NAME_FUNC_OFFSET( 7608, glVertexAttrib4NsvARB, glVertexAttrib4NsvARB, NULL, 492),
+    NAME_FUNC_OFFSET( 7630, glVertexAttrib4NubARB, glVertexAttrib4NubARB, NULL, 493),
+    NAME_FUNC_OFFSET( 7652, glVertexAttrib4NubvARB, glVertexAttrib4NubvARB, NULL, 494),
+    NAME_FUNC_OFFSET( 7675, glVertexAttrib4NuivARB, glVertexAttrib4NuivARB, NULL, 495),
+    NAME_FUNC_OFFSET( 7698, glVertexAttrib4NusvARB, glVertexAttrib4NusvARB, NULL, 496),
+    NAME_FUNC_OFFSET( 7721, glVertexAttrib4bvARB, glVertexAttrib4bvARB, NULL, 497),
+    NAME_FUNC_OFFSET( 7742, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL, 498),
+    NAME_FUNC_OFFSET( 7762, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL, 499),
+    NAME_FUNC_OFFSET( 7783, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, 500),
+    NAME_FUNC_OFFSET( 7803, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, 501),
+    NAME_FUNC_OFFSET( 7824, glVertexAttrib4ivARB, glVertexAttrib4ivARB, NULL, 502),
+    NAME_FUNC_OFFSET( 7845, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL, 503),
+    NAME_FUNC_OFFSET( 7865, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL, 504),
+    NAME_FUNC_OFFSET( 7886, glVertexAttrib4ubvARB, glVertexAttrib4ubvARB, NULL, 505),
+    NAME_FUNC_OFFSET( 7908, glVertexAttrib4uivARB, glVertexAttrib4uivARB, NULL, 506),
+    NAME_FUNC_OFFSET( 7930, glVertexAttrib4usvARB, glVertexAttrib4usvARB, NULL, 507),
+    NAME_FUNC_OFFSET( 7952, glVertexAttribPointerARB, glVertexAttribPointerARB, NULL, 508),
+    NAME_FUNC_OFFSET( 7977, glBindBufferARB, glBindBufferARB, NULL, 509),
+    NAME_FUNC_OFFSET( 7993, glBufferDataARB, glBufferDataARB, NULL, 510),
+    NAME_FUNC_OFFSET( 8009, glBufferSubDataARB, glBufferSubDataARB, NULL, 511),
+    NAME_FUNC_OFFSET( 8028, glDeleteBuffersARB, glDeleteBuffersARB, NULL, 512),
+    NAME_FUNC_OFFSET( 8047, glGenBuffersARB, glGenBuffersARB, NULL, 513),
+    NAME_FUNC_OFFSET( 8063, glGetBufferParameterivARB, glGetBufferParameterivARB, NULL, 514),
+    NAME_FUNC_OFFSET( 8089, glGetBufferPointervARB, glGetBufferPointervARB, NULL, 515),
+    NAME_FUNC_OFFSET( 8112, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL, 516),
+    NAME_FUNC_OFFSET( 8134, glIsBufferARB, glIsBufferARB, NULL, 517),
+    NAME_FUNC_OFFSET( 8148, glMapBufferARB, glMapBufferARB, NULL, 518),
+    NAME_FUNC_OFFSET( 8163, glUnmapBufferARB, glUnmapBufferARB, NULL, 519),
+    NAME_FUNC_OFFSET( 8180, glBeginQueryARB, glBeginQueryARB, NULL, 520),
+    NAME_FUNC_OFFSET( 8196, glDeleteQueriesARB, glDeleteQueriesARB, NULL, 521),
+    NAME_FUNC_OFFSET( 8215, glEndQueryARB, glEndQueryARB, NULL, 522),
+    NAME_FUNC_OFFSET( 8229, glGenQueriesARB, glGenQueriesARB, NULL, 523),
+    NAME_FUNC_OFFSET( 8245, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL, 524),
+    NAME_FUNC_OFFSET( 8267, glGetQueryObjectuivARB, glGetQueryObjectuivARB, NULL, 525),
+    NAME_FUNC_OFFSET( 8290, glGetQueryivARB, glGetQueryivARB, NULL, 526),
+    NAME_FUNC_OFFSET( 8306, glIsQueryARB, glIsQueryARB, NULL, 527),
+    NAME_FUNC_OFFSET( 8319, glAttachObjectARB, glAttachObjectARB, NULL, 528),
+    NAME_FUNC_OFFSET( 8337, glCompileShaderARB, glCompileShaderARB, NULL, 529),
+    NAME_FUNC_OFFSET( 8356, glCreateProgramObjectARB, glCreateProgramObjectARB, NULL, 530),
+    NAME_FUNC_OFFSET( 8381, glCreateShaderObjectARB, glCreateShaderObjectARB, NULL, 531),
+    NAME_FUNC_OFFSET( 8405, glDeleteObjectARB, glDeleteObjectARB, NULL, 532),
+    NAME_FUNC_OFFSET( 8423, glDetachObjectARB, glDetachObjectARB, NULL, 533),
+    NAME_FUNC_OFFSET( 8441, glGetActiveUniformARB, glGetActiveUniformARB, NULL, 534),
+    NAME_FUNC_OFFSET( 8463, glGetAttachedObjectsARB, glGetAttachedObjectsARB, NULL, 535),
+    NAME_FUNC_OFFSET( 8487, glGetHandleARB, glGetHandleARB, NULL, 536),
+    NAME_FUNC_OFFSET( 8502, glGetInfoLogARB, glGetInfoLogARB, NULL, 537),
+    NAME_FUNC_OFFSET( 8518, glGetObjectParameterfvARB, glGetObjectParameterfvARB, NULL, 538),
+    NAME_FUNC_OFFSET( 8544, glGetObjectParameterivARB, glGetObjectParameterivARB, NULL, 539),
+    NAME_FUNC_OFFSET( 8570, glGetShaderSourceARB, glGetShaderSourceARB, NULL, 540),
+    NAME_FUNC_OFFSET( 8591, glGetUniformLocationARB, glGetUniformLocationARB, NULL, 541),
+    NAME_FUNC_OFFSET( 8615, glGetUniformfvARB, glGetUniformfvARB, NULL, 542),
+    NAME_FUNC_OFFSET( 8633, glGetUniformivARB, glGetUniformivARB, NULL, 543),
+    NAME_FUNC_OFFSET( 8651, glLinkProgramARB, glLinkProgramARB, NULL, 544),
+    NAME_FUNC_OFFSET( 8668, glShaderSourceARB, glShaderSourceARB, NULL, 545),
+    NAME_FUNC_OFFSET( 8686, glUniform1fARB, glUniform1fARB, NULL, 546),
+    NAME_FUNC_OFFSET( 8701, glUniform1fvARB, glUniform1fvARB, NULL, 547),
+    NAME_FUNC_OFFSET( 8717, glUniform1iARB, glUniform1iARB, NULL, 548),
+    NAME_FUNC_OFFSET( 8732, glUniform1ivARB, glUniform1ivARB, NULL, 549),
+    NAME_FUNC_OFFSET( 8748, glUniform2fARB, glUniform2fARB, NULL, 550),
+    NAME_FUNC_OFFSET( 8763, glUniform2fvARB, glUniform2fvARB, NULL, 551),
+    NAME_FUNC_OFFSET( 8779, glUniform2iARB, glUniform2iARB, NULL, 552),
+    NAME_FUNC_OFFSET( 8794, glUniform2ivARB, glUniform2ivARB, NULL, 553),
+    NAME_FUNC_OFFSET( 8810, glUniform3fARB, glUniform3fARB, NULL, 554),
+    NAME_FUNC_OFFSET( 8825, glUniform3fvARB, glUniform3fvARB, NULL, 555),
+    NAME_FUNC_OFFSET( 8841, glUniform3iARB, glUniform3iARB, NULL, 556),
+    NAME_FUNC_OFFSET( 8856, glUniform3ivARB, glUniform3ivARB, NULL, 557),
+    NAME_FUNC_OFFSET( 8872, glUniform4fARB, glUniform4fARB, NULL, 558),
+    NAME_FUNC_OFFSET( 8887, glUniform4fvARB, glUniform4fvARB, NULL, 559),
+    NAME_FUNC_OFFSET( 8903, glUniform4iARB, glUniform4iARB, NULL, 560),
+    NAME_FUNC_OFFSET( 8918, glUniform4ivARB, glUniform4ivARB, NULL, 561),
+    NAME_FUNC_OFFSET( 8934, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL, 562),
+    NAME_FUNC_OFFSET( 8956, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL, 563),
+    NAME_FUNC_OFFSET( 8978, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL, 564),
+    NAME_FUNC_OFFSET( 9000, glUseProgramObjectARB, glUseProgramObjectARB, NULL, 565),
+    NAME_FUNC_OFFSET( 9022, glValidateProgramARB, glValidateProgramARB, NULL, 566),
+    NAME_FUNC_OFFSET( 9043, glBindAttribLocationARB, glBindAttribLocationARB, NULL, 567),
+    NAME_FUNC_OFFSET( 9067, glGetActiveAttribARB, glGetActiveAttribARB, NULL, 568),
+    NAME_FUNC_OFFSET( 9088, glGetAttribLocationARB, glGetAttribLocationARB, NULL, 569),
+    NAME_FUNC_OFFSET( 9111, glDrawBuffersARB, glDrawBuffersARB, NULL, 570),
+    NAME_FUNC_OFFSET( 9128, glClampColorARB, glClampColorARB, NULL, 571),
+    NAME_FUNC_OFFSET( 9144, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 572),
+    NAME_FUNC_OFFSET( 9169, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 573),
+    NAME_FUNC_OFFSET( 9196, glRenderbufferStorageMultisample, glRenderbufferStorageMultisample, NULL, 574),
+    NAME_FUNC_OFFSET( 9229, glFramebufferTextureARB, glFramebufferTextureARB, NULL, 575),
+    NAME_FUNC_OFFSET( 9253, glFramebufferTextureFaceARB, glFramebufferTextureFaceARB, NULL, 576),
+    NAME_FUNC_OFFSET( 9281, glProgramParameteriARB, glProgramParameteriARB, NULL, 577),
+    NAME_FUNC_OFFSET( 9304, glVertexAttribDivisorARB, glVertexAttribDivisorARB, NULL, 578),
+    NAME_FUNC_OFFSET( 9329, glFlushMappedBufferRange, glFlushMappedBufferRange, NULL, 579),
+    NAME_FUNC_OFFSET( 9354, glMapBufferRange, glMapBufferRange, NULL, 580),
+    NAME_FUNC_OFFSET( 9371, glTexBufferARB, glTexBufferARB, NULL, 581),
+    NAME_FUNC_OFFSET( 9386, glBindVertexArray, glBindVertexArray, NULL, 582),
+    NAME_FUNC_OFFSET( 9404, glGenVertexArrays, glGenVertexArrays, NULL, 583),
+    NAME_FUNC_OFFSET( 9422, glCopyBufferSubData, glCopyBufferSubData, NULL, 584),
+    NAME_FUNC_OFFSET( 9442, glClientWaitSync, glClientWaitSync, NULL, 585),
+    NAME_FUNC_OFFSET( 9459, glDeleteSync, glDeleteSync, NULL, 586),
+    NAME_FUNC_OFFSET( 9472, glFenceSync, glFenceSync, NULL, 587),
+    NAME_FUNC_OFFSET( 9484, glGetInteger64v, glGetInteger64v, NULL, 588),
+    NAME_FUNC_OFFSET( 9500, glGetSynciv, glGetSynciv, NULL, 589),
+    NAME_FUNC_OFFSET( 9512, glIsSync, glIsSync, NULL, 590),
+    NAME_FUNC_OFFSET( 9521, glWaitSync, glWaitSync, NULL, 591),
+    NAME_FUNC_OFFSET( 9532, glDrawElementsBaseVertex, glDrawElementsBaseVertex, NULL, 592),
+    NAME_FUNC_OFFSET( 9557, glDrawElementsInstancedBaseVertex, glDrawElementsInstancedBaseVertex, NULL, 593),
+    NAME_FUNC_OFFSET( 9591, glDrawRangeElementsBaseVertex, glDrawRangeElementsBaseVertex, NULL, 594),
+    NAME_FUNC_OFFSET( 9621, glMultiDrawElementsBaseVertex, glMultiDrawElementsBaseVertex, NULL, 595),
+    NAME_FUNC_OFFSET( 9651, glBlendEquationSeparateiARB, glBlendEquationSeparateiARB, NULL, 596),
+    NAME_FUNC_OFFSET( 9679, glBlendEquationiARB, glBlendEquationiARB, NULL, 597),
+    NAME_FUNC_OFFSET( 9699, glBlendFuncSeparateiARB, glBlendFuncSeparateiARB, NULL, 598),
+    NAME_FUNC_OFFSET( 9723, glBlendFunciARB, glBlendFunciARB, NULL, 599),
+    NAME_FUNC_OFFSET( 9739, glBindFragDataLocationIndexed, glBindFragDataLocationIndexed, NULL, 600),
+    NAME_FUNC_OFFSET( 9769, glGetFragDataIndex, glGetFragDataIndex, NULL, 601),
+    NAME_FUNC_OFFSET( 9788, glBindSampler, glBindSampler, NULL, 602),
+    NAME_FUNC_OFFSET( 9802, glDeleteSamplers, glDeleteSamplers, NULL, 603),
+    NAME_FUNC_OFFSET( 9819, glGenSamplers, glGenSamplers, NULL, 604),
+    NAME_FUNC_OFFSET( 9833, glGetSamplerParameterIiv, glGetSamplerParameterIiv, NULL, 605),
+    NAME_FUNC_OFFSET( 9858, glGetSamplerParameterIuiv, glGetSamplerParameterIuiv, NULL, 606),
+    NAME_FUNC_OFFSET( 9884, glGetSamplerParameterfv, glGetSamplerParameterfv, NULL, 607),
+    NAME_FUNC_OFFSET( 9908, glGetSamplerParameteriv, glGetSamplerParameteriv, NULL, 608),
+    NAME_FUNC_OFFSET( 9932, glIsSampler, glIsSampler, NULL, 609),
+    NAME_FUNC_OFFSET( 9944, glSamplerParameterIiv, glSamplerParameterIiv, NULL, 610),
+    NAME_FUNC_OFFSET( 9966, glSamplerParameterIuiv, glSamplerParameterIuiv, NULL, 611),
+    NAME_FUNC_OFFSET( 9989, glSamplerParameterf, glSamplerParameterf, NULL, 612),
+    NAME_FUNC_OFFSET(10009, glSamplerParameterfv, glSamplerParameterfv, NULL, 613),
+    NAME_FUNC_OFFSET(10030, glSamplerParameteri, glSamplerParameteri, NULL, 614),
+    NAME_FUNC_OFFSET(10050, glSamplerParameteriv, glSamplerParameteriv, NULL, 615),
+    NAME_FUNC_OFFSET(10071, glColorP3ui, glColorP3ui, NULL, 616),
+    NAME_FUNC_OFFSET(10083, glColorP3uiv, glColorP3uiv, NULL, 617),
+    NAME_FUNC_OFFSET(10096, glColorP4ui, glColorP4ui, NULL, 618),
+    NAME_FUNC_OFFSET(10108, glColorP4uiv, glColorP4uiv, NULL, 619),
+    NAME_FUNC_OFFSET(10121, glMultiTexCoordP1ui, glMultiTexCoordP1ui, NULL, 620),
+    NAME_FUNC_OFFSET(10141, glMultiTexCoordP1uiv, glMultiTexCoordP1uiv, NULL, 621),
+    NAME_FUNC_OFFSET(10162, glMultiTexCoordP2ui, glMultiTexCoordP2ui, NULL, 622),
+    NAME_FUNC_OFFSET(10182, glMultiTexCoordP2uiv, glMultiTexCoordP2uiv, NULL, 623),
+    NAME_FUNC_OFFSET(10203, glMultiTexCoordP3ui, glMultiTexCoordP3ui, NULL, 624),
+    NAME_FUNC_OFFSET(10223, glMultiTexCoordP3uiv, glMultiTexCoordP3uiv, NULL, 625),
+    NAME_FUNC_OFFSET(10244, glMultiTexCoordP4ui, glMultiTexCoordP4ui, NULL, 626),
+    NAME_FUNC_OFFSET(10264, glMultiTexCoordP4uiv, glMultiTexCoordP4uiv, NULL, 627),
+    NAME_FUNC_OFFSET(10285, glNormalP3ui, glNormalP3ui, NULL, 628),
+    NAME_FUNC_OFFSET(10298, glNormalP3uiv, glNormalP3uiv, NULL, 629),
+    NAME_FUNC_OFFSET(10312, glSecondaryColorP3ui, glSecondaryColorP3ui, NULL, 630),
+    NAME_FUNC_OFFSET(10333, glSecondaryColorP3uiv, glSecondaryColorP3uiv, NULL, 631),
+    NAME_FUNC_OFFSET(10355, glTexCoordP1ui, glTexCoordP1ui, NULL, 632),
+    NAME_FUNC_OFFSET(10370, glTexCoordP1uiv, glTexCoordP1uiv, NULL, 633),
+    NAME_FUNC_OFFSET(10386, glTexCoordP2ui, glTexCoordP2ui, NULL, 634),
+    NAME_FUNC_OFFSET(10401, glTexCoordP2uiv, glTexCoordP2uiv, NULL, 635),
+    NAME_FUNC_OFFSET(10417, glTexCoordP3ui, glTexCoordP3ui, NULL, 636),
+    NAME_FUNC_OFFSET(10432, glTexCoordP3uiv, glTexCoordP3uiv, NULL, 637),
+    NAME_FUNC_OFFSET(10448, glTexCoordP4ui, glTexCoordP4ui, NULL, 638),
+    NAME_FUNC_OFFSET(10463, glTexCoordP4uiv, glTexCoordP4uiv, NULL, 639),
+    NAME_FUNC_OFFSET(10479, glVertexAttribP1ui, glVertexAttribP1ui, NULL, 640),
+    NAME_FUNC_OFFSET(10498, glVertexAttribP1uiv, glVertexAttribP1uiv, NULL, 641),
+    NAME_FUNC_OFFSET(10518, glVertexAttribP2ui, glVertexAttribP2ui, NULL, 642),
+    NAME_FUNC_OFFSET(10537, glVertexAttribP2uiv, glVertexAttribP2uiv, NULL, 643),
+    NAME_FUNC_OFFSET(10557, glVertexAttribP3ui, glVertexAttribP3ui, NULL, 644),
+    NAME_FUNC_OFFSET(10576, glVertexAttribP3uiv, glVertexAttribP3uiv, NULL, 645),
+    NAME_FUNC_OFFSET(10596, glVertexAttribP4ui, glVertexAttribP4ui, NULL, 646),
+    NAME_FUNC_OFFSET(10615, glVertexAttribP4uiv, glVertexAttribP4uiv, NULL, 647),
+    NAME_FUNC_OFFSET(10635, glVertexP2ui, glVertexP2ui, NULL, 648),
+    NAME_FUNC_OFFSET(10648, glVertexP2uiv, glVertexP2uiv, NULL, 649),
+    NAME_FUNC_OFFSET(10662, glVertexP3ui, glVertexP3ui, NULL, 650),
+    NAME_FUNC_OFFSET(10675, glVertexP3uiv, glVertexP3uiv, NULL, 651),
+    NAME_FUNC_OFFSET(10689, glVertexP4ui, glVertexP4ui, NULL, 652),
+    NAME_FUNC_OFFSET(10702, glVertexP4uiv, glVertexP4uiv, NULL, 653),
+    NAME_FUNC_OFFSET(10716, glBindTransformFeedback, glBindTransformFeedback, NULL, 654),
+    NAME_FUNC_OFFSET(10740, glDeleteTransformFeedbacks, glDeleteTransformFeedbacks, NULL, 655),
+    NAME_FUNC_OFFSET(10767, glDrawTransformFeedback, glDrawTransformFeedback, NULL, 656),
+    NAME_FUNC_OFFSET(10791, glGenTransformFeedbacks, glGenTransformFeedbacks, NULL, 657),
+    NAME_FUNC_OFFSET(10815, glIsTransformFeedback, glIsTransformFeedback, NULL, 658),
+    NAME_FUNC_OFFSET(10837, glPauseTransformFeedback, glPauseTransformFeedback, NULL, 659),
+    NAME_FUNC_OFFSET(10862, glResumeTransformFeedback, glResumeTransformFeedback, NULL, 660),
+    NAME_FUNC_OFFSET(10888, glClearDepthf, glClearDepthf, NULL, 661),
+    NAME_FUNC_OFFSET(10902, glDepthRangef, glDepthRangef, NULL, 662),
+    NAME_FUNC_OFFSET(10916, glGetShaderPrecisionFormat, glGetShaderPrecisionFormat, NULL, 663),
+    NAME_FUNC_OFFSET(10943, glReleaseShaderCompiler, glReleaseShaderCompiler, NULL, 664),
+    NAME_FUNC_OFFSET(10967, glShaderBinary, glShaderBinary, NULL, 665),
+    NAME_FUNC_OFFSET(10982, glDebugMessageCallbackARB, glDebugMessageCallbackARB, NULL, 666),
+    NAME_FUNC_OFFSET(11008, glDebugMessageControlARB, glDebugMessageControlARB, NULL, 667),
+    NAME_FUNC_OFFSET(11033, glDebugMessageInsertARB, glDebugMessageInsertARB, NULL, 668),
+    NAME_FUNC_OFFSET(11057, glGetDebugMessageLogARB, glGetDebugMessageLogARB, NULL, 669),
+    NAME_FUNC_OFFSET(11081, glGetGraphicsResetStatusARB, glGetGraphicsResetStatusARB, NULL, 670),
+    NAME_FUNC_OFFSET(11109, glGetnColorTableARB, glGetnColorTableARB, NULL, 671),
+    NAME_FUNC_OFFSET(11129, glGetnCompressedTexImageARB, glGetnCompressedTexImageARB, NULL, 672),
+    NAME_FUNC_OFFSET(11157, glGetnConvolutionFilterARB, glGetnConvolutionFilterARB, NULL, 673),
+    NAME_FUNC_OFFSET(11184, glGetnHistogramARB, glGetnHistogramARB, NULL, 674),
+    NAME_FUNC_OFFSET(11203, glGetnMapdvARB, glGetnMapdvARB, NULL, 675),
+    NAME_FUNC_OFFSET(11218, glGetnMapfvARB, glGetnMapfvARB, NULL, 676),
+    NAME_FUNC_OFFSET(11233, glGetnMapivARB, glGetnMapivARB, NULL, 677),
+    NAME_FUNC_OFFSET(11248, glGetnMinmaxARB, glGetnMinmaxARB, NULL, 678),
+    NAME_FUNC_OFFSET(11264, glGetnPixelMapfvARB, glGetnPixelMapfvARB, NULL, 679),
+    NAME_FUNC_OFFSET(11284, glGetnPixelMapuivARB, glGetnPixelMapuivARB, NULL, 680),
+    NAME_FUNC_OFFSET(11305, glGetnPixelMapusvARB, glGetnPixelMapusvARB, NULL, 681),
+    NAME_FUNC_OFFSET(11326, glGetnPolygonStippleARB, glGetnPolygonStippleARB, NULL, 682),
+    NAME_FUNC_OFFSET(11350, glGetnSeparableFilterARB, glGetnSeparableFilterARB, NULL, 683),
+    NAME_FUNC_OFFSET(11375, glGetnTexImageARB, glGetnTexImageARB, NULL, 684),
+    NAME_FUNC_OFFSET(11393, glGetnUniformdvARB, glGetnUniformdvARB, NULL, 685),
+    NAME_FUNC_OFFSET(11412, glGetnUniformfvARB, glGetnUniformfvARB, NULL, 686),
+    NAME_FUNC_OFFSET(11431, glGetnUniformivARB, glGetnUniformivARB, NULL, 687),
+    NAME_FUNC_OFFSET(11450, glGetnUniformuivARB, glGetnUniformuivARB, NULL, 688),
+    NAME_FUNC_OFFSET(11470, glReadnPixelsARB, glReadnPixelsARB, NULL, 689),
+    NAME_FUNC_OFFSET(11487, glTexStorage1D, glTexStorage1D, NULL, 690),
+    NAME_FUNC_OFFSET(11502, glTexStorage2D, glTexStorage2D, NULL, 691),
+    NAME_FUNC_OFFSET(11517, glTexStorage3D, glTexStorage3D, NULL, 692),
+    NAME_FUNC_OFFSET(11532, glTextureStorage1DEXT, glTextureStorage1DEXT, NULL, 693),
+    NAME_FUNC_OFFSET(11554, glTextureStorage2DEXT, glTextureStorage2DEXT, NULL, 694),
+    NAME_FUNC_OFFSET(11576, glTextureStorage3DEXT, glTextureStorage3DEXT, NULL, 695),
+    NAME_FUNC_OFFSET(11598, glPolygonOffsetEXT, glPolygonOffsetEXT, NULL, 696),
+    NAME_FUNC_OFFSET(11617, gl_dispatch_stub_697, gl_dispatch_stub_697, NULL, 697),
+    NAME_FUNC_OFFSET(11649, gl_dispatch_stub_698, gl_dispatch_stub_698, NULL, 698),
+    NAME_FUNC_OFFSET(11681, gl_dispatch_stub_699, gl_dispatch_stub_699, NULL, 699),
+    NAME_FUNC_OFFSET(11709, gl_dispatch_stub_700, gl_dispatch_stub_700, NULL, 700),
+    NAME_FUNC_OFFSET(11738, gl_dispatch_stub_701, gl_dispatch_stub_701, NULL, 701),
+    NAME_FUNC_OFFSET(11766, gl_dispatch_stub_702, gl_dispatch_stub_702, NULL, 702),
+    NAME_FUNC_OFFSET(11795, gl_dispatch_stub_703, gl_dispatch_stub_703, NULL, 703),
+    NAME_FUNC_OFFSET(11812, gl_dispatch_stub_704, gl_dispatch_stub_704, NULL, 704),
+    NAME_FUNC_OFFSET(11832, glColorPointerEXT, glColorPointerEXT, NULL, 705),
+    NAME_FUNC_OFFSET(11850, glEdgeFlagPointerEXT, glEdgeFlagPointerEXT, NULL, 706),
+    NAME_FUNC_OFFSET(11871, glIndexPointerEXT, glIndexPointerEXT, NULL, 707),
+    NAME_FUNC_OFFSET(11889, glNormalPointerEXT, glNormalPointerEXT, NULL, 708),
+    NAME_FUNC_OFFSET(11908, glTexCoordPointerEXT, glTexCoordPointerEXT, NULL, 709),
+    NAME_FUNC_OFFSET(11929, glVertexPointerEXT, glVertexPointerEXT, NULL, 710),
+    NAME_FUNC_OFFSET(11948, glPointParameterfEXT, glPointParameterfEXT, NULL, 711),
+    NAME_FUNC_OFFSET(11969, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 712),
+    NAME_FUNC_OFFSET(11991, glLockArraysEXT, glLockArraysEXT, NULL, 713),
+    NAME_FUNC_OFFSET(12007, glUnlockArraysEXT, glUnlockArraysEXT, NULL, 714),
+    NAME_FUNC_OFFSET(12025, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, 715),
+    NAME_FUNC_OFFSET(12047, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, 716),
+    NAME_FUNC_OFFSET(12070, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, 717),
+    NAME_FUNC_OFFSET(12092, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, 718),
+    NAME_FUNC_OFFSET(12115, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, 719),
+    NAME_FUNC_OFFSET(12137, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, 720),
+    NAME_FUNC_OFFSET(12160, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, 721),
+    NAME_FUNC_OFFSET(12182, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, 722),
+    NAME_FUNC_OFFSET(12205, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, 723),
+    NAME_FUNC_OFFSET(12227, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, 724),
+    NAME_FUNC_OFFSET(12250, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, 725),
+    NAME_FUNC_OFFSET(12273, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, 726),
+    NAME_FUNC_OFFSET(12297, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, 727),
+    NAME_FUNC_OFFSET(12320, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, 728),
+    NAME_FUNC_OFFSET(12344, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, 729),
+    NAME_FUNC_OFFSET(12367, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, 730),
+    NAME_FUNC_OFFSET(12391, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, 731),
+    NAME_FUNC_OFFSET(12418, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, 732),
+    NAME_FUNC_OFFSET(12439, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, 733),
+    NAME_FUNC_OFFSET(12462, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, 734),
+    NAME_FUNC_OFFSET(12483, glFogCoorddEXT, glFogCoorddEXT, NULL, 735),
+    NAME_FUNC_OFFSET(12498, glFogCoorddvEXT, glFogCoorddvEXT, NULL, 736),
+    NAME_FUNC_OFFSET(12514, glFogCoordfEXT, glFogCoordfEXT, NULL, 737),
+    NAME_FUNC_OFFSET(12529, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 738),
+    NAME_FUNC_OFFSET(12545, gl_dispatch_stub_739, gl_dispatch_stub_739, NULL, 739),
+    NAME_FUNC_OFFSET(12563, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, 740),
+    NAME_FUNC_OFFSET(12586, glFlushVertexArrayRangeNV, glFlushVertexArrayRangeNV, NULL, 741),
+    NAME_FUNC_OFFSET(12612, glVertexArrayRangeNV, glVertexArrayRangeNV, NULL, 742),
+    NAME_FUNC_OFFSET(12633, glCombinerInputNV, glCombinerInputNV, NULL, 743),
+    NAME_FUNC_OFFSET(12651, glCombinerOutputNV, glCombinerOutputNV, NULL, 744),
+    NAME_FUNC_OFFSET(12670, glCombinerParameterfNV, glCombinerParameterfNV, NULL, 745),
+    NAME_FUNC_OFFSET(12693, glCombinerParameterfvNV, glCombinerParameterfvNV, NULL, 746),
+    NAME_FUNC_OFFSET(12717, glCombinerParameteriNV, glCombinerParameteriNV, NULL, 747),
+    NAME_FUNC_OFFSET(12740, glCombinerParameterivNV, glCombinerParameterivNV, NULL, 748),
+    NAME_FUNC_OFFSET(12764, glFinalCombinerInputNV, glFinalCombinerInputNV, NULL, 749),
+    NAME_FUNC_OFFSET(12787, glGetCombinerInputParameterfvNV, glGetCombinerInputParameterfvNV, NULL, 750),
+    NAME_FUNC_OFFSET(12819, glGetCombinerInputParameterivNV, glGetCombinerInputParameterivNV, NULL, 751),
+    NAME_FUNC_OFFSET(12851, glGetCombinerOutputParameterfvNV, glGetCombinerOutputParameterfvNV, NULL, 752),
+    NAME_FUNC_OFFSET(12884, glGetCombinerOutputParameterivNV, glGetCombinerOutputParameterivNV, NULL, 753),
+    NAME_FUNC_OFFSET(12917, glGetFinalCombinerInputParameterfvNV, glGetFinalCombinerInputParameterfvNV, NULL, 754),
+    NAME_FUNC_OFFSET(12954, glGetFinalCombinerInputParameterivNV, glGetFinalCombinerInputParameterivNV, NULL, 755),
+    NAME_FUNC_OFFSET(12991, glResizeBuffersMESA, glResizeBuffersMESA, NULL, 756),
+    NAME_FUNC_OFFSET(13011, glWindowPos2dMESA, glWindowPos2dMESA, NULL, 757),
+    NAME_FUNC_OFFSET(13029, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, 758),
+    NAME_FUNC_OFFSET(13048, glWindowPos2fMESA, glWindowPos2fMESA, NULL, 759),
+    NAME_FUNC_OFFSET(13066, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, 760),
+    NAME_FUNC_OFFSET(13085, glWindowPos2iMESA, glWindowPos2iMESA, NULL, 761),
+    NAME_FUNC_OFFSET(13103, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, 762),
+    NAME_FUNC_OFFSET(13122, glWindowPos2sMESA, glWindowPos2sMESA, NULL, 763),
+    NAME_FUNC_OFFSET(13140, glWindowPos2svMESA, glWindowPos2svMESA, NULL, 764),
+    NAME_FUNC_OFFSET(13159, glWindowPos3dMESA, glWindowPos3dMESA, NULL, 765),
+    NAME_FUNC_OFFSET(13177, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, 766),
+    NAME_FUNC_OFFSET(13196, glWindowPos3fMESA, glWindowPos3fMESA, NULL, 767),
+    NAME_FUNC_OFFSET(13214, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, 768),
+    NAME_FUNC_OFFSET(13233, glWindowPos3iMESA, glWindowPos3iMESA, NULL, 769),
+    NAME_FUNC_OFFSET(13251, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, 770),
+    NAME_FUNC_OFFSET(13270, glWindowPos3sMESA, glWindowPos3sMESA, NULL, 771),
+    NAME_FUNC_OFFSET(13288, glWindowPos3svMESA, glWindowPos3svMESA, NULL, 772),
+    NAME_FUNC_OFFSET(13307, glWindowPos4dMESA, glWindowPos4dMESA, NULL, 773),
+    NAME_FUNC_OFFSET(13325, glWindowPos4dvMESA, glWindowPos4dvMESA, NULL, 774),
+    NAME_FUNC_OFFSET(13344, glWindowPos4fMESA, glWindowPos4fMESA, NULL, 775),
+    NAME_FUNC_OFFSET(13362, glWindowPos4fvMESA, glWindowPos4fvMESA, NULL, 776),
+    NAME_FUNC_OFFSET(13381, glWindowPos4iMESA, glWindowPos4iMESA, NULL, 777),
+    NAME_FUNC_OFFSET(13399, glWindowPos4ivMESA, glWindowPos4ivMESA, NULL, 778),
+    NAME_FUNC_OFFSET(13418, glWindowPos4sMESA, glWindowPos4sMESA, NULL, 779),
+    NAME_FUNC_OFFSET(13436, glWindowPos4svMESA, glWindowPos4svMESA, NULL, 780),
+    NAME_FUNC_OFFSET(13455, gl_dispatch_stub_781, gl_dispatch_stub_781, NULL, 781),
+    NAME_FUNC_OFFSET(13480, gl_dispatch_stub_782, gl_dispatch_stub_782, NULL, 782),
+    NAME_FUNC_OFFSET(13507, gl_dispatch_stub_783, gl_dispatch_stub_783, NULL, 783),
+    NAME_FUNC_OFFSET(13524, gl_dispatch_stub_784, gl_dispatch_stub_784, NULL, 784),
+    NAME_FUNC_OFFSET(13540, gl_dispatch_stub_785, gl_dispatch_stub_785, NULL, 785),
+    NAME_FUNC_OFFSET(13554, gl_dispatch_stub_786, gl_dispatch_stub_786, NULL, 786),
+    NAME_FUNC_OFFSET(13569, gl_dispatch_stub_787, gl_dispatch_stub_787, NULL, 787),
     NAME_FUNC_OFFSET(13581, gl_dispatch_stub_788, gl_dispatch_stub_788, NULL, 788),
-    NAME_FUNC_OFFSET(13593, gl_dispatch_stub_789, gl_dispatch_stub_789, NULL, 789),
-    NAME_FUNC_OFFSET(13606, gl_dispatch_stub_790, gl_dispatch_stub_790, NULL, 790),
-    NAME_FUNC_OFFSET(13620, glAreProgramsResidentNV, glAreProgramsResidentNV, NULL, 791),
-    NAME_FUNC_OFFSET(13644, glBindProgramNV, glBindProgramNV, NULL, 792),
-    NAME_FUNC_OFFSET(13660, glDeleteProgramsNV, glDeleteProgramsNV, NULL, 793),
-    NAME_FUNC_OFFSET(13679, glExecuteProgramNV, glExecuteProgramNV, NULL, 794),
-    NAME_FUNC_OFFSET(13698, glGenProgramsNV, glGenProgramsNV, NULL, 795),
-    NAME_FUNC_OFFSET(13714, glGetProgramParameterdvNV, glGetProgramParameterdvNV, NULL, 796),
-    NAME_FUNC_OFFSET(13740, glGetProgramParameterfvNV, glGetProgramParameterfvNV, NULL, 797),
-    NAME_FUNC_OFFSET(13766, glGetProgramStringNV, glGetProgramStringNV, NULL, 798),
-    NAME_FUNC_OFFSET(13787, glGetProgramivNV, glGetProgramivNV, NULL, 799),
-    NAME_FUNC_OFFSET(13804, glGetTrackMatrixivNV, glGetTrackMatrixivNV, NULL, 800),
-    NAME_FUNC_OFFSET(13825, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, 801),
-    NAME_FUNC_OFFSET(13853, glGetVertexAttribdvNV, glGetVertexAttribdvNV, NULL, 802),
-    NAME_FUNC_OFFSET(13875, glGetVertexAttribfvNV, glGetVertexAttribfvNV, NULL, 803),
-    NAME_FUNC_OFFSET(13897, glGetVertexAttribivNV, glGetVertexAttribivNV, NULL, 804),
-    NAME_FUNC_OFFSET(13919, glIsProgramNV, glIsProgramNV, NULL, 805),
-    NAME_FUNC_OFFSET(13933, glLoadProgramNV, glLoadProgramNV, NULL, 806),
-    NAME_FUNC_OFFSET(13949, glProgramParameters4dvNV, glProgramParameters4dvNV, NULL, 807),
-    NAME_FUNC_OFFSET(13974, glProgramParameters4fvNV, glProgramParameters4fvNV, NULL, 808),
-    NAME_FUNC_OFFSET(13999, glRequestResidentProgramsNV, glRequestResidentProgramsNV, NULL, 809),
-    NAME_FUNC_OFFSET(14027, glTrackMatrixNV, glTrackMatrixNV, NULL, 810),
-    NAME_FUNC_OFFSET(14043, glVertexAttrib1dNV, glVertexAttrib1dNV, NULL, 811),
-    NAME_FUNC_OFFSET(14062, glVertexAttrib1dvNV, glVertexAttrib1dvNV, NULL, 812),
-    NAME_FUNC_OFFSET(14082, glVertexAttrib1fNV, glVertexAttrib1fNV, NULL, 813),
-    NAME_FUNC_OFFSET(14101, glVertexAttrib1fvNV, glVertexAttrib1fvNV, NULL, 814),
-    NAME_FUNC_OFFSET(14121, glVertexAttrib1sNV, glVertexAttrib1sNV, NULL, 815),
-    NAME_FUNC_OFFSET(14140, glVertexAttrib1svNV, glVertexAttrib1svNV, NULL, 816),
-    NAME_FUNC_OFFSET(14160, glVertexAttrib2dNV, glVertexAttrib2dNV, NULL, 817),
-    NAME_FUNC_OFFSET(14179, glVertexAttrib2dvNV, glVertexAttrib2dvNV, NULL, 818),
-    NAME_FUNC_OFFSET(14199, glVertexAttrib2fNV, glVertexAttrib2fNV, NULL, 819),
-    NAME_FUNC_OFFSET(14218, glVertexAttrib2fvNV, glVertexAttrib2fvNV, NULL, 820),
-    NAME_FUNC_OFFSET(14238, glVertexAttrib2sNV, glVertexAttrib2sNV, NULL, 821),
-    NAME_FUNC_OFFSET(14257, glVertexAttrib2svNV, glVertexAttrib2svNV, NULL, 822),
-    NAME_FUNC_OFFSET(14277, glVertexAttrib3dNV, glVertexAttrib3dNV, NULL, 823),
-    NAME_FUNC_OFFSET(14296, glVertexAttrib3dvNV, glVertexAttrib3dvNV, NULL, 824),
-    NAME_FUNC_OFFSET(14316, glVertexAttrib3fNV, glVertexAttrib3fNV, NULL, 825),
-    NAME_FUNC_OFFSET(14335, glVertexAttrib3fvNV, glVertexAttrib3fvNV, NULL, 826),
-    NAME_FUNC_OFFSET(14355, glVertexAttrib3sNV, glVertexAttrib3sNV, NULL, 827),
-    NAME_FUNC_OFFSET(14374, glVertexAttrib3svNV, glVertexAttrib3svNV, NULL, 828),
-    NAME_FUNC_OFFSET(14394, glVertexAttrib4dNV, glVertexAttrib4dNV, NULL, 829),
-    NAME_FUNC_OFFSET(14413, glVertexAttrib4dvNV, glVertexAttrib4dvNV, NULL, 830),
-    NAME_FUNC_OFFSET(14433, glVertexAttrib4fNV, glVertexAttrib4fNV, NULL, 831),
-    NAME_FUNC_OFFSET(14452, glVertexAttrib4fvNV, glVertexAttrib4fvNV, NULL, 832),
-    NAME_FUNC_OFFSET(14472, glVertexAttrib4sNV, glVertexAttrib4sNV, NULL, 833),
-    NAME_FUNC_OFFSET(14491, glVertexAttrib4svNV, glVertexAttrib4svNV, NULL, 834),
-    NAME_FUNC_OFFSET(14511, glVertexAttrib4ubNV, glVertexAttrib4ubNV, NULL, 835),
-    NAME_FUNC_OFFSET(14531, glVertexAttrib4ubvNV, glVertexAttrib4ubvNV, NULL, 836),
-    NAME_FUNC_OFFSET(14552, glVertexAttribPointerNV, glVertexAttribPointerNV, NULL, 837),
-    NAME_FUNC_OFFSET(14576, glVertexAttribs1dvNV, glVertexAttribs1dvNV, NULL, 838),
-    NAME_FUNC_OFFSET(14597, glVertexAttribs1fvNV, glVertexAttribs1fvNV, NULL, 839),
-    NAME_FUNC_OFFSET(14618, glVertexAttribs1svNV, glVertexAttribs1svNV, NULL, 840),
-    NAME_FUNC_OFFSET(14639, glVertexAttribs2dvNV, glVertexAttribs2dvNV, NULL, 841),
-    NAME_FUNC_OFFSET(14660, glVertexAttribs2fvNV, glVertexAttribs2fvNV, NULL, 842),
-    NAME_FUNC_OFFSET(14681, glVertexAttribs2svNV, glVertexAttribs2svNV, NULL, 843),
-    NAME_FUNC_OFFSET(14702, glVertexAttribs3dvNV, glVertexAttribs3dvNV, NULL, 844),
-    NAME_FUNC_OFFSET(14723, glVertexAttribs3fvNV, glVertexAttribs3fvNV, NULL, 845),
-    NAME_FUNC_OFFSET(14744, glVertexAttribs3svNV, glVertexAttribs3svNV, NULL, 846),
-    NAME_FUNC_OFFSET(14765, glVertexAttribs4dvNV, glVertexAttribs4dvNV, NULL, 847),
-    NAME_FUNC_OFFSET(14786, glVertexAttribs4fvNV, glVertexAttribs4fvNV, NULL, 848),
-    NAME_FUNC_OFFSET(14807, glVertexAttribs4svNV, glVertexAttribs4svNV, NULL, 849),
-    NAME_FUNC_OFFSET(14828, glVertexAttribs4ubvNV, glVertexAttribs4ubvNV, NULL, 850),
-    NAME_FUNC_OFFSET(14850, glGetTexBumpParameterfvATI, glGetTexBumpParameterfvATI, NULL, 851),
-    NAME_FUNC_OFFSET(14877, glGetTexBumpParameterivATI, glGetTexBumpParameterivATI, NULL, 852),
-    NAME_FUNC_OFFSET(14904, glTexBumpParameterfvATI, glTexBumpParameterfvATI, NULL, 853),
-    NAME_FUNC_OFFSET(14928, glTexBumpParameterivATI, glTexBumpParameterivATI, NULL, 854),
-    NAME_FUNC_OFFSET(14952, glAlphaFragmentOp1ATI, glAlphaFragmentOp1ATI, NULL, 855),
-    NAME_FUNC_OFFSET(14974, glAlphaFragmentOp2ATI, glAlphaFragmentOp2ATI, NULL, 856),
-    NAME_FUNC_OFFSET(14996, glAlphaFragmentOp3ATI, glAlphaFragmentOp3ATI, NULL, 857),
-    NAME_FUNC_OFFSET(15018, glBeginFragmentShaderATI, glBeginFragmentShaderATI, NULL, 858),
-    NAME_FUNC_OFFSET(15043, glBindFragmentShaderATI, glBindFragmentShaderATI, NULL, 859),
-    NAME_FUNC_OFFSET(15067, glColorFragmentOp1ATI, glColorFragmentOp1ATI, NULL, 860),
-    NAME_FUNC_OFFSET(15089, glColorFragmentOp2ATI, glColorFragmentOp2ATI, NULL, 861),
-    NAME_FUNC_OFFSET(15111, glColorFragmentOp3ATI, glColorFragmentOp3ATI, NULL, 862),
-    NAME_FUNC_OFFSET(15133, glDeleteFragmentShaderATI, glDeleteFragmentShaderATI, NULL, 863),
-    NAME_FUNC_OFFSET(15159, glEndFragmentShaderATI, glEndFragmentShaderATI, NULL, 864),
-    NAME_FUNC_OFFSET(15182, glGenFragmentShadersATI, glGenFragmentShadersATI, NULL, 865),
-    NAME_FUNC_OFFSET(15206, glPassTexCoordATI, glPassTexCoordATI, NULL, 866),
-    NAME_FUNC_OFFSET(15224, glSampleMapATI, glSampleMapATI, NULL, 867),
-    NAME_FUNC_OFFSET(15239, glSetFragmentShaderConstantATI, glSetFragmentShaderConstantATI, NULL, 868),
-    NAME_FUNC_OFFSET(15270, glPointParameteriNV, glPointParameteriNV, NULL, 869),
-    NAME_FUNC_OFFSET(15290, glPointParameterivNV, glPointParameterivNV, NULL, 870),
-    NAME_FUNC_OFFSET(15311, gl_dispatch_stub_871, gl_dispatch_stub_871, NULL, 871),
-    NAME_FUNC_OFFSET(15334, gl_dispatch_stub_872, gl_dispatch_stub_872, NULL, 872),
-    NAME_FUNC_OFFSET(15357, gl_dispatch_stub_873, gl_dispatch_stub_873, NULL, 873),
-    NAME_FUNC_OFFSET(15383, gl_dispatch_stub_874, gl_dispatch_stub_874, NULL, 874),
-    NAME_FUNC_OFFSET(15406, gl_dispatch_stub_875, gl_dispatch_stub_875, NULL, 875),
-    NAME_FUNC_OFFSET(15427, glGetProgramNamedParameterdvNV, glGetProgramNamedParameterdvNV, NULL, 876),
-    NAME_FUNC_OFFSET(15458, glGetProgramNamedParameterfvNV, glGetProgramNamedParameterfvNV, NULL, 877),
-    NAME_FUNC_OFFSET(15489, glProgramNamedParameter4dNV, glProgramNamedParameter4dNV, NULL, 878),
-    NAME_FUNC_OFFSET(15517, glProgramNamedParameter4dvNV, glProgramNamedParameter4dvNV, NULL, 879),
-    NAME_FUNC_OFFSET(15546, glProgramNamedParameter4fNV, glProgramNamedParameter4fNV, NULL, 880),
-    NAME_FUNC_OFFSET(15574, glProgramNamedParameter4fvNV, glProgramNamedParameter4fvNV, NULL, 881),
-    NAME_FUNC_OFFSET(15603, glPrimitiveRestartIndexNV, glPrimitiveRestartIndexNV, NULL, 882),
-    NAME_FUNC_OFFSET(15629, glPrimitiveRestartNV, glPrimitiveRestartNV, NULL, 883),
-    NAME_FUNC_OFFSET(15650, gl_dispatch_stub_884, gl_dispatch_stub_884, NULL, 884),
-    NAME_FUNC_OFFSET(15667, gl_dispatch_stub_885, gl_dispatch_stub_885, NULL, 885),
-    NAME_FUNC_OFFSET(15694, glBindFramebufferEXT, glBindFramebufferEXT, NULL, 886),
-    NAME_FUNC_OFFSET(15715, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, 887),
-    NAME_FUNC_OFFSET(15737, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, 888),
-    NAME_FUNC_OFFSET(15765, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, 889),
-    NAME_FUNC_OFFSET(15789, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, 890),
-    NAME_FUNC_OFFSET(15814, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, 891),
-    NAME_FUNC_OFFSET(15843, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, 892),
-    NAME_FUNC_OFFSET(15869, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, 893),
-    NAME_FUNC_OFFSET(15895, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, 894),
-    NAME_FUNC_OFFSET(15921, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, 895),
-    NAME_FUNC_OFFSET(15942, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, 896),
-    NAME_FUNC_OFFSET(15964, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, 897),
-    NAME_FUNC_OFFSET(15984, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, 898),
-    NAME_FUNC_OFFSET(16025, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, 899),
-    NAME_FUNC_OFFSET(16057, glIsFramebufferEXT, glIsFramebufferEXT, NULL, 900),
-    NAME_FUNC_OFFSET(16076, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, 901),
-    NAME_FUNC_OFFSET(16096, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, 902),
-    NAME_FUNC_OFFSET(16121, gl_dispatch_stub_903, gl_dispatch_stub_903, NULL, 903),
-    NAME_FUNC_OFFSET(16142, gl_dispatch_stub_904, gl_dispatch_stub_904, NULL, 904),
-    NAME_FUNC_OFFSET(16166, gl_dispatch_stub_905, gl_dispatch_stub_905, NULL, 905),
-    NAME_FUNC_OFFSET(16196, glBindFragDataLocationEXT, glBindFragDataLocationEXT, NULL, 906),
-    NAME_FUNC_OFFSET(16222, glGetFragDataLocationEXT, glGetFragDataLocationEXT, NULL, 907),
-    NAME_FUNC_OFFSET(16247, glGetUniformuivEXT, glGetUniformuivEXT, NULL, 908),
-    NAME_FUNC_OFFSET(16266, glGetVertexAttribIivEXT, glGetVertexAttribIivEXT, NULL, 909),
-    NAME_FUNC_OFFSET(16290, glGetVertexAttribIuivEXT, glGetVertexAttribIuivEXT, NULL, 910),
-    NAME_FUNC_OFFSET(16315, glUniform1uiEXT, glUniform1uiEXT, NULL, 911),
-    NAME_FUNC_OFFSET(16331, glUniform1uivEXT, glUniform1uivEXT, NULL, 912),
-    NAME_FUNC_OFFSET(16348, glUniform2uiEXT, glUniform2uiEXT, NULL, 913),
-    NAME_FUNC_OFFSET(16364, glUniform2uivEXT, glUniform2uivEXT, NULL, 914),
-    NAME_FUNC_OFFSET(16381, glUniform3uiEXT, glUniform3uiEXT, NULL, 915),
-    NAME_FUNC_OFFSET(16397, glUniform3uivEXT, glUniform3uivEXT, NULL, 916),
-    NAME_FUNC_OFFSET(16414, glUniform4uiEXT, glUniform4uiEXT, NULL, 917),
-    NAME_FUNC_OFFSET(16430, glUniform4uivEXT, glUniform4uivEXT, NULL, 918),
-    NAME_FUNC_OFFSET(16447, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL, 919),
-    NAME_FUNC_OFFSET(16468, glVertexAttribI1ivEXT, glVertexAttribI1ivEXT, NULL, 920),
-    NAME_FUNC_OFFSET(16490, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL, 921),
-    NAME_FUNC_OFFSET(16512, glVertexAttribI1uivEXT, glVertexAttribI1uivEXT, NULL, 922),
-    NAME_FUNC_OFFSET(16535, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL, 923),
-    NAME_FUNC_OFFSET(16556, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL, 924),
-    NAME_FUNC_OFFSET(16578, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL, 925),
-    NAME_FUNC_OFFSET(16600, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT, NULL, 926),
-    NAME_FUNC_OFFSET(16623, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL, 927),
-    NAME_FUNC_OFFSET(16644, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL, 928),
-    NAME_FUNC_OFFSET(16666, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL, 929),
-    NAME_FUNC_OFFSET(16688, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT, NULL, 930),
-    NAME_FUNC_OFFSET(16711, glVertexAttribI4bvEXT, glVertexAttribI4bvEXT, NULL, 931),
-    NAME_FUNC_OFFSET(16733, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL, 932),
-    NAME_FUNC_OFFSET(16754, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL, 933),
-    NAME_FUNC_OFFSET(16776, glVertexAttribI4svEXT, glVertexAttribI4svEXT, NULL, 934),
-    NAME_FUNC_OFFSET(16798, glVertexAttribI4ubvEXT, glVertexAttribI4ubvEXT, NULL, 935),
-    NAME_FUNC_OFFSET(16821, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL, 936),
-    NAME_FUNC_OFFSET(16843, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT, NULL, 937),
-    NAME_FUNC_OFFSET(16866, glVertexAttribI4usvEXT, glVertexAttribI4usvEXT, NULL, 938),
-    NAME_FUNC_OFFSET(16889, glVertexAttribIPointerEXT, glVertexAttribIPointerEXT, NULL, 939),
-    NAME_FUNC_OFFSET(16915, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, 940),
-    NAME_FUNC_OFFSET(16944, glColorMaskIndexedEXT, glColorMaskIndexedEXT, NULL, 941),
-    NAME_FUNC_OFFSET(16966, glDisableIndexedEXT, glDisableIndexedEXT, NULL, 942),
-    NAME_FUNC_OFFSET(16986, glEnableIndexedEXT, glEnableIndexedEXT, NULL, 943),
-    NAME_FUNC_OFFSET(17005, glGetBooleanIndexedvEXT, glGetBooleanIndexedvEXT, NULL, 944),
-    NAME_FUNC_OFFSET(17029, glGetIntegerIndexedvEXT, glGetIntegerIndexedvEXT, NULL, 945),
-    NAME_FUNC_OFFSET(17053, glIsEnabledIndexedEXT, glIsEnabledIndexedEXT, NULL, 946),
-    NAME_FUNC_OFFSET(17075, glClearColorIiEXT, glClearColorIiEXT, NULL, 947),
-    NAME_FUNC_OFFSET(17093, glClearColorIuiEXT, glClearColorIuiEXT, NULL, 948),
-    NAME_FUNC_OFFSET(17112, glGetTexParameterIivEXT, glGetTexParameterIivEXT, NULL, 949),
-    NAME_FUNC_OFFSET(17136, glGetTexParameterIuivEXT, glGetTexParameterIuivEXT, NULL, 950),
-    NAME_FUNC_OFFSET(17161, glTexParameterIivEXT, glTexParameterIivEXT, NULL, 951),
-    NAME_FUNC_OFFSET(17182, glTexParameterIuivEXT, glTexParameterIuivEXT, NULL, 952),
-    NAME_FUNC_OFFSET(17204, glBeginConditionalRenderNV, glBeginConditionalRenderNV, NULL, 953),
-    NAME_FUNC_OFFSET(17231, glEndConditionalRenderNV, glEndConditionalRenderNV, NULL, 954),
-    NAME_FUNC_OFFSET(17256, glBeginTransformFeedbackEXT, glBeginTransformFeedbackEXT, NULL, 955),
-    NAME_FUNC_OFFSET(17284, glBindBufferBaseEXT, glBindBufferBaseEXT, NULL, 956),
-    NAME_FUNC_OFFSET(17304, glBindBufferOffsetEXT, glBindBufferOffsetEXT, NULL, 957),
-    NAME_FUNC_OFFSET(17326, glBindBufferRangeEXT, glBindBufferRangeEXT, NULL, 958),
-    NAME_FUNC_OFFSET(17347, glEndTransformFeedbackEXT, glEndTransformFeedbackEXT, NULL, 959),
-    NAME_FUNC_OFFSET(17373, glGetTransformFeedbackVaryingEXT, glGetTransformFeedbackVaryingEXT, NULL, 960),
-    NAME_FUNC_OFFSET(17406, glTransformFeedbackVaryingsEXT, glTransformFeedbackVaryingsEXT, NULL, 961),
-    NAME_FUNC_OFFSET(17437, glProvokingVertexEXT, glProvokingVertexEXT, NULL, 962),
-    NAME_FUNC_OFFSET(17458, gl_dispatch_stub_963, gl_dispatch_stub_963, NULL, 963),
-    NAME_FUNC_OFFSET(17489, gl_dispatch_stub_964, gl_dispatch_stub_964, NULL, 964),
-    NAME_FUNC_OFFSET(17509, glGetObjectParameterivAPPLE, glGetObjectParameterivAPPLE, NULL, 965),
-    NAME_FUNC_OFFSET(17537, glObjectPurgeableAPPLE, glObjectPurgeableAPPLE, NULL, 966),
-    NAME_FUNC_OFFSET(17560, glObjectUnpurgeableAPPLE, glObjectUnpurgeableAPPLE, NULL, 967),
-    NAME_FUNC_OFFSET(17585, glActiveProgramEXT, glActiveProgramEXT, NULL, 968),
-    NAME_FUNC_OFFSET(17604, glCreateShaderProgramEXT, glCreateShaderProgramEXT, NULL, 969),
-    NAME_FUNC_OFFSET(17629, glUseShaderProgramEXT, glUseShaderProgramEXT, NULL, 970),
-    NAME_FUNC_OFFSET(17651, glTextureBarrierNV, glTextureBarrierNV, NULL, 971),
-    NAME_FUNC_OFFSET(17670, gl_dispatch_stub_972, gl_dispatch_stub_972, NULL, 972),
-    NAME_FUNC_OFFSET(17695, gl_dispatch_stub_973, gl_dispatch_stub_973, NULL, 973),
-    NAME_FUNC_OFFSET(17724, gl_dispatch_stub_974, gl_dispatch_stub_974, NULL, 974),
-    NAME_FUNC_OFFSET(17755, gl_dispatch_stub_975, gl_dispatch_stub_975, NULL, 975),
-    NAME_FUNC_OFFSET(17779, gl_dispatch_stub_976, gl_dispatch_stub_976, NULL, 976),
-    NAME_FUNC_OFFSET(17804, glEGLImageTargetRenderbufferStorageOES, glEGLImageTargetRenderbufferStorageOES, NULL, 977),
-    NAME_FUNC_OFFSET(17843, glEGLImageTargetTexture2DOES, glEGLImageTargetTexture2DOES, NULL, 978),
-    NAME_FUNC_OFFSET(17872, glArrayElement, glArrayElement, NULL, 306),
-    NAME_FUNC_OFFSET(17890, glBindTexture, glBindTexture, NULL, 307),
-    NAME_FUNC_OFFSET(17907, glDrawArrays, glDrawArrays, NULL, 310),
-    NAME_FUNC_OFFSET(17923, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, 322),
-    NAME_FUNC_OFFSET(17948, glCopyTexImage1D, glCopyTexImage1D, NULL, 323),
-    NAME_FUNC_OFFSET(17968, glCopyTexImage2D, glCopyTexImage2D, NULL, 324),
-    NAME_FUNC_OFFSET(17988, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, 325),
-    NAME_FUNC_OFFSET(18011, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, 326),
-    NAME_FUNC_OFFSET(18034, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, 327),
-    NAME_FUNC_OFFSET(18054, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, 328),
-    NAME_FUNC_OFFSET(18071, glGetPointerv, glGetPointerv, NULL, 329),
-    NAME_FUNC_OFFSET(18088, glIsTexture, glIsTextureEXT, glIsTextureEXT, 330),
-    NAME_FUNC_OFFSET(18103, glPrioritizeTextures, glPrioritizeTextures, NULL, 331),
-    NAME_FUNC_OFFSET(18127, glTexSubImage1D, glTexSubImage1D, NULL, 332),
-    NAME_FUNC_OFFSET(18146, glTexSubImage2D, glTexSubImage2D, NULL, 333),
-    NAME_FUNC_OFFSET(18165, glBlendColor, glBlendColor, NULL, 336),
-    NAME_FUNC_OFFSET(18181, glBlendEquation, glBlendEquation, NULL, 337),
-    NAME_FUNC_OFFSET(18200, glDrawRangeElements, glDrawRangeElements, NULL, 338),
-    NAME_FUNC_OFFSET(18223, glColorTable, glColorTable, NULL, 339),
-    NAME_FUNC_OFFSET(18239, glColorTable, glColorTable, NULL, 339),
-    NAME_FUNC_OFFSET(18255, glColorTableParameterfv, glColorTableParameterfv, NULL, 340),
-    NAME_FUNC_OFFSET(18282, glColorTableParameteriv, glColorTableParameteriv, NULL, 341),
-    NAME_FUNC_OFFSET(18309, glCopyColorTable, glCopyColorTable, NULL, 342),
-    NAME_FUNC_OFFSET(18329, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, 343),
-    NAME_FUNC_OFFSET(18348, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, 343),
-    NAME_FUNC_OFFSET(18367, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, 344),
-    NAME_FUNC_OFFSET(18397, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, 344),
-    NAME_FUNC_OFFSET(18427, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, 345),
-    NAME_FUNC_OFFSET(18457, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, 345),
-    NAME_FUNC_OFFSET(18487, glColorSubTable, glColorSubTable, NULL, 346),
-    NAME_FUNC_OFFSET(18506, glCopyColorSubTable, glCopyColorSubTable, NULL, 347),
-    NAME_FUNC_OFFSET(18529, glConvolutionFilter1D, glConvolutionFilter1D, NULL, 348),
-    NAME_FUNC_OFFSET(18554, glConvolutionFilter2D, glConvolutionFilter2D, NULL, 349),
-    NAME_FUNC_OFFSET(18579, glConvolutionParameterf, glConvolutionParameterf, NULL, 350),
-    NAME_FUNC_OFFSET(18606, glConvolutionParameterfv, glConvolutionParameterfv, NULL, 351),
-    NAME_FUNC_OFFSET(18634, glConvolutionParameteri, glConvolutionParameteri, NULL, 352),
-    NAME_FUNC_OFFSET(18661, glConvolutionParameteriv, glConvolutionParameteriv, NULL, 353),
-    NAME_FUNC_OFFSET(18689, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, 354),
-    NAME_FUNC_OFFSET(18718, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, 355),
-    NAME_FUNC_OFFSET(18747, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, 356),
-    NAME_FUNC_OFFSET(18773, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, 357),
-    NAME_FUNC_OFFSET(18804, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, 358),
-    NAME_FUNC_OFFSET(18835, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, 359),
-    NAME_FUNC_OFFSET(18859, glSeparableFilter2D, glSeparableFilter2D, NULL, 360),
-    NAME_FUNC_OFFSET(18882, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, 361),
-    NAME_FUNC_OFFSET(18900, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, 362),
-    NAME_FUNC_OFFSET(18929, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, 363),
-    NAME_FUNC_OFFSET(18958, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, 364),
-    NAME_FUNC_OFFSET(18973, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, 365),
-    NAME_FUNC_OFFSET(18999, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, 366),
-    NAME_FUNC_OFFSET(19025, glHistogram, glHistogram, NULL, 367),
-    NAME_FUNC_OFFSET(19040, glMinmax, glMinmax, NULL, 368),
-    NAME_FUNC_OFFSET(19052, glResetHistogram, glResetHistogram, NULL, 369),
-    NAME_FUNC_OFFSET(19072, glResetMinmax, glResetMinmax, NULL, 370),
-    NAME_FUNC_OFFSET(19089, glTexImage3D, glTexImage3D, NULL, 371),
-    NAME_FUNC_OFFSET(19105, glTexSubImage3D, glTexSubImage3D, NULL, 372),
-    NAME_FUNC_OFFSET(19124, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, 373),
-    NAME_FUNC_OFFSET(19147, glActiveTextureARB, glActiveTextureARB, NULL, 374),
-    NAME_FUNC_OFFSET(19163, glClientActiveTextureARB, glClientActiveTextureARB, NULL, 375),
-    NAME_FUNC_OFFSET(19185, glMultiTexCoord1dARB, glMultiTexCoord1dARB, NULL, 376),
-    NAME_FUNC_OFFSET(19203, glMultiTexCoord1dvARB, glMultiTexCoord1dvARB, NULL, 377),
-    NAME_FUNC_OFFSET(19222, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, 378),
-    NAME_FUNC_OFFSET(19240, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, 379),
-    NAME_FUNC_OFFSET(19259, glMultiTexCoord1iARB, glMultiTexCoord1iARB, NULL, 380),
-    NAME_FUNC_OFFSET(19277, glMultiTexCoord1ivARB, glMultiTexCoord1ivARB, NULL, 381),
-    NAME_FUNC_OFFSET(19296, glMultiTexCoord1sARB, glMultiTexCoord1sARB, NULL, 382),
-    NAME_FUNC_OFFSET(19314, glMultiTexCoord1svARB, glMultiTexCoord1svARB, NULL, 383),
-    NAME_FUNC_OFFSET(19333, glMultiTexCoord2dARB, glMultiTexCoord2dARB, NULL, 384),
-    NAME_FUNC_OFFSET(19351, glMultiTexCoord2dvARB, glMultiTexCoord2dvARB, NULL, 385),
-    NAME_FUNC_OFFSET(19370, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, 386),
-    NAME_FUNC_OFFSET(19388, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, 387),
-    NAME_FUNC_OFFSET(19407, glMultiTexCoord2iARB, glMultiTexCoord2iARB, NULL, 388),
-    NAME_FUNC_OFFSET(19425, glMultiTexCoord2ivARB, glMultiTexCoord2ivARB, NULL, 389),
-    NAME_FUNC_OFFSET(19444, glMultiTexCoord2sARB, glMultiTexCoord2sARB, NULL, 390),
-    NAME_FUNC_OFFSET(19462, glMultiTexCoord2svARB, glMultiTexCoord2svARB, NULL, 391),
-    NAME_FUNC_OFFSET(19481, glMultiTexCoord3dARB, glMultiTexCoord3dARB, NULL, 392),
-    NAME_FUNC_OFFSET(19499, glMultiTexCoord3dvARB, glMultiTexCoord3dvARB, NULL, 393),
-    NAME_FUNC_OFFSET(19518, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, 394),
-    NAME_FUNC_OFFSET(19536, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, 395),
-    NAME_FUNC_OFFSET(19555, glMultiTexCoord3iARB, glMultiTexCoord3iARB, NULL, 396),
-    NAME_FUNC_OFFSET(19573, glMultiTexCoord3ivARB, glMultiTexCoord3ivARB, NULL, 397),
-    NAME_FUNC_OFFSET(19592, glMultiTexCoord3sARB, glMultiTexCoord3sARB, NULL, 398),
-    NAME_FUNC_OFFSET(19610, glMultiTexCoord3svARB, glMultiTexCoord3svARB, NULL, 399),
-    NAME_FUNC_OFFSET(19629, glMultiTexCoord4dARB, glMultiTexCoord4dARB, NULL, 400),
-    NAME_FUNC_OFFSET(19647, glMultiTexCoord4dvARB, glMultiTexCoord4dvARB, NULL, 401),
-    NAME_FUNC_OFFSET(19666, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, 402),
-    NAME_FUNC_OFFSET(19684, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, 403),
-    NAME_FUNC_OFFSET(19703, glMultiTexCoord4iARB, glMultiTexCoord4iARB, NULL, 404),
-    NAME_FUNC_OFFSET(19721, glMultiTexCoord4ivARB, glMultiTexCoord4ivARB, NULL, 405),
-    NAME_FUNC_OFFSET(19740, glMultiTexCoord4sARB, glMultiTexCoord4sARB, NULL, 406),
-    NAME_FUNC_OFFSET(19758, glMultiTexCoord4svARB, glMultiTexCoord4svARB, NULL, 407),
-    NAME_FUNC_OFFSET(19777, glStencilOpSeparate, glStencilOpSeparate, NULL, 423),
-    NAME_FUNC_OFFSET(19800, glLoadTransposeMatrixdARB, glLoadTransposeMatrixdARB, NULL, 441),
-    NAME_FUNC_OFFSET(19823, glLoadTransposeMatrixfARB, glLoadTransposeMatrixfARB, NULL, 442),
-    NAME_FUNC_OFFSET(19846, glMultTransposeMatrixdARB, glMultTransposeMatrixdARB, NULL, 443),
-    NAME_FUNC_OFFSET(19869, glMultTransposeMatrixfARB, glMultTransposeMatrixfARB, NULL, 444),
-    NAME_FUNC_OFFSET(19892, glSampleCoverageARB, glSampleCoverageARB, NULL, 445),
-    NAME_FUNC_OFFSET(19909, glCompressedTexImage1DARB, glCompressedTexImage1DARB, NULL, 446),
-    NAME_FUNC_OFFSET(19932, glCompressedTexImage2DARB, glCompressedTexImage2DARB, NULL, 447),
-    NAME_FUNC_OFFSET(19955, glCompressedTexImage3DARB, glCompressedTexImage3DARB, NULL, 448),
-    NAME_FUNC_OFFSET(19978, glCompressedTexSubImage1DARB, glCompressedTexSubImage1DARB, NULL, 449),
-    NAME_FUNC_OFFSET(20004, glCompressedTexSubImage2DARB, glCompressedTexSubImage2DARB, NULL, 450),
-    NAME_FUNC_OFFSET(20030, glCompressedTexSubImage3DARB, glCompressedTexSubImage3DARB, NULL, 451),
-    NAME_FUNC_OFFSET(20056, glGetCompressedTexImageARB, glGetCompressedTexImageARB, NULL, 452),
-    NAME_FUNC_OFFSET(20080, glDisableVertexAttribArrayARB, glDisableVertexAttribArrayARB, NULL, 453),
-    NAME_FUNC_OFFSET(20107, glEnableVertexAttribArrayARB, glEnableVertexAttribArrayARB, NULL, 454),
-    NAME_FUNC_OFFSET(20133, glGetVertexAttribdvARB, glGetVertexAttribdvARB, NULL, 461),
-    NAME_FUNC_OFFSET(20153, glGetVertexAttribfvARB, glGetVertexAttribfvARB, NULL, 462),
-    NAME_FUNC_OFFSET(20173, glGetVertexAttribivARB, glGetVertexAttribivARB, NULL, 463),
-    NAME_FUNC_OFFSET(20193, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, 464),
-    NAME_FUNC_OFFSET(20216, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, 465),
-    NAME_FUNC_OFFSET(20240, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, 466),
-    NAME_FUNC_OFFSET(20263, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, 467),
-    NAME_FUNC_OFFSET(20287, glVertexAttrib1dARB, glVertexAttrib1dARB, NULL, 473),
-    NAME_FUNC_OFFSET(20304, glVertexAttrib1dvARB, glVertexAttrib1dvARB, NULL, 474),
-    NAME_FUNC_OFFSET(20322, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, 475),
-    NAME_FUNC_OFFSET(20339, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, 476),
-    NAME_FUNC_OFFSET(20357, glVertexAttrib1sARB, glVertexAttrib1sARB, NULL, 477),
-    NAME_FUNC_OFFSET(20374, glVertexAttrib1svARB, glVertexAttrib1svARB, NULL, 478),
-    NAME_FUNC_OFFSET(20392, glVertexAttrib2dARB, glVertexAttrib2dARB, NULL, 479),
-    NAME_FUNC_OFFSET(20409, glVertexAttrib2dvARB, glVertexAttrib2dvARB, NULL, 480),
-    NAME_FUNC_OFFSET(20427, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, 481),
-    NAME_FUNC_OFFSET(20444, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, 482),
-    NAME_FUNC_OFFSET(20462, glVertexAttrib2sARB, glVertexAttrib2sARB, NULL, 483),
-    NAME_FUNC_OFFSET(20479, glVertexAttrib2svARB, glVertexAttrib2svARB, NULL, 484),
-    NAME_FUNC_OFFSET(20497, glVertexAttrib3dARB, glVertexAttrib3dARB, NULL, 485),
-    NAME_FUNC_OFFSET(20514, glVertexAttrib3dvARB, glVertexAttrib3dvARB, NULL, 486),
-    NAME_FUNC_OFFSET(20532, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, 487),
-    NAME_FUNC_OFFSET(20549, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, 488),
-    NAME_FUNC_OFFSET(20567, glVertexAttrib3sARB, glVertexAttrib3sARB, NULL, 489),
-    NAME_FUNC_OFFSET(20584, glVertexAttrib3svARB, glVertexAttrib3svARB, NULL, 490),
-    NAME_FUNC_OFFSET(20602, glVertexAttrib4NbvARB, glVertexAttrib4NbvARB, NULL, 491),
-    NAME_FUNC_OFFSET(20621, glVertexAttrib4NivARB, glVertexAttrib4NivARB, NULL, 492),
-    NAME_FUNC_OFFSET(20640, glVertexAttrib4NsvARB, glVertexAttrib4NsvARB, NULL, 493),
-    NAME_FUNC_OFFSET(20659, glVertexAttrib4NubARB, glVertexAttrib4NubARB, NULL, 494),
-    NAME_FUNC_OFFSET(20678, glVertexAttrib4NubvARB, glVertexAttrib4NubvARB, NULL, 495),
-    NAME_FUNC_OFFSET(20698, glVertexAttrib4NuivARB, glVertexAttrib4NuivARB, NULL, 496),
-    NAME_FUNC_OFFSET(20718, glVertexAttrib4NusvARB, glVertexAttrib4NusvARB, NULL, 497),
-    NAME_FUNC_OFFSET(20738, glVertexAttrib4bvARB, glVertexAttrib4bvARB, NULL, 498),
-    NAME_FUNC_OFFSET(20756, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL, 499),
-    NAME_FUNC_OFFSET(20773, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL, 500),
-    NAME_FUNC_OFFSET(20791, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, 501),
-    NAME_FUNC_OFFSET(20808, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, 502),
-    NAME_FUNC_OFFSET(20826, glVertexAttrib4ivARB, glVertexAttrib4ivARB, NULL, 503),
-    NAME_FUNC_OFFSET(20844, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL, 504),
-    NAME_FUNC_OFFSET(20861, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL, 505),
-    NAME_FUNC_OFFSET(20879, glVertexAttrib4ubvARB, glVertexAttrib4ubvARB, NULL, 506),
-    NAME_FUNC_OFFSET(20898, glVertexAttrib4uivARB, glVertexAttrib4uivARB, NULL, 507),
-    NAME_FUNC_OFFSET(20917, glVertexAttrib4usvARB, glVertexAttrib4usvARB, NULL, 508),
-    NAME_FUNC_OFFSET(20936, glVertexAttribPointerARB, glVertexAttribPointerARB, NULL, 509),
-    NAME_FUNC_OFFSET(20958, glBindBufferARB, glBindBufferARB, NULL, 510),
-    NAME_FUNC_OFFSET(20971, glBufferDataARB, glBufferDataARB, NULL, 511),
-    NAME_FUNC_OFFSET(20984, glBufferSubDataARB, glBufferSubDataARB, NULL, 512),
-    NAME_FUNC_OFFSET(21000, glDeleteBuffersARB, glDeleteBuffersARB, NULL, 513),
-    NAME_FUNC_OFFSET(21016, glGenBuffersARB, glGenBuffersARB, NULL, 514),
-    NAME_FUNC_OFFSET(21029, glGetBufferParameterivARB, glGetBufferParameterivARB, NULL, 515),
-    NAME_FUNC_OFFSET(21052, glGetBufferPointervARB, glGetBufferPointervARB, NULL, 516),
-    NAME_FUNC_OFFSET(21072, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL, 517),
-    NAME_FUNC_OFFSET(21091, glIsBufferARB, glIsBufferARB, NULL, 518),
-    NAME_FUNC_OFFSET(21102, glMapBufferARB, glMapBufferARB, NULL, 519),
-    NAME_FUNC_OFFSET(21114, glUnmapBufferARB, glUnmapBufferARB, NULL, 520),
-    NAME_FUNC_OFFSET(21128, glBeginQueryARB, glBeginQueryARB, NULL, 521),
-    NAME_FUNC_OFFSET(21141, glDeleteQueriesARB, glDeleteQueriesARB, NULL, 522),
-    NAME_FUNC_OFFSET(21157, glEndQueryARB, glEndQueryARB, NULL, 523),
-    NAME_FUNC_OFFSET(21168, glGenQueriesARB, glGenQueriesARB, NULL, 524),
-    NAME_FUNC_OFFSET(21181, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL, 525),
-    NAME_FUNC_OFFSET(21200, glGetQueryObjectuivARB, glGetQueryObjectuivARB, NULL, 526),
-    NAME_FUNC_OFFSET(21220, glGetQueryivARB, glGetQueryivARB, NULL, 527),
-    NAME_FUNC_OFFSET(21233, glIsQueryARB, glIsQueryARB, NULL, 528),
-    NAME_FUNC_OFFSET(21243, glCompileShaderARB, glCompileShaderARB, NULL, 530),
-    NAME_FUNC_OFFSET(21259, glGetActiveUniformARB, glGetActiveUniformARB, NULL, 535),
-    NAME_FUNC_OFFSET(21278, glGetShaderSourceARB, glGetShaderSourceARB, NULL, 541),
-    NAME_FUNC_OFFSET(21296, glGetUniformLocationARB, glGetUniformLocationARB, NULL, 542),
-    NAME_FUNC_OFFSET(21317, glGetUniformfvARB, glGetUniformfvARB, NULL, 543),
-    NAME_FUNC_OFFSET(21332, glGetUniformivARB, glGetUniformivARB, NULL, 544),
-    NAME_FUNC_OFFSET(21347, glLinkProgramARB, glLinkProgramARB, NULL, 545),
-    NAME_FUNC_OFFSET(21361, glShaderSourceARB, glShaderSourceARB, NULL, 546),
-    NAME_FUNC_OFFSET(21376, glUniform1fARB, glUniform1fARB, NULL, 547),
-    NAME_FUNC_OFFSET(21388, glUniform1fvARB, glUniform1fvARB, NULL, 548),
-    NAME_FUNC_OFFSET(21401, glUniform1iARB, glUniform1iARB, NULL, 549),
-    NAME_FUNC_OFFSET(21413, glUniform1ivARB, glUniform1ivARB, NULL, 550),
-    NAME_FUNC_OFFSET(21426, glUniform2fARB, glUniform2fARB, NULL, 551),
-    NAME_FUNC_OFFSET(21438, glUniform2fvARB, glUniform2fvARB, NULL, 552),
-    NAME_FUNC_OFFSET(21451, glUniform2iARB, glUniform2iARB, NULL, 553),
-    NAME_FUNC_OFFSET(21463, glUniform2ivARB, glUniform2ivARB, NULL, 554),
-    NAME_FUNC_OFFSET(21476, glUniform3fARB, glUniform3fARB, NULL, 555),
-    NAME_FUNC_OFFSET(21488, glUniform3fvARB, glUniform3fvARB, NULL, 556),
-    NAME_FUNC_OFFSET(21501, glUniform3iARB, glUniform3iARB, NULL, 557),
-    NAME_FUNC_OFFSET(21513, glUniform3ivARB, glUniform3ivARB, NULL, 558),
-    NAME_FUNC_OFFSET(21526, glUniform4fARB, glUniform4fARB, NULL, 559),
-    NAME_FUNC_OFFSET(21538, glUniform4fvARB, glUniform4fvARB, NULL, 560),
-    NAME_FUNC_OFFSET(21551, glUniform4iARB, glUniform4iARB, NULL, 561),
-    NAME_FUNC_OFFSET(21563, glUniform4ivARB, glUniform4ivARB, NULL, 562),
-    NAME_FUNC_OFFSET(21576, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL, 563),
-    NAME_FUNC_OFFSET(21595, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL, 564),
-    NAME_FUNC_OFFSET(21614, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL, 565),
-    NAME_FUNC_OFFSET(21633, glUseProgramObjectARB, glUseProgramObjectARB, NULL, 566),
-    NAME_FUNC_OFFSET(21646, glValidateProgramARB, glValidateProgramARB, NULL, 567),
-    NAME_FUNC_OFFSET(21664, glBindAttribLocationARB, glBindAttribLocationARB, NULL, 568),
-    NAME_FUNC_OFFSET(21685, glGetActiveAttribARB, glGetActiveAttribARB, NULL, 569),
-    NAME_FUNC_OFFSET(21703, glGetAttribLocationARB, glGetAttribLocationARB, NULL, 570),
-    NAME_FUNC_OFFSET(21723, glDrawBuffersARB, glDrawBuffersARB, NULL, 571),
-    NAME_FUNC_OFFSET(21737, glDrawBuffersARB, glDrawBuffersARB, NULL, 571),
-    NAME_FUNC_OFFSET(21754, glDrawBuffersARB, glDrawBuffersARB, NULL, 571),
-    NAME_FUNC_OFFSET(21770, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 573),
-    NAME_FUNC_OFFSET(21795, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 573),
-    NAME_FUNC_OFFSET(21817, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 574),
-    NAME_FUNC_OFFSET(21844, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 574),
-    NAME_FUNC_OFFSET(21868, glRenderbufferStorageMultisample, glRenderbufferStorageMultisample, NULL, 575),
-    NAME_FUNC_OFFSET(21904, glBlendEquationSeparateiARB, glBlendEquationSeparateiARB, NULL, 597),
-    NAME_FUNC_OFFSET(21938, glBlendEquationiARB, glBlendEquationiARB, NULL, 598),
-    NAME_FUNC_OFFSET(21964, glBlendFuncSeparateiARB, glBlendFuncSeparateiARB, NULL, 599),
-    NAME_FUNC_OFFSET(21994, glBlendFunciARB, glBlendFunciARB, NULL, 600),
-    NAME_FUNC_OFFSET(22016, gl_dispatch_stub_704, gl_dispatch_stub_704, NULL, 704),
-    NAME_FUNC_OFFSET(22032, gl_dispatch_stub_705, gl_dispatch_stub_705, NULL, 705),
-    NAME_FUNC_OFFSET(22051, glPointParameterfEXT, glPointParameterfEXT, NULL, 712),
-    NAME_FUNC_OFFSET(22069, glPointParameterfEXT, glPointParameterfEXT, NULL, 712),
-    NAME_FUNC_OFFSET(22090, glPointParameterfEXT, glPointParameterfEXT, NULL, 712),
-    NAME_FUNC_OFFSET(22112, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 713),
-    NAME_FUNC_OFFSET(22131, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 713),
-    NAME_FUNC_OFFSET(22153, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 713),
-    NAME_FUNC_OFFSET(22176, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, 716),
-    NAME_FUNC_OFFSET(22195, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, 717),
-    NAME_FUNC_OFFSET(22215, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, 718),
-    NAME_FUNC_OFFSET(22234, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, 719),
-    NAME_FUNC_OFFSET(22254, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, 720),
-    NAME_FUNC_OFFSET(22273, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, 721),
-    NAME_FUNC_OFFSET(22293, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, 722),
-    NAME_FUNC_OFFSET(22312, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, 723),
-    NAME_FUNC_OFFSET(22332, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, 724),
-    NAME_FUNC_OFFSET(22351, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, 725),
-    NAME_FUNC_OFFSET(22371, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, 726),
-    NAME_FUNC_OFFSET(22391, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, 727),
-    NAME_FUNC_OFFSET(22412, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, 728),
-    NAME_FUNC_OFFSET(22432, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, 729),
-    NAME_FUNC_OFFSET(22453, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, 730),
-    NAME_FUNC_OFFSET(22473, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, 731),
-    NAME_FUNC_OFFSET(22494, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, 732),
-    NAME_FUNC_OFFSET(22518, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, 733),
-    NAME_FUNC_OFFSET(22536, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, 734),
-    NAME_FUNC_OFFSET(22556, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, 735),
-    NAME_FUNC_OFFSET(22574, glFogCoorddEXT, glFogCoorddEXT, NULL, 736),
-    NAME_FUNC_OFFSET(22586, glFogCoorddvEXT, glFogCoorddvEXT, NULL, 737),
-    NAME_FUNC_OFFSET(22599, glFogCoordfEXT, glFogCoordfEXT, NULL, 738),
-    NAME_FUNC_OFFSET(22611, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 739),
-    NAME_FUNC_OFFSET(22624, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, 741),
-    NAME_FUNC_OFFSET(22644, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, 741),
-    NAME_FUNC_OFFSET(22668, glWindowPos2dMESA, glWindowPos2dMESA, NULL, 758),
-    NAME_FUNC_OFFSET(22682, glWindowPos2dMESA, glWindowPos2dMESA, NULL, 758),
-    NAME_FUNC_OFFSET(22699, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, 759),
-    NAME_FUNC_OFFSET(22714, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, 759),
-    NAME_FUNC_OFFSET(22732, glWindowPos2fMESA, glWindowPos2fMESA, NULL, 760),
-    NAME_FUNC_OFFSET(22746, glWindowPos2fMESA, glWindowPos2fMESA, NULL, 760),
-    NAME_FUNC_OFFSET(22763, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, 761),
-    NAME_FUNC_OFFSET(22778, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, 761),
-    NAME_FUNC_OFFSET(22796, glWindowPos2iMESA, glWindowPos2iMESA, NULL, 762),
-    NAME_FUNC_OFFSET(22810, glWindowPos2iMESA, glWindowPos2iMESA, NULL, 762),
-    NAME_FUNC_OFFSET(22827, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, 763),
-    NAME_FUNC_OFFSET(22842, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, 763),
-    NAME_FUNC_OFFSET(22860, glWindowPos2sMESA, glWindowPos2sMESA, NULL, 764),
-    NAME_FUNC_OFFSET(22874, glWindowPos2sMESA, glWindowPos2sMESA, NULL, 764),
-    NAME_FUNC_OFFSET(22891, glWindowPos2svMESA, glWindowPos2svMESA, NULL, 765),
-    NAME_FUNC_OFFSET(22906, glWindowPos2svMESA, glWindowPos2svMESA, NULL, 765),
-    NAME_FUNC_OFFSET(22924, glWindowPos3dMESA, glWindowPos3dMESA, NULL, 766),
-    NAME_FUNC_OFFSET(22938, glWindowPos3dMESA, glWindowPos3dMESA, NULL, 766),
-    NAME_FUNC_OFFSET(22955, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, 767),
-    NAME_FUNC_OFFSET(22970, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, 767),
-    NAME_FUNC_OFFSET(22988, glWindowPos3fMESA, glWindowPos3fMESA, NULL, 768),
-    NAME_FUNC_OFFSET(23002, glWindowPos3fMESA, glWindowPos3fMESA, NULL, 768),
-    NAME_FUNC_OFFSET(23019, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, 769),
-    NAME_FUNC_OFFSET(23034, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, 769),
-    NAME_FUNC_OFFSET(23052, glWindowPos3iMESA, glWindowPos3iMESA, NULL, 770),
-    NAME_FUNC_OFFSET(23066, glWindowPos3iMESA, glWindowPos3iMESA, NULL, 770),
-    NAME_FUNC_OFFSET(23083, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, 771),
-    NAME_FUNC_OFFSET(23098, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, 771),
-    NAME_FUNC_OFFSET(23116, glWindowPos3sMESA, glWindowPos3sMESA, NULL, 772),
-    NAME_FUNC_OFFSET(23130, glWindowPos3sMESA, glWindowPos3sMESA, NULL, 772),
-    NAME_FUNC_OFFSET(23147, glWindowPos3svMESA, glWindowPos3svMESA, NULL, 773),
-    NAME_FUNC_OFFSET(23162, glWindowPos3svMESA, glWindowPos3svMESA, NULL, 773),
-    NAME_FUNC_OFFSET(23180, glBindProgramNV, glBindProgramNV, NULL, 792),
-    NAME_FUNC_OFFSET(23197, glDeleteProgramsNV, glDeleteProgramsNV, NULL, 793),
-    NAME_FUNC_OFFSET(23217, glGenProgramsNV, glGenProgramsNV, NULL, 795),
-    NAME_FUNC_OFFSET(23234, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, 801),
-    NAME_FUNC_OFFSET(23260, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, 801),
-    NAME_FUNC_OFFSET(23289, glIsProgramNV, glIsProgramNV, NULL, 805),
-    NAME_FUNC_OFFSET(23304, glPointParameteriNV, glPointParameteriNV, NULL, 869),
-    NAME_FUNC_OFFSET(23322, glPointParameterivNV, glPointParameterivNV, NULL, 870),
-    NAME_FUNC_OFFSET(23341, gl_dispatch_stub_873, gl_dispatch_stub_873, NULL, 873),
-    NAME_FUNC_OFFSET(23362, gl_dispatch_stub_875, gl_dispatch_stub_875, NULL, 875),
-    NAME_FUNC_OFFSET(23378, glPrimitiveRestartIndexNV, glPrimitiveRestartIndexNV, NULL, 882),
-    NAME_FUNC_OFFSET(23402, gl_dispatch_stub_885, gl_dispatch_stub_885, NULL, 885),
-    NAME_FUNC_OFFSET(23426, gl_dispatch_stub_885, gl_dispatch_stub_885, NULL, 885),
-    NAME_FUNC_OFFSET(23453, glBindFramebufferEXT, glBindFramebufferEXT, NULL, 886),
-    NAME_FUNC_OFFSET(23471, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, 887),
-    NAME_FUNC_OFFSET(23490, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, 888),
-    NAME_FUNC_OFFSET(23515, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, 889),
-    NAME_FUNC_OFFSET(23536, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, 890),
-    NAME_FUNC_OFFSET(23558, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, 891),
-    NAME_FUNC_OFFSET(23584, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, 892),
-    NAME_FUNC_OFFSET(23607, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, 893),
-    NAME_FUNC_OFFSET(23630, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, 894),
-    NAME_FUNC_OFFSET(23653, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, 895),
-    NAME_FUNC_OFFSET(23671, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, 896),
-    NAME_FUNC_OFFSET(23690, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, 897),
-    NAME_FUNC_OFFSET(23707, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, 898),
-    NAME_FUNC_OFFSET(23745, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, 899),
-    NAME_FUNC_OFFSET(23774, glIsFramebufferEXT, glIsFramebufferEXT, NULL, 900),
-    NAME_FUNC_OFFSET(23790, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, 901),
-    NAME_FUNC_OFFSET(23807, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, 902),
-    NAME_FUNC_OFFSET(23829, gl_dispatch_stub_903, gl_dispatch_stub_903, NULL, 903),
-    NAME_FUNC_OFFSET(23847, glBindFragDataLocationEXT, glBindFragDataLocationEXT, NULL, 906),
-    NAME_FUNC_OFFSET(23870, glGetFragDataLocationEXT, glGetFragDataLocationEXT, NULL, 907),
-    NAME_FUNC_OFFSET(23892, glGetUniformuivEXT, glGetUniformuivEXT, NULL, 908),
-    NAME_FUNC_OFFSET(23908, glGetVertexAttribIivEXT, glGetVertexAttribIivEXT, NULL, 909),
-    NAME_FUNC_OFFSET(23929, glGetVertexAttribIuivEXT, glGetVertexAttribIuivEXT, NULL, 910),
-    NAME_FUNC_OFFSET(23951, glUniform1uiEXT, glUniform1uiEXT, NULL, 911),
-    NAME_FUNC_OFFSET(23964, glUniform1uivEXT, glUniform1uivEXT, NULL, 912),
-    NAME_FUNC_OFFSET(23978, glUniform2uiEXT, glUniform2uiEXT, NULL, 913),
-    NAME_FUNC_OFFSET(23991, glUniform2uivEXT, glUniform2uivEXT, NULL, 914),
-    NAME_FUNC_OFFSET(24005, glUniform3uiEXT, glUniform3uiEXT, NULL, 915),
-    NAME_FUNC_OFFSET(24018, glUniform3uivEXT, glUniform3uivEXT, NULL, 916),
-    NAME_FUNC_OFFSET(24032, glUniform4uiEXT, glUniform4uiEXT, NULL, 917),
-    NAME_FUNC_OFFSET(24045, glUniform4uivEXT, glUniform4uivEXT, NULL, 918),
-    NAME_FUNC_OFFSET(24059, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL, 919),
-    NAME_FUNC_OFFSET(24077, glVertexAttribI1ivEXT, glVertexAttribI1ivEXT, NULL, 920),
-    NAME_FUNC_OFFSET(24096, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL, 921),
-    NAME_FUNC_OFFSET(24115, glVertexAttribI1uivEXT, glVertexAttribI1uivEXT, NULL, 922),
-    NAME_FUNC_OFFSET(24135, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL, 923),
-    NAME_FUNC_OFFSET(24153, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL, 924),
-    NAME_FUNC_OFFSET(24172, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL, 925),
-    NAME_FUNC_OFFSET(24191, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT, NULL, 926),
-    NAME_FUNC_OFFSET(24211, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL, 927),
-    NAME_FUNC_OFFSET(24229, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL, 928),
-    NAME_FUNC_OFFSET(24248, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL, 929),
-    NAME_FUNC_OFFSET(24267, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT, NULL, 930),
-    NAME_FUNC_OFFSET(24287, glVertexAttribI4bvEXT, glVertexAttribI4bvEXT, NULL, 931),
-    NAME_FUNC_OFFSET(24306, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL, 932),
-    NAME_FUNC_OFFSET(24324, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL, 933),
-    NAME_FUNC_OFFSET(24343, glVertexAttribI4svEXT, glVertexAttribI4svEXT, NULL, 934),
-    NAME_FUNC_OFFSET(24362, glVertexAttribI4ubvEXT, glVertexAttribI4ubvEXT, NULL, 935),
-    NAME_FUNC_OFFSET(24382, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL, 936),
-    NAME_FUNC_OFFSET(24401, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT, NULL, 937),
-    NAME_FUNC_OFFSET(24421, glVertexAttribI4usvEXT, glVertexAttribI4usvEXT, NULL, 938),
-    NAME_FUNC_OFFSET(24441, glVertexAttribIPointerEXT, glVertexAttribIPointerEXT, NULL, 939),
-    NAME_FUNC_OFFSET(24464, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, 940),
-    NAME_FUNC_OFFSET(24490, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, 940),
-    NAME_FUNC_OFFSET(24519, glColorMaskIndexedEXT, glColorMaskIndexedEXT, NULL, 941),
-    NAME_FUNC_OFFSET(24532, glDisableIndexedEXT, glDisableIndexedEXT, NULL, 942),
-    NAME_FUNC_OFFSET(24543, glEnableIndexedEXT, glEnableIndexedEXT, NULL, 943),
-    NAME_FUNC_OFFSET(24553, glGetBooleanIndexedvEXT, glGetBooleanIndexedvEXT, NULL, 944),
-    NAME_FUNC_OFFSET(24569, glGetIntegerIndexedvEXT, glGetIntegerIndexedvEXT, NULL, 945),
-    NAME_FUNC_OFFSET(24585, glIsEnabledIndexedEXT, glIsEnabledIndexedEXT, NULL, 946),
-    NAME_FUNC_OFFSET(24598, glGetTexParameterIivEXT, glGetTexParameterIivEXT, NULL, 949),
-    NAME_FUNC_OFFSET(24619, glGetTexParameterIuivEXT, glGetTexParameterIuivEXT, NULL, 950),
-    NAME_FUNC_OFFSET(24641, glTexParameterIivEXT, glTexParameterIivEXT, NULL, 951),
-    NAME_FUNC_OFFSET(24659, glTexParameterIuivEXT, glTexParameterIuivEXT, NULL, 952),
-    NAME_FUNC_OFFSET(24678, glBeginConditionalRenderNV, glBeginConditionalRenderNV, NULL, 953),
-    NAME_FUNC_OFFSET(24703, glEndConditionalRenderNV, glEndConditionalRenderNV, NULL, 954),
-    NAME_FUNC_OFFSET(24726, glBeginTransformFeedbackEXT, glBeginTransformFeedbackEXT, NULL, 955),
-    NAME_FUNC_OFFSET(24751, glBindBufferBaseEXT, glBindBufferBaseEXT, NULL, 956),
-    NAME_FUNC_OFFSET(24768, glBindBufferRangeEXT, glBindBufferRangeEXT, NULL, 958),
-    NAME_FUNC_OFFSET(24786, glEndTransformFeedbackEXT, glEndTransformFeedbackEXT, NULL, 959),
-    NAME_FUNC_OFFSET(24809, glGetTransformFeedbackVaryingEXT, glGetTransformFeedbackVaryingEXT, NULL, 960),
-    NAME_FUNC_OFFSET(24839, glTransformFeedbackVaryingsEXT, glTransformFeedbackVaryingsEXT, NULL, 961),
-    NAME_FUNC_OFFSET(24867, glProvokingVertexEXT, glProvokingVertexEXT, NULL, 962),
+    NAME_FUNC_OFFSET(13594, gl_dispatch_stub_789, gl_dispatch_stub_789, NULL, 789),
+    NAME_FUNC_OFFSET(13608, glAreProgramsResidentNV, glAreProgramsResidentNV, NULL, 790),
+    NAME_FUNC_OFFSET(13632, glBindProgramNV, glBindProgramNV, NULL, 791),
+    NAME_FUNC_OFFSET(13648, glDeleteProgramsNV, glDeleteProgramsNV, NULL, 792),
+    NAME_FUNC_OFFSET(13667, glExecuteProgramNV, glExecuteProgramNV, NULL, 793),
+    NAME_FUNC_OFFSET(13686, glGenProgramsNV, glGenProgramsNV, NULL, 794),
+    NAME_FUNC_OFFSET(13702, glGetProgramParameterdvNV, glGetProgramParameterdvNV, NULL, 795),
+    NAME_FUNC_OFFSET(13728, glGetProgramParameterfvNV, glGetProgramParameterfvNV, NULL, 796),
+    NAME_FUNC_OFFSET(13754, glGetProgramStringNV, glGetProgramStringNV, NULL, 797),
+    NAME_FUNC_OFFSET(13775, glGetProgramivNV, glGetProgramivNV, NULL, 798),
+    NAME_FUNC_OFFSET(13792, glGetTrackMatrixivNV, glGetTrackMatrixivNV, NULL, 799),
+    NAME_FUNC_OFFSET(13813, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, 800),
+    NAME_FUNC_OFFSET(13841, glGetVertexAttribdvNV, glGetVertexAttribdvNV, NULL, 801),
+    NAME_FUNC_OFFSET(13863, glGetVertexAttribfvNV, glGetVertexAttribfvNV, NULL, 802),
+    NAME_FUNC_OFFSET(13885, glGetVertexAttribivNV, glGetVertexAttribivNV, NULL, 803),
+    NAME_FUNC_OFFSET(13907, glIsProgramNV, glIsProgramNV, NULL, 804),
+    NAME_FUNC_OFFSET(13921, glLoadProgramNV, glLoadProgramNV, NULL, 805),
+    NAME_FUNC_OFFSET(13937, glProgramParameters4dvNV, glProgramParameters4dvNV, NULL, 806),
+    NAME_FUNC_OFFSET(13962, glProgramParameters4fvNV, glProgramParameters4fvNV, NULL, 807),
+    NAME_FUNC_OFFSET(13987, glRequestResidentProgramsNV, glRequestResidentProgramsNV, NULL, 808),
+    NAME_FUNC_OFFSET(14015, glTrackMatrixNV, glTrackMatrixNV, NULL, 809),
+    NAME_FUNC_OFFSET(14031, glVertexAttrib1dNV, glVertexAttrib1dNV, NULL, 810),
+    NAME_FUNC_OFFSET(14050, glVertexAttrib1dvNV, glVertexAttrib1dvNV, NULL, 811),
+    NAME_FUNC_OFFSET(14070, glVertexAttrib1fNV, glVertexAttrib1fNV, NULL, 812),
+    NAME_FUNC_OFFSET(14089, glVertexAttrib1fvNV, glVertexAttrib1fvNV, NULL, 813),
+    NAME_FUNC_OFFSET(14109, glVertexAttrib1sNV, glVertexAttrib1sNV, NULL, 814),
+    NAME_FUNC_OFFSET(14128, glVertexAttrib1svNV, glVertexAttrib1svNV, NULL, 815),
+    NAME_FUNC_OFFSET(14148, glVertexAttrib2dNV, glVertexAttrib2dNV, NULL, 816),
+    NAME_FUNC_OFFSET(14167, glVertexAttrib2dvNV, glVertexAttrib2dvNV, NULL, 817),
+    NAME_FUNC_OFFSET(14187, glVertexAttrib2fNV, glVertexAttrib2fNV, NULL, 818),
+    NAME_FUNC_OFFSET(14206, glVertexAttrib2fvNV, glVertexAttrib2fvNV, NULL, 819),
+    NAME_FUNC_OFFSET(14226, glVertexAttrib2sNV, glVertexAttrib2sNV, NULL, 820),
+    NAME_FUNC_OFFSET(14245, glVertexAttrib2svNV, glVertexAttrib2svNV, NULL, 821),
+    NAME_FUNC_OFFSET(14265, glVertexAttrib3dNV, glVertexAttrib3dNV, NULL, 822),
+    NAME_FUNC_OFFSET(14284, glVertexAttrib3dvNV, glVertexAttrib3dvNV, NULL, 823),
+    NAME_FUNC_OFFSET(14304, glVertexAttrib3fNV, glVertexAttrib3fNV, NULL, 824),
+    NAME_FUNC_OFFSET(14323, glVertexAttrib3fvNV, glVertexAttrib3fvNV, NULL, 825),
+    NAME_FUNC_OFFSET(14343, glVertexAttrib3sNV, glVertexAttrib3sNV, NULL, 826),
+    NAME_FUNC_OFFSET(14362, glVertexAttrib3svNV, glVertexAttrib3svNV, NULL, 827),
+    NAME_FUNC_OFFSET(14382, glVertexAttrib4dNV, glVertexAttrib4dNV, NULL, 828),
+    NAME_FUNC_OFFSET(14401, glVertexAttrib4dvNV, glVertexAttrib4dvNV, NULL, 829),
+    NAME_FUNC_OFFSET(14421, glVertexAttrib4fNV, glVertexAttrib4fNV, NULL, 830),
+    NAME_FUNC_OFFSET(14440, glVertexAttrib4fvNV, glVertexAttrib4fvNV, NULL, 831),
+    NAME_FUNC_OFFSET(14460, glVertexAttrib4sNV, glVertexAttrib4sNV, NULL, 832),
+    NAME_FUNC_OFFSET(14479, glVertexAttrib4svNV, glVertexAttrib4svNV, NULL, 833),
+    NAME_FUNC_OFFSET(14499, glVertexAttrib4ubNV, glVertexAttrib4ubNV, NULL, 834),
+    NAME_FUNC_OFFSET(14519, glVertexAttrib4ubvNV, glVertexAttrib4ubvNV, NULL, 835),
+    NAME_FUNC_OFFSET(14540, glVertexAttribPointerNV, glVertexAttribPointerNV, NULL, 836),
+    NAME_FUNC_OFFSET(14564, glVertexAttribs1dvNV, glVertexAttribs1dvNV, NULL, 837),
+    NAME_FUNC_OFFSET(14585, glVertexAttribs1fvNV, glVertexAttribs1fvNV, NULL, 838),
+    NAME_FUNC_OFFSET(14606, glVertexAttribs1svNV, glVertexAttribs1svNV, NULL, 839),
+    NAME_FUNC_OFFSET(14627, glVertexAttribs2dvNV, glVertexAttribs2dvNV, NULL, 840),
+    NAME_FUNC_OFFSET(14648, glVertexAttribs2fvNV, glVertexAttribs2fvNV, NULL, 841),
+    NAME_FUNC_OFFSET(14669, glVertexAttribs2svNV, glVertexAttribs2svNV, NULL, 842),
+    NAME_FUNC_OFFSET(14690, glVertexAttribs3dvNV, glVertexAttribs3dvNV, NULL, 843),
+    NAME_FUNC_OFFSET(14711, glVertexAttribs3fvNV, glVertexAttribs3fvNV, NULL, 844),
+    NAME_FUNC_OFFSET(14732, glVertexAttribs3svNV, glVertexAttribs3svNV, NULL, 845),
+    NAME_FUNC_OFFSET(14753, glVertexAttribs4dvNV, glVertexAttribs4dvNV, NULL, 846),
+    NAME_FUNC_OFFSET(14774, glVertexAttribs4fvNV, glVertexAttribs4fvNV, NULL, 847),
+    NAME_FUNC_OFFSET(14795, glVertexAttribs4svNV, glVertexAttribs4svNV, NULL, 848),
+    NAME_FUNC_OFFSET(14816, glVertexAttribs4ubvNV, glVertexAttribs4ubvNV, NULL, 849),
+    NAME_FUNC_OFFSET(14838, glGetTexBumpParameterfvATI, glGetTexBumpParameterfvATI, NULL, 850),
+    NAME_FUNC_OFFSET(14865, glGetTexBumpParameterivATI, glGetTexBumpParameterivATI, NULL, 851),
+    NAME_FUNC_OFFSET(14892, glTexBumpParameterfvATI, glTexBumpParameterfvATI, NULL, 852),
+    NAME_FUNC_OFFSET(14916, glTexBumpParameterivATI, glTexBumpParameterivATI, NULL, 853),
+    NAME_FUNC_OFFSET(14940, glAlphaFragmentOp1ATI, glAlphaFragmentOp1ATI, NULL, 854),
+    NAME_FUNC_OFFSET(14962, glAlphaFragmentOp2ATI, glAlphaFragmentOp2ATI, NULL, 855),
+    NAME_FUNC_OFFSET(14984, glAlphaFragmentOp3ATI, glAlphaFragmentOp3ATI, NULL, 856),
+    NAME_FUNC_OFFSET(15006, glBeginFragmentShaderATI, glBeginFragmentShaderATI, NULL, 857),
+    NAME_FUNC_OFFSET(15031, glBindFragmentShaderATI, glBindFragmentShaderATI, NULL, 858),
+    NAME_FUNC_OFFSET(15055, glColorFragmentOp1ATI, glColorFragmentOp1ATI, NULL, 859),
+    NAME_FUNC_OFFSET(15077, glColorFragmentOp2ATI, glColorFragmentOp2ATI, NULL, 860),
+    NAME_FUNC_OFFSET(15099, glColorFragmentOp3ATI, glColorFragmentOp3ATI, NULL, 861),
+    NAME_FUNC_OFFSET(15121, glDeleteFragmentShaderATI, glDeleteFragmentShaderATI, NULL, 862),
+    NAME_FUNC_OFFSET(15147, glEndFragmentShaderATI, glEndFragmentShaderATI, NULL, 863),
+    NAME_FUNC_OFFSET(15170, glGenFragmentShadersATI, glGenFragmentShadersATI, NULL, 864),
+    NAME_FUNC_OFFSET(15194, glPassTexCoordATI, glPassTexCoordATI, NULL, 865),
+    NAME_FUNC_OFFSET(15212, glSampleMapATI, glSampleMapATI, NULL, 866),
+    NAME_FUNC_OFFSET(15227, glSetFragmentShaderConstantATI, glSetFragmentShaderConstantATI, NULL, 867),
+    NAME_FUNC_OFFSET(15258, glPointParameteriNV, glPointParameteriNV, NULL, 868),
+    NAME_FUNC_OFFSET(15278, glPointParameterivNV, glPointParameterivNV, NULL, 869),
+    NAME_FUNC_OFFSET(15299, gl_dispatch_stub_870, gl_dispatch_stub_870, NULL, 870),
+    NAME_FUNC_OFFSET(15322, gl_dispatch_stub_871, gl_dispatch_stub_871, NULL, 871),
+    NAME_FUNC_OFFSET(15345, gl_dispatch_stub_872, gl_dispatch_stub_872, NULL, 872),
+    NAME_FUNC_OFFSET(15371, gl_dispatch_stub_873, gl_dispatch_stub_873, NULL, 873),
+    NAME_FUNC_OFFSET(15394, gl_dispatch_stub_874, gl_dispatch_stub_874, NULL, 874),
+    NAME_FUNC_OFFSET(15415, glGetProgramNamedParameterdvNV, glGetProgramNamedParameterdvNV, NULL, 875),
+    NAME_FUNC_OFFSET(15446, glGetProgramNamedParameterfvNV, glGetProgramNamedParameterfvNV, NULL, 876),
+    NAME_FUNC_OFFSET(15477, glProgramNamedParameter4dNV, glProgramNamedParameter4dNV, NULL, 877),
+    NAME_FUNC_OFFSET(15505, glProgramNamedParameter4dvNV, glProgramNamedParameter4dvNV, NULL, 878),
+    NAME_FUNC_OFFSET(15534, glProgramNamedParameter4fNV, glProgramNamedParameter4fNV, NULL, 879),
+    NAME_FUNC_OFFSET(15562, glProgramNamedParameter4fvNV, glProgramNamedParameter4fvNV, NULL, 880),
+    NAME_FUNC_OFFSET(15591, glPrimitiveRestartIndexNV, glPrimitiveRestartIndexNV, NULL, 881),
+    NAME_FUNC_OFFSET(15617, glPrimitiveRestartNV, glPrimitiveRestartNV, NULL, 882),
+    NAME_FUNC_OFFSET(15638, gl_dispatch_stub_883, gl_dispatch_stub_883, NULL, 883),
+    NAME_FUNC_OFFSET(15655, gl_dispatch_stub_884, gl_dispatch_stub_884, NULL, 884),
+    NAME_FUNC_OFFSET(15682, glBindFramebufferEXT, glBindFramebufferEXT, NULL, 885),
+    NAME_FUNC_OFFSET(15703, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, 886),
+    NAME_FUNC_OFFSET(15725, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, 887),
+    NAME_FUNC_OFFSET(15753, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, 888),
+    NAME_FUNC_OFFSET(15777, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, 889),
+    NAME_FUNC_OFFSET(15802, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, 890),
+    NAME_FUNC_OFFSET(15831, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, 891),
+    NAME_FUNC_OFFSET(15857, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, 892),
+    NAME_FUNC_OFFSET(15883, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, 893),
+    NAME_FUNC_OFFSET(15909, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, 894),
+    NAME_FUNC_OFFSET(15930, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, 895),
+    NAME_FUNC_OFFSET(15952, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, 896),
+    NAME_FUNC_OFFSET(15972, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, 897),
+    NAME_FUNC_OFFSET(16013, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, 898),
+    NAME_FUNC_OFFSET(16045, glIsFramebufferEXT, glIsFramebufferEXT, NULL, 899),
+    NAME_FUNC_OFFSET(16064, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, 900),
+    NAME_FUNC_OFFSET(16084, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, 901),
+    NAME_FUNC_OFFSET(16109, gl_dispatch_stub_902, gl_dispatch_stub_902, NULL, 902),
+    NAME_FUNC_OFFSET(16130, gl_dispatch_stub_903, gl_dispatch_stub_903, NULL, 903),
+    NAME_FUNC_OFFSET(16154, gl_dispatch_stub_904, gl_dispatch_stub_904, NULL, 904),
+    NAME_FUNC_OFFSET(16184, glBindFragDataLocationEXT, glBindFragDataLocationEXT, NULL, 905),
+    NAME_FUNC_OFFSET(16210, glGetFragDataLocationEXT, glGetFragDataLocationEXT, NULL, 906),
+    NAME_FUNC_OFFSET(16235, glGetUniformuivEXT, glGetUniformuivEXT, NULL, 907),
+    NAME_FUNC_OFFSET(16254, glGetVertexAttribIivEXT, glGetVertexAttribIivEXT, NULL, 908),
+    NAME_FUNC_OFFSET(16278, glGetVertexAttribIuivEXT, glGetVertexAttribIuivEXT, NULL, 909),
+    NAME_FUNC_OFFSET(16303, glUniform1uiEXT, glUniform1uiEXT, NULL, 910),
+    NAME_FUNC_OFFSET(16319, glUniform1uivEXT, glUniform1uivEXT, NULL, 911),
+    NAME_FUNC_OFFSET(16336, glUniform2uiEXT, glUniform2uiEXT, NULL, 912),
+    NAME_FUNC_OFFSET(16352, glUniform2uivEXT, glUniform2uivEXT, NULL, 913),
+    NAME_FUNC_OFFSET(16369, glUniform3uiEXT, glUniform3uiEXT, NULL, 914),
+    NAME_FUNC_OFFSET(16385, glUniform3uivEXT, glUniform3uivEXT, NULL, 915),
+    NAME_FUNC_OFFSET(16402, glUniform4uiEXT, glUniform4uiEXT, NULL, 916),
+    NAME_FUNC_OFFSET(16418, glUniform4uivEXT, glUniform4uivEXT, NULL, 917),
+    NAME_FUNC_OFFSET(16435, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL, 918),
+    NAME_FUNC_OFFSET(16456, glVertexAttribI1ivEXT, glVertexAttribI1ivEXT, NULL, 919),
+    NAME_FUNC_OFFSET(16478, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL, 920),
+    NAME_FUNC_OFFSET(16500, glVertexAttribI1uivEXT, glVertexAttribI1uivEXT, NULL, 921),
+    NAME_FUNC_OFFSET(16523, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL, 922),
+    NAME_FUNC_OFFSET(16544, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL, 923),
+    NAME_FUNC_OFFSET(16566, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL, 924),
+    NAME_FUNC_OFFSET(16588, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT, NULL, 925),
+    NAME_FUNC_OFFSET(16611, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL, 926),
+    NAME_FUNC_OFFSET(16632, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL, 927),
+    NAME_FUNC_OFFSET(16654, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL, 928),
+    NAME_FUNC_OFFSET(16676, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT, NULL, 929),
+    NAME_FUNC_OFFSET(16699, glVertexAttribI4bvEXT, glVertexAttribI4bvEXT, NULL, 930),
+    NAME_FUNC_OFFSET(16721, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL, 931),
+    NAME_FUNC_OFFSET(16742, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL, 932),
+    NAME_FUNC_OFFSET(16764, glVertexAttribI4svEXT, glVertexAttribI4svEXT, NULL, 933),
+    NAME_FUNC_OFFSET(16786, glVertexAttribI4ubvEXT, glVertexAttribI4ubvEXT, NULL, 934),
+    NAME_FUNC_OFFSET(16809, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL, 935),
+    NAME_FUNC_OFFSET(16831, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT, NULL, 936),
+    NAME_FUNC_OFFSET(16854, glVertexAttribI4usvEXT, glVertexAttribI4usvEXT, NULL, 937),
+    NAME_FUNC_OFFSET(16877, glVertexAttribIPointerEXT, glVertexAttribIPointerEXT, NULL, 938),
+    NAME_FUNC_OFFSET(16903, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, 939),
+    NAME_FUNC_OFFSET(16932, glColorMaskIndexedEXT, glColorMaskIndexedEXT, NULL, 940),
+    NAME_FUNC_OFFSET(16954, glDisableIndexedEXT, glDisableIndexedEXT, NULL, 941),
+    NAME_FUNC_OFFSET(16974, glEnableIndexedEXT, glEnableIndexedEXT, NULL, 942),
+    NAME_FUNC_OFFSET(16993, glGetBooleanIndexedvEXT, glGetBooleanIndexedvEXT, NULL, 943),
+    NAME_FUNC_OFFSET(17017, glGetIntegerIndexedvEXT, glGetIntegerIndexedvEXT, NULL, 944),
+    NAME_FUNC_OFFSET(17041, glIsEnabledIndexedEXT, glIsEnabledIndexedEXT, NULL, 945),
+    NAME_FUNC_OFFSET(17063, glClearColorIiEXT, glClearColorIiEXT, NULL, 946),
+    NAME_FUNC_OFFSET(17081, glClearColorIuiEXT, glClearColorIuiEXT, NULL, 947),
+    NAME_FUNC_OFFSET(17100, glGetTexParameterIivEXT, glGetTexParameterIivEXT, NULL, 948),
+    NAME_FUNC_OFFSET(17124, glGetTexParameterIuivEXT, glGetTexParameterIuivEXT, NULL, 949),
+    NAME_FUNC_OFFSET(17149, glTexParameterIivEXT, glTexParameterIivEXT, NULL, 950),
+    NAME_FUNC_OFFSET(17170, glTexParameterIuivEXT, glTexParameterIuivEXT, NULL, 951),
+    NAME_FUNC_OFFSET(17192, glBeginConditionalRenderNV, glBeginConditionalRenderNV, NULL, 952),
+    NAME_FUNC_OFFSET(17219, glEndConditionalRenderNV, glEndConditionalRenderNV, NULL, 953),
+    NAME_FUNC_OFFSET(17244, glBeginTransformFeedbackEXT, glBeginTransformFeedbackEXT, NULL, 954),
+    NAME_FUNC_OFFSET(17272, glBindBufferBaseEXT, glBindBufferBaseEXT, NULL, 955),
+    NAME_FUNC_OFFSET(17292, glBindBufferOffsetEXT, glBindBufferOffsetEXT, NULL, 956),
+    NAME_FUNC_OFFSET(17314, glBindBufferRangeEXT, glBindBufferRangeEXT, NULL, 957),
+    NAME_FUNC_OFFSET(17335, glEndTransformFeedbackEXT, glEndTransformFeedbackEXT, NULL, 958),
+    NAME_FUNC_OFFSET(17361, glGetTransformFeedbackVaryingEXT, glGetTransformFeedbackVaryingEXT, NULL, 959),
+    NAME_FUNC_OFFSET(17394, glTransformFeedbackVaryingsEXT, glTransformFeedbackVaryingsEXT, NULL, 960),
+    NAME_FUNC_OFFSET(17425, glProvokingVertexEXT, glProvokingVertexEXT, NULL, 961),
+    NAME_FUNC_OFFSET(17446, gl_dispatch_stub_962, gl_dispatch_stub_962, NULL, 962),
+    NAME_FUNC_OFFSET(17477, gl_dispatch_stub_963, gl_dispatch_stub_963, NULL, 963),
+    NAME_FUNC_OFFSET(17497, glGetObjectParameterivAPPLE, glGetObjectParameterivAPPLE, NULL, 964),
+    NAME_FUNC_OFFSET(17525, glObjectPurgeableAPPLE, glObjectPurgeableAPPLE, NULL, 965),
+    NAME_FUNC_OFFSET(17548, glObjectUnpurgeableAPPLE, glObjectUnpurgeableAPPLE, NULL, 966),
+    NAME_FUNC_OFFSET(17573, glActiveProgramEXT, glActiveProgramEXT, NULL, 967),
+    NAME_FUNC_OFFSET(17592, glCreateShaderProgramEXT, glCreateShaderProgramEXT, NULL, 968),
+    NAME_FUNC_OFFSET(17617, glUseShaderProgramEXT, glUseShaderProgramEXT, NULL, 969),
+    NAME_FUNC_OFFSET(17639, glTextureBarrierNV, glTextureBarrierNV, NULL, 970),
+    NAME_FUNC_OFFSET(17658, gl_dispatch_stub_971, gl_dispatch_stub_971, NULL, 971),
+    NAME_FUNC_OFFSET(17683, gl_dispatch_stub_972, gl_dispatch_stub_972, NULL, 972),
+    NAME_FUNC_OFFSET(17712, gl_dispatch_stub_973, gl_dispatch_stub_973, NULL, 973),
+    NAME_FUNC_OFFSET(17743, gl_dispatch_stub_974, gl_dispatch_stub_974, NULL, 974),
+    NAME_FUNC_OFFSET(17767, gl_dispatch_stub_975, gl_dispatch_stub_975, NULL, 975),
+    NAME_FUNC_OFFSET(17792, glEGLImageTargetRenderbufferStorageOES, glEGLImageTargetRenderbufferStorageOES, NULL, 976),
+    NAME_FUNC_OFFSET(17831, glEGLImageTargetTexture2DOES, glEGLImageTargetTexture2DOES, NULL, 977),
+    NAME_FUNC_OFFSET(17860, glArrayElement, glArrayElement, NULL, 306),
+    NAME_FUNC_OFFSET(17878, glBindTexture, glBindTexture, NULL, 307),
+    NAME_FUNC_OFFSET(17895, glDrawArrays, glDrawArrays, NULL, 310),
+    NAME_FUNC_OFFSET(17911, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, 322),
+    NAME_FUNC_OFFSET(17936, glCopyTexImage1D, glCopyTexImage1D, NULL, 323),
+    NAME_FUNC_OFFSET(17956, glCopyTexImage2D, glCopyTexImage2D, NULL, 324),
+    NAME_FUNC_OFFSET(17976, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, 325),
+    NAME_FUNC_OFFSET(17999, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, 326),
+    NAME_FUNC_OFFSET(18022, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, 327),
+    NAME_FUNC_OFFSET(18042, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, 328),
+    NAME_FUNC_OFFSET(18059, glGetPointerv, glGetPointerv, NULL, 329),
+    NAME_FUNC_OFFSET(18076, glIsTexture, glIsTextureEXT, glIsTextureEXT, 330),
+    NAME_FUNC_OFFSET(18091, glPrioritizeTextures, glPrioritizeTextures, NULL, 331),
+    NAME_FUNC_OFFSET(18115, glTexSubImage1D, glTexSubImage1D, NULL, 332),
+    NAME_FUNC_OFFSET(18134, glTexSubImage2D, glTexSubImage2D, NULL, 333),
+    NAME_FUNC_OFFSET(18153, glBlendColor, glBlendColor, NULL, 336),
+    NAME_FUNC_OFFSET(18169, glBlendEquation, glBlendEquation, NULL, 337),
+    NAME_FUNC_OFFSET(18188, glDrawRangeElements, glDrawRangeElements, NULL, 338),
+    NAME_FUNC_OFFSET(18211, glColorTable, glColorTable, NULL, 339),
+    NAME_FUNC_OFFSET(18227, glColorTable, glColorTable, NULL, 339),
+    NAME_FUNC_OFFSET(18243, glColorTableParameterfv, glColorTableParameterfv, NULL, 340),
+    NAME_FUNC_OFFSET(18270, glColorTableParameteriv, glColorTableParameteriv, NULL, 341),
+    NAME_FUNC_OFFSET(18297, glCopyColorTable, glCopyColorTable, NULL, 342),
+    NAME_FUNC_OFFSET(18317, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, 343),
+    NAME_FUNC_OFFSET(18336, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, 343),
+    NAME_FUNC_OFFSET(18355, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, 344),
+    NAME_FUNC_OFFSET(18385, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, 344),
+    NAME_FUNC_OFFSET(18415, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, 345),
+    NAME_FUNC_OFFSET(18445, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, 345),
+    NAME_FUNC_OFFSET(18475, glColorSubTable, glColorSubTable, NULL, 346),
+    NAME_FUNC_OFFSET(18494, glCopyColorSubTable, glCopyColorSubTable, NULL, 347),
+    NAME_FUNC_OFFSET(18517, glConvolutionFilter1D, glConvolutionFilter1D, NULL, 348),
+    NAME_FUNC_OFFSET(18542, glConvolutionFilter2D, glConvolutionFilter2D, NULL, 349),
+    NAME_FUNC_OFFSET(18567, glConvolutionParameterf, glConvolutionParameterf, NULL, 350),
+    NAME_FUNC_OFFSET(18594, glConvolutionParameterfv, glConvolutionParameterfv, NULL, 351),
+    NAME_FUNC_OFFSET(18622, glConvolutionParameteri, glConvolutionParameteri, NULL, 352),
+    NAME_FUNC_OFFSET(18649, glConvolutionParameteriv, glConvolutionParameteriv, NULL, 353),
+    NAME_FUNC_OFFSET(18677, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, 354),
+    NAME_FUNC_OFFSET(18706, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, 355),
+    NAME_FUNC_OFFSET(18735, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, 356),
+    NAME_FUNC_OFFSET(18761, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, 357),
+    NAME_FUNC_OFFSET(18792, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, 358),
+    NAME_FUNC_OFFSET(18823, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, 359),
+    NAME_FUNC_OFFSET(18847, glSeparableFilter2D, glSeparableFilter2D, NULL, 360),
+    NAME_FUNC_OFFSET(18870, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, 361),
+    NAME_FUNC_OFFSET(18888, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, 362),
+    NAME_FUNC_OFFSET(18917, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, 363),
+    NAME_FUNC_OFFSET(18946, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, 364),
+    NAME_FUNC_OFFSET(18961, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, 365),
+    NAME_FUNC_OFFSET(18987, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, 366),
+    NAME_FUNC_OFFSET(19013, glHistogram, glHistogram, NULL, 367),
+    NAME_FUNC_OFFSET(19028, glMinmax, glMinmax, NULL, 368),
+    NAME_FUNC_OFFSET(19040, glResetHistogram, glResetHistogram, NULL, 369),
+    NAME_FUNC_OFFSET(19060, glResetMinmax, glResetMinmax, NULL, 370),
+    NAME_FUNC_OFFSET(19077, glTexImage3D, glTexImage3D, NULL, 371),
+    NAME_FUNC_OFFSET(19093, glTexSubImage3D, glTexSubImage3D, NULL, 372),
+    NAME_FUNC_OFFSET(19112, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, 373),
+    NAME_FUNC_OFFSET(19135, glActiveTextureARB, glActiveTextureARB, NULL, 374),
+    NAME_FUNC_OFFSET(19151, glClientActiveTextureARB, glClientActiveTextureARB, NULL, 375),
+    NAME_FUNC_OFFSET(19173, glMultiTexCoord1dARB, glMultiTexCoord1dARB, NULL, 376),
+    NAME_FUNC_OFFSET(19191, glMultiTexCoord1dvARB, glMultiTexCoord1dvARB, NULL, 377),
+    NAME_FUNC_OFFSET(19210, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, 378),
+    NAME_FUNC_OFFSET(19228, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, 379),
+    NAME_FUNC_OFFSET(19247, glMultiTexCoord1iARB, glMultiTexCoord1iARB, NULL, 380),
+    NAME_FUNC_OFFSET(19265, glMultiTexCoord1ivARB, glMultiTexCoord1ivARB, NULL, 381),
+    NAME_FUNC_OFFSET(19284, glMultiTexCoord1sARB, glMultiTexCoord1sARB, NULL, 382),
+    NAME_FUNC_OFFSET(19302, glMultiTexCoord1svARB, glMultiTexCoord1svARB, NULL, 383),
+    NAME_FUNC_OFFSET(19321, glMultiTexCoord2dARB, glMultiTexCoord2dARB, NULL, 384),
+    NAME_FUNC_OFFSET(19339, glMultiTexCoord2dvARB, glMultiTexCoord2dvARB, NULL, 385),
+    NAME_FUNC_OFFSET(19358, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, 386),
+    NAME_FUNC_OFFSET(19376, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, 387),
+    NAME_FUNC_OFFSET(19395, glMultiTexCoord2iARB, glMultiTexCoord2iARB, NULL, 388),
+    NAME_FUNC_OFFSET(19413, glMultiTexCoord2ivARB, glMultiTexCoord2ivARB, NULL, 389),
+    NAME_FUNC_OFFSET(19432, glMultiTexCoord2sARB, glMultiTexCoord2sARB, NULL, 390),
+    NAME_FUNC_OFFSET(19450, glMultiTexCoord2svARB, glMultiTexCoord2svARB, NULL, 391),
+    NAME_FUNC_OFFSET(19469, glMultiTexCoord3dARB, glMultiTexCoord3dARB, NULL, 392),
+    NAME_FUNC_OFFSET(19487, glMultiTexCoord3dvARB, glMultiTexCoord3dvARB, NULL, 393),
+    NAME_FUNC_OFFSET(19506, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, 394),
+    NAME_FUNC_OFFSET(19524, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, 395),
+    NAME_FUNC_OFFSET(19543, glMultiTexCoord3iARB, glMultiTexCoord3iARB, NULL, 396),
+    NAME_FUNC_OFFSET(19561, glMultiTexCoord3ivARB, glMultiTexCoord3ivARB, NULL, 397),
+    NAME_FUNC_OFFSET(19580, glMultiTexCoord3sARB, glMultiTexCoord3sARB, NULL, 398),
+    NAME_FUNC_OFFSET(19598, glMultiTexCoord3svARB, glMultiTexCoord3svARB, NULL, 399),
+    NAME_FUNC_OFFSET(19617, glMultiTexCoord4dARB, glMultiTexCoord4dARB, NULL, 400),
+    NAME_FUNC_OFFSET(19635, glMultiTexCoord4dvARB, glMultiTexCoord4dvARB, NULL, 401),
+    NAME_FUNC_OFFSET(19654, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, 402),
+    NAME_FUNC_OFFSET(19672, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, 403),
+    NAME_FUNC_OFFSET(19691, glMultiTexCoord4iARB, glMultiTexCoord4iARB, NULL, 404),
+    NAME_FUNC_OFFSET(19709, glMultiTexCoord4ivARB, glMultiTexCoord4ivARB, NULL, 405),
+    NAME_FUNC_OFFSET(19728, glMultiTexCoord4sARB, glMultiTexCoord4sARB, NULL, 406),
+    NAME_FUNC_OFFSET(19746, glMultiTexCoord4svARB, glMultiTexCoord4svARB, NULL, 407),
+    NAME_FUNC_OFFSET(19765, glStencilOpSeparate, glStencilOpSeparate, NULL, 423),
+    NAME_FUNC_OFFSET(19788, glLoadTransposeMatrixdARB, glLoadTransposeMatrixdARB, NULL, 440),
+    NAME_FUNC_OFFSET(19811, glLoadTransposeMatrixfARB, glLoadTransposeMatrixfARB, NULL, 441),
+    NAME_FUNC_OFFSET(19834, glMultTransposeMatrixdARB, glMultTransposeMatrixdARB, NULL, 442),
+    NAME_FUNC_OFFSET(19857, glMultTransposeMatrixfARB, glMultTransposeMatrixfARB, NULL, 443),
+    NAME_FUNC_OFFSET(19880, glSampleCoverageARB, glSampleCoverageARB, NULL, 444),
+    NAME_FUNC_OFFSET(19897, glCompressedTexImage1DARB, glCompressedTexImage1DARB, NULL, 445),
+    NAME_FUNC_OFFSET(19920, glCompressedTexImage2DARB, glCompressedTexImage2DARB, NULL, 446),
+    NAME_FUNC_OFFSET(19943, glCompressedTexImage3DARB, glCompressedTexImage3DARB, NULL, 447),
+    NAME_FUNC_OFFSET(19966, glCompressedTexSubImage1DARB, glCompressedTexSubImage1DARB, NULL, 448),
+    NAME_FUNC_OFFSET(19992, glCompressedTexSubImage2DARB, glCompressedTexSubImage2DARB, NULL, 449),
+    NAME_FUNC_OFFSET(20018, glCompressedTexSubImage3DARB, glCompressedTexSubImage3DARB, NULL, 450),
+    NAME_FUNC_OFFSET(20044, glGetCompressedTexImageARB, glGetCompressedTexImageARB, NULL, 451),
+    NAME_FUNC_OFFSET(20068, glDisableVertexAttribArrayARB, glDisableVertexAttribArrayARB, NULL, 452),
+    NAME_FUNC_OFFSET(20095, glEnableVertexAttribArrayARB, glEnableVertexAttribArrayARB, NULL, 453),
+    NAME_FUNC_OFFSET(20121, glGetVertexAttribdvARB, glGetVertexAttribdvARB, NULL, 460),
+    NAME_FUNC_OFFSET(20141, glGetVertexAttribfvARB, glGetVertexAttribfvARB, NULL, 461),
+    NAME_FUNC_OFFSET(20161, glGetVertexAttribivARB, glGetVertexAttribivARB, NULL, 462),
+    NAME_FUNC_OFFSET(20181, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, 463),
+    NAME_FUNC_OFFSET(20204, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, 464),
+    NAME_FUNC_OFFSET(20228, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, 465),
+    NAME_FUNC_OFFSET(20251, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, 466),
+    NAME_FUNC_OFFSET(20275, glVertexAttrib1dARB, glVertexAttrib1dARB, NULL, 472),
+    NAME_FUNC_OFFSET(20292, glVertexAttrib1dvARB, glVertexAttrib1dvARB, NULL, 473),
+    NAME_FUNC_OFFSET(20310, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, 474),
+    NAME_FUNC_OFFSET(20327, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, 475),
+    NAME_FUNC_OFFSET(20345, glVertexAttrib1sARB, glVertexAttrib1sARB, NULL, 476),
+    NAME_FUNC_OFFSET(20362, glVertexAttrib1svARB, glVertexAttrib1svARB, NULL, 477),
+    NAME_FUNC_OFFSET(20380, glVertexAttrib2dARB, glVertexAttrib2dARB, NULL, 478),
+    NAME_FUNC_OFFSET(20397, glVertexAttrib2dvARB, glVertexAttrib2dvARB, NULL, 479),
+    NAME_FUNC_OFFSET(20415, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, 480),
+    NAME_FUNC_OFFSET(20432, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, 481),
+    NAME_FUNC_OFFSET(20450, glVertexAttrib2sARB, glVertexAttrib2sARB, NULL, 482),
+    NAME_FUNC_OFFSET(20467, glVertexAttrib2svARB, glVertexAttrib2svARB, NULL, 483),
+    NAME_FUNC_OFFSET(20485, glVertexAttrib3dARB, glVertexAttrib3dARB, NULL, 484),
+    NAME_FUNC_OFFSET(20502, glVertexAttrib3dvARB, glVertexAttrib3dvARB, NULL, 485),
+    NAME_FUNC_OFFSET(20520, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, 486),
+    NAME_FUNC_OFFSET(20537, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, 487),
+    NAME_FUNC_OFFSET(20555, glVertexAttrib3sARB, glVertexAttrib3sARB, NULL, 488),
+    NAME_FUNC_OFFSET(20572, glVertexAttrib3svARB, glVertexAttrib3svARB, NULL, 489),
+    NAME_FUNC_OFFSET(20590, glVertexAttrib4NbvARB, glVertexAttrib4NbvARB, NULL, 490),
+    NAME_FUNC_OFFSET(20609, glVertexAttrib4NivARB, glVertexAttrib4NivARB, NULL, 491),
+    NAME_FUNC_OFFSET(20628, glVertexAttrib4NsvARB, glVertexAttrib4NsvARB, NULL, 492),
+    NAME_FUNC_OFFSET(20647, glVertexAttrib4NubARB, glVertexAttrib4NubARB, NULL, 493),
+    NAME_FUNC_OFFSET(20666, glVertexAttrib4NubvARB, glVertexAttrib4NubvARB, NULL, 494),
+    NAME_FUNC_OFFSET(20686, glVertexAttrib4NuivARB, glVertexAttrib4NuivARB, NULL, 495),
+    NAME_FUNC_OFFSET(20706, glVertexAttrib4NusvARB, glVertexAttrib4NusvARB, NULL, 496),
+    NAME_FUNC_OFFSET(20726, glVertexAttrib4bvARB, glVertexAttrib4bvARB, NULL, 497),
+    NAME_FUNC_OFFSET(20744, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL, 498),
+    NAME_FUNC_OFFSET(20761, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL, 499),
+    NAME_FUNC_OFFSET(20779, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, 500),
+    NAME_FUNC_OFFSET(20796, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, 501),
+    NAME_FUNC_OFFSET(20814, glVertexAttrib4ivARB, glVertexAttrib4ivARB, NULL, 502),
+    NAME_FUNC_OFFSET(20832, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL, 503),
+    NAME_FUNC_OFFSET(20849, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL, 504),
+    NAME_FUNC_OFFSET(20867, glVertexAttrib4ubvARB, glVertexAttrib4ubvARB, NULL, 505),
+    NAME_FUNC_OFFSET(20886, glVertexAttrib4uivARB, glVertexAttrib4uivARB, NULL, 506),
+    NAME_FUNC_OFFSET(20905, glVertexAttrib4usvARB, glVertexAttrib4usvARB, NULL, 507),
+    NAME_FUNC_OFFSET(20924, glVertexAttribPointerARB, glVertexAttribPointerARB, NULL, 508),
+    NAME_FUNC_OFFSET(20946, glBindBufferARB, glBindBufferARB, NULL, 509),
+    NAME_FUNC_OFFSET(20959, glBufferDataARB, glBufferDataARB, NULL, 510),
+    NAME_FUNC_OFFSET(20972, glBufferSubDataARB, glBufferSubDataARB, NULL, 511),
+    NAME_FUNC_OFFSET(20988, glDeleteBuffersARB, glDeleteBuffersARB, NULL, 512),
+    NAME_FUNC_OFFSET(21004, glGenBuffersARB, glGenBuffersARB, NULL, 513),
+    NAME_FUNC_OFFSET(21017, glGetBufferParameterivARB, glGetBufferParameterivARB, NULL, 514),
+    NAME_FUNC_OFFSET(21040, glGetBufferPointervARB, glGetBufferPointervARB, NULL, 515),
+    NAME_FUNC_OFFSET(21060, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL, 516),
+    NAME_FUNC_OFFSET(21079, glIsBufferARB, glIsBufferARB, NULL, 517),
+    NAME_FUNC_OFFSET(21090, glMapBufferARB, glMapBufferARB, NULL, 518),
+    NAME_FUNC_OFFSET(21102, glUnmapBufferARB, glUnmapBufferARB, NULL, 519),
+    NAME_FUNC_OFFSET(21116, glBeginQueryARB, glBeginQueryARB, NULL, 520),
+    NAME_FUNC_OFFSET(21129, glDeleteQueriesARB, glDeleteQueriesARB, NULL, 521),
+    NAME_FUNC_OFFSET(21145, glEndQueryARB, glEndQueryARB, NULL, 522),
+    NAME_FUNC_OFFSET(21156, glGenQueriesARB, glGenQueriesARB, NULL, 523),
+    NAME_FUNC_OFFSET(21169, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL, 524),
+    NAME_FUNC_OFFSET(21188, glGetQueryObjectuivARB, glGetQueryObjectuivARB, NULL, 525),
+    NAME_FUNC_OFFSET(21208, glGetQueryivARB, glGetQueryivARB, NULL, 526),
+    NAME_FUNC_OFFSET(21221, glIsQueryARB, glIsQueryARB, NULL, 527),
+    NAME_FUNC_OFFSET(21231, glCompileShaderARB, glCompileShaderARB, NULL, 529),
+    NAME_FUNC_OFFSET(21247, glGetActiveUniformARB, glGetActiveUniformARB, NULL, 534),
+    NAME_FUNC_OFFSET(21266, glGetShaderSourceARB, glGetShaderSourceARB, NULL, 540),
+    NAME_FUNC_OFFSET(21284, glGetUniformLocationARB, glGetUniformLocationARB, NULL, 541),
+    NAME_FUNC_OFFSET(21305, glGetUniformfvARB, glGetUniformfvARB, NULL, 542),
+    NAME_FUNC_OFFSET(21320, glGetUniformivARB, glGetUniformivARB, NULL, 543),
+    NAME_FUNC_OFFSET(21335, glLinkProgramARB, glLinkProgramARB, NULL, 544),
+    NAME_FUNC_OFFSET(21349, glShaderSourceARB, glShaderSourceARB, NULL, 545),
+    NAME_FUNC_OFFSET(21364, glUniform1fARB, glUniform1fARB, NULL, 546),
+    NAME_FUNC_OFFSET(21376, glUniform1fvARB, glUniform1fvARB, NULL, 547),
+    NAME_FUNC_OFFSET(21389, glUniform1iARB, glUniform1iARB, NULL, 548),
+    NAME_FUNC_OFFSET(21401, glUniform1ivARB, glUniform1ivARB, NULL, 549),
+    NAME_FUNC_OFFSET(21414, glUniform2fARB, glUniform2fARB, NULL, 550),
+    NAME_FUNC_OFFSET(21426, glUniform2fvARB, glUniform2fvARB, NULL, 551),
+    NAME_FUNC_OFFSET(21439, glUniform2iARB, glUniform2iARB, NULL, 552),
+    NAME_FUNC_OFFSET(21451, glUniform2ivARB, glUniform2ivARB, NULL, 553),
+    NAME_FUNC_OFFSET(21464, glUniform3fARB, glUniform3fARB, NULL, 554),
+    NAME_FUNC_OFFSET(21476, glUniform3fvARB, glUniform3fvARB, NULL, 555),
+    NAME_FUNC_OFFSET(21489, glUniform3iARB, glUniform3iARB, NULL, 556),
+    NAME_FUNC_OFFSET(21501, glUniform3ivARB, glUniform3ivARB, NULL, 557),
+    NAME_FUNC_OFFSET(21514, glUniform4fARB, glUniform4fARB, NULL, 558),
+    NAME_FUNC_OFFSET(21526, glUniform4fvARB, glUniform4fvARB, NULL, 559),
+    NAME_FUNC_OFFSET(21539, glUniform4iARB, glUniform4iARB, NULL, 560),
+    NAME_FUNC_OFFSET(21551, glUniform4ivARB, glUniform4ivARB, NULL, 561),
+    NAME_FUNC_OFFSET(21564, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL, 562),
+    NAME_FUNC_OFFSET(21583, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL, 563),
+    NAME_FUNC_OFFSET(21602, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL, 564),
+    NAME_FUNC_OFFSET(21621, glUseProgramObjectARB, glUseProgramObjectARB, NULL, 565),
+    NAME_FUNC_OFFSET(21634, glValidateProgramARB, glValidateProgramARB, NULL, 566),
+    NAME_FUNC_OFFSET(21652, glBindAttribLocationARB, glBindAttribLocationARB, NULL, 567),
+    NAME_FUNC_OFFSET(21673, glGetActiveAttribARB, glGetActiveAttribARB, NULL, 568),
+    NAME_FUNC_OFFSET(21691, glGetAttribLocationARB, glGetAttribLocationARB, NULL, 569),
+    NAME_FUNC_OFFSET(21711, glDrawBuffersARB, glDrawBuffersARB, NULL, 570),
+    NAME_FUNC_OFFSET(21725, glDrawBuffersARB, glDrawBuffersARB, NULL, 570),
+    NAME_FUNC_OFFSET(21742, glDrawBuffersARB, glDrawBuffersARB, NULL, 570),
+    NAME_FUNC_OFFSET(21758, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 572),
+    NAME_FUNC_OFFSET(21783, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 572),
+    NAME_FUNC_OFFSET(21805, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 573),
+    NAME_FUNC_OFFSET(21832, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 573),
+    NAME_FUNC_OFFSET(21856, glRenderbufferStorageMultisample, glRenderbufferStorageMultisample, NULL, 574),
+    NAME_FUNC_OFFSET(21892, glTexBufferARB, glTexBufferARB, NULL, 581),
+    NAME_FUNC_OFFSET(21904, glBlendEquationSeparateiARB, glBlendEquationSeparateiARB, NULL, 596),
+    NAME_FUNC_OFFSET(21938, glBlendEquationiARB, glBlendEquationiARB, NULL, 597),
+    NAME_FUNC_OFFSET(21964, glBlendFuncSeparateiARB, glBlendFuncSeparateiARB, NULL, 598),
+    NAME_FUNC_OFFSET(21994, glBlendFunciARB, glBlendFunciARB, NULL, 599),
+    NAME_FUNC_OFFSET(22016, gl_dispatch_stub_703, gl_dispatch_stub_703, NULL, 703),
+    NAME_FUNC_OFFSET(22032, gl_dispatch_stub_704, gl_dispatch_stub_704, NULL, 704),
+    NAME_FUNC_OFFSET(22051, glPointParameterfEXT, glPointParameterfEXT, NULL, 711),
+    NAME_FUNC_OFFSET(22069, glPointParameterfEXT, glPointParameterfEXT, NULL, 711),
+    NAME_FUNC_OFFSET(22090, glPointParameterfEXT, glPointParameterfEXT, NULL, 711),
+    NAME_FUNC_OFFSET(22112, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 712),
+    NAME_FUNC_OFFSET(22131, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 712),
+    NAME_FUNC_OFFSET(22153, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 712),
+    NAME_FUNC_OFFSET(22176, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, 715),
+    NAME_FUNC_OFFSET(22195, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, 716),
+    NAME_FUNC_OFFSET(22215, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, 717),
+    NAME_FUNC_OFFSET(22234, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, 718),
+    NAME_FUNC_OFFSET(22254, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, 719),
+    NAME_FUNC_OFFSET(22273, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, 720),
+    NAME_FUNC_OFFSET(22293, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, 721),
+    NAME_FUNC_OFFSET(22312, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, 722),
+    NAME_FUNC_OFFSET(22332, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, 723),
+    NAME_FUNC_OFFSET(22351, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, 724),
+    NAME_FUNC_OFFSET(22371, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, 725),
+    NAME_FUNC_OFFSET(22391, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, 726),
+    NAME_FUNC_OFFSET(22412, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, 727),
+    NAME_FUNC_OFFSET(22432, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, 728),
+    NAME_FUNC_OFFSET(22453, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, 729),
+    NAME_FUNC_OFFSET(22473, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, 730),
+    NAME_FUNC_OFFSET(22494, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, 731),
+    NAME_FUNC_OFFSET(22518, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, 732),
+    NAME_FUNC_OFFSET(22536, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, 733),
+    NAME_FUNC_OFFSET(22556, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, 734),
+    NAME_FUNC_OFFSET(22574, glFogCoorddEXT, glFogCoorddEXT, NULL, 735),
+    NAME_FUNC_OFFSET(22586, glFogCoorddvEXT, glFogCoorddvEXT, NULL, 736),
+    NAME_FUNC_OFFSET(22599, glFogCoordfEXT, glFogCoordfEXT, NULL, 737),
+    NAME_FUNC_OFFSET(22611, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 738),
+    NAME_FUNC_OFFSET(22624, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, 740),
+    NAME_FUNC_OFFSET(22644, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, 740),
+    NAME_FUNC_OFFSET(22668, glWindowPos2dMESA, glWindowPos2dMESA, NULL, 757),
+    NAME_FUNC_OFFSET(22682, glWindowPos2dMESA, glWindowPos2dMESA, NULL, 757),
+    NAME_FUNC_OFFSET(22699, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, 758),
+    NAME_FUNC_OFFSET(22714, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, 758),
+    NAME_FUNC_OFFSET(22732, glWindowPos2fMESA, glWindowPos2fMESA, NULL, 759),
+    NAME_FUNC_OFFSET(22746, glWindowPos2fMESA, glWindowPos2fMESA, NULL, 759),
+    NAME_FUNC_OFFSET(22763, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, 760),
+    NAME_FUNC_OFFSET(22778, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, 760),
+    NAME_FUNC_OFFSET(22796, glWindowPos2iMESA, glWindowPos2iMESA, NULL, 761),
+    NAME_FUNC_OFFSET(22810, glWindowPos2iMESA, glWindowPos2iMESA, NULL, 761),
+    NAME_FUNC_OFFSET(22827, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, 762),
+    NAME_FUNC_OFFSET(22842, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, 762),
+    NAME_FUNC_OFFSET(22860, glWindowPos2sMESA, glWindowPos2sMESA, NULL, 763),
+    NAME_FUNC_OFFSET(22874, glWindowPos2sMESA, glWindowPos2sMESA, NULL, 763),
+    NAME_FUNC_OFFSET(22891, glWindowPos2svMESA, glWindowPos2svMESA, NULL, 764),
+    NAME_FUNC_OFFSET(22906, glWindowPos2svMESA, glWindowPos2svMESA, NULL, 764),
+    NAME_FUNC_OFFSET(22924, glWindowPos3dMESA, glWindowPos3dMESA, NULL, 765),
+    NAME_FUNC_OFFSET(22938, glWindowPos3dMESA, glWindowPos3dMESA, NULL, 765),
+    NAME_FUNC_OFFSET(22955, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, 766),
+    NAME_FUNC_OFFSET(22970, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, 766),
+    NAME_FUNC_OFFSET(22988, glWindowPos3fMESA, glWindowPos3fMESA, NULL, 767),
+    NAME_FUNC_OFFSET(23002, glWindowPos3fMESA, glWindowPos3fMESA, NULL, 767),
+    NAME_FUNC_OFFSET(23019, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, 768),
+    NAME_FUNC_OFFSET(23034, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, 768),
+    NAME_FUNC_OFFSET(23052, glWindowPos3iMESA, glWindowPos3iMESA, NULL, 769),
+    NAME_FUNC_OFFSET(23066, glWindowPos3iMESA, glWindowPos3iMESA, NULL, 769),
+    NAME_FUNC_OFFSET(23083, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, 770),
+    NAME_FUNC_OFFSET(23098, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, 770),
+    NAME_FUNC_OFFSET(23116, glWindowPos3sMESA, glWindowPos3sMESA, NULL, 771),
+    NAME_FUNC_OFFSET(23130, glWindowPos3sMESA, glWindowPos3sMESA, NULL, 771),
+    NAME_FUNC_OFFSET(23147, glWindowPos3svMESA, glWindowPos3svMESA, NULL, 772),
+    NAME_FUNC_OFFSET(23162, glWindowPos3svMESA, glWindowPos3svMESA, NULL, 772),
+    NAME_FUNC_OFFSET(23180, glBindProgramNV, glBindProgramNV, NULL, 791),
+    NAME_FUNC_OFFSET(23197, glDeleteProgramsNV, glDeleteProgramsNV, NULL, 792),
+    NAME_FUNC_OFFSET(23217, glGenProgramsNV, glGenProgramsNV, NULL, 794),
+    NAME_FUNC_OFFSET(23234, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, 800),
+    NAME_FUNC_OFFSET(23260, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, 800),
+    NAME_FUNC_OFFSET(23289, glIsProgramNV, glIsProgramNV, NULL, 804),
+    NAME_FUNC_OFFSET(23304, glPointParameteriNV, glPointParameteriNV, NULL, 868),
+    NAME_FUNC_OFFSET(23322, glPointParameterivNV, glPointParameterivNV, NULL, 869),
+    NAME_FUNC_OFFSET(23341, gl_dispatch_stub_872, gl_dispatch_stub_872, NULL, 872),
+    NAME_FUNC_OFFSET(23362, gl_dispatch_stub_874, gl_dispatch_stub_874, NULL, 874),
+    NAME_FUNC_OFFSET(23378, glPrimitiveRestartIndexNV, glPrimitiveRestartIndexNV, NULL, 881),
+    NAME_FUNC_OFFSET(23402, gl_dispatch_stub_884, gl_dispatch_stub_884, NULL, 884),
+    NAME_FUNC_OFFSET(23426, gl_dispatch_stub_884, gl_dispatch_stub_884, NULL, 884),
+    NAME_FUNC_OFFSET(23453, glBindFramebufferEXT, glBindFramebufferEXT, NULL, 885),
+    NAME_FUNC_OFFSET(23471, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, 886),
+    NAME_FUNC_OFFSET(23490, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, 887),
+    NAME_FUNC_OFFSET(23515, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, 888),
+    NAME_FUNC_OFFSET(23536, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, 889),
+    NAME_FUNC_OFFSET(23558, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, 890),
+    NAME_FUNC_OFFSET(23584, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, 891),
+    NAME_FUNC_OFFSET(23607, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, 892),
+    NAME_FUNC_OFFSET(23630, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, 893),
+    NAME_FUNC_OFFSET(23653, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, 894),
+    NAME_FUNC_OFFSET(23671, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, 895),
+    NAME_FUNC_OFFSET(23690, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, 896),
+    NAME_FUNC_OFFSET(23707, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, 897),
+    NAME_FUNC_OFFSET(23745, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, 898),
+    NAME_FUNC_OFFSET(23774, glIsFramebufferEXT, glIsFramebufferEXT, NULL, 899),
+    NAME_FUNC_OFFSET(23790, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, 900),
+    NAME_FUNC_OFFSET(23807, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, 901),
+    NAME_FUNC_OFFSET(23829, gl_dispatch_stub_902, gl_dispatch_stub_902, NULL, 902),
+    NAME_FUNC_OFFSET(23847, glBindFragDataLocationEXT, glBindFragDataLocationEXT, NULL, 905),
+    NAME_FUNC_OFFSET(23870, glGetFragDataLocationEXT, glGetFragDataLocationEXT, NULL, 906),
+    NAME_FUNC_OFFSET(23892, glGetUniformuivEXT, glGetUniformuivEXT, NULL, 907),
+    NAME_FUNC_OFFSET(23908, glGetVertexAttribIivEXT, glGetVertexAttribIivEXT, NULL, 908),
+    NAME_FUNC_OFFSET(23929, glGetVertexAttribIuivEXT, glGetVertexAttribIuivEXT, NULL, 909),
+    NAME_FUNC_OFFSET(23951, glUniform1uiEXT, glUniform1uiEXT, NULL, 910),
+    NAME_FUNC_OFFSET(23964, glUniform1uivEXT, glUniform1uivEXT, NULL, 911),
+    NAME_FUNC_OFFSET(23978, glUniform2uiEXT, glUniform2uiEXT, NULL, 912),
+    NAME_FUNC_OFFSET(23991, glUniform2uivEXT, glUniform2uivEXT, NULL, 913),
+    NAME_FUNC_OFFSET(24005, glUniform3uiEXT, glUniform3uiEXT, NULL, 914),
+    NAME_FUNC_OFFSET(24018, glUniform3uivEXT, glUniform3uivEXT, NULL, 915),
+    NAME_FUNC_OFFSET(24032, glUniform4uiEXT, glUniform4uiEXT, NULL, 916),
+    NAME_FUNC_OFFSET(24045, glUniform4uivEXT, glUniform4uivEXT, NULL, 917),
+    NAME_FUNC_OFFSET(24059, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL, 918),
+    NAME_FUNC_OFFSET(24077, glVertexAttribI1ivEXT, glVertexAttribI1ivEXT, NULL, 919),
+    NAME_FUNC_OFFSET(24096, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL, 920),
+    NAME_FUNC_OFFSET(24115, glVertexAttribI1uivEXT, glVertexAttribI1uivEXT, NULL, 921),
+    NAME_FUNC_OFFSET(24135, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL, 922),
+    NAME_FUNC_OFFSET(24153, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL, 923),
+    NAME_FUNC_OFFSET(24172, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL, 924),
+    NAME_FUNC_OFFSET(24191, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT, NULL, 925),
+    NAME_FUNC_OFFSET(24211, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL, 926),
+    NAME_FUNC_OFFSET(24229, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL, 927),
+    NAME_FUNC_OFFSET(24248, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL, 928),
+    NAME_FUNC_OFFSET(24267, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT, NULL, 929),
+    NAME_FUNC_OFFSET(24287, glVertexAttribI4bvEXT, glVertexAttribI4bvEXT, NULL, 930),
+    NAME_FUNC_OFFSET(24306, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL, 931),
+    NAME_FUNC_OFFSET(24324, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL, 932),
+    NAME_FUNC_OFFSET(24343, glVertexAttribI4svEXT, glVertexAttribI4svEXT, NULL, 933),
+    NAME_FUNC_OFFSET(24362, glVertexAttribI4ubvEXT, glVertexAttribI4ubvEXT, NULL, 934),
+    NAME_FUNC_OFFSET(24382, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL, 935),
+    NAME_FUNC_OFFSET(24401, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT, NULL, 936),
+    NAME_FUNC_OFFSET(24421, glVertexAttribI4usvEXT, glVertexAttribI4usvEXT, NULL, 937),
+    NAME_FUNC_OFFSET(24441, glVertexAttribIPointerEXT, glVertexAttribIPointerEXT, NULL, 938),
+    NAME_FUNC_OFFSET(24464, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, 939),
+    NAME_FUNC_OFFSET(24490, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, 939),
+    NAME_FUNC_OFFSET(24519, glColorMaskIndexedEXT, glColorMaskIndexedEXT, NULL, 940),
+    NAME_FUNC_OFFSET(24532, glDisableIndexedEXT, glDisableIndexedEXT, NULL, 941),
+    NAME_FUNC_OFFSET(24543, glEnableIndexedEXT, glEnableIndexedEXT, NULL, 942),
+    NAME_FUNC_OFFSET(24553, glGetBooleanIndexedvEXT, glGetBooleanIndexedvEXT, NULL, 943),
+    NAME_FUNC_OFFSET(24569, glGetIntegerIndexedvEXT, glGetIntegerIndexedvEXT, NULL, 944),
+    NAME_FUNC_OFFSET(24585, glIsEnabledIndexedEXT, glIsEnabledIndexedEXT, NULL, 945),
+    NAME_FUNC_OFFSET(24598, glGetTexParameterIivEXT, glGetTexParameterIivEXT, NULL, 948),
+    NAME_FUNC_OFFSET(24619, glGetTexParameterIuivEXT, glGetTexParameterIuivEXT, NULL, 949),
+    NAME_FUNC_OFFSET(24641, glTexParameterIivEXT, glTexParameterIivEXT, NULL, 950),
+    NAME_FUNC_OFFSET(24659, glTexParameterIuivEXT, glTexParameterIuivEXT, NULL, 951),
+    NAME_FUNC_OFFSET(24678, glBeginConditionalRenderNV, glBeginConditionalRenderNV, NULL, 952),
+    NAME_FUNC_OFFSET(24703, glEndConditionalRenderNV, glEndConditionalRenderNV, NULL, 953),
+    NAME_FUNC_OFFSET(24726, glBeginTransformFeedbackEXT, glBeginTransformFeedbackEXT, NULL, 954),
+    NAME_FUNC_OFFSET(24751, glBindBufferBaseEXT, glBindBufferBaseEXT, NULL, 955),
+    NAME_FUNC_OFFSET(24768, glBindBufferRangeEXT, glBindBufferRangeEXT, NULL, 957),
+    NAME_FUNC_OFFSET(24786, glEndTransformFeedbackEXT, glEndTransformFeedbackEXT, NULL, 958),
+    NAME_FUNC_OFFSET(24809, glGetTransformFeedbackVaryingEXT, glGetTransformFeedbackVaryingEXT, NULL, 959),
+    NAME_FUNC_OFFSET(24839, glTransformFeedbackVaryingsEXT, glTransformFeedbackVaryingsEXT, NULL, 960),
+    NAME_FUNC_OFFSET(24867, glProvokingVertexEXT, glProvokingVertexEXT, NULL, 961),
     NAME_FUNC_OFFSET(-1, NULL, NULL, NULL, 0)
 };
 
diff --git a/mesalib/src/mesa/main/dispatch.h b/mesalib/src/mesa/main/dispatch.h
index e5b05b7b5..03c5992b9 100644
--- a/mesalib/src/mesa/main/dispatch.h
+++ b/mesalib/src/mesa/main/dispatch.h
@@ -63,7 +63,7 @@
     } while(0)
 
 /* total number of offsets below */
-#define _gloffset_COUNT 979
+#define _gloffset_COUNT 978
 
 #define _gloffset_NewList 0
 #define _gloffset_EndList 1
@@ -504,553 +504,552 @@
 #define _gloffset_ClearBufferiv 433
 #define _gloffset_ClearBufferuiv 434
 #define _gloffset_GetStringi 435
-#define _gloffset_TexBuffer 436
-#define _gloffset_FramebufferTexture 437
-#define _gloffset_GetBufferParameteri64v 438
-#define _gloffset_GetInteger64i_v 439
-#define _gloffset_VertexAttribDivisor 440
-#define _gloffset_LoadTransposeMatrixdARB 441
-#define _gloffset_LoadTransposeMatrixfARB 442
-#define _gloffset_MultTransposeMatrixdARB 443
-#define _gloffset_MultTransposeMatrixfARB 444
-#define _gloffset_SampleCoverageARB 445
-#define _gloffset_CompressedTexImage1DARB 446
-#define _gloffset_CompressedTexImage2DARB 447
-#define _gloffset_CompressedTexImage3DARB 448
-#define _gloffset_CompressedTexSubImage1DARB 449
-#define _gloffset_CompressedTexSubImage2DARB 450
-#define _gloffset_CompressedTexSubImage3DARB 451
-#define _gloffset_GetCompressedTexImageARB 452
-#define _gloffset_DisableVertexAttribArrayARB 453
-#define _gloffset_EnableVertexAttribArrayARB 454
-#define _gloffset_GetProgramEnvParameterdvARB 455
-#define _gloffset_GetProgramEnvParameterfvARB 456
-#define _gloffset_GetProgramLocalParameterdvARB 457
-#define _gloffset_GetProgramLocalParameterfvARB 458
-#define _gloffset_GetProgramStringARB 459
-#define _gloffset_GetProgramivARB 460
-#define _gloffset_GetVertexAttribdvARB 461
-#define _gloffset_GetVertexAttribfvARB 462
-#define _gloffset_GetVertexAttribivARB 463
-#define _gloffset_ProgramEnvParameter4dARB 464
-#define _gloffset_ProgramEnvParameter4dvARB 465
-#define _gloffset_ProgramEnvParameter4fARB 466
-#define _gloffset_ProgramEnvParameter4fvARB 467
-#define _gloffset_ProgramLocalParameter4dARB 468
-#define _gloffset_ProgramLocalParameter4dvARB 469
-#define _gloffset_ProgramLocalParameter4fARB 470
-#define _gloffset_ProgramLocalParameter4fvARB 471
-#define _gloffset_ProgramStringARB 472
-#define _gloffset_VertexAttrib1dARB 473
-#define _gloffset_VertexAttrib1dvARB 474
-#define _gloffset_VertexAttrib1fARB 475
-#define _gloffset_VertexAttrib1fvARB 476
-#define _gloffset_VertexAttrib1sARB 477
-#define _gloffset_VertexAttrib1svARB 478
-#define _gloffset_VertexAttrib2dARB 479
-#define _gloffset_VertexAttrib2dvARB 480
-#define _gloffset_VertexAttrib2fARB 481
-#define _gloffset_VertexAttrib2fvARB 482
-#define _gloffset_VertexAttrib2sARB 483
-#define _gloffset_VertexAttrib2svARB 484
-#define _gloffset_VertexAttrib3dARB 485
-#define _gloffset_VertexAttrib3dvARB 486
-#define _gloffset_VertexAttrib3fARB 487
-#define _gloffset_VertexAttrib3fvARB 488
-#define _gloffset_VertexAttrib3sARB 489
-#define _gloffset_VertexAttrib3svARB 490
-#define _gloffset_VertexAttrib4NbvARB 491
-#define _gloffset_VertexAttrib4NivARB 492
-#define _gloffset_VertexAttrib4NsvARB 493
-#define _gloffset_VertexAttrib4NubARB 494
-#define _gloffset_VertexAttrib4NubvARB 495
-#define _gloffset_VertexAttrib4NuivARB 496
-#define _gloffset_VertexAttrib4NusvARB 497
-#define _gloffset_VertexAttrib4bvARB 498
-#define _gloffset_VertexAttrib4dARB 499
-#define _gloffset_VertexAttrib4dvARB 500
-#define _gloffset_VertexAttrib4fARB 501
-#define _gloffset_VertexAttrib4fvARB 502
-#define _gloffset_VertexAttrib4ivARB 503
-#define _gloffset_VertexAttrib4sARB 504
-#define _gloffset_VertexAttrib4svARB 505
-#define _gloffset_VertexAttrib4ubvARB 506
-#define _gloffset_VertexAttrib4uivARB 507
-#define _gloffset_VertexAttrib4usvARB 508
-#define _gloffset_VertexAttribPointerARB 509
-#define _gloffset_BindBufferARB 510
-#define _gloffset_BufferDataARB 511
-#define _gloffset_BufferSubDataARB 512
-#define _gloffset_DeleteBuffersARB 513
-#define _gloffset_GenBuffersARB 514
-#define _gloffset_GetBufferParameterivARB 515
-#define _gloffset_GetBufferPointervARB 516
-#define _gloffset_GetBufferSubDataARB 517
-#define _gloffset_IsBufferARB 518
-#define _gloffset_MapBufferARB 519
-#define _gloffset_UnmapBufferARB 520
-#define _gloffset_BeginQueryARB 521
-#define _gloffset_DeleteQueriesARB 522
-#define _gloffset_EndQueryARB 523
-#define _gloffset_GenQueriesARB 524
-#define _gloffset_GetQueryObjectivARB 525
-#define _gloffset_GetQueryObjectuivARB 526
-#define _gloffset_GetQueryivARB 527
-#define _gloffset_IsQueryARB 528
-#define _gloffset_AttachObjectARB 529
-#define _gloffset_CompileShaderARB 530
-#define _gloffset_CreateProgramObjectARB 531
-#define _gloffset_CreateShaderObjectARB 532
-#define _gloffset_DeleteObjectARB 533
-#define _gloffset_DetachObjectARB 534
-#define _gloffset_GetActiveUniformARB 535
-#define _gloffset_GetAttachedObjectsARB 536
-#define _gloffset_GetHandleARB 537
-#define _gloffset_GetInfoLogARB 538
-#define _gloffset_GetObjectParameterfvARB 539
-#define _gloffset_GetObjectParameterivARB 540
-#define _gloffset_GetShaderSourceARB 541
-#define _gloffset_GetUniformLocationARB 542
-#define _gloffset_GetUniformfvARB 543
-#define _gloffset_GetUniformivARB 544
-#define _gloffset_LinkProgramARB 545
-#define _gloffset_ShaderSourceARB 546
-#define _gloffset_Uniform1fARB 547
-#define _gloffset_Uniform1fvARB 548
-#define _gloffset_Uniform1iARB 549
-#define _gloffset_Uniform1ivARB 550
-#define _gloffset_Uniform2fARB 551
-#define _gloffset_Uniform2fvARB 552
-#define _gloffset_Uniform2iARB 553
-#define _gloffset_Uniform2ivARB 554
-#define _gloffset_Uniform3fARB 555
-#define _gloffset_Uniform3fvARB 556
-#define _gloffset_Uniform3iARB 557
-#define _gloffset_Uniform3ivARB 558
-#define _gloffset_Uniform4fARB 559
-#define _gloffset_Uniform4fvARB 560
-#define _gloffset_Uniform4iARB 561
-#define _gloffset_Uniform4ivARB 562
-#define _gloffset_UniformMatrix2fvARB 563
-#define _gloffset_UniformMatrix3fvARB 564
-#define _gloffset_UniformMatrix4fvARB 565
-#define _gloffset_UseProgramObjectARB 566
-#define _gloffset_ValidateProgramARB 567
-#define _gloffset_BindAttribLocationARB 568
-#define _gloffset_GetActiveAttribARB 569
-#define _gloffset_GetAttribLocationARB 570
-#define _gloffset_DrawBuffersARB 571
-#define _gloffset_ClampColorARB 572
-#define _gloffset_DrawArraysInstancedARB 573
-#define _gloffset_DrawElementsInstancedARB 574
-#define _gloffset_RenderbufferStorageMultisample 575
-#define _gloffset_FramebufferTextureARB 576
-#define _gloffset_FramebufferTextureFaceARB 577
-#define _gloffset_ProgramParameteriARB 578
-#define _gloffset_VertexAttribDivisorARB 579
-#define _gloffset_FlushMappedBufferRange 580
-#define _gloffset_MapBufferRange 581
-#define _gloffset_TexBufferARB 582
-#define _gloffset_BindVertexArray 583
-#define _gloffset_GenVertexArrays 584
-#define _gloffset_CopyBufferSubData 585
-#define _gloffset_ClientWaitSync 586
-#define _gloffset_DeleteSync 587
-#define _gloffset_FenceSync 588
-#define _gloffset_GetInteger64v 589
-#define _gloffset_GetSynciv 590
-#define _gloffset_IsSync 591
-#define _gloffset_WaitSync 592
-#define _gloffset_DrawElementsBaseVertex 593
-#define _gloffset_DrawElementsInstancedBaseVertex 594
-#define _gloffset_DrawRangeElementsBaseVertex 595
-#define _gloffset_MultiDrawElementsBaseVertex 596
-#define _gloffset_BlendEquationSeparateiARB 597
-#define _gloffset_BlendEquationiARB 598
-#define _gloffset_BlendFuncSeparateiARB 599
-#define _gloffset_BlendFunciARB 600
-#define _gloffset_BindFragDataLocationIndexed 601
-#define _gloffset_GetFragDataIndex 602
-#define _gloffset_BindSampler 603
-#define _gloffset_DeleteSamplers 604
-#define _gloffset_GenSamplers 605
-#define _gloffset_GetSamplerParameterIiv 606
-#define _gloffset_GetSamplerParameterIuiv 607
-#define _gloffset_GetSamplerParameterfv 608
-#define _gloffset_GetSamplerParameteriv 609
-#define _gloffset_IsSampler 610
-#define _gloffset_SamplerParameterIiv 611
-#define _gloffset_SamplerParameterIuiv 612
-#define _gloffset_SamplerParameterf 613
-#define _gloffset_SamplerParameterfv 614
-#define _gloffset_SamplerParameteri 615
-#define _gloffset_SamplerParameteriv 616
-#define _gloffset_ColorP3ui 617
-#define _gloffset_ColorP3uiv 618
-#define _gloffset_ColorP4ui 619
-#define _gloffset_ColorP4uiv 620
-#define _gloffset_MultiTexCoordP1ui 621
-#define _gloffset_MultiTexCoordP1uiv 622
-#define _gloffset_MultiTexCoordP2ui 623
-#define _gloffset_MultiTexCoordP2uiv 624
-#define _gloffset_MultiTexCoordP3ui 625
-#define _gloffset_MultiTexCoordP3uiv 626
-#define _gloffset_MultiTexCoordP4ui 627
-#define _gloffset_MultiTexCoordP4uiv 628
-#define _gloffset_NormalP3ui 629
-#define _gloffset_NormalP3uiv 630
-#define _gloffset_SecondaryColorP3ui 631
-#define _gloffset_SecondaryColorP3uiv 632
-#define _gloffset_TexCoordP1ui 633
-#define _gloffset_TexCoordP1uiv 634
-#define _gloffset_TexCoordP2ui 635
-#define _gloffset_TexCoordP2uiv 636
-#define _gloffset_TexCoordP3ui 637
-#define _gloffset_TexCoordP3uiv 638
-#define _gloffset_TexCoordP4ui 639
-#define _gloffset_TexCoordP4uiv 640
-#define _gloffset_VertexAttribP1ui 641
-#define _gloffset_VertexAttribP1uiv 642
-#define _gloffset_VertexAttribP2ui 643
-#define _gloffset_VertexAttribP2uiv 644
-#define _gloffset_VertexAttribP3ui 645
-#define _gloffset_VertexAttribP3uiv 646
-#define _gloffset_VertexAttribP4ui 647
-#define _gloffset_VertexAttribP4uiv 648
-#define _gloffset_VertexP2ui 649
-#define _gloffset_VertexP2uiv 650
-#define _gloffset_VertexP3ui 651
-#define _gloffset_VertexP3uiv 652
-#define _gloffset_VertexP4ui 653
-#define _gloffset_VertexP4uiv 654
-#define _gloffset_BindTransformFeedback 655
-#define _gloffset_DeleteTransformFeedbacks 656
-#define _gloffset_DrawTransformFeedback 657
-#define _gloffset_GenTransformFeedbacks 658
-#define _gloffset_IsTransformFeedback 659
-#define _gloffset_PauseTransformFeedback 660
-#define _gloffset_ResumeTransformFeedback 661
-#define _gloffset_ClearDepthf 662
-#define _gloffset_DepthRangef 663
-#define _gloffset_GetShaderPrecisionFormat 664
-#define _gloffset_ReleaseShaderCompiler 665
-#define _gloffset_ShaderBinary 666
-#define _gloffset_DebugMessageCallbackARB 667
-#define _gloffset_DebugMessageControlARB 668
-#define _gloffset_DebugMessageInsertARB 669
-#define _gloffset_GetDebugMessageLogARB 670
-#define _gloffset_GetGraphicsResetStatusARB 671
-#define _gloffset_GetnColorTableARB 672
-#define _gloffset_GetnCompressedTexImageARB 673
-#define _gloffset_GetnConvolutionFilterARB 674
-#define _gloffset_GetnHistogramARB 675
-#define _gloffset_GetnMapdvARB 676
-#define _gloffset_GetnMapfvARB 677
-#define _gloffset_GetnMapivARB 678
-#define _gloffset_GetnMinmaxARB 679
-#define _gloffset_GetnPixelMapfvARB 680
-#define _gloffset_GetnPixelMapuivARB 681
-#define _gloffset_GetnPixelMapusvARB 682
-#define _gloffset_GetnPolygonStippleARB 683
-#define _gloffset_GetnSeparableFilterARB 684
-#define _gloffset_GetnTexImageARB 685
-#define _gloffset_GetnUniformdvARB 686
-#define _gloffset_GetnUniformfvARB 687
-#define _gloffset_GetnUniformivARB 688
-#define _gloffset_GetnUniformuivARB 689
-#define _gloffset_ReadnPixelsARB 690
-#define _gloffset_TexStorage1D 691
-#define _gloffset_TexStorage2D 692
-#define _gloffset_TexStorage3D 693
-#define _gloffset_TextureStorage1DEXT 694
-#define _gloffset_TextureStorage2DEXT 695
-#define _gloffset_TextureStorage3DEXT 696
-#define _gloffset_PolygonOffsetEXT 697
-#define _gloffset_GetPixelTexGenParameterfvSGIS 698
-#define _gloffset_GetPixelTexGenParameterivSGIS 699
-#define _gloffset_PixelTexGenParameterfSGIS 700
-#define _gloffset_PixelTexGenParameterfvSGIS 701
-#define _gloffset_PixelTexGenParameteriSGIS 702
-#define _gloffset_PixelTexGenParameterivSGIS 703
-#define _gloffset_SampleMaskSGIS 704
-#define _gloffset_SamplePatternSGIS 705
-#define _gloffset_ColorPointerEXT 706
-#define _gloffset_EdgeFlagPointerEXT 707
-#define _gloffset_IndexPointerEXT 708
-#define _gloffset_NormalPointerEXT 709
-#define _gloffset_TexCoordPointerEXT 710
-#define _gloffset_VertexPointerEXT 711
-#define _gloffset_PointParameterfEXT 712
-#define _gloffset_PointParameterfvEXT 713
-#define _gloffset_LockArraysEXT 714
-#define _gloffset_UnlockArraysEXT 715
-#define _gloffset_SecondaryColor3bEXT 716
-#define _gloffset_SecondaryColor3bvEXT 717
-#define _gloffset_SecondaryColor3dEXT 718
-#define _gloffset_SecondaryColor3dvEXT 719
-#define _gloffset_SecondaryColor3fEXT 720
-#define _gloffset_SecondaryColor3fvEXT 721
-#define _gloffset_SecondaryColor3iEXT 722
-#define _gloffset_SecondaryColor3ivEXT 723
-#define _gloffset_SecondaryColor3sEXT 724
-#define _gloffset_SecondaryColor3svEXT 725
-#define _gloffset_SecondaryColor3ubEXT 726
-#define _gloffset_SecondaryColor3ubvEXT 727
-#define _gloffset_SecondaryColor3uiEXT 728
-#define _gloffset_SecondaryColor3uivEXT 729
-#define _gloffset_SecondaryColor3usEXT 730
-#define _gloffset_SecondaryColor3usvEXT 731
-#define _gloffset_SecondaryColorPointerEXT 732
-#define _gloffset_MultiDrawArraysEXT 733
-#define _gloffset_MultiDrawElementsEXT 734
-#define _gloffset_FogCoordPointerEXT 735
-#define _gloffset_FogCoorddEXT 736
-#define _gloffset_FogCoorddvEXT 737
-#define _gloffset_FogCoordfEXT 738
-#define _gloffset_FogCoordfvEXT 739
-#define _gloffset_PixelTexGenSGIX 740
-#define _gloffset_BlendFuncSeparateEXT 741
-#define _gloffset_FlushVertexArrayRangeNV 742
-#define _gloffset_VertexArrayRangeNV 743
-#define _gloffset_CombinerInputNV 744
-#define _gloffset_CombinerOutputNV 745
-#define _gloffset_CombinerParameterfNV 746
-#define _gloffset_CombinerParameterfvNV 747
-#define _gloffset_CombinerParameteriNV 748
-#define _gloffset_CombinerParameterivNV 749
-#define _gloffset_FinalCombinerInputNV 750
-#define _gloffset_GetCombinerInputParameterfvNV 751
-#define _gloffset_GetCombinerInputParameterivNV 752
-#define _gloffset_GetCombinerOutputParameterfvNV 753
-#define _gloffset_GetCombinerOutputParameterivNV 754
-#define _gloffset_GetFinalCombinerInputParameterfvNV 755
-#define _gloffset_GetFinalCombinerInputParameterivNV 756
-#define _gloffset_ResizeBuffersMESA 757
-#define _gloffset_WindowPos2dMESA 758
-#define _gloffset_WindowPos2dvMESA 759
-#define _gloffset_WindowPos2fMESA 760
-#define _gloffset_WindowPos2fvMESA 761
-#define _gloffset_WindowPos2iMESA 762
-#define _gloffset_WindowPos2ivMESA 763
-#define _gloffset_WindowPos2sMESA 764
-#define _gloffset_WindowPos2svMESA 765
-#define _gloffset_WindowPos3dMESA 766
-#define _gloffset_WindowPos3dvMESA 767
-#define _gloffset_WindowPos3fMESA 768
-#define _gloffset_WindowPos3fvMESA 769
-#define _gloffset_WindowPos3iMESA 770
-#define _gloffset_WindowPos3ivMESA 771
-#define _gloffset_WindowPos3sMESA 772
-#define _gloffset_WindowPos3svMESA 773
-#define _gloffset_WindowPos4dMESA 774
-#define _gloffset_WindowPos4dvMESA 775
-#define _gloffset_WindowPos4fMESA 776
-#define _gloffset_WindowPos4fvMESA 777
-#define _gloffset_WindowPos4iMESA 778
-#define _gloffset_WindowPos4ivMESA 779
-#define _gloffset_WindowPos4sMESA 780
-#define _gloffset_WindowPos4svMESA 781
-#define _gloffset_MultiModeDrawArraysIBM 782
-#define _gloffset_MultiModeDrawElementsIBM 783
-#define _gloffset_DeleteFencesNV 784
-#define _gloffset_FinishFenceNV 785
-#define _gloffset_GenFencesNV 786
-#define _gloffset_GetFenceivNV 787
-#define _gloffset_IsFenceNV 788
-#define _gloffset_SetFenceNV 789
-#define _gloffset_TestFenceNV 790
-#define _gloffset_AreProgramsResidentNV 791
-#define _gloffset_BindProgramNV 792
-#define _gloffset_DeleteProgramsNV 793
-#define _gloffset_ExecuteProgramNV 794
-#define _gloffset_GenProgramsNV 795
-#define _gloffset_GetProgramParameterdvNV 796
-#define _gloffset_GetProgramParameterfvNV 797
-#define _gloffset_GetProgramStringNV 798
-#define _gloffset_GetProgramivNV 799
-#define _gloffset_GetTrackMatrixivNV 800
-#define _gloffset_GetVertexAttribPointervNV 801
-#define _gloffset_GetVertexAttribdvNV 802
-#define _gloffset_GetVertexAttribfvNV 803
-#define _gloffset_GetVertexAttribivNV 804
-#define _gloffset_IsProgramNV 805
-#define _gloffset_LoadProgramNV 806
-#define _gloffset_ProgramParameters4dvNV 807
-#define _gloffset_ProgramParameters4fvNV 808
-#define _gloffset_RequestResidentProgramsNV 809
-#define _gloffset_TrackMatrixNV 810
-#define _gloffset_VertexAttrib1dNV 811
-#define _gloffset_VertexAttrib1dvNV 812
-#define _gloffset_VertexAttrib1fNV 813
-#define _gloffset_VertexAttrib1fvNV 814
-#define _gloffset_VertexAttrib1sNV 815
-#define _gloffset_VertexAttrib1svNV 816
-#define _gloffset_VertexAttrib2dNV 817
-#define _gloffset_VertexAttrib2dvNV 818
-#define _gloffset_VertexAttrib2fNV 819
-#define _gloffset_VertexAttrib2fvNV 820
-#define _gloffset_VertexAttrib2sNV 821
-#define _gloffset_VertexAttrib2svNV 822
-#define _gloffset_VertexAttrib3dNV 823
-#define _gloffset_VertexAttrib3dvNV 824
-#define _gloffset_VertexAttrib3fNV 825
-#define _gloffset_VertexAttrib3fvNV 826
-#define _gloffset_VertexAttrib3sNV 827
-#define _gloffset_VertexAttrib3svNV 828
-#define _gloffset_VertexAttrib4dNV 829
-#define _gloffset_VertexAttrib4dvNV 830
-#define _gloffset_VertexAttrib4fNV 831
-#define _gloffset_VertexAttrib4fvNV 832
-#define _gloffset_VertexAttrib4sNV 833
-#define _gloffset_VertexAttrib4svNV 834
-#define _gloffset_VertexAttrib4ubNV 835
-#define _gloffset_VertexAttrib4ubvNV 836
-#define _gloffset_VertexAttribPointerNV 837
-#define _gloffset_VertexAttribs1dvNV 838
-#define _gloffset_VertexAttribs1fvNV 839
-#define _gloffset_VertexAttribs1svNV 840
-#define _gloffset_VertexAttribs2dvNV 841
-#define _gloffset_VertexAttribs2fvNV 842
-#define _gloffset_VertexAttribs2svNV 843
-#define _gloffset_VertexAttribs3dvNV 844
-#define _gloffset_VertexAttribs3fvNV 845
-#define _gloffset_VertexAttribs3svNV 846
-#define _gloffset_VertexAttribs4dvNV 847
-#define _gloffset_VertexAttribs4fvNV 848
-#define _gloffset_VertexAttribs4svNV 849
-#define _gloffset_VertexAttribs4ubvNV 850
-#define _gloffset_GetTexBumpParameterfvATI 851
-#define _gloffset_GetTexBumpParameterivATI 852
-#define _gloffset_TexBumpParameterfvATI 853
-#define _gloffset_TexBumpParameterivATI 854
-#define _gloffset_AlphaFragmentOp1ATI 855
-#define _gloffset_AlphaFragmentOp2ATI 856
-#define _gloffset_AlphaFragmentOp3ATI 857
-#define _gloffset_BeginFragmentShaderATI 858
-#define _gloffset_BindFragmentShaderATI 859
-#define _gloffset_ColorFragmentOp1ATI 860
-#define _gloffset_ColorFragmentOp2ATI 861
-#define _gloffset_ColorFragmentOp3ATI 862
-#define _gloffset_DeleteFragmentShaderATI 863
-#define _gloffset_EndFragmentShaderATI 864
-#define _gloffset_GenFragmentShadersATI 865
-#define _gloffset_PassTexCoordATI 866
-#define _gloffset_SampleMapATI 867
-#define _gloffset_SetFragmentShaderConstantATI 868
-#define _gloffset_PointParameteriNV 869
-#define _gloffset_PointParameterivNV 870
-#define _gloffset_ActiveStencilFaceEXT 871
-#define _gloffset_BindVertexArrayAPPLE 872
-#define _gloffset_DeleteVertexArraysAPPLE 873
-#define _gloffset_GenVertexArraysAPPLE 874
-#define _gloffset_IsVertexArrayAPPLE 875
-#define _gloffset_GetProgramNamedParameterdvNV 876
-#define _gloffset_GetProgramNamedParameterfvNV 877
-#define _gloffset_ProgramNamedParameter4dNV 878
-#define _gloffset_ProgramNamedParameter4dvNV 879
-#define _gloffset_ProgramNamedParameter4fNV 880
-#define _gloffset_ProgramNamedParameter4fvNV 881
-#define _gloffset_PrimitiveRestartIndexNV 882
-#define _gloffset_PrimitiveRestartNV 883
-#define _gloffset_DepthBoundsEXT 884
-#define _gloffset_BlendEquationSeparateEXT 885
-#define _gloffset_BindFramebufferEXT 886
-#define _gloffset_BindRenderbufferEXT 887
-#define _gloffset_CheckFramebufferStatusEXT 888
-#define _gloffset_DeleteFramebuffersEXT 889
-#define _gloffset_DeleteRenderbuffersEXT 890
-#define _gloffset_FramebufferRenderbufferEXT 891
-#define _gloffset_FramebufferTexture1DEXT 892
-#define _gloffset_FramebufferTexture2DEXT 893
-#define _gloffset_FramebufferTexture3DEXT 894
-#define _gloffset_GenFramebuffersEXT 895
-#define _gloffset_GenRenderbuffersEXT 896
-#define _gloffset_GenerateMipmapEXT 897
-#define _gloffset_GetFramebufferAttachmentParameterivEXT 898
-#define _gloffset_GetRenderbufferParameterivEXT 899
-#define _gloffset_IsFramebufferEXT 900
-#define _gloffset_IsRenderbufferEXT 901
-#define _gloffset_RenderbufferStorageEXT 902
-#define _gloffset_BlitFramebufferEXT 903
-#define _gloffset_BufferParameteriAPPLE 904
-#define _gloffset_FlushMappedBufferRangeAPPLE 905
-#define _gloffset_BindFragDataLocationEXT 906
-#define _gloffset_GetFragDataLocationEXT 907
-#define _gloffset_GetUniformuivEXT 908
-#define _gloffset_GetVertexAttribIivEXT 909
-#define _gloffset_GetVertexAttribIuivEXT 910
-#define _gloffset_Uniform1uiEXT 911
-#define _gloffset_Uniform1uivEXT 912
-#define _gloffset_Uniform2uiEXT 913
-#define _gloffset_Uniform2uivEXT 914
-#define _gloffset_Uniform3uiEXT 915
-#define _gloffset_Uniform3uivEXT 916
-#define _gloffset_Uniform4uiEXT 917
-#define _gloffset_Uniform4uivEXT 918
-#define _gloffset_VertexAttribI1iEXT 919
-#define _gloffset_VertexAttribI1ivEXT 920
-#define _gloffset_VertexAttribI1uiEXT 921
-#define _gloffset_VertexAttribI1uivEXT 922
-#define _gloffset_VertexAttribI2iEXT 923
-#define _gloffset_VertexAttribI2ivEXT 924
-#define _gloffset_VertexAttribI2uiEXT 925
-#define _gloffset_VertexAttribI2uivEXT 926
-#define _gloffset_VertexAttribI3iEXT 927
-#define _gloffset_VertexAttribI3ivEXT 928
-#define _gloffset_VertexAttribI3uiEXT 929
-#define _gloffset_VertexAttribI3uivEXT 930
-#define _gloffset_VertexAttribI4bvEXT 931
-#define _gloffset_VertexAttribI4iEXT 932
-#define _gloffset_VertexAttribI4ivEXT 933
-#define _gloffset_VertexAttribI4svEXT 934
-#define _gloffset_VertexAttribI4ubvEXT 935
-#define _gloffset_VertexAttribI4uiEXT 936
-#define _gloffset_VertexAttribI4uivEXT 937
-#define _gloffset_VertexAttribI4usvEXT 938
-#define _gloffset_VertexAttribIPointerEXT 939
-#define _gloffset_FramebufferTextureLayerEXT 940
-#define _gloffset_ColorMaskIndexedEXT 941
-#define _gloffset_DisableIndexedEXT 942
-#define _gloffset_EnableIndexedEXT 943
-#define _gloffset_GetBooleanIndexedvEXT 944
-#define _gloffset_GetIntegerIndexedvEXT 945
-#define _gloffset_IsEnabledIndexedEXT 946
-#define _gloffset_ClearColorIiEXT 947
-#define _gloffset_ClearColorIuiEXT 948
-#define _gloffset_GetTexParameterIivEXT 949
-#define _gloffset_GetTexParameterIuivEXT 950
-#define _gloffset_TexParameterIivEXT 951
-#define _gloffset_TexParameterIuivEXT 952
-#define _gloffset_BeginConditionalRenderNV 953
-#define _gloffset_EndConditionalRenderNV 954
-#define _gloffset_BeginTransformFeedbackEXT 955
-#define _gloffset_BindBufferBaseEXT 956
-#define _gloffset_BindBufferOffsetEXT 957
-#define _gloffset_BindBufferRangeEXT 958
-#define _gloffset_EndTransformFeedbackEXT 959
-#define _gloffset_GetTransformFeedbackVaryingEXT 960
-#define _gloffset_TransformFeedbackVaryingsEXT 961
-#define _gloffset_ProvokingVertexEXT 962
-#define _gloffset_GetTexParameterPointervAPPLE 963
-#define _gloffset_TextureRangeAPPLE 964
-#define _gloffset_GetObjectParameterivAPPLE 965
-#define _gloffset_ObjectPurgeableAPPLE 966
-#define _gloffset_ObjectUnpurgeableAPPLE 967
-#define _gloffset_ActiveProgramEXT 968
-#define _gloffset_CreateShaderProgramEXT 969
-#define _gloffset_UseShaderProgramEXT 970
-#define _gloffset_TextureBarrierNV 971
-#define _gloffset_StencilFuncSeparateATI 972
-#define _gloffset_ProgramEnvParameters4fvEXT 973
-#define _gloffset_ProgramLocalParameters4fvEXT 974
-#define _gloffset_GetQueryObjecti64vEXT 975
-#define _gloffset_GetQueryObjectui64vEXT 976
-#define _gloffset_EGLImageTargetRenderbufferStorageOES 977
-#define _gloffset_EGLImageTargetTexture2DOES 978
+#define _gloffset_FramebufferTexture 436
+#define _gloffset_GetBufferParameteri64v 437
+#define _gloffset_GetInteger64i_v 438
+#define _gloffset_VertexAttribDivisor 439
+#define _gloffset_LoadTransposeMatrixdARB 440
+#define _gloffset_LoadTransposeMatrixfARB 441
+#define _gloffset_MultTransposeMatrixdARB 442
+#define _gloffset_MultTransposeMatrixfARB 443
+#define _gloffset_SampleCoverageARB 444
+#define _gloffset_CompressedTexImage1DARB 445
+#define _gloffset_CompressedTexImage2DARB 446
+#define _gloffset_CompressedTexImage3DARB 447
+#define _gloffset_CompressedTexSubImage1DARB 448
+#define _gloffset_CompressedTexSubImage2DARB 449
+#define _gloffset_CompressedTexSubImage3DARB 450
+#define _gloffset_GetCompressedTexImageARB 451
+#define _gloffset_DisableVertexAttribArrayARB 452
+#define _gloffset_EnableVertexAttribArrayARB 453
+#define _gloffset_GetProgramEnvParameterdvARB 454
+#define _gloffset_GetProgramEnvParameterfvARB 455
+#define _gloffset_GetProgramLocalParameterdvARB 456
+#define _gloffset_GetProgramLocalParameterfvARB 457
+#define _gloffset_GetProgramStringARB 458
+#define _gloffset_GetProgramivARB 459
+#define _gloffset_GetVertexAttribdvARB 460
+#define _gloffset_GetVertexAttribfvARB 461
+#define _gloffset_GetVertexAttribivARB 462
+#define _gloffset_ProgramEnvParameter4dARB 463
+#define _gloffset_ProgramEnvParameter4dvARB 464
+#define _gloffset_ProgramEnvParameter4fARB 465
+#define _gloffset_ProgramEnvParameter4fvARB 466
+#define _gloffset_ProgramLocalParameter4dARB 467
+#define _gloffset_ProgramLocalParameter4dvARB 468
+#define _gloffset_ProgramLocalParameter4fARB 469
+#define _gloffset_ProgramLocalParameter4fvARB 470
+#define _gloffset_ProgramStringARB 471
+#define _gloffset_VertexAttrib1dARB 472
+#define _gloffset_VertexAttrib1dvARB 473
+#define _gloffset_VertexAttrib1fARB 474
+#define _gloffset_VertexAttrib1fvARB 475
+#define _gloffset_VertexAttrib1sARB 476
+#define _gloffset_VertexAttrib1svARB 477
+#define _gloffset_VertexAttrib2dARB 478
+#define _gloffset_VertexAttrib2dvARB 479
+#define _gloffset_VertexAttrib2fARB 480
+#define _gloffset_VertexAttrib2fvARB 481
+#define _gloffset_VertexAttrib2sARB 482
+#define _gloffset_VertexAttrib2svARB 483
+#define _gloffset_VertexAttrib3dARB 484
+#define _gloffset_VertexAttrib3dvARB 485
+#define _gloffset_VertexAttrib3fARB 486
+#define _gloffset_VertexAttrib3fvARB 487
+#define _gloffset_VertexAttrib3sARB 488
+#define _gloffset_VertexAttrib3svARB 489
+#define _gloffset_VertexAttrib4NbvARB 490
+#define _gloffset_VertexAttrib4NivARB 491
+#define _gloffset_VertexAttrib4NsvARB 492
+#define _gloffset_VertexAttrib4NubARB 493
+#define _gloffset_VertexAttrib4NubvARB 494
+#define _gloffset_VertexAttrib4NuivARB 495
+#define _gloffset_VertexAttrib4NusvARB 496
+#define _gloffset_VertexAttrib4bvARB 497
+#define _gloffset_VertexAttrib4dARB 498
+#define _gloffset_VertexAttrib4dvARB 499
+#define _gloffset_VertexAttrib4fARB 500
+#define _gloffset_VertexAttrib4fvARB 501
+#define _gloffset_VertexAttrib4ivARB 502
+#define _gloffset_VertexAttrib4sARB 503
+#define _gloffset_VertexAttrib4svARB 504
+#define _gloffset_VertexAttrib4ubvARB 505
+#define _gloffset_VertexAttrib4uivARB 506
+#define _gloffset_VertexAttrib4usvARB 507
+#define _gloffset_VertexAttribPointerARB 508
+#define _gloffset_BindBufferARB 509
+#define _gloffset_BufferDataARB 510
+#define _gloffset_BufferSubDataARB 511
+#define _gloffset_DeleteBuffersARB 512
+#define _gloffset_GenBuffersARB 513
+#define _gloffset_GetBufferParameterivARB 514
+#define _gloffset_GetBufferPointervARB 515
+#define _gloffset_GetBufferSubDataARB 516
+#define _gloffset_IsBufferARB 517
+#define _gloffset_MapBufferARB 518
+#define _gloffset_UnmapBufferARB 519
+#define _gloffset_BeginQueryARB 520
+#define _gloffset_DeleteQueriesARB 521
+#define _gloffset_EndQueryARB 522
+#define _gloffset_GenQueriesARB 523
+#define _gloffset_GetQueryObjectivARB 524
+#define _gloffset_GetQueryObjectuivARB 525
+#define _gloffset_GetQueryivARB 526
+#define _gloffset_IsQueryARB 527
+#define _gloffset_AttachObjectARB 528
+#define _gloffset_CompileShaderARB 529
+#define _gloffset_CreateProgramObjectARB 530
+#define _gloffset_CreateShaderObjectARB 531
+#define _gloffset_DeleteObjectARB 532
+#define _gloffset_DetachObjectARB 533
+#define _gloffset_GetActiveUniformARB 534
+#define _gloffset_GetAttachedObjectsARB 535
+#define _gloffset_GetHandleARB 536
+#define _gloffset_GetInfoLogARB 537
+#define _gloffset_GetObjectParameterfvARB 538
+#define _gloffset_GetObjectParameterivARB 539
+#define _gloffset_GetShaderSourceARB 540
+#define _gloffset_GetUniformLocationARB 541
+#define _gloffset_GetUniformfvARB 542
+#define _gloffset_GetUniformivARB 543
+#define _gloffset_LinkProgramARB 544
+#define _gloffset_ShaderSourceARB 545
+#define _gloffset_Uniform1fARB 546
+#define _gloffset_Uniform1fvARB 547
+#define _gloffset_Uniform1iARB 548
+#define _gloffset_Uniform1ivARB 549
+#define _gloffset_Uniform2fARB 550
+#define _gloffset_Uniform2fvARB 551
+#define _gloffset_Uniform2iARB 552
+#define _gloffset_Uniform2ivARB 553
+#define _gloffset_Uniform3fARB 554
+#define _gloffset_Uniform3fvARB 555
+#define _gloffset_Uniform3iARB 556
+#define _gloffset_Uniform3ivARB 557
+#define _gloffset_Uniform4fARB 558
+#define _gloffset_Uniform4fvARB 559
+#define _gloffset_Uniform4iARB 560
+#define _gloffset_Uniform4ivARB 561
+#define _gloffset_UniformMatrix2fvARB 562
+#define _gloffset_UniformMatrix3fvARB 563
+#define _gloffset_UniformMatrix4fvARB 564
+#define _gloffset_UseProgramObjectARB 565
+#define _gloffset_ValidateProgramARB 566
+#define _gloffset_BindAttribLocationARB 567
+#define _gloffset_GetActiveAttribARB 568
+#define _gloffset_GetAttribLocationARB 569
+#define _gloffset_DrawBuffersARB 570
+#define _gloffset_ClampColorARB 571
+#define _gloffset_DrawArraysInstancedARB 572
+#define _gloffset_DrawElementsInstancedARB 573
+#define _gloffset_RenderbufferStorageMultisample 574
+#define _gloffset_FramebufferTextureARB 575
+#define _gloffset_FramebufferTextureFaceARB 576
+#define _gloffset_ProgramParameteriARB 577
+#define _gloffset_VertexAttribDivisorARB 578
+#define _gloffset_FlushMappedBufferRange 579
+#define _gloffset_MapBufferRange 580
+#define _gloffset_TexBufferARB 581
+#define _gloffset_BindVertexArray 582
+#define _gloffset_GenVertexArrays 583
+#define _gloffset_CopyBufferSubData 584
+#define _gloffset_ClientWaitSync 585
+#define _gloffset_DeleteSync 586
+#define _gloffset_FenceSync 587
+#define _gloffset_GetInteger64v 588
+#define _gloffset_GetSynciv 589
+#define _gloffset_IsSync 590
+#define _gloffset_WaitSync 591
+#define _gloffset_DrawElementsBaseVertex 592
+#define _gloffset_DrawElementsInstancedBaseVertex 593
+#define _gloffset_DrawRangeElementsBaseVertex 594
+#define _gloffset_MultiDrawElementsBaseVertex 595
+#define _gloffset_BlendEquationSeparateiARB 596
+#define _gloffset_BlendEquationiARB 597
+#define _gloffset_BlendFuncSeparateiARB 598
+#define _gloffset_BlendFunciARB 599
+#define _gloffset_BindFragDataLocationIndexed 600
+#define _gloffset_GetFragDataIndex 601
+#define _gloffset_BindSampler 602
+#define _gloffset_DeleteSamplers 603
+#define _gloffset_GenSamplers 604
+#define _gloffset_GetSamplerParameterIiv 605
+#define _gloffset_GetSamplerParameterIuiv 606
+#define _gloffset_GetSamplerParameterfv 607
+#define _gloffset_GetSamplerParameteriv 608
+#define _gloffset_IsSampler 609
+#define _gloffset_SamplerParameterIiv 610
+#define _gloffset_SamplerParameterIuiv 611
+#define _gloffset_SamplerParameterf 612
+#define _gloffset_SamplerParameterfv 613
+#define _gloffset_SamplerParameteri 614
+#define _gloffset_SamplerParameteriv 615
+#define _gloffset_ColorP3ui 616
+#define _gloffset_ColorP3uiv 617
+#define _gloffset_ColorP4ui 618
+#define _gloffset_ColorP4uiv 619
+#define _gloffset_MultiTexCoordP1ui 620
+#define _gloffset_MultiTexCoordP1uiv 621
+#define _gloffset_MultiTexCoordP2ui 622
+#define _gloffset_MultiTexCoordP2uiv 623
+#define _gloffset_MultiTexCoordP3ui 624
+#define _gloffset_MultiTexCoordP3uiv 625
+#define _gloffset_MultiTexCoordP4ui 626
+#define _gloffset_MultiTexCoordP4uiv 627
+#define _gloffset_NormalP3ui 628
+#define _gloffset_NormalP3uiv 629
+#define _gloffset_SecondaryColorP3ui 630
+#define _gloffset_SecondaryColorP3uiv 631
+#define _gloffset_TexCoordP1ui 632
+#define _gloffset_TexCoordP1uiv 633
+#define _gloffset_TexCoordP2ui 634
+#define _gloffset_TexCoordP2uiv 635
+#define _gloffset_TexCoordP3ui 636
+#define _gloffset_TexCoordP3uiv 637
+#define _gloffset_TexCoordP4ui 638
+#define _gloffset_TexCoordP4uiv 639
+#define _gloffset_VertexAttribP1ui 640
+#define _gloffset_VertexAttribP1uiv 641
+#define _gloffset_VertexAttribP2ui 642
+#define _gloffset_VertexAttribP2uiv 643
+#define _gloffset_VertexAttribP3ui 644
+#define _gloffset_VertexAttribP3uiv 645
+#define _gloffset_VertexAttribP4ui 646
+#define _gloffset_VertexAttribP4uiv 647
+#define _gloffset_VertexP2ui 648
+#define _gloffset_VertexP2uiv 649
+#define _gloffset_VertexP3ui 650
+#define _gloffset_VertexP3uiv 651
+#define _gloffset_VertexP4ui 652
+#define _gloffset_VertexP4uiv 653
+#define _gloffset_BindTransformFeedback 654
+#define _gloffset_DeleteTransformFeedbacks 655
+#define _gloffset_DrawTransformFeedback 656
+#define _gloffset_GenTransformFeedbacks 657
+#define _gloffset_IsTransformFeedback 658
+#define _gloffset_PauseTransformFeedback 659
+#define _gloffset_ResumeTransformFeedback 660
+#define _gloffset_ClearDepthf 661
+#define _gloffset_DepthRangef 662
+#define _gloffset_GetShaderPrecisionFormat 663
+#define _gloffset_ReleaseShaderCompiler 664
+#define _gloffset_ShaderBinary 665
+#define _gloffset_DebugMessageCallbackARB 666
+#define _gloffset_DebugMessageControlARB 667
+#define _gloffset_DebugMessageInsertARB 668
+#define _gloffset_GetDebugMessageLogARB 669
+#define _gloffset_GetGraphicsResetStatusARB 670
+#define _gloffset_GetnColorTableARB 671
+#define _gloffset_GetnCompressedTexImageARB 672
+#define _gloffset_GetnConvolutionFilterARB 673
+#define _gloffset_GetnHistogramARB 674
+#define _gloffset_GetnMapdvARB 675
+#define _gloffset_GetnMapfvARB 676
+#define _gloffset_GetnMapivARB 677
+#define _gloffset_GetnMinmaxARB 678
+#define _gloffset_GetnPixelMapfvARB 679
+#define _gloffset_GetnPixelMapuivARB 680
+#define _gloffset_GetnPixelMapusvARB 681
+#define _gloffset_GetnPolygonStippleARB 682
+#define _gloffset_GetnSeparableFilterARB 683
+#define _gloffset_GetnTexImageARB 684
+#define _gloffset_GetnUniformdvARB 685
+#define _gloffset_GetnUniformfvARB 686
+#define _gloffset_GetnUniformivARB 687
+#define _gloffset_GetnUniformuivARB 688
+#define _gloffset_ReadnPixelsARB 689
+#define _gloffset_TexStorage1D 690
+#define _gloffset_TexStorage2D 691
+#define _gloffset_TexStorage3D 692
+#define _gloffset_TextureStorage1DEXT 693
+#define _gloffset_TextureStorage2DEXT 694
+#define _gloffset_TextureStorage3DEXT 695
+#define _gloffset_PolygonOffsetEXT 696
+#define _gloffset_GetPixelTexGenParameterfvSGIS 697
+#define _gloffset_GetPixelTexGenParameterivSGIS 698
+#define _gloffset_PixelTexGenParameterfSGIS 699
+#define _gloffset_PixelTexGenParameterfvSGIS 700
+#define _gloffset_PixelTexGenParameteriSGIS 701
+#define _gloffset_PixelTexGenParameterivSGIS 702
+#define _gloffset_SampleMaskSGIS 703
+#define _gloffset_SamplePatternSGIS 704
+#define _gloffset_ColorPointerEXT 705
+#define _gloffset_EdgeFlagPointerEXT 706
+#define _gloffset_IndexPointerEXT 707
+#define _gloffset_NormalPointerEXT 708
+#define _gloffset_TexCoordPointerEXT 709
+#define _gloffset_VertexPointerEXT 710
+#define _gloffset_PointParameterfEXT 711
+#define _gloffset_PointParameterfvEXT 712
+#define _gloffset_LockArraysEXT 713
+#define _gloffset_UnlockArraysEXT 714
+#define _gloffset_SecondaryColor3bEXT 715
+#define _gloffset_SecondaryColor3bvEXT 716
+#define _gloffset_SecondaryColor3dEXT 717
+#define _gloffset_SecondaryColor3dvEXT 718
+#define _gloffset_SecondaryColor3fEXT 719
+#define _gloffset_SecondaryColor3fvEXT 720
+#define _gloffset_SecondaryColor3iEXT 721
+#define _gloffset_SecondaryColor3ivEXT 722
+#define _gloffset_SecondaryColor3sEXT 723
+#define _gloffset_SecondaryColor3svEXT 724
+#define _gloffset_SecondaryColor3ubEXT 725
+#define _gloffset_SecondaryColor3ubvEXT 726
+#define _gloffset_SecondaryColor3uiEXT 727
+#define _gloffset_SecondaryColor3uivEXT 728
+#define _gloffset_SecondaryColor3usEXT 729
+#define _gloffset_SecondaryColor3usvEXT 730
+#define _gloffset_SecondaryColorPointerEXT 731
+#define _gloffset_MultiDrawArraysEXT 732
+#define _gloffset_MultiDrawElementsEXT 733
+#define _gloffset_FogCoordPointerEXT 734
+#define _gloffset_FogCoorddEXT 735
+#define _gloffset_FogCoorddvEXT 736
+#define _gloffset_FogCoordfEXT 737
+#define _gloffset_FogCoordfvEXT 738
+#define _gloffset_PixelTexGenSGIX 739
+#define _gloffset_BlendFuncSeparateEXT 740
+#define _gloffset_FlushVertexArrayRangeNV 741
+#define _gloffset_VertexArrayRangeNV 742
+#define _gloffset_CombinerInputNV 743
+#define _gloffset_CombinerOutputNV 744
+#define _gloffset_CombinerParameterfNV 745
+#define _gloffset_CombinerParameterfvNV 746
+#define _gloffset_CombinerParameteriNV 747
+#define _gloffset_CombinerParameterivNV 748
+#define _gloffset_FinalCombinerInputNV 749
+#define _gloffset_GetCombinerInputParameterfvNV 750
+#define _gloffset_GetCombinerInputParameterivNV 751
+#define _gloffset_GetCombinerOutputParameterfvNV 752
+#define _gloffset_GetCombinerOutputParameterivNV 753
+#define _gloffset_GetFinalCombinerInputParameterfvNV 754
+#define _gloffset_GetFinalCombinerInputParameterivNV 755
+#define _gloffset_ResizeBuffersMESA 756
+#define _gloffset_WindowPos2dMESA 757
+#define _gloffset_WindowPos2dvMESA 758
+#define _gloffset_WindowPos2fMESA 759
+#define _gloffset_WindowPos2fvMESA 760
+#define _gloffset_WindowPos2iMESA 761
+#define _gloffset_WindowPos2ivMESA 762
+#define _gloffset_WindowPos2sMESA 763
+#define _gloffset_WindowPos2svMESA 764
+#define _gloffset_WindowPos3dMESA 765
+#define _gloffset_WindowPos3dvMESA 766
+#define _gloffset_WindowPos3fMESA 767
+#define _gloffset_WindowPos3fvMESA 768
+#define _gloffset_WindowPos3iMESA 769
+#define _gloffset_WindowPos3ivMESA 770
+#define _gloffset_WindowPos3sMESA 771
+#define _gloffset_WindowPos3svMESA 772
+#define _gloffset_WindowPos4dMESA 773
+#define _gloffset_WindowPos4dvMESA 774
+#define _gloffset_WindowPos4fMESA 775
+#define _gloffset_WindowPos4fvMESA 776
+#define _gloffset_WindowPos4iMESA 777
+#define _gloffset_WindowPos4ivMESA 778
+#define _gloffset_WindowPos4sMESA 779
+#define _gloffset_WindowPos4svMESA 780
+#define _gloffset_MultiModeDrawArraysIBM 781
+#define _gloffset_MultiModeDrawElementsIBM 782
+#define _gloffset_DeleteFencesNV 783
+#define _gloffset_FinishFenceNV 784
+#define _gloffset_GenFencesNV 785
+#define _gloffset_GetFenceivNV 786
+#define _gloffset_IsFenceNV 787
+#define _gloffset_SetFenceNV 788
+#define _gloffset_TestFenceNV 789
+#define _gloffset_AreProgramsResidentNV 790
+#define _gloffset_BindProgramNV 791
+#define _gloffset_DeleteProgramsNV 792
+#define _gloffset_ExecuteProgramNV 793
+#define _gloffset_GenProgramsNV 794
+#define _gloffset_GetProgramParameterdvNV 795
+#define _gloffset_GetProgramParameterfvNV 796
+#define _gloffset_GetProgramStringNV 797
+#define _gloffset_GetProgramivNV 798
+#define _gloffset_GetTrackMatrixivNV 799
+#define _gloffset_GetVertexAttribPointervNV 800
+#define _gloffset_GetVertexAttribdvNV 801
+#define _gloffset_GetVertexAttribfvNV 802
+#define _gloffset_GetVertexAttribivNV 803
+#define _gloffset_IsProgramNV 804
+#define _gloffset_LoadProgramNV 805
+#define _gloffset_ProgramParameters4dvNV 806
+#define _gloffset_ProgramParameters4fvNV 807
+#define _gloffset_RequestResidentProgramsNV 808
+#define _gloffset_TrackMatrixNV 809
+#define _gloffset_VertexAttrib1dNV 810
+#define _gloffset_VertexAttrib1dvNV 811
+#define _gloffset_VertexAttrib1fNV 812
+#define _gloffset_VertexAttrib1fvNV 813
+#define _gloffset_VertexAttrib1sNV 814
+#define _gloffset_VertexAttrib1svNV 815
+#define _gloffset_VertexAttrib2dNV 816
+#define _gloffset_VertexAttrib2dvNV 817
+#define _gloffset_VertexAttrib2fNV 818
+#define _gloffset_VertexAttrib2fvNV 819
+#define _gloffset_VertexAttrib2sNV 820
+#define _gloffset_VertexAttrib2svNV 821
+#define _gloffset_VertexAttrib3dNV 822
+#define _gloffset_VertexAttrib3dvNV 823
+#define _gloffset_VertexAttrib3fNV 824
+#define _gloffset_VertexAttrib3fvNV 825
+#define _gloffset_VertexAttrib3sNV 826
+#define _gloffset_VertexAttrib3svNV 827
+#define _gloffset_VertexAttrib4dNV 828
+#define _gloffset_VertexAttrib4dvNV 829
+#define _gloffset_VertexAttrib4fNV 830
+#define _gloffset_VertexAttrib4fvNV 831
+#define _gloffset_VertexAttrib4sNV 832
+#define _gloffset_VertexAttrib4svNV 833
+#define _gloffset_VertexAttrib4ubNV 834
+#define _gloffset_VertexAttrib4ubvNV 835
+#define _gloffset_VertexAttribPointerNV 836
+#define _gloffset_VertexAttribs1dvNV 837
+#define _gloffset_VertexAttribs1fvNV 838
+#define _gloffset_VertexAttribs1svNV 839
+#define _gloffset_VertexAttribs2dvNV 840
+#define _gloffset_VertexAttribs2fvNV 841
+#define _gloffset_VertexAttribs2svNV 842
+#define _gloffset_VertexAttribs3dvNV 843
+#define _gloffset_VertexAttribs3fvNV 844
+#define _gloffset_VertexAttribs3svNV 845
+#define _gloffset_VertexAttribs4dvNV 846
+#define _gloffset_VertexAttribs4fvNV 847
+#define _gloffset_VertexAttribs4svNV 848
+#define _gloffset_VertexAttribs4ubvNV 849
+#define _gloffset_GetTexBumpParameterfvATI 850
+#define _gloffset_GetTexBumpParameterivATI 851
+#define _gloffset_TexBumpParameterfvATI 852
+#define _gloffset_TexBumpParameterivATI 853
+#define _gloffset_AlphaFragmentOp1ATI 854
+#define _gloffset_AlphaFragmentOp2ATI 855
+#define _gloffset_AlphaFragmentOp3ATI 856
+#define _gloffset_BeginFragmentShaderATI 857
+#define _gloffset_BindFragmentShaderATI 858
+#define _gloffset_ColorFragmentOp1ATI 859
+#define _gloffset_ColorFragmentOp2ATI 860
+#define _gloffset_ColorFragmentOp3ATI 861
+#define _gloffset_DeleteFragmentShaderATI 862
+#define _gloffset_EndFragmentShaderATI 863
+#define _gloffset_GenFragmentShadersATI 864
+#define _gloffset_PassTexCoordATI 865
+#define _gloffset_SampleMapATI 866
+#define _gloffset_SetFragmentShaderConstantATI 867
+#define _gloffset_PointParameteriNV 868
+#define _gloffset_PointParameterivNV 869
+#define _gloffset_ActiveStencilFaceEXT 870
+#define _gloffset_BindVertexArrayAPPLE 871
+#define _gloffset_DeleteVertexArraysAPPLE 872
+#define _gloffset_GenVertexArraysAPPLE 873
+#define _gloffset_IsVertexArrayAPPLE 874
+#define _gloffset_GetProgramNamedParameterdvNV 875
+#define _gloffset_GetProgramNamedParameterfvNV 876
+#define _gloffset_ProgramNamedParameter4dNV 877
+#define _gloffset_ProgramNamedParameter4dvNV 878
+#define _gloffset_ProgramNamedParameter4fNV 879
+#define _gloffset_ProgramNamedParameter4fvNV 880
+#define _gloffset_PrimitiveRestartIndexNV 881
+#define _gloffset_PrimitiveRestartNV 882
+#define _gloffset_DepthBoundsEXT 883
+#define _gloffset_BlendEquationSeparateEXT 884
+#define _gloffset_BindFramebufferEXT 885
+#define _gloffset_BindRenderbufferEXT 886
+#define _gloffset_CheckFramebufferStatusEXT 887
+#define _gloffset_DeleteFramebuffersEXT 888
+#define _gloffset_DeleteRenderbuffersEXT 889
+#define _gloffset_FramebufferRenderbufferEXT 890
+#define _gloffset_FramebufferTexture1DEXT 891
+#define _gloffset_FramebufferTexture2DEXT 892
+#define _gloffset_FramebufferTexture3DEXT 893
+#define _gloffset_GenFramebuffersEXT 894
+#define _gloffset_GenRenderbuffersEXT 895
+#define _gloffset_GenerateMipmapEXT 896
+#define _gloffset_GetFramebufferAttachmentParameterivEXT 897
+#define _gloffset_GetRenderbufferParameterivEXT 898
+#define _gloffset_IsFramebufferEXT 899
+#define _gloffset_IsRenderbufferEXT 900
+#define _gloffset_RenderbufferStorageEXT 901
+#define _gloffset_BlitFramebufferEXT 902
+#define _gloffset_BufferParameteriAPPLE 903
+#define _gloffset_FlushMappedBufferRangeAPPLE 904
+#define _gloffset_BindFragDataLocationEXT 905
+#define _gloffset_GetFragDataLocationEXT 906
+#define _gloffset_GetUniformuivEXT 907
+#define _gloffset_GetVertexAttribIivEXT 908
+#define _gloffset_GetVertexAttribIuivEXT 909
+#define _gloffset_Uniform1uiEXT 910
+#define _gloffset_Uniform1uivEXT 911
+#define _gloffset_Uniform2uiEXT 912
+#define _gloffset_Uniform2uivEXT 913
+#define _gloffset_Uniform3uiEXT 914
+#define _gloffset_Uniform3uivEXT 915
+#define _gloffset_Uniform4uiEXT 916
+#define _gloffset_Uniform4uivEXT 917
+#define _gloffset_VertexAttribI1iEXT 918
+#define _gloffset_VertexAttribI1ivEXT 919
+#define _gloffset_VertexAttribI1uiEXT 920
+#define _gloffset_VertexAttribI1uivEXT 921
+#define _gloffset_VertexAttribI2iEXT 922
+#define _gloffset_VertexAttribI2ivEXT 923
+#define _gloffset_VertexAttribI2uiEXT 924
+#define _gloffset_VertexAttribI2uivEXT 925
+#define _gloffset_VertexAttribI3iEXT 926
+#define _gloffset_VertexAttribI3ivEXT 927
+#define _gloffset_VertexAttribI3uiEXT 928
+#define _gloffset_VertexAttribI3uivEXT 929
+#define _gloffset_VertexAttribI4bvEXT 930
+#define _gloffset_VertexAttribI4iEXT 931
+#define _gloffset_VertexAttribI4ivEXT 932
+#define _gloffset_VertexAttribI4svEXT 933
+#define _gloffset_VertexAttribI4ubvEXT 934
+#define _gloffset_VertexAttribI4uiEXT 935
+#define _gloffset_VertexAttribI4uivEXT 936
+#define _gloffset_VertexAttribI4usvEXT 937
+#define _gloffset_VertexAttribIPointerEXT 938
+#define _gloffset_FramebufferTextureLayerEXT 939
+#define _gloffset_ColorMaskIndexedEXT 940
+#define _gloffset_DisableIndexedEXT 941
+#define _gloffset_EnableIndexedEXT 942
+#define _gloffset_GetBooleanIndexedvEXT 943
+#define _gloffset_GetIntegerIndexedvEXT 944
+#define _gloffset_IsEnabledIndexedEXT 945
+#define _gloffset_ClearColorIiEXT 946
+#define _gloffset_ClearColorIuiEXT 947
+#define _gloffset_GetTexParameterIivEXT 948
+#define _gloffset_GetTexParameterIuivEXT 949
+#define _gloffset_TexParameterIivEXT 950
+#define _gloffset_TexParameterIuivEXT 951
+#define _gloffset_BeginConditionalRenderNV 952
+#define _gloffset_EndConditionalRenderNV 953
+#define _gloffset_BeginTransformFeedbackEXT 954
+#define _gloffset_BindBufferBaseEXT 955
+#define _gloffset_BindBufferOffsetEXT 956
+#define _gloffset_BindBufferRangeEXT 957
+#define _gloffset_EndTransformFeedbackEXT 958
+#define _gloffset_GetTransformFeedbackVaryingEXT 959
+#define _gloffset_TransformFeedbackVaryingsEXT 960
+#define _gloffset_ProvokingVertexEXT 961
+#define _gloffset_GetTexParameterPointervAPPLE 962
+#define _gloffset_TextureRangeAPPLE 963
+#define _gloffset_GetObjectParameterivAPPLE 964
+#define _gloffset_ObjectPurgeableAPPLE 965
+#define _gloffset_ObjectUnpurgeableAPPLE 966
+#define _gloffset_ActiveProgramEXT 967
+#define _gloffset_CreateShaderProgramEXT 968
+#define _gloffset_UseShaderProgramEXT 969
+#define _gloffset_TextureBarrierNV 970
+#define _gloffset_StencilFuncSeparateATI 971
+#define _gloffset_ProgramEnvParameters4fvEXT 972
+#define _gloffset_ProgramLocalParameters4fvEXT 973
+#define _gloffset_GetQueryObjecti64vEXT 974
+#define _gloffset_GetQueryObjectui64vEXT 975
+#define _gloffset_EGLImageTargetRenderbufferStorageOES 976
+#define _gloffset_EGLImageTargetTexture2DOES 977
 
 #else /* !FEATURE_remap_table */
 
-#define driDispatchRemapTable_size 571
+#define driDispatchRemapTable_size 570
 extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 
 #define AttachShader_remap_index 0
@@ -1081,549 +1080,548 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define ClearBufferiv_remap_index 25
 #define ClearBufferuiv_remap_index 26
 #define GetStringi_remap_index 27
-#define TexBuffer_remap_index 28
-#define FramebufferTexture_remap_index 29
-#define GetBufferParameteri64v_remap_index 30
-#define GetInteger64i_v_remap_index 31
-#define VertexAttribDivisor_remap_index 32
-#define LoadTransposeMatrixdARB_remap_index 33
-#define LoadTransposeMatrixfARB_remap_index 34
-#define MultTransposeMatrixdARB_remap_index 35
-#define MultTransposeMatrixfARB_remap_index 36
-#define SampleCoverageARB_remap_index 37
-#define CompressedTexImage1DARB_remap_index 38
-#define CompressedTexImage2DARB_remap_index 39
-#define CompressedTexImage3DARB_remap_index 40
-#define CompressedTexSubImage1DARB_remap_index 41
-#define CompressedTexSubImage2DARB_remap_index 42
-#define CompressedTexSubImage3DARB_remap_index 43
-#define GetCompressedTexImageARB_remap_index 44
-#define DisableVertexAttribArrayARB_remap_index 45
-#define EnableVertexAttribArrayARB_remap_index 46
-#define GetProgramEnvParameterdvARB_remap_index 47
-#define GetProgramEnvParameterfvARB_remap_index 48
-#define GetProgramLocalParameterdvARB_remap_index 49
-#define GetProgramLocalParameterfvARB_remap_index 50
-#define GetProgramStringARB_remap_index 51
-#define GetProgramivARB_remap_index 52
-#define GetVertexAttribdvARB_remap_index 53
-#define GetVertexAttribfvARB_remap_index 54
-#define GetVertexAttribivARB_remap_index 55
-#define ProgramEnvParameter4dARB_remap_index 56
-#define ProgramEnvParameter4dvARB_remap_index 57
-#define ProgramEnvParameter4fARB_remap_index 58
-#define ProgramEnvParameter4fvARB_remap_index 59
-#define ProgramLocalParameter4dARB_remap_index 60
-#define ProgramLocalParameter4dvARB_remap_index 61
-#define ProgramLocalParameter4fARB_remap_index 62
-#define ProgramLocalParameter4fvARB_remap_index 63
-#define ProgramStringARB_remap_index 64
-#define VertexAttrib1dARB_remap_index 65
-#define VertexAttrib1dvARB_remap_index 66
-#define VertexAttrib1fARB_remap_index 67
-#define VertexAttrib1fvARB_remap_index 68
-#define VertexAttrib1sARB_remap_index 69
-#define VertexAttrib1svARB_remap_index 70
-#define VertexAttrib2dARB_remap_index 71
-#define VertexAttrib2dvARB_remap_index 72
-#define VertexAttrib2fARB_remap_index 73
-#define VertexAttrib2fvARB_remap_index 74
-#define VertexAttrib2sARB_remap_index 75
-#define VertexAttrib2svARB_remap_index 76
-#define VertexAttrib3dARB_remap_index 77
-#define VertexAttrib3dvARB_remap_index 78
-#define VertexAttrib3fARB_remap_index 79
-#define VertexAttrib3fvARB_remap_index 80
-#define VertexAttrib3sARB_remap_index 81
-#define VertexAttrib3svARB_remap_index 82
-#define VertexAttrib4NbvARB_remap_index 83
-#define VertexAttrib4NivARB_remap_index 84
-#define VertexAttrib4NsvARB_remap_index 85
-#define VertexAttrib4NubARB_remap_index 86
-#define VertexAttrib4NubvARB_remap_index 87
-#define VertexAttrib4NuivARB_remap_index 88
-#define VertexAttrib4NusvARB_remap_index 89
-#define VertexAttrib4bvARB_remap_index 90
-#define VertexAttrib4dARB_remap_index 91
-#define VertexAttrib4dvARB_remap_index 92
-#define VertexAttrib4fARB_remap_index 93
-#define VertexAttrib4fvARB_remap_index 94
-#define VertexAttrib4ivARB_remap_index 95
-#define VertexAttrib4sARB_remap_index 96
-#define VertexAttrib4svARB_remap_index 97
-#define VertexAttrib4ubvARB_remap_index 98
-#define VertexAttrib4uivARB_remap_index 99
-#define VertexAttrib4usvARB_remap_index 100
-#define VertexAttribPointerARB_remap_index 101
-#define BindBufferARB_remap_index 102
-#define BufferDataARB_remap_index 103
-#define BufferSubDataARB_remap_index 104
-#define DeleteBuffersARB_remap_index 105
-#define GenBuffersARB_remap_index 106
-#define GetBufferParameterivARB_remap_index 107
-#define GetBufferPointervARB_remap_index 108
-#define GetBufferSubDataARB_remap_index 109
-#define IsBufferARB_remap_index 110
-#define MapBufferARB_remap_index 111
-#define UnmapBufferARB_remap_index 112
-#define BeginQueryARB_remap_index 113
-#define DeleteQueriesARB_remap_index 114
-#define EndQueryARB_remap_index 115
-#define GenQueriesARB_remap_index 116
-#define GetQueryObjectivARB_remap_index 117
-#define GetQueryObjectuivARB_remap_index 118
-#define GetQueryivARB_remap_index 119
-#define IsQueryARB_remap_index 120
-#define AttachObjectARB_remap_index 121
-#define CompileShaderARB_remap_index 122
-#define CreateProgramObjectARB_remap_index 123
-#define CreateShaderObjectARB_remap_index 124
-#define DeleteObjectARB_remap_index 125
-#define DetachObjectARB_remap_index 126
-#define GetActiveUniformARB_remap_index 127
-#define GetAttachedObjectsARB_remap_index 128
-#define GetHandleARB_remap_index 129
-#define GetInfoLogARB_remap_index 130
-#define GetObjectParameterfvARB_remap_index 131
-#define GetObjectParameterivARB_remap_index 132
-#define GetShaderSourceARB_remap_index 133
-#define GetUniformLocationARB_remap_index 134
-#define GetUniformfvARB_remap_index 135
-#define GetUniformivARB_remap_index 136
-#define LinkProgramARB_remap_index 137
-#define ShaderSourceARB_remap_index 138
-#define Uniform1fARB_remap_index 139
-#define Uniform1fvARB_remap_index 140
-#define Uniform1iARB_remap_index 141
-#define Uniform1ivARB_remap_index 142
-#define Uniform2fARB_remap_index 143
-#define Uniform2fvARB_remap_index 144
-#define Uniform2iARB_remap_index 145
-#define Uniform2ivARB_remap_index 146
-#define Uniform3fARB_remap_index 147
-#define Uniform3fvARB_remap_index 148
-#define Uniform3iARB_remap_index 149
-#define Uniform3ivARB_remap_index 150
-#define Uniform4fARB_remap_index 151
-#define Uniform4fvARB_remap_index 152
-#define Uniform4iARB_remap_index 153
-#define Uniform4ivARB_remap_index 154
-#define UniformMatrix2fvARB_remap_index 155
-#define UniformMatrix3fvARB_remap_index 156
-#define UniformMatrix4fvARB_remap_index 157
-#define UseProgramObjectARB_remap_index 158
-#define ValidateProgramARB_remap_index 159
-#define BindAttribLocationARB_remap_index 160
-#define GetActiveAttribARB_remap_index 161
-#define GetAttribLocationARB_remap_index 162
-#define DrawBuffersARB_remap_index 163
-#define ClampColorARB_remap_index 164
-#define DrawArraysInstancedARB_remap_index 165
-#define DrawElementsInstancedARB_remap_index 166
-#define RenderbufferStorageMultisample_remap_index 167
-#define FramebufferTextureARB_remap_index 168
-#define FramebufferTextureFaceARB_remap_index 169
-#define ProgramParameteriARB_remap_index 170
-#define VertexAttribDivisorARB_remap_index 171
-#define FlushMappedBufferRange_remap_index 172
-#define MapBufferRange_remap_index 173
-#define TexBufferARB_remap_index 174
-#define BindVertexArray_remap_index 175
-#define GenVertexArrays_remap_index 176
-#define CopyBufferSubData_remap_index 177
-#define ClientWaitSync_remap_index 178
-#define DeleteSync_remap_index 179
-#define FenceSync_remap_index 180
-#define GetInteger64v_remap_index 181
-#define GetSynciv_remap_index 182
-#define IsSync_remap_index 183
-#define WaitSync_remap_index 184
-#define DrawElementsBaseVertex_remap_index 185
-#define DrawElementsInstancedBaseVertex_remap_index 186
-#define DrawRangeElementsBaseVertex_remap_index 187
-#define MultiDrawElementsBaseVertex_remap_index 188
-#define BlendEquationSeparateiARB_remap_index 189
-#define BlendEquationiARB_remap_index 190
-#define BlendFuncSeparateiARB_remap_index 191
-#define BlendFunciARB_remap_index 192
-#define BindFragDataLocationIndexed_remap_index 193
-#define GetFragDataIndex_remap_index 194
-#define BindSampler_remap_index 195
-#define DeleteSamplers_remap_index 196
-#define GenSamplers_remap_index 197
-#define GetSamplerParameterIiv_remap_index 198
-#define GetSamplerParameterIuiv_remap_index 199
-#define GetSamplerParameterfv_remap_index 200
-#define GetSamplerParameteriv_remap_index 201
-#define IsSampler_remap_index 202
-#define SamplerParameterIiv_remap_index 203
-#define SamplerParameterIuiv_remap_index 204
-#define SamplerParameterf_remap_index 205
-#define SamplerParameterfv_remap_index 206
-#define SamplerParameteri_remap_index 207
-#define SamplerParameteriv_remap_index 208
-#define ColorP3ui_remap_index 209
-#define ColorP3uiv_remap_index 210
-#define ColorP4ui_remap_index 211
-#define ColorP4uiv_remap_index 212
-#define MultiTexCoordP1ui_remap_index 213
-#define MultiTexCoordP1uiv_remap_index 214
-#define MultiTexCoordP2ui_remap_index 215
-#define MultiTexCoordP2uiv_remap_index 216
-#define MultiTexCoordP3ui_remap_index 217
-#define MultiTexCoordP3uiv_remap_index 218
-#define MultiTexCoordP4ui_remap_index 219
-#define MultiTexCoordP4uiv_remap_index 220
-#define NormalP3ui_remap_index 221
-#define NormalP3uiv_remap_index 222
-#define SecondaryColorP3ui_remap_index 223
-#define SecondaryColorP3uiv_remap_index 224
-#define TexCoordP1ui_remap_index 225
-#define TexCoordP1uiv_remap_index 226
-#define TexCoordP2ui_remap_index 227
-#define TexCoordP2uiv_remap_index 228
-#define TexCoordP3ui_remap_index 229
-#define TexCoordP3uiv_remap_index 230
-#define TexCoordP4ui_remap_index 231
-#define TexCoordP4uiv_remap_index 232
-#define VertexAttribP1ui_remap_index 233
-#define VertexAttribP1uiv_remap_index 234
-#define VertexAttribP2ui_remap_index 235
-#define VertexAttribP2uiv_remap_index 236
-#define VertexAttribP3ui_remap_index 237
-#define VertexAttribP3uiv_remap_index 238
-#define VertexAttribP4ui_remap_index 239
-#define VertexAttribP4uiv_remap_index 240
-#define VertexP2ui_remap_index 241
-#define VertexP2uiv_remap_index 242
-#define VertexP3ui_remap_index 243
-#define VertexP3uiv_remap_index 244
-#define VertexP4ui_remap_index 245
-#define VertexP4uiv_remap_index 246
-#define BindTransformFeedback_remap_index 247
-#define DeleteTransformFeedbacks_remap_index 248
-#define DrawTransformFeedback_remap_index 249
-#define GenTransformFeedbacks_remap_index 250
-#define IsTransformFeedback_remap_index 251
-#define PauseTransformFeedback_remap_index 252
-#define ResumeTransformFeedback_remap_index 253
-#define ClearDepthf_remap_index 254
-#define DepthRangef_remap_index 255
-#define GetShaderPrecisionFormat_remap_index 256
-#define ReleaseShaderCompiler_remap_index 257
-#define ShaderBinary_remap_index 258
-#define DebugMessageCallbackARB_remap_index 259
-#define DebugMessageControlARB_remap_index 260
-#define DebugMessageInsertARB_remap_index 261
-#define GetDebugMessageLogARB_remap_index 262
-#define GetGraphicsResetStatusARB_remap_index 263
-#define GetnColorTableARB_remap_index 264
-#define GetnCompressedTexImageARB_remap_index 265
-#define GetnConvolutionFilterARB_remap_index 266
-#define GetnHistogramARB_remap_index 267
-#define GetnMapdvARB_remap_index 268
-#define GetnMapfvARB_remap_index 269
-#define GetnMapivARB_remap_index 270
-#define GetnMinmaxARB_remap_index 271
-#define GetnPixelMapfvARB_remap_index 272
-#define GetnPixelMapuivARB_remap_index 273
-#define GetnPixelMapusvARB_remap_index 274
-#define GetnPolygonStippleARB_remap_index 275
-#define GetnSeparableFilterARB_remap_index 276
-#define GetnTexImageARB_remap_index 277
-#define GetnUniformdvARB_remap_index 278
-#define GetnUniformfvARB_remap_index 279
-#define GetnUniformivARB_remap_index 280
-#define GetnUniformuivARB_remap_index 281
-#define ReadnPixelsARB_remap_index 282
-#define TexStorage1D_remap_index 283
-#define TexStorage2D_remap_index 284
-#define TexStorage3D_remap_index 285
-#define TextureStorage1DEXT_remap_index 286
-#define TextureStorage2DEXT_remap_index 287
-#define TextureStorage3DEXT_remap_index 288
-#define PolygonOffsetEXT_remap_index 289
-#define GetPixelTexGenParameterfvSGIS_remap_index 290
-#define GetPixelTexGenParameterivSGIS_remap_index 291
-#define PixelTexGenParameterfSGIS_remap_index 292
-#define PixelTexGenParameterfvSGIS_remap_index 293
-#define PixelTexGenParameteriSGIS_remap_index 294
-#define PixelTexGenParameterivSGIS_remap_index 295
-#define SampleMaskSGIS_remap_index 296
-#define SamplePatternSGIS_remap_index 297
-#define ColorPointerEXT_remap_index 298
-#define EdgeFlagPointerEXT_remap_index 299
-#define IndexPointerEXT_remap_index 300
-#define NormalPointerEXT_remap_index 301
-#define TexCoordPointerEXT_remap_index 302
-#define VertexPointerEXT_remap_index 303
-#define PointParameterfEXT_remap_index 304
-#define PointParameterfvEXT_remap_index 305
-#define LockArraysEXT_remap_index 306
-#define UnlockArraysEXT_remap_index 307
-#define SecondaryColor3bEXT_remap_index 308
-#define SecondaryColor3bvEXT_remap_index 309
-#define SecondaryColor3dEXT_remap_index 310
-#define SecondaryColor3dvEXT_remap_index 311
-#define SecondaryColor3fEXT_remap_index 312
-#define SecondaryColor3fvEXT_remap_index 313
-#define SecondaryColor3iEXT_remap_index 314
-#define SecondaryColor3ivEXT_remap_index 315
-#define SecondaryColor3sEXT_remap_index 316
-#define SecondaryColor3svEXT_remap_index 317
-#define SecondaryColor3ubEXT_remap_index 318
-#define SecondaryColor3ubvEXT_remap_index 319
-#define SecondaryColor3uiEXT_remap_index 320
-#define SecondaryColor3uivEXT_remap_index 321
-#define SecondaryColor3usEXT_remap_index 322
-#define SecondaryColor3usvEXT_remap_index 323
-#define SecondaryColorPointerEXT_remap_index 324
-#define MultiDrawArraysEXT_remap_index 325
-#define MultiDrawElementsEXT_remap_index 326
-#define FogCoordPointerEXT_remap_index 327
-#define FogCoorddEXT_remap_index 328
-#define FogCoorddvEXT_remap_index 329
-#define FogCoordfEXT_remap_index 330
-#define FogCoordfvEXT_remap_index 331
-#define PixelTexGenSGIX_remap_index 332
-#define BlendFuncSeparateEXT_remap_index 333
-#define FlushVertexArrayRangeNV_remap_index 334
-#define VertexArrayRangeNV_remap_index 335
-#define CombinerInputNV_remap_index 336
-#define CombinerOutputNV_remap_index 337
-#define CombinerParameterfNV_remap_index 338
-#define CombinerParameterfvNV_remap_index 339
-#define CombinerParameteriNV_remap_index 340
-#define CombinerParameterivNV_remap_index 341
-#define FinalCombinerInputNV_remap_index 342
-#define GetCombinerInputParameterfvNV_remap_index 343
-#define GetCombinerInputParameterivNV_remap_index 344
-#define GetCombinerOutputParameterfvNV_remap_index 345
-#define GetCombinerOutputParameterivNV_remap_index 346
-#define GetFinalCombinerInputParameterfvNV_remap_index 347
-#define GetFinalCombinerInputParameterivNV_remap_index 348
-#define ResizeBuffersMESA_remap_index 349
-#define WindowPos2dMESA_remap_index 350
-#define WindowPos2dvMESA_remap_index 351
-#define WindowPos2fMESA_remap_index 352
-#define WindowPos2fvMESA_remap_index 353
-#define WindowPos2iMESA_remap_index 354
-#define WindowPos2ivMESA_remap_index 355
-#define WindowPos2sMESA_remap_index 356
-#define WindowPos2svMESA_remap_index 357
-#define WindowPos3dMESA_remap_index 358
-#define WindowPos3dvMESA_remap_index 359
-#define WindowPos3fMESA_remap_index 360
-#define WindowPos3fvMESA_remap_index 361
-#define WindowPos3iMESA_remap_index 362
-#define WindowPos3ivMESA_remap_index 363
-#define WindowPos3sMESA_remap_index 364
-#define WindowPos3svMESA_remap_index 365
-#define WindowPos4dMESA_remap_index 366
-#define WindowPos4dvMESA_remap_index 367
-#define WindowPos4fMESA_remap_index 368
-#define WindowPos4fvMESA_remap_index 369
-#define WindowPos4iMESA_remap_index 370
-#define WindowPos4ivMESA_remap_index 371
-#define WindowPos4sMESA_remap_index 372
-#define WindowPos4svMESA_remap_index 373
-#define MultiModeDrawArraysIBM_remap_index 374
-#define MultiModeDrawElementsIBM_remap_index 375
-#define DeleteFencesNV_remap_index 376
-#define FinishFenceNV_remap_index 377
-#define GenFencesNV_remap_index 378
-#define GetFenceivNV_remap_index 379
-#define IsFenceNV_remap_index 380
-#define SetFenceNV_remap_index 381
-#define TestFenceNV_remap_index 382
-#define AreProgramsResidentNV_remap_index 383
-#define BindProgramNV_remap_index 384
-#define DeleteProgramsNV_remap_index 385
-#define ExecuteProgramNV_remap_index 386
-#define GenProgramsNV_remap_index 387
-#define GetProgramParameterdvNV_remap_index 388
-#define GetProgramParameterfvNV_remap_index 389
-#define GetProgramStringNV_remap_index 390
-#define GetProgramivNV_remap_index 391
-#define GetTrackMatrixivNV_remap_index 392
-#define GetVertexAttribPointervNV_remap_index 393
-#define GetVertexAttribdvNV_remap_index 394
-#define GetVertexAttribfvNV_remap_index 395
-#define GetVertexAttribivNV_remap_index 396
-#define IsProgramNV_remap_index 397
-#define LoadProgramNV_remap_index 398
-#define ProgramParameters4dvNV_remap_index 399
-#define ProgramParameters4fvNV_remap_index 400
-#define RequestResidentProgramsNV_remap_index 401
-#define TrackMatrixNV_remap_index 402
-#define VertexAttrib1dNV_remap_index 403
-#define VertexAttrib1dvNV_remap_index 404
-#define VertexAttrib1fNV_remap_index 405
-#define VertexAttrib1fvNV_remap_index 406
-#define VertexAttrib1sNV_remap_index 407
-#define VertexAttrib1svNV_remap_index 408
-#define VertexAttrib2dNV_remap_index 409
-#define VertexAttrib2dvNV_remap_index 410
-#define VertexAttrib2fNV_remap_index 411
-#define VertexAttrib2fvNV_remap_index 412
-#define VertexAttrib2sNV_remap_index 413
-#define VertexAttrib2svNV_remap_index 414
-#define VertexAttrib3dNV_remap_index 415
-#define VertexAttrib3dvNV_remap_index 416
-#define VertexAttrib3fNV_remap_index 417
-#define VertexAttrib3fvNV_remap_index 418
-#define VertexAttrib3sNV_remap_index 419
-#define VertexAttrib3svNV_remap_index 420
-#define VertexAttrib4dNV_remap_index 421
-#define VertexAttrib4dvNV_remap_index 422
-#define VertexAttrib4fNV_remap_index 423
-#define VertexAttrib4fvNV_remap_index 424
-#define VertexAttrib4sNV_remap_index 425
-#define VertexAttrib4svNV_remap_index 426
-#define VertexAttrib4ubNV_remap_index 427
-#define VertexAttrib4ubvNV_remap_index 428
-#define VertexAttribPointerNV_remap_index 429
-#define VertexAttribs1dvNV_remap_index 430
-#define VertexAttribs1fvNV_remap_index 431
-#define VertexAttribs1svNV_remap_index 432
-#define VertexAttribs2dvNV_remap_index 433
-#define VertexAttribs2fvNV_remap_index 434
-#define VertexAttribs2svNV_remap_index 435
-#define VertexAttribs3dvNV_remap_index 436
-#define VertexAttribs3fvNV_remap_index 437
-#define VertexAttribs3svNV_remap_index 438
-#define VertexAttribs4dvNV_remap_index 439
-#define VertexAttribs4fvNV_remap_index 440
-#define VertexAttribs4svNV_remap_index 441
-#define VertexAttribs4ubvNV_remap_index 442
-#define GetTexBumpParameterfvATI_remap_index 443
-#define GetTexBumpParameterivATI_remap_index 444
-#define TexBumpParameterfvATI_remap_index 445
-#define TexBumpParameterivATI_remap_index 446
-#define AlphaFragmentOp1ATI_remap_index 447
-#define AlphaFragmentOp2ATI_remap_index 448
-#define AlphaFragmentOp3ATI_remap_index 449
-#define BeginFragmentShaderATI_remap_index 450
-#define BindFragmentShaderATI_remap_index 451
-#define ColorFragmentOp1ATI_remap_index 452
-#define ColorFragmentOp2ATI_remap_index 453
-#define ColorFragmentOp3ATI_remap_index 454
-#define DeleteFragmentShaderATI_remap_index 455
-#define EndFragmentShaderATI_remap_index 456
-#define GenFragmentShadersATI_remap_index 457
-#define PassTexCoordATI_remap_index 458
-#define SampleMapATI_remap_index 459
-#define SetFragmentShaderConstantATI_remap_index 460
-#define PointParameteriNV_remap_index 461
-#define PointParameterivNV_remap_index 462
-#define ActiveStencilFaceEXT_remap_index 463
-#define BindVertexArrayAPPLE_remap_index 464
-#define DeleteVertexArraysAPPLE_remap_index 465
-#define GenVertexArraysAPPLE_remap_index 466
-#define IsVertexArrayAPPLE_remap_index 467
-#define GetProgramNamedParameterdvNV_remap_index 468
-#define GetProgramNamedParameterfvNV_remap_index 469
-#define ProgramNamedParameter4dNV_remap_index 470
-#define ProgramNamedParameter4dvNV_remap_index 471
-#define ProgramNamedParameter4fNV_remap_index 472
-#define ProgramNamedParameter4fvNV_remap_index 473
-#define PrimitiveRestartIndexNV_remap_index 474
-#define PrimitiveRestartNV_remap_index 475
-#define DepthBoundsEXT_remap_index 476
-#define BlendEquationSeparateEXT_remap_index 477
-#define BindFramebufferEXT_remap_index 478
-#define BindRenderbufferEXT_remap_index 479
-#define CheckFramebufferStatusEXT_remap_index 480
-#define DeleteFramebuffersEXT_remap_index 481
-#define DeleteRenderbuffersEXT_remap_index 482
-#define FramebufferRenderbufferEXT_remap_index 483
-#define FramebufferTexture1DEXT_remap_index 484
-#define FramebufferTexture2DEXT_remap_index 485
-#define FramebufferTexture3DEXT_remap_index 486
-#define GenFramebuffersEXT_remap_index 487
-#define GenRenderbuffersEXT_remap_index 488
-#define GenerateMipmapEXT_remap_index 489
-#define GetFramebufferAttachmentParameterivEXT_remap_index 490
-#define GetRenderbufferParameterivEXT_remap_index 491
-#define IsFramebufferEXT_remap_index 492
-#define IsRenderbufferEXT_remap_index 493
-#define RenderbufferStorageEXT_remap_index 494
-#define BlitFramebufferEXT_remap_index 495
-#define BufferParameteriAPPLE_remap_index 496
-#define FlushMappedBufferRangeAPPLE_remap_index 497
-#define BindFragDataLocationEXT_remap_index 498
-#define GetFragDataLocationEXT_remap_index 499
-#define GetUniformuivEXT_remap_index 500
-#define GetVertexAttribIivEXT_remap_index 501
-#define GetVertexAttribIuivEXT_remap_index 502
-#define Uniform1uiEXT_remap_index 503
-#define Uniform1uivEXT_remap_index 504
-#define Uniform2uiEXT_remap_index 505
-#define Uniform2uivEXT_remap_index 506
-#define Uniform3uiEXT_remap_index 507
-#define Uniform3uivEXT_remap_index 508
-#define Uniform4uiEXT_remap_index 509
-#define Uniform4uivEXT_remap_index 510
-#define VertexAttribI1iEXT_remap_index 511
-#define VertexAttribI1ivEXT_remap_index 512
-#define VertexAttribI1uiEXT_remap_index 513
-#define VertexAttribI1uivEXT_remap_index 514
-#define VertexAttribI2iEXT_remap_index 515
-#define VertexAttribI2ivEXT_remap_index 516
-#define VertexAttribI2uiEXT_remap_index 517
-#define VertexAttribI2uivEXT_remap_index 518
-#define VertexAttribI3iEXT_remap_index 519
-#define VertexAttribI3ivEXT_remap_index 520
-#define VertexAttribI3uiEXT_remap_index 521
-#define VertexAttribI3uivEXT_remap_index 522
-#define VertexAttribI4bvEXT_remap_index 523
-#define VertexAttribI4iEXT_remap_index 524
-#define VertexAttribI4ivEXT_remap_index 525
-#define VertexAttribI4svEXT_remap_index 526
-#define VertexAttribI4ubvEXT_remap_index 527
-#define VertexAttribI4uiEXT_remap_index 528
-#define VertexAttribI4uivEXT_remap_index 529
-#define VertexAttribI4usvEXT_remap_index 530
-#define VertexAttribIPointerEXT_remap_index 531
-#define FramebufferTextureLayerEXT_remap_index 532
-#define ColorMaskIndexedEXT_remap_index 533
-#define DisableIndexedEXT_remap_index 534
-#define EnableIndexedEXT_remap_index 535
-#define GetBooleanIndexedvEXT_remap_index 536
-#define GetIntegerIndexedvEXT_remap_index 537
-#define IsEnabledIndexedEXT_remap_index 538
-#define ClearColorIiEXT_remap_index 539
-#define ClearColorIuiEXT_remap_index 540
-#define GetTexParameterIivEXT_remap_index 541
-#define GetTexParameterIuivEXT_remap_index 542
-#define TexParameterIivEXT_remap_index 543
-#define TexParameterIuivEXT_remap_index 544
-#define BeginConditionalRenderNV_remap_index 545
-#define EndConditionalRenderNV_remap_index 546
-#define BeginTransformFeedbackEXT_remap_index 547
-#define BindBufferBaseEXT_remap_index 548
-#define BindBufferOffsetEXT_remap_index 549
-#define BindBufferRangeEXT_remap_index 550
-#define EndTransformFeedbackEXT_remap_index 551
-#define GetTransformFeedbackVaryingEXT_remap_index 552
-#define TransformFeedbackVaryingsEXT_remap_index 553
-#define ProvokingVertexEXT_remap_index 554
-#define GetTexParameterPointervAPPLE_remap_index 555
-#define TextureRangeAPPLE_remap_index 556
-#define GetObjectParameterivAPPLE_remap_index 557
-#define ObjectPurgeableAPPLE_remap_index 558
-#define ObjectUnpurgeableAPPLE_remap_index 559
-#define ActiveProgramEXT_remap_index 560
-#define CreateShaderProgramEXT_remap_index 561
-#define UseShaderProgramEXT_remap_index 562
-#define TextureBarrierNV_remap_index 563
-#define StencilFuncSeparateATI_remap_index 564
-#define ProgramEnvParameters4fvEXT_remap_index 565
-#define ProgramLocalParameters4fvEXT_remap_index 566
-#define GetQueryObjecti64vEXT_remap_index 567
-#define GetQueryObjectui64vEXT_remap_index 568
-#define EGLImageTargetRenderbufferStorageOES_remap_index 569
-#define EGLImageTargetTexture2DOES_remap_index 570
+#define FramebufferTexture_remap_index 28
+#define GetBufferParameteri64v_remap_index 29
+#define GetInteger64i_v_remap_index 30
+#define VertexAttribDivisor_remap_index 31
+#define LoadTransposeMatrixdARB_remap_index 32
+#define LoadTransposeMatrixfARB_remap_index 33
+#define MultTransposeMatrixdARB_remap_index 34
+#define MultTransposeMatrixfARB_remap_index 35
+#define SampleCoverageARB_remap_index 36
+#define CompressedTexImage1DARB_remap_index 37
+#define CompressedTexImage2DARB_remap_index 38
+#define CompressedTexImage3DARB_remap_index 39
+#define CompressedTexSubImage1DARB_remap_index 40
+#define CompressedTexSubImage2DARB_remap_index 41
+#define CompressedTexSubImage3DARB_remap_index 42
+#define GetCompressedTexImageARB_remap_index 43
+#define DisableVertexAttribArrayARB_remap_index 44
+#define EnableVertexAttribArrayARB_remap_index 45
+#define GetProgramEnvParameterdvARB_remap_index 46
+#define GetProgramEnvParameterfvARB_remap_index 47
+#define GetProgramLocalParameterdvARB_remap_index 48
+#define GetProgramLocalParameterfvARB_remap_index 49
+#define GetProgramStringARB_remap_index 50
+#define GetProgramivARB_remap_index 51
+#define GetVertexAttribdvARB_remap_index 52
+#define GetVertexAttribfvARB_remap_index 53
+#define GetVertexAttribivARB_remap_index 54
+#define ProgramEnvParameter4dARB_remap_index 55
+#define ProgramEnvParameter4dvARB_remap_index 56
+#define ProgramEnvParameter4fARB_remap_index 57
+#define ProgramEnvParameter4fvARB_remap_index 58
+#define ProgramLocalParameter4dARB_remap_index 59
+#define ProgramLocalParameter4dvARB_remap_index 60
+#define ProgramLocalParameter4fARB_remap_index 61
+#define ProgramLocalParameter4fvARB_remap_index 62
+#define ProgramStringARB_remap_index 63
+#define VertexAttrib1dARB_remap_index 64
+#define VertexAttrib1dvARB_remap_index 65
+#define VertexAttrib1fARB_remap_index 66
+#define VertexAttrib1fvARB_remap_index 67
+#define VertexAttrib1sARB_remap_index 68
+#define VertexAttrib1svARB_remap_index 69
+#define VertexAttrib2dARB_remap_index 70
+#define VertexAttrib2dvARB_remap_index 71
+#define VertexAttrib2fARB_remap_index 72
+#define VertexAttrib2fvARB_remap_index 73
+#define VertexAttrib2sARB_remap_index 74
+#define VertexAttrib2svARB_remap_index 75
+#define VertexAttrib3dARB_remap_index 76
+#define VertexAttrib3dvARB_remap_index 77
+#define VertexAttrib3fARB_remap_index 78
+#define VertexAttrib3fvARB_remap_index 79
+#define VertexAttrib3sARB_remap_index 80
+#define VertexAttrib3svARB_remap_index 81
+#define VertexAttrib4NbvARB_remap_index 82
+#define VertexAttrib4NivARB_remap_index 83
+#define VertexAttrib4NsvARB_remap_index 84
+#define VertexAttrib4NubARB_remap_index 85
+#define VertexAttrib4NubvARB_remap_index 86
+#define VertexAttrib4NuivARB_remap_index 87
+#define VertexAttrib4NusvARB_remap_index 88
+#define VertexAttrib4bvARB_remap_index 89
+#define VertexAttrib4dARB_remap_index 90
+#define VertexAttrib4dvARB_remap_index 91
+#define VertexAttrib4fARB_remap_index 92
+#define VertexAttrib4fvARB_remap_index 93
+#define VertexAttrib4ivARB_remap_index 94
+#define VertexAttrib4sARB_remap_index 95
+#define VertexAttrib4svARB_remap_index 96
+#define VertexAttrib4ubvARB_remap_index 97
+#define VertexAttrib4uivARB_remap_index 98
+#define VertexAttrib4usvARB_remap_index 99
+#define VertexAttribPointerARB_remap_index 100
+#define BindBufferARB_remap_index 101
+#define BufferDataARB_remap_index 102
+#define BufferSubDataARB_remap_index 103
+#define DeleteBuffersARB_remap_index 104
+#define GenBuffersARB_remap_index 105
+#define GetBufferParameterivARB_remap_index 106
+#define GetBufferPointervARB_remap_index 107
+#define GetBufferSubDataARB_remap_index 108
+#define IsBufferARB_remap_index 109
+#define MapBufferARB_remap_index 110
+#define UnmapBufferARB_remap_index 111
+#define BeginQueryARB_remap_index 112
+#define DeleteQueriesARB_remap_index 113
+#define EndQueryARB_remap_index 114
+#define GenQueriesARB_remap_index 115
+#define GetQueryObjectivARB_remap_index 116
+#define GetQueryObjectuivARB_remap_index 117
+#define GetQueryivARB_remap_index 118
+#define IsQueryARB_remap_index 119
+#define AttachObjectARB_remap_index 120
+#define CompileShaderARB_remap_index 121
+#define CreateProgramObjectARB_remap_index 122
+#define CreateShaderObjectARB_remap_index 123
+#define DeleteObjectARB_remap_index 124
+#define DetachObjectARB_remap_index 125
+#define GetActiveUniformARB_remap_index 126
+#define GetAttachedObjectsARB_remap_index 127
+#define GetHandleARB_remap_index 128
+#define GetInfoLogARB_remap_index 129
+#define GetObjectParameterfvARB_remap_index 130
+#define GetObjectParameterivARB_remap_index 131
+#define GetShaderSourceARB_remap_index 132
+#define GetUniformLocationARB_remap_index 133
+#define GetUniformfvARB_remap_index 134
+#define GetUniformivARB_remap_index 135
+#define LinkProgramARB_remap_index 136
+#define ShaderSourceARB_remap_index 137
+#define Uniform1fARB_remap_index 138
+#define Uniform1fvARB_remap_index 139
+#define Uniform1iARB_remap_index 140
+#define Uniform1ivARB_remap_index 141
+#define Uniform2fARB_remap_index 142
+#define Uniform2fvARB_remap_index 143
+#define Uniform2iARB_remap_index 144
+#define Uniform2ivARB_remap_index 145
+#define Uniform3fARB_remap_index 146
+#define Uniform3fvARB_remap_index 147
+#define Uniform3iARB_remap_index 148
+#define Uniform3ivARB_remap_index 149
+#define Uniform4fARB_remap_index 150
+#define Uniform4fvARB_remap_index 151
+#define Uniform4iARB_remap_index 152
+#define Uniform4ivARB_remap_index 153
+#define UniformMatrix2fvARB_remap_index 154
+#define UniformMatrix3fvARB_remap_index 155
+#define UniformMatrix4fvARB_remap_index 156
+#define UseProgramObjectARB_remap_index 157
+#define ValidateProgramARB_remap_index 158
+#define BindAttribLocationARB_remap_index 159
+#define GetActiveAttribARB_remap_index 160
+#define GetAttribLocationARB_remap_index 161
+#define DrawBuffersARB_remap_index 162
+#define ClampColorARB_remap_index 163
+#define DrawArraysInstancedARB_remap_index 164
+#define DrawElementsInstancedARB_remap_index 165
+#define RenderbufferStorageMultisample_remap_index 166
+#define FramebufferTextureARB_remap_index 167
+#define FramebufferTextureFaceARB_remap_index 168
+#define ProgramParameteriARB_remap_index 169
+#define VertexAttribDivisorARB_remap_index 170
+#define FlushMappedBufferRange_remap_index 171
+#define MapBufferRange_remap_index 172
+#define TexBufferARB_remap_index 173
+#define BindVertexArray_remap_index 174
+#define GenVertexArrays_remap_index 175
+#define CopyBufferSubData_remap_index 176
+#define ClientWaitSync_remap_index 177
+#define DeleteSync_remap_index 178
+#define FenceSync_remap_index 179
+#define GetInteger64v_remap_index 180
+#define GetSynciv_remap_index 181
+#define IsSync_remap_index 182
+#define WaitSync_remap_index 183
+#define DrawElementsBaseVertex_remap_index 184
+#define DrawElementsInstancedBaseVertex_remap_index 185
+#define DrawRangeElementsBaseVertex_remap_index 186
+#define MultiDrawElementsBaseVertex_remap_index 187
+#define BlendEquationSeparateiARB_remap_index 188
+#define BlendEquationiARB_remap_index 189
+#define BlendFuncSeparateiARB_remap_index 190
+#define BlendFunciARB_remap_index 191
+#define BindFragDataLocationIndexed_remap_index 192
+#define GetFragDataIndex_remap_index 193
+#define BindSampler_remap_index 194
+#define DeleteSamplers_remap_index 195
+#define GenSamplers_remap_index 196
+#define GetSamplerParameterIiv_remap_index 197
+#define GetSamplerParameterIuiv_remap_index 198
+#define GetSamplerParameterfv_remap_index 199
+#define GetSamplerParameteriv_remap_index 200
+#define IsSampler_remap_index 201
+#define SamplerParameterIiv_remap_index 202
+#define SamplerParameterIuiv_remap_index 203
+#define SamplerParameterf_remap_index 204
+#define SamplerParameterfv_remap_index 205
+#define SamplerParameteri_remap_index 206
+#define SamplerParameteriv_remap_index 207
+#define ColorP3ui_remap_index 208
+#define ColorP3uiv_remap_index 209
+#define ColorP4ui_remap_index 210
+#define ColorP4uiv_remap_index 211
+#define MultiTexCoordP1ui_remap_index 212
+#define MultiTexCoordP1uiv_remap_index 213
+#define MultiTexCoordP2ui_remap_index 214
+#define MultiTexCoordP2uiv_remap_index 215
+#define MultiTexCoordP3ui_remap_index 216
+#define MultiTexCoordP3uiv_remap_index 217
+#define MultiTexCoordP4ui_remap_index 218
+#define MultiTexCoordP4uiv_remap_index 219
+#define NormalP3ui_remap_index 220
+#define NormalP3uiv_remap_index 221
+#define SecondaryColorP3ui_remap_index 222
+#define SecondaryColorP3uiv_remap_index 223
+#define TexCoordP1ui_remap_index 224
+#define TexCoordP1uiv_remap_index 225
+#define TexCoordP2ui_remap_index 226
+#define TexCoordP2uiv_remap_index 227
+#define TexCoordP3ui_remap_index 228
+#define TexCoordP3uiv_remap_index 229
+#define TexCoordP4ui_remap_index 230
+#define TexCoordP4uiv_remap_index 231
+#define VertexAttribP1ui_remap_index 232
+#define VertexAttribP1uiv_remap_index 233
+#define VertexAttribP2ui_remap_index 234
+#define VertexAttribP2uiv_remap_index 235
+#define VertexAttribP3ui_remap_index 236
+#define VertexAttribP3uiv_remap_index 237
+#define VertexAttribP4ui_remap_index 238
+#define VertexAttribP4uiv_remap_index 239
+#define VertexP2ui_remap_index 240
+#define VertexP2uiv_remap_index 241
+#define VertexP3ui_remap_index 242
+#define VertexP3uiv_remap_index 243
+#define VertexP4ui_remap_index 244
+#define VertexP4uiv_remap_index 245
+#define BindTransformFeedback_remap_index 246
+#define DeleteTransformFeedbacks_remap_index 247
+#define DrawTransformFeedback_remap_index 248
+#define GenTransformFeedbacks_remap_index 249
+#define IsTransformFeedback_remap_index 250
+#define PauseTransformFeedback_remap_index 251
+#define ResumeTransformFeedback_remap_index 252
+#define ClearDepthf_remap_index 253
+#define DepthRangef_remap_index 254
+#define GetShaderPrecisionFormat_remap_index 255
+#define ReleaseShaderCompiler_remap_index 256
+#define ShaderBinary_remap_index 257
+#define DebugMessageCallbackARB_remap_index 258
+#define DebugMessageControlARB_remap_index 259
+#define DebugMessageInsertARB_remap_index 260
+#define GetDebugMessageLogARB_remap_index 261
+#define GetGraphicsResetStatusARB_remap_index 262
+#define GetnColorTableARB_remap_index 263
+#define GetnCompressedTexImageARB_remap_index 264
+#define GetnConvolutionFilterARB_remap_index 265
+#define GetnHistogramARB_remap_index 266
+#define GetnMapdvARB_remap_index 267
+#define GetnMapfvARB_remap_index 268
+#define GetnMapivARB_remap_index 269
+#define GetnMinmaxARB_remap_index 270
+#define GetnPixelMapfvARB_remap_index 271
+#define GetnPixelMapuivARB_remap_index 272
+#define GetnPixelMapusvARB_remap_index 273
+#define GetnPolygonStippleARB_remap_index 274
+#define GetnSeparableFilterARB_remap_index 275
+#define GetnTexImageARB_remap_index 276
+#define GetnUniformdvARB_remap_index 277
+#define GetnUniformfvARB_remap_index 278
+#define GetnUniformivARB_remap_index 279
+#define GetnUniformuivARB_remap_index 280
+#define ReadnPixelsARB_remap_index 281
+#define TexStorage1D_remap_index 282
+#define TexStorage2D_remap_index 283
+#define TexStorage3D_remap_index 284
+#define TextureStorage1DEXT_remap_index 285
+#define TextureStorage2DEXT_remap_index 286
+#define TextureStorage3DEXT_remap_index 287
+#define PolygonOffsetEXT_remap_index 288
+#define GetPixelTexGenParameterfvSGIS_remap_index 289
+#define GetPixelTexGenParameterivSGIS_remap_index 290
+#define PixelTexGenParameterfSGIS_remap_index 291
+#define PixelTexGenParameterfvSGIS_remap_index 292
+#define PixelTexGenParameteriSGIS_remap_index 293
+#define PixelTexGenParameterivSGIS_remap_index 294
+#define SampleMaskSGIS_remap_index 295
+#define SamplePatternSGIS_remap_index 296
+#define ColorPointerEXT_remap_index 297
+#define EdgeFlagPointerEXT_remap_index 298
+#define IndexPointerEXT_remap_index 299
+#define NormalPointerEXT_remap_index 300
+#define TexCoordPointerEXT_remap_index 301
+#define VertexPointerEXT_remap_index 302
+#define PointParameterfEXT_remap_index 303
+#define PointParameterfvEXT_remap_index 304
+#define LockArraysEXT_remap_index 305
+#define UnlockArraysEXT_remap_index 306
+#define SecondaryColor3bEXT_remap_index 307
+#define SecondaryColor3bvEXT_remap_index 308
+#define SecondaryColor3dEXT_remap_index 309
+#define SecondaryColor3dvEXT_remap_index 310
+#define SecondaryColor3fEXT_remap_index 311
+#define SecondaryColor3fvEXT_remap_index 312
+#define SecondaryColor3iEXT_remap_index 313
+#define SecondaryColor3ivEXT_remap_index 314
+#define SecondaryColor3sEXT_remap_index 315
+#define SecondaryColor3svEXT_remap_index 316
+#define SecondaryColor3ubEXT_remap_index 317
+#define SecondaryColor3ubvEXT_remap_index 318
+#define SecondaryColor3uiEXT_remap_index 319
+#define SecondaryColor3uivEXT_remap_index 320
+#define SecondaryColor3usEXT_remap_index 321
+#define SecondaryColor3usvEXT_remap_index 322
+#define SecondaryColorPointerEXT_remap_index 323
+#define MultiDrawArraysEXT_remap_index 324
+#define MultiDrawElementsEXT_remap_index 325
+#define FogCoordPointerEXT_remap_index 326
+#define FogCoorddEXT_remap_index 327
+#define FogCoorddvEXT_remap_index 328
+#define FogCoordfEXT_remap_index 329
+#define FogCoordfvEXT_remap_index 330
+#define PixelTexGenSGIX_remap_index 331
+#define BlendFuncSeparateEXT_remap_index 332
+#define FlushVertexArrayRangeNV_remap_index 333
+#define VertexArrayRangeNV_remap_index 334
+#define CombinerInputNV_remap_index 335
+#define CombinerOutputNV_remap_index 336
+#define CombinerParameterfNV_remap_index 337
+#define CombinerParameterfvNV_remap_index 338
+#define CombinerParameteriNV_remap_index 339
+#define CombinerParameterivNV_remap_index 340
+#define FinalCombinerInputNV_remap_index 341
+#define GetCombinerInputParameterfvNV_remap_index 342
+#define GetCombinerInputParameterivNV_remap_index 343
+#define GetCombinerOutputParameterfvNV_remap_index 344
+#define GetCombinerOutputParameterivNV_remap_index 345
+#define GetFinalCombinerInputParameterfvNV_remap_index 346
+#define GetFinalCombinerInputParameterivNV_remap_index 347
+#define ResizeBuffersMESA_remap_index 348
+#define WindowPos2dMESA_remap_index 349
+#define WindowPos2dvMESA_remap_index 350
+#define WindowPos2fMESA_remap_index 351
+#define WindowPos2fvMESA_remap_index 352
+#define WindowPos2iMESA_remap_index 353
+#define WindowPos2ivMESA_remap_index 354
+#define WindowPos2sMESA_remap_index 355
+#define WindowPos2svMESA_remap_index 356
+#define WindowPos3dMESA_remap_index 357
+#define WindowPos3dvMESA_remap_index 358
+#define WindowPos3fMESA_remap_index 359
+#define WindowPos3fvMESA_remap_index 360
+#define WindowPos3iMESA_remap_index 361
+#define WindowPos3ivMESA_remap_index 362
+#define WindowPos3sMESA_remap_index 363
+#define WindowPos3svMESA_remap_index 364
+#define WindowPos4dMESA_remap_index 365
+#define WindowPos4dvMESA_remap_index 366
+#define WindowPos4fMESA_remap_index 367
+#define WindowPos4fvMESA_remap_index 368
+#define WindowPos4iMESA_remap_index 369
+#define WindowPos4ivMESA_remap_index 370
+#define WindowPos4sMESA_remap_index 371
+#define WindowPos4svMESA_remap_index 372
+#define MultiModeDrawArraysIBM_remap_index 373
+#define MultiModeDrawElementsIBM_remap_index 374
+#define DeleteFencesNV_remap_index 375
+#define FinishFenceNV_remap_index 376
+#define GenFencesNV_remap_index 377
+#define GetFenceivNV_remap_index 378
+#define IsFenceNV_remap_index 379
+#define SetFenceNV_remap_index 380
+#define TestFenceNV_remap_index 381
+#define AreProgramsResidentNV_remap_index 382
+#define BindProgramNV_remap_index 383
+#define DeleteProgramsNV_remap_index 384
+#define ExecuteProgramNV_remap_index 385
+#define GenProgramsNV_remap_index 386
+#define GetProgramParameterdvNV_remap_index 387
+#define GetProgramParameterfvNV_remap_index 388
+#define GetProgramStringNV_remap_index 389
+#define GetProgramivNV_remap_index 390
+#define GetTrackMatrixivNV_remap_index 391
+#define GetVertexAttribPointervNV_remap_index 392
+#define GetVertexAttribdvNV_remap_index 393
+#define GetVertexAttribfvNV_remap_index 394
+#define GetVertexAttribivNV_remap_index 395
+#define IsProgramNV_remap_index 396
+#define LoadProgramNV_remap_index 397
+#define ProgramParameters4dvNV_remap_index 398
+#define ProgramParameters4fvNV_remap_index 399
+#define RequestResidentProgramsNV_remap_index 400
+#define TrackMatrixNV_remap_index 401
+#define VertexAttrib1dNV_remap_index 402
+#define VertexAttrib1dvNV_remap_index 403
+#define VertexAttrib1fNV_remap_index 404
+#define VertexAttrib1fvNV_remap_index 405
+#define VertexAttrib1sNV_remap_index 406
+#define VertexAttrib1svNV_remap_index 407
+#define VertexAttrib2dNV_remap_index 408
+#define VertexAttrib2dvNV_remap_index 409
+#define VertexAttrib2fNV_remap_index 410
+#define VertexAttrib2fvNV_remap_index 411
+#define VertexAttrib2sNV_remap_index 412
+#define VertexAttrib2svNV_remap_index 413
+#define VertexAttrib3dNV_remap_index 414
+#define VertexAttrib3dvNV_remap_index 415
+#define VertexAttrib3fNV_remap_index 416
+#define VertexAttrib3fvNV_remap_index 417
+#define VertexAttrib3sNV_remap_index 418
+#define VertexAttrib3svNV_remap_index 419
+#define VertexAttrib4dNV_remap_index 420
+#define VertexAttrib4dvNV_remap_index 421
+#define VertexAttrib4fNV_remap_index 422
+#define VertexAttrib4fvNV_remap_index 423
+#define VertexAttrib4sNV_remap_index 424
+#define VertexAttrib4svNV_remap_index 425
+#define VertexAttrib4ubNV_remap_index 426
+#define VertexAttrib4ubvNV_remap_index 427
+#define VertexAttribPointerNV_remap_index 428
+#define VertexAttribs1dvNV_remap_index 429
+#define VertexAttribs1fvNV_remap_index 430
+#define VertexAttribs1svNV_remap_index 431
+#define VertexAttribs2dvNV_remap_index 432
+#define VertexAttribs2fvNV_remap_index 433
+#define VertexAttribs2svNV_remap_index 434
+#define VertexAttribs3dvNV_remap_index 435
+#define VertexAttribs3fvNV_remap_index 436
+#define VertexAttribs3svNV_remap_index 437
+#define VertexAttribs4dvNV_remap_index 438
+#define VertexAttribs4fvNV_remap_index 439
+#define VertexAttribs4svNV_remap_index 440
+#define VertexAttribs4ubvNV_remap_index 441
+#define GetTexBumpParameterfvATI_remap_index 442
+#define GetTexBumpParameterivATI_remap_index 443
+#define TexBumpParameterfvATI_remap_index 444
+#define TexBumpParameterivATI_remap_index 445
+#define AlphaFragmentOp1ATI_remap_index 446
+#define AlphaFragmentOp2ATI_remap_index 447
+#define AlphaFragmentOp3ATI_remap_index 448
+#define BeginFragmentShaderATI_remap_index 449
+#define BindFragmentShaderATI_remap_index 450
+#define ColorFragmentOp1ATI_remap_index 451
+#define ColorFragmentOp2ATI_remap_index 452
+#define ColorFragmentOp3ATI_remap_index 453
+#define DeleteFragmentShaderATI_remap_index 454
+#define EndFragmentShaderATI_remap_index 455
+#define GenFragmentShadersATI_remap_index 456
+#define PassTexCoordATI_remap_index 457
+#define SampleMapATI_remap_index 458
+#define SetFragmentShaderConstantATI_remap_index 459
+#define PointParameteriNV_remap_index 460
+#define PointParameterivNV_remap_index 461
+#define ActiveStencilFaceEXT_remap_index 462
+#define BindVertexArrayAPPLE_remap_index 463
+#define DeleteVertexArraysAPPLE_remap_index 464
+#define GenVertexArraysAPPLE_remap_index 465
+#define IsVertexArrayAPPLE_remap_index 466
+#define GetProgramNamedParameterdvNV_remap_index 467
+#define GetProgramNamedParameterfvNV_remap_index 468
+#define ProgramNamedParameter4dNV_remap_index 469
+#define ProgramNamedParameter4dvNV_remap_index 470
+#define ProgramNamedParameter4fNV_remap_index 471
+#define ProgramNamedParameter4fvNV_remap_index 472
+#define PrimitiveRestartIndexNV_remap_index 473
+#define PrimitiveRestartNV_remap_index 474
+#define DepthBoundsEXT_remap_index 475
+#define BlendEquationSeparateEXT_remap_index 476
+#define BindFramebufferEXT_remap_index 477
+#define BindRenderbufferEXT_remap_index 478
+#define CheckFramebufferStatusEXT_remap_index 479
+#define DeleteFramebuffersEXT_remap_index 480
+#define DeleteRenderbuffersEXT_remap_index 481
+#define FramebufferRenderbufferEXT_remap_index 482
+#define FramebufferTexture1DEXT_remap_index 483
+#define FramebufferTexture2DEXT_remap_index 484
+#define FramebufferTexture3DEXT_remap_index 485
+#define GenFramebuffersEXT_remap_index 486
+#define GenRenderbuffersEXT_remap_index 487
+#define GenerateMipmapEXT_remap_index 488
+#define GetFramebufferAttachmentParameterivEXT_remap_index 489
+#define GetRenderbufferParameterivEXT_remap_index 490
+#define IsFramebufferEXT_remap_index 491
+#define IsRenderbufferEXT_remap_index 492
+#define RenderbufferStorageEXT_remap_index 493
+#define BlitFramebufferEXT_remap_index 494
+#define BufferParameteriAPPLE_remap_index 495
+#define FlushMappedBufferRangeAPPLE_remap_index 496
+#define BindFragDataLocationEXT_remap_index 497
+#define GetFragDataLocationEXT_remap_index 498
+#define GetUniformuivEXT_remap_index 499
+#define GetVertexAttribIivEXT_remap_index 500
+#define GetVertexAttribIuivEXT_remap_index 501
+#define Uniform1uiEXT_remap_index 502
+#define Uniform1uivEXT_remap_index 503
+#define Uniform2uiEXT_remap_index 504
+#define Uniform2uivEXT_remap_index 505
+#define Uniform3uiEXT_remap_index 506
+#define Uniform3uivEXT_remap_index 507
+#define Uniform4uiEXT_remap_index 508
+#define Uniform4uivEXT_remap_index 509
+#define VertexAttribI1iEXT_remap_index 510
+#define VertexAttribI1ivEXT_remap_index 511
+#define VertexAttribI1uiEXT_remap_index 512
+#define VertexAttribI1uivEXT_remap_index 513
+#define VertexAttribI2iEXT_remap_index 514
+#define VertexAttribI2ivEXT_remap_index 515
+#define VertexAttribI2uiEXT_remap_index 516
+#define VertexAttribI2uivEXT_remap_index 517
+#define VertexAttribI3iEXT_remap_index 518
+#define VertexAttribI3ivEXT_remap_index 519
+#define VertexAttribI3uiEXT_remap_index 520
+#define VertexAttribI3uivEXT_remap_index 521
+#define VertexAttribI4bvEXT_remap_index 522
+#define VertexAttribI4iEXT_remap_index 523
+#define VertexAttribI4ivEXT_remap_index 524
+#define VertexAttribI4svEXT_remap_index 525
+#define VertexAttribI4ubvEXT_remap_index 526
+#define VertexAttribI4uiEXT_remap_index 527
+#define VertexAttribI4uivEXT_remap_index 528
+#define VertexAttribI4usvEXT_remap_index 529
+#define VertexAttribIPointerEXT_remap_index 530
+#define FramebufferTextureLayerEXT_remap_index 531
+#define ColorMaskIndexedEXT_remap_index 532
+#define DisableIndexedEXT_remap_index 533
+#define EnableIndexedEXT_remap_index 534
+#define GetBooleanIndexedvEXT_remap_index 535
+#define GetIntegerIndexedvEXT_remap_index 536
+#define IsEnabledIndexedEXT_remap_index 537
+#define ClearColorIiEXT_remap_index 538
+#define ClearColorIuiEXT_remap_index 539
+#define GetTexParameterIivEXT_remap_index 540
+#define GetTexParameterIuivEXT_remap_index 541
+#define TexParameterIivEXT_remap_index 542
+#define TexParameterIuivEXT_remap_index 543
+#define BeginConditionalRenderNV_remap_index 544
+#define EndConditionalRenderNV_remap_index 545
+#define BeginTransformFeedbackEXT_remap_index 546
+#define BindBufferBaseEXT_remap_index 547
+#define BindBufferOffsetEXT_remap_index 548
+#define BindBufferRangeEXT_remap_index 549
+#define EndTransformFeedbackEXT_remap_index 550
+#define GetTransformFeedbackVaryingEXT_remap_index 551
+#define TransformFeedbackVaryingsEXT_remap_index 552
+#define ProvokingVertexEXT_remap_index 553
+#define GetTexParameterPointervAPPLE_remap_index 554
+#define TextureRangeAPPLE_remap_index 555
+#define GetObjectParameterivAPPLE_remap_index 556
+#define ObjectPurgeableAPPLE_remap_index 557
+#define ObjectUnpurgeableAPPLE_remap_index 558
+#define ActiveProgramEXT_remap_index 559
+#define CreateShaderProgramEXT_remap_index 560
+#define UseShaderProgramEXT_remap_index 561
+#define TextureBarrierNV_remap_index 562
+#define StencilFuncSeparateATI_remap_index 563
+#define ProgramEnvParameters4fvEXT_remap_index 564
+#define ProgramLocalParameters4fvEXT_remap_index 565
+#define GetQueryObjecti64vEXT_remap_index 566
+#define GetQueryObjectui64vEXT_remap_index 567
+#define EGLImageTargetRenderbufferStorageOES_remap_index 568
+#define EGLImageTargetTexture2DOES_remap_index 569
 
 #define _gloffset_AttachShader driDispatchRemapTable[AttachShader_remap_index]
 #define _gloffset_CreateProgram driDispatchRemapTable[CreateProgram_remap_index]
@@ -1653,7 +1651,6 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define _gloffset_ClearBufferiv driDispatchRemapTable[ClearBufferiv_remap_index]
 #define _gloffset_ClearBufferuiv driDispatchRemapTable[ClearBufferuiv_remap_index]
 #define _gloffset_GetStringi driDispatchRemapTable[GetStringi_remap_index]
-#define _gloffset_TexBuffer driDispatchRemapTable[TexBuffer_remap_index]
 #define _gloffset_FramebufferTexture driDispatchRemapTable[FramebufferTexture_remap_index]
 #define _gloffset_GetBufferParameteri64v driDispatchRemapTable[GetBufferParameteri64v_remap_index]
 #define _gloffset_GetInteger64i_v driDispatchRemapTable[GetInteger64i_v_remap_index]
@@ -6995,17 +6992,6 @@ static inline void SET_GetStringi(struct _glapi_table *disp, const GLubyte * (GL
    SET_by_offset(disp, _gloffset_GetStringi, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_TexBuffer)(GLenum, GLenum, GLuint);
-#define CALL_TexBuffer(disp, parameters) \
-    (* GET_TexBuffer(disp)) parameters
-static inline _glptr_TexBuffer GET_TexBuffer(struct _glapi_table *disp) {
-   return (_glptr_TexBuffer) (GET_by_offset(disp, _gloffset_TexBuffer));
-}
-
-static inline void SET_TexBuffer(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLuint)) {
-   SET_by_offset(disp, _gloffset_TexBuffer, fn);
-}
-
 typedef void (GLAPIENTRYP _glptr_FramebufferTexture)(GLenum, GLenum, GLuint, GLint);
 #define CALL_FramebufferTexture(disp, parameters) \
     (* GET_FramebufferTexture(disp)) parameters
diff --git a/mesalib/src/mesa/main/dlist.c b/mesalib/src/mesa/main/dlist.c
index f113573d8..8cfb97c26 100644
--- a/mesalib/src/mesa/main/dlist.c
+++ b/mesalib/src/mesa/main/dlist.c
@@ -10319,6 +10319,9 @@ _mesa_create_save_table(void)
    SET_FlushMappedBufferRange(table, _mesa_FlushMappedBufferRange); /* no dl */
 #endif
 
+   /* ARB 51. GL_ARB_texture_buffer_object */
+   SET_TexBufferARB(table, _mesa_TexBuffer); /* no dlist save */
+
    /* ARB 59. GL_ARB_copy_buffer */
    SET_CopyBufferSubData(table, _mesa_CopyBufferSubData); /* no dlist save */
 
diff --git a/mesalib/src/mesa/main/extensions.c b/mesalib/src/mesa/main/extensions.c
index 8c262af08..3ce4cd559 100644
--- a/mesalib/src/mesa/main/extensions.c
+++ b/mesalib/src/mesa/main/extensions.c
@@ -750,6 +750,8 @@ get_extension_override( struct gl_context *ctx )
       }
    }
 
+   free(env);
+
    /* Remove trailing space. */
    len = strlen(extra_exts);
    if (extra_exts[len - 1] == ' ')
diff --git a/mesalib/src/mesa/main/ff_fragment_shader.cpp b/mesalib/src/mesa/main/ff_fragment_shader.cpp
index afc17dc49..7b830439d 100644
--- a/mesalib/src/mesa/main/ff_fragment_shader.cpp
+++ b/mesalib/src/mesa/main/ff_fragment_shader.cpp
@@ -511,17 +511,11 @@ static GLuint make_state_key( struct gl_context *ctx,  struct state_key *key )
 struct texenv_fragment_program {
    struct gl_shader_program *shader_program;
    struct gl_shader *shader;
-   struct gl_fragment_program *program;
    exec_list *instructions;
    exec_list *top_instructions;
    void *mem_ctx;
    struct state_key *state;
 
-   GLbitfield alu_temps;	/**< Track texture indirections, see spec. */
-   GLbitfield temps_output;	/**< Track texture indirections, see spec. */
-   GLbitfield temp_in_use;	/**< Tracks temporary regs which are in use. */
-   GLboolean error;
-
    ir_variable *src_texture[MAX_TEXTURE_COORD_UNITS];
    /* Reg containing each texture unit's sampled texture color,
     * else undef.
@@ -537,8 +531,6 @@ struct texenv_fragment_program {
    ir_rvalue *src_previous;	/**< Reg containing color from previous
 				 * stage.  May need to be decl'd.
 				 */
-
-   GLuint last_tex_stage;	/**< Number of last enabled texture unit */
 };
 
 static ir_rvalue *
@@ -1359,7 +1351,6 @@ emit_instructions(struct texenv_fragment_program *p)
       for (unit = 0; unit < key->nr_enabled_units; unit++)
 	 if (key->unit[unit].enabled) {
 	    load_texunit_sources(p, unit);
-	    p->last_tex_stage = unit;
 	 }
 
       /* Second pass - emit combine instructions to build final color:
@@ -1465,8 +1456,6 @@ create_new_program(struct gl_context *ctx, struct state_key *key)
 
    p.src_previous = NULL;
 
-   p.last_tex_stage = 0;
-
    ir_function *main_f = new(p.mem_ctx) ir_function("main");
    p.instructions->push_tail(main_f);
    state->symbols->add_function(main_f);
diff --git a/mesalib/src/mesa/main/mtypes.h b/mesalib/src/mesa/main/mtypes.h
index a3827d48d..8e441c232 100644
--- a/mesalib/src/mesa/main/mtypes.h
+++ b/mesalib/src/mesa/main/mtypes.h
@@ -1329,6 +1329,8 @@ struct gl_texture_object
    /** GL_ARB_texture_buffer_object */
    struct gl_buffer_object *BufferObject;
    GLenum BufferObjectFormat;
+   /** Equivalent Mesa format for BufferObjectFormat. */
+   gl_format _BufferObjectFormat;
 
    /** GL_OES_EGL_image_external */
    GLint RequiredTextureImageUnits;
diff --git a/mesalib/src/mesa/main/remap_helper.h b/mesalib/src/mesa/main/remap_helper.h
index 4c9063c7c..1e672200a 100644
--- a/mesalib/src/mesa/main/remap_helper.h
+++ b/mesalib/src/mesa/main/remap_helper.h
@@ -211,4922 +211,4919 @@ static const char _mesa_function_pool[] =
    "ppp\0"
    "glReplacementCodeuiColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[1181]: PauseTransformFeedback (will be remapped) */
-   "\0"
-   "glPauseTransformFeedback\0"
-   "\0"
-   /* _mesa_function_pool[1208]: BlendEquationSeparateEXT (will be remapped) */
+   /* _mesa_function_pool[1181]: BlendEquationSeparateEXT (will be remapped) */
    "ii\0"
    "glBlendEquationSeparate\0"
    "glBlendEquationSeparateEXT\0"
    "glBlendEquationSeparateATI\0"
    "\0"
-   /* _mesa_function_pool[1290]: ListParameterfSGIX (dynamic) */
+   /* _mesa_function_pool[1263]: ListParameterfSGIX (dynamic) */
    "iif\0"
    "glListParameterfSGIX\0"
    "\0"
-   /* _mesa_function_pool[1316]: TexStorage1D (will be remapped) */
+   /* _mesa_function_pool[1289]: TexStorage1D (will be remapped) */
    "iiii\0"
    "glTexStorage1D\0"
    "\0"
-   /* _mesa_function_pool[1337]: SecondaryColor3bEXT (will be remapped) */
+   /* _mesa_function_pool[1310]: SecondaryColor3bEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3b\0"
    "glSecondaryColor3bEXT\0"
    "\0"
-   /* _mesa_function_pool[1383]: TexCoord4fColor4fNormal3fVertex4fvSUN (dynamic) */
+   /* _mesa_function_pool[1356]: TexCoord4fColor4fNormal3fVertex4fvSUN (dynamic) */
    "pppp\0"
    "glTexCoord4fColor4fNormal3fVertex4fvSUN\0"
    "\0"
-   /* _mesa_function_pool[1429]: GetnPolygonStippleARB (will be remapped) */
+   /* _mesa_function_pool[1402]: GetnPolygonStippleARB (will be remapped) */
    "ip\0"
    "glGetnPolygonStippleARB\0"
    "\0"
-   /* _mesa_function_pool[1457]: GetPixelMapfv (offset 271) */
+   /* _mesa_function_pool[1430]: GetPixelMapfv (offset 271) */
    "ip\0"
    "glGetPixelMapfv\0"
    "\0"
-   /* _mesa_function_pool[1477]: Color3uiv (offset 22) */
+   /* _mesa_function_pool[1450]: Color3uiv (offset 22) */
    "p\0"
    "glColor3uiv\0"
    "\0"
-   /* _mesa_function_pool[1492]: IsEnabled (offset 286) */
+   /* _mesa_function_pool[1465]: IsEnabled (offset 286) */
    "i\0"
    "glIsEnabled\0"
    "\0"
-   /* _mesa_function_pool[1507]: DebugMessageCallbackARB (will be remapped) */
+   /* _mesa_function_pool[1480]: DebugMessageCallbackARB (will be remapped) */
    "pp\0"
    "glDebugMessageCallbackARB\0"
    "\0"
-   /* _mesa_function_pool[1537]: VertexAttrib4svNV (will be remapped) */
+   /* _mesa_function_pool[1510]: VertexAttrib4svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4svNV\0"
    "\0"
-   /* _mesa_function_pool[1561]: EvalCoord2fv (offset 235) */
+   /* _mesa_function_pool[1534]: EvalCoord2fv (offset 235) */
    "p\0"
    "glEvalCoord2fv\0"
    "\0"
-   /* _mesa_function_pool[1579]: GetBufferSubDataARB (will be remapped) */
+   /* _mesa_function_pool[1552]: GetBufferSubDataARB (will be remapped) */
    "iiip\0"
    "glGetBufferSubData\0"
    "glGetBufferSubDataARB\0"
    "\0"
-   /* _mesa_function_pool[1626]: BufferSubDataARB (will be remapped) */
+   /* _mesa_function_pool[1599]: BufferSubDataARB (will be remapped) */
    "iiip\0"
    "glBufferSubData\0"
    "glBufferSubDataARB\0"
    "\0"
-   /* _mesa_function_pool[1667]: TexCoord2fColor4ubVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[1640]: TexCoord2fColor4ubVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fColor4ubVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[1705]: TexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[1678]: TexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
    "ffffffffffff\0"
    "glTexCoord2fColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[1758]: AttachShader (will be remapped) */
+   /* _mesa_function_pool[1731]: AttachShader (will be remapped) */
    "ii\0"
    "glAttachShader\0"
    "\0"
-   /* _mesa_function_pool[1777]: TextureStorage3DEXT (will be remapped) */
+   /* _mesa_function_pool[1750]: TextureStorage3DEXT (will be remapped) */
    "iiiiiii\0"
    "glTextureStorage3DEXT\0"
    "\0"
-   /* _mesa_function_pool[1808]: VertexAttrib2fARB (will be remapped) */
+   /* _mesa_function_pool[1781]: VertexAttrib2fARB (will be remapped) */
    "iff\0"
    "glVertexAttrib2f\0"
    "glVertexAttrib2fARB\0"
    "\0"
-   /* _mesa_function_pool[1850]: GetDebugLogLengthMESA (dynamic) */
+   /* _mesa_function_pool[1823]: GetDebugLogLengthMESA (dynamic) */
    "iii\0"
    "glGetDebugLogLengthMESA\0"
    "\0"
-   /* _mesa_function_pool[1879]: GetMapiv (offset 268) */
+   /* _mesa_function_pool[1852]: GetMapiv (offset 268) */
    "iip\0"
    "glGetMapiv\0"
    "\0"
-   /* _mesa_function_pool[1895]: VertexAttrib3fARB (will be remapped) */
+   /* _mesa_function_pool[1868]: VertexAttrib3fARB (will be remapped) */
    "ifff\0"
    "glVertexAttrib3f\0"
    "glVertexAttrib3fARB\0"
    "\0"
-   /* _mesa_function_pool[1938]: VertexAttribI4ivEXT (will be remapped) */
+   /* _mesa_function_pool[1911]: VertexAttribI4ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4ivEXT\0"
    "glVertexAttribI4iv\0"
    "\0"
-   /* _mesa_function_pool[1983]: Indexubv (offset 316) */
+   /* _mesa_function_pool[1956]: Indexubv (offset 316) */
    "p\0"
    "glIndexubv\0"
    "\0"
-   /* _mesa_function_pool[1997]: GetQueryivARB (will be remapped) */
+   /* _mesa_function_pool[1970]: GetQueryivARB (will be remapped) */
    "iip\0"
    "glGetQueryiv\0"
    "glGetQueryivARB\0"
    "\0"
-   /* _mesa_function_pool[2031]: TexImage3D (offset 371) */
+   /* _mesa_function_pool[2004]: TexImage3D (offset 371) */
    "iiiiiiiiip\0"
    "glTexImage3D\0"
    "glTexImage3DEXT\0"
    "\0"
-   /* _mesa_function_pool[2072]: BindFragDataLocationEXT (will be remapped) */
+   /* _mesa_function_pool[2045]: BindFragDataLocationEXT (will be remapped) */
    "iip\0"
    "glBindFragDataLocationEXT\0"
    "glBindFragDataLocation\0"
    "\0"
-   /* _mesa_function_pool[2126]: TexCoordP4ui (will be remapped) */
+   /* _mesa_function_pool[2099]: TexCoordP4ui (will be remapped) */
    "ii\0"
    "glTexCoordP4ui\0"
    "\0"
-   /* _mesa_function_pool[2145]: ReplacementCodeuiVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[2118]: ReplacementCodeuiVertex3fvSUN (dynamic) */
    "pp\0"
    "glReplacementCodeuiVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[2181]: EdgeFlagPointer (offset 312) */
+   /* _mesa_function_pool[2154]: EdgeFlagPointer (offset 312) */
    "ip\0"
    "glEdgeFlagPointer\0"
    "\0"
-   /* _mesa_function_pool[2203]: Color3ubv (offset 20) */
+   /* _mesa_function_pool[2176]: Color3ubv (offset 20) */
    "p\0"
    "glColor3ubv\0"
    "\0"
-   /* _mesa_function_pool[2218]: GetQueryObjectivARB (will be remapped) */
+   /* _mesa_function_pool[2191]: GetQueryObjectivARB (will be remapped) */
    "iip\0"
    "glGetQueryObjectiv\0"
    "glGetQueryObjectivARB\0"
    "\0"
-   /* _mesa_function_pool[2264]: Vertex3dv (offset 135) */
+   /* _mesa_function_pool[2237]: Vertex3dv (offset 135) */
    "p\0"
    "glVertex3dv\0"
    "\0"
-   /* _mesa_function_pool[2279]: ReplacementCodeuiTexCoord2fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[2252]: ReplacementCodeuiTexCoord2fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiTexCoord2fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[2326]: CompressedTexSubImage2DARB (will be remapped) */
+   /* _mesa_function_pool[2299]: CompressedTexSubImage2DARB (will be remapped) */
    "iiiiiiiip\0"
    "glCompressedTexSubImage2D\0"
    "glCompressedTexSubImage2DARB\0"
    "\0"
-   /* _mesa_function_pool[2392]: CombinerOutputNV (will be remapped) */
+   /* _mesa_function_pool[2365]: CombinerOutputNV (will be remapped) */
    "iiiiiiiiii\0"
    "glCombinerOutputNV\0"
    "\0"
-   /* _mesa_function_pool[2423]: VertexAttribs3fvNV (will be remapped) */
+   /* _mesa_function_pool[2396]: VertexAttribs3fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs3fvNV\0"
    "\0"
-   /* _mesa_function_pool[2449]: GetnMapivARB (will be remapped) */
+   /* _mesa_function_pool[2422]: GetnMapivARB (will be remapped) */
    "iiip\0"
    "glGetnMapivARB\0"
    "\0"
-   /* _mesa_function_pool[2470]: Uniform2fARB (will be remapped) */
+   /* _mesa_function_pool[2443]: Uniform2fARB (will be remapped) */
    "iff\0"
    "glUniform2f\0"
    "glUniform2fARB\0"
    "\0"
-   /* _mesa_function_pool[2502]: LightModeliv (offset 166) */
+   /* _mesa_function_pool[2475]: LightModeliv (offset 166) */
    "ip\0"
    "glLightModeliv\0"
    "\0"
-   /* _mesa_function_pool[2521]: VertexAttrib1svARB (will be remapped) */
+   /* _mesa_function_pool[2494]: VertexAttrib1svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib1sv\0"
    "glVertexAttrib1svARB\0"
    "\0"
-   /* _mesa_function_pool[2564]: VertexAttribs1dvNV (will be remapped) */
+   /* _mesa_function_pool[2537]: VertexAttribs1dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1dvNV\0"
    "\0"
-   /* _mesa_function_pool[2590]: Uniform2ivARB (will be remapped) */
+   /* _mesa_function_pool[2563]: Uniform2ivARB (will be remapped) */
    "iip\0"
    "glUniform2iv\0"
    "glUniform2ivARB\0"
    "\0"
-   /* _mesa_function_pool[2624]: GetImageTransformParameterfvHP (dynamic) */
+   /* _mesa_function_pool[2597]: GetImageTransformParameterfvHP (dynamic) */
    "iip\0"
    "glGetImageTransformParameterfvHP\0"
    "\0"
-   /* _mesa_function_pool[2662]: Normal3bv (offset 53) */
+   /* _mesa_function_pool[2635]: Normal3bv (offset 53) */
    "p\0"
    "glNormal3bv\0"
    "\0"
-   /* _mesa_function_pool[2677]: TexGeniv (offset 193) */
+   /* _mesa_function_pool[2650]: TexGeniv (offset 193) */
    "iip\0"
    "glTexGeniv\0"
    "\0"
-   /* _mesa_function_pool[2693]: TexCoordP1uiv (will be remapped) */
+   /* _mesa_function_pool[2666]: TexCoordP1uiv (will be remapped) */
    "ip\0"
    "glTexCoordP1uiv\0"
    "\0"
-   /* _mesa_function_pool[2713]: WeightubvARB (dynamic) */
+   /* _mesa_function_pool[2686]: WeightubvARB (dynamic) */
    "ip\0"
    "glWeightubvARB\0"
    "\0"
-   /* _mesa_function_pool[2732]: VertexAttrib1fvNV (will be remapped) */
+   /* _mesa_function_pool[2705]: VertexAttrib1fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1fvNV\0"
    "\0"
-   /* _mesa_function_pool[2756]: Vertex3iv (offset 139) */
+   /* _mesa_function_pool[2729]: Vertex3iv (offset 139) */
    "p\0"
    "glVertex3iv\0"
    "\0"
-   /* _mesa_function_pool[2771]: CopyConvolutionFilter1D (offset 354) */
+   /* _mesa_function_pool[2744]: CopyConvolutionFilter1D (offset 354) */
    "iiiii\0"
    "glCopyConvolutionFilter1D\0"
    "glCopyConvolutionFilter1DEXT\0"
    "\0"
-   /* _mesa_function_pool[2833]: VertexAttribI1uiEXT (will be remapped) */
+   /* _mesa_function_pool[2806]: VertexAttribI1uiEXT (will be remapped) */
    "ii\0"
    "glVertexAttribI1uiEXT\0"
    "glVertexAttribI1ui\0"
    "\0"
-   /* _mesa_function_pool[2878]: ReplacementCodeuiNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[2851]: ReplacementCodeuiNormal3fVertex3fSUN (dynamic) */
    "iffffff\0"
    "glReplacementCodeuiNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[2926]: DeleteSync (will be remapped) */
+   /* _mesa_function_pool[2899]: DeleteSync (will be remapped) */
    "i\0"
    "glDeleteSync\0"
    "\0"
-   /* _mesa_function_pool[2942]: FragmentMaterialfvSGIX (dynamic) */
+   /* _mesa_function_pool[2915]: FragmentMaterialfvSGIX (dynamic) */
    "iip\0"
    "glFragmentMaterialfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[2972]: BlendColor (offset 336) */
+   /* _mesa_function_pool[2945]: BlendColor (offset 336) */
    "ffff\0"
    "glBlendColor\0"
    "glBlendColorEXT\0"
    "\0"
-   /* _mesa_function_pool[3007]: UniformMatrix4fvARB (will be remapped) */
+   /* _mesa_function_pool[2980]: UniformMatrix4fvARB (will be remapped) */
    "iiip\0"
    "glUniformMatrix4fv\0"
    "glUniformMatrix4fvARB\0"
    "\0"
-   /* _mesa_function_pool[3054]: DeleteVertexArraysAPPLE (will be remapped) */
+   /* _mesa_function_pool[3027]: DeleteVertexArraysAPPLE (will be remapped) */
    "ip\0"
    "glDeleteVertexArrays\0"
    "glDeleteVertexArraysAPPLE\0"
    "\0"
-   /* _mesa_function_pool[3105]: GetDebugMessageLogARB (will be remapped) */
+   /* _mesa_function_pool[3078]: GetDebugMessageLogARB (will be remapped) */
    "iipppppp\0"
    "glGetDebugMessageLogARB\0"
    "\0"
-   /* _mesa_function_pool[3139]: ReadInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[3112]: ReadInstrumentsSGIX (dynamic) */
    "i\0"
    "glReadInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[3164]: CallLists (offset 3) */
+   /* _mesa_function_pool[3137]: CallLists (offset 3) */
    "iip\0"
    "glCallLists\0"
    "\0"
-   /* _mesa_function_pool[3181]: UniformMatrix2x4fv (will be remapped) */
+   /* _mesa_function_pool[3154]: UniformMatrix2x4fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix2x4fv\0"
    "\0"
-   /* _mesa_function_pool[3208]: ReadnPixelsARB (will be remapped) */
+   /* _mesa_function_pool[3181]: ReadnPixelsARB (will be remapped) */
    "iiiiiiip\0"
    "glReadnPixelsARB\0"
    "\0"
-   /* _mesa_function_pool[3235]: Color4ubVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[3208]: Color4ubVertex3fvSUN (dynamic) */
    "pp\0"
    "glColor4ubVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[3262]: Normal3iv (offset 59) */
+   /* _mesa_function_pool[3235]: Normal3iv (offset 59) */
    "p\0"
    "glNormal3iv\0"
    "\0"
-   /* _mesa_function_pool[3277]: PassThrough (offset 199) */
+   /* _mesa_function_pool[3250]: PassThrough (offset 199) */
    "f\0"
    "glPassThrough\0"
    "\0"
-   /* _mesa_function_pool[3294]: VertexP3ui (will be remapped) */
+   /* _mesa_function_pool[3267]: VertexP3ui (will be remapped) */
    "ii\0"
    "glVertexP3ui\0"
    "\0"
-   /* _mesa_function_pool[3311]: TexParameterIivEXT (will be remapped) */
+   /* _mesa_function_pool[3284]: TexParameterIivEXT (will be remapped) */
    "iip\0"
    "glTexParameterIivEXT\0"
    "glTexParameterIiv\0"
    "\0"
-   /* _mesa_function_pool[3355]: FramebufferTextureLayerEXT (will be remapped) */
+   /* _mesa_function_pool[3328]: FramebufferTextureLayerEXT (will be remapped) */
    "iiiii\0"
    "glFramebufferTextureLayer\0"
    "glFramebufferTextureLayerARB\0"
    "glFramebufferTextureLayerEXT\0"
    "\0"
-   /* _mesa_function_pool[3446]: GetListParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[3419]: GetListParameterfvSGIX (dynamic) */
    "iip\0"
    "glGetListParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[3476]: Viewport (offset 305) */
+   /* _mesa_function_pool[3449]: Viewport (offset 305) */
    "iiii\0"
    "glViewport\0"
    "\0"
-   /* _mesa_function_pool[3493]: VertexAttrib4NusvARB (will be remapped) */
+   /* _mesa_function_pool[3466]: VertexAttrib4NusvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nusv\0"
    "glVertexAttrib4NusvARB\0"
    "\0"
-   /* _mesa_function_pool[3540]: WindowPos4svMESA (will be remapped) */
+   /* _mesa_function_pool[3513]: WindowPos4svMESA (will be remapped) */
    "p\0"
    "glWindowPos4svMESA\0"
    "\0"
-   /* _mesa_function_pool[3562]: CreateProgramObjectARB (will be remapped) */
+   /* _mesa_function_pool[3535]: CreateProgramObjectARB (will be remapped) */
    "\0"
    "glCreateProgramObjectARB\0"
    "\0"
-   /* _mesa_function_pool[3589]: FragmentLightModelivSGIX (dynamic) */
+   /* _mesa_function_pool[3562]: FragmentLightModelivSGIX (dynamic) */
    "ip\0"
    "glFragmentLightModelivSGIX\0"
    "\0"
-   /* _mesa_function_pool[3620]: UniformMatrix4x3fv (will be remapped) */
+   /* _mesa_function_pool[3593]: UniformMatrix4x3fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix4x3fv\0"
    "\0"
-   /* _mesa_function_pool[3647]: PrioritizeTextures (offset 331) */
+   /* _mesa_function_pool[3620]: PrioritizeTextures (offset 331) */
    "ipp\0"
    "glPrioritizeTextures\0"
    "glPrioritizeTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[3697]: VertexAttribI3uiEXT (will be remapped) */
+   /* _mesa_function_pool[3670]: VertexAttribI3uiEXT (will be remapped) */
    "iiii\0"
    "glVertexAttribI3uiEXT\0"
    "glVertexAttribI3ui\0"
    "\0"
-   /* _mesa_function_pool[3744]: AsyncMarkerSGIX (dynamic) */
+   /* _mesa_function_pool[3717]: AsyncMarkerSGIX (dynamic) */
    "i\0"
    "glAsyncMarkerSGIX\0"
    "\0"
-   /* _mesa_function_pool[3765]: GlobalAlphaFactorubSUN (dynamic) */
+   /* _mesa_function_pool[3738]: GlobalAlphaFactorubSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorubSUN\0"
    "\0"
-   /* _mesa_function_pool[3793]: ClearColorIuiEXT (will be remapped) */
+   /* _mesa_function_pool[3766]: ClearColorIuiEXT (will be remapped) */
    "iiii\0"
    "glClearColorIuiEXT\0"
    "\0"
-   /* _mesa_function_pool[3818]: ClearDebugLogMESA (dynamic) */
+   /* _mesa_function_pool[3791]: ClearDebugLogMESA (dynamic) */
    "iii\0"
    "glClearDebugLogMESA\0"
    "\0"
-   /* _mesa_function_pool[3843]: Uniform4uiEXT (will be remapped) */
+   /* _mesa_function_pool[3816]: Uniform4uiEXT (will be remapped) */
    "iiiii\0"
    "glUniform4uiEXT\0"
    "glUniform4ui\0"
    "\0"
-   /* _mesa_function_pool[3879]: ResetHistogram (offset 369) */
+   /* _mesa_function_pool[3852]: ResetHistogram (offset 369) */
    "i\0"
    "glResetHistogram\0"
    "glResetHistogramEXT\0"
    "\0"
-   /* _mesa_function_pool[3919]: GetProgramNamedParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[3892]: GetProgramNamedParameterfvNV (will be remapped) */
    "iipp\0"
    "glGetProgramNamedParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[3956]: PointParameterfEXT (will be remapped) */
+   /* _mesa_function_pool[3929]: PointParameterfEXT (will be remapped) */
    "if\0"
    "glPointParameterf\0"
    "glPointParameterfARB\0"
    "glPointParameterfEXT\0"
    "glPointParameterfSGIS\0"
    "\0"
-   /* _mesa_function_pool[4042]: LoadIdentityDeformationMapSGIX (dynamic) */
+   /* _mesa_function_pool[4015]: LoadIdentityDeformationMapSGIX (dynamic) */
    "i\0"
    "glLoadIdentityDeformationMapSGIX\0"
    "\0"
-   /* _mesa_function_pool[4078]: GenFencesNV (will be remapped) */
+   /* _mesa_function_pool[4051]: GenFencesNV (will be remapped) */
    "ip\0"
    "glGenFencesNV\0"
    "\0"
-   /* _mesa_function_pool[4096]: ImageTransformParameterfHP (dynamic) */
+   /* _mesa_function_pool[4069]: ImageTransformParameterfHP (dynamic) */
    "iif\0"
    "glImageTransformParameterfHP\0"
    "\0"
-   /* _mesa_function_pool[4130]: MatrixIndexusvARB (dynamic) */
+   /* _mesa_function_pool[4103]: MatrixIndexusvARB (dynamic) */
    "ip\0"
    "glMatrixIndexusvARB\0"
    "\0"
-   /* _mesa_function_pool[4154]: DrawElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[4127]: DrawElementsBaseVertex (will be remapped) */
    "iiipi\0"
    "glDrawElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[4186]: DisableVertexAttribArrayARB (will be remapped) */
+   /* _mesa_function_pool[4159]: DisableVertexAttribArrayARB (will be remapped) */
    "i\0"
    "glDisableVertexAttribArray\0"
    "glDisableVertexAttribArrayARB\0"
    "\0"
-   /* _mesa_function_pool[4246]: GetnConvolutionFilterARB (will be remapped) */
+   /* _mesa_function_pool[4219]: GetnConvolutionFilterARB (will be remapped) */
    "iiiip\0"
    "glGetnConvolutionFilterARB\0"
    "\0"
-   /* _mesa_function_pool[4280]: TexCoord2sv (offset 109) */
+   /* _mesa_function_pool[4253]: TexCoord2sv (offset 109) */
    "p\0"
    "glTexCoord2sv\0"
    "\0"
-   /* _mesa_function_pool[4297]: Vertex4dv (offset 143) */
+   /* _mesa_function_pool[4270]: Vertex4dv (offset 143) */
    "p\0"
    "glVertex4dv\0"
    "\0"
-   /* _mesa_function_pool[4312]: StencilMaskSeparate (will be remapped) */
+   /* _mesa_function_pool[4285]: StencilMaskSeparate (will be remapped) */
    "ii\0"
    "glStencilMaskSeparate\0"
    "\0"
-   /* _mesa_function_pool[4338]: ProgramLocalParameter4dARB (will be remapped) */
+   /* _mesa_function_pool[4311]: ProgramLocalParameter4dARB (will be remapped) */
    "iidddd\0"
    "glProgramLocalParameter4dARB\0"
    "\0"
-   /* _mesa_function_pool[4375]: CompressedTexImage3DARB (will be remapped) */
+   /* _mesa_function_pool[4348]: CompressedTexImage3DARB (will be remapped) */
    "iiiiiiiip\0"
    "glCompressedTexImage3D\0"
    "glCompressedTexImage3DARB\0"
    "\0"
-   /* _mesa_function_pool[4435]: Color3sv (offset 18) */
+   /* _mesa_function_pool[4408]: Color3sv (offset 18) */
    "p\0"
    "glColor3sv\0"
    "\0"
-   /* _mesa_function_pool[4449]: GetConvolutionParameteriv (offset 358) */
+   /* _mesa_function_pool[4422]: GetConvolutionParameteriv (offset 358) */
    "iip\0"
    "glGetConvolutionParameteriv\0"
    "glGetConvolutionParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[4513]: DeleteSamplers (will be remapped) */
+   /* _mesa_function_pool[4486]: DeleteSamplers (will be remapped) */
    "ip\0"
    "glDeleteSamplers\0"
    "\0"
-   /* _mesa_function_pool[4534]: VertexAttrib1fARB (will be remapped) */
+   /* _mesa_function_pool[4507]: VertexAttrib1fARB (will be remapped) */
    "if\0"
    "glVertexAttrib1f\0"
    "glVertexAttrib1fARB\0"
    "\0"
-   /* _mesa_function_pool[4575]: Vertex2dv (offset 127) */
+   /* _mesa_function_pool[4548]: Vertex2dv (offset 127) */
    "p\0"
    "glVertex2dv\0"
    "\0"
-   /* _mesa_function_pool[4590]: TestFenceNV (will be remapped) */
+   /* _mesa_function_pool[4563]: TestFenceNV (will be remapped) */
    "i\0"
    "glTestFenceNV\0"
    "\0"
-   /* _mesa_function_pool[4607]: GetVertexAttribIuivEXT (will be remapped) */
+   /* _mesa_function_pool[4580]: GetVertexAttribIuivEXT (will be remapped) */
    "iip\0"
    "glGetVertexAttribIuivEXT\0"
    "glGetVertexAttribIuiv\0"
    "\0"
-   /* _mesa_function_pool[4659]: CreateShaderProgramEXT (will be remapped) */
+   /* _mesa_function_pool[4632]: CreateShaderProgramEXT (will be remapped) */
    "ip\0"
    "glCreateShaderProgramEXT\0"
    "\0"
-   /* _mesa_function_pool[4688]: MultiTexCoord1fvARB (offset 379) */
+   /* _mesa_function_pool[4661]: MultiTexCoord1fvARB (offset 379) */
    "ip\0"
    "glMultiTexCoord1fv\0"
    "glMultiTexCoord1fvARB\0"
    "\0"
-   /* _mesa_function_pool[4733]: TexCoord3iv (offset 115) */
+   /* _mesa_function_pool[4706]: TexCoord3iv (offset 115) */
    "p\0"
    "glTexCoord3iv\0"
    "\0"
-   /* _mesa_function_pool[4750]: Uniform2uivEXT (will be remapped) */
+   /* _mesa_function_pool[4723]: Uniform2uivEXT (will be remapped) */
    "iip\0"
    "glUniform2uivEXT\0"
    "glUniform2uiv\0"
    "\0"
-   /* _mesa_function_pool[4786]: ColorFragmentOp2ATI (will be remapped) */
+   /* _mesa_function_pool[4759]: ColorFragmentOp2ATI (will be remapped) */
    "iiiiiiiiii\0"
    "glColorFragmentOp2ATI\0"
    "\0"
-   /* _mesa_function_pool[4820]: TexStorage2D (will be remapped) */
+   /* _mesa_function_pool[4793]: TexStorage2D (will be remapped) */
    "iiiii\0"
    "glTexStorage2D\0"
    "\0"
-   /* _mesa_function_pool[4842]: SecondaryColorPointerListIBM (dynamic) */
+   /* _mesa_function_pool[4815]: SecondaryColorPointerListIBM (dynamic) */
    "iiipi\0"
    "glSecondaryColorPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[4880]: GetPixelTexGenParameterivSGIS (will be remapped) */
+   /* _mesa_function_pool[4853]: GetPixelTexGenParameterivSGIS (will be remapped) */
    "ip\0"
    "glGetPixelTexGenParameterivSGIS\0"
    "\0"
-   /* _mesa_function_pool[4916]: Color3fv (offset 14) */
+   /* _mesa_function_pool[4889]: Color3fv (offset 14) */
    "p\0"
    "glColor3fv\0"
    "\0"
-   /* _mesa_function_pool[4930]: GetnPixelMapfvARB (will be remapped) */
+   /* _mesa_function_pool[4903]: GetnPixelMapfvARB (will be remapped) */
    "iip\0"
    "glGetnPixelMapfvARB\0"
    "\0"
-   /* _mesa_function_pool[4955]: GetnMapdvARB (will be remapped) */
+   /* _mesa_function_pool[4928]: GetnMapdvARB (will be remapped) */
    "iiip\0"
    "glGetnMapdvARB\0"
    "\0"
-   /* _mesa_function_pool[4976]: TextureStorage1DEXT (will be remapped) */
+   /* _mesa_function_pool[4949]: TextureStorage1DEXT (will be remapped) */
    "iiiii\0"
    "glTextureStorage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[5005]: ReplacementCodeubSUN (dynamic) */
+   /* _mesa_function_pool[4978]: ReplacementCodeubSUN (dynamic) */
    "i\0"
    "glReplacementCodeubSUN\0"
    "\0"
-   /* _mesa_function_pool[5031]: FinishAsyncSGIX (dynamic) */
+   /* _mesa_function_pool[5004]: FinishAsyncSGIX (dynamic) */
    "p\0"
    "glFinishAsyncSGIX\0"
    "\0"
-   /* _mesa_function_pool[5052]: VertexAttribP3ui (will be remapped) */
+   /* _mesa_function_pool[5025]: VertexAttribP3ui (will be remapped) */
    "iiii\0"
    "glVertexAttribP3ui\0"
    "\0"
-   /* _mesa_function_pool[5077]: GetDebugLogMESA (dynamic) */
+   /* _mesa_function_pool[5050]: GetDebugLogMESA (dynamic) */
    "iiiipp\0"
    "glGetDebugLogMESA\0"
    "\0"
-   /* _mesa_function_pool[5103]: FogCoorddEXT (will be remapped) */
+   /* _mesa_function_pool[5076]: FogCoorddEXT (will be remapped) */
    "d\0"
    "glFogCoordd\0"
    "glFogCoorddEXT\0"
    "\0"
-   /* _mesa_function_pool[5133]: BeginConditionalRenderNV (will be remapped) */
+   /* _mesa_function_pool[5106]: BeginConditionalRenderNV (will be remapped) */
    "ii\0"
    "glBeginConditionalRender\0"
    "glBeginConditionalRenderNV\0"
    "\0"
-   /* _mesa_function_pool[5189]: Color4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[5162]: Color4ubVertex3fSUN (dynamic) */
    "iiiifff\0"
    "glColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[5220]: FogCoordfEXT (will be remapped) */
+   /* _mesa_function_pool[5193]: FogCoordfEXT (will be remapped) */
    "f\0"
    "glFogCoordf\0"
    "glFogCoordfEXT\0"
    "\0"
-   /* _mesa_function_pool[5250]: PointSize (offset 173) */
+   /* _mesa_function_pool[5223]: PointSize (offset 173) */
    "f\0"
    "glPointSize\0"
    "\0"
-   /* _mesa_function_pool[5265]: VertexAttribI2uivEXT (will be remapped) */
+   /* _mesa_function_pool[5238]: VertexAttribI2uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI2uivEXT\0"
    "glVertexAttribI2uiv\0"
    "\0"
-   /* _mesa_function_pool[5312]: TexCoord2fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[5285]: TexCoord2fVertex3fSUN (dynamic) */
    "fffff\0"
    "glTexCoord2fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[5343]: PopName (offset 200) */
+   /* _mesa_function_pool[5316]: PopName (offset 200) */
    "\0"
    "glPopName\0"
    "\0"
-   /* _mesa_function_pool[5355]: GetSamplerParameterfv (will be remapped) */
+   /* _mesa_function_pool[5328]: GetSamplerParameterfv (will be remapped) */
    "iip\0"
    "glGetSamplerParameterfv\0"
    "\0"
-   /* _mesa_function_pool[5384]: GlobalAlphaFactoriSUN (dynamic) */
+   /* _mesa_function_pool[5357]: GlobalAlphaFactoriSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactoriSUN\0"
    "\0"
-   /* _mesa_function_pool[5411]: VertexAttrib2dNV (will be remapped) */
+   /* _mesa_function_pool[5384]: VertexAttrib2dNV (will be remapped) */
    "idd\0"
    "glVertexAttrib2dNV\0"
    "\0"
-   /* _mesa_function_pool[5435]: GetProgramInfoLog (will be remapped) */
+   /* _mesa_function_pool[5408]: GetProgramInfoLog (will be remapped) */
    "iipp\0"
    "glGetProgramInfoLog\0"
    "\0"
-   /* _mesa_function_pool[5461]: VertexP2ui (will be remapped) */
+   /* _mesa_function_pool[5434]: VertexP2ui (will be remapped) */
    "ii\0"
    "glVertexP2ui\0"
    "\0"
-   /* _mesa_function_pool[5478]: VertexAttrib4NbvARB (will be remapped) */
+   /* _mesa_function_pool[5451]: VertexAttrib4NbvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nbv\0"
    "glVertexAttrib4NbvARB\0"
    "\0"
-   /* _mesa_function_pool[5523]: GetActiveAttribARB (will be remapped) */
+   /* _mesa_function_pool[5496]: GetActiveAttribARB (will be remapped) */
    "iiipppp\0"
    "glGetActiveAttrib\0"
    "glGetActiveAttribARB\0"
    "\0"
-   /* _mesa_function_pool[5571]: Vertex4sv (offset 149) */
+   /* _mesa_function_pool[5544]: Vertex4sv (offset 149) */
    "p\0"
    "glVertex4sv\0"
    "\0"
-   /* _mesa_function_pool[5586]: VertexAttrib4ubNV (will be remapped) */
+   /* _mesa_function_pool[5559]: VertexAttrib4ubNV (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4ubNV\0"
    "\0"
-   /* _mesa_function_pool[5613]: VertexAttribI1ivEXT (will be remapped) */
+   /* _mesa_function_pool[5586]: VertexAttribI1ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI1ivEXT\0"
    "glVertexAttribI1iv\0"
    "\0"
-   /* _mesa_function_pool[5658]: ClampColor (will be remapped) */
+   /* _mesa_function_pool[5631]: ClampColor (will be remapped) */
    "ii\0"
    "glClampColor\0"
    "\0"
-   /* _mesa_function_pool[5675]: TextureRangeAPPLE (will be remapped) */
+   /* _mesa_function_pool[5648]: TextureRangeAPPLE (will be remapped) */
    "iip\0"
    "glTextureRangeAPPLE\0"
    "\0"
-   /* _mesa_function_pool[5700]: GetTexEnvfv (offset 276) */
+   /* _mesa_function_pool[5673]: GetTexEnvfv (offset 276) */
    "iip\0"
    "glGetTexEnvfv\0"
    "\0"
-   /* _mesa_function_pool[5719]: BindFragDataLocationIndexed (will be remapped) */
+   /* _mesa_function_pool[5692]: BindFragDataLocationIndexed (will be remapped) */
    "iiip\0"
    "glBindFragDataLocationIndexed\0"
    "\0"
-   /* _mesa_function_pool[5755]: BindTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[5728]: BindTransformFeedback (will be remapped) */
    "ii\0"
    "glBindTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[5783]: TextureStorage2DEXT (will be remapped) */
+   /* _mesa_function_pool[5756]: TextureStorage2DEXT (will be remapped) */
    "iiiiii\0"
    "glTextureStorage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[5813]: Indexub (offset 315) */
+   /* _mesa_function_pool[5786]: Indexub (offset 315) */
    "i\0"
    "glIndexub\0"
    "\0"
-   /* _mesa_function_pool[5826]: VertexAttrib4fNV (will be remapped) */
+   /* _mesa_function_pool[5799]: VertexAttrib4fNV (will be remapped) */
    "iffff\0"
    "glVertexAttrib4fNV\0"
    "\0"
-   /* _mesa_function_pool[5852]: GetTransformFeedbackVaryingEXT (will be remapped) */
+   /* _mesa_function_pool[5825]: GetTransformFeedbackVaryingEXT (will be remapped) */
    "iiipppp\0"
    "glGetTransformFeedbackVarying\0"
    "glGetTransformFeedbackVaryingEXT\0"
    "\0"
-   /* _mesa_function_pool[5924]: TexEnvi (offset 186) */
+   /* _mesa_function_pool[5897]: TexEnvi (offset 186) */
    "iii\0"
    "glTexEnvi\0"
    "\0"
-   /* _mesa_function_pool[5939]: GetClipPlane (offset 259) */
+   /* _mesa_function_pool[5912]: GetClipPlane (offset 259) */
    "ip\0"
    "glGetClipPlane\0"
    "\0"
-   /* _mesa_function_pool[5958]: CombinerParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[5931]: CombinerParameterfvNV (will be remapped) */
    "ip\0"
    "glCombinerParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[5986]: TexCoordP4uiv (will be remapped) */
+   /* _mesa_function_pool[5959]: TexCoordP4uiv (will be remapped) */
    "ip\0"
    "glTexCoordP4uiv\0"
    "\0"
-   /* _mesa_function_pool[6006]: VertexAttribs3dvNV (will be remapped) */
+   /* _mesa_function_pool[5979]: VertexAttribs3dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs3dvNV\0"
    "\0"
-   /* _mesa_function_pool[6032]: VertexAttribI2uiEXT (will be remapped) */
+   /* _mesa_function_pool[6005]: VertexAttribI2uiEXT (will be remapped) */
    "iii\0"
    "glVertexAttribI2uiEXT\0"
    "glVertexAttribI2ui\0"
    "\0"
-   /* _mesa_function_pool[6078]: VertexAttribs4fvNV (will be remapped) */
+   /* _mesa_function_pool[6051]: VertexAttribs4fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4fvNV\0"
    "\0"
-   /* _mesa_function_pool[6104]: VertexArrayRangeNV (will be remapped) */
+   /* _mesa_function_pool[6077]: VertexArrayRangeNV (will be remapped) */
    "ip\0"
    "glVertexArrayRangeNV\0"
    "\0"
-   /* _mesa_function_pool[6129]: FragmentLightiSGIX (dynamic) */
+   /* _mesa_function_pool[6102]: FragmentLightiSGIX (dynamic) */
    "iii\0"
    "glFragmentLightiSGIX\0"
    "\0"
-   /* _mesa_function_pool[6155]: PolygonOffsetEXT (will be remapped) */
+   /* _mesa_function_pool[6128]: PolygonOffsetEXT (will be remapped) */
    "ff\0"
    "glPolygonOffsetEXT\0"
    "\0"
-   /* _mesa_function_pool[6178]: VertexAttribI4uivEXT (will be remapped) */
+   /* _mesa_function_pool[6151]: VertexAttribI4uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4uivEXT\0"
    "glVertexAttribI4uiv\0"
    "\0"
-   /* _mesa_function_pool[6225]: PollAsyncSGIX (dynamic) */
+   /* _mesa_function_pool[6198]: PollAsyncSGIX (dynamic) */
    "p\0"
    "glPollAsyncSGIX\0"
    "\0"
-   /* _mesa_function_pool[6244]: DeleteFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[6217]: DeleteFragmentShaderATI (will be remapped) */
    "i\0"
    "glDeleteFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[6273]: Scaled (offset 301) */
+   /* _mesa_function_pool[6246]: Scaled (offset 301) */
    "ddd\0"
    "glScaled\0"
    "\0"
-   /* _mesa_function_pool[6287]: ResumeTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[6260]: ResumeTransformFeedback (will be remapped) */
    "\0"
    "glResumeTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[6315]: Scalef (offset 302) */
+   /* _mesa_function_pool[6288]: Scalef (offset 302) */
    "fff\0"
    "glScalef\0"
    "\0"
-   /* _mesa_function_pool[6329]: TexCoord2fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[6302]: TexCoord2fNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[6367]: ProgramEnvParameters4fvEXT (will be remapped) */
+   /* _mesa_function_pool[6340]: ProgramEnvParameters4fvEXT (will be remapped) */
    "iiip\0"
    "glProgramEnvParameters4fvEXT\0"
    "\0"
-   /* _mesa_function_pool[6402]: MultTransposeMatrixdARB (will be remapped) */
+   /* _mesa_function_pool[6375]: MultTransposeMatrixdARB (will be remapped) */
    "p\0"
    "glMultTransposeMatrixd\0"
    "glMultTransposeMatrixdARB\0"
    "\0"
-   /* _mesa_function_pool[6454]: ObjectUnpurgeableAPPLE (will be remapped) */
+   /* _mesa_function_pool[6427]: ObjectUnpurgeableAPPLE (will be remapped) */
    "iii\0"
    "glObjectUnpurgeableAPPLE\0"
    "\0"
-   /* _mesa_function_pool[6484]: AlphaFunc (offset 240) */
+   /* _mesa_function_pool[6457]: AlphaFunc (offset 240) */
    "if\0"
    "glAlphaFunc\0"
    "\0"
-   /* _mesa_function_pool[6500]: WindowPos2svMESA (will be remapped) */
+   /* _mesa_function_pool[6473]: WindowPos2svMESA (will be remapped) */
    "p\0"
    "glWindowPos2sv\0"
    "glWindowPos2svARB\0"
    "glWindowPos2svMESA\0"
    "\0"
-   /* _mesa_function_pool[6555]: EdgeFlag (offset 41) */
+   /* _mesa_function_pool[6528]: EdgeFlag (offset 41) */
    "i\0"
    "glEdgeFlag\0"
    "\0"
-   /* _mesa_function_pool[6569]: TexCoord2iv (offset 107) */
+   /* _mesa_function_pool[6542]: TexCoord2iv (offset 107) */
    "p\0"
    "glTexCoord2iv\0"
    "\0"
-   /* _mesa_function_pool[6586]: CompressedTexImage1DARB (will be remapped) */
+   /* _mesa_function_pool[6559]: CompressedTexImage1DARB (will be remapped) */
    "iiiiiip\0"
    "glCompressedTexImage1D\0"
    "glCompressedTexImage1DARB\0"
    "\0"
-   /* _mesa_function_pool[6644]: Rotated (offset 299) */
+   /* _mesa_function_pool[6617]: Rotated (offset 299) */
    "dddd\0"
    "glRotated\0"
    "\0"
-   /* _mesa_function_pool[6660]: GetTexParameterIuivEXT (will be remapped) */
+   /* _mesa_function_pool[6633]: GetTexParameterIuivEXT (will be remapped) */
    "iip\0"
    "glGetTexParameterIuivEXT\0"
    "glGetTexParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[6712]: VertexAttrib2sNV (will be remapped) */
+   /* _mesa_function_pool[6685]: VertexAttrib2sNV (will be remapped) */
    "iii\0"
    "glVertexAttrib2sNV\0"
    "\0"
-   /* _mesa_function_pool[6736]: BindBufferBaseEXT (will be remapped) */
+   /* _mesa_function_pool[6709]: BindBufferBaseEXT (will be remapped) */
    "iii\0"
    "glBindBufferBase\0"
    "glBindBufferBaseEXT\0"
    "\0"
-   /* _mesa_function_pool[6778]: ReadPixels (offset 256) */
+   /* _mesa_function_pool[6751]: ReadPixels (offset 256) */
    "iiiiiip\0"
    "glReadPixels\0"
    "\0"
-   /* _mesa_function_pool[6800]: EdgeFlagv (offset 42) */
+   /* _mesa_function_pool[6773]: EdgeFlagv (offset 42) */
    "p\0"
    "glEdgeFlagv\0"
    "\0"
-   /* _mesa_function_pool[6815]: NormalPointerListIBM (dynamic) */
+   /* _mesa_function_pool[6788]: NormalPointerListIBM (dynamic) */
    "iipi\0"
    "glNormalPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[6844]: IndexPointerEXT (will be remapped) */
+   /* _mesa_function_pool[6817]: IndexPointerEXT (will be remapped) */
    "iiip\0"
    "glIndexPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[6868]: Color4iv (offset 32) */
+   /* _mesa_function_pool[6841]: Color4iv (offset 32) */
    "p\0"
    "glColor4iv\0"
    "\0"
-   /* _mesa_function_pool[6882]: TexParameterf (offset 178) */
+   /* _mesa_function_pool[6855]: TexParameterf (offset 178) */
    "iif\0"
    "glTexParameterf\0"
    "\0"
-   /* _mesa_function_pool[6903]: TexParameteri (offset 180) */
+   /* _mesa_function_pool[6876]: TexParameteri (offset 180) */
    "iii\0"
    "glTexParameteri\0"
    "\0"
-   /* _mesa_function_pool[6924]: NormalPointerEXT (will be remapped) */
+   /* _mesa_function_pool[6897]: NormalPointerEXT (will be remapped) */
    "iiip\0"
    "glNormalPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[6949]: MultiTexCoord3dARB (offset 392) */
+   /* _mesa_function_pool[6922]: MultiTexCoord3dARB (offset 392) */
    "iddd\0"
    "glMultiTexCoord3d\0"
    "glMultiTexCoord3dARB\0"
    "\0"
-   /* _mesa_function_pool[6994]: MultiTexCoord2iARB (offset 388) */
+   /* _mesa_function_pool[6967]: MultiTexCoord2iARB (offset 388) */
    "iii\0"
    "glMultiTexCoord2i\0"
    "glMultiTexCoord2iARB\0"
    "\0"
-   /* _mesa_function_pool[7038]: DrawPixels (offset 257) */
+   /* _mesa_function_pool[7011]: DrawPixels (offset 257) */
    "iiiip\0"
    "glDrawPixels\0"
    "\0"
-   /* _mesa_function_pool[7058]: ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[7031]: ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (dynamic) */
    "iffffffff\0"
    "glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[7118]: MultiTexCoord2svARB (offset 391) */
+   /* _mesa_function_pool[7091]: MultiTexCoord2svARB (offset 391) */
    "ip\0"
    "glMultiTexCoord2sv\0"
    "glMultiTexCoord2svARB\0"
    "\0"
-   /* _mesa_function_pool[7163]: ReplacementCodeubvSUN (dynamic) */
+   /* _mesa_function_pool[7136]: ReplacementCodeubvSUN (dynamic) */
    "p\0"
    "glReplacementCodeubvSUN\0"
    "\0"
-   /* _mesa_function_pool[7190]: Uniform3iARB (will be remapped) */
+   /* _mesa_function_pool[7163]: Uniform3iARB (will be remapped) */
    "iiii\0"
    "glUniform3i\0"
    "glUniform3iARB\0"
    "\0"
-   /* _mesa_function_pool[7223]: DrawTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[7196]: DrawTransformFeedback (will be remapped) */
    "ii\0"
    "glDrawTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[7251]: DrawElementsInstancedARB (will be remapped) */
+   /* _mesa_function_pool[7224]: DrawElementsInstancedARB (will be remapped) */
    "iiipi\0"
    "glDrawElementsInstancedARB\0"
    "glDrawElementsInstancedEXT\0"
    "glDrawElementsInstanced\0"
    "\0"
-   /* _mesa_function_pool[7336]: VertexAttribI1iEXT (will be remapped) */
+   /* _mesa_function_pool[7309]: VertexAttribI1iEXT (will be remapped) */
    "ii\0"
    "glVertexAttribI1iEXT\0"
    "glVertexAttribI1i\0"
    "\0"
-   /* _mesa_function_pool[7379]: GetShaderInfoLog (will be remapped) */
+   /* _mesa_function_pool[7352]: GetShaderInfoLog (will be remapped) */
    "iipp\0"
    "glGetShaderInfoLog\0"
    "\0"
-   /* _mesa_function_pool[7404]: GetCombinerInputParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[7377]: GetCombinerInputParameterfvNV (will be remapped) */
    "iiiip\0"
    "glGetCombinerInputParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[7443]: WeightivARB (dynamic) */
+   /* _mesa_function_pool[7416]: WeightivARB (dynamic) */
    "ip\0"
    "glWeightivARB\0"
    "\0"
-   /* _mesa_function_pool[7461]: PollInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[7434]: PollInstrumentsSGIX (dynamic) */
    "p\0"
    "glPollInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[7486]: GlobalAlphaFactordSUN (dynamic) */
+   /* _mesa_function_pool[7459]: GlobalAlphaFactordSUN (dynamic) */
    "d\0"
    "glGlobalAlphaFactordSUN\0"
    "\0"
-   /* _mesa_function_pool[7513]: GetFinalCombinerInputParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[7486]: GetFinalCombinerInputParameterfvNV (will be remapped) */
    "iip\0"
    "glGetFinalCombinerInputParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[7555]: GenerateMipmapEXT (will be remapped) */
+   /* _mesa_function_pool[7528]: GenerateMipmapEXT (will be remapped) */
    "i\0"
    "glGenerateMipmap\0"
    "glGenerateMipmapEXT\0"
    "\0"
-   /* _mesa_function_pool[7595]: GenLists (offset 5) */
+   /* _mesa_function_pool[7568]: GenLists (offset 5) */
    "i\0"
    "glGenLists\0"
    "\0"
-   /* _mesa_function_pool[7609]: DepthRangef (will be remapped) */
+   /* _mesa_function_pool[7582]: DepthRangef (will be remapped) */
    "ff\0"
    "glDepthRangef\0"
    "\0"
-   /* _mesa_function_pool[7627]: GetMapAttribParameterivNV (dynamic) */
+   /* _mesa_function_pool[7600]: GetMapAttribParameterivNV (dynamic) */
    "iiip\0"
    "glGetMapAttribParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[7661]: CreateShaderObjectARB (will be remapped) */
+   /* _mesa_function_pool[7634]: CreateShaderObjectARB (will be remapped) */
    "i\0"
    "glCreateShaderObjectARB\0"
    "\0"
-   /* _mesa_function_pool[7688]: GetSharpenTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[7661]: GetSharpenTexFuncSGIS (dynamic) */
    "ip\0"
    "glGetSharpenTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[7716]: BufferDataARB (will be remapped) */
+   /* _mesa_function_pool[7689]: BufferDataARB (will be remapped) */
    "iipi\0"
    "glBufferData\0"
    "glBufferDataARB\0"
    "\0"
-   /* _mesa_function_pool[7751]: FlushVertexArrayRangeNV (will be remapped) */
+   /* _mesa_function_pool[7724]: FlushVertexArrayRangeNV (will be remapped) */
    "\0"
    "glFlushVertexArrayRangeNV\0"
    "\0"
-   /* _mesa_function_pool[7779]: MapGrid2d (offset 226) */
+   /* _mesa_function_pool[7752]: MapGrid2d (offset 226) */
    "iddidd\0"
    "glMapGrid2d\0"
    "\0"
-   /* _mesa_function_pool[7799]: MapGrid2f (offset 227) */
+   /* _mesa_function_pool[7772]: MapGrid2f (offset 227) */
    "iffiff\0"
    "glMapGrid2f\0"
    "\0"
-   /* _mesa_function_pool[7819]: SampleMapATI (will be remapped) */
+   /* _mesa_function_pool[7792]: SampleMapATI (will be remapped) */
    "iii\0"
    "glSampleMapATI\0"
    "\0"
-   /* _mesa_function_pool[7839]: VertexPointerEXT (will be remapped) */
+   /* _mesa_function_pool[7812]: VertexPointerEXT (will be remapped) */
    "iiiip\0"
    "glVertexPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[7865]: GetTexFilterFuncSGIS (dynamic) */
+   /* _mesa_function_pool[7838]: GetTexFilterFuncSGIS (dynamic) */
    "iip\0"
    "glGetTexFilterFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[7893]: Scissor (offset 176) */
+   /* _mesa_function_pool[7866]: Scissor (offset 176) */
    "iiii\0"
    "glScissor\0"
    "\0"
-   /* _mesa_function_pool[7909]: Fogf (offset 153) */
+   /* _mesa_function_pool[7882]: Fogf (offset 153) */
    "if\0"
    "glFogf\0"
    "\0"
-   /* _mesa_function_pool[7920]: ReplacementCodeuiColor4ubVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[7893]: ReplacementCodeuiColor4ubVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiColor4ubVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[7965]: TexSubImage1D (offset 332) */
+   /* _mesa_function_pool[7938]: TexSubImage1D (offset 332) */
    "iiiiiip\0"
    "glTexSubImage1D\0"
    "glTexSubImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[8009]: VertexAttrib1sARB (will be remapped) */
+   /* _mesa_function_pool[7982]: VertexAttrib1sARB (will be remapped) */
    "ii\0"
    "glVertexAttrib1s\0"
    "glVertexAttrib1sARB\0"
    "\0"
-   /* _mesa_function_pool[8050]: FenceSync (will be remapped) */
+   /* _mesa_function_pool[8023]: FenceSync (will be remapped) */
    "ii\0"
    "glFenceSync\0"
    "\0"
-   /* _mesa_function_pool[8066]: Color4usv (offset 40) */
+   /* _mesa_function_pool[8039]: Color4usv (offset 40) */
    "p\0"
    "glColor4usv\0"
    "\0"
-   /* _mesa_function_pool[8081]: GetnUniformfvARB (will be remapped) */
+   /* _mesa_function_pool[8054]: GetnUniformfvARB (will be remapped) */
    "iiip\0"
    "glGetnUniformfvARB\0"
    "\0"
-   /* _mesa_function_pool[8106]: Fogi (offset 155) */
+   /* _mesa_function_pool[8079]: Fogi (offset 155) */
    "ii\0"
    "glFogi\0"
    "\0"
-   /* _mesa_function_pool[8117]: DepthRange (offset 288) */
+   /* _mesa_function_pool[8090]: DepthRange (offset 288) */
    "dd\0"
    "glDepthRange\0"
    "\0"
-   /* _mesa_function_pool[8134]: RasterPos3iv (offset 75) */
+   /* _mesa_function_pool[8107]: RasterPos3iv (offset 75) */
    "p\0"
    "glRasterPos3iv\0"
    "\0"
-   /* _mesa_function_pool[8152]: FinalCombinerInputNV (will be remapped) */
+   /* _mesa_function_pool[8125]: FinalCombinerInputNV (will be remapped) */
    "iiii\0"
    "glFinalCombinerInputNV\0"
    "\0"
-   /* _mesa_function_pool[8181]: TexCoord2i (offset 106) */
+   /* _mesa_function_pool[8154]: TexCoord2i (offset 106) */
    "ii\0"
    "glTexCoord2i\0"
    "\0"
-   /* _mesa_function_pool[8198]: PixelMapfv (offset 251) */
+   /* _mesa_function_pool[8171]: PixelMapfv (offset 251) */
    "iip\0"
    "glPixelMapfv\0"
    "\0"
-   /* _mesa_function_pool[8216]: Color4ui (offset 37) */
+   /* _mesa_function_pool[8189]: Color4ui (offset 37) */
    "iiii\0"
    "glColor4ui\0"
    "\0"
-   /* _mesa_function_pool[8233]: RasterPos3s (offset 76) */
+   /* _mesa_function_pool[8206]: RasterPos3s (offset 76) */
    "iii\0"
    "glRasterPos3s\0"
    "\0"
-   /* _mesa_function_pool[8252]: Color3usv (offset 24) */
+   /* _mesa_function_pool[8225]: Color3usv (offset 24) */
    "p\0"
    "glColor3usv\0"
    "\0"
-   /* _mesa_function_pool[8267]: FlushRasterSGIX (dynamic) */
+   /* _mesa_function_pool[8240]: FlushRasterSGIX (dynamic) */
    "\0"
    "glFlushRasterSGIX\0"
    "\0"
-   /* _mesa_function_pool[8287]: TexCoord2f (offset 104) */
+   /* _mesa_function_pool[8260]: TexCoord2f (offset 104) */
    "ff\0"
    "glTexCoord2f\0"
    "\0"
-   /* _mesa_function_pool[8304]: ReplacementCodeuiTexCoord2fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[8277]: ReplacementCodeuiTexCoord2fVertex3fSUN (dynamic) */
    "ifffff\0"
    "glReplacementCodeuiTexCoord2fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[8353]: TexCoord2d (offset 102) */
+   /* _mesa_function_pool[8326]: TexCoord2d (offset 102) */
    "dd\0"
    "glTexCoord2d\0"
    "\0"
-   /* _mesa_function_pool[8370]: RasterPos3d (offset 70) */
+   /* _mesa_function_pool[8343]: RasterPos3d (offset 70) */
    "ddd\0"
    "glRasterPos3d\0"
    "\0"
-   /* _mesa_function_pool[8389]: RasterPos3f (offset 72) */
+   /* _mesa_function_pool[8362]: RasterPos3f (offset 72) */
    "fff\0"
    "glRasterPos3f\0"
    "\0"
-   /* _mesa_function_pool[8408]: Uniform1fARB (will be remapped) */
+   /* _mesa_function_pool[8381]: Uniform1fARB (will be remapped) */
    "if\0"
    "glUniform1f\0"
    "glUniform1fARB\0"
    "\0"
-   /* _mesa_function_pool[8439]: AreTexturesResident (offset 322) */
+   /* _mesa_function_pool[8412]: AreTexturesResident (offset 322) */
    "ipp\0"
    "glAreTexturesResident\0"
    "glAreTexturesResidentEXT\0"
    "\0"
-   /* _mesa_function_pool[8491]: TexCoord2s (offset 108) */
+   /* _mesa_function_pool[8464]: TexCoord2s (offset 108) */
    "ii\0"
    "glTexCoord2s\0"
    "\0"
-   /* _mesa_function_pool[8508]: StencilOpSeparate (will be remapped) */
+   /* _mesa_function_pool[8481]: StencilOpSeparate (will be remapped) */
    "iiii\0"
    "glStencilOpSeparate\0"
    "glStencilOpSeparateATI\0"
    "\0"
-   /* _mesa_function_pool[8557]: ColorTableParameteriv (offset 341) */
+   /* _mesa_function_pool[8530]: ColorTableParameteriv (offset 341) */
    "iip\0"
    "glColorTableParameteriv\0"
    "glColorTableParameterivSGI\0"
    "\0"
-   /* _mesa_function_pool[8613]: VertexAttribP2ui (will be remapped) */
+   /* _mesa_function_pool[8586]: VertexAttribP2ui (will be remapped) */
    "iiii\0"
    "glVertexAttribP2ui\0"
    "\0"
-   /* _mesa_function_pool[8638]: WindowPos3dMESA (will be remapped) */
+   /* _mesa_function_pool[8611]: WindowPos3dMESA (will be remapped) */
    "ddd\0"
    "glWindowPos3d\0"
    "glWindowPos3dARB\0"
    "glWindowPos3dMESA\0"
    "\0"
-   /* _mesa_function_pool[8692]: Color4us (offset 39) */
+   /* _mesa_function_pool[8665]: Color4us (offset 39) */
    "iiii\0"
    "glColor4us\0"
    "\0"
-   /* _mesa_function_pool[8709]: PointParameterfvEXT (will be remapped) */
+   /* _mesa_function_pool[8682]: PointParameterfvEXT (will be remapped) */
    "ip\0"
    "glPointParameterfv\0"
    "glPointParameterfvARB\0"
    "glPointParameterfvEXT\0"
    "glPointParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[8799]: Color3bv (offset 10) */
+   /* _mesa_function_pool[8772]: Color3bv (offset 10) */
    "p\0"
    "glColor3bv\0"
    "\0"
-   /* _mesa_function_pool[8813]: GetnCompressedTexImageARB (will be remapped) */
+   /* _mesa_function_pool[8786]: GetnCompressedTexImageARB (will be remapped) */
    "iiip\0"
    "glGetnCompressedTexImageARB\0"
    "\0"
-   /* _mesa_function_pool[8847]: WindowPos2fvMESA (will be remapped) */
+   /* _mesa_function_pool[8820]: WindowPos2fvMESA (will be remapped) */
    "p\0"
    "glWindowPos2fv\0"
    "glWindowPos2fvARB\0"
    "glWindowPos2fvMESA\0"
    "\0"
-   /* _mesa_function_pool[8902]: SecondaryColor3bvEXT (will be remapped) */
+   /* _mesa_function_pool[8875]: SecondaryColor3bvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3bv\0"
    "glSecondaryColor3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[8948]: VertexPointerListIBM (dynamic) */
+   /* _mesa_function_pool[8921]: VertexPointerListIBM (dynamic) */
    "iiipi\0"
    "glVertexPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[8978]: GetProgramLocalParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[8951]: GetProgramLocalParameterfvARB (will be remapped) */
    "iip\0"
    "glGetProgramLocalParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[9015]: FragmentMaterialfSGIX (dynamic) */
+   /* _mesa_function_pool[8988]: FragmentMaterialfSGIX (dynamic) */
    "iif\0"
    "glFragmentMaterialfSGIX\0"
    "\0"
-   /* _mesa_function_pool[9044]: BindSampler (will be remapped) */
+   /* _mesa_function_pool[9017]: BindSampler (will be remapped) */
    "ii\0"
    "glBindSampler\0"
    "\0"
-   /* _mesa_function_pool[9062]: RenderbufferStorageEXT (will be remapped) */
+   /* _mesa_function_pool[9035]: RenderbufferStorageEXT (will be remapped) */
    "iiii\0"
    "glRenderbufferStorage\0"
    "glRenderbufferStorageEXT\0"
    "\0"
-   /* _mesa_function_pool[9115]: IsFenceNV (will be remapped) */
+   /* _mesa_function_pool[9088]: IsFenceNV (will be remapped) */
    "i\0"
    "glIsFenceNV\0"
    "\0"
-   /* _mesa_function_pool[9130]: AlphaFragmentOp2ATI (will be remapped) */
+   /* _mesa_function_pool[9103]: AlphaFragmentOp2ATI (will be remapped) */
    "iiiiiiiii\0"
    "glAlphaFragmentOp2ATI\0"
    "\0"
-   /* _mesa_function_pool[9163]: AttachObjectARB (will be remapped) */
+   /* _mesa_function_pool[9136]: AttachObjectARB (will be remapped) */
    "ii\0"
    "glAttachObjectARB\0"
    "\0"
-   /* _mesa_function_pool[9185]: GetFragmentLightivSGIX (dynamic) */
+   /* _mesa_function_pool[9158]: GetFragmentLightivSGIX (dynamic) */
    "iip\0"
    "glGetFragmentLightivSGIX\0"
    "\0"
-   /* _mesa_function_pool[9215]: UniformMatrix2fvARB (will be remapped) */
+   /* _mesa_function_pool[9188]: UniformMatrix2fvARB (will be remapped) */
    "iiip\0"
    "glUniformMatrix2fv\0"
    "glUniformMatrix2fvARB\0"
    "\0"
-   /* _mesa_function_pool[9262]: MultiTexCoord2fARB (offset 386) */
+   /* _mesa_function_pool[9235]: MultiTexCoord2fARB (offset 386) */
    "iff\0"
    "glMultiTexCoord2f\0"
    "glMultiTexCoord2fARB\0"
    "\0"
-   /* _mesa_function_pool[9306]: ColorTable (offset 339) */
+   /* _mesa_function_pool[9279]: ColorTable (offset 339) */
    "iiiiip\0"
    "glColorTable\0"
    "glColorTableSGI\0"
    "glColorTableEXT\0"
    "\0"
-   /* _mesa_function_pool[9359]: IndexPointer (offset 314) */
+   /* _mesa_function_pool[9332]: IndexPointer (offset 314) */
    "iip\0"
    "glIndexPointer\0"
    "\0"
-   /* _mesa_function_pool[9379]: Accum (offset 213) */
+   /* _mesa_function_pool[9352]: Accum (offset 213) */
    "if\0"
    "glAccum\0"
    "\0"
-   /* _mesa_function_pool[9391]: GetTexImage (offset 281) */
+   /* _mesa_function_pool[9364]: GetTexImage (offset 281) */
    "iiiip\0"
    "glGetTexImage\0"
    "\0"
-   /* _mesa_function_pool[9412]: MapControlPointsNV (dynamic) */
+   /* _mesa_function_pool[9385]: MapControlPointsNV (dynamic) */
    "iiiiiiiip\0"
    "glMapControlPointsNV\0"
    "\0"
-   /* _mesa_function_pool[9444]: ConvolutionFilter2D (offset 349) */
+   /* _mesa_function_pool[9417]: ConvolutionFilter2D (offset 349) */
    "iiiiiip\0"
    "glConvolutionFilter2D\0"
    "glConvolutionFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[9500]: Finish (offset 216) */
+   /* _mesa_function_pool[9473]: Finish (offset 216) */
    "\0"
    "glFinish\0"
    "\0"
-   /* _mesa_function_pool[9511]: MapParameterfvNV (dynamic) */
+   /* _mesa_function_pool[9484]: MapParameterfvNV (dynamic) */
    "iip\0"
    "glMapParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[9535]: ClearStencil (offset 207) */
+   /* _mesa_function_pool[9508]: ClearStencil (offset 207) */
    "i\0"
    "glClearStencil\0"
    "\0"
-   /* _mesa_function_pool[9553]: VertexAttrib3dvARB (will be remapped) */
+   /* _mesa_function_pool[9526]: VertexAttrib3dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3dv\0"
    "glVertexAttrib3dvARB\0"
    "\0"
-   /* _mesa_function_pool[9596]: Uniform4uivEXT (will be remapped) */
+   /* _mesa_function_pool[9569]: Uniform4uivEXT (will be remapped) */
    "iip\0"
    "glUniform4uivEXT\0"
    "glUniform4uiv\0"
    "\0"
-   /* _mesa_function_pool[9632]: HintPGI (dynamic) */
+   /* _mesa_function_pool[9605]: HintPGI (dynamic) */
    "ii\0"
    "glHintPGI\0"
    "\0"
-   /* _mesa_function_pool[9646]: ConvolutionParameteriv (offset 353) */
+   /* _mesa_function_pool[9619]: ConvolutionParameteriv (offset 353) */
    "iip\0"
    "glConvolutionParameteriv\0"
    "glConvolutionParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[9704]: Color4s (offset 33) */
+   /* _mesa_function_pool[9677]: Color4s (offset 33) */
    "iiii\0"
    "glColor4s\0"
    "\0"
-   /* _mesa_function_pool[9720]: InterleavedArrays (offset 317) */
+   /* _mesa_function_pool[9693]: InterleavedArrays (offset 317) */
    "iip\0"
    "glInterleavedArrays\0"
    "\0"
-   /* _mesa_function_pool[9745]: RasterPos2fv (offset 65) */
+   /* _mesa_function_pool[9718]: RasterPos2fv (offset 65) */
    "p\0"
    "glRasterPos2fv\0"
    "\0"
-   /* _mesa_function_pool[9763]: TexCoord1fv (offset 97) */
+   /* _mesa_function_pool[9736]: TexCoord1fv (offset 97) */
    "p\0"
    "glTexCoord1fv\0"
    "\0"
-   /* _mesa_function_pool[9780]: Vertex2d (offset 126) */
+   /* _mesa_function_pool[9753]: Vertex2d (offset 126) */
    "dd\0"
    "glVertex2d\0"
    "\0"
-   /* _mesa_function_pool[9795]: CullParameterdvEXT (dynamic) */
+   /* _mesa_function_pool[9768]: CullParameterdvEXT (dynamic) */
    "ip\0"
    "glCullParameterdvEXT\0"
    "\0"
-   /* _mesa_function_pool[9820]: ProgramNamedParameter4fNV (will be remapped) */
+   /* _mesa_function_pool[9793]: ProgramNamedParameter4fNV (will be remapped) */
    "iipffff\0"
    "glProgramNamedParameter4fNV\0"
    "\0"
-   /* _mesa_function_pool[9857]: Color3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[9830]: Color3fVertex3fSUN (dynamic) */
    "ffffff\0"
    "glColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[9886]: ProgramEnvParameter4fvARB (will be remapped) */
+   /* _mesa_function_pool[9859]: ProgramEnvParameter4fvARB (will be remapped) */
    "iip\0"
    "glProgramEnvParameter4fvARB\0"
    "glProgramParameter4fvNV\0"
    "\0"
-   /* _mesa_function_pool[9943]: Color4i (offset 31) */
+   /* _mesa_function_pool[9916]: Color4i (offset 31) */
    "iiii\0"
    "glColor4i\0"
    "\0"
-   /* _mesa_function_pool[9959]: Color4f (offset 29) */
+   /* _mesa_function_pool[9932]: Color4f (offset 29) */
    "ffff\0"
    "glColor4f\0"
    "\0"
-   /* _mesa_function_pool[9975]: RasterPos4fv (offset 81) */
+   /* _mesa_function_pool[9948]: RasterPos4fv (offset 81) */
    "p\0"
    "glRasterPos4fv\0"
    "\0"
-   /* _mesa_function_pool[9993]: Color4d (offset 27) */
+   /* _mesa_function_pool[9966]: Color4d (offset 27) */
    "dddd\0"
    "glColor4d\0"
    "\0"
-   /* _mesa_function_pool[10009]: ClearIndex (offset 205) */
+   /* _mesa_function_pool[9982]: ClearIndex (offset 205) */
    "f\0"
    "glClearIndex\0"
    "\0"
-   /* _mesa_function_pool[10025]: Color4b (offset 25) */
+   /* _mesa_function_pool[9998]: Color4b (offset 25) */
    "iiii\0"
    "glColor4b\0"
    "\0"
-   /* _mesa_function_pool[10041]: LoadMatrixd (offset 292) */
+   /* _mesa_function_pool[10014]: LoadMatrixd (offset 292) */
    "p\0"
    "glLoadMatrixd\0"
    "\0"
-   /* _mesa_function_pool[10058]: FragmentLightModeliSGIX (dynamic) */
+   /* _mesa_function_pool[10031]: FragmentLightModeliSGIX (dynamic) */
    "ii\0"
    "glFragmentLightModeliSGIX\0"
    "\0"
-   /* _mesa_function_pool[10088]: RasterPos2dv (offset 63) */
+   /* _mesa_function_pool[10061]: RasterPos2dv (offset 63) */
    "p\0"
    "glRasterPos2dv\0"
    "\0"
-   /* _mesa_function_pool[10106]: ConvolutionParameterfv (offset 351) */
+   /* _mesa_function_pool[10079]: ConvolutionParameterfv (offset 351) */
    "iip\0"
    "glConvolutionParameterfv\0"
    "glConvolutionParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[10164]: TbufferMask3DFX (dynamic) */
+   /* _mesa_function_pool[10137]: TbufferMask3DFX (dynamic) */
    "i\0"
    "glTbufferMask3DFX\0"
    "\0"
-   /* _mesa_function_pool[10185]: GetTexGendv (offset 278) */
+   /* _mesa_function_pool[10158]: GetTexGendv (offset 278) */
    "iip\0"
    "glGetTexGendv\0"
    "\0"
-   /* _mesa_function_pool[10204]: ColorMaskIndexedEXT (will be remapped) */
+   /* _mesa_function_pool[10177]: ColorMaskIndexedEXT (will be remapped) */
    "iiiii\0"
    "glColorMaskIndexedEXT\0"
    "glColorMaski\0"
    "\0"
-   /* _mesa_function_pool[10246]: GetFragDataLocationEXT (will be remapped) */
+   /* _mesa_function_pool[10219]: GetFragDataLocationEXT (will be remapped) */
    "ip\0"
    "glGetFragDataLocationEXT\0"
    "glGetFragDataLocation\0"
    "\0"
-   /* _mesa_function_pool[10297]: LoadProgramNV (will be remapped) */
+   /* _mesa_function_pool[10270]: LoadProgramNV (will be remapped) */
    "iiip\0"
    "glLoadProgramNV\0"
    "\0"
-   /* _mesa_function_pool[10319]: WaitSync (will be remapped) */
+   /* _mesa_function_pool[10292]: WaitSync (will be remapped) */
    "iii\0"
    "glWaitSync\0"
    "\0"
-   /* _mesa_function_pool[10335]: EndList (offset 1) */
+   /* _mesa_function_pool[10308]: EndList (offset 1) */
    "\0"
    "glEndList\0"
    "\0"
-   /* _mesa_function_pool[10347]: VertexP4ui (will be remapped) */
+   /* _mesa_function_pool[10320]: VertexP4ui (will be remapped) */
    "ii\0"
    "glVertexP4ui\0"
    "\0"
-   /* _mesa_function_pool[10364]: MultiTexCoordP1ui (will be remapped) */
+   /* _mesa_function_pool[10337]: MultiTexCoordP1ui (will be remapped) */
    "iii\0"
    "glMultiTexCoordP1ui\0"
    "\0"
-   /* _mesa_function_pool[10389]: GetAttachedObjectsARB (will be remapped) */
+   /* _mesa_function_pool[10362]: GetAttachedObjectsARB (will be remapped) */
    "iipp\0"
    "glGetAttachedObjectsARB\0"
    "\0"
-   /* _mesa_function_pool[10419]: Uniform3fvARB (will be remapped) */
+   /* _mesa_function_pool[10392]: Uniform3fvARB (will be remapped) */
    "iip\0"
    "glUniform3fv\0"
    "glUniform3fvARB\0"
    "\0"
-   /* _mesa_function_pool[10453]: EvalCoord1fv (offset 231) */
+   /* _mesa_function_pool[10426]: EvalCoord1fv (offset 231) */
    "p\0"
    "glEvalCoord1fv\0"
    "\0"
-   /* _mesa_function_pool[10471]: DrawRangeElements (offset 338) */
+   /* _mesa_function_pool[10444]: DrawRangeElements (offset 338) */
    "iiiiip\0"
    "glDrawRangeElements\0"
    "glDrawRangeElementsEXT\0"
    "\0"
-   /* _mesa_function_pool[10522]: EvalMesh2 (offset 238) */
+   /* _mesa_function_pool[10495]: EvalMesh2 (offset 238) */
    "iiiii\0"
    "glEvalMesh2\0"
    "\0"
-   /* _mesa_function_pool[10541]: Vertex4fv (offset 145) */
+   /* _mesa_function_pool[10514]: Vertex4fv (offset 145) */
    "p\0"
    "glVertex4fv\0"
    "\0"
-   /* _mesa_function_pool[10556]: GenTransformFeedbacks (will be remapped) */
+   /* _mesa_function_pool[10529]: GenTransformFeedbacks (will be remapped) */
    "ip\0"
    "glGenTransformFeedbacks\0"
    "\0"
-   /* _mesa_function_pool[10584]: SpriteParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[10557]: SpriteParameterfvSGIX (dynamic) */
    "ip\0"
    "glSpriteParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[10612]: CheckFramebufferStatusEXT (will be remapped) */
+   /* _mesa_function_pool[10585]: CheckFramebufferStatusEXT (will be remapped) */
    "i\0"
    "glCheckFramebufferStatus\0"
    "glCheckFramebufferStatusEXT\0"
    "\0"
-   /* _mesa_function_pool[10668]: GlobalAlphaFactoruiSUN (dynamic) */
+   /* _mesa_function_pool[10641]: GlobalAlphaFactoruiSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactoruiSUN\0"
    "\0"
-   /* _mesa_function_pool[10696]: GetHandleARB (will be remapped) */
+   /* _mesa_function_pool[10669]: GetHandleARB (will be remapped) */
    "i\0"
    "glGetHandleARB\0"
    "\0"
-   /* _mesa_function_pool[10714]: DebugMessageControlARB (will be remapped) */
+   /* _mesa_function_pool[10687]: DebugMessageControlARB (will be remapped) */
    "iiiipi\0"
    "glDebugMessageControlARB\0"
    "\0"
-   /* _mesa_function_pool[10747]: GetVertexAttribivARB (will be remapped) */
+   /* _mesa_function_pool[10720]: GetVertexAttribivARB (will be remapped) */
    "iip\0"
    "glGetVertexAttribiv\0"
    "glGetVertexAttribivARB\0"
    "\0"
-   /* _mesa_function_pool[10795]: BlendFunciARB (will be remapped) */
+   /* _mesa_function_pool[10768]: BlendFunciARB (will be remapped) */
    "iii\0"
    "glBlendFunciARB\0"
    "glBlendFuncIndexedAMD\0"
    "\0"
-   /* _mesa_function_pool[10838]: VertexAttribP1ui (will be remapped) */
+   /* _mesa_function_pool[10811]: VertexAttribP1ui (will be remapped) */
    "iiii\0"
    "glVertexAttribP1ui\0"
    "\0"
-   /* _mesa_function_pool[10863]: GetnUniformivARB (will be remapped) */
+   /* _mesa_function_pool[10836]: GetnUniformivARB (will be remapped) */
    "iiip\0"
    "glGetnUniformivARB\0"
    "\0"
-   /* _mesa_function_pool[10888]: GetTexParameterIivEXT (will be remapped) */
+   /* _mesa_function_pool[10861]: GetTexParameterIivEXT (will be remapped) */
    "iip\0"
    "glGetTexParameterIivEXT\0"
    "glGetTexParameterIiv\0"
    "\0"
-   /* _mesa_function_pool[10938]: CreateProgram (will be remapped) */
+   /* _mesa_function_pool[10911]: CreateProgram (will be remapped) */
    "\0"
    "glCreateProgram\0"
    "\0"
-   /* _mesa_function_pool[10956]: LoadTransposeMatrixdARB (will be remapped) */
+   /* _mesa_function_pool[10929]: LoadTransposeMatrixdARB (will be remapped) */
    "p\0"
    "glLoadTransposeMatrixd\0"
    "glLoadTransposeMatrixdARB\0"
    "\0"
-   /* _mesa_function_pool[11008]: ReleaseShaderCompiler (will be remapped) */
+   /* _mesa_function_pool[10981]: ReleaseShaderCompiler (will be remapped) */
    "\0"
    "glReleaseShaderCompiler\0"
    "\0"
-   /* _mesa_function_pool[11034]: GetMinmax (offset 364) */
+   /* _mesa_function_pool[11007]: GetMinmax (offset 364) */
    "iiiip\0"
    "glGetMinmax\0"
    "glGetMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[11068]: StencilFuncSeparate (will be remapped) */
+   /* _mesa_function_pool[11041]: StencilFuncSeparate (will be remapped) */
    "iiii\0"
    "glStencilFuncSeparate\0"
    "\0"
-   /* _mesa_function_pool[11096]: SecondaryColor3sEXT (will be remapped) */
+   /* _mesa_function_pool[11069]: SecondaryColor3sEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3s\0"
    "glSecondaryColor3sEXT\0"
    "\0"
-   /* _mesa_function_pool[11142]: Color3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[11115]: Color3fVertex3fvSUN (dynamic) */
    "pp\0"
    "glColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[11168]: GetInteger64i_v (will be remapped) */
+   /* _mesa_function_pool[11141]: GetInteger64i_v (will be remapped) */
    "iip\0"
    "glGetInteger64i_v\0"
    "\0"
-   /* _mesa_function_pool[11191]: GetVertexAttribdvNV (will be remapped) */
+   /* _mesa_function_pool[11164]: GetVertexAttribdvNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribdvNV\0"
    "\0"
-   /* _mesa_function_pool[11218]: DeleteTransformFeedbacks (will be remapped) */
+   /* _mesa_function_pool[11191]: DeleteTransformFeedbacks (will be remapped) */
    "ip\0"
    "glDeleteTransformFeedbacks\0"
    "\0"
-   /* _mesa_function_pool[11249]: Normal3fv (offset 57) */
+   /* _mesa_function_pool[11222]: Normal3fv (offset 57) */
    "p\0"
    "glNormal3fv\0"
    "\0"
-   /* _mesa_function_pool[11264]: GlobalAlphaFactorbSUN (dynamic) */
+   /* _mesa_function_pool[11237]: GlobalAlphaFactorbSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorbSUN\0"
    "\0"
-   /* _mesa_function_pool[11291]: Color3us (offset 23) */
+   /* _mesa_function_pool[11264]: Color3us (offset 23) */
    "iii\0"
    "glColor3us\0"
    "\0"
-   /* _mesa_function_pool[11307]: ImageTransformParameterfvHP (dynamic) */
+   /* _mesa_function_pool[11280]: ImageTransformParameterfvHP (dynamic) */
    "iip\0"
    "glImageTransformParameterfvHP\0"
    "\0"
-   /* _mesa_function_pool[11342]: VertexAttrib4ivARB (will be remapped) */
+   /* _mesa_function_pool[11315]: VertexAttrib4ivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4iv\0"
    "glVertexAttrib4ivARB\0"
    "\0"
-   /* _mesa_function_pool[11385]: End (offset 43) */
+   /* _mesa_function_pool[11358]: End (offset 43) */
    "\0"
    "glEnd\0"
    "\0"
-   /* _mesa_function_pool[11393]: VertexAttrib3fNV (will be remapped) */
+   /* _mesa_function_pool[11366]: VertexAttrib3fNV (will be remapped) */
    "ifff\0"
    "glVertexAttrib3fNV\0"
    "\0"
-   /* _mesa_function_pool[11418]: MultiTexCoordP3uiv (will be remapped) */
+   /* _mesa_function_pool[11391]: MultiTexCoordP3uiv (will be remapped) */
    "iip\0"
    "glMultiTexCoordP3uiv\0"
    "\0"
-   /* _mesa_function_pool[11444]: VertexAttribs2dvNV (will be remapped) */
+   /* _mesa_function_pool[11417]: VertexAttribs2dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2dvNV\0"
    "\0"
-   /* _mesa_function_pool[11470]: GetQueryObjectui64vEXT (will be remapped) */
+   /* _mesa_function_pool[11443]: GetQueryObjectui64vEXT (will be remapped) */
    "iip\0"
    "glGetQueryObjectui64vEXT\0"
    "\0"
-   /* _mesa_function_pool[11500]: MultiTexCoord3fvARB (offset 395) */
+   /* _mesa_function_pool[11473]: MultiTexCoord3fvARB (offset 395) */
    "ip\0"
    "glMultiTexCoord3fv\0"
    "glMultiTexCoord3fvARB\0"
    "\0"
-   /* _mesa_function_pool[11545]: SecondaryColor3dEXT (will be remapped) */
+   /* _mesa_function_pool[11518]: SecondaryColor3dEXT (will be remapped) */
    "ddd\0"
    "glSecondaryColor3d\0"
    "glSecondaryColor3dEXT\0"
    "\0"
-   /* _mesa_function_pool[11591]: Color3ub (offset 19) */
+   /* _mesa_function_pool[11564]: Color3ub (offset 19) */
    "iii\0"
    "glColor3ub\0"
    "\0"
-   /* _mesa_function_pool[11607]: GetProgramParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[11580]: GetProgramParameterfvNV (will be remapped) */
    "iiip\0"
    "glGetProgramParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[11639]: TangentPointerEXT (dynamic) */
+   /* _mesa_function_pool[11612]: TangentPointerEXT (dynamic) */
    "iip\0"
    "glTangentPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[11664]: Color4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[11637]: Color4fNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[11699]: GetInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[11672]: GetInstrumentsSGIX (dynamic) */
    "\0"
    "glGetInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[11722]: GetUniformuivEXT (will be remapped) */
+   /* _mesa_function_pool[11695]: GetUniformuivEXT (will be remapped) */
    "iip\0"
    "glGetUniformuivEXT\0"
    "glGetUniformuiv\0"
    "\0"
-   /* _mesa_function_pool[11762]: Color3ui (offset 21) */
+   /* _mesa_function_pool[11735]: Color3ui (offset 21) */
    "iii\0"
    "glColor3ui\0"
    "\0"
-   /* _mesa_function_pool[11778]: EvalMapsNV (dynamic) */
+   /* _mesa_function_pool[11751]: EvalMapsNV (dynamic) */
    "ii\0"
    "glEvalMapsNV\0"
    "\0"
-   /* _mesa_function_pool[11795]: TexSubImage2D (offset 333) */
+   /* _mesa_function_pool[11768]: TexSubImage2D (offset 333) */
    "iiiiiiiip\0"
    "glTexSubImage2D\0"
    "glTexSubImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[11841]: FragmentLightivSGIX (dynamic) */
+   /* _mesa_function_pool[11814]: FragmentLightivSGIX (dynamic) */
    "iip\0"
    "glFragmentLightivSGIX\0"
    "\0"
-   /* _mesa_function_pool[11868]: GetTexParameterPointervAPPLE (will be remapped) */
+   /* _mesa_function_pool[11841]: GetTexParameterPointervAPPLE (will be remapped) */
    "iip\0"
    "glGetTexParameterPointervAPPLE\0"
    "\0"
-   /* _mesa_function_pool[11904]: TexGenfv (offset 191) */
+   /* _mesa_function_pool[11877]: TexGenfv (offset 191) */
    "iip\0"
    "glTexGenfv\0"
    "\0"
-   /* _mesa_function_pool[11920]: PixelTransformParameterfvEXT (dynamic) */
+   /* _mesa_function_pool[11893]: PixelTransformParameterfvEXT (dynamic) */
    "iip\0"
    "glPixelTransformParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[11956]: VertexAttrib4bvARB (will be remapped) */
+   /* _mesa_function_pool[11929]: VertexAttrib4bvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4bv\0"
    "glVertexAttrib4bvARB\0"
    "\0"
-   /* _mesa_function_pool[11999]: ShaderBinary (will be remapped) */
+   /* _mesa_function_pool[11972]: ShaderBinary (will be remapped) */
    "ipipi\0"
    "glShaderBinary\0"
    "\0"
-   /* _mesa_function_pool[12021]: TexCoordP2uiv (will be remapped) */
+   /* _mesa_function_pool[11994]: TexCoordP2uiv (will be remapped) */
    "ip\0"
    "glTexCoordP2uiv\0"
    "\0"
-   /* _mesa_function_pool[12041]: MultiTexCoord4sARB (offset 406) */
+   /* _mesa_function_pool[12014]: MultiTexCoord4sARB (offset 406) */
    "iiiii\0"
    "glMultiTexCoord4s\0"
    "glMultiTexCoord4sARB\0"
    "\0"
-   /* _mesa_function_pool[12087]: GetFragmentMaterialivSGIX (dynamic) */
+   /* _mesa_function_pool[12060]: GetFragmentMaterialivSGIX (dynamic) */
    "iip\0"
    "glGetFragmentMaterialivSGIX\0"
    "\0"
-   /* _mesa_function_pool[12120]: WindowPos4dMESA (will be remapped) */
+   /* _mesa_function_pool[12093]: WindowPos4dMESA (will be remapped) */
    "dddd\0"
    "glWindowPos4dMESA\0"
    "\0"
-   /* _mesa_function_pool[12144]: WeightPointerARB (dynamic) */
+   /* _mesa_function_pool[12117]: WeightPointerARB (dynamic) */
    "iiip\0"
    "glWeightPointerARB\0"
    "\0"
-   /* _mesa_function_pool[12169]: WindowPos2dMESA (will be remapped) */
+   /* _mesa_function_pool[12142]: WindowPos2dMESA (will be remapped) */
    "dd\0"
    "glWindowPos2d\0"
    "glWindowPos2dARB\0"
    "glWindowPos2dMESA\0"
    "\0"
-   /* _mesa_function_pool[12222]: FramebufferTexture3DEXT (will be remapped) */
+   /* _mesa_function_pool[12195]: FramebufferTexture3DEXT (will be remapped) */
    "iiiiii\0"
    "glFramebufferTexture3D\0"
    "glFramebufferTexture3DEXT\0"
    "\0"
-   /* _mesa_function_pool[12279]: BlendEquation (offset 337) */
+   /* _mesa_function_pool[12252]: BlendEquation (offset 337) */
    "i\0"
    "glBlendEquation\0"
    "glBlendEquationEXT\0"
    "\0"
-   /* _mesa_function_pool[12317]: VertexAttrib3dNV (will be remapped) */
+   /* _mesa_function_pool[12290]: VertexAttrib3dNV (will be remapped) */
    "iddd\0"
    "glVertexAttrib3dNV\0"
    "\0"
-   /* _mesa_function_pool[12342]: VertexAttrib3dARB (will be remapped) */
+   /* _mesa_function_pool[12315]: VertexAttrib3dARB (will be remapped) */
    "iddd\0"
    "glVertexAttrib3d\0"
    "glVertexAttrib3dARB\0"
    "\0"
-   /* _mesa_function_pool[12385]: VertexAttribI4usvEXT (will be remapped) */
+   /* _mesa_function_pool[12358]: VertexAttribI4usvEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4usvEXT\0"
    "glVertexAttribI4usv\0"
    "\0"
-   /* _mesa_function_pool[12432]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[12405]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
    "ppppp\0"
    "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[12496]: VertexAttrib4fARB (will be remapped) */
+   /* _mesa_function_pool[12469]: VertexAttrib4fARB (will be remapped) */
    "iffff\0"
    "glVertexAttrib4f\0"
    "glVertexAttrib4fARB\0"
    "\0"
-   /* _mesa_function_pool[12540]: GetError (offset 261) */
+   /* _mesa_function_pool[12513]: GetError (offset 261) */
    "\0"
    "glGetError\0"
    "\0"
-   /* _mesa_function_pool[12553]: IndexFuncEXT (dynamic) */
+   /* _mesa_function_pool[12526]: IndexFuncEXT (dynamic) */
    "if\0"
    "glIndexFuncEXT\0"
    "\0"
-   /* _mesa_function_pool[12572]: TexCoord3dv (offset 111) */
+   /* _mesa_function_pool[12545]: TexCoord3dv (offset 111) */
    "p\0"
    "glTexCoord3dv\0"
    "\0"
-   /* _mesa_function_pool[12589]: Indexdv (offset 45) */
+   /* _mesa_function_pool[12562]: Indexdv (offset 45) */
    "p\0"
    "glIndexdv\0"
    "\0"
-   /* _mesa_function_pool[12602]: FramebufferTexture2DEXT (will be remapped) */
+   /* _mesa_function_pool[12575]: FramebufferTexture2DEXT (will be remapped) */
    "iiiii\0"
    "glFramebufferTexture2D\0"
    "glFramebufferTexture2DEXT\0"
    "\0"
-   /* _mesa_function_pool[12658]: Normal3s (offset 60) */
+   /* _mesa_function_pool[12631]: Normal3s (offset 60) */
    "iii\0"
    "glNormal3s\0"
    "\0"
-   /* _mesa_function_pool[12674]: GetObjectParameterivAPPLE (will be remapped) */
+   /* _mesa_function_pool[12647]: GetObjectParameterivAPPLE (will be remapped) */
    "iiip\0"
    "glGetObjectParameterivAPPLE\0"
    "\0"
-   /* _mesa_function_pool[12708]: PushName (offset 201) */
+   /* _mesa_function_pool[12681]: PushName (offset 201) */
    "i\0"
    "glPushName\0"
    "\0"
-   /* _mesa_function_pool[12722]: MultiTexCoord2dvARB (offset 385) */
+   /* _mesa_function_pool[12695]: MultiTexCoord2dvARB (offset 385) */
    "ip\0"
    "glMultiTexCoord2dv\0"
    "glMultiTexCoord2dvARB\0"
    "\0"
-   /* _mesa_function_pool[12767]: CullParameterfvEXT (dynamic) */
+   /* _mesa_function_pool[12740]: CullParameterfvEXT (dynamic) */
    "ip\0"
    "glCullParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[12792]: Normal3i (offset 58) */
+   /* _mesa_function_pool[12765]: Normal3i (offset 58) */
    "iii\0"
    "glNormal3i\0"
    "\0"
-   /* _mesa_function_pool[12808]: ProgramNamedParameter4fvNV (will be remapped) */
+   /* _mesa_function_pool[12781]: ProgramNamedParameter4fvNV (will be remapped) */
    "iipp\0"
    "glProgramNamedParameter4fvNV\0"
    "\0"
-   /* _mesa_function_pool[12843]: SecondaryColorPointerEXT (will be remapped) */
+   /* _mesa_function_pool[12816]: SecondaryColorPointerEXT (will be remapped) */
    "iiip\0"
    "glSecondaryColorPointer\0"
    "glSecondaryColorPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[12900]: VertexAttrib4fvARB (will be remapped) */
+   /* _mesa_function_pool[12873]: VertexAttrib4fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4fv\0"
    "glVertexAttrib4fvARB\0"
    "\0"
-   /* _mesa_function_pool[12943]: PixelTexGenSGIX (will be remapped) */
+   /* _mesa_function_pool[12916]: PixelTexGenSGIX (will be remapped) */
    "i\0"
    "glPixelTexGenSGIX\0"
    "\0"
-   /* _mesa_function_pool[12964]: GetActiveUniformARB (will be remapped) */
+   /* _mesa_function_pool[12937]: GetActiveUniformARB (will be remapped) */
    "iiipppp\0"
    "glGetActiveUniform\0"
    "glGetActiveUniformARB\0"
    "\0"
-   /* _mesa_function_pool[13014]: VertexAttribP1uiv (will be remapped) */
+   /* _mesa_function_pool[12987]: VertexAttribP1uiv (will be remapped) */
    "iiip\0"
    "glVertexAttribP1uiv\0"
    "\0"
-   /* _mesa_function_pool[13040]: Normal3b (offset 52) */
+   /* _mesa_function_pool[13013]: Normal3b (offset 52) */
    "iii\0"
    "glNormal3b\0"
    "\0"
-   /* _mesa_function_pool[13056]: Normal3d (offset 54) */
+   /* _mesa_function_pool[13029]: Normal3d (offset 54) */
    "ddd\0"
    "glNormal3d\0"
    "\0"
-   /* _mesa_function_pool[13072]: Uniform1uiEXT (will be remapped) */
+   /* _mesa_function_pool[13045]: Uniform1uiEXT (will be remapped) */
    "ii\0"
    "glUniform1uiEXT\0"
    "glUniform1ui\0"
    "\0"
-   /* _mesa_function_pool[13105]: Normal3f (offset 56) */
+   /* _mesa_function_pool[13078]: Normal3f (offset 56) */
    "fff\0"
    "glNormal3f\0"
    "\0"
-   /* _mesa_function_pool[13121]: MultiTexCoord1svARB (offset 383) */
+   /* _mesa_function_pool[13094]: MultiTexCoord1svARB (offset 383) */
    "ip\0"
    "glMultiTexCoord1sv\0"
    "glMultiTexCoord1svARB\0"
    "\0"
-   /* _mesa_function_pool[13166]: Indexi (offset 48) */
+   /* _mesa_function_pool[13139]: Indexi (offset 48) */
    "i\0"
    "glIndexi\0"
    "\0"
-   /* _mesa_function_pool[13178]: EGLImageTargetTexture2DOES (will be remapped) */
+   /* _mesa_function_pool[13151]: EGLImageTargetTexture2DOES (will be remapped) */
    "ip\0"
    "glEGLImageTargetTexture2DOES\0"
    "\0"
-   /* _mesa_function_pool[13211]: EndQueryARB (will be remapped) */
+   /* _mesa_function_pool[13184]: EndQueryARB (will be remapped) */
    "i\0"
    "glEndQuery\0"
    "glEndQueryARB\0"
    "\0"
-   /* _mesa_function_pool[13239]: DeleteFencesNV (will be remapped) */
+   /* _mesa_function_pool[13212]: DeleteFencesNV (will be remapped) */
    "ip\0"
    "glDeleteFencesNV\0"
    "\0"
-   /* _mesa_function_pool[13260]: ColorPointerListIBM (dynamic) */
+   /* _mesa_function_pool[13233]: ColorPointerListIBM (dynamic) */
    "iiipi\0"
    "glColorPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[13289]: BindBufferRangeEXT (will be remapped) */
+   /* _mesa_function_pool[13262]: BindBufferRangeEXT (will be remapped) */
    "iiiii\0"
    "glBindBufferRange\0"
    "glBindBufferRangeEXT\0"
    "\0"
-   /* _mesa_function_pool[13335]: DepthMask (offset 211) */
+   /* _mesa_function_pool[13308]: DepthMask (offset 211) */
    "i\0"
    "glDepthMask\0"
    "\0"
-   /* _mesa_function_pool[13350]: IsShader (will be remapped) */
+   /* _mesa_function_pool[13323]: IsShader (will be remapped) */
    "i\0"
    "glIsShader\0"
    "\0"
-   /* _mesa_function_pool[13364]: Indexf (offset 46) */
+   /* _mesa_function_pool[13337]: Indexf (offset 46) */
    "f\0"
    "glIndexf\0"
    "\0"
-   /* _mesa_function_pool[13376]: GetImageTransformParameterivHP (dynamic) */
+   /* _mesa_function_pool[13349]: GetImageTransformParameterivHP (dynamic) */
    "iip\0"
    "glGetImageTransformParameterivHP\0"
    "\0"
-   /* _mesa_function_pool[13414]: Indexd (offset 44) */
+   /* _mesa_function_pool[13387]: Indexd (offset 44) */
    "d\0"
    "glIndexd\0"
    "\0"
-   /* _mesa_function_pool[13426]: GetMaterialiv (offset 270) */
+   /* _mesa_function_pool[13399]: GetMaterialiv (offset 270) */
    "iip\0"
    "glGetMaterialiv\0"
    "\0"
-   /* _mesa_function_pool[13447]: StencilOp (offset 244) */
+   /* _mesa_function_pool[13420]: StencilOp (offset 244) */
    "iii\0"
    "glStencilOp\0"
    "\0"
-   /* _mesa_function_pool[13464]: WindowPos4ivMESA (will be remapped) */
+   /* _mesa_function_pool[13437]: WindowPos4ivMESA (will be remapped) */
    "p\0"
    "glWindowPos4ivMESA\0"
    "\0"
-   /* _mesa_function_pool[13486]: MultiTexCoord3svARB (offset 399) */
+   /* _mesa_function_pool[13459]: MultiTexCoord3svARB (offset 399) */
    "ip\0"
    "glMultiTexCoord3sv\0"
    "glMultiTexCoord3svARB\0"
    "\0"
-   /* _mesa_function_pool[13531]: TexEnvfv (offset 185) */
+   /* _mesa_function_pool[13504]: TexEnvfv (offset 185) */
    "iip\0"
    "glTexEnvfv\0"
    "\0"
-   /* _mesa_function_pool[13547]: MultiTexCoord4iARB (offset 404) */
+   /* _mesa_function_pool[13520]: MultiTexCoord4iARB (offset 404) */
    "iiiii\0"
    "glMultiTexCoord4i\0"
    "glMultiTexCoord4iARB\0"
    "\0"
-   /* _mesa_function_pool[13593]: Indexs (offset 50) */
+   /* _mesa_function_pool[13566]: Indexs (offset 50) */
    "i\0"
    "glIndexs\0"
    "\0"
-   /* _mesa_function_pool[13605]: TexCoordP3ui (will be remapped) */
+   /* _mesa_function_pool[13578]: TexCoordP3ui (will be remapped) */
    "ii\0"
    "glTexCoordP3ui\0"
    "\0"
-   /* _mesa_function_pool[13624]: ResizeBuffersMESA (will be remapped) */
+   /* _mesa_function_pool[13597]: ResizeBuffersMESA (will be remapped) */
    "\0"
    "glResizeBuffersMESA\0"
    "\0"
-   /* _mesa_function_pool[13646]: MultiTexCoordP1uiv (will be remapped) */
+   /* _mesa_function_pool[13619]: MultiTexCoordP1uiv (will be remapped) */
    "iip\0"
    "glMultiTexCoordP1uiv\0"
    "\0"
-   /* _mesa_function_pool[13672]: BlendFuncSeparateiARB (will be remapped) */
+   /* _mesa_function_pool[13645]: BlendFuncSeparateiARB (will be remapped) */
    "iiiii\0"
    "glBlendFuncSeparateiARB\0"
    "glBlendFuncSeparateIndexedAMD\0"
    "\0"
-   /* _mesa_function_pool[13733]: GetUniformivARB (will be remapped) */
+   /* _mesa_function_pool[13706]: GetUniformivARB (will be remapped) */
    "iip\0"
    "glGetUniformiv\0"
    "glGetUniformivARB\0"
    "\0"
-   /* _mesa_function_pool[13771]: PixelTexGenParameteriSGIS (will be remapped) */
+   /* _mesa_function_pool[13744]: PixelTexGenParameteriSGIS (will be remapped) */
    "ii\0"
    "glPixelTexGenParameteriSGIS\0"
    "\0"
-   /* _mesa_function_pool[13803]: VertexPointervINTEL (dynamic) */
+   /* _mesa_function_pool[13776]: VertexPointervINTEL (dynamic) */
    "iip\0"
    "glVertexPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[13830]: Vertex2i (offset 130) */
+   /* _mesa_function_pool[13803]: Vertex2i (offset 130) */
    "ii\0"
    "glVertex2i\0"
    "\0"
-   /* _mesa_function_pool[13845]: LoadMatrixf (offset 291) */
+   /* _mesa_function_pool[13818]: LoadMatrixf (offset 291) */
    "p\0"
    "glLoadMatrixf\0"
    "\0"
-   /* _mesa_function_pool[13862]: VertexAttribI1uivEXT (will be remapped) */
+   /* _mesa_function_pool[13835]: VertexAttribI1uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI1uivEXT\0"
    "glVertexAttribI1uiv\0"
    "\0"
-   /* _mesa_function_pool[13909]: Vertex2f (offset 128) */
+   /* _mesa_function_pool[13882]: Vertex2f (offset 128) */
    "ff\0"
    "glVertex2f\0"
    "\0"
-   /* _mesa_function_pool[13924]: ReplacementCodeuiColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[13897]: ReplacementCodeuiColor4fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glReplacementCodeuiColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[13977]: Color4bv (offset 26) */
+   /* _mesa_function_pool[13950]: Color4bv (offset 26) */
    "p\0"
    "glColor4bv\0"
    "\0"
-   /* _mesa_function_pool[13991]: VertexPointer (offset 321) */
+   /* _mesa_function_pool[13964]: VertexPointer (offset 321) */
    "iiip\0"
    "glVertexPointer\0"
    "\0"
-   /* _mesa_function_pool[14013]: SecondaryColor3uiEXT (will be remapped) */
+   /* _mesa_function_pool[13986]: SecondaryColor3uiEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3ui\0"
    "glSecondaryColor3uiEXT\0"
    "\0"
-   /* _mesa_function_pool[14061]: StartInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[14034]: StartInstrumentsSGIX (dynamic) */
    "\0"
    "glStartInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[14086]: SecondaryColor3usvEXT (will be remapped) */
+   /* _mesa_function_pool[14059]: SecondaryColor3usvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3usv\0"
    "glSecondaryColor3usvEXT\0"
    "\0"
-   /* _mesa_function_pool[14134]: VertexAttrib2fvNV (will be remapped) */
+   /* _mesa_function_pool[14107]: VertexAttrib2fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2fvNV\0"
    "\0"
-   /* _mesa_function_pool[14158]: ProgramLocalParameter4dvARB (will be remapped) */
+   /* _mesa_function_pool[14131]: ProgramLocalParameter4dvARB (will be remapped) */
    "iip\0"
    "glProgramLocalParameter4dvARB\0"
    "\0"
-   /* _mesa_function_pool[14193]: DeleteLists (offset 4) */
+   /* _mesa_function_pool[14166]: DeleteLists (offset 4) */
    "ii\0"
    "glDeleteLists\0"
    "\0"
-   /* _mesa_function_pool[14211]: LogicOp (offset 242) */
+   /* _mesa_function_pool[14184]: LogicOp (offset 242) */
    "i\0"
    "glLogicOp\0"
    "\0"
-   /* _mesa_function_pool[14224]: MatrixIndexuivARB (dynamic) */
+   /* _mesa_function_pool[14197]: MatrixIndexuivARB (dynamic) */
    "ip\0"
    "glMatrixIndexuivARB\0"
    "\0"
-   /* _mesa_function_pool[14248]: Vertex2s (offset 132) */
+   /* _mesa_function_pool[14221]: Vertex2s (offset 132) */
    "ii\0"
    "glVertex2s\0"
    "\0"
-   /* _mesa_function_pool[14263]: RenderbufferStorageMultisample (will be remapped) */
+   /* _mesa_function_pool[14236]: RenderbufferStorageMultisample (will be remapped) */
    "iiiii\0"
    "glRenderbufferStorageMultisample\0"
    "glRenderbufferStorageMultisampleEXT\0"
    "\0"
-   /* _mesa_function_pool[14339]: TexCoord4fv (offset 121) */
+   /* _mesa_function_pool[14312]: TexCoord4fv (offset 121) */
    "p\0"
    "glTexCoord4fv\0"
    "\0"
-   /* _mesa_function_pool[14356]: Tangent3sEXT (dynamic) */
+   /* _mesa_function_pool[14329]: Tangent3sEXT (dynamic) */
    "iii\0"
    "glTangent3sEXT\0"
    "\0"
-   /* _mesa_function_pool[14376]: GlobalAlphaFactorfSUN (dynamic) */
+   /* _mesa_function_pool[14349]: GlobalAlphaFactorfSUN (dynamic) */
    "f\0"
    "glGlobalAlphaFactorfSUN\0"
    "\0"
-   /* _mesa_function_pool[14403]: MultiTexCoord3iARB (offset 396) */
+   /* _mesa_function_pool[14376]: MultiTexCoord3iARB (offset 396) */
    "iiii\0"
    "glMultiTexCoord3i\0"
    "glMultiTexCoord3iARB\0"
    "\0"
-   /* _mesa_function_pool[14448]: IsProgram (will be remapped) */
+   /* _mesa_function_pool[14421]: IsProgram (will be remapped) */
    "i\0"
    "glIsProgram\0"
    "\0"
-   /* _mesa_function_pool[14463]: TexCoordPointerListIBM (dynamic) */
+   /* _mesa_function_pool[14436]: TexCoordPointerListIBM (dynamic) */
    "iiipi\0"
    "glTexCoordPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[14495]: VertexAttribI4svEXT (will be remapped) */
+   /* _mesa_function_pool[14468]: VertexAttribI4svEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4svEXT\0"
    "glVertexAttribI4sv\0"
    "\0"
-   /* _mesa_function_pool[14540]: GlobalAlphaFactorusSUN (dynamic) */
+   /* _mesa_function_pool[14513]: GlobalAlphaFactorusSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorusSUN\0"
    "\0"
-   /* _mesa_function_pool[14568]: ColorP4uiv (will be remapped) */
+   /* _mesa_function_pool[14541]: ColorP4uiv (will be remapped) */
    "ip\0"
    "glColorP4uiv\0"
    "\0"
-   /* _mesa_function_pool[14585]: FramebufferRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[14558]: FramebufferRenderbufferEXT (will be remapped) */
    "iiii\0"
    "glFramebufferRenderbuffer\0"
    "glFramebufferRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[14646]: ClearBufferuiv (will be remapped) */
+   /* _mesa_function_pool[14619]: ClearBufferuiv (will be remapped) */
    "iip\0"
    "glClearBufferuiv\0"
    "\0"
-   /* _mesa_function_pool[14668]: VertexAttrib1dvNV (will be remapped) */
+   /* _mesa_function_pool[14641]: VertexAttrib1dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1dvNV\0"
    "\0"
-   /* _mesa_function_pool[14692]: GenTextures (offset 328) */
+   /* _mesa_function_pool[14665]: GenTextures (offset 328) */
    "ip\0"
    "glGenTextures\0"
    "glGenTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[14727]: FramebufferTextureARB (will be remapped) */
+   /* _mesa_function_pool[14700]: FramebufferTextureARB (will be remapped) */
    "iiii\0"
    "glFramebufferTextureARB\0"
    "\0"
-   /* _mesa_function_pool[14757]: MultiTexCoordP4uiv (will be remapped) */
+   /* _mesa_function_pool[14730]: MultiTexCoordP4uiv (will be remapped) */
    "iip\0"
    "glMultiTexCoordP4uiv\0"
    "\0"
-   /* _mesa_function_pool[14783]: FramebufferTexture1DEXT (will be remapped) */
+   /* _mesa_function_pool[14756]: FramebufferTexture1DEXT (will be remapped) */
    "iiiii\0"
    "glFramebufferTexture1D\0"
    "glFramebufferTexture1DEXT\0"
    "\0"
-   /* _mesa_function_pool[14839]: GetCombinerOutputParameterivNV (will be remapped) */
+   /* _mesa_function_pool[14812]: GetCombinerOutputParameterivNV (will be remapped) */
    "iiip\0"
    "glGetCombinerOutputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[14878]: MultiModeDrawArraysIBM (will be remapped) */
+   /* _mesa_function_pool[14851]: MultiModeDrawArraysIBM (will be remapped) */
    "pppii\0"
    "glMultiModeDrawArraysIBM\0"
    "\0"
-   /* _mesa_function_pool[14910]: PixelTexGenParameterivSGIS (will be remapped) */
+   /* _mesa_function_pool[14883]: PixelTexGenParameterivSGIS (will be remapped) */
    "ip\0"
    "glPixelTexGenParameterivSGIS\0"
    "\0"
-   /* _mesa_function_pool[14943]: TextureNormalEXT (dynamic) */
+   /* _mesa_function_pool[14916]: TextureNormalEXT (dynamic) */
    "i\0"
    "glTextureNormalEXT\0"
    "\0"
-   /* _mesa_function_pool[14965]: IndexPointerListIBM (dynamic) */
+   /* _mesa_function_pool[14938]: IndexPointerListIBM (dynamic) */
    "iipi\0"
    "glIndexPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[14993]: WeightfvARB (dynamic) */
+   /* _mesa_function_pool[14966]: WeightfvARB (dynamic) */
    "ip\0"
    "glWeightfvARB\0"
    "\0"
-   /* _mesa_function_pool[15011]: MultiTexCoordP3ui (will be remapped) */
+   /* _mesa_function_pool[14984]: MultiTexCoordP3ui (will be remapped) */
    "iii\0"
    "glMultiTexCoordP3ui\0"
    "\0"
-   /* _mesa_function_pool[15036]: RasterPos2sv (offset 69) */
+   /* _mesa_function_pool[15009]: RasterPos2sv (offset 69) */
    "p\0"
    "glRasterPos2sv\0"
    "\0"
-   /* _mesa_function_pool[15054]: Color4ubv (offset 36) */
+   /* _mesa_function_pool[15027]: Color4ubv (offset 36) */
    "p\0"
    "glColor4ubv\0"
    "\0"
-   /* _mesa_function_pool[15069]: DrawBuffer (offset 202) */
+   /* _mesa_function_pool[15042]: DrawBuffer (offset 202) */
    "i\0"
    "glDrawBuffer\0"
    "\0"
-   /* _mesa_function_pool[15085]: TexCoord2fv (offset 105) */
+   /* _mesa_function_pool[15058]: TexCoord2fv (offset 105) */
    "p\0"
    "glTexCoord2fv\0"
    "\0"
-   /* _mesa_function_pool[15102]: BeginFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[15075]: BeginFragmentShaderATI (will be remapped) */
    "\0"
    "glBeginFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[15129]: WindowPos4fMESA (will be remapped) */
+   /* _mesa_function_pool[15102]: WindowPos4fMESA (will be remapped) */
    "ffff\0"
    "glWindowPos4fMESA\0"
    "\0"
-   /* _mesa_function_pool[15153]: TexCoord1sv (offset 101) */
+   /* _mesa_function_pool[15126]: TexCoord1sv (offset 101) */
    "p\0"
    "glTexCoord1sv\0"
    "\0"
-   /* _mesa_function_pool[15170]: WindowPos3dvMESA (will be remapped) */
+   /* _mesa_function_pool[15143]: WindowPos3dvMESA (will be remapped) */
    "p\0"
    "glWindowPos3dv\0"
    "glWindowPos3dvARB\0"
    "glWindowPos3dvMESA\0"
    "\0"
-   /* _mesa_function_pool[15225]: VertexAttribP4ui (will be remapped) */
+   /* _mesa_function_pool[15198]: VertexAttribP4ui (will be remapped) */
    "iiii\0"
    "glVertexAttribP4ui\0"
    "\0"
-   /* _mesa_function_pool[15250]: DepthFunc (offset 245) */
+   /* _mesa_function_pool[15223]: DepthFunc (offset 245) */
    "i\0"
    "glDepthFunc\0"
    "\0"
-   /* _mesa_function_pool[15265]: PixelMapusv (offset 253) */
+   /* _mesa_function_pool[15238]: PixelMapusv (offset 253) */
    "iip\0"
    "glPixelMapusv\0"
    "\0"
-   /* _mesa_function_pool[15284]: GetQueryObjecti64vEXT (will be remapped) */
+   /* _mesa_function_pool[15257]: GetQueryObjecti64vEXT (will be remapped) */
    "iip\0"
    "glGetQueryObjecti64vEXT\0"
    "\0"
-   /* _mesa_function_pool[15313]: MultiTexCoord1dARB (offset 376) */
+   /* _mesa_function_pool[15286]: MultiTexCoord1dARB (offset 376) */
    "id\0"
    "glMultiTexCoord1d\0"
    "glMultiTexCoord1dARB\0"
    "\0"
-   /* _mesa_function_pool[15356]: PointParameterivNV (will be remapped) */
+   /* _mesa_function_pool[15329]: PointParameterivNV (will be remapped) */
    "ip\0"
    "glPointParameteriv\0"
    "glPointParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[15400]: IsSampler (will be remapped) */
+   /* _mesa_function_pool[15373]: IsSampler (will be remapped) */
    "i\0"
    "glIsSampler\0"
    "\0"
-   /* _mesa_function_pool[15415]: BlendFunc (offset 241) */
+   /* _mesa_function_pool[15388]: BlendFunc (offset 241) */
    "ii\0"
    "glBlendFunc\0"
    "\0"
-   /* _mesa_function_pool[15431]: ColorP3ui (will be remapped) */
+   /* _mesa_function_pool[15404]: ColorP3ui (will be remapped) */
    "ii\0"
    "glColorP3ui\0"
    "\0"
-   /* _mesa_function_pool[15447]: Uniform2fvARB (will be remapped) */
+   /* _mesa_function_pool[15420]: Uniform2fvARB (will be remapped) */
    "iip\0"
    "glUniform2fv\0"
    "glUniform2fvARB\0"
    "\0"
-   /* _mesa_function_pool[15481]: BufferParameteriAPPLE (will be remapped) */
+   /* _mesa_function_pool[15454]: BufferParameteriAPPLE (will be remapped) */
    "iii\0"
    "glBufferParameteriAPPLE\0"
    "\0"
-   /* _mesa_function_pool[15510]: MultiTexCoord3dvARB (offset 393) */
+   /* _mesa_function_pool[15483]: MultiTexCoord3dvARB (offset 393) */
    "ip\0"
    "glMultiTexCoord3dv\0"
    "glMultiTexCoord3dvARB\0"
    "\0"
-   /* _mesa_function_pool[15555]: ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[15528]: ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[15611]: DeleteObjectARB (will be remapped) */
+   /* _mesa_function_pool[15584]: DeleteObjectARB (will be remapped) */
    "i\0"
    "glDeleteObjectARB\0"
    "\0"
-   /* _mesa_function_pool[15632]: GetShaderPrecisionFormat (will be remapped) */
+   /* _mesa_function_pool[15605]: GetShaderPrecisionFormat (will be remapped) */
    "iipp\0"
    "glGetShaderPrecisionFormat\0"
    "\0"
-   /* _mesa_function_pool[15665]: MatrixIndexPointerARB (dynamic) */
+   /* _mesa_function_pool[15638]: MatrixIndexPointerARB (dynamic) */
    "iiip\0"
    "glMatrixIndexPointerARB\0"
    "\0"
-   /* _mesa_function_pool[15695]: ProgramNamedParameter4dvNV (will be remapped) */
+   /* _mesa_function_pool[15668]: ProgramNamedParameter4dvNV (will be remapped) */
    "iipp\0"
    "glProgramNamedParameter4dvNV\0"
    "\0"
-   /* _mesa_function_pool[15730]: Tangent3fvEXT (dynamic) */
+   /* _mesa_function_pool[15703]: Tangent3fvEXT (dynamic) */
    "p\0"
    "glTangent3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[15749]: Flush (offset 217) */
+   /* _mesa_function_pool[15722]: Flush (offset 217) */
    "\0"
    "glFlush\0"
    "\0"
-   /* _mesa_function_pool[15759]: Color4uiv (offset 38) */
+   /* _mesa_function_pool[15732]: Color4uiv (offset 38) */
    "p\0"
    "glColor4uiv\0"
    "\0"
-   /* _mesa_function_pool[15774]: VertexAttribI4iEXT (will be remapped) */
+   /* _mesa_function_pool[15747]: VertexAttribI4iEXT (will be remapped) */
    "iiiii\0"
    "glVertexAttribI4iEXT\0"
    "glVertexAttribI4i\0"
    "\0"
-   /* _mesa_function_pool[15820]: GenVertexArrays (will be remapped) */
+   /* _mesa_function_pool[15793]: GenVertexArrays (will be remapped) */
    "ip\0"
    "glGenVertexArrays\0"
    "\0"
-   /* _mesa_function_pool[15842]: Uniform3uivEXT (will be remapped) */
+   /* _mesa_function_pool[15815]: Uniform3uivEXT (will be remapped) */
    "iip\0"
    "glUniform3uivEXT\0"
    "glUniform3uiv\0"
    "\0"
-   /* _mesa_function_pool[15878]: RasterPos3sv (offset 77) */
+   /* _mesa_function_pool[15851]: RasterPos3sv (offset 77) */
    "p\0"
    "glRasterPos3sv\0"
    "\0"
-   /* _mesa_function_pool[15896]: TexCoordP2ui (will be remapped) */
+   /* _mesa_function_pool[15869]: TexCoordP2ui (will be remapped) */
    "ii\0"
    "glTexCoordP2ui\0"
    "\0"
-   /* _mesa_function_pool[15915]: BindFramebufferEXT (will be remapped) */
+   /* _mesa_function_pool[15888]: BindFramebufferEXT (will be remapped) */
    "ii\0"
    "glBindFramebuffer\0"
    "glBindFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[15958]: ReferencePlaneSGIX (dynamic) */
+   /* _mesa_function_pool[15931]: ReferencePlaneSGIX (dynamic) */
    "p\0"
    "glReferencePlaneSGIX\0"
    "\0"
-   /* _mesa_function_pool[15982]: PushAttrib (offset 219) */
+   /* _mesa_function_pool[15955]: PushAttrib (offset 219) */
    "i\0"
    "glPushAttrib\0"
    "\0"
-   /* _mesa_function_pool[15998]: RasterPos2i (offset 66) */
+   /* _mesa_function_pool[15971]: RasterPos2i (offset 66) */
    "ii\0"
    "glRasterPos2i\0"
    "\0"
-   /* _mesa_function_pool[16016]: ValidateProgramARB (will be remapped) */
+   /* _mesa_function_pool[15989]: ValidateProgramARB (will be remapped) */
    "i\0"
    "glValidateProgram\0"
    "glValidateProgramARB\0"
    "\0"
-   /* _mesa_function_pool[16058]: TexParameteriv (offset 181) */
+   /* _mesa_function_pool[16031]: TexParameteriv (offset 181) */
    "iip\0"
    "glTexParameteriv\0"
    "\0"
-   /* _mesa_function_pool[16080]: UnlockArraysEXT (will be remapped) */
+   /* _mesa_function_pool[16053]: UnlockArraysEXT (will be remapped) */
    "\0"
    "glUnlockArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[16100]: TexCoord2fColor3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[16073]: TexCoord2fColor3fVertex3fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord2fColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[16141]: WindowPos3fvMESA (will be remapped) */
+   /* _mesa_function_pool[16114]: WindowPos3fvMESA (will be remapped) */
    "p\0"
    "glWindowPos3fv\0"
    "glWindowPos3fvARB\0"
    "glWindowPos3fvMESA\0"
    "\0"
-   /* _mesa_function_pool[16196]: RasterPos2f (offset 64) */
+   /* _mesa_function_pool[16169]: RasterPos2f (offset 64) */
    "ff\0"
    "glRasterPos2f\0"
    "\0"
-   /* _mesa_function_pool[16214]: VertexAttrib1svNV (will be remapped) */
+   /* _mesa_function_pool[16187]: VertexAttrib1svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1svNV\0"
    "\0"
-   /* _mesa_function_pool[16238]: RasterPos2d (offset 62) */
+   /* _mesa_function_pool[16211]: RasterPos2d (offset 62) */
    "dd\0"
    "glRasterPos2d\0"
    "\0"
-   /* _mesa_function_pool[16256]: RasterPos3fv (offset 73) */
+   /* _mesa_function_pool[16229]: RasterPos3fv (offset 73) */
    "p\0"
    "glRasterPos3fv\0"
    "\0"
-   /* _mesa_function_pool[16274]: CopyTexSubImage3D (offset 373) */
+   /* _mesa_function_pool[16247]: CopyTexSubImage3D (offset 373) */
    "iiiiiiiii\0"
    "glCopyTexSubImage3D\0"
    "glCopyTexSubImage3DEXT\0"
    "\0"
-   /* _mesa_function_pool[16328]: VertexAttrib2dARB (will be remapped) */
+   /* _mesa_function_pool[16301]: VertexAttrib2dARB (will be remapped) */
    "idd\0"
    "glVertexAttrib2d\0"
    "glVertexAttrib2dARB\0"
    "\0"
-   /* _mesa_function_pool[16370]: Color4ub (offset 35) */
+   /* _mesa_function_pool[16343]: Color4ub (offset 35) */
    "iiii\0"
    "glColor4ub\0"
    "\0"
-   /* _mesa_function_pool[16387]: GetInteger64v (will be remapped) */
+   /* _mesa_function_pool[16360]: GetInteger64v (will be remapped) */
    "ip\0"
    "glGetInteger64v\0"
    "\0"
-   /* _mesa_function_pool[16407]: TextureColorMaskSGIS (dynamic) */
+   /* _mesa_function_pool[16380]: TextureColorMaskSGIS (dynamic) */
    "iiii\0"
    "glTextureColorMaskSGIS\0"
    "\0"
-   /* _mesa_function_pool[16436]: RasterPos2s (offset 68) */
+   /* _mesa_function_pool[16409]: RasterPos2s (offset 68) */
    "ii\0"
    "glRasterPos2s\0"
    "\0"
-   /* _mesa_function_pool[16454]: GetColorTable (offset 343) */
+   /* _mesa_function_pool[16427]: GetColorTable (offset 343) */
    "iiip\0"
    "glGetColorTable\0"
    "glGetColorTableSGI\0"
    "glGetColorTableEXT\0"
    "\0"
-   /* _mesa_function_pool[16514]: SelectBuffer (offset 195) */
+   /* _mesa_function_pool[16487]: SelectBuffer (offset 195) */
    "ip\0"
    "glSelectBuffer\0"
    "\0"
-   /* _mesa_function_pool[16533]: Indexiv (offset 49) */
+   /* _mesa_function_pool[16506]: Indexiv (offset 49) */
    "p\0"
    "glIndexiv\0"
    "\0"
-   /* _mesa_function_pool[16546]: TexCoord3i (offset 114) */
+   /* _mesa_function_pool[16519]: TexCoord3i (offset 114) */
    "iii\0"
    "glTexCoord3i\0"
    "\0"
-   /* _mesa_function_pool[16564]: CopyColorTable (offset 342) */
+   /* _mesa_function_pool[16537]: CopyColorTable (offset 342) */
    "iiiii\0"
    "glCopyColorTable\0"
    "glCopyColorTableSGI\0"
    "\0"
-   /* _mesa_function_pool[16608]: GetHistogramParameterfv (offset 362) */
+   /* _mesa_function_pool[16581]: GetHistogramParameterfv (offset 362) */
    "iip\0"
    "glGetHistogramParameterfv\0"
    "glGetHistogramParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[16668]: Frustum (offset 289) */
+   /* _mesa_function_pool[16641]: Frustum (offset 289) */
    "dddddd\0"
    "glFrustum\0"
    "\0"
-   /* _mesa_function_pool[16686]: GetString (offset 275) */
+   /* _mesa_function_pool[16659]: GetString (offset 275) */
    "i\0"
    "glGetString\0"
    "\0"
-   /* _mesa_function_pool[16701]: ColorPointervINTEL (dynamic) */
+   /* _mesa_function_pool[16674]: ColorPointervINTEL (dynamic) */
    "iip\0"
    "glColorPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[16727]: TexEnvf (offset 184) */
+   /* _mesa_function_pool[16700]: TexEnvf (offset 184) */
    "iif\0"
    "glTexEnvf\0"
    "\0"
-   /* _mesa_function_pool[16742]: VertexP2uiv (will be remapped) */
+   /* _mesa_function_pool[16715]: VertexP2uiv (will be remapped) */
    "ip\0"
    "glVertexP2uiv\0"
    "\0"
-   /* _mesa_function_pool[16760]: TexCoord3d (offset 110) */
+   /* _mesa_function_pool[16733]: TexCoord3d (offset 110) */
    "ddd\0"
    "glTexCoord3d\0"
    "\0"
-   /* _mesa_function_pool[16778]: AlphaFragmentOp1ATI (will be remapped) */
+   /* _mesa_function_pool[16751]: AlphaFragmentOp1ATI (will be remapped) */
    "iiiiii\0"
    "glAlphaFragmentOp1ATI\0"
    "\0"
-   /* _mesa_function_pool[16808]: TexCoord3f (offset 112) */
+   /* _mesa_function_pool[16781]: TexCoord3f (offset 112) */
    "fff\0"
    "glTexCoord3f\0"
    "\0"
-   /* _mesa_function_pool[16826]: MultiTexCoord3ivARB (offset 397) */
+   /* _mesa_function_pool[16799]: MultiTexCoord3ivARB (offset 397) */
    "ip\0"
    "glMultiTexCoord3iv\0"
    "glMultiTexCoord3ivARB\0"
    "\0"
-   /* _mesa_function_pool[16871]: MultiTexCoord2sARB (offset 390) */
+   /* _mesa_function_pool[16844]: MultiTexCoord2sARB (offset 390) */
    "iii\0"
    "glMultiTexCoord2s\0"
    "glMultiTexCoord2sARB\0"
    "\0"
-   /* _mesa_function_pool[16915]: VertexAttrib1dvARB (will be remapped) */
+   /* _mesa_function_pool[16888]: VertexAttrib1dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib1dv\0"
    "glVertexAttrib1dvARB\0"
    "\0"
-   /* _mesa_function_pool[16958]: GetnHistogramARB (will be remapped) */
+   /* _mesa_function_pool[16931]: GetnHistogramARB (will be remapped) */
    "iiiiip\0"
    "glGetnHistogramARB\0"
    "\0"
-   /* _mesa_function_pool[16985]: DeleteTextures (offset 327) */
+   /* _mesa_function_pool[16958]: DeleteTextures (offset 327) */
    "ip\0"
    "glDeleteTextures\0"
    "glDeleteTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[17026]: TexCoordPointerEXT (will be remapped) */
+   /* _mesa_function_pool[16999]: TexCoordPointerEXT (will be remapped) */
    "iiiip\0"
    "glTexCoordPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[17054]: TexSubImage4DSGIS (dynamic) */
+   /* _mesa_function_pool[17027]: TexSubImage4DSGIS (dynamic) */
    "iiiiiiiiiiiip\0"
    "glTexSubImage4DSGIS\0"
    "\0"
-   /* _mesa_function_pool[17089]: TexCoord3s (offset 116) */
+   /* _mesa_function_pool[17062]: TexCoord3s (offset 116) */
    "iii\0"
    "glTexCoord3s\0"
    "\0"
-   /* _mesa_function_pool[17107]: GetTexLevelParameteriv (offset 285) */
+   /* _mesa_function_pool[17080]: GetTexLevelParameteriv (offset 285) */
    "iiip\0"
    "glGetTexLevelParameteriv\0"
    "\0"
-   /* _mesa_function_pool[17138]: CombinerStageParameterfvNV (dynamic) */
+   /* _mesa_function_pool[17111]: CombinerStageParameterfvNV (dynamic) */
    "iip\0"
    "glCombinerStageParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[17172]: VertexAttribP4uiv (will be remapped) */
+   /* _mesa_function_pool[17145]: VertexAttribP4uiv (will be remapped) */
    "iiip\0"
    "glVertexAttribP4uiv\0"
    "\0"
-   /* _mesa_function_pool[17198]: StopInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[17171]: StopInstrumentsSGIX (dynamic) */
    "i\0"
    "glStopInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[17223]: TexCoord4fColor4fNormal3fVertex4fSUN (dynamic) */
+   /* _mesa_function_pool[17196]: TexCoord4fColor4fNormal3fVertex4fSUN (dynamic) */
    "fffffffffffffff\0"
    "glTexCoord4fColor4fNormal3fVertex4fSUN\0"
    "\0"
-   /* _mesa_function_pool[17279]: ClearAccum (offset 204) */
+   /* _mesa_function_pool[17252]: ClearAccum (offset 204) */
    "ffff\0"
    "glClearAccum\0"
    "\0"
-   /* _mesa_function_pool[17298]: DeformSGIX (dynamic) */
+   /* _mesa_function_pool[17271]: DeformSGIX (dynamic) */
    "i\0"
    "glDeformSGIX\0"
    "\0"
-   /* _mesa_function_pool[17314]: GetVertexAttribfvARB (will be remapped) */
+   /* _mesa_function_pool[17287]: GetVertexAttribfvARB (will be remapped) */
    "iip\0"
    "glGetVertexAttribfv\0"
    "glGetVertexAttribfvARB\0"
    "\0"
-   /* _mesa_function_pool[17362]: SecondaryColor3ivEXT (will be remapped) */
+   /* _mesa_function_pool[17335]: SecondaryColor3ivEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3iv\0"
    "glSecondaryColor3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[17408]: TexCoord4iv (offset 123) */
+   /* _mesa_function_pool[17381]: TexCoord4iv (offset 123) */
    "p\0"
    "glTexCoord4iv\0"
    "\0"
-   /* _mesa_function_pool[17425]: TexStorage3D (will be remapped) */
+   /* _mesa_function_pool[17398]: TexStorage3D (will be remapped) */
    "iiiiii\0"
    "glTexStorage3D\0"
    "\0"
-   /* _mesa_function_pool[17448]: GetFragmentMaterialfvSGIX (dynamic) */
+   /* _mesa_function_pool[17421]: GetFragmentMaterialfvSGIX (dynamic) */
    "iip\0"
    "glGetFragmentMaterialfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[17481]: UniformMatrix4x2fv (will be remapped) */
+   /* _mesa_function_pool[17454]: UniformMatrix4x2fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix4x2fv\0"
    "\0"
-   /* _mesa_function_pool[17508]: GetDetailTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[17481]: GetDetailTexFuncSGIS (dynamic) */
    "ip\0"
    "glGetDetailTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[17535]: GetCombinerStageParameterfvNV (dynamic) */
+   /* _mesa_function_pool[17508]: GetCombinerStageParameterfvNV (dynamic) */
    "iip\0"
    "glGetCombinerStageParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[17572]: SamplerParameterIiv (will be remapped) */
+   /* _mesa_function_pool[17545]: SamplerParameterIiv (will be remapped) */
    "iip\0"
    "glSamplerParameterIiv\0"
    "\0"
-   /* _mesa_function_pool[17599]: PolygonOffset (offset 319) */
+   /* _mesa_function_pool[17572]: PolygonOffset (offset 319) */
    "ff\0"
    "glPolygonOffset\0"
    "\0"
-   /* _mesa_function_pool[17619]: BindVertexArray (will be remapped) */
+   /* _mesa_function_pool[17592]: BindVertexArray (will be remapped) */
    "i\0"
    "glBindVertexArray\0"
    "\0"
-   /* _mesa_function_pool[17640]: Color4ubVertex2fvSUN (dynamic) */
+   /* _mesa_function_pool[17613]: Color4ubVertex2fvSUN (dynamic) */
    "pp\0"
    "glColor4ubVertex2fvSUN\0"
    "\0"
-   /* _mesa_function_pool[17667]: ImageTransformParameterivHP (dynamic) */
+   /* _mesa_function_pool[17640]: ImageTransformParameterivHP (dynamic) */
    "iip\0"
    "glImageTransformParameterivHP\0"
    "\0"
-   /* _mesa_function_pool[17702]: Rectd (offset 86) */
+   /* _mesa_function_pool[17675]: Rectd (offset 86) */
    "dddd\0"
    "glRectd\0"
    "\0"
-   /* _mesa_function_pool[17716]: TexFilterFuncSGIS (dynamic) */
+   /* _mesa_function_pool[17689]: TexFilterFuncSGIS (dynamic) */
    "iiip\0"
    "glTexFilterFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[17742]: SampleMaskSGIS (will be remapped) */
+   /* _mesa_function_pool[17715]: SampleMaskSGIS (will be remapped) */
    "fi\0"
    "glSampleMaskSGIS\0"
    "glSampleMaskEXT\0"
    "\0"
-   /* _mesa_function_pool[17779]: Binormal3ivEXT (dynamic) */
+   /* _mesa_function_pool[17752]: Binormal3ivEXT (dynamic) */
    "p\0"
    "glBinormal3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[17799]: SamplerParameterfv (will be remapped) */
+   /* _mesa_function_pool[17772]: SamplerParameterfv (will be remapped) */
    "iip\0"
    "glSamplerParameterfv\0"
    "\0"
-   /* _mesa_function_pool[17825]: VertexAttribI4ubvEXT (will be remapped) */
+   /* _mesa_function_pool[17798]: VertexAttribI4ubvEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4ubvEXT\0"
    "glVertexAttribI4ubv\0"
    "\0"
-   /* _mesa_function_pool[17872]: GetAttribLocationARB (will be remapped) */
+   /* _mesa_function_pool[17845]: GetAttribLocationARB (will be remapped) */
    "ip\0"
    "glGetAttribLocation\0"
    "glGetAttribLocationARB\0"
    "\0"
-   /* _mesa_function_pool[17919]: RasterPos3i (offset 74) */
+   /* _mesa_function_pool[17892]: RasterPos3i (offset 74) */
    "iii\0"
    "glRasterPos3i\0"
    "\0"
-   /* _mesa_function_pool[17938]: VertexAttrib4ubvARB (will be remapped) */
+   /* _mesa_function_pool[17911]: VertexAttrib4ubvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4ubv\0"
    "glVertexAttrib4ubvARB\0"
    "\0"
-   /* _mesa_function_pool[17983]: DetailTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[17956]: DetailTexFuncSGIS (dynamic) */
    "iip\0"
    "glDetailTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[18008]: Normal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[17981]: Normal3fVertex3fSUN (dynamic) */
    "ffffff\0"
    "glNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[18038]: CopyTexImage2D (offset 324) */
+   /* _mesa_function_pool[18011]: CopyTexImage2D (offset 324) */
    "iiiiiiii\0"
    "glCopyTexImage2D\0"
    "glCopyTexImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[18085]: GetBufferPointervARB (will be remapped) */
+   /* _mesa_function_pool[18058]: GetBufferPointervARB (will be remapped) */
    "iip\0"
    "glGetBufferPointerv\0"
    "glGetBufferPointervARB\0"
    "\0"
-   /* _mesa_function_pool[18133]: ProgramEnvParameter4fARB (will be remapped) */
+   /* _mesa_function_pool[18106]: ProgramEnvParameter4fARB (will be remapped) */
    "iiffff\0"
    "glProgramEnvParameter4fARB\0"
    "glProgramParameter4fNV\0"
    "\0"
-   /* _mesa_function_pool[18191]: Uniform3ivARB (will be remapped) */
+   /* _mesa_function_pool[18164]: Uniform3ivARB (will be remapped) */
    "iip\0"
    "glUniform3iv\0"
    "glUniform3ivARB\0"
    "\0"
-   /* _mesa_function_pool[18225]: Lightfv (offset 160) */
+   /* _mesa_function_pool[18198]: Lightfv (offset 160) */
    "iip\0"
    "glLightfv\0"
    "\0"
-   /* _mesa_function_pool[18240]: PrimitiveRestartIndexNV (will be remapped) */
+   /* _mesa_function_pool[18213]: PrimitiveRestartIndexNV (will be remapped) */
    "i\0"
    "glPrimitiveRestartIndex\0"
    "glPrimitiveRestartIndexNV\0"
    "\0"
-   /* _mesa_function_pool[18293]: ClearDepth (offset 208) */
+   /* _mesa_function_pool[18266]: ClearDepth (offset 208) */
    "d\0"
    "glClearDepth\0"
    "\0"
-   /* _mesa_function_pool[18309]: GetFenceivNV (will be remapped) */
+   /* _mesa_function_pool[18282]: GetFenceivNV (will be remapped) */
    "iip\0"
    "glGetFenceivNV\0"
    "\0"
-   /* _mesa_function_pool[18329]: WindowPos4dvMESA (will be remapped) */
+   /* _mesa_function_pool[18302]: WindowPos4dvMESA (will be remapped) */
    "p\0"
    "glWindowPos4dvMESA\0"
    "\0"
-   /* _mesa_function_pool[18351]: ColorSubTable (offset 346) */
+   /* _mesa_function_pool[18324]: ColorSubTable (offset 346) */
    "iiiiip\0"
    "glColorSubTable\0"
    "glColorSubTableEXT\0"
    "\0"
-   /* _mesa_function_pool[18394]: Color4fv (offset 30) */
+   /* _mesa_function_pool[18367]: Color4fv (offset 30) */
    "p\0"
    "glColor4fv\0"
    "\0"
-   /* _mesa_function_pool[18408]: MultiTexCoord4ivARB (offset 405) */
+   /* _mesa_function_pool[18381]: MultiTexCoord4ivARB (offset 405) */
    "ip\0"
    "glMultiTexCoord4iv\0"
    "glMultiTexCoord4ivARB\0"
    "\0"
-   /* _mesa_function_pool[18453]: GetnMinmaxARB (will be remapped) */
+   /* _mesa_function_pool[18426]: GetnMinmaxARB (will be remapped) */
    "iiiiip\0"
    "glGetnMinmaxARB\0"
    "\0"
-   /* _mesa_function_pool[18477]: ProgramLocalParameters4fvEXT (will be remapped) */
+   /* _mesa_function_pool[18450]: ProgramLocalParameters4fvEXT (will be remapped) */
    "iiip\0"
    "glProgramLocalParameters4fvEXT\0"
    "\0"
-   /* _mesa_function_pool[18514]: ColorPointer (offset 308) */
+   /* _mesa_function_pool[18487]: ColorPointer (offset 308) */
    "iiip\0"
    "glColorPointer\0"
    "\0"
-   /* _mesa_function_pool[18535]: Rects (offset 92) */
+   /* _mesa_function_pool[18508]: Rects (offset 92) */
    "iiii\0"
    "glRects\0"
    "\0"
-   /* _mesa_function_pool[18549]: GetMapAttribParameterfvNV (dynamic) */
+   /* _mesa_function_pool[18522]: GetMapAttribParameterfvNV (dynamic) */
    "iiip\0"
    "glGetMapAttribParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[18583]: MultiTexCoordP2ui (will be remapped) */
+   /* _mesa_function_pool[18556]: MultiTexCoordP2ui (will be remapped) */
    "iii\0"
    "glMultiTexCoordP2ui\0"
    "\0"
-   /* _mesa_function_pool[18608]: ActiveProgramEXT (will be remapped) */
+   /* _mesa_function_pool[18581]: ActiveProgramEXT (will be remapped) */
    "i\0"
    "glActiveProgramEXT\0"
    "\0"
-   /* _mesa_function_pool[18630]: Lightiv (offset 162) */
+   /* _mesa_function_pool[18603]: Lightiv (offset 162) */
    "iip\0"
    "glLightiv\0"
    "\0"
-   /* _mesa_function_pool[18645]: VertexAttrib4sARB (will be remapped) */
+   /* _mesa_function_pool[18618]: VertexAttrib4sARB (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4s\0"
    "glVertexAttrib4sARB\0"
    "\0"
-   /* _mesa_function_pool[18689]: GetQueryObjectuivARB (will be remapped) */
+   /* _mesa_function_pool[18662]: GetQueryObjectuivARB (will be remapped) */
    "iip\0"
    "glGetQueryObjectuiv\0"
    "glGetQueryObjectuivARB\0"
    "\0"
-   /* _mesa_function_pool[18737]: GetTexParameteriv (offset 283) */
+   /* _mesa_function_pool[18710]: GetTexParameteriv (offset 283) */
    "iip\0"
    "glGetTexParameteriv\0"
    "\0"
-   /* _mesa_function_pool[18762]: MapParameterivNV (dynamic) */
+   /* _mesa_function_pool[18735]: MapParameterivNV (dynamic) */
    "iip\0"
    "glMapParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[18786]: GenRenderbuffersEXT (will be remapped) */
+   /* _mesa_function_pool[18759]: GenRenderbuffersEXT (will be remapped) */
    "ip\0"
    "glGenRenderbuffers\0"
    "glGenRenderbuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[18831]: ClearBufferfv (will be remapped) */
+   /* _mesa_function_pool[18804]: ClearBufferfv (will be remapped) */
    "iip\0"
    "glClearBufferfv\0"
    "\0"
-   /* _mesa_function_pool[18852]: VertexAttrib2dvARB (will be remapped) */
+   /* _mesa_function_pool[18825]: VertexAttrib2dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2dv\0"
    "glVertexAttrib2dvARB\0"
    "\0"
-   /* _mesa_function_pool[18895]: EdgeFlagPointerEXT (will be remapped) */
+   /* _mesa_function_pool[18868]: EdgeFlagPointerEXT (will be remapped) */
    "iip\0"
    "glEdgeFlagPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[18921]: VertexAttribs2svNV (will be remapped) */
+   /* _mesa_function_pool[18894]: VertexAttribs2svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2svNV\0"
    "\0"
-   /* _mesa_function_pool[18947]: WeightbvARB (dynamic) */
+   /* _mesa_function_pool[18920]: WeightbvARB (dynamic) */
    "ip\0"
    "glWeightbvARB\0"
    "\0"
-   /* _mesa_function_pool[18965]: VertexAttrib2fvARB (will be remapped) */
+   /* _mesa_function_pool[18938]: VertexAttrib2fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2fv\0"
    "glVertexAttrib2fvARB\0"
    "\0"
-   /* _mesa_function_pool[19008]: GetBufferParameterivARB (will be remapped) */
+   /* _mesa_function_pool[18981]: GetBufferParameterivARB (will be remapped) */
    "iip\0"
    "glGetBufferParameteriv\0"
    "glGetBufferParameterivARB\0"
    "\0"
-   /* _mesa_function_pool[19062]: Rectdv (offset 87) */
+   /* _mesa_function_pool[19035]: Rectdv (offset 87) */
    "pp\0"
    "glRectdv\0"
    "\0"
-   /* _mesa_function_pool[19075]: ListParameteriSGIX (dynamic) */
+   /* _mesa_function_pool[19048]: ListParameteriSGIX (dynamic) */
    "iii\0"
    "glListParameteriSGIX\0"
    "\0"
-   /* _mesa_function_pool[19101]: BlendEquationiARB (will be remapped) */
+   /* _mesa_function_pool[19074]: BlendEquationiARB (will be remapped) */
    "ii\0"
    "glBlendEquationiARB\0"
    "glBlendEquationIndexedAMD\0"
    "\0"
-   /* _mesa_function_pool[19151]: ReplacementCodeuiColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[19124]: ReplacementCodeuiColor4fNormal3fVertex3fSUN (dynamic) */
    "iffffffffff\0"
    "glReplacementCodeuiColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[19210]: InstrumentsBufferSGIX (dynamic) */
+   /* _mesa_function_pool[19183]: InstrumentsBufferSGIX (dynamic) */
    "ip\0"
    "glInstrumentsBufferSGIX\0"
    "\0"
-   /* _mesa_function_pool[19238]: VertexAttrib4NivARB (will be remapped) */
+   /* _mesa_function_pool[19211]: VertexAttrib4NivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Niv\0"
    "glVertexAttrib4NivARB\0"
    "\0"
-   /* _mesa_function_pool[19283]: DrawArraysInstancedARB (will be remapped) */
+   /* _mesa_function_pool[19256]: DrawArraysInstancedARB (will be remapped) */
    "iiii\0"
    "glDrawArraysInstancedARB\0"
    "glDrawArraysInstancedEXT\0"
    "glDrawArraysInstanced\0"
    "\0"
-   /* _mesa_function_pool[19361]: GetAttachedShaders (will be remapped) */
+   /* _mesa_function_pool[19334]: GetAttachedShaders (will be remapped) */
    "iipp\0"
    "glGetAttachedShaders\0"
    "\0"
-   /* _mesa_function_pool[19388]: GenVertexArraysAPPLE (will be remapped) */
+   /* _mesa_function_pool[19361]: GenVertexArraysAPPLE (will be remapped) */
    "ip\0"
    "glGenVertexArraysAPPLE\0"
    "\0"
-   /* _mesa_function_pool[19415]: ClearBufferfi (will be remapped) */
+   /* _mesa_function_pool[19388]: ClearBufferfi (will be remapped) */
    "iifi\0"
    "glClearBufferfi\0"
    "\0"
-   /* _mesa_function_pool[19437]: Materialiv (offset 172) */
+   /* _mesa_function_pool[19410]: Materialiv (offset 172) */
    "iip\0"
    "glMaterialiv\0"
    "\0"
-   /* _mesa_function_pool[19455]: PushClientAttrib (offset 335) */
+   /* _mesa_function_pool[19428]: PushClientAttrib (offset 335) */
    "i\0"
    "glPushClientAttrib\0"
    "\0"
-   /* _mesa_function_pool[19477]: SamplerParameteriv (will be remapped) */
+   /* _mesa_function_pool[19450]: SamplerParameteriv (will be remapped) */
    "iip\0"
    "glSamplerParameteriv\0"
    "\0"
-   /* _mesa_function_pool[19503]: TexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[19476]: TexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glTexCoord2fColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[19549]: WindowPos2iMESA (will be remapped) */
+   /* _mesa_function_pool[19522]: WindowPos2iMESA (will be remapped) */
    "ii\0"
    "glWindowPos2i\0"
    "glWindowPos2iARB\0"
    "glWindowPos2iMESA\0"
    "\0"
-   /* _mesa_function_pool[19602]: SecondaryColor3fvEXT (will be remapped) */
+   /* _mesa_function_pool[19575]: SecondaryColor3fvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3fv\0"
    "glSecondaryColor3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[19648]: PolygonMode (offset 174) */
+   /* _mesa_function_pool[19621]: PolygonMode (offset 174) */
    "ii\0"
    "glPolygonMode\0"
    "\0"
-   /* _mesa_function_pool[19666]: CompressedTexSubImage1DARB (will be remapped) */
+   /* _mesa_function_pool[19639]: CompressedTexSubImage1DARB (will be remapped) */
    "iiiiiip\0"
    "glCompressedTexSubImage1D\0"
    "glCompressedTexSubImage1DARB\0"
    "\0"
-   /* _mesa_function_pool[19730]: VertexAttrib2dvNV (will be remapped) */
+   /* _mesa_function_pool[19703]: VertexAttrib2dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2dvNV\0"
    "\0"
-   /* _mesa_function_pool[19754]: TexCoord2fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[19727]: TexCoord2fNormal3fVertex3fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord2fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[19796]: GetVertexAttribivNV (will be remapped) */
+   /* _mesa_function_pool[19769]: GetVertexAttribivNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribivNV\0"
    "\0"
-   /* _mesa_function_pool[19823]: GetProgramStringARB (will be remapped) */
+   /* _mesa_function_pool[19796]: GetProgramStringARB (will be remapped) */
    "iip\0"
    "glGetProgramStringARB\0"
    "\0"
-   /* _mesa_function_pool[19850]: GetnUniformdvARB (will be remapped) */
+   /* _mesa_function_pool[19823]: GetnUniformdvARB (will be remapped) */
    "iiip\0"
    "glGetnUniformdvARB\0"
    "\0"
-   /* _mesa_function_pool[19875]: DrawElementsInstancedBaseVertex (will be remapped) */
+   /* _mesa_function_pool[19848]: DrawElementsInstancedBaseVertex (will be remapped) */
    "iiipii\0"
    "glDrawElementsInstancedBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[19917]: TexBuffer (will be remapped) */
-   "iii\0"
-   "glTexBuffer\0"
+   /* _mesa_function_pool[19890]: PauseTransformFeedback (will be remapped) */
+   "\0"
+   "glPauseTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[19934]: VertexAttribIPointerEXT (will be remapped) */
+   /* _mesa_function_pool[19917]: VertexAttribIPointerEXT (will be remapped) */
    "iiiip\0"
    "glVertexAttribIPointerEXT\0"
    "glVertexAttribIPointer\0"
    "\0"
-   /* _mesa_function_pool[19990]: TexBumpParameterfvATI (will be remapped) */
+   /* _mesa_function_pool[19973]: TexBumpParameterfvATI (will be remapped) */
    "ip\0"
    "glTexBumpParameterfvATI\0"
    "\0"
-   /* _mesa_function_pool[20018]: Tangent3ivEXT (dynamic) */
+   /* _mesa_function_pool[20001]: Tangent3ivEXT (dynamic) */
    "p\0"
    "glTangent3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[20037]: CompileShaderARB (will be remapped) */
+   /* _mesa_function_pool[20020]: CompileShaderARB (will be remapped) */
    "i\0"
    "glCompileShader\0"
    "glCompileShaderARB\0"
    "\0"
-   /* _mesa_function_pool[20075]: DeleteShader (will be remapped) */
+   /* _mesa_function_pool[20058]: DeleteShader (will be remapped) */
    "i\0"
    "glDeleteShader\0"
    "\0"
-   /* _mesa_function_pool[20093]: DisableClientState (offset 309) */
+   /* _mesa_function_pool[20076]: DisableClientState (offset 309) */
    "i\0"
    "glDisableClientState\0"
    "\0"
-   /* _mesa_function_pool[20117]: TexGeni (offset 192) */
+   /* _mesa_function_pool[20100]: TexGeni (offset 192) */
    "iii\0"
    "glTexGeni\0"
    "\0"
-   /* _mesa_function_pool[20132]: TexGenf (offset 190) */
+   /* _mesa_function_pool[20115]: TexGenf (offset 190) */
    "iif\0"
    "glTexGenf\0"
    "\0"
-   /* _mesa_function_pool[20147]: Uniform3fARB (will be remapped) */
+   /* _mesa_function_pool[20130]: Uniform3fARB (will be remapped) */
    "ifff\0"
    "glUniform3f\0"
    "glUniform3fARB\0"
    "\0"
-   /* _mesa_function_pool[20180]: TexGend (offset 188) */
+   /* _mesa_function_pool[20163]: TexGend (offset 188) */
    "iid\0"
    "glTexGend\0"
    "\0"
-   /* _mesa_function_pool[20195]: ListParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[20178]: ListParameterfvSGIX (dynamic) */
    "iip\0"
    "glListParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[20222]: GetPolygonStipple (offset 274) */
+   /* _mesa_function_pool[20205]: GetPolygonStipple (offset 274) */
    "p\0"
    "glGetPolygonStipple\0"
    "\0"
-   /* _mesa_function_pool[20245]: Tangent3dvEXT (dynamic) */
+   /* _mesa_function_pool[20228]: Tangent3dvEXT (dynamic) */
    "p\0"
    "glTangent3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[20264]: GetVertexAttribfvNV (will be remapped) */
+   /* _mesa_function_pool[20247]: GetVertexAttribfvNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribfvNV\0"
    "\0"
-   /* _mesa_function_pool[20291]: WindowPos3sMESA (will be remapped) */
+   /* _mesa_function_pool[20274]: WindowPos3sMESA (will be remapped) */
    "iii\0"
    "glWindowPos3s\0"
    "glWindowPos3sARB\0"
    "glWindowPos3sMESA\0"
    "\0"
-   /* _mesa_function_pool[20345]: VertexAttrib2svNV (will be remapped) */
+   /* _mesa_function_pool[20328]: VertexAttrib2svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2svNV\0"
    "\0"
-   /* _mesa_function_pool[20369]: NormalP3uiv (will be remapped) */
+   /* _mesa_function_pool[20352]: NormalP3uiv (will be remapped) */
    "ip\0"
    "glNormalP3uiv\0"
    "\0"
-   /* _mesa_function_pool[20387]: SecondaryColorP3uiv (will be remapped) */
+   /* _mesa_function_pool[20370]: SecondaryColorP3uiv (will be remapped) */
    "ip\0"
    "glSecondaryColorP3uiv\0"
    "\0"
-   /* _mesa_function_pool[20413]: VertexAttribs1fvNV (will be remapped) */
+   /* _mesa_function_pool[20396]: VertexAttribs1fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1fvNV\0"
    "\0"
-   /* _mesa_function_pool[20439]: TexCoord2fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[20422]: TexCoord2fVertex3fvSUN (dynamic) */
    "pp\0"
    "glTexCoord2fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[20468]: WindowPos4sMESA (will be remapped) */
+   /* _mesa_function_pool[20451]: WindowPos4sMESA (will be remapped) */
    "iiii\0"
    "glWindowPos4sMESA\0"
    "\0"
-   /* _mesa_function_pool[20492]: GetnPixelMapuivARB (will be remapped) */
+   /* _mesa_function_pool[20475]: GetnPixelMapuivARB (will be remapped) */
    "iip\0"
    "glGetnPixelMapuivARB\0"
    "\0"
-   /* _mesa_function_pool[20518]: VertexAttrib4NuivARB (will be remapped) */
+   /* _mesa_function_pool[20501]: VertexAttrib4NuivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nuiv\0"
    "glVertexAttrib4NuivARB\0"
    "\0"
-   /* _mesa_function_pool[20565]: ClientActiveTextureARB (offset 375) */
+   /* _mesa_function_pool[20548]: ClientActiveTextureARB (offset 375) */
    "i\0"
    "glClientActiveTexture\0"
    "glClientActiveTextureARB\0"
    "\0"
-   /* _mesa_function_pool[20615]: GetSamplerParameterIuiv (will be remapped) */
+   /* _mesa_function_pool[20598]: GetSamplerParameterIuiv (will be remapped) */
    "iip\0"
    "glGetSamplerParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[20646]: ReplacementCodeusvSUN (dynamic) */
+   /* _mesa_function_pool[20629]: ReplacementCodeusvSUN (dynamic) */
    "p\0"
    "glReplacementCodeusvSUN\0"
    "\0"
-   /* _mesa_function_pool[20673]: Uniform4fARB (will be remapped) */
+   /* _mesa_function_pool[20656]: Uniform4fARB (will be remapped) */
    "iffff\0"
    "glUniform4f\0"
    "glUniform4fARB\0"
    "\0"
-   /* _mesa_function_pool[20707]: Color4sv (offset 34) */
+   /* _mesa_function_pool[20690]: Color4sv (offset 34) */
    "p\0"
    "glColor4sv\0"
    "\0"
-   /* _mesa_function_pool[20721]: FlushMappedBufferRange (will be remapped) */
+   /* _mesa_function_pool[20704]: FlushMappedBufferRange (will be remapped) */
    "iii\0"
    "glFlushMappedBufferRange\0"
    "\0"
-   /* _mesa_function_pool[20751]: IsProgramNV (will be remapped) */
+   /* _mesa_function_pool[20734]: IsProgramNV (will be remapped) */
    "i\0"
    "glIsProgramARB\0"
    "glIsProgramNV\0"
    "\0"
-   /* _mesa_function_pool[20783]: FlushMappedBufferRangeAPPLE (will be remapped) */
+   /* _mesa_function_pool[20766]: FlushMappedBufferRangeAPPLE (will be remapped) */
    "iii\0"
    "glFlushMappedBufferRangeAPPLE\0"
    "\0"
-   /* _mesa_function_pool[20818]: PixelZoom (offset 246) */
+   /* _mesa_function_pool[20801]: PixelZoom (offset 246) */
    "ff\0"
    "glPixelZoom\0"
    "\0"
-   /* _mesa_function_pool[20834]: ReplacementCodePointerSUN (dynamic) */
+   /* _mesa_function_pool[20817]: ReplacementCodePointerSUN (dynamic) */
    "iip\0"
    "glReplacementCodePointerSUN\0"
    "\0"
-   /* _mesa_function_pool[20867]: ProgramEnvParameter4dARB (will be remapped) */
+   /* _mesa_function_pool[20850]: ProgramEnvParameter4dARB (will be remapped) */
    "iidddd\0"
    "glProgramEnvParameter4dARB\0"
    "glProgramParameter4dNV\0"
    "\0"
-   /* _mesa_function_pool[20925]: ColorTableParameterfv (offset 340) */
+   /* _mesa_function_pool[20908]: ColorTableParameterfv (offset 340) */
    "iip\0"
    "glColorTableParameterfv\0"
    "glColorTableParameterfvSGI\0"
    "\0"
-   /* _mesa_function_pool[20981]: FragmentLightModelfSGIX (dynamic) */
+   /* _mesa_function_pool[20964]: FragmentLightModelfSGIX (dynamic) */
    "if\0"
    "glFragmentLightModelfSGIX\0"
    "\0"
-   /* _mesa_function_pool[21011]: Binormal3bvEXT (dynamic) */
+   /* _mesa_function_pool[20994]: Binormal3bvEXT (dynamic) */
    "p\0"
    "glBinormal3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[21031]: PixelMapuiv (offset 252) */
+   /* _mesa_function_pool[21014]: PixelMapuiv (offset 252) */
    "iip\0"
    "glPixelMapuiv\0"
    "\0"
-   /* _mesa_function_pool[21050]: Color3dv (offset 12) */
+   /* _mesa_function_pool[21033]: Color3dv (offset 12) */
    "p\0"
    "glColor3dv\0"
    "\0"
-   /* _mesa_function_pool[21064]: IsTexture (offset 330) */
+   /* _mesa_function_pool[21047]: IsTexture (offset 330) */
    "i\0"
    "glIsTexture\0"
    "glIsTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[21094]: GenSamplers (will be remapped) */
+   /* _mesa_function_pool[21077]: GenSamplers (will be remapped) */
    "ip\0"
    "glGenSamplers\0"
    "\0"
-   /* _mesa_function_pool[21112]: ColorPointerEXT (will be remapped) */
+   /* _mesa_function_pool[21095]: ColorPointerEXT (will be remapped) */
    "iiiip\0"
    "glColorPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[21137]: VertexWeightfvEXT (dynamic) */
+   /* _mesa_function_pool[21120]: VertexWeightfvEXT (dynamic) */
    "p\0"
    "glVertexWeightfvEXT\0"
    "\0"
-   /* _mesa_function_pool[21160]: VertexAttrib1dARB (will be remapped) */
+   /* _mesa_function_pool[21143]: VertexAttrib1dARB (will be remapped) */
    "id\0"
    "glVertexAttrib1d\0"
    "glVertexAttrib1dARB\0"
    "\0"
-   /* _mesa_function_pool[21201]: VertexP3uiv (will be remapped) */
+   /* _mesa_function_pool[21184]: VertexP3uiv (will be remapped) */
    "ip\0"
    "glVertexP3uiv\0"
    "\0"
-   /* _mesa_function_pool[21219]: TexCoord4i (offset 122) */
+   /* _mesa_function_pool[21202]: TexCoord4i (offset 122) */
    "iiii\0"
    "glTexCoord4i\0"
    "\0"
-   /* _mesa_function_pool[21238]: DeleteQueriesARB (will be remapped) */
+   /* _mesa_function_pool[21221]: DeleteQueriesARB (will be remapped) */
    "ip\0"
    "glDeleteQueries\0"
    "glDeleteQueriesARB\0"
    "\0"
-   /* _mesa_function_pool[21277]: Color4ubVertex2fSUN (dynamic) */
+   /* _mesa_function_pool[21260]: Color4ubVertex2fSUN (dynamic) */
    "iiiiff\0"
    "glColor4ubVertex2fSUN\0"
    "\0"
-   /* _mesa_function_pool[21307]: FragmentColorMaterialSGIX (dynamic) */
+   /* _mesa_function_pool[21290]: FragmentColorMaterialSGIX (dynamic) */
    "ii\0"
    "glFragmentColorMaterialSGIX\0"
    "\0"
-   /* _mesa_function_pool[21339]: CurrentPaletteMatrixARB (dynamic) */
+   /* _mesa_function_pool[21322]: CurrentPaletteMatrixARB (dynamic) */
    "i\0"
    "glCurrentPaletteMatrixARB\0"
    "\0"
-   /* _mesa_function_pool[21368]: GetMapdv (offset 266) */
+   /* _mesa_function_pool[21351]: GetMapdv (offset 266) */
    "iip\0"
    "glGetMapdv\0"
    "\0"
-   /* _mesa_function_pool[21384]: ObjectPurgeableAPPLE (will be remapped) */
+   /* _mesa_function_pool[21367]: ObjectPurgeableAPPLE (will be remapped) */
    "iii\0"
    "glObjectPurgeableAPPLE\0"
    "\0"
-   /* _mesa_function_pool[21412]: GetStringi (will be remapped) */
+   /* _mesa_function_pool[21395]: GetStringi (will be remapped) */
    "ii\0"
    "glGetStringi\0"
    "\0"
-   /* _mesa_function_pool[21429]: SamplePatternSGIS (will be remapped) */
+   /* _mesa_function_pool[21412]: SamplePatternSGIS (will be remapped) */
    "i\0"
    "glSamplePatternSGIS\0"
    "glSamplePatternEXT\0"
    "\0"
-   /* _mesa_function_pool[21471]: PixelStoref (offset 249) */
+   /* _mesa_function_pool[21454]: PixelStoref (offset 249) */
    "if\0"
    "glPixelStoref\0"
    "\0"
-   /* _mesa_function_pool[21489]: IsQueryARB (will be remapped) */
+   /* _mesa_function_pool[21472]: IsQueryARB (will be remapped) */
    "i\0"
    "glIsQuery\0"
    "glIsQueryARB\0"
    "\0"
-   /* _mesa_function_pool[21515]: ReplacementCodeuiColor4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[21498]: ReplacementCodeuiColor4ubVertex3fSUN (dynamic) */
    "iiiiifff\0"
    "glReplacementCodeuiColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[21564]: PixelStorei (offset 250) */
+   /* _mesa_function_pool[21547]: PixelStorei (offset 250) */
    "ii\0"
    "glPixelStorei\0"
    "\0"
-   /* _mesa_function_pool[21582]: VertexAttrib4usvARB (will be remapped) */
+   /* _mesa_function_pool[21565]: VertexAttrib4usvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4usv\0"
    "glVertexAttrib4usvARB\0"
    "\0"
-   /* _mesa_function_pool[21627]: LinkProgramARB (will be remapped) */
+   /* _mesa_function_pool[21610]: LinkProgramARB (will be remapped) */
    "i\0"
    "glLinkProgram\0"
    "glLinkProgramARB\0"
    "\0"
-   /* _mesa_function_pool[21661]: VertexAttrib2fNV (will be remapped) */
+   /* _mesa_function_pool[21644]: VertexAttrib2fNV (will be remapped) */
    "iff\0"
    "glVertexAttrib2fNV\0"
    "\0"
-   /* _mesa_function_pool[21685]: ShaderSourceARB (will be remapped) */
+   /* _mesa_function_pool[21668]: ShaderSourceARB (will be remapped) */
    "iipp\0"
    "glShaderSource\0"
    "glShaderSourceARB\0"
    "\0"
-   /* _mesa_function_pool[21724]: FragmentMaterialiSGIX (dynamic) */
+   /* _mesa_function_pool[21707]: FragmentMaterialiSGIX (dynamic) */
    "iii\0"
    "glFragmentMaterialiSGIX\0"
    "\0"
-   /* _mesa_function_pool[21753]: EvalCoord2dv (offset 233) */
+   /* _mesa_function_pool[21736]: EvalCoord2dv (offset 233) */
    "p\0"
    "glEvalCoord2dv\0"
    "\0"
-   /* _mesa_function_pool[21771]: VertexAttrib3svARB (will be remapped) */
+   /* _mesa_function_pool[21754]: VertexAttrib3svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3sv\0"
    "glVertexAttrib3svARB\0"
    "\0"
-   /* _mesa_function_pool[21814]: ColorMaterial (offset 151) */
+   /* _mesa_function_pool[21797]: ColorMaterial (offset 151) */
    "ii\0"
    "glColorMaterial\0"
    "\0"
-   /* _mesa_function_pool[21834]: CompressedTexSubImage3DARB (will be remapped) */
+   /* _mesa_function_pool[21817]: CompressedTexSubImage3DARB (will be remapped) */
    "iiiiiiiiiip\0"
    "glCompressedTexSubImage3D\0"
    "glCompressedTexSubImage3DARB\0"
    "\0"
-   /* _mesa_function_pool[21902]: WindowPos2ivMESA (will be remapped) */
+   /* _mesa_function_pool[21885]: WindowPos2ivMESA (will be remapped) */
    "p\0"
    "glWindowPos2iv\0"
    "glWindowPos2ivARB\0"
    "glWindowPos2ivMESA\0"
    "\0"
-   /* _mesa_function_pool[21957]: IsFramebufferEXT (will be remapped) */
+   /* _mesa_function_pool[21940]: IsFramebufferEXT (will be remapped) */
    "i\0"
    "glIsFramebuffer\0"
    "glIsFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[21995]: Uniform4ivARB (will be remapped) */
+   /* _mesa_function_pool[21978]: Uniform4ivARB (will be remapped) */
    "iip\0"
    "glUniform4iv\0"
    "glUniform4ivARB\0"
    "\0"
-   /* _mesa_function_pool[22029]: GetVertexAttribdvARB (will be remapped) */
+   /* _mesa_function_pool[22012]: GetVertexAttribdvARB (will be remapped) */
    "iip\0"
    "glGetVertexAttribdv\0"
    "glGetVertexAttribdvARB\0"
    "\0"
-   /* _mesa_function_pool[22077]: TexBumpParameterivATI (will be remapped) */
+   /* _mesa_function_pool[22060]: TexBumpParameterivATI (will be remapped) */
    "ip\0"
    "glTexBumpParameterivATI\0"
    "\0"
-   /* _mesa_function_pool[22105]: GetSeparableFilter (offset 359) */
+   /* _mesa_function_pool[22088]: GetSeparableFilter (offset 359) */
    "iiippp\0"
    "glGetSeparableFilter\0"
    "glGetSeparableFilterEXT\0"
    "\0"
-   /* _mesa_function_pool[22158]: Binormal3dEXT (dynamic) */
+   /* _mesa_function_pool[22141]: Binormal3dEXT (dynamic) */
    "ddd\0"
    "glBinormal3dEXT\0"
    "\0"
-   /* _mesa_function_pool[22179]: SpriteParameteriSGIX (dynamic) */
+   /* _mesa_function_pool[22162]: SpriteParameteriSGIX (dynamic) */
    "ii\0"
    "glSpriteParameteriSGIX\0"
    "\0"
-   /* _mesa_function_pool[22206]: RequestResidentProgramsNV (will be remapped) */
+   /* _mesa_function_pool[22189]: RequestResidentProgramsNV (will be remapped) */
    "ip\0"
    "glRequestResidentProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[22238]: TexCoordP3uiv (will be remapped) */
+   /* _mesa_function_pool[22221]: TexCoordP3uiv (will be remapped) */
    "ip\0"
    "glTexCoordP3uiv\0"
    "\0"
-   /* _mesa_function_pool[22258]: ReplacementCodeusSUN (dynamic) */
+   /* _mesa_function_pool[22241]: ReplacementCodeusSUN (dynamic) */
    "i\0"
    "glReplacementCodeusSUN\0"
    "\0"
-   /* _mesa_function_pool[22284]: FeedbackBuffer (offset 194) */
+   /* _mesa_function_pool[22267]: FeedbackBuffer (offset 194) */
    "iip\0"
    "glFeedbackBuffer\0"
    "\0"
-   /* _mesa_function_pool[22306]: RasterPos2iv (offset 67) */
+   /* _mesa_function_pool[22289]: RasterPos2iv (offset 67) */
    "p\0"
    "glRasterPos2iv\0"
    "\0"
-   /* _mesa_function_pool[22324]: TexImage1D (offset 182) */
+   /* _mesa_function_pool[22307]: TexImage1D (offset 182) */
    "iiiiiiip\0"
    "glTexImage1D\0"
    "\0"
-   /* _mesa_function_pool[22347]: ListParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[22330]: ListParameterivSGIX (dynamic) */
    "iip\0"
    "glListParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[22374]: MultiDrawElementsEXT (will be remapped) */
+   /* _mesa_function_pool[22357]: MultiDrawElementsEXT (will be remapped) */
    "ipipi\0"
    "glMultiDrawElements\0"
    "glMultiDrawElementsEXT\0"
    "\0"
-   /* _mesa_function_pool[22424]: Color3s (offset 17) */
+   /* _mesa_function_pool[22407]: Color3s (offset 17) */
    "iii\0"
    "glColor3s\0"
    "\0"
-   /* _mesa_function_pool[22439]: Uniform1ivARB (will be remapped) */
+   /* _mesa_function_pool[22422]: Uniform1ivARB (will be remapped) */
    "iip\0"
    "glUniform1iv\0"
    "glUniform1ivARB\0"
    "\0"
-   /* _mesa_function_pool[22473]: WindowPos2sMESA (will be remapped) */
+   /* _mesa_function_pool[22456]: WindowPos2sMESA (will be remapped) */
    "ii\0"
    "glWindowPos2s\0"
    "glWindowPos2sARB\0"
    "glWindowPos2sMESA\0"
    "\0"
-   /* _mesa_function_pool[22526]: WeightusvARB (dynamic) */
+   /* _mesa_function_pool[22509]: WeightusvARB (dynamic) */
    "ip\0"
    "glWeightusvARB\0"
    "\0"
-   /* _mesa_function_pool[22545]: ColorP4ui (will be remapped) */
+   /* _mesa_function_pool[22528]: ColorP4ui (will be remapped) */
    "ii\0"
    "glColorP4ui\0"
    "\0"
-   /* _mesa_function_pool[22561]: TexCoordPointer (offset 320) */
+   /* _mesa_function_pool[22544]: TexCoordPointer (offset 320) */
    "iiip\0"
    "glTexCoordPointer\0"
    "\0"
-   /* _mesa_function_pool[22585]: FogCoordPointerEXT (will be remapped) */
+   /* _mesa_function_pool[22568]: FogCoordPointerEXT (will be remapped) */
    "iip\0"
    "glFogCoordPointer\0"
    "glFogCoordPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[22629]: GetnSeparableFilterARB (will be remapped) */
+   /* _mesa_function_pool[22612]: GetnSeparableFilterARB (will be remapped) */
    "iiiipipp\0"
    "glGetnSeparableFilterARB\0"
    "\0"
-   /* _mesa_function_pool[22664]: IndexMaterialEXT (dynamic) */
+   /* _mesa_function_pool[22647]: IndexMaterialEXT (dynamic) */
    "ii\0"
    "glIndexMaterialEXT\0"
    "\0"
-   /* _mesa_function_pool[22687]: Color3i (offset 15) */
+   /* _mesa_function_pool[22670]: Color3i (offset 15) */
    "iii\0"
    "glColor3i\0"
    "\0"
-   /* _mesa_function_pool[22702]: FrontFace (offset 157) */
+   /* _mesa_function_pool[22685]: FrontFace (offset 157) */
    "i\0"
    "glFrontFace\0"
    "\0"
-   /* _mesa_function_pool[22717]: EvalCoord2d (offset 232) */
+   /* _mesa_function_pool[22700]: EvalCoord2d (offset 232) */
    "dd\0"
    "glEvalCoord2d\0"
    "\0"
-   /* _mesa_function_pool[22735]: SecondaryColor3ubvEXT (will be remapped) */
+   /* _mesa_function_pool[22718]: SecondaryColor3ubvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3ubv\0"
    "glSecondaryColor3ubvEXT\0"
    "\0"
-   /* _mesa_function_pool[22783]: EvalCoord2f (offset 234) */
+   /* _mesa_function_pool[22766]: EvalCoord2f (offset 234) */
    "ff\0"
    "glEvalCoord2f\0"
    "\0"
-   /* _mesa_function_pool[22801]: VertexAttrib4dvARB (will be remapped) */
+   /* _mesa_function_pool[22784]: VertexAttrib4dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4dv\0"
    "glVertexAttrib4dvARB\0"
    "\0"
-   /* _mesa_function_pool[22844]: BindAttribLocationARB (will be remapped) */
+   /* _mesa_function_pool[22827]: BindAttribLocationARB (will be remapped) */
    "iip\0"
    "glBindAttribLocation\0"
    "glBindAttribLocationARB\0"
    "\0"
-   /* _mesa_function_pool[22894]: Color3b (offset 9) */
+   /* _mesa_function_pool[22877]: Color3b (offset 9) */
    "iii\0"
    "glColor3b\0"
    "\0"
-   /* _mesa_function_pool[22909]: MultiTexCoord2dARB (offset 384) */
+   /* _mesa_function_pool[22892]: MultiTexCoord2dARB (offset 384) */
    "idd\0"
    "glMultiTexCoord2d\0"
    "glMultiTexCoord2dARB\0"
    "\0"
-   /* _mesa_function_pool[22953]: ExecuteProgramNV (will be remapped) */
+   /* _mesa_function_pool[22936]: ExecuteProgramNV (will be remapped) */
    "iip\0"
    "glExecuteProgramNV\0"
    "\0"
-   /* _mesa_function_pool[22977]: Color3f (offset 13) */
+   /* _mesa_function_pool[22960]: Color3f (offset 13) */
    "fff\0"
    "glColor3f\0"
    "\0"
-   /* _mesa_function_pool[22992]: LightEnviSGIX (dynamic) */
+   /* _mesa_function_pool[22975]: LightEnviSGIX (dynamic) */
    "ii\0"
    "glLightEnviSGIX\0"
    "\0"
-   /* _mesa_function_pool[23012]: Color3d (offset 11) */
+   /* _mesa_function_pool[22995]: Color3d (offset 11) */
    "ddd\0"
    "glColor3d\0"
    "\0"
-   /* _mesa_function_pool[23027]: TextureBarrierNV (will be remapped) */
+   /* _mesa_function_pool[23010]: TextureBarrierNV (will be remapped) */
    "\0"
    "glTextureBarrierNV\0"
    "\0"
-   /* _mesa_function_pool[23048]: Normal3dv (offset 55) */
+   /* _mesa_function_pool[23031]: Normal3dv (offset 55) */
    "p\0"
    "glNormal3dv\0"
    "\0"
-   /* _mesa_function_pool[23063]: Lightf (offset 159) */
+   /* _mesa_function_pool[23046]: Lightf (offset 159) */
    "iif\0"
    "glLightf\0"
    "\0"
-   /* _mesa_function_pool[23077]: ReplacementCodeuiSUN (dynamic) */
+   /* _mesa_function_pool[23060]: ReplacementCodeuiSUN (dynamic) */
    "i\0"
    "glReplacementCodeuiSUN\0"
    "\0"
-   /* _mesa_function_pool[23103]: MatrixMode (offset 293) */
+   /* _mesa_function_pool[23086]: MatrixMode (offset 293) */
    "i\0"
    "glMatrixMode\0"
    "\0"
-   /* _mesa_function_pool[23119]: GetPixelMapusv (offset 273) */
+   /* _mesa_function_pool[23102]: GetPixelMapusv (offset 273) */
    "ip\0"
    "glGetPixelMapusv\0"
    "\0"
-   /* _mesa_function_pool[23140]: Lighti (offset 161) */
+   /* _mesa_function_pool[23123]: Lighti (offset 161) */
    "iii\0"
    "glLighti\0"
    "\0"
-   /* _mesa_function_pool[23154]: VertexAttribPointerNV (will be remapped) */
+   /* _mesa_function_pool[23137]: VertexAttribPointerNV (will be remapped) */
    "iiiip\0"
    "glVertexAttribPointerNV\0"
    "\0"
-   /* _mesa_function_pool[23185]: ClearDepthf (will be remapped) */
+   /* _mesa_function_pool[23168]: ClearDepthf (will be remapped) */
    "f\0"
    "glClearDepthf\0"
    "\0"
-   /* _mesa_function_pool[23202]: GetFragDataIndex (will be remapped) */
+   /* _mesa_function_pool[23185]: GetFragDataIndex (will be remapped) */
    "ip\0"
    "glGetFragDataIndex\0"
    "\0"
-   /* _mesa_function_pool[23225]: GetBooleanIndexedvEXT (will be remapped) */
+   /* _mesa_function_pool[23208]: GetBooleanIndexedvEXT (will be remapped) */
    "iip\0"
    "glGetBooleanIndexedvEXT\0"
    "glGetBooleani_v\0"
    "\0"
-   /* _mesa_function_pool[23270]: GetFramebufferAttachmentParameterivEXT (will be remapped) */
+   /* _mesa_function_pool[23253]: GetFramebufferAttachmentParameterivEXT (will be remapped) */
    "iiip\0"
    "glGetFramebufferAttachmentParameteriv\0"
    "glGetFramebufferAttachmentParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[23355]: PixelTransformParameterfEXT (dynamic) */
+   /* _mesa_function_pool[23338]: PixelTransformParameterfEXT (dynamic) */
    "iif\0"
    "glPixelTransformParameterfEXT\0"
    "\0"
-   /* _mesa_function_pool[23390]: MultiTexCoord4dvARB (offset 401) */
+   /* _mesa_function_pool[23373]: MultiTexCoord4dvARB (offset 401) */
    "ip\0"
    "glMultiTexCoord4dv\0"
    "glMultiTexCoord4dvARB\0"
    "\0"
-   /* _mesa_function_pool[23435]: PixelTransformParameteriEXT (dynamic) */
+   /* _mesa_function_pool[23418]: PixelTransformParameteriEXT (dynamic) */
    "iii\0"
    "glPixelTransformParameteriEXT\0"
    "\0"
-   /* _mesa_function_pool[23470]: GetDoublev (offset 260) */
+   /* _mesa_function_pool[23453]: GetDoublev (offset 260) */
    "ip\0"
    "glGetDoublev\0"
    "\0"
-   /* _mesa_function_pool[23487]: MultiTexCoordP4ui (will be remapped) */
+   /* _mesa_function_pool[23470]: MultiTexCoordP4ui (will be remapped) */
    "iii\0"
    "glMultiTexCoordP4ui\0"
    "\0"
-   /* _mesa_function_pool[23512]: MultMatrixd (offset 295) */
+   /* _mesa_function_pool[23495]: MultMatrixd (offset 295) */
    "p\0"
    "glMultMatrixd\0"
    "\0"
-   /* _mesa_function_pool[23529]: MultMatrixf (offset 294) */
+   /* _mesa_function_pool[23512]: MultMatrixf (offset 294) */
    "p\0"
    "glMultMatrixf\0"
    "\0"
-   /* _mesa_function_pool[23546]: VertexAttribI4bvEXT (will be remapped) */
+   /* _mesa_function_pool[23529]: VertexAttribI4bvEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4bvEXT\0"
    "glVertexAttribI4bv\0"
    "\0"
-   /* _mesa_function_pool[23591]: TexCoord2fColor4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[23574]: TexCoord2fColor4ubVertex3fSUN (dynamic) */
    "ffiiiifff\0"
    "glTexCoord2fColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[23634]: Uniform1iARB (will be remapped) */
+   /* _mesa_function_pool[23617]: Uniform1iARB (will be remapped) */
    "ii\0"
    "glUniform1i\0"
    "glUniform1iARB\0"
    "\0"
-   /* _mesa_function_pool[23665]: GetnMapfvARB (will be remapped) */
+   /* _mesa_function_pool[23648]: GetnMapfvARB (will be remapped) */
    "iiip\0"
    "glGetnMapfvARB\0"
    "\0"
-   /* _mesa_function_pool[23686]: VertexAttribPointerARB (will be remapped) */
+   /* _mesa_function_pool[23669]: VertexAttribPointerARB (will be remapped) */
    "iiiiip\0"
    "glVertexAttribPointer\0"
    "glVertexAttribPointerARB\0"
    "\0"
-   /* _mesa_function_pool[23741]: SharpenTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[23724]: SharpenTexFuncSGIS (dynamic) */
    "iip\0"
    "glSharpenTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[23767]: MultiTexCoord4fvARB (offset 403) */
+   /* _mesa_function_pool[23750]: MultiTexCoord4fvARB (offset 403) */
    "ip\0"
    "glMultiTexCoord4fv\0"
    "glMultiTexCoord4fvARB\0"
    "\0"
-   /* _mesa_function_pool[23812]: Uniform2uiEXT (will be remapped) */
+   /* _mesa_function_pool[23795]: Uniform2uiEXT (will be remapped) */
    "iii\0"
    "glUniform2uiEXT\0"
    "glUniform2ui\0"
    "\0"
-   /* _mesa_function_pool[23846]: TagSampleBufferSGIX (dynamic) */
+   /* _mesa_function_pool[23829]: TagSampleBufferSGIX (dynamic) */
    "\0"
    "glTagSampleBufferSGIX\0"
    "\0"
-   /* _mesa_function_pool[23870]: UniformMatrix2x3fv (will be remapped) */
+   /* _mesa_function_pool[23853]: UniformMatrix2x3fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix2x3fv\0"
    "\0"
-   /* _mesa_function_pool[23897]: SamplerParameteri (will be remapped) */
+   /* _mesa_function_pool[23880]: SamplerParameteri (will be remapped) */
    "iii\0"
    "glSamplerParameteri\0"
    "\0"
-   /* _mesa_function_pool[23922]: SamplerParameterf (will be remapped) */
+   /* _mesa_function_pool[23905]: SamplerParameterf (will be remapped) */
    "iif\0"
    "glSamplerParameterf\0"
    "\0"
-   /* _mesa_function_pool[23947]: CombinerParameteriNV (will be remapped) */
+   /* _mesa_function_pool[23930]: CombinerParameteriNV (will be remapped) */
    "ii\0"
    "glCombinerParameteriNV\0"
    "\0"
-   /* _mesa_function_pool[23974]: DeleteAsyncMarkersSGIX (dynamic) */
+   /* _mesa_function_pool[23957]: DeleteAsyncMarkersSGIX (dynamic) */
    "ii\0"
    "glDeleteAsyncMarkersSGIX\0"
    "\0"
-   /* _mesa_function_pool[24003]: TransformFeedbackVaryingsEXT (will be remapped) */
+   /* _mesa_function_pool[23986]: TransformFeedbackVaryingsEXT (will be remapped) */
    "iipi\0"
    "glTransformFeedbackVaryings\0"
    "glTransformFeedbackVaryingsEXT\0"
    "\0"
-   /* _mesa_function_pool[24068]: IsAsyncMarkerSGIX (dynamic) */
+   /* _mesa_function_pool[24051]: IsAsyncMarkerSGIX (dynamic) */
    "i\0"
    "glIsAsyncMarkerSGIX\0"
    "\0"
-   /* _mesa_function_pool[24091]: FrameZoomSGIX (dynamic) */
+   /* _mesa_function_pool[24074]: FrameZoomSGIX (dynamic) */
    "i\0"
    "glFrameZoomSGIX\0"
    "\0"
-   /* _mesa_function_pool[24110]: Normal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[24093]: Normal3fVertex3fvSUN (dynamic) */
    "pp\0"
    "glNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[24137]: GetnUniformuivARB (will be remapped) */
+   /* _mesa_function_pool[24120]: GetnUniformuivARB (will be remapped) */
    "iiip\0"
    "glGetnUniformuivARB\0"
    "\0"
-   /* _mesa_function_pool[24163]: RasterPos4sv (offset 85) */
+   /* _mesa_function_pool[24146]: RasterPos4sv (offset 85) */
    "p\0"
    "glRasterPos4sv\0"
    "\0"
-   /* _mesa_function_pool[24181]: VertexAttrib4NsvARB (will be remapped) */
+   /* _mesa_function_pool[24164]: VertexAttrib4NsvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nsv\0"
    "glVertexAttrib4NsvARB\0"
    "\0"
-   /* _mesa_function_pool[24226]: VertexAttrib3fvARB (will be remapped) */
+   /* _mesa_function_pool[24209]: VertexAttrib3fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3fv\0"
    "glVertexAttrib3fvARB\0"
    "\0"
-   /* _mesa_function_pool[24269]: ClearColor (offset 206) */
+   /* _mesa_function_pool[24252]: ClearColor (offset 206) */
    "ffff\0"
    "glClearColor\0"
    "\0"
-   /* _mesa_function_pool[24288]: GetSynciv (will be remapped) */
+   /* _mesa_function_pool[24271]: GetSynciv (will be remapped) */
    "iiipp\0"
    "glGetSynciv\0"
    "\0"
-   /* _mesa_function_pool[24307]: ClearColorIiEXT (will be remapped) */
+   /* _mesa_function_pool[24290]: ClearColorIiEXT (will be remapped) */
    "iiii\0"
    "glClearColorIiEXT\0"
    "\0"
-   /* _mesa_function_pool[24331]: DeleteFramebuffersEXT (will be remapped) */
+   /* _mesa_function_pool[24314]: DeleteFramebuffersEXT (will be remapped) */
    "ip\0"
    "glDeleteFramebuffers\0"
    "glDeleteFramebuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[24380]: GlobalAlphaFactorsSUN (dynamic) */
+   /* _mesa_function_pool[24363]: GlobalAlphaFactorsSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorsSUN\0"
    "\0"
-   /* _mesa_function_pool[24407]: IsEnabledIndexedEXT (will be remapped) */
+   /* _mesa_function_pool[24390]: IsEnabledIndexedEXT (will be remapped) */
    "ii\0"
    "glIsEnabledIndexedEXT\0"
    "glIsEnabledi\0"
    "\0"
-   /* _mesa_function_pool[24446]: TexEnviv (offset 187) */
+   /* _mesa_function_pool[24429]: TexEnviv (offset 187) */
    "iip\0"
    "glTexEnviv\0"
    "\0"
-   /* _mesa_function_pool[24462]: TexSubImage3D (offset 372) */
+   /* _mesa_function_pool[24445]: TexSubImage3D (offset 372) */
    "iiiiiiiiiip\0"
    "glTexSubImage3D\0"
    "glTexSubImage3DEXT\0"
    "\0"
-   /* _mesa_function_pool[24510]: Tangent3fEXT (dynamic) */
+   /* _mesa_function_pool[24493]: Tangent3fEXT (dynamic) */
    "fff\0"
    "glTangent3fEXT\0"
    "\0"
-   /* _mesa_function_pool[24530]: SecondaryColor3uivEXT (will be remapped) */
+   /* _mesa_function_pool[24513]: SecondaryColor3uivEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3uiv\0"
    "glSecondaryColor3uivEXT\0"
    "\0"
-   /* _mesa_function_pool[24578]: MatrixIndexubvARB (dynamic) */
+   /* _mesa_function_pool[24561]: MatrixIndexubvARB (dynamic) */
    "ip\0"
    "glMatrixIndexubvARB\0"
    "\0"
-   /* _mesa_function_pool[24602]: Color4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[24585]: Color4fNormal3fVertex3fSUN (dynamic) */
    "ffffffffff\0"
    "glColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[24643]: PixelTexGenParameterfSGIS (will be remapped) */
+   /* _mesa_function_pool[24626]: PixelTexGenParameterfSGIS (will be remapped) */
    "if\0"
    "glPixelTexGenParameterfSGIS\0"
    "\0"
-   /* _mesa_function_pool[24675]: CreateShader (will be remapped) */
+   /* _mesa_function_pool[24658]: CreateShader (will be remapped) */
    "i\0"
    "glCreateShader\0"
    "\0"
-   /* _mesa_function_pool[24693]: GetColorTableParameterfv (offset 344) */
+   /* _mesa_function_pool[24676]: GetColorTableParameterfv (offset 344) */
    "iip\0"
    "glGetColorTableParameterfv\0"
    "glGetColorTableParameterfvSGI\0"
    "glGetColorTableParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[24785]: FragmentLightModelfvSGIX (dynamic) */
+   /* _mesa_function_pool[24768]: FragmentLightModelfvSGIX (dynamic) */
    "ip\0"
    "glFragmentLightModelfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[24816]: Bitmap (offset 8) */
+   /* _mesa_function_pool[24799]: Bitmap (offset 8) */
    "iiffffp\0"
    "glBitmap\0"
    "\0"
-   /* _mesa_function_pool[24834]: MultiTexCoord3fARB (offset 394) */
+   /* _mesa_function_pool[24817]: MultiTexCoord3fARB (offset 394) */
    "ifff\0"
    "glMultiTexCoord3f\0"
    "glMultiTexCoord3fARB\0"
    "\0"
-   /* _mesa_function_pool[24879]: GetTexLevelParameterfv (offset 284) */
+   /* _mesa_function_pool[24862]: GetTexLevelParameterfv (offset 284) */
    "iiip\0"
    "glGetTexLevelParameterfv\0"
    "\0"
-   /* _mesa_function_pool[24910]: GetPixelTexGenParameterfvSGIS (will be remapped) */
+   /* _mesa_function_pool[24893]: GetPixelTexGenParameterfvSGIS (will be remapped) */
    "ip\0"
    "glGetPixelTexGenParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[24946]: GenFramebuffersEXT (will be remapped) */
+   /* _mesa_function_pool[24929]: GenFramebuffersEXT (will be remapped) */
    "ip\0"
    "glGenFramebuffers\0"
    "glGenFramebuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[24989]: BindBufferOffsetEXT (will be remapped) */
+   /* _mesa_function_pool[24972]: BindBufferOffsetEXT (will be remapped) */
    "iiii\0"
    "glBindBufferOffsetEXT\0"
    "\0"
-   /* _mesa_function_pool[25017]: VertexAttribDivisor (will be remapped) */
+   /* _mesa_function_pool[25000]: VertexAttribDivisor (will be remapped) */
    "ii\0"
    "glVertexAttribDivisor\0"
    "\0"
-   /* _mesa_function_pool[25043]: GetProgramParameterdvNV (will be remapped) */
+   /* _mesa_function_pool[25026]: GetProgramParameterdvNV (will be remapped) */
    "iiip\0"
    "glGetProgramParameterdvNV\0"
    "\0"
-   /* _mesa_function_pool[25075]: Vertex2sv (offset 133) */
+   /* _mesa_function_pool[25058]: Vertex2sv (offset 133) */
    "p\0"
    "glVertex2sv\0"
    "\0"
-   /* _mesa_function_pool[25090]: GetIntegerv (offset 263) */
+   /* _mesa_function_pool[25073]: GetIntegerv (offset 263) */
    "ip\0"
    "glGetIntegerv\0"
    "\0"
-   /* _mesa_function_pool[25108]: IsVertexArrayAPPLE (will be remapped) */
+   /* _mesa_function_pool[25091]: IsVertexArrayAPPLE (will be remapped) */
    "i\0"
    "glIsVertexArray\0"
    "glIsVertexArrayAPPLE\0"
    "\0"
-   /* _mesa_function_pool[25148]: FragmentLightfvSGIX (dynamic) */
+   /* _mesa_function_pool[25131]: FragmentLightfvSGIX (dynamic) */
    "iip\0"
    "glFragmentLightfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[25175]: VertexAttribDivisorARB (will be remapped) */
+   /* _mesa_function_pool[25158]: VertexAttribDivisorARB (will be remapped) */
    "ii\0"
    "glVertexAttribDivisorARB\0"
    "\0"
-   /* _mesa_function_pool[25204]: DetachShader (will be remapped) */
+   /* _mesa_function_pool[25187]: DetachShader (will be remapped) */
    "ii\0"
    "glDetachShader\0"
    "\0"
-   /* _mesa_function_pool[25223]: VertexAttrib4NubARB (will be remapped) */
+   /* _mesa_function_pool[25206]: VertexAttrib4NubARB (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4Nub\0"
    "glVertexAttrib4NubARB\0"
    "\0"
-   /* _mesa_function_pool[25271]: GetProgramEnvParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[25254]: GetProgramEnvParameterfvARB (will be remapped) */
    "iip\0"
    "glGetProgramEnvParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[25306]: GetTrackMatrixivNV (will be remapped) */
+   /* _mesa_function_pool[25289]: GetTrackMatrixivNV (will be remapped) */
    "iiip\0"
    "glGetTrackMatrixivNV\0"
    "\0"
-   /* _mesa_function_pool[25333]: VertexAttrib3svNV (will be remapped) */
+   /* _mesa_function_pool[25316]: VertexAttrib3svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3svNV\0"
    "\0"
-   /* _mesa_function_pool[25357]: Uniform4fvARB (will be remapped) */
+   /* _mesa_function_pool[25340]: Uniform4fvARB (will be remapped) */
    "iip\0"
    "glUniform4fv\0"
    "glUniform4fvARB\0"
    "\0"
-   /* _mesa_function_pool[25391]: MultTransposeMatrixfARB (will be remapped) */
+   /* _mesa_function_pool[25374]: MultTransposeMatrixfARB (will be remapped) */
    "p\0"
    "glMultTransposeMatrixf\0"
    "glMultTransposeMatrixfARB\0"
    "\0"
-   /* _mesa_function_pool[25443]: GetTexEnviv (offset 277) */
+   /* _mesa_function_pool[25426]: GetTexEnviv (offset 277) */
    "iip\0"
    "glGetTexEnviv\0"
    "\0"
-   /* _mesa_function_pool[25462]: ColorFragmentOp1ATI (will be remapped) */
+   /* _mesa_function_pool[25445]: ColorFragmentOp1ATI (will be remapped) */
    "iiiiiii\0"
    "glColorFragmentOp1ATI\0"
    "\0"
-   /* _mesa_function_pool[25493]: GetUniformfvARB (will be remapped) */
+   /* _mesa_function_pool[25476]: GetUniformfvARB (will be remapped) */
    "iip\0"
    "glGetUniformfv\0"
    "glGetUniformfvARB\0"
    "\0"
-   /* _mesa_function_pool[25531]: EGLImageTargetRenderbufferStorageOES (will be remapped) */
+   /* _mesa_function_pool[25514]: EGLImageTargetRenderbufferStorageOES (will be remapped) */
    "ip\0"
    "glEGLImageTargetRenderbufferStorageOES\0"
    "\0"
-   /* _mesa_function_pool[25574]: VertexAttribI2ivEXT (will be remapped) */
+   /* _mesa_function_pool[25557]: VertexAttribI2ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI2ivEXT\0"
    "glVertexAttribI2iv\0"
    "\0"
-   /* _mesa_function_pool[25619]: PopClientAttrib (offset 334) */
+   /* _mesa_function_pool[25602]: PopClientAttrib (offset 334) */
    "\0"
    "glPopClientAttrib\0"
    "\0"
-   /* _mesa_function_pool[25639]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[25622]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
    "iffffffffffff\0"
    "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[25710]: DetachObjectARB (will be remapped) */
+   /* _mesa_function_pool[25693]: DetachObjectARB (will be remapped) */
    "ii\0"
    "glDetachObjectARB\0"
    "\0"
-   /* _mesa_function_pool[25732]: VertexBlendARB (dynamic) */
+   /* _mesa_function_pool[25715]: VertexBlendARB (dynamic) */
    "i\0"
    "glVertexBlendARB\0"
    "\0"
-   /* _mesa_function_pool[25752]: WindowPos3iMESA (will be remapped) */
+   /* _mesa_function_pool[25735]: WindowPos3iMESA (will be remapped) */
    "iii\0"
    "glWindowPos3i\0"
    "glWindowPos3iARB\0"
    "glWindowPos3iMESA\0"
    "\0"
-   /* _mesa_function_pool[25806]: SeparableFilter2D (offset 360) */
+   /* _mesa_function_pool[25789]: SeparableFilter2D (offset 360) */
    "iiiiiipp\0"
    "glSeparableFilter2D\0"
    "glSeparableFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[25859]: ProgramParameteriARB (will be remapped) */
+   /* _mesa_function_pool[25842]: ProgramParameteriARB (will be remapped) */
    "iii\0"
    "glProgramParameteriARB\0"
    "\0"
-   /* _mesa_function_pool[25887]: Map1d (offset 220) */
+   /* _mesa_function_pool[25870]: Map1d (offset 220) */
    "iddiip\0"
    "glMap1d\0"
    "\0"
-   /* _mesa_function_pool[25903]: Map1f (offset 221) */
+   /* _mesa_function_pool[25886]: Map1f (offset 221) */
    "iffiip\0"
    "glMap1f\0"
    "\0"
-   /* _mesa_function_pool[25919]: CompressedTexImage2DARB (will be remapped) */
+   /* _mesa_function_pool[25902]: CompressedTexImage2DARB (will be remapped) */
    "iiiiiiip\0"
    "glCompressedTexImage2D\0"
    "glCompressedTexImage2DARB\0"
    "\0"
-   /* _mesa_function_pool[25978]: ArrayElement (offset 306) */
+   /* _mesa_function_pool[25961]: ArrayElement (offset 306) */
    "i\0"
    "glArrayElement\0"
    "glArrayElementEXT\0"
    "\0"
-   /* _mesa_function_pool[26014]: TexImage2D (offset 183) */
+   /* _mesa_function_pool[25997]: TexImage2D (offset 183) */
    "iiiiiiiip\0"
    "glTexImage2D\0"
    "\0"
-   /* _mesa_function_pool[26038]: DepthBoundsEXT (will be remapped) */
+   /* _mesa_function_pool[26021]: DepthBoundsEXT (will be remapped) */
    "dd\0"
    "glDepthBoundsEXT\0"
    "\0"
-   /* _mesa_function_pool[26059]: ProgramParameters4fvNV (will be remapped) */
+   /* _mesa_function_pool[26042]: ProgramParameters4fvNV (will be remapped) */
    "iiip\0"
    "glProgramParameters4fvNV\0"
    "\0"
-   /* _mesa_function_pool[26090]: DeformationMap3fSGIX (dynamic) */
+   /* _mesa_function_pool[26073]: DeformationMap3fSGIX (dynamic) */
    "iffiiffiiffiip\0"
    "glDeformationMap3fSGIX\0"
    "\0"
-   /* _mesa_function_pool[26129]: GetProgramivNV (will be remapped) */
+   /* _mesa_function_pool[26112]: GetProgramivNV (will be remapped) */
    "iip\0"
    "glGetProgramivNV\0"
    "\0"
-   /* _mesa_function_pool[26151]: GetIntegerIndexedvEXT (will be remapped) */
+   /* _mesa_function_pool[26134]: GetIntegerIndexedvEXT (will be remapped) */
    "iip\0"
    "glGetIntegerIndexedvEXT\0"
    "glGetIntegeri_v\0"
    "\0"
-   /* _mesa_function_pool[26196]: BeginTransformFeedbackEXT (will be remapped) */
+   /* _mesa_function_pool[26179]: BeginTransformFeedbackEXT (will be remapped) */
    "i\0"
    "glBeginTransformFeedback\0"
    "glBeginTransformFeedbackEXT\0"
    "\0"
-   /* _mesa_function_pool[26252]: GetMinmaxParameteriv (offset 366) */
+   /* _mesa_function_pool[26235]: GetMinmaxParameteriv (offset 366) */
    "iip\0"
    "glGetMinmaxParameteriv\0"
    "glGetMinmaxParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[26306]: PixelTransferf (offset 247) */
+   /* _mesa_function_pool[26289]: PixelTransferf (offset 247) */
    "if\0"
    "glPixelTransferf\0"
    "\0"
-   /* _mesa_function_pool[26327]: CopyTexImage1D (offset 323) */
+   /* _mesa_function_pool[26310]: CopyTexImage1D (offset 323) */
    "iiiiiii\0"
    "glCopyTexImage1D\0"
    "glCopyTexImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[26373]: PushMatrix (offset 298) */
+   /* _mesa_function_pool[26356]: PushMatrix (offset 298) */
    "\0"
    "glPushMatrix\0"
    "\0"
-   /* _mesa_function_pool[26388]: Fogiv (offset 156) */
+   /* _mesa_function_pool[26371]: Fogiv (offset 156) */
    "ip\0"
    "glFogiv\0"
    "\0"
-   /* _mesa_function_pool[26400]: TexCoord1dv (offset 95) */
+   /* _mesa_function_pool[26383]: TexCoord1dv (offset 95) */
    "p\0"
    "glTexCoord1dv\0"
    "\0"
-   /* _mesa_function_pool[26417]: AlphaFragmentOp3ATI (will be remapped) */
+   /* _mesa_function_pool[26400]: AlphaFragmentOp3ATI (will be remapped) */
    "iiiiiiiiiiii\0"
    "glAlphaFragmentOp3ATI\0"
    "\0"
-   /* _mesa_function_pool[26453]: PixelTransferi (offset 248) */
+   /* _mesa_function_pool[26436]: PixelTransferi (offset 248) */
    "ii\0"
    "glPixelTransferi\0"
    "\0"
-   /* _mesa_function_pool[26474]: GetnColorTableARB (will be remapped) */
+   /* _mesa_function_pool[26457]: GetnColorTableARB (will be remapped) */
    "iiiip\0"
    "glGetnColorTableARB\0"
    "\0"
-   /* _mesa_function_pool[26501]: VertexAttrib3fvNV (will be remapped) */
+   /* _mesa_function_pool[26484]: VertexAttrib3fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3fvNV\0"
    "\0"
-   /* _mesa_function_pool[26525]: Rotatef (offset 300) */
+   /* _mesa_function_pool[26508]: Rotatef (offset 300) */
    "ffff\0"
    "glRotatef\0"
    "\0"
-   /* _mesa_function_pool[26541]: GetFinalCombinerInputParameterivNV (will be remapped) */
+   /* _mesa_function_pool[26524]: GetFinalCombinerInputParameterivNV (will be remapped) */
    "iip\0"
    "glGetFinalCombinerInputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[26583]: Vertex3i (offset 138) */
+   /* _mesa_function_pool[26566]: Vertex3i (offset 138) */
    "iii\0"
    "glVertex3i\0"
    "\0"
-   /* _mesa_function_pool[26599]: SecondaryColorP3ui (will be remapped) */
+   /* _mesa_function_pool[26582]: SecondaryColorP3ui (will be remapped) */
    "ii\0"
    "glSecondaryColorP3ui\0"
    "\0"
-   /* _mesa_function_pool[26624]: Vertex3f (offset 136) */
+   /* _mesa_function_pool[26607]: Vertex3f (offset 136) */
    "fff\0"
    "glVertex3f\0"
    "\0"
-   /* _mesa_function_pool[26640]: Clear (offset 203) */
+   /* _mesa_function_pool[26623]: Clear (offset 203) */
    "i\0"
    "glClear\0"
    "\0"
-   /* _mesa_function_pool[26651]: Vertex3d (offset 134) */
+   /* _mesa_function_pool[26634]: Vertex3d (offset 134) */
    "ddd\0"
    "glVertex3d\0"
    "\0"
-   /* _mesa_function_pool[26667]: GetMapParameterivNV (dynamic) */
+   /* _mesa_function_pool[26650]: GetMapParameterivNV (dynamic) */
    "iip\0"
    "glGetMapParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[26694]: Uniform4iARB (will be remapped) */
+   /* _mesa_function_pool[26677]: Uniform4iARB (will be remapped) */
    "iiiii\0"
    "glUniform4i\0"
    "glUniform4iARB\0"
    "\0"
-   /* _mesa_function_pool[26728]: ReadBuffer (offset 254) */
+   /* _mesa_function_pool[26711]: ReadBuffer (offset 254) */
    "i\0"
    "glReadBuffer\0"
    "\0"
-   /* _mesa_function_pool[26744]: ConvolutionParameteri (offset 352) */
+   /* _mesa_function_pool[26727]: ConvolutionParameteri (offset 352) */
    "iii\0"
    "glConvolutionParameteri\0"
    "glConvolutionParameteriEXT\0"
    "\0"
-   /* _mesa_function_pool[26800]: Ortho (offset 296) */
+   /* _mesa_function_pool[26783]: Ortho (offset 296) */
    "dddddd\0"
    "glOrtho\0"
    "\0"
-   /* _mesa_function_pool[26816]: Binormal3sEXT (dynamic) */
+   /* _mesa_function_pool[26799]: Binormal3sEXT (dynamic) */
    "iii\0"
    "glBinormal3sEXT\0"
    "\0"
-   /* _mesa_function_pool[26837]: ListBase (offset 6) */
+   /* _mesa_function_pool[26820]: ListBase (offset 6) */
    "i\0"
    "glListBase\0"
    "\0"
-   /* _mesa_function_pool[26851]: VertexAttribI3ivEXT (will be remapped) */
+   /* _mesa_function_pool[26834]: VertexAttribI3ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI3ivEXT\0"
    "glVertexAttribI3iv\0"
    "\0"
-   /* _mesa_function_pool[26896]: VertexAttrib4fvNV (will be remapped) */
+   /* _mesa_function_pool[26879]: VertexAttrib4fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4fvNV\0"
    "\0"
-   /* _mesa_function_pool[26920]: Vertex3s (offset 140) */
+   /* _mesa_function_pool[26903]: Vertex3s (offset 140) */
    "iii\0"
    "glVertex3s\0"
    "\0"
-   /* _mesa_function_pool[26936]: ConvolutionParameterf (offset 350) */
+   /* _mesa_function_pool[26919]: ConvolutionParameterf (offset 350) */
    "iif\0"
    "glConvolutionParameterf\0"
    "glConvolutionParameterfEXT\0"
    "\0"
-   /* _mesa_function_pool[26992]: GetColorTableParameteriv (offset 345) */
+   /* _mesa_function_pool[26975]: GetColorTableParameteriv (offset 345) */
    "iip\0"
    "glGetColorTableParameteriv\0"
    "glGetColorTableParameterivSGI\0"
    "glGetColorTableParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[27084]: ProgramEnvParameter4dvARB (will be remapped) */
+   /* _mesa_function_pool[27067]: ProgramEnvParameter4dvARB (will be remapped) */
    "iip\0"
    "glProgramEnvParameter4dvARB\0"
    "glProgramParameter4dvNV\0"
    "\0"
-   /* _mesa_function_pool[27141]: ShadeModel (offset 177) */
+   /* _mesa_function_pool[27124]: ShadeModel (offset 177) */
    "i\0"
    "glShadeModel\0"
    "\0"
-   /* _mesa_function_pool[27157]: BlendEquationSeparateiARB (will be remapped) */
+   /* _mesa_function_pool[27140]: BlendEquationSeparateiARB (will be remapped) */
    "iii\0"
    "glBlendEquationSeparateiARB\0"
    "glBlendEquationSeparateIndexedAMD\0"
    "\0"
-   /* _mesa_function_pool[27224]: Rectiv (offset 91) */
+   /* _mesa_function_pool[27207]: Rectiv (offset 91) */
    "pp\0"
    "glRectiv\0"
    "\0"
-   /* _mesa_function_pool[27237]: UseProgramObjectARB (will be remapped) */
+   /* _mesa_function_pool[27220]: UseProgramObjectARB (will be remapped) */
    "i\0"
    "glUseProgram\0"
    "glUseProgramObjectARB\0"
    "\0"
-   /* _mesa_function_pool[27275]: GetMapParameterfvNV (dynamic) */
+   /* _mesa_function_pool[27258]: GetMapParameterfvNV (dynamic) */
    "iip\0"
    "glGetMapParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[27302]: EndConditionalRenderNV (will be remapped) */
+   /* _mesa_function_pool[27285]: EndConditionalRenderNV (will be remapped) */
    "\0"
    "glEndConditionalRender\0"
    "glEndConditionalRenderNV\0"
    "\0"
-   /* _mesa_function_pool[27352]: PassTexCoordATI (will be remapped) */
+   /* _mesa_function_pool[27335]: PassTexCoordATI (will be remapped) */
    "iii\0"
    "glPassTexCoordATI\0"
    "\0"
-   /* _mesa_function_pool[27375]: DeleteProgram (will be remapped) */
+   /* _mesa_function_pool[27358]: DeleteProgram (will be remapped) */
    "i\0"
    "glDeleteProgram\0"
    "\0"
-   /* _mesa_function_pool[27394]: GetSamplerParameteriv (will be remapped) */
+   /* _mesa_function_pool[27377]: GetSamplerParameteriv (will be remapped) */
    "iip\0"
    "glGetSamplerParameteriv\0"
    "\0"
-   /* _mesa_function_pool[27423]: Tangent3dEXT (dynamic) */
+   /* _mesa_function_pool[27406]: Tangent3dEXT (dynamic) */
    "ddd\0"
    "glTangent3dEXT\0"
    "\0"
-   /* _mesa_function_pool[27443]: SecondaryColor3dvEXT (will be remapped) */
+   /* _mesa_function_pool[27426]: SecondaryColor3dvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3dv\0"
    "glSecondaryColor3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[27489]: VertexAttrib1dNV (will be remapped) */
+   /* _mesa_function_pool[27472]: VertexAttrib1dNV (will be remapped) */
    "id\0"
    "glVertexAttrib1dNV\0"
    "\0"
-   /* _mesa_function_pool[27512]: Vertex2fv (offset 129) */
+   /* _mesa_function_pool[27495]: Vertex2fv (offset 129) */
    "p\0"
    "glVertex2fv\0"
    "\0"
-   /* _mesa_function_pool[27527]: MultiDrawArraysEXT (will be remapped) */
+   /* _mesa_function_pool[27510]: MultiDrawArraysEXT (will be remapped) */
    "ippi\0"
    "glMultiDrawArrays\0"
    "glMultiDrawArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[27572]: BindRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[27555]: BindRenderbufferEXT (will be remapped) */
    "ii\0"
    "glBindRenderbuffer\0"
    "glBindRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[27617]: MultiTexCoord4dARB (offset 400) */
+   /* _mesa_function_pool[27600]: MultiTexCoord4dARB (offset 400) */
    "idddd\0"
    "glMultiTexCoord4d\0"
    "glMultiTexCoord4dARB\0"
    "\0"
-   /* _mesa_function_pool[27663]: FramebufferTextureFaceARB (will be remapped) */
+   /* _mesa_function_pool[27646]: FramebufferTextureFaceARB (will be remapped) */
    "iiiii\0"
    "glFramebufferTextureFaceARB\0"
    "\0"
-   /* _mesa_function_pool[27698]: Vertex3sv (offset 141) */
+   /* _mesa_function_pool[27681]: Vertex3sv (offset 141) */
    "p\0"
    "glVertex3sv\0"
    "\0"
-   /* _mesa_function_pool[27713]: SecondaryColor3usEXT (will be remapped) */
+   /* _mesa_function_pool[27696]: SecondaryColor3usEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3us\0"
    "glSecondaryColor3usEXT\0"
    "\0"
-   /* _mesa_function_pool[27761]: ProgramLocalParameter4fvARB (will be remapped) */
+   /* _mesa_function_pool[27744]: ProgramLocalParameter4fvARB (will be remapped) */
    "iip\0"
    "glProgramLocalParameter4fvARB\0"
    "\0"
-   /* _mesa_function_pool[27796]: DeleteProgramsNV (will be remapped) */
+   /* _mesa_function_pool[27779]: DeleteProgramsNV (will be remapped) */
    "ip\0"
    "glDeleteProgramsARB\0"
    "glDeleteProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[27839]: EvalMesh1 (offset 236) */
+   /* _mesa_function_pool[27822]: EvalMesh1 (offset 236) */
    "iii\0"
    "glEvalMesh1\0"
    "\0"
-   /* _mesa_function_pool[27856]: GetCombinerOutputParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[27839]: GetCombinerOutputParameterfvNV (will be remapped) */
    "iiip\0"
    "glGetCombinerOutputParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[27895]: MultiTexCoord1sARB (offset 382) */
+   /* _mesa_function_pool[27878]: MultiTexCoord1sARB (offset 382) */
    "ii\0"
    "glMultiTexCoord1s\0"
    "glMultiTexCoord1sARB\0"
    "\0"
-   /* _mesa_function_pool[27938]: ReplacementCodeuiColor3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[27921]: ReplacementCodeuiColor3fVertex3fSUN (dynamic) */
    "iffffff\0"
    "glReplacementCodeuiColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[27985]: GetVertexAttribPointervNV (will be remapped) */
+   /* _mesa_function_pool[27968]: GetVertexAttribPointervNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribPointerv\0"
    "glGetVertexAttribPointervARB\0"
    "glGetVertexAttribPointervNV\0"
    "\0"
-   /* _mesa_function_pool[28073]: DisableIndexedEXT (will be remapped) */
+   /* _mesa_function_pool[28056]: DisableIndexedEXT (will be remapped) */
    "ii\0"
    "glDisableIndexedEXT\0"
    "glDisablei\0"
    "\0"
-   /* _mesa_function_pool[28108]: MultiTexCoord1dvARB (offset 377) */
+   /* _mesa_function_pool[28091]: MultiTexCoord1dvARB (offset 377) */
    "ip\0"
    "glMultiTexCoord1dv\0"
    "glMultiTexCoord1dvARB\0"
    "\0"
-   /* _mesa_function_pool[28153]: Uniform2iARB (will be remapped) */
+   /* _mesa_function_pool[28136]: Uniform2iARB (will be remapped) */
    "iii\0"
    "glUniform2i\0"
    "glUniform2iARB\0"
    "\0"
-   /* _mesa_function_pool[28185]: Vertex2iv (offset 131) */
+   /* _mesa_function_pool[28168]: Vertex2iv (offset 131) */
    "p\0"
    "glVertex2iv\0"
    "\0"
-   /* _mesa_function_pool[28200]: GetProgramStringNV (will be remapped) */
+   /* _mesa_function_pool[28183]: GetProgramStringNV (will be remapped) */
    "iip\0"
    "glGetProgramStringNV\0"
    "\0"
-   /* _mesa_function_pool[28226]: VertexAttribP3uiv (will be remapped) */
+   /* _mesa_function_pool[28209]: VertexAttribP3uiv (will be remapped) */
    "iiip\0"
    "glVertexAttribP3uiv\0"
    "\0"
-   /* _mesa_function_pool[28252]: LineWidth (offset 168) */
+   /* _mesa_function_pool[28235]: LineWidth (offset 168) */
    "f\0"
    "glLineWidth\0"
    "\0"
-   /* _mesa_function_pool[28267]: Tangent3svEXT (dynamic) */
+   /* _mesa_function_pool[28250]: Tangent3svEXT (dynamic) */
    "p\0"
    "glTangent3svEXT\0"
    "\0"
-   /* _mesa_function_pool[28286]: MapBufferARB (will be remapped) */
+   /* _mesa_function_pool[28269]: MapBufferARB (will be remapped) */
    "ii\0"
    "glMapBuffer\0"
    "glMapBufferARB\0"
    "\0"
-   /* _mesa_function_pool[28317]: MultiDrawElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[28300]: MultiDrawElementsBaseVertex (will be remapped) */
    "ipipip\0"
    "glMultiDrawElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[28355]: TexParameterIuivEXT (will be remapped) */
+   /* _mesa_function_pool[28338]: TexParameterIuivEXT (will be remapped) */
    "iip\0"
    "glTexParameterIuivEXT\0"
    "glTexParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[28401]: Binormal3svEXT (dynamic) */
+   /* _mesa_function_pool[28384]: Binormal3svEXT (dynamic) */
    "p\0"
    "glBinormal3svEXT\0"
    "\0"
-   /* _mesa_function_pool[28421]: ApplyTextureEXT (dynamic) */
+   /* _mesa_function_pool[28404]: ApplyTextureEXT (dynamic) */
    "i\0"
    "glApplyTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[28442]: GetBufferParameteri64v (will be remapped) */
+   /* _mesa_function_pool[28425]: GetBufferParameteri64v (will be remapped) */
    "iip\0"
    "glGetBufferParameteri64v\0"
    "\0"
-   /* _mesa_function_pool[28472]: TexGendv (offset 189) */
+   /* _mesa_function_pool[28455]: TexGendv (offset 189) */
    "iip\0"
    "glTexGendv\0"
    "\0"
-   /* _mesa_function_pool[28488]: VertexAttribI3iEXT (will be remapped) */
+   /* _mesa_function_pool[28471]: VertexAttribI3iEXT (will be remapped) */
    "iiii\0"
    "glVertexAttribI3iEXT\0"
    "glVertexAttribI3i\0"
    "\0"
-   /* _mesa_function_pool[28533]: EnableIndexedEXT (will be remapped) */
+   /* _mesa_function_pool[28516]: EnableIndexedEXT (will be remapped) */
    "ii\0"
    "glEnableIndexedEXT\0"
    "glEnablei\0"
    "\0"
-   /* _mesa_function_pool[28566]: TextureMaterialEXT (dynamic) */
+   /* _mesa_function_pool[28549]: TextureMaterialEXT (dynamic) */
    "ii\0"
    "glTextureMaterialEXT\0"
    "\0"
-   /* _mesa_function_pool[28591]: TextureLightEXT (dynamic) */
+   /* _mesa_function_pool[28574]: TextureLightEXT (dynamic) */
    "i\0"
    "glTextureLightEXT\0"
    "\0"
-   /* _mesa_function_pool[28612]: ResetMinmax (offset 370) */
+   /* _mesa_function_pool[28595]: ResetMinmax (offset 370) */
    "i\0"
    "glResetMinmax\0"
    "glResetMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[28646]: SpriteParameterfSGIX (dynamic) */
+   /* _mesa_function_pool[28629]: SpriteParameterfSGIX (dynamic) */
    "if\0"
    "glSpriteParameterfSGIX\0"
    "\0"
-   /* _mesa_function_pool[28673]: EnableClientState (offset 313) */
+   /* _mesa_function_pool[28656]: EnableClientState (offset 313) */
    "i\0"
    "glEnableClientState\0"
    "\0"
-   /* _mesa_function_pool[28696]: VertexAttrib4sNV (will be remapped) */
+   /* _mesa_function_pool[28679]: VertexAttrib4sNV (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4sNV\0"
    "\0"
-   /* _mesa_function_pool[28722]: GetConvolutionParameterfv (offset 357) */
+   /* _mesa_function_pool[28705]: GetConvolutionParameterfv (offset 357) */
    "iip\0"
    "glGetConvolutionParameterfv\0"
    "glGetConvolutionParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[28786]: VertexAttribs4dvNV (will be remapped) */
+   /* _mesa_function_pool[28769]: VertexAttribs4dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4dvNV\0"
    "\0"
-   /* _mesa_function_pool[28812]: VertexAttrib4dARB (will be remapped) */
+   /* _mesa_function_pool[28795]: VertexAttrib4dARB (will be remapped) */
    "idddd\0"
    "glVertexAttrib4d\0"
    "glVertexAttrib4dARB\0"
    "\0"
-   /* _mesa_function_pool[28856]: GetTexBumpParameterfvATI (will be remapped) */
+   /* _mesa_function_pool[28839]: GetTexBumpParameterfvATI (will be remapped) */
    "ip\0"
    "glGetTexBumpParameterfvATI\0"
    "\0"
-   /* _mesa_function_pool[28887]: ProgramNamedParameter4dNV (will be remapped) */
+   /* _mesa_function_pool[28870]: ProgramNamedParameter4dNV (will be remapped) */
    "iipdddd\0"
    "glProgramNamedParameter4dNV\0"
    "\0"
-   /* _mesa_function_pool[28924]: GetMaterialfv (offset 269) */
+   /* _mesa_function_pool[28907]: GetMaterialfv (offset 269) */
    "iip\0"
    "glGetMaterialfv\0"
    "\0"
-   /* _mesa_function_pool[28945]: VertexWeightfEXT (dynamic) */
+   /* _mesa_function_pool[28928]: VertexWeightfEXT (dynamic) */
    "f\0"
    "glVertexWeightfEXT\0"
    "\0"
-   /* _mesa_function_pool[28967]: EndTransformFeedbackEXT (will be remapped) */
+   /* _mesa_function_pool[28950]: EndTransformFeedbackEXT (will be remapped) */
    "\0"
    "glEndTransformFeedback\0"
    "glEndTransformFeedbackEXT\0"
    "\0"
-   /* _mesa_function_pool[29018]: SetFragmentShaderConstantATI (will be remapped) */
+   /* _mesa_function_pool[29001]: SetFragmentShaderConstantATI (will be remapped) */
    "ip\0"
    "glSetFragmentShaderConstantATI\0"
    "\0"
-   /* _mesa_function_pool[29053]: Binormal3fEXT (dynamic) */
+   /* _mesa_function_pool[29036]: Binormal3fEXT (dynamic) */
    "fff\0"
    "glBinormal3fEXT\0"
    "\0"
-   /* _mesa_function_pool[29074]: CallList (offset 2) */
+   /* _mesa_function_pool[29057]: CallList (offset 2) */
    "i\0"
    "glCallList\0"
    "\0"
-   /* _mesa_function_pool[29088]: Materialfv (offset 170) */
+   /* _mesa_function_pool[29071]: Materialfv (offset 170) */
    "iip\0"
    "glMaterialfv\0"
    "\0"
-   /* _mesa_function_pool[29106]: TexCoord3fv (offset 113) */
+   /* _mesa_function_pool[29089]: TexCoord3fv (offset 113) */
    "p\0"
    "glTexCoord3fv\0"
    "\0"
-   /* _mesa_function_pool[29123]: FogCoordfvEXT (will be remapped) */
+   /* _mesa_function_pool[29106]: FogCoordfvEXT (will be remapped) */
    "p\0"
    "glFogCoordfv\0"
    "glFogCoordfvEXT\0"
    "\0"
-   /* _mesa_function_pool[29155]: MultiTexCoord1ivARB (offset 381) */
+   /* _mesa_function_pool[29138]: MultiTexCoord1ivARB (offset 381) */
    "ip\0"
    "glMultiTexCoord1iv\0"
    "glMultiTexCoord1ivARB\0"
    "\0"
-   /* _mesa_function_pool[29200]: SecondaryColor3ubEXT (will be remapped) */
+   /* _mesa_function_pool[29183]: SecondaryColor3ubEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3ub\0"
    "glSecondaryColor3ubEXT\0"
    "\0"
-   /* _mesa_function_pool[29248]: MultiTexCoord2ivARB (offset 389) */
+   /* _mesa_function_pool[29231]: MultiTexCoord2ivARB (offset 389) */
    "ip\0"
    "glMultiTexCoord2iv\0"
    "glMultiTexCoord2ivARB\0"
    "\0"
-   /* _mesa_function_pool[29293]: FogFuncSGIS (dynamic) */
+   /* _mesa_function_pool[29276]: FogFuncSGIS (dynamic) */
    "ip\0"
    "glFogFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[29311]: CopyTexSubImage2D (offset 326) */
+   /* _mesa_function_pool[29294]: CopyTexSubImage2D (offset 326) */
    "iiiiiiii\0"
    "glCopyTexSubImage2D\0"
    "glCopyTexSubImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[29364]: GetObjectParameterivARB (will be remapped) */
+   /* _mesa_function_pool[29347]: GetObjectParameterivARB (will be remapped) */
    "iip\0"
    "glGetObjectParameterivARB\0"
    "\0"
-   /* _mesa_function_pool[29395]: Color3iv (offset 16) */
+   /* _mesa_function_pool[29378]: Color3iv (offset 16) */
    "p\0"
    "glColor3iv\0"
    "\0"
-   /* _mesa_function_pool[29409]: TexCoord4fVertex4fSUN (dynamic) */
+   /* _mesa_function_pool[29392]: TexCoord4fVertex4fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord4fVertex4fSUN\0"
    "\0"
-   /* _mesa_function_pool[29443]: DrawElements (offset 311) */
+   /* _mesa_function_pool[29426]: DrawElements (offset 311) */
    "iiip\0"
    "glDrawElements\0"
    "\0"
-   /* _mesa_function_pool[29464]: BindVertexArrayAPPLE (will be remapped) */
+   /* _mesa_function_pool[29447]: BindVertexArrayAPPLE (will be remapped) */
    "i\0"
    "glBindVertexArrayAPPLE\0"
    "\0"
-   /* _mesa_function_pool[29490]: GetProgramLocalParameterdvARB (will be remapped) */
+   /* _mesa_function_pool[29473]: GetProgramLocalParameterdvARB (will be remapped) */
    "iip\0"
    "glGetProgramLocalParameterdvARB\0"
    "\0"
-   /* _mesa_function_pool[29527]: GetHistogramParameteriv (offset 363) */
+   /* _mesa_function_pool[29510]: GetHistogramParameteriv (offset 363) */
    "iip\0"
    "glGetHistogramParameteriv\0"
    "glGetHistogramParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[29587]: MultiTexCoord1iARB (offset 380) */
+   /* _mesa_function_pool[29570]: MultiTexCoord1iARB (offset 380) */
    "ii\0"
    "glMultiTexCoord1i\0"
    "glMultiTexCoord1iARB\0"
    "\0"
-   /* _mesa_function_pool[29630]: GetConvolutionFilter (offset 356) */
+   /* _mesa_function_pool[29613]: GetConvolutionFilter (offset 356) */
    "iiip\0"
    "glGetConvolutionFilter\0"
    "glGetConvolutionFilterEXT\0"
    "\0"
-   /* _mesa_function_pool[29685]: GetProgramivARB (will be remapped) */
+   /* _mesa_function_pool[29668]: GetProgramivARB (will be remapped) */
    "iip\0"
    "glGetProgramivARB\0"
    "\0"
-   /* _mesa_function_pool[29708]: TexBufferARB (will be remapped) */
+   /* _mesa_function_pool[29691]: TexBufferARB (will be remapped) */
    "iii\0"
    "glTexBufferARB\0"
+   "glTexBuffer\0"
    "\0"
-   /* _mesa_function_pool[29728]: BlendFuncSeparateEXT (will be remapped) */
+   /* _mesa_function_pool[29723]: BlendFuncSeparateEXT (will be remapped) */
    "iiii\0"
    "glBlendFuncSeparate\0"
    "glBlendFuncSeparateEXT\0"
    "glBlendFuncSeparateINGR\0"
    "\0"
-   /* _mesa_function_pool[29801]: MapBufferRange (will be remapped) */
+   /* _mesa_function_pool[29796]: MapBufferRange (will be remapped) */
    "iiii\0"
    "glMapBufferRange\0"
    "\0"
-   /* _mesa_function_pool[29824]: ProgramParameters4dvNV (will be remapped) */
+   /* _mesa_function_pool[29819]: ProgramParameters4dvNV (will be remapped) */
    "iiip\0"
    "glProgramParameters4dvNV\0"
    "\0"
-   /* _mesa_function_pool[29855]: TexCoord2fColor3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[29850]: TexCoord2fColor3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[29892]: EvalPoint2 (offset 239) */
+   /* _mesa_function_pool[29887]: EvalPoint2 (offset 239) */
    "ii\0"
    "glEvalPoint2\0"
    "\0"
-   /* _mesa_function_pool[29909]: Uniform1uivEXT (will be remapped) */
+   /* _mesa_function_pool[29904]: Uniform1uivEXT (will be remapped) */
    "iip\0"
    "glUniform1uivEXT\0"
    "glUniform1uiv\0"
    "\0"
-   /* _mesa_function_pool[29945]: EvalPoint1 (offset 237) */
+   /* _mesa_function_pool[29940]: EvalPoint1 (offset 237) */
    "i\0"
    "glEvalPoint1\0"
    "\0"
-   /* _mesa_function_pool[29961]: Binormal3dvEXT (dynamic) */
+   /* _mesa_function_pool[29956]: Binormal3dvEXT (dynamic) */
    "p\0"
    "glBinormal3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[29981]: PopMatrix (offset 297) */
+   /* _mesa_function_pool[29976]: PopMatrix (offset 297) */
    "\0"
    "glPopMatrix\0"
    "\0"
-   /* _mesa_function_pool[29995]: FinishFenceNV (will be remapped) */
+   /* _mesa_function_pool[29990]: FinishFenceNV (will be remapped) */
    "i\0"
    "glFinishFenceNV\0"
    "\0"
-   /* _mesa_function_pool[30014]: GetFogFuncSGIS (dynamic) */
+   /* _mesa_function_pool[30009]: GetFogFuncSGIS (dynamic) */
    "p\0"
    "glGetFogFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[30034]: GetUniformLocationARB (will be remapped) */
+   /* _mesa_function_pool[30029]: GetUniformLocationARB (will be remapped) */
    "ip\0"
    "glGetUniformLocation\0"
    "glGetUniformLocationARB\0"
    "\0"
-   /* _mesa_function_pool[30083]: SecondaryColor3fEXT (will be remapped) */
+   /* _mesa_function_pool[30078]: SecondaryColor3fEXT (will be remapped) */
    "fff\0"
    "glSecondaryColor3f\0"
    "glSecondaryColor3fEXT\0"
    "\0"
-   /* _mesa_function_pool[30129]: GetTexGeniv (offset 280) */
+   /* _mesa_function_pool[30124]: GetTexGeniv (offset 280) */
    "iip\0"
    "glGetTexGeniv\0"
    "\0"
-   /* _mesa_function_pool[30148]: CombinerInputNV (will be remapped) */
+   /* _mesa_function_pool[30143]: CombinerInputNV (will be remapped) */
    "iiiiii\0"
    "glCombinerInputNV\0"
    "\0"
-   /* _mesa_function_pool[30174]: VertexAttrib3sARB (will be remapped) */
+   /* _mesa_function_pool[30169]: VertexAttrib3sARB (will be remapped) */
    "iiii\0"
    "glVertexAttrib3s\0"
    "glVertexAttrib3sARB\0"
    "\0"
-   /* _mesa_function_pool[30217]: IsTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[30212]: IsTransformFeedback (will be remapped) */
    "i\0"
    "glIsTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[30242]: ReplacementCodeuiNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[30237]: ReplacementCodeuiNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[30287]: Map2d (offset 222) */
+   /* _mesa_function_pool[30282]: Map2d (offset 222) */
    "iddiiddiip\0"
    "glMap2d\0"
    "\0"
-   /* _mesa_function_pool[30307]: Map2f (offset 223) */
+   /* _mesa_function_pool[30302]: Map2f (offset 223) */
    "iffiiffiip\0"
    "glMap2f\0"
    "\0"
-   /* _mesa_function_pool[30327]: ProgramStringARB (will be remapped) */
+   /* _mesa_function_pool[30322]: ProgramStringARB (will be remapped) */
    "iiip\0"
    "glProgramStringARB\0"
    "\0"
-   /* _mesa_function_pool[30352]: Vertex4s (offset 148) */
+   /* _mesa_function_pool[30347]: Vertex4s (offset 148) */
    "iiii\0"
    "glVertex4s\0"
    "\0"
-   /* _mesa_function_pool[30369]: TexCoord4fVertex4fvSUN (dynamic) */
+   /* _mesa_function_pool[30364]: TexCoord4fVertex4fvSUN (dynamic) */
    "pp\0"
    "glTexCoord4fVertex4fvSUN\0"
    "\0"
-   /* _mesa_function_pool[30398]: VertexAttrib3sNV (will be remapped) */
+   /* _mesa_function_pool[30393]: VertexAttrib3sNV (will be remapped) */
    "iiii\0"
    "glVertexAttrib3sNV\0"
    "\0"
-   /* _mesa_function_pool[30423]: VertexAttrib1fNV (will be remapped) */
+   /* _mesa_function_pool[30418]: VertexAttrib1fNV (will be remapped) */
    "if\0"
    "glVertexAttrib1fNV\0"
    "\0"
-   /* _mesa_function_pool[30446]: Vertex4f (offset 144) */
+   /* _mesa_function_pool[30441]: Vertex4f (offset 144) */
    "ffff\0"
    "glVertex4f\0"
    "\0"
-   /* _mesa_function_pool[30463]: EvalCoord1d (offset 228) */
+   /* _mesa_function_pool[30458]: EvalCoord1d (offset 228) */
    "d\0"
    "glEvalCoord1d\0"
    "\0"
-   /* _mesa_function_pool[30480]: Vertex4d (offset 142) */
+   /* _mesa_function_pool[30475]: Vertex4d (offset 142) */
    "dddd\0"
    "glVertex4d\0"
    "\0"
-   /* _mesa_function_pool[30497]: RasterPos4dv (offset 79) */
+   /* _mesa_function_pool[30492]: RasterPos4dv (offset 79) */
    "p\0"
    "glRasterPos4dv\0"
    "\0"
-   /* _mesa_function_pool[30515]: GetGraphicsResetStatusARB (will be remapped) */
+   /* _mesa_function_pool[30510]: GetGraphicsResetStatusARB (will be remapped) */
    "\0"
    "glGetGraphicsResetStatusARB\0"
    "\0"
-   /* _mesa_function_pool[30545]: UseShaderProgramEXT (will be remapped) */
+   /* _mesa_function_pool[30540]: UseShaderProgramEXT (will be remapped) */
    "ii\0"
    "glUseShaderProgramEXT\0"
    "\0"
-   /* _mesa_function_pool[30571]: VertexAttribP2uiv (will be remapped) */
+   /* _mesa_function_pool[30566]: VertexAttribP2uiv (will be remapped) */
    "iiip\0"
    "glVertexAttribP2uiv\0"
    "\0"
-   /* _mesa_function_pool[30597]: PrimitiveRestartNV (will be remapped) */
+   /* _mesa_function_pool[30592]: PrimitiveRestartNV (will be remapped) */
    "\0"
    "glPrimitiveRestartNV\0"
    "\0"
-   /* _mesa_function_pool[30620]: GetCompressedTexImageARB (will be remapped) */
+   /* _mesa_function_pool[30615]: GetCompressedTexImageARB (will be remapped) */
    "iip\0"
    "glGetCompressedTexImage\0"
    "glGetCompressedTexImageARB\0"
    "\0"
-   /* _mesa_function_pool[30676]: GetTexGenfv (offset 279) */
+   /* _mesa_function_pool[30671]: GetTexGenfv (offset 279) */
    "iip\0"
    "glGetTexGenfv\0"
    "\0"
-   /* _mesa_function_pool[30695]: Vertex4i (offset 146) */
+   /* _mesa_function_pool[30690]: Vertex4i (offset 146) */
    "iiii\0"
    "glVertex4i\0"
    "\0"
-   /* _mesa_function_pool[30712]: VertexWeightPointerEXT (dynamic) */
+   /* _mesa_function_pool[30707]: VertexWeightPointerEXT (dynamic) */
    "iiip\0"
    "glVertexWeightPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[30743]: GetHistogram (offset 361) */
+   /* _mesa_function_pool[30738]: GetHistogram (offset 361) */
    "iiiip\0"
    "glGetHistogram\0"
    "glGetHistogramEXT\0"
    "\0"
-   /* _mesa_function_pool[30783]: ActiveStencilFaceEXT (will be remapped) */
+   /* _mesa_function_pool[30778]: ActiveStencilFaceEXT (will be remapped) */
    "i\0"
    "glActiveStencilFaceEXT\0"
    "\0"
-   /* _mesa_function_pool[30809]: StencilFuncSeparateATI (will be remapped) */
+   /* _mesa_function_pool[30804]: StencilFuncSeparateATI (will be remapped) */
    "iiii\0"
    "glStencilFuncSeparateATI\0"
    "\0"
-   /* _mesa_function_pool[30840]: Materialf (offset 169) */
+   /* _mesa_function_pool[30835]: Materialf (offset 169) */
    "iif\0"
    "glMaterialf\0"
    "\0"
-   /* _mesa_function_pool[30857]: GetShaderSourceARB (will be remapped) */
+   /* _mesa_function_pool[30852]: GetShaderSourceARB (will be remapped) */
    "iipp\0"
    "glGetShaderSource\0"
    "glGetShaderSourceARB\0"
    "\0"
-   /* _mesa_function_pool[30902]: IglooInterfaceSGIX (dynamic) */
+   /* _mesa_function_pool[30897]: IglooInterfaceSGIX (dynamic) */
    "ip\0"
    "glIglooInterfaceSGIX\0"
    "\0"
-   /* _mesa_function_pool[30927]: Materiali (offset 171) */
+   /* _mesa_function_pool[30922]: Materiali (offset 171) */
    "iii\0"
    "glMateriali\0"
    "\0"
-   /* _mesa_function_pool[30944]: VertexAttrib4dNV (will be remapped) */
+   /* _mesa_function_pool[30939]: VertexAttrib4dNV (will be remapped) */
    "idddd\0"
    "glVertexAttrib4dNV\0"
    "\0"
-   /* _mesa_function_pool[30970]: MultiModeDrawElementsIBM (will be remapped) */
+   /* _mesa_function_pool[30965]: MultiModeDrawElementsIBM (will be remapped) */
    "ppipii\0"
    "glMultiModeDrawElementsIBM\0"
    "\0"
-   /* _mesa_function_pool[31005]: Indexsv (offset 51) */
+   /* _mesa_function_pool[31000]: Indexsv (offset 51) */
    "p\0"
    "glIndexsv\0"
    "\0"
-   /* _mesa_function_pool[31018]: MultiTexCoord4svARB (offset 407) */
+   /* _mesa_function_pool[31013]: MultiTexCoord4svARB (offset 407) */
    "ip\0"
    "glMultiTexCoord4sv\0"
    "glMultiTexCoord4svARB\0"
    "\0"
-   /* _mesa_function_pool[31063]: LightModelfv (offset 164) */
+   /* _mesa_function_pool[31058]: LightModelfv (offset 164) */
    "ip\0"
    "glLightModelfv\0"
    "\0"
-   /* _mesa_function_pool[31082]: TexCoord2dv (offset 103) */
+   /* _mesa_function_pool[31077]: TexCoord2dv (offset 103) */
    "p\0"
    "glTexCoord2dv\0"
    "\0"
-   /* _mesa_function_pool[31099]: GenQueriesARB (will be remapped) */
+   /* _mesa_function_pool[31094]: GenQueriesARB (will be remapped) */
    "ip\0"
    "glGenQueries\0"
    "glGenQueriesARB\0"
    "\0"
-   /* _mesa_function_pool[31132]: EvalCoord1dv (offset 229) */
+   /* _mesa_function_pool[31127]: EvalCoord1dv (offset 229) */
    "p\0"
    "glEvalCoord1dv\0"
    "\0"
-   /* _mesa_function_pool[31150]: ReplacementCodeuiVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[31145]: ReplacementCodeuiVertex3fSUN (dynamic) */
    "ifff\0"
    "glReplacementCodeuiVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[31187]: Translated (offset 303) */
+   /* _mesa_function_pool[31182]: Translated (offset 303) */
    "ddd\0"
    "glTranslated\0"
    "\0"
-   /* _mesa_function_pool[31205]: Translatef (offset 304) */
+   /* _mesa_function_pool[31200]: Translatef (offset 304) */
    "fff\0"
    "glTranslatef\0"
    "\0"
-   /* _mesa_function_pool[31223]: Uniform3uiEXT (will be remapped) */
+   /* _mesa_function_pool[31218]: Uniform3uiEXT (will be remapped) */
    "iiii\0"
    "glUniform3uiEXT\0"
    "glUniform3ui\0"
    "\0"
-   /* _mesa_function_pool[31258]: StencilMask (offset 209) */
+   /* _mesa_function_pool[31253]: StencilMask (offset 209) */
    "i\0"
    "glStencilMask\0"
    "\0"
-   /* _mesa_function_pool[31275]: Tangent3iEXT (dynamic) */
+   /* _mesa_function_pool[31270]: Tangent3iEXT (dynamic) */
    "iii\0"
    "glTangent3iEXT\0"
    "\0"
-   /* _mesa_function_pool[31295]: ClampColorARB (will be remapped) */
+   /* _mesa_function_pool[31290]: ClampColorARB (will be remapped) */
    "ii\0"
    "glClampColorARB\0"
    "\0"
-   /* _mesa_function_pool[31315]: GetLightiv (offset 265) */
+   /* _mesa_function_pool[31310]: GetLightiv (offset 265) */
    "iip\0"
    "glGetLightiv\0"
    "\0"
-   /* _mesa_function_pool[31333]: GetSamplerParameterIiv (will be remapped) */
+   /* _mesa_function_pool[31328]: GetSamplerParameterIiv (will be remapped) */
    "iip\0"
    "glGetSamplerParameterIiv\0"
    "\0"
-   /* _mesa_function_pool[31363]: DrawMeshArraysSUN (dynamic) */
+   /* _mesa_function_pool[31358]: DrawMeshArraysSUN (dynamic) */
    "iiii\0"
    "glDrawMeshArraysSUN\0"
    "\0"
-   /* _mesa_function_pool[31389]: IsList (offset 287) */
+   /* _mesa_function_pool[31384]: IsList (offset 287) */
    "i\0"
    "glIsList\0"
    "\0"
-   /* _mesa_function_pool[31401]: GetnPixelMapusvARB (will be remapped) */
+   /* _mesa_function_pool[31396]: GetnPixelMapusvARB (will be remapped) */
    "iip\0"
    "glGetnPixelMapusvARB\0"
    "\0"
-   /* _mesa_function_pool[31427]: IsSync (will be remapped) */
+   /* _mesa_function_pool[31422]: IsSync (will be remapped) */
    "i\0"
    "glIsSync\0"
    "\0"
-   /* _mesa_function_pool[31439]: RenderMode (offset 196) */
+   /* _mesa_function_pool[31434]: RenderMode (offset 196) */
    "i\0"
    "glRenderMode\0"
    "\0"
-   /* _mesa_function_pool[31455]: GetMapControlPointsNV (dynamic) */
+   /* _mesa_function_pool[31450]: GetMapControlPointsNV (dynamic) */
    "iiiiiip\0"
    "glGetMapControlPointsNV\0"
    "\0"
-   /* _mesa_function_pool[31488]: DrawBuffersARB (will be remapped) */
+   /* _mesa_function_pool[31483]: DrawBuffersARB (will be remapped) */
    "ip\0"
    "glDrawBuffers\0"
    "glDrawBuffersARB\0"
    "glDrawBuffersATI\0"
    "glDrawBuffersNV\0"
    "\0"
-   /* _mesa_function_pool[31556]: ClearBufferiv (will be remapped) */
+   /* _mesa_function_pool[31551]: ClearBufferiv (will be remapped) */
    "iip\0"
    "glClearBufferiv\0"
    "\0"
-   /* _mesa_function_pool[31577]: ProgramLocalParameter4fARB (will be remapped) */
+   /* _mesa_function_pool[31572]: ProgramLocalParameter4fARB (will be remapped) */
    "iiffff\0"
    "glProgramLocalParameter4fARB\0"
    "\0"
-   /* _mesa_function_pool[31614]: SpriteParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[31609]: SpriteParameterivSGIX (dynamic) */
    "ip\0"
    "glSpriteParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[31642]: ProvokingVertexEXT (will be remapped) */
+   /* _mesa_function_pool[31637]: ProvokingVertexEXT (will be remapped) */
    "i\0"
    "glProvokingVertexEXT\0"
    "glProvokingVertex\0"
    "\0"
-   /* _mesa_function_pool[31684]: MultiTexCoord1fARB (offset 378) */
+   /* _mesa_function_pool[31679]: MultiTexCoord1fARB (offset 378) */
    "if\0"
    "glMultiTexCoord1f\0"
    "glMultiTexCoord1fARB\0"
    "\0"
-   /* _mesa_function_pool[31727]: LoadName (offset 198) */
+   /* _mesa_function_pool[31722]: LoadName (offset 198) */
    "i\0"
    "glLoadName\0"
    "\0"
-   /* _mesa_function_pool[31741]: VertexAttribs4ubvNV (will be remapped) */
+   /* _mesa_function_pool[31736]: VertexAttribs4ubvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4ubvNV\0"
    "\0"
-   /* _mesa_function_pool[31768]: WeightsvARB (dynamic) */
+   /* _mesa_function_pool[31763]: WeightsvARB (dynamic) */
    "ip\0"
    "glWeightsvARB\0"
    "\0"
-   /* _mesa_function_pool[31786]: NormalP3ui (will be remapped) */
+   /* _mesa_function_pool[31781]: NormalP3ui (will be remapped) */
    "ii\0"
    "glNormalP3ui\0"
    "\0"
-   /* _mesa_function_pool[31803]: Uniform1fvARB (will be remapped) */
+   /* _mesa_function_pool[31798]: Uniform1fvARB (will be remapped) */
    "iip\0"
    "glUniform1fv\0"
    "glUniform1fvARB\0"
    "\0"
-   /* _mesa_function_pool[31837]: CopyTexSubImage1D (offset 325) */
+   /* _mesa_function_pool[31832]: CopyTexSubImage1D (offset 325) */
    "iiiiii\0"
    "glCopyTexSubImage1D\0"
    "glCopyTexSubImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[31888]: CullFace (offset 152) */
+   /* _mesa_function_pool[31883]: CullFace (offset 152) */
    "i\0"
    "glCullFace\0"
    "\0"
-   /* _mesa_function_pool[31902]: BindTexture (offset 307) */
+   /* _mesa_function_pool[31897]: BindTexture (offset 307) */
    "ii\0"
    "glBindTexture\0"
    "glBindTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[31937]: VertexAttribs2fvNV (will be remapped) */
+   /* _mesa_function_pool[31932]: VertexAttribs2fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2fvNV\0"
    "\0"
-   /* _mesa_function_pool[31963]: MultiTexCoord4fARB (offset 402) */
+   /* _mesa_function_pool[31958]: MultiTexCoord4fARB (offset 402) */
    "iffff\0"
    "glMultiTexCoord4f\0"
    "glMultiTexCoord4fARB\0"
    "\0"
-   /* _mesa_function_pool[32009]: VertexAttribs3svNV (will be remapped) */
+   /* _mesa_function_pool[32004]: VertexAttribs3svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs3svNV\0"
    "\0"
-   /* _mesa_function_pool[32035]: StencilFunc (offset 243) */
+   /* _mesa_function_pool[32030]: StencilFunc (offset 243) */
    "iii\0"
    "glStencilFunc\0"
    "\0"
-   /* _mesa_function_pool[32054]: CopyPixels (offset 255) */
+   /* _mesa_function_pool[32049]: CopyPixels (offset 255) */
    "iiiii\0"
    "glCopyPixels\0"
    "\0"
-   /* _mesa_function_pool[32074]: Rectsv (offset 93) */
+   /* _mesa_function_pool[32069]: Rectsv (offset 93) */
    "pp\0"
    "glRectsv\0"
    "\0"
-   /* _mesa_function_pool[32087]: ReplacementCodeuivSUN (dynamic) */
+   /* _mesa_function_pool[32082]: ReplacementCodeuivSUN (dynamic) */
    "p\0"
    "glReplacementCodeuivSUN\0"
    "\0"
-   /* _mesa_function_pool[32114]: MultiTexCoordP2uiv (will be remapped) */
+   /* _mesa_function_pool[32109]: MultiTexCoordP2uiv (will be remapped) */
    "iip\0"
    "glMultiTexCoordP2uiv\0"
    "\0"
-   /* _mesa_function_pool[32140]: EnableVertexAttribArrayARB (will be remapped) */
+   /* _mesa_function_pool[32135]: EnableVertexAttribArrayARB (will be remapped) */
    "i\0"
    "glEnableVertexAttribArray\0"
    "glEnableVertexAttribArrayARB\0"
    "\0"
-   /* _mesa_function_pool[32198]: NormalPointervINTEL (dynamic) */
+   /* _mesa_function_pool[32193]: NormalPointervINTEL (dynamic) */
    "ip\0"
    "glNormalPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[32224]: CopyConvolutionFilter2D (offset 355) */
+   /* _mesa_function_pool[32219]: CopyConvolutionFilter2D (offset 355) */
    "iiiiii\0"
    "glCopyConvolutionFilter2D\0"
    "glCopyConvolutionFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[32287]: WindowPos3ivMESA (will be remapped) */
+   /* _mesa_function_pool[32282]: WindowPos3ivMESA (will be remapped) */
    "p\0"
    "glWindowPos3iv\0"
    "glWindowPos3ivARB\0"
    "glWindowPos3ivMESA\0"
    "\0"
-   /* _mesa_function_pool[32342]: CopyBufferSubData (will be remapped) */
+   /* _mesa_function_pool[32337]: CopyBufferSubData (will be remapped) */
    "iiiii\0"
    "glCopyBufferSubData\0"
    "\0"
-   /* _mesa_function_pool[32369]: NormalPointer (offset 318) */
+   /* _mesa_function_pool[32364]: NormalPointer (offset 318) */
    "iip\0"
    "glNormalPointer\0"
    "\0"
-   /* _mesa_function_pool[32390]: TexParameterfv (offset 179) */
+   /* _mesa_function_pool[32385]: TexParameterfv (offset 179) */
    "iip\0"
    "glTexParameterfv\0"
    "\0"
-   /* _mesa_function_pool[32412]: IsBufferARB (will be remapped) */
+   /* _mesa_function_pool[32407]: IsBufferARB (will be remapped) */
    "i\0"
    "glIsBuffer\0"
    "glIsBufferARB\0"
    "\0"
-   /* _mesa_function_pool[32440]: WindowPos4iMESA (will be remapped) */
+   /* _mesa_function_pool[32435]: WindowPos4iMESA (will be remapped) */
    "iiii\0"
    "glWindowPos4iMESA\0"
    "\0"
-   /* _mesa_function_pool[32464]: VertexAttrib4uivARB (will be remapped) */
+   /* _mesa_function_pool[32459]: VertexAttrib4uivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4uiv\0"
    "glVertexAttrib4uivARB\0"
    "\0"
-   /* _mesa_function_pool[32509]: Tangent3bvEXT (dynamic) */
+   /* _mesa_function_pool[32504]: Tangent3bvEXT (dynamic) */
    "p\0"
    "glTangent3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[32528]: VertexAttribI3uivEXT (will be remapped) */
+   /* _mesa_function_pool[32523]: VertexAttribI3uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI3uivEXT\0"
    "glVertexAttribI3uiv\0"
    "\0"
-   /* _mesa_function_pool[32575]: UniformMatrix3x4fv (will be remapped) */
+   /* _mesa_function_pool[32570]: UniformMatrix3x4fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3x4fv\0"
    "\0"
-   /* _mesa_function_pool[32602]: ClipPlane (offset 150) */
+   /* _mesa_function_pool[32597]: ClipPlane (offset 150) */
    "ip\0"
    "glClipPlane\0"
    "\0"
-   /* _mesa_function_pool[32618]: Recti (offset 90) */
+   /* _mesa_function_pool[32613]: Recti (offset 90) */
    "iiii\0"
    "glRecti\0"
    "\0"
-   /* _mesa_function_pool[32632]: TrackMatrixNV (will be remapped) */
+   /* _mesa_function_pool[32627]: TrackMatrixNV (will be remapped) */
    "iiii\0"
    "glTrackMatrixNV\0"
    "\0"
-   /* _mesa_function_pool[32654]: DrawRangeElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[32649]: DrawRangeElementsBaseVertex (will be remapped) */
    "iiiiipi\0"
    "glDrawRangeElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[32693]: SamplerParameterIuiv (will be remapped) */
+   /* _mesa_function_pool[32688]: SamplerParameterIuiv (will be remapped) */
    "iip\0"
    "glSamplerParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[32721]: TexCoordPointervINTEL (dynamic) */
+   /* _mesa_function_pool[32716]: TexCoordPointervINTEL (dynamic) */
    "iip\0"
    "glTexCoordPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[32750]: DeleteBuffersARB (will be remapped) */
+   /* _mesa_function_pool[32745]: DeleteBuffersARB (will be remapped) */
    "ip\0"
    "glDeleteBuffers\0"
    "glDeleteBuffersARB\0"
    "\0"
-   /* _mesa_function_pool[32789]: ImageTransformParameteriHP (dynamic) */
+   /* _mesa_function_pool[32784]: ImageTransformParameteriHP (dynamic) */
    "iii\0"
    "glImageTransformParameteriHP\0"
    "\0"
-   /* _mesa_function_pool[32823]: WindowPos4fvMESA (will be remapped) */
+   /* _mesa_function_pool[32818]: WindowPos4fvMESA (will be remapped) */
    "p\0"
    "glWindowPos4fvMESA\0"
    "\0"
-   /* _mesa_function_pool[32845]: GetPixelMapuiv (offset 272) */
+   /* _mesa_function_pool[32840]: GetPixelMapuiv (offset 272) */
    "ip\0"
    "glGetPixelMapuiv\0"
    "\0"
-   /* _mesa_function_pool[32866]: Rectf (offset 88) */
+   /* _mesa_function_pool[32861]: Rectf (offset 88) */
    "ffff\0"
    "glRectf\0"
    "\0"
-   /* _mesa_function_pool[32880]: VertexAttrib1sNV (will be remapped) */
+   /* _mesa_function_pool[32875]: VertexAttrib1sNV (will be remapped) */
    "ii\0"
    "glVertexAttrib1sNV\0"
    "\0"
-   /* _mesa_function_pool[32903]: Indexfv (offset 47) */
+   /* _mesa_function_pool[32898]: Indexfv (offset 47) */
    "p\0"
    "glIndexfv\0"
    "\0"
-   /* _mesa_function_pool[32916]: ColorP3uiv (will be remapped) */
+   /* _mesa_function_pool[32911]: ColorP3uiv (will be remapped) */
    "ip\0"
    "glColorP3uiv\0"
    "\0"
-   /* _mesa_function_pool[32933]: SecondaryColor3svEXT (will be remapped) */
+   /* _mesa_function_pool[32928]: SecondaryColor3svEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3sv\0"
    "glSecondaryColor3svEXT\0"
    "\0"
-   /* _mesa_function_pool[32979]: LoadTransposeMatrixfARB (will be remapped) */
+   /* _mesa_function_pool[32974]: LoadTransposeMatrixfARB (will be remapped) */
    "p\0"
    "glLoadTransposeMatrixf\0"
    "glLoadTransposeMatrixfARB\0"
    "\0"
-   /* _mesa_function_pool[33031]: GetPointerv (offset 329) */
+   /* _mesa_function_pool[33026]: GetPointerv (offset 329) */
    "ip\0"
    "glGetPointerv\0"
    "glGetPointervEXT\0"
    "\0"
-   /* _mesa_function_pool[33066]: Tangent3bEXT (dynamic) */
+   /* _mesa_function_pool[33061]: Tangent3bEXT (dynamic) */
    "iii\0"
    "glTangent3bEXT\0"
    "\0"
-   /* _mesa_function_pool[33086]: CombinerParameterfNV (will be remapped) */
+   /* _mesa_function_pool[33081]: CombinerParameterfNV (will be remapped) */
    "if\0"
    "glCombinerParameterfNV\0"
    "\0"
-   /* _mesa_function_pool[33113]: IndexMask (offset 212) */
+   /* _mesa_function_pool[33108]: IndexMask (offset 212) */
    "i\0"
    "glIndexMask\0"
    "\0"
-   /* _mesa_function_pool[33128]: BindProgramNV (will be remapped) */
+   /* _mesa_function_pool[33123]: BindProgramNV (will be remapped) */
    "ii\0"
    "glBindProgramARB\0"
    "glBindProgramNV\0"
    "\0"
-   /* _mesa_function_pool[33165]: VertexAttrib4svARB (will be remapped) */
+   /* _mesa_function_pool[33160]: VertexAttrib4svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4sv\0"
    "glVertexAttrib4svARB\0"
    "\0"
-   /* _mesa_function_pool[33208]: GetFloatv (offset 262) */
+   /* _mesa_function_pool[33203]: GetFloatv (offset 262) */
    "ip\0"
    "glGetFloatv\0"
    "\0"
-   /* _mesa_function_pool[33224]: CreateDebugObjectMESA (dynamic) */
+   /* _mesa_function_pool[33219]: CreateDebugObjectMESA (dynamic) */
    "\0"
    "glCreateDebugObjectMESA\0"
    "\0"
-   /* _mesa_function_pool[33250]: GetShaderiv (will be remapped) */
+   /* _mesa_function_pool[33245]: GetShaderiv (will be remapped) */
    "iip\0"
    "glGetShaderiv\0"
    "\0"
-   /* _mesa_function_pool[33269]: ClientWaitSync (will be remapped) */
+   /* _mesa_function_pool[33264]: ClientWaitSync (will be remapped) */
    "iii\0"
    "glClientWaitSync\0"
    "\0"
-   /* _mesa_function_pool[33291]: TexCoord4s (offset 124) */
+   /* _mesa_function_pool[33286]: TexCoord4s (offset 124) */
    "iiii\0"
    "glTexCoord4s\0"
    "\0"
-   /* _mesa_function_pool[33310]: TexCoord3sv (offset 117) */
+   /* _mesa_function_pool[33305]: TexCoord3sv (offset 117) */
    "p\0"
    "glTexCoord3sv\0"
    "\0"
-   /* _mesa_function_pool[33327]: BindFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[33322]: BindFragmentShaderATI (will be remapped) */
    "i\0"
    "glBindFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[33354]: PopAttrib (offset 218) */
+   /* _mesa_function_pool[33349]: PopAttrib (offset 218) */
    "\0"
    "glPopAttrib\0"
    "\0"
-   /* _mesa_function_pool[33368]: Fogfv (offset 154) */
+   /* _mesa_function_pool[33363]: Fogfv (offset 154) */
    "ip\0"
    "glFogfv\0"
    "\0"
-   /* _mesa_function_pool[33380]: UnmapBufferARB (will be remapped) */
+   /* _mesa_function_pool[33375]: UnmapBufferARB (will be remapped) */
    "i\0"
    "glUnmapBuffer\0"
    "glUnmapBufferARB\0"
    "\0"
-   /* _mesa_function_pool[33414]: InitNames (offset 197) */
+   /* _mesa_function_pool[33409]: InitNames (offset 197) */
    "\0"
    "glInitNames\0"
    "\0"
-   /* _mesa_function_pool[33428]: Normal3sv (offset 61) */
+   /* _mesa_function_pool[33423]: Normal3sv (offset 61) */
    "p\0"
    "glNormal3sv\0"
    "\0"
-   /* _mesa_function_pool[33443]: Minmax (offset 368) */
+   /* _mesa_function_pool[33438]: Minmax (offset 368) */
    "iii\0"
    "glMinmax\0"
    "glMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[33469]: TexCoord4d (offset 118) */
+   /* _mesa_function_pool[33464]: TexCoord4d (offset 118) */
    "dddd\0"
    "glTexCoord4d\0"
    "\0"
-   /* _mesa_function_pool[33488]: DeformationMap3dSGIX (dynamic) */
+   /* _mesa_function_pool[33483]: DeformationMap3dSGIX (dynamic) */
    "iddiiddiiddiip\0"
    "glDeformationMap3dSGIX\0"
    "\0"
-   /* _mesa_function_pool[33527]: TexCoord4f (offset 120) */
+   /* _mesa_function_pool[33522]: TexCoord4f (offset 120) */
    "ffff\0"
    "glTexCoord4f\0"
    "\0"
-   /* _mesa_function_pool[33546]: FogCoorddvEXT (will be remapped) */
+   /* _mesa_function_pool[33541]: FogCoorddvEXT (will be remapped) */
    "p\0"
    "glFogCoorddv\0"
    "glFogCoorddvEXT\0"
    "\0"
-   /* _mesa_function_pool[33578]: FinishTextureSUNX (dynamic) */
+   /* _mesa_function_pool[33573]: FinishTextureSUNX (dynamic) */
    "\0"
    "glFinishTextureSUNX\0"
    "\0"
-   /* _mesa_function_pool[33600]: GetFragmentLightfvSGIX (dynamic) */
+   /* _mesa_function_pool[33595]: GetFragmentLightfvSGIX (dynamic) */
    "iip\0"
    "glGetFragmentLightfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[33630]: Binormal3fvEXT (dynamic) */
+   /* _mesa_function_pool[33625]: Binormal3fvEXT (dynamic) */
    "p\0"
    "glBinormal3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[33650]: GetBooleanv (offset 258) */
+   /* _mesa_function_pool[33645]: GetBooleanv (offset 258) */
    "ip\0"
    "glGetBooleanv\0"
    "\0"
-   /* _mesa_function_pool[33668]: ColorFragmentOp3ATI (will be remapped) */
+   /* _mesa_function_pool[33663]: ColorFragmentOp3ATI (will be remapped) */
    "iiiiiiiiiiiii\0"
    "glColorFragmentOp3ATI\0"
    "\0"
-   /* _mesa_function_pool[33705]: Hint (offset 158) */
+   /* _mesa_function_pool[33700]: Hint (offset 158) */
    "ii\0"
    "glHint\0"
    "\0"
-   /* _mesa_function_pool[33716]: Color4dv (offset 28) */
+   /* _mesa_function_pool[33711]: Color4dv (offset 28) */
    "p\0"
    "glColor4dv\0"
    "\0"
-   /* _mesa_function_pool[33730]: VertexAttrib2svARB (will be remapped) */
+   /* _mesa_function_pool[33725]: VertexAttrib2svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2sv\0"
    "glVertexAttrib2svARB\0"
    "\0"
-   /* _mesa_function_pool[33773]: AreProgramsResidentNV (will be remapped) */
+   /* _mesa_function_pool[33768]: AreProgramsResidentNV (will be remapped) */
    "ipp\0"
    "glAreProgramsResidentNV\0"
    "\0"
-   /* _mesa_function_pool[33802]: WindowPos3svMESA (will be remapped) */
+   /* _mesa_function_pool[33797]: WindowPos3svMESA (will be remapped) */
    "p\0"
    "glWindowPos3sv\0"
    "glWindowPos3svARB\0"
    "glWindowPos3svMESA\0"
    "\0"
-   /* _mesa_function_pool[33857]: CopyColorSubTable (offset 347) */
+   /* _mesa_function_pool[33852]: CopyColorSubTable (offset 347) */
    "iiiii\0"
    "glCopyColorSubTable\0"
    "glCopyColorSubTableEXT\0"
    "\0"
-   /* _mesa_function_pool[33907]: WeightdvARB (dynamic) */
+   /* _mesa_function_pool[33902]: WeightdvARB (dynamic) */
    "ip\0"
    "glWeightdvARB\0"
    "\0"
-   /* _mesa_function_pool[33925]: DeleteRenderbuffersEXT (will be remapped) */
+   /* _mesa_function_pool[33920]: DeleteRenderbuffersEXT (will be remapped) */
    "ip\0"
    "glDeleteRenderbuffers\0"
    "glDeleteRenderbuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[33976]: VertexAttrib4NubvARB (will be remapped) */
+   /* _mesa_function_pool[33971]: VertexAttrib4NubvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nubv\0"
    "glVertexAttrib4NubvARB\0"
    "\0"
-   /* _mesa_function_pool[34023]: VertexAttrib3dvNV (will be remapped) */
+   /* _mesa_function_pool[34018]: VertexAttrib3dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3dvNV\0"
    "\0"
-   /* _mesa_function_pool[34047]: GetObjectParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[34042]: GetObjectParameterfvARB (will be remapped) */
    "iip\0"
    "glGetObjectParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[34078]: Vertex4iv (offset 147) */
+   /* _mesa_function_pool[34073]: Vertex4iv (offset 147) */
    "p\0"
    "glVertex4iv\0"
    "\0"
-   /* _mesa_function_pool[34093]: GetProgramEnvParameterdvARB (will be remapped) */
+   /* _mesa_function_pool[34088]: GetProgramEnvParameterdvARB (will be remapped) */
    "iip\0"
    "glGetProgramEnvParameterdvARB\0"
    "\0"
-   /* _mesa_function_pool[34128]: TexCoord4dv (offset 119) */
+   /* _mesa_function_pool[34123]: TexCoord4dv (offset 119) */
    "p\0"
    "glTexCoord4dv\0"
    "\0"
-   /* _mesa_function_pool[34145]: LockArraysEXT (will be remapped) */
+   /* _mesa_function_pool[34140]: LockArraysEXT (will be remapped) */
    "ii\0"
    "glLockArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[34165]: Begin (offset 7) */
+   /* _mesa_function_pool[34160]: Begin (offset 7) */
    "i\0"
    "glBegin\0"
    "\0"
-   /* _mesa_function_pool[34176]: LightModeli (offset 165) */
+   /* _mesa_function_pool[34171]: LightModeli (offset 165) */
    "ii\0"
    "glLightModeli\0"
    "\0"
-   /* _mesa_function_pool[34194]: FogCoordPointerListIBM (dynamic) */
+   /* _mesa_function_pool[34189]: FogCoordPointerListIBM (dynamic) */
    "iipi\0"
    "glFogCoordPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[34225]: Rectfv (offset 89) */
+   /* _mesa_function_pool[34220]: Rectfv (offset 89) */
    "pp\0"
    "glRectfv\0"
    "\0"
-   /* _mesa_function_pool[34238]: LightModelf (offset 163) */
+   /* _mesa_function_pool[34233]: LightModelf (offset 163) */
    "if\0"
    "glLightModelf\0"
    "\0"
-   /* _mesa_function_pool[34256]: GetTexParameterfv (offset 282) */
+   /* _mesa_function_pool[34251]: GetTexParameterfv (offset 282) */
    "iip\0"
    "glGetTexParameterfv\0"
    "\0"
-   /* _mesa_function_pool[34281]: GetLightfv (offset 264) */
+   /* _mesa_function_pool[34276]: GetLightfv (offset 264) */
    "iip\0"
    "glGetLightfv\0"
    "\0"
-   /* _mesa_function_pool[34299]: PixelTransformParameterivEXT (dynamic) */
+   /* _mesa_function_pool[34294]: PixelTransformParameterivEXT (dynamic) */
    "iip\0"
    "glPixelTransformParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[34335]: BinormalPointerEXT (dynamic) */
+   /* _mesa_function_pool[34330]: BinormalPointerEXT (dynamic) */
    "iip\0"
    "glBinormalPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[34361]: VertexP4uiv (will be remapped) */
+   /* _mesa_function_pool[34356]: VertexP4uiv (will be remapped) */
    "ip\0"
    "glVertexP4uiv\0"
    "\0"
-   /* _mesa_function_pool[34379]: GetCombinerInputParameterivNV (will be remapped) */
+   /* _mesa_function_pool[34374]: GetCombinerInputParameterivNV (will be remapped) */
    "iiiip\0"
    "glGetCombinerInputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[34418]: Disable (offset 214) */
+   /* _mesa_function_pool[34413]: Disable (offset 214) */
    "i\0"
    "glDisable\0"
    "\0"
-   /* _mesa_function_pool[34431]: MultiTexCoord2fvARB (offset 387) */
+   /* _mesa_function_pool[34426]: MultiTexCoord2fvARB (offset 387) */
    "ip\0"
    "glMultiTexCoord2fv\0"
    "glMultiTexCoord2fvARB\0"
    "\0"
-   /* _mesa_function_pool[34476]: GetRenderbufferParameterivEXT (will be remapped) */
+   /* _mesa_function_pool[34471]: GetRenderbufferParameterivEXT (will be remapped) */
    "iip\0"
    "glGetRenderbufferParameteriv\0"
    "glGetRenderbufferParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[34542]: CombinerParameterivNV (will be remapped) */
+   /* _mesa_function_pool[34537]: CombinerParameterivNV (will be remapped) */
    "ip\0"
    "glCombinerParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[34570]: GenFragmentShadersATI (will be remapped) */
+   /* _mesa_function_pool[34565]: GenFragmentShadersATI (will be remapped) */
    "i\0"
    "glGenFragmentShadersATI\0"
    "\0"
-   /* _mesa_function_pool[34597]: DrawArrays (offset 310) */
+   /* _mesa_function_pool[34592]: DrawArrays (offset 310) */
    "iii\0"
    "glDrawArrays\0"
    "glDrawArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[34631]: WeightuivARB (dynamic) */
+   /* _mesa_function_pool[34626]: WeightuivARB (dynamic) */
    "ip\0"
    "glWeightuivARB\0"
    "\0"
-   /* _mesa_function_pool[34650]: GetVertexAttribIivEXT (will be remapped) */
+   /* _mesa_function_pool[34645]: GetVertexAttribIivEXT (will be remapped) */
    "iip\0"
    "glGetVertexAttribIivEXT\0"
    "glGetVertexAttribIiv\0"
    "\0"
-   /* _mesa_function_pool[34700]: VertexAttrib2sARB (will be remapped) */
+   /* _mesa_function_pool[34695]: VertexAttrib2sARB (will be remapped) */
    "iii\0"
    "glVertexAttrib2s\0"
    "glVertexAttrib2sARB\0"
    "\0"
-   /* _mesa_function_pool[34742]: GetnTexImageARB (will be remapped) */
+   /* _mesa_function_pool[34737]: GetnTexImageARB (will be remapped) */
    "iiiiip\0"
    "glGetnTexImageARB\0"
    "\0"
-   /* _mesa_function_pool[34768]: ColorMask (offset 210) */
+   /* _mesa_function_pool[34763]: ColorMask (offset 210) */
    "iiii\0"
    "glColorMask\0"
    "\0"
-   /* _mesa_function_pool[34786]: GenAsyncMarkersSGIX (dynamic) */
+   /* _mesa_function_pool[34781]: GenAsyncMarkersSGIX (dynamic) */
    "i\0"
    "glGenAsyncMarkersSGIX\0"
    "\0"
-   /* _mesa_function_pool[34811]: DebugMessageInsertARB (will be remapped) */
+   /* _mesa_function_pool[34806]: DebugMessageInsertARB (will be remapped) */
    "iiiiip\0"
    "glDebugMessageInsertARB\0"
    "\0"
-   /* _mesa_function_pool[34843]: GetListParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[34838]: GetListParameterivSGIX (dynamic) */
    "iip\0"
    "glGetListParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[34873]: BindBufferARB (will be remapped) */
+   /* _mesa_function_pool[34868]: BindBufferARB (will be remapped) */
    "ii\0"
    "glBindBuffer\0"
    "glBindBufferARB\0"
    "\0"
-   /* _mesa_function_pool[34906]: GetInfoLogARB (will be remapped) */
+   /* _mesa_function_pool[34901]: GetInfoLogARB (will be remapped) */
    "iipp\0"
    "glGetInfoLogARB\0"
    "\0"
-   /* _mesa_function_pool[34928]: RasterPos4iv (offset 83) */
+   /* _mesa_function_pool[34923]: RasterPos4iv (offset 83) */
    "p\0"
    "glRasterPos4iv\0"
    "\0"
-   /* _mesa_function_pool[34946]: Enable (offset 215) */
+   /* _mesa_function_pool[34941]: Enable (offset 215) */
    "i\0"
    "glEnable\0"
    "\0"
-   /* _mesa_function_pool[34958]: LineStipple (offset 167) */
+   /* _mesa_function_pool[34953]: LineStipple (offset 167) */
    "ii\0"
    "glLineStipple\0"
    "\0"
-   /* _mesa_function_pool[34976]: FragmentLightfSGIX (dynamic) */
+   /* _mesa_function_pool[34971]: FragmentLightfSGIX (dynamic) */
    "iif\0"
    "glFragmentLightfSGIX\0"
    "\0"
-   /* _mesa_function_pool[35002]: SetFenceNV (will be remapped) */
+   /* _mesa_function_pool[34997]: SetFenceNV (will be remapped) */
    "ii\0"
    "glSetFenceNV\0"
    "\0"
-   /* _mesa_function_pool[35019]: VertexAttribs4svNV (will be remapped) */
+   /* _mesa_function_pool[35014]: VertexAttribs4svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4svNV\0"
    "\0"
-   /* _mesa_function_pool[35045]: EdgeFlagPointerListIBM (dynamic) */
+   /* _mesa_function_pool[35040]: EdgeFlagPointerListIBM (dynamic) */
    "ipi\0"
    "glEdgeFlagPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[35075]: UniformMatrix3x2fv (will be remapped) */
+   /* _mesa_function_pool[35070]: UniformMatrix3x2fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3x2fv\0"
    "\0"
-   /* _mesa_function_pool[35102]: GetMinmaxParameterfv (offset 365) */
+   /* _mesa_function_pool[35097]: GetMinmaxParameterfv (offset 365) */
    "iip\0"
    "glGetMinmaxParameterfv\0"
    "glGetMinmaxParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[35156]: VertexAttrib1fvARB (will be remapped) */
+   /* _mesa_function_pool[35151]: VertexAttrib1fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib1fv\0"
    "glVertexAttrib1fvARB\0"
    "\0"
-   /* _mesa_function_pool[35199]: GenBuffersARB (will be remapped) */
+   /* _mesa_function_pool[35194]: GenBuffersARB (will be remapped) */
    "ip\0"
    "glGenBuffers\0"
    "glGenBuffersARB\0"
    "\0"
-   /* _mesa_function_pool[35232]: VertexAttribs1svNV (will be remapped) */
+   /* _mesa_function_pool[35227]: VertexAttribs1svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1svNV\0"
    "\0"
-   /* _mesa_function_pool[35258]: Vertex3fv (offset 137) */
+   /* _mesa_function_pool[35253]: Vertex3fv (offset 137) */
    "p\0"
    "glVertex3fv\0"
    "\0"
-   /* _mesa_function_pool[35273]: GetTexBumpParameterivATI (will be remapped) */
+   /* _mesa_function_pool[35268]: GetTexBumpParameterivATI (will be remapped) */
    "ip\0"
    "glGetTexBumpParameterivATI\0"
    "\0"
-   /* _mesa_function_pool[35304]: Binormal3bEXT (dynamic) */
+   /* _mesa_function_pool[35299]: Binormal3bEXT (dynamic) */
    "iii\0"
    "glBinormal3bEXT\0"
    "\0"
-   /* _mesa_function_pool[35325]: FragmentMaterialivSGIX (dynamic) */
+   /* _mesa_function_pool[35320]: FragmentMaterialivSGIX (dynamic) */
    "iip\0"
    "glFragmentMaterialivSGIX\0"
    "\0"
-   /* _mesa_function_pool[35355]: IsRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[35350]: IsRenderbufferEXT (will be remapped) */
    "i\0"
    "glIsRenderbuffer\0"
    "glIsRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[35395]: GenProgramsNV (will be remapped) */
+   /* _mesa_function_pool[35390]: GenProgramsNV (will be remapped) */
    "ip\0"
    "glGenProgramsARB\0"
    "glGenProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[35432]: VertexAttrib4dvNV (will be remapped) */
+   /* _mesa_function_pool[35427]: VertexAttrib4dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4dvNV\0"
    "\0"
-   /* _mesa_function_pool[35456]: EndFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[35451]: EndFragmentShaderATI (will be remapped) */
    "\0"
    "glEndFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[35481]: Binormal3iEXT (dynamic) */
+   /* _mesa_function_pool[35476]: Binormal3iEXT (dynamic) */
    "iii\0"
    "glBinormal3iEXT\0"
    "\0"
-   /* _mesa_function_pool[35502]: WindowPos2fMESA (will be remapped) */
+   /* _mesa_function_pool[35497]: WindowPos2fMESA (will be remapped) */
    "ff\0"
    "glWindowPos2f\0"
    "glWindowPos2fARB\0"
@@ -5136,687 +5133,686 @@ static const char _mesa_function_pool[] =
 
 /* these functions need to be remapped */
 static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
-   {  1758, AttachShader_remap_index },
-   { 10938, CreateProgram_remap_index },
-   { 24675, CreateShader_remap_index },
-   { 27375, DeleteProgram_remap_index },
-   { 20075, DeleteShader_remap_index },
-   { 25204, DetachShader_remap_index },
-   { 19361, GetAttachedShaders_remap_index },
-   {  5435, GetProgramInfoLog_remap_index },
+   {  1731, AttachShader_remap_index },
+   { 10911, CreateProgram_remap_index },
+   { 24658, CreateShader_remap_index },
+   { 27358, DeleteProgram_remap_index },
+   { 20058, DeleteShader_remap_index },
+   { 25187, DetachShader_remap_index },
+   { 19334, GetAttachedShaders_remap_index },
+   {  5408, GetProgramInfoLog_remap_index },
    {   453, GetProgramiv_remap_index },
-   {  7379, GetShaderInfoLog_remap_index },
-   { 33250, GetShaderiv_remap_index },
-   { 14448, IsProgram_remap_index },
-   { 13350, IsShader_remap_index },
-   { 11068, StencilFuncSeparate_remap_index },
-   {  4312, StencilMaskSeparate_remap_index },
-   {  8508, StencilOpSeparate_remap_index },
-   { 23870, UniformMatrix2x3fv_remap_index },
-   {  3181, UniformMatrix2x4fv_remap_index },
-   { 35075, UniformMatrix3x2fv_remap_index },
-   { 32575, UniformMatrix3x4fv_remap_index },
-   { 17481, UniformMatrix4x2fv_remap_index },
-   {  3620, UniformMatrix4x3fv_remap_index },
-   {  5658, ClampColor_remap_index },
-   { 19415, ClearBufferfi_remap_index },
-   { 18831, ClearBufferfv_remap_index },
-   { 31556, ClearBufferiv_remap_index },
-   { 14646, ClearBufferuiv_remap_index },
-   { 21412, GetStringi_remap_index },
-   { 19917, TexBuffer_remap_index },
+   {  7352, GetShaderInfoLog_remap_index },
+   { 33245, GetShaderiv_remap_index },
+   { 14421, IsProgram_remap_index },
+   { 13323, IsShader_remap_index },
+   { 11041, StencilFuncSeparate_remap_index },
+   {  4285, StencilMaskSeparate_remap_index },
+   {  8481, StencilOpSeparate_remap_index },
+   { 23853, UniformMatrix2x3fv_remap_index },
+   {  3154, UniformMatrix2x4fv_remap_index },
+   { 35070, UniformMatrix3x2fv_remap_index },
+   { 32570, UniformMatrix3x4fv_remap_index },
+   { 17454, UniformMatrix4x2fv_remap_index },
+   {  3593, UniformMatrix4x3fv_remap_index },
+   {  5631, ClampColor_remap_index },
+   { 19388, ClearBufferfi_remap_index },
+   { 18804, ClearBufferfv_remap_index },
+   { 31551, ClearBufferiv_remap_index },
+   { 14619, ClearBufferuiv_remap_index },
+   { 21395, GetStringi_remap_index },
    {   986, FramebufferTexture_remap_index },
-   { 28442, GetBufferParameteri64v_remap_index },
-   { 11168, GetInteger64i_v_remap_index },
-   { 25017, VertexAttribDivisor_remap_index },
-   { 10956, LoadTransposeMatrixdARB_remap_index },
-   { 32979, LoadTransposeMatrixfARB_remap_index },
-   {  6402, MultTransposeMatrixdARB_remap_index },
-   { 25391, MultTransposeMatrixfARB_remap_index },
+   { 28425, GetBufferParameteri64v_remap_index },
+   { 11141, GetInteger64i_v_remap_index },
+   { 25000, VertexAttribDivisor_remap_index },
+   { 10929, LoadTransposeMatrixdARB_remap_index },
+   { 32974, LoadTransposeMatrixfARB_remap_index },
+   {  6375, MultTransposeMatrixdARB_remap_index },
+   { 25374, MultTransposeMatrixfARB_remap_index },
    {   264, SampleCoverageARB_remap_index },
-   {  6586, CompressedTexImage1DARB_remap_index },
-   { 25919, CompressedTexImage2DARB_remap_index },
-   {  4375, CompressedTexImage3DARB_remap_index },
-   { 19666, CompressedTexSubImage1DARB_remap_index },
-   {  2326, CompressedTexSubImage2DARB_remap_index },
-   { 21834, CompressedTexSubImage3DARB_remap_index },
-   { 30620, GetCompressedTexImageARB_remap_index },
-   {  4186, DisableVertexAttribArrayARB_remap_index },
-   { 32140, EnableVertexAttribArrayARB_remap_index },
-   { 34093, GetProgramEnvParameterdvARB_remap_index },
-   { 25271, GetProgramEnvParameterfvARB_remap_index },
-   { 29490, GetProgramLocalParameterdvARB_remap_index },
-   {  8978, GetProgramLocalParameterfvARB_remap_index },
-   { 19823, GetProgramStringARB_remap_index },
-   { 29685, GetProgramivARB_remap_index },
-   { 22029, GetVertexAttribdvARB_remap_index },
-   { 17314, GetVertexAttribfvARB_remap_index },
-   { 10747, GetVertexAttribivARB_remap_index },
-   { 20867, ProgramEnvParameter4dARB_remap_index },
-   { 27084, ProgramEnvParameter4dvARB_remap_index },
-   { 18133, ProgramEnvParameter4fARB_remap_index },
-   {  9886, ProgramEnvParameter4fvARB_remap_index },
-   {  4338, ProgramLocalParameter4dARB_remap_index },
-   { 14158, ProgramLocalParameter4dvARB_remap_index },
-   { 31577, ProgramLocalParameter4fARB_remap_index },
-   { 27761, ProgramLocalParameter4fvARB_remap_index },
-   { 30327, ProgramStringARB_remap_index },
-   { 21160, VertexAttrib1dARB_remap_index },
-   { 16915, VertexAttrib1dvARB_remap_index },
-   {  4534, VertexAttrib1fARB_remap_index },
-   { 35156, VertexAttrib1fvARB_remap_index },
-   {  8009, VertexAttrib1sARB_remap_index },
-   {  2521, VertexAttrib1svARB_remap_index },
-   { 16328, VertexAttrib2dARB_remap_index },
-   { 18852, VertexAttrib2dvARB_remap_index },
-   {  1808, VertexAttrib2fARB_remap_index },
-   { 18965, VertexAttrib2fvARB_remap_index },
-   { 34700, VertexAttrib2sARB_remap_index },
-   { 33730, VertexAttrib2svARB_remap_index },
-   { 12342, VertexAttrib3dARB_remap_index },
-   {  9553, VertexAttrib3dvARB_remap_index },
-   {  1895, VertexAttrib3fARB_remap_index },
-   { 24226, VertexAttrib3fvARB_remap_index },
-   { 30174, VertexAttrib3sARB_remap_index },
-   { 21771, VertexAttrib3svARB_remap_index },
-   {  5478, VertexAttrib4NbvARB_remap_index },
-   { 19238, VertexAttrib4NivARB_remap_index },
-   { 24181, VertexAttrib4NsvARB_remap_index },
-   { 25223, VertexAttrib4NubARB_remap_index },
-   { 33976, VertexAttrib4NubvARB_remap_index },
-   { 20518, VertexAttrib4NuivARB_remap_index },
-   {  3493, VertexAttrib4NusvARB_remap_index },
-   { 11956, VertexAttrib4bvARB_remap_index },
-   { 28812, VertexAttrib4dARB_remap_index },
-   { 22801, VertexAttrib4dvARB_remap_index },
-   { 12496, VertexAttrib4fARB_remap_index },
-   { 12900, VertexAttrib4fvARB_remap_index },
-   { 11342, VertexAttrib4ivARB_remap_index },
-   { 18645, VertexAttrib4sARB_remap_index },
-   { 33165, VertexAttrib4svARB_remap_index },
-   { 17938, VertexAttrib4ubvARB_remap_index },
-   { 32464, VertexAttrib4uivARB_remap_index },
-   { 21582, VertexAttrib4usvARB_remap_index },
-   { 23686, VertexAttribPointerARB_remap_index },
-   { 34873, BindBufferARB_remap_index },
-   {  7716, BufferDataARB_remap_index },
-   {  1626, BufferSubDataARB_remap_index },
-   { 32750, DeleteBuffersARB_remap_index },
-   { 35199, GenBuffersARB_remap_index },
-   { 19008, GetBufferParameterivARB_remap_index },
-   { 18085, GetBufferPointervARB_remap_index },
-   {  1579, GetBufferSubDataARB_remap_index },
-   { 32412, IsBufferARB_remap_index },
-   { 28286, MapBufferARB_remap_index },
-   { 33380, UnmapBufferARB_remap_index },
+   {  6559, CompressedTexImage1DARB_remap_index },
+   { 25902, CompressedTexImage2DARB_remap_index },
+   {  4348, CompressedTexImage3DARB_remap_index },
+   { 19639, CompressedTexSubImage1DARB_remap_index },
+   {  2299, CompressedTexSubImage2DARB_remap_index },
+   { 21817, CompressedTexSubImage3DARB_remap_index },
+   { 30615, GetCompressedTexImageARB_remap_index },
+   {  4159, DisableVertexAttribArrayARB_remap_index },
+   { 32135, EnableVertexAttribArrayARB_remap_index },
+   { 34088, GetProgramEnvParameterdvARB_remap_index },
+   { 25254, GetProgramEnvParameterfvARB_remap_index },
+   { 29473, GetProgramLocalParameterdvARB_remap_index },
+   {  8951, GetProgramLocalParameterfvARB_remap_index },
+   { 19796, GetProgramStringARB_remap_index },
+   { 29668, GetProgramivARB_remap_index },
+   { 22012, GetVertexAttribdvARB_remap_index },
+   { 17287, GetVertexAttribfvARB_remap_index },
+   { 10720, GetVertexAttribivARB_remap_index },
+   { 20850, ProgramEnvParameter4dARB_remap_index },
+   { 27067, ProgramEnvParameter4dvARB_remap_index },
+   { 18106, ProgramEnvParameter4fARB_remap_index },
+   {  9859, ProgramEnvParameter4fvARB_remap_index },
+   {  4311, ProgramLocalParameter4dARB_remap_index },
+   { 14131, ProgramLocalParameter4dvARB_remap_index },
+   { 31572, ProgramLocalParameter4fARB_remap_index },
+   { 27744, ProgramLocalParameter4fvARB_remap_index },
+   { 30322, ProgramStringARB_remap_index },
+   { 21143, VertexAttrib1dARB_remap_index },
+   { 16888, VertexAttrib1dvARB_remap_index },
+   {  4507, VertexAttrib1fARB_remap_index },
+   { 35151, VertexAttrib1fvARB_remap_index },
+   {  7982, VertexAttrib1sARB_remap_index },
+   {  2494, VertexAttrib1svARB_remap_index },
+   { 16301, VertexAttrib2dARB_remap_index },
+   { 18825, VertexAttrib2dvARB_remap_index },
+   {  1781, VertexAttrib2fARB_remap_index },
+   { 18938, VertexAttrib2fvARB_remap_index },
+   { 34695, VertexAttrib2sARB_remap_index },
+   { 33725, VertexAttrib2svARB_remap_index },
+   { 12315, VertexAttrib3dARB_remap_index },
+   {  9526, VertexAttrib3dvARB_remap_index },
+   {  1868, VertexAttrib3fARB_remap_index },
+   { 24209, VertexAttrib3fvARB_remap_index },
+   { 30169, VertexAttrib3sARB_remap_index },
+   { 21754, VertexAttrib3svARB_remap_index },
+   {  5451, VertexAttrib4NbvARB_remap_index },
+   { 19211, VertexAttrib4NivARB_remap_index },
+   { 24164, VertexAttrib4NsvARB_remap_index },
+   { 25206, VertexAttrib4NubARB_remap_index },
+   { 33971, VertexAttrib4NubvARB_remap_index },
+   { 20501, VertexAttrib4NuivARB_remap_index },
+   {  3466, VertexAttrib4NusvARB_remap_index },
+   { 11929, VertexAttrib4bvARB_remap_index },
+   { 28795, VertexAttrib4dARB_remap_index },
+   { 22784, VertexAttrib4dvARB_remap_index },
+   { 12469, VertexAttrib4fARB_remap_index },
+   { 12873, VertexAttrib4fvARB_remap_index },
+   { 11315, VertexAttrib4ivARB_remap_index },
+   { 18618, VertexAttrib4sARB_remap_index },
+   { 33160, VertexAttrib4svARB_remap_index },
+   { 17911, VertexAttrib4ubvARB_remap_index },
+   { 32459, VertexAttrib4uivARB_remap_index },
+   { 21565, VertexAttrib4usvARB_remap_index },
+   { 23669, VertexAttribPointerARB_remap_index },
+   { 34868, BindBufferARB_remap_index },
+   {  7689, BufferDataARB_remap_index },
+   {  1599, BufferSubDataARB_remap_index },
+   { 32745, DeleteBuffersARB_remap_index },
+   { 35194, GenBuffersARB_remap_index },
+   { 18981, GetBufferParameterivARB_remap_index },
+   { 18058, GetBufferPointervARB_remap_index },
+   {  1552, GetBufferSubDataARB_remap_index },
+   { 32407, IsBufferARB_remap_index },
+   { 28269, MapBufferARB_remap_index },
+   { 33375, UnmapBufferARB_remap_index },
    {   360, BeginQueryARB_remap_index },
-   { 21238, DeleteQueriesARB_remap_index },
-   { 13211, EndQueryARB_remap_index },
-   { 31099, GenQueriesARB_remap_index },
-   {  2218, GetQueryObjectivARB_remap_index },
-   { 18689, GetQueryObjectuivARB_remap_index },
-   {  1997, GetQueryivARB_remap_index },
-   { 21489, IsQueryARB_remap_index },
-   {  9163, AttachObjectARB_remap_index },
-   { 20037, CompileShaderARB_remap_index },
-   {  3562, CreateProgramObjectARB_remap_index },
-   {  7661, CreateShaderObjectARB_remap_index },
-   { 15611, DeleteObjectARB_remap_index },
-   { 25710, DetachObjectARB_remap_index },
-   { 12964, GetActiveUniformARB_remap_index },
-   { 10389, GetAttachedObjectsARB_remap_index },
-   { 10696, GetHandleARB_remap_index },
-   { 34906, GetInfoLogARB_remap_index },
-   { 34047, GetObjectParameterfvARB_remap_index },
-   { 29364, GetObjectParameterivARB_remap_index },
-   { 30857, GetShaderSourceARB_remap_index },
-   { 30034, GetUniformLocationARB_remap_index },
-   { 25493, GetUniformfvARB_remap_index },
-   { 13733, GetUniformivARB_remap_index },
-   { 21627, LinkProgramARB_remap_index },
-   { 21685, ShaderSourceARB_remap_index },
-   {  8408, Uniform1fARB_remap_index },
-   { 31803, Uniform1fvARB_remap_index },
-   { 23634, Uniform1iARB_remap_index },
-   { 22439, Uniform1ivARB_remap_index },
-   {  2470, Uniform2fARB_remap_index },
-   { 15447, Uniform2fvARB_remap_index },
-   { 28153, Uniform2iARB_remap_index },
-   {  2590, Uniform2ivARB_remap_index },
-   { 20147, Uniform3fARB_remap_index },
-   { 10419, Uniform3fvARB_remap_index },
-   {  7190, Uniform3iARB_remap_index },
-   { 18191, Uniform3ivARB_remap_index },
-   { 20673, Uniform4fARB_remap_index },
-   { 25357, Uniform4fvARB_remap_index },
-   { 26694, Uniform4iARB_remap_index },
-   { 21995, Uniform4ivARB_remap_index },
-   {  9215, UniformMatrix2fvARB_remap_index },
+   { 21221, DeleteQueriesARB_remap_index },
+   { 13184, EndQueryARB_remap_index },
+   { 31094, GenQueriesARB_remap_index },
+   {  2191, GetQueryObjectivARB_remap_index },
+   { 18662, GetQueryObjectuivARB_remap_index },
+   {  1970, GetQueryivARB_remap_index },
+   { 21472, IsQueryARB_remap_index },
+   {  9136, AttachObjectARB_remap_index },
+   { 20020, CompileShaderARB_remap_index },
+   {  3535, CreateProgramObjectARB_remap_index },
+   {  7634, CreateShaderObjectARB_remap_index },
+   { 15584, DeleteObjectARB_remap_index },
+   { 25693, DetachObjectARB_remap_index },
+   { 12937, GetActiveUniformARB_remap_index },
+   { 10362, GetAttachedObjectsARB_remap_index },
+   { 10669, GetHandleARB_remap_index },
+   { 34901, GetInfoLogARB_remap_index },
+   { 34042, GetObjectParameterfvARB_remap_index },
+   { 29347, GetObjectParameterivARB_remap_index },
+   { 30852, GetShaderSourceARB_remap_index },
+   { 30029, GetUniformLocationARB_remap_index },
+   { 25476, GetUniformfvARB_remap_index },
+   { 13706, GetUniformivARB_remap_index },
+   { 21610, LinkProgramARB_remap_index },
+   { 21668, ShaderSourceARB_remap_index },
+   {  8381, Uniform1fARB_remap_index },
+   { 31798, Uniform1fvARB_remap_index },
+   { 23617, Uniform1iARB_remap_index },
+   { 22422, Uniform1ivARB_remap_index },
+   {  2443, Uniform2fARB_remap_index },
+   { 15420, Uniform2fvARB_remap_index },
+   { 28136, Uniform2iARB_remap_index },
+   {  2563, Uniform2ivARB_remap_index },
+   { 20130, Uniform3fARB_remap_index },
+   { 10392, Uniform3fvARB_remap_index },
+   {  7163, Uniform3iARB_remap_index },
+   { 18164, Uniform3ivARB_remap_index },
+   { 20656, Uniform4fARB_remap_index },
+   { 25340, Uniform4fvARB_remap_index },
+   { 26677, Uniform4iARB_remap_index },
+   { 21978, Uniform4ivARB_remap_index },
+   {  9188, UniformMatrix2fvARB_remap_index },
    {    17, UniformMatrix3fvARB_remap_index },
-   {  3007, UniformMatrix4fvARB_remap_index },
-   { 27237, UseProgramObjectARB_remap_index },
-   { 16016, ValidateProgramARB_remap_index },
-   { 22844, BindAttribLocationARB_remap_index },
-   {  5523, GetActiveAttribARB_remap_index },
-   { 17872, GetAttribLocationARB_remap_index },
-   { 31488, DrawBuffersARB_remap_index },
-   { 31295, ClampColorARB_remap_index },
-   { 19283, DrawArraysInstancedARB_remap_index },
-   {  7251, DrawElementsInstancedARB_remap_index },
-   { 14263, RenderbufferStorageMultisample_remap_index },
-   { 14727, FramebufferTextureARB_remap_index },
-   { 27663, FramebufferTextureFaceARB_remap_index },
-   { 25859, ProgramParameteriARB_remap_index },
-   { 25175, VertexAttribDivisorARB_remap_index },
-   { 20721, FlushMappedBufferRange_remap_index },
-   { 29801, MapBufferRange_remap_index },
-   { 29708, TexBufferARB_remap_index },
-   { 17619, BindVertexArray_remap_index },
-   { 15820, GenVertexArrays_remap_index },
-   { 32342, CopyBufferSubData_remap_index },
-   { 33269, ClientWaitSync_remap_index },
-   {  2926, DeleteSync_remap_index },
-   {  8050, FenceSync_remap_index },
-   { 16387, GetInteger64v_remap_index },
-   { 24288, GetSynciv_remap_index },
-   { 31427, IsSync_remap_index },
-   { 10319, WaitSync_remap_index },
-   {  4154, DrawElementsBaseVertex_remap_index },
-   { 19875, DrawElementsInstancedBaseVertex_remap_index },
-   { 32654, DrawRangeElementsBaseVertex_remap_index },
-   { 28317, MultiDrawElementsBaseVertex_remap_index },
-   { 27157, BlendEquationSeparateiARB_remap_index },
-   { 19101, BlendEquationiARB_remap_index },
-   { 13672, BlendFuncSeparateiARB_remap_index },
-   { 10795, BlendFunciARB_remap_index },
-   {  5719, BindFragDataLocationIndexed_remap_index },
-   { 23202, GetFragDataIndex_remap_index },
-   {  9044, BindSampler_remap_index },
-   {  4513, DeleteSamplers_remap_index },
-   { 21094, GenSamplers_remap_index },
-   { 31333, GetSamplerParameterIiv_remap_index },
-   { 20615, GetSamplerParameterIuiv_remap_index },
-   {  5355, GetSamplerParameterfv_remap_index },
-   { 27394, GetSamplerParameteriv_remap_index },
-   { 15400, IsSampler_remap_index },
-   { 17572, SamplerParameterIiv_remap_index },
-   { 32693, SamplerParameterIuiv_remap_index },
-   { 23922, SamplerParameterf_remap_index },
-   { 17799, SamplerParameterfv_remap_index },
-   { 23897, SamplerParameteri_remap_index },
-   { 19477, SamplerParameteriv_remap_index },
-   { 15431, ColorP3ui_remap_index },
-   { 32916, ColorP3uiv_remap_index },
-   { 22545, ColorP4ui_remap_index },
-   { 14568, ColorP4uiv_remap_index },
-   { 10364, MultiTexCoordP1ui_remap_index },
-   { 13646, MultiTexCoordP1uiv_remap_index },
-   { 18583, MultiTexCoordP2ui_remap_index },
-   { 32114, MultiTexCoordP2uiv_remap_index },
-   { 15011, MultiTexCoordP3ui_remap_index },
-   { 11418, MultiTexCoordP3uiv_remap_index },
-   { 23487, MultiTexCoordP4ui_remap_index },
-   { 14757, MultiTexCoordP4uiv_remap_index },
-   { 31786, NormalP3ui_remap_index },
-   { 20369, NormalP3uiv_remap_index },
-   { 26599, SecondaryColorP3ui_remap_index },
-   { 20387, SecondaryColorP3uiv_remap_index },
+   {  2980, UniformMatrix4fvARB_remap_index },
+   { 27220, UseProgramObjectARB_remap_index },
+   { 15989, ValidateProgramARB_remap_index },
+   { 22827, BindAttribLocationARB_remap_index },
+   {  5496, GetActiveAttribARB_remap_index },
+   { 17845, GetAttribLocationARB_remap_index },
+   { 31483, DrawBuffersARB_remap_index },
+   { 31290, ClampColorARB_remap_index },
+   { 19256, DrawArraysInstancedARB_remap_index },
+   {  7224, DrawElementsInstancedARB_remap_index },
+   { 14236, RenderbufferStorageMultisample_remap_index },
+   { 14700, FramebufferTextureARB_remap_index },
+   { 27646, FramebufferTextureFaceARB_remap_index },
+   { 25842, ProgramParameteriARB_remap_index },
+   { 25158, VertexAttribDivisorARB_remap_index },
+   { 20704, FlushMappedBufferRange_remap_index },
+   { 29796, MapBufferRange_remap_index },
+   { 29691, TexBufferARB_remap_index },
+   { 17592, BindVertexArray_remap_index },
+   { 15793, GenVertexArrays_remap_index },
+   { 32337, CopyBufferSubData_remap_index },
+   { 33264, ClientWaitSync_remap_index },
+   {  2899, DeleteSync_remap_index },
+   {  8023, FenceSync_remap_index },
+   { 16360, GetInteger64v_remap_index },
+   { 24271, GetSynciv_remap_index },
+   { 31422, IsSync_remap_index },
+   { 10292, WaitSync_remap_index },
+   {  4127, DrawElementsBaseVertex_remap_index },
+   { 19848, DrawElementsInstancedBaseVertex_remap_index },
+   { 32649, DrawRangeElementsBaseVertex_remap_index },
+   { 28300, MultiDrawElementsBaseVertex_remap_index },
+   { 27140, BlendEquationSeparateiARB_remap_index },
+   { 19074, BlendEquationiARB_remap_index },
+   { 13645, BlendFuncSeparateiARB_remap_index },
+   { 10768, BlendFunciARB_remap_index },
+   {  5692, BindFragDataLocationIndexed_remap_index },
+   { 23185, GetFragDataIndex_remap_index },
+   {  9017, BindSampler_remap_index },
+   {  4486, DeleteSamplers_remap_index },
+   { 21077, GenSamplers_remap_index },
+   { 31328, GetSamplerParameterIiv_remap_index },
+   { 20598, GetSamplerParameterIuiv_remap_index },
+   {  5328, GetSamplerParameterfv_remap_index },
+   { 27377, GetSamplerParameteriv_remap_index },
+   { 15373, IsSampler_remap_index },
+   { 17545, SamplerParameterIiv_remap_index },
+   { 32688, SamplerParameterIuiv_remap_index },
+   { 23905, SamplerParameterf_remap_index },
+   { 17772, SamplerParameterfv_remap_index },
+   { 23880, SamplerParameteri_remap_index },
+   { 19450, SamplerParameteriv_remap_index },
+   { 15404, ColorP3ui_remap_index },
+   { 32911, ColorP3uiv_remap_index },
+   { 22528, ColorP4ui_remap_index },
+   { 14541, ColorP4uiv_remap_index },
+   { 10337, MultiTexCoordP1ui_remap_index },
+   { 13619, MultiTexCoordP1uiv_remap_index },
+   { 18556, MultiTexCoordP2ui_remap_index },
+   { 32109, MultiTexCoordP2uiv_remap_index },
+   { 14984, MultiTexCoordP3ui_remap_index },
+   { 11391, MultiTexCoordP3uiv_remap_index },
+   { 23470, MultiTexCoordP4ui_remap_index },
+   { 14730, MultiTexCoordP4uiv_remap_index },
+   { 31781, NormalP3ui_remap_index },
+   { 20352, NormalP3uiv_remap_index },
+   { 26582, SecondaryColorP3ui_remap_index },
+   { 20370, SecondaryColorP3uiv_remap_index },
    {  1013, TexCoordP1ui_remap_index },
-   {  2693, TexCoordP1uiv_remap_index },
-   { 15896, TexCoordP2ui_remap_index },
-   { 12021, TexCoordP2uiv_remap_index },
-   { 13605, TexCoordP3ui_remap_index },
-   { 22238, TexCoordP3uiv_remap_index },
-   {  2126, TexCoordP4ui_remap_index },
-   {  5986, TexCoordP4uiv_remap_index },
-   { 10838, VertexAttribP1ui_remap_index },
-   { 13014, VertexAttribP1uiv_remap_index },
-   {  8613, VertexAttribP2ui_remap_index },
-   { 30571, VertexAttribP2uiv_remap_index },
-   {  5052, VertexAttribP3ui_remap_index },
-   { 28226, VertexAttribP3uiv_remap_index },
-   { 15225, VertexAttribP4ui_remap_index },
-   { 17172, VertexAttribP4uiv_remap_index },
-   {  5461, VertexP2ui_remap_index },
-   { 16742, VertexP2uiv_remap_index },
-   {  3294, VertexP3ui_remap_index },
-   { 21201, VertexP3uiv_remap_index },
-   { 10347, VertexP4ui_remap_index },
-   { 34361, VertexP4uiv_remap_index },
-   {  5755, BindTransformFeedback_remap_index },
-   { 11218, DeleteTransformFeedbacks_remap_index },
-   {  7223, DrawTransformFeedback_remap_index },
-   { 10556, GenTransformFeedbacks_remap_index },
-   { 30217, IsTransformFeedback_remap_index },
-   {  1181, PauseTransformFeedback_remap_index },
-   {  6287, ResumeTransformFeedback_remap_index },
-   { 23185, ClearDepthf_remap_index },
-   {  7609, DepthRangef_remap_index },
-   { 15632, GetShaderPrecisionFormat_remap_index },
-   { 11008, ReleaseShaderCompiler_remap_index },
-   { 11999, ShaderBinary_remap_index },
-   {  1507, DebugMessageCallbackARB_remap_index },
-   { 10714, DebugMessageControlARB_remap_index },
-   { 34811, DebugMessageInsertARB_remap_index },
-   {  3105, GetDebugMessageLogARB_remap_index },
-   { 30515, GetGraphicsResetStatusARB_remap_index },
-   { 26474, GetnColorTableARB_remap_index },
-   {  8813, GetnCompressedTexImageARB_remap_index },
-   {  4246, GetnConvolutionFilterARB_remap_index },
-   { 16958, GetnHistogramARB_remap_index },
-   {  4955, GetnMapdvARB_remap_index },
-   { 23665, GetnMapfvARB_remap_index },
-   {  2449, GetnMapivARB_remap_index },
-   { 18453, GetnMinmaxARB_remap_index },
-   {  4930, GetnPixelMapfvARB_remap_index },
-   { 20492, GetnPixelMapuivARB_remap_index },
-   { 31401, GetnPixelMapusvARB_remap_index },
-   {  1429, GetnPolygonStippleARB_remap_index },
-   { 22629, GetnSeparableFilterARB_remap_index },
-   { 34742, GetnTexImageARB_remap_index },
-   { 19850, GetnUniformdvARB_remap_index },
-   {  8081, GetnUniformfvARB_remap_index },
-   { 10863, GetnUniformivARB_remap_index },
-   { 24137, GetnUniformuivARB_remap_index },
-   {  3208, ReadnPixelsARB_remap_index },
-   {  1316, TexStorage1D_remap_index },
-   {  4820, TexStorage2D_remap_index },
-   { 17425, TexStorage3D_remap_index },
-   {  4976, TextureStorage1DEXT_remap_index },
-   {  5783, TextureStorage2DEXT_remap_index },
-   {  1777, TextureStorage3DEXT_remap_index },
-   {  6155, PolygonOffsetEXT_remap_index },
-   { 24910, GetPixelTexGenParameterfvSGIS_remap_index },
-   {  4880, GetPixelTexGenParameterivSGIS_remap_index },
-   { 24643, PixelTexGenParameterfSGIS_remap_index },
+   {  2666, TexCoordP1uiv_remap_index },
+   { 15869, TexCoordP2ui_remap_index },
+   { 11994, TexCoordP2uiv_remap_index },
+   { 13578, TexCoordP3ui_remap_index },
+   { 22221, TexCoordP3uiv_remap_index },
+   {  2099, TexCoordP4ui_remap_index },
+   {  5959, TexCoordP4uiv_remap_index },
+   { 10811, VertexAttribP1ui_remap_index },
+   { 12987, VertexAttribP1uiv_remap_index },
+   {  8586, VertexAttribP2ui_remap_index },
+   { 30566, VertexAttribP2uiv_remap_index },
+   {  5025, VertexAttribP3ui_remap_index },
+   { 28209, VertexAttribP3uiv_remap_index },
+   { 15198, VertexAttribP4ui_remap_index },
+   { 17145, VertexAttribP4uiv_remap_index },
+   {  5434, VertexP2ui_remap_index },
+   { 16715, VertexP2uiv_remap_index },
+   {  3267, VertexP3ui_remap_index },
+   { 21184, VertexP3uiv_remap_index },
+   { 10320, VertexP4ui_remap_index },
+   { 34356, VertexP4uiv_remap_index },
+   {  5728, BindTransformFeedback_remap_index },
+   { 11191, DeleteTransformFeedbacks_remap_index },
+   {  7196, DrawTransformFeedback_remap_index },
+   { 10529, GenTransformFeedbacks_remap_index },
+   { 30212, IsTransformFeedback_remap_index },
+   { 19890, PauseTransformFeedback_remap_index },
+   {  6260, ResumeTransformFeedback_remap_index },
+   { 23168, ClearDepthf_remap_index },
+   {  7582, DepthRangef_remap_index },
+   { 15605, GetShaderPrecisionFormat_remap_index },
+   { 10981, ReleaseShaderCompiler_remap_index },
+   { 11972, ShaderBinary_remap_index },
+   {  1480, DebugMessageCallbackARB_remap_index },
+   { 10687, DebugMessageControlARB_remap_index },
+   { 34806, DebugMessageInsertARB_remap_index },
+   {  3078, GetDebugMessageLogARB_remap_index },
+   { 30510, GetGraphicsResetStatusARB_remap_index },
+   { 26457, GetnColorTableARB_remap_index },
+   {  8786, GetnCompressedTexImageARB_remap_index },
+   {  4219, GetnConvolutionFilterARB_remap_index },
+   { 16931, GetnHistogramARB_remap_index },
+   {  4928, GetnMapdvARB_remap_index },
+   { 23648, GetnMapfvARB_remap_index },
+   {  2422, GetnMapivARB_remap_index },
+   { 18426, GetnMinmaxARB_remap_index },
+   {  4903, GetnPixelMapfvARB_remap_index },
+   { 20475, GetnPixelMapuivARB_remap_index },
+   { 31396, GetnPixelMapusvARB_remap_index },
+   {  1402, GetnPolygonStippleARB_remap_index },
+   { 22612, GetnSeparableFilterARB_remap_index },
+   { 34737, GetnTexImageARB_remap_index },
+   { 19823, GetnUniformdvARB_remap_index },
+   {  8054, GetnUniformfvARB_remap_index },
+   { 10836, GetnUniformivARB_remap_index },
+   { 24120, GetnUniformuivARB_remap_index },
+   {  3181, ReadnPixelsARB_remap_index },
+   {  1289, TexStorage1D_remap_index },
+   {  4793, TexStorage2D_remap_index },
+   { 17398, TexStorage3D_remap_index },
+   {  4949, TextureStorage1DEXT_remap_index },
+   {  5756, TextureStorage2DEXT_remap_index },
+   {  1750, TextureStorage3DEXT_remap_index },
+   {  6128, PolygonOffsetEXT_remap_index },
+   { 24893, GetPixelTexGenParameterfvSGIS_remap_index },
+   {  4853, GetPixelTexGenParameterivSGIS_remap_index },
+   { 24626, PixelTexGenParameterfSGIS_remap_index },
    {   672, PixelTexGenParameterfvSGIS_remap_index },
-   { 13771, PixelTexGenParameteriSGIS_remap_index },
-   { 14910, PixelTexGenParameterivSGIS_remap_index },
-   { 17742, SampleMaskSGIS_remap_index },
-   { 21429, SamplePatternSGIS_remap_index },
-   { 21112, ColorPointerEXT_remap_index },
-   { 18895, EdgeFlagPointerEXT_remap_index },
-   {  6844, IndexPointerEXT_remap_index },
-   {  6924, NormalPointerEXT_remap_index },
-   { 17026, TexCoordPointerEXT_remap_index },
-   {  7839, VertexPointerEXT_remap_index },
-   {  3956, PointParameterfEXT_remap_index },
-   {  8709, PointParameterfvEXT_remap_index },
-   { 34145, LockArraysEXT_remap_index },
-   { 16080, UnlockArraysEXT_remap_index },
-   {  1337, SecondaryColor3bEXT_remap_index },
-   {  8902, SecondaryColor3bvEXT_remap_index },
-   { 11545, SecondaryColor3dEXT_remap_index },
-   { 27443, SecondaryColor3dvEXT_remap_index },
-   { 30083, SecondaryColor3fEXT_remap_index },
-   { 19602, SecondaryColor3fvEXT_remap_index },
+   { 13744, PixelTexGenParameteriSGIS_remap_index },
+   { 14883, PixelTexGenParameterivSGIS_remap_index },
+   { 17715, SampleMaskSGIS_remap_index },
+   { 21412, SamplePatternSGIS_remap_index },
+   { 21095, ColorPointerEXT_remap_index },
+   { 18868, EdgeFlagPointerEXT_remap_index },
+   {  6817, IndexPointerEXT_remap_index },
+   {  6897, NormalPointerEXT_remap_index },
+   { 16999, TexCoordPointerEXT_remap_index },
+   {  7812, VertexPointerEXT_remap_index },
+   {  3929, PointParameterfEXT_remap_index },
+   {  8682, PointParameterfvEXT_remap_index },
+   { 34140, LockArraysEXT_remap_index },
+   { 16053, UnlockArraysEXT_remap_index },
+   {  1310, SecondaryColor3bEXT_remap_index },
+   {  8875, SecondaryColor3bvEXT_remap_index },
+   { 11518, SecondaryColor3dEXT_remap_index },
+   { 27426, SecondaryColor3dvEXT_remap_index },
+   { 30078, SecondaryColor3fEXT_remap_index },
+   { 19575, SecondaryColor3fvEXT_remap_index },
    {   518, SecondaryColor3iEXT_remap_index },
-   { 17362, SecondaryColor3ivEXT_remap_index },
-   { 11096, SecondaryColor3sEXT_remap_index },
-   { 32933, SecondaryColor3svEXT_remap_index },
-   { 29200, SecondaryColor3ubEXT_remap_index },
-   { 22735, SecondaryColor3ubvEXT_remap_index },
-   { 14013, SecondaryColor3uiEXT_remap_index },
-   { 24530, SecondaryColor3uivEXT_remap_index },
-   { 27713, SecondaryColor3usEXT_remap_index },
-   { 14086, SecondaryColor3usvEXT_remap_index },
-   { 12843, SecondaryColorPointerEXT_remap_index },
-   { 27527, MultiDrawArraysEXT_remap_index },
-   { 22374, MultiDrawElementsEXT_remap_index },
-   { 22585, FogCoordPointerEXT_remap_index },
-   {  5103, FogCoorddEXT_remap_index },
-   { 33546, FogCoorddvEXT_remap_index },
-   {  5220, FogCoordfEXT_remap_index },
-   { 29123, FogCoordfvEXT_remap_index },
-   { 12943, PixelTexGenSGIX_remap_index },
-   { 29728, BlendFuncSeparateEXT_remap_index },
-   {  7751, FlushVertexArrayRangeNV_remap_index },
-   {  6104, VertexArrayRangeNV_remap_index },
-   { 30148, CombinerInputNV_remap_index },
-   {  2392, CombinerOutputNV_remap_index },
-   { 33086, CombinerParameterfNV_remap_index },
-   {  5958, CombinerParameterfvNV_remap_index },
-   { 23947, CombinerParameteriNV_remap_index },
-   { 34542, CombinerParameterivNV_remap_index },
-   {  8152, FinalCombinerInputNV_remap_index },
-   {  7404, GetCombinerInputParameterfvNV_remap_index },
-   { 34379, GetCombinerInputParameterivNV_remap_index },
-   { 27856, GetCombinerOutputParameterfvNV_remap_index },
-   { 14839, GetCombinerOutputParameterivNV_remap_index },
-   {  7513, GetFinalCombinerInputParameterfvNV_remap_index },
-   { 26541, GetFinalCombinerInputParameterivNV_remap_index },
-   { 13624, ResizeBuffersMESA_remap_index },
-   { 12169, WindowPos2dMESA_remap_index },
+   { 17335, SecondaryColor3ivEXT_remap_index },
+   { 11069, SecondaryColor3sEXT_remap_index },
+   { 32928, SecondaryColor3svEXT_remap_index },
+   { 29183, SecondaryColor3ubEXT_remap_index },
+   { 22718, SecondaryColor3ubvEXT_remap_index },
+   { 13986, SecondaryColor3uiEXT_remap_index },
+   { 24513, SecondaryColor3uivEXT_remap_index },
+   { 27696, SecondaryColor3usEXT_remap_index },
+   { 14059, SecondaryColor3usvEXT_remap_index },
+   { 12816, SecondaryColorPointerEXT_remap_index },
+   { 27510, MultiDrawArraysEXT_remap_index },
+   { 22357, MultiDrawElementsEXT_remap_index },
+   { 22568, FogCoordPointerEXT_remap_index },
+   {  5076, FogCoorddEXT_remap_index },
+   { 33541, FogCoorddvEXT_remap_index },
+   {  5193, FogCoordfEXT_remap_index },
+   { 29106, FogCoordfvEXT_remap_index },
+   { 12916, PixelTexGenSGIX_remap_index },
+   { 29723, BlendFuncSeparateEXT_remap_index },
+   {  7724, FlushVertexArrayRangeNV_remap_index },
+   {  6077, VertexArrayRangeNV_remap_index },
+   { 30143, CombinerInputNV_remap_index },
+   {  2365, CombinerOutputNV_remap_index },
+   { 33081, CombinerParameterfNV_remap_index },
+   {  5931, CombinerParameterfvNV_remap_index },
+   { 23930, CombinerParameteriNV_remap_index },
+   { 34537, CombinerParameterivNV_remap_index },
+   {  8125, FinalCombinerInputNV_remap_index },
+   {  7377, GetCombinerInputParameterfvNV_remap_index },
+   { 34374, GetCombinerInputParameterivNV_remap_index },
+   { 27839, GetCombinerOutputParameterfvNV_remap_index },
+   { 14812, GetCombinerOutputParameterivNV_remap_index },
+   {  7486, GetFinalCombinerInputParameterfvNV_remap_index },
+   { 26524, GetFinalCombinerInputParameterivNV_remap_index },
+   { 13597, ResizeBuffersMESA_remap_index },
+   { 12142, WindowPos2dMESA_remap_index },
    {  1082, WindowPos2dvMESA_remap_index },
-   { 35502, WindowPos2fMESA_remap_index },
-   {  8847, WindowPos2fvMESA_remap_index },
-   { 19549, WindowPos2iMESA_remap_index },
-   { 21902, WindowPos2ivMESA_remap_index },
-   { 22473, WindowPos2sMESA_remap_index },
-   {  6500, WindowPos2svMESA_remap_index },
-   {  8638, WindowPos3dMESA_remap_index },
-   { 15170, WindowPos3dvMESA_remap_index },
+   { 35497, WindowPos2fMESA_remap_index },
+   {  8820, WindowPos2fvMESA_remap_index },
+   { 19522, WindowPos2iMESA_remap_index },
+   { 21885, WindowPos2ivMESA_remap_index },
+   { 22456, WindowPos2sMESA_remap_index },
+   {  6473, WindowPos2svMESA_remap_index },
+   {  8611, WindowPos3dMESA_remap_index },
+   { 15143, WindowPos3dvMESA_remap_index },
    {   564, WindowPos3fMESA_remap_index },
-   { 16141, WindowPos3fvMESA_remap_index },
-   { 25752, WindowPos3iMESA_remap_index },
-   { 32287, WindowPos3ivMESA_remap_index },
-   { 20291, WindowPos3sMESA_remap_index },
-   { 33802, WindowPos3svMESA_remap_index },
-   { 12120, WindowPos4dMESA_remap_index },
-   { 18329, WindowPos4dvMESA_remap_index },
-   { 15129, WindowPos4fMESA_remap_index },
-   { 32823, WindowPos4fvMESA_remap_index },
-   { 32440, WindowPos4iMESA_remap_index },
-   { 13464, WindowPos4ivMESA_remap_index },
-   { 20468, WindowPos4sMESA_remap_index },
-   {  3540, WindowPos4svMESA_remap_index },
-   { 14878, MultiModeDrawArraysIBM_remap_index },
-   { 30970, MultiModeDrawElementsIBM_remap_index },
-   { 13239, DeleteFencesNV_remap_index },
-   { 29995, FinishFenceNV_remap_index },
-   {  4078, GenFencesNV_remap_index },
-   { 18309, GetFenceivNV_remap_index },
-   {  9115, IsFenceNV_remap_index },
-   { 35002, SetFenceNV_remap_index },
-   {  4590, TestFenceNV_remap_index },
-   { 33773, AreProgramsResidentNV_remap_index },
-   { 33128, BindProgramNV_remap_index },
-   { 27796, DeleteProgramsNV_remap_index },
-   { 22953, ExecuteProgramNV_remap_index },
-   { 35395, GenProgramsNV_remap_index },
-   { 25043, GetProgramParameterdvNV_remap_index },
-   { 11607, GetProgramParameterfvNV_remap_index },
-   { 28200, GetProgramStringNV_remap_index },
-   { 26129, GetProgramivNV_remap_index },
-   { 25306, GetTrackMatrixivNV_remap_index },
-   { 27985, GetVertexAttribPointervNV_remap_index },
-   { 11191, GetVertexAttribdvNV_remap_index },
-   { 20264, GetVertexAttribfvNV_remap_index },
-   { 19796, GetVertexAttribivNV_remap_index },
-   { 20751, IsProgramNV_remap_index },
-   { 10297, LoadProgramNV_remap_index },
-   { 29824, ProgramParameters4dvNV_remap_index },
-   { 26059, ProgramParameters4fvNV_remap_index },
-   { 22206, RequestResidentProgramsNV_remap_index },
-   { 32632, TrackMatrixNV_remap_index },
-   { 27489, VertexAttrib1dNV_remap_index },
-   { 14668, VertexAttrib1dvNV_remap_index },
-   { 30423, VertexAttrib1fNV_remap_index },
-   {  2732, VertexAttrib1fvNV_remap_index },
-   { 32880, VertexAttrib1sNV_remap_index },
-   { 16214, VertexAttrib1svNV_remap_index },
-   {  5411, VertexAttrib2dNV_remap_index },
-   { 19730, VertexAttrib2dvNV_remap_index },
-   { 21661, VertexAttrib2fNV_remap_index },
-   { 14134, VertexAttrib2fvNV_remap_index },
-   {  6712, VertexAttrib2sNV_remap_index },
-   { 20345, VertexAttrib2svNV_remap_index },
-   { 12317, VertexAttrib3dNV_remap_index },
-   { 34023, VertexAttrib3dvNV_remap_index },
-   { 11393, VertexAttrib3fNV_remap_index },
-   { 26501, VertexAttrib3fvNV_remap_index },
-   { 30398, VertexAttrib3sNV_remap_index },
-   { 25333, VertexAttrib3svNV_remap_index },
-   { 30944, VertexAttrib4dNV_remap_index },
-   { 35432, VertexAttrib4dvNV_remap_index },
-   {  5826, VertexAttrib4fNV_remap_index },
-   { 26896, VertexAttrib4fvNV_remap_index },
-   { 28696, VertexAttrib4sNV_remap_index },
-   {  1537, VertexAttrib4svNV_remap_index },
-   {  5586, VertexAttrib4ubNV_remap_index },
+   { 16114, WindowPos3fvMESA_remap_index },
+   { 25735, WindowPos3iMESA_remap_index },
+   { 32282, WindowPos3ivMESA_remap_index },
+   { 20274, WindowPos3sMESA_remap_index },
+   { 33797, WindowPos3svMESA_remap_index },
+   { 12093, WindowPos4dMESA_remap_index },
+   { 18302, WindowPos4dvMESA_remap_index },
+   { 15102, WindowPos4fMESA_remap_index },
+   { 32818, WindowPos4fvMESA_remap_index },
+   { 32435, WindowPos4iMESA_remap_index },
+   { 13437, WindowPos4ivMESA_remap_index },
+   { 20451, WindowPos4sMESA_remap_index },
+   {  3513, WindowPos4svMESA_remap_index },
+   { 14851, MultiModeDrawArraysIBM_remap_index },
+   { 30965, MultiModeDrawElementsIBM_remap_index },
+   { 13212, DeleteFencesNV_remap_index },
+   { 29990, FinishFenceNV_remap_index },
+   {  4051, GenFencesNV_remap_index },
+   { 18282, GetFenceivNV_remap_index },
+   {  9088, IsFenceNV_remap_index },
+   { 34997, SetFenceNV_remap_index },
+   {  4563, TestFenceNV_remap_index },
+   { 33768, AreProgramsResidentNV_remap_index },
+   { 33123, BindProgramNV_remap_index },
+   { 27779, DeleteProgramsNV_remap_index },
+   { 22936, ExecuteProgramNV_remap_index },
+   { 35390, GenProgramsNV_remap_index },
+   { 25026, GetProgramParameterdvNV_remap_index },
+   { 11580, GetProgramParameterfvNV_remap_index },
+   { 28183, GetProgramStringNV_remap_index },
+   { 26112, GetProgramivNV_remap_index },
+   { 25289, GetTrackMatrixivNV_remap_index },
+   { 27968, GetVertexAttribPointervNV_remap_index },
+   { 11164, GetVertexAttribdvNV_remap_index },
+   { 20247, GetVertexAttribfvNV_remap_index },
+   { 19769, GetVertexAttribivNV_remap_index },
+   { 20734, IsProgramNV_remap_index },
+   { 10270, LoadProgramNV_remap_index },
+   { 29819, ProgramParameters4dvNV_remap_index },
+   { 26042, ProgramParameters4fvNV_remap_index },
+   { 22189, RequestResidentProgramsNV_remap_index },
+   { 32627, TrackMatrixNV_remap_index },
+   { 27472, VertexAttrib1dNV_remap_index },
+   { 14641, VertexAttrib1dvNV_remap_index },
+   { 30418, VertexAttrib1fNV_remap_index },
+   {  2705, VertexAttrib1fvNV_remap_index },
+   { 32875, VertexAttrib1sNV_remap_index },
+   { 16187, VertexAttrib1svNV_remap_index },
+   {  5384, VertexAttrib2dNV_remap_index },
+   { 19703, VertexAttrib2dvNV_remap_index },
+   { 21644, VertexAttrib2fNV_remap_index },
+   { 14107, VertexAttrib2fvNV_remap_index },
+   {  6685, VertexAttrib2sNV_remap_index },
+   { 20328, VertexAttrib2svNV_remap_index },
+   { 12290, VertexAttrib3dNV_remap_index },
+   { 34018, VertexAttrib3dvNV_remap_index },
+   { 11366, VertexAttrib3fNV_remap_index },
+   { 26484, VertexAttrib3fvNV_remap_index },
+   { 30393, VertexAttrib3sNV_remap_index },
+   { 25316, VertexAttrib3svNV_remap_index },
+   { 30939, VertexAttrib4dNV_remap_index },
+   { 35427, VertexAttrib4dvNV_remap_index },
+   {  5799, VertexAttrib4fNV_remap_index },
+   { 26879, VertexAttrib4fvNV_remap_index },
+   { 28679, VertexAttrib4sNV_remap_index },
+   {  1510, VertexAttrib4svNV_remap_index },
+   {  5559, VertexAttrib4ubNV_remap_index },
    {   826, VertexAttrib4ubvNV_remap_index },
-   { 23154, VertexAttribPointerNV_remap_index },
-   {  2564, VertexAttribs1dvNV_remap_index },
-   { 20413, VertexAttribs1fvNV_remap_index },
-   { 35232, VertexAttribs1svNV_remap_index },
-   { 11444, VertexAttribs2dvNV_remap_index },
-   { 31937, VertexAttribs2fvNV_remap_index },
-   { 18921, VertexAttribs2svNV_remap_index },
-   {  6006, VertexAttribs3dvNV_remap_index },
-   {  2423, VertexAttribs3fvNV_remap_index },
-   { 32009, VertexAttribs3svNV_remap_index },
-   { 28786, VertexAttribs4dvNV_remap_index },
-   {  6078, VertexAttribs4fvNV_remap_index },
-   { 35019, VertexAttribs4svNV_remap_index },
-   { 31741, VertexAttribs4ubvNV_remap_index },
-   { 28856, GetTexBumpParameterfvATI_remap_index },
-   { 35273, GetTexBumpParameterivATI_remap_index },
-   { 19990, TexBumpParameterfvATI_remap_index },
-   { 22077, TexBumpParameterivATI_remap_index },
-   { 16778, AlphaFragmentOp1ATI_remap_index },
-   {  9130, AlphaFragmentOp2ATI_remap_index },
-   { 26417, AlphaFragmentOp3ATI_remap_index },
-   { 15102, BeginFragmentShaderATI_remap_index },
-   { 33327, BindFragmentShaderATI_remap_index },
-   { 25462, ColorFragmentOp1ATI_remap_index },
-   {  4786, ColorFragmentOp2ATI_remap_index },
-   { 33668, ColorFragmentOp3ATI_remap_index },
-   {  6244, DeleteFragmentShaderATI_remap_index },
-   { 35456, EndFragmentShaderATI_remap_index },
-   { 34570, GenFragmentShadersATI_remap_index },
-   { 27352, PassTexCoordATI_remap_index },
-   {  7819, SampleMapATI_remap_index },
-   { 29018, SetFragmentShaderConstantATI_remap_index },
+   { 23137, VertexAttribPointerNV_remap_index },
+   {  2537, VertexAttribs1dvNV_remap_index },
+   { 20396, VertexAttribs1fvNV_remap_index },
+   { 35227, VertexAttribs1svNV_remap_index },
+   { 11417, VertexAttribs2dvNV_remap_index },
+   { 31932, VertexAttribs2fvNV_remap_index },
+   { 18894, VertexAttribs2svNV_remap_index },
+   {  5979, VertexAttribs3dvNV_remap_index },
+   {  2396, VertexAttribs3fvNV_remap_index },
+   { 32004, VertexAttribs3svNV_remap_index },
+   { 28769, VertexAttribs4dvNV_remap_index },
+   {  6051, VertexAttribs4fvNV_remap_index },
+   { 35014, VertexAttribs4svNV_remap_index },
+   { 31736, VertexAttribs4ubvNV_remap_index },
+   { 28839, GetTexBumpParameterfvATI_remap_index },
+   { 35268, GetTexBumpParameterivATI_remap_index },
+   { 19973, TexBumpParameterfvATI_remap_index },
+   { 22060, TexBumpParameterivATI_remap_index },
+   { 16751, AlphaFragmentOp1ATI_remap_index },
+   {  9103, AlphaFragmentOp2ATI_remap_index },
+   { 26400, AlphaFragmentOp3ATI_remap_index },
+   { 15075, BeginFragmentShaderATI_remap_index },
+   { 33322, BindFragmentShaderATI_remap_index },
+   { 25445, ColorFragmentOp1ATI_remap_index },
+   {  4759, ColorFragmentOp2ATI_remap_index },
+   { 33663, ColorFragmentOp3ATI_remap_index },
+   {  6217, DeleteFragmentShaderATI_remap_index },
+   { 35451, EndFragmentShaderATI_remap_index },
+   { 34565, GenFragmentShadersATI_remap_index },
+   { 27335, PassTexCoordATI_remap_index },
+   {  7792, SampleMapATI_remap_index },
+   { 29001, SetFragmentShaderConstantATI_remap_index },
    {   411, PointParameteriNV_remap_index },
-   { 15356, PointParameterivNV_remap_index },
-   { 30783, ActiveStencilFaceEXT_remap_index },
-   { 29464, BindVertexArrayAPPLE_remap_index },
-   {  3054, DeleteVertexArraysAPPLE_remap_index },
-   { 19388, GenVertexArraysAPPLE_remap_index },
-   { 25108, IsVertexArrayAPPLE_remap_index },
+   { 15329, PointParameterivNV_remap_index },
+   { 30778, ActiveStencilFaceEXT_remap_index },
+   { 29447, BindVertexArrayAPPLE_remap_index },
+   {  3027, DeleteVertexArraysAPPLE_remap_index },
+   { 19361, GenVertexArraysAPPLE_remap_index },
+   { 25091, IsVertexArrayAPPLE_remap_index },
    {   867, GetProgramNamedParameterdvNV_remap_index },
-   {  3919, GetProgramNamedParameterfvNV_remap_index },
-   { 28887, ProgramNamedParameter4dNV_remap_index },
-   { 15695, ProgramNamedParameter4dvNV_remap_index },
-   {  9820, ProgramNamedParameter4fNV_remap_index },
-   { 12808, ProgramNamedParameter4fvNV_remap_index },
-   { 18240, PrimitiveRestartIndexNV_remap_index },
-   { 30597, PrimitiveRestartNV_remap_index },
-   { 26038, DepthBoundsEXT_remap_index },
-   {  1208, BlendEquationSeparateEXT_remap_index },
-   { 15915, BindFramebufferEXT_remap_index },
-   { 27572, BindRenderbufferEXT_remap_index },
-   { 10612, CheckFramebufferStatusEXT_remap_index },
-   { 24331, DeleteFramebuffersEXT_remap_index },
-   { 33925, DeleteRenderbuffersEXT_remap_index },
-   { 14585, FramebufferRenderbufferEXT_remap_index },
-   { 14783, FramebufferTexture1DEXT_remap_index },
-   { 12602, FramebufferTexture2DEXT_remap_index },
-   { 12222, FramebufferTexture3DEXT_remap_index },
-   { 24946, GenFramebuffersEXT_remap_index },
-   { 18786, GenRenderbuffersEXT_remap_index },
-   {  7555, GenerateMipmapEXT_remap_index },
-   { 23270, GetFramebufferAttachmentParameterivEXT_remap_index },
-   { 34476, GetRenderbufferParameterivEXT_remap_index },
-   { 21957, IsFramebufferEXT_remap_index },
-   { 35355, IsRenderbufferEXT_remap_index },
-   {  9062, RenderbufferStorageEXT_remap_index },
+   {  3892, GetProgramNamedParameterfvNV_remap_index },
+   { 28870, ProgramNamedParameter4dNV_remap_index },
+   { 15668, ProgramNamedParameter4dvNV_remap_index },
+   {  9793, ProgramNamedParameter4fNV_remap_index },
+   { 12781, ProgramNamedParameter4fvNV_remap_index },
+   { 18213, PrimitiveRestartIndexNV_remap_index },
+   { 30592, PrimitiveRestartNV_remap_index },
+   { 26021, DepthBoundsEXT_remap_index },
+   {  1181, BlendEquationSeparateEXT_remap_index },
+   { 15888, BindFramebufferEXT_remap_index },
+   { 27555, BindRenderbufferEXT_remap_index },
+   { 10585, CheckFramebufferStatusEXT_remap_index },
+   { 24314, DeleteFramebuffersEXT_remap_index },
+   { 33920, DeleteRenderbuffersEXT_remap_index },
+   { 14558, FramebufferRenderbufferEXT_remap_index },
+   { 14756, FramebufferTexture1DEXT_remap_index },
+   { 12575, FramebufferTexture2DEXT_remap_index },
+   { 12195, FramebufferTexture3DEXT_remap_index },
+   { 24929, GenFramebuffersEXT_remap_index },
+   { 18759, GenRenderbuffersEXT_remap_index },
+   {  7528, GenerateMipmapEXT_remap_index },
+   { 23253, GetFramebufferAttachmentParameterivEXT_remap_index },
+   { 34471, GetRenderbufferParameterivEXT_remap_index },
+   { 21940, IsFramebufferEXT_remap_index },
+   { 35350, IsRenderbufferEXT_remap_index },
+   {  9035, RenderbufferStorageEXT_remap_index },
    {   743, BlitFramebufferEXT_remap_index },
-   { 15481, BufferParameteriAPPLE_remap_index },
-   { 20783, FlushMappedBufferRangeAPPLE_remap_index },
-   {  2072, BindFragDataLocationEXT_remap_index },
-   { 10246, GetFragDataLocationEXT_remap_index },
-   { 11722, GetUniformuivEXT_remap_index },
-   { 34650, GetVertexAttribIivEXT_remap_index },
-   {  4607, GetVertexAttribIuivEXT_remap_index },
-   { 13072, Uniform1uiEXT_remap_index },
-   { 29909, Uniform1uivEXT_remap_index },
-   { 23812, Uniform2uiEXT_remap_index },
-   {  4750, Uniform2uivEXT_remap_index },
-   { 31223, Uniform3uiEXT_remap_index },
-   { 15842, Uniform3uivEXT_remap_index },
-   {  3843, Uniform4uiEXT_remap_index },
-   {  9596, Uniform4uivEXT_remap_index },
-   {  7336, VertexAttribI1iEXT_remap_index },
-   {  5613, VertexAttribI1ivEXT_remap_index },
-   {  2833, VertexAttribI1uiEXT_remap_index },
-   { 13862, VertexAttribI1uivEXT_remap_index },
+   { 15454, BufferParameteriAPPLE_remap_index },
+   { 20766, FlushMappedBufferRangeAPPLE_remap_index },
+   {  2045, BindFragDataLocationEXT_remap_index },
+   { 10219, GetFragDataLocationEXT_remap_index },
+   { 11695, GetUniformuivEXT_remap_index },
+   { 34645, GetVertexAttribIivEXT_remap_index },
+   {  4580, GetVertexAttribIuivEXT_remap_index },
+   { 13045, Uniform1uiEXT_remap_index },
+   { 29904, Uniform1uivEXT_remap_index },
+   { 23795, Uniform2uiEXT_remap_index },
+   {  4723, Uniform2uivEXT_remap_index },
+   { 31218, Uniform3uiEXT_remap_index },
+   { 15815, Uniform3uivEXT_remap_index },
+   {  3816, Uniform4uiEXT_remap_index },
+   {  9569, Uniform4uivEXT_remap_index },
+   {  7309, VertexAttribI1iEXT_remap_index },
+   {  5586, VertexAttribI1ivEXT_remap_index },
+   {  2806, VertexAttribI1uiEXT_remap_index },
+   { 13835, VertexAttribI1uivEXT_remap_index },
    {    81, VertexAttribI2iEXT_remap_index },
-   { 25574, VertexAttribI2ivEXT_remap_index },
-   {  6032, VertexAttribI2uiEXT_remap_index },
-   {  5265, VertexAttribI2uivEXT_remap_index },
-   { 28488, VertexAttribI3iEXT_remap_index },
-   { 26851, VertexAttribI3ivEXT_remap_index },
-   {  3697, VertexAttribI3uiEXT_remap_index },
-   { 32528, VertexAttribI3uivEXT_remap_index },
-   { 23546, VertexAttribI4bvEXT_remap_index },
-   { 15774, VertexAttribI4iEXT_remap_index },
-   {  1938, VertexAttribI4ivEXT_remap_index },
-   { 14495, VertexAttribI4svEXT_remap_index },
-   { 17825, VertexAttribI4ubvEXT_remap_index },
+   { 25557, VertexAttribI2ivEXT_remap_index },
+   {  6005, VertexAttribI2uiEXT_remap_index },
+   {  5238, VertexAttribI2uivEXT_remap_index },
+   { 28471, VertexAttribI3iEXT_remap_index },
+   { 26834, VertexAttribI3ivEXT_remap_index },
+   {  3670, VertexAttribI3uiEXT_remap_index },
+   { 32523, VertexAttribI3uivEXT_remap_index },
+   { 23529, VertexAttribI4bvEXT_remap_index },
+   { 15747, VertexAttribI4iEXT_remap_index },
+   {  1911, VertexAttribI4ivEXT_remap_index },
+   { 14468, VertexAttribI4svEXT_remap_index },
+   { 17798, VertexAttribI4ubvEXT_remap_index },
    {   145, VertexAttribI4uiEXT_remap_index },
-   {  6178, VertexAttribI4uivEXT_remap_index },
-   { 12385, VertexAttribI4usvEXT_remap_index },
-   { 19934, VertexAttribIPointerEXT_remap_index },
-   {  3355, FramebufferTextureLayerEXT_remap_index },
-   { 10204, ColorMaskIndexedEXT_remap_index },
-   { 28073, DisableIndexedEXT_remap_index },
-   { 28533, EnableIndexedEXT_remap_index },
-   { 23225, GetBooleanIndexedvEXT_remap_index },
-   { 26151, GetIntegerIndexedvEXT_remap_index },
-   { 24407, IsEnabledIndexedEXT_remap_index },
-   { 24307, ClearColorIiEXT_remap_index },
-   {  3793, ClearColorIuiEXT_remap_index },
-   { 10888, GetTexParameterIivEXT_remap_index },
-   {  6660, GetTexParameterIuivEXT_remap_index },
-   {  3311, TexParameterIivEXT_remap_index },
-   { 28355, TexParameterIuivEXT_remap_index },
-   {  5133, BeginConditionalRenderNV_remap_index },
-   { 27302, EndConditionalRenderNV_remap_index },
-   { 26196, BeginTransformFeedbackEXT_remap_index },
-   {  6736, BindBufferBaseEXT_remap_index },
-   { 24989, BindBufferOffsetEXT_remap_index },
-   { 13289, BindBufferRangeEXT_remap_index },
-   { 28967, EndTransformFeedbackEXT_remap_index },
-   {  5852, GetTransformFeedbackVaryingEXT_remap_index },
-   { 24003, TransformFeedbackVaryingsEXT_remap_index },
-   { 31642, ProvokingVertexEXT_remap_index },
-   { 11868, GetTexParameterPointervAPPLE_remap_index },
-   {  5675, TextureRangeAPPLE_remap_index },
-   { 12674, GetObjectParameterivAPPLE_remap_index },
-   { 21384, ObjectPurgeableAPPLE_remap_index },
-   {  6454, ObjectUnpurgeableAPPLE_remap_index },
-   { 18608, ActiveProgramEXT_remap_index },
-   {  4659, CreateShaderProgramEXT_remap_index },
-   { 30545, UseShaderProgramEXT_remap_index },
-   { 23027, TextureBarrierNV_remap_index },
-   { 30809, StencilFuncSeparateATI_remap_index },
-   {  6367, ProgramEnvParameters4fvEXT_remap_index },
-   { 18477, ProgramLocalParameters4fvEXT_remap_index },
-   { 15284, GetQueryObjecti64vEXT_remap_index },
-   { 11470, GetQueryObjectui64vEXT_remap_index },
-   { 25531, EGLImageTargetRenderbufferStorageOES_remap_index },
-   { 13178, EGLImageTargetTexture2DOES_remap_index },
+   {  6151, VertexAttribI4uivEXT_remap_index },
+   { 12358, VertexAttribI4usvEXT_remap_index },
+   { 19917, VertexAttribIPointerEXT_remap_index },
+   {  3328, FramebufferTextureLayerEXT_remap_index },
+   { 10177, ColorMaskIndexedEXT_remap_index },
+   { 28056, DisableIndexedEXT_remap_index },
+   { 28516, EnableIndexedEXT_remap_index },
+   { 23208, GetBooleanIndexedvEXT_remap_index },
+   { 26134, GetIntegerIndexedvEXT_remap_index },
+   { 24390, IsEnabledIndexedEXT_remap_index },
+   { 24290, ClearColorIiEXT_remap_index },
+   {  3766, ClearColorIuiEXT_remap_index },
+   { 10861, GetTexParameterIivEXT_remap_index },
+   {  6633, GetTexParameterIuivEXT_remap_index },
+   {  3284, TexParameterIivEXT_remap_index },
+   { 28338, TexParameterIuivEXT_remap_index },
+   {  5106, BeginConditionalRenderNV_remap_index },
+   { 27285, EndConditionalRenderNV_remap_index },
+   { 26179, BeginTransformFeedbackEXT_remap_index },
+   {  6709, BindBufferBaseEXT_remap_index },
+   { 24972, BindBufferOffsetEXT_remap_index },
+   { 13262, BindBufferRangeEXT_remap_index },
+   { 28950, EndTransformFeedbackEXT_remap_index },
+   {  5825, GetTransformFeedbackVaryingEXT_remap_index },
+   { 23986, TransformFeedbackVaryingsEXT_remap_index },
+   { 31637, ProvokingVertexEXT_remap_index },
+   { 11841, GetTexParameterPointervAPPLE_remap_index },
+   {  5648, TextureRangeAPPLE_remap_index },
+   { 12647, GetObjectParameterivAPPLE_remap_index },
+   { 21367, ObjectPurgeableAPPLE_remap_index },
+   {  6427, ObjectUnpurgeableAPPLE_remap_index },
+   { 18581, ActiveProgramEXT_remap_index },
+   {  4632, CreateShaderProgramEXT_remap_index },
+   { 30540, UseShaderProgramEXT_remap_index },
+   { 23010, TextureBarrierNV_remap_index },
+   { 30804, StencilFuncSeparateATI_remap_index },
+   {  6340, ProgramEnvParameters4fvEXT_remap_index },
+   { 18450, ProgramLocalParameters4fvEXT_remap_index },
+   { 15257, GetQueryObjecti64vEXT_remap_index },
+   { 11443, GetQueryObjectui64vEXT_remap_index },
+   { 25514, EGLImageTargetRenderbufferStorageOES_remap_index },
+   { 13151, EGLImageTargetTexture2DOES_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 */
-   {  2972, _gloffset_BlendColor },
+   {  2945, _gloffset_BlendColor },
    /* from GL_EXT_blend_minmax */
-   { 12279, _gloffset_BlendEquation },
+   { 12252, _gloffset_BlendEquation },
    /* from GL_EXT_color_subtable */
-   { 18351, _gloffset_ColorSubTable },
-   { 33857, _gloffset_CopyColorSubTable },
+   { 18324, _gloffset_ColorSubTable },
+   { 33852, _gloffset_CopyColorSubTable },
    /* from GL_EXT_convolution */
    {   305, _gloffset_ConvolutionFilter1D },
-   {  2771, _gloffset_CopyConvolutionFilter1D },
-   {  4449, _gloffset_GetConvolutionParameteriv },
-   {  9444, _gloffset_ConvolutionFilter2D },
-   {  9646, _gloffset_ConvolutionParameteriv },
-   { 10106, _gloffset_ConvolutionParameterfv },
-   { 22105, _gloffset_GetSeparableFilter },
-   { 25806, _gloffset_SeparableFilter2D },
-   { 26744, _gloffset_ConvolutionParameteri },
-   { 26936, _gloffset_ConvolutionParameterf },
-   { 28722, _gloffset_GetConvolutionParameterfv },
-   { 29630, _gloffset_GetConvolutionFilter },
-   { 32224, _gloffset_CopyConvolutionFilter2D },
+   {  2744, _gloffset_CopyConvolutionFilter1D },
+   {  4422, _gloffset_GetConvolutionParameteriv },
+   {  9417, _gloffset_ConvolutionFilter2D },
+   {  9619, _gloffset_ConvolutionParameteriv },
+   { 10079, _gloffset_ConvolutionParameterfv },
+   { 22088, _gloffset_GetSeparableFilter },
+   { 25789, _gloffset_SeparableFilter2D },
+   { 26727, _gloffset_ConvolutionParameteri },
+   { 26919, _gloffset_ConvolutionParameterf },
+   { 28705, _gloffset_GetConvolutionParameterfv },
+   { 29613, _gloffset_GetConvolutionFilter },
+   { 32219, _gloffset_CopyConvolutionFilter2D },
    /* from GL_EXT_copy_texture */
-   { 16274, _gloffset_CopyTexSubImage3D },
-   { 18038, _gloffset_CopyTexImage2D },
-   { 26327, _gloffset_CopyTexImage1D },
-   { 29311, _gloffset_CopyTexSubImage2D },
-   { 31837, _gloffset_CopyTexSubImage1D },
+   { 16247, _gloffset_CopyTexSubImage3D },
+   { 18011, _gloffset_CopyTexImage2D },
+   { 26310, _gloffset_CopyTexImage1D },
+   { 29294, _gloffset_CopyTexSubImage2D },
+   { 31832, _gloffset_CopyTexSubImage1D },
    /* from GL_EXT_draw_range_elements */
-   { 10471, _gloffset_DrawRangeElements },
+   { 10444, _gloffset_DrawRangeElements },
    /* from GL_EXT_histogram */
    {   904, _gloffset_Histogram },
-   {  3879, _gloffset_ResetHistogram },
-   { 11034, _gloffset_GetMinmax },
-   { 16608, _gloffset_GetHistogramParameterfv },
-   { 26252, _gloffset_GetMinmaxParameteriv },
-   { 28612, _gloffset_ResetMinmax },
-   { 29527, _gloffset_GetHistogramParameteriv },
-   { 30743, _gloffset_GetHistogram },
-   { 33443, _gloffset_Minmax },
-   { 35102, _gloffset_GetMinmaxParameterfv },
+   {  3852, _gloffset_ResetHistogram },
+   { 11007, _gloffset_GetMinmax },
+   { 16581, _gloffset_GetHistogramParameterfv },
+   { 26235, _gloffset_GetMinmaxParameteriv },
+   { 28595, _gloffset_ResetMinmax },
+   { 29510, _gloffset_GetHistogramParameteriv },
+   { 30738, _gloffset_GetHistogram },
+   { 33438, _gloffset_Minmax },
+   { 35097, _gloffset_GetMinmaxParameterfv },
    /* from GL_EXT_paletted_texture */
-   {  9306, _gloffset_ColorTable },
-   { 16454, _gloffset_GetColorTable },
-   { 24693, _gloffset_GetColorTableParameterfv },
-   { 26992, _gloffset_GetColorTableParameteriv },
+   {  9279, _gloffset_ColorTable },
+   { 16427, _gloffset_GetColorTable },
+   { 24676, _gloffset_GetColorTableParameterfv },
+   { 26975, _gloffset_GetColorTableParameteriv },
    /* from GL_EXT_subtexture */
-   {  7965, _gloffset_TexSubImage1D },
-   { 11795, _gloffset_TexSubImage2D },
+   {  7938, _gloffset_TexSubImage1D },
+   { 11768, _gloffset_TexSubImage2D },
    /* from GL_EXT_texture3D */
-   {  2031, _gloffset_TexImage3D },
-   { 24462, _gloffset_TexSubImage3D },
+   {  2004, _gloffset_TexImage3D },
+   { 24445, _gloffset_TexSubImage3D },
    /* from GL_EXT_texture_object */
-   {  3647, _gloffset_PrioritizeTextures },
-   {  8439, _gloffset_AreTexturesResident },
-   { 14692, _gloffset_GenTextures },
-   { 16985, _gloffset_DeleteTextures },
-   { 21064, _gloffset_IsTexture },
-   { 31902, _gloffset_BindTexture },
+   {  3620, _gloffset_PrioritizeTextures },
+   {  8412, _gloffset_AreTexturesResident },
+   { 14665, _gloffset_GenTextures },
+   { 16958, _gloffset_DeleteTextures },
+   { 21047, _gloffset_IsTexture },
+   { 31897, _gloffset_BindTexture },
    /* from GL_EXT_vertex_array */
-   { 25978, _gloffset_ArrayElement },
-   { 33031, _gloffset_GetPointerv },
-   { 34597, _gloffset_DrawArrays },
+   { 25961, _gloffset_ArrayElement },
+   { 33026, _gloffset_GetPointerv },
+   { 34592, _gloffset_DrawArrays },
    /* from GL_SGI_color_table */
-   {  8557, _gloffset_ColorTableParameteriv },
-   {  9306, _gloffset_ColorTable },
-   { 16454, _gloffset_GetColorTable },
-   { 16564, _gloffset_CopyColorTable },
-   { 20925, _gloffset_ColorTableParameterfv },
-   { 24693, _gloffset_GetColorTableParameterfv },
-   { 26992, _gloffset_GetColorTableParameteriv },
+   {  8530, _gloffset_ColorTableParameteriv },
+   {  9279, _gloffset_ColorTable },
+   { 16427, _gloffset_GetColorTable },
+   { 16537, _gloffset_CopyColorTable },
+   { 20908, _gloffset_ColorTableParameterfv },
+   { 24676, _gloffset_GetColorTableParameterfv },
+   { 26975, _gloffset_GetColorTableParameteriv },
    /* from GL_VERSION_1_3 */
    {   473, _gloffset_MultiTexCoord3sARB },
    {   705, _gloffset_ActiveTextureARB },
-   {  4688, _gloffset_MultiTexCoord1fvARB },
-   {  6949, _gloffset_MultiTexCoord3dARB },
-   {  6994, _gloffset_MultiTexCoord2iARB },
-   {  7118, _gloffset_MultiTexCoord2svARB },
-   {  9262, _gloffset_MultiTexCoord2fARB },
-   { 11500, _gloffset_MultiTexCoord3fvARB },
-   { 12041, _gloffset_MultiTexCoord4sARB },
-   { 12722, _gloffset_MultiTexCoord2dvARB },
-   { 13121, _gloffset_MultiTexCoord1svARB },
-   { 13486, _gloffset_MultiTexCoord3svARB },
-   { 13547, _gloffset_MultiTexCoord4iARB },
-   { 14403, _gloffset_MultiTexCoord3iARB },
-   { 15313, _gloffset_MultiTexCoord1dARB },
-   { 15510, _gloffset_MultiTexCoord3dvARB },
-   { 16826, _gloffset_MultiTexCoord3ivARB },
-   { 16871, _gloffset_MultiTexCoord2sARB },
-   { 18408, _gloffset_MultiTexCoord4ivARB },
-   { 20565, _gloffset_ClientActiveTextureARB },
-   { 22909, _gloffset_MultiTexCoord2dARB },
-   { 23390, _gloffset_MultiTexCoord4dvARB },
-   { 23767, _gloffset_MultiTexCoord4fvARB },
-   { 24834, _gloffset_MultiTexCoord3fARB },
-   { 27617, _gloffset_MultiTexCoord4dARB },
-   { 27895, _gloffset_MultiTexCoord1sARB },
-   { 28108, _gloffset_MultiTexCoord1dvARB },
-   { 29155, _gloffset_MultiTexCoord1ivARB },
-   { 29248, _gloffset_MultiTexCoord2ivARB },
-   { 29587, _gloffset_MultiTexCoord1iARB },
-   { 31018, _gloffset_MultiTexCoord4svARB },
-   { 31684, _gloffset_MultiTexCoord1fARB },
-   { 31963, _gloffset_MultiTexCoord4fARB },
-   { 34431, _gloffset_MultiTexCoord2fvARB },
+   {  4661, _gloffset_MultiTexCoord1fvARB },
+   {  6922, _gloffset_MultiTexCoord3dARB },
+   {  6967, _gloffset_MultiTexCoord2iARB },
+   {  7091, _gloffset_MultiTexCoord2svARB },
+   {  9235, _gloffset_MultiTexCoord2fARB },
+   { 11473, _gloffset_MultiTexCoord3fvARB },
+   { 12014, _gloffset_MultiTexCoord4sARB },
+   { 12695, _gloffset_MultiTexCoord2dvARB },
+   { 13094, _gloffset_MultiTexCoord1svARB },
+   { 13459, _gloffset_MultiTexCoord3svARB },
+   { 13520, _gloffset_MultiTexCoord4iARB },
+   { 14376, _gloffset_MultiTexCoord3iARB },
+   { 15286, _gloffset_MultiTexCoord1dARB },
+   { 15483, _gloffset_MultiTexCoord3dvARB },
+   { 16799, _gloffset_MultiTexCoord3ivARB },
+   { 16844, _gloffset_MultiTexCoord2sARB },
+   { 18381, _gloffset_MultiTexCoord4ivARB },
+   { 20548, _gloffset_ClientActiveTextureARB },
+   { 22892, _gloffset_MultiTexCoord2dARB },
+   { 23373, _gloffset_MultiTexCoord4dvARB },
+   { 23750, _gloffset_MultiTexCoord4fvARB },
+   { 24817, _gloffset_MultiTexCoord3fARB },
+   { 27600, _gloffset_MultiTexCoord4dARB },
+   { 27878, _gloffset_MultiTexCoord1sARB },
+   { 28091, _gloffset_MultiTexCoord1dvARB },
+   { 29138, _gloffset_MultiTexCoord1ivARB },
+   { 29231, _gloffset_MultiTexCoord2ivARB },
+   { 29570, _gloffset_MultiTexCoord1iARB },
+   { 31013, _gloffset_MultiTexCoord4svARB },
+   { 31679, _gloffset_MultiTexCoord1fARB },
+   { 31958, _gloffset_MultiTexCoord4fARB },
+   { 34426, _gloffset_MultiTexCoord2fvARB },
    {    -1, -1 }
 };
 
diff --git a/mesalib/src/mesa/main/teximage.c b/mesalib/src/mesa/main/teximage.c
index c54118212..23486467d 100644
--- a/mesalib/src/mesa/main/teximage.c
+++ b/mesalib/src/mesa/main/teximage.c
@@ -3746,228 +3746,186 @@ _mesa_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset,
                             width, height, depth, format, imageSize, data);
 }
 
-
-/**
- * Helper for glTexBuffer().  Check if internalFormat is legal.  If so,
- * return the basic data type and number of components for the format.
- * \param return  GL_TRUE if internalFormat is legal, GL_FALSE otherwise
- */
-static GLboolean
-get_sized_format_info(const struct gl_context *ctx, GLenum internalFormat,
-                      GLenum *datatype, GLuint *components)
+static gl_format
+get_texbuffer_format(const struct gl_context *ctx, GLenum internalFormat)
 {
    switch (internalFormat) {
    case GL_ALPHA8:
-      *datatype = GL_UNSIGNED_BYTE;
-      *components = 1;
-      break;
+      return MESA_FORMAT_A8;
    case GL_ALPHA16:
-      *datatype = GL_UNSIGNED_SHORT;
-      *components = 1;
-      break;
+      return MESA_FORMAT_A16;
    case GL_ALPHA16F_ARB:
-      *datatype = GL_HALF_FLOAT;
-      *components = 1;
-      break;
+      return MESA_FORMAT_ALPHA_FLOAT16;
    case GL_ALPHA32F_ARB:
-      *datatype = GL_FLOAT;
-      *components = 1;
-      break;
+      return MESA_FORMAT_ALPHA_FLOAT32;
    case GL_ALPHA8I_EXT:
-      *datatype = GL_BYTE;
-      *components = 1;
-      break;
+      return MESA_FORMAT_ALPHA_INT8;
    case GL_ALPHA16I_EXT:
-      *datatype = GL_SHORT;
-      *components = 1;
-      break;
+      return MESA_FORMAT_ALPHA_INT16;
    case GL_ALPHA32I_EXT:
-      *datatype = GL_INT;
-      *components = 1;
-      break;
+      return MESA_FORMAT_ALPHA_INT32;
    case GL_ALPHA8UI_EXT:
-      *datatype = GL_UNSIGNED_BYTE;
-      *components = 1;
-      break;
+      return MESA_FORMAT_ALPHA_UINT8;
    case GL_ALPHA16UI_EXT:
-      *datatype = GL_UNSIGNED_SHORT;
-      *components = 1;
-      break;
+      return MESA_FORMAT_ALPHA_UINT16;
    case GL_ALPHA32UI_EXT:
-      *datatype = GL_UNSIGNED_INT;
-      *components = 1;
-      break;
+      return MESA_FORMAT_ALPHA_UINT32;
    case GL_LUMINANCE8:
-      *datatype = GL_UNSIGNED_BYTE;
-      *components = 1;
-      break;
+      return MESA_FORMAT_L8;
    case GL_LUMINANCE16:
-      *datatype = GL_UNSIGNED_SHORT;
-      *components = 1;
-      break;
+      return MESA_FORMAT_L16;
    case GL_LUMINANCE16F_ARB:
-      *datatype = GL_HALF_FLOAT;
-      *components = 1;
-      break;
+      return MESA_FORMAT_LUMINANCE_FLOAT16;
    case GL_LUMINANCE32F_ARB:
-      *datatype = GL_FLOAT;
-      *components = 1;
-      break;
+      return MESA_FORMAT_LUMINANCE_FLOAT32;
    case GL_LUMINANCE8I_EXT:
-      *datatype = GL_BYTE;
-      *components = 1;
-      break;
+      return MESA_FORMAT_LUMINANCE_INT8;
    case GL_LUMINANCE16I_EXT:
-      *datatype = GL_SHORT;
-      *components = 1;
-      break;
+      return MESA_FORMAT_LUMINANCE_INT16;
    case GL_LUMINANCE32I_EXT:
-      *datatype = GL_INT;
-      *components = 1;
-      break;
+      return MESA_FORMAT_LUMINANCE_INT32;
    case GL_LUMINANCE8UI_EXT:
-      *datatype = GL_UNSIGNED_BYTE;
-      *components = 1;
-      break;
+      return MESA_FORMAT_LUMINANCE_UINT8;
    case GL_LUMINANCE16UI_EXT:
-      *datatype = GL_UNSIGNED_SHORT;
-      *components = 1;
-      break;
+      return MESA_FORMAT_LUMINANCE_UINT16;
    case GL_LUMINANCE32UI_EXT:
-      *datatype = GL_UNSIGNED_INT;
-      *components = 1;
-      break;
+      return MESA_FORMAT_LUMINANCE_UINT32;
    case GL_LUMINANCE8_ALPHA8:
-      *datatype = GL_UNSIGNED_BYTE;
-      *components = 2;
-      break;
+      return MESA_FORMAT_AL88;
    case GL_LUMINANCE16_ALPHA16:
-      *datatype = GL_UNSIGNED_SHORT;
-      *components = 2;
-      break;
+      return MESA_FORMAT_AL1616;
    case GL_LUMINANCE_ALPHA16F_ARB:
-      *datatype = GL_HALF_FLOAT;
-      *components = 2;
-      break;
+      return MESA_FORMAT_LUMINANCE_ALPHA_FLOAT16;
    case GL_LUMINANCE_ALPHA32F_ARB:
-      *datatype = GL_FLOAT;
-      *components = 2;
-      break;
+      return MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32;
    case GL_LUMINANCE_ALPHA8I_EXT:
-      *datatype = GL_BYTE;
-      *components = 2;
-      break;
+      return MESA_FORMAT_LUMINANCE_ALPHA_INT8;
    case GL_LUMINANCE_ALPHA16I_EXT:
-      *datatype = GL_SHORT;
-      *components = 2;
-      break;
+      return MESA_FORMAT_LUMINANCE_ALPHA_INT8;
    case GL_LUMINANCE_ALPHA32I_EXT:
-      *datatype = GL_INT;
-      *components = 2;
-      break;
+      return MESA_FORMAT_LUMINANCE_ALPHA_INT16;
    case GL_LUMINANCE_ALPHA8UI_EXT:
-      *datatype = GL_UNSIGNED_BYTE;
-      *components = 2;
-      break;
+      return MESA_FORMAT_LUMINANCE_ALPHA_UINT8;
    case GL_LUMINANCE_ALPHA16UI_EXT:
-      *datatype = GL_UNSIGNED_SHORT;
-      *components = 2;
-      break;
+      return MESA_FORMAT_LUMINANCE_ALPHA_UINT16;
    case GL_LUMINANCE_ALPHA32UI_EXT:
-      *datatype = GL_UNSIGNED_INT;
-      *components = 2;
-      break;
+      return MESA_FORMAT_LUMINANCE_ALPHA_UINT32;
    case GL_INTENSITY8:
-      *datatype = GL_UNSIGNED_BYTE;
-      *components = 1;
-      break;
+      return MESA_FORMAT_I8;
    case GL_INTENSITY16:
-      *datatype = GL_UNSIGNED_SHORT;
-      *components = 1;
-      break;
+      return MESA_FORMAT_I16;
    case GL_INTENSITY16F_ARB:
-      *datatype = GL_HALF_FLOAT;
-      *components = 1;
-      break;
+      return MESA_FORMAT_INTENSITY_FLOAT16;
    case GL_INTENSITY32F_ARB:
-      *datatype = GL_FLOAT;
-      *components = 1;
-      break;
+      return MESA_FORMAT_INTENSITY_FLOAT32;
    case GL_INTENSITY8I_EXT:
-      *datatype = GL_BYTE;
-      *components = 1;
-      break;
+      return MESA_FORMAT_INTENSITY_INT8;
    case GL_INTENSITY16I_EXT:
-      *datatype = GL_SHORT;
-      *components = 1;
-      break;
+      return MESA_FORMAT_INTENSITY_INT16;
    case GL_INTENSITY32I_EXT:
-      *datatype = GL_INT;
-      *components = 1;
-      break;
+      return MESA_FORMAT_INTENSITY_INT32;
    case GL_INTENSITY8UI_EXT:
-      *datatype = GL_UNSIGNED_BYTE;
-      *components = 1;
-      break;
+      return MESA_FORMAT_INTENSITY_UINT8;
    case GL_INTENSITY16UI_EXT:
-      *datatype = GL_UNSIGNED_SHORT;
-      *components = 1;
-      break;
+      return MESA_FORMAT_INTENSITY_UINT16;
    case GL_INTENSITY32UI_EXT:
-      *datatype = GL_UNSIGNED_INT;
-      *components = 1;
-      break;
+      return MESA_FORMAT_INTENSITY_UINT32;
    case GL_RGBA8:
-      *datatype = GL_UNSIGNED_BYTE;
-      *components = 4;
-      break;
+      return MESA_FORMAT_RGBA8888_REV;
    case GL_RGBA16:
-      *datatype = GL_UNSIGNED_SHORT;
-      *components = 4;
-      break;
+      return MESA_FORMAT_RGBA_16;
    case GL_RGBA16F_ARB:
-      *datatype = GL_HALF_FLOAT;
-      *components = 4;
-      break;
+      return MESA_FORMAT_RGBA_FLOAT16;
    case GL_RGBA32F_ARB:
-      *datatype = GL_FLOAT;
-      *components = 4;
-      break;
+      return MESA_FORMAT_RGBA_FLOAT32;
    case GL_RGBA8I_EXT:
-      *datatype = GL_BYTE;
-      *components = 4;
-      break;
+      return MESA_FORMAT_RGBA_INT8;
    case GL_RGBA16I_EXT:
-      *datatype = GL_SHORT;
-      *components = 4;
-      break;
+      return MESA_FORMAT_RGBA_INT16;
    case GL_RGBA32I_EXT:
-      *datatype = GL_INT;
-      *components = 4;
-      break;
+      return MESA_FORMAT_RGBA_INT32;
    case GL_RGBA8UI_EXT:
-      *datatype = GL_UNSIGNED_BYTE;
-      *components = 4;
-      break;
+      return MESA_FORMAT_RGBA_UINT8;
    case GL_RGBA16UI_EXT:
-      *datatype = GL_UNSIGNED_SHORT;
-      *components = 4;
-      break;
+      return MESA_FORMAT_RGBA_UINT16;
    case GL_RGBA32UI_EXT:
-      *datatype = GL_UNSIGNED_INT;
-      *components = 4;
-      break;
+      return MESA_FORMAT_RGBA_UINT32;
+
+   case GL_RG8:
+      return MESA_FORMAT_GR88;
+   case GL_RG16:
+      return MESA_FORMAT_RG1616;
+   case GL_RG16F:
+      return MESA_FORMAT_RG_FLOAT16;
+   case GL_RG32F:
+      return MESA_FORMAT_RG_FLOAT32;
+   case GL_RG8I:
+      return MESA_FORMAT_RG_INT8;
+   case GL_RG16I:
+      return MESA_FORMAT_RG_INT16;
+   case GL_RG32I:
+      return MESA_FORMAT_RG_INT32;
+   case GL_RG8UI:
+      return MESA_FORMAT_RG_UINT8;
+   case GL_RG16UI:
+      return MESA_FORMAT_RG_UINT16;
+   case GL_RG32UI:
+      return MESA_FORMAT_RG_UINT32;
+
+   case GL_R8:
+      return MESA_FORMAT_R8;
+   case GL_R16:
+      return MESA_FORMAT_R16;
+   case GL_R16F:
+      return MESA_FORMAT_R_FLOAT16;
+   case GL_R32F:
+      return MESA_FORMAT_R_FLOAT32;
+   case GL_R8I:
+      return MESA_FORMAT_R_INT8;
+   case GL_R16I:
+      return MESA_FORMAT_R_INT16;
+   case GL_R32I:
+      return MESA_FORMAT_R_INT32;
+   case GL_R8UI:
+      return MESA_FORMAT_R_UINT8;
+   case GL_R16UI:
+      return MESA_FORMAT_R_UINT16;
+   case GL_R32UI:
+      return MESA_FORMAT_R_UINT32;
+
    default:
-      return GL_FALSE;
+      return MESA_FORMAT_NONE;
    }
+}
 
-   if (*datatype == GL_FLOAT && !ctx->Extensions.ARB_texture_float)
-      return GL_FALSE;
+static gl_format
+validate_texbuffer_format(const struct gl_context *ctx, GLenum internalFormat)
+{
+   gl_format format = get_texbuffer_format(ctx, internalFormat);
+   GLenum datatype;
 
-   if (*datatype == GL_HALF_FLOAT && !ctx->Extensions.ARB_half_float_pixel)
-      return GL_FALSE;
+   if (format == MESA_FORMAT_NONE)
+      return MESA_FORMAT_NONE;
 
-   return GL_TRUE;
+   datatype = _mesa_get_format_datatype(format);
+   if (datatype == GL_FLOAT && !ctx->Extensions.ARB_texture_float)
+      return MESA_FORMAT_NONE;
+
+   if (datatype == GL_HALF_FLOAT && !ctx->Extensions.ARB_half_float_pixel)
+      return MESA_FORMAT_NONE;
+
+   /* The GL_ARB_texture_rg and GL_ARB_texture_buffer_object specs don't make
+    * any mention of R/RG formats, but they appear in the GL 3.1 core
+    * specification.
+    */
+   if (ctx->VersionMajor < 3 ||
+       (ctx->VersionMajor == 3 && ctx->VersionMinor == 0)) {
+      GLenum base_format = _mesa_get_format_base_format(format);
+
+      if (base_format == GL_R || base_format == GL_RG)
+	 return MESA_FORMAT_NONE;
+   }
+   return format;
 }
 
 
@@ -3977,8 +3935,7 @@ _mesa_TexBuffer(GLenum target, GLenum internalFormat, GLuint buffer)
 {
    struct gl_texture_object *texObj;
    struct gl_buffer_object *bufObj;
-   GLenum dataType;
-   GLuint comps;
+   gl_format format;
 
    GET_CURRENT_CONTEXT(ctx);
    ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
@@ -3993,7 +3950,8 @@ _mesa_TexBuffer(GLenum target, GLenum internalFormat, GLuint buffer)
       return;
    }
 
-   if (!get_sized_format_info(ctx, internalFormat, &dataType, &comps)) {
+   format = validate_texbuffer_format(ctx, internalFormat);
+   if (format == MESA_FORMAT_NONE) {
       _mesa_error(ctx, GL_INVALID_ENUM, "glTexBuffer(internalFormat 0x%x)",
                   internalFormat);
       return;
@@ -4011,6 +3969,7 @@ _mesa_TexBuffer(GLenum target, GLenum internalFormat, GLuint buffer)
    {
       _mesa_reference_buffer_object(ctx, &texObj->BufferObject, bufObj);
       texObj->BufferObjectFormat = internalFormat;
+      texObj->_BufferObjectFormat = format;
    }
    _mesa_unlock_texture(ctx, texObj);
 }
diff --git a/mesalib/src/mesa/main/texobj.c b/mesalib/src/mesa/main/texobj.c
index 97bef3543..4c3eed2b6 100644
--- a/mesalib/src/mesa/main/texobj.c
+++ b/mesalib/src/mesa/main/texobj.c
@@ -153,6 +153,8 @@ _mesa_initialize_texture_object( struct gl_texture_object *obj,
    obj->Swizzle[3] = GL_ALPHA;
    obj->_Swizzle = SWIZZLE_NOOP;
    obj->Sampler.sRGBDecode = GL_DECODE_EXT;
+   obj->BufferObjectFormat = GL_LUMINANCE8;
+   obj->_BufferObjectFormat = MESA_FORMAT_L8;
 }
 
 
@@ -448,6 +450,14 @@ _mesa_test_texobj_completeness( const struct gl_context *ctx,
    t->_BaseComplete = GL_TRUE;
    t->_MipmapComplete = GL_TRUE;
 
+   if (t->Target == GL_TEXTURE_BUFFER) {
+      /* Buffer textures are always considered complete.  The obvious case where
+       * they would be incomplete (no BO attached) is actually specced to be
+       * undefined rendering results.
+       */
+      return;
+   }
+
    /* Detect cases where the application set the base level to an invalid
     * value.
     */
@@ -755,6 +765,9 @@ _mesa_get_fallback_texture(struct gl_context *ctx, gl_texture_index tex)
          target = GL_TEXTURE_1D;
          break;
       case TEXTURE_BUFFER_INDEX:
+         dims = 0;
+         target = GL_TEXTURE_BUFFER;
+         break;
       case TEXTURE_EXTERNAL_INDEX:
       default:
          /* no-op */
@@ -793,6 +806,8 @@ _mesa_get_fallback_texture(struct gl_context *ctx, gl_texture_index tex)
                                     GL_RGBA, texFormat);
 
          switch (dims) {
+	 case 0:
+	    break;
          case 1:
             ctx->Driver.TexImage1D(ctx, texImage, GL_RGBA,
                                    width, 0,
diff --git a/mesalib/src/mesa/main/texstate.c b/mesalib/src/mesa/main/texstate.c
index ee778ffd0..8ca9092ce 100644
--- a/mesalib/src/mesa/main/texstate.c
+++ b/mesalib/src/mesa/main/texstate.c
@@ -390,6 +390,10 @@ update_tex_combine(struct gl_context *ctx, struct gl_texture_unit *texUnit)
 {
    struct gl_tex_env_combine_state *combine;
 
+   /* No combiners will apply to this. */
+   if (texUnit->_Current->Target == GL_TEXTURE_BUFFER)
+      return;
+
    /* Set the texUnit->_CurrentCombine field to point to the user's combiner
     * state, or the combiner state which is derived from traditional texenv
     * mode.
diff --git a/mesalib/src/mesa/program/ir_to_mesa.cpp b/mesalib/src/mesa/program/ir_to_mesa.cpp
index 6a90d5ad7..6f4a095dd 100644
--- a/mesalib/src/mesa/program/ir_to_mesa.cpp
+++ b/mesalib/src/mesa/program/ir_to_mesa.cpp
@@ -172,8 +172,6 @@ public:
    int sampler; /**< sampler index */
    int tex_target; /**< One of TEXTURE_*_INDEX */
    GLboolean tex_shadow;
-
-   class function_entry *function; /* Set on OPCODE_CAL or OPCODE_BGNSUB */
 };
 
 class variable_storage : public exec_node {
@@ -238,8 +236,6 @@ public:
 
    variable_storage *find_variable_storage(ir_variable *var);
 
-   function_entry *get_function_signature(ir_function_signature *sig);
-
    src_reg get_temp(const glsl_type *type);
    void reladdr_to_temp(ir_instruction *ir, src_reg *reg, int *num_reladdr);
 
@@ -383,8 +379,6 @@ ir_to_mesa_visitor::emit(ir_instruction *ir, enum prog_opcode op,
    inst->src[2] = src2;
    inst->ir = ir;
 
-   inst->function = NULL;
-
    this->instructions.push_tail(inst);
 
    return inst;
@@ -1956,126 +1950,10 @@ ir_to_mesa_visitor::visit(ir_constant *ir)
 						   &this->result.swizzle);
 }
 
-function_entry *
-ir_to_mesa_visitor::get_function_signature(ir_function_signature *sig)
-{
-   function_entry *entry;
-
-   foreach_iter(exec_list_iterator, iter, this->function_signatures) {
-      entry = (function_entry *)iter.get();
-
-      if (entry->sig == sig)
-	 return entry;
-   }
-
-   entry = ralloc(mem_ctx, function_entry);
-   entry->sig = sig;
-   entry->sig_id = this->next_signature_id++;
-   entry->bgn_inst = NULL;
-
-   /* Allocate storage for all the parameters. */
-   foreach_iter(exec_list_iterator, iter, sig->parameters) {
-      ir_variable *param = (ir_variable *)iter.get();
-      variable_storage *storage;
-
-      storage = find_variable_storage(param);
-      assert(!storage);
-
-      storage = new(mem_ctx) variable_storage(param, PROGRAM_TEMPORARY,
-					      this->next_temp);
-      this->variables.push_tail(storage);
-
-      this->next_temp += type_size(param->type);
-   }
-
-   if (!sig->return_type->is_void()) {
-      entry->return_reg = get_temp(sig->return_type);
-   } else {
-      entry->return_reg = undef_src;
-   }
-
-   this->function_signatures.push_tail(entry);
-   return entry;
-}
-
 void
 ir_to_mesa_visitor::visit(ir_call *ir)
 {
-   ir_to_mesa_instruction *call_inst;
-   ir_function_signature *sig = ir->get_callee();
-   function_entry *entry = get_function_signature(sig);
-   int i;
-
-   /* Process in parameters. */
-   exec_list_iterator sig_iter = sig->parameters.iterator();
-   foreach_iter(exec_list_iterator, iter, *ir) {
-      ir_rvalue *param_rval = (ir_rvalue *)iter.get();
-      ir_variable *param = (ir_variable *)sig_iter.get();
-
-      if (param->mode == ir_var_in ||
-	  param->mode == ir_var_inout) {
-	 variable_storage *storage = find_variable_storage(param);
-	 assert(storage);
-
-	 param_rval->accept(this);
-	 src_reg r = this->result;
-
-	 dst_reg l;
-	 l.file = storage->file;
-	 l.index = storage->index;
-	 l.reladdr = NULL;
-	 l.writemask = WRITEMASK_XYZW;
-	 l.cond_mask = COND_TR;
-
-	 for (i = 0; i < type_size(param->type); i++) {
-	    emit(ir, OPCODE_MOV, l, r);
-	    l.index++;
-	    r.index++;
-	 }
-      }
-
-      sig_iter.next();
-   }
-   assert(!sig_iter.has_next());
-
-   /* Emit call instruction */
-   call_inst = emit(ir, OPCODE_CAL);
-   call_inst->function = entry;
-
-   /* Process out parameters. */
-   sig_iter = sig->parameters.iterator();
-   foreach_iter(exec_list_iterator, iter, *ir) {
-      ir_rvalue *param_rval = (ir_rvalue *)iter.get();
-      ir_variable *param = (ir_variable *)sig_iter.get();
-
-      if (param->mode == ir_var_out ||
-	  param->mode == ir_var_inout) {
-	 variable_storage *storage = find_variable_storage(param);
-	 assert(storage);
-
-	 src_reg r;
-	 r.file = storage->file;
-	 r.index = storage->index;
-	 r.reladdr = NULL;
-	 r.swizzle = SWIZZLE_NOOP;
-	 r.negate = 0;
-
-	 param_rval->accept(this);
-	 dst_reg l = dst_reg(this->result);
-
-	 for (i = 0; i < type_size(param->type); i++) {
-	    emit(ir, OPCODE_MOV, l, r);
-	    l.index++;
-	    r.index++;
-	 }
-      }
-
-      sig_iter.next();
-   }
-   assert(!sig_iter.has_next());
-
-   /* Process return value. */
-   this->result = entry->return_reg;
+   assert(!"ir_to_mesa: All function calls should have been inlined by now.");
 }
 
 void
@@ -2263,24 +2141,10 @@ ir_to_mesa_visitor::visit(ir_texture *ir)
 void
 ir_to_mesa_visitor::visit(ir_return *ir)
 {
-   if (ir->get_value()) {
-      dst_reg l;
-      int i;
-
-      assert(current_function);
-
-      ir->get_value()->accept(this);
-      src_reg r = this->result;
-
-      l = dst_reg(current_function->return_reg);
-
-      for (i = 0; i < type_size(current_function->sig->return_type); i++) {
-	 emit(ir, OPCODE_MOV, l, r);
-	 l.index++;
-	 r.index++;
-      }
-   }
-
+   /* Non-void functions should have been inlined.  We may still emit RETs
+    * from main() unless the EmitNoMainReturn option is set.
+    */
+   assert(!ir->get_value());
    emit(ir, OPCODE_RET);
 }
 
@@ -2975,7 +2839,6 @@ get_mesa_program(struct gl_context *ctx,
    struct gl_program *prog;
    GLenum target;
    const char *target_string;
-   GLboolean progress;
    struct gl_shader_compiler_options *options =
          &ctx->ShaderCompilerOptions[_mesa_shader_type_to_index(shader->Type)];
 
@@ -3015,35 +2878,6 @@ get_mesa_program(struct gl_context *ctx,
    visit_exec_list(shader->ir, &v);
    v.emit(NULL, OPCODE_END);
 
-   /* Now emit bodies for any functions that were used. */
-   do {
-      progress = GL_FALSE;
-
-      foreach_iter(exec_list_iterator, iter, v.function_signatures) {
-	 function_entry *entry = (function_entry *)iter.get();
-
-	 if (!entry->bgn_inst) {
-	    v.current_function = entry;
-
-	    entry->bgn_inst = v.emit(NULL, OPCODE_BGNSUB);
-	    entry->bgn_inst->function = entry;
-
-	    visit_exec_list(&entry->sig->body, &v);
-
-	    ir_to_mesa_instruction *last;
-	    last = (ir_to_mesa_instruction *)v.instructions.get_tail();
-	    if (last->op != OPCODE_RET)
-	       v.emit(NULL, OPCODE_RET);
-
-	    ir_to_mesa_instruction *end;
-	    end = v.emit(NULL, OPCODE_ENDSUB);
-	    end->function = entry;
-
-	    progress = GL_TRUE;
-	 }
-      }
-   } while (progress);
-
    prog->NumTemporaries = v.next_temp;
 
    int num_instructions = 0;
@@ -3117,16 +2951,6 @@ get_mesa_program(struct gl_context *ctx,
 			   "rasterization.\n");
 	 }
 	 break;
-      case OPCODE_BGNSUB:
-	 inst->function->inst = i;
-	 mesa_inst->Comment = strdup(inst->function->sig->function_name());
-	 break;
-      case OPCODE_ENDSUB:
-	 mesa_inst->Comment = strdup(inst->function->sig->function_name());
-	 break;
-      case OPCODE_CAL:
-	 mesa_inst->BranchTarget = inst->function->sig_id; /* rewritten later */
-	 break;
       case OPCODE_ARL:
 	 prog->NumAddressRegs = 1;
 	 break;
diff --git a/mesalib/src/mesa/state_tracker/st_cb_queryobj.c b/mesalib/src/mesa/state_tracker/st_cb_queryobj.c
index 057499615..b6a236e8d 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_queryobj.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_queryobj.c
@@ -150,7 +150,7 @@ st_WaitQuery(struct gl_context *ctx, struct gl_query_object *q)
 	  !pipe->get_query_result(pipe, 
 				  stq->pq,
 				  TRUE,
-				  &q->Result))
+				  (void*)&q->Result))
    {
       /* nothing */
    }
@@ -165,7 +165,7 @@ st_CheckQuery(struct gl_context *ctx, struct gl_query_object *q)
    struct pipe_context *pipe = st_context(ctx)->pipe;
    struct st_query_object *stq = st_query_object(q);
    assert(!q->Ready);   /* we should not get called if Ready is TRUE */
-   q->Ready = pipe->get_query_result(pipe, stq->pq, FALSE, &q->Result);
+   q->Ready = pipe->get_query_result(pipe, stq->pq, FALSE, (void*)&q->Result);
 }
 
 
diff --git a/mesalib/src/mesa/state_tracker/st_draw.c b/mesalib/src/mesa/state_tracker/st_draw.c
index eb187519f..0a35ab2be 100644
--- a/mesalib/src/mesa/state_tracker/st_draw.c
+++ b/mesalib/src/mesa/state_tracker/st_draw.c
@@ -979,6 +979,7 @@ st_draw_vbo(struct gl_context *ctx,
    struct pipe_index_buffer ibuffer;
    struct pipe_draw_info info;
    unsigned i, num_instances = 1;
+   unsigned max_index_plus_base;
    GLboolean new_array =
       st->dirty.st &&
       (st->dirty.mesa & (_NEW_ARRAY | _NEW_PROGRAM | _NEW_BUFFER_OBJECT)) != 0;
@@ -987,6 +988,8 @@ st_draw_vbo(struct gl_context *ctx,
    assert(ctx->NewState == 0x0);
 
    if (ib) {
+      int max_base_vertex = 0;
+
       /* Gallium probably doesn't want this in some cases. */
       if (!index_bounds_valid)
          if (!all_varyings_in_vbos(arrays))
@@ -995,7 +998,16 @@ st_draw_vbo(struct gl_context *ctx,
 
       for (i = 0; i < nr_prims; i++) {
          num_instances = MAX2(num_instances, prims[i].num_instances);
+         max_base_vertex = MAX2(max_base_vertex, prims[i].basevertex);
       }
+
+      /* Compute the sum of max_index and max_base_vertex.  That's the value
+       * we need to use when creating buffers.
+       */
+      if (max_index == ~0)
+         max_index_plus_base = max_index;
+      else
+         max_index_plus_base = max_index + max_base_vertex;
    }
    else {
       /* Get min/max index for non-indexed drawing. */
@@ -1007,6 +1019,9 @@ st_draw_vbo(struct gl_context *ctx,
          max_index = MAX2(max_index, prims[i].start + prims[i].count - 1);
          num_instances = MAX2(num_instances, prims[i].num_instances);
       }
+
+      /* The base vertex offset only applies to indexed drawing */
+      max_index_plus_base = max_index;
    }
 
    /* Validate state. */
@@ -1023,7 +1038,8 @@ st_draw_vbo(struct gl_context *ctx,
       st_validate_state(st);
 
       if (new_array) {
-         if (!st_validate_varrays(ctx, arrays, max_index, num_instances)) {
+         if (!st_validate_varrays(ctx, arrays, max_index_plus_base,
+                                  num_instances)) {
             /* probably out of memory, no-op the draw call */
             return;
          }
@@ -1047,7 +1063,7 @@ st_draw_vbo(struct gl_context *ctx,
             unsigned element_size = st->user_attrib[i].element_size;
             unsigned stride = st->user_attrib[i].stride;
             unsigned min_offset = min_index * stride;
-            unsigned max_offset = max_index * stride + element_size;
+            unsigned max_offset = max_index_plus_base * stride + element_size;
 
             assert(max_offset > min_offset);
 
diff --git a/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
index b0227855c..ae8533e18 100644
--- a/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
+++ b/mesalib/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
@@ -2439,7 +2439,7 @@ void
 glsl_to_tgsi_visitor::visit(ir_call *ir)
 {
    glsl_to_tgsi_instruction *call_inst;
-   ir_function_signature *sig = ir->get_callee();
+   ir_function_signature *sig = ir->callee;
    function_entry *entry = get_function_signature(sig);
    int i;
 
@@ -2815,6 +2815,10 @@ glsl_to_tgsi_visitor::glsl_to_tgsi_visitor()
    indirect_addr_temps = false;
    indirect_addr_consts = false;
    mem_ctx = ralloc_context(NULL);
+   ctx = NULL;
+   prog = NULL;
+   shader_program = NULL;
+   options = NULL;
 }
 
 glsl_to_tgsi_visitor::~glsl_to_tgsi_visitor()
diff --git a/mesalib/src/mesa/swrast/s_blit.c b/mesalib/src/mesa/swrast/s_blit.c
index 6d0b889c1..b0c56a40f 100644
--- a/mesalib/src/mesa/swrast/s_blit.c
+++ b/mesalib/src/mesa/swrast/s_blit.c
@@ -566,6 +566,9 @@ blit_linear(struct gl_context *ctx,
                                   GL_MAP_READ_BIT | GL_MAP_WRITE_BIT,
                                   &srcMap, &srcRowStride);
       if (!srcMap) {
+         free(srcBuffer0);
+         free(srcBuffer1);
+         free(dstBuffer);
          _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBlitFramebuffer");
          return;
       }
@@ -582,6 +585,9 @@ blit_linear(struct gl_context *ctx,
 				  0, 0, readRb->Width, readRb->Height,
                                   GL_MAP_READ_BIT, &srcMap, &srcRowStride);
       if (!srcMap) {
+         free(srcBuffer0);
+         free(srcBuffer1);
+         free(dstBuffer);
          _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBlitFramebuffer");
          return;
       }
@@ -590,6 +596,9 @@ blit_linear(struct gl_context *ctx,
                                   GL_MAP_WRITE_BIT, &dstMap, &dstRowStride);
       if (!dstMap) {
          ctx->Driver.UnmapRenderbuffer(ctx, readRb);
+         free(srcBuffer0);
+         free(srcBuffer1);
+         free(dstBuffer);
          _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBlitFramebuffer");
          return;
       }
diff --git a/pixman/demos/Makefile.am b/pixman/demos/Makefile.am
index 6049090ea..a664d939e 100644
--- a/pixman/demos/Makefile.am
+++ b/pixman/demos/Makefile.am
@@ -6,7 +6,7 @@ AM_LDFLAGS = $(OPENMP_CFLAGS)
 LDADD = $(top_builddir)/pixman/libpixman-1.la -lm $(GTK_LIBS) $(PNG_LIBS)
 INCLUDES = -I$(top_srcdir)/pixman -I$(top_builddir)/pixman $(GTK_CFLAGS) $(PNG_CFLAGS)
 
-GTK_UTILS = gtk-utils.c gtk-utils.h
+GTK_UTILS = gtk-utils.c gtk-utils.h ../test/utils.c ../test/utils.h
 
 DEMOS =				\
 	clip-test		\
@@ -30,8 +30,8 @@ clip_in_SOURCES = clip-in.c $(GTK_UTILS)
 trap_test_SOURCES = trap-test.c $(GTK_UTILS)
 screen_test_SOURCES = screen-test.c $(GTK_UTILS)
 convolution_test_SOURCES = convolution-test.c $(GTK_UTILS)
-radial_test_SOURCES = radial-test.c ../test/utils.c ../test/utils.h $(GTK_UTILS)
-tri_test_SOURCES = tri-test.c ../test/utils.c ../test/utils.h $(GTK_UTILS)
+radial_test_SOURCES = radial-test.c $(GTK_UTILS)
+tri_test_SOURCES = tri-test.c $(GTK_UTILS)
 checkerboard_SOURCES = checkerboard.c $(GTK_UTILS)
 
 noinst_PROGRAMS = $(DEMOS)
diff --git a/pixman/demos/gtk-utils.c b/pixman/demos/gtk-utils.c
index f45cdc912..1ff89ebd3 100644
--- a/pixman/demos/gtk-utils.c
+++ b/pixman/demos/gtk-utils.c
@@ -1,115 +1,87 @@
-#include <gtk/gtk.h>

-#include <config.h>

-#include "pixman-private.h"	/* For image->bits.format

-				 * FIXME: there should probably be public API for this

-				 */

-#include "gtk-utils.h"

-

-GdkPixbuf *

-pixbuf_from_argb32 (uint32_t *bits,

-		    gboolean has_alpha,

-		    int width,

-		    int height,

-		    int stride)

-{

-    GdkPixbuf *pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE,

-					8, width, height);

-    int p_stride = gdk_pixbuf_get_rowstride (pixbuf);

-    guint32 *p_bits = (guint32 *)gdk_pixbuf_get_pixels (pixbuf);

-    int w, h;

-    

-    for (h = 0; h < height; ++h)

-    {

-	for (w = 0; w < width; ++w)

-	{

-	    uint32_t argb = bits[h * (stride / 4) + w];

-	    guint r, g, b, a;

-	    char *pb = (char *)p_bits;

-

-	    pb += h * p_stride + w * 4;

-

-	    r = (argb & 0x00ff0000) >> 16;

-	    g = (argb & 0x0000ff00) >> 8;

-	    b = (argb & 0x000000ff) >> 0;

-	    a = has_alpha? (argb & 0xff000000) >> 24 : 0xff;

-

-	    if (a)

-	    {

-		r = (r * 255) / a;

-		g = (g * 255) / a;

-		b = (b * 255) / a;

-	    }

-

-	    if (r > 255) r = 255;

-	    if (g > 255) g = 255;

-	    if (b > 255) b = 255;

-	    

-	    pb[0] = r;

-	    pb[1] = g;

-	    pb[2] = b;

-	    pb[3] = a;

-	}

-    }

-    

-    return pixbuf;

-}

-

-

-static gboolean

-on_expose (GtkWidget *widget, GdkEventExpose *expose, gpointer data)

-{

-    GdkPixbuf *pixbuf = data;

-    

-    gdk_draw_pixbuf (widget->window, NULL,

-		     pixbuf, 0, 0, 0, 0,

-		     gdk_pixbuf_get_width (pixbuf),

-		     gdk_pixbuf_get_height (pixbuf),

-		     GDK_RGB_DITHER_NONE,

-		     0, 0);

-    

-    return TRUE;

-}

-

-void

-show_image (pixman_image_t *image)

-{

-    GtkWidget *window;

-    GdkPixbuf *pixbuf;

-    int width, height, stride;

-    int argc;

-    char **argv;

-    char *arg0 = g_strdup ("pixman-test-program");

-    gboolean has_alpha;

-    pixman_format_code_t format;

-

-    argc = 1;

-    argv = (char **)&arg0;

-

-    gtk_init (&argc, &argv);

-    

-    window = gtk_window_new (GTK_WINDOW_TOPLEVEL);

-    width = pixman_image_get_width (image);

-    height = pixman_image_get_height (image);

-    stride = pixman_image_get_stride (image);

-

-    gtk_window_set_default_size (GTK_WINDOW (window), width, height);

-    

-    format = image->bits.format;

-    

-    if (format == PIXMAN_a8r8g8b8)

-	has_alpha = TRUE;

-    else if (format == PIXMAN_x8r8g8b8)

-	has_alpha = FALSE;

-    else

-	g_error ("Can't deal with this format: %x\n", format);

-    

-    pixbuf = pixbuf_from_argb32 (pixman_image_get_data (image), has_alpha,

-				 width, height, stride);

-    

-    g_signal_connect (window, "expose_event", G_CALLBACK (on_expose), pixbuf);

-    g_signal_connect (window, "delete_event", G_CALLBACK (gtk_main_quit), NULL);

-    

-    gtk_widget_show (window);

-    

-    gtk_main ();

-}

+#include <gtk/gtk.h>
+#include <config.h>
+#include "../test/utils.h"
+#include "gtk-utils.h"
+
+GdkPixbuf *
+pixbuf_from_argb32 (uint32_t *bits,
+		    gboolean has_alpha,
+		    int width,
+		    int height,
+		    int stride)
+{
+    GdkPixbuf *pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE,
+					8, width, height);
+    int p_stride = gdk_pixbuf_get_rowstride (pixbuf);
+    guint32 *p_bits = (guint32 *)gdk_pixbuf_get_pixels (pixbuf);
+    int i;
+
+    for (i = 0; i < height; ++i)
+    {
+	uint32_t *src_row = &bits[i * (stride / 4)];
+	uint32_t *dst_row = p_bits + i * (p_stride / 4);
+
+	a8r8g8b8_to_rgba_np (dst_row, src_row, width);
+    }
+
+    return pixbuf;
+}
+
+static gboolean
+on_expose (GtkWidget *widget, GdkEventExpose *expose, gpointer data)
+{
+    GdkPixbuf *pixbuf = data;
+    
+    gdk_draw_pixbuf (widget->window, NULL,
+		     pixbuf, 0, 0, 0, 0,
+		     gdk_pixbuf_get_width (pixbuf),
+		     gdk_pixbuf_get_height (pixbuf),
+		     GDK_RGB_DITHER_NONE,
+		     0, 0);
+    
+    return TRUE;
+}
+
+void
+show_image (pixman_image_t *image)
+{
+    GtkWidget *window;
+    GdkPixbuf *pixbuf;
+    int width, height, stride;
+    int argc;
+    char **argv;
+    char *arg0 = g_strdup ("pixman-test-program");
+    gboolean has_alpha;
+    pixman_format_code_t format;
+
+    argc = 1;
+    argv = (char **)&arg0;
+
+    gtk_init (&argc, &argv);
+    
+    window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+    width = pixman_image_get_width (image);
+    height = pixman_image_get_height (image);
+    stride = pixman_image_get_stride (image);
+
+    gtk_window_set_default_size (GTK_WINDOW (window), width, height);
+    
+    format = pixman_image_get_format (image);
+    
+    if (format == PIXMAN_a8r8g8b8)
+	has_alpha = TRUE;
+    else if (format == PIXMAN_x8r8g8b8)
+	has_alpha = FALSE;
+    else
+	g_error ("Can't deal with this format: %x\n", format);
+    
+    pixbuf = pixbuf_from_argb32 (pixman_image_get_data (image), has_alpha,
+				 width, height, stride);
+    
+    g_signal_connect (window, "expose_event", G_CALLBACK (on_expose), pixbuf);
+    g_signal_connect (window, "delete_event", G_CALLBACK (gtk_main_quit), NULL);
+    
+    gtk_widget_show (window);
+    
+    gtk_main ();
+}
diff --git a/pixman/pixman/pixman-mmx.c b/pixman/pixman/pixman-mmx.c
index 9d1f6afd4..3b4625ccf 100644
--- a/pixman/pixman/pixman-mmx.c
+++ b/pixman/pixman/pixman-mmx.c
@@ -319,7 +319,7 @@ in_over (__m64 src, __m64 srca, __m64 mask, __m64 dest)
 
 /* Elemental unaligned loads */
 
-static __inline__ __m64 ldq_u(uint64_t *p)
+static force_inline __m64 ldq_u(uint64_t *p)
 {
 #ifdef USE_X86_MMX
     /* x86's alignment restrictions are very relaxed. */
@@ -338,7 +338,7 @@ static __inline__ __m64 ldq_u(uint64_t *p)
 #endif
 }
 
-static __inline__ uint32_t ldl_u(const uint32_t *p)
+static force_inline uint32_t ldl_u(const uint32_t *p)
 {
 #ifdef USE_X86_MMX
     /* x86's alignment restrictions are very relaxed. */
@@ -3139,6 +3139,7 @@ static const pixman_fast_path_t mmx_fast_paths[] =
     PIXMAN_STD_FAST_PATH    (OVER, solid,    null,     a8r8g8b8, mmx_composite_over_n_8888         ),
     PIXMAN_STD_FAST_PATH    (OVER, solid,    null,     x8r8g8b8, mmx_composite_over_n_8888         ),
     PIXMAN_STD_FAST_PATH    (OVER, solid,    null,     r5g6b5,   mmx_composite_over_n_0565         ),
+    PIXMAN_STD_FAST_PATH    (OVER, solid,    null,     b5g6r5,   mmx_composite_over_n_0565         ),
     PIXMAN_STD_FAST_PATH    (OVER, x8r8g8b8, null,     x8r8g8b8, mmx_composite_copy_area           ),
     PIXMAN_STD_FAST_PATH    (OVER, x8b8g8r8, null,     x8b8g8r8, mmx_composite_copy_area           ),
 
diff --git a/pixman/test/utils.c b/pixman/test/utils.c
index 379bd71a8..cc0365aa2 100644
--- a/pixman/test/utils.c
+++ b/pixman/test/utils.c
@@ -340,17 +340,15 @@ make_random_bytes (int n_bytes)
     return bytes;
 }
 
-#ifdef HAVE_LIBPNG
-
-static void
-pngify_pixels (uint32_t *pixels, int n_pixels)
+void
+a8r8g8b8_to_rgba_np (uint32_t *dst, uint32_t *src, int n_pixels)
 {
+    uint8_t *dst8 = (uint8_t *)dst;
     int i;
 
     for (i = 0; i < n_pixels; ++i)
     {
-	uint32_t p = pixels[i];
-	uint8_t *out = (uint8_t *)&(pixels[i]);
+	uint32_t p = src[i];
 	uint8_t a, r, g, b;
 
 	a = (p & 0xff000000) >> 24;
@@ -365,13 +363,15 @@ pngify_pixels (uint32_t *pixels, int n_pixels)
 	    b = (b * 255) / a;
 	}
 
-	*out++ = r;
-	*out++ = g;
-	*out++ = b;
-	*out++ = a;
+	*dst8++ = r;
+	*dst8++ = g;
+	*dst8++ = b;
+	*dst8++ = a;
     }
 }
 
+#ifdef HAVE_LIBPNG
+
 pixman_bool_t
 write_png (pixman_image_t *image, const char *filename)
 {
@@ -398,7 +398,7 @@ write_png (pixman_image_t *image, const char *filename)
     pixman_image_composite32 (
 	PIXMAN_OP_SRC, image, NULL, copy, 0, 0, 0, 0, 0, 0, width, height);
 
-    pngify_pixels (data, height * width);
+    a8r8g8b8_to_rgba_np (data, data, height * width);
 
     for (i = 0; i < height; ++i)
 	row_pointers[i] = (png_bytep)(data + i * width);
diff --git a/pixman/test/utils.h b/pixman/test/utils.h
index 3c0647bc6..01af316d2 100644
--- a/pixman/test/utils.h
+++ b/pixman/test/utils.h
@@ -107,6 +107,15 @@ fail_after (int seconds, const char *msg);
 /* If possible, enable traps for floating point exceptions */
 void enable_fp_exceptions(void);
 
+/* Converts a8r8g8b8 pixels to pixels that
+ *  - are not premultiplied,
+ *  - are stored in this order in memory: R, G, B, A, regardless of
+ *    the endianness of the computer.
+ * It is allowed for @src and @dst to point to the same memory buffer.
+ */
+void
+a8r8g8b8_to_rgba_np (uint32_t *dst, uint32_t *src, int n_pixels);
+
 pixman_bool_t
 write_png (pixman_image_t *image, const char *filename);
 
diff --git a/xorg-server/Xi/xipassivegrab.c b/xorg-server/Xi/xipassivegrab.c
index 8a1c59968..7130328ec 100644
--- a/xorg-server/Xi/xipassivegrab.c
+++ b/xorg-server/Xi/xipassivegrab.c
@@ -290,13 +290,15 @@ ProcXIPassiveUngrabDevice(ClientPtr client)
     if (stuff->grab_type != XIGrabtypeButton &&
         stuff->grab_type != XIGrabtypeKeycode &&
         stuff->grab_type != XIGrabtypeEnter &&
-        stuff->grab_type != XIGrabtypeFocusIn) {
+        stuff->grab_type != XIGrabtypeFocusIn &&
+        stuff->grab_type != XIGrabtypeTouchBegin) {
         client->errorValue = stuff->grab_type;
         return BadValue;
     }
 
     if ((stuff->grab_type == XIGrabtypeEnter ||
-         stuff->grab_type == XIGrabtypeFocusIn) && stuff->detail != 0) {
+         stuff->grab_type == XIGrabtypeFocusIn ||
+         stuff->grab_type == XIGrabtypeTouchBegin) && stuff->detail != 0) {
         client->errorValue = stuff->detail;
         return BadValue;
     }
@@ -327,6 +329,9 @@ ProcXIPassiveUngrabDevice(ClientPtr client)
     case XIGrabtypeFocusIn:
         tempGrab->type = XI_FocusIn;
         break;
+    case XIGrabtypeTouchBegin:
+        tempGrab->type = XI_TouchBegin;
+        break;
     }
     tempGrab->grabtype = XI2;
     tempGrab->modifierDevice = mod_dev;
diff --git a/xorg-server/hw/xquartz/darwin.c b/xorg-server/hw/xquartz/darwin.c
index 2e0bfe6da..03030ad22 100644
--- a/xorg-server/hw/xquartz/darwin.c
+++ b/xorg-server/hw/xquartz/darwin.c
@@ -541,15 +541,15 @@ InitInput(int argc, char **argv)
        gdkdev->info.source = GDK_SOURCE_PEN;
      */
 
-    darwinTabletStylus = AddInputDevice(serverClient, DarwinTabletProc, FALSE);
+    darwinTabletStylus = AddInputDevice(serverClient, DarwinTabletProc, TRUE);
     assert(darwinTabletStylus);
     darwinTabletStylus->name = strdup("pen");
 
-    darwinTabletCursor = AddInputDevice(serverClient, DarwinTabletProc, FALSE);
+    darwinTabletCursor = AddInputDevice(serverClient, DarwinTabletProc, TRUE);
     assert(darwinTabletCursor);
     darwinTabletCursor->name = strdup("cursor");
 
-    darwinTabletEraser = AddInputDevice(serverClient, DarwinTabletProc, FALSE);
+    darwinTabletEraser = AddInputDevice(serverClient, DarwinTabletProc, TRUE);
     assert(darwinTabletEraser);
     darwinTabletEraser->name = strdup("eraser");
 
diff --git a/xorg-server/hw/xquartz/mach-startup/Makefile.am b/xorg-server/hw/xquartz/mach-startup/Makefile.am
index 21ad5b503..77962b14d 100644
--- a/xorg-server/hw/xquartz/mach-startup/Makefile.am
+++ b/xorg-server/hw/xquartz/mach-startup/Makefile.am
@@ -23,7 +23,7 @@ nodist_X11_bin_SOURCES = \
 	mach_startupServer.c \
 	mach_startupUser.c
 
-X11_bin_LDADD = \
+X11_bin_DEPENDENCIES = \
 	$(top_builddir)/hw/xquartz/libXquartz.la \
 	$(top_builddir)/hw/xquartz/xpr/libXquartzXpr.la \
 	$(top_builddir)/dix/dixfonts.lo \
@@ -31,8 +31,12 @@ X11_bin_LDADD = \
 	$(top_builddir)/hw/xquartz/pbproxy/libxpbproxy.la \
 	$(XQUARTZ_LIBS) $(XSERVER_LIBS)
 
+# $(XSERVER_SYS_LIBS) is placed here in order to set command line ordering
+# to work around build issues on Tiger.
+X11_bin_LDADD = $(X11_bin_DEPENDENCIES) $(XSERVER_SYS_LIBS)
+
 X11_bin_LDFLAGS =  \
-	$(XSERVER_SYS_LIBS) -lXplugin \
+	-lXplugin \
 	-XCClinker -Objc \
 	-Wl,-u,_miDCInitialize \
 	-Wl,-framework,Carbon \
@@ -41,7 +45,7 @@ X11_bin_LDFLAGS =  \
 	-Wl,-framework,IOKit
 
 if GLX
-X11_bin_LDADD += \
+X11_bin_DEPENDENCIES += \
 	$(top_builddir)/hw/xquartz/GL/libCGLCore.la \
 	$(top_builddir)/glx/libglx.la
 
@@ -55,12 +59,10 @@ X11_bin_LDFLAGS += \
 endif
 
 if RECORD
-X11_bin_LDADD += \
+X11_bin_DEPENDENCIES += \
 	$(top_builddir)/record/librecord.la
 endif
 
-X11_bin_DEPENDENCIES = $(X11_bin_LDADD)
-
 bin_PROGRAMS = Xquartz
 
 dist_Xquartz_SOURCES = \
diff --git a/xorg-server/os/log.c b/xorg-server/os/log.c
index 9a719696c..061b3dd61 100644
--- a/xorg-server/os/log.c
+++ b/xorg-server/os/log.c
@@ -601,6 +601,8 @@ FatalError(const char *f, ...)
     else
         ErrorF("\nFatal server error:\n");
 
+    va_start(args, f);
+
     /* Make a copy for OsVendorFatalError */
     va_copy(args2, args);
 
diff --git a/xorg-server/xkeyboard-config/rules/base.extras.xml.in b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
index a2f4db040..205f5c119 100644
--- a/xorg-server/xkeyboard-config/rules/base.extras.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
@@ -358,6 +358,23 @@
         </variant>
       </variantList>
     </layout>
+      <layout>
+      <configItem>
+        <name>il</name>
+        <_shortDescription>he</_shortDescription>
+        <_description>Hebrew (Biblical SIL)</_description>
+        <languageList><iso639Id>heb</iso639Id></languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>SIL Phonetic</name>
+            <_description>Biblical SIL phonetic</_description>
+            <languageList><iso639Id>heb</iso639Id></languageList>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
   </layoutList>
   <optionList/>
 </xkbConfigRegistry>
diff --git a/xorg-server/xkeyboard-config/symbols/cz b/xorg-server/xkeyboard-config/symbols/cz
index 25fd54a11..db3dd4885 100644
--- a/xorg-server/xkeyboard-config/symbols/cz
+++ b/xorg-server/xkeyboard-config/symbols/cz
@@ -90,7 +90,7 @@ xkb_symbols "qwerty" {
 
     key <AB01>	{ [         z,          Z,       degree,         NoSymbol ] };
     key <AC10>	{ [     uring,   quotedbl,    semicolon,            colon ] };
-    key <AC11>	{ [   section,     exclam,   apostrophe,         quotedbl ] };
+    key <AC11>	{ [   section,     exclam,   apostrophe,           ssharp ] };
     key <AD06>	{ [         y,          Y,     NoSymbol,         NoSymbol ] };
     key <AD11>	{ [    uacute,      slash,  bracketleft,        braceleft ] };
     key <AD12>	{ [parenright,  parenleft, bracketright,       braceright ] };
diff --git a/xorg-server/xkeyboard-config/symbols/il b/xorg-server/xkeyboard-config/symbols/il
index 8bbeaaa51..eafb8cd75 100644
--- a/xorg-server/xkeyboard-config/symbols/il
+++ b/xorg-server/xkeyboard-config/symbols/il
@@ -249,3 +249,69 @@ xkb_symbols "biblical" {
 
 	key <SPCE> { [ space, space, thinspace, nobreakspace ] };
 };
+
+// Biblical hebrew (SIL) US Standard layout version 1.5
+// This map is based closely on v 1.5 of the standard. The only deviation being the replacement of the composite characters sin and shin 
+// by their more recent Unicodev6 counterparts
+// this map contains all the characters found in Biblical annotation, masoretic and Dead Sea Scroll related work.
+// The layout corresponds phonetically to a US standard layout or similar (Qwerty).
+// If you are using an actual Hebrew keyboard, you are probably better off using a Tiro compliant scholarly layout
+// This linux port created and maintained by Dennis Meulensteen, dennis@meulensteen.nl
+partial alphanumeric_keys 
+xkb_symbols "biblicalSIL" {
+	name[Group1]= "Israel - Biblical Hebrew SIL Phonetic";
+	key.type = "FOUR_LEVEL_SEMIALPHABETIC";
+
+	key <TLDE> { [ U20AC,		U20AA,		U0024 ] }; 			//Euro, 		Shekel, 		Dollar		-
+	key <AE01> { [ 1,		U0021,		U05BD,		U0597 ] };		//1,			exclamation	meteg		revia
+	key <AE02> { [ 2,		U0598,		U05A2,		U05AE ] };	//2,			zarqa		atn. hafukh	zinor
+	key <AE03> { [ 3,		U05A8,		U0596,		U0599 ] };		//3,			qadma		tipeha		pashta
+	key <AE04> { [ 4,		U059C,		U05A5,		U05A0 ] };		//4,			geresh		merkha		tel. gedola
+	key <AE05> { [ 5,		U059E,		U05A6,		U05A9 ] };		//5,			gershayim		mer. kefula	tel qetana
+	key <AE06> { [ 6,		VoidSymbol,	U05AD,		U059F ] };		//6,			-			dehi			qar. para
+	key <AE07> { [ 7,		U05AC,		U05A3,		U05A1 ] };		//7,			iluy			munah		pazer
+	key <AE08> { [ 8,		U059D,		U059B,		U0595 ] };		//8,			g. muqdam	tevir			zaq. gadol
+	key <AE09> { [ 9,		U0029,		U05A7,		U0593 ] };		//9,			parenth.R		darqa		shalshelet
+	key <AE10> { [ 0,		U0028,		U05AA,		U05AF ] };		//0,			paren.L		yer. ben yomo	masora c.
+	key <AE11> { [ U05BE,		U2013,		U2014,		U05BF ] };	//Maqaf, 		en dash		em dash		rafe
+	key <AE12> { [ U05BC,		VoidSymbol,	U0591,		U25CC ] };	//Dagesh		-			etnahta		mark base
+
+	key <AD01> { [ hebrew_qoph,	U0597 ] };							//Qof		revia			-			-
+	key <AD02> { [ hebrew_waw] }; 								//waw		-			-			-
+	key <AD03> { [ U05B6,		U05B5,		VoidSymbol,	U05B1 ] };	//segol		tsere			-			hat. segol
+	key <AD04> { [ hebrew_resh ] };								//resh		-			-			-
+	key <AD05> { [ hebrew_taw ] }; 								//taw		-			-			-
+	key <AD06> { [ hebrew_yod,	U059F ] };							//jod		qar. para		-			-
+	key <AD07> { [ U05BB] }; 									//quibuts		-			-			-
+	key <AD08> { [ U05B4 ] };									//hiriq, 		-			-			-
+	key <AD09> { [ U05B9,		U05BA,		U05C7, 		U05B3 ] };	//holam, 		holam(wav)	qam. qatan	hat. Qamats
+	key <AD10> { [ hebrew_pe,	hebrew_finalpe,	VoidSymbol,	U034F ] };	//pe			final pe		-			c. grapheme joiner
+	key <AD11> { [ bracketright,	braceright,	VoidSymbol,	U0594 ] };		//Bracket R	brace R		-			zaq. qatan
+	key <AD12> { [ bracketleft,	braceleft, 	U059A,		U0592 ] };		//Brachket L	brace L		yetiv			segolta
+	key <BKSL> { [ U05C0, 		U05C0, 		U05A4,		U05AB ] };//Paseq		Paseq		mahapakh		ole
+
+	key <AC01> { [ U05B7,		U05B8,		U05C7,		U05B2 ] };  //patah		Qamats		Qam. Qatan	hat. patah
+	key <AC02> { [ hebrew_samech,	U05E9 ] }; 					//Samech, 	shin no dot	-			-
+	key <AC03> { [ hebrew_dalet ] }; 								//dalet		-			-			-
+	key <AC04> { [ UFB2B,		hebrew_sin,	U05C2 ] }; 			//UCSv6 Sin	sin (nodot)	sindot		-
+	key <AC05> { [ hebrew_gimel,	VoidSymbol,	U25E6,		U2022 ] };	//gimel		-			bullet(DSS)	bulletfill (DSS)
+	key <AC06> { [ hebrew_he,	VoidSymbol,	U0336,		U030A ] };//he			-			strikeout(DSS)	Ring Above(DSS)
+	key <AC07> { [ UFB2A,		hebrew_shin,	U05C1] };				//UCSv6 Shin	shin (nodot)	shindot		-
+	key <AC08> { [ hebrew_kaph,	hebrew_finalkaph ] };					//kaph		Final kaph		-
+	key <AC09> { [ hebrew_lamed,	VoidSymbol ] };						//lamed		-			-
+	key <AC10> { [ U05B0,		U05F4,		semicolon,	U05C3 ] };		//sva		gers. p		semicolon		sof pasuq
+	key <AC11> { [ U2019,		U201D, 		U0323,		U05C4 ] };//QuoteRight	double R Quote	punctum		punctum Above
+
+	key <AB01> { [ hebrew_zain ] };								//Zayin		-			-			
+	key <AB02> { [ hebrew_chet ] };								//chet		-			-
+	key <AB03> { [ hebrew_zade, 	U05E5 ] };							// tzade, 		final tzade		-
+	key <AB04> { [ hebrew_tet ] };									//tet			-			-
+	key <AB05> { [ hebrew_bet ] };									//bet			-			-
+	key <AB06> { [ hebrew_nun,	hebrew_finalnun ] }; 					//nun, 		final nun
+	key <AB07> { [ hebrew_mem,	hebrew_finalmem, U200C,		U200D ] };	//mem, 		final mem		0.wid.non.join.	0.wid.joiner
+	key <AB08> { [ U002C,		U05E2, 		U00AB,		U0307 ] }; //comma, 	ayin			guillemetsR	masora dot
+	key <AB09> { [ U0002E,		U05D0, 		U00BB,		U0308 ] }; //period, 		alef			guillemetsL	thousands
+	key <AB10> { [ slash,		question,	U05F3 ] };					//slash		question		geresh P
+
+	key <SPCE> { [ space, 		space,		thinspace,	nobreakspace ] };//space		space			thin space,		nbsp
+};
\ No newline at end of file
diff --git a/xorg-server/xkeyboard-config/symbols/in b/xorg-server/xkeyboard-config/symbols/in
index 84d9b06f8..f98d060c3 100644
--- a/xorg-server/xkeyboard-config/symbols/in
+++ b/xorg-server/xkeyboard-config/symbols/in
@@ -98,7 +98,7 @@ xkb_symbols "deva" {
 //Inspired by "devrom" keymap by Steve Smith for the windows tool "keyman"
 //Original Author :	Noah Levitt<nlevitt at columbia.edu>
 //Past Authors  : Pramod.R <pramodr at gmail.com> and Ravikant <ravikant at sarai.net>
-// Current Main.: G Karunakar <karunakar@sarai.net>
+//Current Main. : G Karunakar <karunakar@indlinux.org>
 
 partial alphanumeric_keys
 xkb_symbols "bolnagri" {
@@ -110,7 +110,7 @@ xkb_symbols "bolnagri" {
     key <AE01>  { [   1,	exclam,		U0967,		exclam	   ] };
     key <AE02>  { [   2,	at,		U0968,		at	   ] };
     key <AE03>  { [   3,    	numbersign, 	U0969,		numbersign ] };
-    key <AE04>  { [   4,	dollar,		U096A,		dollar     ] };
+    key <AE04>  { [   4,	U20B9,		U096A,		dollar     ] }; // Rupee symbol on $
     key <AE05>  { [   5,	percent,	U096B,		percent    ] };
     key <AE06>  { [   6,	asciicircum,	U096C,		asciicircum ] };
     key <AE07>  { [   7,	ampersand,	U096D,		ampersand  ] };
@@ -125,7 +125,7 @@ xkb_symbols "bolnagri" {
     key <AD01>   { [   U200C, 	U200D   ] };  // Q: ZWNJ, ZWJ
     key <AD02>   { [   U0935,  	U950	] };  // W: wa, OM
     key <AD03>   { [   U0947,   U0948,	U090F,	U0910   ] };  // E: e, ai matras
-    key <AD04>   { [   U0930,	U0943  	] };  // R: ra, vocalic Ri
+    key <AD04>   { [   U0930,	U0943,	U0931,  U090B  	] };  // R: ra, vocalic Ri
     key <AD05>   { [   U0924,   U0925   ] };  // T: ta, tha
     key <AD06>   { [   U092f,	U091E   ] };  // Y: ya, nya
     key <AD07>   { [   U0941,   U0942,	U0909,	U090A   ] };  // U: u, uu matras
@@ -136,7 +136,7 @@ xkb_symbols "bolnagri" {
     key <AD12>	 { [   bracketright, braceright   ] };
     
     //A Row
-    key <AC01>   { [   U093E,	 U0906,	U0905,	U0906  ] };   // A: aa
+    key <AC01>   { [   U093E,	 U0906,	U0905,	U0906  ] };   // A: aa, full A, AA
     key <AC02>   { [   U0938,    U0937   ] };  // S: sa, ssa
     key <AC03>   { [   U0926,    U0927   ] };  // D: da, dha
     key <AC04>   { [   U091F,    U0920   ] };  // F: TA, THA
@@ -144,18 +144,18 @@ xkb_symbols "bolnagri" {
     key <AC06>   { [   U0939,    U0903   ] };  // H: ha, visarg 
     key <AC07>   { [   U091C,    U091D   ] };  // J: ja, jha
     key <AC08>   { [   U0915,    U0916   ] };  // K: ka, kha
-    key <AC09>   { [   U0932,	 U0962   ] };  // L: la, vocalic L or lru matra`
+    key <AC09>   { [   U0932,	 U0933,	U0962,   U090C   ] };  // L: la, vocalic L or lru matra
     key <AC10>   { [   semicolon, colon  ] }; 
     key <AC11>   { [apostrophe, quotedbl ] };
 
     //Z Row
-    key <AB01>   { [   U0936,	 U0945 	 ] };  // Z: sha, akaar candra
-    key <AB02>   { [   U094D,    U0949	 ] };  // X: halant, aakaar candra
+    key <AB01>   { [   U0936,	 U0945, U0936, U090D 	 ] };  // Z: sha, akaar candra
+    key <AB02>   { [   U094D,    U0949, U094D, U0911	 ] };  // X: halant, aakaar candra, chandra A
     key <AB03>   { [   U091A,    U091B   ] };  // C: ca, cha
     key <AB04>   { [   U0921,    U0922   ] };  // V: da, dha
     key <AB05>   { [   U092C,    U092D   ] };  // B: ba, bha
-    key <AB06>   { [   U0928,    U0923   ] };  // N: na, nha
-    key <AB07>   { [   U092E,    U093D,	U092E,	U093D   ] };  // M: ma, avagraha
+    key <AB06>   { [   U0928,    U0923   ] };  // N: na, nna
+    key <AB07>   { [   U092E,    U0919,	U092E,	U093D   ] };  // M: ma, nga, avagraha
     key <AB08>   { [   comma,    U0970	 ] };// comma: comma, dev abbreviation sign
     key <AB09>   { [   period,   U093C 	 ] };  // period: period, nukta
     key <AB10>	 { [   slash,   question ] };