xkeyboard-config fontconfig libX11 libXft libxcb mesa git update 12 Mar 2012

122 files changed, 13591 insertions, 15220 deletions

diff --git a/fontconfig/Makefile.am b/fontconfig/Makefile.am
index 7931717a2..ed3065030 100644
--- a/fontconfig/Makefile.am
+++ b/fontconfig/Makefile.am
@@ -71,7 +71,7 @@ $(srcdir)/ChangeLog:
 	if test -d "$(srcdir)/.git"; then \
 	  (GIT_DIR=$(top_srcdir)/.git ./missing --run git log --stat) | fmt --split-only > $@.tmp \
 	  && mv -f $@.tmp $@ \
-	  || ($(RM) $@.tmp; \
+	  || (rm -f $@.tmp; \
 	      echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
 	      (test -f $@ || echo git-log is required to generate this file >> $@)); \
 	else \
@@ -89,7 +89,7 @@ fonts.conf: fonts.conf.in Makefile
 		-e 's,@FC_FONTPATH\@,$(FC_FONTPATH),g' \
 		-e 's,@PACKAGE\@,$(PACKAGE),g' \
 		-e 's,@VERSION\@,$(VERSION),g' \
-		$< > $@.tmp && \
+		$(srcdir)/$@.in > $@.tmp && \
 	mv $@.tmp $@
 
 install-data-local: fonts.conf
diff --git a/fontconfig/README b/fontconfig/README
index adbaf3679..07558b596 100644
--- a/fontconfig/README
+++ b/fontconfig/README
@@ -1,12 +1,137 @@
                               Fontconfig
              Font configuration and customization library
-                              Version 2.8
-                              2009-11-18
+                              Version 2.9
+                              2012-03-11
 
 
 Check INSTALL for compilation and installation instructions.
 Report bugs to https://bugs.freedesktop.org in the fontconfig module.
 
+2.9
+
+Akira TAGOH (28):
+      Add charset editing feature.
+      add some document for range and charset.
+      Add the range support in blank element
+      Add editing langset feature.
+      add some documents
+      Bug 24744 - No n'ko orthography
+      Remove the unnecessary comment in ks.orth
+      Bug 32965 - Asturian (ast-ES) language matching missing ḷḷḥ
+      Add a missing file
+      Bug 35517 - Remove Apple Roman cmap support
+      Bug 40452 - Running 'fc-match --all' core dumps when no fonts are installed
+      Get rid of the unexpected family name
+      Bug 44826 - <alias> must contain only a single <family>
+      Bug 46169 - Pointer error in FcConfigGlobMatch
+      Do not update stream->pos when seeking is failed.
+      Bug 27385 - lcdfilter settings for freetype-2.3.12 not available in fontconfig-2.8.0
+      Add brx.orth and sat.orth
+      Bug 41694 - FcCache functions have random-number-generator side effects
+      Bug 23336 - unable to display bitmap-only (SFNT) TrueType or OpenType
+      Check null value for given object to avoid possibly segfaulting
+      Bug 19128 - Handling whitespace in aliases
+      Fix distcheck error
+      Update the version info
+      Update to detect the uncommited changes properly
+      Fix a build issue
+      Fix a build fail on some environment
+      Fix a build fail on some environment.
+      Get rid of $< from Makefile.am
+
+Alan Coopersmith (1):
+      Fix compiler warnings
+
+Behdad Esfahbod (54):
+      [fc-cache] Document -r argument in man page
+      [doc] Fix typo
+      Bug 25508 configure assumes bash > 2.0 is on system
+      Update INSTALL
+      Add note about autogen.sh to INSTALL
+      Fix doc typo
+      More doc typo fixes
+      Bug 18886 installation crashes if fontconfig already installed
+      Bug 26157 Solaris/Sun C 5.8: compilation of 2.8.0 and 2.7.3 fails
+      Bug 25152 Don't sleep(2) if all caches were uptodate
+      Don't include unistd.h in fontconfig.h
+      Accept TT_PLATFORM_MICROSOFT, TT_MS_ID_SYMBOL_CS from name table
+      Whitespace
+      More whitespace
+      Remove all training whitespaces
+      Fix comment
+      Add fc-pattern cmdline tool
+      Bug 29338 - fc-pattern.sgml, open para tag
+      Add comments
+      Bug 29995 - fc-cat does not invoke FcFini()
+      Add new public API: FcCharSetDelChar()
+      [fc-lang] Support excluding characters
+      Bug 24729 - [ne_NP] Fix ortho file
+      Add more copyright owners
+      Cleanup copyright notices to replace "Keith Packard" with "the author(s)"
+      Fix returned value
+      Bug 28958 - lang=en matches other langs
+      Make most generated-files cross-compiling-safe
+      Make fc-arch stuff cross-compiling-safe
+      Bump version
+      Allow editing charset and lang in target="scan"
+      Add <range> support for <blank> into the DTD
+      Skip <range> elements with begin > end
+      Doc nit
+      Fix assertion failure on le32d4
+      Remove AM_MAINTAINER_MODE
+      Update CaseFolding.txt to Unicode 6.0
+      Remove --enable-maintainer-mode from autogen.sh
+      Bug 20113 - Uighur (ug) orthography incomplete
+      Bug 30566 - fcformat.c:interpret_enumerate() passes uninitialized idx to FcPatternGetLangSet()
+      Mark constant strings as constant
+      More doc typo fixes
+      Always define FcStat as a function
+      Fix warning
+      Bug 35587 - Add padding to make valgrind and glibc not hate each other
+      [.gitignore] Update
+      Bug 36577 - Updating cache with no-bitmaps disables bitmap fonts...
+      Bug 26718 - "fc-match sans file" doesn't work
+      Switch fc-match to use FcPatternFormat()
+      Switch fc-cat to use FcPatternFormat()
+      Fix stupid bug in FcFontSort()
+      Bug 41171 - Invalid use of memset
+      Fix parallel build
+      Add FcPublic to FcLangSetUnion and FcLangSetSubtract
+
+Brad Hards (1):
+      Documentation fixes
+
+Jeremy Huddleston (2):
+      fontconfig.pc: Add variables for confdir and cachedir
+      fontconfig.pc.in: Add sysconfdir, localstatedir, and PACKAGE
+
+Jinkyu Yi (1):
+      Bug 42423 - make default Korean font from Un to Nanum
+
+MINAMI Hirokazu (1):
+      Bug 43406 - typo of Japanese font name in conf.d/65-nonlatin.conf
+
+Mike Frysinger (9):
+      FcStrPlus: optimize a little
+      delete unused variables
+      FcStat: change to FcChar8 for first arg
+      fc-cat: fix pointer warning
+      FcName{,Get}Constant: constify string input
+      fc-{list,match}: constify format string
+      fix build warnings when using --with-arch
+      FcObjectValidType: tweak -1 checking
+      makealias: handle missing funcs better
+
+Parag Nemade (2):
+      Bug 25651 - Add ortho file for locale brx_IN
+      Bug 25650 - Add ortho file for locale sat_IN
+
+Pravin Satpute (4):
+      Bug 27195 - need updates to ks.orth file
+      Bug 43321 - Required corrections in urdu.orth file
+      Bug 25653 - Add ortho file for locale doi_IN
+      Bug 25652 - Add ortho file for locale mni_IN
+
 2.8
 
 Behdad Esfahbod (24):
diff --git a/fontconfig/configure.in b/fontconfig/configure.in
index 06851a5e4..da6ef9532 100644
--- a/fontconfig/configure.in
+++ b/fontconfig/configure.in
@@ -33,7 +33,7 @@ dnl This is the package version number, not the shared library
 dnl version.  This same version number must appear in fontconfig/fontconfig.h
 dnl Yes, it is a pain to synchronize version numbers.  Unfortunately, it's
 dnl not possible to extract the version number here from fontconfig.h
-AM_INIT_AUTOMAKE(fontconfig, 2.8.90)
+AM_INIT_AUTOMAKE(fontconfig, 2.9.0)
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
 dnl libtool versioning
@@ -41,11 +41,11 @@ dnl libtool versioning
 dnl bump revision when fixing bugs
 dnl bump current and age, reset revision to zero when adding APIs
 dnl bump current, leave age, reset revision to zero when changing/removing APIS
-LIBT_CURRENT=5
-LIBT_REVISION=4
+LIBT_CURRENT=6
+LIBT_REVISION=0
 AC_SUBST(LIBT_CURRENT)
 AC_SUBST(LIBT_REVISION)
-LIBT_AGE=4
+LIBT_AGE=5
 
 LIBT_VERSION_INFO="$LIBT_CURRENT:$LIBT_REVISION:$LIBT_AGE"
 AC_SUBST(LIBT_VERSION_INFO)
diff --git a/fontconfig/doc/Makefile.am b/fontconfig/doc/Makefile.am
index 06ec5e9ea..f483bc757 100644
--- a/fontconfig/doc/Makefile.am
+++ b/fontconfig/doc/Makefile.am
@@ -143,7 +143,6 @@ htmldoc_DATA =		\
 if USEDOCBOOK
 BUILT_SOURCES +=		\
 	$(LOCAL_SGML_FILES)	\
-	func.refs		\
 	$(NULL)
 noinst_PROGRAMS +=	\
 	edit-sgml	\
@@ -156,48 +155,48 @@ if CROSS_COMPILING
 	@echo Warning: cannot rebuild $@ when cross-compiling
 else
 .fncs.sgml: edit-sgml$(EXEEXT) $(srcdir)/func.sgml
-	-rm $@
-	$(AM_V_GEN) $(builddir)/edit-sgml$(EXEEXT) $(srcdir)/func.sgml < '$<' > $*.sgml
+	-@rm $@
+	$(AM_V_GEN) $(builddir)/edit-sgml$(EXEEXT) $(srcdir)/func.sgml < '$*.fncs' > $*.sgml
 endif
 .sgml.txt: $(DOCS_DEPS)
-	-rm $@
-	$(AM_V_GEN) $(DOC2TXT) $<
+	-@rm $@
+	$(AM_V_GEN) $(DOC2TXT) $*.sgml
 .sgml.pdf: $(DOCS_DEPS)
-	-rm $@
-	$(AM_V_GEN) $(DOC2PDF) $<
+	-@rm $@
+	$(AM_V_GEN) $(DOC2PDF) $*.sgml
 .sgml.html: $(DOCS_DEPS)
-	-rm $@
-	$(AM_V_GEN) $(DOC2HTML) -u $< > $@
+	-@rm $@
+	$(AM_V_GEN) $(DOC2HTML) -u $*.sgml > $@
 ##
 fonts-conf.5: local-fontconfig-user.sgml version.sgml confdir.sgml
-	-rm $@
-	$(AM_V_GEN) $(DOC2MAN) $< && \
-	$(RM) manpage.*
+	-@rm $@
+	$(AM_V_GEN) $(DOC2MAN) local-fontconfig-user.sgml && \
+	rm manpage.*
 ##
 $(man3_MANS): func.refs
 func.refs: local-fontconfig-devel.sgml $(DOCS_DEPS)
-	-rm $@
+	-@rm $@
 	[ "x$(builddir)" != "x$(srcdir)" ] &&		\
 	for f in $(DOC_FUNCS_SGML); do			\
-		$(RM) $(builddir)/$$f || :;		\
+		rm -f $(builddir)/$$f || :;		\
 		$(LN_S) $(srcdir)/$$f $(builddir)/$$f;	\
 	done || :
 	$(AM_V_GEN) $(DOC2MAN) -o devel-man local-fontconfig-devel.sgml && \
 	mv devel-man/manpage.refs func.refs &&	\
 	mv devel-man/*.3 . &&			\
-	$(RM) devel-man/manpage.* &&		\
+	rm devel-man/manpage.* &&		\
 	rmdir devel-man
 confdir.sgml: $(srcdir)/confdir.sgml.in
-	$(AM_V_GEN) sed -e 's,@CONFDIR\@,${CONFDIR},' $< | awk '{if (NR > 1) printf("\n"); printf("%s", $$0);}' > $@
+	$(AM_V_GEN) sed -e 's,@CONFDIR\@,${CONFDIR},' $(srcdir)/$@.in | awk '{if (NR > 1) printf("\n"); printf("%s", $$0);}' > $@
 ##
 $(HTML_DIR)/*: $(HTML_DIR)
 $(HTML_DIR): local-fontconfig-devel.sgml $(DOCS_DEPS)
-	-rm -r $@
+	-@rm -r $@
 	$(AM_V_GEN) $(DOC2HTML) -V '%use-id-as-filename%' -o $@ local-fontconfig-devel.sgml
 local-fontconfig-user.sgml: $(srcdir)/fontconfig-user.sgml
-	$(AM_V_GEN) $(LN_S) $< $@
+	$(AM_V_GEN) $(LN_S) $(srcdir)/fontconfig-user.sgml $@
 local-fontconfig-devel.sgml: $(srcdir)/fontconfig-devel.sgml
-	$(AM_V_GEN) $(LN_S) $< $@
+	$(AM_V_GEN) $(LN_S) $(srcdir)/fontconfig-devel.sgml $@
 #
 all-local: $(BUILT_DOCS) $(HTML_DIR)/*
 clean-local:
diff --git a/fontconfig/fc-cache/Makefile.am b/fontconfig/fc-cache/Makefile.am
index 300c96697..b647c3f4b 100644
--- a/fontconfig/fc-cache/Makefile.am
+++ b/fontconfig/fc-cache/Makefile.am
@@ -33,7 +33,7 @@ install-data-local:
 	-$(mkinstalldirs) "$(DESTDIR)$(fc_cachedir)"
 
 uninstall-local:
-	-$(RM) -rf "$(DESTDIR)$(fc_cachedir)"
+	-rm -rf "$(DESTDIR)$(fc_cachedir)"
 endif
 
 INCLUDES=-I${top_srcdir} -I${top_srcdir}/src $(WARN_CFLAGS)
@@ -53,14 +53,14 @@ fc_cache_LDADD = ${top_builddir}/src/libfontconfig.la
 if USEDOCBOOK
 
 ${man_MANS}: ${SGML}	
-	$(RM) $@
-	$(DOC2MAN) ${SGML}
-	$(RM) manpage.*
+	-@rm $@
+	$(AM_V_GEN) $(DOC2MAN) ${SGML}
+	@rm -f manpage.*
 
 all-local: $(man_MANS)
 
 clean-local:
-	$(RM) $(man_MANS)
+	-rm $(man_MANS)
 
 else
 all-local:
diff --git a/fontconfig/fc-case/Makefile.am b/fontconfig/fc-case/Makefile.am
index de657afa8..1855d47b8 100644
--- a/fontconfig/fc-case/Makefile.am
+++ b/fontconfig/fc-case/Makefile.am
@@ -33,10 +33,8 @@ noinst_PROGRAMS=fc-case
 
 noinst_HEADERS=$(TARG)
 
-fc_case_SRCS= \
-	fc-case.c \
-	fccaseint.h \
-	fccaseread.c
+fc_case_SOURCES= \
+	fc-case.c
 
 CASEFOLDING=CaseFolding.txt
 SCASEFOLDING=${top_srcdir}/fc-case/CaseFolding.txt
@@ -48,8 +46,8 @@ $(TARG): $(STMPL) fc-case.c $(SCASEFOLDING)
 	@echo Warning: cannot rebuild $(TARG) when cross-compiling
 else
 $(TARG): $(STMPL) fc-case$(EXEEXT) $(SCASEFOLDING)
-	$(AM_V_GEN) $(RM) $(TARG); \
-	./fc-case$(EXEEXT) $(SCASEFOLDING) < $(STMPL) > $(TARG).tmp && \
+	-@rm $(TARG)
+	$(AM_V_GEN) $(builddir)/fc-case$(EXEEXT) $(SCASEFOLDING) < $(STMPL) > $(TARG).tmp && \
 	mv $(TARG).tmp $(TARG)
 endif
 
diff --git a/fontconfig/fc-cat/Makefile.am b/fontconfig/fc-cat/Makefile.am
index 587459591..6bc616848 100644
--- a/fontconfig/fc-cat/Makefile.am
+++ b/fontconfig/fc-cat/Makefile.am
@@ -44,14 +44,14 @@ fc_cat_LDADD = ${top_builddir}/src/libfontconfig.la
 if USEDOCBOOK
 
 ${man_MANS}: ${SGML}	
-	$(RM) $@
+	-@rm $@
 	$(DOC2MAN) ${SGML}
-	$(RM) manpage.*
+	@rm -f manpage.*
 
 all-local: $(man_MANS)
 
 clean-local:
-	$(RM) $(man_MANS)
+	-rm $(man_MANS)
 
 else
 all-local:
diff --git a/fontconfig/fc-glyphname/Makefile.am b/fontconfig/fc-glyphname/Makefile.am
index 697b5c3b9..837870737 100644
--- a/fontconfig/fc-glyphname/Makefile.am
+++ b/fontconfig/fc-glyphname/Makefile.am
@@ -41,8 +41,8 @@ $(TARG): $(STMPL) fc-glyphname.c $(SGLYPHNAME)
 	@echo Warning: cannot rebuild $(TARG) when cross-compiling
 else
 $(TARG): $(STMPL) fc-glyphname$(EXEEXT) $(SGLYPHNAME)
-	$(AM_V_GEN) $(RM) $(TARG); \
-	./fc-glyphname$(EXEEXT) $(SGLYPHNAME) < $(STMPL) > $(TARG).tmp && \
+	-@rm $(TARG)
+	$(AM_V_GEN) $(builddir)/fc-glyphname$(EXEEXT) $(SGLYPHNAME) < $(STMPL) > $(TARG).tmp && \
 	mv $(TARG).tmp $(TARG)
 endif
 
diff --git a/fontconfig/fc-lang/Makefile.am b/fontconfig/fc-lang/Makefile.am
index d2eca5ba8..54fde38c4 100644
--- a/fontconfig/fc-lang/Makefile.am
+++ b/fontconfig/fc-lang/Makefile.am
@@ -40,8 +40,8 @@ $(TARG):$(ORTH) fc-lang.c $(STMPL)
 	@echo Warning: cannot rebuild $(TARG) when cross-compiling
 else
 $(TARG):$(ORTH) fc-lang${EXEEXT} $(STMPL)
-	$(AM_V_GEN) $(RM) $(TARG); \
-	./fc-lang${EXEEXT} -d ${srcdir} $(ORTH) < $(STMPL) > $(TARG).tmp && \
+	-@rm $(TARG)
+	$(AM_V_GEN) $(builddir)/fc-lang${EXEEXT} -d ${srcdir} $(ORTH) < $(STMPL) > $(TARG).tmp && \
 	mv $(TARG).tmp $(TARG)
 endif
 
diff --git a/fontconfig/fc-list/Makefile.am b/fontconfig/fc-list/Makefile.am
index d40700a4e..fb87b50b6 100644
--- a/fontconfig/fc-list/Makefile.am
+++ b/fontconfig/fc-list/Makefile.am
@@ -44,14 +44,14 @@ fc_list_LDADD = ${top_builddir}/src/libfontconfig.la
 if USEDOCBOOK
 
 ${man_MANS}: ${SGML}
-	$(RM) $@
-	$(DOC2MAN) ${SGML}
-	$(RM) manpage.*
+	-@rm $@
+	$(AM_V_GEN) $(DOC2MAN) ${SGML}
+	@rm manpage.*
 
 all-local: $(man_MANS)
 
 clean-local:
-	$(RM) $(man_MANS)
+	-rm $(man_MANS)
 
 else
 all-local:
diff --git a/fontconfig/fc-match/Makefile.am b/fontconfig/fc-match/Makefile.am
index 94fc7d906..3bdff6d77 100644
--- a/fontconfig/fc-match/Makefile.am
+++ b/fontconfig/fc-match/Makefile.am
@@ -44,14 +44,14 @@ fc_match_LDADD = ${top_builddir}/src/libfontconfig.la
 if USEDOCBOOK
 
 ${man_MANS}: ${SGML}
-	$(RM) $@
-	$(DOC2MAN) ${SGML}
-	$(RM) manpage.*
+	-@rm $@
+	$(AM_V_GEN) $(DOC2MAN) ${SGML}
+	@rm manpage.*
 
 all-local: $(man_MANS)
 
 clean-local:
-	$(RM) $(man_MANS)
+	-rm $(man_MANS)
 
 else
 all-local:
diff --git a/fontconfig/fc-pattern/Makefile.am b/fontconfig/fc-pattern/Makefile.am
index a7db2105e..085c1dade 100644
--- a/fontconfig/fc-pattern/Makefile.am
+++ b/fontconfig/fc-pattern/Makefile.am
@@ -44,14 +44,14 @@ fc_pattern_LDADD = ${top_builddir}/src/libfontconfig.la
 if USEDOCBOOK
 
 ${man_MANS}: ${SGML}
-	$(RM) $@
+	-@rm $@
 	$(DOC2MAN) ${SGML}
-	$(RM) manpage.*
+	@rm manpage.*
 
 all-local: $(man_MANS)
 
 clean-local:
-	$(RM) $(man_MANS)
+	-rm $(man_MANS)
 
 else
 all-local:
diff --git a/fontconfig/fc-query/Makefile.am b/fontconfig/fc-query/Makefile.am
index 132dd401c..31fced90c 100644
--- a/fontconfig/fc-query/Makefile.am
+++ b/fontconfig/fc-query/Makefile.am
@@ -44,14 +44,14 @@ fc_query_LDADD = ${top_builddir}/src/libfontconfig.la
 if USEDOCBOOK
 
 ${man_MANS}: ${SGML}
-	$(RM) $@
-	$(DOC2MAN) ${SGML}
-	$(RM) manpage.*
+	-@rm $@
+	$(AM_V_GEN) $(DOC2MAN) ${SGML}
+	@rm manpage.*
 
 all-local: $(man_MANS)
 
 clean-local:
-	$(RM) $(man_MANS)
+	-rm $(man_MANS)
 
 else
 all-local:
diff --git a/fontconfig/fc-scan/Makefile.am b/fontconfig/fc-scan/Makefile.am
index c9d8904ae..f36e8f4e7 100644
--- a/fontconfig/fc-scan/Makefile.am
+++ b/fontconfig/fc-scan/Makefile.am
@@ -44,14 +44,14 @@ fc_scan_LDADD = ${top_builddir}/src/libfontconfig.la
 if USEDOCBOOK
 
 ${man_MANS}: ${SGML}
-	$(RM) $@
-	$(DOC2MAN) ${SGML}
-	$(RM) manpage.*
+	-@rm $@
+	$(AM_V_GEN) $(DOC2MAN) ${SGML}
+	@rm manpage.*
 
 all-local: $(man_MANS)
 
 clean-local:
-	$(RM) $(man_MANS)
+	-rm $(man_MANS)
 
 else
 all-local:
diff --git a/fontconfig/fontconfig/fontconfig.h b/fontconfig/fontconfig/fontconfig.h
index 23ea222ca..8936d8337 100644
--- a/fontconfig/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig/fontconfig.h
@@ -51,7 +51,7 @@ typedef int		FcBool;
  */
 
 #define FC_MAJOR	2
-#define FC_MINOR	8
+#define FC_MINOR	9
 #define FC_REVISION	0
 
 #define FC_VERSION	((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION))
diff --git a/fontconfig/new-version.sh b/fontconfig/new-version.sh
index 9ab64dd09..6cf609f29 100644
--- a/fontconfig/new-version.sh
+++ b/fontconfig/new-version.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-if git status -a > /dev/null; then
+if [ "x`git status -s -uno`" != "x" ]; then
 	echo 'Uncommited changes in repository' 1>&2
 	exit 1
 fi
diff --git a/fontconfig/src/Makefile.am b/fontconfig/src/Makefile.am
index 090f9b1ab..a7bb73ce2 100644
--- a/fontconfig/src/Makefile.am
+++ b/fontconfig/src/Makefile.am
@@ -164,4 +164,4 @@ fontconfig.def: $(PUBLIC_FILES) $(PUBLIC_FT_FILES)
 	sort; \
 	echo LIBRARY libfontconfig-@LIBT_CURRENT_MINUS_AGE@.dll; \
 	echo VERSION @LIBT_CURRENT@.@LIBT_REVISION@) >$@
-	@ ! grep -q FcERROR $@ || ($(RM) $@; false)
+	@ ! grep -q FcERROR $@ || (rm $@; false)
diff --git a/libX11/src/OpenDis.c b/libX11/src/OpenDis.c
index 0b779b0ad..9379fec83 100644
--- a/libX11/src/OpenDis.c
+++ b/libX11/src/OpenDis.c
@@ -1,739 +1,720 @@
-/*

-

-Copyright 1985, 1986, 1998  The Open Group

-

-Permission to use, copy, modify, distribute, and sell this software and its

-documentation for any purpose is hereby granted without fee, provided that

-the above copyright notice appear in all copies and that both that

-copyright notice and this permission notice appear in supporting

-documentation.

-

-The above copyright notice and this permission notice shall be included in

-all copies or substantial portions of the Software.

-

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

-OPEN GROUP 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.

-

-Except as contained in this notice, the name of The Open Group shall not be

-used in advertising or otherwise to promote the sale, use or other dealings

-in this Software without prior written authorization from The Open Group.

-

-*/

-

-#ifdef HAVE_CONFIG_H

-#include <config.h>

-#endif

-#include "Xlibint.h"

-#include "Xxcbint.h"

-#include <X11/Xatom.h>

-#include <X11/Xresource.h>

-#include <stdio.h>

-#include "Xintconn.h"

-

-#ifdef XKB

-#include "XKBlib.h"

-#endif /* XKB */

-

-#ifdef XTHREADS

-#include "locking.h"

-int  (*_XInitDisplayLock_fn)(Display *dpy) = NULL;

-void (*_XFreeDisplayLock_fn)(Display *dpy) = NULL;

-

-#define InitDisplayLock(d)	(_XInitDisplayLock_fn ? (*_XInitDisplayLock_fn)(d) : Success)

-#define FreeDisplayLock(d)	if (_XFreeDisplayLock_fn) (*_XFreeDisplayLock_fn)(d)

-#else

-#define InitDisplayLock(dis) Success

-#define FreeDisplayLock(dis)

-#endif /* XTHREADS */

-

-static xReq _dummy_request = {

-	0, 0, 0

-};

-

-static void OutOfMemory(Display *dpy);

-

-/*

- * Connects to a server, creates a Display object and returns a pointer to

- * the newly created Display back to the caller.

- */

-Display *

-XOpenDisplay (

-	register _Xconst char *display)

-{

-	register Display *dpy;		/* New Display object being created. */

-	register int i;

-	int j, k;			/* random iterator indexes */

-	char *display_name;		/* pointer to display name */

-	char *setup = NULL;		/* memory allocated at startup */

-	int iscreen;			/* screen number */

-	xConnSetupPrefix prefix;	/* prefix information */

-	int vendorlen;			/* length of vendor string */

-	union {

-		xConnSetup *setup;

-		char *failure;

-		char *vendor;

-		xPixmapFormat *sf;

-		xWindowRoot *rp;

-		xDepth *dp;

-		xVisualType *vp;

-	} u;				/* proto data returned from server */

-	long setuplength;	/* number of bytes in setup message */

-	long usedbytes = 0;     /* number of bytes we have processed */

-	unsigned long mask;

-	long int conn_buf_size;

-	char *xlib_buffer_size;

-

-	/*

-	 * If the display specifier string supplied as an argument to this

-	 * routine is NULL or a pointer to NULL, read the DISPLAY variable.

-	 */

-	if (display == NULL || *display == '\0') {

-		if ((display_name = getenv("DISPLAY")) == NULL) {

-			/* Oops! No DISPLAY environment variable - error. */

-			return(NULL);

-		}

-	}

-	else {

-		/* Display is non-NULL, copy the pointer */

-		display_name = (char *)display;

-	}

-

-/*

- * Set the default error handlers.  This allows the global variables to

- * default to NULL for use with shared libraries.

- */

-	if (_XErrorFunction == NULL) (void) XSetErrorHandler (NULL);

-	if (_XIOErrorFunction == NULL) (void) XSetIOErrorHandler (NULL);

-

-/*

- * Attempt to allocate a display structure. Return NULL if allocation fails.

- */

-	if ((dpy = (Display *)Xcalloc(1, sizeof(Display))) == NULL) {

-		return(NULL);

-	}

-

-	if ((dpy->display_name = strdup(display_name)) == NULL) {

-		OutOfMemory(dpy);

-		return(NULL);

-	}

-

-/*

- * Call the Connect routine to get the transport connection object.

- * If NULL is returned, the connection failed.

- */

-

-	if(!_XConnectXCB(dpy, display, &iscreen)) {

-		/* Try falling back on other transports if no transport specified */

-		const char *slash = strrchr(display_name, '/');

-		if(slash == NULL) {

-			const char *protocols[] = {"local", "unix", "tcp", "inet6", "inet", NULL};

-			const char **s;

-			size_t buf_size = strlen(display_name) + 7; // max strlen + 2 (null + /)

-			char *buf = Xmalloc(buf_size * sizeof(char));

-

-			if(buf) {

-				for(s = protocols; buf && *s; s++) {

-					snprintf(buf, buf_size, "%s/%s", *s, display_name);

-					if(_XConnectXCB(dpy, buf, &iscreen))

-						goto fallback_success;

-				}

-				Xfree(buf);

-			}

-		}

-

-		OutOfMemory(dpy);

-		return NULL;

-	}

-fallback_success:

-

-	/* Initialize as much of the display structure as we can.

-	 * Initialize pointers to NULL so that XFreeDisplayStructure will

-	 * work if we run out of memory before we finish initializing.

-	 */

-	dpy->keysyms		= (KeySym *) NULL;

-	dpy->modifiermap	= NULL;

-	dpy->lock_meaning	= NoSymbol;

-	dpy->keysyms_per_keycode = 0;

-	dpy->xdefaults		= (char *)NULL;

-	dpy->scratch_length	= 0L;

-	dpy->scratch_buffer	= NULL;

-	dpy->key_bindings	= NULL;

-	dpy->ext_procs		= (_XExtension *)NULL;

-	dpy->ext_data		= (XExtData *)NULL;

-	dpy->ext_number 	= 0;

-	dpy->event_vec[X_Error] = _XUnknownWireEvent;

-	dpy->event_vec[X_Reply] = _XUnknownWireEvent;

-	dpy->wire_vec[X_Error]  = _XUnknownNativeEvent;

-	dpy->wire_vec[X_Reply]  = _XUnknownNativeEvent;

-	for (i = KeyPress; i < LASTEvent; i++) {

-	    dpy->event_vec[i] 	= _XWireToEvent;

-	    dpy->wire_vec[i] 	= NULL;

-	}

-	for (i = LASTEvent; i < 128; i++) {

-	    dpy->event_vec[i] 	= _XUnknownWireEvent;

-	    dpy->wire_vec[i] 	= _XUnknownNativeEvent;

-	}

-	dpy->resource_id	= 0;

-	dpy->db 		= (struct _XrmHashBucketRec *)NULL;

-	dpy->cursor_font	= None;

-	dpy->flags		= 0;

-	dpy->async_handlers	= NULL;

-	dpy->screens		= NULL;

-	dpy->vendor		= NULL;

-	dpy->buffer		= NULL;

-	dpy->atoms		= NULL;

-	dpy->error_vec		= NULL;

-	dpy->context_db		= NULL;

-	dpy->free_funcs		= NULL;

-	dpy->pixmap_format	= NULL;

-	dpy->cms.clientCmaps	= NULL;

-	dpy->cms.defaultCCCs	= NULL;

-	dpy->cms.perVisualIntensityMaps = NULL;

-	dpy->im_filters		= NULL;

- 	dpy->bigreq_size	= 0;

-	dpy->lock		= NULL;

-	dpy->lock_fns		= NULL;

-	dpy->qfree		= NULL;

-	dpy->next_event_serial_num = 1;

-	dpy->im_fd_info		= NULL;

-	dpy->im_fd_length	= 0;

-	dpy->conn_watchers	= NULL;

-	dpy->watcher_count	= 0;

-	dpy->filedes		= NULL;

-	dpy->flushes		= NULL;

-	dpy->xcmisc_opcode	= 0;

-	dpy->xkb_info		= NULL;

-

-/*

- * Setup other information in this display structure.

- */

-	dpy->vnumber = X_PROTOCOL;

-	dpy->resource_alloc = _XAllocID;

-	dpy->idlist_alloc = _XAllocIDs;

-	dpy->synchandler = NULL;

-	dpy->savedsynchandler = NULL;

-	dpy->request = 0;

-	dpy->last_request_read = 0;

-	dpy->default_screen = iscreen;  /* Value returned by ConnectDisplay */

-	dpy->last_req = (char *)&_dummy_request;

-

-	/* Initialize the display lock */

-	if (InitDisplayLock(dpy) != 0) {

-	        OutOfMemory (dpy);

-		return(NULL);

-	}

-

-	if (!_XPollfdCacheInit(dpy)) {

-	        OutOfMemory (dpy);

-		return(NULL);

-	}

-

-	/* Set up the output buffers. */

-#ifndef XLIBDEFAULTBUFSIZE

-#define XLIBDEFAULTBUFSIZE 16384 /* 16k */

-#endif

-#ifndef XLIBMINBUFSIZE

-#define XLIBMINBUFSIZE BUFSIZE /* old default buffer size */

-#endif

-	xlib_buffer_size = getenv("XLIBBUFFERSIZE");

-

-#ifdef __sun /* Backwards compatibility for old Solaris libX11 name */

-	if (xlib_buffer_size == NULL)

-	    xlib_buffer_size = getenv("XSUNBUFFERSIZE");

-#endif

-

-	if (xlib_buffer_size == NULL)

-	    conn_buf_size = XLIBDEFAULTBUFSIZE;

-	else

-	    conn_buf_size = 1024 * strtol(xlib_buffer_size, NULL, 10);

-	if (conn_buf_size < XLIBMINBUFSIZE)

-	    conn_buf_size = XLIBMINBUFSIZE;

-

-	if ((dpy->bufptr = dpy->buffer = Xcalloc(1, conn_buf_size)) == NULL) {

-	    OutOfMemory (dpy);

-	    return(NULL);

-	}

-	dpy->xcb->real_bufmax = dpy->buffer + conn_buf_size;

-	dpy->bufmax = dpy->buffer;

-

-	/* Set up the input event queue and input event queue parameters. */

-	dpy->head = dpy->tail = NULL;

-	dpy->qlen = 0;

-

-	/* Set up free-function record */

-	if ((dpy->free_funcs = (_XFreeFuncRec *)Xcalloc(1,

-							sizeof(_XFreeFuncRec)))

-	    == NULL) {

-	    OutOfMemory (dpy);

-	    return(NULL);

-	}

-

-	{

-		const struct xcb_setup_t *xcbsetup = xcb_get_setup(dpy->xcb->connection);

-		memcpy(&prefix, xcbsetup, sizeof(prefix));

-		setuplength = prefix.length << 2;

-		setup = (char *) xcbsetup;

-		setup += SIZEOF(xConnSetupPrefix);

-		u.setup = (xConnSetup *) setup;

-	}

-

-/*

- * Check if the reply was long enough to get any information out of it.

- */

-	usedbytes = sz_xConnSetup;

-	if (setuplength < usedbytes ) {

-	    fprintf (stderr, "Xlib: Broken initial reply: Too short (%ld)\n", setuplength);

-	    OutOfMemory(dpy);

-	    return (NULL);

-	}

-

-/*

- * We succeeded at authorization, so let us move the data into

- * the display structure.

- */

-	dpy->proto_major_version= prefix.majorVersion;

-	dpy->proto_minor_version= prefix.minorVersion;

-	dpy->release 		= u.setup->release;

-	dpy->resource_base	= u.setup->ridBase;

-	dpy->resource_mask	= u.setup->ridMask;

-	dpy->min_keycode	= u.setup->minKeyCode;

-	dpy->max_keycode	= u.setup->maxKeyCode;

-	dpy->motion_buffer	= u.setup->motionBufferSize;

-	dpy->nformats		= u.setup->numFormats;

-	dpy->nscreens		= u.setup->numRoots;

-	dpy->byte_order		= u.setup->imageByteOrder;

-	dpy->bitmap_unit	= u.setup->bitmapScanlineUnit;

-	dpy->bitmap_pad		= u.setup->bitmapScanlinePad;

-	dpy->bitmap_bit_order   = u.setup->bitmapBitOrder;

-	dpy->max_request_size	= u.setup->maxRequestSize;

-	mask = dpy->resource_mask;

-	dpy->resource_shift	= 0;

-	if (!mask)

-	{

-	    fprintf (stderr, "Xlib: connection to \"%s\" invalid setup\n",

-		     dpy->display_name);

-	    OutOfMemory(dpy);

-	    return (NULL);

-	}

-

-	while (!(mask & 1)) {

-	    dpy->resource_shift++;

-	    mask = mask >> 1;

-	}

-	dpy->resource_max = (dpy->resource_mask >> dpy->resource_shift) - 5;

-/*

- * now extract the vendor string...  String must be null terminated,

- * padded to multiple of 4 bytes.

- */

-	/* Check for a sane vendor string length */

-	if (u.setup->nbytesVendor > 256) {

-	    OutOfMemory(dpy);

-	    return (NULL);

-	}

-

-	dpy->vendor = (char *) Xmalloc((unsigned) (u.setup->nbytesVendor + 1));

-	if (dpy->vendor == NULL) {

-	    OutOfMemory(dpy);

-	    return (NULL);

-	}

-	vendorlen = u.setup->nbytesVendor;

-

-/*

- * validate setup length

- */

-	usedbytes += (vendorlen + 3) & ~3;

-	if (setuplength < usedbytes) {

-	    fprintf (stderr, "Xlib: Broken initial reply: Too short (%ld)\n", setuplength);

-	    OutOfMemory(dpy);

-	    return (NULL);

-	}

-

- 	u.setup = (xConnSetup *) (((char *) u.setup) + sz_xConnSetup);

-  	(void) strncpy(dpy->vendor, u.vendor, vendorlen);

-	dpy->vendor[vendorlen] = '\0';

- 	vendorlen = (vendorlen + 3) & ~3;	/* round up */

-	u.vendor += vendorlen;

-

-/*

- * Now iterate down setup information.....

- */

-	dpy->pixmap_format =

-	    (ScreenFormat *)Xmalloc(

-		(unsigned) (dpy->nformats *sizeof(ScreenFormat)));

-	if (dpy->pixmap_format == NULL) {

-	        OutOfMemory (dpy);

-		return(NULL);

-	}

-/*

- * First decode the Z axis Screen format information.

- */

-	usedbytes += dpy->nformats * sz_xPixmapFormat;

-

-	if (setuplength < usedbytes) {

-	    fprintf (stderr, "Xlib: Broken initial reply: Too short (%ld)\n", setuplength);

-	    OutOfMemory (dpy);

-	    return(NULL);

-	}

-

-	for (i = 0; i < dpy->nformats; i++) {

-	    register ScreenFormat *fmt = &dpy->pixmap_format[i];

-	    fmt->depth = u.sf->depth;

-	    fmt->bits_per_pixel = u.sf->bitsPerPixel;

-	    fmt->scanline_pad = u.sf->scanLinePad;

-	    fmt->ext_data = NULL;

-	    u.sf = (xPixmapFormat *) (((char *) u.sf) + sz_xPixmapFormat);

-	}

-

-/*

- * next the Screen structures.

- */

-	dpy->screens =

-	    (Screen *)Xmalloc((unsigned) dpy->nscreens*sizeof(Screen));

-	if (dpy->screens == NULL) {

-	        OutOfMemory (dpy);

-		return(NULL);

-	}

-

-/*

- * Now go deal with each screen structure.

- */

-	for (i = 0; i < dpy->nscreens; i++) {

-	    register Screen *sp = &dpy->screens[i];

-	    VisualID root_visualID;

-

-	    usedbytes += sz_xWindowRoot;

-	    if (setuplength < usedbytes) {

-		fprintf (stderr, "Xlib: Broken initial reply: Too short (%ld)\n", setuplength);

-		OutOfMemory (dpy);

-		return(NULL);

-	    }

-

-	    root_visualID = u.rp->rootVisualID;

-	    sp->display	    = dpy;

-	    sp->root 	    = u.rp->windowId;

-	    sp->cmap 	    = u.rp->defaultColormap;

-	    sp->white_pixel = u.rp->whitePixel;

-	    sp->black_pixel = u.rp->blackPixel;

-	    sp->root_input_mask = u.rp->currentInputMask;

-	    sp->width	    = u.rp->pixWidth;

-	    sp->height	    = u.rp->pixHeight;

-	    sp->mwidth	    = u.rp->mmWidth;

-	    sp->mheight	    = u.rp->mmHeight;

-	    sp->min_maps    = u.rp->minInstalledMaps;

-	    sp->max_maps    = u.rp->maxInstalledMaps;

-	    sp->backing_store= u.rp->backingStore;

-	    sp->save_unders = u.rp->saveUnders;

-	    sp->root_depth  = u.rp->rootDepth;

-	    sp->ndepths	    = u.rp->nDepths;

-	    sp->ext_data   = NULL;

-	    u.rp = (xWindowRoot *) (((char *) u.rp) + sz_xWindowRoot);

-/*

- * lets set up the depth structures.

- */

-	    sp->depths = (Depth *)Xmalloc(

-			(unsigned)sp->ndepths*sizeof(Depth));

-	    if (sp->depths == NULL) {

-		OutOfMemory (dpy);

-		return(NULL);

-	    }

-	    /*

-	     * for all depths on this screen.

-	     */

-	    for (j = 0; j < sp->ndepths; j++) {

-		Depth *dp = &sp->depths[j];

-

-		usedbytes += sz_xDepth;

-		if (setuplength < usedbytes) {

-		    fprintf (stderr, "Xlib: Broken initial reply: Too short (%ld)\n", setuplength);

-		    OutOfMemory (dpy);

-		    return(NULL);

-		}

-

-		dp->depth = u.dp->depth;

-		dp->nvisuals = u.dp->nVisuals;

-		u.dp = (xDepth *) (((char *) u.dp) + sz_xDepth);

-		if (dp->nvisuals > 0) {

-		    dp->visuals =

-		      (Visual *)Xmalloc((unsigned)dp->nvisuals*sizeof(Visual));

-		    if (dp->visuals == NULL) {

-			OutOfMemory (dpy);

-			return(NULL);

-		    }

-		    for (k = 0; k < dp->nvisuals; k++) {

-			register Visual *vp = &dp->visuals[k];

-

-			usedbytes += sz_xVisualType;

-			if (setuplength < usedbytes) {

-			    fprintf (stderr, "Xlib: Broken initial reply: Too short (%ld)\n", setuplength);

-			    OutOfMemory (dpy);

-			    return(NULL);

-			}

-

-			vp->visualid	= u.vp->visualID;

-			vp->class	= u.vp->class;

-			vp->bits_per_rgb= u.vp->bitsPerRGB;

-			vp->map_entries	= u.vp->colormapEntries;

-			vp->red_mask	= u.vp->redMask;

-			vp->green_mask	= u.vp->greenMask;

-			vp->blue_mask	= u.vp->blueMask;

-			vp->ext_data	= NULL;

-			u.vp = (xVisualType *) (((char *) u.vp) +

-						sz_xVisualType);

-		    }

-		    if (dp->depth == 32 && getenv ("XLIB_SKIP_ARGB_VISUALS"))

-		    {

-			Xfree (dp->visuals);

-			dp->visuals = NULL;

-			dp->nvisuals = 0;

-		    }

-		} else {

-		    dp->visuals = (Visual *) NULL;

-		}

-	    }

-	    sp->root_visual = _XVIDtoVisual(dpy, root_visualID);

-	}

-

-	if(usedbytes != setuplength){

-	    /* Sanity check, shouldn't happen. */

-	    fprintf(stderr, "Xlib: Did not parse entire setup message: "

-	                    "parsed: %ld, message: %ld\n",

-		    usedbytes, setuplength);

-	    OutOfMemory(dpy);

-	    return(NULL);

-	}

-

-/*

- * Now start talking to the server to setup all other information...

- */

-

-/*

- * Make sure default screen is legal.

- */

-	if (iscreen >= dpy->nscreens) {

-	    OutOfMemory(dpy);

-	    return(NULL);

-	}

-

-	dpy->bigreq_size = xcb_get_maximum_request_length(dpy->xcb->connection);

-	if(dpy->bigreq_size <= dpy->max_request_size)

-		dpy->bigreq_size = 0;

-

-/*

- * Set up other stuff clients are always going to use.

- */

-	for (i = 0; i < dpy->nscreens; i++) {

-	    register Screen *sp = &dpy->screens[i];

-	    XGCValues values;

-	    values.foreground = sp->black_pixel;

-	    values.background = sp->white_pixel;

-	    if ((sp->default_gc = XCreateGC (dpy, sp->root,

-					     GCForeground|GCBackground,

-					     &values)) == NULL) {

-		OutOfMemory(dpy);

-		return (NULL);

-	    }

-	}

-/*

- * call into synchronization routine so that all programs can be

- * forced synchronous

- */

-	(void) XSynchronize(dpy, _Xdebug);

-

-/*

- * get availability of large requests, and

- * get the resource manager database off the root window.

- */

-	LockDisplay(dpy);

-	{

-	    xGetPropertyReply reply;

-	    xGetPropertyReq *req;

-

-	    GetReq (GetProperty, req);

-	    req->window = RootWindow(dpy, 0);

-	    req->property = XA_RESOURCE_MANAGER;

-	    req->type = XA_STRING;

-	    req->delete = False;

-	    req->longOffset = 0;

-	    req->longLength = 100000000L;

-

-	    if (_XReply (dpy, (xReply *) &reply, 0, xFalse)) {

-		if (reply.format == 8 && reply.propertyType == XA_STRING &&

-		    (reply.nItems + 1 > 0) &&

-		    (reply.nItems <= req->longLength * 4) &&

-		    (dpy->xdefaults = Xmalloc (reply.nItems + 1))) {

-		    _XReadPad (dpy, dpy->xdefaults, reply.nItems);

-		    dpy->xdefaults[reply.nItems] = '\0';

-		}

-		else if (reply.propertyType != None)

-		    _XEatData(dpy, reply.nItems * (reply.format >> 3));

-	    }

-	}

-	UnlockDisplay(dpy);

-

-#ifdef MOTIFBC

-	{

-	    extern Display *_XHeadOfDisplayList;

-	    _XHeadOfDisplayList = dpy;

-	}

-#endif

-#ifdef XKB

-	XkbUseExtension(dpy,NULL,NULL);

-#endif

-/*

- * and return successfully

- */

- 	return(dpy);

-}

-

-/* XFreeDisplayStructure frees all the storage associated with a

- * Display.  It is used by XOpenDisplay if it runs out of memory,

- * and also by XCloseDisplay.   It needs to check whether all pointers

- * are non-NULL before dereferencing them, since it may be called

- * by XOpenDisplay before the Display structure is fully formed.

- * XOpenDisplay must be sure to initialize all the pointers to NULL

- * before the first possible call on this.

- */

-

-void _XFreeDisplayStructure(Display *dpy)

-{

-	/* move all cookies in the EQ to the jar, then free them. */

-	if (dpy->qfree) {

-	    _XQEvent *qelt = dpy->qfree;

-	    while (qelt) {

-		if (_XIsEventCookie(dpy, &qelt->event))

-		    _XStoreEventCookie(dpy, &qelt->event);

-		qelt = qelt->next;

-	    }

-        }

-	if (dpy->cookiejar)

-	    _XFreeEventCookies(dpy);

-	while (dpy->ext_procs) {

-	    _XExtension *ext = dpy->ext_procs;

-	    dpy->ext_procs = ext->next;

-	    if (ext->name)

-		Xfree (ext->name);

-	    Xfree ((char *)ext);

-	}

-	if (dpy->im_filters)

-	   (*dpy->free_funcs->im_filters)(dpy);

-	if (dpy->cms.clientCmaps)

-	   (*dpy->free_funcs->clientCmaps)(dpy);

-	if (dpy->cms.defaultCCCs)

-	   (*dpy->free_funcs->defaultCCCs)(dpy);

-	if (dpy->cms.perVisualIntensityMaps)

-	   (*dpy->free_funcs->intensityMaps)(dpy);

-	if (dpy->atoms)

-	    (*dpy->free_funcs->atoms)(dpy);

-	if (dpy->modifiermap)

-	   (*dpy->free_funcs->modifiermap)(dpy->modifiermap);

-	if (dpy->key_bindings)

-	   (*dpy->free_funcs->key_bindings)(dpy);

-	if (dpy->context_db)

-	   (*dpy->free_funcs->context_db)(dpy);

-	if (dpy->xkb_info)

-	   (*dpy->free_funcs->xkb)(dpy);

-

-	/* if RM database was allocated by XGetDefault() free it */

-	if (dpy->db && (dpy->flags & XlibDisplayDfltRMDB))

-	    XrmDestroyDatabase(dpy->db);

-

-	if (dpy->screens) {

-	    register int i;

-

-            for (i = 0; i < dpy->nscreens; i++) {

-		Screen *sp = &dpy->screens[i];

-

-		if (sp->depths) {

-		   register int j;

-

-		   for (j = 0; j < sp->ndepths; j++) {

-			Depth *dp = &sp->depths[j];

-

-			if (dp->visuals) {

-			   register int k;

-

-			   for (k = 0; k < dp->nvisuals; k++)

-			     _XFreeExtData (dp->visuals[k].ext_data);

-			   Xfree ((char *) dp->visuals);

-			   }

-			}

-

-		   Xfree ((char *) sp->depths);

-		   }

-

-		_XFreeExtData (sp->ext_data);

-		}

-

-	    Xfree ((char *)dpy->screens);

-	    }

-

-	if (dpy->pixmap_format) {

-	    register int i;

-

-	    for (i = 0; i < dpy->nformats; i++)

-	      _XFreeExtData (dpy->pixmap_format[i].ext_data);

-            Xfree ((char *)dpy->pixmap_format);

-	    }

-

-	free(dpy->display_name);

-	if (dpy->vendor)

-	   Xfree (dpy->vendor);

-

-        if (dpy->buffer)

-	   Xfree (dpy->buffer);

-	if (dpy->keysyms)

-	   Xfree ((char *) dpy->keysyms);

-	if (dpy->xdefaults)

-	   Xfree (dpy->xdefaults);

-	if (dpy->error_vec)

-	    Xfree ((char *)dpy->error_vec);

-

-	_XFreeExtData (dpy->ext_data);

-	if (dpy->free_funcs)

-	    Xfree ((char *)dpy->free_funcs);

- 	if (dpy->scratch_buffer)

- 	    Xfree (dpy->scratch_buffer);

-	FreeDisplayLock(dpy);

-

-	if (dpy->qfree) {

-	    register _XQEvent *qelt = dpy->qfree;

-

-	    while (qelt) {

-		register _XQEvent *qnxt = qelt->next;

-		Xfree ((char *) qelt);

-		qelt = qnxt;

-	    }

-	}

-	while (dpy->im_fd_info) {

-	    struct _XConnectionInfo *conni = dpy->im_fd_info;

-	    dpy->im_fd_info = conni->next;

-	    if (conni->watch_data)

-		Xfree (conni->watch_data);

-	    Xfree (conni);

-	}

-	if (dpy->conn_watchers) {

-	    struct _XConnWatchInfo *watcher = dpy->conn_watchers;

-	    dpy->conn_watchers = watcher->next;

-	    Xfree (watcher);

-	}

-	if (dpy->filedes)

-	    Xfree (dpy->filedes);

-

-	_XFreeX11XCBStructure(dpy);

-

-	Xfree ((char *)dpy);

-}

-

-/* OutOfMemory is called if malloc fails.  XOpenDisplay returns NULL

-   after this returns. */

-

-static void OutOfMemory(Display *dpy)

-{

-    if(dpy->xcb->connection)

-	xcb_disconnect(dpy->xcb->connection);

-    _XFreeDisplayStructure (dpy);

-}

+/*
+
+Copyright 1985, 1986, 1998  The Open Group
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+OPEN GROUP 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.
+
+Except as contained in this notice, the name of The Open Group shall not be
+used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization from The Open Group.
+
+*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include "Xlibint.h"
+#include "Xxcbint.h"
+#include <X11/Xatom.h>
+#include <X11/Xresource.h>
+#include <stdio.h>
+#include "Xintconn.h"
+
+#ifdef XKB
+#include "XKBlib.h"
+#endif /* XKB */
+
+#ifdef XTHREADS
+#include "locking.h"
+int  (*_XInitDisplayLock_fn)(Display *dpy) = NULL;
+void (*_XFreeDisplayLock_fn)(Display *dpy) = NULL;
+
+#define InitDisplayLock(d)	(_XInitDisplayLock_fn ? (*_XInitDisplayLock_fn)(d) : Success)
+#define FreeDisplayLock(d)	if (_XFreeDisplayLock_fn) (*_XFreeDisplayLock_fn)(d)
+#else
+#define InitDisplayLock(dis) Success
+#define FreeDisplayLock(dis)
+#endif /* XTHREADS */
+
+static xReq _dummy_request = {
+	0, 0, 0
+};
+
+static void OutOfMemory(Display *dpy);
+
+/*
+ * Connects to a server, creates a Display object and returns a pointer to
+ * the newly created Display back to the caller.
+ */
+Display *
+XOpenDisplay (
+	register _Xconst char *display)
+{
+	register Display *dpy;		/* New Display object being created. */
+	register int i;
+	int j, k;			/* random iterator indexes */
+	char *display_name;		/* pointer to display name */
+	char *setup = NULL;		/* memory allocated at startup */
+	int iscreen;			/* screen number */
+	xConnSetupPrefix prefix;	/* prefix information */
+	int vendorlen;			/* length of vendor string */
+	union {
+		xConnSetup *setup;
+		char *failure;
+		char *vendor;
+		xPixmapFormat *sf;
+		xWindowRoot *rp;
+		xDepth *dp;
+		xVisualType *vp;
+	} u;				/* proto data returned from server */
+	long setuplength;	/* number of bytes in setup message */
+	long usedbytes = 0;     /* number of bytes we have processed */
+	unsigned long mask;
+	long int conn_buf_size;
+	char *xlib_buffer_size;
+
+	/*
+	 * If the display specifier string supplied as an argument to this
+	 * routine is NULL or a pointer to NULL, read the DISPLAY variable.
+	 */
+	if (display == NULL || *display == '\0') {
+		if ((display_name = getenv("DISPLAY")) == NULL) {
+			/* Oops! No DISPLAY environment variable - error. */
+			return(NULL);
+		}
+	}
+	else {
+		/* Display is non-NULL, copy the pointer */
+		display_name = (char *)display;
+	}
+
+/*
+ * Set the default error handlers.  This allows the global variables to
+ * default to NULL for use with shared libraries.
+ */
+	if (_XErrorFunction == NULL) (void) XSetErrorHandler (NULL);
+	if (_XIOErrorFunction == NULL) (void) XSetIOErrorHandler (NULL);
+
+/*
+ * Attempt to allocate a display structure. Return NULL if allocation fails.
+ */
+	if ((dpy = (Display *)Xcalloc(1, sizeof(Display))) == NULL) {
+		return(NULL);
+	}
+
+	if ((dpy->display_name = strdup(display_name)) == NULL) {
+		OutOfMemory(dpy);
+		return(NULL);
+	}
+
+/*
+ * Call the Connect routine to get the transport connection object.
+ * If NULL is returned, the connection failed.
+ */
+
+	if(!_XConnectXCB(dpy, display, &iscreen)) {
+		OutOfMemory(dpy);
+		return NULL;
+	}
+
+	/* Initialize as much of the display structure as we can.
+	 * Initialize pointers to NULL so that XFreeDisplayStructure will
+	 * work if we run out of memory before we finish initializing.
+	 */
+	dpy->keysyms		= (KeySym *) NULL;
+	dpy->modifiermap	= NULL;
+	dpy->lock_meaning	= NoSymbol;
+	dpy->keysyms_per_keycode = 0;
+	dpy->xdefaults		= (char *)NULL;
+	dpy->scratch_length	= 0L;
+	dpy->scratch_buffer	= NULL;
+	dpy->key_bindings	= NULL;
+	dpy->ext_procs		= (_XExtension *)NULL;
+	dpy->ext_data		= (XExtData *)NULL;
+	dpy->ext_number 	= 0;
+	dpy->event_vec[X_Error] = _XUnknownWireEvent;
+	dpy->event_vec[X_Reply] = _XUnknownWireEvent;
+	dpy->wire_vec[X_Error]  = _XUnknownNativeEvent;
+	dpy->wire_vec[X_Reply]  = _XUnknownNativeEvent;
+	for (i = KeyPress; i < LASTEvent; i++) {
+	    dpy->event_vec[i] 	= _XWireToEvent;
+	    dpy->wire_vec[i] 	= NULL;
+	}
+	for (i = LASTEvent; i < 128; i++) {
+	    dpy->event_vec[i] 	= _XUnknownWireEvent;
+	    dpy->wire_vec[i] 	= _XUnknownNativeEvent;
+	}
+	dpy->resource_id	= 0;
+	dpy->db 		= (struct _XrmHashBucketRec *)NULL;
+	dpy->cursor_font	= None;
+	dpy->flags		= 0;
+	dpy->async_handlers	= NULL;
+	dpy->screens		= NULL;
+	dpy->vendor		= NULL;
+	dpy->buffer		= NULL;
+	dpy->atoms		= NULL;
+	dpy->error_vec		= NULL;
+	dpy->context_db		= NULL;
+	dpy->free_funcs		= NULL;
+	dpy->pixmap_format	= NULL;
+	dpy->cms.clientCmaps	= NULL;
+	dpy->cms.defaultCCCs	= NULL;
+	dpy->cms.perVisualIntensityMaps = NULL;
+	dpy->im_filters		= NULL;
+ 	dpy->bigreq_size	= 0;
+	dpy->lock		= NULL;
+	dpy->lock_fns		= NULL;
+	dpy->qfree		= NULL;
+	dpy->next_event_serial_num = 1;
+	dpy->im_fd_info		= NULL;
+	dpy->im_fd_length	= 0;
+	dpy->conn_watchers	= NULL;
+	dpy->watcher_count	= 0;
+	dpy->filedes		= NULL;
+	dpy->flushes		= NULL;
+	dpy->xcmisc_opcode	= 0;
+	dpy->xkb_info		= NULL;
+
+/*
+ * Setup other information in this display structure.
+ */
+	dpy->vnumber = X_PROTOCOL;
+	dpy->resource_alloc = _XAllocID;
+	dpy->idlist_alloc = _XAllocIDs;
+	dpy->synchandler = NULL;
+	dpy->savedsynchandler = NULL;
+	dpy->request = 0;
+	dpy->last_request_read = 0;
+	dpy->default_screen = iscreen;  /* Value returned by ConnectDisplay */
+	dpy->last_req = (char *)&_dummy_request;
+
+	/* Initialize the display lock */
+	if (InitDisplayLock(dpy) != 0) {
+	        OutOfMemory (dpy);
+		return(NULL);
+	}
+
+	if (!_XPollfdCacheInit(dpy)) {
+	        OutOfMemory (dpy);
+		return(NULL);
+	}
+
+	/* Set up the output buffers. */
+#ifndef XLIBDEFAULTBUFSIZE
+#define XLIBDEFAULTBUFSIZE 16384 /* 16k */
+#endif
+#ifndef XLIBMINBUFSIZE
+#define XLIBMINBUFSIZE BUFSIZE /* old default buffer size */
+#endif
+	xlib_buffer_size = getenv("XLIBBUFFERSIZE");
+
+#ifdef __sun /* Backwards compatibility for old Solaris libX11 name */
+	if (xlib_buffer_size == NULL)
+	    xlib_buffer_size = getenv("XSUNBUFFERSIZE");
+#endif
+
+	if (xlib_buffer_size == NULL)
+	    conn_buf_size = XLIBDEFAULTBUFSIZE;
+	else
+	    conn_buf_size = 1024 * strtol(xlib_buffer_size, NULL, 10);
+	if (conn_buf_size < XLIBMINBUFSIZE)
+	    conn_buf_size = XLIBMINBUFSIZE;
+
+	if ((dpy->bufptr = dpy->buffer = Xcalloc(1, conn_buf_size)) == NULL) {
+	    OutOfMemory (dpy);
+	    return(NULL);
+	}
+	dpy->xcb->real_bufmax = dpy->buffer + conn_buf_size;
+	dpy->bufmax = dpy->buffer;
+
+	/* Set up the input event queue and input event queue parameters. */
+	dpy->head = dpy->tail = NULL;
+	dpy->qlen = 0;
+
+	/* Set up free-function record */
+	if ((dpy->free_funcs = (_XFreeFuncRec *)Xcalloc(1,
+							sizeof(_XFreeFuncRec)))
+	    == NULL) {
+	    OutOfMemory (dpy);
+	    return(NULL);
+	}
+
+	{
+		const struct xcb_setup_t *xcbsetup = xcb_get_setup(dpy->xcb->connection);
+		memcpy(&prefix, xcbsetup, sizeof(prefix));
+		setuplength = prefix.length << 2;
+		setup = (char *) xcbsetup;
+		setup += SIZEOF(xConnSetupPrefix);
+		u.setup = (xConnSetup *) setup;
+	}
+
+/*
+ * Check if the reply was long enough to get any information out of it.
+ */
+	usedbytes = sz_xConnSetup;
+	if (setuplength < usedbytes ) {
+	    fprintf (stderr, "Xlib: Broken initial reply: Too short (%ld)\n", setuplength);
+	    OutOfMemory(dpy);
+	    return (NULL);
+	}
+
+/*
+ * We succeeded at authorization, so let us move the data into
+ * the display structure.
+ */
+	dpy->proto_major_version= prefix.majorVersion;
+	dpy->proto_minor_version= prefix.minorVersion;
+	dpy->release 		= u.setup->release;
+	dpy->resource_base	= u.setup->ridBase;
+	dpy->resource_mask	= u.setup->ridMask;
+	dpy->min_keycode	= u.setup->minKeyCode;
+	dpy->max_keycode	= u.setup->maxKeyCode;
+	dpy->motion_buffer	= u.setup->motionBufferSize;
+	dpy->nformats		= u.setup->numFormats;
+	dpy->nscreens		= u.setup->numRoots;
+	dpy->byte_order		= u.setup->imageByteOrder;
+	dpy->bitmap_unit	= u.setup->bitmapScanlineUnit;
+	dpy->bitmap_pad		= u.setup->bitmapScanlinePad;
+	dpy->bitmap_bit_order   = u.setup->bitmapBitOrder;
+	dpy->max_request_size	= u.setup->maxRequestSize;
+	mask = dpy->resource_mask;
+	dpy->resource_shift	= 0;
+	if (!mask)
+	{
+	    fprintf (stderr, "Xlib: connection to \"%s\" invalid setup\n",
+		     dpy->display_name);
+	    OutOfMemory(dpy);
+	    return (NULL);
+	}
+
+	while (!(mask & 1)) {
+	    dpy->resource_shift++;
+	    mask = mask >> 1;
+	}
+	dpy->resource_max = (dpy->resource_mask >> dpy->resource_shift) - 5;
+/*
+ * now extract the vendor string...  String must be null terminated,
+ * padded to multiple of 4 bytes.
+ */
+	/* Check for a sane vendor string length */
+	if (u.setup->nbytesVendor > 256) {
+	    OutOfMemory(dpy);
+	    return (NULL);
+	}
+
+	dpy->vendor = (char *) Xmalloc((unsigned) (u.setup->nbytesVendor + 1));
+	if (dpy->vendor == NULL) {
+	    OutOfMemory(dpy);
+	    return (NULL);
+	}
+	vendorlen = u.setup->nbytesVendor;
+
+/*
+ * validate setup length
+ */
+	usedbytes += (vendorlen + 3) & ~3;
+	if (setuplength < usedbytes) {
+	    fprintf (stderr, "Xlib: Broken initial reply: Too short (%ld)\n", setuplength);
+	    OutOfMemory(dpy);
+	    return (NULL);
+	}
+
+ 	u.setup = (xConnSetup *) (((char *) u.setup) + sz_xConnSetup);
+  	(void) strncpy(dpy->vendor, u.vendor, vendorlen);
+	dpy->vendor[vendorlen] = '\0';
+ 	vendorlen = (vendorlen + 3) & ~3;	/* round up */
+	u.vendor += vendorlen;
+
+/*
+ * Now iterate down setup information.....
+ */
+	dpy->pixmap_format =
+	    (ScreenFormat *)Xmalloc(
+		(unsigned) (dpy->nformats *sizeof(ScreenFormat)));
+	if (dpy->pixmap_format == NULL) {
+	        OutOfMemory (dpy);
+		return(NULL);
+	}
+/*
+ * First decode the Z axis Screen format information.
+ */
+	usedbytes += dpy->nformats * sz_xPixmapFormat;
+
+	if (setuplength < usedbytes) {
+	    fprintf (stderr, "Xlib: Broken initial reply: Too short (%ld)\n", setuplength);
+	    OutOfMemory (dpy);
+	    return(NULL);
+	}
+
+	for (i = 0; i < dpy->nformats; i++) {
+	    register ScreenFormat *fmt = &dpy->pixmap_format[i];
+	    fmt->depth = u.sf->depth;
+	    fmt->bits_per_pixel = u.sf->bitsPerPixel;
+	    fmt->scanline_pad = u.sf->scanLinePad;
+	    fmt->ext_data = NULL;
+	    u.sf = (xPixmapFormat *) (((char *) u.sf) + sz_xPixmapFormat);
+	}
+
+/*
+ * next the Screen structures.
+ */
+	dpy->screens =
+	    (Screen *)Xmalloc((unsigned) dpy->nscreens*sizeof(Screen));
+	if (dpy->screens == NULL) {
+	        OutOfMemory (dpy);
+		return(NULL);
+	}
+
+/*
+ * Now go deal with each screen structure.
+ */
+	for (i = 0; i < dpy->nscreens; i++) {
+	    register Screen *sp = &dpy->screens[i];
+	    VisualID root_visualID;
+
+	    usedbytes += sz_xWindowRoot;
+	    if (setuplength < usedbytes) {
+		fprintf (stderr, "Xlib: Broken initial reply: Too short (%ld)\n", setuplength);
+		OutOfMemory (dpy);
+		return(NULL);
+	    }
+
+	    root_visualID = u.rp->rootVisualID;
+	    sp->display	    = dpy;
+	    sp->root 	    = u.rp->windowId;
+	    sp->cmap 	    = u.rp->defaultColormap;
+	    sp->white_pixel = u.rp->whitePixel;
+	    sp->black_pixel = u.rp->blackPixel;
+	    sp->root_input_mask = u.rp->currentInputMask;
+	    sp->width	    = u.rp->pixWidth;
+	    sp->height	    = u.rp->pixHeight;
+	    sp->mwidth	    = u.rp->mmWidth;
+	    sp->mheight	    = u.rp->mmHeight;
+	    sp->min_maps    = u.rp->minInstalledMaps;
+	    sp->max_maps    = u.rp->maxInstalledMaps;
+	    sp->backing_store= u.rp->backingStore;
+	    sp->save_unders = u.rp->saveUnders;
+	    sp->root_depth  = u.rp->rootDepth;
+	    sp->ndepths	    = u.rp->nDepths;
+	    sp->ext_data   = NULL;
+	    u.rp = (xWindowRoot *) (((char *) u.rp) + sz_xWindowRoot);
+/*
+ * lets set up the depth structures.
+ */
+	    sp->depths = (Depth *)Xmalloc(
+			(unsigned)sp->ndepths*sizeof(Depth));
+	    if (sp->depths == NULL) {
+		OutOfMemory (dpy);
+		return(NULL);
+	    }
+	    /*
+	     * for all depths on this screen.
+	     */
+	    for (j = 0; j < sp->ndepths; j++) {
+		Depth *dp = &sp->depths[j];
+
+		usedbytes += sz_xDepth;
+		if (setuplength < usedbytes) {
+		    fprintf (stderr, "Xlib: Broken initial reply: Too short (%ld)\n", setuplength);
+		    OutOfMemory (dpy);
+		    return(NULL);
+		}
+
+		dp->depth = u.dp->depth;
+		dp->nvisuals = u.dp->nVisuals;
+		u.dp = (xDepth *) (((char *) u.dp) + sz_xDepth);
+		if (dp->nvisuals > 0) {
+		    dp->visuals =
+		      (Visual *)Xmalloc((unsigned)dp->nvisuals*sizeof(Visual));
+		    if (dp->visuals == NULL) {
+			OutOfMemory (dpy);
+			return(NULL);
+		    }
+		    for (k = 0; k < dp->nvisuals; k++) {
+			register Visual *vp = &dp->visuals[k];
+
+			usedbytes += sz_xVisualType;
+			if (setuplength < usedbytes) {
+			    fprintf (stderr, "Xlib: Broken initial reply: Too short (%ld)\n", setuplength);
+			    OutOfMemory (dpy);
+			    return(NULL);
+			}
+
+			vp->visualid	= u.vp->visualID;
+			vp->class	= u.vp->class;
+			vp->bits_per_rgb= u.vp->bitsPerRGB;
+			vp->map_entries	= u.vp->colormapEntries;
+			vp->red_mask	= u.vp->redMask;
+			vp->green_mask	= u.vp->greenMask;
+			vp->blue_mask	= u.vp->blueMask;
+			vp->ext_data	= NULL;
+			u.vp = (xVisualType *) (((char *) u.vp) +
+						sz_xVisualType);
+		    }
+		    if (dp->depth == 32 && getenv ("XLIB_SKIP_ARGB_VISUALS"))
+		    {
+			Xfree (dp->visuals);
+			dp->visuals = NULL;
+			dp->nvisuals = 0;
+		    }
+		} else {
+		    dp->visuals = (Visual *) NULL;
+		}
+	    }
+	    sp->root_visual = _XVIDtoVisual(dpy, root_visualID);
+	}
+
+	if(usedbytes != setuplength){
+	    /* Sanity check, shouldn't happen. */
+	    fprintf(stderr, "Xlib: Did not parse entire setup message: "
+	                    "parsed: %ld, message: %ld\n",
+		    usedbytes, setuplength);
+	    OutOfMemory(dpy);
+	    return(NULL);
+	}
+
+/*
+ * Now start talking to the server to setup all other information...
+ */
+
+/*
+ * Make sure default screen is legal.
+ */
+	if (iscreen >= dpy->nscreens) {
+	    OutOfMemory(dpy);
+	    return(NULL);
+	}
+
+	dpy->bigreq_size = xcb_get_maximum_request_length(dpy->xcb->connection);
+	if(dpy->bigreq_size <= dpy->max_request_size)
+		dpy->bigreq_size = 0;
+
+/*
+ * Set up other stuff clients are always going to use.
+ */
+	for (i = 0; i < dpy->nscreens; i++) {
+	    register Screen *sp = &dpy->screens[i];
+	    XGCValues values;
+	    values.foreground = sp->black_pixel;
+	    values.background = sp->white_pixel;
+	    if ((sp->default_gc = XCreateGC (dpy, sp->root,
+					     GCForeground|GCBackground,
+					     &values)) == NULL) {
+		OutOfMemory(dpy);
+		return (NULL);
+	    }
+	}
+/*
+ * call into synchronization routine so that all programs can be
+ * forced synchronous
+ */
+	(void) XSynchronize(dpy, _Xdebug);
+
+/*
+ * get availability of large requests, and
+ * get the resource manager database off the root window.
+ */
+	LockDisplay(dpy);
+	{
+	    xGetPropertyReply reply;
+	    xGetPropertyReq *req;
+
+	    GetReq (GetProperty, req);
+	    req->window = RootWindow(dpy, 0);
+	    req->property = XA_RESOURCE_MANAGER;
+	    req->type = XA_STRING;
+	    req->delete = False;
+	    req->longOffset = 0;
+	    req->longLength = 100000000L;
+
+	    if (_XReply (dpy, (xReply *) &reply, 0, xFalse)) {
+		if (reply.format == 8 && reply.propertyType == XA_STRING &&
+		    (reply.nItems + 1 > 0) &&
+		    (reply.nItems <= req->longLength * 4) &&
+		    (dpy->xdefaults = Xmalloc (reply.nItems + 1))) {
+		    _XReadPad (dpy, dpy->xdefaults, reply.nItems);
+		    dpy->xdefaults[reply.nItems] = '\0';
+		}
+		else if (reply.propertyType != None)
+		    _XEatData(dpy, reply.nItems * (reply.format >> 3));
+	    }
+	}
+	UnlockDisplay(dpy);
+
+#ifdef MOTIFBC
+	{
+	    extern Display *_XHeadOfDisplayList;
+	    _XHeadOfDisplayList = dpy;
+	}
+#endif
+#ifdef XKB
+	XkbUseExtension(dpy,NULL,NULL);
+#endif
+/*
+ * and return successfully
+ */
+ 	return(dpy);
+}
+
+/* XFreeDisplayStructure frees all the storage associated with a
+ * Display.  It is used by XOpenDisplay if it runs out of memory,
+ * and also by XCloseDisplay.   It needs to check whether all pointers
+ * are non-NULL before dereferencing them, since it may be called
+ * by XOpenDisplay before the Display structure is fully formed.
+ * XOpenDisplay must be sure to initialize all the pointers to NULL
+ * before the first possible call on this.
+ */
+
+void _XFreeDisplayStructure(Display *dpy)
+{
+	/* move all cookies in the EQ to the jar, then free them. */
+	if (dpy->qfree) {
+	    _XQEvent *qelt = dpy->qfree;
+	    while (qelt) {
+		if (_XIsEventCookie(dpy, &qelt->event))
+		    _XStoreEventCookie(dpy, &qelt->event);
+		qelt = qelt->next;
+	    }
+        }
+	if (dpy->cookiejar)
+	    _XFreeEventCookies(dpy);
+	while (dpy->ext_procs) {
+	    _XExtension *ext = dpy->ext_procs;
+	    dpy->ext_procs = ext->next;
+	    if (ext->name)
+		Xfree (ext->name);
+	    Xfree ((char *)ext);
+	}
+	if (dpy->im_filters)
+	   (*dpy->free_funcs->im_filters)(dpy);
+	if (dpy->cms.clientCmaps)
+	   (*dpy->free_funcs->clientCmaps)(dpy);
+	if (dpy->cms.defaultCCCs)
+	   (*dpy->free_funcs->defaultCCCs)(dpy);
+	if (dpy->cms.perVisualIntensityMaps)
+	   (*dpy->free_funcs->intensityMaps)(dpy);
+	if (dpy->atoms)
+	    (*dpy->free_funcs->atoms)(dpy);
+	if (dpy->modifiermap)
+	   (*dpy->free_funcs->modifiermap)(dpy->modifiermap);
+	if (dpy->key_bindings)
+	   (*dpy->free_funcs->key_bindings)(dpy);
+	if (dpy->context_db)
+	   (*dpy->free_funcs->context_db)(dpy);
+	if (dpy->xkb_info)
+	   (*dpy->free_funcs->xkb)(dpy);
+
+	/* if RM database was allocated by XGetDefault() free it */
+	if (dpy->db && (dpy->flags & XlibDisplayDfltRMDB))
+	    XrmDestroyDatabase(dpy->db);
+
+	if (dpy->screens) {
+	    register int i;
+
+            for (i = 0; i < dpy->nscreens; i++) {
+		Screen *sp = &dpy->screens[i];
+
+		if (sp->depths) {
+		   register int j;
+
+		   for (j = 0; j < sp->ndepths; j++) {
+			Depth *dp = &sp->depths[j];
+
+			if (dp->visuals) {
+			   register int k;
+
+			   for (k = 0; k < dp->nvisuals; k++)
+			     _XFreeExtData (dp->visuals[k].ext_data);
+			   Xfree ((char *) dp->visuals);
+			   }
+			}
+
+		   Xfree ((char *) sp->depths);
+		   }
+
+		_XFreeExtData (sp->ext_data);
+		}
+
+	    Xfree ((char *)dpy->screens);
+	    }
+
+	if (dpy->pixmap_format) {
+	    register int i;
+
+	    for (i = 0; i < dpy->nformats; i++)
+	      _XFreeExtData (dpy->pixmap_format[i].ext_data);
+            Xfree ((char *)dpy->pixmap_format);
+	    }
+
+	free(dpy->display_name);
+	if (dpy->vendor)
+	   Xfree (dpy->vendor);
+
+        if (dpy->buffer)
+	   Xfree (dpy->buffer);
+	if (dpy->keysyms)
+	   Xfree ((char *) dpy->keysyms);
+	if (dpy->xdefaults)
+	   Xfree (dpy->xdefaults);
+	if (dpy->error_vec)
+	    Xfree ((char *)dpy->error_vec);
+
+	_XFreeExtData (dpy->ext_data);
+	if (dpy->free_funcs)
+	    Xfree ((char *)dpy->free_funcs);
+ 	if (dpy->scratch_buffer)
+ 	    Xfree (dpy->scratch_buffer);
+	FreeDisplayLock(dpy);
+
+	if (dpy->qfree) {
+	    register _XQEvent *qelt = dpy->qfree;
+
+	    while (qelt) {
+		register _XQEvent *qnxt = qelt->next;
+		Xfree ((char *) qelt);
+		qelt = qnxt;
+	    }
+	}
+	while (dpy->im_fd_info) {
+	    struct _XConnectionInfo *conni = dpy->im_fd_info;
+	    dpy->im_fd_info = conni->next;
+	    if (conni->watch_data)
+		Xfree (conni->watch_data);
+	    Xfree (conni);
+	}
+	if (dpy->conn_watchers) {
+	    struct _XConnWatchInfo *watcher = dpy->conn_watchers;
+	    dpy->conn_watchers = watcher->next;
+	    Xfree (watcher);
+	}
+	if (dpy->filedes)
+	    Xfree (dpy->filedes);
+
+	_XFreeX11XCBStructure(dpy);
+
+	Xfree ((char *)dpy);
+}
+
+/* OutOfMemory is called if malloc fails.  XOpenDisplay returns NULL
+   after this returns. */
+
+static void OutOfMemory(Display *dpy)
+{
+    if(dpy->xcb->connection)
+	xcb_disconnect(dpy->xcb->connection);
+    _XFreeDisplayStructure (dpy);
+}
diff --git a/libX11/src/xcb_io.c b/libX11/src/xcb_io.c
index bac9bdf0b..300ef571f 100644
--- a/libX11/src/xcb_io.c
+++ b/libX11/src/xcb_io.c
@@ -1,759 +1,759 @@
-/* Copyright (C) 2003-2006 Jamey Sharp, Josh Triplett

- * This file is licensed under the MIT license. See the file COPYING. */

-

-#ifdef HAVE_CONFIG_H

-#include <config.h>

-#endif

-

-#include "Xlibint.h"

-#include "locking.h"

-#include "Xprivate.h"

-#include "Xxcbint.h"

-#include <xcb/xcbext.h>

-

-#include <assert.h>

-#ifdef HAVE_INTTYPES_H

-#include <inttypes.h>

-#endif

-#include <stdio.h>

-#include <stdint.h>

-#include <stdlib.h>

-#include <string.h>

-#ifdef HAVE_SYS_SELECT_H

-#include <sys/select.h>

-#endif

-

-#define xcb_fail_assert(_message, _var) { \

-	unsigned int _var = 1; \

-	fprintf(stderr, "[xcb] Aborting, sorry about that.\n"); \

-	assert(!_var); \

-}

-

-#define throw_thread_fail_assert(_message, _var) { \

-	fprintf(stderr, "[xcb] " _message "\n"); \

-	fprintf(stderr, "[xcb] Most likely this is a multi-threaded client " \

-	                "and XInitThreads has not been called\n"); \

-	xcb_fail_assert(_message, _var); \

-}

-

-/* XXX: It would probably be most useful if we stored the last-processed

- *      request, so we could find the offender from the message. */

-#define throw_extlib_fail_assert(_message, _var) { \

-	fprintf(stderr, "[xcb] " _message "\n"); \

-	fprintf(stderr, "[xcb] This is most likely caused by a broken X " \

-	                "extension library\n"); \

-	xcb_fail_assert(_message, _var); \

-}

-

-static void return_socket(void *closure)

-{

-	Display *dpy = closure;

-	InternalLockDisplay(dpy, /* don't skip user locks */ 0);

-	_XSend(dpy, NULL, 0);

-	dpy->bufmax = dpy->buffer;

-	UnlockDisplay(dpy);

-}

-

-static void require_socket(Display *dpy)

-{

-	if(dpy->bufmax == dpy->buffer)

-	{

-		uint64_t sent;

-		int flags = 0;

-		/* if we don't own the event queue, we have to ask XCB

-		 * to set our errors aside for us. */

-		if(dpy->xcb->event_owner != XlibOwnsEventQueue)

-			flags = XCB_REQUEST_CHECKED;

-		if(!xcb_take_socket(dpy->xcb->connection, return_socket, dpy,

-		                    flags, &sent))

-			_XIOError(dpy);

-		/* Xlib uses unsigned long for sequence numbers.  XCB

-		 * uses 64-bit internally, but currently exposes an

-		 * unsigned int API.  If these differ, Xlib cannot track

-		 * the full 64-bit sequence number if 32-bit wrap

-		 * happens while Xlib does not own the socket.  A

-		 * complete fix would be to make XCB's public API use

-		 * 64-bit sequence numbers. */

-		if (sizeof(unsigned long) > sizeof(unsigned int) &&

-		    dpy->xcb->event_owner == XlibOwnsEventQueue &&

-		    (sent - dpy->last_request_read >= (UINT64_C(1) << 32))) {

-			throw_thread_fail_assert("Sequence number wrapped "

-			                         "beyond 32 bits while Xlib "

-						 "did not own the socket",

-			                         xcb_xlib_seq_number_wrapped);

-		}

-		dpy->xcb->last_flushed = dpy->request = sent;

-		dpy->bufmax = dpy->xcb->real_bufmax;

-	}

-}

-

-/* Call internal connection callbacks for any fds that are currently

- * ready to read. This function will not block unless one of the

- * callbacks blocks.

- *

- * This code borrowed from _XWaitForReadable. Inverse call tree:

- * _XRead

- *  _XWaitForWritable

- *   _XFlush

- *   _XSend

- *  _XEventsQueued

- *  _XReadEvents

- *  _XRead[0-9]+

- *   _XAllocIDs

- *  _XReply

- *  _XEatData

- * _XReadPad

- */

-static void check_internal_connections(Display *dpy)

-{

-	struct _XConnectionInfo *ilist;

-	fd_set r_mask;

-	struct timeval tv;

-	int result;

-	int highest_fd = -1;

-

-	if(dpy->flags & XlibDisplayProcConni || !dpy->im_fd_info)

-		return;

-

-	FD_ZERO(&r_mask);

-	for(ilist = dpy->im_fd_info; ilist; ilist = ilist->next)

-	{

-		assert(ilist->fd >= 0);

-		FD_SET(ilist->fd, &r_mask);

-		if(ilist->fd > highest_fd)

-			highest_fd = ilist->fd;

-	}

-	assert(highest_fd >= 0);

-

-	tv.tv_sec = 0;

-	tv.tv_usec = 0;

-	result = select(highest_fd + 1, &r_mask, NULL, NULL, &tv);

-

-	if(result == -1)

-	{

-		if(errno == EINTR)

-			return;

-		_XIOError(dpy);

-	}

-

-	for(ilist = dpy->im_fd_info; result && ilist; ilist = ilist->next)

-		if(FD_ISSET(ilist->fd, &r_mask))

-		{

-			_XProcessInternalConnection(dpy, ilist);

-			--result;

-		}

-}

-

-static PendingRequest *append_pending_request(Display *dpy, unsigned long sequence)

-{

-	PendingRequest *node = malloc(sizeof(PendingRequest));

-	assert(node);

-	node->next = NULL;

-	node->sequence = sequence;

-	node->reply_waiter = 0;

-	if(dpy->xcb->pending_requests_tail)

-	{

-		if (XLIB_SEQUENCE_COMPARE(dpy->xcb->pending_requests_tail->sequence,

-		                          >=, node->sequence))

-			throw_thread_fail_assert("Unknown sequence number "

-			                         "while appending request",

-			                         xcb_xlib_unknown_seq_number);

-		if (dpy->xcb->pending_requests_tail->next != NULL)

-			throw_thread_fail_assert("Unknown request in queue "

-			                         "while appending request",

-			                         xcb_xlib_unknown_req_pending);

-		dpy->xcb->pending_requests_tail->next = node;

-	}

-	else

-		dpy->xcb->pending_requests = node;

-	dpy->xcb->pending_requests_tail = node;

-	return node;

-}

-

-static void dequeue_pending_request(Display *dpy, PendingRequest *req)

-{

-	if (req != dpy->xcb->pending_requests)

-		throw_thread_fail_assert("Unknown request in queue while "

-		                         "dequeuing",

-		                         xcb_xlib_unknown_req_in_deq);

-

-	dpy->xcb->pending_requests = req->next;

-	if(!dpy->xcb->pending_requests)

-	{

-		if (req != dpy->xcb->pending_requests_tail)

-			throw_thread_fail_assert("Unknown request in queue "

-			                         "while dequeuing",

-			                         xcb_xlib_unknown_req_in_deq);

-		dpy->xcb->pending_requests_tail = NULL;

-	}

-	else if (XLIB_SEQUENCE_COMPARE(req->sequence, >=,

-	                               dpy->xcb->pending_requests->sequence))

-		throw_thread_fail_assert("Unknown sequence number while "

-		                         "dequeuing request",

-		                         xcb_xlib_threads_sequence_lost);

-

-	free(req);

-}

-

-static int handle_error(Display *dpy, xError *err, Bool in_XReply)

-{

-	_XExtension *ext;

-	int ret_code;

-	/* Oddly, Xlib only allows extensions to suppress errors when

-	 * those errors were seen by _XReply. */

-	if(in_XReply)

-		/*

-		 * we better see if there is an extension who may

-		 * want to suppress the error.

-		 */

-		for(ext = dpy->ext_procs; ext; ext = ext->next)

-			if(ext->error && (*ext->error)(dpy, err, &ext->codes, &ret_code))

-				return ret_code;

-	_XError(dpy, err);

-	return 0;

-}

-

-/* Widen a 32-bit sequence number into a native-word-size (unsigned long)

- * sequence number.  Treating the comparison as a 1 and shifting it avoids a

- * conditional branch, and shifting by 16 twice avoids a compiler warning when

- * sizeof(unsigned long) == 4. */

-static void widen(unsigned long *wide, unsigned int narrow)

-{

-	unsigned long new = (*wide & ~0xFFFFFFFFUL) | narrow;

-	*wide = new + ((unsigned long) (new < *wide) << 16 << 16);

-}

-

-/* Thread-safety rules:

- *

- * At most one thread can be reading from XCB's event queue at a time.

- * If you are not the current event-reading thread and you need to find

- * out if an event is available, you must wait.

- *

- * The same rule applies for reading replies.

- *

- * A single thread cannot be both the the event-reading and the

- * reply-reading thread at the same time.

- *

- * We always look at both the current event and the first pending reply

- * to decide which to process next.

- *

- * We always process all responses in sequence-number order, which may

- * mean waiting for another thread (either the event_waiter or the

- * reply_waiter) to handle an earlier response before we can process or

- * return a later one. If so, we wait on the corresponding condition

- * variable for that thread to process the response and wake us up.

- */

-

-static xcb_generic_reply_t *poll_for_event(Display *dpy)

-{

-	/* Make sure the Display's sequence numbers are valid */

-	require_socket(dpy);

-

-	/* Precondition: This thread can safely get events from XCB. */

-	assert(dpy->xcb->event_owner == XlibOwnsEventQueue && !dpy->xcb->event_waiter);

-

-	if(!dpy->xcb->next_event)

-		dpy->xcb->next_event = xcb_poll_for_event(dpy->xcb->connection);

-

-	if(dpy->xcb->next_event)

-	{

-		PendingRequest *req = dpy->xcb->pending_requests;

-		xcb_generic_event_t *event = dpy->xcb->next_event;

-		unsigned long event_sequence = dpy->last_request_read;

-		widen(&event_sequence, event->full_sequence);

-		if(!req || XLIB_SEQUENCE_COMPARE(event_sequence, <, req->sequence)

-		        || (event->response_type != X_Error && event_sequence == req->sequence))

-		{

-			if (XLIB_SEQUENCE_COMPARE(event_sequence, >,

-			                          dpy->request))

-			{

-				throw_thread_fail_assert("Unknown sequence "

-				                         "number while "

-							 "processing queue",

-				                xcb_xlib_threads_sequence_lost);

-			}

-			dpy->last_request_read = event_sequence;

-			dpy->xcb->next_event = NULL;

-			return (xcb_generic_reply_t *) event;

-		}

-	}

-	return NULL;

-}

-

-static xcb_generic_reply_t *poll_for_response(Display *dpy)

-{

-	void *response;

-	xcb_generic_error_t *error;

-	PendingRequest *req;

-	while(!(response = poll_for_event(dpy)) &&

-	      (req = dpy->xcb->pending_requests) &&

-	      !req->reply_waiter &&

-	      xcb_poll_for_reply(dpy->xcb->connection, req->sequence, &response, &error))

-	{

-		if(XLIB_SEQUENCE_COMPARE(req->sequence, >, dpy->request))

-		{

-			throw_thread_fail_assert("Unknown sequence number "

-			                         "while awaiting reply",

-			                        xcb_xlib_threads_sequence_lost);

-		}

-		dpy->last_request_read = req->sequence;

-		if(response)

-			break;

-		dequeue_pending_request(dpy, req);

-		if(error)

-			return (xcb_generic_reply_t *) error;

-	}

-	return response;

-}

-

-static void handle_response(Display *dpy, xcb_generic_reply_t *response, Bool in_XReply)

-{

-	_XAsyncHandler *async, *next;

-	switch(response->response_type)

-	{

-	case X_Reply:

-		for(async = dpy->async_handlers; async; async = next)

-		{

-			next = async->next;

-			if(async->handler(dpy, (xReply *) response, (char *) response, sizeof(xReply) + (response->length << 2), async->data))

-				break;

-		}

-		break;

-

-	case X_Error:

-		handle_error(dpy, (xError *) response, in_XReply);

-		break;

-

-	default: /* event */

-		/* GenericEvents may be > 32 bytes. In this case, the

-		 * event struct is trailed by the additional bytes. the

-		 * xcb_generic_event_t struct uses 4 bytes for internal

-		 * numbering, so we need to shift the trailing data to

-		 * be after the first 32 bytes. */

-		if(response->response_type == GenericEvent && ((xcb_ge_event_t *) response)->length)

-		{

-			xcb_ge_event_t *event = (xcb_ge_event_t *) response;

-			memmove(&event->full_sequence, &event[1], event->length * 4);

-		}

-		_XEnq(dpy, (xEvent *) response);

-		break;

-	}

-	free(response);

-}

-

-int _XEventsQueued(Display *dpy, int mode)

-{

-	xcb_generic_reply_t *response;

-	if(dpy->flags & XlibDisplayIOError)

-		return 0;

-	if(dpy->xcb->event_owner != XlibOwnsEventQueue)

-		return 0;

-

-	if(mode == QueuedAfterFlush)

-		_XSend(dpy, NULL, 0);

-	else

-		check_internal_connections(dpy);

-

-	/* If another thread is blocked waiting for events, then we must

-	 * let that thread pick up the next event. Since it blocked, we

-	 * can reasonably claim there are no new events right now. */

-	if(!dpy->xcb->event_waiter)

-	{

-		while((response = poll_for_response(dpy)))

-			handle_response(dpy, response, False);

-		if(xcb_connection_has_error(dpy->xcb->connection))

-			_XIOError(dpy);

-	}

-	return dpy->qlen;

-}

-

-/* _XReadEvents - Flush the output queue,

- * then read as many events as possible (but at least 1) and enqueue them

- */

-void _XReadEvents(Display *dpy)

-{

-	xcb_generic_reply_t *response;

-	unsigned long serial;

-

-	if(dpy->flags & XlibDisplayIOError)

-		return;

-	_XSend(dpy, NULL, 0);

-	if(dpy->xcb->event_owner != XlibOwnsEventQueue)

-		return;

-	check_internal_connections(dpy);

-

-	serial = dpy->next_event_serial_num;

-	while(serial == dpy->next_event_serial_num || dpy->qlen == 0)

-	{

-		if(dpy->xcb->event_waiter)

-		{

-			ConditionWait(dpy, dpy->xcb->event_notify);

-			/* Maybe the other thread got us an event. */

-			continue;

-		}

-

-		if(!dpy->xcb->next_event)

-		{

-			xcb_generic_event_t *event;

-			dpy->xcb->event_waiter = 1;

-			UnlockDisplay(dpy);

-			event = xcb_wait_for_event(dpy->xcb->connection);

-			/* It appears that classic Xlib respected user

-			 * locks when waking up after waiting for

-			 * events. However, if this thread did not have

-			 * any user locks, and another thread takes a

-			 * user lock and tries to read events, then we'd

-			 * deadlock. So we'll choose to let the thread

-			 * that got in first consume events, despite the

-			 * later thread's user locks. */

-			InternalLockDisplay(dpy, /* ignore user locks */ 1);

-			dpy->xcb->event_waiter = 0;

-			ConditionBroadcast(dpy, dpy->xcb->event_notify);

-			if(!event)

-				_XIOError(dpy);

-			dpy->xcb->next_event = event;

-		}

-

-		/* We've established most of the conditions for

-		 * poll_for_response to return non-NULL. The exceptions

-		 * are connection shutdown, and finding that another

-		 * thread is waiting for the next reply we'd like to

-		 * process. */

-

-		response = poll_for_response(dpy);

-		if(response)

-			handle_response(dpy, response, False);

-		else if(dpy->xcb->pending_requests->reply_waiter)

-		{ /* need braces around ConditionWait */

-			ConditionWait(dpy, dpy->xcb->reply_notify);

-		}

-		else

-			_XIOError(dpy);

-	}

-

-	/* The preceding loop established that there is no

-	 * event_waiter--unless we just called ConditionWait because of

-	 * a reply_waiter, in which case another thread may have become

-	 * the event_waiter while we slept unlocked. */

-	if(!dpy->xcb->event_waiter)

-		while((response = poll_for_response(dpy)))

-			handle_response(dpy, response, False);

-	if(xcb_connection_has_error(dpy->xcb->connection))

-		_XIOError(dpy);

-}

-

-/*

- * _XSend - Flush the buffer and send the client data. 32 bit word aligned

- * transmission is used, if size is not 0 mod 4, extra bytes are transmitted.

- *

- * Note that the connection must not be read from once the data currently

- * in the buffer has been written.

- */

-void _XSend(Display *dpy, const char *data, long size)

-{

-	static const xReq dummy_request;

-	static char const pad[3];

-	struct iovec vec[3];

-	uint64_t requests;

-	_XExtension *ext;

-	xcb_connection_t *c = dpy->xcb->connection;

-	if(dpy->flags & XlibDisplayIOError)

-		return;

-

-	if(dpy->bufptr == dpy->buffer && !size)

-		return;

-

-	/* iff we asked XCB to set aside errors, we must pick those up

-	 * eventually. iff there are async handlers, we may have just

-	 * issued requests that will generate replies. in either case,

-	 * we need to remember to check later. */

-	if(dpy->xcb->event_owner != XlibOwnsEventQueue || dpy->async_handlers)

-	{

-		uint64_t sequence;

-		for(sequence = dpy->xcb->last_flushed + 1; sequence <= dpy->request; ++sequence)

-			append_pending_request(dpy, sequence);

-	}

-	requests = dpy->request - dpy->xcb->last_flushed;

-	dpy->xcb->last_flushed = dpy->request;

-

-	vec[0].iov_base = dpy->buffer;

-	vec[0].iov_len = dpy->bufptr - dpy->buffer;

-	vec[1].iov_base = (caddr_t) data;

-	vec[1].iov_len = size;

-	vec[2].iov_base = (caddr_t) pad;

-	vec[2].iov_len = -size & 3;

-

-	for(ext = dpy->flushes; ext; ext = ext->next_flush)

-	{

-		int i;

-		for(i = 0; i < 3; ++i)

-			if(vec[i].iov_len)

-				ext->before_flush(dpy, &ext->codes, vec[i].iov_base, vec[i].iov_len);

-	}

-

-	if(xcb_writev(c, vec, 3, requests) < 0)

-		_XIOError(dpy);

-	dpy->bufptr = dpy->buffer;

-	dpy->last_req = (char *) &dummy_request;

-

-	check_internal_connections(dpy);

-

-	_XSetSeqSyncFunction(dpy);

-}

-

-/*

- * _XFlush - Flush the X request buffer.  If the buffer is empty, no

- * action is taken.

- */

-void _XFlush(Display *dpy)

-{

-	require_socket(dpy);

-	_XSend(dpy, NULL, 0);

-

-	_XEventsQueued(dpy, QueuedAfterReading);

-}

-

-static const XID inval_id = ~0UL;

-

-void _XIDHandler(Display *dpy)

-{

-	if (dpy->xcb->next_xid == inval_id)

-		_XAllocIDs(dpy, &dpy->xcb->next_xid, 1);

-}

-

-/* _XAllocID - resource ID allocation routine. */

-XID _XAllocID(Display *dpy)

-{

-	XID ret = dpy->xcb->next_xid;

-	assert (ret != inval_id);

-	dpy->xcb->next_xid = inval_id;

-	_XSetPrivSyncFunction(dpy);

-	return ret;

-}

-

-/* _XAllocIDs - multiple resource ID allocation routine. */

-void _XAllocIDs(Display *dpy, XID *ids, int count)

-{

-	int i;

-#ifdef XTHREADS

-	if (dpy->lock)

-		(*dpy->lock->user_lock_display)(dpy);

-	UnlockDisplay(dpy);

-#endif

-	for (i = 0; i < count; i++)

-		ids[i] = xcb_generate_id(dpy->xcb->connection);

-#ifdef XTHREADS

-	InternalLockDisplay(dpy, /* don't skip user locks */ 0);

-	if (dpy->lock)

-		(*dpy->lock->user_unlock_display)(dpy);

-#endif

-}

-

-static void _XFreeReplyData(Display *dpy, Bool force)

-{

-	if(!force && dpy->xcb->reply_consumed < dpy->xcb->reply_length)

-		return;

-	free(dpy->xcb->reply_data);

-	dpy->xcb->reply_data = NULL;

-}

-

-/*

- * _XReply - Wait for a reply packet and copy its contents into the

- * specified rep.

- * extra: number of 32-bit words expected after the reply

- * discard: should I discard data following "extra" words?

- */

-Status _XReply(Display *dpy, xReply *rep, int extra, Bool discard)

-{

-	xcb_generic_error_t *error;

-	xcb_connection_t *c = dpy->xcb->connection;

-	char *reply;

-	PendingRequest *current;

-

-	if (dpy->xcb->reply_data)

-		throw_extlib_fail_assert("Extra reply data still left in queue",

-		                         xcb_xlib_extra_reply_data_left);

-

-	if(dpy->flags & XlibDisplayIOError)

-		return 0;

-

-	_XSend(dpy, NULL, 0);

-	if(dpy->xcb->pending_requests_tail && dpy->xcb->pending_requests_tail->sequence == dpy->request)

-		current = dpy->xcb->pending_requests_tail;

-	else

-		current = append_pending_request(dpy, dpy->request);

-	/* Don't let any other thread get this reply. */

-	current->reply_waiter = 1;

-

-	while(1)

-	{

-		PendingRequest *req = dpy->xcb->pending_requests;

-		xcb_generic_reply_t *response;

-

-		if(req != current && req->reply_waiter)

-		{

-			ConditionWait(dpy, dpy->xcb->reply_notify);

-			/* Another thread got this reply. */

-			continue;

-		}

-		req->reply_waiter = 1;

-		UnlockDisplay(dpy);

-		response = xcb_wait_for_reply(c, req->sequence, &error);

-		/* Any user locks on another thread must have been taken

-		 * while we slept in xcb_wait_for_reply. Classic Xlib

-		 * ignored those user locks in this case, so we do too. */

-		InternalLockDisplay(dpy, /* ignore user locks */ 1);

-

-		/* We have the response we're looking for. Now, before

-		 * letting anyone else process this sequence number, we

-		 * need to process any events that should have come

-		 * earlier. */

-

-		if(dpy->xcb->event_owner == XlibOwnsEventQueue)

-		{

-			xcb_generic_reply_t *event;

-			/* If some thread is already waiting for events,

-			 * it will get the first one. That thread must

-			 * process that event before we can continue. */

-			/* FIXME: That event might be after this reply,

-			 * and might never even come--or there might be

-			 * multiple threads trying to get events. */

-			while(dpy->xcb->event_waiter)

-			{ /* need braces around ConditionWait */

-				ConditionWait(dpy, dpy->xcb->event_notify);

-			}

-			while((event = poll_for_event(dpy)))

-				handle_response(dpy, event, True);

-		}

-

-		req->reply_waiter = 0;

-		ConditionBroadcast(dpy, dpy->xcb->reply_notify);

-		if(XLIB_SEQUENCE_COMPARE(req->sequence, >, dpy->request)) {

-			throw_thread_fail_assert("Unknown sequence number "

-			                         "while processing reply",

-			                        xcb_xlib_threads_sequence_lost);

-		}

-		dpy->last_request_read = req->sequence;

-		if(!response)

-			dequeue_pending_request(dpy, req);

-

-		if(req == current)

-		{

-			reply = (char *) response;

-			break;

-		}

-

-		if(error)

-			handle_response(dpy, (xcb_generic_reply_t *) error, True);

-		else if(response)

-			handle_response(dpy, response, True);

-	}

-	check_internal_connections(dpy);

-

-	if(dpy->xcb->next_event && dpy->xcb->next_event->response_type == X_Error)

-	{

-		xcb_generic_event_t *event = dpy->xcb->next_event;

-		unsigned long event_sequence = dpy->last_request_read;

-		widen(&event_sequence, event->full_sequence);

-		if(event_sequence == dpy->last_request_read)

-		{

-			error = (xcb_generic_error_t *) event;

-			dpy->xcb->next_event = NULL;

-		}

-	}

-

-	if(error)

-	{

-		int ret_code;

-

-		/* Xlib is evil and assumes that even errors will be

-		 * copied into rep. */

-		memcpy(rep, error, 32);

-

-		/* do not die on "no such font", "can't allocate",

-		   "can't grab" failures */

-		switch(error->error_code)

-		{

-			case BadName:

-				switch(error->major_code)

-				{

-					case X_LookupColor:

-					case X_AllocNamedColor:

-						free(error);

-						return 0;

-				}

-				break;

-			case BadFont:

-				if(error->major_code == X_QueryFont) {

-					free(error);

-					return 0;

-				}

-				break;

-			case BadAlloc:

-			case BadAccess:

-				free(error);

-				return 0;

-		}

-

-		ret_code = handle_error(dpy, (xError *) error, True);

-		free(error);

-		return ret_code;

-	}

-

-	/* it's not an error, but we don't have a reply, so it's an I/O

-	 * error. */

-	if(!reply)

-	{

-		_XIOError(dpy);

-		return 0;

-	}

-

-	/* there's no error and we have a reply. */

-	dpy->xcb->reply_data = reply;

-	dpy->xcb->reply_consumed = sizeof(xReply) + (extra * 4);

-	dpy->xcb->reply_length = sizeof(xReply);

-	if(dpy->xcb->reply_data[0] == 1)

-		dpy->xcb->reply_length += (((xcb_generic_reply_t *) dpy->xcb->reply_data)->length * 4);

-

-	/* error: Xlib asks too much. give them what we can anyway. */

-	if(dpy->xcb->reply_length < dpy->xcb->reply_consumed)

-		dpy->xcb->reply_consumed = dpy->xcb->reply_length;

-

-	memcpy(rep, dpy->xcb->reply_data, dpy->xcb->reply_consumed);

-	_XFreeReplyData(dpy, discard);

-	return 1;

-}

-

-int _XRead(Display *dpy, char *data, long size)

-{

-	assert(size >= 0);

-	if(size == 0)

-		return 0;

-	if(dpy->xcb->reply_data == NULL ||

-	   dpy->xcb->reply_consumed + size > dpy->xcb->reply_length)

-		throw_extlib_fail_assert("Too much data requested from _XRead",

-		                         xcb_xlib_too_much_data_requested);

-	memcpy(data, dpy->xcb->reply_data + dpy->xcb->reply_consumed, size);

-	dpy->xcb->reply_consumed += size;

-	_XFreeReplyData(dpy, False);

-	return 0;

-}

-

-/*

- * _XReadPad - Read bytes from the socket taking into account incomplete

- * reads.  If the number of bytes is not 0 mod 4, read additional pad

- * bytes.

- */

-void _XReadPad(Display *dpy, char *data, long size)

-{

-	_XRead(dpy, data, size);

-	dpy->xcb->reply_consumed += -size & 3;

-	_XFreeReplyData(dpy, False);

-}

-

-/* Read and discard "n" 8-bit bytes of data */

-void _XEatData(Display *dpy, unsigned long n)

-{

-	dpy->xcb->reply_consumed += n;

-	_XFreeReplyData(dpy, False);

-}

+/* Copyright (C) 2003-2006 Jamey Sharp, Josh Triplett
+ * This file is licensed under the MIT license. See the file COPYING. */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "Xlibint.h"
+#include "locking.h"
+#include "Xprivate.h"
+#include "Xxcbint.h"
+#include <xcb/xcbext.h>
+
+#include <assert.h>
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+
+#define xcb_fail_assert(_message, _var) { \
+	unsigned int _var = 1; \
+	fprintf(stderr, "[xcb] Aborting, sorry about that.\n"); \
+	assert(!_var); \
+}
+
+#define throw_thread_fail_assert(_message, _var) { \
+	fprintf(stderr, "[xcb] " _message "\n"); \
+	fprintf(stderr, "[xcb] Most likely this is a multi-threaded client " \
+	                "and XInitThreads has not been called\n"); \
+	xcb_fail_assert(_message, _var); \
+}
+
+/* XXX: It would probably be most useful if we stored the last-processed
+ *      request, so we could find the offender from the message. */
+#define throw_extlib_fail_assert(_message, _var) { \
+	fprintf(stderr, "[xcb] " _message "\n"); \
+	fprintf(stderr, "[xcb] This is most likely caused by a broken X " \
+	                "extension library\n"); \
+	xcb_fail_assert(_message, _var); \
+}
+
+static void return_socket(void *closure)
+{
+	Display *dpy = closure;
+	InternalLockDisplay(dpy, /* don't skip user locks */ 0);
+	_XSend(dpy, NULL, 0);
+	dpy->bufmax = dpy->buffer;
+	UnlockDisplay(dpy);
+}
+
+static void require_socket(Display *dpy)
+{
+	if(dpy->bufmax == dpy->buffer)
+	{
+		uint64_t sent;
+		int flags = 0;
+		/* if we don't own the event queue, we have to ask XCB
+		 * to set our errors aside for us. */
+		if(dpy->xcb->event_owner != XlibOwnsEventQueue)
+			flags = XCB_REQUEST_CHECKED;
+		if(!xcb_take_socket(dpy->xcb->connection, return_socket, dpy,
+		                    flags, &sent))
+			_XIOError(dpy);
+		/* Xlib uses unsigned long for sequence numbers.  XCB
+		 * uses 64-bit internally, but currently exposes an
+		 * unsigned int API.  If these differ, Xlib cannot track
+		 * the full 64-bit sequence number if 32-bit wrap
+		 * happens while Xlib does not own the socket.  A
+		 * complete fix would be to make XCB's public API use
+		 * 64-bit sequence numbers. */
+		if (sizeof(unsigned long) > sizeof(unsigned int) &&
+		    dpy->xcb->event_owner == XlibOwnsEventQueue &&
+		    (sent - dpy->last_request_read >= (UINT64_C(1) << 32))) {
+			throw_thread_fail_assert("Sequence number wrapped "
+			                         "beyond 32 bits while Xlib "
+						 "did not own the socket",
+			                         xcb_xlib_seq_number_wrapped);
+		}
+		dpy->xcb->last_flushed = dpy->request = sent;
+		dpy->bufmax = dpy->xcb->real_bufmax;
+	}
+}
+
+/* Call internal connection callbacks for any fds that are currently
+ * ready to read. This function will not block unless one of the
+ * callbacks blocks.
+ *
+ * This code borrowed from _XWaitForReadable. Inverse call tree:
+ * _XRead
+ *  _XWaitForWritable
+ *   _XFlush
+ *   _XSend
+ *  _XEventsQueued
+ *  _XReadEvents
+ *  _XRead[0-9]+
+ *   _XAllocIDs
+ *  _XReply
+ *  _XEatData
+ * _XReadPad
+ */
+static void check_internal_connections(Display *dpy)
+{
+	struct _XConnectionInfo *ilist;
+	fd_set r_mask;
+	struct timeval tv;
+	int result;
+	int highest_fd = -1;
+
+	if(dpy->flags & XlibDisplayProcConni || !dpy->im_fd_info)
+		return;
+
+	FD_ZERO(&r_mask);
+	for(ilist = dpy->im_fd_info; ilist; ilist = ilist->next)
+	{
+		assert(ilist->fd >= 0);
+		FD_SET(ilist->fd, &r_mask);
+		if(ilist->fd > highest_fd)
+			highest_fd = ilist->fd;
+	}
+	assert(highest_fd >= 0);
+
+	tv.tv_sec = 0;
+	tv.tv_usec = 0;
+	result = select(highest_fd + 1, &r_mask, NULL, NULL, &tv);
+
+	if(result == -1)
+	{
+		if(errno == EINTR)
+			return;
+		_XIOError(dpy);
+	}
+
+	for(ilist = dpy->im_fd_info; result && ilist; ilist = ilist->next)
+		if(FD_ISSET(ilist->fd, &r_mask))
+		{
+			_XProcessInternalConnection(dpy, ilist);
+			--result;
+		}
+}
+
+static PendingRequest *append_pending_request(Display *dpy, unsigned long sequence)
+{
+	PendingRequest *node = malloc(sizeof(PendingRequest));
+	assert(node);
+	node->next = NULL;
+	node->sequence = sequence;
+	node->reply_waiter = 0;
+	if(dpy->xcb->pending_requests_tail)
+	{
+		if (XLIB_SEQUENCE_COMPARE(dpy->xcb->pending_requests_tail->sequence,
+		                          >=, node->sequence))
+			throw_thread_fail_assert("Unknown sequence number "
+			                         "while appending request",
+			                         xcb_xlib_unknown_seq_number);
+		if (dpy->xcb->pending_requests_tail->next != NULL)
+			throw_thread_fail_assert("Unknown request in queue "
+			                         "while appending request",
+			                         xcb_xlib_unknown_req_pending);
+		dpy->xcb->pending_requests_tail->next = node;
+	}
+	else
+		dpy->xcb->pending_requests = node;
+	dpy->xcb->pending_requests_tail = node;
+	return node;
+}
+
+static void dequeue_pending_request(Display *dpy, PendingRequest *req)
+{
+	if (req != dpy->xcb->pending_requests)
+		throw_thread_fail_assert("Unknown request in queue while "
+		                         "dequeuing",
+		                         xcb_xlib_unknown_req_in_deq);
+
+	dpy->xcb->pending_requests = req->next;
+	if(!dpy->xcb->pending_requests)
+	{
+		if (req != dpy->xcb->pending_requests_tail)
+			throw_thread_fail_assert("Unknown request in queue "
+			                         "while dequeuing",
+			                         xcb_xlib_unknown_req_in_deq);
+		dpy->xcb->pending_requests_tail = NULL;
+	}
+	else if (XLIB_SEQUENCE_COMPARE(req->sequence, >=,
+	                               dpy->xcb->pending_requests->sequence))
+		throw_thread_fail_assert("Unknown sequence number while "
+		                         "dequeuing request",
+		                         xcb_xlib_threads_sequence_lost);
+
+	free(req);
+}
+
+static int handle_error(Display *dpy, xError *err, Bool in_XReply)
+{
+	_XExtension *ext;
+	int ret_code;
+	/* Oddly, Xlib only allows extensions to suppress errors when
+	 * those errors were seen by _XReply. */
+	if(in_XReply)
+		/*
+		 * we better see if there is an extension who may
+		 * want to suppress the error.
+		 */
+		for(ext = dpy->ext_procs; ext; ext = ext->next)
+			if(ext->error && (*ext->error)(dpy, err, &ext->codes, &ret_code))
+				return ret_code;
+	_XError(dpy, err);
+	return 0;
+}
+
+/* Widen a 32-bit sequence number into a native-word-size (unsigned long)
+ * sequence number.  Treating the comparison as a 1 and shifting it avoids a
+ * conditional branch, and shifting by 16 twice avoids a compiler warning when
+ * sizeof(unsigned long) == 4. */
+static void widen(unsigned long *wide, unsigned int narrow)
+{
+	unsigned long new = (*wide & ~0xFFFFFFFFUL) | narrow;
+	*wide = new + ((unsigned long) (new < *wide) << 16 << 16);
+}
+
+/* Thread-safety rules:
+ *
+ * At most one thread can be reading from XCB's event queue at a time.
+ * If you are not the current event-reading thread and you need to find
+ * out if an event is available, you must wait.
+ *
+ * The same rule applies for reading replies.
+ *
+ * A single thread cannot be both the the event-reading and the
+ * reply-reading thread at the same time.
+ *
+ * We always look at both the current event and the first pending reply
+ * to decide which to process next.
+ *
+ * We always process all responses in sequence-number order, which may
+ * mean waiting for another thread (either the event_waiter or the
+ * reply_waiter) to handle an earlier response before we can process or
+ * return a later one. If so, we wait on the corresponding condition
+ * variable for that thread to process the response and wake us up.
+ */
+
+static xcb_generic_reply_t *poll_for_event(Display *dpy)
+{
+	/* Make sure the Display's sequence numbers are valid */
+	require_socket(dpy);
+
+	/* Precondition: This thread can safely get events from XCB. */
+	assert(dpy->xcb->event_owner == XlibOwnsEventQueue && !dpy->xcb->event_waiter);
+
+	if(!dpy->xcb->next_event)
+		dpy->xcb->next_event = xcb_poll_for_event(dpy->xcb->connection);
+
+	if(dpy->xcb->next_event)
+	{
+		PendingRequest *req = dpy->xcb->pending_requests;
+		xcb_generic_event_t *event = dpy->xcb->next_event;
+		unsigned long event_sequence = dpy->last_request_read;
+		widen(&event_sequence, event->full_sequence);
+		if(!req || XLIB_SEQUENCE_COMPARE(event_sequence, <, req->sequence)
+		        || (event->response_type != X_Error && event_sequence == req->sequence))
+		{
+			if (XLIB_SEQUENCE_COMPARE(event_sequence, >,
+			                          dpy->request))
+			{
+				throw_thread_fail_assert("Unknown sequence "
+				                         "number while "
+							 "processing queue",
+				                xcb_xlib_threads_sequence_lost);
+			}
+			dpy->last_request_read = event_sequence;
+			dpy->xcb->next_event = NULL;
+			return (xcb_generic_reply_t *) event;
+		}
+	}
+	return NULL;
+}
+
+static xcb_generic_reply_t *poll_for_response(Display *dpy)
+{
+	void *response;
+	xcb_generic_error_t *error;
+	PendingRequest *req;
+	while(!(response = poll_for_event(dpy)) &&
+	      (req = dpy->xcb->pending_requests) &&
+	      !req->reply_waiter &&
+	      xcb_poll_for_reply(dpy->xcb->connection, req->sequence, &response, &error))
+	{
+		if(XLIB_SEQUENCE_COMPARE(req->sequence, >, dpy->request))
+		{
+			throw_thread_fail_assert("Unknown sequence number "
+			                         "while awaiting reply",
+			                        xcb_xlib_threads_sequence_lost);
+		}
+		dpy->last_request_read = req->sequence;
+		if(response)
+			break;
+		dequeue_pending_request(dpy, req);
+		if(error)
+			return (xcb_generic_reply_t *) error;
+	}
+	return response;
+}
+
+static void handle_response(Display *dpy, xcb_generic_reply_t *response, Bool in_XReply)
+{
+	_XAsyncHandler *async, *next;
+	switch(response->response_type)
+	{
+	case X_Reply:
+		for(async = dpy->async_handlers; async; async = next)
+		{
+			next = async->next;
+			if(async->handler(dpy, (xReply *) response, (char *) response, sizeof(xReply) + (response->length << 2), async->data))
+				break;
+		}
+		break;
+
+	case X_Error:
+		handle_error(dpy, (xError *) response, in_XReply);
+		break;
+
+	default: /* event */
+		/* GenericEvents may be > 32 bytes. In this case, the
+		 * event struct is trailed by the additional bytes. the
+		 * xcb_generic_event_t struct uses 4 bytes for internal
+		 * numbering, so we need to shift the trailing data to
+		 * be after the first 32 bytes. */
+		if(response->response_type == GenericEvent && ((xcb_ge_event_t *) response)->length)
+		{
+			xcb_ge_event_t *event = (xcb_ge_event_t *) response;
+			memmove(&event->full_sequence, &event[1], event->length * 4);
+		}
+		_XEnq(dpy, (xEvent *) response);
+		break;
+	}
+	free(response);
+}
+
+int _XEventsQueued(Display *dpy, int mode)
+{
+	xcb_generic_reply_t *response;
+	if(dpy->flags & XlibDisplayIOError)
+		return 0;
+	if(dpy->xcb->event_owner != XlibOwnsEventQueue)
+		return 0;
+
+	if(mode == QueuedAfterFlush)
+		_XSend(dpy, NULL, 0);
+	else
+		check_internal_connections(dpy);
+
+	/* If another thread is blocked waiting for events, then we must
+	 * let that thread pick up the next event. Since it blocked, we
+	 * can reasonably claim there are no new events right now. */
+	if(!dpy->xcb->event_waiter)
+	{
+		while((response = poll_for_response(dpy)))
+			handle_response(dpy, response, False);
+		if(xcb_connection_has_error(dpy->xcb->connection))
+			_XIOError(dpy);
+	}
+	return dpy->qlen;
+}
+
+/* _XReadEvents - Flush the output queue,
+ * then read as many events as possible (but at least 1) and enqueue them
+ */
+void _XReadEvents(Display *dpy)
+{
+	xcb_generic_reply_t *response;
+	unsigned long serial;
+
+	if(dpy->flags & XlibDisplayIOError)
+		return;
+	_XSend(dpy, NULL, 0);
+	if(dpy->xcb->event_owner != XlibOwnsEventQueue)
+		return;
+	check_internal_connections(dpy);
+
+	serial = dpy->next_event_serial_num;
+	while(serial == dpy->next_event_serial_num || dpy->qlen == 0)
+	{
+		if(dpy->xcb->event_waiter)
+		{
+			ConditionWait(dpy, dpy->xcb->event_notify);
+			/* Maybe the other thread got us an event. */
+			continue;
+		}
+
+		if(!dpy->xcb->next_event)
+		{
+			xcb_generic_event_t *event;
+			dpy->xcb->event_waiter = 1;
+			UnlockDisplay(dpy);
+			event = xcb_wait_for_event(dpy->xcb->connection);
+			/* It appears that classic Xlib respected user
+			 * locks when waking up after waiting for
+			 * events. However, if this thread did not have
+			 * any user locks, and another thread takes a
+			 * user lock and tries to read events, then we'd
+			 * deadlock. So we'll choose to let the thread
+			 * that got in first consume events, despite the
+			 * later thread's user locks. */
+			InternalLockDisplay(dpy, /* ignore user locks */ 1);
+			dpy->xcb->event_waiter = 0;
+			ConditionBroadcast(dpy, dpy->xcb->event_notify);
+			if(!event)
+				_XIOError(dpy);
+			dpy->xcb->next_event = event;
+		}
+
+		/* We've established most of the conditions for
+		 * poll_for_response to return non-NULL. The exceptions
+		 * are connection shutdown, and finding that another
+		 * thread is waiting for the next reply we'd like to
+		 * process. */
+
+		response = poll_for_response(dpy);
+		if(response)
+			handle_response(dpy, response, False);
+		else if(dpy->xcb->pending_requests->reply_waiter)
+		{ /* need braces around ConditionWait */
+			ConditionWait(dpy, dpy->xcb->reply_notify);
+		}
+		else
+			_XIOError(dpy);
+	}
+
+	/* The preceding loop established that there is no
+	 * event_waiter--unless we just called ConditionWait because of
+	 * a reply_waiter, in which case another thread may have become
+	 * the event_waiter while we slept unlocked. */
+	if(!dpy->xcb->event_waiter)
+		while((response = poll_for_response(dpy)))
+			handle_response(dpy, response, False);
+	if(xcb_connection_has_error(dpy->xcb->connection))
+		_XIOError(dpy);
+}
+
+/*
+ * _XSend - Flush the buffer and send the client data. 32 bit word aligned
+ * transmission is used, if size is not 0 mod 4, extra bytes are transmitted.
+ *
+ * Note that the connection must not be read from once the data currently
+ * in the buffer has been written.
+ */
+void _XSend(Display *dpy, const char *data, long size)
+{
+	static const xReq dummy_request;
+	static char const pad[3];
+	struct iovec vec[3];
+	uint64_t requests;
+	_XExtension *ext;
+	xcb_connection_t *c = dpy->xcb->connection;
+	if(dpy->flags & XlibDisplayIOError)
+		return;
+
+	if(dpy->bufptr == dpy->buffer && !size)
+		return;
+
+	/* iff we asked XCB to set aside errors, we must pick those up
+	 * eventually. iff there are async handlers, we may have just
+	 * issued requests that will generate replies. in either case,
+	 * we need to remember to check later. */
+	if(dpy->xcb->event_owner != XlibOwnsEventQueue || dpy->async_handlers)
+	{
+		uint64_t sequence;
+		for(sequence = dpy->xcb->last_flushed + 1; sequence <= dpy->request; ++sequence)
+			append_pending_request(dpy, sequence);
+	}
+	requests = dpy->request - dpy->xcb->last_flushed;
+	dpy->xcb->last_flushed = dpy->request;
+
+	vec[0].iov_base = dpy->buffer;
+	vec[0].iov_len = dpy->bufptr - dpy->buffer;
+	vec[1].iov_base = (char *)data;
+	vec[1].iov_len = size;
+	vec[2].iov_base = (char *)pad;
+	vec[2].iov_len = -size & 3;
+
+	for(ext = dpy->flushes; ext; ext = ext->next_flush)
+	{
+		int i;
+		for(i = 0; i < 3; ++i)
+			if(vec[i].iov_len)
+				ext->before_flush(dpy, &ext->codes, vec[i].iov_base, vec[i].iov_len);
+	}
+
+	if(xcb_writev(c, vec, 3, requests) < 0)
+		_XIOError(dpy);
+	dpy->bufptr = dpy->buffer;
+	dpy->last_req = (char *) &dummy_request;
+
+	check_internal_connections(dpy);
+
+	_XSetSeqSyncFunction(dpy);
+}
+
+/*
+ * _XFlush - Flush the X request buffer.  If the buffer is empty, no
+ * action is taken.
+ */
+void _XFlush(Display *dpy)
+{
+	require_socket(dpy);
+	_XSend(dpy, NULL, 0);
+
+	_XEventsQueued(dpy, QueuedAfterReading);
+}
+
+static const XID inval_id = ~0UL;
+
+void _XIDHandler(Display *dpy)
+{
+	if (dpy->xcb->next_xid == inval_id)
+		_XAllocIDs(dpy, &dpy->xcb->next_xid, 1);
+}
+
+/* _XAllocID - resource ID allocation routine. */
+XID _XAllocID(Display *dpy)
+{
+	XID ret = dpy->xcb->next_xid;
+	assert (ret != inval_id);
+	dpy->xcb->next_xid = inval_id;
+	_XSetPrivSyncFunction(dpy);
+	return ret;
+}
+
+/* _XAllocIDs - multiple resource ID allocation routine. */
+void _XAllocIDs(Display *dpy, XID *ids, int count)
+{
+	int i;
+#ifdef XTHREADS
+	if (dpy->lock)
+		(*dpy->lock->user_lock_display)(dpy);
+	UnlockDisplay(dpy);
+#endif
+	for (i = 0; i < count; i++)
+		ids[i] = xcb_generate_id(dpy->xcb->connection);
+#ifdef XTHREADS
+	InternalLockDisplay(dpy, /* don't skip user locks */ 0);
+	if (dpy->lock)
+		(*dpy->lock->user_unlock_display)(dpy);
+#endif
+}
+
+static void _XFreeReplyData(Display *dpy, Bool force)
+{
+	if(!force && dpy->xcb->reply_consumed < dpy->xcb->reply_length)
+		return;
+	free(dpy->xcb->reply_data);
+	dpy->xcb->reply_data = NULL;
+}
+
+/*
+ * _XReply - Wait for a reply packet and copy its contents into the
+ * specified rep.
+ * extra: number of 32-bit words expected after the reply
+ * discard: should I discard data following "extra" words?
+ */
+Status _XReply(Display *dpy, xReply *rep, int extra, Bool discard)
+{
+	xcb_generic_error_t *error;
+	xcb_connection_t *c = dpy->xcb->connection;
+	char *reply;
+	PendingRequest *current;
+
+	if (dpy->xcb->reply_data)
+		throw_extlib_fail_assert("Extra reply data still left in queue",
+		                         xcb_xlib_extra_reply_data_left);
+
+	if(dpy->flags & XlibDisplayIOError)
+		return 0;
+
+	_XSend(dpy, NULL, 0);
+	if(dpy->xcb->pending_requests_tail && dpy->xcb->pending_requests_tail->sequence == dpy->request)
+		current = dpy->xcb->pending_requests_tail;
+	else
+		current = append_pending_request(dpy, dpy->request);
+	/* Don't let any other thread get this reply. */
+	current->reply_waiter = 1;
+
+	while(1)
+	{
+		PendingRequest *req = dpy->xcb->pending_requests;
+		xcb_generic_reply_t *response;
+
+		if(req != current && req->reply_waiter)
+		{
+			ConditionWait(dpy, dpy->xcb->reply_notify);
+			/* Another thread got this reply. */
+			continue;
+		}
+		req->reply_waiter = 1;
+		UnlockDisplay(dpy);
+		response = xcb_wait_for_reply(c, req->sequence, &error);
+		/* Any user locks on another thread must have been taken
+		 * while we slept in xcb_wait_for_reply. Classic Xlib
+		 * ignored those user locks in this case, so we do too. */
+		InternalLockDisplay(dpy, /* ignore user locks */ 1);
+
+		/* We have the response we're looking for. Now, before
+		 * letting anyone else process this sequence number, we
+		 * need to process any events that should have come
+		 * earlier. */
+
+		if(dpy->xcb->event_owner == XlibOwnsEventQueue)
+		{
+			xcb_generic_reply_t *event;
+			/* If some thread is already waiting for events,
+			 * it will get the first one. That thread must
+			 * process that event before we can continue. */
+			/* FIXME: That event might be after this reply,
+			 * and might never even come--or there might be
+			 * multiple threads trying to get events. */
+			while(dpy->xcb->event_waiter)
+			{ /* need braces around ConditionWait */
+				ConditionWait(dpy, dpy->xcb->event_notify);
+			}
+			while((event = poll_for_event(dpy)))
+				handle_response(dpy, event, True);
+		}
+
+		req->reply_waiter = 0;
+		ConditionBroadcast(dpy, dpy->xcb->reply_notify);
+		if(XLIB_SEQUENCE_COMPARE(req->sequence, >, dpy->request)) {
+			throw_thread_fail_assert("Unknown sequence number "
+			                         "while processing reply",
+			                        xcb_xlib_threads_sequence_lost);
+		}
+		dpy->last_request_read = req->sequence;
+		if(!response)
+			dequeue_pending_request(dpy, req);
+
+		if(req == current)
+		{
+			reply = (char *) response;
+			break;
+		}
+
+		if(error)
+			handle_response(dpy, (xcb_generic_reply_t *) error, True);
+		else if(response)
+			handle_response(dpy, response, True);
+	}
+	check_internal_connections(dpy);
+
+	if(dpy->xcb->next_event && dpy->xcb->next_event->response_type == X_Error)
+	{
+		xcb_generic_event_t *event = dpy->xcb->next_event;
+		unsigned long event_sequence = dpy->last_request_read;
+		widen(&event_sequence, event->full_sequence);
+		if(event_sequence == dpy->last_request_read)
+		{
+			error = (xcb_generic_error_t *) event;
+			dpy->xcb->next_event = NULL;
+		}
+	}
+
+	if(error)
+	{
+		int ret_code;
+
+		/* Xlib is evil and assumes that even errors will be
+		 * copied into rep. */
+		memcpy(rep, error, 32);
+
+		/* do not die on "no such font", "can't allocate",
+		   "can't grab" failures */
+		switch(error->error_code)
+		{
+			case BadName:
+				switch(error->major_code)
+				{
+					case X_LookupColor:
+					case X_AllocNamedColor:
+						free(error);
+						return 0;
+				}
+				break;
+			case BadFont:
+				if(error->major_code == X_QueryFont) {
+					free(error);
+					return 0;
+				}
+				break;
+			case BadAlloc:
+			case BadAccess:
+				free(error);
+				return 0;
+		}
+
+		ret_code = handle_error(dpy, (xError *) error, True);
+		free(error);
+		return ret_code;
+	}
+
+	/* it's not an error, but we don't have a reply, so it's an I/O
+	 * error. */
+	if(!reply)
+	{
+		_XIOError(dpy);
+		return 0;
+	}
+
+	/* there's no error and we have a reply. */
+	dpy->xcb->reply_data = reply;
+	dpy->xcb->reply_consumed = sizeof(xReply) + (extra * 4);
+	dpy->xcb->reply_length = sizeof(xReply);
+	if(dpy->xcb->reply_data[0] == 1)
+		dpy->xcb->reply_length += (((xcb_generic_reply_t *) dpy->xcb->reply_data)->length * 4);
+
+	/* error: Xlib asks too much. give them what we can anyway. */
+	if(dpy->xcb->reply_length < dpy->xcb->reply_consumed)
+		dpy->xcb->reply_consumed = dpy->xcb->reply_length;
+
+	memcpy(rep, dpy->xcb->reply_data, dpy->xcb->reply_consumed);
+	_XFreeReplyData(dpy, discard);
+	return 1;
+}
+
+int _XRead(Display *dpy, char *data, long size)
+{
+	assert(size >= 0);
+	if(size == 0)
+		return 0;
+	if(dpy->xcb->reply_data == NULL ||
+	   dpy->xcb->reply_consumed + size > dpy->xcb->reply_length)
+		throw_extlib_fail_assert("Too much data requested from _XRead",
+		                         xcb_xlib_too_much_data_requested);
+	memcpy(data, dpy->xcb->reply_data + dpy->xcb->reply_consumed, size);
+	dpy->xcb->reply_consumed += size;
+	_XFreeReplyData(dpy, False);
+	return 0;
+}
+
+/*
+ * _XReadPad - Read bytes from the socket taking into account incomplete
+ * reads.  If the number of bytes is not 0 mod 4, read additional pad
+ * bytes.
+ */
+void _XReadPad(Display *dpy, char *data, long size)
+{
+	_XRead(dpy, data, size);
+	dpy->xcb->reply_consumed += -size & 3;
+	_XFreeReplyData(dpy, False);
+}
+
+/* Read and discard "n" 8-bit bytes of data */
+void _XEatData(Display *dpy, unsigned long n)
+{
+	dpy->xcb->reply_consumed += n;
+	_XFreeReplyData(dpy, False);
+}
diff --git a/libXft/src/xftglyphs.c b/libXft/src/xftglyphs.c
index 4a3b9d606..2f3dc5a6b 100644
--- a/libXft/src/xftglyphs.c
+++ b/libXft/src/xftglyphs.c
@@ -24,9 +24,7 @@
 #include <freetype/ftoutln.h>
 #include <freetype/ftlcdfil.h>
 
-#if HAVE_FT_GLYPHSLOT_EMBOLDEN
 #include <freetype/ftsynth.h>
-#endif
 
 /*
  * Validate the memory info for a font
@@ -434,12 +432,10 @@ XftFontLoadGlyphs (Display	    *dpy,
 
 	glyphslot = face->glyph;
 
-#if HAVE_FT_GLYPHSLOT_EMBOLDEN
 	/*
 	 * Embolden if required
 	 */
 	if (font->info.embolden) FT_GlyphSlot_Embolden(glyphslot);
-#endif
 
 	/*
 	 * Compute glyph metrics from FreeType information
diff --git a/libXft/src/xftint.h b/libXft/src/xftint.h
index 5cb57aeab..165897767 100644
--- a/libXft/src/xftint.h
+++ b/libXft/src/xftint.h
@@ -68,16 +68,6 @@
 # define _X_EXPORT /**/
 #endif
 
-#ifndef HAVE_CONFIG_H
-# if (FREETYPE_MAJOR > 2 ||						    \
-      (FREETYPE_MAJOR == 2 && (FREETYPE_MINOR > 1 ||			    \
-			       (FREETYPE_MINOR == 1 && FREETYPE_PATCH >= 5))))
-#  define HAVE_FT_BITMAP_SIZE_Y_PPEM 1
-# else
-#  define HAVE_FT_BITMAP_SIZE_Y_PPEM 0
-# endif
-#endif
-
 typedef struct _XftMatcher {
     char    *object;
     double  (*compare) (char *object, FcValue value1, FcValue value2);
diff --git a/libxcb/NEWS b/libxcb/NEWS
index bb4b47d68..66d6253ae 100644
--- a/libxcb/NEWS
+++ b/libxcb/NEWS
@@ -1,3 +1,14 @@
+Release 1.8.1 (2012-03-09)
+==========================
+- Fix a busy loop on BSD and Mac OS
+- Bump xcb-proto requirement
+- Fallback to TCP if no protocol is specified and the UNIX connection fails
+- Update use of error_connection under WIN32 to _xcb_conn_ret_error()
+- Fix build of xcb_auth.c with XDMCP on WIN32
+- Revert "Fix include order with Xdmcp on WIN32"
+- darwin: Use read(2) rather than recv(2)
+- Add xkb_internals and xkb_issues to EXTRA_DIST.
+
 Release 1.8 (2012-01-11)
 ========================
 - xcb_disconnect: call shutdown() to force a disconnect
@@ -42,7 +53,6 @@ Release 1.8 (2012-01-11)
 - Compute alignment correctly
 - Fix a dead-lock due to xcb_poll_for_reply
 
-
 Release 1.7 (2010-08-13)
 ========================
 - Always wake up readers after writing
diff --git a/libxcb/configure.ac b/libxcb/configure.ac
index 9abaffced..e94e32c7b 100644
--- a/libxcb/configure.ac
+++ b/libxcb/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([libxcb],
-        1.8,
+        1.8.1,
         [xcb@lists.freedesktop.org])
 AC_CONFIG_SRCDIR([xcb.pc.in])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
diff --git a/mesalib/include/GL/glext.h b/mesalib/include/GL/glext.h
index 09400215b..113241e77 100644
--- a/mesalib/include/GL/glext.h
+++ b/mesalib/include/GL/glext.h
@@ -7573,12 +7573,12 @@ typedef GLsync (APIENTRYP PFNGLCREATESYNCFROMCLEVENTARBPROC) (struct _cl_context
 #ifdef GL_GLEXT_PROTOTYPES
 GLAPI void APIENTRY glDebugMessageControlARB (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
 GLAPI void APIENTRY glDebugMessageInsertARB (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf);
-GLAPI void APIENTRY glDebugMessageCallbackARB (GLDEBUGPROCARB callback, const GLvoid *userParam);
+GLAPI void APIENTRY glDebugMessageCallbackARB (GLDEBUGPROCARB callback, GLvoid *userParam);
 GLAPI GLuint APIENTRY glGetDebugMessageLogARB (GLuint count, GLsizei bufsize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog);
 #endif /* GL_GLEXT_PROTOTYPES */
 typedef void (APIENTRYP PFNGLDEBUGMESSAGECONTROLARBPROC) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled);
 typedef void (APIENTRYP PFNGLDEBUGMESSAGEINSERTARBPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf);
-typedef void (APIENTRYP PFNGLDEBUGMESSAGECALLBACKARBPROC) (GLDEBUGPROCARB callback, const GLvoid *userParam);
+typedef void (APIENTRYP PFNGLDEBUGMESSAGECALLBACKARBPROC) (GLDEBUGPROCARB callback, GLvoid *userParam);
 typedef GLuint (APIENTRYP PFNGLGETDEBUGMESSAGELOGARBPROC) (GLuint count, GLsizei bufsize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog);
 #endif
 
diff --git a/mesalib/src/gallium/auxiliary/util/u_format.csv b/mesalib/src/gallium/auxiliary/util/u_format.csv
index 345cc9d47..05f04b587 100644
--- a/mesalib/src/gallium/auxiliary/util/u_format.csv
+++ b/mesalib/src/gallium/auxiliary/util/u_format.csv
@@ -145,6 +145,8 @@ PIPE_FORMAT_YUYV                 , subsampled, 2, 1, x32 ,     ,     ,     , xyz
 # same subsampling but with rgb channels
 PIPE_FORMAT_R8G8_B8G8_UNORM      , subsampled, 2, 1, x32 ,     ,     ,     , xyz1, rgb
 PIPE_FORMAT_G8R8_G8B8_UNORM      , subsampled, 2, 1, x32 ,     ,     ,     , xyz1, rgb
+PIPE_FORMAT_G8R8_B8R8_UNORM      , subsampled, 2, 1, x32 ,     ,     ,     , yxz1, rgb
+PIPE_FORMAT_R8G8_R8B8_UNORM      , subsampled, 2, 1, x32 ,     ,     ,     , yxz1, rgb
 
 # some special formats not fitting anywhere else
 PIPE_FORMAT_R11G11B10_FLOAT       , other,      1,  1, x32 ,     ,     ,     , xyz1, rgb
diff --git a/mesalib/src/gallium/auxiliary/util/u_format.h b/mesalib/src/gallium/auxiliary/util/u_format.h
index b9ae7c190..bd4e51d27 100644
--- a/mesalib/src/gallium/auxiliary/util/u_format.h
+++ b/mesalib/src/gallium/auxiliary/util/u_format.h
@@ -54,7 +54,7 @@ enum util_format_layout {
    /**
     * Formats with sub-sampled channels.
     *
-    * This is for formats like YV12 where there is less than one sample per
+    * This is for formats like YVYU where there is less than one sample per
     * pixel.
     */
    UTIL_FORMAT_LAYOUT_SUBSAMPLED = 3,
diff --git a/mesalib/src/gallium/auxiliary/util/u_format_yuv.c b/mesalib/src/gallium/auxiliary/util/u_format_yuv.c
index 38a25b186..c7fdaa04f 100644
--- a/mesalib/src/gallium/auxiliary/util/u_format_yuv.c
+++ b/mesalib/src/gallium/auxiliary/util/u_format_yuv.c
@@ -1142,3 +1142,51 @@ util_format_nv21_pack_rgba_float(uint8_t *dst_row, unsigned dst_stride,
 void
 util_format_nv21_fetch_rgba_float(float *dst, const uint8_t *src,
                              unsigned i, unsigned j) {}
+
+void
+util_format_r8g8_r8b8_unorm_unpack_rgba_float(float *dst_row, unsigned dst_stride,
+                                         const uint8_t *src_row, unsigned src_stride,
+                                         unsigned width, unsigned height) {}
+
+void
+util_format_r8g8_r8b8_unorm_unpack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride,
+                                          const uint8_t *src_row, unsigned src_stride,
+                                          unsigned width, unsigned height) {}
+
+void
+util_format_r8g8_r8b8_unorm_pack_rgba_float(uint8_t *dst_row, unsigned dst_stride,
+                                       const float *src_row, unsigned src_stride,
+                                       unsigned width, unsigned height) {}
+
+void
+util_format_r8g8_r8b8_unorm_pack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride,
+                                        const uint8_t *src_row, unsigned src_stride,
+                                        unsigned width, unsigned height) {}
+
+void
+util_format_r8g8_r8b8_unorm_fetch_rgba_float(float *dst, const uint8_t *src,
+                                        unsigned i, unsigned j) {}
+
+void
+util_format_g8r8_b8r8_unorm_unpack_rgba_float(float *dst_row, unsigned dst_stride,
+                                         const uint8_t *src_row, unsigned src_stride,
+                                         unsigned width, unsigned height) {}
+
+void
+util_format_g8r8_b8r8_unorm_unpack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride,
+                                          const uint8_t *src_row, unsigned src_stride,
+                                          unsigned width, unsigned height) {}
+
+void
+util_format_g8r8_b8r8_unorm_pack_rgba_float(uint8_t *dst_row, unsigned dst_stride,
+                                       const float *src_row, unsigned src_stride,
+                                       unsigned width, unsigned height) {}
+
+void
+util_format_g8r8_b8r8_unorm_pack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride,
+                                        const uint8_t *src_row, unsigned src_stride,
+                                        unsigned width, unsigned height) {}
+
+void
+util_format_g8r8_b8r8_unorm_fetch_rgba_float(float *dst, const uint8_t *src,
+                                        unsigned i, unsigned j) {}
diff --git a/mesalib/src/gallium/auxiliary/util/u_format_yuv.h b/mesalib/src/gallium/auxiliary/util/u_format_yuv.h
index 4cb22df7a..4ec39812e 100644
--- a/mesalib/src/gallium/auxiliary/util/u_format_yuv.h
+++ b/mesalib/src/gallium/auxiliary/util/u_format_yuv.h
@@ -313,6 +313,52 @@ void
 util_format_g8r8_g8b8_unorm_fetch_rgba_float(float *dst, const uint8_t *src,
                                         unsigned i, unsigned j);
 
+void
+util_format_r8g8_r8b8_unorm_unpack_rgba_float(float *dst_row, unsigned dst_stride,
+                                         const uint8_t *src_row, unsigned src_stride,
+                                         unsigned width, unsigned height);
+
+void
+util_format_r8g8_r8b8_unorm_unpack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride,
+                                          const uint8_t *src_row, unsigned src_stride,
+                                          unsigned width, unsigned height);
+
+void
+util_format_r8g8_r8b8_unorm_pack_rgba_float(uint8_t *dst_row, unsigned dst_stride,
+                                       const float *src_row, unsigned src_stride,
+                                       unsigned width, unsigned height);
+
+void
+util_format_r8g8_r8b8_unorm_pack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride,
+                                        const uint8_t *src_row, unsigned src_stride,
+                                        unsigned width, unsigned height);
+
+void
+util_format_r8g8_r8b8_unorm_fetch_rgba_float(float *dst, const uint8_t *src,
+                                        unsigned i, unsigned j);
 
+void
+util_format_g8r8_b8r8_unorm_unpack_rgba_float(float *dst_row, unsigned dst_stride,
+                                         const uint8_t *src_row, unsigned src_stride,
+                                         unsigned width, unsigned height);
+
+void
+util_format_g8r8_b8r8_unorm_unpack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride,
+                                          const uint8_t *src_row, unsigned src_stride,
+                                          unsigned width, unsigned height);
+
+void
+util_format_g8r8_b8r8_unorm_pack_rgba_float(uint8_t *dst_row, unsigned dst_stride,
+                                       const float *src_row, unsigned src_stride,
+                                       unsigned width, unsigned height);
+
+void
+util_format_g8r8_b8r8_unorm_pack_rgba_8unorm(uint8_t *dst_row, unsigned dst_stride,
+                                        const uint8_t *src_row, unsigned src_stride,
+                                        unsigned width, unsigned height);
+
+void
+util_format_g8r8_b8r8_unorm_fetch_rgba_float(float *dst, const uint8_t *src,
+                                        unsigned i, unsigned j);
 
 #endif /* U_FORMAT_YUV_H_ */
diff --git a/mesalib/src/mapi/glapi/gen/ARB_debug_output.xml b/mesalib/src/mapi/glapi/gen/ARB_debug_output.xml
new file mode 100644
index 000000000..f2877a4f7
--- /dev/null
+++ b/mesalib/src/mapi/glapi/gen/ARB_debug_output.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0"?>
+<!DOCTYPE OpenGLAPI SYSTEM "gl_API.dtd">
+
+<!-- Note: no GLX protocol info yet. -->
+
+
+<OpenGLAPI>
+
+<category name="GL_ARB_debug_output" number="104">
+
+    <!-- glEnable/Disable/IsEnabled -->
+    <enum name="DEBUG_OUTPUT_SYNCHRONOUS_ARB"              value="0x8242"/>
+
+    <!-- glGetIntegerv -->
+    <enum name="MAX_DEBUG_MESSAGE_LENGTH_ARB"    count="1" value="0x9143">
+        <size name="Get" mode="get"/>
+    </enum>
+    <enum name="MAX_DEBUG_LOGGED_MESSAGES_ARB"   count="1" value="0x9144">
+        <size name="Get" mode="get"/>
+    </enum>
+    <enum name="DEBUG_LOGGED_MESSAGES_ARB"       count="1" value="0x9145">
+        <size name="Get" mode="get"/>
+    </enum>
+    <enum name="DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_ARB" count="1" value="0x8243">
+        <size name="Get" mode="get"/>
+    </enum>
+
+    <!-- glGetPointerv -->
+    <enum name="DEBUG_CALLBACK_FUNCTION_ARB"     count="1" value="0x8244">
+        <size name="GetPointerv" mode="get"/>
+    </enum>
+    <enum name="DEBUG_CALLBACK_USER_PARAM_ARB"   count="1" value="0x8245">
+        <size name="GetPointerv" mode="get"/>
+    </enum>
+
+    <enum name="DEBUG_SOURCE_API_ARB"                      value="0x8246"/>
+    <enum name="DEBUG_SOURCE_WINDOW_SYSTEM_ARB"            value="0x8247"/>
+    <enum name="DEBUG_SOURCE_SHADER_COMPILER_ARB"          value="0x8248"/>
+    <enum name="DEBUG_SOURCE_THIRD_PARTY_ARB"              value="0x8249"/>
+    <enum name="DEBUG_SOURCE_APPLICATION_ARB"              value="0x824A"/>
+    <enum name="DEBUG_SOURCE_OTHER_ARB"                    value="0x824B"/>
+
+    <enum name="DEBUG_TYPE_ERROR_ARB"                      value="0x824C"/>
+    <enum name="DEBUG_TYPE_DEPRECATED_BEHAVIOR_ARB"        value="0x824D"/>
+    <enum name="DEBUG_TYPE_UNDEFINED_BEHAVIOR_ARB"         value="0x824E"/>
+    <enum name="DEBUG_TYPE_PORTABILITY_ARB"                value="0x824F"/>
+    <enum name="DEBUG_TYPE_PERFORMANCE_ARB"                value="0x8250"/>
+    <enum name="DEBUG_TYPE_OTHER_ARB"                      value="0x8251"/>
+
+    <enum name="DEBUG_SEVERITY_HIGH_ARB"                   value="0x9146"/>
+    <enum name="DEBUG_SEVERITY_MEDIUM_ARB"                 value="0x9147"/>
+    <enum name="DEBUG_SEVERITY_LOW_ARB"                    value="0x9148"/>
+
+
+    <function name="DebugMessageControlARB" offset="assign">
+        <param name="source" type="GLenum"/>
+        <param name="type" type="GLenum"/>
+        <param name="severity" type="GLenum"/>
+        <param name="count" type="GLsizei" counter="true"/>
+        <param name="ids" type="const GLuint *" count="count"/>
+        <param name="enabled" type="GLboolean"/>
+    </function>
+
+    <function name="DebugMessageInsertARB" offset="assign">
+        <param name="source" type="GLenum"/>
+        <param name="type" type="GLenum"/>
+        <param name="id" type="GLuint"/>
+        <param name="severity" type="GLenum"/>
+        <param name="length" type="GLsizei"/>
+        <param name="buf" type="const GLcharARB *"/>
+    </function>
+
+    <function name="DebugMessageCallbackARB" offset="assign">
+        <param name="callback" type="GLDEBUGPROCARB"/>
+        <param name="userParam" type="GLvoid *"/>
+    </function>
+
+    <function name="GetDebugMessageLogARB" offset="assign">
+        <return type="GLuint"/>
+        <param name="count" type="GLuint"/>
+        <param name="bufsize" type="GLsizei"/>
+        <param name="sources" type="GLenum *" output="true"/>
+        <param name="types" type="GLenum *" output="true"/>
+        <param name="ids" type="GLuint *" output="true"/>
+        <param name="severities" type="GLenum *" output="true"/>
+        <param name="lengths" type="GLsizei *" output="true"/>
+        <param name="messageLog" type="GLcharARB *" output="true"/>
+    </function>
+
+</category>
+
+
+</OpenGLAPI>
diff --git a/mesalib/src/mapi/glapi/gen/Makefile b/mesalib/src/mapi/glapi/gen/Makefile
index c409285dd..44939e354 100644
--- a/mesalib/src/mapi/glapi/gen/Makefile
+++ b/mesalib/src/mapi/glapi/gen/Makefile
@@ -65,6 +65,7 @@ API_XML = \
 	gl_API.xml \
 	ARB_color_buffer_float.xml \
 	ARB_copy_buffer.xml \
+	ARB_debug_output.xml \
 	ARB_depth_clamp.xml \
 	ARB_draw_buffers_blend.xml \
 	ARB_draw_elements_base_vertex.xml \
diff --git a/mesalib/src/mapi/glapi/gen/gl_API.dtd b/mesalib/src/mapi/glapi/gen/gl_API.dtd
index 30c646c92..149a433ca 100644
--- a/mesalib/src/mapi/glapi/gen/gl_API.dtd
+++ b/mesalib/src/mapi/glapi/gen/gl_API.dtd
@@ -26,6 +26,7 @@
                    size                NMTOKEN #REQUIRED
 		   float               (true | false) "false"
 		   unsigned            (true | false) "false"
+		   pointer             (true | false) "false"
                    glx_name            NMTOKEN #IMPLIED>
 <!ATTLIST enum     name                NMTOKEN #REQUIRED
                    count               CDATA   #IMPLIED
diff --git a/mesalib/src/mapi/glapi/gen/gl_API.xml b/mesalib/src/mapi/glapi/gen/gl_API.xml
index 24539c0f4..9f8635611 100644
--- a/mesalib/src/mapi/glapi/gen/gl_API.xml
+++ b/mesalib/src/mapi/glapi/gen/gl_API.xml
@@ -1106,6 +1106,8 @@
     
     <type name="void"    size="1"/>
 
+    <type name="DEBUGPROCARB" size="4" pointer="true"/>
+
     <function name="NewList" offset="0">
         <param name="list" type="GLuint"/>
         <param name="mode" type="GLenum"/>
@@ -7925,6 +7927,8 @@
 
 <xi:include href="ARB_color_buffer_float.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
+<xi:include href="ARB_debug_output.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
 <xi:include href="ARB_robustness.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
 <!-- Non-ARB extensions sorted by extension number. -->
diff --git a/mesalib/src/mapi/glapi/gen/gl_XML.py b/mesalib/src/mapi/glapi/gen/gl_XML.py
index 4dc2e8fa7..340a581f1 100644
--- a/mesalib/src/mapi/glapi/gen/gl_XML.py
+++ b/mesalib/src/mapi/glapi/gen/gl_XML.py
@@ -340,6 +340,7 @@ class gl_type( gl_item ):
 		tn.size = int( element.nsProp( "size", None ), 0 )
 		tn.integer = not is_attr_true( element, "float" )
 		tn.unsigned = is_attr_true( element, "unsigned" )
+		tn.pointer = is_attr_true( element, "pointer" )
 		tn.name = "GL" + self.name
 		te.set_base_type_node( tn )
 
diff --git a/mesalib/src/mapi/glapi/gen/typeexpr.py b/mesalib/src/mapi/glapi/gen/typeexpr.py
index 8ba7de486..7836b2739 100644
--- a/mesalib/src/mapi/glapi/gen/typeexpr.py
+++ b/mesalib/src/mapi/glapi/gen/typeexpr.py
@@ -252,7 +252,7 @@ class type_expression:
 
 
 	def get_stack_size(self):
-		tn = self.expr[ len(self.expr) - 1 ]
+		tn = self.expr[ -1 ]
 
 		if tn.elements or tn.pointer:
 			return 4
@@ -263,12 +263,12 @@ class type_expression:
 
 
 	def is_pointer(self):
-		tn = self.expr[ len(self.expr) - 1 ]
+		tn = self.expr[ -1 ]
 		return tn.pointer
 
 
 	def format_string(self):
-		tn = self.expr[ len(self.expr) - 1 ]
+		tn = self.expr[ -1 ]
 		if tn.pointer:
 			return "%p"
 		elif not tn.integer:
diff --git a/mesalib/src/mapi/glapi/glapi_gentable.c b/mesalib/src/mapi/glapi/glapi_gentable.c
index 5c0480170..abb0d0109 100644
--- a/mesalib/src/mapi/glapi/glapi_gentable.c
+++ b/mesalib/src/mapi/glapi/glapi_gentable.c
@@ -6261,6 +6261,34 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) {
     }
 
 
+    if(!disp->DebugMessageCallbackARB) {
+        void ** procp = (void **) &disp->DebugMessageCallbackARB;
+        snprintf(symboln, sizeof(symboln), "%sDebugMessageCallbackARB", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->DebugMessageControlARB) {
+        void ** procp = (void **) &disp->DebugMessageControlARB;
+        snprintf(symboln, sizeof(symboln), "%sDebugMessageControlARB", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->DebugMessageInsertARB) {
+        void ** procp = (void **) &disp->DebugMessageInsertARB;
+        snprintf(symboln, sizeof(symboln), "%sDebugMessageInsertARB", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->GetDebugMessageLogARB) {
+        void ** procp = (void **) &disp->GetDebugMessageLogARB;
+        snprintf(symboln, sizeof(symboln), "%sGetDebugMessageLogARB", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
     if(!disp->GetGraphicsResetStatusARB) {
         void ** procp = (void **) &disp->GetGraphicsResetStatusARB;
         snprintf(symboln, sizeof(symboln), "%sGetGraphicsResetStatusARB", symbol_prefix);
diff --git a/mesalib/src/mapi/glapi/glapi_mapi_tmp.h b/mesalib/src/mapi/glapi/glapi_mapi_tmp.h
index 11a824a84..647ac9d79 100644
--- a/mesalib/src/mapi/glapi/glapi_mapi_tmp.h
+++ b/mesalib/src/mapi/glapi/glapi_mapi_tmp.h
@@ -880,6 +880,10 @@ GLAPI void APIENTRY GLAPI_PREFIX(ShaderBinary)(GLsizei n, const GLuint *shaders,
 void APIENTRY GLAPI_PREFIX(_dispatch_stub_665)(GLuint program, GLsizei bufSize, GLsizei *length, GLenum *binaryFormat, GLvoid *binary);
 void APIENTRY GLAPI_PREFIX(_dispatch_stub_666)(GLuint program, GLenum binaryFormat, const GLvoid *binary, GLsizei length);
 void APIENTRY GLAPI_PREFIX(_dispatch_stub_667)(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);
+GLAPI GLuint APIENTRY GLAPI_PREFIX(GetDebugMessageLogARB)(GLuint count, GLsizei bufsize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLcharARB *messageLog);
 GLAPI GLenum APIENTRY GLAPI_PREFIX(GetGraphicsResetStatusARB)(void);
 GLAPI void APIENTRY GLAPI_PREFIX(GetnColorTableARB)(GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid *table);
 GLAPI void APIENTRY GLAPI_PREFIX(GetnCompressedTexImageARB)(GLenum target, GLint lod, GLsizei bufSize, GLvoid *img);
@@ -907,24 +911,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_695)(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_696)(const GLfloat *coords);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_697)(GLint x, GLint y, GLint z, GLint width, GLint height);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_698)(const GLint *coords);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_699)(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_700)(const GLshort *coords);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_701)(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_702)(const GLfixed *coords);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_703)(GLenum type, GLsizei stride, const GLvoid *pointer);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_704)(GLenum pname, GLfloat *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_705)(GLenum pname, GLint *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_706)(GLenum pname, GLfloat param);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_707)(GLenum pname, const GLfloat *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_708)(GLenum pname, GLint param);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_709)(GLenum pname, const GLint *params);
-GLbitfield APIENTRY GLAPI_PREFIX(_dispatch_stub_710)(GLfixed *mantissa, GLint *exponent);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_711)(GLclampf value, GLboolean invert);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_712)(GLenum pattern);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_699)(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_700)(const GLfloat *coords);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_701)(GLint x, GLint y, GLint z, GLint width, GLint height);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_702)(const GLint *coords);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_703)(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_704)(const GLshort *coords);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_705)(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_706)(const GLfixed *coords);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_707)(GLenum type, GLsizei stride, const GLvoid *pointer);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_708)(GLenum pname, GLfloat *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_709)(GLenum pname, GLint *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_710)(GLenum pname, GLfloat param);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_711)(GLenum pname, const GLfloat *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_712)(GLenum pname, GLint param);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_713)(GLenum pname, const GLint *params);
+GLbitfield APIENTRY GLAPI_PREFIX(_dispatch_stub_714)(GLfixed *mantissa, GLint *exponent);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_715)(GLclampf value, GLboolean invert);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_716)(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);
@@ -987,7 +991,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_747)(GLenum mode);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_751)(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);
@@ -1062,15 +1066,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_789)(const GLenum *mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_790)(const GLenum *mode, const GLsizei *count, GLenum type, const GLvoid * const *indices, GLsizei primcount, GLint modestride);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_791)(GLsizei n, const GLuint *fences);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_792)(GLuint fence);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_793)(GLsizei n, GLuint *fences);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_794)(GLuint fence, GLenum pname, GLint *params);
-GLboolean APIENTRY GLAPI_PREFIX(_dispatch_stub_795)(GLuint fence);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_796)(GLuint fence, GLenum condition);
-GLboolean APIENTRY GLAPI_PREFIX(_dispatch_stub_797)(GLuint fence);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_793)(const GLenum *mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_794)(const GLenum *mode, const GLsizei *count, GLenum type, const GLvoid * const *indices, GLsizei primcount, GLint modestride);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_795)(GLsizei n, const GLuint *fences);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_796)(GLuint fence);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_797)(GLsizei n, GLuint *fences);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_798)(GLuint fence, GLenum pname, GLint *params);
+GLboolean APIENTRY GLAPI_PREFIX(_dispatch_stub_799)(GLuint fence);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_800)(GLuint fence, GLenum condition);
+GLboolean APIENTRY GLAPI_PREFIX(_dispatch_stub_801)(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);
@@ -1159,12 +1163,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_878)(GLenum face);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_879)(GLuint array);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_880)(GLsizei n, const GLuint *arrays);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_882)(GLenum face);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_883)(GLuint array);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_884)(GLsizei n, const GLuint *arrays);
 GLAPI void APIENTRY GLAPI_PREFIX(DeleteVertexArrays)(GLsizei n, const GLuint *arrays);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_881)(GLsizei n, GLuint *arrays);
-GLboolean APIENTRY GLAPI_PREFIX(_dispatch_stub_882)(GLuint array);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_885)(GLsizei n, GLuint *arrays);
+GLboolean APIENTRY GLAPI_PREFIX(_dispatch_stub_886)(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);
@@ -1175,54 +1179,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_891)(GLenum func, GLclampx ref);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_892)(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_893)(GLclampx depth);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_894)(GLenum plane, const GLfixed *equation);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_895)(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_896)(GLclampx zNear, GLclampx zFar);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_897)(GLenum pname, GLfixed param);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_898)(GLenum pname, const GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_899)(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_900)(GLenum plane, GLfixed *equation);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_901)(GLenum pname, GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_902)(GLenum light, GLenum pname, GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_903)(GLenum face, GLenum pname, GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_904)(GLenum target, GLenum pname, GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_905)(GLenum coord, GLenum pname, GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_906)(GLenum target, GLenum pname, GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_907)(GLenum pname, GLfixed param);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_908)(GLenum pname, const GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_909)(GLenum light, GLenum pname, GLfixed param);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_910)(GLenum light, GLenum pname, const GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_911)(GLfixed width);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_912)(const GLfixed *m);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_913)(GLenum face, GLenum pname, GLfixed param);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_914)(GLenum face, GLenum pname, const GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_915)(const GLfixed *m);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_916)(GLenum target, GLfixed s, GLfixed t, GLfixed r, GLfixed q);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_917)(GLfixed nx, GLfixed ny, GLfixed nz);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_918)(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_919)(GLenum pname, GLfixed param);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_920)(GLenum pname, const GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_921)(GLfixed size);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_922)(GLfixed factor, GLfixed units);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_923)(GLfixed angle, GLfixed x, GLfixed y, GLfixed z);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_924)(GLclampx value, GLboolean invert);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_925)(GLfixed x, GLfixed y, GLfixed z);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_926)(GLenum target, GLenum pname, GLfixed param);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_927)(GLenum target, GLenum pname, const GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_928)(GLenum coord, GLenum pname, GLint param);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_929)(GLenum coord, GLenum pname, const GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_895)(GLenum func, GLclampx ref);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_896)(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_897)(GLclampx depth);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_898)(GLenum plane, const GLfixed *equation);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_899)(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_900)(GLclampx zNear, GLclampx zFar);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_901)(GLenum pname, GLfixed param);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_902)(GLenum pname, const GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_903)(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_904)(GLenum plane, GLfixed *equation);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_905)(GLenum pname, GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_906)(GLenum light, GLenum pname, GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_907)(GLenum face, GLenum pname, GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_908)(GLenum target, GLenum pname, GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_909)(GLenum coord, 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 pname, GLfixed param);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_912)(GLenum pname, const GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_913)(GLenum light, GLenum pname, GLfixed param);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_914)(GLenum light, GLenum pname, const GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_915)(GLfixed width);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_916)(const GLfixed *m);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_917)(GLenum face, GLenum pname, GLfixed param);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_918)(GLenum face, GLenum pname, const GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_919)(const GLfixed *m);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_920)(GLenum target, GLfixed s, GLfixed t, GLfixed r, GLfixed q);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_921)(GLfixed nx, GLfixed ny, GLfixed nz);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_922)(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top, GLfixed zNear, GLfixed zFar);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_923)(GLenum pname, GLfixed param);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_924)(GLenum pname, const GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_925)(GLfixed size);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_926)(GLfixed factor, GLfixed units);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_927)(GLfixed angle, GLfixed x, GLfixed y, GLfixed z);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_928)(GLclampx value, GLboolean invert);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_929)(GLfixed x, GLfixed y, GLfixed z);
 void APIENTRY GLAPI_PREFIX(_dispatch_stub_930)(GLenum target, GLenum pname, GLfixed param);
 void APIENTRY GLAPI_PREFIX(_dispatch_stub_931)(GLenum target, GLenum pname, const GLfixed *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_932)(GLfixed x, GLfixed y, GLfixed z);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_933)(GLenum plane, const GLfloat *equation);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_934)(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_935)(GLenum plane, GLfloat *equation);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_936)(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_937)(GLclampd zmin, GLclampd zmax);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_938)(GLenum modeRGB, GLenum modeA);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_932)(GLenum coord, GLenum pname, GLint param);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_933)(GLenum coord, GLenum pname, const GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_934)(GLenum target, GLenum pname, GLfixed param);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_935)(GLenum target, GLenum pname, const GLfixed *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_936)(GLfixed x, GLfixed y, GLfixed z);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_937)(GLenum plane, const GLfloat *equation);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_938)(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top, GLfloat zNear, GLfloat zFar);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_939)(GLenum plane, 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)(GLclampd zmin, GLclampd zmax);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_942)(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);
@@ -1258,10 +1262,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_956)(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_960)(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_957)(GLenum target, GLenum pname, GLint param);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_958)(GLenum target, GLintptr offset, GLsizeiptr size);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_961)(GLenum target, GLenum pname, GLint param);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_962)(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);
@@ -1374,8 +1378,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_1016)(GLenum target, GLenum pname, GLvoid **params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_1017)(GLenum target, GLsizei length, GLvoid *pointer);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_1020)(GLenum target, GLenum pname, GLvoid **params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_1021)(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);
@@ -1383,11 +1387,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_1025)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_1026)(GLenum target, GLuint index, GLsizei count, const GLfloat *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_1027)(GLenum target, GLuint index, GLsizei count, const GLfloat *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_1028)(GLuint id, GLenum pname, GLint64EXT *params);
-void APIENTRY GLAPI_PREFIX(_dispatch_stub_1029)(GLuint id, GLenum pname, GLuint64EXT *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_1029)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_1030)(GLenum target, GLuint index, GLsizei count, const GLfloat *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_1031)(GLenum target, GLuint index, GLsizei count, const GLfloat *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_1032)(GLuint id, GLenum pname, GLint64EXT *params);
+void APIENTRY GLAPI_PREFIX(_dispatch_stub_1033)(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
@@ -7323,2936 +7327,2964 @@ GLAPI void APIENTRY GLAPI_PREFIX(ShaderBinary)(GLsizei n, const GLuint *shaders,
    ((void (APIENTRY *)(GLsizei n, const GLuint *shaders, GLenum binaryformat, const GLvoid *binary, GLsizei length)) _func)(n, shaders, binaryformat, binary, length);
 }
 
-GLAPI GLenum APIENTRY GLAPI_PREFIX(GetGraphicsResetStatusARB)(void)
+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)[668];
+   ((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)[669];
+   ((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)[670];
+   ((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)[671];
+   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)[672];
    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)[669];
+   mapi_func _func = ((const mapi_func *) _tbl)[673];
    ((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)[670];
+   mapi_func _func = ((const mapi_func *) _tbl)[674];
    ((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)[671];
+   mapi_func _func = ((const mapi_func *) _tbl)[675];
    ((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)[672];
+   mapi_func _func = ((const mapi_func *) _tbl)[676];
    ((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)[673];
+   mapi_func _func = ((const mapi_func *) _tbl)[677];
    ((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)[674];
+   mapi_func _func = ((const mapi_func *) _tbl)[678];
    ((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)[675];
+   mapi_func _func = ((const mapi_func *) _tbl)[679];
    ((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)[676];
+   mapi_func _func = ((const mapi_func *) _tbl)[680];
    ((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)[677];
+   mapi_func _func = ((const mapi_func *) _tbl)[681];
    ((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)[678];
+   mapi_func _func = ((const mapi_func *) _tbl)[682];
    ((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)[679];
+   mapi_func _func = ((const mapi_func *) _tbl)[683];
    ((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)[680];
+   mapi_func _func = ((const mapi_func *) _tbl)[684];
    ((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)[681];
+   mapi_func _func = ((const mapi_func *) _tbl)[685];
    ((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)[682];
+   mapi_func _func = ((const mapi_func *) _tbl)[686];
    ((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)[683];
+   mapi_func _func = ((const mapi_func *) _tbl)[687];
    ((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)[684];
+   mapi_func _func = ((const mapi_func *) _tbl)[688];
    ((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)[685];
+   mapi_func _func = ((const mapi_func *) _tbl)[689];
    ((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)[686];
+   mapi_func _func = ((const mapi_func *) _tbl)[690];
    ((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)[687];
+   mapi_func _func = ((const mapi_func *) _tbl)[691];
    ((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)[688];
+   mapi_func _func = ((const mapi_func *) _tbl)[692];
    ((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)[689];
+   mapi_func _func = ((const mapi_func *) _tbl)[693];
    ((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)[690];
+   mapi_func _func = ((const mapi_func *) _tbl)[694];
    ((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)[691];
+   mapi_func _func = ((const mapi_func *) _tbl)[695];
    ((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)[692];
+   mapi_func _func = ((const mapi_func *) _tbl)[696];
    ((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)[693];
+   mapi_func _func = ((const mapi_func *) _tbl)[697];
    ((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)[694];
+   mapi_func _func = ((const mapi_func *) _tbl)[698];
    ((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)[713];
+   mapi_func _func = ((const mapi_func *) _tbl)[717];
    ((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)[714];
+   mapi_func _func = ((const mapi_func *) _tbl)[718];
    ((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)[715];
+   mapi_func _func = ((const mapi_func *) _tbl)[719];
    ((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)[716];
+   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(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)[717];
+   mapi_func _func = ((const mapi_func *) _tbl)[721];
    ((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)[718];
+   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(PointParameterfEXT)(GLenum pname, GLfloat param)
 {
    const struct mapi_table *_tbl = entry_current_get();
-   mapi_func _func = ((const mapi_func *) _tbl)[719];
+   mapi_func _func = ((const mapi_func *) _tbl)[723];
    ((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)[719];
+   mapi_func _func = ((const mapi_func *) _tbl)[723];
    ((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)[719];
+   mapi_func _func = ((const mapi_func *) _tbl)[723];
    ((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)[720];
+   mapi_func _func = ((const mapi_func *) _tbl)[724];
    ((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)[720];
+   mapi_func _func = ((const mapi_func *) _tbl)[724];
    ((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)[720];
+   mapi_func _func = ((const mapi_func *) _tbl)[724];
    ((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)[721];
+   mapi_func _func = ((const mapi_func *) _tbl)[725];
    ((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)[722];
+   mapi_func _func = ((const mapi_func *) _tbl)[726];
    ((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)[723];
+   mapi_func _func = ((const mapi_func *) _tbl)[727];
    ((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)[723];
+   mapi_func _func = ((const mapi_func *) _tbl)[727];
    ((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)[724];
+   mapi_func _func = ((const mapi_func *) _tbl)[728];
    ((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)[724];
+   mapi_func _func = ((const mapi_func *) _tbl)[728];
    ((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)[725];
+   mapi_func _func = ((const mapi_func *) _tbl)[729];
    ((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)[725];
+   mapi_func _func = ((const mapi_func *) _tbl)[729];
    ((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)[726];
+   mapi_func _func = ((const mapi_func *) _tbl)[730];
    ((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)[726];
+   mapi_func _func = ((const mapi_func *) _tbl)[730];
    ((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)[727];
+   mapi_func _func = ((const mapi_func *) _tbl)[731];
    ((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)[727];
+   mapi_func _func = ((const mapi_func *) _tbl)[731];
    ((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)[728];
+   mapi_func _func = ((const mapi_func *) _tbl)[732];
    ((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)[728];
+   mapi_func _func = ((const mapi_func *) _tbl)[732];
    ((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)[729];
+   mapi_func _func = ((const mapi_func *) _tbl)[733];
    ((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)[729];
+   mapi_func _func = ((const mapi_func *) _tbl)[733];
    ((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)[730];
+   mapi_func _func = ((const mapi_func *) _tbl)[734];
    ((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)[730];
+   mapi_func _func = ((const mapi_func *) _tbl)[734];
    ((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)[731];
+   mapi_func _func = ((const mapi_func *) _tbl)[735];
    ((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)[731];
+   mapi_func _func = ((const mapi_func *) _tbl)[735];
    ((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)[732];
+   mapi_func _func = ((const mapi_func *) _tbl)[736];
    ((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)[732];
+   mapi_func _func = ((const mapi_func *) _tbl)[736];
    ((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)[733];
+   mapi_func _func = ((const mapi_func *) _tbl)[737];
    ((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)[733];
+   mapi_func _func = ((const mapi_func *) _tbl)[737];
    ((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)[734];
+   mapi_func _func = ((const mapi_func *) _tbl)[738];
    ((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)[734];
+   mapi_func _func = ((const mapi_func *) _tbl)[738];
    ((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)[735];
+   mapi_func _func = ((const mapi_func *) _tbl)[739];
    ((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)[735];
+   mapi_func _func = ((const mapi_func *) _tbl)[739];
    ((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)[736];
+   mapi_func _func = ((const mapi_func *) _tbl)[740];
    ((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)[736];
+   mapi_func _func = ((const mapi_func *) _tbl)[740];
    ((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)[737];
+   mapi_func _func = ((const mapi_func *) _tbl)[741];
    ((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)[737];
+   mapi_func _func = ((const mapi_func *) _tbl)[741];
    ((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)[738];
+   mapi_func _func = ((const mapi_func *) _tbl)[742];
    ((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)[738];
+   mapi_func _func = ((const mapi_func *) _tbl)[742];
    ((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)[739];
+   mapi_func _func = ((const mapi_func *) _tbl)[743];
    ((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)[739];
+   mapi_func _func = ((const mapi_func *) _tbl)[743];
    ((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)[740];
+   mapi_func _func = ((const mapi_func *) _tbl)[744];
    ((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)[740];
+   mapi_func _func = ((const mapi_func *) _tbl)[744];
    ((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)[741];
+   mapi_func _func = ((const mapi_func *) _tbl)[745];
    ((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)[741];
+   mapi_func _func = ((const mapi_func *) _tbl)[745];
    ((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)[742];
+   mapi_func _func = ((const mapi_func *) _tbl)[746];
    ((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)[742];
+   mapi_func _func = ((const mapi_func *) _tbl)[746];
    ((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)[743];
+   mapi_func _func = ((const mapi_func *) _tbl)[747];
    ((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)[743];
+   mapi_func _func = ((const mapi_func *) _tbl)[747];
    ((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)[744];
+   mapi_func _func = ((const mapi_func *) _tbl)[748];
    ((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)[744];
+   mapi_func _func = ((const mapi_func *) _tbl)[748];
    ((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)[745];
+   mapi_func _func = ((const mapi_func *) _tbl)[749];
    ((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)[745];
+   mapi_func _func = ((const mapi_func *) _tbl)[749];
    ((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)[746];
+   mapi_func _func = ((const mapi_func *) _tbl)[750];
    ((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)[746];
+   mapi_func _func = ((const mapi_func *) _tbl)[750];
    ((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)[748];
+   mapi_func _func = ((const mapi_func *) _tbl)[752];
    ((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)[748];
+   mapi_func _func = ((const mapi_func *) _tbl)[752];
    ((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)[749];
+   mapi_func _func = ((const mapi_func *) _tbl)[753];
    ((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)[750];
+   mapi_func _func = ((const mapi_func *) _tbl)[754];
    ((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)[751];
+   mapi_func _func = ((const mapi_func *) _tbl)[755];
    ((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)[752];
+   mapi_func _func = ((const mapi_func *) _tbl)[756];
    ((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)[753];
+   mapi_func _func = ((const mapi_func *) _tbl)[757];
    ((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)[754];
+   mapi_func _func = ((const mapi_func *) _tbl)[758];
    ((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)[755];
+   mapi_func _func = ((const mapi_func *) _tbl)[759];
    ((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)[756];
+   mapi_func _func = ((const mapi_func *) _tbl)[760];
    ((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)[757];
+   mapi_func _func = ((const mapi_func *) _tbl)[761];
    ((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)[758];
+   mapi_func _func = ((const mapi_func *) _tbl)[762];
    ((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)[759];
+   mapi_func _func = ((const mapi_func *) _tbl)[763];
    ((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)[760];
+   mapi_func _func = ((const mapi_func *) _tbl)[764];
    ((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)[761];
+   mapi_func _func = ((const mapi_func *) _tbl)[765];
    ((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)[762];
+   mapi_func _func = ((const mapi_func *) _tbl)[766];
    ((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)[763];
+   mapi_func _func = ((const mapi_func *) _tbl)[767];
    ((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)[764];
+   mapi_func _func = ((const mapi_func *) _tbl)[768];
    ((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)[765];
+   mapi_func _func = ((const mapi_func *) _tbl)[769];
    ((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)[765];
+   mapi_func _func = ((const mapi_func *) _tbl)[769];
    ((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)[765];
+   mapi_func _func = ((const mapi_func *) _tbl)[769];
    ((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)[766];
+   mapi_func _func = ((const mapi_func *) _tbl)[770];
    ((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)[766];
+   mapi_func _func = ((const mapi_func *) _tbl)[770];
    ((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)[766];
+   mapi_func _func = ((const mapi_func *) _tbl)[770];
    ((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)[767];
+   mapi_func _func = ((const mapi_func *) _tbl)[771];
    ((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)[767];
+   mapi_func _func = ((const mapi_func *) _tbl)[771];
    ((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)[767];
+   mapi_func _func = ((const mapi_func *) _tbl)[771];
    ((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)[768];
+   mapi_func _func = ((const mapi_func *) _tbl)[772];
    ((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)[768];
+   mapi_func _func = ((const mapi_func *) _tbl)[772];
    ((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)[768];
+   mapi_func _func = ((const mapi_func *) _tbl)[772];
    ((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)[769];
+   mapi_func _func = ((const mapi_func *) _tbl)[773];
    ((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)[769];
+   mapi_func _func = ((const mapi_func *) _tbl)[773];
    ((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)[769];
+   mapi_func _func = ((const mapi_func *) _tbl)[773];
    ((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)[770];
+   mapi_func _func = ((const mapi_func *) _tbl)[774];
    ((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)[770];
+   mapi_func _func = ((const mapi_func *) _tbl)[774];
    ((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)[770];
+   mapi_func _func = ((const mapi_func *) _tbl)[774];
    ((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)[771];
+   mapi_func _func = ((const mapi_func *) _tbl)[775];
    ((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)[771];
+   mapi_func _func = ((const mapi_func *) _tbl)[775];
    ((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)[771];
+   mapi_func _func = ((const mapi_func *) _tbl)[775];
    ((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)[772];
+   mapi_func _func = ((const mapi_func *) _tbl)[776];
    ((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)[772];
+   mapi_func _func = ((const mapi_func *) _tbl)[776];
    ((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)[772];
+   mapi_func _func = ((const mapi_func *) _tbl)[776];
    ((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)[773];
+   mapi_func _func = ((const mapi_func *) _tbl)[777];
    ((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)[773];
+   mapi_func _func = ((const mapi_func *) _tbl)[777];
    ((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)[773];
+   mapi_func _func = ((const mapi_func *) _tbl)[777];
    ((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)[774];
+   mapi_func _func = ((const mapi_func *) _tbl)[778];
    ((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)[774];
+   mapi_func _func = ((const mapi_func *) _tbl)[778];
    ((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)[774];
+   mapi_func _func = ((const mapi_func *) _tbl)[778];
    ((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)[775];
+   mapi_func _func = ((const mapi_func *) _tbl)[779];
    ((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)[775];
+   mapi_func _func = ((const mapi_func *) _tbl)[779];
    ((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)[775];
+   mapi_func _func = ((const mapi_func *) _tbl)[779];
    ((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)[776];
+   mapi_func _func = ((const mapi_func *) _tbl)[780];
    ((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)[776];
+   mapi_func _func = ((const mapi_func *) _tbl)[780];
    ((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)[776];
+   mapi_func _func = ((const mapi_func *) _tbl)[780];
    ((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)[777];
+   mapi_func _func = ((const mapi_func *) _tbl)[781];
    ((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)[777];
+   mapi_func _func = ((const mapi_func *) _tbl)[781];
    ((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)[777];
+   mapi_func _func = ((const mapi_func *) _tbl)[781];
    ((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)[778];
+   mapi_func _func = ((const mapi_func *) _tbl)[782];
    ((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)[778];
+   mapi_func _func = ((const mapi_func *) _tbl)[782];
    ((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)[778];
+   mapi_func _func = ((const mapi_func *) _tbl)[782];
    ((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)[779];
+   mapi_func _func = ((const mapi_func *) _tbl)[783];
    ((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)[779];
+   mapi_func _func = ((const mapi_func *) _tbl)[783];
    ((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)[779];
+   mapi_func _func = ((const mapi_func *) _tbl)[783];
    ((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)[780];
+   mapi_func _func = ((const mapi_func *) _tbl)[784];
    ((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)[780];
+   mapi_func _func = ((const mapi_func *) _tbl)[784];
    ((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)[780];
+   mapi_func _func = ((const mapi_func *) _tbl)[784];
    ((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)[781];
+   mapi_func _func = ((const mapi_func *) _tbl)[785];
    ((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)[782];
+   mapi_func _func = ((const mapi_func *) _tbl)[786];
    ((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)[783];
+   mapi_func _func = ((const mapi_func *) _tbl)[787];
    ((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)[784];
+   mapi_func _func = ((const mapi_func *) _tbl)[788];
    ((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)[785];
+   mapi_func _func = ((const mapi_func *) _tbl)[789];
    ((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)[786];
+   mapi_func _func = ((const mapi_func *) _tbl)[790];
    ((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)[787];
+   mapi_func _func = ((const mapi_func *) _tbl)[791];
    ((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)[788];
+   mapi_func _func = ((const mapi_func *) _tbl)[792];
    ((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)[798];
+   mapi_func _func = ((const mapi_func *) _tbl)[802];
    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)[799];
+   mapi_func _func = ((const mapi_func *) _tbl)[803];
    ((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)[799];
+   mapi_func _func = ((const mapi_func *) _tbl)[803];
    ((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)[800];
+   mapi_func _func = ((const mapi_func *) _tbl)[804];
    ((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)[800];
+   mapi_func _func = ((const mapi_func *) _tbl)[804];
    ((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)[801];
+   mapi_func _func = ((const mapi_func *) _tbl)[805];
    ((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)[802];
+   mapi_func _func = ((const mapi_func *) _tbl)[806];
    ((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)[802];
+   mapi_func _func = ((const mapi_func *) _tbl)[806];
    ((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)[803];
+   mapi_func _func = ((const mapi_func *) _tbl)[807];
    ((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)[804];
+   mapi_func _func = ((const mapi_func *) _tbl)[808];
    ((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)[805];
+   mapi_func _func = ((const mapi_func *) _tbl)[809];
    ((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)[806];
+   mapi_func _func = ((const mapi_func *) _tbl)[810];
    ((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)[807];
+   mapi_func _func = ((const mapi_func *) _tbl)[811];
    ((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)[808];
+   mapi_func _func = ((const mapi_func *) _tbl)[812];
    ((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)[808];
+   mapi_func _func = ((const mapi_func *) _tbl)[812];
    ((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)[808];
+   mapi_func _func = ((const mapi_func *) _tbl)[812];
    ((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)[809];
+   mapi_func _func = ((const mapi_func *) _tbl)[813];
    ((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)[810];
+   mapi_func _func = ((const mapi_func *) _tbl)[814];
    ((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)[811];
+   mapi_func _func = ((const mapi_func *) _tbl)[815];
    ((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)[812];
+   mapi_func _func = ((const mapi_func *) _tbl)[816];
    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)[812];
+   mapi_func _func = ((const mapi_func *) _tbl)[816];
    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)[813];
+   mapi_func _func = ((const mapi_func *) _tbl)[817];
    ((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)[814];
+   mapi_func _func = ((const mapi_func *) _tbl)[818];
    ((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)[815];
+   mapi_func _func = ((const mapi_func *) _tbl)[819];
    ((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)[816];
+   mapi_func _func = ((const mapi_func *) _tbl)[820];
    ((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)[817];
+   mapi_func _func = ((const mapi_func *) _tbl)[821];
    ((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)[818];
+   mapi_func _func = ((const mapi_func *) _tbl)[822];
    ((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)[819];
+   mapi_func _func = ((const mapi_func *) _tbl)[823];
    ((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)[820];
+   mapi_func _func = ((const mapi_func *) _tbl)[824];
    ((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)[821];
+   mapi_func _func = ((const mapi_func *) _tbl)[825];
    ((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)[822];
+   mapi_func _func = ((const mapi_func *) _tbl)[826];
    ((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)[823];
+   mapi_func _func = ((const mapi_func *) _tbl)[827];
    ((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)[824];
+   mapi_func _func = ((const mapi_func *) _tbl)[828];
    ((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)[825];
+   mapi_func _func = ((const mapi_func *) _tbl)[829];
    ((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)[826];
+   mapi_func _func = ((const mapi_func *) _tbl)[830];
    ((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)[827];
+   mapi_func _func = ((const mapi_func *) _tbl)[831];
    ((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)[828];
+   mapi_func _func = ((const mapi_func *) _tbl)[832];
    ((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)[829];
+   mapi_func _func = ((const mapi_func *) _tbl)[833];
    ((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)[830];
+   mapi_func _func = ((const mapi_func *) _tbl)[834];
    ((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)[831];
+   mapi_func _func = ((const mapi_func *) _tbl)[835];
    ((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)[832];
+   mapi_func _func = ((const mapi_func *) _tbl)[836];
    ((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)[833];
+   mapi_func _func = ((const mapi_func *) _tbl)[837];
    ((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)[834];
+   mapi_func _func = ((const mapi_func *) _tbl)[838];
    ((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)[835];
+   mapi_func _func = ((const mapi_func *) _tbl)[839];
    ((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)[836];
+   mapi_func _func = ((const mapi_func *) _tbl)[840];
    ((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)[837];
+   mapi_func _func = ((const mapi_func *) _tbl)[841];
    ((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)[838];
+   mapi_func _func = ((const mapi_func *) _tbl)[842];
    ((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)[839];
+   mapi_func _func = ((const mapi_func *) _tbl)[843];
    ((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)[840];
+   mapi_func _func = ((const mapi_func *) _tbl)[844];
    ((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)[841];
+   mapi_func _func = ((const mapi_func *) _tbl)[845];
    ((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)[842];
+   mapi_func _func = ((const mapi_func *) _tbl)[846];
    ((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)[843];
+   mapi_func _func = ((const mapi_func *) _tbl)[847];
    ((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)[844];
+   mapi_func _func = ((const mapi_func *) _tbl)[848];
    ((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)[845];
+   mapi_func _func = ((const mapi_func *) _tbl)[849];
    ((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)[846];
+   mapi_func _func = ((const mapi_func *) _tbl)[850];
    ((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)[847];
+   mapi_func _func = ((const mapi_func *) _tbl)[851];
    ((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)[848];
+   mapi_func _func = ((const mapi_func *) _tbl)[852];
    ((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)[849];
+   mapi_func _func = ((const mapi_func *) _tbl)[853];
    ((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)[850];
+   mapi_func _func = ((const mapi_func *) _tbl)[854];
    ((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)[851];
+   mapi_func _func = ((const mapi_func *) _tbl)[855];
    ((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)[852];
+   mapi_func _func = ((const mapi_func *) _tbl)[856];
    ((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)[853];
+   mapi_func _func = ((const mapi_func *) _tbl)[857];
    ((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)[854];
+   mapi_func _func = ((const mapi_func *) _tbl)[858];
    ((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)[855];
+   mapi_func _func = ((const mapi_func *) _tbl)[859];
    ((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)[856];
+   mapi_func _func = ((const mapi_func *) _tbl)[860];
    ((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)[857];
+   mapi_func _func = ((const mapi_func *) _tbl)[861];
    ((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)[858];
+   mapi_func _func = ((const mapi_func *) _tbl)[862];
    ((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)[859];
+   mapi_func _func = ((const mapi_func *) _tbl)[863];
    ((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)[860];
+   mapi_func _func = ((const mapi_func *) _tbl)[864];
    ((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)[861];
+   mapi_func _func = ((const mapi_func *) _tbl)[865];
    ((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)[862];
+   mapi_func _func = ((const mapi_func *) _tbl)[866];
    ((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)[863];
+   mapi_func _func = ((const mapi_func *) _tbl)[867];
    ((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)[864];
+   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, 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)[865];
+   mapi_func _func = ((const mapi_func *) _tbl)[869];
    ((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)[866];
+   mapi_func _func = ((const mapi_func *) _tbl)[870];
    ((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)[867];
+   mapi_func _func = ((const mapi_func *) _tbl)[871];
    ((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)[868];
+   mapi_func _func = ((const mapi_func *) _tbl)[872];
    ((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)[869];
+   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, 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)[870];
+   mapi_func _func = ((const mapi_func *) _tbl)[874];
    ((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)[871];
+   mapi_func _func = ((const mapi_func *) _tbl)[875];
    ((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)[872];
+   mapi_func _func = ((const mapi_func *) _tbl)[876];
    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)[873];
+   mapi_func _func = ((const mapi_func *) _tbl)[877];
    ((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)[874];
+   mapi_func _func = ((const mapi_func *) _tbl)[878];
    ((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)[875];
+   mapi_func _func = ((const mapi_func *) _tbl)[879];
    ((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)[876];
+   mapi_func _func = ((const mapi_func *) _tbl)[880];
    ((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)[876];
+   mapi_func _func = ((const mapi_func *) _tbl)[880];
    ((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)[877];
+   mapi_func _func = ((const mapi_func *) _tbl)[881];
    ((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)[877];
+   mapi_func _func = ((const mapi_func *) _tbl)[881];
    ((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)[880];
+   mapi_func _func = ((const mapi_func *) _tbl)[884];
    ((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)[882];
+   mapi_func _func = ((const mapi_func *) _tbl)[886];
    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)[883];
+   mapi_func _func = ((const mapi_func *) _tbl)[887];
    ((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)[884];
+   mapi_func _func = ((const mapi_func *) _tbl)[888];
    ((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)[885];
+   mapi_func _func = ((const mapi_func *) _tbl)[889];
    ((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)[886];
+   mapi_func _func = ((const mapi_func *) _tbl)[890];
    ((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)[887];
+   mapi_func _func = ((const mapi_func *) _tbl)[891];
    ((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)[888];
+   mapi_func _func = ((const mapi_func *) _tbl)[892];
    ((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)[889];
+   mapi_func _func = ((const mapi_func *) _tbl)[893];
    ((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)[889];
+   mapi_func _func = ((const mapi_func *) _tbl)[893];
    ((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)[890];
+   mapi_func _func = ((const mapi_func *) _tbl)[894];
    ((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)[938];
+   mapi_func _func = ((const mapi_func *) _tbl)[942];
    ((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)[939];
+   mapi_func _func = ((const mapi_func *) _tbl)[943];
    ((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)[939];
+   mapi_func _func = ((const mapi_func *) _tbl)[943];
    ((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)[940];
+   mapi_func _func = ((const mapi_func *) _tbl)[944];
    ((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)[940];
+   mapi_func _func = ((const mapi_func *) _tbl)[944];
    ((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)[941];
+   mapi_func _func = ((const mapi_func *) _tbl)[945];
    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)[941];
+   mapi_func _func = ((const mapi_func *) _tbl)[945];
    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)[942];
+   mapi_func _func = ((const mapi_func *) _tbl)[946];
    ((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)[942];
+   mapi_func _func = ((const mapi_func *) _tbl)[946];
    ((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)[943];
+   mapi_func _func = ((const mapi_func *) _tbl)[947];
    ((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)[943];
+   mapi_func _func = ((const mapi_func *) _tbl)[947];
    ((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)[944];
+   mapi_func _func = ((const mapi_func *) _tbl)[948];
    ((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)[944];
+   mapi_func _func = ((const mapi_func *) _tbl)[948];
    ((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)[945];
+   mapi_func _func = ((const mapi_func *) _tbl)[949];
    ((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)[945];
+   mapi_func _func = ((const mapi_func *) _tbl)[949];
    ((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)[946];
+   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(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)[946];
+   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(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)[947];
+   mapi_func _func = ((const mapi_func *) _tbl)[951];
    ((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)[947];
+   mapi_func _func = ((const mapi_func *) _tbl)[951];
    ((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)[948];
+   mapi_func _func = ((const mapi_func *) _tbl)[952];
    ((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)[948];
+   mapi_func _func = ((const mapi_func *) _tbl)[952];
    ((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)[949];
+   mapi_func _func = ((const mapi_func *) _tbl)[953];
    ((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)[949];
+   mapi_func _func = ((const mapi_func *) _tbl)[953];
    ((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)[950];
+   mapi_func _func = ((const mapi_func *) _tbl)[954];
    ((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)[950];
+   mapi_func _func = ((const mapi_func *) _tbl)[954];
    ((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)[951];
+   mapi_func _func = ((const mapi_func *) _tbl)[955];
    ((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)[951];
+   mapi_func _func = ((const mapi_func *) _tbl)[955];
    ((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)[952];
+   mapi_func _func = ((const mapi_func *) _tbl)[956];
    ((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)[952];
+   mapi_func _func = ((const mapi_func *) _tbl)[956];
    ((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)[953];
+   mapi_func _func = ((const mapi_func *) _tbl)[957];
    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)[953];
+   mapi_func _func = ((const mapi_func *) _tbl)[957];
    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)[954];
+   mapi_func _func = ((const mapi_func *) _tbl)[958];
    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)[954];
+   mapi_func _func = ((const mapi_func *) _tbl)[958];
    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)[955];
+   mapi_func _func = ((const mapi_func *) _tbl)[959];
    ((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)[955];
+   mapi_func _func = ((const mapi_func *) _tbl)[959];
    ((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)[956];
+   mapi_func _func = ((const mapi_func *) _tbl)[960];
    ((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)[959];
+   mapi_func _func = ((const mapi_func *) _tbl)[963];
    ((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)[959];
+   mapi_func _func = ((const mapi_func *) _tbl)[963];
    ((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)[960];
+   mapi_func _func = ((const mapi_func *) _tbl)[964];
    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)[960];
+   mapi_func _func = ((const mapi_func *) _tbl)[964];
    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)[961];
+   mapi_func _func = ((const mapi_func *) _tbl)[965];
    ((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)[961];
+   mapi_func _func = ((const mapi_func *) _tbl)[965];
    ((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)[962];
+   mapi_func _func = ((const mapi_func *) _tbl)[966];
    ((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)[962];
+   mapi_func _func = ((const mapi_func *) _tbl)[966];
    ((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)[963];
+   mapi_func _func = ((const mapi_func *) _tbl)[967];
    ((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)[963];
+   mapi_func _func = ((const mapi_func *) _tbl)[967];
    ((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)[964];
+   mapi_func _func = ((const mapi_func *) _tbl)[968];
    ((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)[964];
+   mapi_func _func = ((const mapi_func *) _tbl)[968];
    ((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)[965];
+   mapi_func _func = ((const mapi_func *) _tbl)[969];
    ((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)[965];
+   mapi_func _func = ((const mapi_func *) _tbl)[969];
    ((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)[966];
+   mapi_func _func = ((const mapi_func *) _tbl)[970];
    ((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)[966];
+   mapi_func _func = ((const mapi_func *) _tbl)[970];
    ((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)[967];
+   mapi_func _func = ((const mapi_func *) _tbl)[971];
    ((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)[967];
+   mapi_func _func = ((const mapi_func *) _tbl)[971];
    ((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)[968];
+   mapi_func _func = ((const mapi_func *) _tbl)[972];
    ((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)[968];
+   mapi_func _func = ((const mapi_func *) _tbl)[972];
    ((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)[969];
+   mapi_func _func = ((const mapi_func *) _tbl)[973];
    ((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)[969];
+   mapi_func _func = ((const mapi_func *) _tbl)[973];
    ((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)[970];
+   mapi_func _func = ((const mapi_func *) _tbl)[974];
    ((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)[970];
+   mapi_func _func = ((const mapi_func *) _tbl)[974];
    ((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)[971];
+   mapi_func _func = ((const mapi_func *) _tbl)[975];
    ((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)[971];
+   mapi_func _func = ((const mapi_func *) _tbl)[975];
    ((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)[972];
+   mapi_func _func = ((const mapi_func *) _tbl)[976];
    ((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)[972];
+   mapi_func _func = ((const mapi_func *) _tbl)[976];
    ((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)[973];
+   mapi_func _func = ((const mapi_func *) _tbl)[977];
    ((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)[973];
+   mapi_func _func = ((const mapi_func *) _tbl)[977];
    ((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)[974];
+   mapi_func _func = ((const mapi_func *) _tbl)[978];
    ((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)[974];
+   mapi_func _func = ((const mapi_func *) _tbl)[978];
    ((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)[975];
+   mapi_func _func = ((const mapi_func *) _tbl)[979];
    ((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)[975];
+   mapi_func _func = ((const mapi_func *) _tbl)[979];
    ((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)[976];
+   mapi_func _func = ((const mapi_func *) _tbl)[980];
    ((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)[976];
+   mapi_func _func = ((const mapi_func *) _tbl)[980];
    ((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)[977];
+   mapi_func _func = ((const mapi_func *) _tbl)[981];
    ((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)[977];
+   mapi_func _func = ((const mapi_func *) _tbl)[981];
    ((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)[978];
+   mapi_func _func = ((const mapi_func *) _tbl)[982];
    ((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)[978];
+   mapi_func _func = ((const mapi_func *) _tbl)[982];
    ((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)[979];
+   mapi_func _func = ((const mapi_func *) _tbl)[983];
    ((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)[979];
+   mapi_func _func = ((const mapi_func *) _tbl)[983];
    ((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)[980];
+   mapi_func _func = ((const mapi_func *) _tbl)[984];
    ((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)[980];
+   mapi_func _func = ((const mapi_func *) _tbl)[984];
    ((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)[981];
+   mapi_func _func = ((const mapi_func *) _tbl)[985];
    ((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)[981];
+   mapi_func _func = ((const mapi_func *) _tbl)[985];
    ((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)[982];
+   mapi_func _func = ((const mapi_func *) _tbl)[986];
    ((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)[982];
+   mapi_func _func = ((const mapi_func *) _tbl)[986];
    ((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)[983];
+   mapi_func _func = ((const mapi_func *) _tbl)[987];
    ((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)[983];
+   mapi_func _func = ((const mapi_func *) _tbl)[987];
    ((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)[984];
+   mapi_func _func = ((const mapi_func *) _tbl)[988];
    ((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)[984];
+   mapi_func _func = ((const mapi_func *) _tbl)[988];
    ((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)[985];
+   mapi_func _func = ((const mapi_func *) _tbl)[989];
    ((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)[985];
+   mapi_func _func = ((const mapi_func *) _tbl)[989];
    ((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)[986];
+   mapi_func _func = ((const mapi_func *) _tbl)[990];
    ((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)[986];
+   mapi_func _func = ((const mapi_func *) _tbl)[990];
    ((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)[987];
+   mapi_func _func = ((const mapi_func *) _tbl)[991];
    ((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)[987];
+   mapi_func _func = ((const mapi_func *) _tbl)[991];
    ((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)[988];
+   mapi_func _func = ((const mapi_func *) _tbl)[992];
    ((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)[988];
+   mapi_func _func = ((const mapi_func *) _tbl)[992];
    ((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)[989];
+   mapi_func _func = ((const mapi_func *) _tbl)[993];
    ((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)[989];
+   mapi_func _func = ((const mapi_func *) _tbl)[993];
    ((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)[990];
+   mapi_func _func = ((const mapi_func *) _tbl)[994];
    ((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)[990];
+   mapi_func _func = ((const mapi_func *) _tbl)[994];
    ((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)[991];
+   mapi_func _func = ((const mapi_func *) _tbl)[995];
    ((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)[991];
+   mapi_func _func = ((const mapi_func *) _tbl)[995];
    ((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)[992];
+   mapi_func _func = ((const mapi_func *) _tbl)[996];
    ((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)[992];
+   mapi_func _func = ((const mapi_func *) _tbl)[996];
    ((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)[993];
+   mapi_func _func = ((const mapi_func *) _tbl)[997];
    ((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)[993];
+   mapi_func _func = ((const mapi_func *) _tbl)[997];
    ((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)[993];
+   mapi_func _func = ((const mapi_func *) _tbl)[997];
    ((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)[994];
+   mapi_func _func = ((const mapi_func *) _tbl)[998];
    ((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)[994];
+   mapi_func _func = ((const mapi_func *) _tbl)[998];
    ((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)[995];
+   mapi_func _func = ((const mapi_func *) _tbl)[999];
    ((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)[995];
+   mapi_func _func = ((const mapi_func *) _tbl)[999];
    ((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)[996];
+   mapi_func _func = ((const mapi_func *) _tbl)[1000];
    ((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)[996];
+   mapi_func _func = ((const mapi_func *) _tbl)[1000];
    ((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)[997];
+   mapi_func _func = ((const mapi_func *) _tbl)[1001];
    ((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)[997];
+   mapi_func _func = ((const mapi_func *) _tbl)[1001];
    ((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)[998];
+   mapi_func _func = ((const mapi_func *) _tbl)[1002];
    ((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)[998];
+   mapi_func _func = ((const mapi_func *) _tbl)[1002];
    ((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)[999];
+   mapi_func _func = ((const mapi_func *) _tbl)[1003];
    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)[999];
+   mapi_func _func = ((const mapi_func *) _tbl)[1003];
    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)[1000];
+   mapi_func _func = ((const mapi_func *) _tbl)[1004];
    ((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)[1001];
+   mapi_func _func = ((const mapi_func *) _tbl)[1005];
    ((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)[1002];
+   mapi_func _func = ((const mapi_func *) _tbl)[1006];
    ((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)[1002];
+   mapi_func _func = ((const mapi_func *) _tbl)[1006];
    ((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)[1003];
+   mapi_func _func = ((const mapi_func *) _tbl)[1007];
    ((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)[1003];
+   mapi_func _func = ((const mapi_func *) _tbl)[1007];
    ((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)[1004];
+   mapi_func _func = ((const mapi_func *) _tbl)[1008];
    ((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)[1004];
+   mapi_func _func = ((const mapi_func *) _tbl)[1008];
    ((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)[1005];
+   mapi_func _func = ((const mapi_func *) _tbl)[1009];
    ((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)[1005];
+   mapi_func _func = ((const mapi_func *) _tbl)[1009];
    ((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)[1006];
+   mapi_func _func = ((const mapi_func *) _tbl)[1010];
    ((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)[1006];
+   mapi_func _func = ((const mapi_func *) _tbl)[1010];
    ((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)[1007];
+   mapi_func _func = ((const mapi_func *) _tbl)[1011];
    ((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)[1007];
+   mapi_func _func = ((const mapi_func *) _tbl)[1011];
    ((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)[1008];
+   mapi_func _func = ((const mapi_func *) _tbl)[1012];
    ((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)[1008];
+   mapi_func _func = ((const mapi_func *) _tbl)[1012];
    ((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)[1009];
+   mapi_func _func = ((const mapi_func *) _tbl)[1013];
    ((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)[1009];
+   mapi_func _func = ((const mapi_func *) _tbl)[1013];
    ((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)[1010];
+   mapi_func _func = ((const mapi_func *) _tbl)[1014];
    ((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)[1011];
+   mapi_func _func = ((const mapi_func *) _tbl)[1015];
    ((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)[1011];
+   mapi_func _func = ((const mapi_func *) _tbl)[1015];
    ((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)[1012];
+   mapi_func _func = ((const mapi_func *) _tbl)[1016];
    ((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)[1012];
+   mapi_func _func = ((const mapi_func *) _tbl)[1016];
    ((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)[1013];
+   mapi_func _func = ((const mapi_func *) _tbl)[1017];
    ((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)[1013];
+   mapi_func _func = ((const mapi_func *) _tbl)[1017];
    ((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)[1014];
+   mapi_func _func = ((const mapi_func *) _tbl)[1018];
    ((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)[1014];
+   mapi_func _func = ((const mapi_func *) _tbl)[1018];
    ((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)[1015];
+   mapi_func _func = ((const mapi_func *) _tbl)[1019];
    ((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)[1015];
+   mapi_func _func = ((const mapi_func *) _tbl)[1019];
    ((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)[1018];
+   mapi_func _func = ((const mapi_func *) _tbl)[1022];
    ((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)[1019];
+   mapi_func _func = ((const mapi_func *) _tbl)[1023];
    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)[1020];
+   mapi_func _func = ((const mapi_func *) _tbl)[1024];
    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)[1021];
+   mapi_func _func = ((const mapi_func *) _tbl)[1025];
    ((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)[1022];
+   mapi_func _func = ((const mapi_func *) _tbl)[1026];
    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)[1023];
+   mapi_func _func = ((const mapi_func *) _tbl)[1027];
    ((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)[1024];
+   mapi_func _func = ((const mapi_func *) _tbl)[1028];
    ((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)[1030];
+   mapi_func _func = ((const mapi_func *) _tbl)[1034];
    ((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)[1031];
+   mapi_func _func = ((const mapi_func *) _tbl)[1035];
    ((void (APIENTRY *)(GLenum target, GLvoid *writeOffset)) _func)(target, writeOffset);
 }
 
@@ -12811,107 +12843,119 @@ STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ReleaseShaderCompiler))"\n"
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ShaderBinary))"\n"
 "\t"STUB_ASM_CODE("664")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetGraphicsResetStatusARB))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DebugMessageCallbackARB))"\n"
 "\t"STUB_ASM_CODE("668")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnColorTableARB))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DebugMessageControlARB))"\n"
 "\t"STUB_ASM_CODE("669")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnCompressedTexImageARB))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DebugMessageInsertARB))"\n"
 "\t"STUB_ASM_CODE("670")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnConvolutionFilterARB))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetDebugMessageLogARB))"\n"
 "\t"STUB_ASM_CODE("671")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnHistogramARB))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetGraphicsResetStatusARB))"\n"
 "\t"STUB_ASM_CODE("672")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnMapdvARB))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnColorTableARB))"\n"
 "\t"STUB_ASM_CODE("673")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnMapfvARB))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnCompressedTexImageARB))"\n"
 "\t"STUB_ASM_CODE("674")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnMapivARB))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnConvolutionFilterARB))"\n"
 "\t"STUB_ASM_CODE("675")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnMinmaxARB))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnHistogramARB))"\n"
 "\t"STUB_ASM_CODE("676")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnPixelMapfvARB))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnMapdvARB))"\n"
 "\t"STUB_ASM_CODE("677")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnPixelMapuivARB))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnMapfvARB))"\n"
 "\t"STUB_ASM_CODE("678")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnPixelMapusvARB))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnMapivARB))"\n"
 "\t"STUB_ASM_CODE("679")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnPolygonStippleARB))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnMinmaxARB))"\n"
 "\t"STUB_ASM_CODE("680")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnSeparableFilterARB))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnPixelMapfvARB))"\n"
 "\t"STUB_ASM_CODE("681")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnTexImageARB))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnPixelMapuivARB))"\n"
 "\t"STUB_ASM_CODE("682")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnUniformdvARB))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnPixelMapusvARB))"\n"
 "\t"STUB_ASM_CODE("683")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnUniformfvARB))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnPolygonStippleARB))"\n"
 "\t"STUB_ASM_CODE("684")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnUniformivARB))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnSeparableFilterARB))"\n"
 "\t"STUB_ASM_CODE("685")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnUniformuivARB))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnTexImageARB))"\n"
 "\t"STUB_ASM_CODE("686")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ReadnPixelsARB))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnUniformdvARB))"\n"
 "\t"STUB_ASM_CODE("687")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexStorage1D))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnUniformfvARB))"\n"
 "\t"STUB_ASM_CODE("688")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexStorage2D))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnUniformivARB))"\n"
 "\t"STUB_ASM_CODE("689")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexStorage3D))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetnUniformuivARB))"\n"
 "\t"STUB_ASM_CODE("690")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TextureStorage1DEXT))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ReadnPixelsARB))"\n"
 "\t"STUB_ASM_CODE("691")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TextureStorage2DEXT))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexStorage1D))"\n"
 "\t"STUB_ASM_CODE("692")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TextureStorage3DEXT))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexStorage2D))"\n"
 "\t"STUB_ASM_CODE("693")"\n"
 
-STUB_ASM_ENTRY(GLAPI_PREFIX_STR(PolygonOffsetEXT))"\n"
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexStorage3D))"\n"
 "\t"STUB_ASM_CODE("694")"\n"
 
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TextureStorage1DEXT))"\n"
+"\t"STUB_ASM_CODE("695")"\n"
+
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TextureStorage2DEXT))"\n"
+"\t"STUB_ASM_CODE("696")"\n"
+
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TextureStorage3DEXT))"\n"
+"\t"STUB_ASM_CODE("697")"\n"
+
+STUB_ASM_ENTRY(GLAPI_PREFIX_STR(PolygonOffsetEXT))"\n"
+"\t"STUB_ASM_CODE("698")"\n"
+
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ColorPointerEXT))"\n"
-"\t"STUB_ASM_CODE("713")"\n"
+"\t"STUB_ASM_CODE("717")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(EdgeFlagPointerEXT))"\n"
-"\t"STUB_ASM_CODE("714")"\n"
+"\t"STUB_ASM_CODE("718")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(IndexPointerEXT))"\n"
-"\t"STUB_ASM_CODE("715")"\n"
+"\t"STUB_ASM_CODE("719")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(NormalPointerEXT))"\n"
-"\t"STUB_ASM_CODE("716")"\n"
+"\t"STUB_ASM_CODE("720")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexCoordPointerEXT))"\n"
-"\t"STUB_ASM_CODE("717")"\n"
+"\t"STUB_ASM_CODE("721")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexPointerEXT))"\n"
-"\t"STUB_ASM_CODE("718")"\n"
+"\t"STUB_ASM_CODE("722")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(PointParameterfEXT))"\n"
-"\t"STUB_ASM_CODE("719")"\n"
+"\t"STUB_ASM_CODE("723")"\n"
 
 ".globl "GLAPI_PREFIX_STR(PointParameterf)"\n"
 ".set "GLAPI_PREFIX_STR(PointParameterf)", "GLAPI_PREFIX_STR(PointParameterfEXT)"\n"
@@ -12920,7 +12964,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("720")"\n"
+"\t"STUB_ASM_CODE("724")"\n"
 
 ".globl "GLAPI_PREFIX_STR(PointParameterfv)"\n"
 ".set "GLAPI_PREFIX_STR(PointParameterfv)", "GLAPI_PREFIX_STR(PointParameterfvEXT)"\n"
@@ -12929,211 +12973,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("721")"\n"
+"\t"STUB_ASM_CODE("725")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(UnlockArraysEXT))"\n"
-"\t"STUB_ASM_CODE("722")"\n"
+"\t"STUB_ASM_CODE("726")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SecondaryColor3bEXT))"\n"
-"\t"STUB_ASM_CODE("723")"\n"
+"\t"STUB_ASM_CODE("727")"\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("724")"\n"
+"\t"STUB_ASM_CODE("728")"\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("725")"\n"
+"\t"STUB_ASM_CODE("729")"\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("726")"\n"
+"\t"STUB_ASM_CODE("730")"\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("727")"\n"
+"\t"STUB_ASM_CODE("731")"\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("728")"\n"
+"\t"STUB_ASM_CODE("732")"\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("729")"\n"
+"\t"STUB_ASM_CODE("733")"\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("730")"\n"
+"\t"STUB_ASM_CODE("734")"\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("731")"\n"
+"\t"STUB_ASM_CODE("735")"\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("732")"\n"
+"\t"STUB_ASM_CODE("736")"\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("733")"\n"
+"\t"STUB_ASM_CODE("737")"\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("734")"\n"
+"\t"STUB_ASM_CODE("738")"\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("735")"\n"
+"\t"STUB_ASM_CODE("739")"\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("736")"\n"
+"\t"STUB_ASM_CODE("740")"\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("737")"\n"
+"\t"STUB_ASM_CODE("741")"\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("738")"\n"
+"\t"STUB_ASM_CODE("742")"\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("739")"\n"
+"\t"STUB_ASM_CODE("743")"\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("740")"\n"
+"\t"STUB_ASM_CODE("744")"\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("741")"\n"
+"\t"STUB_ASM_CODE("745")"\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("742")"\n"
+"\t"STUB_ASM_CODE("746")"\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("743")"\n"
+"\t"STUB_ASM_CODE("747")"\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("744")"\n"
+"\t"STUB_ASM_CODE("748")"\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("745")"\n"
+"\t"STUB_ASM_CODE("749")"\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("746")"\n"
+"\t"STUB_ASM_CODE("750")"\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("748")"\n"
+"\t"STUB_ASM_CODE("752")"\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("749")"\n"
+"\t"STUB_ASM_CODE("753")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexArrayRangeNV))"\n"
-"\t"STUB_ASM_CODE("750")"\n"
+"\t"STUB_ASM_CODE("754")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(CombinerInputNV))"\n"
-"\t"STUB_ASM_CODE("751")"\n"
+"\t"STUB_ASM_CODE("755")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(CombinerOutputNV))"\n"
-"\t"STUB_ASM_CODE("752")"\n"
+"\t"STUB_ASM_CODE("756")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(CombinerParameterfNV))"\n"
-"\t"STUB_ASM_CODE("753")"\n"
+"\t"STUB_ASM_CODE("757")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(CombinerParameterfvNV))"\n"
-"\t"STUB_ASM_CODE("754")"\n"
+"\t"STUB_ASM_CODE("758")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(CombinerParameteriNV))"\n"
-"\t"STUB_ASM_CODE("755")"\n"
+"\t"STUB_ASM_CODE("759")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(CombinerParameterivNV))"\n"
-"\t"STUB_ASM_CODE("756")"\n"
+"\t"STUB_ASM_CODE("760")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(FinalCombinerInputNV))"\n"
-"\t"STUB_ASM_CODE("757")"\n"
+"\t"STUB_ASM_CODE("761")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetCombinerInputParameterfvNV))"\n"
-"\t"STUB_ASM_CODE("758")"\n"
+"\t"STUB_ASM_CODE("762")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetCombinerInputParameterivNV))"\n"
-"\t"STUB_ASM_CODE("759")"\n"
+"\t"STUB_ASM_CODE("763")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetCombinerOutputParameterfvNV))"\n"
-"\t"STUB_ASM_CODE("760")"\n"
+"\t"STUB_ASM_CODE("764")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetCombinerOutputParameterivNV))"\n"
-"\t"STUB_ASM_CODE("761")"\n"
+"\t"STUB_ASM_CODE("765")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetFinalCombinerInputParameterfvNV))"\n"
-"\t"STUB_ASM_CODE("762")"\n"
+"\t"STUB_ASM_CODE("766")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetFinalCombinerInputParameterivNV))"\n"
-"\t"STUB_ASM_CODE("763")"\n"
+"\t"STUB_ASM_CODE("767")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ResizeBuffersMESA))"\n"
-"\t"STUB_ASM_CODE("764")"\n"
+"\t"STUB_ASM_CODE("768")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos2dMESA))"\n"
-"\t"STUB_ASM_CODE("765")"\n"
+"\t"STUB_ASM_CODE("769")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos2d)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2d)", "GLAPI_PREFIX_STR(WindowPos2dMESA)"\n"
@@ -13142,7 +13186,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("766")"\n"
+"\t"STUB_ASM_CODE("770")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos2dv)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2dv)", "GLAPI_PREFIX_STR(WindowPos2dvMESA)"\n"
@@ -13151,7 +13195,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("767")"\n"
+"\t"STUB_ASM_CODE("771")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos2f)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2f)", "GLAPI_PREFIX_STR(WindowPos2fMESA)"\n"
@@ -13160,7 +13204,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("768")"\n"
+"\t"STUB_ASM_CODE("772")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos2fv)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2fv)", "GLAPI_PREFIX_STR(WindowPos2fvMESA)"\n"
@@ -13169,7 +13213,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("769")"\n"
+"\t"STUB_ASM_CODE("773")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos2i)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2i)", "GLAPI_PREFIX_STR(WindowPos2iMESA)"\n"
@@ -13178,7 +13222,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("770")"\n"
+"\t"STUB_ASM_CODE("774")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos2iv)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2iv)", "GLAPI_PREFIX_STR(WindowPos2ivMESA)"\n"
@@ -13187,7 +13231,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("771")"\n"
+"\t"STUB_ASM_CODE("775")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos2s)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2s)", "GLAPI_PREFIX_STR(WindowPos2sMESA)"\n"
@@ -13196,7 +13240,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("772")"\n"
+"\t"STUB_ASM_CODE("776")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos2sv)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos2sv)", "GLAPI_PREFIX_STR(WindowPos2svMESA)"\n"
@@ -13205,7 +13249,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("773")"\n"
+"\t"STUB_ASM_CODE("777")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos3d)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3d)", "GLAPI_PREFIX_STR(WindowPos3dMESA)"\n"
@@ -13214,7 +13258,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("774")"\n"
+"\t"STUB_ASM_CODE("778")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos3dv)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3dv)", "GLAPI_PREFIX_STR(WindowPos3dvMESA)"\n"
@@ -13223,7 +13267,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("775")"\n"
+"\t"STUB_ASM_CODE("779")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos3f)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3f)", "GLAPI_PREFIX_STR(WindowPos3fMESA)"\n"
@@ -13232,7 +13276,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("776")"\n"
+"\t"STUB_ASM_CODE("780")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos3fv)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3fv)", "GLAPI_PREFIX_STR(WindowPos3fvMESA)"\n"
@@ -13241,7 +13285,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("777")"\n"
+"\t"STUB_ASM_CODE("781")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos3i)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3i)", "GLAPI_PREFIX_STR(WindowPos3iMESA)"\n"
@@ -13250,7 +13294,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("778")"\n"
+"\t"STUB_ASM_CODE("782")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos3iv)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3iv)", "GLAPI_PREFIX_STR(WindowPos3ivMESA)"\n"
@@ -13259,7 +13303,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("779")"\n"
+"\t"STUB_ASM_CODE("783")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos3s)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3s)", "GLAPI_PREFIX_STR(WindowPos3sMESA)"\n"
@@ -13268,7 +13312,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("780")"\n"
+"\t"STUB_ASM_CODE("784")"\n"
 
 ".globl "GLAPI_PREFIX_STR(WindowPos3sv)"\n"
 ".set "GLAPI_PREFIX_STR(WindowPos3sv)", "GLAPI_PREFIX_STR(WindowPos3svMESA)"\n"
@@ -13277,70 +13321,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("781")"\n"
+"\t"STUB_ASM_CODE("785")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos4dvMESA))"\n"
-"\t"STUB_ASM_CODE("782")"\n"
+"\t"STUB_ASM_CODE("786")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos4fMESA))"\n"
-"\t"STUB_ASM_CODE("783")"\n"
+"\t"STUB_ASM_CODE("787")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos4fvMESA))"\n"
-"\t"STUB_ASM_CODE("784")"\n"
+"\t"STUB_ASM_CODE("788")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos4iMESA))"\n"
-"\t"STUB_ASM_CODE("785")"\n"
+"\t"STUB_ASM_CODE("789")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos4ivMESA))"\n"
-"\t"STUB_ASM_CODE("786")"\n"
+"\t"STUB_ASM_CODE("790")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos4sMESA))"\n"
-"\t"STUB_ASM_CODE("787")"\n"
+"\t"STUB_ASM_CODE("791")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(WindowPos4svMESA))"\n"
-"\t"STUB_ASM_CODE("788")"\n"
+"\t"STUB_ASM_CODE("792")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(AreProgramsResidentNV))"\n"
-"\t"STUB_ASM_CODE("798")"\n"
+"\t"STUB_ASM_CODE("802")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BindProgramNV))"\n"
-"\t"STUB_ASM_CODE("799")"\n"
+"\t"STUB_ASM_CODE("803")"\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("800")"\n"
+"\t"STUB_ASM_CODE("804")"\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("801")"\n"
+"\t"STUB_ASM_CODE("805")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GenProgramsNV))"\n"
-"\t"STUB_ASM_CODE("802")"\n"
+"\t"STUB_ASM_CODE("806")"\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("803")"\n"
+"\t"STUB_ASM_CODE("807")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetProgramParameterfvNV))"\n"
-"\t"STUB_ASM_CODE("804")"\n"
+"\t"STUB_ASM_CODE("808")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetProgramStringNV))"\n"
-"\t"STUB_ASM_CODE("805")"\n"
+"\t"STUB_ASM_CODE("809")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetProgramivNV))"\n"
-"\t"STUB_ASM_CODE("806")"\n"
+"\t"STUB_ASM_CODE("810")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetTrackMatrixivNV))"\n"
-"\t"STUB_ASM_CODE("807")"\n"
+"\t"STUB_ASM_CODE("811")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetVertexAttribPointervNV))"\n"
-"\t"STUB_ASM_CODE("808")"\n"
+"\t"STUB_ASM_CODE("812")"\n"
 
 ".globl "GLAPI_PREFIX_STR(GetVertexAttribPointerv)"\n"
 ".set "GLAPI_PREFIX_STR(GetVertexAttribPointerv)", "GLAPI_PREFIX_STR(GetVertexAttribPointervNV)"\n"
@@ -13349,568 +13393,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("809")"\n"
+"\t"STUB_ASM_CODE("813")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetVertexAttribfvNV))"\n"
-"\t"STUB_ASM_CODE("810")"\n"
+"\t"STUB_ASM_CODE("814")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetVertexAttribivNV))"\n"
-"\t"STUB_ASM_CODE("811")"\n"
+"\t"STUB_ASM_CODE("815")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(IsProgramNV))"\n"
-"\t"STUB_ASM_CODE("812")"\n"
+"\t"STUB_ASM_CODE("816")"\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("813")"\n"
+"\t"STUB_ASM_CODE("817")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ProgramParameters4dvNV))"\n"
-"\t"STUB_ASM_CODE("814")"\n"
+"\t"STUB_ASM_CODE("818")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ProgramParameters4fvNV))"\n"
-"\t"STUB_ASM_CODE("815")"\n"
+"\t"STUB_ASM_CODE("819")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(RequestResidentProgramsNV))"\n"
-"\t"STUB_ASM_CODE("816")"\n"
+"\t"STUB_ASM_CODE("820")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TrackMatrixNV))"\n"
-"\t"STUB_ASM_CODE("817")"\n"
+"\t"STUB_ASM_CODE("821")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib1dNV))"\n"
-"\t"STUB_ASM_CODE("818")"\n"
+"\t"STUB_ASM_CODE("822")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib1dvNV))"\n"
-"\t"STUB_ASM_CODE("819")"\n"
+"\t"STUB_ASM_CODE("823")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib1fNV))"\n"
-"\t"STUB_ASM_CODE("820")"\n"
+"\t"STUB_ASM_CODE("824")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib1fvNV))"\n"
-"\t"STUB_ASM_CODE("821")"\n"
+"\t"STUB_ASM_CODE("825")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib1sNV))"\n"
-"\t"STUB_ASM_CODE("822")"\n"
+"\t"STUB_ASM_CODE("826")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib1svNV))"\n"
-"\t"STUB_ASM_CODE("823")"\n"
+"\t"STUB_ASM_CODE("827")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib2dNV))"\n"
-"\t"STUB_ASM_CODE("824")"\n"
+"\t"STUB_ASM_CODE("828")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib2dvNV))"\n"
-"\t"STUB_ASM_CODE("825")"\n"
+"\t"STUB_ASM_CODE("829")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib2fNV))"\n"
-"\t"STUB_ASM_CODE("826")"\n"
+"\t"STUB_ASM_CODE("830")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib2fvNV))"\n"
-"\t"STUB_ASM_CODE("827")"\n"
+"\t"STUB_ASM_CODE("831")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib2sNV))"\n"
-"\t"STUB_ASM_CODE("828")"\n"
+"\t"STUB_ASM_CODE("832")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib2svNV))"\n"
-"\t"STUB_ASM_CODE("829")"\n"
+"\t"STUB_ASM_CODE("833")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib3dNV))"\n"
-"\t"STUB_ASM_CODE("830")"\n"
+"\t"STUB_ASM_CODE("834")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib3dvNV))"\n"
-"\t"STUB_ASM_CODE("831")"\n"
+"\t"STUB_ASM_CODE("835")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib3fNV))"\n"
-"\t"STUB_ASM_CODE("832")"\n"
+"\t"STUB_ASM_CODE("836")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib3fvNV))"\n"
-"\t"STUB_ASM_CODE("833")"\n"
+"\t"STUB_ASM_CODE("837")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib3sNV))"\n"
-"\t"STUB_ASM_CODE("834")"\n"
+"\t"STUB_ASM_CODE("838")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib3svNV))"\n"
-"\t"STUB_ASM_CODE("835")"\n"
+"\t"STUB_ASM_CODE("839")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib4dNV))"\n"
-"\t"STUB_ASM_CODE("836")"\n"
+"\t"STUB_ASM_CODE("840")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib4dvNV))"\n"
-"\t"STUB_ASM_CODE("837")"\n"
+"\t"STUB_ASM_CODE("841")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib4fNV))"\n"
-"\t"STUB_ASM_CODE("838")"\n"
+"\t"STUB_ASM_CODE("842")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib4fvNV))"\n"
-"\t"STUB_ASM_CODE("839")"\n"
+"\t"STUB_ASM_CODE("843")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib4sNV))"\n"
-"\t"STUB_ASM_CODE("840")"\n"
+"\t"STUB_ASM_CODE("844")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib4svNV))"\n"
-"\t"STUB_ASM_CODE("841")"\n"
+"\t"STUB_ASM_CODE("845")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib4ubNV))"\n"
-"\t"STUB_ASM_CODE("842")"\n"
+"\t"STUB_ASM_CODE("846")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttrib4ubvNV))"\n"
-"\t"STUB_ASM_CODE("843")"\n"
+"\t"STUB_ASM_CODE("847")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribPointerNV))"\n"
-"\t"STUB_ASM_CODE("844")"\n"
+"\t"STUB_ASM_CODE("848")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs1dvNV))"\n"
-"\t"STUB_ASM_CODE("845")"\n"
+"\t"STUB_ASM_CODE("849")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs1fvNV))"\n"
-"\t"STUB_ASM_CODE("846")"\n"
+"\t"STUB_ASM_CODE("850")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs1svNV))"\n"
-"\t"STUB_ASM_CODE("847")"\n"
+"\t"STUB_ASM_CODE("851")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs2dvNV))"\n"
-"\t"STUB_ASM_CODE("848")"\n"
+"\t"STUB_ASM_CODE("852")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs2fvNV))"\n"
-"\t"STUB_ASM_CODE("849")"\n"
+"\t"STUB_ASM_CODE("853")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs2svNV))"\n"
-"\t"STUB_ASM_CODE("850")"\n"
+"\t"STUB_ASM_CODE("854")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs3dvNV))"\n"
-"\t"STUB_ASM_CODE("851")"\n"
+"\t"STUB_ASM_CODE("855")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs3fvNV))"\n"
-"\t"STUB_ASM_CODE("852")"\n"
+"\t"STUB_ASM_CODE("856")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs3svNV))"\n"
-"\t"STUB_ASM_CODE("853")"\n"
+"\t"STUB_ASM_CODE("857")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs4dvNV))"\n"
-"\t"STUB_ASM_CODE("854")"\n"
+"\t"STUB_ASM_CODE("858")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs4fvNV))"\n"
-"\t"STUB_ASM_CODE("855")"\n"
+"\t"STUB_ASM_CODE("859")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs4svNV))"\n"
-"\t"STUB_ASM_CODE("856")"\n"
+"\t"STUB_ASM_CODE("860")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(VertexAttribs4ubvNV))"\n"
-"\t"STUB_ASM_CODE("857")"\n"
+"\t"STUB_ASM_CODE("861")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetTexBumpParameterfvATI))"\n"
-"\t"STUB_ASM_CODE("858")"\n"
+"\t"STUB_ASM_CODE("862")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetTexBumpParameterivATI))"\n"
-"\t"STUB_ASM_CODE("859")"\n"
+"\t"STUB_ASM_CODE("863")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexBumpParameterfvATI))"\n"
-"\t"STUB_ASM_CODE("860")"\n"
+"\t"STUB_ASM_CODE("864")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TexBumpParameterivATI))"\n"
-"\t"STUB_ASM_CODE("861")"\n"
+"\t"STUB_ASM_CODE("865")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(AlphaFragmentOp1ATI))"\n"
-"\t"STUB_ASM_CODE("862")"\n"
+"\t"STUB_ASM_CODE("866")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(AlphaFragmentOp2ATI))"\n"
-"\t"STUB_ASM_CODE("863")"\n"
+"\t"STUB_ASM_CODE("867")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(AlphaFragmentOp3ATI))"\n"
-"\t"STUB_ASM_CODE("864")"\n"
+"\t"STUB_ASM_CODE("868")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BeginFragmentShaderATI))"\n"
-"\t"STUB_ASM_CODE("865")"\n"
+"\t"STUB_ASM_CODE("869")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BindFragmentShaderATI))"\n"
-"\t"STUB_ASM_CODE("866")"\n"
+"\t"STUB_ASM_CODE("870")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ColorFragmentOp1ATI))"\n"
-"\t"STUB_ASM_CODE("867")"\n"
+"\t"STUB_ASM_CODE("871")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ColorFragmentOp2ATI))"\n"
-"\t"STUB_ASM_CODE("868")"\n"
+"\t"STUB_ASM_CODE("872")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ColorFragmentOp3ATI))"\n"
-"\t"STUB_ASM_CODE("869")"\n"
+"\t"STUB_ASM_CODE("873")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(DeleteFragmentShaderATI))"\n"
-"\t"STUB_ASM_CODE("870")"\n"
+"\t"STUB_ASM_CODE("874")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(EndFragmentShaderATI))"\n"
-"\t"STUB_ASM_CODE("871")"\n"
+"\t"STUB_ASM_CODE("875")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GenFragmentShadersATI))"\n"
-"\t"STUB_ASM_CODE("872")"\n"
+"\t"STUB_ASM_CODE("876")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(PassTexCoordATI))"\n"
-"\t"STUB_ASM_CODE("873")"\n"
+"\t"STUB_ASM_CODE("877")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SampleMapATI))"\n"
-"\t"STUB_ASM_CODE("874")"\n"
+"\t"STUB_ASM_CODE("878")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(SetFragmentShaderConstantATI))"\n"
-"\t"STUB_ASM_CODE("875")"\n"
+"\t"STUB_ASM_CODE("879")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(PointParameteriNV))"\n"
-"\t"STUB_ASM_CODE("876")"\n"
+"\t"STUB_ASM_CODE("880")"\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("877")"\n"
+"\t"STUB_ASM_CODE("881")"\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("880")"\n"
+"\t"STUB_ASM_CODE("884")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(IsVertexArray))"\n"
-"\t"STUB_ASM_CODE("882")"\n"
+"\t"STUB_ASM_CODE("886")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetProgramNamedParameterdvNV))"\n"
-"\t"STUB_ASM_CODE("883")"\n"
+"\t"STUB_ASM_CODE("887")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetProgramNamedParameterfvNV))"\n"
-"\t"STUB_ASM_CODE("884")"\n"
+"\t"STUB_ASM_CODE("888")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ProgramNamedParameter4dNV))"\n"
-"\t"STUB_ASM_CODE("885")"\n"
+"\t"STUB_ASM_CODE("889")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ProgramNamedParameter4dvNV))"\n"
-"\t"STUB_ASM_CODE("886")"\n"
+"\t"STUB_ASM_CODE("890")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ProgramNamedParameter4fNV))"\n"
-"\t"STUB_ASM_CODE("887")"\n"
+"\t"STUB_ASM_CODE("891")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ProgramNamedParameter4fvNV))"\n"
-"\t"STUB_ASM_CODE("888")"\n"
+"\t"STUB_ASM_CODE("892")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(PrimitiveRestartIndexNV))"\n"
-"\t"STUB_ASM_CODE("889")"\n"
+"\t"STUB_ASM_CODE("893")"\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("890")"\n"
+"\t"STUB_ASM_CODE("894")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BlendEquationSeparate))"\n"
-"\t"STUB_ASM_CODE("938")"\n"
+"\t"STUB_ASM_CODE("942")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BindFramebufferEXT))"\n"
-"\t"STUB_ASM_CODE("939")"\n"
+"\t"STUB_ASM_CODE("943")"\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("940")"\n"
+"\t"STUB_ASM_CODE("944")"\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("941")"\n"
+"\t"STUB_ASM_CODE("945")"\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("942")"\n"
+"\t"STUB_ASM_CODE("946")"\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("943")"\n"
+"\t"STUB_ASM_CODE("947")"\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("944")"\n"
+"\t"STUB_ASM_CODE("948")"\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("945")"\n"
+"\t"STUB_ASM_CODE("949")"\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("946")"\n"
+"\t"STUB_ASM_CODE("950")"\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("947")"\n"
+"\t"STUB_ASM_CODE("951")"\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("948")"\n"
+"\t"STUB_ASM_CODE("952")"\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("949")"\n"
+"\t"STUB_ASM_CODE("953")"\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("950")"\n"
+"\t"STUB_ASM_CODE("954")"\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("951")"\n"
+"\t"STUB_ASM_CODE("955")"\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("952")"\n"
+"\t"STUB_ASM_CODE("956")"\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("953")"\n"
+"\t"STUB_ASM_CODE("957")"\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("954")"\n"
+"\t"STUB_ASM_CODE("958")"\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("955")"\n"
+"\t"STUB_ASM_CODE("959")"\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("956")"\n"
+"\t"STUB_ASM_CODE("960")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BindFragDataLocationEXT))"\n"
-"\t"STUB_ASM_CODE("959")"\n"
+"\t"STUB_ASM_CODE("963")"\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("960")"\n"
+"\t"STUB_ASM_CODE("964")"\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("961")"\n"
+"\t"STUB_ASM_CODE("965")"\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("962")"\n"
+"\t"STUB_ASM_CODE("966")"\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("963")"\n"
+"\t"STUB_ASM_CODE("967")"\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("964")"\n"
+"\t"STUB_ASM_CODE("968")"\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("965")"\n"
+"\t"STUB_ASM_CODE("969")"\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("966")"\n"
+"\t"STUB_ASM_CODE("970")"\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("967")"\n"
+"\t"STUB_ASM_CODE("971")"\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("968")"\n"
+"\t"STUB_ASM_CODE("972")"\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("969")"\n"
+"\t"STUB_ASM_CODE("973")"\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("970")"\n"
+"\t"STUB_ASM_CODE("974")"\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("971")"\n"
+"\t"STUB_ASM_CODE("975")"\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("972")"\n"
+"\t"STUB_ASM_CODE("976")"\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("973")"\n"
+"\t"STUB_ASM_CODE("977")"\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("974")"\n"
+"\t"STUB_ASM_CODE("978")"\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("975")"\n"
+"\t"STUB_ASM_CODE("979")"\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("976")"\n"
+"\t"STUB_ASM_CODE("980")"\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("977")"\n"
+"\t"STUB_ASM_CODE("981")"\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("978")"\n"
+"\t"STUB_ASM_CODE("982")"\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("979")"\n"
+"\t"STUB_ASM_CODE("983")"\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("980")"\n"
+"\t"STUB_ASM_CODE("984")"\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("981")"\n"
+"\t"STUB_ASM_CODE("985")"\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("982")"\n"
+"\t"STUB_ASM_CODE("986")"\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("983")"\n"
+"\t"STUB_ASM_CODE("987")"\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("984")"\n"
+"\t"STUB_ASM_CODE("988")"\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("985")"\n"
+"\t"STUB_ASM_CODE("989")"\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("986")"\n"
+"\t"STUB_ASM_CODE("990")"\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("987")"\n"
+"\t"STUB_ASM_CODE("991")"\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("988")"\n"
+"\t"STUB_ASM_CODE("992")"\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("989")"\n"
+"\t"STUB_ASM_CODE("993")"\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("990")"\n"
+"\t"STUB_ASM_CODE("994")"\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("991")"\n"
+"\t"STUB_ASM_CODE("995")"\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("992")"\n"
+"\t"STUB_ASM_CODE("996")"\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("993")"\n"
+"\t"STUB_ASM_CODE("997")"\n"
 
 ".globl "GLAPI_PREFIX_STR(FramebufferTextureLayer)"\n"
 ".set "GLAPI_PREFIX_STR(FramebufferTextureLayer)", "GLAPI_PREFIX_STR(FramebufferTextureLayerEXT)"\n"
@@ -13919,154 +13963,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("994")"\n"
+"\t"STUB_ASM_CODE("998")"\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("995")"\n"
+"\t"STUB_ASM_CODE("999")"\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("996")"\n"
+"\t"STUB_ASM_CODE("1000")"\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("997")"\n"
+"\t"STUB_ASM_CODE("1001")"\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("998")"\n"
+"\t"STUB_ASM_CODE("1002")"\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("999")"\n"
+"\t"STUB_ASM_CODE("1003")"\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("1000")"\n"
+"\t"STUB_ASM_CODE("1004")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ClearColorIuiEXT))"\n"
-"\t"STUB_ASM_CODE("1001")"\n"
+"\t"STUB_ASM_CODE("1005")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(GetTexParameterIivEXT))"\n"
-"\t"STUB_ASM_CODE("1002")"\n"
+"\t"STUB_ASM_CODE("1006")"\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("1003")"\n"
+"\t"STUB_ASM_CODE("1007")"\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("1004")"\n"
+"\t"STUB_ASM_CODE("1008")"\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("1005")"\n"
+"\t"STUB_ASM_CODE("1009")"\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("1006")"\n"
+"\t"STUB_ASM_CODE("1010")"\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("1007")"\n"
+"\t"STUB_ASM_CODE("1011")"\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("1008")"\n"
+"\t"STUB_ASM_CODE("1012")"\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("1009")"\n"
+"\t"STUB_ASM_CODE("1013")"\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("1010")"\n"
+"\t"STUB_ASM_CODE("1014")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(BindBufferRangeEXT))"\n"
-"\t"STUB_ASM_CODE("1011")"\n"
+"\t"STUB_ASM_CODE("1015")"\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("1012")"\n"
+"\t"STUB_ASM_CODE("1016")"\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("1013")"\n"
+"\t"STUB_ASM_CODE("1017")"\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("1014")"\n"
+"\t"STUB_ASM_CODE("1018")"\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("1015")"\n"
+"\t"STUB_ASM_CODE("1019")"\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("1018")"\n"
+"\t"STUB_ASM_CODE("1022")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ObjectPurgeableAPPLE))"\n"
-"\t"STUB_ASM_CODE("1019")"\n"
+"\t"STUB_ASM_CODE("1023")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ObjectUnpurgeableAPPLE))"\n"
-"\t"STUB_ASM_CODE("1020")"\n"
+"\t"STUB_ASM_CODE("1024")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(ActiveProgramEXT))"\n"
-"\t"STUB_ASM_CODE("1021")"\n"
+"\t"STUB_ASM_CODE("1025")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(CreateShaderProgramEXT))"\n"
-"\t"STUB_ASM_CODE("1022")"\n"
+"\t"STUB_ASM_CODE("1026")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(UseShaderProgramEXT))"\n"
-"\t"STUB_ASM_CODE("1023")"\n"
+"\t"STUB_ASM_CODE("1027")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(TextureBarrierNV))"\n"
-"\t"STUB_ASM_CODE("1024")"\n"
+"\t"STUB_ASM_CODE("1028")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(EGLImageTargetRenderbufferStorageOES))"\n"
-"\t"STUB_ASM_CODE("1030")"\n"
+"\t"STUB_ASM_CODE("1034")"\n"
 
 STUB_ASM_ENTRY(GLAPI_PREFIX_STR(EGLImageTargetTexture2DOES))"\n"
-"\t"STUB_ASM_CODE("1031")"\n"
+"\t"STUB_ASM_CODE("1035")"\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 004ea9f22..fd5f90fd6 100644
--- a/mesalib/src/mapi/glapi/glapi_sparc.S
+++ b/mesalib/src/mapi/glapi/glapi_sparc.S
@@ -860,41 +860,37 @@ gl_dispatch_functions_start:
 	GL_STUB(glGetShaderPrecisionFormat, 662)
 	GL_STUB(glReleaseShaderCompiler, 663)
 	GL_STUB(glShaderBinary, 664)
-	GL_STUB(glGetGraphicsResetStatusARB, 665)
-	GL_STUB(glGetnColorTableARB, 666)
-	GL_STUB(glGetnCompressedTexImageARB, 667)
-	GL_STUB(glGetnConvolutionFilterARB, 668)
-	GL_STUB(glGetnHistogramARB, 669)
-	GL_STUB(glGetnMapdvARB, 670)
-	GL_STUB(glGetnMapfvARB, 671)
-	GL_STUB(glGetnMapivARB, 672)
-	GL_STUB(glGetnMinmaxARB, 673)
-	GL_STUB(glGetnPixelMapfvARB, 674)
-	GL_STUB(glGetnPixelMapuivARB, 675)
-	GL_STUB(glGetnPixelMapusvARB, 676)
-	GL_STUB(glGetnPolygonStippleARB, 677)
-	GL_STUB(glGetnSeparableFilterARB, 678)
-	GL_STUB(glGetnTexImageARB, 679)
-	GL_STUB(glGetnUniformdvARB, 680)
-	GL_STUB(glGetnUniformfvARB, 681)
-	GL_STUB(glGetnUniformivARB, 682)
-	GL_STUB(glGetnUniformuivARB, 683)
-	GL_STUB(glReadnPixelsARB, 684)
-	GL_STUB(glTexStorage1D, 685)
-	GL_STUB(glTexStorage2D, 686)
-	GL_STUB(glTexStorage3D, 687)
-	GL_STUB(glTextureStorage1DEXT, 688)
-	GL_STUB(glTextureStorage2DEXT, 689)
-	GL_STUB(glTextureStorage3DEXT, 690)
-	GL_STUB(glPolygonOffsetEXT, 691)
-	GL_STUB(gl_dispatch_stub_692, 692)
-	HIDDEN(gl_dispatch_stub_692)
-	GL_STUB(gl_dispatch_stub_693, 693)
-	HIDDEN(gl_dispatch_stub_693)
-	GL_STUB(gl_dispatch_stub_694, 694)
-	HIDDEN(gl_dispatch_stub_694)
-	GL_STUB(gl_dispatch_stub_695, 695)
-	HIDDEN(gl_dispatch_stub_695)
+	GL_STUB(glDebugMessageCallbackARB, 665)
+	GL_STUB(glDebugMessageControlARB, 666)
+	GL_STUB(glDebugMessageInsertARB, 667)
+	GL_STUB(glGetDebugMessageLogARB, 668)
+	GL_STUB(glGetGraphicsResetStatusARB, 669)
+	GL_STUB(glGetnColorTableARB, 670)
+	GL_STUB(glGetnCompressedTexImageARB, 671)
+	GL_STUB(glGetnConvolutionFilterARB, 672)
+	GL_STUB(glGetnHistogramARB, 673)
+	GL_STUB(glGetnMapdvARB, 674)
+	GL_STUB(glGetnMapfvARB, 675)
+	GL_STUB(glGetnMapivARB, 676)
+	GL_STUB(glGetnMinmaxARB, 677)
+	GL_STUB(glGetnPixelMapfvARB, 678)
+	GL_STUB(glGetnPixelMapuivARB, 679)
+	GL_STUB(glGetnPixelMapusvARB, 680)
+	GL_STUB(glGetnPolygonStippleARB, 681)
+	GL_STUB(glGetnSeparableFilterARB, 682)
+	GL_STUB(glGetnTexImageARB, 683)
+	GL_STUB(glGetnUniformdvARB, 684)
+	GL_STUB(glGetnUniformfvARB, 685)
+	GL_STUB(glGetnUniformivARB, 686)
+	GL_STUB(glGetnUniformuivARB, 687)
+	GL_STUB(glReadnPixelsARB, 688)
+	GL_STUB(glTexStorage1D, 689)
+	GL_STUB(glTexStorage2D, 690)
+	GL_STUB(glTexStorage3D, 691)
+	GL_STUB(glTextureStorage1DEXT, 692)
+	GL_STUB(glTextureStorage2DEXT, 693)
+	GL_STUB(glTextureStorage3DEXT, 694)
+	GL_STUB(glPolygonOffsetEXT, 695)
 	GL_STUB(gl_dispatch_stub_696, 696)
 	HIDDEN(gl_dispatch_stub_696)
 	GL_STUB(gl_dispatch_stub_697, 697)
@@ -903,91 +899,91 @@ gl_dispatch_functions_start:
 	HIDDEN(gl_dispatch_stub_698)
 	GL_STUB(gl_dispatch_stub_699, 699)
 	HIDDEN(gl_dispatch_stub_699)
-	GL_STUB(glColorPointerEXT, 700)
-	GL_STUB(glEdgeFlagPointerEXT, 701)
-	GL_STUB(glIndexPointerEXT, 702)
-	GL_STUB(glNormalPointerEXT, 703)
-	GL_STUB(glTexCoordPointerEXT, 704)
-	GL_STUB(glVertexPointerEXT, 705)
-	GL_STUB(glPointParameterfEXT, 706)
-	GL_STUB(glPointParameterfvEXT, 707)
-	GL_STUB(glLockArraysEXT, 708)
-	GL_STUB(glUnlockArraysEXT, 709)
-	GL_STUB(glSecondaryColor3bEXT, 710)
-	GL_STUB(glSecondaryColor3bvEXT, 711)
-	GL_STUB(glSecondaryColor3dEXT, 712)
-	GL_STUB(glSecondaryColor3dvEXT, 713)
-	GL_STUB(glSecondaryColor3fEXT, 714)
-	GL_STUB(glSecondaryColor3fvEXT, 715)
-	GL_STUB(glSecondaryColor3iEXT, 716)
-	GL_STUB(glSecondaryColor3ivEXT, 717)
-	GL_STUB(glSecondaryColor3sEXT, 718)
-	GL_STUB(glSecondaryColor3svEXT, 719)
-	GL_STUB(glSecondaryColor3ubEXT, 720)
-	GL_STUB(glSecondaryColor3ubvEXT, 721)
-	GL_STUB(glSecondaryColor3uiEXT, 722)
-	GL_STUB(glSecondaryColor3uivEXT, 723)
-	GL_STUB(glSecondaryColor3usEXT, 724)
-	GL_STUB(glSecondaryColor3usvEXT, 725)
-	GL_STUB(glSecondaryColorPointerEXT, 726)
-	GL_STUB(glMultiDrawArraysEXT, 727)
-	GL_STUB(glMultiDrawElementsEXT, 728)
-	GL_STUB(glFogCoordPointerEXT, 729)
-	GL_STUB(glFogCoorddEXT, 730)
-	GL_STUB(glFogCoorddvEXT, 731)
-	GL_STUB(glFogCoordfEXT, 732)
-	GL_STUB(glFogCoordfvEXT, 733)
-	GL_STUB(gl_dispatch_stub_734, 734)
-	HIDDEN(gl_dispatch_stub_734)
-	GL_STUB(glBlendFuncSeparateEXT, 735)
-	GL_STUB(glFlushVertexArrayRangeNV, 736)
-	GL_STUB(glVertexArrayRangeNV, 737)
-	GL_STUB(glCombinerInputNV, 738)
-	GL_STUB(glCombinerOutputNV, 739)
-	GL_STUB(glCombinerParameterfNV, 740)
-	GL_STUB(glCombinerParameterfvNV, 741)
-	GL_STUB(glCombinerParameteriNV, 742)
-	GL_STUB(glCombinerParameterivNV, 743)
-	GL_STUB(glFinalCombinerInputNV, 744)
-	GL_STUB(glGetCombinerInputParameterfvNV, 745)
-	GL_STUB(glGetCombinerInputParameterivNV, 746)
-	GL_STUB(glGetCombinerOutputParameterfvNV, 747)
-	GL_STUB(glGetCombinerOutputParameterivNV, 748)
-	GL_STUB(glGetFinalCombinerInputParameterfvNV, 749)
-	GL_STUB(glGetFinalCombinerInputParameterivNV, 750)
-	GL_STUB(glResizeBuffersMESA, 751)
-	GL_STUB(glWindowPos2dMESA, 752)
-	GL_STUB(glWindowPos2dvMESA, 753)
-	GL_STUB(glWindowPos2fMESA, 754)
-	GL_STUB(glWindowPos2fvMESA, 755)
-	GL_STUB(glWindowPos2iMESA, 756)
-	GL_STUB(glWindowPos2ivMESA, 757)
-	GL_STUB(glWindowPos2sMESA, 758)
-	GL_STUB(glWindowPos2svMESA, 759)
-	GL_STUB(glWindowPos3dMESA, 760)
-	GL_STUB(glWindowPos3dvMESA, 761)
-	GL_STUB(glWindowPos3fMESA, 762)
-	GL_STUB(glWindowPos3fvMESA, 763)
-	GL_STUB(glWindowPos3iMESA, 764)
-	GL_STUB(glWindowPos3ivMESA, 765)
-	GL_STUB(glWindowPos3sMESA, 766)
-	GL_STUB(glWindowPos3svMESA, 767)
-	GL_STUB(glWindowPos4dMESA, 768)
-	GL_STUB(glWindowPos4dvMESA, 769)
-	GL_STUB(glWindowPos4fMESA, 770)
-	GL_STUB(glWindowPos4fvMESA, 771)
-	GL_STUB(glWindowPos4iMESA, 772)
-	GL_STUB(glWindowPos4ivMESA, 773)
-	GL_STUB(glWindowPos4sMESA, 774)
-	GL_STUB(glWindowPos4svMESA, 775)
-	GL_STUB(gl_dispatch_stub_776, 776)
-	HIDDEN(gl_dispatch_stub_776)
-	GL_STUB(gl_dispatch_stub_777, 777)
-	HIDDEN(gl_dispatch_stub_777)
-	GL_STUB(gl_dispatch_stub_778, 778)
-	HIDDEN(gl_dispatch_stub_778)
-	GL_STUB(gl_dispatch_stub_779, 779)
-	HIDDEN(gl_dispatch_stub_779)
+	GL_STUB(gl_dispatch_stub_700, 700)
+	HIDDEN(gl_dispatch_stub_700)
+	GL_STUB(gl_dispatch_stub_701, 701)
+	HIDDEN(gl_dispatch_stub_701)
+	GL_STUB(gl_dispatch_stub_702, 702)
+	HIDDEN(gl_dispatch_stub_702)
+	GL_STUB(gl_dispatch_stub_703, 703)
+	HIDDEN(gl_dispatch_stub_703)
+	GL_STUB(glColorPointerEXT, 704)
+	GL_STUB(glEdgeFlagPointerEXT, 705)
+	GL_STUB(glIndexPointerEXT, 706)
+	GL_STUB(glNormalPointerEXT, 707)
+	GL_STUB(glTexCoordPointerEXT, 708)
+	GL_STUB(glVertexPointerEXT, 709)
+	GL_STUB(glPointParameterfEXT, 710)
+	GL_STUB(glPointParameterfvEXT, 711)
+	GL_STUB(glLockArraysEXT, 712)
+	GL_STUB(glUnlockArraysEXT, 713)
+	GL_STUB(glSecondaryColor3bEXT, 714)
+	GL_STUB(glSecondaryColor3bvEXT, 715)
+	GL_STUB(glSecondaryColor3dEXT, 716)
+	GL_STUB(glSecondaryColor3dvEXT, 717)
+	GL_STUB(glSecondaryColor3fEXT, 718)
+	GL_STUB(glSecondaryColor3fvEXT, 719)
+	GL_STUB(glSecondaryColor3iEXT, 720)
+	GL_STUB(glSecondaryColor3ivEXT, 721)
+	GL_STUB(glSecondaryColor3sEXT, 722)
+	GL_STUB(glSecondaryColor3svEXT, 723)
+	GL_STUB(glSecondaryColor3ubEXT, 724)
+	GL_STUB(glSecondaryColor3ubvEXT, 725)
+	GL_STUB(glSecondaryColor3uiEXT, 726)
+	GL_STUB(glSecondaryColor3uivEXT, 727)
+	GL_STUB(glSecondaryColor3usEXT, 728)
+	GL_STUB(glSecondaryColor3usvEXT, 729)
+	GL_STUB(glSecondaryColorPointerEXT, 730)
+	GL_STUB(glMultiDrawArraysEXT, 731)
+	GL_STUB(glMultiDrawElementsEXT, 732)
+	GL_STUB(glFogCoordPointerEXT, 733)
+	GL_STUB(glFogCoorddEXT, 734)
+	GL_STUB(glFogCoorddvEXT, 735)
+	GL_STUB(glFogCoordfEXT, 736)
+	GL_STUB(glFogCoordfvEXT, 737)
+	GL_STUB(gl_dispatch_stub_738, 738)
+	HIDDEN(gl_dispatch_stub_738)
+	GL_STUB(glBlendFuncSeparateEXT, 739)
+	GL_STUB(glFlushVertexArrayRangeNV, 740)
+	GL_STUB(glVertexArrayRangeNV, 741)
+	GL_STUB(glCombinerInputNV, 742)
+	GL_STUB(glCombinerOutputNV, 743)
+	GL_STUB(glCombinerParameterfNV, 744)
+	GL_STUB(glCombinerParameterfvNV, 745)
+	GL_STUB(glCombinerParameteriNV, 746)
+	GL_STUB(glCombinerParameterivNV, 747)
+	GL_STUB(glFinalCombinerInputNV, 748)
+	GL_STUB(glGetCombinerInputParameterfvNV, 749)
+	GL_STUB(glGetCombinerInputParameterivNV, 750)
+	GL_STUB(glGetCombinerOutputParameterfvNV, 751)
+	GL_STUB(glGetCombinerOutputParameterivNV, 752)
+	GL_STUB(glGetFinalCombinerInputParameterfvNV, 753)
+	GL_STUB(glGetFinalCombinerInputParameterivNV, 754)
+	GL_STUB(glResizeBuffersMESA, 755)
+	GL_STUB(glWindowPos2dMESA, 756)
+	GL_STUB(glWindowPos2dvMESA, 757)
+	GL_STUB(glWindowPos2fMESA, 758)
+	GL_STUB(glWindowPos2fvMESA, 759)
+	GL_STUB(glWindowPos2iMESA, 760)
+	GL_STUB(glWindowPos2ivMESA, 761)
+	GL_STUB(glWindowPos2sMESA, 762)
+	GL_STUB(glWindowPos2svMESA, 763)
+	GL_STUB(glWindowPos3dMESA, 764)
+	GL_STUB(glWindowPos3dvMESA, 765)
+	GL_STUB(glWindowPos3fMESA, 766)
+	GL_STUB(glWindowPos3fvMESA, 767)
+	GL_STUB(glWindowPos3iMESA, 768)
+	GL_STUB(glWindowPos3ivMESA, 769)
+	GL_STUB(glWindowPos3sMESA, 770)
+	GL_STUB(glWindowPos3svMESA, 771)
+	GL_STUB(glWindowPos4dMESA, 772)
+	GL_STUB(glWindowPos4dvMESA, 773)
+	GL_STUB(glWindowPos4fMESA, 774)
+	GL_STUB(glWindowPos4fvMESA, 775)
+	GL_STUB(glWindowPos4iMESA, 776)
+	GL_STUB(glWindowPos4ivMESA, 777)
+	GL_STUB(glWindowPos4sMESA, 778)
+	GL_STUB(glWindowPos4svMESA, 779)
 	GL_STUB(gl_dispatch_stub_780, 780)
 	HIDDEN(gl_dispatch_stub_780)
 	GL_STUB(gl_dispatch_stub_781, 781)
@@ -998,211 +994,219 @@ gl_dispatch_functions_start:
 	HIDDEN(gl_dispatch_stub_783)
 	GL_STUB(gl_dispatch_stub_784, 784)
 	HIDDEN(gl_dispatch_stub_784)
-	GL_STUB(glAreProgramsResidentNV, 785)
-	GL_STUB(glBindProgramNV, 786)
-	GL_STUB(glDeleteProgramsNV, 787)
-	GL_STUB(glExecuteProgramNV, 788)
-	GL_STUB(glGenProgramsNV, 789)
-	GL_STUB(glGetProgramParameterdvNV, 790)
-	GL_STUB(glGetProgramParameterfvNV, 791)
-	GL_STUB(glGetProgramStringNV, 792)
-	GL_STUB(glGetProgramivNV, 793)
-	GL_STUB(glGetTrackMatrixivNV, 794)
-	GL_STUB(glGetVertexAttribPointervNV, 795)
-	GL_STUB(glGetVertexAttribdvNV, 796)
-	GL_STUB(glGetVertexAttribfvNV, 797)
-	GL_STUB(glGetVertexAttribivNV, 798)
-	GL_STUB(glIsProgramNV, 799)
-	GL_STUB(glLoadProgramNV, 800)
-	GL_STUB(glProgramParameters4dvNV, 801)
-	GL_STUB(glProgramParameters4fvNV, 802)
-	GL_STUB(glRequestResidentProgramsNV, 803)
-	GL_STUB(glTrackMatrixNV, 804)
-	GL_STUB(glVertexAttrib1dNV, 805)
-	GL_STUB(glVertexAttrib1dvNV, 806)
-	GL_STUB(glVertexAttrib1fNV, 807)
-	GL_STUB(glVertexAttrib1fvNV, 808)
-	GL_STUB(glVertexAttrib1sNV, 809)
-	GL_STUB(glVertexAttrib1svNV, 810)
-	GL_STUB(glVertexAttrib2dNV, 811)
-	GL_STUB(glVertexAttrib2dvNV, 812)
-	GL_STUB(glVertexAttrib2fNV, 813)
-	GL_STUB(glVertexAttrib2fvNV, 814)
-	GL_STUB(glVertexAttrib2sNV, 815)
-	GL_STUB(glVertexAttrib2svNV, 816)
-	GL_STUB(glVertexAttrib3dNV, 817)
-	GL_STUB(glVertexAttrib3dvNV, 818)
-	GL_STUB(glVertexAttrib3fNV, 819)
-	GL_STUB(glVertexAttrib3fvNV, 820)
-	GL_STUB(glVertexAttrib3sNV, 821)
-	GL_STUB(glVertexAttrib3svNV, 822)
-	GL_STUB(glVertexAttrib4dNV, 823)
-	GL_STUB(glVertexAttrib4dvNV, 824)
-	GL_STUB(glVertexAttrib4fNV, 825)
-	GL_STUB(glVertexAttrib4fvNV, 826)
-	GL_STUB(glVertexAttrib4sNV, 827)
-	GL_STUB(glVertexAttrib4svNV, 828)
-	GL_STUB(glVertexAttrib4ubNV, 829)
-	GL_STUB(glVertexAttrib4ubvNV, 830)
-	GL_STUB(glVertexAttribPointerNV, 831)
-	GL_STUB(glVertexAttribs1dvNV, 832)
-	GL_STUB(glVertexAttribs1fvNV, 833)
-	GL_STUB(glVertexAttribs1svNV, 834)
-	GL_STUB(glVertexAttribs2dvNV, 835)
-	GL_STUB(glVertexAttribs2fvNV, 836)
-	GL_STUB(glVertexAttribs2svNV, 837)
-	GL_STUB(glVertexAttribs3dvNV, 838)
-	GL_STUB(glVertexAttribs3fvNV, 839)
-	GL_STUB(glVertexAttribs3svNV, 840)
-	GL_STUB(glVertexAttribs4dvNV, 841)
-	GL_STUB(glVertexAttribs4fvNV, 842)
-	GL_STUB(glVertexAttribs4svNV, 843)
-	GL_STUB(glVertexAttribs4ubvNV, 844)
-	GL_STUB(glGetTexBumpParameterfvATI, 845)
-	GL_STUB(glGetTexBumpParameterivATI, 846)
-	GL_STUB(glTexBumpParameterfvATI, 847)
-	GL_STUB(glTexBumpParameterivATI, 848)
-	GL_STUB(glAlphaFragmentOp1ATI, 849)
-	GL_STUB(glAlphaFragmentOp2ATI, 850)
-	GL_STUB(glAlphaFragmentOp3ATI, 851)
-	GL_STUB(glBeginFragmentShaderATI, 852)
-	GL_STUB(glBindFragmentShaderATI, 853)
-	GL_STUB(glColorFragmentOp1ATI, 854)
-	GL_STUB(glColorFragmentOp2ATI, 855)
-	GL_STUB(glColorFragmentOp3ATI, 856)
-	GL_STUB(glDeleteFragmentShaderATI, 857)
-	GL_STUB(glEndFragmentShaderATI, 858)
-	GL_STUB(glGenFragmentShadersATI, 859)
-	GL_STUB(glPassTexCoordATI, 860)
-	GL_STUB(glSampleMapATI, 861)
-	GL_STUB(glSetFragmentShaderConstantATI, 862)
-	GL_STUB(glPointParameteriNV, 863)
-	GL_STUB(glPointParameterivNV, 864)
-	GL_STUB(gl_dispatch_stub_865, 865)
-	HIDDEN(gl_dispatch_stub_865)
-	GL_STUB(gl_dispatch_stub_866, 866)
-	HIDDEN(gl_dispatch_stub_866)
-	GL_STUB(gl_dispatch_stub_867, 867)
-	HIDDEN(gl_dispatch_stub_867)
-	GL_STUB(gl_dispatch_stub_868, 868)
-	HIDDEN(gl_dispatch_stub_868)
+	GL_STUB(gl_dispatch_stub_785, 785)
+	HIDDEN(gl_dispatch_stub_785)
+	GL_STUB(gl_dispatch_stub_786, 786)
+	HIDDEN(gl_dispatch_stub_786)
+	GL_STUB(gl_dispatch_stub_787, 787)
+	HIDDEN(gl_dispatch_stub_787)
+	GL_STUB(gl_dispatch_stub_788, 788)
+	HIDDEN(gl_dispatch_stub_788)
+	GL_STUB(glAreProgramsResidentNV, 789)
+	GL_STUB(glBindProgramNV, 790)
+	GL_STUB(glDeleteProgramsNV, 791)
+	GL_STUB(glExecuteProgramNV, 792)
+	GL_STUB(glGenProgramsNV, 793)
+	GL_STUB(glGetProgramParameterdvNV, 794)
+	GL_STUB(glGetProgramParameterfvNV, 795)
+	GL_STUB(glGetProgramStringNV, 796)
+	GL_STUB(glGetProgramivNV, 797)
+	GL_STUB(glGetTrackMatrixivNV, 798)
+	GL_STUB(glGetVertexAttribPointervNV, 799)
+	GL_STUB(glGetVertexAttribdvNV, 800)
+	GL_STUB(glGetVertexAttribfvNV, 801)
+	GL_STUB(glGetVertexAttribivNV, 802)
+	GL_STUB(glIsProgramNV, 803)
+	GL_STUB(glLoadProgramNV, 804)
+	GL_STUB(glProgramParameters4dvNV, 805)
+	GL_STUB(glProgramParameters4fvNV, 806)
+	GL_STUB(glRequestResidentProgramsNV, 807)
+	GL_STUB(glTrackMatrixNV, 808)
+	GL_STUB(glVertexAttrib1dNV, 809)
+	GL_STUB(glVertexAttrib1dvNV, 810)
+	GL_STUB(glVertexAttrib1fNV, 811)
+	GL_STUB(glVertexAttrib1fvNV, 812)
+	GL_STUB(glVertexAttrib1sNV, 813)
+	GL_STUB(glVertexAttrib1svNV, 814)
+	GL_STUB(glVertexAttrib2dNV, 815)
+	GL_STUB(glVertexAttrib2dvNV, 816)
+	GL_STUB(glVertexAttrib2fNV, 817)
+	GL_STUB(glVertexAttrib2fvNV, 818)
+	GL_STUB(glVertexAttrib2sNV, 819)
+	GL_STUB(glVertexAttrib2svNV, 820)
+	GL_STUB(glVertexAttrib3dNV, 821)
+	GL_STUB(glVertexAttrib3dvNV, 822)
+	GL_STUB(glVertexAttrib3fNV, 823)
+	GL_STUB(glVertexAttrib3fvNV, 824)
+	GL_STUB(glVertexAttrib3sNV, 825)
+	GL_STUB(glVertexAttrib3svNV, 826)
+	GL_STUB(glVertexAttrib4dNV, 827)
+	GL_STUB(glVertexAttrib4dvNV, 828)
+	GL_STUB(glVertexAttrib4fNV, 829)
+	GL_STUB(glVertexAttrib4fvNV, 830)
+	GL_STUB(glVertexAttrib4sNV, 831)
+	GL_STUB(glVertexAttrib4svNV, 832)
+	GL_STUB(glVertexAttrib4ubNV, 833)
+	GL_STUB(glVertexAttrib4ubvNV, 834)
+	GL_STUB(glVertexAttribPointerNV, 835)
+	GL_STUB(glVertexAttribs1dvNV, 836)
+	GL_STUB(glVertexAttribs1fvNV, 837)
+	GL_STUB(glVertexAttribs1svNV, 838)
+	GL_STUB(glVertexAttribs2dvNV, 839)
+	GL_STUB(glVertexAttribs2fvNV, 840)
+	GL_STUB(glVertexAttribs2svNV, 841)
+	GL_STUB(glVertexAttribs3dvNV, 842)
+	GL_STUB(glVertexAttribs3fvNV, 843)
+	GL_STUB(glVertexAttribs3svNV, 844)
+	GL_STUB(glVertexAttribs4dvNV, 845)
+	GL_STUB(glVertexAttribs4fvNV, 846)
+	GL_STUB(glVertexAttribs4svNV, 847)
+	GL_STUB(glVertexAttribs4ubvNV, 848)
+	GL_STUB(glGetTexBumpParameterfvATI, 849)
+	GL_STUB(glGetTexBumpParameterivATI, 850)
+	GL_STUB(glTexBumpParameterfvATI, 851)
+	GL_STUB(glTexBumpParameterivATI, 852)
+	GL_STUB(glAlphaFragmentOp1ATI, 853)
+	GL_STUB(glAlphaFragmentOp2ATI, 854)
+	GL_STUB(glAlphaFragmentOp3ATI, 855)
+	GL_STUB(glBeginFragmentShaderATI, 856)
+	GL_STUB(glBindFragmentShaderATI, 857)
+	GL_STUB(glColorFragmentOp1ATI, 858)
+	GL_STUB(glColorFragmentOp2ATI, 859)
+	GL_STUB(glColorFragmentOp3ATI, 860)
+	GL_STUB(glDeleteFragmentShaderATI, 861)
+	GL_STUB(glEndFragmentShaderATI, 862)
+	GL_STUB(glGenFragmentShadersATI, 863)
+	GL_STUB(glPassTexCoordATI, 864)
+	GL_STUB(glSampleMapATI, 865)
+	GL_STUB(glSetFragmentShaderConstantATI, 866)
+	GL_STUB(glPointParameteriNV, 867)
+	GL_STUB(glPointParameterivNV, 868)
 	GL_STUB(gl_dispatch_stub_869, 869)
 	HIDDEN(gl_dispatch_stub_869)
-	GL_STUB(glGetProgramNamedParameterdvNV, 870)
-	GL_STUB(glGetProgramNamedParameterfvNV, 871)
-	GL_STUB(glProgramNamedParameter4dNV, 872)
-	GL_STUB(glProgramNamedParameter4dvNV, 873)
-	GL_STUB(glProgramNamedParameter4fNV, 874)
-	GL_STUB(glProgramNamedParameter4fvNV, 875)
-	GL_STUB(glPrimitiveRestartIndexNV, 876)
-	GL_STUB(glPrimitiveRestartNV, 877)
-	GL_STUB(gl_dispatch_stub_878, 878)
-	HIDDEN(gl_dispatch_stub_878)
-	GL_STUB(gl_dispatch_stub_879, 879)
-	HIDDEN(gl_dispatch_stub_879)
-	GL_STUB(glBindFramebufferEXT, 880)
-	GL_STUB(glBindRenderbufferEXT, 881)
-	GL_STUB(glCheckFramebufferStatusEXT, 882)
-	GL_STUB(glDeleteFramebuffersEXT, 883)
-	GL_STUB(glDeleteRenderbuffersEXT, 884)
-	GL_STUB(glFramebufferRenderbufferEXT, 885)
-	GL_STUB(glFramebufferTexture1DEXT, 886)
-	GL_STUB(glFramebufferTexture2DEXT, 887)
-	GL_STUB(glFramebufferTexture3DEXT, 888)
-	GL_STUB(glGenFramebuffersEXT, 889)
-	GL_STUB(glGenRenderbuffersEXT, 890)
-	GL_STUB(glGenerateMipmapEXT, 891)
-	GL_STUB(glGetFramebufferAttachmentParameterivEXT, 892)
-	GL_STUB(glGetRenderbufferParameterivEXT, 893)
-	GL_STUB(glIsFramebufferEXT, 894)
-	GL_STUB(glIsRenderbufferEXT, 895)
-	GL_STUB(glRenderbufferStorageEXT, 896)
-	GL_STUB(gl_dispatch_stub_897, 897)
-	HIDDEN(gl_dispatch_stub_897)
-	GL_STUB(gl_dispatch_stub_898, 898)
-	HIDDEN(gl_dispatch_stub_898)
-	GL_STUB(gl_dispatch_stub_899, 899)
-	HIDDEN(gl_dispatch_stub_899)
-	GL_STUB(glBindFragDataLocationEXT, 900)
-	GL_STUB(glGetFragDataLocationEXT, 901)
-	GL_STUB(glGetUniformuivEXT, 902)
-	GL_STUB(glGetVertexAttribIivEXT, 903)
-	GL_STUB(glGetVertexAttribIuivEXT, 904)
-	GL_STUB(glUniform1uiEXT, 905)
-	GL_STUB(glUniform1uivEXT, 906)
-	GL_STUB(glUniform2uiEXT, 907)
-	GL_STUB(glUniform2uivEXT, 908)
-	GL_STUB(glUniform3uiEXT, 909)
-	GL_STUB(glUniform3uivEXT, 910)
-	GL_STUB(glUniform4uiEXT, 911)
-	GL_STUB(glUniform4uivEXT, 912)
-	GL_STUB(glVertexAttribI1iEXT, 913)
-	GL_STUB(glVertexAttribI1ivEXT, 914)
-	GL_STUB(glVertexAttribI1uiEXT, 915)
-	GL_STUB(glVertexAttribI1uivEXT, 916)
-	GL_STUB(glVertexAttribI2iEXT, 917)
-	GL_STUB(glVertexAttribI2ivEXT, 918)
-	GL_STUB(glVertexAttribI2uiEXT, 919)
-	GL_STUB(glVertexAttribI2uivEXT, 920)
-	GL_STUB(glVertexAttribI3iEXT, 921)
-	GL_STUB(glVertexAttribI3ivEXT, 922)
-	GL_STUB(glVertexAttribI3uiEXT, 923)
-	GL_STUB(glVertexAttribI3uivEXT, 924)
-	GL_STUB(glVertexAttribI4bvEXT, 925)
-	GL_STUB(glVertexAttribI4iEXT, 926)
-	GL_STUB(glVertexAttribI4ivEXT, 927)
-	GL_STUB(glVertexAttribI4svEXT, 928)
-	GL_STUB(glVertexAttribI4ubvEXT, 929)
-	GL_STUB(glVertexAttribI4uiEXT, 930)
-	GL_STUB(glVertexAttribI4uivEXT, 931)
-	GL_STUB(glVertexAttribI4usvEXT, 932)
-	GL_STUB(glVertexAttribIPointerEXT, 933)
-	GL_STUB(glFramebufferTextureLayerEXT, 934)
-	GL_STUB(glColorMaskIndexedEXT, 935)
-	GL_STUB(glDisableIndexedEXT, 936)
-	GL_STUB(glEnableIndexedEXT, 937)
-	GL_STUB(glGetBooleanIndexedvEXT, 938)
-	GL_STUB(glGetIntegerIndexedvEXT, 939)
-	GL_STUB(glIsEnabledIndexedEXT, 940)
-	GL_STUB(glClearColorIiEXT, 941)
-	GL_STUB(glClearColorIuiEXT, 942)
-	GL_STUB(glGetTexParameterIivEXT, 943)
-	GL_STUB(glGetTexParameterIuivEXT, 944)
-	GL_STUB(glTexParameterIivEXT, 945)
-	GL_STUB(glTexParameterIuivEXT, 946)
-	GL_STUB(glBeginConditionalRenderNV, 947)
-	GL_STUB(glEndConditionalRenderNV, 948)
-	GL_STUB(glBeginTransformFeedbackEXT, 949)
-	GL_STUB(glBindBufferBaseEXT, 950)
-	GL_STUB(glBindBufferOffsetEXT, 951)
-	GL_STUB(glBindBufferRangeEXT, 952)
-	GL_STUB(glEndTransformFeedbackEXT, 953)
-	GL_STUB(glGetTransformFeedbackVaryingEXT, 954)
-	GL_STUB(glTransformFeedbackVaryingsEXT, 955)
-	GL_STUB(glProvokingVertexEXT, 956)
-	GL_STUB(gl_dispatch_stub_957, 957)
-	HIDDEN(gl_dispatch_stub_957)
-	GL_STUB(gl_dispatch_stub_958, 958)
-	HIDDEN(gl_dispatch_stub_958)
-	GL_STUB(glGetObjectParameterivAPPLE, 959)
-	GL_STUB(glObjectPurgeableAPPLE, 960)
-	GL_STUB(glObjectUnpurgeableAPPLE, 961)
-	GL_STUB(glActiveProgramEXT, 962)
-	GL_STUB(glCreateShaderProgramEXT, 963)
-	GL_STUB(glUseShaderProgramEXT, 964)
-	GL_STUB(glTextureBarrierNV, 965)
-	GL_STUB(gl_dispatch_stub_966, 966)
-	HIDDEN(gl_dispatch_stub_966)
-	GL_STUB(gl_dispatch_stub_967, 967)
-	HIDDEN(gl_dispatch_stub_967)
-	GL_STUB(gl_dispatch_stub_968, 968)
-	HIDDEN(gl_dispatch_stub_968)
-	GL_STUB(gl_dispatch_stub_969, 969)
-	HIDDEN(gl_dispatch_stub_969)
+	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)
+	HIDDEN(gl_dispatch_stub_872)
+	GL_STUB(gl_dispatch_stub_873, 873)
+	HIDDEN(gl_dispatch_stub_873)
+	GL_STUB(glGetProgramNamedParameterdvNV, 874)
+	GL_STUB(glGetProgramNamedParameterfvNV, 875)
+	GL_STUB(glProgramNamedParameter4dNV, 876)
+	GL_STUB(glProgramNamedParameter4dvNV, 877)
+	GL_STUB(glProgramNamedParameter4fNV, 878)
+	GL_STUB(glProgramNamedParameter4fvNV, 879)
+	GL_STUB(glPrimitiveRestartIndexNV, 880)
+	GL_STUB(glPrimitiveRestartNV, 881)
+	GL_STUB(gl_dispatch_stub_882, 882)
+	HIDDEN(gl_dispatch_stub_882)
+	GL_STUB(gl_dispatch_stub_883, 883)
+	HIDDEN(gl_dispatch_stub_883)
+	GL_STUB(glBindFramebufferEXT, 884)
+	GL_STUB(glBindRenderbufferEXT, 885)
+	GL_STUB(glCheckFramebufferStatusEXT, 886)
+	GL_STUB(glDeleteFramebuffersEXT, 887)
+	GL_STUB(glDeleteRenderbuffersEXT, 888)
+	GL_STUB(glFramebufferRenderbufferEXT, 889)
+	GL_STUB(glFramebufferTexture1DEXT, 890)
+	GL_STUB(glFramebufferTexture2DEXT, 891)
+	GL_STUB(glFramebufferTexture3DEXT, 892)
+	GL_STUB(glGenFramebuffersEXT, 893)
+	GL_STUB(glGenRenderbuffersEXT, 894)
+	GL_STUB(glGenerateMipmapEXT, 895)
+	GL_STUB(glGetFramebufferAttachmentParameterivEXT, 896)
+	GL_STUB(glGetRenderbufferParameterivEXT, 897)
+	GL_STUB(glIsFramebufferEXT, 898)
+	GL_STUB(glIsRenderbufferEXT, 899)
+	GL_STUB(glRenderbufferStorageEXT, 900)
+	GL_STUB(gl_dispatch_stub_901, 901)
+	HIDDEN(gl_dispatch_stub_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(glBindFragDataLocationEXT, 904)
+	GL_STUB(glGetFragDataLocationEXT, 905)
+	GL_STUB(glGetUniformuivEXT, 906)
+	GL_STUB(glGetVertexAttribIivEXT, 907)
+	GL_STUB(glGetVertexAttribIuivEXT, 908)
+	GL_STUB(glUniform1uiEXT, 909)
+	GL_STUB(glUniform1uivEXT, 910)
+	GL_STUB(glUniform2uiEXT, 911)
+	GL_STUB(glUniform2uivEXT, 912)
+	GL_STUB(glUniform3uiEXT, 913)
+	GL_STUB(glUniform3uivEXT, 914)
+	GL_STUB(glUniform4uiEXT, 915)
+	GL_STUB(glUniform4uivEXT, 916)
+	GL_STUB(glVertexAttribI1iEXT, 917)
+	GL_STUB(glVertexAttribI1ivEXT, 918)
+	GL_STUB(glVertexAttribI1uiEXT, 919)
+	GL_STUB(glVertexAttribI1uivEXT, 920)
+	GL_STUB(glVertexAttribI2iEXT, 921)
+	GL_STUB(glVertexAttribI2ivEXT, 922)
+	GL_STUB(glVertexAttribI2uiEXT, 923)
+	GL_STUB(glVertexAttribI2uivEXT, 924)
+	GL_STUB(glVertexAttribI3iEXT, 925)
+	GL_STUB(glVertexAttribI3ivEXT, 926)
+	GL_STUB(glVertexAttribI3uiEXT, 927)
+	GL_STUB(glVertexAttribI3uivEXT, 928)
+	GL_STUB(glVertexAttribI4bvEXT, 929)
+	GL_STUB(glVertexAttribI4iEXT, 930)
+	GL_STUB(glVertexAttribI4ivEXT, 931)
+	GL_STUB(glVertexAttribI4svEXT, 932)
+	GL_STUB(glVertexAttribI4ubvEXT, 933)
+	GL_STUB(glVertexAttribI4uiEXT, 934)
+	GL_STUB(glVertexAttribI4uivEXT, 935)
+	GL_STUB(glVertexAttribI4usvEXT, 936)
+	GL_STUB(glVertexAttribIPointerEXT, 937)
+	GL_STUB(glFramebufferTextureLayerEXT, 938)
+	GL_STUB(glColorMaskIndexedEXT, 939)
+	GL_STUB(glDisableIndexedEXT, 940)
+	GL_STUB(glEnableIndexedEXT, 941)
+	GL_STUB(glGetBooleanIndexedvEXT, 942)
+	GL_STUB(glGetIntegerIndexedvEXT, 943)
+	GL_STUB(glIsEnabledIndexedEXT, 944)
+	GL_STUB(glClearColorIiEXT, 945)
+	GL_STUB(glClearColorIuiEXT, 946)
+	GL_STUB(glGetTexParameterIivEXT, 947)
+	GL_STUB(glGetTexParameterIuivEXT, 948)
+	GL_STUB(glTexParameterIivEXT, 949)
+	GL_STUB(glTexParameterIuivEXT, 950)
+	GL_STUB(glBeginConditionalRenderNV, 951)
+	GL_STUB(glEndConditionalRenderNV, 952)
+	GL_STUB(glBeginTransformFeedbackEXT, 953)
+	GL_STUB(glBindBufferBaseEXT, 954)
+	GL_STUB(glBindBufferOffsetEXT, 955)
+	GL_STUB(glBindBufferRangeEXT, 956)
+	GL_STUB(glEndTransformFeedbackEXT, 957)
+	GL_STUB(glGetTransformFeedbackVaryingEXT, 958)
+	GL_STUB(glTransformFeedbackVaryingsEXT, 959)
+	GL_STUB(glProvokingVertexEXT, 960)
+	GL_STUB(gl_dispatch_stub_961, 961)
+	HIDDEN(gl_dispatch_stub_961)
+	GL_STUB(gl_dispatch_stub_962, 962)
+	HIDDEN(gl_dispatch_stub_962)
+	GL_STUB(glGetObjectParameterivAPPLE, 963)
+	GL_STUB(glObjectPurgeableAPPLE, 964)
+	GL_STUB(glObjectUnpurgeableAPPLE, 965)
+	GL_STUB(glActiveProgramEXT, 966)
+	GL_STUB(glCreateShaderProgramEXT, 967)
+	GL_STUB(glUseShaderProgramEXT, 968)
+	GL_STUB(glTextureBarrierNV, 969)
 	GL_STUB(gl_dispatch_stub_970, 970)
 	HIDDEN(gl_dispatch_stub_970)
-	GL_STUB(glEGLImageTargetRenderbufferStorageOES, 971)
-	GL_STUB(glEGLImageTargetTexture2DOES, 972)
+	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)
+	HIDDEN(gl_dispatch_stub_973)
+	GL_STUB(gl_dispatch_stub_974, 974)
+	HIDDEN(gl_dispatch_stub_974)
+	GL_STUB(glEGLImageTargetRenderbufferStorageOES, 975)
+	GL_STUB(glEGLImageTargetTexture2DOES, 976)
 	GL_STUB_ALIAS(glArrayElementEXT, glArrayElement)
 	GL_STUB_ALIAS(glBindTextureEXT, glBindTexture)
 	GL_STUB_ALIAS(glDrawArraysEXT, glDrawArrays)
diff --git a/mesalib/src/mapi/glapi/glapi_x86-64.S b/mesalib/src/mapi/glapi/glapi_x86-64.S
index 5c3d15af6..8ea2a3b44 100644
--- a/mesalib/src/mapi/glapi/glapi_x86-64.S
+++ b/mesalib/src/mapi/glapi/glapi_x86-64.S
@@ -25117,17 +25117,21 @@ GL_PREFIX(ShaderBinary):
 	.size	GL_PREFIX(ShaderBinary), .-GL_PREFIX(ShaderBinary)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(GetGraphicsResetStatusARB)
-	.type	GL_PREFIX(GetGraphicsResetStatusARB), @function
-GL_PREFIX(GetGraphicsResetStatusARB):
+	.globl	GL_PREFIX(DebugMessageCallbackARB)
+	.type	GL_PREFIX(DebugMessageCallbackARB), @function
+GL_PREFIX(DebugMessageCallbackARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
 	movq	5320(%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	5320(%rax), %r11
 	jmp	*%r11
 #else
@@ -25137,18 +25141,22 @@ GL_PREFIX(GetGraphicsResetStatusARB):
 	movq	5320(%rax), %r11
 	jmp	*%r11
 1:
+	pushq	%rdi
+	pushq	%rsi
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
+	popq	%rsi
+	popq	%rdi
 	movq	5320(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(GetGraphicsResetStatusARB), .-GL_PREFIX(GetGraphicsResetStatusARB)
+	.size	GL_PREFIX(DebugMessageCallbackARB), .-GL_PREFIX(DebugMessageCallbackARB)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(GetnColorTableARB)
-	.type	GL_PREFIX(GetnColorTableARB), @function
-GL_PREFIX(GetnColorTableARB):
+	.globl	GL_PREFIX(DebugMessageControlARB)
+	.type	GL_PREFIX(DebugMessageControlARB), @function
+GL_PREFIX(DebugMessageControlARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
 	movq	5328(%rax), %r11
@@ -25159,7 +25167,11 @@ GL_PREFIX(GetnColorTableARB):
 	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
@@ -25179,7 +25191,11 @@ GL_PREFIX(GetnColorTableARB):
 	pushq	%rdx
 	pushq	%rcx
 	pushq	%r8
+	pushq	%r9
+	pushq	%rbp
 	call	_glapi_get_dispatch
+	popq	%rbp
+	popq	%r9
 	popq	%r8
 	popq	%rcx
 	popq	%rdx
@@ -25188,12 +25204,12 @@ GL_PREFIX(GetnColorTableARB):
 	movq	5328(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(GetnColorTableARB), .-GL_PREFIX(GetnColorTableARB)
+	.size	GL_PREFIX(DebugMessageControlARB), .-GL_PREFIX(DebugMessageControlARB)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(GetnCompressedTexImageARB)
-	.type	GL_PREFIX(GetnCompressedTexImageARB), @function
-GL_PREFIX(GetnCompressedTexImageARB):
+	.globl	GL_PREFIX(DebugMessageInsertARB)
+	.type	GL_PREFIX(DebugMessageInsertARB), @function
+GL_PREFIX(DebugMessageInsertARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
 	movq	5336(%rax), %r11
@@ -25203,9 +25219,13 @@ GL_PREFIX(GetnCompressedTexImageARB):
 	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
@@ -25223,9 +25243,13 @@ GL_PREFIX(GetnCompressedTexImageARB):
 	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
@@ -25233,12 +25257,12 @@ GL_PREFIX(GetnCompressedTexImageARB):
 	movq	5336(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(GetnCompressedTexImageARB), .-GL_PREFIX(GetnCompressedTexImageARB)
+	.size	GL_PREFIX(DebugMessageInsertARB), .-GL_PREFIX(DebugMessageInsertARB)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(GetnConvolutionFilterARB)
-	.type	GL_PREFIX(GetnConvolutionFilterARB), @function
-GL_PREFIX(GetnConvolutionFilterARB):
+	.globl	GL_PREFIX(GetDebugMessageLogARB)
+	.type	GL_PREFIX(GetDebugMessageLogARB), @function
+GL_PREFIX(GetDebugMessageLogARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
 	movq	5344(%rax), %r11
@@ -25249,7 +25273,11 @@ GL_PREFIX(GetnConvolutionFilterARB):
 	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
@@ -25269,7 +25297,11 @@ GL_PREFIX(GetnConvolutionFilterARB):
 	pushq	%rdx
 	pushq	%rcx
 	pushq	%r8
+	pushq	%r9
+	pushq	%rbp
 	call	_glapi_get_dispatch
+	popq	%rbp
+	popq	%r9
 	popq	%r8
 	popq	%rcx
 	popq	%rdx
@@ -25278,6 +25310,170 @@ GL_PREFIX(GetnConvolutionFilterARB):
 	movq	5344(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(GetDebugMessageLogARB), .-GL_PREFIX(GetDebugMessageLogARB)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(GetGraphicsResetStatusARB)
+	.type	GL_PREFIX(GetGraphicsResetStatusARB), @function
+GL_PREFIX(GetGraphicsResetStatusARB):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	5352(%rax), %r11
+	jmp	*%r11
+#elif defined(PTHREADS)
+	pushq	%rbp
+	call	_x86_64_get_dispatch@PLT
+	popq	%rbp
+	movq	5352(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	5352(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rbp
+	call	_glapi_get_dispatch
+	popq	%rbp
+	movq	5352(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(GetGraphicsResetStatusARB), .-GL_PREFIX(GetGraphicsResetStatusARB)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(GetnColorTableARB)
+	.type	GL_PREFIX(GetnColorTableARB), @function
+GL_PREFIX(GetnColorTableARB):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	5360(%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	5360(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	5360(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	pushq	%rcx
+	pushq	%r8
+	call	_glapi_get_dispatch
+	popq	%r8
+	popq	%rcx
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	5360(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(GetnColorTableARB), .-GL_PREFIX(GetnColorTableARB)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(GetnCompressedTexImageARB)
+	.type	GL_PREFIX(GetnCompressedTexImageARB), @function
+GL_PREFIX(GetnCompressedTexImageARB):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	5368(%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	5368(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	5368(%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	5368(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
+	.size	GL_PREFIX(GetnCompressedTexImageARB), .-GL_PREFIX(GetnCompressedTexImageARB)
+
+	.p2align	4,,15
+	.globl	GL_PREFIX(GetnConvolutionFilterARB)
+	.type	GL_PREFIX(GetnConvolutionFilterARB), @function
+GL_PREFIX(GetnConvolutionFilterARB):
+#if defined(GLX_USE_TLS)
+	call	_x86_64_get_dispatch@PLT
+	movq	5376(%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	5376(%rax), %r11
+	jmp	*%r11
+#else
+	movq	_glapi_Dispatch(%rip), %rax
+	testq	%rax, %rax
+	je	1f
+	movq	5376(%rax), %r11
+	jmp	*%r11
+1:
+	pushq	%rdi
+	pushq	%rsi
+	pushq	%rdx
+	pushq	%rcx
+	pushq	%r8
+	call	_glapi_get_dispatch
+	popq	%r8
+	popq	%rcx
+	popq	%rdx
+	popq	%rsi
+	popq	%rdi
+	movq	5376(%rax), %r11
+	jmp	*%r11
+#endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnConvolutionFilterARB), .-GL_PREFIX(GetnConvolutionFilterARB)
 
 	.p2align	4,,15
@@ -25286,7 +25482,7 @@ GL_PREFIX(GetnConvolutionFilterARB):
 GL_PREFIX(GetnHistogramARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5352(%rax), %r11
+	movq	5384(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25304,13 +25500,13 @@ GL_PREFIX(GetnHistogramARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5352(%rax), %r11
+	movq	5384(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5352(%rax), %r11
+	movq	5384(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25328,7 +25524,7 @@ GL_PREFIX(GetnHistogramARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5352(%rax), %r11
+	movq	5384(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnHistogramARB), .-GL_PREFIX(GetnHistogramARB)
@@ -25339,7 +25535,7 @@ GL_PREFIX(GetnHistogramARB):
 GL_PREFIX(GetnMapdvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5360(%rax), %r11
+	movq	5392(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25353,13 +25549,13 @@ GL_PREFIX(GetnMapdvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5360(%rax), %r11
+	movq	5392(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5360(%rax), %r11
+	movq	5392(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25373,7 +25569,7 @@ GL_PREFIX(GetnMapdvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5360(%rax), %r11
+	movq	5392(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnMapdvARB), .-GL_PREFIX(GetnMapdvARB)
@@ -25384,7 +25580,7 @@ GL_PREFIX(GetnMapdvARB):
 GL_PREFIX(GetnMapfvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5368(%rax), %r11
+	movq	5400(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25398,13 +25594,13 @@ GL_PREFIX(GetnMapfvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5368(%rax), %r11
+	movq	5400(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5368(%rax), %r11
+	movq	5400(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25418,7 +25614,7 @@ GL_PREFIX(GetnMapfvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5368(%rax), %r11
+	movq	5400(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnMapfvARB), .-GL_PREFIX(GetnMapfvARB)
@@ -25429,7 +25625,7 @@ GL_PREFIX(GetnMapfvARB):
 GL_PREFIX(GetnMapivARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5376(%rax), %r11
+	movq	5408(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25443,13 +25639,13 @@ GL_PREFIX(GetnMapivARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5376(%rax), %r11
+	movq	5408(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5376(%rax), %r11
+	movq	5408(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25463,7 +25659,7 @@ GL_PREFIX(GetnMapivARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5376(%rax), %r11
+	movq	5408(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnMapivARB), .-GL_PREFIX(GetnMapivARB)
@@ -25474,7 +25670,7 @@ GL_PREFIX(GetnMapivARB):
 GL_PREFIX(GetnMinmaxARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5384(%rax), %r11
+	movq	5416(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25492,13 +25688,13 @@ GL_PREFIX(GetnMinmaxARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5384(%rax), %r11
+	movq	5416(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5384(%rax), %r11
+	movq	5416(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25516,7 +25712,7 @@ GL_PREFIX(GetnMinmaxARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5384(%rax), %r11
+	movq	5416(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnMinmaxARB), .-GL_PREFIX(GetnMinmaxARB)
@@ -25527,7 +25723,7 @@ GL_PREFIX(GetnMinmaxARB):
 GL_PREFIX(GetnPixelMapfvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5392(%rax), %r11
+	movq	5424(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25537,13 +25733,13 @@ GL_PREFIX(GetnPixelMapfvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5392(%rax), %r11
+	movq	5424(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5392(%rax), %r11
+	movq	5424(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25553,7 +25749,7 @@ GL_PREFIX(GetnPixelMapfvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5392(%rax), %r11
+	movq	5424(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnPixelMapfvARB), .-GL_PREFIX(GetnPixelMapfvARB)
@@ -25564,7 +25760,7 @@ GL_PREFIX(GetnPixelMapfvARB):
 GL_PREFIX(GetnPixelMapuivARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5400(%rax), %r11
+	movq	5432(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25574,13 +25770,13 @@ GL_PREFIX(GetnPixelMapuivARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5400(%rax), %r11
+	movq	5432(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5400(%rax), %r11
+	movq	5432(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25590,7 +25786,7 @@ GL_PREFIX(GetnPixelMapuivARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5400(%rax), %r11
+	movq	5432(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnPixelMapuivARB), .-GL_PREFIX(GetnPixelMapuivARB)
@@ -25601,7 +25797,7 @@ GL_PREFIX(GetnPixelMapuivARB):
 GL_PREFIX(GetnPixelMapusvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5408(%rax), %r11
+	movq	5440(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25611,13 +25807,13 @@ GL_PREFIX(GetnPixelMapusvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5408(%rax), %r11
+	movq	5440(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5408(%rax), %r11
+	movq	5440(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25627,7 +25823,7 @@ GL_PREFIX(GetnPixelMapusvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5408(%rax), %r11
+	movq	5440(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnPixelMapusvARB), .-GL_PREFIX(GetnPixelMapusvARB)
@@ -25638,7 +25834,7 @@ GL_PREFIX(GetnPixelMapusvARB):
 GL_PREFIX(GetnPolygonStippleARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5416(%rax), %r11
+	movq	5448(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25648,13 +25844,13 @@ GL_PREFIX(GetnPolygonStippleARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5416(%rax), %r11
+	movq	5448(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5416(%rax), %r11
+	movq	5448(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25664,7 +25860,7 @@ GL_PREFIX(GetnPolygonStippleARB):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5416(%rax), %r11
+	movq	5448(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnPolygonStippleARB), .-GL_PREFIX(GetnPolygonStippleARB)
@@ -25675,7 +25871,7 @@ GL_PREFIX(GetnPolygonStippleARB):
 GL_PREFIX(GetnSeparableFilterARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5424(%rax), %r11
+	movq	5456(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25693,13 +25889,13 @@ GL_PREFIX(GetnSeparableFilterARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5424(%rax), %r11
+	movq	5456(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5424(%rax), %r11
+	movq	5456(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25717,7 +25913,7 @@ GL_PREFIX(GetnSeparableFilterARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5424(%rax), %r11
+	movq	5456(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnSeparableFilterARB), .-GL_PREFIX(GetnSeparableFilterARB)
@@ -25728,7 +25924,7 @@ GL_PREFIX(GetnSeparableFilterARB):
 GL_PREFIX(GetnTexImageARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5432(%rax), %r11
+	movq	5464(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25746,13 +25942,13 @@ GL_PREFIX(GetnTexImageARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5432(%rax), %r11
+	movq	5464(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5432(%rax), %r11
+	movq	5464(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25770,7 +25966,7 @@ GL_PREFIX(GetnTexImageARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5432(%rax), %r11
+	movq	5464(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnTexImageARB), .-GL_PREFIX(GetnTexImageARB)
@@ -25781,7 +25977,7 @@ GL_PREFIX(GetnTexImageARB):
 GL_PREFIX(GetnUniformdvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5440(%rax), %r11
+	movq	5472(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25795,13 +25991,13 @@ GL_PREFIX(GetnUniformdvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5440(%rax), %r11
+	movq	5472(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5440(%rax), %r11
+	movq	5472(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25815,7 +26011,7 @@ GL_PREFIX(GetnUniformdvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5440(%rax), %r11
+	movq	5472(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnUniformdvARB), .-GL_PREFIX(GetnUniformdvARB)
@@ -25826,7 +26022,7 @@ GL_PREFIX(GetnUniformdvARB):
 GL_PREFIX(GetnUniformfvARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5448(%rax), %r11
+	movq	5480(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25840,13 +26036,13 @@ GL_PREFIX(GetnUniformfvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5448(%rax), %r11
+	movq	5480(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5448(%rax), %r11
+	movq	5480(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25860,7 +26056,7 @@ GL_PREFIX(GetnUniformfvARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5448(%rax), %r11
+	movq	5480(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnUniformfvARB), .-GL_PREFIX(GetnUniformfvARB)
@@ -25871,7 +26067,7 @@ GL_PREFIX(GetnUniformfvARB):
 GL_PREFIX(GetnUniformivARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5456(%rax), %r11
+	movq	5488(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25885,13 +26081,13 @@ GL_PREFIX(GetnUniformivARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5456(%rax), %r11
+	movq	5488(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5456(%rax), %r11
+	movq	5488(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25905,7 +26101,7 @@ GL_PREFIX(GetnUniformivARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5456(%rax), %r11
+	movq	5488(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnUniformivARB), .-GL_PREFIX(GetnUniformivARB)
@@ -25916,7 +26112,7 @@ GL_PREFIX(GetnUniformivARB):
 GL_PREFIX(GetnUniformuivARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5464(%rax), %r11
+	movq	5496(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25930,13 +26126,13 @@ GL_PREFIX(GetnUniformuivARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5464(%rax), %r11
+	movq	5496(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5464(%rax), %r11
+	movq	5496(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -25950,7 +26146,7 @@ GL_PREFIX(GetnUniformuivARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5464(%rax), %r11
+	movq	5496(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetnUniformuivARB), .-GL_PREFIX(GetnUniformuivARB)
@@ -25961,7 +26157,7 @@ GL_PREFIX(GetnUniformuivARB):
 GL_PREFIX(ReadnPixelsARB):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5472(%rax), %r11
+	movq	5504(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -25979,13 +26175,13 @@ GL_PREFIX(ReadnPixelsARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5472(%rax), %r11
+	movq	5504(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5472(%rax), %r11
+	movq	5504(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26003,7 +26199,7 @@ GL_PREFIX(ReadnPixelsARB):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5472(%rax), %r11
+	movq	5504(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ReadnPixelsARB), .-GL_PREFIX(ReadnPixelsARB)
@@ -26014,7 +26210,7 @@ GL_PREFIX(ReadnPixelsARB):
 GL_PREFIX(TexStorage1D):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5480(%rax), %r11
+	movq	5512(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26028,13 +26224,13 @@ GL_PREFIX(TexStorage1D):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5480(%rax), %r11
+	movq	5512(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5480(%rax), %r11
+	movq	5512(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26048,7 +26244,7 @@ GL_PREFIX(TexStorage1D):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5480(%rax), %r11
+	movq	5512(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexStorage1D), .-GL_PREFIX(TexStorage1D)
@@ -26059,7 +26255,7 @@ GL_PREFIX(TexStorage1D):
 GL_PREFIX(TexStorage2D):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5488(%rax), %r11
+	movq	5520(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26073,13 +26269,13 @@ GL_PREFIX(TexStorage2D):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5488(%rax), %r11
+	movq	5520(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5488(%rax), %r11
+	movq	5520(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26093,7 +26289,7 @@ GL_PREFIX(TexStorage2D):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5488(%rax), %r11
+	movq	5520(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexStorage2D), .-GL_PREFIX(TexStorage2D)
@@ -26104,7 +26300,7 @@ GL_PREFIX(TexStorage2D):
 GL_PREFIX(TexStorage3D):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5496(%rax), %r11
+	movq	5528(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26122,13 +26318,13 @@ GL_PREFIX(TexStorage3D):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5496(%rax), %r11
+	movq	5528(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5496(%rax), %r11
+	movq	5528(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26146,7 +26342,7 @@ GL_PREFIX(TexStorage3D):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5496(%rax), %r11
+	movq	5528(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexStorage3D), .-GL_PREFIX(TexStorage3D)
@@ -26157,7 +26353,7 @@ GL_PREFIX(TexStorage3D):
 GL_PREFIX(TextureStorage1DEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5504(%rax), %r11
+	movq	5536(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26171,13 +26367,13 @@ GL_PREFIX(TextureStorage1DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5504(%rax), %r11
+	movq	5536(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5504(%rax), %r11
+	movq	5536(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26191,7 +26387,7 @@ GL_PREFIX(TextureStorage1DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5504(%rax), %r11
+	movq	5536(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TextureStorage1DEXT), .-GL_PREFIX(TextureStorage1DEXT)
@@ -26202,7 +26398,7 @@ GL_PREFIX(TextureStorage1DEXT):
 GL_PREFIX(TextureStorage2DEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5512(%rax), %r11
+	movq	5544(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26220,13 +26416,13 @@ GL_PREFIX(TextureStorage2DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5512(%rax), %r11
+	movq	5544(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5512(%rax), %r11
+	movq	5544(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26244,7 +26440,7 @@ GL_PREFIX(TextureStorage2DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5512(%rax), %r11
+	movq	5544(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TextureStorage2DEXT), .-GL_PREFIX(TextureStorage2DEXT)
@@ -26255,7 +26451,7 @@ GL_PREFIX(TextureStorage2DEXT):
 GL_PREFIX(TextureStorage3DEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5520(%rax), %r11
+	movq	5552(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26273,13 +26469,13 @@ GL_PREFIX(TextureStorage3DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5520(%rax), %r11
+	movq	5552(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5520(%rax), %r11
+	movq	5552(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26297,7 +26493,7 @@ GL_PREFIX(TextureStorage3DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5520(%rax), %r11
+	movq	5552(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TextureStorage3DEXT), .-GL_PREFIX(TextureStorage3DEXT)
@@ -26308,7 +26504,7 @@ GL_PREFIX(TextureStorage3DEXT):
 GL_PREFIX(PolygonOffsetEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5528(%rax), %r11
+	movq	5560(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -26318,13 +26514,13 @@ GL_PREFIX(PolygonOffsetEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5528(%rax), %r11
+	movq	5560(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5528(%rax), %r11
+	movq	5560(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -26334,19 +26530,19 @@ GL_PREFIX(PolygonOffsetEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5528(%rax), %r11
+	movq	5560(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PolygonOffsetEXT), .-GL_PREFIX(PolygonOffsetEXT)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_692)
-	.type	GL_PREFIX(_dispatch_stub_692), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_692))
-GL_PREFIX(_dispatch_stub_692):
+	.globl	GL_PREFIX(_dispatch_stub_696)
+	.type	GL_PREFIX(_dispatch_stub_696), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_696))
+GL_PREFIX(_dispatch_stub_696):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5536(%rax), %r11
+	movq	5568(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26356,13 +26552,13 @@ GL_PREFIX(_dispatch_stub_692):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5536(%rax), %r11
+	movq	5568(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5536(%rax), %r11
+	movq	5568(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26372,19 +26568,19 @@ GL_PREFIX(_dispatch_stub_692):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5536(%rax), %r11
+	movq	5568(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_692), .-GL_PREFIX(_dispatch_stub_692)
+	.size	GL_PREFIX(_dispatch_stub_696), .-GL_PREFIX(_dispatch_stub_696)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_693)
-	.type	GL_PREFIX(_dispatch_stub_693), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_693))
-GL_PREFIX(_dispatch_stub_693):
+	.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	5544(%rax), %r11
+	movq	5576(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26394,13 +26590,13 @@ GL_PREFIX(_dispatch_stub_693):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5544(%rax), %r11
+	movq	5576(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5544(%rax), %r11
+	movq	5576(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26410,19 +26606,19 @@ GL_PREFIX(_dispatch_stub_693):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5544(%rax), %r11
+	movq	5576(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_693), .-GL_PREFIX(_dispatch_stub_693)
+	.size	GL_PREFIX(_dispatch_stub_697), .-GL_PREFIX(_dispatch_stub_697)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_694)
-	.type	GL_PREFIX(_dispatch_stub_694), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_694))
-GL_PREFIX(_dispatch_stub_694):
+	.globl	GL_PREFIX(_dispatch_stub_698)
+	.type	GL_PREFIX(_dispatch_stub_698), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_698))
+GL_PREFIX(_dispatch_stub_698):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5552(%rax), %r11
+	movq	5584(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -26432,13 +26628,13 @@ GL_PREFIX(_dispatch_stub_694):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5552(%rax), %r11
+	movq	5584(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5552(%rax), %r11
+	movq	5584(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -26448,19 +26644,19 @@ GL_PREFIX(_dispatch_stub_694):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5552(%rax), %r11
+	movq	5584(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_694), .-GL_PREFIX(_dispatch_stub_694)
+	.size	GL_PREFIX(_dispatch_stub_698), .-GL_PREFIX(_dispatch_stub_698)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_695)
-	.type	GL_PREFIX(_dispatch_stub_695), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_695))
-GL_PREFIX(_dispatch_stub_695):
+	.globl	GL_PREFIX(_dispatch_stub_699)
+	.type	GL_PREFIX(_dispatch_stub_699), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_699))
+GL_PREFIX(_dispatch_stub_699):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5560(%rax), %r11
+	movq	5592(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26470,13 +26666,13 @@ GL_PREFIX(_dispatch_stub_695):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5560(%rax), %r11
+	movq	5592(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5560(%rax), %r11
+	movq	5592(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26486,19 +26682,19 @@ GL_PREFIX(_dispatch_stub_695):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5560(%rax), %r11
+	movq	5592(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_695), .-GL_PREFIX(_dispatch_stub_695)
+	.size	GL_PREFIX(_dispatch_stub_699), .-GL_PREFIX(_dispatch_stub_699)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_696)
-	.type	GL_PREFIX(_dispatch_stub_696), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_696))
-GL_PREFIX(_dispatch_stub_696):
+	.globl	GL_PREFIX(_dispatch_stub_700)
+	.type	GL_PREFIX(_dispatch_stub_700), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_700))
+GL_PREFIX(_dispatch_stub_700):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5568(%rax), %r11
+	movq	5600(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26508,13 +26704,13 @@ GL_PREFIX(_dispatch_stub_696):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5568(%rax), %r11
+	movq	5600(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5568(%rax), %r11
+	movq	5600(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26524,19 +26720,19 @@ GL_PREFIX(_dispatch_stub_696):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5568(%rax), %r11
+	movq	5600(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_696), .-GL_PREFIX(_dispatch_stub_696)
+	.size	GL_PREFIX(_dispatch_stub_700), .-GL_PREFIX(_dispatch_stub_700)
 
 	.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):
+	.globl	GL_PREFIX(_dispatch_stub_701)
+	.type	GL_PREFIX(_dispatch_stub_701), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_701))
+GL_PREFIX(_dispatch_stub_701):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5576(%rax), %r11
+	movq	5608(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26546,13 +26742,13 @@ GL_PREFIX(_dispatch_stub_697):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5576(%rax), %r11
+	movq	5608(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5576(%rax), %r11
+	movq	5608(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26562,19 +26758,19 @@ GL_PREFIX(_dispatch_stub_697):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5576(%rax), %r11
+	movq	5608(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_697), .-GL_PREFIX(_dispatch_stub_697)
+	.size	GL_PREFIX(_dispatch_stub_701), .-GL_PREFIX(_dispatch_stub_701)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_698)
-	.type	GL_PREFIX(_dispatch_stub_698), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_698))
-GL_PREFIX(_dispatch_stub_698):
+	.globl	GL_PREFIX(_dispatch_stub_702)
+	.type	GL_PREFIX(_dispatch_stub_702), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_702))
+GL_PREFIX(_dispatch_stub_702):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5584(%rax), %r11
+	movq	5616(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26584,13 +26780,13 @@ GL_PREFIX(_dispatch_stub_698):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5584(%rax), %r11
+	movq	5616(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5584(%rax), %r11
+	movq	5616(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26600,40 +26796,40 @@ GL_PREFIX(_dispatch_stub_698):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5584(%rax), %r11
+	movq	5616(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_698), .-GL_PREFIX(_dispatch_stub_698)
+	.size	GL_PREFIX(_dispatch_stub_702), .-GL_PREFIX(_dispatch_stub_702)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_699)
-	.type	GL_PREFIX(_dispatch_stub_699), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_699))
-GL_PREFIX(_dispatch_stub_699):
+	.globl	GL_PREFIX(_dispatch_stub_703)
+	.type	GL_PREFIX(_dispatch_stub_703), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_703))
+GL_PREFIX(_dispatch_stub_703):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5592(%rax), %r11
+	movq	5624(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5592(%rax), %r11
+	movq	5624(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5592(%rax), %r11
+	movq	5624(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5592(%rax), %r11
+	movq	5624(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_699), .-GL_PREFIX(_dispatch_stub_699)
+	.size	GL_PREFIX(_dispatch_stub_703), .-GL_PREFIX(_dispatch_stub_703)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(ColorPointerEXT)
@@ -26641,7 +26837,7 @@ GL_PREFIX(_dispatch_stub_699):
 GL_PREFIX(ColorPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5600(%rax), %r11
+	movq	5632(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26655,13 +26851,13 @@ GL_PREFIX(ColorPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5600(%rax), %r11
+	movq	5632(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5600(%rax), %r11
+	movq	5632(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26675,7 +26871,7 @@ GL_PREFIX(ColorPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5600(%rax), %r11
+	movq	5632(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorPointerEXT), .-GL_PREFIX(ColorPointerEXT)
@@ -26686,7 +26882,7 @@ GL_PREFIX(ColorPointerEXT):
 GL_PREFIX(EdgeFlagPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5608(%rax), %r11
+	movq	5640(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26696,13 +26892,13 @@ GL_PREFIX(EdgeFlagPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5608(%rax), %r11
+	movq	5640(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5608(%rax), %r11
+	movq	5640(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26712,7 +26908,7 @@ GL_PREFIX(EdgeFlagPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5608(%rax), %r11
+	movq	5640(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(EdgeFlagPointerEXT), .-GL_PREFIX(EdgeFlagPointerEXT)
@@ -26723,7 +26919,7 @@ GL_PREFIX(EdgeFlagPointerEXT):
 GL_PREFIX(IndexPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5616(%rax), %r11
+	movq	5648(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26737,13 +26933,13 @@ GL_PREFIX(IndexPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5616(%rax), %r11
+	movq	5648(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5616(%rax), %r11
+	movq	5648(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26757,7 +26953,7 @@ GL_PREFIX(IndexPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5616(%rax), %r11
+	movq	5648(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IndexPointerEXT), .-GL_PREFIX(IndexPointerEXT)
@@ -26768,7 +26964,7 @@ GL_PREFIX(IndexPointerEXT):
 GL_PREFIX(NormalPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5624(%rax), %r11
+	movq	5656(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26782,13 +26978,13 @@ GL_PREFIX(NormalPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5624(%rax), %r11
+	movq	5656(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5624(%rax), %r11
+	movq	5656(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26802,7 +26998,7 @@ GL_PREFIX(NormalPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5624(%rax), %r11
+	movq	5656(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(NormalPointerEXT), .-GL_PREFIX(NormalPointerEXT)
@@ -26813,7 +27009,7 @@ GL_PREFIX(NormalPointerEXT):
 GL_PREFIX(TexCoordPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5632(%rax), %r11
+	movq	5664(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26827,13 +27023,13 @@ GL_PREFIX(TexCoordPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5632(%rax), %r11
+	movq	5664(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5632(%rax), %r11
+	movq	5664(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26847,7 +27043,7 @@ GL_PREFIX(TexCoordPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5632(%rax), %r11
+	movq	5664(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexCoordPointerEXT), .-GL_PREFIX(TexCoordPointerEXT)
@@ -26858,7 +27054,7 @@ GL_PREFIX(TexCoordPointerEXT):
 GL_PREFIX(VertexPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5640(%rax), %r11
+	movq	5672(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26872,13 +27068,13 @@ GL_PREFIX(VertexPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5640(%rax), %r11
+	movq	5672(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5640(%rax), %r11
+	movq	5672(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26892,7 +27088,7 @@ GL_PREFIX(VertexPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5640(%rax), %r11
+	movq	5672(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexPointerEXT), .-GL_PREFIX(VertexPointerEXT)
@@ -26903,7 +27099,7 @@ GL_PREFIX(VertexPointerEXT):
 GL_PREFIX(PointParameterfEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5648(%rax), %r11
+	movq	5680(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -26913,13 +27109,13 @@ GL_PREFIX(PointParameterfEXT):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5648(%rax), %r11
+	movq	5680(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5648(%rax), %r11
+	movq	5680(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -26929,7 +27125,7 @@ GL_PREFIX(PointParameterfEXT):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5648(%rax), %r11
+	movq	5680(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PointParameterfEXT), .-GL_PREFIX(PointParameterfEXT)
@@ -26940,7 +27136,7 @@ GL_PREFIX(PointParameterfEXT):
 GL_PREFIX(PointParameterfvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5656(%rax), %r11
+	movq	5688(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26950,13 +27146,13 @@ GL_PREFIX(PointParameterfvEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5656(%rax), %r11
+	movq	5688(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5656(%rax), %r11
+	movq	5688(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -26966,7 +27162,7 @@ GL_PREFIX(PointParameterfvEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5656(%rax), %r11
+	movq	5688(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PointParameterfvEXT), .-GL_PREFIX(PointParameterfvEXT)
@@ -26977,7 +27173,7 @@ GL_PREFIX(PointParameterfvEXT):
 GL_PREFIX(LockArraysEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5664(%rax), %r11
+	movq	5696(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -26987,13 +27183,13 @@ GL_PREFIX(LockArraysEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5664(%rax), %r11
+	movq	5696(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5664(%rax), %r11
+	movq	5696(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27003,7 +27199,7 @@ GL_PREFIX(LockArraysEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5664(%rax), %r11
+	movq	5696(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(LockArraysEXT), .-GL_PREFIX(LockArraysEXT)
@@ -27014,25 +27210,25 @@ GL_PREFIX(LockArraysEXT):
 GL_PREFIX(UnlockArraysEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5672(%rax), %r11
+	movq	5704(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	5672(%rax), %r11
+	movq	5704(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5672(%rax), %r11
+	movq	5704(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	5672(%rax), %r11
+	movq	5704(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(UnlockArraysEXT), .-GL_PREFIX(UnlockArraysEXT)
@@ -27043,7 +27239,7 @@ GL_PREFIX(UnlockArraysEXT):
 GL_PREFIX(SecondaryColor3bEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5680(%rax), %r11
+	movq	5712(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27053,13 +27249,13 @@ GL_PREFIX(SecondaryColor3bEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5680(%rax), %r11
+	movq	5712(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5680(%rax), %r11
+	movq	5712(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27069,7 +27265,7 @@ GL_PREFIX(SecondaryColor3bEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5680(%rax), %r11
+	movq	5712(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3bEXT), .-GL_PREFIX(SecondaryColor3bEXT)
@@ -27080,25 +27276,25 @@ GL_PREFIX(SecondaryColor3bEXT):
 GL_PREFIX(SecondaryColor3bvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5688(%rax), %r11
+	movq	5720(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5688(%rax), %r11
+	movq	5720(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5688(%rax), %r11
+	movq	5720(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5688(%rax), %r11
+	movq	5720(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3bvEXT), .-GL_PREFIX(SecondaryColor3bvEXT)
@@ -27109,7 +27305,7 @@ GL_PREFIX(SecondaryColor3bvEXT):
 GL_PREFIX(SecondaryColor3dEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5696(%rax), %r11
+	movq	5728(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -27121,13 +27317,13 @@ GL_PREFIX(SecondaryColor3dEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5696(%rax), %r11
+	movq	5728(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5696(%rax), %r11
+	movq	5728(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -27139,7 +27335,7 @@ GL_PREFIX(SecondaryColor3dEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5696(%rax), %r11
+	movq	5728(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3dEXT), .-GL_PREFIX(SecondaryColor3dEXT)
@@ -27150,25 +27346,25 @@ GL_PREFIX(SecondaryColor3dEXT):
 GL_PREFIX(SecondaryColor3dvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5704(%rax), %r11
+	movq	5736(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5704(%rax), %r11
+	movq	5736(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5704(%rax), %r11
+	movq	5736(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5704(%rax), %r11
+	movq	5736(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3dvEXT), .-GL_PREFIX(SecondaryColor3dvEXT)
@@ -27179,7 +27375,7 @@ GL_PREFIX(SecondaryColor3dvEXT):
 GL_PREFIX(SecondaryColor3fEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5712(%rax), %r11
+	movq	5744(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -27191,13 +27387,13 @@ GL_PREFIX(SecondaryColor3fEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5712(%rax), %r11
+	movq	5744(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5712(%rax), %r11
+	movq	5744(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -27209,7 +27405,7 @@ GL_PREFIX(SecondaryColor3fEXT):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	5712(%rax), %r11
+	movq	5744(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3fEXT), .-GL_PREFIX(SecondaryColor3fEXT)
@@ -27220,25 +27416,25 @@ GL_PREFIX(SecondaryColor3fEXT):
 GL_PREFIX(SecondaryColor3fvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5720(%rax), %r11
+	movq	5752(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5720(%rax), %r11
+	movq	5752(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5720(%rax), %r11
+	movq	5752(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5720(%rax), %r11
+	movq	5752(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3fvEXT), .-GL_PREFIX(SecondaryColor3fvEXT)
@@ -27249,7 +27445,7 @@ GL_PREFIX(SecondaryColor3fvEXT):
 GL_PREFIX(SecondaryColor3iEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5728(%rax), %r11
+	movq	5760(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27259,13 +27455,13 @@ GL_PREFIX(SecondaryColor3iEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5728(%rax), %r11
+	movq	5760(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5728(%rax), %r11
+	movq	5760(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27275,7 +27471,7 @@ GL_PREFIX(SecondaryColor3iEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5728(%rax), %r11
+	movq	5760(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3iEXT), .-GL_PREFIX(SecondaryColor3iEXT)
@@ -27286,25 +27482,25 @@ GL_PREFIX(SecondaryColor3iEXT):
 GL_PREFIX(SecondaryColor3ivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5736(%rax), %r11
+	movq	5768(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5736(%rax), %r11
+	movq	5768(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5736(%rax), %r11
+	movq	5768(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5736(%rax), %r11
+	movq	5768(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3ivEXT), .-GL_PREFIX(SecondaryColor3ivEXT)
@@ -27315,7 +27511,7 @@ GL_PREFIX(SecondaryColor3ivEXT):
 GL_PREFIX(SecondaryColor3sEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5744(%rax), %r11
+	movq	5776(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27325,13 +27521,13 @@ GL_PREFIX(SecondaryColor3sEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5744(%rax), %r11
+	movq	5776(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5744(%rax), %r11
+	movq	5776(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27341,7 +27537,7 @@ GL_PREFIX(SecondaryColor3sEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5744(%rax), %r11
+	movq	5776(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3sEXT), .-GL_PREFIX(SecondaryColor3sEXT)
@@ -27352,25 +27548,25 @@ GL_PREFIX(SecondaryColor3sEXT):
 GL_PREFIX(SecondaryColor3svEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5752(%rax), %r11
+	movq	5784(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5752(%rax), %r11
+	movq	5784(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5752(%rax), %r11
+	movq	5784(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5752(%rax), %r11
+	movq	5784(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3svEXT), .-GL_PREFIX(SecondaryColor3svEXT)
@@ -27381,7 +27577,7 @@ GL_PREFIX(SecondaryColor3svEXT):
 GL_PREFIX(SecondaryColor3ubEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5760(%rax), %r11
+	movq	5792(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27391,13 +27587,13 @@ GL_PREFIX(SecondaryColor3ubEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5760(%rax), %r11
+	movq	5792(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5760(%rax), %r11
+	movq	5792(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27407,7 +27603,7 @@ GL_PREFIX(SecondaryColor3ubEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5760(%rax), %r11
+	movq	5792(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3ubEXT), .-GL_PREFIX(SecondaryColor3ubEXT)
@@ -27418,25 +27614,25 @@ GL_PREFIX(SecondaryColor3ubEXT):
 GL_PREFIX(SecondaryColor3ubvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5768(%rax), %r11
+	movq	5800(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5768(%rax), %r11
+	movq	5800(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5768(%rax), %r11
+	movq	5800(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5768(%rax), %r11
+	movq	5800(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3ubvEXT), .-GL_PREFIX(SecondaryColor3ubvEXT)
@@ -27447,7 +27643,7 @@ GL_PREFIX(SecondaryColor3ubvEXT):
 GL_PREFIX(SecondaryColor3uiEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5776(%rax), %r11
+	movq	5808(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27457,13 +27653,13 @@ GL_PREFIX(SecondaryColor3uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5776(%rax), %r11
+	movq	5808(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5776(%rax), %r11
+	movq	5808(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27473,7 +27669,7 @@ GL_PREFIX(SecondaryColor3uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5776(%rax), %r11
+	movq	5808(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3uiEXT), .-GL_PREFIX(SecondaryColor3uiEXT)
@@ -27484,25 +27680,25 @@ GL_PREFIX(SecondaryColor3uiEXT):
 GL_PREFIX(SecondaryColor3uivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5784(%rax), %r11
+	movq	5816(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5784(%rax), %r11
+	movq	5816(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5784(%rax), %r11
+	movq	5816(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5784(%rax), %r11
+	movq	5816(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3uivEXT), .-GL_PREFIX(SecondaryColor3uivEXT)
@@ -27513,7 +27709,7 @@ GL_PREFIX(SecondaryColor3uivEXT):
 GL_PREFIX(SecondaryColor3usEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5792(%rax), %r11
+	movq	5824(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27523,13 +27719,13 @@ GL_PREFIX(SecondaryColor3usEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5792(%rax), %r11
+	movq	5824(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5792(%rax), %r11
+	movq	5824(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27539,7 +27735,7 @@ GL_PREFIX(SecondaryColor3usEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5792(%rax), %r11
+	movq	5824(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3usEXT), .-GL_PREFIX(SecondaryColor3usEXT)
@@ -27550,25 +27746,25 @@ GL_PREFIX(SecondaryColor3usEXT):
 GL_PREFIX(SecondaryColor3usvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5800(%rax), %r11
+	movq	5832(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5800(%rax), %r11
+	movq	5832(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5800(%rax), %r11
+	movq	5832(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5800(%rax), %r11
+	movq	5832(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColor3usvEXT), .-GL_PREFIX(SecondaryColor3usvEXT)
@@ -27579,7 +27775,7 @@ GL_PREFIX(SecondaryColor3usvEXT):
 GL_PREFIX(SecondaryColorPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5808(%rax), %r11
+	movq	5840(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27593,13 +27789,13 @@ GL_PREFIX(SecondaryColorPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5808(%rax), %r11
+	movq	5840(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5808(%rax), %r11
+	movq	5840(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27613,7 +27809,7 @@ GL_PREFIX(SecondaryColorPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5808(%rax), %r11
+	movq	5840(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SecondaryColorPointerEXT), .-GL_PREFIX(SecondaryColorPointerEXT)
@@ -27624,7 +27820,7 @@ GL_PREFIX(SecondaryColorPointerEXT):
 GL_PREFIX(MultiDrawArraysEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5816(%rax), %r11
+	movq	5848(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27638,13 +27834,13 @@ GL_PREFIX(MultiDrawArraysEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5816(%rax), %r11
+	movq	5848(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5816(%rax), %r11
+	movq	5848(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27658,7 +27854,7 @@ GL_PREFIX(MultiDrawArraysEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5816(%rax), %r11
+	movq	5848(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(MultiDrawArraysEXT), .-GL_PREFIX(MultiDrawArraysEXT)
@@ -27669,7 +27865,7 @@ GL_PREFIX(MultiDrawArraysEXT):
 GL_PREFIX(MultiDrawElementsEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5824(%rax), %r11
+	movq	5856(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27683,13 +27879,13 @@ GL_PREFIX(MultiDrawElementsEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5824(%rax), %r11
+	movq	5856(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5824(%rax), %r11
+	movq	5856(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27703,7 +27899,7 @@ GL_PREFIX(MultiDrawElementsEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5824(%rax), %r11
+	movq	5856(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(MultiDrawElementsEXT), .-GL_PREFIX(MultiDrawElementsEXT)
@@ -27714,7 +27910,7 @@ GL_PREFIX(MultiDrawElementsEXT):
 GL_PREFIX(FogCoordPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5832(%rax), %r11
+	movq	5864(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27724,13 +27920,13 @@ GL_PREFIX(FogCoordPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5832(%rax), %r11
+	movq	5864(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5832(%rax), %r11
+	movq	5864(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27740,7 +27936,7 @@ GL_PREFIX(FogCoordPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5832(%rax), %r11
+	movq	5864(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FogCoordPointerEXT), .-GL_PREFIX(FogCoordPointerEXT)
@@ -27751,7 +27947,7 @@ GL_PREFIX(FogCoordPointerEXT):
 GL_PREFIX(FogCoorddEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5840(%rax), %r11
+	movq	5872(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$8, %rsp
@@ -27759,13 +27955,13 @@ GL_PREFIX(FogCoorddEXT):
 	call	_x86_64_get_dispatch@PLT
 	movq	(%rsp), %xmm0
 	addq	$8, %rsp
-	movq	5840(%rax), %r11
+	movq	5872(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5840(%rax), %r11
+	movq	5872(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$8, %rsp
@@ -27773,7 +27969,7 @@ GL_PREFIX(FogCoorddEXT):
 	call	_glapi_get_dispatch
 	movq	(%rsp), %xmm0
 	addq	$8, %rsp
-	movq	5840(%rax), %r11
+	movq	5872(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FogCoorddEXT), .-GL_PREFIX(FogCoorddEXT)
@@ -27784,25 +27980,25 @@ GL_PREFIX(FogCoorddEXT):
 GL_PREFIX(FogCoorddvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5848(%rax), %r11
+	movq	5880(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5848(%rax), %r11
+	movq	5880(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5848(%rax), %r11
+	movq	5880(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5848(%rax), %r11
+	movq	5880(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FogCoorddvEXT), .-GL_PREFIX(FogCoorddvEXT)
@@ -27813,7 +28009,7 @@ GL_PREFIX(FogCoorddvEXT):
 GL_PREFIX(FogCoordfEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5856(%rax), %r11
+	movq	5888(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$8, %rsp
@@ -27821,13 +28017,13 @@ GL_PREFIX(FogCoordfEXT):
 	call	_x86_64_get_dispatch@PLT
 	movq	(%rsp), %xmm0
 	addq	$8, %rsp
-	movq	5856(%rax), %r11
+	movq	5888(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5856(%rax), %r11
+	movq	5888(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$8, %rsp
@@ -27835,7 +28031,7 @@ GL_PREFIX(FogCoordfEXT):
 	call	_glapi_get_dispatch
 	movq	(%rsp), %xmm0
 	addq	$8, %rsp
-	movq	5856(%rax), %r11
+	movq	5888(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FogCoordfEXT), .-GL_PREFIX(FogCoordfEXT)
@@ -27846,58 +28042,58 @@ GL_PREFIX(FogCoordfEXT):
 GL_PREFIX(FogCoordfvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5864(%rax), %r11
+	movq	5896(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5864(%rax), %r11
+	movq	5896(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5864(%rax), %r11
+	movq	5896(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5864(%rax), %r11
+	movq	5896(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FogCoordfvEXT), .-GL_PREFIX(FogCoordfvEXT)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_734)
-	.type	GL_PREFIX(_dispatch_stub_734), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_734))
-GL_PREFIX(_dispatch_stub_734):
+	.globl	GL_PREFIX(_dispatch_stub_738)
+	.type	GL_PREFIX(_dispatch_stub_738), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_738))
+GL_PREFIX(_dispatch_stub_738):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5872(%rax), %r11
+	movq	5904(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	5872(%rax), %r11
+	movq	5904(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5872(%rax), %r11
+	movq	5904(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	5872(%rax), %r11
+	movq	5904(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_734), .-GL_PREFIX(_dispatch_stub_734)
+	.size	GL_PREFIX(_dispatch_stub_738), .-GL_PREFIX(_dispatch_stub_738)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(BlendFuncSeparateEXT)
@@ -27905,7 +28101,7 @@ GL_PREFIX(_dispatch_stub_734):
 GL_PREFIX(BlendFuncSeparateEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5880(%rax), %r11
+	movq	5912(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27919,13 +28115,13 @@ GL_PREFIX(BlendFuncSeparateEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5880(%rax), %r11
+	movq	5912(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5880(%rax), %r11
+	movq	5912(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -27939,7 +28135,7 @@ GL_PREFIX(BlendFuncSeparateEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5880(%rax), %r11
+	movq	5912(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BlendFuncSeparateEXT), .-GL_PREFIX(BlendFuncSeparateEXT)
@@ -27950,25 +28146,25 @@ GL_PREFIX(BlendFuncSeparateEXT):
 GL_PREFIX(FlushVertexArrayRangeNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5888(%rax), %r11
+	movq	5920(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	5888(%rax), %r11
+	movq	5920(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5888(%rax), %r11
+	movq	5920(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	5888(%rax), %r11
+	movq	5920(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FlushVertexArrayRangeNV), .-GL_PREFIX(FlushVertexArrayRangeNV)
@@ -27979,7 +28175,7 @@ GL_PREFIX(FlushVertexArrayRangeNV):
 GL_PREFIX(VertexArrayRangeNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5896(%rax), %r11
+	movq	5928(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -27989,13 +28185,13 @@ GL_PREFIX(VertexArrayRangeNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5896(%rax), %r11
+	movq	5928(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5896(%rax), %r11
+	movq	5928(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28005,7 +28201,7 @@ GL_PREFIX(VertexArrayRangeNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5896(%rax), %r11
+	movq	5928(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexArrayRangeNV), .-GL_PREFIX(VertexArrayRangeNV)
@@ -28016,7 +28212,7 @@ GL_PREFIX(VertexArrayRangeNV):
 GL_PREFIX(CombinerInputNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5904(%rax), %r11
+	movq	5936(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28034,13 +28230,13 @@ GL_PREFIX(CombinerInputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5904(%rax), %r11
+	movq	5936(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5904(%rax), %r11
+	movq	5936(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28058,7 +28254,7 @@ GL_PREFIX(CombinerInputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5904(%rax), %r11
+	movq	5936(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerInputNV), .-GL_PREFIX(CombinerInputNV)
@@ -28069,7 +28265,7 @@ GL_PREFIX(CombinerInputNV):
 GL_PREFIX(CombinerOutputNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5912(%rax), %r11
+	movq	5944(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28087,13 +28283,13 @@ GL_PREFIX(CombinerOutputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5912(%rax), %r11
+	movq	5944(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5912(%rax), %r11
+	movq	5944(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28111,7 +28307,7 @@ GL_PREFIX(CombinerOutputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5912(%rax), %r11
+	movq	5944(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerOutputNV), .-GL_PREFIX(CombinerOutputNV)
@@ -28122,7 +28318,7 @@ GL_PREFIX(CombinerOutputNV):
 GL_PREFIX(CombinerParameterfNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5920(%rax), %r11
+	movq	5952(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -28132,13 +28328,13 @@ GL_PREFIX(CombinerParameterfNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5920(%rax), %r11
+	movq	5952(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5920(%rax), %r11
+	movq	5952(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -28148,7 +28344,7 @@ GL_PREFIX(CombinerParameterfNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	5920(%rax), %r11
+	movq	5952(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerParameterfNV), .-GL_PREFIX(CombinerParameterfNV)
@@ -28159,7 +28355,7 @@ GL_PREFIX(CombinerParameterfNV):
 GL_PREFIX(CombinerParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5928(%rax), %r11
+	movq	5960(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28169,13 +28365,13 @@ GL_PREFIX(CombinerParameterfvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5928(%rax), %r11
+	movq	5960(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5928(%rax), %r11
+	movq	5960(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28185,7 +28381,7 @@ GL_PREFIX(CombinerParameterfvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5928(%rax), %r11
+	movq	5960(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerParameterfvNV), .-GL_PREFIX(CombinerParameterfvNV)
@@ -28196,7 +28392,7 @@ GL_PREFIX(CombinerParameterfvNV):
 GL_PREFIX(CombinerParameteriNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5936(%rax), %r11
+	movq	5968(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28206,13 +28402,13 @@ GL_PREFIX(CombinerParameteriNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5936(%rax), %r11
+	movq	5968(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5936(%rax), %r11
+	movq	5968(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28222,7 +28418,7 @@ GL_PREFIX(CombinerParameteriNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5936(%rax), %r11
+	movq	5968(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerParameteriNV), .-GL_PREFIX(CombinerParameteriNV)
@@ -28233,7 +28429,7 @@ GL_PREFIX(CombinerParameteriNV):
 GL_PREFIX(CombinerParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5944(%rax), %r11
+	movq	5976(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28243,13 +28439,13 @@ GL_PREFIX(CombinerParameterivNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5944(%rax), %r11
+	movq	5976(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5944(%rax), %r11
+	movq	5976(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28259,7 +28455,7 @@ GL_PREFIX(CombinerParameterivNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	5944(%rax), %r11
+	movq	5976(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CombinerParameterivNV), .-GL_PREFIX(CombinerParameterivNV)
@@ -28270,7 +28466,7 @@ GL_PREFIX(CombinerParameterivNV):
 GL_PREFIX(FinalCombinerInputNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5952(%rax), %r11
+	movq	5984(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28284,13 +28480,13 @@ GL_PREFIX(FinalCombinerInputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5952(%rax), %r11
+	movq	5984(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5952(%rax), %r11
+	movq	5984(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28304,7 +28500,7 @@ GL_PREFIX(FinalCombinerInputNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5952(%rax), %r11
+	movq	5984(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FinalCombinerInputNV), .-GL_PREFIX(FinalCombinerInputNV)
@@ -28315,7 +28511,7 @@ GL_PREFIX(FinalCombinerInputNV):
 GL_PREFIX(GetCombinerInputParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5960(%rax), %r11
+	movq	5992(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28329,13 +28525,13 @@ GL_PREFIX(GetCombinerInputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5960(%rax), %r11
+	movq	5992(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5960(%rax), %r11
+	movq	5992(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28349,7 +28545,7 @@ GL_PREFIX(GetCombinerInputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5960(%rax), %r11
+	movq	5992(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetCombinerInputParameterfvNV), .-GL_PREFIX(GetCombinerInputParameterfvNV)
@@ -28360,7 +28556,7 @@ GL_PREFIX(GetCombinerInputParameterfvNV):
 GL_PREFIX(GetCombinerInputParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5968(%rax), %r11
+	movq	6000(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28374,13 +28570,13 @@ GL_PREFIX(GetCombinerInputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5968(%rax), %r11
+	movq	6000(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5968(%rax), %r11
+	movq	6000(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28394,7 +28590,7 @@ GL_PREFIX(GetCombinerInputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5968(%rax), %r11
+	movq	6000(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetCombinerInputParameterivNV), .-GL_PREFIX(GetCombinerInputParameterivNV)
@@ -28405,7 +28601,7 @@ GL_PREFIX(GetCombinerInputParameterivNV):
 GL_PREFIX(GetCombinerOutputParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5976(%rax), %r11
+	movq	6008(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28419,13 +28615,13 @@ GL_PREFIX(GetCombinerOutputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5976(%rax), %r11
+	movq	6008(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5976(%rax), %r11
+	movq	6008(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28439,7 +28635,7 @@ GL_PREFIX(GetCombinerOutputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5976(%rax), %r11
+	movq	6008(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetCombinerOutputParameterfvNV), .-GL_PREFIX(GetCombinerOutputParameterfvNV)
@@ -28450,7 +28646,7 @@ GL_PREFIX(GetCombinerOutputParameterfvNV):
 GL_PREFIX(GetCombinerOutputParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5984(%rax), %r11
+	movq	6016(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28464,13 +28660,13 @@ GL_PREFIX(GetCombinerOutputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5984(%rax), %r11
+	movq	6016(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5984(%rax), %r11
+	movq	6016(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28484,7 +28680,7 @@ GL_PREFIX(GetCombinerOutputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5984(%rax), %r11
+	movq	6016(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetCombinerOutputParameterivNV), .-GL_PREFIX(GetCombinerOutputParameterivNV)
@@ -28495,7 +28691,7 @@ GL_PREFIX(GetCombinerOutputParameterivNV):
 GL_PREFIX(GetFinalCombinerInputParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	5992(%rax), %r11
+	movq	6024(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28505,13 +28701,13 @@ GL_PREFIX(GetFinalCombinerInputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5992(%rax), %r11
+	movq	6024(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	5992(%rax), %r11
+	movq	6024(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28521,7 +28717,7 @@ GL_PREFIX(GetFinalCombinerInputParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	5992(%rax), %r11
+	movq	6024(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetFinalCombinerInputParameterfvNV), .-GL_PREFIX(GetFinalCombinerInputParameterfvNV)
@@ -28532,7 +28728,7 @@ GL_PREFIX(GetFinalCombinerInputParameterfvNV):
 GL_PREFIX(GetFinalCombinerInputParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6000(%rax), %r11
+	movq	6032(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28542,13 +28738,13 @@ GL_PREFIX(GetFinalCombinerInputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6000(%rax), %r11
+	movq	6032(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6000(%rax), %r11
+	movq	6032(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28558,7 +28754,7 @@ GL_PREFIX(GetFinalCombinerInputParameterivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6000(%rax), %r11
+	movq	6032(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetFinalCombinerInputParameterivNV), .-GL_PREFIX(GetFinalCombinerInputParameterivNV)
@@ -28569,25 +28765,25 @@ GL_PREFIX(GetFinalCombinerInputParameterivNV):
 GL_PREFIX(ResizeBuffersMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6008(%rax), %r11
+	movq	6040(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	6008(%rax), %r11
+	movq	6040(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6008(%rax), %r11
+	movq	6040(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	6008(%rax), %r11
+	movq	6040(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ResizeBuffersMESA), .-GL_PREFIX(ResizeBuffersMESA)
@@ -28598,7 +28794,7 @@ GL_PREFIX(ResizeBuffersMESA):
 GL_PREFIX(WindowPos2dMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6016(%rax), %r11
+	movq	6048(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -28608,13 +28804,13 @@ GL_PREFIX(WindowPos2dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	6016(%rax), %r11
+	movq	6048(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6016(%rax), %r11
+	movq	6048(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -28624,7 +28820,7 @@ GL_PREFIX(WindowPos2dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	6016(%rax), %r11
+	movq	6048(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2dMESA), .-GL_PREFIX(WindowPos2dMESA)
@@ -28635,25 +28831,25 @@ GL_PREFIX(WindowPos2dMESA):
 GL_PREFIX(WindowPos2dvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6024(%rax), %r11
+	movq	6056(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6024(%rax), %r11
+	movq	6056(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6024(%rax), %r11
+	movq	6056(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6024(%rax), %r11
+	movq	6056(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2dvMESA), .-GL_PREFIX(WindowPos2dvMESA)
@@ -28664,7 +28860,7 @@ GL_PREFIX(WindowPos2dvMESA):
 GL_PREFIX(WindowPos2fMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6032(%rax), %r11
+	movq	6064(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -28674,13 +28870,13 @@ GL_PREFIX(WindowPos2fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	6032(%rax), %r11
+	movq	6064(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6032(%rax), %r11
+	movq	6064(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -28690,7 +28886,7 @@ GL_PREFIX(WindowPos2fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	6032(%rax), %r11
+	movq	6064(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2fMESA), .-GL_PREFIX(WindowPos2fMESA)
@@ -28701,25 +28897,25 @@ GL_PREFIX(WindowPos2fMESA):
 GL_PREFIX(WindowPos2fvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6040(%rax), %r11
+	movq	6072(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6040(%rax), %r11
+	movq	6072(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6040(%rax), %r11
+	movq	6072(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6040(%rax), %r11
+	movq	6072(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2fvMESA), .-GL_PREFIX(WindowPos2fvMESA)
@@ -28730,7 +28926,7 @@ GL_PREFIX(WindowPos2fvMESA):
 GL_PREFIX(WindowPos2iMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6048(%rax), %r11
+	movq	6080(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28740,13 +28936,13 @@ GL_PREFIX(WindowPos2iMESA):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6048(%rax), %r11
+	movq	6080(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6048(%rax), %r11
+	movq	6080(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28756,7 +28952,7 @@ GL_PREFIX(WindowPos2iMESA):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6048(%rax), %r11
+	movq	6080(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2iMESA), .-GL_PREFIX(WindowPos2iMESA)
@@ -28767,25 +28963,25 @@ GL_PREFIX(WindowPos2iMESA):
 GL_PREFIX(WindowPos2ivMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6056(%rax), %r11
+	movq	6088(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6056(%rax), %r11
+	movq	6088(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6056(%rax), %r11
+	movq	6088(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6056(%rax), %r11
+	movq	6088(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2ivMESA), .-GL_PREFIX(WindowPos2ivMESA)
@@ -28796,7 +28992,7 @@ GL_PREFIX(WindowPos2ivMESA):
 GL_PREFIX(WindowPos2sMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6064(%rax), %r11
+	movq	6096(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -28806,13 +29002,13 @@ GL_PREFIX(WindowPos2sMESA):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6064(%rax), %r11
+	movq	6096(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6064(%rax), %r11
+	movq	6096(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -28822,7 +29018,7 @@ GL_PREFIX(WindowPos2sMESA):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6064(%rax), %r11
+	movq	6096(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2sMESA), .-GL_PREFIX(WindowPos2sMESA)
@@ -28833,25 +29029,25 @@ GL_PREFIX(WindowPos2sMESA):
 GL_PREFIX(WindowPos2svMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6072(%rax), %r11
+	movq	6104(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6072(%rax), %r11
+	movq	6104(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6072(%rax), %r11
+	movq	6104(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6072(%rax), %r11
+	movq	6104(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos2svMESA), .-GL_PREFIX(WindowPos2svMESA)
@@ -28862,7 +29058,7 @@ GL_PREFIX(WindowPos2svMESA):
 GL_PREFIX(WindowPos3dMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6080(%rax), %r11
+	movq	6112(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -28874,13 +29070,13 @@ GL_PREFIX(WindowPos3dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	6080(%rax), %r11
+	movq	6112(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6080(%rax), %r11
+	movq	6112(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -28892,7 +29088,7 @@ GL_PREFIX(WindowPos3dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	6080(%rax), %r11
+	movq	6112(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3dMESA), .-GL_PREFIX(WindowPos3dMESA)
@@ -28903,25 +29099,25 @@ GL_PREFIX(WindowPos3dMESA):
 GL_PREFIX(WindowPos3dvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6088(%rax), %r11
+	movq	6120(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6088(%rax), %r11
+	movq	6120(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6088(%rax), %r11
+	movq	6120(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6088(%rax), %r11
+	movq	6120(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3dvMESA), .-GL_PREFIX(WindowPos3dvMESA)
@@ -28932,7 +29128,7 @@ GL_PREFIX(WindowPos3dvMESA):
 GL_PREFIX(WindowPos3fMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6096(%rax), %r11
+	movq	6128(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -28944,13 +29140,13 @@ GL_PREFIX(WindowPos3fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	6096(%rax), %r11
+	movq	6128(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6096(%rax), %r11
+	movq	6128(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -28962,7 +29158,7 @@ GL_PREFIX(WindowPos3fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$24, %rsp
-	movq	6096(%rax), %r11
+	movq	6128(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3fMESA), .-GL_PREFIX(WindowPos3fMESA)
@@ -28973,25 +29169,25 @@ GL_PREFIX(WindowPos3fMESA):
 GL_PREFIX(WindowPos3fvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6104(%rax), %r11
+	movq	6136(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6104(%rax), %r11
+	movq	6136(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6104(%rax), %r11
+	movq	6136(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6104(%rax), %r11
+	movq	6136(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3fvMESA), .-GL_PREFIX(WindowPos3fvMESA)
@@ -29002,7 +29198,7 @@ GL_PREFIX(WindowPos3fvMESA):
 GL_PREFIX(WindowPos3iMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6112(%rax), %r11
+	movq	6144(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29012,13 +29208,13 @@ GL_PREFIX(WindowPos3iMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6112(%rax), %r11
+	movq	6144(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6112(%rax), %r11
+	movq	6144(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29028,7 +29224,7 @@ GL_PREFIX(WindowPos3iMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6112(%rax), %r11
+	movq	6144(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3iMESA), .-GL_PREFIX(WindowPos3iMESA)
@@ -29039,25 +29235,25 @@ GL_PREFIX(WindowPos3iMESA):
 GL_PREFIX(WindowPos3ivMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6120(%rax), %r11
+	movq	6152(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6120(%rax), %r11
+	movq	6152(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6120(%rax), %r11
+	movq	6152(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6120(%rax), %r11
+	movq	6152(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3ivMESA), .-GL_PREFIX(WindowPos3ivMESA)
@@ -29068,7 +29264,7 @@ GL_PREFIX(WindowPos3ivMESA):
 GL_PREFIX(WindowPos3sMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6128(%rax), %r11
+	movq	6160(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29078,13 +29274,13 @@ GL_PREFIX(WindowPos3sMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6128(%rax), %r11
+	movq	6160(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6128(%rax), %r11
+	movq	6160(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29094,7 +29290,7 @@ GL_PREFIX(WindowPos3sMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6128(%rax), %r11
+	movq	6160(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3sMESA), .-GL_PREFIX(WindowPos3sMESA)
@@ -29105,25 +29301,25 @@ GL_PREFIX(WindowPos3sMESA):
 GL_PREFIX(WindowPos3svMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6136(%rax), %r11
+	movq	6168(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6136(%rax), %r11
+	movq	6168(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6136(%rax), %r11
+	movq	6168(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6136(%rax), %r11
+	movq	6168(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos3svMESA), .-GL_PREFIX(WindowPos3svMESA)
@@ -29134,7 +29330,7 @@ GL_PREFIX(WindowPos3svMESA):
 GL_PREFIX(WindowPos4dMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6144(%rax), %r11
+	movq	6176(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -29148,13 +29344,13 @@ GL_PREFIX(WindowPos4dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$40, %rsp
-	movq	6144(%rax), %r11
+	movq	6176(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6144(%rax), %r11
+	movq	6176(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -29168,7 +29364,7 @@ GL_PREFIX(WindowPos4dMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$40, %rsp
-	movq	6144(%rax), %r11
+	movq	6176(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4dMESA), .-GL_PREFIX(WindowPos4dMESA)
@@ -29179,25 +29375,25 @@ GL_PREFIX(WindowPos4dMESA):
 GL_PREFIX(WindowPos4dvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6152(%rax), %r11
+	movq	6184(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6152(%rax), %r11
+	movq	6184(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6152(%rax), %r11
+	movq	6184(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6152(%rax), %r11
+	movq	6184(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4dvMESA), .-GL_PREFIX(WindowPos4dvMESA)
@@ -29208,7 +29404,7 @@ GL_PREFIX(WindowPos4dvMESA):
 GL_PREFIX(WindowPos4fMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6160(%rax), %r11
+	movq	6192(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -29222,13 +29418,13 @@ GL_PREFIX(WindowPos4fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$40, %rsp
-	movq	6160(%rax), %r11
+	movq	6192(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6160(%rax), %r11
+	movq	6192(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -29242,7 +29438,7 @@ GL_PREFIX(WindowPos4fMESA):
 	movq	8(%rsp), %xmm1
 	movq	(%rsp), %xmm0
 	addq	$40, %rsp
-	movq	6160(%rax), %r11
+	movq	6192(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4fMESA), .-GL_PREFIX(WindowPos4fMESA)
@@ -29253,25 +29449,25 @@ GL_PREFIX(WindowPos4fMESA):
 GL_PREFIX(WindowPos4fvMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6168(%rax), %r11
+	movq	6200(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6168(%rax), %r11
+	movq	6200(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6168(%rax), %r11
+	movq	6200(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6168(%rax), %r11
+	movq	6200(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4fvMESA), .-GL_PREFIX(WindowPos4fvMESA)
@@ -29282,7 +29478,7 @@ GL_PREFIX(WindowPos4fvMESA):
 GL_PREFIX(WindowPos4iMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6176(%rax), %r11
+	movq	6208(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29296,13 +29492,13 @@ GL_PREFIX(WindowPos4iMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6176(%rax), %r11
+	movq	6208(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6176(%rax), %r11
+	movq	6208(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29316,7 +29512,7 @@ GL_PREFIX(WindowPos4iMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6176(%rax), %r11
+	movq	6208(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4iMESA), .-GL_PREFIX(WindowPos4iMESA)
@@ -29327,25 +29523,25 @@ GL_PREFIX(WindowPos4iMESA):
 GL_PREFIX(WindowPos4ivMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6184(%rax), %r11
+	movq	6216(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6184(%rax), %r11
+	movq	6216(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6184(%rax), %r11
+	movq	6216(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6184(%rax), %r11
+	movq	6216(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4ivMESA), .-GL_PREFIX(WindowPos4ivMESA)
@@ -29356,7 +29552,7 @@ GL_PREFIX(WindowPos4ivMESA):
 GL_PREFIX(WindowPos4sMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6192(%rax), %r11
+	movq	6224(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29370,13 +29566,13 @@ GL_PREFIX(WindowPos4sMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6192(%rax), %r11
+	movq	6224(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6192(%rax), %r11
+	movq	6224(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29390,7 +29586,7 @@ GL_PREFIX(WindowPos4sMESA):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6192(%rax), %r11
+	movq	6224(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4sMESA), .-GL_PREFIX(WindowPos4sMESA)
@@ -29401,37 +29597,37 @@ GL_PREFIX(WindowPos4sMESA):
 GL_PREFIX(WindowPos4svMESA):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6200(%rax), %r11
+	movq	6232(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6200(%rax), %r11
+	movq	6232(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6200(%rax), %r11
+	movq	6232(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6200(%rax), %r11
+	movq	6232(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(WindowPos4svMESA), .-GL_PREFIX(WindowPos4svMESA)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_776)
-	.type	GL_PREFIX(_dispatch_stub_776), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_776))
-GL_PREFIX(_dispatch_stub_776):
+	.globl	GL_PREFIX(_dispatch_stub_780)
+	.type	GL_PREFIX(_dispatch_stub_780), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_780))
+GL_PREFIX(_dispatch_stub_780):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6208(%rax), %r11
+	movq	6240(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29445,13 +29641,13 @@ GL_PREFIX(_dispatch_stub_776):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6208(%rax), %r11
+	movq	6240(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6208(%rax), %r11
+	movq	6240(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29465,19 +29661,19 @@ GL_PREFIX(_dispatch_stub_776):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6208(%rax), %r11
+	movq	6240(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_776), .-GL_PREFIX(_dispatch_stub_776)
+	.size	GL_PREFIX(_dispatch_stub_780), .-GL_PREFIX(_dispatch_stub_780)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_777)
-	.type	GL_PREFIX(_dispatch_stub_777), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_777))
-GL_PREFIX(_dispatch_stub_777):
+	.globl	GL_PREFIX(_dispatch_stub_781)
+	.type	GL_PREFIX(_dispatch_stub_781), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_781))
+GL_PREFIX(_dispatch_stub_781):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6216(%rax), %r11
+	movq	6248(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29495,13 +29691,13 @@ GL_PREFIX(_dispatch_stub_777):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6216(%rax), %r11
+	movq	6248(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6216(%rax), %r11
+	movq	6248(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29519,19 +29715,19 @@ GL_PREFIX(_dispatch_stub_777):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6216(%rax), %r11
+	movq	6248(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_777), .-GL_PREFIX(_dispatch_stub_777)
+	.size	GL_PREFIX(_dispatch_stub_781), .-GL_PREFIX(_dispatch_stub_781)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_778)
-	.type	GL_PREFIX(_dispatch_stub_778), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_778))
-GL_PREFIX(_dispatch_stub_778):
+	.globl	GL_PREFIX(_dispatch_stub_782)
+	.type	GL_PREFIX(_dispatch_stub_782), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_782))
+GL_PREFIX(_dispatch_stub_782):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6224(%rax), %r11
+	movq	6256(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29541,13 +29737,13 @@ GL_PREFIX(_dispatch_stub_778):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6224(%rax), %r11
+	movq	6256(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6224(%rax), %r11
+	movq	6256(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29557,49 +29753,49 @@ GL_PREFIX(_dispatch_stub_778):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6224(%rax), %r11
+	movq	6256(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_778), .-GL_PREFIX(_dispatch_stub_778)
+	.size	GL_PREFIX(_dispatch_stub_782), .-GL_PREFIX(_dispatch_stub_782)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_779)
-	.type	GL_PREFIX(_dispatch_stub_779), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_779))
-GL_PREFIX(_dispatch_stub_779):
+	.globl	GL_PREFIX(_dispatch_stub_783)
+	.type	GL_PREFIX(_dispatch_stub_783), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_783))
+GL_PREFIX(_dispatch_stub_783):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6232(%rax), %r11
+	movq	6264(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6232(%rax), %r11
+	movq	6264(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6232(%rax), %r11
+	movq	6264(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6232(%rax), %r11
+	movq	6264(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_779), .-GL_PREFIX(_dispatch_stub_779)
+	.size	GL_PREFIX(_dispatch_stub_783), .-GL_PREFIX(_dispatch_stub_783)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_780)
-	.type	GL_PREFIX(_dispatch_stub_780), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_780))
-GL_PREFIX(_dispatch_stub_780):
+	.globl	GL_PREFIX(_dispatch_stub_784)
+	.type	GL_PREFIX(_dispatch_stub_784), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_784))
+GL_PREFIX(_dispatch_stub_784):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6240(%rax), %r11
+	movq	6272(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29609,13 +29805,13 @@ GL_PREFIX(_dispatch_stub_780):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6240(%rax), %r11
+	movq	6272(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6240(%rax), %r11
+	movq	6272(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29625,19 +29821,19 @@ GL_PREFIX(_dispatch_stub_780):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6240(%rax), %r11
+	movq	6272(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_780), .-GL_PREFIX(_dispatch_stub_780)
+	.size	GL_PREFIX(_dispatch_stub_784), .-GL_PREFIX(_dispatch_stub_784)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_781)
-	.type	GL_PREFIX(_dispatch_stub_781), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_781))
-GL_PREFIX(_dispatch_stub_781):
+	.globl	GL_PREFIX(_dispatch_stub_785)
+	.type	GL_PREFIX(_dispatch_stub_785), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_785))
+GL_PREFIX(_dispatch_stub_785):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6248(%rax), %r11
+	movq	6280(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29647,13 +29843,13 @@ GL_PREFIX(_dispatch_stub_781):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6248(%rax), %r11
+	movq	6280(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6248(%rax), %r11
+	movq	6280(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29663,49 +29859,49 @@ GL_PREFIX(_dispatch_stub_781):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6248(%rax), %r11
+	movq	6280(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_781), .-GL_PREFIX(_dispatch_stub_781)
+	.size	GL_PREFIX(_dispatch_stub_785), .-GL_PREFIX(_dispatch_stub_785)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_782)
-	.type	GL_PREFIX(_dispatch_stub_782), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_782))
-GL_PREFIX(_dispatch_stub_782):
+	.globl	GL_PREFIX(_dispatch_stub_786)
+	.type	GL_PREFIX(_dispatch_stub_786), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_786))
+GL_PREFIX(_dispatch_stub_786):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6256(%rax), %r11
+	movq	6288(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6256(%rax), %r11
+	movq	6288(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6256(%rax), %r11
+	movq	6288(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6256(%rax), %r11
+	movq	6288(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_782), .-GL_PREFIX(_dispatch_stub_782)
+	.size	GL_PREFIX(_dispatch_stub_786), .-GL_PREFIX(_dispatch_stub_786)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_783)
-	.type	GL_PREFIX(_dispatch_stub_783), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_783))
-GL_PREFIX(_dispatch_stub_783):
+	.globl	GL_PREFIX(_dispatch_stub_787)
+	.type	GL_PREFIX(_dispatch_stub_787), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_787))
+GL_PREFIX(_dispatch_stub_787):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6264(%rax), %r11
+	movq	6296(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29715,13 +29911,13 @@ GL_PREFIX(_dispatch_stub_783):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6264(%rax), %r11
+	movq	6296(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6264(%rax), %r11
+	movq	6296(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29731,40 +29927,40 @@ GL_PREFIX(_dispatch_stub_783):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6264(%rax), %r11
+	movq	6296(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_783), .-GL_PREFIX(_dispatch_stub_783)
+	.size	GL_PREFIX(_dispatch_stub_787), .-GL_PREFIX(_dispatch_stub_787)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_784)
-	.type	GL_PREFIX(_dispatch_stub_784), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_784))
-GL_PREFIX(_dispatch_stub_784):
+	.globl	GL_PREFIX(_dispatch_stub_788)
+	.type	GL_PREFIX(_dispatch_stub_788), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_788))
+GL_PREFIX(_dispatch_stub_788):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6272(%rax), %r11
+	movq	6304(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6272(%rax), %r11
+	movq	6304(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6272(%rax), %r11
+	movq	6304(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6272(%rax), %r11
+	movq	6304(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_784), .-GL_PREFIX(_dispatch_stub_784)
+	.size	GL_PREFIX(_dispatch_stub_788), .-GL_PREFIX(_dispatch_stub_788)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(AreProgramsResidentNV)
@@ -29772,7 +29968,7 @@ GL_PREFIX(_dispatch_stub_784):
 GL_PREFIX(AreProgramsResidentNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6280(%rax), %r11
+	movq	6312(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29782,13 +29978,13 @@ GL_PREFIX(AreProgramsResidentNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6280(%rax), %r11
+	movq	6312(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6280(%rax), %r11
+	movq	6312(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29798,7 +29994,7 @@ GL_PREFIX(AreProgramsResidentNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6280(%rax), %r11
+	movq	6312(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(AreProgramsResidentNV), .-GL_PREFIX(AreProgramsResidentNV)
@@ -29809,7 +30005,7 @@ GL_PREFIX(AreProgramsResidentNV):
 GL_PREFIX(BindProgramNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6288(%rax), %r11
+	movq	6320(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29819,13 +30015,13 @@ GL_PREFIX(BindProgramNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6288(%rax), %r11
+	movq	6320(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6288(%rax), %r11
+	movq	6320(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29835,7 +30031,7 @@ GL_PREFIX(BindProgramNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6288(%rax), %r11
+	movq	6320(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindProgramNV), .-GL_PREFIX(BindProgramNV)
@@ -29846,7 +30042,7 @@ GL_PREFIX(BindProgramNV):
 GL_PREFIX(DeleteProgramsNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6296(%rax), %r11
+	movq	6328(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29856,13 +30052,13 @@ GL_PREFIX(DeleteProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6296(%rax), %r11
+	movq	6328(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6296(%rax), %r11
+	movq	6328(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29872,7 +30068,7 @@ GL_PREFIX(DeleteProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6296(%rax), %r11
+	movq	6328(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteProgramsNV), .-GL_PREFIX(DeleteProgramsNV)
@@ -29883,7 +30079,7 @@ GL_PREFIX(DeleteProgramsNV):
 GL_PREFIX(ExecuteProgramNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6304(%rax), %r11
+	movq	6336(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29893,13 +30089,13 @@ GL_PREFIX(ExecuteProgramNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6304(%rax), %r11
+	movq	6336(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6304(%rax), %r11
+	movq	6336(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29909,7 +30105,7 @@ GL_PREFIX(ExecuteProgramNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6304(%rax), %r11
+	movq	6336(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ExecuteProgramNV), .-GL_PREFIX(ExecuteProgramNV)
@@ -29920,7 +30116,7 @@ GL_PREFIX(ExecuteProgramNV):
 GL_PREFIX(GenProgramsNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6312(%rax), %r11
+	movq	6344(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29930,13 +30126,13 @@ GL_PREFIX(GenProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6312(%rax), %r11
+	movq	6344(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6312(%rax), %r11
+	movq	6344(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29946,7 +30142,7 @@ GL_PREFIX(GenProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6312(%rax), %r11
+	movq	6344(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenProgramsNV), .-GL_PREFIX(GenProgramsNV)
@@ -29957,7 +30153,7 @@ GL_PREFIX(GenProgramsNV):
 GL_PREFIX(GetProgramParameterdvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6320(%rax), %r11
+	movq	6352(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -29971,13 +30167,13 @@ GL_PREFIX(GetProgramParameterdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6320(%rax), %r11
+	movq	6352(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6320(%rax), %r11
+	movq	6352(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -29991,7 +30187,7 @@ GL_PREFIX(GetProgramParameterdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6320(%rax), %r11
+	movq	6352(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramParameterdvNV), .-GL_PREFIX(GetProgramParameterdvNV)
@@ -30002,7 +30198,7 @@ GL_PREFIX(GetProgramParameterdvNV):
 GL_PREFIX(GetProgramParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6328(%rax), %r11
+	movq	6360(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30016,13 +30212,13 @@ GL_PREFIX(GetProgramParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6328(%rax), %r11
+	movq	6360(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6328(%rax), %r11
+	movq	6360(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30036,7 +30232,7 @@ GL_PREFIX(GetProgramParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6328(%rax), %r11
+	movq	6360(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramParameterfvNV), .-GL_PREFIX(GetProgramParameterfvNV)
@@ -30047,7 +30243,7 @@ GL_PREFIX(GetProgramParameterfvNV):
 GL_PREFIX(GetProgramStringNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6336(%rax), %r11
+	movq	6368(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30057,13 +30253,13 @@ GL_PREFIX(GetProgramStringNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6336(%rax), %r11
+	movq	6368(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6336(%rax), %r11
+	movq	6368(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30073,7 +30269,7 @@ GL_PREFIX(GetProgramStringNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6336(%rax), %r11
+	movq	6368(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramStringNV), .-GL_PREFIX(GetProgramStringNV)
@@ -30084,7 +30280,7 @@ GL_PREFIX(GetProgramStringNV):
 GL_PREFIX(GetProgramivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6344(%rax), %r11
+	movq	6376(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30094,13 +30290,13 @@ GL_PREFIX(GetProgramivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6344(%rax), %r11
+	movq	6376(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6344(%rax), %r11
+	movq	6376(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30110,7 +30306,7 @@ GL_PREFIX(GetProgramivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6344(%rax), %r11
+	movq	6376(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramivNV), .-GL_PREFIX(GetProgramivNV)
@@ -30121,7 +30317,7 @@ GL_PREFIX(GetProgramivNV):
 GL_PREFIX(GetTrackMatrixivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6352(%rax), %r11
+	movq	6384(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30135,13 +30331,13 @@ GL_PREFIX(GetTrackMatrixivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6352(%rax), %r11
+	movq	6384(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6352(%rax), %r11
+	movq	6384(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30155,7 +30351,7 @@ GL_PREFIX(GetTrackMatrixivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6352(%rax), %r11
+	movq	6384(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetTrackMatrixivNV), .-GL_PREFIX(GetTrackMatrixivNV)
@@ -30166,7 +30362,7 @@ GL_PREFIX(GetTrackMatrixivNV):
 GL_PREFIX(GetVertexAttribPointervNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6360(%rax), %r11
+	movq	6392(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30176,13 +30372,13 @@ GL_PREFIX(GetVertexAttribPointervNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6360(%rax), %r11
+	movq	6392(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6360(%rax), %r11
+	movq	6392(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30192,7 +30388,7 @@ GL_PREFIX(GetVertexAttribPointervNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6360(%rax), %r11
+	movq	6392(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribPointervNV), .-GL_PREFIX(GetVertexAttribPointervNV)
@@ -30203,7 +30399,7 @@ GL_PREFIX(GetVertexAttribPointervNV):
 GL_PREFIX(GetVertexAttribdvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6368(%rax), %r11
+	movq	6400(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30213,13 +30409,13 @@ GL_PREFIX(GetVertexAttribdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6368(%rax), %r11
+	movq	6400(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6368(%rax), %r11
+	movq	6400(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30229,7 +30425,7 @@ GL_PREFIX(GetVertexAttribdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6368(%rax), %r11
+	movq	6400(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribdvNV), .-GL_PREFIX(GetVertexAttribdvNV)
@@ -30240,7 +30436,7 @@ GL_PREFIX(GetVertexAttribdvNV):
 GL_PREFIX(GetVertexAttribfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6376(%rax), %r11
+	movq	6408(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30250,13 +30446,13 @@ GL_PREFIX(GetVertexAttribfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6376(%rax), %r11
+	movq	6408(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6376(%rax), %r11
+	movq	6408(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30266,7 +30462,7 @@ GL_PREFIX(GetVertexAttribfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6376(%rax), %r11
+	movq	6408(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribfvNV), .-GL_PREFIX(GetVertexAttribfvNV)
@@ -30277,7 +30473,7 @@ GL_PREFIX(GetVertexAttribfvNV):
 GL_PREFIX(GetVertexAttribivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6384(%rax), %r11
+	movq	6416(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30287,13 +30483,13 @@ GL_PREFIX(GetVertexAttribivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6384(%rax), %r11
+	movq	6416(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6384(%rax), %r11
+	movq	6416(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30303,7 +30499,7 @@ GL_PREFIX(GetVertexAttribivNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6384(%rax), %r11
+	movq	6416(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribivNV), .-GL_PREFIX(GetVertexAttribivNV)
@@ -30314,25 +30510,25 @@ GL_PREFIX(GetVertexAttribivNV):
 GL_PREFIX(IsProgramNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6392(%rax), %r11
+	movq	6424(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6392(%rax), %r11
+	movq	6424(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6392(%rax), %r11
+	movq	6424(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6392(%rax), %r11
+	movq	6424(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IsProgramNV), .-GL_PREFIX(IsProgramNV)
@@ -30343,7 +30539,7 @@ GL_PREFIX(IsProgramNV):
 GL_PREFIX(LoadProgramNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6400(%rax), %r11
+	movq	6432(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30357,13 +30553,13 @@ GL_PREFIX(LoadProgramNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6400(%rax), %r11
+	movq	6432(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6400(%rax), %r11
+	movq	6432(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30377,7 +30573,7 @@ GL_PREFIX(LoadProgramNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6400(%rax), %r11
+	movq	6432(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(LoadProgramNV), .-GL_PREFIX(LoadProgramNV)
@@ -30388,7 +30584,7 @@ GL_PREFIX(LoadProgramNV):
 GL_PREFIX(ProgramParameters4dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6408(%rax), %r11
+	movq	6440(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30402,13 +30598,13 @@ GL_PREFIX(ProgramParameters4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6408(%rax), %r11
+	movq	6440(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6408(%rax), %r11
+	movq	6440(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30422,7 +30618,7 @@ GL_PREFIX(ProgramParameters4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6408(%rax), %r11
+	movq	6440(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramParameters4dvNV), .-GL_PREFIX(ProgramParameters4dvNV)
@@ -30433,7 +30629,7 @@ GL_PREFIX(ProgramParameters4dvNV):
 GL_PREFIX(ProgramParameters4fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6416(%rax), %r11
+	movq	6448(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30447,13 +30643,13 @@ GL_PREFIX(ProgramParameters4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6416(%rax), %r11
+	movq	6448(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6416(%rax), %r11
+	movq	6448(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30467,7 +30663,7 @@ GL_PREFIX(ProgramParameters4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6416(%rax), %r11
+	movq	6448(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramParameters4fvNV), .-GL_PREFIX(ProgramParameters4fvNV)
@@ -30478,7 +30674,7 @@ GL_PREFIX(ProgramParameters4fvNV):
 GL_PREFIX(RequestResidentProgramsNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6424(%rax), %r11
+	movq	6456(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30488,13 +30684,13 @@ GL_PREFIX(RequestResidentProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6424(%rax), %r11
+	movq	6456(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6424(%rax), %r11
+	movq	6456(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30504,7 +30700,7 @@ GL_PREFIX(RequestResidentProgramsNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6424(%rax), %r11
+	movq	6456(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(RequestResidentProgramsNV), .-GL_PREFIX(RequestResidentProgramsNV)
@@ -30515,7 +30711,7 @@ GL_PREFIX(RequestResidentProgramsNV):
 GL_PREFIX(TrackMatrixNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6432(%rax), %r11
+	movq	6464(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30529,13 +30725,13 @@ GL_PREFIX(TrackMatrixNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6432(%rax), %r11
+	movq	6464(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6432(%rax), %r11
+	movq	6464(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30549,7 +30745,7 @@ GL_PREFIX(TrackMatrixNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6432(%rax), %r11
+	movq	6464(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TrackMatrixNV), .-GL_PREFIX(TrackMatrixNV)
@@ -30560,7 +30756,7 @@ GL_PREFIX(TrackMatrixNV):
 GL_PREFIX(VertexAttrib1dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6440(%rax), %r11
+	movq	6472(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -30570,13 +30766,13 @@ GL_PREFIX(VertexAttrib1dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	6440(%rax), %r11
+	movq	6472(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6440(%rax), %r11
+	movq	6472(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -30586,7 +30782,7 @@ GL_PREFIX(VertexAttrib1dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	6440(%rax), %r11
+	movq	6472(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1dNV), .-GL_PREFIX(VertexAttrib1dNV)
@@ -30597,7 +30793,7 @@ GL_PREFIX(VertexAttrib1dNV):
 GL_PREFIX(VertexAttrib1dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6448(%rax), %r11
+	movq	6480(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30607,13 +30803,13 @@ GL_PREFIX(VertexAttrib1dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6448(%rax), %r11
+	movq	6480(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6448(%rax), %r11
+	movq	6480(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30623,7 +30819,7 @@ GL_PREFIX(VertexAttrib1dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6448(%rax), %r11
+	movq	6480(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1dvNV), .-GL_PREFIX(VertexAttrib1dvNV)
@@ -30634,7 +30830,7 @@ GL_PREFIX(VertexAttrib1dvNV):
 GL_PREFIX(VertexAttrib1fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6456(%rax), %r11
+	movq	6488(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -30644,13 +30840,13 @@ GL_PREFIX(VertexAttrib1fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	6456(%rax), %r11
+	movq	6488(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6456(%rax), %r11
+	movq	6488(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -30660,7 +30856,7 @@ GL_PREFIX(VertexAttrib1fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	6456(%rax), %r11
+	movq	6488(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1fNV), .-GL_PREFIX(VertexAttrib1fNV)
@@ -30671,7 +30867,7 @@ GL_PREFIX(VertexAttrib1fNV):
 GL_PREFIX(VertexAttrib1fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6464(%rax), %r11
+	movq	6496(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30681,13 +30877,13 @@ GL_PREFIX(VertexAttrib1fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6464(%rax), %r11
+	movq	6496(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6464(%rax), %r11
+	movq	6496(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30697,7 +30893,7 @@ GL_PREFIX(VertexAttrib1fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6464(%rax), %r11
+	movq	6496(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1fvNV), .-GL_PREFIX(VertexAttrib1fvNV)
@@ -30708,7 +30904,7 @@ GL_PREFIX(VertexAttrib1fvNV):
 GL_PREFIX(VertexAttrib1sNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6472(%rax), %r11
+	movq	6504(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30718,13 +30914,13 @@ GL_PREFIX(VertexAttrib1sNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6472(%rax), %r11
+	movq	6504(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6472(%rax), %r11
+	movq	6504(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30734,7 +30930,7 @@ GL_PREFIX(VertexAttrib1sNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6472(%rax), %r11
+	movq	6504(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1sNV), .-GL_PREFIX(VertexAttrib1sNV)
@@ -30745,7 +30941,7 @@ GL_PREFIX(VertexAttrib1sNV):
 GL_PREFIX(VertexAttrib1svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6480(%rax), %r11
+	movq	6512(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30755,13 +30951,13 @@ GL_PREFIX(VertexAttrib1svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6480(%rax), %r11
+	movq	6512(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6480(%rax), %r11
+	movq	6512(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30771,7 +30967,7 @@ GL_PREFIX(VertexAttrib1svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6480(%rax), %r11
+	movq	6512(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib1svNV), .-GL_PREFIX(VertexAttrib1svNV)
@@ -30782,7 +30978,7 @@ GL_PREFIX(VertexAttrib1svNV):
 GL_PREFIX(VertexAttrib2dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6488(%rax), %r11
+	movq	6520(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -30794,13 +30990,13 @@ GL_PREFIX(VertexAttrib2dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	6488(%rax), %r11
+	movq	6520(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6488(%rax), %r11
+	movq	6520(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -30812,7 +31008,7 @@ GL_PREFIX(VertexAttrib2dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	6488(%rax), %r11
+	movq	6520(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2dNV), .-GL_PREFIX(VertexAttrib2dNV)
@@ -30823,7 +31019,7 @@ GL_PREFIX(VertexAttrib2dNV):
 GL_PREFIX(VertexAttrib2dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6496(%rax), %r11
+	movq	6528(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30833,13 +31029,13 @@ GL_PREFIX(VertexAttrib2dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6496(%rax), %r11
+	movq	6528(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6496(%rax), %r11
+	movq	6528(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30849,7 +31045,7 @@ GL_PREFIX(VertexAttrib2dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6496(%rax), %r11
+	movq	6528(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2dvNV), .-GL_PREFIX(VertexAttrib2dvNV)
@@ -30860,7 +31056,7 @@ GL_PREFIX(VertexAttrib2dvNV):
 GL_PREFIX(VertexAttrib2fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6504(%rax), %r11
+	movq	6536(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$24, %rsp
@@ -30872,13 +31068,13 @@ GL_PREFIX(VertexAttrib2fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	6504(%rax), %r11
+	movq	6536(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6504(%rax), %r11
+	movq	6536(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$24, %rsp
@@ -30890,7 +31086,7 @@ GL_PREFIX(VertexAttrib2fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$24, %rsp
-	movq	6504(%rax), %r11
+	movq	6536(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2fNV), .-GL_PREFIX(VertexAttrib2fNV)
@@ -30901,7 +31097,7 @@ GL_PREFIX(VertexAttrib2fNV):
 GL_PREFIX(VertexAttrib2fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6512(%rax), %r11
+	movq	6544(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30911,13 +31107,13 @@ GL_PREFIX(VertexAttrib2fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6512(%rax), %r11
+	movq	6544(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6512(%rax), %r11
+	movq	6544(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30927,7 +31123,7 @@ GL_PREFIX(VertexAttrib2fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6512(%rax), %r11
+	movq	6544(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2fvNV), .-GL_PREFIX(VertexAttrib2fvNV)
@@ -30938,7 +31134,7 @@ GL_PREFIX(VertexAttrib2fvNV):
 GL_PREFIX(VertexAttrib2sNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6520(%rax), %r11
+	movq	6552(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30948,13 +31144,13 @@ GL_PREFIX(VertexAttrib2sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6520(%rax), %r11
+	movq	6552(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6520(%rax), %r11
+	movq	6552(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -30964,7 +31160,7 @@ GL_PREFIX(VertexAttrib2sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6520(%rax), %r11
+	movq	6552(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2sNV), .-GL_PREFIX(VertexAttrib2sNV)
@@ -30975,7 +31171,7 @@ GL_PREFIX(VertexAttrib2sNV):
 GL_PREFIX(VertexAttrib2svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6528(%rax), %r11
+	movq	6560(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -30985,13 +31181,13 @@ GL_PREFIX(VertexAttrib2svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6528(%rax), %r11
+	movq	6560(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6528(%rax), %r11
+	movq	6560(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31001,7 +31197,7 @@ GL_PREFIX(VertexAttrib2svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6528(%rax), %r11
+	movq	6560(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib2svNV), .-GL_PREFIX(VertexAttrib2svNV)
@@ -31012,7 +31208,7 @@ GL_PREFIX(VertexAttrib2svNV):
 GL_PREFIX(VertexAttrib3dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6536(%rax), %r11
+	movq	6568(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -31026,13 +31222,13 @@ GL_PREFIX(VertexAttrib3dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	6536(%rax), %r11
+	movq	6568(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6536(%rax), %r11
+	movq	6568(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -31046,7 +31242,7 @@ GL_PREFIX(VertexAttrib3dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	6536(%rax), %r11
+	movq	6568(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3dNV), .-GL_PREFIX(VertexAttrib3dNV)
@@ -31057,7 +31253,7 @@ GL_PREFIX(VertexAttrib3dNV):
 GL_PREFIX(VertexAttrib3dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6544(%rax), %r11
+	movq	6576(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31067,13 +31263,13 @@ GL_PREFIX(VertexAttrib3dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6544(%rax), %r11
+	movq	6576(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6544(%rax), %r11
+	movq	6576(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31083,7 +31279,7 @@ GL_PREFIX(VertexAttrib3dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6544(%rax), %r11
+	movq	6576(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3dvNV), .-GL_PREFIX(VertexAttrib3dvNV)
@@ -31094,7 +31290,7 @@ GL_PREFIX(VertexAttrib3dvNV):
 GL_PREFIX(VertexAttrib3fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6552(%rax), %r11
+	movq	6584(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -31108,13 +31304,13 @@ GL_PREFIX(VertexAttrib3fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	6552(%rax), %r11
+	movq	6584(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6552(%rax), %r11
+	movq	6584(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -31128,7 +31324,7 @@ GL_PREFIX(VertexAttrib3fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	6552(%rax), %r11
+	movq	6584(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3fNV), .-GL_PREFIX(VertexAttrib3fNV)
@@ -31139,7 +31335,7 @@ GL_PREFIX(VertexAttrib3fNV):
 GL_PREFIX(VertexAttrib3fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6560(%rax), %r11
+	movq	6592(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31149,13 +31345,13 @@ GL_PREFIX(VertexAttrib3fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6560(%rax), %r11
+	movq	6592(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6560(%rax), %r11
+	movq	6592(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31165,7 +31361,7 @@ GL_PREFIX(VertexAttrib3fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6560(%rax), %r11
+	movq	6592(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3fvNV), .-GL_PREFIX(VertexAttrib3fvNV)
@@ -31176,7 +31372,7 @@ GL_PREFIX(VertexAttrib3fvNV):
 GL_PREFIX(VertexAttrib3sNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6568(%rax), %r11
+	movq	6600(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31190,13 +31386,13 @@ GL_PREFIX(VertexAttrib3sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6568(%rax), %r11
+	movq	6600(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6568(%rax), %r11
+	movq	6600(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31210,7 +31406,7 @@ GL_PREFIX(VertexAttrib3sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6568(%rax), %r11
+	movq	6600(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3sNV), .-GL_PREFIX(VertexAttrib3sNV)
@@ -31221,7 +31417,7 @@ GL_PREFIX(VertexAttrib3sNV):
 GL_PREFIX(VertexAttrib3svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6576(%rax), %r11
+	movq	6608(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31231,13 +31427,13 @@ GL_PREFIX(VertexAttrib3svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6576(%rax), %r11
+	movq	6608(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6576(%rax), %r11
+	movq	6608(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31247,7 +31443,7 @@ GL_PREFIX(VertexAttrib3svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6576(%rax), %r11
+	movq	6608(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib3svNV), .-GL_PREFIX(VertexAttrib3svNV)
@@ -31258,7 +31454,7 @@ GL_PREFIX(VertexAttrib3svNV):
 GL_PREFIX(VertexAttrib4dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6584(%rax), %r11
+	movq	6616(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -31274,13 +31470,13 @@ GL_PREFIX(VertexAttrib4dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	6584(%rax), %r11
+	movq	6616(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6584(%rax), %r11
+	movq	6616(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -31296,7 +31492,7 @@ GL_PREFIX(VertexAttrib4dNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	6584(%rax), %r11
+	movq	6616(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4dNV), .-GL_PREFIX(VertexAttrib4dNV)
@@ -31307,7 +31503,7 @@ GL_PREFIX(VertexAttrib4dNV):
 GL_PREFIX(VertexAttrib4dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6592(%rax), %r11
+	movq	6624(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31317,13 +31513,13 @@ GL_PREFIX(VertexAttrib4dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6592(%rax), %r11
+	movq	6624(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6592(%rax), %r11
+	movq	6624(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31333,7 +31529,7 @@ GL_PREFIX(VertexAttrib4dvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6592(%rax), %r11
+	movq	6624(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4dvNV), .-GL_PREFIX(VertexAttrib4dvNV)
@@ -31344,7 +31540,7 @@ GL_PREFIX(VertexAttrib4dvNV):
 GL_PREFIX(VertexAttrib4fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6600(%rax), %r11
+	movq	6632(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$40, %rsp
@@ -31360,13 +31556,13 @@ GL_PREFIX(VertexAttrib4fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	6600(%rax), %r11
+	movq	6632(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6600(%rax), %r11
+	movq	6632(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$40, %rsp
@@ -31382,7 +31578,7 @@ GL_PREFIX(VertexAttrib4fNV):
 	movq	8(%rsp), %xmm0
 	movq	(%rsp), %rdi
 	addq	$40, %rsp
-	movq	6600(%rax), %r11
+	movq	6632(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4fNV), .-GL_PREFIX(VertexAttrib4fNV)
@@ -31393,7 +31589,7 @@ GL_PREFIX(VertexAttrib4fNV):
 GL_PREFIX(VertexAttrib4fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6608(%rax), %r11
+	movq	6640(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31403,13 +31599,13 @@ GL_PREFIX(VertexAttrib4fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6608(%rax), %r11
+	movq	6640(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6608(%rax), %r11
+	movq	6640(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31419,7 +31615,7 @@ GL_PREFIX(VertexAttrib4fvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6608(%rax), %r11
+	movq	6640(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4fvNV), .-GL_PREFIX(VertexAttrib4fvNV)
@@ -31430,7 +31626,7 @@ GL_PREFIX(VertexAttrib4fvNV):
 GL_PREFIX(VertexAttrib4sNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6616(%rax), %r11
+	movq	6648(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31444,13 +31640,13 @@ GL_PREFIX(VertexAttrib4sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6616(%rax), %r11
+	movq	6648(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6616(%rax), %r11
+	movq	6648(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31464,7 +31660,7 @@ GL_PREFIX(VertexAttrib4sNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6616(%rax), %r11
+	movq	6648(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4sNV), .-GL_PREFIX(VertexAttrib4sNV)
@@ -31475,7 +31671,7 @@ GL_PREFIX(VertexAttrib4sNV):
 GL_PREFIX(VertexAttrib4svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6624(%rax), %r11
+	movq	6656(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31485,13 +31681,13 @@ GL_PREFIX(VertexAttrib4svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6624(%rax), %r11
+	movq	6656(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6624(%rax), %r11
+	movq	6656(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31501,7 +31697,7 @@ GL_PREFIX(VertexAttrib4svNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6624(%rax), %r11
+	movq	6656(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4svNV), .-GL_PREFIX(VertexAttrib4svNV)
@@ -31512,7 +31708,7 @@ GL_PREFIX(VertexAttrib4svNV):
 GL_PREFIX(VertexAttrib4ubNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6632(%rax), %r11
+	movq	6664(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31526,13 +31722,13 @@ GL_PREFIX(VertexAttrib4ubNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6632(%rax), %r11
+	movq	6664(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6632(%rax), %r11
+	movq	6664(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31546,7 +31742,7 @@ GL_PREFIX(VertexAttrib4ubNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6632(%rax), %r11
+	movq	6664(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4ubNV), .-GL_PREFIX(VertexAttrib4ubNV)
@@ -31557,7 +31753,7 @@ GL_PREFIX(VertexAttrib4ubNV):
 GL_PREFIX(VertexAttrib4ubvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6640(%rax), %r11
+	movq	6672(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31567,13 +31763,13 @@ GL_PREFIX(VertexAttrib4ubvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6640(%rax), %r11
+	movq	6672(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6640(%rax), %r11
+	movq	6672(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31583,7 +31779,7 @@ GL_PREFIX(VertexAttrib4ubvNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6640(%rax), %r11
+	movq	6672(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttrib4ubvNV), .-GL_PREFIX(VertexAttrib4ubvNV)
@@ -31594,7 +31790,7 @@ GL_PREFIX(VertexAttrib4ubvNV):
 GL_PREFIX(VertexAttribPointerNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6648(%rax), %r11
+	movq	6680(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31608,13 +31804,13 @@ GL_PREFIX(VertexAttribPointerNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6648(%rax), %r11
+	movq	6680(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6648(%rax), %r11
+	movq	6680(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31628,7 +31824,7 @@ GL_PREFIX(VertexAttribPointerNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6648(%rax), %r11
+	movq	6680(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribPointerNV), .-GL_PREFIX(VertexAttribPointerNV)
@@ -31639,7 +31835,7 @@ GL_PREFIX(VertexAttribPointerNV):
 GL_PREFIX(VertexAttribs1dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6656(%rax), %r11
+	movq	6688(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31649,13 +31845,13 @@ GL_PREFIX(VertexAttribs1dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6656(%rax), %r11
+	movq	6688(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6656(%rax), %r11
+	movq	6688(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31665,7 +31861,7 @@ GL_PREFIX(VertexAttribs1dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6656(%rax), %r11
+	movq	6688(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs1dvNV), .-GL_PREFIX(VertexAttribs1dvNV)
@@ -31676,7 +31872,7 @@ GL_PREFIX(VertexAttribs1dvNV):
 GL_PREFIX(VertexAttribs1fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6664(%rax), %r11
+	movq	6696(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31686,13 +31882,13 @@ GL_PREFIX(VertexAttribs1fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6664(%rax), %r11
+	movq	6696(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6664(%rax), %r11
+	movq	6696(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31702,7 +31898,7 @@ GL_PREFIX(VertexAttribs1fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6664(%rax), %r11
+	movq	6696(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs1fvNV), .-GL_PREFIX(VertexAttribs1fvNV)
@@ -31713,7 +31909,7 @@ GL_PREFIX(VertexAttribs1fvNV):
 GL_PREFIX(VertexAttribs1svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6672(%rax), %r11
+	movq	6704(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31723,13 +31919,13 @@ GL_PREFIX(VertexAttribs1svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6672(%rax), %r11
+	movq	6704(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6672(%rax), %r11
+	movq	6704(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31739,7 +31935,7 @@ GL_PREFIX(VertexAttribs1svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6672(%rax), %r11
+	movq	6704(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs1svNV), .-GL_PREFIX(VertexAttribs1svNV)
@@ -31750,7 +31946,7 @@ GL_PREFIX(VertexAttribs1svNV):
 GL_PREFIX(VertexAttribs2dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6680(%rax), %r11
+	movq	6712(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31760,13 +31956,13 @@ GL_PREFIX(VertexAttribs2dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6680(%rax), %r11
+	movq	6712(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6680(%rax), %r11
+	movq	6712(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31776,7 +31972,7 @@ GL_PREFIX(VertexAttribs2dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6680(%rax), %r11
+	movq	6712(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs2dvNV), .-GL_PREFIX(VertexAttribs2dvNV)
@@ -31787,7 +31983,7 @@ GL_PREFIX(VertexAttribs2dvNV):
 GL_PREFIX(VertexAttribs2fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6688(%rax), %r11
+	movq	6720(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31797,13 +31993,13 @@ GL_PREFIX(VertexAttribs2fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6688(%rax), %r11
+	movq	6720(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6688(%rax), %r11
+	movq	6720(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31813,7 +32009,7 @@ GL_PREFIX(VertexAttribs2fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6688(%rax), %r11
+	movq	6720(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs2fvNV), .-GL_PREFIX(VertexAttribs2fvNV)
@@ -31824,7 +32020,7 @@ GL_PREFIX(VertexAttribs2fvNV):
 GL_PREFIX(VertexAttribs2svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6696(%rax), %r11
+	movq	6728(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31834,13 +32030,13 @@ GL_PREFIX(VertexAttribs2svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6696(%rax), %r11
+	movq	6728(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6696(%rax), %r11
+	movq	6728(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31850,7 +32046,7 @@ GL_PREFIX(VertexAttribs2svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6696(%rax), %r11
+	movq	6728(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs2svNV), .-GL_PREFIX(VertexAttribs2svNV)
@@ -31861,7 +32057,7 @@ GL_PREFIX(VertexAttribs2svNV):
 GL_PREFIX(VertexAttribs3dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6704(%rax), %r11
+	movq	6736(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31871,13 +32067,13 @@ GL_PREFIX(VertexAttribs3dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6704(%rax), %r11
+	movq	6736(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6704(%rax), %r11
+	movq	6736(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31887,7 +32083,7 @@ GL_PREFIX(VertexAttribs3dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6704(%rax), %r11
+	movq	6736(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs3dvNV), .-GL_PREFIX(VertexAttribs3dvNV)
@@ -31898,7 +32094,7 @@ GL_PREFIX(VertexAttribs3dvNV):
 GL_PREFIX(VertexAttribs3fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6712(%rax), %r11
+	movq	6744(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31908,13 +32104,13 @@ GL_PREFIX(VertexAttribs3fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6712(%rax), %r11
+	movq	6744(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6712(%rax), %r11
+	movq	6744(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31924,7 +32120,7 @@ GL_PREFIX(VertexAttribs3fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6712(%rax), %r11
+	movq	6744(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs3fvNV), .-GL_PREFIX(VertexAttribs3fvNV)
@@ -31935,7 +32131,7 @@ GL_PREFIX(VertexAttribs3fvNV):
 GL_PREFIX(VertexAttribs3svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6720(%rax), %r11
+	movq	6752(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31945,13 +32141,13 @@ GL_PREFIX(VertexAttribs3svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6720(%rax), %r11
+	movq	6752(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6720(%rax), %r11
+	movq	6752(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31961,7 +32157,7 @@ GL_PREFIX(VertexAttribs3svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6720(%rax), %r11
+	movq	6752(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs3svNV), .-GL_PREFIX(VertexAttribs3svNV)
@@ -31972,7 +32168,7 @@ GL_PREFIX(VertexAttribs3svNV):
 GL_PREFIX(VertexAttribs4dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6728(%rax), %r11
+	movq	6760(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -31982,13 +32178,13 @@ GL_PREFIX(VertexAttribs4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6728(%rax), %r11
+	movq	6760(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6728(%rax), %r11
+	movq	6760(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -31998,7 +32194,7 @@ GL_PREFIX(VertexAttribs4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6728(%rax), %r11
+	movq	6760(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs4dvNV), .-GL_PREFIX(VertexAttribs4dvNV)
@@ -32009,7 +32205,7 @@ GL_PREFIX(VertexAttribs4dvNV):
 GL_PREFIX(VertexAttribs4fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6736(%rax), %r11
+	movq	6768(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32019,13 +32215,13 @@ GL_PREFIX(VertexAttribs4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6736(%rax), %r11
+	movq	6768(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6736(%rax), %r11
+	movq	6768(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32035,7 +32231,7 @@ GL_PREFIX(VertexAttribs4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6736(%rax), %r11
+	movq	6768(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs4fvNV), .-GL_PREFIX(VertexAttribs4fvNV)
@@ -32046,7 +32242,7 @@ GL_PREFIX(VertexAttribs4fvNV):
 GL_PREFIX(VertexAttribs4svNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6744(%rax), %r11
+	movq	6776(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32056,13 +32252,13 @@ GL_PREFIX(VertexAttribs4svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6744(%rax), %r11
+	movq	6776(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6744(%rax), %r11
+	movq	6776(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32072,7 +32268,7 @@ GL_PREFIX(VertexAttribs4svNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6744(%rax), %r11
+	movq	6776(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs4svNV), .-GL_PREFIX(VertexAttribs4svNV)
@@ -32083,7 +32279,7 @@ GL_PREFIX(VertexAttribs4svNV):
 GL_PREFIX(VertexAttribs4ubvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6752(%rax), %r11
+	movq	6784(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32093,13 +32289,13 @@ GL_PREFIX(VertexAttribs4ubvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6752(%rax), %r11
+	movq	6784(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6752(%rax), %r11
+	movq	6784(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32109,7 +32305,7 @@ GL_PREFIX(VertexAttribs4ubvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6752(%rax), %r11
+	movq	6784(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribs4ubvNV), .-GL_PREFIX(VertexAttribs4ubvNV)
@@ -32120,7 +32316,7 @@ GL_PREFIX(VertexAttribs4ubvNV):
 GL_PREFIX(GetTexBumpParameterfvATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6760(%rax), %r11
+	movq	6792(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32130,13 +32326,13 @@ GL_PREFIX(GetTexBumpParameterfvATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6760(%rax), %r11
+	movq	6792(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6760(%rax), %r11
+	movq	6792(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32146,7 +32342,7 @@ GL_PREFIX(GetTexBumpParameterfvATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6760(%rax), %r11
+	movq	6792(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetTexBumpParameterfvATI), .-GL_PREFIX(GetTexBumpParameterfvATI)
@@ -32157,7 +32353,7 @@ GL_PREFIX(GetTexBumpParameterfvATI):
 GL_PREFIX(GetTexBumpParameterivATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6768(%rax), %r11
+	movq	6800(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32167,13 +32363,13 @@ GL_PREFIX(GetTexBumpParameterivATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6768(%rax), %r11
+	movq	6800(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6768(%rax), %r11
+	movq	6800(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32183,7 +32379,7 @@ GL_PREFIX(GetTexBumpParameterivATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6768(%rax), %r11
+	movq	6800(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetTexBumpParameterivATI), .-GL_PREFIX(GetTexBumpParameterivATI)
@@ -32194,7 +32390,7 @@ GL_PREFIX(GetTexBumpParameterivATI):
 GL_PREFIX(TexBumpParameterfvATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6776(%rax), %r11
+	movq	6808(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32204,13 +32400,13 @@ GL_PREFIX(TexBumpParameterfvATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6776(%rax), %r11
+	movq	6808(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6776(%rax), %r11
+	movq	6808(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32220,7 +32416,7 @@ GL_PREFIX(TexBumpParameterfvATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6776(%rax), %r11
+	movq	6808(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexBumpParameterfvATI), .-GL_PREFIX(TexBumpParameterfvATI)
@@ -32231,7 +32427,7 @@ GL_PREFIX(TexBumpParameterfvATI):
 GL_PREFIX(TexBumpParameterivATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6784(%rax), %r11
+	movq	6816(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32241,13 +32437,13 @@ GL_PREFIX(TexBumpParameterivATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6784(%rax), %r11
+	movq	6816(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6784(%rax), %r11
+	movq	6816(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32257,7 +32453,7 @@ GL_PREFIX(TexBumpParameterivATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6784(%rax), %r11
+	movq	6816(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexBumpParameterivATI), .-GL_PREFIX(TexBumpParameterivATI)
@@ -32268,7 +32464,7 @@ GL_PREFIX(TexBumpParameterivATI):
 GL_PREFIX(AlphaFragmentOp1ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6792(%rax), %r11
+	movq	6824(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32286,13 +32482,13 @@ GL_PREFIX(AlphaFragmentOp1ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6792(%rax), %r11
+	movq	6824(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6792(%rax), %r11
+	movq	6824(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32310,7 +32506,7 @@ GL_PREFIX(AlphaFragmentOp1ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6792(%rax), %r11
+	movq	6824(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(AlphaFragmentOp1ATI), .-GL_PREFIX(AlphaFragmentOp1ATI)
@@ -32321,7 +32517,7 @@ GL_PREFIX(AlphaFragmentOp1ATI):
 GL_PREFIX(AlphaFragmentOp2ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6800(%rax), %r11
+	movq	6832(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32339,13 +32535,13 @@ GL_PREFIX(AlphaFragmentOp2ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6800(%rax), %r11
+	movq	6832(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6800(%rax), %r11
+	movq	6832(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32363,7 +32559,7 @@ GL_PREFIX(AlphaFragmentOp2ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6800(%rax), %r11
+	movq	6832(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(AlphaFragmentOp2ATI), .-GL_PREFIX(AlphaFragmentOp2ATI)
@@ -32374,7 +32570,7 @@ GL_PREFIX(AlphaFragmentOp2ATI):
 GL_PREFIX(AlphaFragmentOp3ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6808(%rax), %r11
+	movq	6840(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32392,13 +32588,13 @@ GL_PREFIX(AlphaFragmentOp3ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6808(%rax), %r11
+	movq	6840(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6808(%rax), %r11
+	movq	6840(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32416,7 +32612,7 @@ GL_PREFIX(AlphaFragmentOp3ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6808(%rax), %r11
+	movq	6840(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(AlphaFragmentOp3ATI), .-GL_PREFIX(AlphaFragmentOp3ATI)
@@ -32427,25 +32623,25 @@ GL_PREFIX(AlphaFragmentOp3ATI):
 GL_PREFIX(BeginFragmentShaderATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6816(%rax), %r11
+	movq	6848(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	6816(%rax), %r11
+	movq	6848(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6816(%rax), %r11
+	movq	6848(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	6816(%rax), %r11
+	movq	6848(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BeginFragmentShaderATI), .-GL_PREFIX(BeginFragmentShaderATI)
@@ -32456,25 +32652,25 @@ GL_PREFIX(BeginFragmentShaderATI):
 GL_PREFIX(BindFragmentShaderATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6824(%rax), %r11
+	movq	6856(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6824(%rax), %r11
+	movq	6856(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6824(%rax), %r11
+	movq	6856(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6824(%rax), %r11
+	movq	6856(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindFragmentShaderATI), .-GL_PREFIX(BindFragmentShaderATI)
@@ -32485,7 +32681,7 @@ GL_PREFIX(BindFragmentShaderATI):
 GL_PREFIX(ColorFragmentOp1ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6832(%rax), %r11
+	movq	6864(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32503,13 +32699,13 @@ GL_PREFIX(ColorFragmentOp1ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6832(%rax), %r11
+	movq	6864(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6832(%rax), %r11
+	movq	6864(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32527,7 +32723,7 @@ GL_PREFIX(ColorFragmentOp1ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6832(%rax), %r11
+	movq	6864(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorFragmentOp1ATI), .-GL_PREFIX(ColorFragmentOp1ATI)
@@ -32538,7 +32734,7 @@ GL_PREFIX(ColorFragmentOp1ATI):
 GL_PREFIX(ColorFragmentOp2ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6840(%rax), %r11
+	movq	6872(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32556,13 +32752,13 @@ GL_PREFIX(ColorFragmentOp2ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6840(%rax), %r11
+	movq	6872(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6840(%rax), %r11
+	movq	6872(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32580,7 +32776,7 @@ GL_PREFIX(ColorFragmentOp2ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6840(%rax), %r11
+	movq	6872(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorFragmentOp2ATI), .-GL_PREFIX(ColorFragmentOp2ATI)
@@ -32591,7 +32787,7 @@ GL_PREFIX(ColorFragmentOp2ATI):
 GL_PREFIX(ColorFragmentOp3ATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6848(%rax), %r11
+	movq	6880(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32609,13 +32805,13 @@ GL_PREFIX(ColorFragmentOp3ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6848(%rax), %r11
+	movq	6880(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6848(%rax), %r11
+	movq	6880(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32633,7 +32829,7 @@ GL_PREFIX(ColorFragmentOp3ATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6848(%rax), %r11
+	movq	6880(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorFragmentOp3ATI), .-GL_PREFIX(ColorFragmentOp3ATI)
@@ -32644,25 +32840,25 @@ GL_PREFIX(ColorFragmentOp3ATI):
 GL_PREFIX(DeleteFragmentShaderATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6856(%rax), %r11
+	movq	6888(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6856(%rax), %r11
+	movq	6888(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6856(%rax), %r11
+	movq	6888(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6856(%rax), %r11
+	movq	6888(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteFragmentShaderATI), .-GL_PREFIX(DeleteFragmentShaderATI)
@@ -32673,25 +32869,25 @@ GL_PREFIX(DeleteFragmentShaderATI):
 GL_PREFIX(EndFragmentShaderATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6864(%rax), %r11
+	movq	6896(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	6864(%rax), %r11
+	movq	6896(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6864(%rax), %r11
+	movq	6896(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	6864(%rax), %r11
+	movq	6896(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(EndFragmentShaderATI), .-GL_PREFIX(EndFragmentShaderATI)
@@ -32702,25 +32898,25 @@ GL_PREFIX(EndFragmentShaderATI):
 GL_PREFIX(GenFragmentShadersATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6872(%rax), %r11
+	movq	6904(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6872(%rax), %r11
+	movq	6904(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6872(%rax), %r11
+	movq	6904(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6872(%rax), %r11
+	movq	6904(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenFragmentShadersATI), .-GL_PREFIX(GenFragmentShadersATI)
@@ -32731,7 +32927,7 @@ GL_PREFIX(GenFragmentShadersATI):
 GL_PREFIX(PassTexCoordATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6880(%rax), %r11
+	movq	6912(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32741,13 +32937,13 @@ GL_PREFIX(PassTexCoordATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6880(%rax), %r11
+	movq	6912(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6880(%rax), %r11
+	movq	6912(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32757,7 +32953,7 @@ GL_PREFIX(PassTexCoordATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6880(%rax), %r11
+	movq	6912(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PassTexCoordATI), .-GL_PREFIX(PassTexCoordATI)
@@ -32768,7 +32964,7 @@ GL_PREFIX(PassTexCoordATI):
 GL_PREFIX(SampleMapATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6888(%rax), %r11
+	movq	6920(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32778,13 +32974,13 @@ GL_PREFIX(SampleMapATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6888(%rax), %r11
+	movq	6920(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6888(%rax), %r11
+	movq	6920(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32794,7 +32990,7 @@ GL_PREFIX(SampleMapATI):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6888(%rax), %r11
+	movq	6920(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SampleMapATI), .-GL_PREFIX(SampleMapATI)
@@ -32805,7 +33001,7 @@ GL_PREFIX(SampleMapATI):
 GL_PREFIX(SetFragmentShaderConstantATI):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6896(%rax), %r11
+	movq	6928(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32815,13 +33011,13 @@ GL_PREFIX(SetFragmentShaderConstantATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6896(%rax), %r11
+	movq	6928(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6896(%rax), %r11
+	movq	6928(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32831,7 +33027,7 @@ GL_PREFIX(SetFragmentShaderConstantATI):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6896(%rax), %r11
+	movq	6928(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(SetFragmentShaderConstantATI), .-GL_PREFIX(SetFragmentShaderConstantATI)
@@ -32842,7 +33038,7 @@ GL_PREFIX(SetFragmentShaderConstantATI):
 GL_PREFIX(PointParameteriNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6904(%rax), %r11
+	movq	6936(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32852,13 +33048,13 @@ GL_PREFIX(PointParameteriNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6904(%rax), %r11
+	movq	6936(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6904(%rax), %r11
+	movq	6936(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32868,7 +33064,7 @@ GL_PREFIX(PointParameteriNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6904(%rax), %r11
+	movq	6936(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PointParameteriNV), .-GL_PREFIX(PointParameteriNV)
@@ -32879,7 +33075,7 @@ GL_PREFIX(PointParameteriNV):
 GL_PREFIX(PointParameterivNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6912(%rax), %r11
+	movq	6944(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32889,13 +33085,13 @@ GL_PREFIX(PointParameterivNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6912(%rax), %r11
+	movq	6944(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6912(%rax), %r11
+	movq	6944(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -32905,79 +33101,79 @@ GL_PREFIX(PointParameterivNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6912(%rax), %r11
+	movq	6944(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PointParameterivNV), .-GL_PREFIX(PointParameterivNV)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_865)
-	.type	GL_PREFIX(_dispatch_stub_865), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_865))
-GL_PREFIX(_dispatch_stub_865):
+	.globl	GL_PREFIX(_dispatch_stub_869)
+	.type	GL_PREFIX(_dispatch_stub_869), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_869))
+GL_PREFIX(_dispatch_stub_869):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6920(%rax), %r11
+	movq	6952(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6920(%rax), %r11
+	movq	6952(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6920(%rax), %r11
+	movq	6952(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6920(%rax), %r11
+	movq	6952(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_865), .-GL_PREFIX(_dispatch_stub_865)
+	.size	GL_PREFIX(_dispatch_stub_869), .-GL_PREFIX(_dispatch_stub_869)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_866)
-	.type	GL_PREFIX(_dispatch_stub_866), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_866))
-GL_PREFIX(_dispatch_stub_866):
+	.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	6928(%rax), %r11
+	movq	6960(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6928(%rax), %r11
+	movq	6960(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6928(%rax), %r11
+	movq	6960(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6928(%rax), %r11
+	movq	6960(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_866), .-GL_PREFIX(_dispatch_stub_866)
+	.size	GL_PREFIX(_dispatch_stub_870), .-GL_PREFIX(_dispatch_stub_870)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_867)
-	.type	GL_PREFIX(_dispatch_stub_867), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_867))
-GL_PREFIX(_dispatch_stub_867):
+	.globl	GL_PREFIX(_dispatch_stub_871)
+	.type	GL_PREFIX(_dispatch_stub_871), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_871))
+GL_PREFIX(_dispatch_stub_871):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6936(%rax), %r11
+	movq	6968(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -32987,13 +33183,13 @@ GL_PREFIX(_dispatch_stub_867):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6936(%rax), %r11
+	movq	6968(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6936(%rax), %r11
+	movq	6968(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33003,19 +33199,19 @@ GL_PREFIX(_dispatch_stub_867):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6936(%rax), %r11
+	movq	6968(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_867), .-GL_PREFIX(_dispatch_stub_867)
+	.size	GL_PREFIX(_dispatch_stub_871), .-GL_PREFIX(_dispatch_stub_871)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_868)
-	.type	GL_PREFIX(_dispatch_stub_868), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_868))
-GL_PREFIX(_dispatch_stub_868):
+	.globl	GL_PREFIX(_dispatch_stub_872)
+	.type	GL_PREFIX(_dispatch_stub_872), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_872))
+GL_PREFIX(_dispatch_stub_872):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6944(%rax), %r11
+	movq	6976(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33025,13 +33221,13 @@ GL_PREFIX(_dispatch_stub_868):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6944(%rax), %r11
+	movq	6976(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6944(%rax), %r11
+	movq	6976(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33041,40 +33237,40 @@ GL_PREFIX(_dispatch_stub_868):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	6944(%rax), %r11
+	movq	6976(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_868), .-GL_PREFIX(_dispatch_stub_868)
+	.size	GL_PREFIX(_dispatch_stub_872), .-GL_PREFIX(_dispatch_stub_872)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_869)
-	.type	GL_PREFIX(_dispatch_stub_869), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_869))
-GL_PREFIX(_dispatch_stub_869):
+	.globl	GL_PREFIX(_dispatch_stub_873)
+	.type	GL_PREFIX(_dispatch_stub_873), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_873))
+GL_PREFIX(_dispatch_stub_873):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6952(%rax), %r11
+	movq	6984(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	6952(%rax), %r11
+	movq	6984(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6952(%rax), %r11
+	movq	6984(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	6952(%rax), %r11
+	movq	6984(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_869), .-GL_PREFIX(_dispatch_stub_869)
+	.size	GL_PREFIX(_dispatch_stub_873), .-GL_PREFIX(_dispatch_stub_873)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(GetProgramNamedParameterdvNV)
@@ -33082,7 +33278,7 @@ GL_PREFIX(_dispatch_stub_869):
 GL_PREFIX(GetProgramNamedParameterdvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6960(%rax), %r11
+	movq	6992(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33096,13 +33292,13 @@ GL_PREFIX(GetProgramNamedParameterdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6960(%rax), %r11
+	movq	6992(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6960(%rax), %r11
+	movq	6992(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33116,7 +33312,7 @@ GL_PREFIX(GetProgramNamedParameterdvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6960(%rax), %r11
+	movq	6992(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramNamedParameterdvNV), .-GL_PREFIX(GetProgramNamedParameterdvNV)
@@ -33127,7 +33323,7 @@ GL_PREFIX(GetProgramNamedParameterdvNV):
 GL_PREFIX(GetProgramNamedParameterfvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6968(%rax), %r11
+	movq	7000(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33141,13 +33337,13 @@ GL_PREFIX(GetProgramNamedParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6968(%rax), %r11
+	movq	7000(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6968(%rax), %r11
+	movq	7000(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33161,7 +33357,7 @@ GL_PREFIX(GetProgramNamedParameterfvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6968(%rax), %r11
+	movq	7000(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetProgramNamedParameterfvNV), .-GL_PREFIX(GetProgramNamedParameterfvNV)
@@ -33172,7 +33368,7 @@ GL_PREFIX(GetProgramNamedParameterfvNV):
 GL_PREFIX(ProgramNamedParameter4dNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6976(%rax), %r11
+	movq	7008(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$56, %rsp
@@ -33192,13 +33388,13 @@ GL_PREFIX(ProgramNamedParameter4dNV):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	6976(%rax), %r11
+	movq	7008(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6976(%rax), %r11
+	movq	7008(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$56, %rsp
@@ -33218,7 +33414,7 @@ GL_PREFIX(ProgramNamedParameter4dNV):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	6976(%rax), %r11
+	movq	7008(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramNamedParameter4dNV), .-GL_PREFIX(ProgramNamedParameter4dNV)
@@ -33229,7 +33425,7 @@ GL_PREFIX(ProgramNamedParameter4dNV):
 GL_PREFIX(ProgramNamedParameter4dvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6984(%rax), %r11
+	movq	7016(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33243,13 +33439,13 @@ GL_PREFIX(ProgramNamedParameter4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6984(%rax), %r11
+	movq	7016(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6984(%rax), %r11
+	movq	7016(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33263,7 +33459,7 @@ GL_PREFIX(ProgramNamedParameter4dvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	6984(%rax), %r11
+	movq	7016(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramNamedParameter4dvNV), .-GL_PREFIX(ProgramNamedParameter4dvNV)
@@ -33274,7 +33470,7 @@ GL_PREFIX(ProgramNamedParameter4dvNV):
 GL_PREFIX(ProgramNamedParameter4fNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	6992(%rax), %r11
+	movq	7024(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	subq	$56, %rsp
@@ -33294,13 +33490,13 @@ GL_PREFIX(ProgramNamedParameter4fNV):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	6992(%rax), %r11
+	movq	7024(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	6992(%rax), %r11
+	movq	7024(%rax), %r11
 	jmp	*%r11
 1:
 	subq	$56, %rsp
@@ -33320,7 +33516,7 @@ GL_PREFIX(ProgramNamedParameter4fNV):
 	movq	8(%rsp), %rsi
 	movq	(%rsp), %rdi
 	addq	$56, %rsp
-	movq	6992(%rax), %r11
+	movq	7024(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramNamedParameter4fNV), .-GL_PREFIX(ProgramNamedParameter4fNV)
@@ -33331,7 +33527,7 @@ GL_PREFIX(ProgramNamedParameter4fNV):
 GL_PREFIX(ProgramNamedParameter4fvNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7000(%rax), %r11
+	movq	7032(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33345,13 +33541,13 @@ GL_PREFIX(ProgramNamedParameter4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7000(%rax), %r11
+	movq	7032(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7000(%rax), %r11
+	movq	7032(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33365,7 +33561,7 @@ GL_PREFIX(ProgramNamedParameter4fvNV):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7000(%rax), %r11
+	movq	7032(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProgramNamedParameter4fvNV), .-GL_PREFIX(ProgramNamedParameter4fvNV)
@@ -33376,25 +33572,25 @@ GL_PREFIX(ProgramNamedParameter4fvNV):
 GL_PREFIX(PrimitiveRestartIndexNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7008(%rax), %r11
+	movq	7040(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	7008(%rax), %r11
+	movq	7040(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7008(%rax), %r11
+	movq	7040(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	7008(%rax), %r11
+	movq	7040(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PrimitiveRestartIndexNV), .-GL_PREFIX(PrimitiveRestartIndexNV)
@@ -33405,37 +33601,37 @@ GL_PREFIX(PrimitiveRestartIndexNV):
 GL_PREFIX(PrimitiveRestartNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7016(%rax), %r11
+	movq	7048(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	7016(%rax), %r11
+	movq	7048(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7016(%rax), %r11
+	movq	7048(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	7016(%rax), %r11
+	movq	7048(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(PrimitiveRestartNV), .-GL_PREFIX(PrimitiveRestartNV)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_878)
-	.type	GL_PREFIX(_dispatch_stub_878), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_878))
-GL_PREFIX(_dispatch_stub_878):
+	.globl	GL_PREFIX(_dispatch_stub_882)
+	.type	GL_PREFIX(_dispatch_stub_882), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_882))
+GL_PREFIX(_dispatch_stub_882):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7024(%rax), %r11
+	movq	7056(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33445,13 +33641,13 @@ GL_PREFIX(_dispatch_stub_878):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7024(%rax), %r11
+	movq	7056(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7024(%rax), %r11
+	movq	7056(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33461,19 +33657,19 @@ GL_PREFIX(_dispatch_stub_878):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7024(%rax), %r11
+	movq	7056(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_878), .-GL_PREFIX(_dispatch_stub_878)
+	.size	GL_PREFIX(_dispatch_stub_882), .-GL_PREFIX(_dispatch_stub_882)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_879)
-	.type	GL_PREFIX(_dispatch_stub_879), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_879))
-GL_PREFIX(_dispatch_stub_879):
+	.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	7032(%rax), %r11
+	movq	7064(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33483,13 +33679,13 @@ GL_PREFIX(_dispatch_stub_879):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7032(%rax), %r11
+	movq	7064(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7032(%rax), %r11
+	movq	7064(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33499,10 +33695,10 @@ GL_PREFIX(_dispatch_stub_879):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7032(%rax), %r11
+	movq	7064(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_879), .-GL_PREFIX(_dispatch_stub_879)
+	.size	GL_PREFIX(_dispatch_stub_883), .-GL_PREFIX(_dispatch_stub_883)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(BindFramebufferEXT)
@@ -33510,7 +33706,7 @@ GL_PREFIX(_dispatch_stub_879):
 GL_PREFIX(BindFramebufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7040(%rax), %r11
+	movq	7072(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33520,13 +33716,13 @@ GL_PREFIX(BindFramebufferEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7040(%rax), %r11
+	movq	7072(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7040(%rax), %r11
+	movq	7072(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33536,7 +33732,7 @@ GL_PREFIX(BindFramebufferEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7040(%rax), %r11
+	movq	7072(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindFramebufferEXT), .-GL_PREFIX(BindFramebufferEXT)
@@ -33547,7 +33743,7 @@ GL_PREFIX(BindFramebufferEXT):
 GL_PREFIX(BindRenderbufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7048(%rax), %r11
+	movq	7080(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33557,13 +33753,13 @@ GL_PREFIX(BindRenderbufferEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7048(%rax), %r11
+	movq	7080(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7048(%rax), %r11
+	movq	7080(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33573,7 +33769,7 @@ GL_PREFIX(BindRenderbufferEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7048(%rax), %r11
+	movq	7080(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindRenderbufferEXT), .-GL_PREFIX(BindRenderbufferEXT)
@@ -33584,25 +33780,25 @@ GL_PREFIX(BindRenderbufferEXT):
 GL_PREFIX(CheckFramebufferStatusEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7056(%rax), %r11
+	movq	7088(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	7056(%rax), %r11
+	movq	7088(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7056(%rax), %r11
+	movq	7088(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	7056(%rax), %r11
+	movq	7088(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CheckFramebufferStatusEXT), .-GL_PREFIX(CheckFramebufferStatusEXT)
@@ -33613,7 +33809,7 @@ GL_PREFIX(CheckFramebufferStatusEXT):
 GL_PREFIX(DeleteFramebuffersEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7064(%rax), %r11
+	movq	7096(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33623,13 +33819,13 @@ GL_PREFIX(DeleteFramebuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7064(%rax), %r11
+	movq	7096(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7064(%rax), %r11
+	movq	7096(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33639,7 +33835,7 @@ GL_PREFIX(DeleteFramebuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7064(%rax), %r11
+	movq	7096(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteFramebuffersEXT), .-GL_PREFIX(DeleteFramebuffersEXT)
@@ -33650,7 +33846,7 @@ GL_PREFIX(DeleteFramebuffersEXT):
 GL_PREFIX(DeleteRenderbuffersEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7072(%rax), %r11
+	movq	7104(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33660,13 +33856,13 @@ GL_PREFIX(DeleteRenderbuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7072(%rax), %r11
+	movq	7104(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7072(%rax), %r11
+	movq	7104(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33676,7 +33872,7 @@ GL_PREFIX(DeleteRenderbuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7072(%rax), %r11
+	movq	7104(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DeleteRenderbuffersEXT), .-GL_PREFIX(DeleteRenderbuffersEXT)
@@ -33687,7 +33883,7 @@ GL_PREFIX(DeleteRenderbuffersEXT):
 GL_PREFIX(FramebufferRenderbufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7080(%rax), %r11
+	movq	7112(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33701,13 +33897,13 @@ GL_PREFIX(FramebufferRenderbufferEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7080(%rax), %r11
+	movq	7112(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7080(%rax), %r11
+	movq	7112(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33721,7 +33917,7 @@ GL_PREFIX(FramebufferRenderbufferEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7080(%rax), %r11
+	movq	7112(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferRenderbufferEXT), .-GL_PREFIX(FramebufferRenderbufferEXT)
@@ -33732,7 +33928,7 @@ GL_PREFIX(FramebufferRenderbufferEXT):
 GL_PREFIX(FramebufferTexture1DEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7088(%rax), %r11
+	movq	7120(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33746,13 +33942,13 @@ GL_PREFIX(FramebufferTexture1DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7088(%rax), %r11
+	movq	7120(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7088(%rax), %r11
+	movq	7120(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33766,7 +33962,7 @@ GL_PREFIX(FramebufferTexture1DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7088(%rax), %r11
+	movq	7120(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTexture1DEXT), .-GL_PREFIX(FramebufferTexture1DEXT)
@@ -33777,7 +33973,7 @@ GL_PREFIX(FramebufferTexture1DEXT):
 GL_PREFIX(FramebufferTexture2DEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7096(%rax), %r11
+	movq	7128(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33791,13 +33987,13 @@ GL_PREFIX(FramebufferTexture2DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7096(%rax), %r11
+	movq	7128(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7096(%rax), %r11
+	movq	7128(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33811,7 +34007,7 @@ GL_PREFIX(FramebufferTexture2DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7096(%rax), %r11
+	movq	7128(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTexture2DEXT), .-GL_PREFIX(FramebufferTexture2DEXT)
@@ -33822,7 +34018,7 @@ GL_PREFIX(FramebufferTexture2DEXT):
 GL_PREFIX(FramebufferTexture3DEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7104(%rax), %r11
+	movq	7136(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33840,13 +34036,13 @@ GL_PREFIX(FramebufferTexture3DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7104(%rax), %r11
+	movq	7136(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7104(%rax), %r11
+	movq	7136(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33864,7 +34060,7 @@ GL_PREFIX(FramebufferTexture3DEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7104(%rax), %r11
+	movq	7136(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTexture3DEXT), .-GL_PREFIX(FramebufferTexture3DEXT)
@@ -33875,7 +34071,7 @@ GL_PREFIX(FramebufferTexture3DEXT):
 GL_PREFIX(GenFramebuffersEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7112(%rax), %r11
+	movq	7144(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33885,13 +34081,13 @@ GL_PREFIX(GenFramebuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7112(%rax), %r11
+	movq	7144(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7112(%rax), %r11
+	movq	7144(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33901,7 +34097,7 @@ GL_PREFIX(GenFramebuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7112(%rax), %r11
+	movq	7144(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenFramebuffersEXT), .-GL_PREFIX(GenFramebuffersEXT)
@@ -33912,7 +34108,7 @@ GL_PREFIX(GenFramebuffersEXT):
 GL_PREFIX(GenRenderbuffersEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7120(%rax), %r11
+	movq	7152(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33922,13 +34118,13 @@ GL_PREFIX(GenRenderbuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7120(%rax), %r11
+	movq	7152(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7120(%rax), %r11
+	movq	7152(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -33938,7 +34134,7 @@ GL_PREFIX(GenRenderbuffersEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7120(%rax), %r11
+	movq	7152(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenRenderbuffersEXT), .-GL_PREFIX(GenRenderbuffersEXT)
@@ -33949,25 +34145,25 @@ GL_PREFIX(GenRenderbuffersEXT):
 GL_PREFIX(GenerateMipmapEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7128(%rax), %r11
+	movq	7160(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	7128(%rax), %r11
+	movq	7160(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7128(%rax), %r11
+	movq	7160(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	7128(%rax), %r11
+	movq	7160(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GenerateMipmapEXT), .-GL_PREFIX(GenerateMipmapEXT)
@@ -33978,7 +34174,7 @@ GL_PREFIX(GenerateMipmapEXT):
 GL_PREFIX(GetFramebufferAttachmentParameterivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7136(%rax), %r11
+	movq	7168(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -33992,13 +34188,13 @@ GL_PREFIX(GetFramebufferAttachmentParameterivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7136(%rax), %r11
+	movq	7168(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7136(%rax), %r11
+	movq	7168(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34012,7 +34208,7 @@ GL_PREFIX(GetFramebufferAttachmentParameterivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7136(%rax), %r11
+	movq	7168(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetFramebufferAttachmentParameterivEXT), .-GL_PREFIX(GetFramebufferAttachmentParameterivEXT)
@@ -34023,7 +34219,7 @@ GL_PREFIX(GetFramebufferAttachmentParameterivEXT):
 GL_PREFIX(GetRenderbufferParameterivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7144(%rax), %r11
+	movq	7176(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34033,13 +34229,13 @@ GL_PREFIX(GetRenderbufferParameterivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7144(%rax), %r11
+	movq	7176(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7144(%rax), %r11
+	movq	7176(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34049,7 +34245,7 @@ GL_PREFIX(GetRenderbufferParameterivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7144(%rax), %r11
+	movq	7176(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetRenderbufferParameterivEXT), .-GL_PREFIX(GetRenderbufferParameterivEXT)
@@ -34060,25 +34256,25 @@ GL_PREFIX(GetRenderbufferParameterivEXT):
 GL_PREFIX(IsFramebufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7152(%rax), %r11
+	movq	7184(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	7152(%rax), %r11
+	movq	7184(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7152(%rax), %r11
+	movq	7184(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	7152(%rax), %r11
+	movq	7184(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IsFramebufferEXT), .-GL_PREFIX(IsFramebufferEXT)
@@ -34089,25 +34285,25 @@ GL_PREFIX(IsFramebufferEXT):
 GL_PREFIX(IsRenderbufferEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7160(%rax), %r11
+	movq	7192(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	7160(%rax), %r11
+	movq	7192(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7160(%rax), %r11
+	movq	7192(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	7160(%rax), %r11
+	movq	7192(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IsRenderbufferEXT), .-GL_PREFIX(IsRenderbufferEXT)
@@ -34118,7 +34314,7 @@ GL_PREFIX(IsRenderbufferEXT):
 GL_PREFIX(RenderbufferStorageEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7168(%rax), %r11
+	movq	7200(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34132,13 +34328,13 @@ GL_PREFIX(RenderbufferStorageEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7168(%rax), %r11
+	movq	7200(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7168(%rax), %r11
+	movq	7200(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34152,19 +34348,19 @@ GL_PREFIX(RenderbufferStorageEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7168(%rax), %r11
+	movq	7200(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(RenderbufferStorageEXT), .-GL_PREFIX(RenderbufferStorageEXT)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_897)
-	.type	GL_PREFIX(_dispatch_stub_897), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_897))
-GL_PREFIX(_dispatch_stub_897):
+	.globl	GL_PREFIX(_dispatch_stub_901)
+	.type	GL_PREFIX(_dispatch_stub_901), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_901))
+GL_PREFIX(_dispatch_stub_901):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7176(%rax), %r11
+	movq	7208(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34182,13 +34378,13 @@ GL_PREFIX(_dispatch_stub_897):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7176(%rax), %r11
+	movq	7208(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7176(%rax), %r11
+	movq	7208(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34206,19 +34402,19 @@ GL_PREFIX(_dispatch_stub_897):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7176(%rax), %r11
+	movq	7208(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_897), .-GL_PREFIX(_dispatch_stub_897)
+	.size	GL_PREFIX(_dispatch_stub_901), .-GL_PREFIX(_dispatch_stub_901)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_898)
-	.type	GL_PREFIX(_dispatch_stub_898), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_898))
-GL_PREFIX(_dispatch_stub_898):
+	.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	7184(%rax), %r11
+	movq	7216(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34228,13 +34424,13 @@ GL_PREFIX(_dispatch_stub_898):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7184(%rax), %r11
+	movq	7216(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7184(%rax), %r11
+	movq	7216(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34244,19 +34440,19 @@ GL_PREFIX(_dispatch_stub_898):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7184(%rax), %r11
+	movq	7216(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_898), .-GL_PREFIX(_dispatch_stub_898)
+	.size	GL_PREFIX(_dispatch_stub_902), .-GL_PREFIX(_dispatch_stub_902)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_899)
-	.type	GL_PREFIX(_dispatch_stub_899), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_899))
-GL_PREFIX(_dispatch_stub_899):
+	.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	7192(%rax), %r11
+	movq	7224(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34266,13 +34462,13 @@ GL_PREFIX(_dispatch_stub_899):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7192(%rax), %r11
+	movq	7224(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7192(%rax), %r11
+	movq	7224(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34282,10 +34478,10 @@ GL_PREFIX(_dispatch_stub_899):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7192(%rax), %r11
+	movq	7224(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_899), .-GL_PREFIX(_dispatch_stub_899)
+	.size	GL_PREFIX(_dispatch_stub_903), .-GL_PREFIX(_dispatch_stub_903)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(BindFragDataLocationEXT)
@@ -34293,7 +34489,7 @@ GL_PREFIX(_dispatch_stub_899):
 GL_PREFIX(BindFragDataLocationEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7200(%rax), %r11
+	movq	7232(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34303,13 +34499,13 @@ GL_PREFIX(BindFragDataLocationEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7200(%rax), %r11
+	movq	7232(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7200(%rax), %r11
+	movq	7232(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34319,7 +34515,7 @@ GL_PREFIX(BindFragDataLocationEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7200(%rax), %r11
+	movq	7232(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindFragDataLocationEXT), .-GL_PREFIX(BindFragDataLocationEXT)
@@ -34330,7 +34526,7 @@ GL_PREFIX(BindFragDataLocationEXT):
 GL_PREFIX(GetFragDataLocationEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7208(%rax), %r11
+	movq	7240(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34340,13 +34536,13 @@ GL_PREFIX(GetFragDataLocationEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7208(%rax), %r11
+	movq	7240(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7208(%rax), %r11
+	movq	7240(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34356,7 +34552,7 @@ GL_PREFIX(GetFragDataLocationEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7208(%rax), %r11
+	movq	7240(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetFragDataLocationEXT), .-GL_PREFIX(GetFragDataLocationEXT)
@@ -34367,7 +34563,7 @@ GL_PREFIX(GetFragDataLocationEXT):
 GL_PREFIX(GetUniformuivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7216(%rax), %r11
+	movq	7248(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34377,13 +34573,13 @@ GL_PREFIX(GetUniformuivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7216(%rax), %r11
+	movq	7248(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7216(%rax), %r11
+	movq	7248(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34393,7 +34589,7 @@ GL_PREFIX(GetUniformuivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7216(%rax), %r11
+	movq	7248(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetUniformuivEXT), .-GL_PREFIX(GetUniformuivEXT)
@@ -34404,7 +34600,7 @@ GL_PREFIX(GetUniformuivEXT):
 GL_PREFIX(GetVertexAttribIivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7224(%rax), %r11
+	movq	7256(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34414,13 +34610,13 @@ GL_PREFIX(GetVertexAttribIivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7224(%rax), %r11
+	movq	7256(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7224(%rax), %r11
+	movq	7256(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34430,7 +34626,7 @@ GL_PREFIX(GetVertexAttribIivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7224(%rax), %r11
+	movq	7256(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribIivEXT), .-GL_PREFIX(GetVertexAttribIivEXT)
@@ -34441,7 +34637,7 @@ GL_PREFIX(GetVertexAttribIivEXT):
 GL_PREFIX(GetVertexAttribIuivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7232(%rax), %r11
+	movq	7264(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34451,13 +34647,13 @@ GL_PREFIX(GetVertexAttribIuivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7232(%rax), %r11
+	movq	7264(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7232(%rax), %r11
+	movq	7264(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34467,7 +34663,7 @@ GL_PREFIX(GetVertexAttribIuivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7232(%rax), %r11
+	movq	7264(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetVertexAttribIuivEXT), .-GL_PREFIX(GetVertexAttribIuivEXT)
@@ -34478,7 +34674,7 @@ GL_PREFIX(GetVertexAttribIuivEXT):
 GL_PREFIX(Uniform1uiEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7240(%rax), %r11
+	movq	7272(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34488,13 +34684,13 @@ GL_PREFIX(Uniform1uiEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7240(%rax), %r11
+	movq	7272(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7240(%rax), %r11
+	movq	7272(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34504,7 +34700,7 @@ GL_PREFIX(Uniform1uiEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7240(%rax), %r11
+	movq	7272(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(Uniform1uiEXT), .-GL_PREFIX(Uniform1uiEXT)
@@ -34515,7 +34711,7 @@ GL_PREFIX(Uniform1uiEXT):
 GL_PREFIX(Uniform1uivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7248(%rax), %r11
+	movq	7280(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34525,13 +34721,13 @@ GL_PREFIX(Uniform1uivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7248(%rax), %r11
+	movq	7280(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7248(%rax), %r11
+	movq	7280(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34541,7 +34737,7 @@ GL_PREFIX(Uniform1uivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7248(%rax), %r11
+	movq	7280(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(Uniform1uivEXT), .-GL_PREFIX(Uniform1uivEXT)
@@ -34552,7 +34748,7 @@ GL_PREFIX(Uniform1uivEXT):
 GL_PREFIX(Uniform2uiEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7256(%rax), %r11
+	movq	7288(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34562,13 +34758,13 @@ GL_PREFIX(Uniform2uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7256(%rax), %r11
+	movq	7288(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7256(%rax), %r11
+	movq	7288(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34578,7 +34774,7 @@ GL_PREFIX(Uniform2uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7256(%rax), %r11
+	movq	7288(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(Uniform2uiEXT), .-GL_PREFIX(Uniform2uiEXT)
@@ -34589,7 +34785,7 @@ GL_PREFIX(Uniform2uiEXT):
 GL_PREFIX(Uniform2uivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7264(%rax), %r11
+	movq	7296(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34599,13 +34795,13 @@ GL_PREFIX(Uniform2uivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7264(%rax), %r11
+	movq	7296(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7264(%rax), %r11
+	movq	7296(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34615,7 +34811,7 @@ GL_PREFIX(Uniform2uivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7264(%rax), %r11
+	movq	7296(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(Uniform2uivEXT), .-GL_PREFIX(Uniform2uivEXT)
@@ -34626,7 +34822,7 @@ GL_PREFIX(Uniform2uivEXT):
 GL_PREFIX(Uniform3uiEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7272(%rax), %r11
+	movq	7304(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34640,13 +34836,13 @@ GL_PREFIX(Uniform3uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7272(%rax), %r11
+	movq	7304(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7272(%rax), %r11
+	movq	7304(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34660,7 +34856,7 @@ GL_PREFIX(Uniform3uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7272(%rax), %r11
+	movq	7304(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(Uniform3uiEXT), .-GL_PREFIX(Uniform3uiEXT)
@@ -34671,7 +34867,7 @@ GL_PREFIX(Uniform3uiEXT):
 GL_PREFIX(Uniform3uivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7280(%rax), %r11
+	movq	7312(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34681,13 +34877,13 @@ GL_PREFIX(Uniform3uivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7280(%rax), %r11
+	movq	7312(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7280(%rax), %r11
+	movq	7312(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34697,7 +34893,7 @@ GL_PREFIX(Uniform3uivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7280(%rax), %r11
+	movq	7312(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(Uniform3uivEXT), .-GL_PREFIX(Uniform3uivEXT)
@@ -34708,7 +34904,7 @@ GL_PREFIX(Uniform3uivEXT):
 GL_PREFIX(Uniform4uiEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7288(%rax), %r11
+	movq	7320(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34722,13 +34918,13 @@ GL_PREFIX(Uniform4uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7288(%rax), %r11
+	movq	7320(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7288(%rax), %r11
+	movq	7320(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34742,7 +34938,7 @@ GL_PREFIX(Uniform4uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7288(%rax), %r11
+	movq	7320(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(Uniform4uiEXT), .-GL_PREFIX(Uniform4uiEXT)
@@ -34753,7 +34949,7 @@ GL_PREFIX(Uniform4uiEXT):
 GL_PREFIX(Uniform4uivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7296(%rax), %r11
+	movq	7328(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34763,13 +34959,13 @@ GL_PREFIX(Uniform4uivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7296(%rax), %r11
+	movq	7328(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7296(%rax), %r11
+	movq	7328(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34779,7 +34975,7 @@ GL_PREFIX(Uniform4uivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7296(%rax), %r11
+	movq	7328(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(Uniform4uivEXT), .-GL_PREFIX(Uniform4uivEXT)
@@ -34790,7 +34986,7 @@ GL_PREFIX(Uniform4uivEXT):
 GL_PREFIX(VertexAttribI1iEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7304(%rax), %r11
+	movq	7336(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34800,13 +34996,13 @@ GL_PREFIX(VertexAttribI1iEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7304(%rax), %r11
+	movq	7336(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7304(%rax), %r11
+	movq	7336(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34816,7 +35012,7 @@ GL_PREFIX(VertexAttribI1iEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7304(%rax), %r11
+	movq	7336(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI1iEXT), .-GL_PREFIX(VertexAttribI1iEXT)
@@ -34827,7 +35023,7 @@ GL_PREFIX(VertexAttribI1iEXT):
 GL_PREFIX(VertexAttribI1ivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7312(%rax), %r11
+	movq	7344(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34837,13 +35033,13 @@ GL_PREFIX(VertexAttribI1ivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7312(%rax), %r11
+	movq	7344(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7312(%rax), %r11
+	movq	7344(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34853,7 +35049,7 @@ GL_PREFIX(VertexAttribI1ivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7312(%rax), %r11
+	movq	7344(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI1ivEXT), .-GL_PREFIX(VertexAttribI1ivEXT)
@@ -34864,7 +35060,7 @@ GL_PREFIX(VertexAttribI1ivEXT):
 GL_PREFIX(VertexAttribI1uiEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7320(%rax), %r11
+	movq	7352(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34874,13 +35070,13 @@ GL_PREFIX(VertexAttribI1uiEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7320(%rax), %r11
+	movq	7352(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7320(%rax), %r11
+	movq	7352(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34890,7 +35086,7 @@ GL_PREFIX(VertexAttribI1uiEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7320(%rax), %r11
+	movq	7352(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI1uiEXT), .-GL_PREFIX(VertexAttribI1uiEXT)
@@ -34901,7 +35097,7 @@ GL_PREFIX(VertexAttribI1uiEXT):
 GL_PREFIX(VertexAttribI1uivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7328(%rax), %r11
+	movq	7360(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34911,13 +35107,13 @@ GL_PREFIX(VertexAttribI1uivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7328(%rax), %r11
+	movq	7360(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7328(%rax), %r11
+	movq	7360(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34927,7 +35123,7 @@ GL_PREFIX(VertexAttribI1uivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7328(%rax), %r11
+	movq	7360(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI1uivEXT), .-GL_PREFIX(VertexAttribI1uivEXT)
@@ -34938,7 +35134,7 @@ GL_PREFIX(VertexAttribI1uivEXT):
 GL_PREFIX(VertexAttribI2iEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7336(%rax), %r11
+	movq	7368(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34948,13 +35144,13 @@ GL_PREFIX(VertexAttribI2iEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7336(%rax), %r11
+	movq	7368(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7336(%rax), %r11
+	movq	7368(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -34964,7 +35160,7 @@ GL_PREFIX(VertexAttribI2iEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7336(%rax), %r11
+	movq	7368(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI2iEXT), .-GL_PREFIX(VertexAttribI2iEXT)
@@ -34975,7 +35171,7 @@ GL_PREFIX(VertexAttribI2iEXT):
 GL_PREFIX(VertexAttribI2ivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7344(%rax), %r11
+	movq	7376(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -34985,13 +35181,13 @@ GL_PREFIX(VertexAttribI2ivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7344(%rax), %r11
+	movq	7376(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7344(%rax), %r11
+	movq	7376(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35001,7 +35197,7 @@ GL_PREFIX(VertexAttribI2ivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7344(%rax), %r11
+	movq	7376(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI2ivEXT), .-GL_PREFIX(VertexAttribI2ivEXT)
@@ -35012,7 +35208,7 @@ GL_PREFIX(VertexAttribI2ivEXT):
 GL_PREFIX(VertexAttribI2uiEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7352(%rax), %r11
+	movq	7384(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35022,13 +35218,13 @@ GL_PREFIX(VertexAttribI2uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7352(%rax), %r11
+	movq	7384(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7352(%rax), %r11
+	movq	7384(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35038,7 +35234,7 @@ GL_PREFIX(VertexAttribI2uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7352(%rax), %r11
+	movq	7384(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI2uiEXT), .-GL_PREFIX(VertexAttribI2uiEXT)
@@ -35049,7 +35245,7 @@ GL_PREFIX(VertexAttribI2uiEXT):
 GL_PREFIX(VertexAttribI2uivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7360(%rax), %r11
+	movq	7392(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35059,13 +35255,13 @@ GL_PREFIX(VertexAttribI2uivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7360(%rax), %r11
+	movq	7392(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7360(%rax), %r11
+	movq	7392(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35075,7 +35271,7 @@ GL_PREFIX(VertexAttribI2uivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7360(%rax), %r11
+	movq	7392(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI2uivEXT), .-GL_PREFIX(VertexAttribI2uivEXT)
@@ -35086,7 +35282,7 @@ GL_PREFIX(VertexAttribI2uivEXT):
 GL_PREFIX(VertexAttribI3iEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7368(%rax), %r11
+	movq	7400(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35100,13 +35296,13 @@ GL_PREFIX(VertexAttribI3iEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7368(%rax), %r11
+	movq	7400(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7368(%rax), %r11
+	movq	7400(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35120,7 +35316,7 @@ GL_PREFIX(VertexAttribI3iEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7368(%rax), %r11
+	movq	7400(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI3iEXT), .-GL_PREFIX(VertexAttribI3iEXT)
@@ -35131,7 +35327,7 @@ GL_PREFIX(VertexAttribI3iEXT):
 GL_PREFIX(VertexAttribI3ivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7376(%rax), %r11
+	movq	7408(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35141,13 +35337,13 @@ GL_PREFIX(VertexAttribI3ivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7376(%rax), %r11
+	movq	7408(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7376(%rax), %r11
+	movq	7408(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35157,7 +35353,7 @@ GL_PREFIX(VertexAttribI3ivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7376(%rax), %r11
+	movq	7408(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI3ivEXT), .-GL_PREFIX(VertexAttribI3ivEXT)
@@ -35168,7 +35364,7 @@ GL_PREFIX(VertexAttribI3ivEXT):
 GL_PREFIX(VertexAttribI3uiEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7384(%rax), %r11
+	movq	7416(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35182,13 +35378,13 @@ GL_PREFIX(VertexAttribI3uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7384(%rax), %r11
+	movq	7416(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7384(%rax), %r11
+	movq	7416(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35202,7 +35398,7 @@ GL_PREFIX(VertexAttribI3uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7384(%rax), %r11
+	movq	7416(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI3uiEXT), .-GL_PREFIX(VertexAttribI3uiEXT)
@@ -35213,7 +35409,7 @@ GL_PREFIX(VertexAttribI3uiEXT):
 GL_PREFIX(VertexAttribI3uivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7392(%rax), %r11
+	movq	7424(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35223,13 +35419,13 @@ GL_PREFIX(VertexAttribI3uivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7392(%rax), %r11
+	movq	7424(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7392(%rax), %r11
+	movq	7424(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35239,7 +35435,7 @@ GL_PREFIX(VertexAttribI3uivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7392(%rax), %r11
+	movq	7424(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI3uivEXT), .-GL_PREFIX(VertexAttribI3uivEXT)
@@ -35250,7 +35446,7 @@ GL_PREFIX(VertexAttribI3uivEXT):
 GL_PREFIX(VertexAttribI4bvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7400(%rax), %r11
+	movq	7432(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35260,13 +35456,13 @@ GL_PREFIX(VertexAttribI4bvEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7400(%rax), %r11
+	movq	7432(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7400(%rax), %r11
+	movq	7432(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35276,7 +35472,7 @@ GL_PREFIX(VertexAttribI4bvEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7400(%rax), %r11
+	movq	7432(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI4bvEXT), .-GL_PREFIX(VertexAttribI4bvEXT)
@@ -35287,7 +35483,7 @@ GL_PREFIX(VertexAttribI4bvEXT):
 GL_PREFIX(VertexAttribI4iEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7408(%rax), %r11
+	movq	7440(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35301,13 +35497,13 @@ GL_PREFIX(VertexAttribI4iEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7408(%rax), %r11
+	movq	7440(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7408(%rax), %r11
+	movq	7440(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35321,7 +35517,7 @@ GL_PREFIX(VertexAttribI4iEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7408(%rax), %r11
+	movq	7440(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI4iEXT), .-GL_PREFIX(VertexAttribI4iEXT)
@@ -35332,7 +35528,7 @@ GL_PREFIX(VertexAttribI4iEXT):
 GL_PREFIX(VertexAttribI4ivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7416(%rax), %r11
+	movq	7448(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35342,13 +35538,13 @@ GL_PREFIX(VertexAttribI4ivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7416(%rax), %r11
+	movq	7448(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7416(%rax), %r11
+	movq	7448(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35358,7 +35554,7 @@ GL_PREFIX(VertexAttribI4ivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7416(%rax), %r11
+	movq	7448(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI4ivEXT), .-GL_PREFIX(VertexAttribI4ivEXT)
@@ -35369,7 +35565,7 @@ GL_PREFIX(VertexAttribI4ivEXT):
 GL_PREFIX(VertexAttribI4svEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7424(%rax), %r11
+	movq	7456(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35379,13 +35575,13 @@ GL_PREFIX(VertexAttribI4svEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7424(%rax), %r11
+	movq	7456(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7424(%rax), %r11
+	movq	7456(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35395,7 +35591,7 @@ GL_PREFIX(VertexAttribI4svEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7424(%rax), %r11
+	movq	7456(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI4svEXT), .-GL_PREFIX(VertexAttribI4svEXT)
@@ -35406,7 +35602,7 @@ GL_PREFIX(VertexAttribI4svEXT):
 GL_PREFIX(VertexAttribI4ubvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7432(%rax), %r11
+	movq	7464(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35416,13 +35612,13 @@ GL_PREFIX(VertexAttribI4ubvEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7432(%rax), %r11
+	movq	7464(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7432(%rax), %r11
+	movq	7464(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35432,7 +35628,7 @@ GL_PREFIX(VertexAttribI4ubvEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7432(%rax), %r11
+	movq	7464(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI4ubvEXT), .-GL_PREFIX(VertexAttribI4ubvEXT)
@@ -35443,7 +35639,7 @@ GL_PREFIX(VertexAttribI4ubvEXT):
 GL_PREFIX(VertexAttribI4uiEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7440(%rax), %r11
+	movq	7472(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35457,13 +35653,13 @@ GL_PREFIX(VertexAttribI4uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7440(%rax), %r11
+	movq	7472(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7440(%rax), %r11
+	movq	7472(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35477,7 +35673,7 @@ GL_PREFIX(VertexAttribI4uiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7440(%rax), %r11
+	movq	7472(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI4uiEXT), .-GL_PREFIX(VertexAttribI4uiEXT)
@@ -35488,7 +35684,7 @@ GL_PREFIX(VertexAttribI4uiEXT):
 GL_PREFIX(VertexAttribI4uivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7448(%rax), %r11
+	movq	7480(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35498,13 +35694,13 @@ GL_PREFIX(VertexAttribI4uivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7448(%rax), %r11
+	movq	7480(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7448(%rax), %r11
+	movq	7480(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35514,7 +35710,7 @@ GL_PREFIX(VertexAttribI4uivEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7448(%rax), %r11
+	movq	7480(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI4uivEXT), .-GL_PREFIX(VertexAttribI4uivEXT)
@@ -35525,7 +35721,7 @@ GL_PREFIX(VertexAttribI4uivEXT):
 GL_PREFIX(VertexAttribI4usvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7456(%rax), %r11
+	movq	7488(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35535,13 +35731,13 @@ GL_PREFIX(VertexAttribI4usvEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7456(%rax), %r11
+	movq	7488(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7456(%rax), %r11
+	movq	7488(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35551,7 +35747,7 @@ GL_PREFIX(VertexAttribI4usvEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7456(%rax), %r11
+	movq	7488(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribI4usvEXT), .-GL_PREFIX(VertexAttribI4usvEXT)
@@ -35562,7 +35758,7 @@ GL_PREFIX(VertexAttribI4usvEXT):
 GL_PREFIX(VertexAttribIPointerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7464(%rax), %r11
+	movq	7496(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35576,13 +35772,13 @@ GL_PREFIX(VertexAttribIPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7464(%rax), %r11
+	movq	7496(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7464(%rax), %r11
+	movq	7496(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35596,7 +35792,7 @@ GL_PREFIX(VertexAttribIPointerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7464(%rax), %r11
+	movq	7496(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(VertexAttribIPointerEXT), .-GL_PREFIX(VertexAttribIPointerEXT)
@@ -35607,7 +35803,7 @@ GL_PREFIX(VertexAttribIPointerEXT):
 GL_PREFIX(FramebufferTextureLayerEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7472(%rax), %r11
+	movq	7504(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35621,13 +35817,13 @@ GL_PREFIX(FramebufferTextureLayerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7472(%rax), %r11
+	movq	7504(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7472(%rax), %r11
+	movq	7504(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35641,7 +35837,7 @@ GL_PREFIX(FramebufferTextureLayerEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7472(%rax), %r11
+	movq	7504(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(FramebufferTextureLayerEXT), .-GL_PREFIX(FramebufferTextureLayerEXT)
@@ -35652,7 +35848,7 @@ GL_PREFIX(FramebufferTextureLayerEXT):
 GL_PREFIX(ColorMaskIndexedEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7480(%rax), %r11
+	movq	7512(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35666,13 +35862,13 @@ GL_PREFIX(ColorMaskIndexedEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7480(%rax), %r11
+	movq	7512(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7480(%rax), %r11
+	movq	7512(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35686,7 +35882,7 @@ GL_PREFIX(ColorMaskIndexedEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7480(%rax), %r11
+	movq	7512(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ColorMaskIndexedEXT), .-GL_PREFIX(ColorMaskIndexedEXT)
@@ -35697,7 +35893,7 @@ GL_PREFIX(ColorMaskIndexedEXT):
 GL_PREFIX(DisableIndexedEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7488(%rax), %r11
+	movq	7520(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35707,13 +35903,13 @@ GL_PREFIX(DisableIndexedEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7488(%rax), %r11
+	movq	7520(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7488(%rax), %r11
+	movq	7520(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35723,7 +35919,7 @@ GL_PREFIX(DisableIndexedEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7488(%rax), %r11
+	movq	7520(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(DisableIndexedEXT), .-GL_PREFIX(DisableIndexedEXT)
@@ -35734,7 +35930,7 @@ GL_PREFIX(DisableIndexedEXT):
 GL_PREFIX(EnableIndexedEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7496(%rax), %r11
+	movq	7528(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35744,13 +35940,13 @@ GL_PREFIX(EnableIndexedEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7496(%rax), %r11
+	movq	7528(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7496(%rax), %r11
+	movq	7528(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35760,7 +35956,7 @@ GL_PREFIX(EnableIndexedEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7496(%rax), %r11
+	movq	7528(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(EnableIndexedEXT), .-GL_PREFIX(EnableIndexedEXT)
@@ -35771,7 +35967,7 @@ GL_PREFIX(EnableIndexedEXT):
 GL_PREFIX(GetBooleanIndexedvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7504(%rax), %r11
+	movq	7536(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35781,13 +35977,13 @@ GL_PREFIX(GetBooleanIndexedvEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7504(%rax), %r11
+	movq	7536(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7504(%rax), %r11
+	movq	7536(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35797,7 +35993,7 @@ GL_PREFIX(GetBooleanIndexedvEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7504(%rax), %r11
+	movq	7536(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetBooleanIndexedvEXT), .-GL_PREFIX(GetBooleanIndexedvEXT)
@@ -35808,7 +36004,7 @@ GL_PREFIX(GetBooleanIndexedvEXT):
 GL_PREFIX(GetIntegerIndexedvEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7512(%rax), %r11
+	movq	7544(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35818,13 +36014,13 @@ GL_PREFIX(GetIntegerIndexedvEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7512(%rax), %r11
+	movq	7544(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7512(%rax), %r11
+	movq	7544(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35834,7 +36030,7 @@ GL_PREFIX(GetIntegerIndexedvEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7512(%rax), %r11
+	movq	7544(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetIntegerIndexedvEXT), .-GL_PREFIX(GetIntegerIndexedvEXT)
@@ -35845,7 +36041,7 @@ GL_PREFIX(GetIntegerIndexedvEXT):
 GL_PREFIX(IsEnabledIndexedEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7520(%rax), %r11
+	movq	7552(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35855,13 +36051,13 @@ GL_PREFIX(IsEnabledIndexedEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7520(%rax), %r11
+	movq	7552(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7520(%rax), %r11
+	movq	7552(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35871,7 +36067,7 @@ GL_PREFIX(IsEnabledIndexedEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7520(%rax), %r11
+	movq	7552(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(IsEnabledIndexedEXT), .-GL_PREFIX(IsEnabledIndexedEXT)
@@ -35882,7 +36078,7 @@ GL_PREFIX(IsEnabledIndexedEXT):
 GL_PREFIX(ClearColorIiEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7528(%rax), %r11
+	movq	7560(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35896,13 +36092,13 @@ GL_PREFIX(ClearColorIiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7528(%rax), %r11
+	movq	7560(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7528(%rax), %r11
+	movq	7560(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35916,7 +36112,7 @@ GL_PREFIX(ClearColorIiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7528(%rax), %r11
+	movq	7560(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ClearColorIiEXT), .-GL_PREFIX(ClearColorIiEXT)
@@ -35927,7 +36123,7 @@ GL_PREFIX(ClearColorIiEXT):
 GL_PREFIX(ClearColorIuiEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7536(%rax), %r11
+	movq	7568(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35941,13 +36137,13 @@ GL_PREFIX(ClearColorIuiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7536(%rax), %r11
+	movq	7568(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7536(%rax), %r11
+	movq	7568(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35961,7 +36157,7 @@ GL_PREFIX(ClearColorIuiEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7536(%rax), %r11
+	movq	7568(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ClearColorIuiEXT), .-GL_PREFIX(ClearColorIuiEXT)
@@ -35972,7 +36168,7 @@ GL_PREFIX(ClearColorIuiEXT):
 GL_PREFIX(GetTexParameterIivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7544(%rax), %r11
+	movq	7576(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -35982,13 +36178,13 @@ GL_PREFIX(GetTexParameterIivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7544(%rax), %r11
+	movq	7576(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7544(%rax), %r11
+	movq	7576(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -35998,7 +36194,7 @@ GL_PREFIX(GetTexParameterIivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7544(%rax), %r11
+	movq	7576(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetTexParameterIivEXT), .-GL_PREFIX(GetTexParameterIivEXT)
@@ -36009,7 +36205,7 @@ GL_PREFIX(GetTexParameterIivEXT):
 GL_PREFIX(GetTexParameterIuivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7552(%rax), %r11
+	movq	7584(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36019,13 +36215,13 @@ GL_PREFIX(GetTexParameterIuivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7552(%rax), %r11
+	movq	7584(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7552(%rax), %r11
+	movq	7584(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36035,7 +36231,7 @@ GL_PREFIX(GetTexParameterIuivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7552(%rax), %r11
+	movq	7584(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetTexParameterIuivEXT), .-GL_PREFIX(GetTexParameterIuivEXT)
@@ -36046,7 +36242,7 @@ GL_PREFIX(GetTexParameterIuivEXT):
 GL_PREFIX(TexParameterIivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7560(%rax), %r11
+	movq	7592(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36056,13 +36252,13 @@ GL_PREFIX(TexParameterIivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7560(%rax), %r11
+	movq	7592(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7560(%rax), %r11
+	movq	7592(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36072,7 +36268,7 @@ GL_PREFIX(TexParameterIivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7560(%rax), %r11
+	movq	7592(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexParameterIivEXT), .-GL_PREFIX(TexParameterIivEXT)
@@ -36083,7 +36279,7 @@ GL_PREFIX(TexParameterIivEXT):
 GL_PREFIX(TexParameterIuivEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7568(%rax), %r11
+	movq	7600(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36093,13 +36289,13 @@ GL_PREFIX(TexParameterIuivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7568(%rax), %r11
+	movq	7600(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7568(%rax), %r11
+	movq	7600(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36109,7 +36305,7 @@ GL_PREFIX(TexParameterIuivEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7568(%rax), %r11
+	movq	7600(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TexParameterIuivEXT), .-GL_PREFIX(TexParameterIuivEXT)
@@ -36120,7 +36316,7 @@ GL_PREFIX(TexParameterIuivEXT):
 GL_PREFIX(BeginConditionalRenderNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7576(%rax), %r11
+	movq	7608(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36130,13 +36326,13 @@ GL_PREFIX(BeginConditionalRenderNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7576(%rax), %r11
+	movq	7608(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7576(%rax), %r11
+	movq	7608(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36146,7 +36342,7 @@ GL_PREFIX(BeginConditionalRenderNV):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7576(%rax), %r11
+	movq	7608(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BeginConditionalRenderNV), .-GL_PREFIX(BeginConditionalRenderNV)
@@ -36157,25 +36353,25 @@ GL_PREFIX(BeginConditionalRenderNV):
 GL_PREFIX(EndConditionalRenderNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7584(%rax), %r11
+	movq	7616(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	7584(%rax), %r11
+	movq	7616(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7584(%rax), %r11
+	movq	7616(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	7584(%rax), %r11
+	movq	7616(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(EndConditionalRenderNV), .-GL_PREFIX(EndConditionalRenderNV)
@@ -36186,25 +36382,25 @@ GL_PREFIX(EndConditionalRenderNV):
 GL_PREFIX(BeginTransformFeedbackEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7592(%rax), %r11
+	movq	7624(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	7592(%rax), %r11
+	movq	7624(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7592(%rax), %r11
+	movq	7624(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	7592(%rax), %r11
+	movq	7624(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BeginTransformFeedbackEXT), .-GL_PREFIX(BeginTransformFeedbackEXT)
@@ -36215,7 +36411,7 @@ GL_PREFIX(BeginTransformFeedbackEXT):
 GL_PREFIX(BindBufferBaseEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7600(%rax), %r11
+	movq	7632(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36225,13 +36421,13 @@ GL_PREFIX(BindBufferBaseEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7600(%rax), %r11
+	movq	7632(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7600(%rax), %r11
+	movq	7632(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36241,7 +36437,7 @@ GL_PREFIX(BindBufferBaseEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7600(%rax), %r11
+	movq	7632(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindBufferBaseEXT), .-GL_PREFIX(BindBufferBaseEXT)
@@ -36252,7 +36448,7 @@ GL_PREFIX(BindBufferBaseEXT):
 GL_PREFIX(BindBufferOffsetEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7608(%rax), %r11
+	movq	7640(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36266,13 +36462,13 @@ GL_PREFIX(BindBufferOffsetEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7608(%rax), %r11
+	movq	7640(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7608(%rax), %r11
+	movq	7640(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36286,7 +36482,7 @@ GL_PREFIX(BindBufferOffsetEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7608(%rax), %r11
+	movq	7640(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindBufferOffsetEXT), .-GL_PREFIX(BindBufferOffsetEXT)
@@ -36297,7 +36493,7 @@ GL_PREFIX(BindBufferOffsetEXT):
 GL_PREFIX(BindBufferRangeEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7616(%rax), %r11
+	movq	7648(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36311,13 +36507,13 @@ GL_PREFIX(BindBufferRangeEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7616(%rax), %r11
+	movq	7648(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7616(%rax), %r11
+	movq	7648(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36331,7 +36527,7 @@ GL_PREFIX(BindBufferRangeEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7616(%rax), %r11
+	movq	7648(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(BindBufferRangeEXT), .-GL_PREFIX(BindBufferRangeEXT)
@@ -36342,25 +36538,25 @@ GL_PREFIX(BindBufferRangeEXT):
 GL_PREFIX(EndTransformFeedbackEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7624(%rax), %r11
+	movq	7656(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	7624(%rax), %r11
+	movq	7656(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7624(%rax), %r11
+	movq	7656(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	7624(%rax), %r11
+	movq	7656(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(EndTransformFeedbackEXT), .-GL_PREFIX(EndTransformFeedbackEXT)
@@ -36371,7 +36567,7 @@ GL_PREFIX(EndTransformFeedbackEXT):
 GL_PREFIX(GetTransformFeedbackVaryingEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7632(%rax), %r11
+	movq	7664(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36389,13 +36585,13 @@ GL_PREFIX(GetTransformFeedbackVaryingEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7632(%rax), %r11
+	movq	7664(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7632(%rax), %r11
+	movq	7664(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36413,7 +36609,7 @@ GL_PREFIX(GetTransformFeedbackVaryingEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7632(%rax), %r11
+	movq	7664(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetTransformFeedbackVaryingEXT), .-GL_PREFIX(GetTransformFeedbackVaryingEXT)
@@ -36424,7 +36620,7 @@ GL_PREFIX(GetTransformFeedbackVaryingEXT):
 GL_PREFIX(TransformFeedbackVaryingsEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7640(%rax), %r11
+	movq	7672(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36438,13 +36634,13 @@ GL_PREFIX(TransformFeedbackVaryingsEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7640(%rax), %r11
+	movq	7672(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7640(%rax), %r11
+	movq	7672(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36458,7 +36654,7 @@ GL_PREFIX(TransformFeedbackVaryingsEXT):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7640(%rax), %r11
+	movq	7672(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TransformFeedbackVaryingsEXT), .-GL_PREFIX(TransformFeedbackVaryingsEXT)
@@ -36469,37 +36665,37 @@ GL_PREFIX(TransformFeedbackVaryingsEXT):
 GL_PREFIX(ProvokingVertexEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7648(%rax), %r11
+	movq	7680(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	7648(%rax), %r11
+	movq	7680(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7648(%rax), %r11
+	movq	7680(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	7648(%rax), %r11
+	movq	7680(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ProvokingVertexEXT), .-GL_PREFIX(ProvokingVertexEXT)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_957)
-	.type	GL_PREFIX(_dispatch_stub_957), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_957))
-GL_PREFIX(_dispatch_stub_957):
+	.globl	GL_PREFIX(_dispatch_stub_961)
+	.type	GL_PREFIX(_dispatch_stub_961), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_961))
+GL_PREFIX(_dispatch_stub_961):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7656(%rax), %r11
+	movq	7688(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36509,13 +36705,13 @@ GL_PREFIX(_dispatch_stub_957):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7656(%rax), %r11
+	movq	7688(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7656(%rax), %r11
+	movq	7688(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36525,19 +36721,19 @@ GL_PREFIX(_dispatch_stub_957):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7656(%rax), %r11
+	movq	7688(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_957), .-GL_PREFIX(_dispatch_stub_957)
+	.size	GL_PREFIX(_dispatch_stub_961), .-GL_PREFIX(_dispatch_stub_961)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_958)
-	.type	GL_PREFIX(_dispatch_stub_958), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_958))
-GL_PREFIX(_dispatch_stub_958):
+	.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	7664(%rax), %r11
+	movq	7696(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36547,13 +36743,13 @@ GL_PREFIX(_dispatch_stub_958):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7664(%rax), %r11
+	movq	7696(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7664(%rax), %r11
+	movq	7696(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36563,10 +36759,10 @@ GL_PREFIX(_dispatch_stub_958):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7664(%rax), %r11
+	movq	7696(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_958), .-GL_PREFIX(_dispatch_stub_958)
+	.size	GL_PREFIX(_dispatch_stub_962), .-GL_PREFIX(_dispatch_stub_962)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(GetObjectParameterivAPPLE)
@@ -36574,7 +36770,7 @@ GL_PREFIX(_dispatch_stub_958):
 GL_PREFIX(GetObjectParameterivAPPLE):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7672(%rax), %r11
+	movq	7704(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36588,13 +36784,13 @@ GL_PREFIX(GetObjectParameterivAPPLE):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7672(%rax), %r11
+	movq	7704(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7672(%rax), %r11
+	movq	7704(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36608,7 +36804,7 @@ GL_PREFIX(GetObjectParameterivAPPLE):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7672(%rax), %r11
+	movq	7704(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(GetObjectParameterivAPPLE), .-GL_PREFIX(GetObjectParameterivAPPLE)
@@ -36619,7 +36815,7 @@ GL_PREFIX(GetObjectParameterivAPPLE):
 GL_PREFIX(ObjectPurgeableAPPLE):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7680(%rax), %r11
+	movq	7712(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36629,13 +36825,13 @@ GL_PREFIX(ObjectPurgeableAPPLE):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7680(%rax), %r11
+	movq	7712(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7680(%rax), %r11
+	movq	7712(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36645,7 +36841,7 @@ GL_PREFIX(ObjectPurgeableAPPLE):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7680(%rax), %r11
+	movq	7712(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ObjectPurgeableAPPLE), .-GL_PREFIX(ObjectPurgeableAPPLE)
@@ -36656,7 +36852,7 @@ GL_PREFIX(ObjectPurgeableAPPLE):
 GL_PREFIX(ObjectUnpurgeableAPPLE):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7688(%rax), %r11
+	movq	7720(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36666,13 +36862,13 @@ GL_PREFIX(ObjectUnpurgeableAPPLE):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7688(%rax), %r11
+	movq	7720(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7688(%rax), %r11
+	movq	7720(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36682,7 +36878,7 @@ GL_PREFIX(ObjectUnpurgeableAPPLE):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7688(%rax), %r11
+	movq	7720(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ObjectUnpurgeableAPPLE), .-GL_PREFIX(ObjectUnpurgeableAPPLE)
@@ -36693,25 +36889,25 @@ GL_PREFIX(ObjectUnpurgeableAPPLE):
 GL_PREFIX(ActiveProgramEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7696(%rax), %r11
+	movq	7728(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
 	call	_x86_64_get_dispatch@PLT
 	popq	%rdi
-	movq	7696(%rax), %r11
+	movq	7728(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7696(%rax), %r11
+	movq	7728(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
 	call	_glapi_get_dispatch
 	popq	%rdi
-	movq	7696(%rax), %r11
+	movq	7728(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(ActiveProgramEXT), .-GL_PREFIX(ActiveProgramEXT)
@@ -36722,7 +36918,7 @@ GL_PREFIX(ActiveProgramEXT):
 GL_PREFIX(CreateShaderProgramEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7704(%rax), %r11
+	movq	7736(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36732,13 +36928,13 @@ GL_PREFIX(CreateShaderProgramEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7704(%rax), %r11
+	movq	7736(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7704(%rax), %r11
+	movq	7736(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36748,7 +36944,7 @@ GL_PREFIX(CreateShaderProgramEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7704(%rax), %r11
+	movq	7736(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(CreateShaderProgramEXT), .-GL_PREFIX(CreateShaderProgramEXT)
@@ -36759,7 +36955,7 @@ GL_PREFIX(CreateShaderProgramEXT):
 GL_PREFIX(UseShaderProgramEXT):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7712(%rax), %r11
+	movq	7744(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36769,13 +36965,13 @@ GL_PREFIX(UseShaderProgramEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7712(%rax), %r11
+	movq	7744(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7712(%rax), %r11
+	movq	7744(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36785,7 +36981,7 @@ GL_PREFIX(UseShaderProgramEXT):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7712(%rax), %r11
+	movq	7744(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(UseShaderProgramEXT), .-GL_PREFIX(UseShaderProgramEXT)
@@ -36796,37 +36992,37 @@ GL_PREFIX(UseShaderProgramEXT):
 GL_PREFIX(TextureBarrierNV):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7720(%rax), %r11
+	movq	7752(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rbp
 	call	_x86_64_get_dispatch@PLT
 	popq	%rbp
-	movq	7720(%rax), %r11
+	movq	7752(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7720(%rax), %r11
+	movq	7752(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rbp
 	call	_glapi_get_dispatch
 	popq	%rbp
-	movq	7720(%rax), %r11
+	movq	7752(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(TextureBarrierNV), .-GL_PREFIX(TextureBarrierNV)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_966)
-	.type	GL_PREFIX(_dispatch_stub_966), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_966))
-GL_PREFIX(_dispatch_stub_966):
+	.globl	GL_PREFIX(_dispatch_stub_970)
+	.type	GL_PREFIX(_dispatch_stub_970), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_970))
+GL_PREFIX(_dispatch_stub_970):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7728(%rax), %r11
+	movq	7760(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36840,13 +37036,13 @@ GL_PREFIX(_dispatch_stub_966):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7728(%rax), %r11
+	movq	7760(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7728(%rax), %r11
+	movq	7760(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36860,19 +37056,19 @@ GL_PREFIX(_dispatch_stub_966):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7728(%rax), %r11
+	movq	7760(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_966), .-GL_PREFIX(_dispatch_stub_966)
+	.size	GL_PREFIX(_dispatch_stub_970), .-GL_PREFIX(_dispatch_stub_970)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_967)
-	.type	GL_PREFIX(_dispatch_stub_967), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_967))
-GL_PREFIX(_dispatch_stub_967):
+	.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	7736(%rax), %r11
+	movq	7768(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36886,13 +37082,13 @@ GL_PREFIX(_dispatch_stub_967):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7736(%rax), %r11
+	movq	7768(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7736(%rax), %r11
+	movq	7768(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36906,19 +37102,19 @@ GL_PREFIX(_dispatch_stub_967):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7736(%rax), %r11
+	movq	7768(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_967), .-GL_PREFIX(_dispatch_stub_967)
+	.size	GL_PREFIX(_dispatch_stub_971), .-GL_PREFIX(_dispatch_stub_971)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_968)
-	.type	GL_PREFIX(_dispatch_stub_968), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_968))
-GL_PREFIX(_dispatch_stub_968):
+	.globl	GL_PREFIX(_dispatch_stub_972)
+	.type	GL_PREFIX(_dispatch_stub_972), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_972))
+GL_PREFIX(_dispatch_stub_972):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7744(%rax), %r11
+	movq	7776(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36932,13 +37128,13 @@ GL_PREFIX(_dispatch_stub_968):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7744(%rax), %r11
+	movq	7776(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7744(%rax), %r11
+	movq	7776(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36952,19 +37148,19 @@ GL_PREFIX(_dispatch_stub_968):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7744(%rax), %r11
+	movq	7776(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_968), .-GL_PREFIX(_dispatch_stub_968)
+	.size	GL_PREFIX(_dispatch_stub_972), .-GL_PREFIX(_dispatch_stub_972)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_969)
-	.type	GL_PREFIX(_dispatch_stub_969), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_969))
-GL_PREFIX(_dispatch_stub_969):
+	.globl	GL_PREFIX(_dispatch_stub_973)
+	.type	GL_PREFIX(_dispatch_stub_973), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_973))
+GL_PREFIX(_dispatch_stub_973):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7752(%rax), %r11
+	movq	7784(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -36974,13 +37170,13 @@ GL_PREFIX(_dispatch_stub_969):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7752(%rax), %r11
+	movq	7784(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7752(%rax), %r11
+	movq	7784(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -36990,19 +37186,19 @@ GL_PREFIX(_dispatch_stub_969):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7752(%rax), %r11
+	movq	7784(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_969), .-GL_PREFIX(_dispatch_stub_969)
+	.size	GL_PREFIX(_dispatch_stub_973), .-GL_PREFIX(_dispatch_stub_973)
 
 	.p2align	4,,15
-	.globl	GL_PREFIX(_dispatch_stub_970)
-	.type	GL_PREFIX(_dispatch_stub_970), @function
-	HIDDEN(GL_PREFIX(_dispatch_stub_970))
-GL_PREFIX(_dispatch_stub_970):
+	.globl	GL_PREFIX(_dispatch_stub_974)
+	.type	GL_PREFIX(_dispatch_stub_974), @function
+	HIDDEN(GL_PREFIX(_dispatch_stub_974))
+GL_PREFIX(_dispatch_stub_974):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7760(%rax), %r11
+	movq	7792(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -37012,13 +37208,13 @@ GL_PREFIX(_dispatch_stub_970):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7760(%rax), %r11
+	movq	7792(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7760(%rax), %r11
+	movq	7792(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -37028,10 +37224,10 @@ GL_PREFIX(_dispatch_stub_970):
 	popq	%rdx
 	popq	%rsi
 	popq	%rdi
-	movq	7760(%rax), %r11
+	movq	7792(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
-	.size	GL_PREFIX(_dispatch_stub_970), .-GL_PREFIX(_dispatch_stub_970)
+	.size	GL_PREFIX(_dispatch_stub_974), .-GL_PREFIX(_dispatch_stub_974)
 
 	.p2align	4,,15
 	.globl	GL_PREFIX(EGLImageTargetRenderbufferStorageOES)
@@ -37039,7 +37235,7 @@ GL_PREFIX(_dispatch_stub_970):
 GL_PREFIX(EGLImageTargetRenderbufferStorageOES):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7768(%rax), %r11
+	movq	7800(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -37049,13 +37245,13 @@ GL_PREFIX(EGLImageTargetRenderbufferStorageOES):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7768(%rax), %r11
+	movq	7800(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7768(%rax), %r11
+	movq	7800(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -37065,7 +37261,7 @@ GL_PREFIX(EGLImageTargetRenderbufferStorageOES):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7768(%rax), %r11
+	movq	7800(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(EGLImageTargetRenderbufferStorageOES), .-GL_PREFIX(EGLImageTargetRenderbufferStorageOES)
@@ -37076,7 +37272,7 @@ GL_PREFIX(EGLImageTargetRenderbufferStorageOES):
 GL_PREFIX(EGLImageTargetTexture2DOES):
 #if defined(GLX_USE_TLS)
 	call	_x86_64_get_dispatch@PLT
-	movq	7776(%rax), %r11
+	movq	7808(%rax), %r11
 	jmp	*%r11
 #elif defined(PTHREADS)
 	pushq	%rdi
@@ -37086,13 +37282,13 @@ GL_PREFIX(EGLImageTargetTexture2DOES):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7776(%rax), %r11
+	movq	7808(%rax), %r11
 	jmp	*%r11
 #else
 	movq	_glapi_Dispatch(%rip), %rax
 	testq	%rax, %rax
 	je	1f
-	movq	7776(%rax), %r11
+	movq	7808(%rax), %r11
 	jmp	*%r11
 1:
 	pushq	%rdi
@@ -37102,7 +37298,7 @@ GL_PREFIX(EGLImageTargetTexture2DOES):
 	popq	%rbp
 	popq	%rsi
 	popq	%rdi
-	movq	7776(%rax), %r11
+	movq	7808(%rax), %r11
 	jmp	*%r11
 #endif /* defined(GLX_USE_TLS) */
 	.size	GL_PREFIX(EGLImageTargetTexture2DOES), .-GL_PREFIX(EGLImageTargetTexture2DOES)
@@ -37370,10 +37566,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_867)
-	.globl GL_PREFIX(IsVertexArray) ; .set GL_PREFIX(IsVertexArray), GL_PREFIX(_dispatch_stub_869)
+	.globl GL_PREFIX(DeleteVertexArrays) ; .set GL_PREFIX(DeleteVertexArrays), GL_PREFIX(_dispatch_stub_871)
+	.globl GL_PREFIX(IsVertexArray) ; .set GL_PREFIX(IsVertexArray), GL_PREFIX(_dispatch_stub_873)
 	.globl GL_PREFIX(PrimitiveRestartIndex) ; .set GL_PREFIX(PrimitiveRestartIndex), GL_PREFIX(PrimitiveRestartIndexNV)
-	.globl GL_PREFIX(BlendEquationSeparate) ; .set GL_PREFIX(BlendEquationSeparate), GL_PREFIX(_dispatch_stub_879)
+	.globl GL_PREFIX(BlendEquationSeparate) ; .set GL_PREFIX(BlendEquationSeparate), GL_PREFIX(_dispatch_stub_883)
 	.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)
@@ -37391,7 +37587,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_897)
+	.globl GL_PREFIX(BlitFramebuffer) ; .set GL_PREFIX(BlitFramebuffer), GL_PREFIX(_dispatch_stub_901)
 	.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 11bb0ad35..a50923d32 100644
--- a/mesalib/src/mapi/glapi/glapi_x86.S
+++ b/mesalib/src/mapi/glapi/glapi_x86.S
@@ -815,349 +815,353 @@ GLNAME(gl_dispatch_functions_start):
 	GL_STUB(GetShaderPrecisionFormat, 662, GetShaderPrecisionFormat@16)
 	GL_STUB(ReleaseShaderCompiler, 663, ReleaseShaderCompiler@0)
 	GL_STUB(ShaderBinary, 664, ShaderBinary@20)
-	GL_STUB(GetGraphicsResetStatusARB, 665, GetGraphicsResetStatusARB@0)
-	GL_STUB(GetnColorTableARB, 666, GetnColorTableARB@20)
-	GL_STUB(GetnCompressedTexImageARB, 667, GetnCompressedTexImageARB@16)
-	GL_STUB(GetnConvolutionFilterARB, 668, GetnConvolutionFilterARB@20)
-	GL_STUB(GetnHistogramARB, 669, GetnHistogramARB@24)
-	GL_STUB(GetnMapdvARB, 670, GetnMapdvARB@16)
-	GL_STUB(GetnMapfvARB, 671, GetnMapfvARB@16)
-	GL_STUB(GetnMapivARB, 672, GetnMapivARB@16)
-	GL_STUB(GetnMinmaxARB, 673, GetnMinmaxARB@24)
-	GL_STUB(GetnPixelMapfvARB, 674, GetnPixelMapfvARB@12)
-	GL_STUB(GetnPixelMapuivARB, 675, GetnPixelMapuivARB@12)
-	GL_STUB(GetnPixelMapusvARB, 676, GetnPixelMapusvARB@12)
-	GL_STUB(GetnPolygonStippleARB, 677, GetnPolygonStippleARB@8)
-	GL_STUB(GetnSeparableFilterARB, 678, GetnSeparableFilterARB@32)
-	GL_STUB(GetnTexImageARB, 679, GetnTexImageARB@24)
-	GL_STUB(GetnUniformdvARB, 680, GetnUniformdvARB@16)
-	GL_STUB(GetnUniformfvARB, 681, GetnUniformfvARB@16)
-	GL_STUB(GetnUniformivARB, 682, GetnUniformivARB@16)
-	GL_STUB(GetnUniformuivARB, 683, GetnUniformuivARB@16)
-	GL_STUB(ReadnPixelsARB, 684, ReadnPixelsARB@32)
-	GL_STUB(TexStorage1D, 685, TexStorage1D@16)
-	GL_STUB(TexStorage2D, 686, TexStorage2D@20)
-	GL_STUB(TexStorage3D, 687, TexStorage3D@24)
-	GL_STUB(TextureStorage1DEXT, 688, TextureStorage1DEXT@20)
-	GL_STUB(TextureStorage2DEXT, 689, TextureStorage2DEXT@24)
-	GL_STUB(TextureStorage3DEXT, 690, TextureStorage3DEXT@28)
-	GL_STUB(PolygonOffsetEXT, 691, PolygonOffsetEXT@8)
-	GL_STUB(_dispatch_stub_692, 692, _dispatch_stub_692@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_692, _dispatch_stub_692@8))
-	GL_STUB(_dispatch_stub_693, 693, _dispatch_stub_693@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_693, _dispatch_stub_693@8))
-	GL_STUB(_dispatch_stub_694, 694, _dispatch_stub_694@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_694, _dispatch_stub_694@8))
-	GL_STUB(_dispatch_stub_695, 695, _dispatch_stub_695@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_695, _dispatch_stub_695@8))
+	GL_STUB(DebugMessageCallbackARB, 665, DebugMessageCallbackARB@8)
+	GL_STUB(DebugMessageControlARB, 666, DebugMessageControlARB@24)
+	GL_STUB(DebugMessageInsertARB, 667, DebugMessageInsertARB@24)
+	GL_STUB(GetDebugMessageLogARB, 668, GetDebugMessageLogARB@32)
+	GL_STUB(GetGraphicsResetStatusARB, 669, GetGraphicsResetStatusARB@0)
+	GL_STUB(GetnColorTableARB, 670, GetnColorTableARB@20)
+	GL_STUB(GetnCompressedTexImageARB, 671, GetnCompressedTexImageARB@16)
+	GL_STUB(GetnConvolutionFilterARB, 672, GetnConvolutionFilterARB@20)
+	GL_STUB(GetnHistogramARB, 673, GetnHistogramARB@24)
+	GL_STUB(GetnMapdvARB, 674, GetnMapdvARB@16)
+	GL_STUB(GetnMapfvARB, 675, GetnMapfvARB@16)
+	GL_STUB(GetnMapivARB, 676, GetnMapivARB@16)
+	GL_STUB(GetnMinmaxARB, 677, GetnMinmaxARB@24)
+	GL_STUB(GetnPixelMapfvARB, 678, GetnPixelMapfvARB@12)
+	GL_STUB(GetnPixelMapuivARB, 679, GetnPixelMapuivARB@12)
+	GL_STUB(GetnPixelMapusvARB, 680, GetnPixelMapusvARB@12)
+	GL_STUB(GetnPolygonStippleARB, 681, GetnPolygonStippleARB@8)
+	GL_STUB(GetnSeparableFilterARB, 682, GetnSeparableFilterARB@32)
+	GL_STUB(GetnTexImageARB, 683, GetnTexImageARB@24)
+	GL_STUB(GetnUniformdvARB, 684, GetnUniformdvARB@16)
+	GL_STUB(GetnUniformfvARB, 685, GetnUniformfvARB@16)
+	GL_STUB(GetnUniformivARB, 686, GetnUniformivARB@16)
+	GL_STUB(GetnUniformuivARB, 687, GetnUniformuivARB@16)
+	GL_STUB(ReadnPixelsARB, 688, ReadnPixelsARB@32)
+	GL_STUB(TexStorage1D, 689, TexStorage1D@16)
+	GL_STUB(TexStorage2D, 690, TexStorage2D@20)
+	GL_STUB(TexStorage3D, 691, TexStorage3D@24)
+	GL_STUB(TextureStorage1DEXT, 692, TextureStorage1DEXT@20)
+	GL_STUB(TextureStorage2DEXT, 693, TextureStorage2DEXT@24)
+	GL_STUB(TextureStorage3DEXT, 694, TextureStorage3DEXT@28)
+	GL_STUB(PolygonOffsetEXT, 695, PolygonOffsetEXT@8)
 	GL_STUB(_dispatch_stub_696, 696, _dispatch_stub_696@8)
 	HIDDEN(GL_PREFIX(_dispatch_stub_696, _dispatch_stub_696@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@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_699, _dispatch_stub_699@4))
-	GL_STUB(ColorPointerEXT, 700, ColorPointerEXT@20)
-	GL_STUB(EdgeFlagPointerEXT, 701, EdgeFlagPointerEXT@12)
-	GL_STUB(IndexPointerEXT, 702, IndexPointerEXT@16)
-	GL_STUB(NormalPointerEXT, 703, NormalPointerEXT@16)
-	GL_STUB(TexCoordPointerEXT, 704, TexCoordPointerEXT@20)
-	GL_STUB(VertexPointerEXT, 705, VertexPointerEXT@20)
-	GL_STUB(PointParameterfEXT, 706, PointParameterfEXT@8)
-	GL_STUB(PointParameterfvEXT, 707, PointParameterfvEXT@8)
-	GL_STUB(LockArraysEXT, 708, LockArraysEXT@8)
-	GL_STUB(UnlockArraysEXT, 709, UnlockArraysEXT@0)
-	GL_STUB(SecondaryColor3bEXT, 710, SecondaryColor3bEXT@12)
-	GL_STUB(SecondaryColor3bvEXT, 711, SecondaryColor3bvEXT@4)
-	GL_STUB(SecondaryColor3dEXT, 712, SecondaryColor3dEXT@24)
-	GL_STUB(SecondaryColor3dvEXT, 713, SecondaryColor3dvEXT@4)
-	GL_STUB(SecondaryColor3fEXT, 714, SecondaryColor3fEXT@12)
-	GL_STUB(SecondaryColor3fvEXT, 715, SecondaryColor3fvEXT@4)
-	GL_STUB(SecondaryColor3iEXT, 716, SecondaryColor3iEXT@12)
-	GL_STUB(SecondaryColor3ivEXT, 717, SecondaryColor3ivEXT@4)
-	GL_STUB(SecondaryColor3sEXT, 718, SecondaryColor3sEXT@12)
-	GL_STUB(SecondaryColor3svEXT, 719, SecondaryColor3svEXT@4)
-	GL_STUB(SecondaryColor3ubEXT, 720, SecondaryColor3ubEXT@12)
-	GL_STUB(SecondaryColor3ubvEXT, 721, SecondaryColor3ubvEXT@4)
-	GL_STUB(SecondaryColor3uiEXT, 722, SecondaryColor3uiEXT@12)
-	GL_STUB(SecondaryColor3uivEXT, 723, SecondaryColor3uivEXT@4)
-	GL_STUB(SecondaryColor3usEXT, 724, SecondaryColor3usEXT@12)
-	GL_STUB(SecondaryColor3usvEXT, 725, SecondaryColor3usvEXT@4)
-	GL_STUB(SecondaryColorPointerEXT, 726, SecondaryColorPointerEXT@16)
-	GL_STUB(MultiDrawArraysEXT, 727, MultiDrawArraysEXT@16)
-	GL_STUB(MultiDrawElementsEXT, 728, MultiDrawElementsEXT@20)
-	GL_STUB(FogCoordPointerEXT, 729, FogCoordPointerEXT@12)
-	GL_STUB(FogCoorddEXT, 730, FogCoorddEXT@8)
-	GL_STUB(FogCoorddvEXT, 731, FogCoorddvEXT@4)
-	GL_STUB(FogCoordfEXT, 732, FogCoordfEXT@4)
-	GL_STUB(FogCoordfvEXT, 733, FogCoordfvEXT@4)
-	GL_STUB(_dispatch_stub_734, 734, _dispatch_stub_734@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_734, _dispatch_stub_734@4))
-	GL_STUB(BlendFuncSeparateEXT, 735, BlendFuncSeparateEXT@16)
-	GL_STUB(FlushVertexArrayRangeNV, 736, FlushVertexArrayRangeNV@0)
-	GL_STUB(VertexArrayRangeNV, 737, VertexArrayRangeNV@8)
-	GL_STUB(CombinerInputNV, 738, CombinerInputNV@24)
-	GL_STUB(CombinerOutputNV, 739, CombinerOutputNV@40)
-	GL_STUB(CombinerParameterfNV, 740, CombinerParameterfNV@8)
-	GL_STUB(CombinerParameterfvNV, 741, CombinerParameterfvNV@8)
-	GL_STUB(CombinerParameteriNV, 742, CombinerParameteriNV@8)
-	GL_STUB(CombinerParameterivNV, 743, CombinerParameterivNV@8)
-	GL_STUB(FinalCombinerInputNV, 744, FinalCombinerInputNV@16)
-	GL_STUB(GetCombinerInputParameterfvNV, 745, GetCombinerInputParameterfvNV@20)
-	GL_STUB(GetCombinerInputParameterivNV, 746, GetCombinerInputParameterivNV@20)
-	GL_STUB(GetCombinerOutputParameterfvNV, 747, GetCombinerOutputParameterfvNV@16)
-	GL_STUB(GetCombinerOutputParameterivNV, 748, GetCombinerOutputParameterivNV@16)
-	GL_STUB(GetFinalCombinerInputParameterfvNV, 749, GetFinalCombinerInputParameterfvNV@12)
-	GL_STUB(GetFinalCombinerInputParameterivNV, 750, GetFinalCombinerInputParameterivNV@12)
-	GL_STUB(ResizeBuffersMESA, 751, ResizeBuffersMESA@0)
-	GL_STUB(WindowPos2dMESA, 752, WindowPos2dMESA@16)
-	GL_STUB(WindowPos2dvMESA, 753, WindowPos2dvMESA@4)
-	GL_STUB(WindowPos2fMESA, 754, WindowPos2fMESA@8)
-	GL_STUB(WindowPos2fvMESA, 755, WindowPos2fvMESA@4)
-	GL_STUB(WindowPos2iMESA, 756, WindowPos2iMESA@8)
-	GL_STUB(WindowPos2ivMESA, 757, WindowPos2ivMESA@4)
-	GL_STUB(WindowPos2sMESA, 758, WindowPos2sMESA@8)
-	GL_STUB(WindowPos2svMESA, 759, WindowPos2svMESA@4)
-	GL_STUB(WindowPos3dMESA, 760, WindowPos3dMESA@24)
-	GL_STUB(WindowPos3dvMESA, 761, WindowPos3dvMESA@4)
-	GL_STUB(WindowPos3fMESA, 762, WindowPos3fMESA@12)
-	GL_STUB(WindowPos3fvMESA, 763, WindowPos3fvMESA@4)
-	GL_STUB(WindowPos3iMESA, 764, WindowPos3iMESA@12)
-	GL_STUB(WindowPos3ivMESA, 765, WindowPos3ivMESA@4)
-	GL_STUB(WindowPos3sMESA, 766, WindowPos3sMESA@12)
-	GL_STUB(WindowPos3svMESA, 767, WindowPos3svMESA@4)
-	GL_STUB(WindowPos4dMESA, 768, WindowPos4dMESA@32)
-	GL_STUB(WindowPos4dvMESA, 769, WindowPos4dvMESA@4)
-	GL_STUB(WindowPos4fMESA, 770, WindowPos4fMESA@16)
-	GL_STUB(WindowPos4fvMESA, 771, WindowPos4fvMESA@4)
-	GL_STUB(WindowPos4iMESA, 772, WindowPos4iMESA@16)
-	GL_STUB(WindowPos4ivMESA, 773, WindowPos4ivMESA@4)
-	GL_STUB(WindowPos4sMESA, 774, WindowPos4sMESA@16)
-	GL_STUB(WindowPos4svMESA, 775, WindowPos4svMESA@4)
-	GL_STUB(_dispatch_stub_776, 776, _dispatch_stub_776@20)
-	HIDDEN(GL_PREFIX(_dispatch_stub_776, _dispatch_stub_776@20))
-	GL_STUB(_dispatch_stub_777, 777, _dispatch_stub_777@24)
-	HIDDEN(GL_PREFIX(_dispatch_stub_777, _dispatch_stub_777@24))
-	GL_STUB(_dispatch_stub_778, 778, _dispatch_stub_778@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_778, _dispatch_stub_778@8))
-	GL_STUB(_dispatch_stub_779, 779, _dispatch_stub_779@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_779, _dispatch_stub_779@4))
-	GL_STUB(_dispatch_stub_780, 780, _dispatch_stub_780@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_780, _dispatch_stub_780@8))
-	GL_STUB(_dispatch_stub_781, 781, _dispatch_stub_781@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_781, _dispatch_stub_781@12))
-	GL_STUB(_dispatch_stub_782, 782, _dispatch_stub_782@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_782, _dispatch_stub_782@4))
-	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(AreProgramsResidentNV, 785, AreProgramsResidentNV@12)
-	GL_STUB(BindProgramNV, 786, BindProgramNV@8)
-	GL_STUB(DeleteProgramsNV, 787, DeleteProgramsNV@8)
-	GL_STUB(ExecuteProgramNV, 788, ExecuteProgramNV@12)
-	GL_STUB(GenProgramsNV, 789, GenProgramsNV@8)
-	GL_STUB(GetProgramParameterdvNV, 790, GetProgramParameterdvNV@16)
-	GL_STUB(GetProgramParameterfvNV, 791, GetProgramParameterfvNV@16)
-	GL_STUB(GetProgramStringNV, 792, GetProgramStringNV@12)
-	GL_STUB(GetProgramivNV, 793, GetProgramivNV@12)
-	GL_STUB(GetTrackMatrixivNV, 794, GetTrackMatrixivNV@16)
-	GL_STUB(GetVertexAttribPointervNV, 795, GetVertexAttribPointervNV@12)
-	GL_STUB(GetVertexAttribdvNV, 796, GetVertexAttribdvNV@12)
-	GL_STUB(GetVertexAttribfvNV, 797, GetVertexAttribfvNV@12)
-	GL_STUB(GetVertexAttribivNV, 798, GetVertexAttribivNV@12)
-	GL_STUB(IsProgramNV, 799, IsProgramNV@4)
-	GL_STUB(LoadProgramNV, 800, LoadProgramNV@16)
-	GL_STUB(ProgramParameters4dvNV, 801, ProgramParameters4dvNV@16)
-	GL_STUB(ProgramParameters4fvNV, 802, ProgramParameters4fvNV@16)
-	GL_STUB(RequestResidentProgramsNV, 803, RequestResidentProgramsNV@8)
-	GL_STUB(TrackMatrixNV, 804, TrackMatrixNV@16)
-	GL_STUB(VertexAttrib1dNV, 805, VertexAttrib1dNV@12)
-	GL_STUB(VertexAttrib1dvNV, 806, VertexAttrib1dvNV@8)
-	GL_STUB(VertexAttrib1fNV, 807, VertexAttrib1fNV@8)
-	GL_STUB(VertexAttrib1fvNV, 808, VertexAttrib1fvNV@8)
-	GL_STUB(VertexAttrib1sNV, 809, VertexAttrib1sNV@8)
-	GL_STUB(VertexAttrib1svNV, 810, VertexAttrib1svNV@8)
-	GL_STUB(VertexAttrib2dNV, 811, VertexAttrib2dNV@20)
-	GL_STUB(VertexAttrib2dvNV, 812, VertexAttrib2dvNV@8)
-	GL_STUB(VertexAttrib2fNV, 813, VertexAttrib2fNV@12)
-	GL_STUB(VertexAttrib2fvNV, 814, VertexAttrib2fvNV@8)
-	GL_STUB(VertexAttrib2sNV, 815, VertexAttrib2sNV@12)
-	GL_STUB(VertexAttrib2svNV, 816, VertexAttrib2svNV@8)
-	GL_STUB(VertexAttrib3dNV, 817, VertexAttrib3dNV@28)
-	GL_STUB(VertexAttrib3dvNV, 818, VertexAttrib3dvNV@8)
-	GL_STUB(VertexAttrib3fNV, 819, VertexAttrib3fNV@16)
-	GL_STUB(VertexAttrib3fvNV, 820, VertexAttrib3fvNV@8)
-	GL_STUB(VertexAttrib3sNV, 821, VertexAttrib3sNV@16)
-	GL_STUB(VertexAttrib3svNV, 822, VertexAttrib3svNV@8)
-	GL_STUB(VertexAttrib4dNV, 823, VertexAttrib4dNV@36)
-	GL_STUB(VertexAttrib4dvNV, 824, VertexAttrib4dvNV@8)
-	GL_STUB(VertexAttrib4fNV, 825, VertexAttrib4fNV@20)
-	GL_STUB(VertexAttrib4fvNV, 826, VertexAttrib4fvNV@8)
-	GL_STUB(VertexAttrib4sNV, 827, VertexAttrib4sNV@20)
-	GL_STUB(VertexAttrib4svNV, 828, VertexAttrib4svNV@8)
-	GL_STUB(VertexAttrib4ubNV, 829, VertexAttrib4ubNV@20)
-	GL_STUB(VertexAttrib4ubvNV, 830, VertexAttrib4ubvNV@8)
-	GL_STUB(VertexAttribPointerNV, 831, VertexAttribPointerNV@20)
-	GL_STUB(VertexAttribs1dvNV, 832, VertexAttribs1dvNV@12)
-	GL_STUB(VertexAttribs1fvNV, 833, VertexAttribs1fvNV@12)
-	GL_STUB(VertexAttribs1svNV, 834, VertexAttribs1svNV@12)
-	GL_STUB(VertexAttribs2dvNV, 835, VertexAttribs2dvNV@12)
-	GL_STUB(VertexAttribs2fvNV, 836, VertexAttribs2fvNV@12)
-	GL_STUB(VertexAttribs2svNV, 837, VertexAttribs2svNV@12)
-	GL_STUB(VertexAttribs3dvNV, 838, VertexAttribs3dvNV@12)
-	GL_STUB(VertexAttribs3fvNV, 839, VertexAttribs3fvNV@12)
-	GL_STUB(VertexAttribs3svNV, 840, VertexAttribs3svNV@12)
-	GL_STUB(VertexAttribs4dvNV, 841, VertexAttribs4dvNV@12)
-	GL_STUB(VertexAttribs4fvNV, 842, VertexAttribs4fvNV@12)
-	GL_STUB(VertexAttribs4svNV, 843, VertexAttribs4svNV@12)
-	GL_STUB(VertexAttribs4ubvNV, 844, VertexAttribs4ubvNV@12)
-	GL_STUB(GetTexBumpParameterfvATI, 845, GetTexBumpParameterfvATI@8)
-	GL_STUB(GetTexBumpParameterivATI, 846, GetTexBumpParameterivATI@8)
-	GL_STUB(TexBumpParameterfvATI, 847, TexBumpParameterfvATI@8)
-	GL_STUB(TexBumpParameterivATI, 848, TexBumpParameterivATI@8)
-	GL_STUB(AlphaFragmentOp1ATI, 849, AlphaFragmentOp1ATI@24)
-	GL_STUB(AlphaFragmentOp2ATI, 850, AlphaFragmentOp2ATI@36)
-	GL_STUB(AlphaFragmentOp3ATI, 851, AlphaFragmentOp3ATI@48)
-	GL_STUB(BeginFragmentShaderATI, 852, BeginFragmentShaderATI@0)
-	GL_STUB(BindFragmentShaderATI, 853, BindFragmentShaderATI@4)
-	GL_STUB(ColorFragmentOp1ATI, 854, ColorFragmentOp1ATI@28)
-	GL_STUB(ColorFragmentOp2ATI, 855, ColorFragmentOp2ATI@40)
-	GL_STUB(ColorFragmentOp3ATI, 856, ColorFragmentOp3ATI@52)
-	GL_STUB(DeleteFragmentShaderATI, 857, DeleteFragmentShaderATI@4)
-	GL_STUB(EndFragmentShaderATI, 858, EndFragmentShaderATI@0)
-	GL_STUB(GenFragmentShadersATI, 859, GenFragmentShadersATI@4)
-	GL_STUB(PassTexCoordATI, 860, PassTexCoordATI@12)
-	GL_STUB(SampleMapATI, 861, SampleMapATI@12)
-	GL_STUB(SetFragmentShaderConstantATI, 862, SetFragmentShaderConstantATI@8)
-	GL_STUB(PointParameteriNV, 863, PointParameteriNV@8)
-	GL_STUB(PointParameterivNV, 864, PointParameterivNV@8)
-	GL_STUB(_dispatch_stub_865, 865, _dispatch_stub_865@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_865, _dispatch_stub_865@4))
-	GL_STUB(_dispatch_stub_866, 866, _dispatch_stub_866@4)
-	HIDDEN(GL_PREFIX(_dispatch_stub_866, _dispatch_stub_866@4))
-	GL_STUB(_dispatch_stub_867, 867, _dispatch_stub_867@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_867, _dispatch_stub_867@8))
-	GL_STUB(_dispatch_stub_868, 868, _dispatch_stub_868@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_868, _dispatch_stub_868@8))
+	GL_STUB(_dispatch_stub_699, 699, _dispatch_stub_699@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_699, _dispatch_stub_699@8))
+	GL_STUB(_dispatch_stub_700, 700, _dispatch_stub_700@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_700, _dispatch_stub_700@8))
+	GL_STUB(_dispatch_stub_701, 701, _dispatch_stub_701@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_701, _dispatch_stub_701@8))
+	GL_STUB(_dispatch_stub_702, 702, _dispatch_stub_702@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_702, _dispatch_stub_702@8))
+	GL_STUB(_dispatch_stub_703, 703, _dispatch_stub_703@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_703, _dispatch_stub_703@4))
+	GL_STUB(ColorPointerEXT, 704, ColorPointerEXT@20)
+	GL_STUB(EdgeFlagPointerEXT, 705, EdgeFlagPointerEXT@12)
+	GL_STUB(IndexPointerEXT, 706, IndexPointerEXT@16)
+	GL_STUB(NormalPointerEXT, 707, NormalPointerEXT@16)
+	GL_STUB(TexCoordPointerEXT, 708, TexCoordPointerEXT@20)
+	GL_STUB(VertexPointerEXT, 709, VertexPointerEXT@20)
+	GL_STUB(PointParameterfEXT, 710, PointParameterfEXT@8)
+	GL_STUB(PointParameterfvEXT, 711, PointParameterfvEXT@8)
+	GL_STUB(LockArraysEXT, 712, LockArraysEXT@8)
+	GL_STUB(UnlockArraysEXT, 713, UnlockArraysEXT@0)
+	GL_STUB(SecondaryColor3bEXT, 714, SecondaryColor3bEXT@12)
+	GL_STUB(SecondaryColor3bvEXT, 715, SecondaryColor3bvEXT@4)
+	GL_STUB(SecondaryColor3dEXT, 716, SecondaryColor3dEXT@24)
+	GL_STUB(SecondaryColor3dvEXT, 717, SecondaryColor3dvEXT@4)
+	GL_STUB(SecondaryColor3fEXT, 718, SecondaryColor3fEXT@12)
+	GL_STUB(SecondaryColor3fvEXT, 719, SecondaryColor3fvEXT@4)
+	GL_STUB(SecondaryColor3iEXT, 720, SecondaryColor3iEXT@12)
+	GL_STUB(SecondaryColor3ivEXT, 721, SecondaryColor3ivEXT@4)
+	GL_STUB(SecondaryColor3sEXT, 722, SecondaryColor3sEXT@12)
+	GL_STUB(SecondaryColor3svEXT, 723, SecondaryColor3svEXT@4)
+	GL_STUB(SecondaryColor3ubEXT, 724, SecondaryColor3ubEXT@12)
+	GL_STUB(SecondaryColor3ubvEXT, 725, SecondaryColor3ubvEXT@4)
+	GL_STUB(SecondaryColor3uiEXT, 726, SecondaryColor3uiEXT@12)
+	GL_STUB(SecondaryColor3uivEXT, 727, SecondaryColor3uivEXT@4)
+	GL_STUB(SecondaryColor3usEXT, 728, SecondaryColor3usEXT@12)
+	GL_STUB(SecondaryColor3usvEXT, 729, SecondaryColor3usvEXT@4)
+	GL_STUB(SecondaryColorPointerEXT, 730, SecondaryColorPointerEXT@16)
+	GL_STUB(MultiDrawArraysEXT, 731, MultiDrawArraysEXT@16)
+	GL_STUB(MultiDrawElementsEXT, 732, MultiDrawElementsEXT@20)
+	GL_STUB(FogCoordPointerEXT, 733, FogCoordPointerEXT@12)
+	GL_STUB(FogCoorddEXT, 734, FogCoorddEXT@8)
+	GL_STUB(FogCoorddvEXT, 735, FogCoorddvEXT@4)
+	GL_STUB(FogCoordfEXT, 736, FogCoordfEXT@4)
+	GL_STUB(FogCoordfvEXT, 737, FogCoordfvEXT@4)
+	GL_STUB(_dispatch_stub_738, 738, _dispatch_stub_738@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_738, _dispatch_stub_738@4))
+	GL_STUB(BlendFuncSeparateEXT, 739, BlendFuncSeparateEXT@16)
+	GL_STUB(FlushVertexArrayRangeNV, 740, FlushVertexArrayRangeNV@0)
+	GL_STUB(VertexArrayRangeNV, 741, VertexArrayRangeNV@8)
+	GL_STUB(CombinerInputNV, 742, CombinerInputNV@24)
+	GL_STUB(CombinerOutputNV, 743, CombinerOutputNV@40)
+	GL_STUB(CombinerParameterfNV, 744, CombinerParameterfNV@8)
+	GL_STUB(CombinerParameterfvNV, 745, CombinerParameterfvNV@8)
+	GL_STUB(CombinerParameteriNV, 746, CombinerParameteriNV@8)
+	GL_STUB(CombinerParameterivNV, 747, CombinerParameterivNV@8)
+	GL_STUB(FinalCombinerInputNV, 748, FinalCombinerInputNV@16)
+	GL_STUB(GetCombinerInputParameterfvNV, 749, GetCombinerInputParameterfvNV@20)
+	GL_STUB(GetCombinerInputParameterivNV, 750, GetCombinerInputParameterivNV@20)
+	GL_STUB(GetCombinerOutputParameterfvNV, 751, GetCombinerOutputParameterfvNV@16)
+	GL_STUB(GetCombinerOutputParameterivNV, 752, GetCombinerOutputParameterivNV@16)
+	GL_STUB(GetFinalCombinerInputParameterfvNV, 753, GetFinalCombinerInputParameterfvNV@12)
+	GL_STUB(GetFinalCombinerInputParameterivNV, 754, GetFinalCombinerInputParameterivNV@12)
+	GL_STUB(ResizeBuffersMESA, 755, ResizeBuffersMESA@0)
+	GL_STUB(WindowPos2dMESA, 756, WindowPos2dMESA@16)
+	GL_STUB(WindowPos2dvMESA, 757, WindowPos2dvMESA@4)
+	GL_STUB(WindowPos2fMESA, 758, WindowPos2fMESA@8)
+	GL_STUB(WindowPos2fvMESA, 759, WindowPos2fvMESA@4)
+	GL_STUB(WindowPos2iMESA, 760, WindowPos2iMESA@8)
+	GL_STUB(WindowPos2ivMESA, 761, WindowPos2ivMESA@4)
+	GL_STUB(WindowPos2sMESA, 762, WindowPos2sMESA@8)
+	GL_STUB(WindowPos2svMESA, 763, WindowPos2svMESA@4)
+	GL_STUB(WindowPos3dMESA, 764, WindowPos3dMESA@24)
+	GL_STUB(WindowPos3dvMESA, 765, WindowPos3dvMESA@4)
+	GL_STUB(WindowPos3fMESA, 766, WindowPos3fMESA@12)
+	GL_STUB(WindowPos3fvMESA, 767, WindowPos3fvMESA@4)
+	GL_STUB(WindowPos3iMESA, 768, WindowPos3iMESA@12)
+	GL_STUB(WindowPos3ivMESA, 769, WindowPos3ivMESA@4)
+	GL_STUB(WindowPos3sMESA, 770, WindowPos3sMESA@12)
+	GL_STUB(WindowPos3svMESA, 771, WindowPos3svMESA@4)
+	GL_STUB(WindowPos4dMESA, 772, WindowPos4dMESA@32)
+	GL_STUB(WindowPos4dvMESA, 773, WindowPos4dvMESA@4)
+	GL_STUB(WindowPos4fMESA, 774, WindowPos4fMESA@16)
+	GL_STUB(WindowPos4fvMESA, 775, WindowPos4fvMESA@4)
+	GL_STUB(WindowPos4iMESA, 776, WindowPos4iMESA@16)
+	GL_STUB(WindowPos4ivMESA, 777, WindowPos4ivMESA@4)
+	GL_STUB(WindowPos4sMESA, 778, WindowPos4sMESA@16)
+	GL_STUB(WindowPos4svMESA, 779, WindowPos4svMESA@4)
+	GL_STUB(_dispatch_stub_780, 780, _dispatch_stub_780@20)
+	HIDDEN(GL_PREFIX(_dispatch_stub_780, _dispatch_stub_780@20))
+	GL_STUB(_dispatch_stub_781, 781, _dispatch_stub_781@24)
+	HIDDEN(GL_PREFIX(_dispatch_stub_781, _dispatch_stub_781@24))
+	GL_STUB(_dispatch_stub_782, 782, _dispatch_stub_782@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_782, _dispatch_stub_782@8))
+	GL_STUB(_dispatch_stub_783, 783, _dispatch_stub_783@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_783, _dispatch_stub_783@4))
+	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@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_785, _dispatch_stub_785@12))
+	GL_STUB(_dispatch_stub_786, 786, _dispatch_stub_786@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_786, _dispatch_stub_786@4))
+	GL_STUB(_dispatch_stub_787, 787, _dispatch_stub_787@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_787, _dispatch_stub_787@8))
+	GL_STUB(_dispatch_stub_788, 788, _dispatch_stub_788@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_788, _dispatch_stub_788@4))
+	GL_STUB(AreProgramsResidentNV, 789, AreProgramsResidentNV@12)
+	GL_STUB(BindProgramNV, 790, BindProgramNV@8)
+	GL_STUB(DeleteProgramsNV, 791, DeleteProgramsNV@8)
+	GL_STUB(ExecuteProgramNV, 792, ExecuteProgramNV@12)
+	GL_STUB(GenProgramsNV, 793, GenProgramsNV@8)
+	GL_STUB(GetProgramParameterdvNV, 794, GetProgramParameterdvNV@16)
+	GL_STUB(GetProgramParameterfvNV, 795, GetProgramParameterfvNV@16)
+	GL_STUB(GetProgramStringNV, 796, GetProgramStringNV@12)
+	GL_STUB(GetProgramivNV, 797, GetProgramivNV@12)
+	GL_STUB(GetTrackMatrixivNV, 798, GetTrackMatrixivNV@16)
+	GL_STUB(GetVertexAttribPointervNV, 799, GetVertexAttribPointervNV@12)
+	GL_STUB(GetVertexAttribdvNV, 800, GetVertexAttribdvNV@12)
+	GL_STUB(GetVertexAttribfvNV, 801, GetVertexAttribfvNV@12)
+	GL_STUB(GetVertexAttribivNV, 802, GetVertexAttribivNV@12)
+	GL_STUB(IsProgramNV, 803, IsProgramNV@4)
+	GL_STUB(LoadProgramNV, 804, LoadProgramNV@16)
+	GL_STUB(ProgramParameters4dvNV, 805, ProgramParameters4dvNV@16)
+	GL_STUB(ProgramParameters4fvNV, 806, ProgramParameters4fvNV@16)
+	GL_STUB(RequestResidentProgramsNV, 807, RequestResidentProgramsNV@8)
+	GL_STUB(TrackMatrixNV, 808, TrackMatrixNV@16)
+	GL_STUB(VertexAttrib1dNV, 809, VertexAttrib1dNV@12)
+	GL_STUB(VertexAttrib1dvNV, 810, VertexAttrib1dvNV@8)
+	GL_STUB(VertexAttrib1fNV, 811, VertexAttrib1fNV@8)
+	GL_STUB(VertexAttrib1fvNV, 812, VertexAttrib1fvNV@8)
+	GL_STUB(VertexAttrib1sNV, 813, VertexAttrib1sNV@8)
+	GL_STUB(VertexAttrib1svNV, 814, VertexAttrib1svNV@8)
+	GL_STUB(VertexAttrib2dNV, 815, VertexAttrib2dNV@20)
+	GL_STUB(VertexAttrib2dvNV, 816, VertexAttrib2dvNV@8)
+	GL_STUB(VertexAttrib2fNV, 817, VertexAttrib2fNV@12)
+	GL_STUB(VertexAttrib2fvNV, 818, VertexAttrib2fvNV@8)
+	GL_STUB(VertexAttrib2sNV, 819, VertexAttrib2sNV@12)
+	GL_STUB(VertexAttrib2svNV, 820, VertexAttrib2svNV@8)
+	GL_STUB(VertexAttrib3dNV, 821, VertexAttrib3dNV@28)
+	GL_STUB(VertexAttrib3dvNV, 822, VertexAttrib3dvNV@8)
+	GL_STUB(VertexAttrib3fNV, 823, VertexAttrib3fNV@16)
+	GL_STUB(VertexAttrib3fvNV, 824, VertexAttrib3fvNV@8)
+	GL_STUB(VertexAttrib3sNV, 825, VertexAttrib3sNV@16)
+	GL_STUB(VertexAttrib3svNV, 826, VertexAttrib3svNV@8)
+	GL_STUB(VertexAttrib4dNV, 827, VertexAttrib4dNV@36)
+	GL_STUB(VertexAttrib4dvNV, 828, VertexAttrib4dvNV@8)
+	GL_STUB(VertexAttrib4fNV, 829, VertexAttrib4fNV@20)
+	GL_STUB(VertexAttrib4fvNV, 830, VertexAttrib4fvNV@8)
+	GL_STUB(VertexAttrib4sNV, 831, VertexAttrib4sNV@20)
+	GL_STUB(VertexAttrib4svNV, 832, VertexAttrib4svNV@8)
+	GL_STUB(VertexAttrib4ubNV, 833, VertexAttrib4ubNV@20)
+	GL_STUB(VertexAttrib4ubvNV, 834, VertexAttrib4ubvNV@8)
+	GL_STUB(VertexAttribPointerNV, 835, VertexAttribPointerNV@20)
+	GL_STUB(VertexAttribs1dvNV, 836, VertexAttribs1dvNV@12)
+	GL_STUB(VertexAttribs1fvNV, 837, VertexAttribs1fvNV@12)
+	GL_STUB(VertexAttribs1svNV, 838, VertexAttribs1svNV@12)
+	GL_STUB(VertexAttribs2dvNV, 839, VertexAttribs2dvNV@12)
+	GL_STUB(VertexAttribs2fvNV, 840, VertexAttribs2fvNV@12)
+	GL_STUB(VertexAttribs2svNV, 841, VertexAttribs2svNV@12)
+	GL_STUB(VertexAttribs3dvNV, 842, VertexAttribs3dvNV@12)
+	GL_STUB(VertexAttribs3fvNV, 843, VertexAttribs3fvNV@12)
+	GL_STUB(VertexAttribs3svNV, 844, VertexAttribs3svNV@12)
+	GL_STUB(VertexAttribs4dvNV, 845, VertexAttribs4dvNV@12)
+	GL_STUB(VertexAttribs4fvNV, 846, VertexAttribs4fvNV@12)
+	GL_STUB(VertexAttribs4svNV, 847, VertexAttribs4svNV@12)
+	GL_STUB(VertexAttribs4ubvNV, 848, VertexAttribs4ubvNV@12)
+	GL_STUB(GetTexBumpParameterfvATI, 849, GetTexBumpParameterfvATI@8)
+	GL_STUB(GetTexBumpParameterivATI, 850, GetTexBumpParameterivATI@8)
+	GL_STUB(TexBumpParameterfvATI, 851, TexBumpParameterfvATI@8)
+	GL_STUB(TexBumpParameterivATI, 852, TexBumpParameterivATI@8)
+	GL_STUB(AlphaFragmentOp1ATI, 853, AlphaFragmentOp1ATI@24)
+	GL_STUB(AlphaFragmentOp2ATI, 854, AlphaFragmentOp2ATI@36)
+	GL_STUB(AlphaFragmentOp3ATI, 855, AlphaFragmentOp3ATI@48)
+	GL_STUB(BeginFragmentShaderATI, 856, BeginFragmentShaderATI@0)
+	GL_STUB(BindFragmentShaderATI, 857, BindFragmentShaderATI@4)
+	GL_STUB(ColorFragmentOp1ATI, 858, ColorFragmentOp1ATI@28)
+	GL_STUB(ColorFragmentOp2ATI, 859, ColorFragmentOp2ATI@40)
+	GL_STUB(ColorFragmentOp3ATI, 860, ColorFragmentOp3ATI@52)
+	GL_STUB(DeleteFragmentShaderATI, 861, DeleteFragmentShaderATI@4)
+	GL_STUB(EndFragmentShaderATI, 862, EndFragmentShaderATI@0)
+	GL_STUB(GenFragmentShadersATI, 863, GenFragmentShadersATI@4)
+	GL_STUB(PassTexCoordATI, 864, PassTexCoordATI@12)
+	GL_STUB(SampleMapATI, 865, SampleMapATI@12)
+	GL_STUB(SetFragmentShaderConstantATI, 866, SetFragmentShaderConstantATI@8)
+	GL_STUB(PointParameteriNV, 867, PointParameteriNV@8)
+	GL_STUB(PointParameterivNV, 868, PointParameterivNV@8)
 	GL_STUB(_dispatch_stub_869, 869, _dispatch_stub_869@4)
 	HIDDEN(GL_PREFIX(_dispatch_stub_869, _dispatch_stub_869@4))
-	GL_STUB(GetProgramNamedParameterdvNV, 870, GetProgramNamedParameterdvNV@16)
-	GL_STUB(GetProgramNamedParameterfvNV, 871, GetProgramNamedParameterfvNV@16)
-	GL_STUB(ProgramNamedParameter4dNV, 872, ProgramNamedParameter4dNV@44)
-	GL_STUB(ProgramNamedParameter4dvNV, 873, ProgramNamedParameter4dvNV@16)
-	GL_STUB(ProgramNamedParameter4fNV, 874, ProgramNamedParameter4fNV@28)
-	GL_STUB(ProgramNamedParameter4fvNV, 875, ProgramNamedParameter4fvNV@16)
-	GL_STUB(PrimitiveRestartIndexNV, 876, PrimitiveRestartIndexNV@4)
-	GL_STUB(PrimitiveRestartNV, 877, PrimitiveRestartNV@0)
-	GL_STUB(_dispatch_stub_878, 878, _dispatch_stub_878@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_878, _dispatch_stub_878@16))
-	GL_STUB(_dispatch_stub_879, 879, _dispatch_stub_879@8)
-	HIDDEN(GL_PREFIX(_dispatch_stub_879, _dispatch_stub_879@8))
-	GL_STUB(BindFramebufferEXT, 880, BindFramebufferEXT@8)
-	GL_STUB(BindRenderbufferEXT, 881, BindRenderbufferEXT@8)
-	GL_STUB(CheckFramebufferStatusEXT, 882, CheckFramebufferStatusEXT@4)
-	GL_STUB(DeleteFramebuffersEXT, 883, DeleteFramebuffersEXT@8)
-	GL_STUB(DeleteRenderbuffersEXT, 884, DeleteRenderbuffersEXT@8)
-	GL_STUB(FramebufferRenderbufferEXT, 885, FramebufferRenderbufferEXT@16)
-	GL_STUB(FramebufferTexture1DEXT, 886, FramebufferTexture1DEXT@20)
-	GL_STUB(FramebufferTexture2DEXT, 887, FramebufferTexture2DEXT@20)
-	GL_STUB(FramebufferTexture3DEXT, 888, FramebufferTexture3DEXT@24)
-	GL_STUB(GenFramebuffersEXT, 889, GenFramebuffersEXT@8)
-	GL_STUB(GenRenderbuffersEXT, 890, GenRenderbuffersEXT@8)
-	GL_STUB(GenerateMipmapEXT, 891, GenerateMipmapEXT@4)
-	GL_STUB(GetFramebufferAttachmentParameterivEXT, 892, GetFramebufferAttachmentParameterivEXT@16)
-	GL_STUB(GetRenderbufferParameterivEXT, 893, GetRenderbufferParameterivEXT@12)
-	GL_STUB(IsFramebufferEXT, 894, IsFramebufferEXT@4)
-	GL_STUB(IsRenderbufferEXT, 895, IsRenderbufferEXT@4)
-	GL_STUB(RenderbufferStorageEXT, 896, RenderbufferStorageEXT@16)
-	GL_STUB(_dispatch_stub_897, 897, _dispatch_stub_897@40)
-	HIDDEN(GL_PREFIX(_dispatch_stub_897, _dispatch_stub_897@40))
-	GL_STUB(_dispatch_stub_898, 898, _dispatch_stub_898@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_898, _dispatch_stub_898@12))
-	GL_STUB(_dispatch_stub_899, 899, _dispatch_stub_899@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_899, _dispatch_stub_899@12))
-	GL_STUB(BindFragDataLocationEXT, 900, BindFragDataLocationEXT@12)
-	GL_STUB(GetFragDataLocationEXT, 901, GetFragDataLocationEXT@8)
-	GL_STUB(GetUniformuivEXT, 902, GetUniformuivEXT@12)
-	GL_STUB(GetVertexAttribIivEXT, 903, GetVertexAttribIivEXT@12)
-	GL_STUB(GetVertexAttribIuivEXT, 904, GetVertexAttribIuivEXT@12)
-	GL_STUB(Uniform1uiEXT, 905, Uniform1uiEXT@8)
-	GL_STUB(Uniform1uivEXT, 906, Uniform1uivEXT@12)
-	GL_STUB(Uniform2uiEXT, 907, Uniform2uiEXT@12)
-	GL_STUB(Uniform2uivEXT, 908, Uniform2uivEXT@12)
-	GL_STUB(Uniform3uiEXT, 909, Uniform3uiEXT@16)
-	GL_STUB(Uniform3uivEXT, 910, Uniform3uivEXT@12)
-	GL_STUB(Uniform4uiEXT, 911, Uniform4uiEXT@20)
-	GL_STUB(Uniform4uivEXT, 912, Uniform4uivEXT@12)
-	GL_STUB(VertexAttribI1iEXT, 913, VertexAttribI1iEXT@8)
-	GL_STUB(VertexAttribI1ivEXT, 914, VertexAttribI1ivEXT@8)
-	GL_STUB(VertexAttribI1uiEXT, 915, VertexAttribI1uiEXT@8)
-	GL_STUB(VertexAttribI1uivEXT, 916, VertexAttribI1uivEXT@8)
-	GL_STUB(VertexAttribI2iEXT, 917, VertexAttribI2iEXT@12)
-	GL_STUB(VertexAttribI2ivEXT, 918, VertexAttribI2ivEXT@8)
-	GL_STUB(VertexAttribI2uiEXT, 919, VertexAttribI2uiEXT@12)
-	GL_STUB(VertexAttribI2uivEXT, 920, VertexAttribI2uivEXT@8)
-	GL_STUB(VertexAttribI3iEXT, 921, VertexAttribI3iEXT@16)
-	GL_STUB(VertexAttribI3ivEXT, 922, VertexAttribI3ivEXT@8)
-	GL_STUB(VertexAttribI3uiEXT, 923, VertexAttribI3uiEXT@16)
-	GL_STUB(VertexAttribI3uivEXT, 924, VertexAttribI3uivEXT@8)
-	GL_STUB(VertexAttribI4bvEXT, 925, VertexAttribI4bvEXT@8)
-	GL_STUB(VertexAttribI4iEXT, 926, VertexAttribI4iEXT@20)
-	GL_STUB(VertexAttribI4ivEXT, 927, VertexAttribI4ivEXT@8)
-	GL_STUB(VertexAttribI4svEXT, 928, VertexAttribI4svEXT@8)
-	GL_STUB(VertexAttribI4ubvEXT, 929, VertexAttribI4ubvEXT@8)
-	GL_STUB(VertexAttribI4uiEXT, 930, VertexAttribI4uiEXT@20)
-	GL_STUB(VertexAttribI4uivEXT, 931, VertexAttribI4uivEXT@8)
-	GL_STUB(VertexAttribI4usvEXT, 932, VertexAttribI4usvEXT@8)
-	GL_STUB(VertexAttribIPointerEXT, 933, VertexAttribIPointerEXT@20)
-	GL_STUB(FramebufferTextureLayerEXT, 934, FramebufferTextureLayerEXT@20)
-	GL_STUB(ColorMaskIndexedEXT, 935, ColorMaskIndexedEXT@20)
-	GL_STUB(DisableIndexedEXT, 936, DisableIndexedEXT@8)
-	GL_STUB(EnableIndexedEXT, 937, EnableIndexedEXT@8)
-	GL_STUB(GetBooleanIndexedvEXT, 938, GetBooleanIndexedvEXT@12)
-	GL_STUB(GetIntegerIndexedvEXT, 939, GetIntegerIndexedvEXT@12)
-	GL_STUB(IsEnabledIndexedEXT, 940, IsEnabledIndexedEXT@8)
-	GL_STUB(ClearColorIiEXT, 941, ClearColorIiEXT@16)
-	GL_STUB(ClearColorIuiEXT, 942, ClearColorIuiEXT@16)
-	GL_STUB(GetTexParameterIivEXT, 943, GetTexParameterIivEXT@12)
-	GL_STUB(GetTexParameterIuivEXT, 944, GetTexParameterIuivEXT@12)
-	GL_STUB(TexParameterIivEXT, 945, TexParameterIivEXT@12)
-	GL_STUB(TexParameterIuivEXT, 946, TexParameterIuivEXT@12)
-	GL_STUB(BeginConditionalRenderNV, 947, BeginConditionalRenderNV@8)
-	GL_STUB(EndConditionalRenderNV, 948, EndConditionalRenderNV@0)
-	GL_STUB(BeginTransformFeedbackEXT, 949, BeginTransformFeedbackEXT@4)
-	GL_STUB(BindBufferBaseEXT, 950, BindBufferBaseEXT@12)
-	GL_STUB(BindBufferOffsetEXT, 951, BindBufferOffsetEXT@16)
-	GL_STUB(BindBufferRangeEXT, 952, BindBufferRangeEXT@20)
-	GL_STUB(EndTransformFeedbackEXT, 953, EndTransformFeedbackEXT@0)
-	GL_STUB(GetTransformFeedbackVaryingEXT, 954, GetTransformFeedbackVaryingEXT@28)
-	GL_STUB(TransformFeedbackVaryingsEXT, 955, TransformFeedbackVaryingsEXT@16)
-	GL_STUB(ProvokingVertexEXT, 956, ProvokingVertexEXT@4)
-	GL_STUB(_dispatch_stub_957, 957, _dispatch_stub_957@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_957, _dispatch_stub_957@12))
-	GL_STUB(_dispatch_stub_958, 958, _dispatch_stub_958@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_958, _dispatch_stub_958@12))
-	GL_STUB(GetObjectParameterivAPPLE, 959, GetObjectParameterivAPPLE@16)
-	GL_STUB(ObjectPurgeableAPPLE, 960, ObjectPurgeableAPPLE@12)
-	GL_STUB(ObjectUnpurgeableAPPLE, 961, ObjectUnpurgeableAPPLE@12)
-	GL_STUB(ActiveProgramEXT, 962, ActiveProgramEXT@4)
-	GL_STUB(CreateShaderProgramEXT, 963, CreateShaderProgramEXT@8)
-	GL_STUB(UseShaderProgramEXT, 964, UseShaderProgramEXT@8)
-	GL_STUB(TextureBarrierNV, 965, TextureBarrierNV@0)
-	GL_STUB(_dispatch_stub_966, 966, _dispatch_stub_966@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_966, _dispatch_stub_966@16))
-	GL_STUB(_dispatch_stub_967, 967, _dispatch_stub_967@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_967, _dispatch_stub_967@16))
-	GL_STUB(_dispatch_stub_968, 968, _dispatch_stub_968@16)
-	HIDDEN(GL_PREFIX(_dispatch_stub_968, _dispatch_stub_968@16))
-	GL_STUB(_dispatch_stub_969, 969, _dispatch_stub_969@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_969, _dispatch_stub_969@12))
-	GL_STUB(_dispatch_stub_970, 970, _dispatch_stub_970@12)
-	HIDDEN(GL_PREFIX(_dispatch_stub_970, _dispatch_stub_970@12))
-	GL_STUB(EGLImageTargetRenderbufferStorageOES, 971, EGLImageTargetRenderbufferStorageOES@8)
-	GL_STUB(EGLImageTargetTexture2DOES, 972, EGLImageTargetTexture2DOES@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@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_871, _dispatch_stub_871@8))
+	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@4)
+	HIDDEN(GL_PREFIX(_dispatch_stub_873, _dispatch_stub_873@4))
+	GL_STUB(GetProgramNamedParameterdvNV, 874, GetProgramNamedParameterdvNV@16)
+	GL_STUB(GetProgramNamedParameterfvNV, 875, GetProgramNamedParameterfvNV@16)
+	GL_STUB(ProgramNamedParameter4dNV, 876, ProgramNamedParameter4dNV@44)
+	GL_STUB(ProgramNamedParameter4dvNV, 877, ProgramNamedParameter4dvNV@16)
+	GL_STUB(ProgramNamedParameter4fNV, 878, ProgramNamedParameter4fNV@28)
+	GL_STUB(ProgramNamedParameter4fvNV, 879, ProgramNamedParameter4fvNV@16)
+	GL_STUB(PrimitiveRestartIndexNV, 880, PrimitiveRestartIndexNV@4)
+	GL_STUB(PrimitiveRestartNV, 881, PrimitiveRestartNV@0)
+	GL_STUB(_dispatch_stub_882, 882, _dispatch_stub_882@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_882, _dispatch_stub_882@16))
+	GL_STUB(_dispatch_stub_883, 883, _dispatch_stub_883@8)
+	HIDDEN(GL_PREFIX(_dispatch_stub_883, _dispatch_stub_883@8))
+	GL_STUB(BindFramebufferEXT, 884, BindFramebufferEXT@8)
+	GL_STUB(BindRenderbufferEXT, 885, BindRenderbufferEXT@8)
+	GL_STUB(CheckFramebufferStatusEXT, 886, CheckFramebufferStatusEXT@4)
+	GL_STUB(DeleteFramebuffersEXT, 887, DeleteFramebuffersEXT@8)
+	GL_STUB(DeleteRenderbuffersEXT, 888, DeleteRenderbuffersEXT@8)
+	GL_STUB(FramebufferRenderbufferEXT, 889, FramebufferRenderbufferEXT@16)
+	GL_STUB(FramebufferTexture1DEXT, 890, FramebufferTexture1DEXT@20)
+	GL_STUB(FramebufferTexture2DEXT, 891, FramebufferTexture2DEXT@20)
+	GL_STUB(FramebufferTexture3DEXT, 892, FramebufferTexture3DEXT@24)
+	GL_STUB(GenFramebuffersEXT, 893, GenFramebuffersEXT@8)
+	GL_STUB(GenRenderbuffersEXT, 894, GenRenderbuffersEXT@8)
+	GL_STUB(GenerateMipmapEXT, 895, GenerateMipmapEXT@4)
+	GL_STUB(GetFramebufferAttachmentParameterivEXT, 896, GetFramebufferAttachmentParameterivEXT@16)
+	GL_STUB(GetRenderbufferParameterivEXT, 897, GetRenderbufferParameterivEXT@12)
+	GL_STUB(IsFramebufferEXT, 898, IsFramebufferEXT@4)
+	GL_STUB(IsRenderbufferEXT, 899, IsRenderbufferEXT@4)
+	GL_STUB(RenderbufferStorageEXT, 900, RenderbufferStorageEXT@16)
+	GL_STUB(_dispatch_stub_901, 901, _dispatch_stub_901@40)
+	HIDDEN(GL_PREFIX(_dispatch_stub_901, _dispatch_stub_901@40))
+	GL_STUB(_dispatch_stub_902, 902, _dispatch_stub_902@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_902, _dispatch_stub_902@12))
+	GL_STUB(_dispatch_stub_903, 903, _dispatch_stub_903@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_903, _dispatch_stub_903@12))
+	GL_STUB(BindFragDataLocationEXT, 904, BindFragDataLocationEXT@12)
+	GL_STUB(GetFragDataLocationEXT, 905, GetFragDataLocationEXT@8)
+	GL_STUB(GetUniformuivEXT, 906, GetUniformuivEXT@12)
+	GL_STUB(GetVertexAttribIivEXT, 907, GetVertexAttribIivEXT@12)
+	GL_STUB(GetVertexAttribIuivEXT, 908, GetVertexAttribIuivEXT@12)
+	GL_STUB(Uniform1uiEXT, 909, Uniform1uiEXT@8)
+	GL_STUB(Uniform1uivEXT, 910, Uniform1uivEXT@12)
+	GL_STUB(Uniform2uiEXT, 911, Uniform2uiEXT@12)
+	GL_STUB(Uniform2uivEXT, 912, Uniform2uivEXT@12)
+	GL_STUB(Uniform3uiEXT, 913, Uniform3uiEXT@16)
+	GL_STUB(Uniform3uivEXT, 914, Uniform3uivEXT@12)
+	GL_STUB(Uniform4uiEXT, 915, Uniform4uiEXT@20)
+	GL_STUB(Uniform4uivEXT, 916, Uniform4uivEXT@12)
+	GL_STUB(VertexAttribI1iEXT, 917, VertexAttribI1iEXT@8)
+	GL_STUB(VertexAttribI1ivEXT, 918, VertexAttribI1ivEXT@8)
+	GL_STUB(VertexAttribI1uiEXT, 919, VertexAttribI1uiEXT@8)
+	GL_STUB(VertexAttribI1uivEXT, 920, VertexAttribI1uivEXT@8)
+	GL_STUB(VertexAttribI2iEXT, 921, VertexAttribI2iEXT@12)
+	GL_STUB(VertexAttribI2ivEXT, 922, VertexAttribI2ivEXT@8)
+	GL_STUB(VertexAttribI2uiEXT, 923, VertexAttribI2uiEXT@12)
+	GL_STUB(VertexAttribI2uivEXT, 924, VertexAttribI2uivEXT@8)
+	GL_STUB(VertexAttribI3iEXT, 925, VertexAttribI3iEXT@16)
+	GL_STUB(VertexAttribI3ivEXT, 926, VertexAttribI3ivEXT@8)
+	GL_STUB(VertexAttribI3uiEXT, 927, VertexAttribI3uiEXT@16)
+	GL_STUB(VertexAttribI3uivEXT, 928, VertexAttribI3uivEXT@8)
+	GL_STUB(VertexAttribI4bvEXT, 929, VertexAttribI4bvEXT@8)
+	GL_STUB(VertexAttribI4iEXT, 930, VertexAttribI4iEXT@20)
+	GL_STUB(VertexAttribI4ivEXT, 931, VertexAttribI4ivEXT@8)
+	GL_STUB(VertexAttribI4svEXT, 932, VertexAttribI4svEXT@8)
+	GL_STUB(VertexAttribI4ubvEXT, 933, VertexAttribI4ubvEXT@8)
+	GL_STUB(VertexAttribI4uiEXT, 934, VertexAttribI4uiEXT@20)
+	GL_STUB(VertexAttribI4uivEXT, 935, VertexAttribI4uivEXT@8)
+	GL_STUB(VertexAttribI4usvEXT, 936, VertexAttribI4usvEXT@8)
+	GL_STUB(VertexAttribIPointerEXT, 937, VertexAttribIPointerEXT@20)
+	GL_STUB(FramebufferTextureLayerEXT, 938, FramebufferTextureLayerEXT@20)
+	GL_STUB(ColorMaskIndexedEXT, 939, ColorMaskIndexedEXT@20)
+	GL_STUB(DisableIndexedEXT, 940, DisableIndexedEXT@8)
+	GL_STUB(EnableIndexedEXT, 941, EnableIndexedEXT@8)
+	GL_STUB(GetBooleanIndexedvEXT, 942, GetBooleanIndexedvEXT@12)
+	GL_STUB(GetIntegerIndexedvEXT, 943, GetIntegerIndexedvEXT@12)
+	GL_STUB(IsEnabledIndexedEXT, 944, IsEnabledIndexedEXT@8)
+	GL_STUB(ClearColorIiEXT, 945, ClearColorIiEXT@16)
+	GL_STUB(ClearColorIuiEXT, 946, ClearColorIuiEXT@16)
+	GL_STUB(GetTexParameterIivEXT, 947, GetTexParameterIivEXT@12)
+	GL_STUB(GetTexParameterIuivEXT, 948, GetTexParameterIuivEXT@12)
+	GL_STUB(TexParameterIivEXT, 949, TexParameterIivEXT@12)
+	GL_STUB(TexParameterIuivEXT, 950, TexParameterIuivEXT@12)
+	GL_STUB(BeginConditionalRenderNV, 951, BeginConditionalRenderNV@8)
+	GL_STUB(EndConditionalRenderNV, 952, EndConditionalRenderNV@0)
+	GL_STUB(BeginTransformFeedbackEXT, 953, BeginTransformFeedbackEXT@4)
+	GL_STUB(BindBufferBaseEXT, 954, BindBufferBaseEXT@12)
+	GL_STUB(BindBufferOffsetEXT, 955, BindBufferOffsetEXT@16)
+	GL_STUB(BindBufferRangeEXT, 956, BindBufferRangeEXT@20)
+	GL_STUB(EndTransformFeedbackEXT, 957, EndTransformFeedbackEXT@0)
+	GL_STUB(GetTransformFeedbackVaryingEXT, 958, GetTransformFeedbackVaryingEXT@28)
+	GL_STUB(TransformFeedbackVaryingsEXT, 959, TransformFeedbackVaryingsEXT@16)
+	GL_STUB(ProvokingVertexEXT, 960, ProvokingVertexEXT@4)
+	GL_STUB(_dispatch_stub_961, 961, _dispatch_stub_961@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_961, _dispatch_stub_961@12))
+	GL_STUB(_dispatch_stub_962, 962, _dispatch_stub_962@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_962, _dispatch_stub_962@12))
+	GL_STUB(GetObjectParameterivAPPLE, 963, GetObjectParameterivAPPLE@16)
+	GL_STUB(ObjectPurgeableAPPLE, 964, ObjectPurgeableAPPLE@12)
+	GL_STUB(ObjectUnpurgeableAPPLE, 965, ObjectUnpurgeableAPPLE@12)
+	GL_STUB(ActiveProgramEXT, 966, ActiveProgramEXT@4)
+	GL_STUB(CreateShaderProgramEXT, 967, CreateShaderProgramEXT@8)
+	GL_STUB(UseShaderProgramEXT, 968, UseShaderProgramEXT@8)
+	GL_STUB(TextureBarrierNV, 969, TextureBarrierNV@0)
+	GL_STUB(_dispatch_stub_970, 970, _dispatch_stub_970@16)
+	HIDDEN(GL_PREFIX(_dispatch_stub_970, _dispatch_stub_970@16))
+	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@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_973, _dispatch_stub_973@12))
+	GL_STUB(_dispatch_stub_974, 974, _dispatch_stub_974@12)
+	HIDDEN(GL_PREFIX(_dispatch_stub_974, _dispatch_stub_974@12))
+	GL_STUB(EGLImageTargetRenderbufferStorageOES, 975, EGLImageTargetRenderbufferStorageOES@8)
+	GL_STUB(EGLImageTargetTexture2DOES, 976, 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)
@@ -1352,152 +1356,152 @@ GLNAME(gl_dispatch_functions_start):
 	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, 706, PointParameterf@8, PointParameterfEXT, PointParameterfEXT@8)
-	GL_STUB_ALIAS(PointParameterfARB, 706, PointParameterfARB@8, PointParameterfEXT, PointParameterfEXT@8)
-	GL_STUB_ALIAS(PointParameterfv, 707, PointParameterfv@8, PointParameterfvEXT, PointParameterfvEXT@8)
-	GL_STUB_ALIAS(PointParameterfvARB, 707, PointParameterfvARB@8, PointParameterfvEXT, PointParameterfvEXT@8)
-	GL_STUB_ALIAS(SecondaryColor3b, 710, SecondaryColor3b@12, SecondaryColor3bEXT, SecondaryColor3bEXT@12)
-	GL_STUB_ALIAS(SecondaryColor3bv, 711, SecondaryColor3bv@4, SecondaryColor3bvEXT, SecondaryColor3bvEXT@4)
-	GL_STUB_ALIAS(SecondaryColor3d, 712, SecondaryColor3d@24, SecondaryColor3dEXT, SecondaryColor3dEXT@24)
-	GL_STUB_ALIAS(SecondaryColor3dv, 713, SecondaryColor3dv@4, SecondaryColor3dvEXT, SecondaryColor3dvEXT@4)
-	GL_STUB_ALIAS(SecondaryColor3f, 714, SecondaryColor3f@12, SecondaryColor3fEXT, SecondaryColor3fEXT@12)
-	GL_STUB_ALIAS(SecondaryColor3fv, 715, SecondaryColor3fv@4, SecondaryColor3fvEXT, SecondaryColor3fvEXT@4)
-	GL_STUB_ALIAS(SecondaryColor3i, 716, SecondaryColor3i@12, SecondaryColor3iEXT, SecondaryColor3iEXT@12)
-	GL_STUB_ALIAS(SecondaryColor3iv, 717, SecondaryColor3iv@4, SecondaryColor3ivEXT, SecondaryColor3ivEXT@4)
-	GL_STUB_ALIAS(SecondaryColor3s, 718, SecondaryColor3s@12, SecondaryColor3sEXT, SecondaryColor3sEXT@12)
-	GL_STUB_ALIAS(SecondaryColor3sv, 719, SecondaryColor3sv@4, SecondaryColor3svEXT, SecondaryColor3svEXT@4)
-	GL_STUB_ALIAS(SecondaryColor3ub, 720, SecondaryColor3ub@12, SecondaryColor3ubEXT, SecondaryColor3ubEXT@12)
-	GL_STUB_ALIAS(SecondaryColor3ubv, 721, SecondaryColor3ubv@4, SecondaryColor3ubvEXT, SecondaryColor3ubvEXT@4)
-	GL_STUB_ALIAS(SecondaryColor3ui, 722, SecondaryColor3ui@12, SecondaryColor3uiEXT, SecondaryColor3uiEXT@12)
-	GL_STUB_ALIAS(SecondaryColor3uiv, 723, SecondaryColor3uiv@4, SecondaryColor3uivEXT, SecondaryColor3uivEXT@4)
-	GL_STUB_ALIAS(SecondaryColor3us, 724, SecondaryColor3us@12, SecondaryColor3usEXT, SecondaryColor3usEXT@12)
-	GL_STUB_ALIAS(SecondaryColor3usv, 725, SecondaryColor3usv@4, SecondaryColor3usvEXT, SecondaryColor3usvEXT@4)
-	GL_STUB_ALIAS(SecondaryColorPointer, 726, SecondaryColorPointer@16, SecondaryColorPointerEXT, SecondaryColorPointerEXT@16)
-	GL_STUB_ALIAS(MultiDrawArrays, 727, MultiDrawArrays@16, MultiDrawArraysEXT, MultiDrawArraysEXT@16)
-	GL_STUB_ALIAS(MultiDrawElements, 728, MultiDrawElements@20, MultiDrawElementsEXT, MultiDrawElementsEXT@20)
-	GL_STUB_ALIAS(FogCoordPointer, 729, FogCoordPointer@12, FogCoordPointerEXT, FogCoordPointerEXT@12)
-	GL_STUB_ALIAS(FogCoordd, 730, FogCoordd@8, FogCoorddEXT, FogCoorddEXT@8)
-	GL_STUB_ALIAS(FogCoorddv, 731, FogCoorddv@4, FogCoorddvEXT, FogCoorddvEXT@4)
-	GL_STUB_ALIAS(FogCoordf, 732, FogCoordf@4, FogCoordfEXT, FogCoordfEXT@4)
-	GL_STUB_ALIAS(FogCoordfv, 733, FogCoordfv@4, FogCoordfvEXT, FogCoordfvEXT@4)
-	GL_STUB_ALIAS(BlendFuncSeparate, 735, BlendFuncSeparate@16, BlendFuncSeparateEXT, BlendFuncSeparateEXT@16)
-	GL_STUB_ALIAS(WindowPos2d, 752, WindowPos2d@16, WindowPos2dMESA, WindowPos2dMESA@16)
-	GL_STUB_ALIAS(WindowPos2dARB, 752, WindowPos2dARB@16, WindowPos2dMESA, WindowPos2dMESA@16)
-	GL_STUB_ALIAS(WindowPos2dv, 753, WindowPos2dv@4, WindowPos2dvMESA, WindowPos2dvMESA@4)
-	GL_STUB_ALIAS(WindowPos2dvARB, 753, WindowPos2dvARB@4, WindowPos2dvMESA, WindowPos2dvMESA@4)
-	GL_STUB_ALIAS(WindowPos2f, 754, WindowPos2f@8, WindowPos2fMESA, WindowPos2fMESA@8)
-	GL_STUB_ALIAS(WindowPos2fARB, 754, WindowPos2fARB@8, WindowPos2fMESA, WindowPos2fMESA@8)
-	GL_STUB_ALIAS(WindowPos2fv, 755, WindowPos2fv@4, WindowPos2fvMESA, WindowPos2fvMESA@4)
-	GL_STUB_ALIAS(WindowPos2fvARB, 755, WindowPos2fvARB@4, WindowPos2fvMESA, WindowPos2fvMESA@4)
-	GL_STUB_ALIAS(WindowPos2i, 756, WindowPos2i@8, WindowPos2iMESA, WindowPos2iMESA@8)
-	GL_STUB_ALIAS(WindowPos2iARB, 756, WindowPos2iARB@8, WindowPos2iMESA, WindowPos2iMESA@8)
-	GL_STUB_ALIAS(WindowPos2iv, 757, WindowPos2iv@4, WindowPos2ivMESA, WindowPos2ivMESA@4)
-	GL_STUB_ALIAS(WindowPos2ivARB, 757, WindowPos2ivARB@4, WindowPos2ivMESA, WindowPos2ivMESA@4)
-	GL_STUB_ALIAS(WindowPos2s, 758, WindowPos2s@8, WindowPos2sMESA, WindowPos2sMESA@8)
-	GL_STUB_ALIAS(WindowPos2sARB, 758, WindowPos2sARB@8, WindowPos2sMESA, WindowPos2sMESA@8)
-	GL_STUB_ALIAS(WindowPos2sv, 759, WindowPos2sv@4, WindowPos2svMESA, WindowPos2svMESA@4)
-	GL_STUB_ALIAS(WindowPos2svARB, 759, WindowPos2svARB@4, WindowPos2svMESA, WindowPos2svMESA@4)
-	GL_STUB_ALIAS(WindowPos3d, 760, WindowPos3d@24, WindowPos3dMESA, WindowPos3dMESA@24)
-	GL_STUB_ALIAS(WindowPos3dARB, 760, WindowPos3dARB@24, WindowPos3dMESA, WindowPos3dMESA@24)
-	GL_STUB_ALIAS(WindowPos3dv, 761, WindowPos3dv@4, WindowPos3dvMESA, WindowPos3dvMESA@4)
-	GL_STUB_ALIAS(WindowPos3dvARB, 761, WindowPos3dvARB@4, WindowPos3dvMESA, WindowPos3dvMESA@4)
-	GL_STUB_ALIAS(WindowPos3f, 762, WindowPos3f@12, WindowPos3fMESA, WindowPos3fMESA@12)
-	GL_STUB_ALIAS(WindowPos3fARB, 762, WindowPos3fARB@12, WindowPos3fMESA, WindowPos3fMESA@12)
-	GL_STUB_ALIAS(WindowPos3fv, 763, WindowPos3fv@4, WindowPos3fvMESA, WindowPos3fvMESA@4)
-	GL_STUB_ALIAS(WindowPos3fvARB, 763, WindowPos3fvARB@4, WindowPos3fvMESA, WindowPos3fvMESA@4)
-	GL_STUB_ALIAS(WindowPos3i, 764, WindowPos3i@12, WindowPos3iMESA, WindowPos3iMESA@12)
-	GL_STUB_ALIAS(WindowPos3iARB, 764, WindowPos3iARB@12, WindowPos3iMESA, WindowPos3iMESA@12)
-	GL_STUB_ALIAS(WindowPos3iv, 765, WindowPos3iv@4, WindowPos3ivMESA, WindowPos3ivMESA@4)
-	GL_STUB_ALIAS(WindowPos3ivARB, 765, WindowPos3ivARB@4, WindowPos3ivMESA, WindowPos3ivMESA@4)
-	GL_STUB_ALIAS(WindowPos3s, 766, WindowPos3s@12, WindowPos3sMESA, WindowPos3sMESA@12)
-	GL_STUB_ALIAS(WindowPos3sARB, 766, WindowPos3sARB@12, WindowPos3sMESA, WindowPos3sMESA@12)
-	GL_STUB_ALIAS(WindowPos3sv, 767, WindowPos3sv@4, WindowPos3svMESA, WindowPos3svMESA@4)
-	GL_STUB_ALIAS(WindowPos3svARB, 767, WindowPos3svARB@4, WindowPos3svMESA, WindowPos3svMESA@4)
-	GL_STUB_ALIAS(BindProgramARB, 786, BindProgramARB@8, BindProgramNV, BindProgramNV@8)
-	GL_STUB_ALIAS(DeleteProgramsARB, 787, DeleteProgramsARB@8, DeleteProgramsNV, DeleteProgramsNV@8)
-	GL_STUB_ALIAS(GenProgramsARB, 789, GenProgramsARB@8, GenProgramsNV, GenProgramsNV@8)
-	GL_STUB_ALIAS(GetVertexAttribPointerv, 795, GetVertexAttribPointerv@12, GetVertexAttribPointervNV, GetVertexAttribPointervNV@12)
-	GL_STUB_ALIAS(GetVertexAttribPointervARB, 795, GetVertexAttribPointervARB@12, GetVertexAttribPointervNV, GetVertexAttribPointervNV@12)
-	GL_STUB_ALIAS(IsProgramARB, 799, IsProgramARB@4, IsProgramNV, IsProgramNV@4)
-	GL_STUB_ALIAS(PointParameteri, 863, PointParameteri@8, PointParameteriNV, PointParameteriNV@8)
-	GL_STUB_ALIAS(PointParameteriv, 864, PointParameteriv@8, PointParameterivNV, PointParameterivNV@8)
-	GL_STUB_ALIAS(DeleteVertexArrays, 867, DeleteVertexArrays@8, _dispatch_stub_867, _dispatch_stub_867@8)
-	GL_STUB_ALIAS(IsVertexArray, 869, IsVertexArray@4, _dispatch_stub_869, _dispatch_stub_869@4)
-	GL_STUB_ALIAS(PrimitiveRestartIndex, 876, PrimitiveRestartIndex@4, PrimitiveRestartIndexNV, PrimitiveRestartIndexNV@4)
-	GL_STUB_ALIAS(BlendEquationSeparate, 879, BlendEquationSeparate@8, _dispatch_stub_879, _dispatch_stub_879@8)
-	GL_STUB_ALIAS(BindFramebuffer, 880, BindFramebuffer@8, BindFramebufferEXT, BindFramebufferEXT@8)
-	GL_STUB_ALIAS(BindRenderbuffer, 881, BindRenderbuffer@8, BindRenderbufferEXT, BindRenderbufferEXT@8)
-	GL_STUB_ALIAS(CheckFramebufferStatus, 882, CheckFramebufferStatus@4, CheckFramebufferStatusEXT, CheckFramebufferStatusEXT@4)
-	GL_STUB_ALIAS(DeleteFramebuffers, 883, DeleteFramebuffers@8, DeleteFramebuffersEXT, DeleteFramebuffersEXT@8)
-	GL_STUB_ALIAS(DeleteRenderbuffers, 884, DeleteRenderbuffers@8, DeleteRenderbuffersEXT, DeleteRenderbuffersEXT@8)
-	GL_STUB_ALIAS(FramebufferRenderbuffer, 885, FramebufferRenderbuffer@16, FramebufferRenderbufferEXT, FramebufferRenderbufferEXT@16)
-	GL_STUB_ALIAS(FramebufferTexture1D, 886, FramebufferTexture1D@20, FramebufferTexture1DEXT, FramebufferTexture1DEXT@20)
-	GL_STUB_ALIAS(FramebufferTexture2D, 887, FramebufferTexture2D@20, FramebufferTexture2DEXT, FramebufferTexture2DEXT@20)
-	GL_STUB_ALIAS(FramebufferTexture3D, 888, FramebufferTexture3D@24, FramebufferTexture3DEXT, FramebufferTexture3DEXT@24)
-	GL_STUB_ALIAS(GenFramebuffers, 889, GenFramebuffers@8, GenFramebuffersEXT, GenFramebuffersEXT@8)
-	GL_STUB_ALIAS(GenRenderbuffers, 890, GenRenderbuffers@8, GenRenderbuffersEXT, GenRenderbuffersEXT@8)
-	GL_STUB_ALIAS(GenerateMipmap, 891, GenerateMipmap@4, GenerateMipmapEXT, GenerateMipmapEXT@4)
-	GL_STUB_ALIAS(GetFramebufferAttachmentParameteriv, 892, GetFramebufferAttachmentParameteriv@16, GetFramebufferAttachmentParameterivEXT, GetFramebufferAttachmentParameterivEXT@16)
-	GL_STUB_ALIAS(GetRenderbufferParameteriv, 893, GetRenderbufferParameteriv@12, GetRenderbufferParameterivEXT, GetRenderbufferParameterivEXT@12)
-	GL_STUB_ALIAS(IsFramebuffer, 894, IsFramebuffer@4, IsFramebufferEXT, IsFramebufferEXT@4)
-	GL_STUB_ALIAS(IsRenderbuffer, 895, IsRenderbuffer@4, IsRenderbufferEXT, IsRenderbufferEXT@4)
-	GL_STUB_ALIAS(RenderbufferStorage, 896, RenderbufferStorage@16, RenderbufferStorageEXT, RenderbufferStorageEXT@16)
-	GL_STUB_ALIAS(BlitFramebuffer, 897, BlitFramebuffer@40, _dispatch_stub_897, _dispatch_stub_897@40)
-	GL_STUB_ALIAS(BindFragDataLocation, 900, BindFragDataLocation@12, BindFragDataLocationEXT, BindFragDataLocationEXT@12)
-	GL_STUB_ALIAS(GetFragDataLocation, 901, GetFragDataLocation@8, GetFragDataLocationEXT, GetFragDataLocationEXT@8)
-	GL_STUB_ALIAS(GetUniformuiv, 902, GetUniformuiv@12, GetUniformuivEXT, GetUniformuivEXT@12)
-	GL_STUB_ALIAS(GetVertexAttribIiv, 903, GetVertexAttribIiv@12, GetVertexAttribIivEXT, GetVertexAttribIivEXT@12)
-	GL_STUB_ALIAS(GetVertexAttribIuiv, 904, GetVertexAttribIuiv@12, GetVertexAttribIuivEXT, GetVertexAttribIuivEXT@12)
-	GL_STUB_ALIAS(Uniform1ui, 905, Uniform1ui@8, Uniform1uiEXT, Uniform1uiEXT@8)
-	GL_STUB_ALIAS(Uniform1uiv, 906, Uniform1uiv@12, Uniform1uivEXT, Uniform1uivEXT@12)
-	GL_STUB_ALIAS(Uniform2ui, 907, Uniform2ui@12, Uniform2uiEXT, Uniform2uiEXT@12)
-	GL_STUB_ALIAS(Uniform2uiv, 908, Uniform2uiv@12, Uniform2uivEXT, Uniform2uivEXT@12)
-	GL_STUB_ALIAS(Uniform3ui, 909, Uniform3ui@16, Uniform3uiEXT, Uniform3uiEXT@16)
-	GL_STUB_ALIAS(Uniform3uiv, 910, Uniform3uiv@12, Uniform3uivEXT, Uniform3uivEXT@12)
-	GL_STUB_ALIAS(Uniform4ui, 911, Uniform4ui@20, Uniform4uiEXT, Uniform4uiEXT@20)
-	GL_STUB_ALIAS(Uniform4uiv, 912, Uniform4uiv@12, Uniform4uivEXT, Uniform4uivEXT@12)
-	GL_STUB_ALIAS(VertexAttribI1i, 913, VertexAttribI1i@8, VertexAttribI1iEXT, VertexAttribI1iEXT@8)
-	GL_STUB_ALIAS(VertexAttribI1iv, 914, VertexAttribI1iv@8, VertexAttribI1ivEXT, VertexAttribI1ivEXT@8)
-	GL_STUB_ALIAS(VertexAttribI1ui, 915, VertexAttribI1ui@8, VertexAttribI1uiEXT, VertexAttribI1uiEXT@8)
-	GL_STUB_ALIAS(VertexAttribI1uiv, 916, VertexAttribI1uiv@8, VertexAttribI1uivEXT, VertexAttribI1uivEXT@8)
-	GL_STUB_ALIAS(VertexAttribI2i, 917, VertexAttribI2i@12, VertexAttribI2iEXT, VertexAttribI2iEXT@12)
-	GL_STUB_ALIAS(VertexAttribI2iv, 918, VertexAttribI2iv@8, VertexAttribI2ivEXT, VertexAttribI2ivEXT@8)
-	GL_STUB_ALIAS(VertexAttribI2ui, 919, VertexAttribI2ui@12, VertexAttribI2uiEXT, VertexAttribI2uiEXT@12)
-	GL_STUB_ALIAS(VertexAttribI2uiv, 920, VertexAttribI2uiv@8, VertexAttribI2uivEXT, VertexAttribI2uivEXT@8)
-	GL_STUB_ALIAS(VertexAttribI3i, 921, VertexAttribI3i@16, VertexAttribI3iEXT, VertexAttribI3iEXT@16)
-	GL_STUB_ALIAS(VertexAttribI3iv, 922, VertexAttribI3iv@8, VertexAttribI3ivEXT, VertexAttribI3ivEXT@8)
-	GL_STUB_ALIAS(VertexAttribI3ui, 923, VertexAttribI3ui@16, VertexAttribI3uiEXT, VertexAttribI3uiEXT@16)
-	GL_STUB_ALIAS(VertexAttribI3uiv, 924, VertexAttribI3uiv@8, VertexAttribI3uivEXT, VertexAttribI3uivEXT@8)
-	GL_STUB_ALIAS(VertexAttribI4bv, 925, VertexAttribI4bv@8, VertexAttribI4bvEXT, VertexAttribI4bvEXT@8)
-	GL_STUB_ALIAS(VertexAttribI4i, 926, VertexAttribI4i@20, VertexAttribI4iEXT, VertexAttribI4iEXT@20)
-	GL_STUB_ALIAS(VertexAttribI4iv, 927, VertexAttribI4iv@8, VertexAttribI4ivEXT, VertexAttribI4ivEXT@8)
-	GL_STUB_ALIAS(VertexAttribI4sv, 928, VertexAttribI4sv@8, VertexAttribI4svEXT, VertexAttribI4svEXT@8)
-	GL_STUB_ALIAS(VertexAttribI4ubv, 929, VertexAttribI4ubv@8, VertexAttribI4ubvEXT, VertexAttribI4ubvEXT@8)
-	GL_STUB_ALIAS(VertexAttribI4ui, 930, VertexAttribI4ui@20, VertexAttribI4uiEXT, VertexAttribI4uiEXT@20)
-	GL_STUB_ALIAS(VertexAttribI4uiv, 931, VertexAttribI4uiv@8, VertexAttribI4uivEXT, VertexAttribI4uivEXT@8)
-	GL_STUB_ALIAS(VertexAttribI4usv, 932, VertexAttribI4usv@8, VertexAttribI4usvEXT, VertexAttribI4usvEXT@8)
-	GL_STUB_ALIAS(VertexAttribIPointer, 933, VertexAttribIPointer@20, VertexAttribIPointerEXT, VertexAttribIPointerEXT@20)
-	GL_STUB_ALIAS(FramebufferTextureLayer, 934, FramebufferTextureLayer@20, FramebufferTextureLayerEXT, FramebufferTextureLayerEXT@20)
-	GL_STUB_ALIAS(FramebufferTextureLayerARB, 934, FramebufferTextureLayerARB@20, FramebufferTextureLayerEXT, FramebufferTextureLayerEXT@20)
-	GL_STUB_ALIAS(ColorMaski, 935, ColorMaski@20, ColorMaskIndexedEXT, ColorMaskIndexedEXT@20)
-	GL_STUB_ALIAS(Disablei, 936, Disablei@8, DisableIndexedEXT, DisableIndexedEXT@8)
-	GL_STUB_ALIAS(Enablei, 937, Enablei@8, EnableIndexedEXT, EnableIndexedEXT@8)
-	GL_STUB_ALIAS(GetBooleani_v, 938, GetBooleani_v@12, GetBooleanIndexedvEXT, GetBooleanIndexedvEXT@12)
-	GL_STUB_ALIAS(GetIntegeri_v, 939, GetIntegeri_v@12, GetIntegerIndexedvEXT, GetIntegerIndexedvEXT@12)
-	GL_STUB_ALIAS(IsEnabledi, 940, IsEnabledi@8, IsEnabledIndexedEXT, IsEnabledIndexedEXT@8)
-	GL_STUB_ALIAS(GetTexParameterIiv, 943, GetTexParameterIiv@12, GetTexParameterIivEXT, GetTexParameterIivEXT@12)
-	GL_STUB_ALIAS(GetTexParameterIuiv, 944, GetTexParameterIuiv@12, GetTexParameterIuivEXT, GetTexParameterIuivEXT@12)
-	GL_STUB_ALIAS(TexParameterIiv, 945, TexParameterIiv@12, TexParameterIivEXT, TexParameterIivEXT@12)
-	GL_STUB_ALIAS(TexParameterIuiv, 946, TexParameterIuiv@12, TexParameterIuivEXT, TexParameterIuivEXT@12)
-	GL_STUB_ALIAS(BeginConditionalRender, 947, BeginConditionalRender@8, BeginConditionalRenderNV, BeginConditionalRenderNV@8)
-	GL_STUB_ALIAS(EndConditionalRender, 948, EndConditionalRender@0, EndConditionalRenderNV, EndConditionalRenderNV@0)
-	GL_STUB_ALIAS(BeginTransformFeedback, 949, BeginTransformFeedback@4, BeginTransformFeedbackEXT, BeginTransformFeedbackEXT@4)
-	GL_STUB_ALIAS(BindBufferBase, 950, BindBufferBase@12, BindBufferBaseEXT, BindBufferBaseEXT@12)
-	GL_STUB_ALIAS(BindBufferRange, 952, BindBufferRange@20, BindBufferRangeEXT, BindBufferRangeEXT@20)
-	GL_STUB_ALIAS(EndTransformFeedback, 953, EndTransformFeedback@0, EndTransformFeedbackEXT, EndTransformFeedbackEXT@0)
-	GL_STUB_ALIAS(GetTransformFeedbackVarying, 954, GetTransformFeedbackVarying@28, GetTransformFeedbackVaryingEXT, GetTransformFeedbackVaryingEXT@28)
-	GL_STUB_ALIAS(TransformFeedbackVaryings, 955, TransformFeedbackVaryings@16, TransformFeedbackVaryingsEXT, TransformFeedbackVaryingsEXT@16)
-	GL_STUB_ALIAS(ProvokingVertex, 956, ProvokingVertex@4, ProvokingVertexEXT, ProvokingVertexEXT@4)
+	GL_STUB_ALIAS(PointParameterf, 710, PointParameterf@8, PointParameterfEXT, PointParameterfEXT@8)
+	GL_STUB_ALIAS(PointParameterfARB, 710, PointParameterfARB@8, PointParameterfEXT, PointParameterfEXT@8)
+	GL_STUB_ALIAS(PointParameterfv, 711, PointParameterfv@8, PointParameterfvEXT, PointParameterfvEXT@8)
+	GL_STUB_ALIAS(PointParameterfvARB, 711, PointParameterfvARB@8, PointParameterfvEXT, PointParameterfvEXT@8)
+	GL_STUB_ALIAS(SecondaryColor3b, 714, SecondaryColor3b@12, SecondaryColor3bEXT, SecondaryColor3bEXT@12)
+	GL_STUB_ALIAS(SecondaryColor3bv, 715, SecondaryColor3bv@4, SecondaryColor3bvEXT, SecondaryColor3bvEXT@4)
+	GL_STUB_ALIAS(SecondaryColor3d, 716, SecondaryColor3d@24, SecondaryColor3dEXT, SecondaryColor3dEXT@24)
+	GL_STUB_ALIAS(SecondaryColor3dv, 717, SecondaryColor3dv@4, SecondaryColor3dvEXT, SecondaryColor3dvEXT@4)
+	GL_STUB_ALIAS(SecondaryColor3f, 718, SecondaryColor3f@12, SecondaryColor3fEXT, SecondaryColor3fEXT@12)
+	GL_STUB_ALIAS(SecondaryColor3fv, 719, SecondaryColor3fv@4, SecondaryColor3fvEXT, SecondaryColor3fvEXT@4)
+	GL_STUB_ALIAS(SecondaryColor3i, 720, SecondaryColor3i@12, SecondaryColor3iEXT, SecondaryColor3iEXT@12)
+	GL_STUB_ALIAS(SecondaryColor3iv, 721, SecondaryColor3iv@4, SecondaryColor3ivEXT, SecondaryColor3ivEXT@4)
+	GL_STUB_ALIAS(SecondaryColor3s, 722, SecondaryColor3s@12, SecondaryColor3sEXT, SecondaryColor3sEXT@12)
+	GL_STUB_ALIAS(SecondaryColor3sv, 723, SecondaryColor3sv@4, SecondaryColor3svEXT, SecondaryColor3svEXT@4)
+	GL_STUB_ALIAS(SecondaryColor3ub, 724, SecondaryColor3ub@12, SecondaryColor3ubEXT, SecondaryColor3ubEXT@12)
+	GL_STUB_ALIAS(SecondaryColor3ubv, 725, SecondaryColor3ubv@4, SecondaryColor3ubvEXT, SecondaryColor3ubvEXT@4)
+	GL_STUB_ALIAS(SecondaryColor3ui, 726, SecondaryColor3ui@12, SecondaryColor3uiEXT, SecondaryColor3uiEXT@12)
+	GL_STUB_ALIAS(SecondaryColor3uiv, 727, SecondaryColor3uiv@4, SecondaryColor3uivEXT, SecondaryColor3uivEXT@4)
+	GL_STUB_ALIAS(SecondaryColor3us, 728, SecondaryColor3us@12, SecondaryColor3usEXT, SecondaryColor3usEXT@12)
+	GL_STUB_ALIAS(SecondaryColor3usv, 729, SecondaryColor3usv@4, SecondaryColor3usvEXT, SecondaryColor3usvEXT@4)
+	GL_STUB_ALIAS(SecondaryColorPointer, 730, SecondaryColorPointer@16, SecondaryColorPointerEXT, SecondaryColorPointerEXT@16)
+	GL_STUB_ALIAS(MultiDrawArrays, 731, MultiDrawArrays@16, MultiDrawArraysEXT, MultiDrawArraysEXT@16)
+	GL_STUB_ALIAS(MultiDrawElements, 732, MultiDrawElements@20, MultiDrawElementsEXT, MultiDrawElementsEXT@20)
+	GL_STUB_ALIAS(FogCoordPointer, 733, FogCoordPointer@12, FogCoordPointerEXT, FogCoordPointerEXT@12)
+	GL_STUB_ALIAS(FogCoordd, 734, FogCoordd@8, FogCoorddEXT, FogCoorddEXT@8)
+	GL_STUB_ALIAS(FogCoorddv, 735, FogCoorddv@4, FogCoorddvEXT, FogCoorddvEXT@4)
+	GL_STUB_ALIAS(FogCoordf, 736, FogCoordf@4, FogCoordfEXT, FogCoordfEXT@4)
+	GL_STUB_ALIAS(FogCoordfv, 737, FogCoordfv@4, FogCoordfvEXT, FogCoordfvEXT@4)
+	GL_STUB_ALIAS(BlendFuncSeparate, 739, BlendFuncSeparate@16, BlendFuncSeparateEXT, BlendFuncSeparateEXT@16)
+	GL_STUB_ALIAS(WindowPos2d, 756, WindowPos2d@16, WindowPos2dMESA, WindowPos2dMESA@16)
+	GL_STUB_ALIAS(WindowPos2dARB, 756, WindowPos2dARB@16, WindowPos2dMESA, WindowPos2dMESA@16)
+	GL_STUB_ALIAS(WindowPos2dv, 757, WindowPos2dv@4, WindowPos2dvMESA, WindowPos2dvMESA@4)
+	GL_STUB_ALIAS(WindowPos2dvARB, 757, WindowPos2dvARB@4, WindowPos2dvMESA, WindowPos2dvMESA@4)
+	GL_STUB_ALIAS(WindowPos2f, 758, WindowPos2f@8, WindowPos2fMESA, WindowPos2fMESA@8)
+	GL_STUB_ALIAS(WindowPos2fARB, 758, WindowPos2fARB@8, WindowPos2fMESA, WindowPos2fMESA@8)
+	GL_STUB_ALIAS(WindowPos2fv, 759, WindowPos2fv@4, WindowPos2fvMESA, WindowPos2fvMESA@4)
+	GL_STUB_ALIAS(WindowPos2fvARB, 759, WindowPos2fvARB@4, WindowPos2fvMESA, WindowPos2fvMESA@4)
+	GL_STUB_ALIAS(WindowPos2i, 760, WindowPos2i@8, WindowPos2iMESA, WindowPos2iMESA@8)
+	GL_STUB_ALIAS(WindowPos2iARB, 760, WindowPos2iARB@8, WindowPos2iMESA, WindowPos2iMESA@8)
+	GL_STUB_ALIAS(WindowPos2iv, 761, WindowPos2iv@4, WindowPos2ivMESA, WindowPos2ivMESA@4)
+	GL_STUB_ALIAS(WindowPos2ivARB, 761, WindowPos2ivARB@4, WindowPos2ivMESA, WindowPos2ivMESA@4)
+	GL_STUB_ALIAS(WindowPos2s, 762, WindowPos2s@8, WindowPos2sMESA, WindowPos2sMESA@8)
+	GL_STUB_ALIAS(WindowPos2sARB, 762, WindowPos2sARB@8, WindowPos2sMESA, WindowPos2sMESA@8)
+	GL_STUB_ALIAS(WindowPos2sv, 763, WindowPos2sv@4, WindowPos2svMESA, WindowPos2svMESA@4)
+	GL_STUB_ALIAS(WindowPos2svARB, 763, WindowPos2svARB@4, WindowPos2svMESA, WindowPos2svMESA@4)
+	GL_STUB_ALIAS(WindowPos3d, 764, WindowPos3d@24, WindowPos3dMESA, WindowPos3dMESA@24)
+	GL_STUB_ALIAS(WindowPos3dARB, 764, WindowPos3dARB@24, WindowPos3dMESA, WindowPos3dMESA@24)
+	GL_STUB_ALIAS(WindowPos3dv, 765, WindowPos3dv@4, WindowPos3dvMESA, WindowPos3dvMESA@4)
+	GL_STUB_ALIAS(WindowPos3dvARB, 765, WindowPos3dvARB@4, WindowPos3dvMESA, WindowPos3dvMESA@4)
+	GL_STUB_ALIAS(WindowPos3f, 766, WindowPos3f@12, WindowPos3fMESA, WindowPos3fMESA@12)
+	GL_STUB_ALIAS(WindowPos3fARB, 766, WindowPos3fARB@12, WindowPos3fMESA, WindowPos3fMESA@12)
+	GL_STUB_ALIAS(WindowPos3fv, 767, WindowPos3fv@4, WindowPos3fvMESA, WindowPos3fvMESA@4)
+	GL_STUB_ALIAS(WindowPos3fvARB, 767, WindowPos3fvARB@4, WindowPos3fvMESA, WindowPos3fvMESA@4)
+	GL_STUB_ALIAS(WindowPos3i, 768, WindowPos3i@12, WindowPos3iMESA, WindowPos3iMESA@12)
+	GL_STUB_ALIAS(WindowPos3iARB, 768, WindowPos3iARB@12, WindowPos3iMESA, WindowPos3iMESA@12)
+	GL_STUB_ALIAS(WindowPos3iv, 769, WindowPos3iv@4, WindowPos3ivMESA, WindowPos3ivMESA@4)
+	GL_STUB_ALIAS(WindowPos3ivARB, 769, WindowPos3ivARB@4, WindowPos3ivMESA, WindowPos3ivMESA@4)
+	GL_STUB_ALIAS(WindowPos3s, 770, WindowPos3s@12, WindowPos3sMESA, WindowPos3sMESA@12)
+	GL_STUB_ALIAS(WindowPos3sARB, 770, WindowPos3sARB@12, WindowPos3sMESA, WindowPos3sMESA@12)
+	GL_STUB_ALIAS(WindowPos3sv, 771, WindowPos3sv@4, WindowPos3svMESA, WindowPos3svMESA@4)
+	GL_STUB_ALIAS(WindowPos3svARB, 771, WindowPos3svARB@4, WindowPos3svMESA, WindowPos3svMESA@4)
+	GL_STUB_ALIAS(BindProgramARB, 790, BindProgramARB@8, BindProgramNV, BindProgramNV@8)
+	GL_STUB_ALIAS(DeleteProgramsARB, 791, DeleteProgramsARB@8, DeleteProgramsNV, DeleteProgramsNV@8)
+	GL_STUB_ALIAS(GenProgramsARB, 793, GenProgramsARB@8, GenProgramsNV, GenProgramsNV@8)
+	GL_STUB_ALIAS(GetVertexAttribPointerv, 799, GetVertexAttribPointerv@12, GetVertexAttribPointervNV, GetVertexAttribPointervNV@12)
+	GL_STUB_ALIAS(GetVertexAttribPointervARB, 799, GetVertexAttribPointervARB@12, GetVertexAttribPointervNV, GetVertexAttribPointervNV@12)
+	GL_STUB_ALIAS(IsProgramARB, 803, IsProgramARB@4, IsProgramNV, IsProgramNV@4)
+	GL_STUB_ALIAS(PointParameteri, 867, PointParameteri@8, PointParameteriNV, PointParameteriNV@8)
+	GL_STUB_ALIAS(PointParameteriv, 868, PointParameteriv@8, PointParameterivNV, PointParameterivNV@8)
+	GL_STUB_ALIAS(DeleteVertexArrays, 871, DeleteVertexArrays@8, _dispatch_stub_871, _dispatch_stub_871@8)
+	GL_STUB_ALIAS(IsVertexArray, 873, IsVertexArray@4, _dispatch_stub_873, _dispatch_stub_873@4)
+	GL_STUB_ALIAS(PrimitiveRestartIndex, 880, PrimitiveRestartIndex@4, PrimitiveRestartIndexNV, PrimitiveRestartIndexNV@4)
+	GL_STUB_ALIAS(BlendEquationSeparate, 883, BlendEquationSeparate@8, _dispatch_stub_883, _dispatch_stub_883@8)
+	GL_STUB_ALIAS(BindFramebuffer, 884, BindFramebuffer@8, BindFramebufferEXT, BindFramebufferEXT@8)
+	GL_STUB_ALIAS(BindRenderbuffer, 885, BindRenderbuffer@8, BindRenderbufferEXT, BindRenderbufferEXT@8)
+	GL_STUB_ALIAS(CheckFramebufferStatus, 886, CheckFramebufferStatus@4, CheckFramebufferStatusEXT, CheckFramebufferStatusEXT@4)
+	GL_STUB_ALIAS(DeleteFramebuffers, 887, DeleteFramebuffers@8, DeleteFramebuffersEXT, DeleteFramebuffersEXT@8)
+	GL_STUB_ALIAS(DeleteRenderbuffers, 888, DeleteRenderbuffers@8, DeleteRenderbuffersEXT, DeleteRenderbuffersEXT@8)
+	GL_STUB_ALIAS(FramebufferRenderbuffer, 889, FramebufferRenderbuffer@16, FramebufferRenderbufferEXT, FramebufferRenderbufferEXT@16)
+	GL_STUB_ALIAS(FramebufferTexture1D, 890, FramebufferTexture1D@20, FramebufferTexture1DEXT, FramebufferTexture1DEXT@20)
+	GL_STUB_ALIAS(FramebufferTexture2D, 891, FramebufferTexture2D@20, FramebufferTexture2DEXT, FramebufferTexture2DEXT@20)
+	GL_STUB_ALIAS(FramebufferTexture3D, 892, FramebufferTexture3D@24, FramebufferTexture3DEXT, FramebufferTexture3DEXT@24)
+	GL_STUB_ALIAS(GenFramebuffers, 893, GenFramebuffers@8, GenFramebuffersEXT, GenFramebuffersEXT@8)
+	GL_STUB_ALIAS(GenRenderbuffers, 894, GenRenderbuffers@8, GenRenderbuffersEXT, GenRenderbuffersEXT@8)
+	GL_STUB_ALIAS(GenerateMipmap, 895, GenerateMipmap@4, GenerateMipmapEXT, GenerateMipmapEXT@4)
+	GL_STUB_ALIAS(GetFramebufferAttachmentParameteriv, 896, GetFramebufferAttachmentParameteriv@16, GetFramebufferAttachmentParameterivEXT, GetFramebufferAttachmentParameterivEXT@16)
+	GL_STUB_ALIAS(GetRenderbufferParameteriv, 897, GetRenderbufferParameteriv@12, GetRenderbufferParameterivEXT, GetRenderbufferParameterivEXT@12)
+	GL_STUB_ALIAS(IsFramebuffer, 898, IsFramebuffer@4, IsFramebufferEXT, IsFramebufferEXT@4)
+	GL_STUB_ALIAS(IsRenderbuffer, 899, IsRenderbuffer@4, IsRenderbufferEXT, IsRenderbufferEXT@4)
+	GL_STUB_ALIAS(RenderbufferStorage, 900, RenderbufferStorage@16, RenderbufferStorageEXT, RenderbufferStorageEXT@16)
+	GL_STUB_ALIAS(BlitFramebuffer, 901, BlitFramebuffer@40, _dispatch_stub_901, _dispatch_stub_901@40)
+	GL_STUB_ALIAS(BindFragDataLocation, 904, BindFragDataLocation@12, BindFragDataLocationEXT, BindFragDataLocationEXT@12)
+	GL_STUB_ALIAS(GetFragDataLocation, 905, GetFragDataLocation@8, GetFragDataLocationEXT, GetFragDataLocationEXT@8)
+	GL_STUB_ALIAS(GetUniformuiv, 906, GetUniformuiv@12, GetUniformuivEXT, GetUniformuivEXT@12)
+	GL_STUB_ALIAS(GetVertexAttribIiv, 907, GetVertexAttribIiv@12, GetVertexAttribIivEXT, GetVertexAttribIivEXT@12)
+	GL_STUB_ALIAS(GetVertexAttribIuiv, 908, GetVertexAttribIuiv@12, GetVertexAttribIuivEXT, GetVertexAttribIuivEXT@12)
+	GL_STUB_ALIAS(Uniform1ui, 909, Uniform1ui@8, Uniform1uiEXT, Uniform1uiEXT@8)
+	GL_STUB_ALIAS(Uniform1uiv, 910, Uniform1uiv@12, Uniform1uivEXT, Uniform1uivEXT@12)
+	GL_STUB_ALIAS(Uniform2ui, 911, Uniform2ui@12, Uniform2uiEXT, Uniform2uiEXT@12)
+	GL_STUB_ALIAS(Uniform2uiv, 912, Uniform2uiv@12, Uniform2uivEXT, Uniform2uivEXT@12)
+	GL_STUB_ALIAS(Uniform3ui, 913, Uniform3ui@16, Uniform3uiEXT, Uniform3uiEXT@16)
+	GL_STUB_ALIAS(Uniform3uiv, 914, Uniform3uiv@12, Uniform3uivEXT, Uniform3uivEXT@12)
+	GL_STUB_ALIAS(Uniform4ui, 915, Uniform4ui@20, Uniform4uiEXT, Uniform4uiEXT@20)
+	GL_STUB_ALIAS(Uniform4uiv, 916, Uniform4uiv@12, Uniform4uivEXT, Uniform4uivEXT@12)
+	GL_STUB_ALIAS(VertexAttribI1i, 917, VertexAttribI1i@8, VertexAttribI1iEXT, VertexAttribI1iEXT@8)
+	GL_STUB_ALIAS(VertexAttribI1iv, 918, VertexAttribI1iv@8, VertexAttribI1ivEXT, VertexAttribI1ivEXT@8)
+	GL_STUB_ALIAS(VertexAttribI1ui, 919, VertexAttribI1ui@8, VertexAttribI1uiEXT, VertexAttribI1uiEXT@8)
+	GL_STUB_ALIAS(VertexAttribI1uiv, 920, VertexAttribI1uiv@8, VertexAttribI1uivEXT, VertexAttribI1uivEXT@8)
+	GL_STUB_ALIAS(VertexAttribI2i, 921, VertexAttribI2i@12, VertexAttribI2iEXT, VertexAttribI2iEXT@12)
+	GL_STUB_ALIAS(VertexAttribI2iv, 922, VertexAttribI2iv@8, VertexAttribI2ivEXT, VertexAttribI2ivEXT@8)
+	GL_STUB_ALIAS(VertexAttribI2ui, 923, VertexAttribI2ui@12, VertexAttribI2uiEXT, VertexAttribI2uiEXT@12)
+	GL_STUB_ALIAS(VertexAttribI2uiv, 924, VertexAttribI2uiv@8, VertexAttribI2uivEXT, VertexAttribI2uivEXT@8)
+	GL_STUB_ALIAS(VertexAttribI3i, 925, VertexAttribI3i@16, VertexAttribI3iEXT, VertexAttribI3iEXT@16)
+	GL_STUB_ALIAS(VertexAttribI3iv, 926, VertexAttribI3iv@8, VertexAttribI3ivEXT, VertexAttribI3ivEXT@8)
+	GL_STUB_ALIAS(VertexAttribI3ui, 927, VertexAttribI3ui@16, VertexAttribI3uiEXT, VertexAttribI3uiEXT@16)
+	GL_STUB_ALIAS(VertexAttribI3uiv, 928, VertexAttribI3uiv@8, VertexAttribI3uivEXT, VertexAttribI3uivEXT@8)
+	GL_STUB_ALIAS(VertexAttribI4bv, 929, VertexAttribI4bv@8, VertexAttribI4bvEXT, VertexAttribI4bvEXT@8)
+	GL_STUB_ALIAS(VertexAttribI4i, 930, VertexAttribI4i@20, VertexAttribI4iEXT, VertexAttribI4iEXT@20)
+	GL_STUB_ALIAS(VertexAttribI4iv, 931, VertexAttribI4iv@8, VertexAttribI4ivEXT, VertexAttribI4ivEXT@8)
+	GL_STUB_ALIAS(VertexAttribI4sv, 932, VertexAttribI4sv@8, VertexAttribI4svEXT, VertexAttribI4svEXT@8)
+	GL_STUB_ALIAS(VertexAttribI4ubv, 933, VertexAttribI4ubv@8, VertexAttribI4ubvEXT, VertexAttribI4ubvEXT@8)
+	GL_STUB_ALIAS(VertexAttribI4ui, 934, VertexAttribI4ui@20, VertexAttribI4uiEXT, VertexAttribI4uiEXT@20)
+	GL_STUB_ALIAS(VertexAttribI4uiv, 935, VertexAttribI4uiv@8, VertexAttribI4uivEXT, VertexAttribI4uivEXT@8)
+	GL_STUB_ALIAS(VertexAttribI4usv, 936, VertexAttribI4usv@8, VertexAttribI4usvEXT, VertexAttribI4usvEXT@8)
+	GL_STUB_ALIAS(VertexAttribIPointer, 937, VertexAttribIPointer@20, VertexAttribIPointerEXT, VertexAttribIPointerEXT@20)
+	GL_STUB_ALIAS(FramebufferTextureLayer, 938, FramebufferTextureLayer@20, FramebufferTextureLayerEXT, FramebufferTextureLayerEXT@20)
+	GL_STUB_ALIAS(FramebufferTextureLayerARB, 938, FramebufferTextureLayerARB@20, FramebufferTextureLayerEXT, FramebufferTextureLayerEXT@20)
+	GL_STUB_ALIAS(ColorMaski, 939, ColorMaski@20, ColorMaskIndexedEXT, ColorMaskIndexedEXT@20)
+	GL_STUB_ALIAS(Disablei, 940, Disablei@8, DisableIndexedEXT, DisableIndexedEXT@8)
+	GL_STUB_ALIAS(Enablei, 941, Enablei@8, EnableIndexedEXT, EnableIndexedEXT@8)
+	GL_STUB_ALIAS(GetBooleani_v, 942, GetBooleani_v@12, GetBooleanIndexedvEXT, GetBooleanIndexedvEXT@12)
+	GL_STUB_ALIAS(GetIntegeri_v, 943, GetIntegeri_v@12, GetIntegerIndexedvEXT, GetIntegerIndexedvEXT@12)
+	GL_STUB_ALIAS(IsEnabledi, 944, IsEnabledi@8, IsEnabledIndexedEXT, IsEnabledIndexedEXT@8)
+	GL_STUB_ALIAS(GetTexParameterIiv, 947, GetTexParameterIiv@12, GetTexParameterIivEXT, GetTexParameterIivEXT@12)
+	GL_STUB_ALIAS(GetTexParameterIuiv, 948, GetTexParameterIuiv@12, GetTexParameterIuivEXT, GetTexParameterIuivEXT@12)
+	GL_STUB_ALIAS(TexParameterIiv, 949, TexParameterIiv@12, TexParameterIivEXT, TexParameterIivEXT@12)
+	GL_STUB_ALIAS(TexParameterIuiv, 950, TexParameterIuiv@12, TexParameterIuivEXT, TexParameterIuivEXT@12)
+	GL_STUB_ALIAS(BeginConditionalRender, 951, BeginConditionalRender@8, BeginConditionalRenderNV, BeginConditionalRenderNV@8)
+	GL_STUB_ALIAS(EndConditionalRender, 952, EndConditionalRender@0, EndConditionalRenderNV, EndConditionalRenderNV@0)
+	GL_STUB_ALIAS(BeginTransformFeedback, 953, BeginTransformFeedback@4, BeginTransformFeedbackEXT, BeginTransformFeedbackEXT@4)
+	GL_STUB_ALIAS(BindBufferBase, 954, BindBufferBase@12, BindBufferBaseEXT, BindBufferBaseEXT@12)
+	GL_STUB_ALIAS(BindBufferRange, 956, BindBufferRange@20, BindBufferRangeEXT, BindBufferRangeEXT@20)
+	GL_STUB_ALIAS(EndTransformFeedback, 957, EndTransformFeedback@0, EndTransformFeedbackEXT, EndTransformFeedbackEXT@0)
+	GL_STUB_ALIAS(GetTransformFeedbackVarying, 958, GetTransformFeedbackVarying@28, GetTransformFeedbackVaryingEXT, GetTransformFeedbackVaryingEXT@28)
+	GL_STUB_ALIAS(TransformFeedbackVaryings, 959, TransformFeedbackVaryings@16, TransformFeedbackVaryingsEXT, TransformFeedbackVaryingsEXT@16)
+	GL_STUB_ALIAS(ProvokingVertex, 960, 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 e5c5449a9..4bc95cf94 100644
--- a/mesalib/src/mapi/glapi/glapitable.h
+++ b/mesalib/src/mapi/glapi/glapitable.h
@@ -705,314 +705,318 @@ struct _glapi_table
    void (GLAPIENTRYP GetShaderPrecisionFormat)(GLenum shadertype, GLenum precisiontype, GLint * range, GLint * precision); /* 662 */
    void (GLAPIENTRYP ReleaseShaderCompiler)(void); /* 663 */
    void (GLAPIENTRYP ShaderBinary)(GLsizei n, const GLuint * shaders, GLenum binaryformat, const GLvoid * binary, GLsizei length); /* 664 */
-   GLenum (GLAPIENTRYP GetGraphicsResetStatusARB)(void); /* 665 */
-   void (GLAPIENTRYP GetnColorTableARB)(GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid * table); /* 666 */
-   void (GLAPIENTRYP GetnCompressedTexImageARB)(GLenum target, GLint lod, GLsizei bufSize, GLvoid * img); /* 667 */
-   void (GLAPIENTRYP GetnConvolutionFilterARB)(GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid * image); /* 668 */
-   void (GLAPIENTRYP GetnHistogramARB)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid * values); /* 669 */
-   void (GLAPIENTRYP GetnMapdvARB)(GLenum target, GLenum query, GLsizei bufSize, GLdouble * v); /* 670 */
-   void (GLAPIENTRYP GetnMapfvARB)(GLenum target, GLenum query, GLsizei bufSize, GLfloat * v); /* 671 */
-   void (GLAPIENTRYP GetnMapivARB)(GLenum target, GLenum query, GLsizei bufSize, GLint * v); /* 672 */
-   void (GLAPIENTRYP GetnMinmaxARB)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid * values); /* 673 */
-   void (GLAPIENTRYP GetnPixelMapfvARB)(GLenum map, GLsizei bufSize, GLfloat * values); /* 674 */
-   void (GLAPIENTRYP GetnPixelMapuivARB)(GLenum map, GLsizei bufSize, GLuint * values); /* 675 */
-   void (GLAPIENTRYP GetnPixelMapusvARB)(GLenum map, GLsizei bufSize, GLushort * values); /* 676 */
-   void (GLAPIENTRYP GetnPolygonStippleARB)(GLsizei bufSize, GLubyte * pattern); /* 677 */
-   void (GLAPIENTRYP GetnSeparableFilterARB)(GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, GLvoid * row, GLsizei columnBufSize, GLvoid * column, GLvoid * span); /* 678 */
-   void (GLAPIENTRYP GetnTexImageARB)(GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, GLvoid * img); /* 679 */
-   void (GLAPIENTRYP GetnUniformdvARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLdouble * params); /* 680 */
-   void (GLAPIENTRYP GetnUniformfvARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLfloat * params); /* 681 */
-   void (GLAPIENTRYP GetnUniformivARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLint * params); /* 682 */
-   void (GLAPIENTRYP GetnUniformuivARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLuint * params); /* 683 */
-   void (GLAPIENTRYP ReadnPixelsARB)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, GLvoid * data); /* 684 */
-   void (GLAPIENTRYP TexStorage1D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width); /* 685 */
-   void (GLAPIENTRYP TexStorage2D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height); /* 686 */
-   void (GLAPIENTRYP TexStorage3D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth); /* 687 */
-   void (GLAPIENTRYP TextureStorage1DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width); /* 688 */
-   void (GLAPIENTRYP TextureStorage2DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height); /* 689 */
-   void (GLAPIENTRYP TextureStorage3DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth); /* 690 */
-   void (GLAPIENTRYP PolygonOffsetEXT)(GLfloat factor, GLfloat bias); /* 691 */
-   void (GLAPIENTRYP GetPixelTexGenParameterfvSGIS)(GLenum pname, GLfloat * params); /* 692 */
-   void (GLAPIENTRYP GetPixelTexGenParameterivSGIS)(GLenum pname, GLint * params); /* 693 */
-   void (GLAPIENTRYP PixelTexGenParameterfSGIS)(GLenum pname, GLfloat param); /* 694 */
-   void (GLAPIENTRYP PixelTexGenParameterfvSGIS)(GLenum pname, const GLfloat * params); /* 695 */
-   void (GLAPIENTRYP PixelTexGenParameteriSGIS)(GLenum pname, GLint param); /* 696 */
-   void (GLAPIENTRYP PixelTexGenParameterivSGIS)(GLenum pname, const GLint * params); /* 697 */
-   void (GLAPIENTRYP SampleMaskSGIS)(GLclampf value, GLboolean invert); /* 698 */
-   void (GLAPIENTRYP SamplePatternSGIS)(GLenum pattern); /* 699 */
-   void (GLAPIENTRYP ColorPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 700 */
-   void (GLAPIENTRYP EdgeFlagPointerEXT)(GLsizei stride, GLsizei count, const GLboolean * pointer); /* 701 */
-   void (GLAPIENTRYP IndexPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 702 */
-   void (GLAPIENTRYP NormalPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 703 */
-   void (GLAPIENTRYP TexCoordPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 704 */
-   void (GLAPIENTRYP VertexPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 705 */
-   void (GLAPIENTRYP PointParameterfEXT)(GLenum pname, GLfloat param); /* 706 */
-   void (GLAPIENTRYP PointParameterfvEXT)(GLenum pname, const GLfloat * params); /* 707 */
-   void (GLAPIENTRYP LockArraysEXT)(GLint first, GLsizei count); /* 708 */
-   void (GLAPIENTRYP UnlockArraysEXT)(void); /* 709 */
-   void (GLAPIENTRYP SecondaryColor3bEXT)(GLbyte red, GLbyte green, GLbyte blue); /* 710 */
-   void (GLAPIENTRYP SecondaryColor3bvEXT)(const GLbyte * v); /* 711 */
-   void (GLAPIENTRYP SecondaryColor3dEXT)(GLdouble red, GLdouble green, GLdouble blue); /* 712 */
-   void (GLAPIENTRYP SecondaryColor3dvEXT)(const GLdouble * v); /* 713 */
-   void (GLAPIENTRYP SecondaryColor3fEXT)(GLfloat red, GLfloat green, GLfloat blue); /* 714 */
-   void (GLAPIENTRYP SecondaryColor3fvEXT)(const GLfloat * v); /* 715 */
-   void (GLAPIENTRYP SecondaryColor3iEXT)(GLint red, GLint green, GLint blue); /* 716 */
-   void (GLAPIENTRYP SecondaryColor3ivEXT)(const GLint * v); /* 717 */
-   void (GLAPIENTRYP SecondaryColor3sEXT)(GLshort red, GLshort green, GLshort blue); /* 718 */
-   void (GLAPIENTRYP SecondaryColor3svEXT)(const GLshort * v); /* 719 */
-   void (GLAPIENTRYP SecondaryColor3ubEXT)(GLubyte red, GLubyte green, GLubyte blue); /* 720 */
-   void (GLAPIENTRYP SecondaryColor3ubvEXT)(const GLubyte * v); /* 721 */
-   void (GLAPIENTRYP SecondaryColor3uiEXT)(GLuint red, GLuint green, GLuint blue); /* 722 */
-   void (GLAPIENTRYP SecondaryColor3uivEXT)(const GLuint * v); /* 723 */
-   void (GLAPIENTRYP SecondaryColor3usEXT)(GLushort red, GLushort green, GLushort blue); /* 724 */
-   void (GLAPIENTRYP SecondaryColor3usvEXT)(const GLushort * v); /* 725 */
-   void (GLAPIENTRYP SecondaryColorPointerEXT)(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 726 */
-   void (GLAPIENTRYP MultiDrawArraysEXT)(GLenum mode, const GLint * first, const GLsizei * count, GLsizei primcount); /* 727 */
-   void (GLAPIENTRYP MultiDrawElementsEXT)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid ** indices, GLsizei primcount); /* 728 */
-   void (GLAPIENTRYP FogCoordPointerEXT)(GLenum type, GLsizei stride, const GLvoid * pointer); /* 729 */
-   void (GLAPIENTRYP FogCoorddEXT)(GLdouble coord); /* 730 */
-   void (GLAPIENTRYP FogCoorddvEXT)(const GLdouble * coord); /* 731 */
-   void (GLAPIENTRYP FogCoordfEXT)(GLfloat coord); /* 732 */
-   void (GLAPIENTRYP FogCoordfvEXT)(const GLfloat * coord); /* 733 */
-   void (GLAPIENTRYP PixelTexGenSGIX)(GLenum mode); /* 734 */
-   void (GLAPIENTRYP BlendFuncSeparateEXT)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); /* 735 */
-   void (GLAPIENTRYP FlushVertexArrayRangeNV)(void); /* 736 */
-   void (GLAPIENTRYP VertexArrayRangeNV)(GLsizei length, const GLvoid * pointer); /* 737 */
-   void (GLAPIENTRYP CombinerInputNV)(GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); /* 738 */
-   void (GLAPIENTRYP CombinerOutputNV)(GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum); /* 739 */
-   void (GLAPIENTRYP CombinerParameterfNV)(GLenum pname, GLfloat param); /* 740 */
-   void (GLAPIENTRYP CombinerParameterfvNV)(GLenum pname, const GLfloat * params); /* 741 */
-   void (GLAPIENTRYP CombinerParameteriNV)(GLenum pname, GLint param); /* 742 */
-   void (GLAPIENTRYP CombinerParameterivNV)(GLenum pname, const GLint * params); /* 743 */
-   void (GLAPIENTRYP FinalCombinerInputNV)(GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); /* 744 */
-   void (GLAPIENTRYP GetCombinerInputParameterfvNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat * params); /* 745 */
-   void (GLAPIENTRYP GetCombinerInputParameterivNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint * params); /* 746 */
-   void (GLAPIENTRYP GetCombinerOutputParameterfvNV)(GLenum stage, GLenum portion, GLenum pname, GLfloat * params); /* 747 */
-   void (GLAPIENTRYP GetCombinerOutputParameterivNV)(GLenum stage, GLenum portion, GLenum pname, GLint * params); /* 748 */
-   void (GLAPIENTRYP GetFinalCombinerInputParameterfvNV)(GLenum variable, GLenum pname, GLfloat * params); /* 749 */
-   void (GLAPIENTRYP GetFinalCombinerInputParameterivNV)(GLenum variable, GLenum pname, GLint * params); /* 750 */
-   void (GLAPIENTRYP ResizeBuffersMESA)(void); /* 751 */
-   void (GLAPIENTRYP WindowPos2dMESA)(GLdouble x, GLdouble y); /* 752 */
-   void (GLAPIENTRYP WindowPos2dvMESA)(const GLdouble * v); /* 753 */
-   void (GLAPIENTRYP WindowPos2fMESA)(GLfloat x, GLfloat y); /* 754 */
-   void (GLAPIENTRYP WindowPos2fvMESA)(const GLfloat * v); /* 755 */
-   void (GLAPIENTRYP WindowPos2iMESA)(GLint x, GLint y); /* 756 */
-   void (GLAPIENTRYP WindowPos2ivMESA)(const GLint * v); /* 757 */
-   void (GLAPIENTRYP WindowPos2sMESA)(GLshort x, GLshort y); /* 758 */
-   void (GLAPIENTRYP WindowPos2svMESA)(const GLshort * v); /* 759 */
-   void (GLAPIENTRYP WindowPos3dMESA)(GLdouble x, GLdouble y, GLdouble z); /* 760 */
-   void (GLAPIENTRYP WindowPos3dvMESA)(const GLdouble * v); /* 761 */
-   void (GLAPIENTRYP WindowPos3fMESA)(GLfloat x, GLfloat y, GLfloat z); /* 762 */
-   void (GLAPIENTRYP WindowPos3fvMESA)(const GLfloat * v); /* 763 */
-   void (GLAPIENTRYP WindowPos3iMESA)(GLint x, GLint y, GLint z); /* 764 */
-   void (GLAPIENTRYP WindowPos3ivMESA)(const GLint * v); /* 765 */
-   void (GLAPIENTRYP WindowPos3sMESA)(GLshort x, GLshort y, GLshort z); /* 766 */
-   void (GLAPIENTRYP WindowPos3svMESA)(const GLshort * v); /* 767 */
-   void (GLAPIENTRYP WindowPos4dMESA)(GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 768 */
-   void (GLAPIENTRYP WindowPos4dvMESA)(const GLdouble * v); /* 769 */
-   void (GLAPIENTRYP WindowPos4fMESA)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 770 */
-   void (GLAPIENTRYP WindowPos4fvMESA)(const GLfloat * v); /* 771 */
-   void (GLAPIENTRYP WindowPos4iMESA)(GLint x, GLint y, GLint z, GLint w); /* 772 */
-   void (GLAPIENTRYP WindowPos4ivMESA)(const GLint * v); /* 773 */
-   void (GLAPIENTRYP WindowPos4sMESA)(GLshort x, GLshort y, GLshort z, GLshort w); /* 774 */
-   void (GLAPIENTRYP WindowPos4svMESA)(const GLshort * v); /* 775 */
-   void (GLAPIENTRYP MultiModeDrawArraysIBM)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride); /* 776 */
-   void (GLAPIENTRYP MultiModeDrawElementsIBM)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride); /* 777 */
-   void (GLAPIENTRYP DeleteFencesNV)(GLsizei n, const GLuint * fences); /* 778 */
-   void (GLAPIENTRYP FinishFenceNV)(GLuint fence); /* 779 */
-   void (GLAPIENTRYP GenFencesNV)(GLsizei n, GLuint * fences); /* 780 */
-   void (GLAPIENTRYP GetFenceivNV)(GLuint fence, GLenum pname, GLint * params); /* 781 */
-   GLboolean (GLAPIENTRYP IsFenceNV)(GLuint fence); /* 782 */
-   void (GLAPIENTRYP SetFenceNV)(GLuint fence, GLenum condition); /* 783 */
-   GLboolean (GLAPIENTRYP TestFenceNV)(GLuint fence); /* 784 */
-   GLboolean (GLAPIENTRYP AreProgramsResidentNV)(GLsizei n, const GLuint * ids, GLboolean * residences); /* 785 */
-   void (GLAPIENTRYP BindProgramNV)(GLenum target, GLuint program); /* 786 */
-   void (GLAPIENTRYP DeleteProgramsNV)(GLsizei n, const GLuint * programs); /* 787 */
-   void (GLAPIENTRYP ExecuteProgramNV)(GLenum target, GLuint id, const GLfloat * params); /* 788 */
-   void (GLAPIENTRYP GenProgramsNV)(GLsizei n, GLuint * programs); /* 789 */
-   void (GLAPIENTRYP GetProgramParameterdvNV)(GLenum target, GLuint index, GLenum pname, GLdouble * params); /* 790 */
-   void (GLAPIENTRYP GetProgramParameterfvNV)(GLenum target, GLuint index, GLenum pname, GLfloat * params); /* 791 */
-   void (GLAPIENTRYP GetProgramStringNV)(GLuint id, GLenum pname, GLubyte * program); /* 792 */
-   void (GLAPIENTRYP GetProgramivNV)(GLuint id, GLenum pname, GLint * params); /* 793 */
-   void (GLAPIENTRYP GetTrackMatrixivNV)(GLenum target, GLuint address, GLenum pname, GLint * params); /* 794 */
-   void (GLAPIENTRYP GetVertexAttribPointervNV)(GLuint index, GLenum pname, GLvoid ** pointer); /* 795 */
-   void (GLAPIENTRYP GetVertexAttribdvNV)(GLuint index, GLenum pname, GLdouble * params); /* 796 */
-   void (GLAPIENTRYP GetVertexAttribfvNV)(GLuint index, GLenum pname, GLfloat * params); /* 797 */
-   void (GLAPIENTRYP GetVertexAttribivNV)(GLuint index, GLenum pname, GLint * params); /* 798 */
-   GLboolean (GLAPIENTRYP IsProgramNV)(GLuint program); /* 799 */
-   void (GLAPIENTRYP LoadProgramNV)(GLenum target, GLuint id, GLsizei len, const GLubyte * program); /* 800 */
-   void (GLAPIENTRYP ProgramParameters4dvNV)(GLenum target, GLuint index, GLsizei num, const GLdouble * params); /* 801 */
-   void (GLAPIENTRYP ProgramParameters4fvNV)(GLenum target, GLuint index, GLsizei num, const GLfloat * params); /* 802 */
-   void (GLAPIENTRYP RequestResidentProgramsNV)(GLsizei n, const GLuint * ids); /* 803 */
-   void (GLAPIENTRYP TrackMatrixNV)(GLenum target, GLuint address, GLenum matrix, GLenum transform); /* 804 */
-   void (GLAPIENTRYP VertexAttrib1dNV)(GLuint index, GLdouble x); /* 805 */
-   void (GLAPIENTRYP VertexAttrib1dvNV)(GLuint index, const GLdouble * v); /* 806 */
-   void (GLAPIENTRYP VertexAttrib1fNV)(GLuint index, GLfloat x); /* 807 */
-   void (GLAPIENTRYP VertexAttrib1fvNV)(GLuint index, const GLfloat * v); /* 808 */
-   void (GLAPIENTRYP VertexAttrib1sNV)(GLuint index, GLshort x); /* 809 */
-   void (GLAPIENTRYP VertexAttrib1svNV)(GLuint index, const GLshort * v); /* 810 */
-   void (GLAPIENTRYP VertexAttrib2dNV)(GLuint index, GLdouble x, GLdouble y); /* 811 */
-   void (GLAPIENTRYP VertexAttrib2dvNV)(GLuint index, const GLdouble * v); /* 812 */
-   void (GLAPIENTRYP VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y); /* 813 */
-   void (GLAPIENTRYP VertexAttrib2fvNV)(GLuint index, const GLfloat * v); /* 814 */
-   void (GLAPIENTRYP VertexAttrib2sNV)(GLuint index, GLshort x, GLshort y); /* 815 */
-   void (GLAPIENTRYP VertexAttrib2svNV)(GLuint index, const GLshort * v); /* 816 */
-   void (GLAPIENTRYP VertexAttrib3dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z); /* 817 */
-   void (GLAPIENTRYP VertexAttrib3dvNV)(GLuint index, const GLdouble * v); /* 818 */
-   void (GLAPIENTRYP VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z); /* 819 */
-   void (GLAPIENTRYP VertexAttrib3fvNV)(GLuint index, const GLfloat * v); /* 820 */
-   void (GLAPIENTRYP VertexAttrib3sNV)(GLuint index, GLshort x, GLshort y, GLshort z); /* 821 */
-   void (GLAPIENTRYP VertexAttrib3svNV)(GLuint index, const GLshort * v); /* 822 */
-   void (GLAPIENTRYP VertexAttrib4dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 823 */
-   void (GLAPIENTRYP VertexAttrib4dvNV)(GLuint index, const GLdouble * v); /* 824 */
-   void (GLAPIENTRYP VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 825 */
-   void (GLAPIENTRYP VertexAttrib4fvNV)(GLuint index, const GLfloat * v); /* 826 */
-   void (GLAPIENTRYP VertexAttrib4sNV)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); /* 827 */
-   void (GLAPIENTRYP VertexAttrib4svNV)(GLuint index, const GLshort * v); /* 828 */
-   void (GLAPIENTRYP VertexAttrib4ubNV)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); /* 829 */
-   void (GLAPIENTRYP VertexAttrib4ubvNV)(GLuint index, const GLubyte * v); /* 830 */
-   void (GLAPIENTRYP VertexAttribPointerNV)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 831 */
-   void (GLAPIENTRYP VertexAttribs1dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 832 */
-   void (GLAPIENTRYP VertexAttribs1fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 833 */
-   void (GLAPIENTRYP VertexAttribs1svNV)(GLuint index, GLsizei n, const GLshort * v); /* 834 */
-   void (GLAPIENTRYP VertexAttribs2dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 835 */
-   void (GLAPIENTRYP VertexAttribs2fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 836 */
-   void (GLAPIENTRYP VertexAttribs2svNV)(GLuint index, GLsizei n, const GLshort * v); /* 837 */
-   void (GLAPIENTRYP VertexAttribs3dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 838 */
-   void (GLAPIENTRYP VertexAttribs3fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 839 */
-   void (GLAPIENTRYP VertexAttribs3svNV)(GLuint index, GLsizei n, const GLshort * v); /* 840 */
-   void (GLAPIENTRYP VertexAttribs4dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 841 */
-   void (GLAPIENTRYP VertexAttribs4fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 842 */
-   void (GLAPIENTRYP VertexAttribs4svNV)(GLuint index, GLsizei n, const GLshort * v); /* 843 */
-   void (GLAPIENTRYP VertexAttribs4ubvNV)(GLuint index, GLsizei n, const GLubyte * v); /* 844 */
-   void (GLAPIENTRYP GetTexBumpParameterfvATI)(GLenum pname, GLfloat * param); /* 845 */
-   void (GLAPIENTRYP GetTexBumpParameterivATI)(GLenum pname, GLint * param); /* 846 */
-   void (GLAPIENTRYP TexBumpParameterfvATI)(GLenum pname, const GLfloat * param); /* 847 */
-   void (GLAPIENTRYP TexBumpParameterivATI)(GLenum pname, const GLint * param); /* 848 */
-   void (GLAPIENTRYP AlphaFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 849 */
-   void (GLAPIENTRYP AlphaFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 850 */
-   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); /* 851 */
-   void (GLAPIENTRYP BeginFragmentShaderATI)(void); /* 852 */
-   void (GLAPIENTRYP BindFragmentShaderATI)(GLuint id); /* 853 */
-   void (GLAPIENTRYP ColorFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 854 */
-   void (GLAPIENTRYP ColorFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 855 */
-   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); /* 856 */
-   void (GLAPIENTRYP DeleteFragmentShaderATI)(GLuint id); /* 857 */
-   void (GLAPIENTRYP EndFragmentShaderATI)(void); /* 858 */
-   GLuint (GLAPIENTRYP GenFragmentShadersATI)(GLuint range); /* 859 */
-   void (GLAPIENTRYP PassTexCoordATI)(GLuint dst, GLuint coord, GLenum swizzle); /* 860 */
-   void (GLAPIENTRYP SampleMapATI)(GLuint dst, GLuint interp, GLenum swizzle); /* 861 */
-   void (GLAPIENTRYP SetFragmentShaderConstantATI)(GLuint dst, const GLfloat * value); /* 862 */
-   void (GLAPIENTRYP PointParameteriNV)(GLenum pname, GLint param); /* 863 */
-   void (GLAPIENTRYP PointParameterivNV)(GLenum pname, const GLint * params); /* 864 */
-   void (GLAPIENTRYP ActiveStencilFaceEXT)(GLenum face); /* 865 */
-   void (GLAPIENTRYP BindVertexArrayAPPLE)(GLuint array); /* 866 */
-   void (GLAPIENTRYP DeleteVertexArraysAPPLE)(GLsizei n, const GLuint * arrays); /* 867 */
-   void (GLAPIENTRYP GenVertexArraysAPPLE)(GLsizei n, GLuint * arrays); /* 868 */
-   GLboolean (GLAPIENTRYP IsVertexArrayAPPLE)(GLuint array); /* 869 */
-   void (GLAPIENTRYP GetProgramNamedParameterdvNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble * params); /* 870 */
-   void (GLAPIENTRYP GetProgramNamedParameterfvNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat * params); /* 871 */
-   void (GLAPIENTRYP ProgramNamedParameter4dNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 872 */
-   void (GLAPIENTRYP ProgramNamedParameter4dvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLdouble * v); /* 873 */
-   void (GLAPIENTRYP ProgramNamedParameter4fNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 874 */
-   void (GLAPIENTRYP ProgramNamedParameter4fvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLfloat * v); /* 875 */
-   void (GLAPIENTRYP PrimitiveRestartIndexNV)(GLuint index); /* 876 */
-   void (GLAPIENTRYP PrimitiveRestartNV)(void); /* 877 */
-   void (GLAPIENTRYP DepthBoundsEXT)(GLclampd zmin, GLclampd zmax); /* 878 */
-   void (GLAPIENTRYP BlendEquationSeparateEXT)(GLenum modeRGB, GLenum modeA); /* 879 */
-   void (GLAPIENTRYP BindFramebufferEXT)(GLenum target, GLuint framebuffer); /* 880 */
-   void (GLAPIENTRYP BindRenderbufferEXT)(GLenum target, GLuint renderbuffer); /* 881 */
-   GLenum (GLAPIENTRYP CheckFramebufferStatusEXT)(GLenum target); /* 882 */
-   void (GLAPIENTRYP DeleteFramebuffersEXT)(GLsizei n, const GLuint * framebuffers); /* 883 */
-   void (GLAPIENTRYP DeleteRenderbuffersEXT)(GLsizei n, const GLuint * renderbuffers); /* 884 */
-   void (GLAPIENTRYP FramebufferRenderbufferEXT)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); /* 885 */
-   void (GLAPIENTRYP FramebufferTexture1DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 886 */
-   void (GLAPIENTRYP FramebufferTexture2DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 887 */
-   void (GLAPIENTRYP FramebufferTexture3DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); /* 888 */
-   void (GLAPIENTRYP GenFramebuffersEXT)(GLsizei n, GLuint * framebuffers); /* 889 */
-   void (GLAPIENTRYP GenRenderbuffersEXT)(GLsizei n, GLuint * renderbuffers); /* 890 */
-   void (GLAPIENTRYP GenerateMipmapEXT)(GLenum target); /* 891 */
-   void (GLAPIENTRYP GetFramebufferAttachmentParameterivEXT)(GLenum target, GLenum attachment, GLenum pname, GLint * params); /* 892 */
-   void (GLAPIENTRYP GetRenderbufferParameterivEXT)(GLenum target, GLenum pname, GLint * params); /* 893 */
-   GLboolean (GLAPIENTRYP IsFramebufferEXT)(GLuint framebuffer); /* 894 */
-   GLboolean (GLAPIENTRYP IsRenderbufferEXT)(GLuint renderbuffer); /* 895 */
-   void (GLAPIENTRYP RenderbufferStorageEXT)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height); /* 896 */
-   void (GLAPIENTRYP BlitFramebufferEXT)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); /* 897 */
-   void (GLAPIENTRYP BufferParameteriAPPLE)(GLenum target, GLenum pname, GLint param); /* 898 */
-   void (GLAPIENTRYP FlushMappedBufferRangeAPPLE)(GLenum target, GLintptr offset, GLsizeiptr size); /* 899 */
-   void (GLAPIENTRYP BindFragDataLocationEXT)(GLuint program, GLuint colorNumber, const GLchar * name); /* 900 */
-   GLint (GLAPIENTRYP GetFragDataLocationEXT)(GLuint program, const GLchar * name); /* 901 */
-   void (GLAPIENTRYP GetUniformuivEXT)(GLuint program, GLint location, GLuint * params); /* 902 */
-   void (GLAPIENTRYP GetVertexAttribIivEXT)(GLuint index, GLenum pname, GLint * params); /* 903 */
-   void (GLAPIENTRYP GetVertexAttribIuivEXT)(GLuint index, GLenum pname, GLuint * params); /* 904 */
-   void (GLAPIENTRYP Uniform1uiEXT)(GLint location, GLuint x); /* 905 */
-   void (GLAPIENTRYP Uniform1uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 906 */
-   void (GLAPIENTRYP Uniform2uiEXT)(GLint location, GLuint x, GLuint y); /* 907 */
-   void (GLAPIENTRYP Uniform2uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 908 */
-   void (GLAPIENTRYP Uniform3uiEXT)(GLint location, GLuint x, GLuint y, GLuint z); /* 909 */
-   void (GLAPIENTRYP Uniform3uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 910 */
-   void (GLAPIENTRYP Uniform4uiEXT)(GLint location, GLuint x, GLuint y, GLuint z, GLuint w); /* 911 */
-   void (GLAPIENTRYP Uniform4uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 912 */
-   void (GLAPIENTRYP VertexAttribI1iEXT)(GLuint index, GLint x); /* 913 */
-   void (GLAPIENTRYP VertexAttribI1ivEXT)(GLuint index, const GLint * v); /* 914 */
-   void (GLAPIENTRYP VertexAttribI1uiEXT)(GLuint index, GLuint x); /* 915 */
-   void (GLAPIENTRYP VertexAttribI1uivEXT)(GLuint index, const GLuint * v); /* 916 */
-   void (GLAPIENTRYP VertexAttribI2iEXT)(GLuint index, GLint x, GLint y); /* 917 */
-   void (GLAPIENTRYP VertexAttribI2ivEXT)(GLuint index, const GLint * v); /* 918 */
-   void (GLAPIENTRYP VertexAttribI2uiEXT)(GLuint index, GLuint x, GLuint y); /* 919 */
-   void (GLAPIENTRYP VertexAttribI2uivEXT)(GLuint index, const GLuint * v); /* 920 */
-   void (GLAPIENTRYP VertexAttribI3iEXT)(GLuint index, GLint x, GLint y, GLint z); /* 921 */
-   void (GLAPIENTRYP VertexAttribI3ivEXT)(GLuint index, const GLint * v); /* 922 */
-   void (GLAPIENTRYP VertexAttribI3uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z); /* 923 */
-   void (GLAPIENTRYP VertexAttribI3uivEXT)(GLuint index, const GLuint * v); /* 924 */
-   void (GLAPIENTRYP VertexAttribI4bvEXT)(GLuint index, const GLbyte * v); /* 925 */
-   void (GLAPIENTRYP VertexAttribI4iEXT)(GLuint index, GLint x, GLint y, GLint z, GLint w); /* 926 */
-   void (GLAPIENTRYP VertexAttribI4ivEXT)(GLuint index, const GLint * v); /* 927 */
-   void (GLAPIENTRYP VertexAttribI4svEXT)(GLuint index, const GLshort * v); /* 928 */
-   void (GLAPIENTRYP VertexAttribI4ubvEXT)(GLuint index, const GLubyte * v); /* 929 */
-   void (GLAPIENTRYP VertexAttribI4uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); /* 930 */
-   void (GLAPIENTRYP VertexAttribI4uivEXT)(GLuint index, const GLuint * v); /* 931 */
-   void (GLAPIENTRYP VertexAttribI4usvEXT)(GLuint index, const GLushort * v); /* 932 */
-   void (GLAPIENTRYP VertexAttribIPointerEXT)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 933 */
-   void (GLAPIENTRYP FramebufferTextureLayerEXT)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); /* 934 */
-   void (GLAPIENTRYP ColorMaskIndexedEXT)(GLuint buf, GLboolean r, GLboolean g, GLboolean b, GLboolean a); /* 935 */
-   void (GLAPIENTRYP DisableIndexedEXT)(GLenum target, GLuint index); /* 936 */
-   void (GLAPIENTRYP EnableIndexedEXT)(GLenum target, GLuint index); /* 937 */
-   void (GLAPIENTRYP GetBooleanIndexedvEXT)(GLenum value, GLuint index, GLboolean * data); /* 938 */
-   void (GLAPIENTRYP GetIntegerIndexedvEXT)(GLenum value, GLuint index, GLint * data); /* 939 */
-   GLboolean (GLAPIENTRYP IsEnabledIndexedEXT)(GLenum target, GLuint index); /* 940 */
-   void (GLAPIENTRYP ClearColorIiEXT)(GLint r, GLint g, GLint b, GLint a); /* 941 */
-   void (GLAPIENTRYP ClearColorIuiEXT)(GLuint r, GLuint g, GLuint b, GLuint a); /* 942 */
-   void (GLAPIENTRYP GetTexParameterIivEXT)(GLenum target, GLenum pname, GLint * params); /* 943 */
-   void (GLAPIENTRYP GetTexParameterIuivEXT)(GLenum target, GLenum pname, GLuint * params); /* 944 */
-   void (GLAPIENTRYP TexParameterIivEXT)(GLenum target, GLenum pname, const GLint * params); /* 945 */
-   void (GLAPIENTRYP TexParameterIuivEXT)(GLenum target, GLenum pname, const GLuint * params); /* 946 */
-   void (GLAPIENTRYP BeginConditionalRenderNV)(GLuint query, GLenum mode); /* 947 */
-   void (GLAPIENTRYP EndConditionalRenderNV)(void); /* 948 */
-   void (GLAPIENTRYP BeginTransformFeedbackEXT)(GLenum mode); /* 949 */
-   void (GLAPIENTRYP BindBufferBaseEXT)(GLenum target, GLuint index, GLuint buffer); /* 950 */
-   void (GLAPIENTRYP BindBufferOffsetEXT)(GLenum target, GLuint index, GLuint buffer, GLintptr offset); /* 951 */
-   void (GLAPIENTRYP BindBufferRangeEXT)(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); /* 952 */
-   void (GLAPIENTRYP EndTransformFeedbackEXT)(void); /* 953 */
-   void (GLAPIENTRYP GetTransformFeedbackVaryingEXT)(GLuint program, GLuint index, GLsizei bufSize, GLsizei * length, GLsizei * size, GLenum * type, GLchar * name); /* 954 */
-   void (GLAPIENTRYP TransformFeedbackVaryingsEXT)(GLuint program, GLsizei count, const char ** varyings, GLenum bufferMode); /* 955 */
-   void (GLAPIENTRYP ProvokingVertexEXT)(GLenum mode); /* 956 */
-   void (GLAPIENTRYP GetTexParameterPointervAPPLE)(GLenum target, GLenum pname, GLvoid ** params); /* 957 */
-   void (GLAPIENTRYP TextureRangeAPPLE)(GLenum target, GLsizei length, GLvoid * pointer); /* 958 */
-   void (GLAPIENTRYP GetObjectParameterivAPPLE)(GLenum objectType, GLuint name, GLenum pname, GLint * value); /* 959 */
-   GLenum (GLAPIENTRYP ObjectPurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 960 */
-   GLenum (GLAPIENTRYP ObjectUnpurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 961 */
-   void (GLAPIENTRYP ActiveProgramEXT)(GLuint program); /* 962 */
-   GLuint (GLAPIENTRYP CreateShaderProgramEXT)(GLenum type, const GLchar * string); /* 963 */
-   void (GLAPIENTRYP UseShaderProgramEXT)(GLenum type, GLuint program); /* 964 */
-   void (GLAPIENTRYP TextureBarrierNV)(void); /* 965 */
-   void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 966 */
-   void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 967 */
-   void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 968 */
-   void (GLAPIENTRYP GetQueryObjecti64vEXT)(GLuint id, GLenum pname, GLint64EXT * params); /* 969 */
-   void (GLAPIENTRYP GetQueryObjectui64vEXT)(GLuint id, GLenum pname, GLuint64EXT * params); /* 970 */
-   void (GLAPIENTRYP EGLImageTargetRenderbufferStorageOES)(GLenum target, GLvoid * writeOffset); /* 971 */
-   void (GLAPIENTRYP EGLImageTargetTexture2DOES)(GLenum target, GLvoid * writeOffset); /* 972 */
+   void (GLAPIENTRYP DebugMessageCallbackARB)(GLDEBUGPROCARB callback, GLvoid * userParam); /* 665 */
+   void (GLAPIENTRYP DebugMessageControlARB)(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint * ids, GLboolean enabled); /* 666 */
+   void (GLAPIENTRYP DebugMessageInsertARB)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLcharARB * buf); /* 667 */
+   GLuint (GLAPIENTRYP GetDebugMessageLogARB)(GLuint count, GLsizei bufsize, GLenum * sources, GLenum * types, GLuint * ids, GLenum * severities, GLsizei * lengths, GLcharARB * messageLog); /* 668 */
+   GLenum (GLAPIENTRYP GetGraphicsResetStatusARB)(void); /* 669 */
+   void (GLAPIENTRYP GetnColorTableARB)(GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid * table); /* 670 */
+   void (GLAPIENTRYP GetnCompressedTexImageARB)(GLenum target, GLint lod, GLsizei bufSize, GLvoid * img); /* 671 */
+   void (GLAPIENTRYP GetnConvolutionFilterARB)(GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid * image); /* 672 */
+   void (GLAPIENTRYP GetnHistogramARB)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid * values); /* 673 */
+   void (GLAPIENTRYP GetnMapdvARB)(GLenum target, GLenum query, GLsizei bufSize, GLdouble * v); /* 674 */
+   void (GLAPIENTRYP GetnMapfvARB)(GLenum target, GLenum query, GLsizei bufSize, GLfloat * v); /* 675 */
+   void (GLAPIENTRYP GetnMapivARB)(GLenum target, GLenum query, GLsizei bufSize, GLint * v); /* 676 */
+   void (GLAPIENTRYP GetnMinmaxARB)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid * values); /* 677 */
+   void (GLAPIENTRYP GetnPixelMapfvARB)(GLenum map, GLsizei bufSize, GLfloat * values); /* 678 */
+   void (GLAPIENTRYP GetnPixelMapuivARB)(GLenum map, GLsizei bufSize, GLuint * values); /* 679 */
+   void (GLAPIENTRYP GetnPixelMapusvARB)(GLenum map, GLsizei bufSize, GLushort * values); /* 680 */
+   void (GLAPIENTRYP GetnPolygonStippleARB)(GLsizei bufSize, GLubyte * pattern); /* 681 */
+   void (GLAPIENTRYP GetnSeparableFilterARB)(GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, GLvoid * row, GLsizei columnBufSize, GLvoid * column, GLvoid * span); /* 682 */
+   void (GLAPIENTRYP GetnTexImageARB)(GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, GLvoid * img); /* 683 */
+   void (GLAPIENTRYP GetnUniformdvARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLdouble * params); /* 684 */
+   void (GLAPIENTRYP GetnUniformfvARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLfloat * params); /* 685 */
+   void (GLAPIENTRYP GetnUniformivARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLint * params); /* 686 */
+   void (GLAPIENTRYP GetnUniformuivARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLuint * params); /* 687 */
+   void (GLAPIENTRYP ReadnPixelsARB)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, GLvoid * data); /* 688 */
+   void (GLAPIENTRYP TexStorage1D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width); /* 689 */
+   void (GLAPIENTRYP TexStorage2D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height); /* 690 */
+   void (GLAPIENTRYP TexStorage3D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth); /* 691 */
+   void (GLAPIENTRYP TextureStorage1DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width); /* 692 */
+   void (GLAPIENTRYP TextureStorage2DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height); /* 693 */
+   void (GLAPIENTRYP TextureStorage3DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth); /* 694 */
+   void (GLAPIENTRYP PolygonOffsetEXT)(GLfloat factor, GLfloat bias); /* 695 */
+   void (GLAPIENTRYP GetPixelTexGenParameterfvSGIS)(GLenum pname, GLfloat * params); /* 696 */
+   void (GLAPIENTRYP GetPixelTexGenParameterivSGIS)(GLenum pname, GLint * params); /* 697 */
+   void (GLAPIENTRYP PixelTexGenParameterfSGIS)(GLenum pname, GLfloat param); /* 698 */
+   void (GLAPIENTRYP PixelTexGenParameterfvSGIS)(GLenum pname, const GLfloat * params); /* 699 */
+   void (GLAPIENTRYP PixelTexGenParameteriSGIS)(GLenum pname, GLint param); /* 700 */
+   void (GLAPIENTRYP PixelTexGenParameterivSGIS)(GLenum pname, const GLint * params); /* 701 */
+   void (GLAPIENTRYP SampleMaskSGIS)(GLclampf value, GLboolean invert); /* 702 */
+   void (GLAPIENTRYP SamplePatternSGIS)(GLenum pattern); /* 703 */
+   void (GLAPIENTRYP ColorPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 704 */
+   void (GLAPIENTRYP EdgeFlagPointerEXT)(GLsizei stride, GLsizei count, const GLboolean * pointer); /* 705 */
+   void (GLAPIENTRYP IndexPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 706 */
+   void (GLAPIENTRYP NormalPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 707 */
+   void (GLAPIENTRYP TexCoordPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 708 */
+   void (GLAPIENTRYP VertexPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 709 */
+   void (GLAPIENTRYP PointParameterfEXT)(GLenum pname, GLfloat param); /* 710 */
+   void (GLAPIENTRYP PointParameterfvEXT)(GLenum pname, const GLfloat * params); /* 711 */
+   void (GLAPIENTRYP LockArraysEXT)(GLint first, GLsizei count); /* 712 */
+   void (GLAPIENTRYP UnlockArraysEXT)(void); /* 713 */
+   void (GLAPIENTRYP SecondaryColor3bEXT)(GLbyte red, GLbyte green, GLbyte blue); /* 714 */
+   void (GLAPIENTRYP SecondaryColor3bvEXT)(const GLbyte * v); /* 715 */
+   void (GLAPIENTRYP SecondaryColor3dEXT)(GLdouble red, GLdouble green, GLdouble blue); /* 716 */
+   void (GLAPIENTRYP SecondaryColor3dvEXT)(const GLdouble * v); /* 717 */
+   void (GLAPIENTRYP SecondaryColor3fEXT)(GLfloat red, GLfloat green, GLfloat blue); /* 718 */
+   void (GLAPIENTRYP SecondaryColor3fvEXT)(const GLfloat * v); /* 719 */
+   void (GLAPIENTRYP SecondaryColor3iEXT)(GLint red, GLint green, GLint blue); /* 720 */
+   void (GLAPIENTRYP SecondaryColor3ivEXT)(const GLint * v); /* 721 */
+   void (GLAPIENTRYP SecondaryColor3sEXT)(GLshort red, GLshort green, GLshort blue); /* 722 */
+   void (GLAPIENTRYP SecondaryColor3svEXT)(const GLshort * v); /* 723 */
+   void (GLAPIENTRYP SecondaryColor3ubEXT)(GLubyte red, GLubyte green, GLubyte blue); /* 724 */
+   void (GLAPIENTRYP SecondaryColor3ubvEXT)(const GLubyte * v); /* 725 */
+   void (GLAPIENTRYP SecondaryColor3uiEXT)(GLuint red, GLuint green, GLuint blue); /* 726 */
+   void (GLAPIENTRYP SecondaryColor3uivEXT)(const GLuint * v); /* 727 */
+   void (GLAPIENTRYP SecondaryColor3usEXT)(GLushort red, GLushort green, GLushort blue); /* 728 */
+   void (GLAPIENTRYP SecondaryColor3usvEXT)(const GLushort * v); /* 729 */
+   void (GLAPIENTRYP SecondaryColorPointerEXT)(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 730 */
+   void (GLAPIENTRYP MultiDrawArraysEXT)(GLenum mode, const GLint * first, const GLsizei * count, GLsizei primcount); /* 731 */
+   void (GLAPIENTRYP MultiDrawElementsEXT)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid ** indices, GLsizei primcount); /* 732 */
+   void (GLAPIENTRYP FogCoordPointerEXT)(GLenum type, GLsizei stride, const GLvoid * pointer); /* 733 */
+   void (GLAPIENTRYP FogCoorddEXT)(GLdouble coord); /* 734 */
+   void (GLAPIENTRYP FogCoorddvEXT)(const GLdouble * coord); /* 735 */
+   void (GLAPIENTRYP FogCoordfEXT)(GLfloat coord); /* 736 */
+   void (GLAPIENTRYP FogCoordfvEXT)(const GLfloat * coord); /* 737 */
+   void (GLAPIENTRYP PixelTexGenSGIX)(GLenum mode); /* 738 */
+   void (GLAPIENTRYP BlendFuncSeparateEXT)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); /* 739 */
+   void (GLAPIENTRYP FlushVertexArrayRangeNV)(void); /* 740 */
+   void (GLAPIENTRYP VertexArrayRangeNV)(GLsizei length, const GLvoid * pointer); /* 741 */
+   void (GLAPIENTRYP CombinerInputNV)(GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); /* 742 */
+   void (GLAPIENTRYP CombinerOutputNV)(GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum); /* 743 */
+   void (GLAPIENTRYP CombinerParameterfNV)(GLenum pname, GLfloat param); /* 744 */
+   void (GLAPIENTRYP CombinerParameterfvNV)(GLenum pname, const GLfloat * params); /* 745 */
+   void (GLAPIENTRYP CombinerParameteriNV)(GLenum pname, GLint param); /* 746 */
+   void (GLAPIENTRYP CombinerParameterivNV)(GLenum pname, const GLint * params); /* 747 */
+   void (GLAPIENTRYP FinalCombinerInputNV)(GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); /* 748 */
+   void (GLAPIENTRYP GetCombinerInputParameterfvNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat * params); /* 749 */
+   void (GLAPIENTRYP GetCombinerInputParameterivNV)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint * params); /* 750 */
+   void (GLAPIENTRYP GetCombinerOutputParameterfvNV)(GLenum stage, GLenum portion, GLenum pname, GLfloat * params); /* 751 */
+   void (GLAPIENTRYP GetCombinerOutputParameterivNV)(GLenum stage, GLenum portion, GLenum pname, GLint * params); /* 752 */
+   void (GLAPIENTRYP GetFinalCombinerInputParameterfvNV)(GLenum variable, GLenum pname, GLfloat * params); /* 753 */
+   void (GLAPIENTRYP GetFinalCombinerInputParameterivNV)(GLenum variable, GLenum pname, GLint * params); /* 754 */
+   void (GLAPIENTRYP ResizeBuffersMESA)(void); /* 755 */
+   void (GLAPIENTRYP WindowPos2dMESA)(GLdouble x, GLdouble y); /* 756 */
+   void (GLAPIENTRYP WindowPos2dvMESA)(const GLdouble * v); /* 757 */
+   void (GLAPIENTRYP WindowPos2fMESA)(GLfloat x, GLfloat y); /* 758 */
+   void (GLAPIENTRYP WindowPos2fvMESA)(const GLfloat * v); /* 759 */
+   void (GLAPIENTRYP WindowPos2iMESA)(GLint x, GLint y); /* 760 */
+   void (GLAPIENTRYP WindowPos2ivMESA)(const GLint * v); /* 761 */
+   void (GLAPIENTRYP WindowPos2sMESA)(GLshort x, GLshort y); /* 762 */
+   void (GLAPIENTRYP WindowPos2svMESA)(const GLshort * v); /* 763 */
+   void (GLAPIENTRYP WindowPos3dMESA)(GLdouble x, GLdouble y, GLdouble z); /* 764 */
+   void (GLAPIENTRYP WindowPos3dvMESA)(const GLdouble * v); /* 765 */
+   void (GLAPIENTRYP WindowPos3fMESA)(GLfloat x, GLfloat y, GLfloat z); /* 766 */
+   void (GLAPIENTRYP WindowPos3fvMESA)(const GLfloat * v); /* 767 */
+   void (GLAPIENTRYP WindowPos3iMESA)(GLint x, GLint y, GLint z); /* 768 */
+   void (GLAPIENTRYP WindowPos3ivMESA)(const GLint * v); /* 769 */
+   void (GLAPIENTRYP WindowPos3sMESA)(GLshort x, GLshort y, GLshort z); /* 770 */
+   void (GLAPIENTRYP WindowPos3svMESA)(const GLshort * v); /* 771 */
+   void (GLAPIENTRYP WindowPos4dMESA)(GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 772 */
+   void (GLAPIENTRYP WindowPos4dvMESA)(const GLdouble * v); /* 773 */
+   void (GLAPIENTRYP WindowPos4fMESA)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 774 */
+   void (GLAPIENTRYP WindowPos4fvMESA)(const GLfloat * v); /* 775 */
+   void (GLAPIENTRYP WindowPos4iMESA)(GLint x, GLint y, GLint z, GLint w); /* 776 */
+   void (GLAPIENTRYP WindowPos4ivMESA)(const GLint * v); /* 777 */
+   void (GLAPIENTRYP WindowPos4sMESA)(GLshort x, GLshort y, GLshort z, GLshort w); /* 778 */
+   void (GLAPIENTRYP WindowPos4svMESA)(const GLshort * v); /* 779 */
+   void (GLAPIENTRYP MultiModeDrawArraysIBM)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride); /* 780 */
+   void (GLAPIENTRYP MultiModeDrawElementsIBM)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride); /* 781 */
+   void (GLAPIENTRYP DeleteFencesNV)(GLsizei n, const GLuint * fences); /* 782 */
+   void (GLAPIENTRYP FinishFenceNV)(GLuint fence); /* 783 */
+   void (GLAPIENTRYP GenFencesNV)(GLsizei n, GLuint * fences); /* 784 */
+   void (GLAPIENTRYP GetFenceivNV)(GLuint fence, GLenum pname, GLint * params); /* 785 */
+   GLboolean (GLAPIENTRYP IsFenceNV)(GLuint fence); /* 786 */
+   void (GLAPIENTRYP SetFenceNV)(GLuint fence, GLenum condition); /* 787 */
+   GLboolean (GLAPIENTRYP TestFenceNV)(GLuint fence); /* 788 */
+   GLboolean (GLAPIENTRYP AreProgramsResidentNV)(GLsizei n, const GLuint * ids, GLboolean * residences); /* 789 */
+   void (GLAPIENTRYP BindProgramNV)(GLenum target, GLuint program); /* 790 */
+   void (GLAPIENTRYP DeleteProgramsNV)(GLsizei n, const GLuint * programs); /* 791 */
+   void (GLAPIENTRYP ExecuteProgramNV)(GLenum target, GLuint id, const GLfloat * params); /* 792 */
+   void (GLAPIENTRYP GenProgramsNV)(GLsizei n, GLuint * programs); /* 793 */
+   void (GLAPIENTRYP GetProgramParameterdvNV)(GLenum target, GLuint index, GLenum pname, GLdouble * params); /* 794 */
+   void (GLAPIENTRYP GetProgramParameterfvNV)(GLenum target, GLuint index, GLenum pname, GLfloat * params); /* 795 */
+   void (GLAPIENTRYP GetProgramStringNV)(GLuint id, GLenum pname, GLubyte * program); /* 796 */
+   void (GLAPIENTRYP GetProgramivNV)(GLuint id, GLenum pname, GLint * params); /* 797 */
+   void (GLAPIENTRYP GetTrackMatrixivNV)(GLenum target, GLuint address, GLenum pname, GLint * params); /* 798 */
+   void (GLAPIENTRYP GetVertexAttribPointervNV)(GLuint index, GLenum pname, GLvoid ** pointer); /* 799 */
+   void (GLAPIENTRYP GetVertexAttribdvNV)(GLuint index, GLenum pname, GLdouble * params); /* 800 */
+   void (GLAPIENTRYP GetVertexAttribfvNV)(GLuint index, GLenum pname, GLfloat * params); /* 801 */
+   void (GLAPIENTRYP GetVertexAttribivNV)(GLuint index, GLenum pname, GLint * params); /* 802 */
+   GLboolean (GLAPIENTRYP IsProgramNV)(GLuint program); /* 803 */
+   void (GLAPIENTRYP LoadProgramNV)(GLenum target, GLuint id, GLsizei len, const GLubyte * program); /* 804 */
+   void (GLAPIENTRYP ProgramParameters4dvNV)(GLenum target, GLuint index, GLsizei num, const GLdouble * params); /* 805 */
+   void (GLAPIENTRYP ProgramParameters4fvNV)(GLenum target, GLuint index, GLsizei num, const GLfloat * params); /* 806 */
+   void (GLAPIENTRYP RequestResidentProgramsNV)(GLsizei n, const GLuint * ids); /* 807 */
+   void (GLAPIENTRYP TrackMatrixNV)(GLenum target, GLuint address, GLenum matrix, GLenum transform); /* 808 */
+   void (GLAPIENTRYP VertexAttrib1dNV)(GLuint index, GLdouble x); /* 809 */
+   void (GLAPIENTRYP VertexAttrib1dvNV)(GLuint index, const GLdouble * v); /* 810 */
+   void (GLAPIENTRYP VertexAttrib1fNV)(GLuint index, GLfloat x); /* 811 */
+   void (GLAPIENTRYP VertexAttrib1fvNV)(GLuint index, const GLfloat * v); /* 812 */
+   void (GLAPIENTRYP VertexAttrib1sNV)(GLuint index, GLshort x); /* 813 */
+   void (GLAPIENTRYP VertexAttrib1svNV)(GLuint index, const GLshort * v); /* 814 */
+   void (GLAPIENTRYP VertexAttrib2dNV)(GLuint index, GLdouble x, GLdouble y); /* 815 */
+   void (GLAPIENTRYP VertexAttrib2dvNV)(GLuint index, const GLdouble * v); /* 816 */
+   void (GLAPIENTRYP VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y); /* 817 */
+   void (GLAPIENTRYP VertexAttrib2fvNV)(GLuint index, const GLfloat * v); /* 818 */
+   void (GLAPIENTRYP VertexAttrib2sNV)(GLuint index, GLshort x, GLshort y); /* 819 */
+   void (GLAPIENTRYP VertexAttrib2svNV)(GLuint index, const GLshort * v); /* 820 */
+   void (GLAPIENTRYP VertexAttrib3dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z); /* 821 */
+   void (GLAPIENTRYP VertexAttrib3dvNV)(GLuint index, const GLdouble * v); /* 822 */
+   void (GLAPIENTRYP VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z); /* 823 */
+   void (GLAPIENTRYP VertexAttrib3fvNV)(GLuint index, const GLfloat * v); /* 824 */
+   void (GLAPIENTRYP VertexAttrib3sNV)(GLuint index, GLshort x, GLshort y, GLshort z); /* 825 */
+   void (GLAPIENTRYP VertexAttrib3svNV)(GLuint index, const GLshort * v); /* 826 */
+   void (GLAPIENTRYP VertexAttrib4dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 827 */
+   void (GLAPIENTRYP VertexAttrib4dvNV)(GLuint index, const GLdouble * v); /* 828 */
+   void (GLAPIENTRYP VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 829 */
+   void (GLAPIENTRYP VertexAttrib4fvNV)(GLuint index, const GLfloat * v); /* 830 */
+   void (GLAPIENTRYP VertexAttrib4sNV)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); /* 831 */
+   void (GLAPIENTRYP VertexAttrib4svNV)(GLuint index, const GLshort * v); /* 832 */
+   void (GLAPIENTRYP VertexAttrib4ubNV)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); /* 833 */
+   void (GLAPIENTRYP VertexAttrib4ubvNV)(GLuint index, const GLubyte * v); /* 834 */
+   void (GLAPIENTRYP VertexAttribPointerNV)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 835 */
+   void (GLAPIENTRYP VertexAttribs1dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 836 */
+   void (GLAPIENTRYP VertexAttribs1fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 837 */
+   void (GLAPIENTRYP VertexAttribs1svNV)(GLuint index, GLsizei n, const GLshort * v); /* 838 */
+   void (GLAPIENTRYP VertexAttribs2dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 839 */
+   void (GLAPIENTRYP VertexAttribs2fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 840 */
+   void (GLAPIENTRYP VertexAttribs2svNV)(GLuint index, GLsizei n, const GLshort * v); /* 841 */
+   void (GLAPIENTRYP VertexAttribs3dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 842 */
+   void (GLAPIENTRYP VertexAttribs3fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 843 */
+   void (GLAPIENTRYP VertexAttribs3svNV)(GLuint index, GLsizei n, const GLshort * v); /* 844 */
+   void (GLAPIENTRYP VertexAttribs4dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 845 */
+   void (GLAPIENTRYP VertexAttribs4fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 846 */
+   void (GLAPIENTRYP VertexAttribs4svNV)(GLuint index, GLsizei n, const GLshort * v); /* 847 */
+   void (GLAPIENTRYP VertexAttribs4ubvNV)(GLuint index, GLsizei n, const GLubyte * v); /* 848 */
+   void (GLAPIENTRYP GetTexBumpParameterfvATI)(GLenum pname, GLfloat * param); /* 849 */
+   void (GLAPIENTRYP GetTexBumpParameterivATI)(GLenum pname, GLint * param); /* 850 */
+   void (GLAPIENTRYP TexBumpParameterfvATI)(GLenum pname, const GLfloat * param); /* 851 */
+   void (GLAPIENTRYP TexBumpParameterivATI)(GLenum pname, const GLint * param); /* 852 */
+   void (GLAPIENTRYP AlphaFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 853 */
+   void (GLAPIENTRYP AlphaFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 854 */
+   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); /* 855 */
+   void (GLAPIENTRYP BeginFragmentShaderATI)(void); /* 856 */
+   void (GLAPIENTRYP BindFragmentShaderATI)(GLuint id); /* 857 */
+   void (GLAPIENTRYP ColorFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 858 */
+   void (GLAPIENTRYP ColorFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 859 */
+   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); /* 860 */
+   void (GLAPIENTRYP DeleteFragmentShaderATI)(GLuint id); /* 861 */
+   void (GLAPIENTRYP EndFragmentShaderATI)(void); /* 862 */
+   GLuint (GLAPIENTRYP GenFragmentShadersATI)(GLuint range); /* 863 */
+   void (GLAPIENTRYP PassTexCoordATI)(GLuint dst, GLuint coord, GLenum swizzle); /* 864 */
+   void (GLAPIENTRYP SampleMapATI)(GLuint dst, GLuint interp, GLenum swizzle); /* 865 */
+   void (GLAPIENTRYP SetFragmentShaderConstantATI)(GLuint dst, const GLfloat * value); /* 866 */
+   void (GLAPIENTRYP PointParameteriNV)(GLenum pname, GLint param); /* 867 */
+   void (GLAPIENTRYP PointParameterivNV)(GLenum pname, const GLint * params); /* 868 */
+   void (GLAPIENTRYP ActiveStencilFaceEXT)(GLenum face); /* 869 */
+   void (GLAPIENTRYP BindVertexArrayAPPLE)(GLuint array); /* 870 */
+   void (GLAPIENTRYP DeleteVertexArraysAPPLE)(GLsizei n, const GLuint * arrays); /* 871 */
+   void (GLAPIENTRYP GenVertexArraysAPPLE)(GLsizei n, GLuint * arrays); /* 872 */
+   GLboolean (GLAPIENTRYP IsVertexArrayAPPLE)(GLuint array); /* 873 */
+   void (GLAPIENTRYP GetProgramNamedParameterdvNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble * params); /* 874 */
+   void (GLAPIENTRYP GetProgramNamedParameterfvNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat * params); /* 875 */
+   void (GLAPIENTRYP ProgramNamedParameter4dNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 876 */
+   void (GLAPIENTRYP ProgramNamedParameter4dvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLdouble * v); /* 877 */
+   void (GLAPIENTRYP ProgramNamedParameter4fNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 878 */
+   void (GLAPIENTRYP ProgramNamedParameter4fvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLfloat * v); /* 879 */
+   void (GLAPIENTRYP PrimitiveRestartIndexNV)(GLuint index); /* 880 */
+   void (GLAPIENTRYP PrimitiveRestartNV)(void); /* 881 */
+   void (GLAPIENTRYP DepthBoundsEXT)(GLclampd zmin, GLclampd zmax); /* 882 */
+   void (GLAPIENTRYP BlendEquationSeparateEXT)(GLenum modeRGB, GLenum modeA); /* 883 */
+   void (GLAPIENTRYP BindFramebufferEXT)(GLenum target, GLuint framebuffer); /* 884 */
+   void (GLAPIENTRYP BindRenderbufferEXT)(GLenum target, GLuint renderbuffer); /* 885 */
+   GLenum (GLAPIENTRYP CheckFramebufferStatusEXT)(GLenum target); /* 886 */
+   void (GLAPIENTRYP DeleteFramebuffersEXT)(GLsizei n, const GLuint * framebuffers); /* 887 */
+   void (GLAPIENTRYP DeleteRenderbuffersEXT)(GLsizei n, const GLuint * renderbuffers); /* 888 */
+   void (GLAPIENTRYP FramebufferRenderbufferEXT)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); /* 889 */
+   void (GLAPIENTRYP FramebufferTexture1DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 890 */
+   void (GLAPIENTRYP FramebufferTexture2DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 891 */
+   void (GLAPIENTRYP FramebufferTexture3DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); /* 892 */
+   void (GLAPIENTRYP GenFramebuffersEXT)(GLsizei n, GLuint * framebuffers); /* 893 */
+   void (GLAPIENTRYP GenRenderbuffersEXT)(GLsizei n, GLuint * renderbuffers); /* 894 */
+   void (GLAPIENTRYP GenerateMipmapEXT)(GLenum target); /* 895 */
+   void (GLAPIENTRYP GetFramebufferAttachmentParameterivEXT)(GLenum target, GLenum attachment, GLenum pname, GLint * params); /* 896 */
+   void (GLAPIENTRYP GetRenderbufferParameterivEXT)(GLenum target, GLenum pname, GLint * params); /* 897 */
+   GLboolean (GLAPIENTRYP IsFramebufferEXT)(GLuint framebuffer); /* 898 */
+   GLboolean (GLAPIENTRYP IsRenderbufferEXT)(GLuint renderbuffer); /* 899 */
+   void (GLAPIENTRYP RenderbufferStorageEXT)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height); /* 900 */
+   void (GLAPIENTRYP BlitFramebufferEXT)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); /* 901 */
+   void (GLAPIENTRYP BufferParameteriAPPLE)(GLenum target, GLenum pname, GLint param); /* 902 */
+   void (GLAPIENTRYP FlushMappedBufferRangeAPPLE)(GLenum target, GLintptr offset, GLsizeiptr size); /* 903 */
+   void (GLAPIENTRYP BindFragDataLocationEXT)(GLuint program, GLuint colorNumber, const GLchar * name); /* 904 */
+   GLint (GLAPIENTRYP GetFragDataLocationEXT)(GLuint program, const GLchar * name); /* 905 */
+   void (GLAPIENTRYP GetUniformuivEXT)(GLuint program, GLint location, GLuint * params); /* 906 */
+   void (GLAPIENTRYP GetVertexAttribIivEXT)(GLuint index, GLenum pname, GLint * params); /* 907 */
+   void (GLAPIENTRYP GetVertexAttribIuivEXT)(GLuint index, GLenum pname, GLuint * params); /* 908 */
+   void (GLAPIENTRYP Uniform1uiEXT)(GLint location, GLuint x); /* 909 */
+   void (GLAPIENTRYP Uniform1uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 910 */
+   void (GLAPIENTRYP Uniform2uiEXT)(GLint location, GLuint x, GLuint y); /* 911 */
+   void (GLAPIENTRYP Uniform2uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 912 */
+   void (GLAPIENTRYP Uniform3uiEXT)(GLint location, GLuint x, GLuint y, GLuint z); /* 913 */
+   void (GLAPIENTRYP Uniform3uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 914 */
+   void (GLAPIENTRYP Uniform4uiEXT)(GLint location, GLuint x, GLuint y, GLuint z, GLuint w); /* 915 */
+   void (GLAPIENTRYP Uniform4uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 916 */
+   void (GLAPIENTRYP VertexAttribI1iEXT)(GLuint index, GLint x); /* 917 */
+   void (GLAPIENTRYP VertexAttribI1ivEXT)(GLuint index, const GLint * v); /* 918 */
+   void (GLAPIENTRYP VertexAttribI1uiEXT)(GLuint index, GLuint x); /* 919 */
+   void (GLAPIENTRYP VertexAttribI1uivEXT)(GLuint index, const GLuint * v); /* 920 */
+   void (GLAPIENTRYP VertexAttribI2iEXT)(GLuint index, GLint x, GLint y); /* 921 */
+   void (GLAPIENTRYP VertexAttribI2ivEXT)(GLuint index, const GLint * v); /* 922 */
+   void (GLAPIENTRYP VertexAttribI2uiEXT)(GLuint index, GLuint x, GLuint y); /* 923 */
+   void (GLAPIENTRYP VertexAttribI2uivEXT)(GLuint index, const GLuint * v); /* 924 */
+   void (GLAPIENTRYP VertexAttribI3iEXT)(GLuint index, GLint x, GLint y, GLint z); /* 925 */
+   void (GLAPIENTRYP VertexAttribI3ivEXT)(GLuint index, const GLint * v); /* 926 */
+   void (GLAPIENTRYP VertexAttribI3uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z); /* 927 */
+   void (GLAPIENTRYP VertexAttribI3uivEXT)(GLuint index, const GLuint * v); /* 928 */
+   void (GLAPIENTRYP VertexAttribI4bvEXT)(GLuint index, const GLbyte * v); /* 929 */
+   void (GLAPIENTRYP VertexAttribI4iEXT)(GLuint index, GLint x, GLint y, GLint z, GLint w); /* 930 */
+   void (GLAPIENTRYP VertexAttribI4ivEXT)(GLuint index, const GLint * v); /* 931 */
+   void (GLAPIENTRYP VertexAttribI4svEXT)(GLuint index, const GLshort * v); /* 932 */
+   void (GLAPIENTRYP VertexAttribI4ubvEXT)(GLuint index, const GLubyte * v); /* 933 */
+   void (GLAPIENTRYP VertexAttribI4uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); /* 934 */
+   void (GLAPIENTRYP VertexAttribI4uivEXT)(GLuint index, const GLuint * v); /* 935 */
+   void (GLAPIENTRYP VertexAttribI4usvEXT)(GLuint index, const GLushort * v); /* 936 */
+   void (GLAPIENTRYP VertexAttribIPointerEXT)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 937 */
+   void (GLAPIENTRYP FramebufferTextureLayerEXT)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); /* 938 */
+   void (GLAPIENTRYP ColorMaskIndexedEXT)(GLuint buf, GLboolean r, GLboolean g, GLboolean b, GLboolean a); /* 939 */
+   void (GLAPIENTRYP DisableIndexedEXT)(GLenum target, GLuint index); /* 940 */
+   void (GLAPIENTRYP EnableIndexedEXT)(GLenum target, GLuint index); /* 941 */
+   void (GLAPIENTRYP GetBooleanIndexedvEXT)(GLenum value, GLuint index, GLboolean * data); /* 942 */
+   void (GLAPIENTRYP GetIntegerIndexedvEXT)(GLenum value, GLuint index, GLint * data); /* 943 */
+   GLboolean (GLAPIENTRYP IsEnabledIndexedEXT)(GLenum target, GLuint index); /* 944 */
+   void (GLAPIENTRYP ClearColorIiEXT)(GLint r, GLint g, GLint b, GLint a); /* 945 */
+   void (GLAPIENTRYP ClearColorIuiEXT)(GLuint r, GLuint g, GLuint b, GLuint a); /* 946 */
+   void (GLAPIENTRYP GetTexParameterIivEXT)(GLenum target, GLenum pname, GLint * params); /* 947 */
+   void (GLAPIENTRYP GetTexParameterIuivEXT)(GLenum target, GLenum pname, GLuint * params); /* 948 */
+   void (GLAPIENTRYP TexParameterIivEXT)(GLenum target, GLenum pname, const GLint * params); /* 949 */
+   void (GLAPIENTRYP TexParameterIuivEXT)(GLenum target, GLenum pname, const GLuint * params); /* 950 */
+   void (GLAPIENTRYP BeginConditionalRenderNV)(GLuint query, GLenum mode); /* 951 */
+   void (GLAPIENTRYP EndConditionalRenderNV)(void); /* 952 */
+   void (GLAPIENTRYP BeginTransformFeedbackEXT)(GLenum mode); /* 953 */
+   void (GLAPIENTRYP BindBufferBaseEXT)(GLenum target, GLuint index, GLuint buffer); /* 954 */
+   void (GLAPIENTRYP BindBufferOffsetEXT)(GLenum target, GLuint index, GLuint buffer, GLintptr offset); /* 955 */
+   void (GLAPIENTRYP BindBufferRangeEXT)(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); /* 956 */
+   void (GLAPIENTRYP EndTransformFeedbackEXT)(void); /* 957 */
+   void (GLAPIENTRYP GetTransformFeedbackVaryingEXT)(GLuint program, GLuint index, GLsizei bufSize, GLsizei * length, GLsizei * size, GLenum * type, GLchar * name); /* 958 */
+   void (GLAPIENTRYP TransformFeedbackVaryingsEXT)(GLuint program, GLsizei count, const char ** varyings, GLenum bufferMode); /* 959 */
+   void (GLAPIENTRYP ProvokingVertexEXT)(GLenum mode); /* 960 */
+   void (GLAPIENTRYP GetTexParameterPointervAPPLE)(GLenum target, GLenum pname, GLvoid ** params); /* 961 */
+   void (GLAPIENTRYP TextureRangeAPPLE)(GLenum target, GLsizei length, GLvoid * pointer); /* 962 */
+   void (GLAPIENTRYP GetObjectParameterivAPPLE)(GLenum objectType, GLuint name, GLenum pname, GLint * value); /* 963 */
+   GLenum (GLAPIENTRYP ObjectPurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 964 */
+   GLenum (GLAPIENTRYP ObjectUnpurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 965 */
+   void (GLAPIENTRYP ActiveProgramEXT)(GLuint program); /* 966 */
+   GLuint (GLAPIENTRYP CreateShaderProgramEXT)(GLenum type, const GLchar * string); /* 967 */
+   void (GLAPIENTRYP UseShaderProgramEXT)(GLenum type, GLuint program); /* 968 */
+   void (GLAPIENTRYP TextureBarrierNV)(void); /* 969 */
+   void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 970 */
+   void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 971 */
+   void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 972 */
+   void (GLAPIENTRYP GetQueryObjecti64vEXT)(GLuint id, GLenum pname, GLint64EXT * params); /* 973 */
+   void (GLAPIENTRYP GetQueryObjectui64vEXT)(GLuint id, GLenum pname, GLuint64EXT * params); /* 974 */
+   void (GLAPIENTRYP EGLImageTargetRenderbufferStorageOES)(GLenum target, GLvoid * writeOffset); /* 975 */
+   void (GLAPIENTRYP EGLImageTargetTexture2DOES)(GLenum target, GLvoid * writeOffset); /* 976 */
 };
 
 #endif /* !defined( _GLAPI_TABLE_H_ ) */
diff --git a/mesalib/src/mapi/glapi/glapitemp.h b/mesalib/src/mapi/glapi/glapitemp.h
index a421d72c9..b018c7573 100644
--- a/mesalib/src/mapi/glapi/glapitemp.h
+++ b/mesalib/src/mapi/glapi/glapitemp.h
@@ -5253,6 +5253,30 @@ KEYWORD1 void KEYWORD2 NAME(ShaderBinary)(GLsizei n, const GLuint * shaders, GLe
    DISPATCH(ShaderBinary, (n, shaders, binaryformat, binary, length), (F, "glShaderBinary(%d, %p, 0x%x, %p, %d);\n", n, (const void *) shaders, binaryformat, (const void *) binary, length));
 }
 
+KEYWORD1 void KEYWORD2 NAME(DebugMessageCallbackARB)(GLDEBUGPROCARB callback, GLvoid * userParam)
+{
+    (void) callback; (void) userParam;
+   DISPATCH(DebugMessageCallbackARB, (callback, userParam), (F, "glDebugMessageCallbackARB(%p, %p);\n", (const void *) callback, (const void *) userParam));
+}
+
+KEYWORD1 void KEYWORD2 NAME(DebugMessageControlARB)(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint * ids, GLboolean enabled)
+{
+    (void) source; (void) type; (void) severity; (void) count; (void) ids; (void) enabled;
+   DISPATCH(DebugMessageControlARB, (source, type, severity, count, ids, enabled), (F, "glDebugMessageControlARB(0x%x, 0x%x, 0x%x, %d, %p, %d);\n", source, type, severity, count, (const void *) ids, enabled));
+}
+
+KEYWORD1 void KEYWORD2 NAME(DebugMessageInsertARB)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLcharARB * buf)
+{
+    (void) source; (void) type; (void) id; (void) severity; (void) length; (void) buf;
+   DISPATCH(DebugMessageInsertARB, (source, type, id, severity, length, buf), (F, "glDebugMessageInsertARB(0x%x, 0x%x, %d, 0x%x, %d, %p);\n", source, type, id, severity, length, (const void *) buf));
+}
+
+KEYWORD1 GLuint KEYWORD2 NAME(GetDebugMessageLogARB)(GLuint count, GLsizei bufsize, GLenum * sources, GLenum * types, GLuint * ids, GLenum * severities, GLsizei * lengths, GLcharARB * messageLog)
+{
+    (void) count; (void) bufsize; (void) sources; (void) types; (void) ids; (void) severities; (void) lengths; (void) messageLog;
+   RETURN_DISPATCH(GetDebugMessageLogARB, (count, bufsize, sources, types, ids, severities, lengths, messageLog), (F, "glGetDebugMessageLogARB(%d, %d, %p, %p, %p, %p, %p, %p);\n", count, bufsize, (const void *) sources, (const void *) types, (const void *) ids, (const void *) severities, (const void *) lengths, (const void *) messageLog));
+}
+
 KEYWORD1 GLenum KEYWORD2 NAME(GetGraphicsResetStatusARB)(void)
 {
    RETURN_DISPATCH(GetGraphicsResetStatusARB, (), (F, "glGetGraphicsResetStatusARB();\n"));
@@ -5414,65 +5438,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_692)(GLenum pname, GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_696)(GLenum pname, GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_692)(GLenum pname, GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_696)(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_693)(GLenum pname, GLint * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_697)(GLenum pname, GLint * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_693)(GLenum pname, GLint * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_697)(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_694)(GLenum pname, GLfloat param);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_698)(GLenum pname, GLfloat param);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_694)(GLenum pname, GLfloat param)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_698)(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_695)(GLenum pname, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_699)(GLenum pname, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_695)(GLenum pname, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_699)(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_696)(GLenum pname, GLint param);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_700)(GLenum pname, GLint param);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_696)(GLenum pname, GLint param)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_700)(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_697)(GLenum pname, const GLint * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_701)(GLenum pname, const GLint * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_697)(GLenum pname, const GLint * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_701)(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_698)(GLclampf value, GLboolean invert);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_702)(GLclampf value, GLboolean invert);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_698)(GLclampf value, GLboolean invert)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_702)(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_699)(GLenum pattern);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_703)(GLenum pattern);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_699)(GLenum pattern)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_703)(GLenum pattern)
 {
     (void) pattern;
    DISPATCH(SamplePatternSGIS, (pattern), (F, "glSamplePatternSGIS(0x%x);\n", pattern));
@@ -5532,9 +5556,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_706)(GLenum pname, GLfloat param);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_710)(GLenum pname, GLfloat param);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_706)(GLenum pname, GLfloat param)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_710)(GLenum pname, GLfloat param)
 {
     (void) pname; (void) param;
    DISPATCH(PointParameterfEXT, (pname, param), (F, "glPointParameterfSGIS(0x%x, %f);\n", pname, param));
@@ -5558,9 +5582,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_707)(GLenum pname, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_711)(GLenum pname, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_707)(GLenum pname, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_711)(GLenum pname, const GLfloat * params)
 {
     (void) pname; (void) params;
    DISPATCH(PointParameterfvEXT, (pname, params), (F, "glPointParameterfvSGIS(0x%x, %p);\n", pname, (const void *) params));
@@ -5865,9 +5889,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_734)(GLenum mode);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_738)(GLenum mode);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_734)(GLenum mode)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_738)(GLenum mode)
 {
     (void) mode;
    DISPATCH(PixelTexGenSGIX, (mode), (F, "glPixelTexGenSGIX(0x%x);\n", mode));
@@ -5885,9 +5909,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_735)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_739)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_735)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_739)(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));
@@ -6323,73 +6347,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_776)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_780)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_776)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_780)(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_777)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_781)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_777)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_781)(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_778)(GLsizei n, const GLuint * fences);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_782)(GLsizei n, const GLuint * fences);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_778)(GLsizei n, const GLuint * fences)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_782)(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_779)(GLuint fence);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_783)(GLuint fence);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_779)(GLuint fence)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_783)(GLuint fence)
 {
     (void) fence;
    DISPATCH(FinishFenceNV, (fence), (F, "glFinishFenceNV(%d);\n", fence));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_780)(GLsizei n, GLuint * fences);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_784)(GLsizei n, GLuint * fences);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_780)(GLsizei n, GLuint * fences)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_784)(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_781)(GLuint fence, GLenum pname, GLint * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_785)(GLuint fence, GLenum pname, GLint * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_781)(GLuint fence, GLenum pname, GLint * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_785)(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_782)(GLuint fence);
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_786)(GLuint fence);
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_782)(GLuint fence)
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_786)(GLuint fence)
 {
     (void) fence;
    RETURN_DISPATCH(IsFenceNV, (fence), (F, "glIsFenceNV(%d);\n", fence));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_783)(GLuint fence, GLenum condition);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_787)(GLuint fence, GLenum condition);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_783)(GLuint fence, GLenum condition)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_787)(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_784)(GLuint fence);
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_788)(GLuint fence);
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_784)(GLuint fence)
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_788)(GLuint fence)
 {
     (void) fence;
    RETURN_DISPATCH(TestFenceNV, (fence), (F, "glTestFenceNV(%d);\n", fence));
@@ -6921,17 +6945,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_865)(GLenum face);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_869)(GLenum face);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_865)(GLenum face)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_869)(GLenum face)
 {
     (void) face;
    DISPATCH(ActiveStencilFaceEXT, (face), (F, "glActiveStencilFaceEXT(0x%x);\n", face));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_866)(GLuint array);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_870)(GLuint array);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_866)(GLuint array)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_870)(GLuint array)
 {
     (void) array;
    DISPATCH(BindVertexArrayAPPLE, (array), (F, "glBindVertexArrayAPPLE(%d);\n", array));
@@ -6943,17 +6967,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_867)(GLsizei n, const GLuint * arrays);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_871)(GLsizei n, const GLuint * arrays);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_867)(GLsizei n, const GLuint * arrays)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_871)(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_868)(GLsizei n, GLuint * arrays);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_872)(GLsizei n, GLuint * arrays);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_868)(GLsizei n, GLuint * arrays)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_872)(GLsizei n, GLuint * arrays)
 {
     (void) n; (void) arrays;
    DISPATCH(GenVertexArraysAPPLE, (n, arrays), (F, "glGenVertexArraysAPPLE(%d, %p);\n", n, (const void *) arrays));
@@ -6965,9 +6989,9 @@ KEYWORD1 GLboolean KEYWORD2 NAME(IsVertexArray)(GLuint array)
    RETURN_DISPATCH(IsVertexArrayAPPLE, (array), (F, "glIsVertexArray(%d);\n", array));
 }
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_869)(GLuint array);
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_873)(GLuint array);
 
-KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_869)(GLuint array)
+KEYWORD1_ALT GLboolean KEYWORD2 NAME(_dispatch_stub_873)(GLuint array)
 {
     (void) array;
    RETURN_DISPATCH(IsVertexArrayAPPLE, (array), (F, "glIsVertexArrayAPPLE(%d);\n", array));
@@ -7026,9 +7050,9 @@ KEYWORD1 void KEYWORD2 NAME(PrimitiveRestartNV)(void)
    DISPATCH(PrimitiveRestartNV, (), (F, "glPrimitiveRestartNV();\n"));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_878)(GLclampd zmin, GLclampd zmax);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_882)(GLclampd zmin, GLclampd zmax);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_878)(GLclampd zmin, GLclampd zmax)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_882)(GLclampd zmin, GLclampd zmax)
 {
     (void) zmin; (void) zmax;
    DISPATCH(DepthBoundsEXT, (zmin, zmax), (F, "glDepthBoundsEXT(%f, %f);\n", zmin, zmax));
@@ -7040,9 +7064,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_879)(GLenum modeRGB, GLenum modeA);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_883)(GLenum modeRGB, GLenum modeA);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_879)(GLenum modeRGB, GLenum modeA)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_883)(GLenum modeRGB, GLenum modeA)
 {
     (void) modeRGB; (void) modeA;
    DISPATCH(BlendEquationSeparateEXT, (modeRGB, modeA), (F, "glBlendEquationSeparateEXT(0x%x, 0x%x);\n", modeRGB, modeA));
@@ -7258,25 +7282,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_897)(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_901)(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_897)(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_901)(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_898)(GLenum target, GLenum pname, GLint param);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_902)(GLenum target, GLenum pname, GLint param);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_898)(GLenum target, GLenum pname, GLint param)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_902)(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_899)(GLenum target, GLintptr offset, GLsizeiptr size);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_903)(GLenum target, GLintptr offset, GLsizeiptr size);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_899)(GLenum target, GLintptr offset, GLsizeiptr size)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_903)(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));
@@ -7950,17 +7974,17 @@ KEYWORD1 void KEYWORD2 NAME(ProvokingVertex)(GLenum mode)
    DISPATCH(ProvokingVertexEXT, (mode), (F, "glProvokingVertex(0x%x);\n", mode));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_957)(GLenum target, GLenum pname, GLvoid ** params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_961)(GLenum target, GLenum pname, GLvoid ** params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_957)(GLenum target, GLenum pname, GLvoid ** params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_961)(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_958)(GLenum target, GLsizei length, GLvoid * pointer);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_962)(GLenum target, GLsizei length, GLvoid * pointer);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_958)(GLenum target, GLsizei length, GLvoid * pointer)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_962)(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));
@@ -8007,41 +8031,41 @@ KEYWORD1 void KEYWORD2 NAME(TextureBarrierNV)(void)
    DISPATCH(TextureBarrierNV, (), (F, "glTextureBarrierNV();\n"));
 }
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_966)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_970)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_966)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_970)(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_967)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_971)(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_967)(GLenum target, GLuint index, GLsizei count, const GLfloat * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_971)(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_968)(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_968)(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(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_969)(GLuint id, GLenum pname, GLint64EXT * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_973)(GLuint id, GLenum pname, GLint64EXT * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_969)(GLuint id, GLenum pname, GLint64EXT * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_973)(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_970)(GLuint id, GLenum pname, GLuint64EXT * params);
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_974)(GLuint id, GLenum pname, GLuint64EXT * params);
 
-KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_970)(GLuint id, GLenum pname, GLuint64EXT * params)
+KEYWORD1_ALT void KEYWORD2 NAME(_dispatch_stub_974)(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));
@@ -8897,6 +8921,10 @@ _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(GetShaderPrecisionFormat),
    TABLE_ENTRY(ReleaseShaderCompiler),
    TABLE_ENTRY(ShaderBinary),
+   TABLE_ENTRY(DebugMessageCallbackARB),
+   TABLE_ENTRY(DebugMessageControlARB),
+   TABLE_ENTRY(DebugMessageInsertARB),
+   TABLE_ENTRY(GetDebugMessageLogARB),
    TABLE_ENTRY(GetGraphicsResetStatusARB),
    TABLE_ENTRY(GetnColorTableARB),
    TABLE_ENTRY(GetnCompressedTexImageARB),
@@ -8924,14 +8952,14 @@ _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(TextureStorage2DEXT),
    TABLE_ENTRY(TextureStorage3DEXT),
    TABLE_ENTRY(PolygonOffsetEXT),
-   TABLE_ENTRY(_dispatch_stub_692),
-   TABLE_ENTRY(_dispatch_stub_693),
-   TABLE_ENTRY(_dispatch_stub_694),
-   TABLE_ENTRY(_dispatch_stub_695),
    TABLE_ENTRY(_dispatch_stub_696),
    TABLE_ENTRY(_dispatch_stub_697),
    TABLE_ENTRY(_dispatch_stub_698),
    TABLE_ENTRY(_dispatch_stub_699),
+   TABLE_ENTRY(_dispatch_stub_700),
+   TABLE_ENTRY(_dispatch_stub_701),
+   TABLE_ENTRY(_dispatch_stub_702),
+   TABLE_ENTRY(_dispatch_stub_703),
    TABLE_ENTRY(ColorPointerEXT),
    TABLE_ENTRY(EdgeFlagPointerEXT),
    TABLE_ENTRY(IndexPointerEXT),
@@ -8966,7 +8994,7 @@ _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(FogCoorddvEXT),
    TABLE_ENTRY(FogCoordfEXT),
    TABLE_ENTRY(FogCoordfvEXT),
-   TABLE_ENTRY(_dispatch_stub_734),
+   TABLE_ENTRY(_dispatch_stub_738),
    TABLE_ENTRY(BlendFuncSeparateEXT),
    TABLE_ENTRY(FlushVertexArrayRangeNV),
    TABLE_ENTRY(VertexArrayRangeNV),
@@ -9008,15 +9036,15 @@ _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(WindowPos4ivMESA),
    TABLE_ENTRY(WindowPos4sMESA),
    TABLE_ENTRY(WindowPos4svMESA),
-   TABLE_ENTRY(_dispatch_stub_776),
-   TABLE_ENTRY(_dispatch_stub_777),
-   TABLE_ENTRY(_dispatch_stub_778),
-   TABLE_ENTRY(_dispatch_stub_779),
    TABLE_ENTRY(_dispatch_stub_780),
    TABLE_ENTRY(_dispatch_stub_781),
    TABLE_ENTRY(_dispatch_stub_782),
    TABLE_ENTRY(_dispatch_stub_783),
    TABLE_ENTRY(_dispatch_stub_784),
+   TABLE_ENTRY(_dispatch_stub_785),
+   TABLE_ENTRY(_dispatch_stub_786),
+   TABLE_ENTRY(_dispatch_stub_787),
+   TABLE_ENTRY(_dispatch_stub_788),
    TABLE_ENTRY(AreProgramsResidentNV),
    TABLE_ENTRY(BindProgramNV),
    TABLE_ENTRY(DeleteProgramsNV),
@@ -9097,11 +9125,11 @@ _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(SetFragmentShaderConstantATI),
    TABLE_ENTRY(PointParameteriNV),
    TABLE_ENTRY(PointParameterivNV),
-   TABLE_ENTRY(_dispatch_stub_865),
-   TABLE_ENTRY(_dispatch_stub_866),
-   TABLE_ENTRY(_dispatch_stub_867),
-   TABLE_ENTRY(_dispatch_stub_868),
    TABLE_ENTRY(_dispatch_stub_869),
+   TABLE_ENTRY(_dispatch_stub_870),
+   TABLE_ENTRY(_dispatch_stub_871),
+   TABLE_ENTRY(_dispatch_stub_872),
+   TABLE_ENTRY(_dispatch_stub_873),
    TABLE_ENTRY(GetProgramNamedParameterdvNV),
    TABLE_ENTRY(GetProgramNamedParameterfvNV),
    TABLE_ENTRY(ProgramNamedParameter4dNV),
@@ -9110,8 +9138,8 @@ _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(ProgramNamedParameter4fvNV),
    TABLE_ENTRY(PrimitiveRestartIndexNV),
    TABLE_ENTRY(PrimitiveRestartNV),
-   TABLE_ENTRY(_dispatch_stub_878),
-   TABLE_ENTRY(_dispatch_stub_879),
+   TABLE_ENTRY(_dispatch_stub_882),
+   TABLE_ENTRY(_dispatch_stub_883),
    TABLE_ENTRY(BindFramebufferEXT),
    TABLE_ENTRY(BindRenderbufferEXT),
    TABLE_ENTRY(CheckFramebufferStatusEXT),
@@ -9129,9 +9157,9 @@ _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(IsFramebufferEXT),
    TABLE_ENTRY(IsRenderbufferEXT),
    TABLE_ENTRY(RenderbufferStorageEXT),
-   TABLE_ENTRY(_dispatch_stub_897),
-   TABLE_ENTRY(_dispatch_stub_898),
-   TABLE_ENTRY(_dispatch_stub_899),
+   TABLE_ENTRY(_dispatch_stub_901),
+   TABLE_ENTRY(_dispatch_stub_902),
+   TABLE_ENTRY(_dispatch_stub_903),
    TABLE_ENTRY(BindFragDataLocationEXT),
    TABLE_ENTRY(GetFragDataLocationEXT),
    TABLE_ENTRY(GetUniformuivEXT),
@@ -9189,8 +9217,8 @@ _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(GetTransformFeedbackVaryingEXT),
    TABLE_ENTRY(TransformFeedbackVaryingsEXT),
    TABLE_ENTRY(ProvokingVertexEXT),
-   TABLE_ENTRY(_dispatch_stub_957),
-   TABLE_ENTRY(_dispatch_stub_958),
+   TABLE_ENTRY(_dispatch_stub_961),
+   TABLE_ENTRY(_dispatch_stub_962),
    TABLE_ENTRY(GetObjectParameterivAPPLE),
    TABLE_ENTRY(ObjectPurgeableAPPLE),
    TABLE_ENTRY(ObjectUnpurgeableAPPLE),
@@ -9198,11 +9226,11 @@ _glapi_proc DISPATCH_TABLE_NAME[] = {
    TABLE_ENTRY(CreateShaderProgramEXT),
    TABLE_ENTRY(UseShaderProgramEXT),
    TABLE_ENTRY(TextureBarrierNV),
-   TABLE_ENTRY(_dispatch_stub_966),
-   TABLE_ENTRY(_dispatch_stub_967),
-   TABLE_ENTRY(_dispatch_stub_968),
-   TABLE_ENTRY(_dispatch_stub_969),
    TABLE_ENTRY(_dispatch_stub_970),
+   TABLE_ENTRY(_dispatch_stub_971),
+   TABLE_ENTRY(_dispatch_stub_972),
+   TABLE_ENTRY(_dispatch_stub_973),
+   TABLE_ENTRY(_dispatch_stub_974),
    TABLE_ENTRY(EGLImageTargetRenderbufferStorageOES),
    TABLE_ENTRY(EGLImageTargetTexture2DOES),
    /* A whole bunch of no-op functions.  These might be called
@@ -9514,10 +9542,10 @@ _glapi_proc UNUSED_TABLE_NAME[] = {
    TABLE_ENTRY(BlendFuncIndexedAMD),
    TABLE_ENTRY(PointParameterf),
    TABLE_ENTRY(PointParameterfARB),
-   TABLE_ENTRY(_dispatch_stub_706),
+   TABLE_ENTRY(_dispatch_stub_710),
    TABLE_ENTRY(PointParameterfv),
    TABLE_ENTRY(PointParameterfvARB),
-   TABLE_ENTRY(_dispatch_stub_707),
+   TABLE_ENTRY(_dispatch_stub_711),
    TABLE_ENTRY(SecondaryColor3b),
    TABLE_ENTRY(SecondaryColor3bv),
    TABLE_ENTRY(SecondaryColor3d),
@@ -9543,7 +9571,7 @@ _glapi_proc UNUSED_TABLE_NAME[] = {
    TABLE_ENTRY(FogCoordf),
    TABLE_ENTRY(FogCoordfv),
    TABLE_ENTRY(BlendFuncSeparate),
-   TABLE_ENTRY(_dispatch_stub_735),
+   TABLE_ENTRY(_dispatch_stub_739),
    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 5227a0be8..3047d2f49 100644
--- a/mesalib/src/mapi/glapi/glprocs.h
+++ b/mesalib/src/mapi/glapi/glprocs.h
@@ -717,6 +717,10 @@ static const char gl_string_table[] =
     "glGetShaderPrecisionFormat\0"
     "glReleaseShaderCompiler\0"
     "glShaderBinary\0"
+    "glDebugMessageCallbackARB\0"
+    "glDebugMessageControlARB\0"
+    "glDebugMessageInsertARB\0"
+    "glGetDebugMessageLogARB\0"
     "glGetGraphicsResetStatusARB\0"
     "glGetnColorTableARB\0"
     "glGetnCompressedTexImageARB\0"
@@ -1407,41 +1411,41 @@ 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_692 mgl_dispatch_stub_692
-#define gl_dispatch_stub_693 mgl_dispatch_stub_693
-#define gl_dispatch_stub_694 mgl_dispatch_stub_694
-#define gl_dispatch_stub_695 mgl_dispatch_stub_695
 #define gl_dispatch_stub_696 mgl_dispatch_stub_696
 #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_734 mgl_dispatch_stub_734
-#define gl_dispatch_stub_776 mgl_dispatch_stub_776
-#define gl_dispatch_stub_777 mgl_dispatch_stub_777
-#define gl_dispatch_stub_778 mgl_dispatch_stub_778
-#define gl_dispatch_stub_779 mgl_dispatch_stub_779
+#define gl_dispatch_stub_700 mgl_dispatch_stub_700
+#define gl_dispatch_stub_701 mgl_dispatch_stub_701
+#define gl_dispatch_stub_702 mgl_dispatch_stub_702
+#define gl_dispatch_stub_703 mgl_dispatch_stub_703
+#define gl_dispatch_stub_738 mgl_dispatch_stub_738
 #define gl_dispatch_stub_780 mgl_dispatch_stub_780
 #define gl_dispatch_stub_781 mgl_dispatch_stub_781
 #define gl_dispatch_stub_782 mgl_dispatch_stub_782
 #define gl_dispatch_stub_783 mgl_dispatch_stub_783
 #define gl_dispatch_stub_784 mgl_dispatch_stub_784
-#define gl_dispatch_stub_865 mgl_dispatch_stub_865
-#define gl_dispatch_stub_866 mgl_dispatch_stub_866
-#define gl_dispatch_stub_867 mgl_dispatch_stub_867
-#define gl_dispatch_stub_868 mgl_dispatch_stub_868
+#define gl_dispatch_stub_785 mgl_dispatch_stub_785
+#define gl_dispatch_stub_786 mgl_dispatch_stub_786
+#define gl_dispatch_stub_787 mgl_dispatch_stub_787
+#define gl_dispatch_stub_788 mgl_dispatch_stub_788
 #define gl_dispatch_stub_869 mgl_dispatch_stub_869
-#define gl_dispatch_stub_878 mgl_dispatch_stub_878
-#define gl_dispatch_stub_879 mgl_dispatch_stub_879
-#define gl_dispatch_stub_897 mgl_dispatch_stub_897
-#define gl_dispatch_stub_898 mgl_dispatch_stub_898
-#define gl_dispatch_stub_899 mgl_dispatch_stub_899
-#define gl_dispatch_stub_957 mgl_dispatch_stub_957
-#define gl_dispatch_stub_958 mgl_dispatch_stub_958
-#define gl_dispatch_stub_966 mgl_dispatch_stub_966
-#define gl_dispatch_stub_967 mgl_dispatch_stub_967
-#define gl_dispatch_stub_968 mgl_dispatch_stub_968
-#define gl_dispatch_stub_969 mgl_dispatch_stub_969
+#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_882 mgl_dispatch_stub_882
+#define gl_dispatch_stub_883 mgl_dispatch_stub_883
+#define gl_dispatch_stub_901 mgl_dispatch_stub_901
+#define gl_dispatch_stub_902 mgl_dispatch_stub_902
+#define gl_dispatch_stub_903 mgl_dispatch_stub_903
+#define gl_dispatch_stub_961 mgl_dispatch_stub_961
+#define gl_dispatch_stub_962 mgl_dispatch_stub_962
 #define gl_dispatch_stub_970 mgl_dispatch_stub_970
+#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
 #endif /* USE_MGL_NAMESPACE */
 
 
@@ -1459,41 +1463,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_692(GLenum pname, GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_693(GLenum pname, GLint * params);
-void GLAPIENTRY gl_dispatch_stub_694(GLenum pname, GLfloat param);
-void GLAPIENTRY gl_dispatch_stub_695(GLenum pname, const GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_696(GLenum pname, GLint param);
-void GLAPIENTRY gl_dispatch_stub_697(GLenum pname, const GLint * params);
-void GLAPIENTRY gl_dispatch_stub_698(GLclampf value, GLboolean invert);
-void GLAPIENTRY gl_dispatch_stub_699(GLenum pattern);
-void GLAPIENTRY gl_dispatch_stub_734(GLenum mode);
-void GLAPIENTRY gl_dispatch_stub_776(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
-void GLAPIENTRY gl_dispatch_stub_777(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
-void GLAPIENTRY gl_dispatch_stub_778(GLsizei n, const GLuint * fences);
-void GLAPIENTRY gl_dispatch_stub_779(GLuint fence);
-void GLAPIENTRY gl_dispatch_stub_780(GLsizei n, GLuint * fences);
-void GLAPIENTRY gl_dispatch_stub_781(GLuint fence, GLenum pname, GLint * params);
-GLboolean GLAPIENTRY gl_dispatch_stub_782(GLuint fence);
-void GLAPIENTRY gl_dispatch_stub_783(GLuint fence, GLenum condition);
-GLboolean GLAPIENTRY gl_dispatch_stub_784(GLuint fence);
-void GLAPIENTRY gl_dispatch_stub_865(GLenum face);
-void GLAPIENTRY gl_dispatch_stub_866(GLuint array);
-void GLAPIENTRY gl_dispatch_stub_867(GLsizei n, const GLuint * arrays);
-void GLAPIENTRY gl_dispatch_stub_868(GLsizei n, GLuint * arrays);
-GLboolean GLAPIENTRY gl_dispatch_stub_869(GLuint array);
-void GLAPIENTRY gl_dispatch_stub_878(GLclampd zmin, GLclampd zmax);
-void GLAPIENTRY gl_dispatch_stub_879(GLenum modeRGB, GLenum modeA);
-void GLAPIENTRY gl_dispatch_stub_897(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_898(GLenum target, GLenum pname, GLint param);
-void GLAPIENTRY gl_dispatch_stub_899(GLenum target, GLintptr offset, GLsizeiptr size);
-void GLAPIENTRY gl_dispatch_stub_957(GLenum target, GLenum pname, GLvoid ** params);
-void GLAPIENTRY gl_dispatch_stub_958(GLenum target, GLsizei length, GLvoid * pointer);
-void GLAPIENTRY gl_dispatch_stub_966(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
-void GLAPIENTRY gl_dispatch_stub_967(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_968(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_969(GLuint id, GLenum pname, GLint64EXT * params);
-void GLAPIENTRY gl_dispatch_stub_970(GLuint id, GLenum pname, GLuint64EXT * params);
+void GLAPIENTRY gl_dispatch_stub_696(GLenum pname, GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_697(GLenum pname, GLint * params);
+void GLAPIENTRY gl_dispatch_stub_698(GLenum pname, GLfloat param);
+void GLAPIENTRY gl_dispatch_stub_699(GLenum pname, const GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_700(GLenum pname, GLint param);
+void GLAPIENTRY gl_dispatch_stub_701(GLenum pname, const GLint * params);
+void GLAPIENTRY gl_dispatch_stub_702(GLclampf value, GLboolean invert);
+void GLAPIENTRY gl_dispatch_stub_703(GLenum pattern);
+void GLAPIENTRY gl_dispatch_stub_738(GLenum mode);
+void GLAPIENTRY gl_dispatch_stub_780(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
+void GLAPIENTRY gl_dispatch_stub_781(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
+void GLAPIENTRY gl_dispatch_stub_782(GLsizei n, const GLuint * fences);
+void GLAPIENTRY gl_dispatch_stub_783(GLuint fence);
+void GLAPIENTRY gl_dispatch_stub_784(GLsizei n, GLuint * fences);
+void GLAPIENTRY gl_dispatch_stub_785(GLuint fence, GLenum pname, GLint * params);
+GLboolean GLAPIENTRY gl_dispatch_stub_786(GLuint fence);
+void GLAPIENTRY gl_dispatch_stub_787(GLuint fence, GLenum condition);
+GLboolean GLAPIENTRY gl_dispatch_stub_788(GLuint fence);
+void GLAPIENTRY gl_dispatch_stub_869(GLenum face);
+void GLAPIENTRY gl_dispatch_stub_870(GLuint array);
+void GLAPIENTRY gl_dispatch_stub_871(GLsizei n, const GLuint * arrays);
+void GLAPIENTRY gl_dispatch_stub_872(GLsizei n, GLuint * arrays);
+GLboolean GLAPIENTRY gl_dispatch_stub_873(GLuint array);
+void GLAPIENTRY gl_dispatch_stub_882(GLclampd zmin, GLclampd zmax);
+void GLAPIENTRY gl_dispatch_stub_883(GLenum modeRGB, GLenum modeA);
+void GLAPIENTRY gl_dispatch_stub_901(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_902(GLenum target, GLenum pname, GLint param);
+void GLAPIENTRY gl_dispatch_stub_903(GLenum target, GLintptr offset, GLsizeiptr size);
+void GLAPIENTRY gl_dispatch_stub_961(GLenum target, GLenum pname, GLvoid ** params);
+void GLAPIENTRY gl_dispatch_stub_962(GLenum target, GLsizei length, GLvoid * pointer);
+void GLAPIENTRY gl_dispatch_stub_970(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+void GLAPIENTRY gl_dispatch_stub_971(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_972(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
+void GLAPIENTRY gl_dispatch_stub_973(GLuint id, GLenum pname, GLint64EXT * params);
+void GLAPIENTRY gl_dispatch_stub_974(GLuint id, GLenum pname, GLuint64EXT * params);
 #endif /* defined(NEED_FUNCTION_POINTER) || defined(GLX_INDIRECT_RENDERING) */
 
 static const glprocs_table_t static_functions[] = {
@@ -2162,679 +2166,683 @@ static const glprocs_table_t static_functions[] = {
     NAME_FUNC_OFFSET(10879, glGetShaderPrecisionFormat, glGetShaderPrecisionFormat, NULL, 662),
     NAME_FUNC_OFFSET(10906, glReleaseShaderCompiler, glReleaseShaderCompiler, NULL, 663),
     NAME_FUNC_OFFSET(10930, glShaderBinary, glShaderBinary, NULL, 664),
-    NAME_FUNC_OFFSET(10945, glGetGraphicsResetStatusARB, glGetGraphicsResetStatusARB, NULL, 665),
-    NAME_FUNC_OFFSET(10973, glGetnColorTableARB, glGetnColorTableARB, NULL, 666),
-    NAME_FUNC_OFFSET(10993, glGetnCompressedTexImageARB, glGetnCompressedTexImageARB, NULL, 667),
-    NAME_FUNC_OFFSET(11021, glGetnConvolutionFilterARB, glGetnConvolutionFilterARB, NULL, 668),
-    NAME_FUNC_OFFSET(11048, glGetnHistogramARB, glGetnHistogramARB, NULL, 669),
-    NAME_FUNC_OFFSET(11067, glGetnMapdvARB, glGetnMapdvARB, NULL, 670),
-    NAME_FUNC_OFFSET(11082, glGetnMapfvARB, glGetnMapfvARB, NULL, 671),
-    NAME_FUNC_OFFSET(11097, glGetnMapivARB, glGetnMapivARB, NULL, 672),
-    NAME_FUNC_OFFSET(11112, glGetnMinmaxARB, glGetnMinmaxARB, NULL, 673),
-    NAME_FUNC_OFFSET(11128, glGetnPixelMapfvARB, glGetnPixelMapfvARB, NULL, 674),
-    NAME_FUNC_OFFSET(11148, glGetnPixelMapuivARB, glGetnPixelMapuivARB, NULL, 675),
-    NAME_FUNC_OFFSET(11169, glGetnPixelMapusvARB, glGetnPixelMapusvARB, NULL, 676),
-    NAME_FUNC_OFFSET(11190, glGetnPolygonStippleARB, glGetnPolygonStippleARB, NULL, 677),
-    NAME_FUNC_OFFSET(11214, glGetnSeparableFilterARB, glGetnSeparableFilterARB, NULL, 678),
-    NAME_FUNC_OFFSET(11239, glGetnTexImageARB, glGetnTexImageARB, NULL, 679),
-    NAME_FUNC_OFFSET(11257, glGetnUniformdvARB, glGetnUniformdvARB, NULL, 680),
-    NAME_FUNC_OFFSET(11276, glGetnUniformfvARB, glGetnUniformfvARB, NULL, 681),
-    NAME_FUNC_OFFSET(11295, glGetnUniformivARB, glGetnUniformivARB, NULL, 682),
-    NAME_FUNC_OFFSET(11314, glGetnUniformuivARB, glGetnUniformuivARB, NULL, 683),
-    NAME_FUNC_OFFSET(11334, glReadnPixelsARB, glReadnPixelsARB, NULL, 684),
-    NAME_FUNC_OFFSET(11351, glTexStorage1D, glTexStorage1D, NULL, 685),
-    NAME_FUNC_OFFSET(11366, glTexStorage2D, glTexStorage2D, NULL, 686),
-    NAME_FUNC_OFFSET(11381, glTexStorage3D, glTexStorage3D, NULL, 687),
-    NAME_FUNC_OFFSET(11396, glTextureStorage1DEXT, glTextureStorage1DEXT, NULL, 688),
-    NAME_FUNC_OFFSET(11418, glTextureStorage2DEXT, glTextureStorage2DEXT, NULL, 689),
-    NAME_FUNC_OFFSET(11440, glTextureStorage3DEXT, glTextureStorage3DEXT, NULL, 690),
-    NAME_FUNC_OFFSET(11462, glPolygonOffsetEXT, glPolygonOffsetEXT, NULL, 691),
-    NAME_FUNC_OFFSET(11481, gl_dispatch_stub_692, gl_dispatch_stub_692, NULL, 692),
-    NAME_FUNC_OFFSET(11513, gl_dispatch_stub_693, gl_dispatch_stub_693, NULL, 693),
-    NAME_FUNC_OFFSET(11545, gl_dispatch_stub_694, gl_dispatch_stub_694, NULL, 694),
-    NAME_FUNC_OFFSET(11573, gl_dispatch_stub_695, gl_dispatch_stub_695, NULL, 695),
-    NAME_FUNC_OFFSET(11602, gl_dispatch_stub_696, gl_dispatch_stub_696, NULL, 696),
-    NAME_FUNC_OFFSET(11630, gl_dispatch_stub_697, gl_dispatch_stub_697, NULL, 697),
-    NAME_FUNC_OFFSET(11659, gl_dispatch_stub_698, gl_dispatch_stub_698, NULL, 698),
-    NAME_FUNC_OFFSET(11676, gl_dispatch_stub_699, gl_dispatch_stub_699, NULL, 699),
-    NAME_FUNC_OFFSET(11696, glColorPointerEXT, glColorPointerEXT, NULL, 700),
-    NAME_FUNC_OFFSET(11714, glEdgeFlagPointerEXT, glEdgeFlagPointerEXT, NULL, 701),
-    NAME_FUNC_OFFSET(11735, glIndexPointerEXT, glIndexPointerEXT, NULL, 702),
-    NAME_FUNC_OFFSET(11753, glNormalPointerEXT, glNormalPointerEXT, NULL, 703),
-    NAME_FUNC_OFFSET(11772, glTexCoordPointerEXT, glTexCoordPointerEXT, NULL, 704),
-    NAME_FUNC_OFFSET(11793, glVertexPointerEXT, glVertexPointerEXT, NULL, 705),
-    NAME_FUNC_OFFSET(11812, glPointParameterfEXT, glPointParameterfEXT, NULL, 706),
-    NAME_FUNC_OFFSET(11833, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 707),
-    NAME_FUNC_OFFSET(11855, glLockArraysEXT, glLockArraysEXT, NULL, 708),
-    NAME_FUNC_OFFSET(11871, glUnlockArraysEXT, glUnlockArraysEXT, NULL, 709),
-    NAME_FUNC_OFFSET(11889, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, 710),
-    NAME_FUNC_OFFSET(11911, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, 711),
-    NAME_FUNC_OFFSET(11934, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, 712),
-    NAME_FUNC_OFFSET(11956, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, 713),
-    NAME_FUNC_OFFSET(11979, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, 714),
-    NAME_FUNC_OFFSET(12001, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, 715),
-    NAME_FUNC_OFFSET(12024, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, 716),
-    NAME_FUNC_OFFSET(12046, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, 717),
-    NAME_FUNC_OFFSET(12069, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, 718),
-    NAME_FUNC_OFFSET(12091, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, 719),
-    NAME_FUNC_OFFSET(12114, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, 720),
-    NAME_FUNC_OFFSET(12137, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, 721),
-    NAME_FUNC_OFFSET(12161, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, 722),
-    NAME_FUNC_OFFSET(12184, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, 723),
-    NAME_FUNC_OFFSET(12208, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, 724),
-    NAME_FUNC_OFFSET(12231, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, 725),
-    NAME_FUNC_OFFSET(12255, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, 726),
-    NAME_FUNC_OFFSET(12282, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, 727),
-    NAME_FUNC_OFFSET(12303, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, 728),
-    NAME_FUNC_OFFSET(12326, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, 729),
-    NAME_FUNC_OFFSET(12347, glFogCoorddEXT, glFogCoorddEXT, NULL, 730),
-    NAME_FUNC_OFFSET(12362, glFogCoorddvEXT, glFogCoorddvEXT, NULL, 731),
-    NAME_FUNC_OFFSET(12378, glFogCoordfEXT, glFogCoordfEXT, NULL, 732),
-    NAME_FUNC_OFFSET(12393, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 733),
-    NAME_FUNC_OFFSET(12409, gl_dispatch_stub_734, gl_dispatch_stub_734, NULL, 734),
-    NAME_FUNC_OFFSET(12427, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, 735),
-    NAME_FUNC_OFFSET(12450, glFlushVertexArrayRangeNV, glFlushVertexArrayRangeNV, NULL, 736),
-    NAME_FUNC_OFFSET(12476, glVertexArrayRangeNV, glVertexArrayRangeNV, NULL, 737),
-    NAME_FUNC_OFFSET(12497, glCombinerInputNV, glCombinerInputNV, NULL, 738),
-    NAME_FUNC_OFFSET(12515, glCombinerOutputNV, glCombinerOutputNV, NULL, 739),
-    NAME_FUNC_OFFSET(12534, glCombinerParameterfNV, glCombinerParameterfNV, NULL, 740),
-    NAME_FUNC_OFFSET(12557, glCombinerParameterfvNV, glCombinerParameterfvNV, NULL, 741),
-    NAME_FUNC_OFFSET(12581, glCombinerParameteriNV, glCombinerParameteriNV, NULL, 742),
-    NAME_FUNC_OFFSET(12604, glCombinerParameterivNV, glCombinerParameterivNV, NULL, 743),
-    NAME_FUNC_OFFSET(12628, glFinalCombinerInputNV, glFinalCombinerInputNV, NULL, 744),
-    NAME_FUNC_OFFSET(12651, glGetCombinerInputParameterfvNV, glGetCombinerInputParameterfvNV, NULL, 745),
-    NAME_FUNC_OFFSET(12683, glGetCombinerInputParameterivNV, glGetCombinerInputParameterivNV, NULL, 746),
-    NAME_FUNC_OFFSET(12715, glGetCombinerOutputParameterfvNV, glGetCombinerOutputParameterfvNV, NULL, 747),
-    NAME_FUNC_OFFSET(12748, glGetCombinerOutputParameterivNV, glGetCombinerOutputParameterivNV, NULL, 748),
-    NAME_FUNC_OFFSET(12781, glGetFinalCombinerInputParameterfvNV, glGetFinalCombinerInputParameterfvNV, NULL, 749),
-    NAME_FUNC_OFFSET(12818, glGetFinalCombinerInputParameterivNV, glGetFinalCombinerInputParameterivNV, NULL, 750),
-    NAME_FUNC_OFFSET(12855, glResizeBuffersMESA, glResizeBuffersMESA, NULL, 751),
-    NAME_FUNC_OFFSET(12875, glWindowPos2dMESA, glWindowPos2dMESA, NULL, 752),
-    NAME_FUNC_OFFSET(12893, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, 753),
-    NAME_FUNC_OFFSET(12912, glWindowPos2fMESA, glWindowPos2fMESA, NULL, 754),
-    NAME_FUNC_OFFSET(12930, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, 755),
-    NAME_FUNC_OFFSET(12949, glWindowPos2iMESA, glWindowPos2iMESA, NULL, 756),
-    NAME_FUNC_OFFSET(12967, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, 757),
-    NAME_FUNC_OFFSET(12986, glWindowPos2sMESA, glWindowPos2sMESA, NULL, 758),
-    NAME_FUNC_OFFSET(13004, glWindowPos2svMESA, glWindowPos2svMESA, NULL, 759),
-    NAME_FUNC_OFFSET(13023, glWindowPos3dMESA, glWindowPos3dMESA, NULL, 760),
-    NAME_FUNC_OFFSET(13041, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, 761),
-    NAME_FUNC_OFFSET(13060, glWindowPos3fMESA, glWindowPos3fMESA, NULL, 762),
-    NAME_FUNC_OFFSET(13078, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, 763),
-    NAME_FUNC_OFFSET(13097, glWindowPos3iMESA, glWindowPos3iMESA, NULL, 764),
-    NAME_FUNC_OFFSET(13115, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, 765),
-    NAME_FUNC_OFFSET(13134, glWindowPos3sMESA, glWindowPos3sMESA, NULL, 766),
-    NAME_FUNC_OFFSET(13152, glWindowPos3svMESA, glWindowPos3svMESA, NULL, 767),
-    NAME_FUNC_OFFSET(13171, glWindowPos4dMESA, glWindowPos4dMESA, NULL, 768),
-    NAME_FUNC_OFFSET(13189, glWindowPos4dvMESA, glWindowPos4dvMESA, NULL, 769),
-    NAME_FUNC_OFFSET(13208, glWindowPos4fMESA, glWindowPos4fMESA, NULL, 770),
-    NAME_FUNC_OFFSET(13226, glWindowPos4fvMESA, glWindowPos4fvMESA, NULL, 771),
-    NAME_FUNC_OFFSET(13245, glWindowPos4iMESA, glWindowPos4iMESA, NULL, 772),
-    NAME_FUNC_OFFSET(13263, glWindowPos4ivMESA, glWindowPos4ivMESA, NULL, 773),
-    NAME_FUNC_OFFSET(13282, glWindowPos4sMESA, glWindowPos4sMESA, NULL, 774),
-    NAME_FUNC_OFFSET(13300, glWindowPos4svMESA, glWindowPos4svMESA, NULL, 775),
-    NAME_FUNC_OFFSET(13319, gl_dispatch_stub_776, gl_dispatch_stub_776, NULL, 776),
-    NAME_FUNC_OFFSET(13344, gl_dispatch_stub_777, gl_dispatch_stub_777, NULL, 777),
-    NAME_FUNC_OFFSET(13371, gl_dispatch_stub_778, gl_dispatch_stub_778, NULL, 778),
-    NAME_FUNC_OFFSET(13388, gl_dispatch_stub_779, gl_dispatch_stub_779, NULL, 779),
-    NAME_FUNC_OFFSET(13404, gl_dispatch_stub_780, gl_dispatch_stub_780, NULL, 780),
-    NAME_FUNC_OFFSET(13418, gl_dispatch_stub_781, gl_dispatch_stub_781, NULL, 781),
-    NAME_FUNC_OFFSET(13433, gl_dispatch_stub_782, gl_dispatch_stub_782, NULL, 782),
-    NAME_FUNC_OFFSET(13445, gl_dispatch_stub_783, gl_dispatch_stub_783, NULL, 783),
-    NAME_FUNC_OFFSET(13458, gl_dispatch_stub_784, gl_dispatch_stub_784, NULL, 784),
-    NAME_FUNC_OFFSET(13472, glAreProgramsResidentNV, glAreProgramsResidentNV, NULL, 785),
-    NAME_FUNC_OFFSET(13496, glBindProgramNV, glBindProgramNV, NULL, 786),
-    NAME_FUNC_OFFSET(13512, glDeleteProgramsNV, glDeleteProgramsNV, NULL, 787),
-    NAME_FUNC_OFFSET(13531, glExecuteProgramNV, glExecuteProgramNV, NULL, 788),
-    NAME_FUNC_OFFSET(13550, glGenProgramsNV, glGenProgramsNV, NULL, 789),
-    NAME_FUNC_OFFSET(13566, glGetProgramParameterdvNV, glGetProgramParameterdvNV, NULL, 790),
-    NAME_FUNC_OFFSET(13592, glGetProgramParameterfvNV, glGetProgramParameterfvNV, NULL, 791),
-    NAME_FUNC_OFFSET(13618, glGetProgramStringNV, glGetProgramStringNV, NULL, 792),
-    NAME_FUNC_OFFSET(13639, glGetProgramivNV, glGetProgramivNV, NULL, 793),
-    NAME_FUNC_OFFSET(13656, glGetTrackMatrixivNV, glGetTrackMatrixivNV, NULL, 794),
-    NAME_FUNC_OFFSET(13677, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, 795),
-    NAME_FUNC_OFFSET(13705, glGetVertexAttribdvNV, glGetVertexAttribdvNV, NULL, 796),
-    NAME_FUNC_OFFSET(13727, glGetVertexAttribfvNV, glGetVertexAttribfvNV, NULL, 797),
-    NAME_FUNC_OFFSET(13749, glGetVertexAttribivNV, glGetVertexAttribivNV, NULL, 798),
-    NAME_FUNC_OFFSET(13771, glIsProgramNV, glIsProgramNV, NULL, 799),
-    NAME_FUNC_OFFSET(13785, glLoadProgramNV, glLoadProgramNV, NULL, 800),
-    NAME_FUNC_OFFSET(13801, glProgramParameters4dvNV, glProgramParameters4dvNV, NULL, 801),
-    NAME_FUNC_OFFSET(13826, glProgramParameters4fvNV, glProgramParameters4fvNV, NULL, 802),
-    NAME_FUNC_OFFSET(13851, glRequestResidentProgramsNV, glRequestResidentProgramsNV, NULL, 803),
-    NAME_FUNC_OFFSET(13879, glTrackMatrixNV, glTrackMatrixNV, NULL, 804),
-    NAME_FUNC_OFFSET(13895, glVertexAttrib1dNV, glVertexAttrib1dNV, NULL, 805),
-    NAME_FUNC_OFFSET(13914, glVertexAttrib1dvNV, glVertexAttrib1dvNV, NULL, 806),
-    NAME_FUNC_OFFSET(13934, glVertexAttrib1fNV, glVertexAttrib1fNV, NULL, 807),
-    NAME_FUNC_OFFSET(13953, glVertexAttrib1fvNV, glVertexAttrib1fvNV, NULL, 808),
-    NAME_FUNC_OFFSET(13973, glVertexAttrib1sNV, glVertexAttrib1sNV, NULL, 809),
-    NAME_FUNC_OFFSET(13992, glVertexAttrib1svNV, glVertexAttrib1svNV, NULL, 810),
-    NAME_FUNC_OFFSET(14012, glVertexAttrib2dNV, glVertexAttrib2dNV, NULL, 811),
-    NAME_FUNC_OFFSET(14031, glVertexAttrib2dvNV, glVertexAttrib2dvNV, NULL, 812),
-    NAME_FUNC_OFFSET(14051, glVertexAttrib2fNV, glVertexAttrib2fNV, NULL, 813),
-    NAME_FUNC_OFFSET(14070, glVertexAttrib2fvNV, glVertexAttrib2fvNV, NULL, 814),
-    NAME_FUNC_OFFSET(14090, glVertexAttrib2sNV, glVertexAttrib2sNV, NULL, 815),
-    NAME_FUNC_OFFSET(14109, glVertexAttrib2svNV, glVertexAttrib2svNV, NULL, 816),
-    NAME_FUNC_OFFSET(14129, glVertexAttrib3dNV, glVertexAttrib3dNV, NULL, 817),
-    NAME_FUNC_OFFSET(14148, glVertexAttrib3dvNV, glVertexAttrib3dvNV, NULL, 818),
-    NAME_FUNC_OFFSET(14168, glVertexAttrib3fNV, glVertexAttrib3fNV, NULL, 819),
-    NAME_FUNC_OFFSET(14187, glVertexAttrib3fvNV, glVertexAttrib3fvNV, NULL, 820),
-    NAME_FUNC_OFFSET(14207, glVertexAttrib3sNV, glVertexAttrib3sNV, NULL, 821),
-    NAME_FUNC_OFFSET(14226, glVertexAttrib3svNV, glVertexAttrib3svNV, NULL, 822),
-    NAME_FUNC_OFFSET(14246, glVertexAttrib4dNV, glVertexAttrib4dNV, NULL, 823),
-    NAME_FUNC_OFFSET(14265, glVertexAttrib4dvNV, glVertexAttrib4dvNV, NULL, 824),
-    NAME_FUNC_OFFSET(14285, glVertexAttrib4fNV, glVertexAttrib4fNV, NULL, 825),
-    NAME_FUNC_OFFSET(14304, glVertexAttrib4fvNV, glVertexAttrib4fvNV, NULL, 826),
-    NAME_FUNC_OFFSET(14324, glVertexAttrib4sNV, glVertexAttrib4sNV, NULL, 827),
-    NAME_FUNC_OFFSET(14343, glVertexAttrib4svNV, glVertexAttrib4svNV, NULL, 828),
-    NAME_FUNC_OFFSET(14363, glVertexAttrib4ubNV, glVertexAttrib4ubNV, NULL, 829),
-    NAME_FUNC_OFFSET(14383, glVertexAttrib4ubvNV, glVertexAttrib4ubvNV, NULL, 830),
-    NAME_FUNC_OFFSET(14404, glVertexAttribPointerNV, glVertexAttribPointerNV, NULL, 831),
-    NAME_FUNC_OFFSET(14428, glVertexAttribs1dvNV, glVertexAttribs1dvNV, NULL, 832),
-    NAME_FUNC_OFFSET(14449, glVertexAttribs1fvNV, glVertexAttribs1fvNV, NULL, 833),
-    NAME_FUNC_OFFSET(14470, glVertexAttribs1svNV, glVertexAttribs1svNV, NULL, 834),
-    NAME_FUNC_OFFSET(14491, glVertexAttribs2dvNV, glVertexAttribs2dvNV, NULL, 835),
-    NAME_FUNC_OFFSET(14512, glVertexAttribs2fvNV, glVertexAttribs2fvNV, NULL, 836),
-    NAME_FUNC_OFFSET(14533, glVertexAttribs2svNV, glVertexAttribs2svNV, NULL, 837),
-    NAME_FUNC_OFFSET(14554, glVertexAttribs3dvNV, glVertexAttribs3dvNV, NULL, 838),
-    NAME_FUNC_OFFSET(14575, glVertexAttribs3fvNV, glVertexAttribs3fvNV, NULL, 839),
-    NAME_FUNC_OFFSET(14596, glVertexAttribs3svNV, glVertexAttribs3svNV, NULL, 840),
-    NAME_FUNC_OFFSET(14617, glVertexAttribs4dvNV, glVertexAttribs4dvNV, NULL, 841),
-    NAME_FUNC_OFFSET(14638, glVertexAttribs4fvNV, glVertexAttribs4fvNV, NULL, 842),
-    NAME_FUNC_OFFSET(14659, glVertexAttribs4svNV, glVertexAttribs4svNV, NULL, 843),
-    NAME_FUNC_OFFSET(14680, glVertexAttribs4ubvNV, glVertexAttribs4ubvNV, NULL, 844),
-    NAME_FUNC_OFFSET(14702, glGetTexBumpParameterfvATI, glGetTexBumpParameterfvATI, NULL, 845),
-    NAME_FUNC_OFFSET(14729, glGetTexBumpParameterivATI, glGetTexBumpParameterivATI, NULL, 846),
-    NAME_FUNC_OFFSET(14756, glTexBumpParameterfvATI, glTexBumpParameterfvATI, NULL, 847),
-    NAME_FUNC_OFFSET(14780, glTexBumpParameterivATI, glTexBumpParameterivATI, NULL, 848),
-    NAME_FUNC_OFFSET(14804, glAlphaFragmentOp1ATI, glAlphaFragmentOp1ATI, NULL, 849),
-    NAME_FUNC_OFFSET(14826, glAlphaFragmentOp2ATI, glAlphaFragmentOp2ATI, NULL, 850),
-    NAME_FUNC_OFFSET(14848, glAlphaFragmentOp3ATI, glAlphaFragmentOp3ATI, NULL, 851),
-    NAME_FUNC_OFFSET(14870, glBeginFragmentShaderATI, glBeginFragmentShaderATI, NULL, 852),
-    NAME_FUNC_OFFSET(14895, glBindFragmentShaderATI, glBindFragmentShaderATI, NULL, 853),
-    NAME_FUNC_OFFSET(14919, glColorFragmentOp1ATI, glColorFragmentOp1ATI, NULL, 854),
-    NAME_FUNC_OFFSET(14941, glColorFragmentOp2ATI, glColorFragmentOp2ATI, NULL, 855),
-    NAME_FUNC_OFFSET(14963, glColorFragmentOp3ATI, glColorFragmentOp3ATI, NULL, 856),
-    NAME_FUNC_OFFSET(14985, glDeleteFragmentShaderATI, glDeleteFragmentShaderATI, NULL, 857),
-    NAME_FUNC_OFFSET(15011, glEndFragmentShaderATI, glEndFragmentShaderATI, NULL, 858),
-    NAME_FUNC_OFFSET(15034, glGenFragmentShadersATI, glGenFragmentShadersATI, NULL, 859),
-    NAME_FUNC_OFFSET(15058, glPassTexCoordATI, glPassTexCoordATI, NULL, 860),
-    NAME_FUNC_OFFSET(15076, glSampleMapATI, glSampleMapATI, NULL, 861),
-    NAME_FUNC_OFFSET(15091, glSetFragmentShaderConstantATI, glSetFragmentShaderConstantATI, NULL, 862),
-    NAME_FUNC_OFFSET(15122, glPointParameteriNV, glPointParameteriNV, NULL, 863),
-    NAME_FUNC_OFFSET(15142, glPointParameterivNV, glPointParameterivNV, NULL, 864),
-    NAME_FUNC_OFFSET(15163, gl_dispatch_stub_865, gl_dispatch_stub_865, NULL, 865),
-    NAME_FUNC_OFFSET(15186, gl_dispatch_stub_866, gl_dispatch_stub_866, NULL, 866),
-    NAME_FUNC_OFFSET(15209, gl_dispatch_stub_867, gl_dispatch_stub_867, NULL, 867),
-    NAME_FUNC_OFFSET(15235, gl_dispatch_stub_868, gl_dispatch_stub_868, NULL, 868),
-    NAME_FUNC_OFFSET(15258, gl_dispatch_stub_869, gl_dispatch_stub_869, NULL, 869),
-    NAME_FUNC_OFFSET(15279, glGetProgramNamedParameterdvNV, glGetProgramNamedParameterdvNV, NULL, 870),
-    NAME_FUNC_OFFSET(15310, glGetProgramNamedParameterfvNV, glGetProgramNamedParameterfvNV, NULL, 871),
-    NAME_FUNC_OFFSET(15341, glProgramNamedParameter4dNV, glProgramNamedParameter4dNV, NULL, 872),
-    NAME_FUNC_OFFSET(15369, glProgramNamedParameter4dvNV, glProgramNamedParameter4dvNV, NULL, 873),
-    NAME_FUNC_OFFSET(15398, glProgramNamedParameter4fNV, glProgramNamedParameter4fNV, NULL, 874),
-    NAME_FUNC_OFFSET(15426, glProgramNamedParameter4fvNV, glProgramNamedParameter4fvNV, NULL, 875),
-    NAME_FUNC_OFFSET(15455, glPrimitiveRestartIndexNV, glPrimitiveRestartIndexNV, NULL, 876),
-    NAME_FUNC_OFFSET(15481, glPrimitiveRestartNV, glPrimitiveRestartNV, NULL, 877),
-    NAME_FUNC_OFFSET(15502, gl_dispatch_stub_878, gl_dispatch_stub_878, NULL, 878),
-    NAME_FUNC_OFFSET(15519, gl_dispatch_stub_879, gl_dispatch_stub_879, NULL, 879),
-    NAME_FUNC_OFFSET(15546, glBindFramebufferEXT, glBindFramebufferEXT, NULL, 880),
-    NAME_FUNC_OFFSET(15567, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, 881),
-    NAME_FUNC_OFFSET(15589, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, 882),
-    NAME_FUNC_OFFSET(15617, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, 883),
-    NAME_FUNC_OFFSET(15641, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, 884),
-    NAME_FUNC_OFFSET(15666, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, 885),
-    NAME_FUNC_OFFSET(15695, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, 886),
-    NAME_FUNC_OFFSET(15721, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, 887),
-    NAME_FUNC_OFFSET(15747, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, 888),
-    NAME_FUNC_OFFSET(15773, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, 889),
-    NAME_FUNC_OFFSET(15794, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, 890),
-    NAME_FUNC_OFFSET(15816, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, 891),
-    NAME_FUNC_OFFSET(15836, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, 892),
-    NAME_FUNC_OFFSET(15877, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, 893),
-    NAME_FUNC_OFFSET(15909, glIsFramebufferEXT, glIsFramebufferEXT, NULL, 894),
-    NAME_FUNC_OFFSET(15928, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, 895),
-    NAME_FUNC_OFFSET(15948, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, 896),
-    NAME_FUNC_OFFSET(15973, gl_dispatch_stub_897, gl_dispatch_stub_897, NULL, 897),
-    NAME_FUNC_OFFSET(15994, gl_dispatch_stub_898, gl_dispatch_stub_898, NULL, 898),
-    NAME_FUNC_OFFSET(16018, gl_dispatch_stub_899, gl_dispatch_stub_899, NULL, 899),
-    NAME_FUNC_OFFSET(16048, glBindFragDataLocationEXT, glBindFragDataLocationEXT, NULL, 900),
-    NAME_FUNC_OFFSET(16074, glGetFragDataLocationEXT, glGetFragDataLocationEXT, NULL, 901),
-    NAME_FUNC_OFFSET(16099, glGetUniformuivEXT, glGetUniformuivEXT, NULL, 902),
-    NAME_FUNC_OFFSET(16118, glGetVertexAttribIivEXT, glGetVertexAttribIivEXT, NULL, 903),
-    NAME_FUNC_OFFSET(16142, glGetVertexAttribIuivEXT, glGetVertexAttribIuivEXT, NULL, 904),
-    NAME_FUNC_OFFSET(16167, glUniform1uiEXT, glUniform1uiEXT, NULL, 905),
-    NAME_FUNC_OFFSET(16183, glUniform1uivEXT, glUniform1uivEXT, NULL, 906),
-    NAME_FUNC_OFFSET(16200, glUniform2uiEXT, glUniform2uiEXT, NULL, 907),
-    NAME_FUNC_OFFSET(16216, glUniform2uivEXT, glUniform2uivEXT, NULL, 908),
-    NAME_FUNC_OFFSET(16233, glUniform3uiEXT, glUniform3uiEXT, NULL, 909),
-    NAME_FUNC_OFFSET(16249, glUniform3uivEXT, glUniform3uivEXT, NULL, 910),
-    NAME_FUNC_OFFSET(16266, glUniform4uiEXT, glUniform4uiEXT, NULL, 911),
-    NAME_FUNC_OFFSET(16282, glUniform4uivEXT, glUniform4uivEXT, NULL, 912),
-    NAME_FUNC_OFFSET(16299, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL, 913),
-    NAME_FUNC_OFFSET(16320, glVertexAttribI1ivEXT, glVertexAttribI1ivEXT, NULL, 914),
-    NAME_FUNC_OFFSET(16342, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL, 915),
-    NAME_FUNC_OFFSET(16364, glVertexAttribI1uivEXT, glVertexAttribI1uivEXT, NULL, 916),
-    NAME_FUNC_OFFSET(16387, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL, 917),
-    NAME_FUNC_OFFSET(16408, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL, 918),
-    NAME_FUNC_OFFSET(16430, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL, 919),
-    NAME_FUNC_OFFSET(16452, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT, NULL, 920),
-    NAME_FUNC_OFFSET(16475, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL, 921),
-    NAME_FUNC_OFFSET(16496, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL, 922),
-    NAME_FUNC_OFFSET(16518, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL, 923),
-    NAME_FUNC_OFFSET(16540, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT, NULL, 924),
-    NAME_FUNC_OFFSET(16563, glVertexAttribI4bvEXT, glVertexAttribI4bvEXT, NULL, 925),
-    NAME_FUNC_OFFSET(16585, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL, 926),
-    NAME_FUNC_OFFSET(16606, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL, 927),
-    NAME_FUNC_OFFSET(16628, glVertexAttribI4svEXT, glVertexAttribI4svEXT, NULL, 928),
-    NAME_FUNC_OFFSET(16650, glVertexAttribI4ubvEXT, glVertexAttribI4ubvEXT, NULL, 929),
-    NAME_FUNC_OFFSET(16673, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL, 930),
-    NAME_FUNC_OFFSET(16695, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT, NULL, 931),
-    NAME_FUNC_OFFSET(16718, glVertexAttribI4usvEXT, glVertexAttribI4usvEXT, NULL, 932),
-    NAME_FUNC_OFFSET(16741, glVertexAttribIPointerEXT, glVertexAttribIPointerEXT, NULL, 933),
-    NAME_FUNC_OFFSET(16767, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, 934),
-    NAME_FUNC_OFFSET(16796, glColorMaskIndexedEXT, glColorMaskIndexedEXT, NULL, 935),
-    NAME_FUNC_OFFSET(16818, glDisableIndexedEXT, glDisableIndexedEXT, NULL, 936),
-    NAME_FUNC_OFFSET(16838, glEnableIndexedEXT, glEnableIndexedEXT, NULL, 937),
-    NAME_FUNC_OFFSET(16857, glGetBooleanIndexedvEXT, glGetBooleanIndexedvEXT, NULL, 938),
-    NAME_FUNC_OFFSET(16881, glGetIntegerIndexedvEXT, glGetIntegerIndexedvEXT, NULL, 939),
-    NAME_FUNC_OFFSET(16905, glIsEnabledIndexedEXT, glIsEnabledIndexedEXT, NULL, 940),
-    NAME_FUNC_OFFSET(16927, glClearColorIiEXT, glClearColorIiEXT, NULL, 941),
-    NAME_FUNC_OFFSET(16945, glClearColorIuiEXT, glClearColorIuiEXT, NULL, 942),
-    NAME_FUNC_OFFSET(16964, glGetTexParameterIivEXT, glGetTexParameterIivEXT, NULL, 943),
-    NAME_FUNC_OFFSET(16988, glGetTexParameterIuivEXT, glGetTexParameterIuivEXT, NULL, 944),
-    NAME_FUNC_OFFSET(17013, glTexParameterIivEXT, glTexParameterIivEXT, NULL, 945),
-    NAME_FUNC_OFFSET(17034, glTexParameterIuivEXT, glTexParameterIuivEXT, NULL, 946),
-    NAME_FUNC_OFFSET(17056, glBeginConditionalRenderNV, glBeginConditionalRenderNV, NULL, 947),
-    NAME_FUNC_OFFSET(17083, glEndConditionalRenderNV, glEndConditionalRenderNV, NULL, 948),
-    NAME_FUNC_OFFSET(17108, glBeginTransformFeedbackEXT, glBeginTransformFeedbackEXT, NULL, 949),
-    NAME_FUNC_OFFSET(17136, glBindBufferBaseEXT, glBindBufferBaseEXT, NULL, 950),
-    NAME_FUNC_OFFSET(17156, glBindBufferOffsetEXT, glBindBufferOffsetEXT, NULL, 951),
-    NAME_FUNC_OFFSET(17178, glBindBufferRangeEXT, glBindBufferRangeEXT, NULL, 952),
-    NAME_FUNC_OFFSET(17199, glEndTransformFeedbackEXT, glEndTransformFeedbackEXT, NULL, 953),
-    NAME_FUNC_OFFSET(17225, glGetTransformFeedbackVaryingEXT, glGetTransformFeedbackVaryingEXT, NULL, 954),
-    NAME_FUNC_OFFSET(17258, glTransformFeedbackVaryingsEXT, glTransformFeedbackVaryingsEXT, NULL, 955),
-    NAME_FUNC_OFFSET(17289, glProvokingVertexEXT, glProvokingVertexEXT, NULL, 956),
-    NAME_FUNC_OFFSET(17310, gl_dispatch_stub_957, gl_dispatch_stub_957, NULL, 957),
-    NAME_FUNC_OFFSET(17341, gl_dispatch_stub_958, gl_dispatch_stub_958, NULL, 958),
-    NAME_FUNC_OFFSET(17361, glGetObjectParameterivAPPLE, glGetObjectParameterivAPPLE, NULL, 959),
-    NAME_FUNC_OFFSET(17389, glObjectPurgeableAPPLE, glObjectPurgeableAPPLE, NULL, 960),
-    NAME_FUNC_OFFSET(17412, glObjectUnpurgeableAPPLE, glObjectUnpurgeableAPPLE, NULL, 961),
-    NAME_FUNC_OFFSET(17437, glActiveProgramEXT, glActiveProgramEXT, NULL, 962),
-    NAME_FUNC_OFFSET(17456, glCreateShaderProgramEXT, glCreateShaderProgramEXT, NULL, 963),
-    NAME_FUNC_OFFSET(17481, glUseShaderProgramEXT, glUseShaderProgramEXT, NULL, 964),
-    NAME_FUNC_OFFSET(17503, glTextureBarrierNV, glTextureBarrierNV, NULL, 965),
-    NAME_FUNC_OFFSET(17522, gl_dispatch_stub_966, gl_dispatch_stub_966, NULL, 966),
-    NAME_FUNC_OFFSET(17547, gl_dispatch_stub_967, gl_dispatch_stub_967, NULL, 967),
-    NAME_FUNC_OFFSET(17576, gl_dispatch_stub_968, gl_dispatch_stub_968, NULL, 968),
-    NAME_FUNC_OFFSET(17607, gl_dispatch_stub_969, gl_dispatch_stub_969, NULL, 969),
-    NAME_FUNC_OFFSET(17631, gl_dispatch_stub_970, gl_dispatch_stub_970, NULL, 970),
-    NAME_FUNC_OFFSET(17656, glEGLImageTargetRenderbufferStorageOES, glEGLImageTargetRenderbufferStorageOES, NULL, 971),
-    NAME_FUNC_OFFSET(17695, glEGLImageTargetTexture2DOES, glEGLImageTargetTexture2DOES, NULL, 972),
-    NAME_FUNC_OFFSET(17724, glArrayElement, glArrayElement, NULL, 306),
-    NAME_FUNC_OFFSET(17742, glBindTexture, glBindTexture, NULL, 307),
-    NAME_FUNC_OFFSET(17759, glDrawArrays, glDrawArrays, NULL, 310),
-    NAME_FUNC_OFFSET(17775, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, 322),
-    NAME_FUNC_OFFSET(17800, glCopyTexImage1D, glCopyTexImage1D, NULL, 323),
-    NAME_FUNC_OFFSET(17820, glCopyTexImage2D, glCopyTexImage2D, NULL, 324),
-    NAME_FUNC_OFFSET(17840, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, 325),
-    NAME_FUNC_OFFSET(17863, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, 326),
-    NAME_FUNC_OFFSET(17886, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, 327),
-    NAME_FUNC_OFFSET(17906, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, 328),
-    NAME_FUNC_OFFSET(17923, glGetPointerv, glGetPointerv, NULL, 329),
-    NAME_FUNC_OFFSET(17940, glIsTexture, glIsTextureEXT, glIsTextureEXT, 330),
-    NAME_FUNC_OFFSET(17955, glPrioritizeTextures, glPrioritizeTextures, NULL, 331),
-    NAME_FUNC_OFFSET(17979, glTexSubImage1D, glTexSubImage1D, NULL, 332),
-    NAME_FUNC_OFFSET(17998, glTexSubImage2D, glTexSubImage2D, NULL, 333),
-    NAME_FUNC_OFFSET(18017, glBlendColor, glBlendColor, NULL, 336),
-    NAME_FUNC_OFFSET(18033, glBlendEquation, glBlendEquation, NULL, 337),
-    NAME_FUNC_OFFSET(18052, glDrawRangeElements, glDrawRangeElements, NULL, 338),
-    NAME_FUNC_OFFSET(18075, glColorTable, glColorTable, NULL, 339),
-    NAME_FUNC_OFFSET(18091, glColorTable, glColorTable, NULL, 339),
-    NAME_FUNC_OFFSET(18107, glColorTableParameterfv, glColorTableParameterfv, NULL, 340),
-    NAME_FUNC_OFFSET(18134, glColorTableParameteriv, glColorTableParameteriv, NULL, 341),
-    NAME_FUNC_OFFSET(18161, glCopyColorTable, glCopyColorTable, NULL, 342),
-    NAME_FUNC_OFFSET(18181, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, 343),
-    NAME_FUNC_OFFSET(18200, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, 343),
-    NAME_FUNC_OFFSET(18219, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, 344),
-    NAME_FUNC_OFFSET(18249, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, 344),
-    NAME_FUNC_OFFSET(18279, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, 345),
-    NAME_FUNC_OFFSET(18309, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, 345),
-    NAME_FUNC_OFFSET(18339, glColorSubTable, glColorSubTable, NULL, 346),
-    NAME_FUNC_OFFSET(18358, glCopyColorSubTable, glCopyColorSubTable, NULL, 347),
-    NAME_FUNC_OFFSET(18381, glConvolutionFilter1D, glConvolutionFilter1D, NULL, 348),
-    NAME_FUNC_OFFSET(18406, glConvolutionFilter2D, glConvolutionFilter2D, NULL, 349),
-    NAME_FUNC_OFFSET(18431, glConvolutionParameterf, glConvolutionParameterf, NULL, 350),
-    NAME_FUNC_OFFSET(18458, glConvolutionParameterfv, glConvolutionParameterfv, NULL, 351),
-    NAME_FUNC_OFFSET(18486, glConvolutionParameteri, glConvolutionParameteri, NULL, 352),
-    NAME_FUNC_OFFSET(18513, glConvolutionParameteriv, glConvolutionParameteriv, NULL, 353),
-    NAME_FUNC_OFFSET(18541, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, 354),
-    NAME_FUNC_OFFSET(18570, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, 355),
-    NAME_FUNC_OFFSET(18599, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, 356),
-    NAME_FUNC_OFFSET(18625, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, 357),
-    NAME_FUNC_OFFSET(18656, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, 358),
-    NAME_FUNC_OFFSET(18687, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, 359),
-    NAME_FUNC_OFFSET(18711, glSeparableFilter2D, glSeparableFilter2D, NULL, 360),
-    NAME_FUNC_OFFSET(18734, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, 361),
-    NAME_FUNC_OFFSET(18752, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, 362),
-    NAME_FUNC_OFFSET(18781, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, 363),
-    NAME_FUNC_OFFSET(18810, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, 364),
-    NAME_FUNC_OFFSET(18825, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, 365),
-    NAME_FUNC_OFFSET(18851, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, 366),
-    NAME_FUNC_OFFSET(18877, glHistogram, glHistogram, NULL, 367),
-    NAME_FUNC_OFFSET(18892, glMinmax, glMinmax, NULL, 368),
-    NAME_FUNC_OFFSET(18904, glResetHistogram, glResetHistogram, NULL, 369),
-    NAME_FUNC_OFFSET(18924, glResetMinmax, glResetMinmax, NULL, 370),
-    NAME_FUNC_OFFSET(18941, glTexImage3D, glTexImage3D, NULL, 371),
-    NAME_FUNC_OFFSET(18957, glTexSubImage3D, glTexSubImage3D, NULL, 372),
-    NAME_FUNC_OFFSET(18976, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, 373),
-    NAME_FUNC_OFFSET(18999, glActiveTextureARB, glActiveTextureARB, NULL, 374),
-    NAME_FUNC_OFFSET(19015, glClientActiveTextureARB, glClientActiveTextureARB, NULL, 375),
-    NAME_FUNC_OFFSET(19037, glMultiTexCoord1dARB, glMultiTexCoord1dARB, NULL, 376),
-    NAME_FUNC_OFFSET(19055, glMultiTexCoord1dvARB, glMultiTexCoord1dvARB, NULL, 377),
-    NAME_FUNC_OFFSET(19074, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, 378),
-    NAME_FUNC_OFFSET(19092, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, 379),
-    NAME_FUNC_OFFSET(19111, glMultiTexCoord1iARB, glMultiTexCoord1iARB, NULL, 380),
-    NAME_FUNC_OFFSET(19129, glMultiTexCoord1ivARB, glMultiTexCoord1ivARB, NULL, 381),
-    NAME_FUNC_OFFSET(19148, glMultiTexCoord1sARB, glMultiTexCoord1sARB, NULL, 382),
-    NAME_FUNC_OFFSET(19166, glMultiTexCoord1svARB, glMultiTexCoord1svARB, NULL, 383),
-    NAME_FUNC_OFFSET(19185, glMultiTexCoord2dARB, glMultiTexCoord2dARB, NULL, 384),
-    NAME_FUNC_OFFSET(19203, glMultiTexCoord2dvARB, glMultiTexCoord2dvARB, NULL, 385),
-    NAME_FUNC_OFFSET(19222, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, 386),
-    NAME_FUNC_OFFSET(19240, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, 387),
-    NAME_FUNC_OFFSET(19259, glMultiTexCoord2iARB, glMultiTexCoord2iARB, NULL, 388),
-    NAME_FUNC_OFFSET(19277, glMultiTexCoord2ivARB, glMultiTexCoord2ivARB, NULL, 389),
-    NAME_FUNC_OFFSET(19296, glMultiTexCoord2sARB, glMultiTexCoord2sARB, NULL, 390),
-    NAME_FUNC_OFFSET(19314, glMultiTexCoord2svARB, glMultiTexCoord2svARB, NULL, 391),
-    NAME_FUNC_OFFSET(19333, glMultiTexCoord3dARB, glMultiTexCoord3dARB, NULL, 392),
-    NAME_FUNC_OFFSET(19351, glMultiTexCoord3dvARB, glMultiTexCoord3dvARB, NULL, 393),
-    NAME_FUNC_OFFSET(19370, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, 394),
-    NAME_FUNC_OFFSET(19388, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, 395),
-    NAME_FUNC_OFFSET(19407, glMultiTexCoord3iARB, glMultiTexCoord3iARB, NULL, 396),
-    NAME_FUNC_OFFSET(19425, glMultiTexCoord3ivARB, glMultiTexCoord3ivARB, NULL, 397),
-    NAME_FUNC_OFFSET(19444, glMultiTexCoord3sARB, glMultiTexCoord3sARB, NULL, 398),
-    NAME_FUNC_OFFSET(19462, glMultiTexCoord3svARB, glMultiTexCoord3svARB, NULL, 399),
-    NAME_FUNC_OFFSET(19481, glMultiTexCoord4dARB, glMultiTexCoord4dARB, NULL, 400),
-    NAME_FUNC_OFFSET(19499, glMultiTexCoord4dvARB, glMultiTexCoord4dvARB, NULL, 401),
-    NAME_FUNC_OFFSET(19518, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, 402),
-    NAME_FUNC_OFFSET(19536, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, 403),
-    NAME_FUNC_OFFSET(19555, glMultiTexCoord4iARB, glMultiTexCoord4iARB, NULL, 404),
-    NAME_FUNC_OFFSET(19573, glMultiTexCoord4ivARB, glMultiTexCoord4ivARB, NULL, 405),
-    NAME_FUNC_OFFSET(19592, glMultiTexCoord4sARB, glMultiTexCoord4sARB, NULL, 406),
-    NAME_FUNC_OFFSET(19610, glMultiTexCoord4svARB, glMultiTexCoord4svARB, NULL, 407),
-    NAME_FUNC_OFFSET(19629, glStencilOpSeparate, glStencilOpSeparate, NULL, 423),
-    NAME_FUNC_OFFSET(19652, glLoadTransposeMatrixdARB, glLoadTransposeMatrixdARB, NULL, 441),
-    NAME_FUNC_OFFSET(19675, glLoadTransposeMatrixfARB, glLoadTransposeMatrixfARB, NULL, 442),
-    NAME_FUNC_OFFSET(19698, glMultTransposeMatrixdARB, glMultTransposeMatrixdARB, NULL, 443),
-    NAME_FUNC_OFFSET(19721, glMultTransposeMatrixfARB, glMultTransposeMatrixfARB, NULL, 444),
-    NAME_FUNC_OFFSET(19744, glSampleCoverageARB, glSampleCoverageARB, NULL, 445),
-    NAME_FUNC_OFFSET(19761, glCompressedTexImage1DARB, glCompressedTexImage1DARB, NULL, 446),
-    NAME_FUNC_OFFSET(19784, glCompressedTexImage2DARB, glCompressedTexImage2DARB, NULL, 447),
-    NAME_FUNC_OFFSET(19807, glCompressedTexImage3DARB, glCompressedTexImage3DARB, NULL, 448),
-    NAME_FUNC_OFFSET(19830, glCompressedTexSubImage1DARB, glCompressedTexSubImage1DARB, NULL, 449),
-    NAME_FUNC_OFFSET(19856, glCompressedTexSubImage2DARB, glCompressedTexSubImage2DARB, NULL, 450),
-    NAME_FUNC_OFFSET(19882, glCompressedTexSubImage3DARB, glCompressedTexSubImage3DARB, NULL, 451),
-    NAME_FUNC_OFFSET(19908, glGetCompressedTexImageARB, glGetCompressedTexImageARB, NULL, 452),
-    NAME_FUNC_OFFSET(19932, glDisableVertexAttribArrayARB, glDisableVertexAttribArrayARB, NULL, 453),
-    NAME_FUNC_OFFSET(19959, glEnableVertexAttribArrayARB, glEnableVertexAttribArrayARB, NULL, 454),
-    NAME_FUNC_OFFSET(19985, glGetVertexAttribdvARB, glGetVertexAttribdvARB, NULL, 461),
-    NAME_FUNC_OFFSET(20005, glGetVertexAttribfvARB, glGetVertexAttribfvARB, NULL, 462),
-    NAME_FUNC_OFFSET(20025, glGetVertexAttribivARB, glGetVertexAttribivARB, NULL, 463),
-    NAME_FUNC_OFFSET(20045, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, 464),
-    NAME_FUNC_OFFSET(20068, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, 465),
-    NAME_FUNC_OFFSET(20092, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, 466),
-    NAME_FUNC_OFFSET(20115, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, 467),
-    NAME_FUNC_OFFSET(20139, glVertexAttrib1dARB, glVertexAttrib1dARB, NULL, 473),
-    NAME_FUNC_OFFSET(20156, glVertexAttrib1dvARB, glVertexAttrib1dvARB, NULL, 474),
-    NAME_FUNC_OFFSET(20174, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, 475),
-    NAME_FUNC_OFFSET(20191, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, 476),
-    NAME_FUNC_OFFSET(20209, glVertexAttrib1sARB, glVertexAttrib1sARB, NULL, 477),
-    NAME_FUNC_OFFSET(20226, glVertexAttrib1svARB, glVertexAttrib1svARB, NULL, 478),
-    NAME_FUNC_OFFSET(20244, glVertexAttrib2dARB, glVertexAttrib2dARB, NULL, 479),
-    NAME_FUNC_OFFSET(20261, glVertexAttrib2dvARB, glVertexAttrib2dvARB, NULL, 480),
-    NAME_FUNC_OFFSET(20279, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, 481),
-    NAME_FUNC_OFFSET(20296, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, 482),
-    NAME_FUNC_OFFSET(20314, glVertexAttrib2sARB, glVertexAttrib2sARB, NULL, 483),
-    NAME_FUNC_OFFSET(20331, glVertexAttrib2svARB, glVertexAttrib2svARB, NULL, 484),
-    NAME_FUNC_OFFSET(20349, glVertexAttrib3dARB, glVertexAttrib3dARB, NULL, 485),
-    NAME_FUNC_OFFSET(20366, glVertexAttrib3dvARB, glVertexAttrib3dvARB, NULL, 486),
-    NAME_FUNC_OFFSET(20384, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, 487),
-    NAME_FUNC_OFFSET(20401, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, 488),
-    NAME_FUNC_OFFSET(20419, glVertexAttrib3sARB, glVertexAttrib3sARB, NULL, 489),
-    NAME_FUNC_OFFSET(20436, glVertexAttrib3svARB, glVertexAttrib3svARB, NULL, 490),
-    NAME_FUNC_OFFSET(20454, glVertexAttrib4NbvARB, glVertexAttrib4NbvARB, NULL, 491),
-    NAME_FUNC_OFFSET(20473, glVertexAttrib4NivARB, glVertexAttrib4NivARB, NULL, 492),
-    NAME_FUNC_OFFSET(20492, glVertexAttrib4NsvARB, glVertexAttrib4NsvARB, NULL, 493),
-    NAME_FUNC_OFFSET(20511, glVertexAttrib4NubARB, glVertexAttrib4NubARB, NULL, 494),
-    NAME_FUNC_OFFSET(20530, glVertexAttrib4NubvARB, glVertexAttrib4NubvARB, NULL, 495),
-    NAME_FUNC_OFFSET(20550, glVertexAttrib4NuivARB, glVertexAttrib4NuivARB, NULL, 496),
-    NAME_FUNC_OFFSET(20570, glVertexAttrib4NusvARB, glVertexAttrib4NusvARB, NULL, 497),
-    NAME_FUNC_OFFSET(20590, glVertexAttrib4bvARB, glVertexAttrib4bvARB, NULL, 498),
-    NAME_FUNC_OFFSET(20608, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL, 499),
-    NAME_FUNC_OFFSET(20625, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL, 500),
-    NAME_FUNC_OFFSET(20643, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, 501),
-    NAME_FUNC_OFFSET(20660, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, 502),
-    NAME_FUNC_OFFSET(20678, glVertexAttrib4ivARB, glVertexAttrib4ivARB, NULL, 503),
-    NAME_FUNC_OFFSET(20696, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL, 504),
-    NAME_FUNC_OFFSET(20713, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL, 505),
-    NAME_FUNC_OFFSET(20731, glVertexAttrib4ubvARB, glVertexAttrib4ubvARB, NULL, 506),
-    NAME_FUNC_OFFSET(20750, glVertexAttrib4uivARB, glVertexAttrib4uivARB, NULL, 507),
-    NAME_FUNC_OFFSET(20769, glVertexAttrib4usvARB, glVertexAttrib4usvARB, NULL, 508),
-    NAME_FUNC_OFFSET(20788, glVertexAttribPointerARB, glVertexAttribPointerARB, NULL, 509),
-    NAME_FUNC_OFFSET(20810, glBindBufferARB, glBindBufferARB, NULL, 510),
-    NAME_FUNC_OFFSET(20823, glBufferDataARB, glBufferDataARB, NULL, 511),
-    NAME_FUNC_OFFSET(20836, glBufferSubDataARB, glBufferSubDataARB, NULL, 512),
-    NAME_FUNC_OFFSET(20852, glDeleteBuffersARB, glDeleteBuffersARB, NULL, 513),
-    NAME_FUNC_OFFSET(20868, glGenBuffersARB, glGenBuffersARB, NULL, 514),
-    NAME_FUNC_OFFSET(20881, glGetBufferParameterivARB, glGetBufferParameterivARB, NULL, 515),
-    NAME_FUNC_OFFSET(20904, glGetBufferPointervARB, glGetBufferPointervARB, NULL, 516),
-    NAME_FUNC_OFFSET(20924, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL, 517),
-    NAME_FUNC_OFFSET(20943, glIsBufferARB, glIsBufferARB, NULL, 518),
-    NAME_FUNC_OFFSET(20954, glMapBufferARB, glMapBufferARB, NULL, 519),
-    NAME_FUNC_OFFSET(20966, glUnmapBufferARB, glUnmapBufferARB, NULL, 520),
-    NAME_FUNC_OFFSET(20980, glBeginQueryARB, glBeginQueryARB, NULL, 521),
-    NAME_FUNC_OFFSET(20993, glDeleteQueriesARB, glDeleteQueriesARB, NULL, 522),
-    NAME_FUNC_OFFSET(21009, glEndQueryARB, glEndQueryARB, NULL, 523),
-    NAME_FUNC_OFFSET(21020, glGenQueriesARB, glGenQueriesARB, NULL, 524),
-    NAME_FUNC_OFFSET(21033, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL, 525),
-    NAME_FUNC_OFFSET(21052, glGetQueryObjectuivARB, glGetQueryObjectuivARB, NULL, 526),
-    NAME_FUNC_OFFSET(21072, glGetQueryivARB, glGetQueryivARB, NULL, 527),
-    NAME_FUNC_OFFSET(21085, glIsQueryARB, glIsQueryARB, NULL, 528),
-    NAME_FUNC_OFFSET(21095, glCompileShaderARB, glCompileShaderARB, NULL, 530),
-    NAME_FUNC_OFFSET(21111, glGetActiveUniformARB, glGetActiveUniformARB, NULL, 535),
-    NAME_FUNC_OFFSET(21130, glGetShaderSourceARB, glGetShaderSourceARB, NULL, 541),
-    NAME_FUNC_OFFSET(21148, glGetUniformLocationARB, glGetUniformLocationARB, NULL, 542),
-    NAME_FUNC_OFFSET(21169, glGetUniformfvARB, glGetUniformfvARB, NULL, 543),
-    NAME_FUNC_OFFSET(21184, glGetUniformivARB, glGetUniformivARB, NULL, 544),
-    NAME_FUNC_OFFSET(21199, glLinkProgramARB, glLinkProgramARB, NULL, 545),
-    NAME_FUNC_OFFSET(21213, glShaderSourceARB, glShaderSourceARB, NULL, 546),
-    NAME_FUNC_OFFSET(21228, glUniform1fARB, glUniform1fARB, NULL, 547),
-    NAME_FUNC_OFFSET(21240, glUniform1fvARB, glUniform1fvARB, NULL, 548),
-    NAME_FUNC_OFFSET(21253, glUniform1iARB, glUniform1iARB, NULL, 549),
-    NAME_FUNC_OFFSET(21265, glUniform1ivARB, glUniform1ivARB, NULL, 550),
-    NAME_FUNC_OFFSET(21278, glUniform2fARB, glUniform2fARB, NULL, 551),
-    NAME_FUNC_OFFSET(21290, glUniform2fvARB, glUniform2fvARB, NULL, 552),
-    NAME_FUNC_OFFSET(21303, glUniform2iARB, glUniform2iARB, NULL, 553),
-    NAME_FUNC_OFFSET(21315, glUniform2ivARB, glUniform2ivARB, NULL, 554),
-    NAME_FUNC_OFFSET(21328, glUniform3fARB, glUniform3fARB, NULL, 555),
-    NAME_FUNC_OFFSET(21340, glUniform3fvARB, glUniform3fvARB, NULL, 556),
-    NAME_FUNC_OFFSET(21353, glUniform3iARB, glUniform3iARB, NULL, 557),
-    NAME_FUNC_OFFSET(21365, glUniform3ivARB, glUniform3ivARB, NULL, 558),
-    NAME_FUNC_OFFSET(21378, glUniform4fARB, glUniform4fARB, NULL, 559),
-    NAME_FUNC_OFFSET(21390, glUniform4fvARB, glUniform4fvARB, NULL, 560),
-    NAME_FUNC_OFFSET(21403, glUniform4iARB, glUniform4iARB, NULL, 561),
-    NAME_FUNC_OFFSET(21415, glUniform4ivARB, glUniform4ivARB, NULL, 562),
-    NAME_FUNC_OFFSET(21428, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL, 563),
-    NAME_FUNC_OFFSET(21447, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL, 564),
-    NAME_FUNC_OFFSET(21466, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL, 565),
-    NAME_FUNC_OFFSET(21485, glUseProgramObjectARB, glUseProgramObjectARB, NULL, 566),
-    NAME_FUNC_OFFSET(21498, glValidateProgramARB, glValidateProgramARB, NULL, 567),
-    NAME_FUNC_OFFSET(21516, glBindAttribLocationARB, glBindAttribLocationARB, NULL, 568),
-    NAME_FUNC_OFFSET(21537, glGetActiveAttribARB, glGetActiveAttribARB, NULL, 569),
-    NAME_FUNC_OFFSET(21555, glGetAttribLocationARB, glGetAttribLocationARB, NULL, 570),
-    NAME_FUNC_OFFSET(21575, glDrawBuffersARB, glDrawBuffersARB, NULL, 571),
-    NAME_FUNC_OFFSET(21589, glDrawBuffersARB, glDrawBuffersARB, NULL, 571),
-    NAME_FUNC_OFFSET(21606, glDrawBuffersARB, glDrawBuffersARB, NULL, 571),
-    NAME_FUNC_OFFSET(21622, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 573),
-    NAME_FUNC_OFFSET(21647, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 573),
-    NAME_FUNC_OFFSET(21669, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 574),
-    NAME_FUNC_OFFSET(21696, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 574),
-    NAME_FUNC_OFFSET(21720, glRenderbufferStorageMultisample, glRenderbufferStorageMultisample, NULL, 575),
-    NAME_FUNC_OFFSET(21756, glBlendEquationSeparateiARB, glBlendEquationSeparateiARB, NULL, 597),
-    NAME_FUNC_OFFSET(21790, glBlendEquationiARB, glBlendEquationiARB, NULL, 598),
-    NAME_FUNC_OFFSET(21816, glBlendFuncSeparateiARB, glBlendFuncSeparateiARB, NULL, 599),
-    NAME_FUNC_OFFSET(21846, glBlendFunciARB, glBlendFunciARB, NULL, 600),
-    NAME_FUNC_OFFSET(21868, gl_dispatch_stub_698, gl_dispatch_stub_698, NULL, 698),
-    NAME_FUNC_OFFSET(21884, gl_dispatch_stub_699, gl_dispatch_stub_699, NULL, 699),
-    NAME_FUNC_OFFSET(21903, glPointParameterfEXT, glPointParameterfEXT, NULL, 706),
-    NAME_FUNC_OFFSET(21921, glPointParameterfEXT, glPointParameterfEXT, NULL, 706),
-    NAME_FUNC_OFFSET(21942, glPointParameterfEXT, glPointParameterfEXT, NULL, 706),
-    NAME_FUNC_OFFSET(21964, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 707),
-    NAME_FUNC_OFFSET(21983, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 707),
-    NAME_FUNC_OFFSET(22005, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 707),
-    NAME_FUNC_OFFSET(22028, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, 710),
-    NAME_FUNC_OFFSET(22047, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, 711),
-    NAME_FUNC_OFFSET(22067, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, 712),
-    NAME_FUNC_OFFSET(22086, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, 713),
-    NAME_FUNC_OFFSET(22106, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, 714),
-    NAME_FUNC_OFFSET(22125, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, 715),
-    NAME_FUNC_OFFSET(22145, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, 716),
-    NAME_FUNC_OFFSET(22164, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, 717),
-    NAME_FUNC_OFFSET(22184, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, 718),
-    NAME_FUNC_OFFSET(22203, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, 719),
-    NAME_FUNC_OFFSET(22223, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, 720),
-    NAME_FUNC_OFFSET(22243, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, 721),
-    NAME_FUNC_OFFSET(22264, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, 722),
-    NAME_FUNC_OFFSET(22284, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, 723),
-    NAME_FUNC_OFFSET(22305, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, 724),
-    NAME_FUNC_OFFSET(22325, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, 725),
-    NAME_FUNC_OFFSET(22346, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, 726),
-    NAME_FUNC_OFFSET(22370, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, 727),
-    NAME_FUNC_OFFSET(22388, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, 728),
-    NAME_FUNC_OFFSET(22408, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, 729),
-    NAME_FUNC_OFFSET(22426, glFogCoorddEXT, glFogCoorddEXT, NULL, 730),
-    NAME_FUNC_OFFSET(22438, glFogCoorddvEXT, glFogCoorddvEXT, NULL, 731),
-    NAME_FUNC_OFFSET(22451, glFogCoordfEXT, glFogCoordfEXT, NULL, 732),
-    NAME_FUNC_OFFSET(22463, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 733),
-    NAME_FUNC_OFFSET(22476, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, 735),
-    NAME_FUNC_OFFSET(22496, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, 735),
-    NAME_FUNC_OFFSET(22520, glWindowPos2dMESA, glWindowPos2dMESA, NULL, 752),
-    NAME_FUNC_OFFSET(22534, glWindowPos2dMESA, glWindowPos2dMESA, NULL, 752),
-    NAME_FUNC_OFFSET(22551, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, 753),
-    NAME_FUNC_OFFSET(22566, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, 753),
-    NAME_FUNC_OFFSET(22584, glWindowPos2fMESA, glWindowPos2fMESA, NULL, 754),
-    NAME_FUNC_OFFSET(22598, glWindowPos2fMESA, glWindowPos2fMESA, NULL, 754),
-    NAME_FUNC_OFFSET(22615, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, 755),
-    NAME_FUNC_OFFSET(22630, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, 755),
-    NAME_FUNC_OFFSET(22648, glWindowPos2iMESA, glWindowPos2iMESA, NULL, 756),
-    NAME_FUNC_OFFSET(22662, glWindowPos2iMESA, glWindowPos2iMESA, NULL, 756),
-    NAME_FUNC_OFFSET(22679, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, 757),
-    NAME_FUNC_OFFSET(22694, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, 757),
-    NAME_FUNC_OFFSET(22712, glWindowPos2sMESA, glWindowPos2sMESA, NULL, 758),
-    NAME_FUNC_OFFSET(22726, glWindowPos2sMESA, glWindowPos2sMESA, NULL, 758),
-    NAME_FUNC_OFFSET(22743, glWindowPos2svMESA, glWindowPos2svMESA, NULL, 759),
-    NAME_FUNC_OFFSET(22758, glWindowPos2svMESA, glWindowPos2svMESA, NULL, 759),
-    NAME_FUNC_OFFSET(22776, glWindowPos3dMESA, glWindowPos3dMESA, NULL, 760),
-    NAME_FUNC_OFFSET(22790, glWindowPos3dMESA, glWindowPos3dMESA, NULL, 760),
-    NAME_FUNC_OFFSET(22807, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, 761),
-    NAME_FUNC_OFFSET(22822, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, 761),
-    NAME_FUNC_OFFSET(22840, glWindowPos3fMESA, glWindowPos3fMESA, NULL, 762),
-    NAME_FUNC_OFFSET(22854, glWindowPos3fMESA, glWindowPos3fMESA, NULL, 762),
-    NAME_FUNC_OFFSET(22871, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, 763),
-    NAME_FUNC_OFFSET(22886, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, 763),
-    NAME_FUNC_OFFSET(22904, glWindowPos3iMESA, glWindowPos3iMESA, NULL, 764),
-    NAME_FUNC_OFFSET(22918, glWindowPos3iMESA, glWindowPos3iMESA, NULL, 764),
-    NAME_FUNC_OFFSET(22935, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, 765),
-    NAME_FUNC_OFFSET(22950, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, 765),
-    NAME_FUNC_OFFSET(22968, glWindowPos3sMESA, glWindowPos3sMESA, NULL, 766),
-    NAME_FUNC_OFFSET(22982, glWindowPos3sMESA, glWindowPos3sMESA, NULL, 766),
-    NAME_FUNC_OFFSET(22999, glWindowPos3svMESA, glWindowPos3svMESA, NULL, 767),
-    NAME_FUNC_OFFSET(23014, glWindowPos3svMESA, glWindowPos3svMESA, NULL, 767),
-    NAME_FUNC_OFFSET(23032, glBindProgramNV, glBindProgramNV, NULL, 786),
-    NAME_FUNC_OFFSET(23049, glDeleteProgramsNV, glDeleteProgramsNV, NULL, 787),
-    NAME_FUNC_OFFSET(23069, glGenProgramsNV, glGenProgramsNV, NULL, 789),
-    NAME_FUNC_OFFSET(23086, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, 795),
-    NAME_FUNC_OFFSET(23112, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, 795),
-    NAME_FUNC_OFFSET(23141, glIsProgramNV, glIsProgramNV, NULL, 799),
-    NAME_FUNC_OFFSET(23156, glPointParameteriNV, glPointParameteriNV, NULL, 863),
-    NAME_FUNC_OFFSET(23174, glPointParameterivNV, glPointParameterivNV, NULL, 864),
-    NAME_FUNC_OFFSET(23193, gl_dispatch_stub_867, gl_dispatch_stub_867, NULL, 867),
-    NAME_FUNC_OFFSET(23214, gl_dispatch_stub_869, gl_dispatch_stub_869, NULL, 869),
-    NAME_FUNC_OFFSET(23230, glPrimitiveRestartIndexNV, glPrimitiveRestartIndexNV, NULL, 876),
-    NAME_FUNC_OFFSET(23254, gl_dispatch_stub_879, gl_dispatch_stub_879, NULL, 879),
-    NAME_FUNC_OFFSET(23278, gl_dispatch_stub_879, gl_dispatch_stub_879, NULL, 879),
-    NAME_FUNC_OFFSET(23305, glBindFramebufferEXT, glBindFramebufferEXT, NULL, 880),
-    NAME_FUNC_OFFSET(23323, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, 881),
-    NAME_FUNC_OFFSET(23342, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, 882),
-    NAME_FUNC_OFFSET(23367, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, 883),
-    NAME_FUNC_OFFSET(23388, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, 884),
-    NAME_FUNC_OFFSET(23410, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, 885),
-    NAME_FUNC_OFFSET(23436, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, 886),
-    NAME_FUNC_OFFSET(23459, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, 887),
-    NAME_FUNC_OFFSET(23482, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, 888),
-    NAME_FUNC_OFFSET(23505, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, 889),
-    NAME_FUNC_OFFSET(23523, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, 890),
-    NAME_FUNC_OFFSET(23542, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, 891),
-    NAME_FUNC_OFFSET(23559, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, 892),
-    NAME_FUNC_OFFSET(23597, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, 893),
-    NAME_FUNC_OFFSET(23626, glIsFramebufferEXT, glIsFramebufferEXT, NULL, 894),
-    NAME_FUNC_OFFSET(23642, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, 895),
-    NAME_FUNC_OFFSET(23659, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, 896),
-    NAME_FUNC_OFFSET(23681, gl_dispatch_stub_897, gl_dispatch_stub_897, NULL, 897),
-    NAME_FUNC_OFFSET(23699, glBindFragDataLocationEXT, glBindFragDataLocationEXT, NULL, 900),
-    NAME_FUNC_OFFSET(23722, glGetFragDataLocationEXT, glGetFragDataLocationEXT, NULL, 901),
-    NAME_FUNC_OFFSET(23744, glGetUniformuivEXT, glGetUniformuivEXT, NULL, 902),
-    NAME_FUNC_OFFSET(23760, glGetVertexAttribIivEXT, glGetVertexAttribIivEXT, NULL, 903),
-    NAME_FUNC_OFFSET(23781, glGetVertexAttribIuivEXT, glGetVertexAttribIuivEXT, NULL, 904),
-    NAME_FUNC_OFFSET(23803, glUniform1uiEXT, glUniform1uiEXT, NULL, 905),
-    NAME_FUNC_OFFSET(23816, glUniform1uivEXT, glUniform1uivEXT, NULL, 906),
-    NAME_FUNC_OFFSET(23830, glUniform2uiEXT, glUniform2uiEXT, NULL, 907),
-    NAME_FUNC_OFFSET(23843, glUniform2uivEXT, glUniform2uivEXT, NULL, 908),
-    NAME_FUNC_OFFSET(23857, glUniform3uiEXT, glUniform3uiEXT, NULL, 909),
-    NAME_FUNC_OFFSET(23870, glUniform3uivEXT, glUniform3uivEXT, NULL, 910),
-    NAME_FUNC_OFFSET(23884, glUniform4uiEXT, glUniform4uiEXT, NULL, 911),
-    NAME_FUNC_OFFSET(23897, glUniform4uivEXT, glUniform4uivEXT, NULL, 912),
-    NAME_FUNC_OFFSET(23911, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL, 913),
-    NAME_FUNC_OFFSET(23929, glVertexAttribI1ivEXT, glVertexAttribI1ivEXT, NULL, 914),
-    NAME_FUNC_OFFSET(23948, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL, 915),
-    NAME_FUNC_OFFSET(23967, glVertexAttribI1uivEXT, glVertexAttribI1uivEXT, NULL, 916),
-    NAME_FUNC_OFFSET(23987, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL, 917),
-    NAME_FUNC_OFFSET(24005, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL, 918),
-    NAME_FUNC_OFFSET(24024, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL, 919),
-    NAME_FUNC_OFFSET(24043, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT, NULL, 920),
-    NAME_FUNC_OFFSET(24063, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL, 921),
-    NAME_FUNC_OFFSET(24081, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL, 922),
-    NAME_FUNC_OFFSET(24100, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL, 923),
-    NAME_FUNC_OFFSET(24119, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT, NULL, 924),
-    NAME_FUNC_OFFSET(24139, glVertexAttribI4bvEXT, glVertexAttribI4bvEXT, NULL, 925),
-    NAME_FUNC_OFFSET(24158, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL, 926),
-    NAME_FUNC_OFFSET(24176, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL, 927),
-    NAME_FUNC_OFFSET(24195, glVertexAttribI4svEXT, glVertexAttribI4svEXT, NULL, 928),
-    NAME_FUNC_OFFSET(24214, glVertexAttribI4ubvEXT, glVertexAttribI4ubvEXT, NULL, 929),
-    NAME_FUNC_OFFSET(24234, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL, 930),
-    NAME_FUNC_OFFSET(24253, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT, NULL, 931),
-    NAME_FUNC_OFFSET(24273, glVertexAttribI4usvEXT, glVertexAttribI4usvEXT, NULL, 932),
-    NAME_FUNC_OFFSET(24293, glVertexAttribIPointerEXT, glVertexAttribIPointerEXT, NULL, 933),
-    NAME_FUNC_OFFSET(24316, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, 934),
-    NAME_FUNC_OFFSET(24342, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, 934),
-    NAME_FUNC_OFFSET(24371, glColorMaskIndexedEXT, glColorMaskIndexedEXT, NULL, 935),
-    NAME_FUNC_OFFSET(24384, glDisableIndexedEXT, glDisableIndexedEXT, NULL, 936),
-    NAME_FUNC_OFFSET(24395, glEnableIndexedEXT, glEnableIndexedEXT, NULL, 937),
-    NAME_FUNC_OFFSET(24405, glGetBooleanIndexedvEXT, glGetBooleanIndexedvEXT, NULL, 938),
-    NAME_FUNC_OFFSET(24421, glGetIntegerIndexedvEXT, glGetIntegerIndexedvEXT, NULL, 939),
-    NAME_FUNC_OFFSET(24437, glIsEnabledIndexedEXT, glIsEnabledIndexedEXT, NULL, 940),
-    NAME_FUNC_OFFSET(24450, glGetTexParameterIivEXT, glGetTexParameterIivEXT, NULL, 943),
-    NAME_FUNC_OFFSET(24471, glGetTexParameterIuivEXT, glGetTexParameterIuivEXT, NULL, 944),
-    NAME_FUNC_OFFSET(24493, glTexParameterIivEXT, glTexParameterIivEXT, NULL, 945),
-    NAME_FUNC_OFFSET(24511, glTexParameterIuivEXT, glTexParameterIuivEXT, NULL, 946),
-    NAME_FUNC_OFFSET(24530, glBeginConditionalRenderNV, glBeginConditionalRenderNV, NULL, 947),
-    NAME_FUNC_OFFSET(24555, glEndConditionalRenderNV, glEndConditionalRenderNV, NULL, 948),
-    NAME_FUNC_OFFSET(24578, glBeginTransformFeedbackEXT, glBeginTransformFeedbackEXT, NULL, 949),
-    NAME_FUNC_OFFSET(24603, glBindBufferBaseEXT, glBindBufferBaseEXT, NULL, 950),
-    NAME_FUNC_OFFSET(24620, glBindBufferRangeEXT, glBindBufferRangeEXT, NULL, 952),
-    NAME_FUNC_OFFSET(24638, glEndTransformFeedbackEXT, glEndTransformFeedbackEXT, NULL, 953),
-    NAME_FUNC_OFFSET(24661, glGetTransformFeedbackVaryingEXT, glGetTransformFeedbackVaryingEXT, NULL, 954),
-    NAME_FUNC_OFFSET(24691, glTransformFeedbackVaryingsEXT, glTransformFeedbackVaryingsEXT, NULL, 955),
-    NAME_FUNC_OFFSET(24719, glProvokingVertexEXT, glProvokingVertexEXT, NULL, 956),
+    NAME_FUNC_OFFSET(10945, glDebugMessageCallbackARB, glDebugMessageCallbackARB, NULL, 665),
+    NAME_FUNC_OFFSET(10971, glDebugMessageControlARB, glDebugMessageControlARB, NULL, 666),
+    NAME_FUNC_OFFSET(10996, glDebugMessageInsertARB, glDebugMessageInsertARB, NULL, 667),
+    NAME_FUNC_OFFSET(11020, glGetDebugMessageLogARB, glGetDebugMessageLogARB, NULL, 668),
+    NAME_FUNC_OFFSET(11044, glGetGraphicsResetStatusARB, glGetGraphicsResetStatusARB, NULL, 669),
+    NAME_FUNC_OFFSET(11072, glGetnColorTableARB, glGetnColorTableARB, NULL, 670),
+    NAME_FUNC_OFFSET(11092, glGetnCompressedTexImageARB, glGetnCompressedTexImageARB, NULL, 671),
+    NAME_FUNC_OFFSET(11120, glGetnConvolutionFilterARB, glGetnConvolutionFilterARB, NULL, 672),
+    NAME_FUNC_OFFSET(11147, glGetnHistogramARB, glGetnHistogramARB, NULL, 673),
+    NAME_FUNC_OFFSET(11166, glGetnMapdvARB, glGetnMapdvARB, NULL, 674),
+    NAME_FUNC_OFFSET(11181, glGetnMapfvARB, glGetnMapfvARB, NULL, 675),
+    NAME_FUNC_OFFSET(11196, glGetnMapivARB, glGetnMapivARB, NULL, 676),
+    NAME_FUNC_OFFSET(11211, glGetnMinmaxARB, glGetnMinmaxARB, NULL, 677),
+    NAME_FUNC_OFFSET(11227, glGetnPixelMapfvARB, glGetnPixelMapfvARB, NULL, 678),
+    NAME_FUNC_OFFSET(11247, glGetnPixelMapuivARB, glGetnPixelMapuivARB, NULL, 679),
+    NAME_FUNC_OFFSET(11268, glGetnPixelMapusvARB, glGetnPixelMapusvARB, NULL, 680),
+    NAME_FUNC_OFFSET(11289, glGetnPolygonStippleARB, glGetnPolygonStippleARB, NULL, 681),
+    NAME_FUNC_OFFSET(11313, glGetnSeparableFilterARB, glGetnSeparableFilterARB, NULL, 682),
+    NAME_FUNC_OFFSET(11338, glGetnTexImageARB, glGetnTexImageARB, NULL, 683),
+    NAME_FUNC_OFFSET(11356, glGetnUniformdvARB, glGetnUniformdvARB, NULL, 684),
+    NAME_FUNC_OFFSET(11375, glGetnUniformfvARB, glGetnUniformfvARB, NULL, 685),
+    NAME_FUNC_OFFSET(11394, glGetnUniformivARB, glGetnUniformivARB, NULL, 686),
+    NAME_FUNC_OFFSET(11413, glGetnUniformuivARB, glGetnUniformuivARB, NULL, 687),
+    NAME_FUNC_OFFSET(11433, glReadnPixelsARB, glReadnPixelsARB, NULL, 688),
+    NAME_FUNC_OFFSET(11450, glTexStorage1D, glTexStorage1D, NULL, 689),
+    NAME_FUNC_OFFSET(11465, glTexStorage2D, glTexStorage2D, NULL, 690),
+    NAME_FUNC_OFFSET(11480, glTexStorage3D, glTexStorage3D, NULL, 691),
+    NAME_FUNC_OFFSET(11495, glTextureStorage1DEXT, glTextureStorage1DEXT, NULL, 692),
+    NAME_FUNC_OFFSET(11517, glTextureStorage2DEXT, glTextureStorage2DEXT, NULL, 693),
+    NAME_FUNC_OFFSET(11539, glTextureStorage3DEXT, glTextureStorage3DEXT, NULL, 694),
+    NAME_FUNC_OFFSET(11561, glPolygonOffsetEXT, glPolygonOffsetEXT, NULL, 695),
+    NAME_FUNC_OFFSET(11580, gl_dispatch_stub_696, gl_dispatch_stub_696, NULL, 696),
+    NAME_FUNC_OFFSET(11612, gl_dispatch_stub_697, gl_dispatch_stub_697, NULL, 697),
+    NAME_FUNC_OFFSET(11644, gl_dispatch_stub_698, gl_dispatch_stub_698, NULL, 698),
+    NAME_FUNC_OFFSET(11672, gl_dispatch_stub_699, gl_dispatch_stub_699, NULL, 699),
+    NAME_FUNC_OFFSET(11701, gl_dispatch_stub_700, gl_dispatch_stub_700, NULL, 700),
+    NAME_FUNC_OFFSET(11729, gl_dispatch_stub_701, gl_dispatch_stub_701, NULL, 701),
+    NAME_FUNC_OFFSET(11758, gl_dispatch_stub_702, gl_dispatch_stub_702, NULL, 702),
+    NAME_FUNC_OFFSET(11775, gl_dispatch_stub_703, gl_dispatch_stub_703, NULL, 703),
+    NAME_FUNC_OFFSET(11795, glColorPointerEXT, glColorPointerEXT, NULL, 704),
+    NAME_FUNC_OFFSET(11813, glEdgeFlagPointerEXT, glEdgeFlagPointerEXT, NULL, 705),
+    NAME_FUNC_OFFSET(11834, glIndexPointerEXT, glIndexPointerEXT, NULL, 706),
+    NAME_FUNC_OFFSET(11852, glNormalPointerEXT, glNormalPointerEXT, NULL, 707),
+    NAME_FUNC_OFFSET(11871, glTexCoordPointerEXT, glTexCoordPointerEXT, NULL, 708),
+    NAME_FUNC_OFFSET(11892, glVertexPointerEXT, glVertexPointerEXT, NULL, 709),
+    NAME_FUNC_OFFSET(11911, glPointParameterfEXT, glPointParameterfEXT, NULL, 710),
+    NAME_FUNC_OFFSET(11932, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 711),
+    NAME_FUNC_OFFSET(11954, glLockArraysEXT, glLockArraysEXT, NULL, 712),
+    NAME_FUNC_OFFSET(11970, glUnlockArraysEXT, glUnlockArraysEXT, NULL, 713),
+    NAME_FUNC_OFFSET(11988, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, 714),
+    NAME_FUNC_OFFSET(12010, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, 715),
+    NAME_FUNC_OFFSET(12033, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, 716),
+    NAME_FUNC_OFFSET(12055, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, 717),
+    NAME_FUNC_OFFSET(12078, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, 718),
+    NAME_FUNC_OFFSET(12100, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, 719),
+    NAME_FUNC_OFFSET(12123, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, 720),
+    NAME_FUNC_OFFSET(12145, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, 721),
+    NAME_FUNC_OFFSET(12168, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, 722),
+    NAME_FUNC_OFFSET(12190, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, 723),
+    NAME_FUNC_OFFSET(12213, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, 724),
+    NAME_FUNC_OFFSET(12236, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, 725),
+    NAME_FUNC_OFFSET(12260, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, 726),
+    NAME_FUNC_OFFSET(12283, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, 727),
+    NAME_FUNC_OFFSET(12307, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, 728),
+    NAME_FUNC_OFFSET(12330, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, 729),
+    NAME_FUNC_OFFSET(12354, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, 730),
+    NAME_FUNC_OFFSET(12381, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, 731),
+    NAME_FUNC_OFFSET(12402, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, 732),
+    NAME_FUNC_OFFSET(12425, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, 733),
+    NAME_FUNC_OFFSET(12446, glFogCoorddEXT, glFogCoorddEXT, NULL, 734),
+    NAME_FUNC_OFFSET(12461, glFogCoorddvEXT, glFogCoorddvEXT, NULL, 735),
+    NAME_FUNC_OFFSET(12477, glFogCoordfEXT, glFogCoordfEXT, NULL, 736),
+    NAME_FUNC_OFFSET(12492, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 737),
+    NAME_FUNC_OFFSET(12508, gl_dispatch_stub_738, gl_dispatch_stub_738, NULL, 738),
+    NAME_FUNC_OFFSET(12526, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, 739),
+    NAME_FUNC_OFFSET(12549, glFlushVertexArrayRangeNV, glFlushVertexArrayRangeNV, NULL, 740),
+    NAME_FUNC_OFFSET(12575, glVertexArrayRangeNV, glVertexArrayRangeNV, NULL, 741),
+    NAME_FUNC_OFFSET(12596, glCombinerInputNV, glCombinerInputNV, NULL, 742),
+    NAME_FUNC_OFFSET(12614, glCombinerOutputNV, glCombinerOutputNV, NULL, 743),
+    NAME_FUNC_OFFSET(12633, glCombinerParameterfNV, glCombinerParameterfNV, NULL, 744),
+    NAME_FUNC_OFFSET(12656, glCombinerParameterfvNV, glCombinerParameterfvNV, NULL, 745),
+    NAME_FUNC_OFFSET(12680, glCombinerParameteriNV, glCombinerParameteriNV, NULL, 746),
+    NAME_FUNC_OFFSET(12703, glCombinerParameterivNV, glCombinerParameterivNV, NULL, 747),
+    NAME_FUNC_OFFSET(12727, glFinalCombinerInputNV, glFinalCombinerInputNV, NULL, 748),
+    NAME_FUNC_OFFSET(12750, glGetCombinerInputParameterfvNV, glGetCombinerInputParameterfvNV, NULL, 749),
+    NAME_FUNC_OFFSET(12782, glGetCombinerInputParameterivNV, glGetCombinerInputParameterivNV, NULL, 750),
+    NAME_FUNC_OFFSET(12814, glGetCombinerOutputParameterfvNV, glGetCombinerOutputParameterfvNV, NULL, 751),
+    NAME_FUNC_OFFSET(12847, glGetCombinerOutputParameterivNV, glGetCombinerOutputParameterivNV, NULL, 752),
+    NAME_FUNC_OFFSET(12880, glGetFinalCombinerInputParameterfvNV, glGetFinalCombinerInputParameterfvNV, NULL, 753),
+    NAME_FUNC_OFFSET(12917, glGetFinalCombinerInputParameterivNV, glGetFinalCombinerInputParameterivNV, NULL, 754),
+    NAME_FUNC_OFFSET(12954, glResizeBuffersMESA, glResizeBuffersMESA, NULL, 755),
+    NAME_FUNC_OFFSET(12974, glWindowPos2dMESA, glWindowPos2dMESA, NULL, 756),
+    NAME_FUNC_OFFSET(12992, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, 757),
+    NAME_FUNC_OFFSET(13011, glWindowPos2fMESA, glWindowPos2fMESA, NULL, 758),
+    NAME_FUNC_OFFSET(13029, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, 759),
+    NAME_FUNC_OFFSET(13048, glWindowPos2iMESA, glWindowPos2iMESA, NULL, 760),
+    NAME_FUNC_OFFSET(13066, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, 761),
+    NAME_FUNC_OFFSET(13085, glWindowPos2sMESA, glWindowPos2sMESA, NULL, 762),
+    NAME_FUNC_OFFSET(13103, glWindowPos2svMESA, glWindowPos2svMESA, NULL, 763),
+    NAME_FUNC_OFFSET(13122, glWindowPos3dMESA, glWindowPos3dMESA, NULL, 764),
+    NAME_FUNC_OFFSET(13140, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, 765),
+    NAME_FUNC_OFFSET(13159, glWindowPos3fMESA, glWindowPos3fMESA, NULL, 766),
+    NAME_FUNC_OFFSET(13177, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, 767),
+    NAME_FUNC_OFFSET(13196, glWindowPos3iMESA, glWindowPos3iMESA, NULL, 768),
+    NAME_FUNC_OFFSET(13214, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, 769),
+    NAME_FUNC_OFFSET(13233, glWindowPos3sMESA, glWindowPos3sMESA, NULL, 770),
+    NAME_FUNC_OFFSET(13251, glWindowPos3svMESA, glWindowPos3svMESA, NULL, 771),
+    NAME_FUNC_OFFSET(13270, glWindowPos4dMESA, glWindowPos4dMESA, NULL, 772),
+    NAME_FUNC_OFFSET(13288, glWindowPos4dvMESA, glWindowPos4dvMESA, NULL, 773),
+    NAME_FUNC_OFFSET(13307, glWindowPos4fMESA, glWindowPos4fMESA, NULL, 774),
+    NAME_FUNC_OFFSET(13325, glWindowPos4fvMESA, glWindowPos4fvMESA, NULL, 775),
+    NAME_FUNC_OFFSET(13344, glWindowPos4iMESA, glWindowPos4iMESA, NULL, 776),
+    NAME_FUNC_OFFSET(13362, glWindowPos4ivMESA, glWindowPos4ivMESA, NULL, 777),
+    NAME_FUNC_OFFSET(13381, glWindowPos4sMESA, glWindowPos4sMESA, NULL, 778),
+    NAME_FUNC_OFFSET(13399, glWindowPos4svMESA, glWindowPos4svMESA, NULL, 779),
+    NAME_FUNC_OFFSET(13418, gl_dispatch_stub_780, gl_dispatch_stub_780, NULL, 780),
+    NAME_FUNC_OFFSET(13443, gl_dispatch_stub_781, gl_dispatch_stub_781, NULL, 781),
+    NAME_FUNC_OFFSET(13470, gl_dispatch_stub_782, gl_dispatch_stub_782, NULL, 782),
+    NAME_FUNC_OFFSET(13487, gl_dispatch_stub_783, gl_dispatch_stub_783, NULL, 783),
+    NAME_FUNC_OFFSET(13503, gl_dispatch_stub_784, gl_dispatch_stub_784, NULL, 784),
+    NAME_FUNC_OFFSET(13517, gl_dispatch_stub_785, gl_dispatch_stub_785, NULL, 785),
+    NAME_FUNC_OFFSET(13532, gl_dispatch_stub_786, gl_dispatch_stub_786, NULL, 786),
+    NAME_FUNC_OFFSET(13544, gl_dispatch_stub_787, gl_dispatch_stub_787, NULL, 787),
+    NAME_FUNC_OFFSET(13557, gl_dispatch_stub_788, gl_dispatch_stub_788, NULL, 788),
+    NAME_FUNC_OFFSET(13571, glAreProgramsResidentNV, glAreProgramsResidentNV, NULL, 789),
+    NAME_FUNC_OFFSET(13595, glBindProgramNV, glBindProgramNV, NULL, 790),
+    NAME_FUNC_OFFSET(13611, glDeleteProgramsNV, glDeleteProgramsNV, NULL, 791),
+    NAME_FUNC_OFFSET(13630, glExecuteProgramNV, glExecuteProgramNV, NULL, 792),
+    NAME_FUNC_OFFSET(13649, glGenProgramsNV, glGenProgramsNV, NULL, 793),
+    NAME_FUNC_OFFSET(13665, glGetProgramParameterdvNV, glGetProgramParameterdvNV, NULL, 794),
+    NAME_FUNC_OFFSET(13691, glGetProgramParameterfvNV, glGetProgramParameterfvNV, NULL, 795),
+    NAME_FUNC_OFFSET(13717, glGetProgramStringNV, glGetProgramStringNV, NULL, 796),
+    NAME_FUNC_OFFSET(13738, glGetProgramivNV, glGetProgramivNV, NULL, 797),
+    NAME_FUNC_OFFSET(13755, glGetTrackMatrixivNV, glGetTrackMatrixivNV, NULL, 798),
+    NAME_FUNC_OFFSET(13776, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, 799),
+    NAME_FUNC_OFFSET(13804, glGetVertexAttribdvNV, glGetVertexAttribdvNV, NULL, 800),
+    NAME_FUNC_OFFSET(13826, glGetVertexAttribfvNV, glGetVertexAttribfvNV, NULL, 801),
+    NAME_FUNC_OFFSET(13848, glGetVertexAttribivNV, glGetVertexAttribivNV, NULL, 802),
+    NAME_FUNC_OFFSET(13870, glIsProgramNV, glIsProgramNV, NULL, 803),
+    NAME_FUNC_OFFSET(13884, glLoadProgramNV, glLoadProgramNV, NULL, 804),
+    NAME_FUNC_OFFSET(13900, glProgramParameters4dvNV, glProgramParameters4dvNV, NULL, 805),
+    NAME_FUNC_OFFSET(13925, glProgramParameters4fvNV, glProgramParameters4fvNV, NULL, 806),
+    NAME_FUNC_OFFSET(13950, glRequestResidentProgramsNV, glRequestResidentProgramsNV, NULL, 807),
+    NAME_FUNC_OFFSET(13978, glTrackMatrixNV, glTrackMatrixNV, NULL, 808),
+    NAME_FUNC_OFFSET(13994, glVertexAttrib1dNV, glVertexAttrib1dNV, NULL, 809),
+    NAME_FUNC_OFFSET(14013, glVertexAttrib1dvNV, glVertexAttrib1dvNV, NULL, 810),
+    NAME_FUNC_OFFSET(14033, glVertexAttrib1fNV, glVertexAttrib1fNV, NULL, 811),
+    NAME_FUNC_OFFSET(14052, glVertexAttrib1fvNV, glVertexAttrib1fvNV, NULL, 812),
+    NAME_FUNC_OFFSET(14072, glVertexAttrib1sNV, glVertexAttrib1sNV, NULL, 813),
+    NAME_FUNC_OFFSET(14091, glVertexAttrib1svNV, glVertexAttrib1svNV, NULL, 814),
+    NAME_FUNC_OFFSET(14111, glVertexAttrib2dNV, glVertexAttrib2dNV, NULL, 815),
+    NAME_FUNC_OFFSET(14130, glVertexAttrib2dvNV, glVertexAttrib2dvNV, NULL, 816),
+    NAME_FUNC_OFFSET(14150, glVertexAttrib2fNV, glVertexAttrib2fNV, NULL, 817),
+    NAME_FUNC_OFFSET(14169, glVertexAttrib2fvNV, glVertexAttrib2fvNV, NULL, 818),
+    NAME_FUNC_OFFSET(14189, glVertexAttrib2sNV, glVertexAttrib2sNV, NULL, 819),
+    NAME_FUNC_OFFSET(14208, glVertexAttrib2svNV, glVertexAttrib2svNV, NULL, 820),
+    NAME_FUNC_OFFSET(14228, glVertexAttrib3dNV, glVertexAttrib3dNV, NULL, 821),
+    NAME_FUNC_OFFSET(14247, glVertexAttrib3dvNV, glVertexAttrib3dvNV, NULL, 822),
+    NAME_FUNC_OFFSET(14267, glVertexAttrib3fNV, glVertexAttrib3fNV, NULL, 823),
+    NAME_FUNC_OFFSET(14286, glVertexAttrib3fvNV, glVertexAttrib3fvNV, NULL, 824),
+    NAME_FUNC_OFFSET(14306, glVertexAttrib3sNV, glVertexAttrib3sNV, NULL, 825),
+    NAME_FUNC_OFFSET(14325, glVertexAttrib3svNV, glVertexAttrib3svNV, NULL, 826),
+    NAME_FUNC_OFFSET(14345, glVertexAttrib4dNV, glVertexAttrib4dNV, NULL, 827),
+    NAME_FUNC_OFFSET(14364, glVertexAttrib4dvNV, glVertexAttrib4dvNV, NULL, 828),
+    NAME_FUNC_OFFSET(14384, glVertexAttrib4fNV, glVertexAttrib4fNV, NULL, 829),
+    NAME_FUNC_OFFSET(14403, glVertexAttrib4fvNV, glVertexAttrib4fvNV, NULL, 830),
+    NAME_FUNC_OFFSET(14423, glVertexAttrib4sNV, glVertexAttrib4sNV, NULL, 831),
+    NAME_FUNC_OFFSET(14442, glVertexAttrib4svNV, glVertexAttrib4svNV, NULL, 832),
+    NAME_FUNC_OFFSET(14462, glVertexAttrib4ubNV, glVertexAttrib4ubNV, NULL, 833),
+    NAME_FUNC_OFFSET(14482, glVertexAttrib4ubvNV, glVertexAttrib4ubvNV, NULL, 834),
+    NAME_FUNC_OFFSET(14503, glVertexAttribPointerNV, glVertexAttribPointerNV, NULL, 835),
+    NAME_FUNC_OFFSET(14527, glVertexAttribs1dvNV, glVertexAttribs1dvNV, NULL, 836),
+    NAME_FUNC_OFFSET(14548, glVertexAttribs1fvNV, glVertexAttribs1fvNV, NULL, 837),
+    NAME_FUNC_OFFSET(14569, glVertexAttribs1svNV, glVertexAttribs1svNV, NULL, 838),
+    NAME_FUNC_OFFSET(14590, glVertexAttribs2dvNV, glVertexAttribs2dvNV, NULL, 839),
+    NAME_FUNC_OFFSET(14611, glVertexAttribs2fvNV, glVertexAttribs2fvNV, NULL, 840),
+    NAME_FUNC_OFFSET(14632, glVertexAttribs2svNV, glVertexAttribs2svNV, NULL, 841),
+    NAME_FUNC_OFFSET(14653, glVertexAttribs3dvNV, glVertexAttribs3dvNV, NULL, 842),
+    NAME_FUNC_OFFSET(14674, glVertexAttribs3fvNV, glVertexAttribs3fvNV, NULL, 843),
+    NAME_FUNC_OFFSET(14695, glVertexAttribs3svNV, glVertexAttribs3svNV, NULL, 844),
+    NAME_FUNC_OFFSET(14716, glVertexAttribs4dvNV, glVertexAttribs4dvNV, NULL, 845),
+    NAME_FUNC_OFFSET(14737, glVertexAttribs4fvNV, glVertexAttribs4fvNV, NULL, 846),
+    NAME_FUNC_OFFSET(14758, glVertexAttribs4svNV, glVertexAttribs4svNV, NULL, 847),
+    NAME_FUNC_OFFSET(14779, glVertexAttribs4ubvNV, glVertexAttribs4ubvNV, NULL, 848),
+    NAME_FUNC_OFFSET(14801, glGetTexBumpParameterfvATI, glGetTexBumpParameterfvATI, NULL, 849),
+    NAME_FUNC_OFFSET(14828, glGetTexBumpParameterivATI, glGetTexBumpParameterivATI, NULL, 850),
+    NAME_FUNC_OFFSET(14855, glTexBumpParameterfvATI, glTexBumpParameterfvATI, NULL, 851),
+    NAME_FUNC_OFFSET(14879, glTexBumpParameterivATI, glTexBumpParameterivATI, NULL, 852),
+    NAME_FUNC_OFFSET(14903, glAlphaFragmentOp1ATI, glAlphaFragmentOp1ATI, NULL, 853),
+    NAME_FUNC_OFFSET(14925, glAlphaFragmentOp2ATI, glAlphaFragmentOp2ATI, NULL, 854),
+    NAME_FUNC_OFFSET(14947, glAlphaFragmentOp3ATI, glAlphaFragmentOp3ATI, NULL, 855),
+    NAME_FUNC_OFFSET(14969, glBeginFragmentShaderATI, glBeginFragmentShaderATI, NULL, 856),
+    NAME_FUNC_OFFSET(14994, glBindFragmentShaderATI, glBindFragmentShaderATI, NULL, 857),
+    NAME_FUNC_OFFSET(15018, glColorFragmentOp1ATI, glColorFragmentOp1ATI, NULL, 858),
+    NAME_FUNC_OFFSET(15040, glColorFragmentOp2ATI, glColorFragmentOp2ATI, NULL, 859),
+    NAME_FUNC_OFFSET(15062, glColorFragmentOp3ATI, glColorFragmentOp3ATI, NULL, 860),
+    NAME_FUNC_OFFSET(15084, glDeleteFragmentShaderATI, glDeleteFragmentShaderATI, NULL, 861),
+    NAME_FUNC_OFFSET(15110, glEndFragmentShaderATI, glEndFragmentShaderATI, NULL, 862),
+    NAME_FUNC_OFFSET(15133, glGenFragmentShadersATI, glGenFragmentShadersATI, NULL, 863),
+    NAME_FUNC_OFFSET(15157, glPassTexCoordATI, glPassTexCoordATI, NULL, 864),
+    NAME_FUNC_OFFSET(15175, glSampleMapATI, glSampleMapATI, NULL, 865),
+    NAME_FUNC_OFFSET(15190, glSetFragmentShaderConstantATI, glSetFragmentShaderConstantATI, NULL, 866),
+    NAME_FUNC_OFFSET(15221, glPointParameteriNV, glPointParameteriNV, NULL, 867),
+    NAME_FUNC_OFFSET(15241, glPointParameterivNV, glPointParameterivNV, NULL, 868),
+    NAME_FUNC_OFFSET(15262, gl_dispatch_stub_869, gl_dispatch_stub_869, NULL, 869),
+    NAME_FUNC_OFFSET(15285, gl_dispatch_stub_870, gl_dispatch_stub_870, NULL, 870),
+    NAME_FUNC_OFFSET(15308, 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(15378, glGetProgramNamedParameterdvNV, glGetProgramNamedParameterdvNV, NULL, 874),
+    NAME_FUNC_OFFSET(15409, glGetProgramNamedParameterfvNV, glGetProgramNamedParameterfvNV, NULL, 875),
+    NAME_FUNC_OFFSET(15440, glProgramNamedParameter4dNV, glProgramNamedParameter4dNV, NULL, 876),
+    NAME_FUNC_OFFSET(15468, glProgramNamedParameter4dvNV, glProgramNamedParameter4dvNV, NULL, 877),
+    NAME_FUNC_OFFSET(15497, glProgramNamedParameter4fNV, glProgramNamedParameter4fNV, NULL, 878),
+    NAME_FUNC_OFFSET(15525, glProgramNamedParameter4fvNV, glProgramNamedParameter4fvNV, NULL, 879),
+    NAME_FUNC_OFFSET(15554, glPrimitiveRestartIndexNV, glPrimitiveRestartIndexNV, NULL, 880),
+    NAME_FUNC_OFFSET(15580, glPrimitiveRestartNV, glPrimitiveRestartNV, NULL, 881),
+    NAME_FUNC_OFFSET(15601, gl_dispatch_stub_882, gl_dispatch_stub_882, NULL, 882),
+    NAME_FUNC_OFFSET(15618, gl_dispatch_stub_883, gl_dispatch_stub_883, NULL, 883),
+    NAME_FUNC_OFFSET(15645, glBindFramebufferEXT, glBindFramebufferEXT, NULL, 884),
+    NAME_FUNC_OFFSET(15666, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, 885),
+    NAME_FUNC_OFFSET(15688, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, 886),
+    NAME_FUNC_OFFSET(15716, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, 887),
+    NAME_FUNC_OFFSET(15740, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, 888),
+    NAME_FUNC_OFFSET(15765, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, 889),
+    NAME_FUNC_OFFSET(15794, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, 890),
+    NAME_FUNC_OFFSET(15820, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, 891),
+    NAME_FUNC_OFFSET(15846, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, 892),
+    NAME_FUNC_OFFSET(15872, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, 893),
+    NAME_FUNC_OFFSET(15893, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, 894),
+    NAME_FUNC_OFFSET(15915, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, 895),
+    NAME_FUNC_OFFSET(15935, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, 896),
+    NAME_FUNC_OFFSET(15976, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, 897),
+    NAME_FUNC_OFFSET(16008, glIsFramebufferEXT, glIsFramebufferEXT, NULL, 898),
+    NAME_FUNC_OFFSET(16027, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, 899),
+    NAME_FUNC_OFFSET(16047, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, 900),
+    NAME_FUNC_OFFSET(16072, gl_dispatch_stub_901, gl_dispatch_stub_901, NULL, 901),
+    NAME_FUNC_OFFSET(16093, gl_dispatch_stub_902, gl_dispatch_stub_902, NULL, 902),
+    NAME_FUNC_OFFSET(16117, gl_dispatch_stub_903, gl_dispatch_stub_903, NULL, 903),
+    NAME_FUNC_OFFSET(16147, glBindFragDataLocationEXT, glBindFragDataLocationEXT, NULL, 904),
+    NAME_FUNC_OFFSET(16173, glGetFragDataLocationEXT, glGetFragDataLocationEXT, NULL, 905),
+    NAME_FUNC_OFFSET(16198, glGetUniformuivEXT, glGetUniformuivEXT, NULL, 906),
+    NAME_FUNC_OFFSET(16217, glGetVertexAttribIivEXT, glGetVertexAttribIivEXT, NULL, 907),
+    NAME_FUNC_OFFSET(16241, glGetVertexAttribIuivEXT, glGetVertexAttribIuivEXT, NULL, 908),
+    NAME_FUNC_OFFSET(16266, glUniform1uiEXT, glUniform1uiEXT, NULL, 909),
+    NAME_FUNC_OFFSET(16282, glUniform1uivEXT, glUniform1uivEXT, NULL, 910),
+    NAME_FUNC_OFFSET(16299, glUniform2uiEXT, glUniform2uiEXT, NULL, 911),
+    NAME_FUNC_OFFSET(16315, glUniform2uivEXT, glUniform2uivEXT, NULL, 912),
+    NAME_FUNC_OFFSET(16332, glUniform3uiEXT, glUniform3uiEXT, NULL, 913),
+    NAME_FUNC_OFFSET(16348, glUniform3uivEXT, glUniform3uivEXT, NULL, 914),
+    NAME_FUNC_OFFSET(16365, glUniform4uiEXT, glUniform4uiEXT, NULL, 915),
+    NAME_FUNC_OFFSET(16381, glUniform4uivEXT, glUniform4uivEXT, NULL, 916),
+    NAME_FUNC_OFFSET(16398, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL, 917),
+    NAME_FUNC_OFFSET(16419, glVertexAttribI1ivEXT, glVertexAttribI1ivEXT, NULL, 918),
+    NAME_FUNC_OFFSET(16441, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL, 919),
+    NAME_FUNC_OFFSET(16463, glVertexAttribI1uivEXT, glVertexAttribI1uivEXT, NULL, 920),
+    NAME_FUNC_OFFSET(16486, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL, 921),
+    NAME_FUNC_OFFSET(16507, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL, 922),
+    NAME_FUNC_OFFSET(16529, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL, 923),
+    NAME_FUNC_OFFSET(16551, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT, NULL, 924),
+    NAME_FUNC_OFFSET(16574, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL, 925),
+    NAME_FUNC_OFFSET(16595, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL, 926),
+    NAME_FUNC_OFFSET(16617, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL, 927),
+    NAME_FUNC_OFFSET(16639, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT, NULL, 928),
+    NAME_FUNC_OFFSET(16662, glVertexAttribI4bvEXT, glVertexAttribI4bvEXT, NULL, 929),
+    NAME_FUNC_OFFSET(16684, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL, 930),
+    NAME_FUNC_OFFSET(16705, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL, 931),
+    NAME_FUNC_OFFSET(16727, glVertexAttribI4svEXT, glVertexAttribI4svEXT, NULL, 932),
+    NAME_FUNC_OFFSET(16749, glVertexAttribI4ubvEXT, glVertexAttribI4ubvEXT, NULL, 933),
+    NAME_FUNC_OFFSET(16772, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL, 934),
+    NAME_FUNC_OFFSET(16794, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT, NULL, 935),
+    NAME_FUNC_OFFSET(16817, glVertexAttribI4usvEXT, glVertexAttribI4usvEXT, NULL, 936),
+    NAME_FUNC_OFFSET(16840, glVertexAttribIPointerEXT, glVertexAttribIPointerEXT, NULL, 937),
+    NAME_FUNC_OFFSET(16866, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, 938),
+    NAME_FUNC_OFFSET(16895, glColorMaskIndexedEXT, glColorMaskIndexedEXT, NULL, 939),
+    NAME_FUNC_OFFSET(16917, glDisableIndexedEXT, glDisableIndexedEXT, NULL, 940),
+    NAME_FUNC_OFFSET(16937, glEnableIndexedEXT, glEnableIndexedEXT, NULL, 941),
+    NAME_FUNC_OFFSET(16956, glGetBooleanIndexedvEXT, glGetBooleanIndexedvEXT, NULL, 942),
+    NAME_FUNC_OFFSET(16980, glGetIntegerIndexedvEXT, glGetIntegerIndexedvEXT, NULL, 943),
+    NAME_FUNC_OFFSET(17004, glIsEnabledIndexedEXT, glIsEnabledIndexedEXT, NULL, 944),
+    NAME_FUNC_OFFSET(17026, glClearColorIiEXT, glClearColorIiEXT, NULL, 945),
+    NAME_FUNC_OFFSET(17044, glClearColorIuiEXT, glClearColorIuiEXT, NULL, 946),
+    NAME_FUNC_OFFSET(17063, glGetTexParameterIivEXT, glGetTexParameterIivEXT, NULL, 947),
+    NAME_FUNC_OFFSET(17087, glGetTexParameterIuivEXT, glGetTexParameterIuivEXT, NULL, 948),
+    NAME_FUNC_OFFSET(17112, glTexParameterIivEXT, glTexParameterIivEXT, NULL, 949),
+    NAME_FUNC_OFFSET(17133, glTexParameterIuivEXT, glTexParameterIuivEXT, NULL, 950),
+    NAME_FUNC_OFFSET(17155, glBeginConditionalRenderNV, glBeginConditionalRenderNV, NULL, 951),
+    NAME_FUNC_OFFSET(17182, glEndConditionalRenderNV, glEndConditionalRenderNV, NULL, 952),
+    NAME_FUNC_OFFSET(17207, glBeginTransformFeedbackEXT, glBeginTransformFeedbackEXT, NULL, 953),
+    NAME_FUNC_OFFSET(17235, glBindBufferBaseEXT, glBindBufferBaseEXT, NULL, 954),
+    NAME_FUNC_OFFSET(17255, glBindBufferOffsetEXT, glBindBufferOffsetEXT, NULL, 955),
+    NAME_FUNC_OFFSET(17277, glBindBufferRangeEXT, glBindBufferRangeEXT, NULL, 956),
+    NAME_FUNC_OFFSET(17298, glEndTransformFeedbackEXT, glEndTransformFeedbackEXT, NULL, 957),
+    NAME_FUNC_OFFSET(17324, glGetTransformFeedbackVaryingEXT, glGetTransformFeedbackVaryingEXT, NULL, 958),
+    NAME_FUNC_OFFSET(17357, glTransformFeedbackVaryingsEXT, glTransformFeedbackVaryingsEXT, NULL, 959),
+    NAME_FUNC_OFFSET(17388, glProvokingVertexEXT, glProvokingVertexEXT, NULL, 960),
+    NAME_FUNC_OFFSET(17409, gl_dispatch_stub_961, gl_dispatch_stub_961, NULL, 961),
+    NAME_FUNC_OFFSET(17440, gl_dispatch_stub_962, gl_dispatch_stub_962, NULL, 962),
+    NAME_FUNC_OFFSET(17460, glGetObjectParameterivAPPLE, glGetObjectParameterivAPPLE, NULL, 963),
+    NAME_FUNC_OFFSET(17488, glObjectPurgeableAPPLE, glObjectPurgeableAPPLE, NULL, 964),
+    NAME_FUNC_OFFSET(17511, glObjectUnpurgeableAPPLE, glObjectUnpurgeableAPPLE, NULL, 965),
+    NAME_FUNC_OFFSET(17536, glActiveProgramEXT, glActiveProgramEXT, NULL, 966),
+    NAME_FUNC_OFFSET(17555, glCreateShaderProgramEXT, glCreateShaderProgramEXT, NULL, 967),
+    NAME_FUNC_OFFSET(17580, glUseShaderProgramEXT, glUseShaderProgramEXT, NULL, 968),
+    NAME_FUNC_OFFSET(17602, glTextureBarrierNV, glTextureBarrierNV, NULL, 969),
+    NAME_FUNC_OFFSET(17621, gl_dispatch_stub_970, gl_dispatch_stub_970, NULL, 970),
+    NAME_FUNC_OFFSET(17646, gl_dispatch_stub_971, gl_dispatch_stub_971, NULL, 971),
+    NAME_FUNC_OFFSET(17675, gl_dispatch_stub_972, gl_dispatch_stub_972, NULL, 972),
+    NAME_FUNC_OFFSET(17706, gl_dispatch_stub_973, gl_dispatch_stub_973, NULL, 973),
+    NAME_FUNC_OFFSET(17730, gl_dispatch_stub_974, gl_dispatch_stub_974, NULL, 974),
+    NAME_FUNC_OFFSET(17755, glEGLImageTargetRenderbufferStorageOES, glEGLImageTargetRenderbufferStorageOES, NULL, 975),
+    NAME_FUNC_OFFSET(17794, glEGLImageTargetTexture2DOES, glEGLImageTargetTexture2DOES, NULL, 976),
+    NAME_FUNC_OFFSET(17823, glArrayElement, glArrayElement, NULL, 306),
+    NAME_FUNC_OFFSET(17841, glBindTexture, glBindTexture, NULL, 307),
+    NAME_FUNC_OFFSET(17858, glDrawArrays, glDrawArrays, NULL, 310),
+    NAME_FUNC_OFFSET(17874, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, 322),
+    NAME_FUNC_OFFSET(17899, glCopyTexImage1D, glCopyTexImage1D, NULL, 323),
+    NAME_FUNC_OFFSET(17919, glCopyTexImage2D, glCopyTexImage2D, NULL, 324),
+    NAME_FUNC_OFFSET(17939, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, 325),
+    NAME_FUNC_OFFSET(17962, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, 326),
+    NAME_FUNC_OFFSET(17985, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, 327),
+    NAME_FUNC_OFFSET(18005, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, 328),
+    NAME_FUNC_OFFSET(18022, glGetPointerv, glGetPointerv, NULL, 329),
+    NAME_FUNC_OFFSET(18039, glIsTexture, glIsTextureEXT, glIsTextureEXT, 330),
+    NAME_FUNC_OFFSET(18054, glPrioritizeTextures, glPrioritizeTextures, NULL, 331),
+    NAME_FUNC_OFFSET(18078, glTexSubImage1D, glTexSubImage1D, NULL, 332),
+    NAME_FUNC_OFFSET(18097, glTexSubImage2D, glTexSubImage2D, NULL, 333),
+    NAME_FUNC_OFFSET(18116, glBlendColor, glBlendColor, NULL, 336),
+    NAME_FUNC_OFFSET(18132, glBlendEquation, glBlendEquation, NULL, 337),
+    NAME_FUNC_OFFSET(18151, glDrawRangeElements, glDrawRangeElements, NULL, 338),
+    NAME_FUNC_OFFSET(18174, glColorTable, glColorTable, NULL, 339),
+    NAME_FUNC_OFFSET(18190, glColorTable, glColorTable, NULL, 339),
+    NAME_FUNC_OFFSET(18206, glColorTableParameterfv, glColorTableParameterfv, NULL, 340),
+    NAME_FUNC_OFFSET(18233, glColorTableParameteriv, glColorTableParameteriv, NULL, 341),
+    NAME_FUNC_OFFSET(18260, glCopyColorTable, glCopyColorTable, NULL, 342),
+    NAME_FUNC_OFFSET(18280, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, 343),
+    NAME_FUNC_OFFSET(18299, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, 343),
+    NAME_FUNC_OFFSET(18318, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, 344),
+    NAME_FUNC_OFFSET(18348, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, 344),
+    NAME_FUNC_OFFSET(18378, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, 345),
+    NAME_FUNC_OFFSET(18408, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, 345),
+    NAME_FUNC_OFFSET(18438, glColorSubTable, glColorSubTable, NULL, 346),
+    NAME_FUNC_OFFSET(18457, glCopyColorSubTable, glCopyColorSubTable, NULL, 347),
+    NAME_FUNC_OFFSET(18480, glConvolutionFilter1D, glConvolutionFilter1D, NULL, 348),
+    NAME_FUNC_OFFSET(18505, glConvolutionFilter2D, glConvolutionFilter2D, NULL, 349),
+    NAME_FUNC_OFFSET(18530, glConvolutionParameterf, glConvolutionParameterf, NULL, 350),
+    NAME_FUNC_OFFSET(18557, glConvolutionParameterfv, glConvolutionParameterfv, NULL, 351),
+    NAME_FUNC_OFFSET(18585, glConvolutionParameteri, glConvolutionParameteri, NULL, 352),
+    NAME_FUNC_OFFSET(18612, glConvolutionParameteriv, glConvolutionParameteriv, NULL, 353),
+    NAME_FUNC_OFFSET(18640, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, 354),
+    NAME_FUNC_OFFSET(18669, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, 355),
+    NAME_FUNC_OFFSET(18698, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, 356),
+    NAME_FUNC_OFFSET(18724, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, 357),
+    NAME_FUNC_OFFSET(18755, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, 358),
+    NAME_FUNC_OFFSET(18786, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, 359),
+    NAME_FUNC_OFFSET(18810, glSeparableFilter2D, glSeparableFilter2D, NULL, 360),
+    NAME_FUNC_OFFSET(18833, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, 361),
+    NAME_FUNC_OFFSET(18851, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, 362),
+    NAME_FUNC_OFFSET(18880, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, 363),
+    NAME_FUNC_OFFSET(18909, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, 364),
+    NAME_FUNC_OFFSET(18924, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, 365),
+    NAME_FUNC_OFFSET(18950, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, 366),
+    NAME_FUNC_OFFSET(18976, glHistogram, glHistogram, NULL, 367),
+    NAME_FUNC_OFFSET(18991, glMinmax, glMinmax, NULL, 368),
+    NAME_FUNC_OFFSET(19003, glResetHistogram, glResetHistogram, NULL, 369),
+    NAME_FUNC_OFFSET(19023, glResetMinmax, glResetMinmax, NULL, 370),
+    NAME_FUNC_OFFSET(19040, glTexImage3D, glTexImage3D, NULL, 371),
+    NAME_FUNC_OFFSET(19056, glTexSubImage3D, glTexSubImage3D, NULL, 372),
+    NAME_FUNC_OFFSET(19075, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, 373),
+    NAME_FUNC_OFFSET(19098, glActiveTextureARB, glActiveTextureARB, NULL, 374),
+    NAME_FUNC_OFFSET(19114, glClientActiveTextureARB, glClientActiveTextureARB, NULL, 375),
+    NAME_FUNC_OFFSET(19136, glMultiTexCoord1dARB, glMultiTexCoord1dARB, NULL, 376),
+    NAME_FUNC_OFFSET(19154, glMultiTexCoord1dvARB, glMultiTexCoord1dvARB, NULL, 377),
+    NAME_FUNC_OFFSET(19173, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, 378),
+    NAME_FUNC_OFFSET(19191, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, 379),
+    NAME_FUNC_OFFSET(19210, glMultiTexCoord1iARB, glMultiTexCoord1iARB, NULL, 380),
+    NAME_FUNC_OFFSET(19228, glMultiTexCoord1ivARB, glMultiTexCoord1ivARB, NULL, 381),
+    NAME_FUNC_OFFSET(19247, glMultiTexCoord1sARB, glMultiTexCoord1sARB, NULL, 382),
+    NAME_FUNC_OFFSET(19265, glMultiTexCoord1svARB, glMultiTexCoord1svARB, NULL, 383),
+    NAME_FUNC_OFFSET(19284, glMultiTexCoord2dARB, glMultiTexCoord2dARB, NULL, 384),
+    NAME_FUNC_OFFSET(19302, glMultiTexCoord2dvARB, glMultiTexCoord2dvARB, NULL, 385),
+    NAME_FUNC_OFFSET(19321, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, 386),
+    NAME_FUNC_OFFSET(19339, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, 387),
+    NAME_FUNC_OFFSET(19358, glMultiTexCoord2iARB, glMultiTexCoord2iARB, NULL, 388),
+    NAME_FUNC_OFFSET(19376, glMultiTexCoord2ivARB, glMultiTexCoord2ivARB, NULL, 389),
+    NAME_FUNC_OFFSET(19395, glMultiTexCoord2sARB, glMultiTexCoord2sARB, NULL, 390),
+    NAME_FUNC_OFFSET(19413, glMultiTexCoord2svARB, glMultiTexCoord2svARB, NULL, 391),
+    NAME_FUNC_OFFSET(19432, glMultiTexCoord3dARB, glMultiTexCoord3dARB, NULL, 392),
+    NAME_FUNC_OFFSET(19450, glMultiTexCoord3dvARB, glMultiTexCoord3dvARB, NULL, 393),
+    NAME_FUNC_OFFSET(19469, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, 394),
+    NAME_FUNC_OFFSET(19487, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, 395),
+    NAME_FUNC_OFFSET(19506, glMultiTexCoord3iARB, glMultiTexCoord3iARB, NULL, 396),
+    NAME_FUNC_OFFSET(19524, glMultiTexCoord3ivARB, glMultiTexCoord3ivARB, NULL, 397),
+    NAME_FUNC_OFFSET(19543, glMultiTexCoord3sARB, glMultiTexCoord3sARB, NULL, 398),
+    NAME_FUNC_OFFSET(19561, glMultiTexCoord3svARB, glMultiTexCoord3svARB, NULL, 399),
+    NAME_FUNC_OFFSET(19580, glMultiTexCoord4dARB, glMultiTexCoord4dARB, NULL, 400),
+    NAME_FUNC_OFFSET(19598, glMultiTexCoord4dvARB, glMultiTexCoord4dvARB, NULL, 401),
+    NAME_FUNC_OFFSET(19617, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, 402),
+    NAME_FUNC_OFFSET(19635, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, 403),
+    NAME_FUNC_OFFSET(19654, glMultiTexCoord4iARB, glMultiTexCoord4iARB, NULL, 404),
+    NAME_FUNC_OFFSET(19672, glMultiTexCoord4ivARB, glMultiTexCoord4ivARB, NULL, 405),
+    NAME_FUNC_OFFSET(19691, glMultiTexCoord4sARB, glMultiTexCoord4sARB, NULL, 406),
+    NAME_FUNC_OFFSET(19709, glMultiTexCoord4svARB, glMultiTexCoord4svARB, NULL, 407),
+    NAME_FUNC_OFFSET(19728, glStencilOpSeparate, glStencilOpSeparate, NULL, 423),
+    NAME_FUNC_OFFSET(19751, glLoadTransposeMatrixdARB, glLoadTransposeMatrixdARB, NULL, 441),
+    NAME_FUNC_OFFSET(19774, glLoadTransposeMatrixfARB, glLoadTransposeMatrixfARB, NULL, 442),
+    NAME_FUNC_OFFSET(19797, glMultTransposeMatrixdARB, glMultTransposeMatrixdARB, NULL, 443),
+    NAME_FUNC_OFFSET(19820, glMultTransposeMatrixfARB, glMultTransposeMatrixfARB, NULL, 444),
+    NAME_FUNC_OFFSET(19843, glSampleCoverageARB, glSampleCoverageARB, NULL, 445),
+    NAME_FUNC_OFFSET(19860, glCompressedTexImage1DARB, glCompressedTexImage1DARB, NULL, 446),
+    NAME_FUNC_OFFSET(19883, glCompressedTexImage2DARB, glCompressedTexImage2DARB, NULL, 447),
+    NAME_FUNC_OFFSET(19906, glCompressedTexImage3DARB, glCompressedTexImage3DARB, NULL, 448),
+    NAME_FUNC_OFFSET(19929, glCompressedTexSubImage1DARB, glCompressedTexSubImage1DARB, NULL, 449),
+    NAME_FUNC_OFFSET(19955, glCompressedTexSubImage2DARB, glCompressedTexSubImage2DARB, NULL, 450),
+    NAME_FUNC_OFFSET(19981, glCompressedTexSubImage3DARB, glCompressedTexSubImage3DARB, NULL, 451),
+    NAME_FUNC_OFFSET(20007, glGetCompressedTexImageARB, glGetCompressedTexImageARB, NULL, 452),
+    NAME_FUNC_OFFSET(20031, glDisableVertexAttribArrayARB, glDisableVertexAttribArrayARB, NULL, 453),
+    NAME_FUNC_OFFSET(20058, glEnableVertexAttribArrayARB, glEnableVertexAttribArrayARB, NULL, 454),
+    NAME_FUNC_OFFSET(20084, glGetVertexAttribdvARB, glGetVertexAttribdvARB, NULL, 461),
+    NAME_FUNC_OFFSET(20104, glGetVertexAttribfvARB, glGetVertexAttribfvARB, NULL, 462),
+    NAME_FUNC_OFFSET(20124, glGetVertexAttribivARB, glGetVertexAttribivARB, NULL, 463),
+    NAME_FUNC_OFFSET(20144, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, 464),
+    NAME_FUNC_OFFSET(20167, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, 465),
+    NAME_FUNC_OFFSET(20191, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, 466),
+    NAME_FUNC_OFFSET(20214, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, 467),
+    NAME_FUNC_OFFSET(20238, glVertexAttrib1dARB, glVertexAttrib1dARB, NULL, 473),
+    NAME_FUNC_OFFSET(20255, glVertexAttrib1dvARB, glVertexAttrib1dvARB, NULL, 474),
+    NAME_FUNC_OFFSET(20273, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, 475),
+    NAME_FUNC_OFFSET(20290, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, 476),
+    NAME_FUNC_OFFSET(20308, glVertexAttrib1sARB, glVertexAttrib1sARB, NULL, 477),
+    NAME_FUNC_OFFSET(20325, glVertexAttrib1svARB, glVertexAttrib1svARB, NULL, 478),
+    NAME_FUNC_OFFSET(20343, glVertexAttrib2dARB, glVertexAttrib2dARB, NULL, 479),
+    NAME_FUNC_OFFSET(20360, glVertexAttrib2dvARB, glVertexAttrib2dvARB, NULL, 480),
+    NAME_FUNC_OFFSET(20378, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, 481),
+    NAME_FUNC_OFFSET(20395, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, 482),
+    NAME_FUNC_OFFSET(20413, glVertexAttrib2sARB, glVertexAttrib2sARB, NULL, 483),
+    NAME_FUNC_OFFSET(20430, glVertexAttrib2svARB, glVertexAttrib2svARB, NULL, 484),
+    NAME_FUNC_OFFSET(20448, glVertexAttrib3dARB, glVertexAttrib3dARB, NULL, 485),
+    NAME_FUNC_OFFSET(20465, glVertexAttrib3dvARB, glVertexAttrib3dvARB, NULL, 486),
+    NAME_FUNC_OFFSET(20483, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, 487),
+    NAME_FUNC_OFFSET(20500, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, 488),
+    NAME_FUNC_OFFSET(20518, glVertexAttrib3sARB, glVertexAttrib3sARB, NULL, 489),
+    NAME_FUNC_OFFSET(20535, glVertexAttrib3svARB, glVertexAttrib3svARB, NULL, 490),
+    NAME_FUNC_OFFSET(20553, glVertexAttrib4NbvARB, glVertexAttrib4NbvARB, NULL, 491),
+    NAME_FUNC_OFFSET(20572, glVertexAttrib4NivARB, glVertexAttrib4NivARB, NULL, 492),
+    NAME_FUNC_OFFSET(20591, glVertexAttrib4NsvARB, glVertexAttrib4NsvARB, NULL, 493),
+    NAME_FUNC_OFFSET(20610, glVertexAttrib4NubARB, glVertexAttrib4NubARB, NULL, 494),
+    NAME_FUNC_OFFSET(20629, glVertexAttrib4NubvARB, glVertexAttrib4NubvARB, NULL, 495),
+    NAME_FUNC_OFFSET(20649, glVertexAttrib4NuivARB, glVertexAttrib4NuivARB, NULL, 496),
+    NAME_FUNC_OFFSET(20669, glVertexAttrib4NusvARB, glVertexAttrib4NusvARB, NULL, 497),
+    NAME_FUNC_OFFSET(20689, glVertexAttrib4bvARB, glVertexAttrib4bvARB, NULL, 498),
+    NAME_FUNC_OFFSET(20707, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL, 499),
+    NAME_FUNC_OFFSET(20724, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL, 500),
+    NAME_FUNC_OFFSET(20742, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, 501),
+    NAME_FUNC_OFFSET(20759, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, 502),
+    NAME_FUNC_OFFSET(20777, glVertexAttrib4ivARB, glVertexAttrib4ivARB, NULL, 503),
+    NAME_FUNC_OFFSET(20795, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL, 504),
+    NAME_FUNC_OFFSET(20812, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL, 505),
+    NAME_FUNC_OFFSET(20830, glVertexAttrib4ubvARB, glVertexAttrib4ubvARB, NULL, 506),
+    NAME_FUNC_OFFSET(20849, glVertexAttrib4uivARB, glVertexAttrib4uivARB, NULL, 507),
+    NAME_FUNC_OFFSET(20868, glVertexAttrib4usvARB, glVertexAttrib4usvARB, NULL, 508),
+    NAME_FUNC_OFFSET(20887, glVertexAttribPointerARB, glVertexAttribPointerARB, NULL, 509),
+    NAME_FUNC_OFFSET(20909, glBindBufferARB, glBindBufferARB, NULL, 510),
+    NAME_FUNC_OFFSET(20922, glBufferDataARB, glBufferDataARB, NULL, 511),
+    NAME_FUNC_OFFSET(20935, glBufferSubDataARB, glBufferSubDataARB, NULL, 512),
+    NAME_FUNC_OFFSET(20951, glDeleteBuffersARB, glDeleteBuffersARB, NULL, 513),
+    NAME_FUNC_OFFSET(20967, glGenBuffersARB, glGenBuffersARB, NULL, 514),
+    NAME_FUNC_OFFSET(20980, glGetBufferParameterivARB, glGetBufferParameterivARB, NULL, 515),
+    NAME_FUNC_OFFSET(21003, glGetBufferPointervARB, glGetBufferPointervARB, NULL, 516),
+    NAME_FUNC_OFFSET(21023, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL, 517),
+    NAME_FUNC_OFFSET(21042, glIsBufferARB, glIsBufferARB, NULL, 518),
+    NAME_FUNC_OFFSET(21053, glMapBufferARB, glMapBufferARB, NULL, 519),
+    NAME_FUNC_OFFSET(21065, glUnmapBufferARB, glUnmapBufferARB, NULL, 520),
+    NAME_FUNC_OFFSET(21079, glBeginQueryARB, glBeginQueryARB, NULL, 521),
+    NAME_FUNC_OFFSET(21092, glDeleteQueriesARB, glDeleteQueriesARB, NULL, 522),
+    NAME_FUNC_OFFSET(21108, glEndQueryARB, glEndQueryARB, NULL, 523),
+    NAME_FUNC_OFFSET(21119, glGenQueriesARB, glGenQueriesARB, NULL, 524),
+    NAME_FUNC_OFFSET(21132, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL, 525),
+    NAME_FUNC_OFFSET(21151, glGetQueryObjectuivARB, glGetQueryObjectuivARB, NULL, 526),
+    NAME_FUNC_OFFSET(21171, glGetQueryivARB, glGetQueryivARB, NULL, 527),
+    NAME_FUNC_OFFSET(21184, glIsQueryARB, glIsQueryARB, NULL, 528),
+    NAME_FUNC_OFFSET(21194, glCompileShaderARB, glCompileShaderARB, NULL, 530),
+    NAME_FUNC_OFFSET(21210, glGetActiveUniformARB, glGetActiveUniformARB, NULL, 535),
+    NAME_FUNC_OFFSET(21229, glGetShaderSourceARB, glGetShaderSourceARB, NULL, 541),
+    NAME_FUNC_OFFSET(21247, glGetUniformLocationARB, glGetUniformLocationARB, NULL, 542),
+    NAME_FUNC_OFFSET(21268, glGetUniformfvARB, glGetUniformfvARB, NULL, 543),
+    NAME_FUNC_OFFSET(21283, glGetUniformivARB, glGetUniformivARB, NULL, 544),
+    NAME_FUNC_OFFSET(21298, glLinkProgramARB, glLinkProgramARB, NULL, 545),
+    NAME_FUNC_OFFSET(21312, glShaderSourceARB, glShaderSourceARB, NULL, 546),
+    NAME_FUNC_OFFSET(21327, glUniform1fARB, glUniform1fARB, NULL, 547),
+    NAME_FUNC_OFFSET(21339, glUniform1fvARB, glUniform1fvARB, NULL, 548),
+    NAME_FUNC_OFFSET(21352, glUniform1iARB, glUniform1iARB, NULL, 549),
+    NAME_FUNC_OFFSET(21364, glUniform1ivARB, glUniform1ivARB, NULL, 550),
+    NAME_FUNC_OFFSET(21377, glUniform2fARB, glUniform2fARB, NULL, 551),
+    NAME_FUNC_OFFSET(21389, glUniform2fvARB, glUniform2fvARB, NULL, 552),
+    NAME_FUNC_OFFSET(21402, glUniform2iARB, glUniform2iARB, NULL, 553),
+    NAME_FUNC_OFFSET(21414, glUniform2ivARB, glUniform2ivARB, NULL, 554),
+    NAME_FUNC_OFFSET(21427, glUniform3fARB, glUniform3fARB, NULL, 555),
+    NAME_FUNC_OFFSET(21439, glUniform3fvARB, glUniform3fvARB, NULL, 556),
+    NAME_FUNC_OFFSET(21452, glUniform3iARB, glUniform3iARB, NULL, 557),
+    NAME_FUNC_OFFSET(21464, glUniform3ivARB, glUniform3ivARB, NULL, 558),
+    NAME_FUNC_OFFSET(21477, glUniform4fARB, glUniform4fARB, NULL, 559),
+    NAME_FUNC_OFFSET(21489, glUniform4fvARB, glUniform4fvARB, NULL, 560),
+    NAME_FUNC_OFFSET(21502, glUniform4iARB, glUniform4iARB, NULL, 561),
+    NAME_FUNC_OFFSET(21514, glUniform4ivARB, glUniform4ivARB, NULL, 562),
+    NAME_FUNC_OFFSET(21527, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL, 563),
+    NAME_FUNC_OFFSET(21546, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL, 564),
+    NAME_FUNC_OFFSET(21565, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL, 565),
+    NAME_FUNC_OFFSET(21584, glUseProgramObjectARB, glUseProgramObjectARB, NULL, 566),
+    NAME_FUNC_OFFSET(21597, glValidateProgramARB, glValidateProgramARB, NULL, 567),
+    NAME_FUNC_OFFSET(21615, glBindAttribLocationARB, glBindAttribLocationARB, NULL, 568),
+    NAME_FUNC_OFFSET(21636, glGetActiveAttribARB, glGetActiveAttribARB, NULL, 569),
+    NAME_FUNC_OFFSET(21654, glGetAttribLocationARB, glGetAttribLocationARB, NULL, 570),
+    NAME_FUNC_OFFSET(21674, glDrawBuffersARB, glDrawBuffersARB, NULL, 571),
+    NAME_FUNC_OFFSET(21688, glDrawBuffersARB, glDrawBuffersARB, NULL, 571),
+    NAME_FUNC_OFFSET(21705, glDrawBuffersARB, glDrawBuffersARB, NULL, 571),
+    NAME_FUNC_OFFSET(21721, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 573),
+    NAME_FUNC_OFFSET(21746, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 573),
+    NAME_FUNC_OFFSET(21768, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 574),
+    NAME_FUNC_OFFSET(21795, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 574),
+    NAME_FUNC_OFFSET(21819, glRenderbufferStorageMultisample, glRenderbufferStorageMultisample, NULL, 575),
+    NAME_FUNC_OFFSET(21855, glBlendEquationSeparateiARB, glBlendEquationSeparateiARB, NULL, 597),
+    NAME_FUNC_OFFSET(21889, glBlendEquationiARB, glBlendEquationiARB, NULL, 598),
+    NAME_FUNC_OFFSET(21915, glBlendFuncSeparateiARB, glBlendFuncSeparateiARB, NULL, 599),
+    NAME_FUNC_OFFSET(21945, glBlendFunciARB, glBlendFunciARB, NULL, 600),
+    NAME_FUNC_OFFSET(21967, gl_dispatch_stub_702, gl_dispatch_stub_702, NULL, 702),
+    NAME_FUNC_OFFSET(21983, gl_dispatch_stub_703, gl_dispatch_stub_703, NULL, 703),
+    NAME_FUNC_OFFSET(22002, glPointParameterfEXT, glPointParameterfEXT, NULL, 710),
+    NAME_FUNC_OFFSET(22020, glPointParameterfEXT, glPointParameterfEXT, NULL, 710),
+    NAME_FUNC_OFFSET(22041, glPointParameterfEXT, glPointParameterfEXT, NULL, 710),
+    NAME_FUNC_OFFSET(22063, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 711),
+    NAME_FUNC_OFFSET(22082, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 711),
+    NAME_FUNC_OFFSET(22104, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 711),
+    NAME_FUNC_OFFSET(22127, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, 714),
+    NAME_FUNC_OFFSET(22146, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, 715),
+    NAME_FUNC_OFFSET(22166, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, 716),
+    NAME_FUNC_OFFSET(22185, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, 717),
+    NAME_FUNC_OFFSET(22205, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, 718),
+    NAME_FUNC_OFFSET(22224, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, 719),
+    NAME_FUNC_OFFSET(22244, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, 720),
+    NAME_FUNC_OFFSET(22263, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, 721),
+    NAME_FUNC_OFFSET(22283, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, 722),
+    NAME_FUNC_OFFSET(22302, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, 723),
+    NAME_FUNC_OFFSET(22322, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, 724),
+    NAME_FUNC_OFFSET(22342, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, 725),
+    NAME_FUNC_OFFSET(22363, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, 726),
+    NAME_FUNC_OFFSET(22383, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, 727),
+    NAME_FUNC_OFFSET(22404, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, 728),
+    NAME_FUNC_OFFSET(22424, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, 729),
+    NAME_FUNC_OFFSET(22445, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, 730),
+    NAME_FUNC_OFFSET(22469, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, 731),
+    NAME_FUNC_OFFSET(22487, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, 732),
+    NAME_FUNC_OFFSET(22507, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, 733),
+    NAME_FUNC_OFFSET(22525, glFogCoorddEXT, glFogCoorddEXT, NULL, 734),
+    NAME_FUNC_OFFSET(22537, glFogCoorddvEXT, glFogCoorddvEXT, NULL, 735),
+    NAME_FUNC_OFFSET(22550, glFogCoordfEXT, glFogCoordfEXT, NULL, 736),
+    NAME_FUNC_OFFSET(22562, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 737),
+    NAME_FUNC_OFFSET(22575, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, 739),
+    NAME_FUNC_OFFSET(22595, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, 739),
+    NAME_FUNC_OFFSET(22619, glWindowPos2dMESA, glWindowPos2dMESA, NULL, 756),
+    NAME_FUNC_OFFSET(22633, glWindowPos2dMESA, glWindowPos2dMESA, NULL, 756),
+    NAME_FUNC_OFFSET(22650, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, 757),
+    NAME_FUNC_OFFSET(22665, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, 757),
+    NAME_FUNC_OFFSET(22683, glWindowPos2fMESA, glWindowPos2fMESA, NULL, 758),
+    NAME_FUNC_OFFSET(22697, glWindowPos2fMESA, glWindowPos2fMESA, NULL, 758),
+    NAME_FUNC_OFFSET(22714, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, 759),
+    NAME_FUNC_OFFSET(22729, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, 759),
+    NAME_FUNC_OFFSET(22747, glWindowPos2iMESA, glWindowPos2iMESA, NULL, 760),
+    NAME_FUNC_OFFSET(22761, glWindowPos2iMESA, glWindowPos2iMESA, NULL, 760),
+    NAME_FUNC_OFFSET(22778, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, 761),
+    NAME_FUNC_OFFSET(22793, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, 761),
+    NAME_FUNC_OFFSET(22811, glWindowPos2sMESA, glWindowPos2sMESA, NULL, 762),
+    NAME_FUNC_OFFSET(22825, glWindowPos2sMESA, glWindowPos2sMESA, NULL, 762),
+    NAME_FUNC_OFFSET(22842, glWindowPos2svMESA, glWindowPos2svMESA, NULL, 763),
+    NAME_FUNC_OFFSET(22857, glWindowPos2svMESA, glWindowPos2svMESA, NULL, 763),
+    NAME_FUNC_OFFSET(22875, glWindowPos3dMESA, glWindowPos3dMESA, NULL, 764),
+    NAME_FUNC_OFFSET(22889, glWindowPos3dMESA, glWindowPos3dMESA, NULL, 764),
+    NAME_FUNC_OFFSET(22906, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, 765),
+    NAME_FUNC_OFFSET(22921, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, 765),
+    NAME_FUNC_OFFSET(22939, glWindowPos3fMESA, glWindowPos3fMESA, NULL, 766),
+    NAME_FUNC_OFFSET(22953, glWindowPos3fMESA, glWindowPos3fMESA, NULL, 766),
+    NAME_FUNC_OFFSET(22970, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, 767),
+    NAME_FUNC_OFFSET(22985, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, 767),
+    NAME_FUNC_OFFSET(23003, glWindowPos3iMESA, glWindowPos3iMESA, NULL, 768),
+    NAME_FUNC_OFFSET(23017, glWindowPos3iMESA, glWindowPos3iMESA, NULL, 768),
+    NAME_FUNC_OFFSET(23034, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, 769),
+    NAME_FUNC_OFFSET(23049, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, 769),
+    NAME_FUNC_OFFSET(23067, glWindowPos3sMESA, glWindowPos3sMESA, NULL, 770),
+    NAME_FUNC_OFFSET(23081, glWindowPos3sMESA, glWindowPos3sMESA, NULL, 770),
+    NAME_FUNC_OFFSET(23098, glWindowPos3svMESA, glWindowPos3svMESA, NULL, 771),
+    NAME_FUNC_OFFSET(23113, glWindowPos3svMESA, glWindowPos3svMESA, NULL, 771),
+    NAME_FUNC_OFFSET(23131, glBindProgramNV, glBindProgramNV, NULL, 790),
+    NAME_FUNC_OFFSET(23148, glDeleteProgramsNV, glDeleteProgramsNV, NULL, 791),
+    NAME_FUNC_OFFSET(23168, glGenProgramsNV, glGenProgramsNV, NULL, 793),
+    NAME_FUNC_OFFSET(23185, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, 799),
+    NAME_FUNC_OFFSET(23211, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, 799),
+    NAME_FUNC_OFFSET(23240, glIsProgramNV, glIsProgramNV, NULL, 803),
+    NAME_FUNC_OFFSET(23255, glPointParameteriNV, glPointParameteriNV, NULL, 867),
+    NAME_FUNC_OFFSET(23273, glPointParameterivNV, glPointParameterivNV, NULL, 868),
+    NAME_FUNC_OFFSET(23292, gl_dispatch_stub_871, gl_dispatch_stub_871, NULL, 871),
+    NAME_FUNC_OFFSET(23313, gl_dispatch_stub_873, gl_dispatch_stub_873, NULL, 873),
+    NAME_FUNC_OFFSET(23329, glPrimitiveRestartIndexNV, glPrimitiveRestartIndexNV, NULL, 880),
+    NAME_FUNC_OFFSET(23353, gl_dispatch_stub_883, gl_dispatch_stub_883, NULL, 883),
+    NAME_FUNC_OFFSET(23377, gl_dispatch_stub_883, gl_dispatch_stub_883, NULL, 883),
+    NAME_FUNC_OFFSET(23404, glBindFramebufferEXT, glBindFramebufferEXT, NULL, 884),
+    NAME_FUNC_OFFSET(23422, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, 885),
+    NAME_FUNC_OFFSET(23441, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, 886),
+    NAME_FUNC_OFFSET(23466, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, 887),
+    NAME_FUNC_OFFSET(23487, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, 888),
+    NAME_FUNC_OFFSET(23509, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, 889),
+    NAME_FUNC_OFFSET(23535, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, 890),
+    NAME_FUNC_OFFSET(23558, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, 891),
+    NAME_FUNC_OFFSET(23581, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, 892),
+    NAME_FUNC_OFFSET(23604, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, 893),
+    NAME_FUNC_OFFSET(23622, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, 894),
+    NAME_FUNC_OFFSET(23641, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, 895),
+    NAME_FUNC_OFFSET(23658, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, 896),
+    NAME_FUNC_OFFSET(23696, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, 897),
+    NAME_FUNC_OFFSET(23725, glIsFramebufferEXT, glIsFramebufferEXT, NULL, 898),
+    NAME_FUNC_OFFSET(23741, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, 899),
+    NAME_FUNC_OFFSET(23758, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, 900),
+    NAME_FUNC_OFFSET(23780, gl_dispatch_stub_901, gl_dispatch_stub_901, NULL, 901),
+    NAME_FUNC_OFFSET(23798, glBindFragDataLocationEXT, glBindFragDataLocationEXT, NULL, 904),
+    NAME_FUNC_OFFSET(23821, glGetFragDataLocationEXT, glGetFragDataLocationEXT, NULL, 905),
+    NAME_FUNC_OFFSET(23843, glGetUniformuivEXT, glGetUniformuivEXT, NULL, 906),
+    NAME_FUNC_OFFSET(23859, glGetVertexAttribIivEXT, glGetVertexAttribIivEXT, NULL, 907),
+    NAME_FUNC_OFFSET(23880, glGetVertexAttribIuivEXT, glGetVertexAttribIuivEXT, NULL, 908),
+    NAME_FUNC_OFFSET(23902, glUniform1uiEXT, glUniform1uiEXT, NULL, 909),
+    NAME_FUNC_OFFSET(23915, glUniform1uivEXT, glUniform1uivEXT, NULL, 910),
+    NAME_FUNC_OFFSET(23929, glUniform2uiEXT, glUniform2uiEXT, NULL, 911),
+    NAME_FUNC_OFFSET(23942, glUniform2uivEXT, glUniform2uivEXT, NULL, 912),
+    NAME_FUNC_OFFSET(23956, glUniform3uiEXT, glUniform3uiEXT, NULL, 913),
+    NAME_FUNC_OFFSET(23969, glUniform3uivEXT, glUniform3uivEXT, NULL, 914),
+    NAME_FUNC_OFFSET(23983, glUniform4uiEXT, glUniform4uiEXT, NULL, 915),
+    NAME_FUNC_OFFSET(23996, glUniform4uivEXT, glUniform4uivEXT, NULL, 916),
+    NAME_FUNC_OFFSET(24010, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL, 917),
+    NAME_FUNC_OFFSET(24028, glVertexAttribI1ivEXT, glVertexAttribI1ivEXT, NULL, 918),
+    NAME_FUNC_OFFSET(24047, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL, 919),
+    NAME_FUNC_OFFSET(24066, glVertexAttribI1uivEXT, glVertexAttribI1uivEXT, NULL, 920),
+    NAME_FUNC_OFFSET(24086, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL, 921),
+    NAME_FUNC_OFFSET(24104, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL, 922),
+    NAME_FUNC_OFFSET(24123, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL, 923),
+    NAME_FUNC_OFFSET(24142, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT, NULL, 924),
+    NAME_FUNC_OFFSET(24162, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL, 925),
+    NAME_FUNC_OFFSET(24180, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL, 926),
+    NAME_FUNC_OFFSET(24199, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL, 927),
+    NAME_FUNC_OFFSET(24218, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT, NULL, 928),
+    NAME_FUNC_OFFSET(24238, glVertexAttribI4bvEXT, glVertexAttribI4bvEXT, NULL, 929),
+    NAME_FUNC_OFFSET(24257, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL, 930),
+    NAME_FUNC_OFFSET(24275, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL, 931),
+    NAME_FUNC_OFFSET(24294, glVertexAttribI4svEXT, glVertexAttribI4svEXT, NULL, 932),
+    NAME_FUNC_OFFSET(24313, glVertexAttribI4ubvEXT, glVertexAttribI4ubvEXT, NULL, 933),
+    NAME_FUNC_OFFSET(24333, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL, 934),
+    NAME_FUNC_OFFSET(24352, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT, NULL, 935),
+    NAME_FUNC_OFFSET(24372, glVertexAttribI4usvEXT, glVertexAttribI4usvEXT, NULL, 936),
+    NAME_FUNC_OFFSET(24392, glVertexAttribIPointerEXT, glVertexAttribIPointerEXT, NULL, 937),
+    NAME_FUNC_OFFSET(24415, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, 938),
+    NAME_FUNC_OFFSET(24441, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, 938),
+    NAME_FUNC_OFFSET(24470, glColorMaskIndexedEXT, glColorMaskIndexedEXT, NULL, 939),
+    NAME_FUNC_OFFSET(24483, glDisableIndexedEXT, glDisableIndexedEXT, NULL, 940),
+    NAME_FUNC_OFFSET(24494, glEnableIndexedEXT, glEnableIndexedEXT, NULL, 941),
+    NAME_FUNC_OFFSET(24504, glGetBooleanIndexedvEXT, glGetBooleanIndexedvEXT, NULL, 942),
+    NAME_FUNC_OFFSET(24520, glGetIntegerIndexedvEXT, glGetIntegerIndexedvEXT, NULL, 943),
+    NAME_FUNC_OFFSET(24536, glIsEnabledIndexedEXT, glIsEnabledIndexedEXT, NULL, 944),
+    NAME_FUNC_OFFSET(24549, glGetTexParameterIivEXT, glGetTexParameterIivEXT, NULL, 947),
+    NAME_FUNC_OFFSET(24570, glGetTexParameterIuivEXT, glGetTexParameterIuivEXT, NULL, 948),
+    NAME_FUNC_OFFSET(24592, glTexParameterIivEXT, glTexParameterIivEXT, NULL, 949),
+    NAME_FUNC_OFFSET(24610, glTexParameterIuivEXT, glTexParameterIuivEXT, NULL, 950),
+    NAME_FUNC_OFFSET(24629, glBeginConditionalRenderNV, glBeginConditionalRenderNV, NULL, 951),
+    NAME_FUNC_OFFSET(24654, glEndConditionalRenderNV, glEndConditionalRenderNV, NULL, 952),
+    NAME_FUNC_OFFSET(24677, glBeginTransformFeedbackEXT, glBeginTransformFeedbackEXT, NULL, 953),
+    NAME_FUNC_OFFSET(24702, glBindBufferBaseEXT, glBindBufferBaseEXT, NULL, 954),
+    NAME_FUNC_OFFSET(24719, glBindBufferRangeEXT, glBindBufferRangeEXT, NULL, 956),
+    NAME_FUNC_OFFSET(24737, glEndTransformFeedbackEXT, glEndTransformFeedbackEXT, NULL, 957),
+    NAME_FUNC_OFFSET(24760, glGetTransformFeedbackVaryingEXT, glGetTransformFeedbackVaryingEXT, NULL, 958),
+    NAME_FUNC_OFFSET(24790, glTransformFeedbackVaryingsEXT, glTransformFeedbackVaryingsEXT, NULL, 959),
+    NAME_FUNC_OFFSET(24818, glProvokingVertexEXT, glProvokingVertexEXT, NULL, 960),
     NAME_FUNC_OFFSET(-1, NULL, NULL, NULL, 0)
 };
 
diff --git a/mesalib/src/mesa/SConscript b/mesalib/src/mesa/SConscript
index 10a04689d..dc37a6730 100644
--- a/mesalib/src/mesa/SConscript
+++ b/mesalib/src/mesa/SConscript
@@ -64,6 +64,7 @@ main_sources = [
     'main/drawtex.c',
     'main/enable.c',
     'main/enums.c',
+    'main/errors.c',
     'main/eval.c',
     'main/execmem.c',
     'main/extensions.c',
diff --git a/mesalib/src/mesa/drivers/dri/common/drirc b/mesalib/src/mesa/drivers/dri/common/drirc
index 59c00d7ad..755174afd 100644
--- a/mesalib/src/mesa/drivers/dri/common/drirc
+++ b/mesalib/src/mesa/drivers/dri/common/drirc
@@ -6,5 +6,11 @@
         <application executable="Tropics">
             <option name="force_glsl_extensions_warn" value="true" />
 	</application>
+        <application executable="heaven_x86">
+            <option name="force_glsl_extensions_warn" value="true" />
+	</application>
+        <application executable="heaven_x64">
+            <option name="force_glsl_extensions_warn" value="true" />
+	</application>
     </device>
 </driconf>
diff --git a/mesalib/src/mesa/main/api_exec.c b/mesalib/src/mesa/main/api_exec.c
index 605af381d..15b9f6974 100644
--- a/mesalib/src/mesa/main/api_exec.c
+++ b/mesalib/src/mesa/main/api_exec.c
@@ -55,6 +55,7 @@
 #include "drawpix.h"
 #include "rastpos.h"
 #include "enable.h"
+#include "errors.h"
 #include "eval.h"
 #include "get.h"
 #include "feedback.h"
@@ -598,15 +599,18 @@ _mesa_create_exec_table(void)
    SET_DrawBuffersARB(exec, _mesa_DrawBuffersARB);
 #endif
 
-   /* ARB 104. GL_ARB_robustness */
+   /* ARB 66. GL_ARB_sync */
+   _mesa_init_sync_dispatch(exec);
+
+   /* ARB 104. GL_ARB_debug_output */
+   _mesa_init_errors_dispatch(exec);
+
+   /* ARB 105. GL_ARB_robustness */
    SET_GetGraphicsResetStatusARB(exec, _mesa_GetGraphicsResetStatusARB);
    SET_GetnPolygonStippleARB(exec, _mesa_GetnPolygonStippleARB);
    SET_GetnTexImageARB(exec, _mesa_GetnTexImageARB);
    SET_ReadnPixelsARB(exec, _mesa_ReadnPixelsARB);
 
-   /* GL_ARB_sync */
-   _mesa_init_sync_dispatch(exec);
-
   /* GL_ATI_fragment_shader */
    _mesa_init_ati_fragment_shader_dispatch(exec);
 
diff --git a/mesalib/src/mesa/main/config.h b/mesalib/src/mesa/main/config.h
index 8bf741f99..1d5a0622d 100644
--- a/mesalib/src/mesa/main/config.h
+++ b/mesalib/src/mesa/main/config.h
@@ -261,6 +261,12 @@
 #define MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS         1024
 /*@}*/
 
+/** For GL_ARB_debug_output */
+/*@{*/
+#define MAX_DEBUG_LOGGED_MESSAGES   10
+#define MAX_DEBUG_MESSAGE_LENGTH    4096
+/*@}*/
+
 
 /*
  * Color channel component order
diff --git a/mesalib/src/mesa/main/context.c b/mesalib/src/mesa/main/context.c
index 8d48904f8..83e5de47a 100644
--- a/mesalib/src/mesa/main/context.c
+++ b/mesalib/src/mesa/main/context.c
@@ -759,6 +759,7 @@ init_attrib_groups(struct gl_context *ctx)
    _mesa_init_depth( ctx );
    _mesa_init_debug( ctx );
    _mesa_init_display_list( ctx );
+   _mesa_init_errors( ctx );
    _mesa_init_eval( ctx );
    _mesa_init_fbobjects( ctx );
    _mesa_init_feedback( ctx );
@@ -1137,6 +1138,8 @@ _mesa_free_context_data( struct gl_context *ctx )
    /* needs to be after freeing shared state */
    _mesa_free_display_list_data(ctx);
 
+   _mesa_free_errors_data(ctx);
+
    if (ctx->Extensions.String)
       free((void *) ctx->Extensions.String);
 
diff --git a/mesalib/src/mesa/main/descrip.mms b/mesalib/src/mesa/main/descrip.mms
index 70bc26372..91d7225c3 100644
--- a/mesalib/src/mesa/main/descrip.mms
+++ b/mesalib/src/mesa/main/descrip.mms
@@ -42,6 +42,7 @@ SOURCES =accum.c \
 	drawpix.c \
 	enable.c \
 	enums.c \
+	errors.c \
 	eval.c \
 	execmem.c \
 	extensions.c \
@@ -116,6 +117,7 @@ dlist.obj,\
 drawpix.obj,\
 enable.obj,\
 enums.obj,\
+errors.obj,\
 eval.obj,\
 execmem.obj,\
 extensions.obj,\
@@ -200,6 +202,7 @@ dlist.obj : dlist.c
 drawpix.obj : drawpix.c
 enable.obj : enable.c
 enums.obj : enums.c
+errors.obj : errors.c
 eval.obj : eval.c
 execmem.obj : execmem.c
 extensions.obj : extensions.c
diff --git a/mesalib/src/mesa/main/dispatch.h b/mesalib/src/mesa/main/dispatch.h
index 19eabb85c..6ae69f770 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 973
+#define _gloffset_COUNT 977
 
 #define _gloffset_NewList 0
 #define _gloffset_EndList 1
@@ -733,318 +733,322 @@
 #define _gloffset_GetShaderPrecisionFormat 662
 #define _gloffset_ReleaseShaderCompiler 663
 #define _gloffset_ShaderBinary 664
-#define _gloffset_GetGraphicsResetStatusARB 665
-#define _gloffset_GetnColorTableARB 666
-#define _gloffset_GetnCompressedTexImageARB 667
-#define _gloffset_GetnConvolutionFilterARB 668
-#define _gloffset_GetnHistogramARB 669
-#define _gloffset_GetnMapdvARB 670
-#define _gloffset_GetnMapfvARB 671
-#define _gloffset_GetnMapivARB 672
-#define _gloffset_GetnMinmaxARB 673
-#define _gloffset_GetnPixelMapfvARB 674
-#define _gloffset_GetnPixelMapuivARB 675
-#define _gloffset_GetnPixelMapusvARB 676
-#define _gloffset_GetnPolygonStippleARB 677
-#define _gloffset_GetnSeparableFilterARB 678
-#define _gloffset_GetnTexImageARB 679
-#define _gloffset_GetnUniformdvARB 680
-#define _gloffset_GetnUniformfvARB 681
-#define _gloffset_GetnUniformivARB 682
-#define _gloffset_GetnUniformuivARB 683
-#define _gloffset_ReadnPixelsARB 684
-#define _gloffset_TexStorage1D 685
-#define _gloffset_TexStorage2D 686
-#define _gloffset_TexStorage3D 687
-#define _gloffset_TextureStorage1DEXT 688
-#define _gloffset_TextureStorage2DEXT 689
-#define _gloffset_TextureStorage3DEXT 690
-#define _gloffset_PolygonOffsetEXT 691
-#define _gloffset_GetPixelTexGenParameterfvSGIS 692
-#define _gloffset_GetPixelTexGenParameterivSGIS 693
-#define _gloffset_PixelTexGenParameterfSGIS 694
-#define _gloffset_PixelTexGenParameterfvSGIS 695
-#define _gloffset_PixelTexGenParameteriSGIS 696
-#define _gloffset_PixelTexGenParameterivSGIS 697
-#define _gloffset_SampleMaskSGIS 698
-#define _gloffset_SamplePatternSGIS 699
-#define _gloffset_ColorPointerEXT 700
-#define _gloffset_EdgeFlagPointerEXT 701
-#define _gloffset_IndexPointerEXT 702
-#define _gloffset_NormalPointerEXT 703
-#define _gloffset_TexCoordPointerEXT 704
-#define _gloffset_VertexPointerEXT 705
-#define _gloffset_PointParameterfEXT 706
-#define _gloffset_PointParameterfvEXT 707
-#define _gloffset_LockArraysEXT 708
-#define _gloffset_UnlockArraysEXT 709
-#define _gloffset_SecondaryColor3bEXT 710
-#define _gloffset_SecondaryColor3bvEXT 711
-#define _gloffset_SecondaryColor3dEXT 712
-#define _gloffset_SecondaryColor3dvEXT 713
-#define _gloffset_SecondaryColor3fEXT 714
-#define _gloffset_SecondaryColor3fvEXT 715
-#define _gloffset_SecondaryColor3iEXT 716
-#define _gloffset_SecondaryColor3ivEXT 717
-#define _gloffset_SecondaryColor3sEXT 718
-#define _gloffset_SecondaryColor3svEXT 719
-#define _gloffset_SecondaryColor3ubEXT 720
-#define _gloffset_SecondaryColor3ubvEXT 721
-#define _gloffset_SecondaryColor3uiEXT 722
-#define _gloffset_SecondaryColor3uivEXT 723
-#define _gloffset_SecondaryColor3usEXT 724
-#define _gloffset_SecondaryColor3usvEXT 725
-#define _gloffset_SecondaryColorPointerEXT 726
-#define _gloffset_MultiDrawArraysEXT 727
-#define _gloffset_MultiDrawElementsEXT 728
-#define _gloffset_FogCoordPointerEXT 729
-#define _gloffset_FogCoorddEXT 730
-#define _gloffset_FogCoorddvEXT 731
-#define _gloffset_FogCoordfEXT 732
-#define _gloffset_FogCoordfvEXT 733
-#define _gloffset_PixelTexGenSGIX 734
-#define _gloffset_BlendFuncSeparateEXT 735
-#define _gloffset_FlushVertexArrayRangeNV 736
-#define _gloffset_VertexArrayRangeNV 737
-#define _gloffset_CombinerInputNV 738
-#define _gloffset_CombinerOutputNV 739
-#define _gloffset_CombinerParameterfNV 740
-#define _gloffset_CombinerParameterfvNV 741
-#define _gloffset_CombinerParameteriNV 742
-#define _gloffset_CombinerParameterivNV 743
-#define _gloffset_FinalCombinerInputNV 744
-#define _gloffset_GetCombinerInputParameterfvNV 745
-#define _gloffset_GetCombinerInputParameterivNV 746
-#define _gloffset_GetCombinerOutputParameterfvNV 747
-#define _gloffset_GetCombinerOutputParameterivNV 748
-#define _gloffset_GetFinalCombinerInputParameterfvNV 749
-#define _gloffset_GetFinalCombinerInputParameterivNV 750
-#define _gloffset_ResizeBuffersMESA 751
-#define _gloffset_WindowPos2dMESA 752
-#define _gloffset_WindowPos2dvMESA 753
-#define _gloffset_WindowPos2fMESA 754
-#define _gloffset_WindowPos2fvMESA 755
-#define _gloffset_WindowPos2iMESA 756
-#define _gloffset_WindowPos2ivMESA 757
-#define _gloffset_WindowPos2sMESA 758
-#define _gloffset_WindowPos2svMESA 759
-#define _gloffset_WindowPos3dMESA 760
-#define _gloffset_WindowPos3dvMESA 761
-#define _gloffset_WindowPos3fMESA 762
-#define _gloffset_WindowPos3fvMESA 763
-#define _gloffset_WindowPos3iMESA 764
-#define _gloffset_WindowPos3ivMESA 765
-#define _gloffset_WindowPos3sMESA 766
-#define _gloffset_WindowPos3svMESA 767
-#define _gloffset_WindowPos4dMESA 768
-#define _gloffset_WindowPos4dvMESA 769
-#define _gloffset_WindowPos4fMESA 770
-#define _gloffset_WindowPos4fvMESA 771
-#define _gloffset_WindowPos4iMESA 772
-#define _gloffset_WindowPos4ivMESA 773
-#define _gloffset_WindowPos4sMESA 774
-#define _gloffset_WindowPos4svMESA 775
-#define _gloffset_MultiModeDrawArraysIBM 776
-#define _gloffset_MultiModeDrawElementsIBM 777
-#define _gloffset_DeleteFencesNV 778
-#define _gloffset_FinishFenceNV 779
-#define _gloffset_GenFencesNV 780
-#define _gloffset_GetFenceivNV 781
-#define _gloffset_IsFenceNV 782
-#define _gloffset_SetFenceNV 783
-#define _gloffset_TestFenceNV 784
-#define _gloffset_AreProgramsResidentNV 785
-#define _gloffset_BindProgramNV 786
-#define _gloffset_DeleteProgramsNV 787
-#define _gloffset_ExecuteProgramNV 788
-#define _gloffset_GenProgramsNV 789
-#define _gloffset_GetProgramParameterdvNV 790
-#define _gloffset_GetProgramParameterfvNV 791
-#define _gloffset_GetProgramStringNV 792
-#define _gloffset_GetProgramivNV 793
-#define _gloffset_GetTrackMatrixivNV 794
-#define _gloffset_GetVertexAttribPointervNV 795
-#define _gloffset_GetVertexAttribdvNV 796
-#define _gloffset_GetVertexAttribfvNV 797
-#define _gloffset_GetVertexAttribivNV 798
-#define _gloffset_IsProgramNV 799
-#define _gloffset_LoadProgramNV 800
-#define _gloffset_ProgramParameters4dvNV 801
-#define _gloffset_ProgramParameters4fvNV 802
-#define _gloffset_RequestResidentProgramsNV 803
-#define _gloffset_TrackMatrixNV 804
-#define _gloffset_VertexAttrib1dNV 805
-#define _gloffset_VertexAttrib1dvNV 806
-#define _gloffset_VertexAttrib1fNV 807
-#define _gloffset_VertexAttrib1fvNV 808
-#define _gloffset_VertexAttrib1sNV 809
-#define _gloffset_VertexAttrib1svNV 810
-#define _gloffset_VertexAttrib2dNV 811
-#define _gloffset_VertexAttrib2dvNV 812
-#define _gloffset_VertexAttrib2fNV 813
-#define _gloffset_VertexAttrib2fvNV 814
-#define _gloffset_VertexAttrib2sNV 815
-#define _gloffset_VertexAttrib2svNV 816
-#define _gloffset_VertexAttrib3dNV 817
-#define _gloffset_VertexAttrib3dvNV 818
-#define _gloffset_VertexAttrib3fNV 819
-#define _gloffset_VertexAttrib3fvNV 820
-#define _gloffset_VertexAttrib3sNV 821
-#define _gloffset_VertexAttrib3svNV 822
-#define _gloffset_VertexAttrib4dNV 823
-#define _gloffset_VertexAttrib4dvNV 824
-#define _gloffset_VertexAttrib4fNV 825
-#define _gloffset_VertexAttrib4fvNV 826
-#define _gloffset_VertexAttrib4sNV 827
-#define _gloffset_VertexAttrib4svNV 828
-#define _gloffset_VertexAttrib4ubNV 829
-#define _gloffset_VertexAttrib4ubvNV 830
-#define _gloffset_VertexAttribPointerNV 831
-#define _gloffset_VertexAttribs1dvNV 832
-#define _gloffset_VertexAttribs1fvNV 833
-#define _gloffset_VertexAttribs1svNV 834
-#define _gloffset_VertexAttribs2dvNV 835
-#define _gloffset_VertexAttribs2fvNV 836
-#define _gloffset_VertexAttribs2svNV 837
-#define _gloffset_VertexAttribs3dvNV 838
-#define _gloffset_VertexAttribs3fvNV 839
-#define _gloffset_VertexAttribs3svNV 840
-#define _gloffset_VertexAttribs4dvNV 841
-#define _gloffset_VertexAttribs4fvNV 842
-#define _gloffset_VertexAttribs4svNV 843
-#define _gloffset_VertexAttribs4ubvNV 844
-#define _gloffset_GetTexBumpParameterfvATI 845
-#define _gloffset_GetTexBumpParameterivATI 846
-#define _gloffset_TexBumpParameterfvATI 847
-#define _gloffset_TexBumpParameterivATI 848
-#define _gloffset_AlphaFragmentOp1ATI 849
-#define _gloffset_AlphaFragmentOp2ATI 850
-#define _gloffset_AlphaFragmentOp3ATI 851
-#define _gloffset_BeginFragmentShaderATI 852
-#define _gloffset_BindFragmentShaderATI 853
-#define _gloffset_ColorFragmentOp1ATI 854
-#define _gloffset_ColorFragmentOp2ATI 855
-#define _gloffset_ColorFragmentOp3ATI 856
-#define _gloffset_DeleteFragmentShaderATI 857
-#define _gloffset_EndFragmentShaderATI 858
-#define _gloffset_GenFragmentShadersATI 859
-#define _gloffset_PassTexCoordATI 860
-#define _gloffset_SampleMapATI 861
-#define _gloffset_SetFragmentShaderConstantATI 862
-#define _gloffset_PointParameteriNV 863
-#define _gloffset_PointParameterivNV 864
-#define _gloffset_ActiveStencilFaceEXT 865
-#define _gloffset_BindVertexArrayAPPLE 866
-#define _gloffset_DeleteVertexArraysAPPLE 867
-#define _gloffset_GenVertexArraysAPPLE 868
-#define _gloffset_IsVertexArrayAPPLE 869
-#define _gloffset_GetProgramNamedParameterdvNV 870
-#define _gloffset_GetProgramNamedParameterfvNV 871
-#define _gloffset_ProgramNamedParameter4dNV 872
-#define _gloffset_ProgramNamedParameter4dvNV 873
-#define _gloffset_ProgramNamedParameter4fNV 874
-#define _gloffset_ProgramNamedParameter4fvNV 875
-#define _gloffset_PrimitiveRestartIndexNV 876
-#define _gloffset_PrimitiveRestartNV 877
-#define _gloffset_DepthBoundsEXT 878
-#define _gloffset_BlendEquationSeparateEXT 879
-#define _gloffset_BindFramebufferEXT 880
-#define _gloffset_BindRenderbufferEXT 881
-#define _gloffset_CheckFramebufferStatusEXT 882
-#define _gloffset_DeleteFramebuffersEXT 883
-#define _gloffset_DeleteRenderbuffersEXT 884
-#define _gloffset_FramebufferRenderbufferEXT 885
-#define _gloffset_FramebufferTexture1DEXT 886
-#define _gloffset_FramebufferTexture2DEXT 887
-#define _gloffset_FramebufferTexture3DEXT 888
-#define _gloffset_GenFramebuffersEXT 889
-#define _gloffset_GenRenderbuffersEXT 890
-#define _gloffset_GenerateMipmapEXT 891
-#define _gloffset_GetFramebufferAttachmentParameterivEXT 892
-#define _gloffset_GetRenderbufferParameterivEXT 893
-#define _gloffset_IsFramebufferEXT 894
-#define _gloffset_IsRenderbufferEXT 895
-#define _gloffset_RenderbufferStorageEXT 896
-#define _gloffset_BlitFramebufferEXT 897
-#define _gloffset_BufferParameteriAPPLE 898
-#define _gloffset_FlushMappedBufferRangeAPPLE 899
-#define _gloffset_BindFragDataLocationEXT 900
-#define _gloffset_GetFragDataLocationEXT 901
-#define _gloffset_GetUniformuivEXT 902
-#define _gloffset_GetVertexAttribIivEXT 903
-#define _gloffset_GetVertexAttribIuivEXT 904
-#define _gloffset_Uniform1uiEXT 905
-#define _gloffset_Uniform1uivEXT 906
-#define _gloffset_Uniform2uiEXT 907
-#define _gloffset_Uniform2uivEXT 908
-#define _gloffset_Uniform3uiEXT 909
-#define _gloffset_Uniform3uivEXT 910
-#define _gloffset_Uniform4uiEXT 911
-#define _gloffset_Uniform4uivEXT 912
-#define _gloffset_VertexAttribI1iEXT 913
-#define _gloffset_VertexAttribI1ivEXT 914
-#define _gloffset_VertexAttribI1uiEXT 915
-#define _gloffset_VertexAttribI1uivEXT 916
-#define _gloffset_VertexAttribI2iEXT 917
-#define _gloffset_VertexAttribI2ivEXT 918
-#define _gloffset_VertexAttribI2uiEXT 919
-#define _gloffset_VertexAttribI2uivEXT 920
-#define _gloffset_VertexAttribI3iEXT 921
-#define _gloffset_VertexAttribI3ivEXT 922
-#define _gloffset_VertexAttribI3uiEXT 923
-#define _gloffset_VertexAttribI3uivEXT 924
-#define _gloffset_VertexAttribI4bvEXT 925
-#define _gloffset_VertexAttribI4iEXT 926
-#define _gloffset_VertexAttribI4ivEXT 927
-#define _gloffset_VertexAttribI4svEXT 928
-#define _gloffset_VertexAttribI4ubvEXT 929
-#define _gloffset_VertexAttribI4uiEXT 930
-#define _gloffset_VertexAttribI4uivEXT 931
-#define _gloffset_VertexAttribI4usvEXT 932
-#define _gloffset_VertexAttribIPointerEXT 933
-#define _gloffset_FramebufferTextureLayerEXT 934
-#define _gloffset_ColorMaskIndexedEXT 935
-#define _gloffset_DisableIndexedEXT 936
-#define _gloffset_EnableIndexedEXT 937
-#define _gloffset_GetBooleanIndexedvEXT 938
-#define _gloffset_GetIntegerIndexedvEXT 939
-#define _gloffset_IsEnabledIndexedEXT 940
-#define _gloffset_ClearColorIiEXT 941
-#define _gloffset_ClearColorIuiEXT 942
-#define _gloffset_GetTexParameterIivEXT 943
-#define _gloffset_GetTexParameterIuivEXT 944
-#define _gloffset_TexParameterIivEXT 945
-#define _gloffset_TexParameterIuivEXT 946
-#define _gloffset_BeginConditionalRenderNV 947
-#define _gloffset_EndConditionalRenderNV 948
-#define _gloffset_BeginTransformFeedbackEXT 949
-#define _gloffset_BindBufferBaseEXT 950
-#define _gloffset_BindBufferOffsetEXT 951
-#define _gloffset_BindBufferRangeEXT 952
-#define _gloffset_EndTransformFeedbackEXT 953
-#define _gloffset_GetTransformFeedbackVaryingEXT 954
-#define _gloffset_TransformFeedbackVaryingsEXT 955
-#define _gloffset_ProvokingVertexEXT 956
-#define _gloffset_GetTexParameterPointervAPPLE 957
-#define _gloffset_TextureRangeAPPLE 958
-#define _gloffset_GetObjectParameterivAPPLE 959
-#define _gloffset_ObjectPurgeableAPPLE 960
-#define _gloffset_ObjectUnpurgeableAPPLE 961
-#define _gloffset_ActiveProgramEXT 962
-#define _gloffset_CreateShaderProgramEXT 963
-#define _gloffset_UseShaderProgramEXT 964
-#define _gloffset_TextureBarrierNV 965
-#define _gloffset_StencilFuncSeparateATI 966
-#define _gloffset_ProgramEnvParameters4fvEXT 967
-#define _gloffset_ProgramLocalParameters4fvEXT 968
-#define _gloffset_GetQueryObjecti64vEXT 969
-#define _gloffset_GetQueryObjectui64vEXT 970
-#define _gloffset_EGLImageTargetRenderbufferStorageOES 971
-#define _gloffset_EGLImageTargetTexture2DOES 972
+#define _gloffset_DebugMessageCallbackARB 665
+#define _gloffset_DebugMessageControlARB 666
+#define _gloffset_DebugMessageInsertARB 667
+#define _gloffset_GetDebugMessageLogARB 668
+#define _gloffset_GetGraphicsResetStatusARB 669
+#define _gloffset_GetnColorTableARB 670
+#define _gloffset_GetnCompressedTexImageARB 671
+#define _gloffset_GetnConvolutionFilterARB 672
+#define _gloffset_GetnHistogramARB 673
+#define _gloffset_GetnMapdvARB 674
+#define _gloffset_GetnMapfvARB 675
+#define _gloffset_GetnMapivARB 676
+#define _gloffset_GetnMinmaxARB 677
+#define _gloffset_GetnPixelMapfvARB 678
+#define _gloffset_GetnPixelMapuivARB 679
+#define _gloffset_GetnPixelMapusvARB 680
+#define _gloffset_GetnPolygonStippleARB 681
+#define _gloffset_GetnSeparableFilterARB 682
+#define _gloffset_GetnTexImageARB 683
+#define _gloffset_GetnUniformdvARB 684
+#define _gloffset_GetnUniformfvARB 685
+#define _gloffset_GetnUniformivARB 686
+#define _gloffset_GetnUniformuivARB 687
+#define _gloffset_ReadnPixelsARB 688
+#define _gloffset_TexStorage1D 689
+#define _gloffset_TexStorage2D 690
+#define _gloffset_TexStorage3D 691
+#define _gloffset_TextureStorage1DEXT 692
+#define _gloffset_TextureStorage2DEXT 693
+#define _gloffset_TextureStorage3DEXT 694
+#define _gloffset_PolygonOffsetEXT 695
+#define _gloffset_GetPixelTexGenParameterfvSGIS 696
+#define _gloffset_GetPixelTexGenParameterivSGIS 697
+#define _gloffset_PixelTexGenParameterfSGIS 698
+#define _gloffset_PixelTexGenParameterfvSGIS 699
+#define _gloffset_PixelTexGenParameteriSGIS 700
+#define _gloffset_PixelTexGenParameterivSGIS 701
+#define _gloffset_SampleMaskSGIS 702
+#define _gloffset_SamplePatternSGIS 703
+#define _gloffset_ColorPointerEXT 704
+#define _gloffset_EdgeFlagPointerEXT 705
+#define _gloffset_IndexPointerEXT 706
+#define _gloffset_NormalPointerEXT 707
+#define _gloffset_TexCoordPointerEXT 708
+#define _gloffset_VertexPointerEXT 709
+#define _gloffset_PointParameterfEXT 710
+#define _gloffset_PointParameterfvEXT 711
+#define _gloffset_LockArraysEXT 712
+#define _gloffset_UnlockArraysEXT 713
+#define _gloffset_SecondaryColor3bEXT 714
+#define _gloffset_SecondaryColor3bvEXT 715
+#define _gloffset_SecondaryColor3dEXT 716
+#define _gloffset_SecondaryColor3dvEXT 717
+#define _gloffset_SecondaryColor3fEXT 718
+#define _gloffset_SecondaryColor3fvEXT 719
+#define _gloffset_SecondaryColor3iEXT 720
+#define _gloffset_SecondaryColor3ivEXT 721
+#define _gloffset_SecondaryColor3sEXT 722
+#define _gloffset_SecondaryColor3svEXT 723
+#define _gloffset_SecondaryColor3ubEXT 724
+#define _gloffset_SecondaryColor3ubvEXT 725
+#define _gloffset_SecondaryColor3uiEXT 726
+#define _gloffset_SecondaryColor3uivEXT 727
+#define _gloffset_SecondaryColor3usEXT 728
+#define _gloffset_SecondaryColor3usvEXT 729
+#define _gloffset_SecondaryColorPointerEXT 730
+#define _gloffset_MultiDrawArraysEXT 731
+#define _gloffset_MultiDrawElementsEXT 732
+#define _gloffset_FogCoordPointerEXT 733
+#define _gloffset_FogCoorddEXT 734
+#define _gloffset_FogCoorddvEXT 735
+#define _gloffset_FogCoordfEXT 736
+#define _gloffset_FogCoordfvEXT 737
+#define _gloffset_PixelTexGenSGIX 738
+#define _gloffset_BlendFuncSeparateEXT 739
+#define _gloffset_FlushVertexArrayRangeNV 740
+#define _gloffset_VertexArrayRangeNV 741
+#define _gloffset_CombinerInputNV 742
+#define _gloffset_CombinerOutputNV 743
+#define _gloffset_CombinerParameterfNV 744
+#define _gloffset_CombinerParameterfvNV 745
+#define _gloffset_CombinerParameteriNV 746
+#define _gloffset_CombinerParameterivNV 747
+#define _gloffset_FinalCombinerInputNV 748
+#define _gloffset_GetCombinerInputParameterfvNV 749
+#define _gloffset_GetCombinerInputParameterivNV 750
+#define _gloffset_GetCombinerOutputParameterfvNV 751
+#define _gloffset_GetCombinerOutputParameterivNV 752
+#define _gloffset_GetFinalCombinerInputParameterfvNV 753
+#define _gloffset_GetFinalCombinerInputParameterivNV 754
+#define _gloffset_ResizeBuffersMESA 755
+#define _gloffset_WindowPos2dMESA 756
+#define _gloffset_WindowPos2dvMESA 757
+#define _gloffset_WindowPos2fMESA 758
+#define _gloffset_WindowPos2fvMESA 759
+#define _gloffset_WindowPos2iMESA 760
+#define _gloffset_WindowPos2ivMESA 761
+#define _gloffset_WindowPos2sMESA 762
+#define _gloffset_WindowPos2svMESA 763
+#define _gloffset_WindowPos3dMESA 764
+#define _gloffset_WindowPos3dvMESA 765
+#define _gloffset_WindowPos3fMESA 766
+#define _gloffset_WindowPos3fvMESA 767
+#define _gloffset_WindowPos3iMESA 768
+#define _gloffset_WindowPos3ivMESA 769
+#define _gloffset_WindowPos3sMESA 770
+#define _gloffset_WindowPos3svMESA 771
+#define _gloffset_WindowPos4dMESA 772
+#define _gloffset_WindowPos4dvMESA 773
+#define _gloffset_WindowPos4fMESA 774
+#define _gloffset_WindowPos4fvMESA 775
+#define _gloffset_WindowPos4iMESA 776
+#define _gloffset_WindowPos4ivMESA 777
+#define _gloffset_WindowPos4sMESA 778
+#define _gloffset_WindowPos4svMESA 779
+#define _gloffset_MultiModeDrawArraysIBM 780
+#define _gloffset_MultiModeDrawElementsIBM 781
+#define _gloffset_DeleteFencesNV 782
+#define _gloffset_FinishFenceNV 783
+#define _gloffset_GenFencesNV 784
+#define _gloffset_GetFenceivNV 785
+#define _gloffset_IsFenceNV 786
+#define _gloffset_SetFenceNV 787
+#define _gloffset_TestFenceNV 788
+#define _gloffset_AreProgramsResidentNV 789
+#define _gloffset_BindProgramNV 790
+#define _gloffset_DeleteProgramsNV 791
+#define _gloffset_ExecuteProgramNV 792
+#define _gloffset_GenProgramsNV 793
+#define _gloffset_GetProgramParameterdvNV 794
+#define _gloffset_GetProgramParameterfvNV 795
+#define _gloffset_GetProgramStringNV 796
+#define _gloffset_GetProgramivNV 797
+#define _gloffset_GetTrackMatrixivNV 798
+#define _gloffset_GetVertexAttribPointervNV 799
+#define _gloffset_GetVertexAttribdvNV 800
+#define _gloffset_GetVertexAttribfvNV 801
+#define _gloffset_GetVertexAttribivNV 802
+#define _gloffset_IsProgramNV 803
+#define _gloffset_LoadProgramNV 804
+#define _gloffset_ProgramParameters4dvNV 805
+#define _gloffset_ProgramParameters4fvNV 806
+#define _gloffset_RequestResidentProgramsNV 807
+#define _gloffset_TrackMatrixNV 808
+#define _gloffset_VertexAttrib1dNV 809
+#define _gloffset_VertexAttrib1dvNV 810
+#define _gloffset_VertexAttrib1fNV 811
+#define _gloffset_VertexAttrib1fvNV 812
+#define _gloffset_VertexAttrib1sNV 813
+#define _gloffset_VertexAttrib1svNV 814
+#define _gloffset_VertexAttrib2dNV 815
+#define _gloffset_VertexAttrib2dvNV 816
+#define _gloffset_VertexAttrib2fNV 817
+#define _gloffset_VertexAttrib2fvNV 818
+#define _gloffset_VertexAttrib2sNV 819
+#define _gloffset_VertexAttrib2svNV 820
+#define _gloffset_VertexAttrib3dNV 821
+#define _gloffset_VertexAttrib3dvNV 822
+#define _gloffset_VertexAttrib3fNV 823
+#define _gloffset_VertexAttrib3fvNV 824
+#define _gloffset_VertexAttrib3sNV 825
+#define _gloffset_VertexAttrib3svNV 826
+#define _gloffset_VertexAttrib4dNV 827
+#define _gloffset_VertexAttrib4dvNV 828
+#define _gloffset_VertexAttrib4fNV 829
+#define _gloffset_VertexAttrib4fvNV 830
+#define _gloffset_VertexAttrib4sNV 831
+#define _gloffset_VertexAttrib4svNV 832
+#define _gloffset_VertexAttrib4ubNV 833
+#define _gloffset_VertexAttrib4ubvNV 834
+#define _gloffset_VertexAttribPointerNV 835
+#define _gloffset_VertexAttribs1dvNV 836
+#define _gloffset_VertexAttribs1fvNV 837
+#define _gloffset_VertexAttribs1svNV 838
+#define _gloffset_VertexAttribs2dvNV 839
+#define _gloffset_VertexAttribs2fvNV 840
+#define _gloffset_VertexAttribs2svNV 841
+#define _gloffset_VertexAttribs3dvNV 842
+#define _gloffset_VertexAttribs3fvNV 843
+#define _gloffset_VertexAttribs3svNV 844
+#define _gloffset_VertexAttribs4dvNV 845
+#define _gloffset_VertexAttribs4fvNV 846
+#define _gloffset_VertexAttribs4svNV 847
+#define _gloffset_VertexAttribs4ubvNV 848
+#define _gloffset_GetTexBumpParameterfvATI 849
+#define _gloffset_GetTexBumpParameterivATI 850
+#define _gloffset_TexBumpParameterfvATI 851
+#define _gloffset_TexBumpParameterivATI 852
+#define _gloffset_AlphaFragmentOp1ATI 853
+#define _gloffset_AlphaFragmentOp2ATI 854
+#define _gloffset_AlphaFragmentOp3ATI 855
+#define _gloffset_BeginFragmentShaderATI 856
+#define _gloffset_BindFragmentShaderATI 857
+#define _gloffset_ColorFragmentOp1ATI 858
+#define _gloffset_ColorFragmentOp2ATI 859
+#define _gloffset_ColorFragmentOp3ATI 860
+#define _gloffset_DeleteFragmentShaderATI 861
+#define _gloffset_EndFragmentShaderATI 862
+#define _gloffset_GenFragmentShadersATI 863
+#define _gloffset_PassTexCoordATI 864
+#define _gloffset_SampleMapATI 865
+#define _gloffset_SetFragmentShaderConstantATI 866
+#define _gloffset_PointParameteriNV 867
+#define _gloffset_PointParameterivNV 868
+#define _gloffset_ActiveStencilFaceEXT 869
+#define _gloffset_BindVertexArrayAPPLE 870
+#define _gloffset_DeleteVertexArraysAPPLE 871
+#define _gloffset_GenVertexArraysAPPLE 872
+#define _gloffset_IsVertexArrayAPPLE 873
+#define _gloffset_GetProgramNamedParameterdvNV 874
+#define _gloffset_GetProgramNamedParameterfvNV 875
+#define _gloffset_ProgramNamedParameter4dNV 876
+#define _gloffset_ProgramNamedParameter4dvNV 877
+#define _gloffset_ProgramNamedParameter4fNV 878
+#define _gloffset_ProgramNamedParameter4fvNV 879
+#define _gloffset_PrimitiveRestartIndexNV 880
+#define _gloffset_PrimitiveRestartNV 881
+#define _gloffset_DepthBoundsEXT 882
+#define _gloffset_BlendEquationSeparateEXT 883
+#define _gloffset_BindFramebufferEXT 884
+#define _gloffset_BindRenderbufferEXT 885
+#define _gloffset_CheckFramebufferStatusEXT 886
+#define _gloffset_DeleteFramebuffersEXT 887
+#define _gloffset_DeleteRenderbuffersEXT 888
+#define _gloffset_FramebufferRenderbufferEXT 889
+#define _gloffset_FramebufferTexture1DEXT 890
+#define _gloffset_FramebufferTexture2DEXT 891
+#define _gloffset_FramebufferTexture3DEXT 892
+#define _gloffset_GenFramebuffersEXT 893
+#define _gloffset_GenRenderbuffersEXT 894
+#define _gloffset_GenerateMipmapEXT 895
+#define _gloffset_GetFramebufferAttachmentParameterivEXT 896
+#define _gloffset_GetRenderbufferParameterivEXT 897
+#define _gloffset_IsFramebufferEXT 898
+#define _gloffset_IsRenderbufferEXT 899
+#define _gloffset_RenderbufferStorageEXT 900
+#define _gloffset_BlitFramebufferEXT 901
+#define _gloffset_BufferParameteriAPPLE 902
+#define _gloffset_FlushMappedBufferRangeAPPLE 903
+#define _gloffset_BindFragDataLocationEXT 904
+#define _gloffset_GetFragDataLocationEXT 905
+#define _gloffset_GetUniformuivEXT 906
+#define _gloffset_GetVertexAttribIivEXT 907
+#define _gloffset_GetVertexAttribIuivEXT 908
+#define _gloffset_Uniform1uiEXT 909
+#define _gloffset_Uniform1uivEXT 910
+#define _gloffset_Uniform2uiEXT 911
+#define _gloffset_Uniform2uivEXT 912
+#define _gloffset_Uniform3uiEXT 913
+#define _gloffset_Uniform3uivEXT 914
+#define _gloffset_Uniform4uiEXT 915
+#define _gloffset_Uniform4uivEXT 916
+#define _gloffset_VertexAttribI1iEXT 917
+#define _gloffset_VertexAttribI1ivEXT 918
+#define _gloffset_VertexAttribI1uiEXT 919
+#define _gloffset_VertexAttribI1uivEXT 920
+#define _gloffset_VertexAttribI2iEXT 921
+#define _gloffset_VertexAttribI2ivEXT 922
+#define _gloffset_VertexAttribI2uiEXT 923
+#define _gloffset_VertexAttribI2uivEXT 924
+#define _gloffset_VertexAttribI3iEXT 925
+#define _gloffset_VertexAttribI3ivEXT 926
+#define _gloffset_VertexAttribI3uiEXT 927
+#define _gloffset_VertexAttribI3uivEXT 928
+#define _gloffset_VertexAttribI4bvEXT 929
+#define _gloffset_VertexAttribI4iEXT 930
+#define _gloffset_VertexAttribI4ivEXT 931
+#define _gloffset_VertexAttribI4svEXT 932
+#define _gloffset_VertexAttribI4ubvEXT 933
+#define _gloffset_VertexAttribI4uiEXT 934
+#define _gloffset_VertexAttribI4uivEXT 935
+#define _gloffset_VertexAttribI4usvEXT 936
+#define _gloffset_VertexAttribIPointerEXT 937
+#define _gloffset_FramebufferTextureLayerEXT 938
+#define _gloffset_ColorMaskIndexedEXT 939
+#define _gloffset_DisableIndexedEXT 940
+#define _gloffset_EnableIndexedEXT 941
+#define _gloffset_GetBooleanIndexedvEXT 942
+#define _gloffset_GetIntegerIndexedvEXT 943
+#define _gloffset_IsEnabledIndexedEXT 944
+#define _gloffset_ClearColorIiEXT 945
+#define _gloffset_ClearColorIuiEXT 946
+#define _gloffset_GetTexParameterIivEXT 947
+#define _gloffset_GetTexParameterIuivEXT 948
+#define _gloffset_TexParameterIivEXT 949
+#define _gloffset_TexParameterIuivEXT 950
+#define _gloffset_BeginConditionalRenderNV 951
+#define _gloffset_EndConditionalRenderNV 952
+#define _gloffset_BeginTransformFeedbackEXT 953
+#define _gloffset_BindBufferBaseEXT 954
+#define _gloffset_BindBufferOffsetEXT 955
+#define _gloffset_BindBufferRangeEXT 956
+#define _gloffset_EndTransformFeedbackEXT 957
+#define _gloffset_GetTransformFeedbackVaryingEXT 958
+#define _gloffset_TransformFeedbackVaryingsEXT 959
+#define _gloffset_ProvokingVertexEXT 960
+#define _gloffset_GetTexParameterPointervAPPLE 961
+#define _gloffset_TextureRangeAPPLE 962
+#define _gloffset_GetObjectParameterivAPPLE 963
+#define _gloffset_ObjectPurgeableAPPLE 964
+#define _gloffset_ObjectUnpurgeableAPPLE 965
+#define _gloffset_ActiveProgramEXT 966
+#define _gloffset_CreateShaderProgramEXT 967
+#define _gloffset_UseShaderProgramEXT 968
+#define _gloffset_TextureBarrierNV 969
+#define _gloffset_StencilFuncSeparateATI 970
+#define _gloffset_ProgramEnvParameters4fvEXT 971
+#define _gloffset_ProgramLocalParameters4fvEXT 972
+#define _gloffset_GetQueryObjecti64vEXT 973
+#define _gloffset_GetQueryObjectui64vEXT 974
+#define _gloffset_EGLImageTargetRenderbufferStorageOES 975
+#define _gloffset_EGLImageTargetTexture2DOES 976
 
 #else /* !FEATURE_remap_table */
 
-#define driDispatchRemapTable_size 565
+#define driDispatchRemapTable_size 569
 extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 
 #define AttachShader_remap_index 0
@@ -1304,314 +1308,318 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define GetShaderPrecisionFormat_remap_index 254
 #define ReleaseShaderCompiler_remap_index 255
 #define ShaderBinary_remap_index 256
-#define GetGraphicsResetStatusARB_remap_index 257
-#define GetnColorTableARB_remap_index 258
-#define GetnCompressedTexImageARB_remap_index 259
-#define GetnConvolutionFilterARB_remap_index 260
-#define GetnHistogramARB_remap_index 261
-#define GetnMapdvARB_remap_index 262
-#define GetnMapfvARB_remap_index 263
-#define GetnMapivARB_remap_index 264
-#define GetnMinmaxARB_remap_index 265
-#define GetnPixelMapfvARB_remap_index 266
-#define GetnPixelMapuivARB_remap_index 267
-#define GetnPixelMapusvARB_remap_index 268
-#define GetnPolygonStippleARB_remap_index 269
-#define GetnSeparableFilterARB_remap_index 270
-#define GetnTexImageARB_remap_index 271
-#define GetnUniformdvARB_remap_index 272
-#define GetnUniformfvARB_remap_index 273
-#define GetnUniformivARB_remap_index 274
-#define GetnUniformuivARB_remap_index 275
-#define ReadnPixelsARB_remap_index 276
-#define TexStorage1D_remap_index 277
-#define TexStorage2D_remap_index 278
-#define TexStorage3D_remap_index 279
-#define TextureStorage1DEXT_remap_index 280
-#define TextureStorage2DEXT_remap_index 281
-#define TextureStorage3DEXT_remap_index 282
-#define PolygonOffsetEXT_remap_index 283
-#define GetPixelTexGenParameterfvSGIS_remap_index 284
-#define GetPixelTexGenParameterivSGIS_remap_index 285
-#define PixelTexGenParameterfSGIS_remap_index 286
-#define PixelTexGenParameterfvSGIS_remap_index 287
-#define PixelTexGenParameteriSGIS_remap_index 288
-#define PixelTexGenParameterivSGIS_remap_index 289
-#define SampleMaskSGIS_remap_index 290
-#define SamplePatternSGIS_remap_index 291
-#define ColorPointerEXT_remap_index 292
-#define EdgeFlagPointerEXT_remap_index 293
-#define IndexPointerEXT_remap_index 294
-#define NormalPointerEXT_remap_index 295
-#define TexCoordPointerEXT_remap_index 296
-#define VertexPointerEXT_remap_index 297
-#define PointParameterfEXT_remap_index 298
-#define PointParameterfvEXT_remap_index 299
-#define LockArraysEXT_remap_index 300
-#define UnlockArraysEXT_remap_index 301
-#define SecondaryColor3bEXT_remap_index 302
-#define SecondaryColor3bvEXT_remap_index 303
-#define SecondaryColor3dEXT_remap_index 304
-#define SecondaryColor3dvEXT_remap_index 305
-#define SecondaryColor3fEXT_remap_index 306
-#define SecondaryColor3fvEXT_remap_index 307
-#define SecondaryColor3iEXT_remap_index 308
-#define SecondaryColor3ivEXT_remap_index 309
-#define SecondaryColor3sEXT_remap_index 310
-#define SecondaryColor3svEXT_remap_index 311
-#define SecondaryColor3ubEXT_remap_index 312
-#define SecondaryColor3ubvEXT_remap_index 313
-#define SecondaryColor3uiEXT_remap_index 314
-#define SecondaryColor3uivEXT_remap_index 315
-#define SecondaryColor3usEXT_remap_index 316
-#define SecondaryColor3usvEXT_remap_index 317
-#define SecondaryColorPointerEXT_remap_index 318
-#define MultiDrawArraysEXT_remap_index 319
-#define MultiDrawElementsEXT_remap_index 320
-#define FogCoordPointerEXT_remap_index 321
-#define FogCoorddEXT_remap_index 322
-#define FogCoorddvEXT_remap_index 323
-#define FogCoordfEXT_remap_index 324
-#define FogCoordfvEXT_remap_index 325
-#define PixelTexGenSGIX_remap_index 326
-#define BlendFuncSeparateEXT_remap_index 327
-#define FlushVertexArrayRangeNV_remap_index 328
-#define VertexArrayRangeNV_remap_index 329
-#define CombinerInputNV_remap_index 330
-#define CombinerOutputNV_remap_index 331
-#define CombinerParameterfNV_remap_index 332
-#define CombinerParameterfvNV_remap_index 333
-#define CombinerParameteriNV_remap_index 334
-#define CombinerParameterivNV_remap_index 335
-#define FinalCombinerInputNV_remap_index 336
-#define GetCombinerInputParameterfvNV_remap_index 337
-#define GetCombinerInputParameterivNV_remap_index 338
-#define GetCombinerOutputParameterfvNV_remap_index 339
-#define GetCombinerOutputParameterivNV_remap_index 340
-#define GetFinalCombinerInputParameterfvNV_remap_index 341
-#define GetFinalCombinerInputParameterivNV_remap_index 342
-#define ResizeBuffersMESA_remap_index 343
-#define WindowPos2dMESA_remap_index 344
-#define WindowPos2dvMESA_remap_index 345
-#define WindowPos2fMESA_remap_index 346
-#define WindowPos2fvMESA_remap_index 347
-#define WindowPos2iMESA_remap_index 348
-#define WindowPos2ivMESA_remap_index 349
-#define WindowPos2sMESA_remap_index 350
-#define WindowPos2svMESA_remap_index 351
-#define WindowPos3dMESA_remap_index 352
-#define WindowPos3dvMESA_remap_index 353
-#define WindowPos3fMESA_remap_index 354
-#define WindowPos3fvMESA_remap_index 355
-#define WindowPos3iMESA_remap_index 356
-#define WindowPos3ivMESA_remap_index 357
-#define WindowPos3sMESA_remap_index 358
-#define WindowPos3svMESA_remap_index 359
-#define WindowPos4dMESA_remap_index 360
-#define WindowPos4dvMESA_remap_index 361
-#define WindowPos4fMESA_remap_index 362
-#define WindowPos4fvMESA_remap_index 363
-#define WindowPos4iMESA_remap_index 364
-#define WindowPos4ivMESA_remap_index 365
-#define WindowPos4sMESA_remap_index 366
-#define WindowPos4svMESA_remap_index 367
-#define MultiModeDrawArraysIBM_remap_index 368
-#define MultiModeDrawElementsIBM_remap_index 369
-#define DeleteFencesNV_remap_index 370
-#define FinishFenceNV_remap_index 371
-#define GenFencesNV_remap_index 372
-#define GetFenceivNV_remap_index 373
-#define IsFenceNV_remap_index 374
-#define SetFenceNV_remap_index 375
-#define TestFenceNV_remap_index 376
-#define AreProgramsResidentNV_remap_index 377
-#define BindProgramNV_remap_index 378
-#define DeleteProgramsNV_remap_index 379
-#define ExecuteProgramNV_remap_index 380
-#define GenProgramsNV_remap_index 381
-#define GetProgramParameterdvNV_remap_index 382
-#define GetProgramParameterfvNV_remap_index 383
-#define GetProgramStringNV_remap_index 384
-#define GetProgramivNV_remap_index 385
-#define GetTrackMatrixivNV_remap_index 386
-#define GetVertexAttribPointervNV_remap_index 387
-#define GetVertexAttribdvNV_remap_index 388
-#define GetVertexAttribfvNV_remap_index 389
-#define GetVertexAttribivNV_remap_index 390
-#define IsProgramNV_remap_index 391
-#define LoadProgramNV_remap_index 392
-#define ProgramParameters4dvNV_remap_index 393
-#define ProgramParameters4fvNV_remap_index 394
-#define RequestResidentProgramsNV_remap_index 395
-#define TrackMatrixNV_remap_index 396
-#define VertexAttrib1dNV_remap_index 397
-#define VertexAttrib1dvNV_remap_index 398
-#define VertexAttrib1fNV_remap_index 399
-#define VertexAttrib1fvNV_remap_index 400
-#define VertexAttrib1sNV_remap_index 401
-#define VertexAttrib1svNV_remap_index 402
-#define VertexAttrib2dNV_remap_index 403
-#define VertexAttrib2dvNV_remap_index 404
-#define VertexAttrib2fNV_remap_index 405
-#define VertexAttrib2fvNV_remap_index 406
-#define VertexAttrib2sNV_remap_index 407
-#define VertexAttrib2svNV_remap_index 408
-#define VertexAttrib3dNV_remap_index 409
-#define VertexAttrib3dvNV_remap_index 410
-#define VertexAttrib3fNV_remap_index 411
-#define VertexAttrib3fvNV_remap_index 412
-#define VertexAttrib3sNV_remap_index 413
-#define VertexAttrib3svNV_remap_index 414
-#define VertexAttrib4dNV_remap_index 415
-#define VertexAttrib4dvNV_remap_index 416
-#define VertexAttrib4fNV_remap_index 417
-#define VertexAttrib4fvNV_remap_index 418
-#define VertexAttrib4sNV_remap_index 419
-#define VertexAttrib4svNV_remap_index 420
-#define VertexAttrib4ubNV_remap_index 421
-#define VertexAttrib4ubvNV_remap_index 422
-#define VertexAttribPointerNV_remap_index 423
-#define VertexAttribs1dvNV_remap_index 424
-#define VertexAttribs1fvNV_remap_index 425
-#define VertexAttribs1svNV_remap_index 426
-#define VertexAttribs2dvNV_remap_index 427
-#define VertexAttribs2fvNV_remap_index 428
-#define VertexAttribs2svNV_remap_index 429
-#define VertexAttribs3dvNV_remap_index 430
-#define VertexAttribs3fvNV_remap_index 431
-#define VertexAttribs3svNV_remap_index 432
-#define VertexAttribs4dvNV_remap_index 433
-#define VertexAttribs4fvNV_remap_index 434
-#define VertexAttribs4svNV_remap_index 435
-#define VertexAttribs4ubvNV_remap_index 436
-#define GetTexBumpParameterfvATI_remap_index 437
-#define GetTexBumpParameterivATI_remap_index 438
-#define TexBumpParameterfvATI_remap_index 439
-#define TexBumpParameterivATI_remap_index 440
-#define AlphaFragmentOp1ATI_remap_index 441
-#define AlphaFragmentOp2ATI_remap_index 442
-#define AlphaFragmentOp3ATI_remap_index 443
-#define BeginFragmentShaderATI_remap_index 444
-#define BindFragmentShaderATI_remap_index 445
-#define ColorFragmentOp1ATI_remap_index 446
-#define ColorFragmentOp2ATI_remap_index 447
-#define ColorFragmentOp3ATI_remap_index 448
-#define DeleteFragmentShaderATI_remap_index 449
-#define EndFragmentShaderATI_remap_index 450
-#define GenFragmentShadersATI_remap_index 451
-#define PassTexCoordATI_remap_index 452
-#define SampleMapATI_remap_index 453
-#define SetFragmentShaderConstantATI_remap_index 454
-#define PointParameteriNV_remap_index 455
-#define PointParameterivNV_remap_index 456
-#define ActiveStencilFaceEXT_remap_index 457
-#define BindVertexArrayAPPLE_remap_index 458
-#define DeleteVertexArraysAPPLE_remap_index 459
-#define GenVertexArraysAPPLE_remap_index 460
-#define IsVertexArrayAPPLE_remap_index 461
-#define GetProgramNamedParameterdvNV_remap_index 462
-#define GetProgramNamedParameterfvNV_remap_index 463
-#define ProgramNamedParameter4dNV_remap_index 464
-#define ProgramNamedParameter4dvNV_remap_index 465
-#define ProgramNamedParameter4fNV_remap_index 466
-#define ProgramNamedParameter4fvNV_remap_index 467
-#define PrimitiveRestartIndexNV_remap_index 468
-#define PrimitiveRestartNV_remap_index 469
-#define DepthBoundsEXT_remap_index 470
-#define BlendEquationSeparateEXT_remap_index 471
-#define BindFramebufferEXT_remap_index 472
-#define BindRenderbufferEXT_remap_index 473
-#define CheckFramebufferStatusEXT_remap_index 474
-#define DeleteFramebuffersEXT_remap_index 475
-#define DeleteRenderbuffersEXT_remap_index 476
-#define FramebufferRenderbufferEXT_remap_index 477
-#define FramebufferTexture1DEXT_remap_index 478
-#define FramebufferTexture2DEXT_remap_index 479
-#define FramebufferTexture3DEXT_remap_index 480
-#define GenFramebuffersEXT_remap_index 481
-#define GenRenderbuffersEXT_remap_index 482
-#define GenerateMipmapEXT_remap_index 483
-#define GetFramebufferAttachmentParameterivEXT_remap_index 484
-#define GetRenderbufferParameterivEXT_remap_index 485
-#define IsFramebufferEXT_remap_index 486
-#define IsRenderbufferEXT_remap_index 487
-#define RenderbufferStorageEXT_remap_index 488
-#define BlitFramebufferEXT_remap_index 489
-#define BufferParameteriAPPLE_remap_index 490
-#define FlushMappedBufferRangeAPPLE_remap_index 491
-#define BindFragDataLocationEXT_remap_index 492
-#define GetFragDataLocationEXT_remap_index 493
-#define GetUniformuivEXT_remap_index 494
-#define GetVertexAttribIivEXT_remap_index 495
-#define GetVertexAttribIuivEXT_remap_index 496
-#define Uniform1uiEXT_remap_index 497
-#define Uniform1uivEXT_remap_index 498
-#define Uniform2uiEXT_remap_index 499
-#define Uniform2uivEXT_remap_index 500
-#define Uniform3uiEXT_remap_index 501
-#define Uniform3uivEXT_remap_index 502
-#define Uniform4uiEXT_remap_index 503
-#define Uniform4uivEXT_remap_index 504
-#define VertexAttribI1iEXT_remap_index 505
-#define VertexAttribI1ivEXT_remap_index 506
-#define VertexAttribI1uiEXT_remap_index 507
-#define VertexAttribI1uivEXT_remap_index 508
-#define VertexAttribI2iEXT_remap_index 509
-#define VertexAttribI2ivEXT_remap_index 510
-#define VertexAttribI2uiEXT_remap_index 511
-#define VertexAttribI2uivEXT_remap_index 512
-#define VertexAttribI3iEXT_remap_index 513
-#define VertexAttribI3ivEXT_remap_index 514
-#define VertexAttribI3uiEXT_remap_index 515
-#define VertexAttribI3uivEXT_remap_index 516
-#define VertexAttribI4bvEXT_remap_index 517
-#define VertexAttribI4iEXT_remap_index 518
-#define VertexAttribI4ivEXT_remap_index 519
-#define VertexAttribI4svEXT_remap_index 520
-#define VertexAttribI4ubvEXT_remap_index 521
-#define VertexAttribI4uiEXT_remap_index 522
-#define VertexAttribI4uivEXT_remap_index 523
-#define VertexAttribI4usvEXT_remap_index 524
-#define VertexAttribIPointerEXT_remap_index 525
-#define FramebufferTextureLayerEXT_remap_index 526
-#define ColorMaskIndexedEXT_remap_index 527
-#define DisableIndexedEXT_remap_index 528
-#define EnableIndexedEXT_remap_index 529
-#define GetBooleanIndexedvEXT_remap_index 530
-#define GetIntegerIndexedvEXT_remap_index 531
-#define IsEnabledIndexedEXT_remap_index 532
-#define ClearColorIiEXT_remap_index 533
-#define ClearColorIuiEXT_remap_index 534
-#define GetTexParameterIivEXT_remap_index 535
-#define GetTexParameterIuivEXT_remap_index 536
-#define TexParameterIivEXT_remap_index 537
-#define TexParameterIuivEXT_remap_index 538
-#define BeginConditionalRenderNV_remap_index 539
-#define EndConditionalRenderNV_remap_index 540
-#define BeginTransformFeedbackEXT_remap_index 541
-#define BindBufferBaseEXT_remap_index 542
-#define BindBufferOffsetEXT_remap_index 543
-#define BindBufferRangeEXT_remap_index 544
-#define EndTransformFeedbackEXT_remap_index 545
-#define GetTransformFeedbackVaryingEXT_remap_index 546
-#define TransformFeedbackVaryingsEXT_remap_index 547
-#define ProvokingVertexEXT_remap_index 548
-#define GetTexParameterPointervAPPLE_remap_index 549
-#define TextureRangeAPPLE_remap_index 550
-#define GetObjectParameterivAPPLE_remap_index 551
-#define ObjectPurgeableAPPLE_remap_index 552
-#define ObjectUnpurgeableAPPLE_remap_index 553
-#define ActiveProgramEXT_remap_index 554
-#define CreateShaderProgramEXT_remap_index 555
-#define UseShaderProgramEXT_remap_index 556
-#define TextureBarrierNV_remap_index 557
-#define StencilFuncSeparateATI_remap_index 558
-#define ProgramEnvParameters4fvEXT_remap_index 559
-#define ProgramLocalParameters4fvEXT_remap_index 560
-#define GetQueryObjecti64vEXT_remap_index 561
-#define GetQueryObjectui64vEXT_remap_index 562
-#define EGLImageTargetRenderbufferStorageOES_remap_index 563
-#define EGLImageTargetTexture2DOES_remap_index 564
+#define DebugMessageCallbackARB_remap_index 257
+#define DebugMessageControlARB_remap_index 258
+#define DebugMessageInsertARB_remap_index 259
+#define GetDebugMessageLogARB_remap_index 260
+#define GetGraphicsResetStatusARB_remap_index 261
+#define GetnColorTableARB_remap_index 262
+#define GetnCompressedTexImageARB_remap_index 263
+#define GetnConvolutionFilterARB_remap_index 264
+#define GetnHistogramARB_remap_index 265
+#define GetnMapdvARB_remap_index 266
+#define GetnMapfvARB_remap_index 267
+#define GetnMapivARB_remap_index 268
+#define GetnMinmaxARB_remap_index 269
+#define GetnPixelMapfvARB_remap_index 270
+#define GetnPixelMapuivARB_remap_index 271
+#define GetnPixelMapusvARB_remap_index 272
+#define GetnPolygonStippleARB_remap_index 273
+#define GetnSeparableFilterARB_remap_index 274
+#define GetnTexImageARB_remap_index 275
+#define GetnUniformdvARB_remap_index 276
+#define GetnUniformfvARB_remap_index 277
+#define GetnUniformivARB_remap_index 278
+#define GetnUniformuivARB_remap_index 279
+#define ReadnPixelsARB_remap_index 280
+#define TexStorage1D_remap_index 281
+#define TexStorage2D_remap_index 282
+#define TexStorage3D_remap_index 283
+#define TextureStorage1DEXT_remap_index 284
+#define TextureStorage2DEXT_remap_index 285
+#define TextureStorage3DEXT_remap_index 286
+#define PolygonOffsetEXT_remap_index 287
+#define GetPixelTexGenParameterfvSGIS_remap_index 288
+#define GetPixelTexGenParameterivSGIS_remap_index 289
+#define PixelTexGenParameterfSGIS_remap_index 290
+#define PixelTexGenParameterfvSGIS_remap_index 291
+#define PixelTexGenParameteriSGIS_remap_index 292
+#define PixelTexGenParameterivSGIS_remap_index 293
+#define SampleMaskSGIS_remap_index 294
+#define SamplePatternSGIS_remap_index 295
+#define ColorPointerEXT_remap_index 296
+#define EdgeFlagPointerEXT_remap_index 297
+#define IndexPointerEXT_remap_index 298
+#define NormalPointerEXT_remap_index 299
+#define TexCoordPointerEXT_remap_index 300
+#define VertexPointerEXT_remap_index 301
+#define PointParameterfEXT_remap_index 302
+#define PointParameterfvEXT_remap_index 303
+#define LockArraysEXT_remap_index 304
+#define UnlockArraysEXT_remap_index 305
+#define SecondaryColor3bEXT_remap_index 306
+#define SecondaryColor3bvEXT_remap_index 307
+#define SecondaryColor3dEXT_remap_index 308
+#define SecondaryColor3dvEXT_remap_index 309
+#define SecondaryColor3fEXT_remap_index 310
+#define SecondaryColor3fvEXT_remap_index 311
+#define SecondaryColor3iEXT_remap_index 312
+#define SecondaryColor3ivEXT_remap_index 313
+#define SecondaryColor3sEXT_remap_index 314
+#define SecondaryColor3svEXT_remap_index 315
+#define SecondaryColor3ubEXT_remap_index 316
+#define SecondaryColor3ubvEXT_remap_index 317
+#define SecondaryColor3uiEXT_remap_index 318
+#define SecondaryColor3uivEXT_remap_index 319
+#define SecondaryColor3usEXT_remap_index 320
+#define SecondaryColor3usvEXT_remap_index 321
+#define SecondaryColorPointerEXT_remap_index 322
+#define MultiDrawArraysEXT_remap_index 323
+#define MultiDrawElementsEXT_remap_index 324
+#define FogCoordPointerEXT_remap_index 325
+#define FogCoorddEXT_remap_index 326
+#define FogCoorddvEXT_remap_index 327
+#define FogCoordfEXT_remap_index 328
+#define FogCoordfvEXT_remap_index 329
+#define PixelTexGenSGIX_remap_index 330
+#define BlendFuncSeparateEXT_remap_index 331
+#define FlushVertexArrayRangeNV_remap_index 332
+#define VertexArrayRangeNV_remap_index 333
+#define CombinerInputNV_remap_index 334
+#define CombinerOutputNV_remap_index 335
+#define CombinerParameterfNV_remap_index 336
+#define CombinerParameterfvNV_remap_index 337
+#define CombinerParameteriNV_remap_index 338
+#define CombinerParameterivNV_remap_index 339
+#define FinalCombinerInputNV_remap_index 340
+#define GetCombinerInputParameterfvNV_remap_index 341
+#define GetCombinerInputParameterivNV_remap_index 342
+#define GetCombinerOutputParameterfvNV_remap_index 343
+#define GetCombinerOutputParameterivNV_remap_index 344
+#define GetFinalCombinerInputParameterfvNV_remap_index 345
+#define GetFinalCombinerInputParameterivNV_remap_index 346
+#define ResizeBuffersMESA_remap_index 347
+#define WindowPos2dMESA_remap_index 348
+#define WindowPos2dvMESA_remap_index 349
+#define WindowPos2fMESA_remap_index 350
+#define WindowPos2fvMESA_remap_index 351
+#define WindowPos2iMESA_remap_index 352
+#define WindowPos2ivMESA_remap_index 353
+#define WindowPos2sMESA_remap_index 354
+#define WindowPos2svMESA_remap_index 355
+#define WindowPos3dMESA_remap_index 356
+#define WindowPos3dvMESA_remap_index 357
+#define WindowPos3fMESA_remap_index 358
+#define WindowPos3fvMESA_remap_index 359
+#define WindowPos3iMESA_remap_index 360
+#define WindowPos3ivMESA_remap_index 361
+#define WindowPos3sMESA_remap_index 362
+#define WindowPos3svMESA_remap_index 363
+#define WindowPos4dMESA_remap_index 364
+#define WindowPos4dvMESA_remap_index 365
+#define WindowPos4fMESA_remap_index 366
+#define WindowPos4fvMESA_remap_index 367
+#define WindowPos4iMESA_remap_index 368
+#define WindowPos4ivMESA_remap_index 369
+#define WindowPos4sMESA_remap_index 370
+#define WindowPos4svMESA_remap_index 371
+#define MultiModeDrawArraysIBM_remap_index 372
+#define MultiModeDrawElementsIBM_remap_index 373
+#define DeleteFencesNV_remap_index 374
+#define FinishFenceNV_remap_index 375
+#define GenFencesNV_remap_index 376
+#define GetFenceivNV_remap_index 377
+#define IsFenceNV_remap_index 378
+#define SetFenceNV_remap_index 379
+#define TestFenceNV_remap_index 380
+#define AreProgramsResidentNV_remap_index 381
+#define BindProgramNV_remap_index 382
+#define DeleteProgramsNV_remap_index 383
+#define ExecuteProgramNV_remap_index 384
+#define GenProgramsNV_remap_index 385
+#define GetProgramParameterdvNV_remap_index 386
+#define GetProgramParameterfvNV_remap_index 387
+#define GetProgramStringNV_remap_index 388
+#define GetProgramivNV_remap_index 389
+#define GetTrackMatrixivNV_remap_index 390
+#define GetVertexAttribPointervNV_remap_index 391
+#define GetVertexAttribdvNV_remap_index 392
+#define GetVertexAttribfvNV_remap_index 393
+#define GetVertexAttribivNV_remap_index 394
+#define IsProgramNV_remap_index 395
+#define LoadProgramNV_remap_index 396
+#define ProgramParameters4dvNV_remap_index 397
+#define ProgramParameters4fvNV_remap_index 398
+#define RequestResidentProgramsNV_remap_index 399
+#define TrackMatrixNV_remap_index 400
+#define VertexAttrib1dNV_remap_index 401
+#define VertexAttrib1dvNV_remap_index 402
+#define VertexAttrib1fNV_remap_index 403
+#define VertexAttrib1fvNV_remap_index 404
+#define VertexAttrib1sNV_remap_index 405
+#define VertexAttrib1svNV_remap_index 406
+#define VertexAttrib2dNV_remap_index 407
+#define VertexAttrib2dvNV_remap_index 408
+#define VertexAttrib2fNV_remap_index 409
+#define VertexAttrib2fvNV_remap_index 410
+#define VertexAttrib2sNV_remap_index 411
+#define VertexAttrib2svNV_remap_index 412
+#define VertexAttrib3dNV_remap_index 413
+#define VertexAttrib3dvNV_remap_index 414
+#define VertexAttrib3fNV_remap_index 415
+#define VertexAttrib3fvNV_remap_index 416
+#define VertexAttrib3sNV_remap_index 417
+#define VertexAttrib3svNV_remap_index 418
+#define VertexAttrib4dNV_remap_index 419
+#define VertexAttrib4dvNV_remap_index 420
+#define VertexAttrib4fNV_remap_index 421
+#define VertexAttrib4fvNV_remap_index 422
+#define VertexAttrib4sNV_remap_index 423
+#define VertexAttrib4svNV_remap_index 424
+#define VertexAttrib4ubNV_remap_index 425
+#define VertexAttrib4ubvNV_remap_index 426
+#define VertexAttribPointerNV_remap_index 427
+#define VertexAttribs1dvNV_remap_index 428
+#define VertexAttribs1fvNV_remap_index 429
+#define VertexAttribs1svNV_remap_index 430
+#define VertexAttribs2dvNV_remap_index 431
+#define VertexAttribs2fvNV_remap_index 432
+#define VertexAttribs2svNV_remap_index 433
+#define VertexAttribs3dvNV_remap_index 434
+#define VertexAttribs3fvNV_remap_index 435
+#define VertexAttribs3svNV_remap_index 436
+#define VertexAttribs4dvNV_remap_index 437
+#define VertexAttribs4fvNV_remap_index 438
+#define VertexAttribs4svNV_remap_index 439
+#define VertexAttribs4ubvNV_remap_index 440
+#define GetTexBumpParameterfvATI_remap_index 441
+#define GetTexBumpParameterivATI_remap_index 442
+#define TexBumpParameterfvATI_remap_index 443
+#define TexBumpParameterivATI_remap_index 444
+#define AlphaFragmentOp1ATI_remap_index 445
+#define AlphaFragmentOp2ATI_remap_index 446
+#define AlphaFragmentOp3ATI_remap_index 447
+#define BeginFragmentShaderATI_remap_index 448
+#define BindFragmentShaderATI_remap_index 449
+#define ColorFragmentOp1ATI_remap_index 450
+#define ColorFragmentOp2ATI_remap_index 451
+#define ColorFragmentOp3ATI_remap_index 452
+#define DeleteFragmentShaderATI_remap_index 453
+#define EndFragmentShaderATI_remap_index 454
+#define GenFragmentShadersATI_remap_index 455
+#define PassTexCoordATI_remap_index 456
+#define SampleMapATI_remap_index 457
+#define SetFragmentShaderConstantATI_remap_index 458
+#define PointParameteriNV_remap_index 459
+#define PointParameterivNV_remap_index 460
+#define ActiveStencilFaceEXT_remap_index 461
+#define BindVertexArrayAPPLE_remap_index 462
+#define DeleteVertexArraysAPPLE_remap_index 463
+#define GenVertexArraysAPPLE_remap_index 464
+#define IsVertexArrayAPPLE_remap_index 465
+#define GetProgramNamedParameterdvNV_remap_index 466
+#define GetProgramNamedParameterfvNV_remap_index 467
+#define ProgramNamedParameter4dNV_remap_index 468
+#define ProgramNamedParameter4dvNV_remap_index 469
+#define ProgramNamedParameter4fNV_remap_index 470
+#define ProgramNamedParameter4fvNV_remap_index 471
+#define PrimitiveRestartIndexNV_remap_index 472
+#define PrimitiveRestartNV_remap_index 473
+#define DepthBoundsEXT_remap_index 474
+#define BlendEquationSeparateEXT_remap_index 475
+#define BindFramebufferEXT_remap_index 476
+#define BindRenderbufferEXT_remap_index 477
+#define CheckFramebufferStatusEXT_remap_index 478
+#define DeleteFramebuffersEXT_remap_index 479
+#define DeleteRenderbuffersEXT_remap_index 480
+#define FramebufferRenderbufferEXT_remap_index 481
+#define FramebufferTexture1DEXT_remap_index 482
+#define FramebufferTexture2DEXT_remap_index 483
+#define FramebufferTexture3DEXT_remap_index 484
+#define GenFramebuffersEXT_remap_index 485
+#define GenRenderbuffersEXT_remap_index 486
+#define GenerateMipmapEXT_remap_index 487
+#define GetFramebufferAttachmentParameterivEXT_remap_index 488
+#define GetRenderbufferParameterivEXT_remap_index 489
+#define IsFramebufferEXT_remap_index 490
+#define IsRenderbufferEXT_remap_index 491
+#define RenderbufferStorageEXT_remap_index 492
+#define BlitFramebufferEXT_remap_index 493
+#define BufferParameteriAPPLE_remap_index 494
+#define FlushMappedBufferRangeAPPLE_remap_index 495
+#define BindFragDataLocationEXT_remap_index 496
+#define GetFragDataLocationEXT_remap_index 497
+#define GetUniformuivEXT_remap_index 498
+#define GetVertexAttribIivEXT_remap_index 499
+#define GetVertexAttribIuivEXT_remap_index 500
+#define Uniform1uiEXT_remap_index 501
+#define Uniform1uivEXT_remap_index 502
+#define Uniform2uiEXT_remap_index 503
+#define Uniform2uivEXT_remap_index 504
+#define Uniform3uiEXT_remap_index 505
+#define Uniform3uivEXT_remap_index 506
+#define Uniform4uiEXT_remap_index 507
+#define Uniform4uivEXT_remap_index 508
+#define VertexAttribI1iEXT_remap_index 509
+#define VertexAttribI1ivEXT_remap_index 510
+#define VertexAttribI1uiEXT_remap_index 511
+#define VertexAttribI1uivEXT_remap_index 512
+#define VertexAttribI2iEXT_remap_index 513
+#define VertexAttribI2ivEXT_remap_index 514
+#define VertexAttribI2uiEXT_remap_index 515
+#define VertexAttribI2uivEXT_remap_index 516
+#define VertexAttribI3iEXT_remap_index 517
+#define VertexAttribI3ivEXT_remap_index 518
+#define VertexAttribI3uiEXT_remap_index 519
+#define VertexAttribI3uivEXT_remap_index 520
+#define VertexAttribI4bvEXT_remap_index 521
+#define VertexAttribI4iEXT_remap_index 522
+#define VertexAttribI4ivEXT_remap_index 523
+#define VertexAttribI4svEXT_remap_index 524
+#define VertexAttribI4ubvEXT_remap_index 525
+#define VertexAttribI4uiEXT_remap_index 526
+#define VertexAttribI4uivEXT_remap_index 527
+#define VertexAttribI4usvEXT_remap_index 528
+#define VertexAttribIPointerEXT_remap_index 529
+#define FramebufferTextureLayerEXT_remap_index 530
+#define ColorMaskIndexedEXT_remap_index 531
+#define DisableIndexedEXT_remap_index 532
+#define EnableIndexedEXT_remap_index 533
+#define GetBooleanIndexedvEXT_remap_index 534
+#define GetIntegerIndexedvEXT_remap_index 535
+#define IsEnabledIndexedEXT_remap_index 536
+#define ClearColorIiEXT_remap_index 537
+#define ClearColorIuiEXT_remap_index 538
+#define GetTexParameterIivEXT_remap_index 539
+#define GetTexParameterIuivEXT_remap_index 540
+#define TexParameterIivEXT_remap_index 541
+#define TexParameterIuivEXT_remap_index 542
+#define BeginConditionalRenderNV_remap_index 543
+#define EndConditionalRenderNV_remap_index 544
+#define BeginTransformFeedbackEXT_remap_index 545
+#define BindBufferBaseEXT_remap_index 546
+#define BindBufferOffsetEXT_remap_index 547
+#define BindBufferRangeEXT_remap_index 548
+#define EndTransformFeedbackEXT_remap_index 549
+#define GetTransformFeedbackVaryingEXT_remap_index 550
+#define TransformFeedbackVaryingsEXT_remap_index 551
+#define ProvokingVertexEXT_remap_index 552
+#define GetTexParameterPointervAPPLE_remap_index 553
+#define TextureRangeAPPLE_remap_index 554
+#define GetObjectParameterivAPPLE_remap_index 555
+#define ObjectPurgeableAPPLE_remap_index 556
+#define ObjectUnpurgeableAPPLE_remap_index 557
+#define ActiveProgramEXT_remap_index 558
+#define CreateShaderProgramEXT_remap_index 559
+#define UseShaderProgramEXT_remap_index 560
+#define TextureBarrierNV_remap_index 561
+#define StencilFuncSeparateATI_remap_index 562
+#define ProgramEnvParameters4fvEXT_remap_index 563
+#define ProgramLocalParameters4fvEXT_remap_index 564
+#define GetQueryObjecti64vEXT_remap_index 565
+#define GetQueryObjectui64vEXT_remap_index 566
+#define EGLImageTargetRenderbufferStorageOES_remap_index 567
+#define EGLImageTargetTexture2DOES_remap_index 568
 
 #define _gloffset_AttachShader driDispatchRemapTable[AttachShader_remap_index]
 #define _gloffset_CreateProgram driDispatchRemapTable[CreateProgram_remap_index]
@@ -1870,6 +1878,10 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define _gloffset_GetShaderPrecisionFormat driDispatchRemapTable[GetShaderPrecisionFormat_remap_index]
 #define _gloffset_ReleaseShaderCompiler driDispatchRemapTable[ReleaseShaderCompiler_remap_index]
 #define _gloffset_ShaderBinary driDispatchRemapTable[ShaderBinary_remap_index]
+#define _gloffset_DebugMessageCallbackARB driDispatchRemapTable[DebugMessageCallbackARB_remap_index]
+#define _gloffset_DebugMessageControlARB driDispatchRemapTable[DebugMessageControlARB_remap_index]
+#define _gloffset_DebugMessageInsertARB driDispatchRemapTable[DebugMessageInsertARB_remap_index]
+#define _gloffset_GetDebugMessageLogARB driDispatchRemapTable[GetDebugMessageLogARB_remap_index]
 #define _gloffset_GetGraphicsResetStatusARB driDispatchRemapTable[GetGraphicsResetStatusARB_remap_index]
 #define _gloffset_GetnColorTableARB driDispatchRemapTable[GetnColorTableARB_remap_index]
 #define _gloffset_GetnCompressedTexImageARB driDispatchRemapTable[GetnCompressedTexImageARB_remap_index]
@@ -9496,6 +9508,50 @@ static inline void SET_ShaderBinary(struct _glapi_table *disp, void (GLAPIENTRYP
    SET_by_offset(disp, _gloffset_ShaderBinary, fn);
 }
 
+typedef void (GLAPIENTRYP _glptr_DebugMessageCallbackARB)(GLDEBUGPROCARB, GLvoid *);
+#define CALL_DebugMessageCallbackARB(disp, parameters) \
+    (* GET_DebugMessageCallbackARB(disp)) parameters
+static inline _glptr_DebugMessageCallbackARB GET_DebugMessageCallbackARB(struct _glapi_table *disp) {
+   return (_glptr_DebugMessageCallbackARB) (GET_by_offset(disp, _gloffset_DebugMessageCallbackARB));
+}
+
+static inline void SET_DebugMessageCallbackARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLDEBUGPROCARB, GLvoid *)) {
+   SET_by_offset(disp, _gloffset_DebugMessageCallbackARB, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_DebugMessageControlARB)(GLenum, GLenum, GLenum, GLsizei, const GLuint *, GLboolean);
+#define CALL_DebugMessageControlARB(disp, parameters) \
+    (* GET_DebugMessageControlARB(disp)) parameters
+static inline _glptr_DebugMessageControlARB GET_DebugMessageControlARB(struct _glapi_table *disp) {
+   return (_glptr_DebugMessageControlARB) (GET_by_offset(disp, _gloffset_DebugMessageControlARB));
+}
+
+static inline void SET_DebugMessageControlARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLenum, GLsizei, const GLuint *, GLboolean)) {
+   SET_by_offset(disp, _gloffset_DebugMessageControlARB, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_DebugMessageInsertARB)(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLcharARB *);
+#define CALL_DebugMessageInsertARB(disp, parameters) \
+    (* GET_DebugMessageInsertARB(disp)) parameters
+static inline _glptr_DebugMessageInsertARB GET_DebugMessageInsertARB(struct _glapi_table *disp) {
+   return (_glptr_DebugMessageInsertARB) (GET_by_offset(disp, _gloffset_DebugMessageInsertARB));
+}
+
+static inline void SET_DebugMessageInsertARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLcharARB *)) {
+   SET_by_offset(disp, _gloffset_DebugMessageInsertARB, fn);
+}
+
+typedef GLuint (GLAPIENTRYP _glptr_GetDebugMessageLogARB)(GLuint, GLsizei, GLenum *, GLenum *, GLuint *, GLenum *, GLsizei *, GLcharARB *);
+#define CALL_GetDebugMessageLogARB(disp, parameters) \
+    (* GET_GetDebugMessageLogARB(disp)) parameters
+static inline _glptr_GetDebugMessageLogARB GET_GetDebugMessageLogARB(struct _glapi_table *disp) {
+   return (_glptr_GetDebugMessageLogARB) (GET_by_offset(disp, _gloffset_GetDebugMessageLogARB));
+}
+
+static inline void SET_GetDebugMessageLogARB(struct _glapi_table *disp, GLuint (GLAPIENTRYP fn)(GLuint, GLsizei, GLenum *, GLenum *, GLuint *, GLenum *, GLsizei *, GLcharARB *)) {
+   SET_by_offset(disp, _gloffset_GetDebugMessageLogARB, fn);
+}
+
 typedef GLenum (GLAPIENTRYP _glptr_GetGraphicsResetStatusARB)(void);
 #define CALL_GetGraphicsResetStatusARB(disp, parameters) \
     (* GET_GetGraphicsResetStatusARB(disp)) parameters
diff --git a/mesalib/src/mesa/main/dlist.c b/mesalib/src/mesa/main/dlist.c
index 3db7bebae..420ddcc0c 100644
--- a/mesalib/src/mesa/main/dlist.c
+++ b/mesalib/src/mesa/main/dlist.c
@@ -10425,6 +10425,9 @@ _mesa_create_save_table(void)
    SET_TextureStorage2DEXT(table, _mesa_TextureStorage2DEXT);
    SET_TextureStorage3DEXT(table, _mesa_TextureStorage3DEXT);
 
+   /* GL_ARB_debug_output (no dlist support) */
+   _mesa_init_errors_dispatch(table);
+
    return table;
 }
 
diff --git a/mesalib/src/mesa/main/enable.c b/mesalib/src/mesa/main/enable.c
index 515dda952..2f0216b01 100644
--- a/mesalib/src/mesa/main/enable.c
+++ b/mesalib/src/mesa/main/enable.c
@@ -348,6 +348,9 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state)
          FLUSH_VERTICES(ctx, _NEW_DEPTH);
          ctx->Depth.Test = state;
          break;
+      case GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB:
+         ctx->Debug.SyncOutput = state;
+         break;
       case GL_DITHER:
          if (ctx->Color.DitherFlag == state)
             return;
@@ -1114,6 +1117,8 @@ _mesa_IsEnabled( GLenum cap )
 	 return ctx->Light.ColorMaterialEnabled;
       case GL_CULL_FACE:
          return ctx->Polygon.CullFlag;
+      case GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB:
+         return ctx->Debug.SyncOutput;
       case GL_DEPTH_TEST:
          return ctx->Depth.Test;
       case GL_DITHER:
diff --git a/mesalib/src/mesa/main/enums.c b/mesalib/src/mesa/main/enums.c
index c92a9a166..d2a2773fa 100644
--- a/mesalib/src/mesa/main/enums.c
+++ b/mesalib/src/mesa/main/enums.c
@@ -429,8 +429,28 @@ LONGSTRING static const char enum_string_table[] =
    "GL_CURRENT_WEIGHT_ARB\0"
    "GL_CW\0"
    "GL_DEBUG_ASSERT_MESA\0"
+   "GL_DEBUG_CALLBACK_FUNCTION_ARB\0"
+   "GL_DEBUG_CALLBACK_USER_PARAM_ARB\0"
+   "GL_DEBUG_LOGGED_MESSAGES_ARB\0"
+   "GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_ARB\0"
    "GL_DEBUG_OBJECT_MESA\0"
+   "GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB\0"
    "GL_DEBUG_PRINT_MESA\0"
+   "GL_DEBUG_SEVERITY_HIGH_ARB\0"
+   "GL_DEBUG_SEVERITY_LOW_ARB\0"
+   "GL_DEBUG_SEVERITY_MEDIUM_ARB\0"
+   "GL_DEBUG_SOURCE_API_ARB\0"
+   "GL_DEBUG_SOURCE_APPLICATION_ARB\0"
+   "GL_DEBUG_SOURCE_OTHER_ARB\0"
+   "GL_DEBUG_SOURCE_SHADER_COMPILER_ARB\0"
+   "GL_DEBUG_SOURCE_THIRD_PARTY_ARB\0"
+   "GL_DEBUG_SOURCE_WINDOW_SYSTEM_ARB\0"
+   "GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_ARB\0"
+   "GL_DEBUG_TYPE_ERROR_ARB\0"
+   "GL_DEBUG_TYPE_OTHER_ARB\0"
+   "GL_DEBUG_TYPE_PERFORMANCE_ARB\0"
+   "GL_DEBUG_TYPE_PORTABILITY_ARB\0"
+   "GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_ARB\0"
    "GL_DECAL\0"
    "GL_DECR\0"
    "GL_DECR_WRAP\0"
@@ -1097,6 +1117,8 @@ LONGSTRING static const char enum_string_table[] =
    "GL_MAX_CUBE_MAP_TEXTURE_SIZE\0"
    "GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB\0"
    "GL_MAX_CUBE_MAP_TEXTURE_SIZE_OES\0"
+   "GL_MAX_DEBUG_LOGGED_MESSAGES_ARB\0"
+   "GL_MAX_DEBUG_MESSAGE_LENGTH_ARB\0"
    "GL_MAX_DRAW_BUFFERS\0"
    "GL_MAX_DRAW_BUFFERS_ARB\0"
    "GL_MAX_DRAW_BUFFERS_ATI\0"
@@ -2379,7 +2401,7 @@ LONGSTRING static const char enum_string_table[] =
    "GL_ZOOM_Y\0"
    ;
 
-static const enum_elt all_enums[2340] =
+static const enum_elt all_enums[2362] =
 {
    {     0, 0x00000600 }, /* GL_2D */
    {     6, 0x00001407 }, /* GL_2_BYTES */
@@ -2773,2038 +2795,2060 @@ static const enum_elt all_enums[2340] =
    {  8147, 0x000086A8 }, /* GL_CURRENT_WEIGHT_ARB */
    {  8169, 0x00000900 }, /* GL_CW */
    {  8175, 0x0000875B }, /* GL_DEBUG_ASSERT_MESA */
-   {  8196, 0x00008759 }, /* GL_DEBUG_OBJECT_MESA */
-   {  8217, 0x0000875A }, /* GL_DEBUG_PRINT_MESA */
-   {  8237, 0x00002101 }, /* GL_DECAL */
-   {  8246, 0x00001E03 }, /* GL_DECR */
-   {  8254, 0x00008508 }, /* GL_DECR_WRAP */
-   {  8267, 0x00008508 }, /* GL_DECR_WRAP_EXT */
-   {  8284, 0x00008B80 }, /* GL_DELETE_STATUS */
-   {  8301, 0x00001801 }, /* GL_DEPTH */
-   {  8310, 0x000088F0 }, /* GL_DEPTH24_STENCIL8 */
-   {  8330, 0x000088F0 }, /* GL_DEPTH24_STENCIL8_EXT */
-   {  8354, 0x000088F0 }, /* GL_DEPTH24_STENCIL8_OES */
-   {  8378, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT */
-   {  8398, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT_EXT */
-   {  8422, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT_OES */
-   {  8446, 0x00000D1F }, /* GL_DEPTH_BIAS */
-   {  8460, 0x00000D56 }, /* GL_DEPTH_BITS */
-   {  8474, 0x00008891 }, /* GL_DEPTH_BOUNDS_EXT */
-   {  8494, 0x00008890 }, /* GL_DEPTH_BOUNDS_TEST_EXT */
-   {  8519, 0x00008223 }, /* GL_DEPTH_BUFFER */
-   {  8535, 0x00000100 }, /* GL_DEPTH_BUFFER_BIT */
-   {  8555, 0x0000864F }, /* GL_DEPTH_CLAMP */
-   {  8570, 0x0000864F }, /* GL_DEPTH_CLAMP_NV */
-   {  8588, 0x00000B73 }, /* GL_DEPTH_CLEAR_VALUE */
-   {  8609, 0x00001902 }, /* GL_DEPTH_COMPONENT */
-   {  8628, 0x000081A5 }, /* GL_DEPTH_COMPONENT16 */
-   {  8649, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_ARB */
-   {  8674, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_OES */
-   {  8699, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_SGIX */
-   {  8725, 0x000081A6 }, /* GL_DEPTH_COMPONENT24 */
-   {  8746, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_ARB */
-   {  8771, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_OES */
-   {  8796, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_SGIX */
-   {  8822, 0x000081A7 }, /* GL_DEPTH_COMPONENT32 */
-   {  8843, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_ARB */
-   {  8868, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_OES */
-   {  8893, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_SGIX */
-   {  8919, 0x00000B74 }, /* GL_DEPTH_FUNC */
-   {  8933, 0x00000B70 }, /* GL_DEPTH_RANGE */
-   {  8948, 0x00000D1E }, /* GL_DEPTH_SCALE */
-   {  8963, 0x000084F9 }, /* GL_DEPTH_STENCIL */
-   {  8980, 0x0000821A }, /* GL_DEPTH_STENCIL_ATTACHMENT */
-   {  9008, 0x000084F9 }, /* GL_DEPTH_STENCIL_EXT */
-   {  9029, 0x000084F9 }, /* GL_DEPTH_STENCIL_NV */
-   {  9049, 0x000084F9 }, /* GL_DEPTH_STENCIL_OES */
-   {  9070, 0x0000886F }, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
-   {  9098, 0x0000886E }, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
-   {  9126, 0x00000B71 }, /* GL_DEPTH_TEST */
-   {  9140, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE */
-   {  9162, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE_ARB */
-   {  9188, 0x00000B72 }, /* GL_DEPTH_WRITEMASK */
-   {  9207, 0x00001201 }, /* GL_DIFFUSE */
-   {  9218, 0x00000BD0 }, /* GL_DITHER */
-   {  9228, 0x00000A02 }, /* GL_DOMAIN */
-   {  9238, 0x00001100 }, /* GL_DONT_CARE */
-   {  9251, 0x000086AE }, /* GL_DOT3_RGB */
-   {  9263, 0x000086AF }, /* GL_DOT3_RGBA */
-   {  9276, 0x000086AF }, /* GL_DOT3_RGBA_ARB */
-   {  9293, 0x00008741 }, /* GL_DOT3_RGBA_EXT */
-   {  9310, 0x000086AE }, /* GL_DOT3_RGB_ARB */
-   {  9326, 0x00008740 }, /* GL_DOT3_RGB_EXT */
-   {  9342, 0x0000140A }, /* GL_DOUBLE */
-   {  9352, 0x00000C32 }, /* GL_DOUBLEBUFFER */
-   {  9368, 0x00000C01 }, /* GL_DRAW_BUFFER */
-   {  9383, 0x00008825 }, /* GL_DRAW_BUFFER0 */
-   {  9399, 0x00008825 }, /* GL_DRAW_BUFFER0_ARB */
-   {  9419, 0x00008825 }, /* GL_DRAW_BUFFER0_ATI */
-   {  9439, 0x00008825 }, /* GL_DRAW_BUFFER0_NV */
-   {  9458, 0x00008826 }, /* GL_DRAW_BUFFER1 */
-   {  9474, 0x0000882F }, /* GL_DRAW_BUFFER10 */
-   {  9491, 0x0000882F }, /* GL_DRAW_BUFFER10_ARB */
-   {  9512, 0x0000882F }, /* GL_DRAW_BUFFER10_ATI */
-   {  9533, 0x0000882F }, /* GL_DRAW_BUFFER10_NV */
-   {  9553, 0x00008830 }, /* GL_DRAW_BUFFER11 */
-   {  9570, 0x00008830 }, /* GL_DRAW_BUFFER11_ARB */
-   {  9591, 0x00008830 }, /* GL_DRAW_BUFFER11_ATI */
-   {  9612, 0x00008830 }, /* GL_DRAW_BUFFER11_NV */
-   {  9632, 0x00008831 }, /* GL_DRAW_BUFFER12 */
-   {  9649, 0x00008831 }, /* GL_DRAW_BUFFER12_ARB */
-   {  9670, 0x00008831 }, /* GL_DRAW_BUFFER12_ATI */
-   {  9691, 0x00008831 }, /* GL_DRAW_BUFFER12_NV */
-   {  9711, 0x00008832 }, /* GL_DRAW_BUFFER13 */
-   {  9728, 0x00008832 }, /* GL_DRAW_BUFFER13_ARB */
-   {  9749, 0x00008832 }, /* GL_DRAW_BUFFER13_ATI */
-   {  9770, 0x00008832 }, /* GL_DRAW_BUFFER13_NV */
-   {  9790, 0x00008833 }, /* GL_DRAW_BUFFER14 */
-   {  9807, 0x00008833 }, /* GL_DRAW_BUFFER14_ARB */
-   {  9828, 0x00008833 }, /* GL_DRAW_BUFFER14_ATI */
-   {  9849, 0x00008833 }, /* GL_DRAW_BUFFER14_NV */
-   {  9869, 0x00008834 }, /* GL_DRAW_BUFFER15 */
-   {  9886, 0x00008834 }, /* GL_DRAW_BUFFER15_ARB */
-   {  9907, 0x00008834 }, /* GL_DRAW_BUFFER15_ATI */
-   {  9928, 0x00008834 }, /* GL_DRAW_BUFFER15_NV */
-   {  9948, 0x00008826 }, /* GL_DRAW_BUFFER1_ARB */
-   {  9968, 0x00008826 }, /* GL_DRAW_BUFFER1_ATI */
-   {  9988, 0x00008826 }, /* GL_DRAW_BUFFER1_NV */
-   { 10007, 0x00008827 }, /* GL_DRAW_BUFFER2 */
-   { 10023, 0x00008827 }, /* GL_DRAW_BUFFER2_ARB */
-   { 10043, 0x00008827 }, /* GL_DRAW_BUFFER2_ATI */
-   { 10063, 0x00008827 }, /* GL_DRAW_BUFFER2_NV */
-   { 10082, 0x00008828 }, /* GL_DRAW_BUFFER3 */
-   { 10098, 0x00008828 }, /* GL_DRAW_BUFFER3_ARB */
-   { 10118, 0x00008828 }, /* GL_DRAW_BUFFER3_ATI */
-   { 10138, 0x00008828 }, /* GL_DRAW_BUFFER3_NV */
-   { 10157, 0x00008829 }, /* GL_DRAW_BUFFER4 */
-   { 10173, 0x00008829 }, /* GL_DRAW_BUFFER4_ARB */
-   { 10193, 0x00008829 }, /* GL_DRAW_BUFFER4_ATI */
-   { 10213, 0x00008829 }, /* GL_DRAW_BUFFER4_NV */
-   { 10232, 0x0000882A }, /* GL_DRAW_BUFFER5 */
-   { 10248, 0x0000882A }, /* GL_DRAW_BUFFER5_ARB */
-   { 10268, 0x0000882A }, /* GL_DRAW_BUFFER5_ATI */
-   { 10288, 0x0000882A }, /* GL_DRAW_BUFFER5_NV */
-   { 10307, 0x0000882B }, /* GL_DRAW_BUFFER6 */
-   { 10323, 0x0000882B }, /* GL_DRAW_BUFFER6_ARB */
-   { 10343, 0x0000882B }, /* GL_DRAW_BUFFER6_ATI */
-   { 10363, 0x0000882B }, /* GL_DRAW_BUFFER6_NV */
-   { 10382, 0x0000882C }, /* GL_DRAW_BUFFER7 */
-   { 10398, 0x0000882C }, /* GL_DRAW_BUFFER7_ARB */
-   { 10418, 0x0000882C }, /* GL_DRAW_BUFFER7_ATI */
-   { 10438, 0x0000882C }, /* GL_DRAW_BUFFER7_NV */
-   { 10457, 0x0000882D }, /* GL_DRAW_BUFFER8 */
-   { 10473, 0x0000882D }, /* GL_DRAW_BUFFER8_ARB */
-   { 10493, 0x0000882D }, /* GL_DRAW_BUFFER8_ATI */
-   { 10513, 0x0000882D }, /* GL_DRAW_BUFFER8_NV */
-   { 10532, 0x0000882E }, /* GL_DRAW_BUFFER9 */
-   { 10548, 0x0000882E }, /* GL_DRAW_BUFFER9_ARB */
-   { 10568, 0x0000882E }, /* GL_DRAW_BUFFER9_ATI */
-   { 10588, 0x0000882E }, /* GL_DRAW_BUFFER9_NV */
-   { 10607, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER */
-   { 10627, 0x00008CA6 }, /* GL_DRAW_FRAMEBUFFER_BINDING */
-   { 10655, 0x00008CA6 }, /* GL_DRAW_FRAMEBUFFER_BINDING_EXT */
-   { 10687, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER_EXT */
-   { 10711, 0x00000705 }, /* GL_DRAW_PIXEL_TOKEN */
-   { 10731, 0x00000304 }, /* GL_DST_ALPHA */
-   { 10744, 0x00000306 }, /* GL_DST_COLOR */
-   { 10757, 0x0000877A }, /* GL_DU8DV8_ATI */
-   { 10771, 0x00008779 }, /* GL_DUDV_ATI */
-   { 10783, 0x000088EA }, /* GL_DYNAMIC_COPY */
-   { 10799, 0x000088EA }, /* GL_DYNAMIC_COPY_ARB */
-   { 10819, 0x000088E8 }, /* GL_DYNAMIC_DRAW */
-   { 10835, 0x000088E8 }, /* GL_DYNAMIC_DRAW_ARB */
-   { 10855, 0x000088E9 }, /* GL_DYNAMIC_READ */
-   { 10871, 0x000088E9 }, /* GL_DYNAMIC_READ_ARB */
-   { 10891, 0x00000B43 }, /* GL_EDGE_FLAG */
-   { 10904, 0x00008079 }, /* GL_EDGE_FLAG_ARRAY */
-   { 10923, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
-   { 10957, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB */
-   { 10995, 0x00008093 }, /* GL_EDGE_FLAG_ARRAY_POINTER */
-   { 11022, 0x0000808C }, /* GL_EDGE_FLAG_ARRAY_STRIDE */
-   { 11048, 0x00008893 }, /* GL_ELEMENT_ARRAY_BUFFER */
-   { 11072, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
-   { 11104, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB */
-   { 11140, 0x00001600 }, /* GL_EMISSION */
-   { 11152, 0x00002000 }, /* GL_ENABLE_BIT */
-   { 11166, 0x00000202 }, /* GL_EQUAL */
-   { 11175, 0x00001509 }, /* GL_EQUIV */
-   { 11184, 0x00008D64 }, /* GL_ETC1_RGB8_OES */
-   { 11201, 0x00010000 }, /* GL_EVAL_BIT */
-   { 11213, 0x00000800 }, /* GL_EXP */
-   { 11220, 0x00000801 }, /* GL_EXP2 */
-   { 11228, 0x00001F03 }, /* GL_EXTENSIONS */
-   { 11242, 0x00002400 }, /* GL_EYE_LINEAR */
-   { 11256, 0x00002502 }, /* GL_EYE_PLANE */
-   { 11269, 0x0000855C }, /* GL_EYE_PLANE_ABSOLUTE_NV */
-   { 11294, 0x0000855B }, /* GL_EYE_RADIAL_NV */
-   { 11311, 0x00000000 }, /* GL_FALSE */
-   { 11320, 0x00001101 }, /* GL_FASTEST */
-   { 11331, 0x00001C01 }, /* GL_FEEDBACK */
-   { 11343, 0x00000DF0 }, /* GL_FEEDBACK_BUFFER_POINTER */
-   { 11370, 0x00000DF1 }, /* GL_FEEDBACK_BUFFER_SIZE */
-   { 11394, 0x00000DF2 }, /* GL_FEEDBACK_BUFFER_TYPE */
-   { 11418, 0x00001B02 }, /* GL_FILL */
-   { 11426, 0x00008E4D }, /* GL_FIRST_VERTEX_CONVENTION */
-   { 11453, 0x00008E4D }, /* GL_FIRST_VERTEX_CONVENTION_EXT */
-   { 11484, 0x0000140C }, /* GL_FIXED */
-   { 11493, 0x0000140C }, /* GL_FIXED_OES */
-   { 11506, 0x0000891D }, /* GL_FIXED_ONLY */
-   { 11520, 0x0000891D }, /* GL_FIXED_ONLY_ARB */
-   { 11538, 0x00001D00 }, /* GL_FLAT */
-   { 11546, 0x00001406 }, /* GL_FLOAT */
-   { 11555, 0x00008B5A }, /* GL_FLOAT_MAT2 */
-   { 11569, 0x00008B5A }, /* GL_FLOAT_MAT2_ARB */
-   { 11587, 0x00008B65 }, /* GL_FLOAT_MAT2x3 */
-   { 11603, 0x00008B66 }, /* GL_FLOAT_MAT2x4 */
-   { 11619, 0x00008B5B }, /* GL_FLOAT_MAT3 */
-   { 11633, 0x00008B5B }, /* GL_FLOAT_MAT3_ARB */
-   { 11651, 0x00008B67 }, /* GL_FLOAT_MAT3x2 */
-   { 11667, 0x00008B68 }, /* GL_FLOAT_MAT3x4 */
-   { 11683, 0x00008B5C }, /* GL_FLOAT_MAT4 */
-   { 11697, 0x00008B5C }, /* GL_FLOAT_MAT4_ARB */
-   { 11715, 0x00008B69 }, /* GL_FLOAT_MAT4x2 */
-   { 11731, 0x00008B6A }, /* GL_FLOAT_MAT4x3 */
-   { 11747, 0x00008B50 }, /* GL_FLOAT_VEC2 */
-   { 11761, 0x00008B50 }, /* GL_FLOAT_VEC2_ARB */
-   { 11779, 0x00008B51 }, /* GL_FLOAT_VEC3 */
-   { 11793, 0x00008B51 }, /* GL_FLOAT_VEC3_ARB */
-   { 11811, 0x00008B52 }, /* GL_FLOAT_VEC4 */
-   { 11825, 0x00008B52 }, /* GL_FLOAT_VEC4_ARB */
-   { 11843, 0x00000B60 }, /* GL_FOG */
-   { 11850, 0x00000080 }, /* GL_FOG_BIT */
-   { 11861, 0x00000B66 }, /* GL_FOG_COLOR */
-   { 11874, 0x00008451 }, /* GL_FOG_COORD */
-   { 11887, 0x00008451 }, /* GL_FOG_COORDINATE */
-   { 11905, 0x00008457 }, /* GL_FOG_COORDINATE_ARRAY */
-   { 11929, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
-   { 11968, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB */
-   { 12011, 0x00008456 }, /* GL_FOG_COORDINATE_ARRAY_POINTER */
-   { 12043, 0x00008455 }, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
-   { 12074, 0x00008454 }, /* GL_FOG_COORDINATE_ARRAY_TYPE */
-   { 12103, 0x00008450 }, /* GL_FOG_COORDINATE_SOURCE */
-   { 12128, 0x00008457 }, /* GL_FOG_COORD_ARRAY */
-   { 12147, 0x0000889D }, /* GL_FOG_COORD_ARRAY_BUFFER_BINDING */
-   { 12181, 0x00008456 }, /* GL_FOG_COORD_ARRAY_POINTER */
-   { 12208, 0x00008455 }, /* GL_FOG_COORD_ARRAY_STRIDE */
-   { 12234, 0x00008454 }, /* GL_FOG_COORD_ARRAY_TYPE */
-   { 12258, 0x00008450 }, /* GL_FOG_COORD_SRC */
-   { 12275, 0x00000B62 }, /* GL_FOG_DENSITY */
-   { 12290, 0x0000855A }, /* GL_FOG_DISTANCE_MODE_NV */
-   { 12314, 0x00000B64 }, /* GL_FOG_END */
-   { 12325, 0x00000C54 }, /* GL_FOG_HINT */
-   { 12337, 0x00000B61 }, /* GL_FOG_INDEX */
-   { 12350, 0x00000B65 }, /* GL_FOG_MODE */
-   { 12362, 0x00008198 }, /* GL_FOG_OFFSET_SGIX */
-   { 12381, 0x00008199 }, /* GL_FOG_OFFSET_VALUE_SGIX */
-   { 12406, 0x00000B63 }, /* GL_FOG_START */
-   { 12419, 0x00008452 }, /* GL_FRAGMENT_DEPTH */
-   { 12437, 0x00008804 }, /* GL_FRAGMENT_PROGRAM_ARB */
-   { 12461, 0x00008B30 }, /* GL_FRAGMENT_SHADER */
-   { 12480, 0x00008B30 }, /* GL_FRAGMENT_SHADER_ARB */
-   { 12503, 0x00008B8B }, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
-   { 12538, 0x00008B8B }, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT_OES */
-   { 12577, 0x00008D40 }, /* GL_FRAMEBUFFER */
-   { 12592, 0x00008215 }, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
-   { 12629, 0x00008214 }, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
-   { 12665, 0x00008210 }, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
-   { 12706, 0x00008211 }, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
-   { 12747, 0x00008216 }, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
-   { 12784, 0x00008213 }, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
-   { 12821, 0x00008DA7 }, /* GL_FRAMEBUFFER_ATTACHMENT_LAYERED */
-   { 12855, 0x00008DA7 }, /* GL_FRAMEBUFFER_ATTACHMENT_LAYERED_ARB */
-   { 12893, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
-   { 12931, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT */
-   { 12973, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_OES */
-   { 13015, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
-   { 13053, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT */
-   { 13095, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_OES */
-   { 13137, 0x00008212 }, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
-   { 13172, 0x00008217 }, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
-   { 13211, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT */
-   { 13260, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_OES */
-   { 13309, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
-   { 13357, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT */
-   { 13409, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_OES */
-   { 13461, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
-   { 13501, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
-   { 13545, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
-   { 13585, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT */
-   { 13629, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_OES */
-   { 13673, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING */
-   { 13696, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING_EXT */
-   { 13723, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING_OES */
-   { 13750, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE */
-   { 13774, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE_EXT */
-   { 13802, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE_OES */
-   { 13830, 0x00008218 }, /* GL_FRAMEBUFFER_DEFAULT */
-   { 13853, 0x00008D40 }, /* GL_FRAMEBUFFER_EXT */
-   { 13872, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
-   { 13909, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT */
-   { 13950, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_OES */
-   { 13991, 0x00008CD9 }, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS */
-   { 14028, 0x00008CD9 }, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
-   { 14069, 0x00008CD9 }, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_OES */
-   { 14110, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER */
-   { 14148, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT */
-   { 14190, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_OES */
-   { 14232, 0x00008CD8 }, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
-   { 14283, 0x00008CDA }, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
-   { 14321, 0x00008CDA }, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_OES */
-   { 14359, 0x00008DA9 }, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB */
-   { 14401, 0x00008DA8 }, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS */
-   { 14441, 0x00008DA8 }, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_ARB */
-   { 14485, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
-   { 14530, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT */
-   { 14579, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_OES */
-   { 14628, 0x00008D56 }, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
-   { 14666, 0x00008D56 }, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT */
-   { 14708, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER */
-   { 14746, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT */
-   { 14788, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_OES */
-   { 14830, 0x00008D40 }, /* GL_FRAMEBUFFER_OES */
-   { 14849, 0x00008CDE }, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
-   { 14881, 0x00008219 }, /* GL_FRAMEBUFFER_UNDEFINED */
-   { 14906, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED */
-   { 14933, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED_EXT */
-   { 14964, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED_OES */
-   { 14995, 0x00000404 }, /* GL_FRONT */
-   { 15004, 0x00000408 }, /* GL_FRONT_AND_BACK */
-   { 15022, 0x00000B46 }, /* GL_FRONT_FACE */
-   { 15036, 0x00000400 }, /* GL_FRONT_LEFT */
-   { 15050, 0x00000401 }, /* GL_FRONT_RIGHT */
-   { 15065, 0x00008006 }, /* GL_FUNC_ADD */
-   { 15077, 0x00008006 }, /* GL_FUNC_ADD_EXT */
-   { 15093, 0x00008006 }, /* GL_FUNC_ADD_OES */
-   { 15109, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT */
-   { 15134, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT_EXT */
-   { 15163, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT_OES */
-   { 15192, 0x0000800A }, /* GL_FUNC_SUBTRACT */
-   { 15209, 0x0000800A }, /* GL_FUNC_SUBTRACT_EXT */
-   { 15230, 0x0000800A }, /* GL_FUNC_SUBTRACT_OES */
-   { 15251, 0x00008191 }, /* GL_GENERATE_MIPMAP */
-   { 15270, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT */
-   { 15294, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT_SGIS */
-   { 15323, 0x00008191 }, /* GL_GENERATE_MIPMAP_SGIS */
-   { 15347, 0x00008917 }, /* GL_GEOMETRY_INPUT_TYPE */
-   { 15370, 0x00008DDB }, /* GL_GEOMETRY_INPUT_TYPE_ARB */
-   { 15397, 0x00008918 }, /* GL_GEOMETRY_OUTPUT_TYPE */
-   { 15421, 0x00008DDC }, /* GL_GEOMETRY_OUTPUT_TYPE_ARB */
-   { 15449, 0x00008DD9 }, /* GL_GEOMETRY_SHADER */
-   { 15468, 0x00008DD9 }, /* GL_GEOMETRY_SHADER_ARB */
-   { 15491, 0x00008916 }, /* GL_GEOMETRY_VERTICES_OUT */
-   { 15516, 0x00008DDA }, /* GL_GEOMETRY_VERTICES_OUT_ARB */
-   { 15545, 0x00000206 }, /* GL_GEQUAL */
-   { 15555, 0x0000912F }, /* GL_GL_TEXTURE_IMMUTABLE_FORMAT */
-   { 15586, 0x00000204 }, /* GL_GREATER */
-   { 15597, 0x00001904 }, /* GL_GREEN */
-   { 15606, 0x00000D19 }, /* GL_GREEN_BIAS */
-   { 15620, 0x00000D53 }, /* GL_GREEN_BITS */
-   { 15634, 0x00008D95 }, /* GL_GREEN_INTEGER */
-   { 15651, 0x00008D95 }, /* GL_GREEN_INTEGER_EXT */
-   { 15672, 0x00000D18 }, /* GL_GREEN_SCALE */
-   { 15687, 0x00008253 }, /* GL_GUILTY_CONTEXT_RESET_ARB */
-   { 15715, 0x0000140B }, /* GL_HALF_FLOAT */
-   { 15729, 0x00008D61 }, /* GL_HALF_FLOAT_OES */
-   { 15747, 0x00008DF2 }, /* GL_HIGH_FLOAT */
-   { 15761, 0x00008DF5 }, /* GL_HIGH_INT */
-   { 15773, 0x00008000 }, /* GL_HINT_BIT */
-   { 15785, 0x00008024 }, /* GL_HISTOGRAM */
-   { 15798, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE */
-   { 15822, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE_EXT */
-   { 15850, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE */
-   { 15873, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE_EXT */
-   { 15900, 0x00008024 }, /* GL_HISTOGRAM_EXT */
-   { 15917, 0x00008027 }, /* GL_HISTOGRAM_FORMAT */
-   { 15937, 0x00008027 }, /* GL_HISTOGRAM_FORMAT_EXT */
-   { 15961, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE */
-   { 15985, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE_EXT */
-   { 16013, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE */
-   { 16041, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE_EXT */
-   { 16073, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE */
-   { 16095, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE_EXT */
-   { 16121, 0x0000802D }, /* GL_HISTOGRAM_SINK */
-   { 16139, 0x0000802D }, /* GL_HISTOGRAM_SINK_EXT */
-   { 16161, 0x00008026 }, /* GL_HISTOGRAM_WIDTH */
-   { 16180, 0x00008026 }, /* GL_HISTOGRAM_WIDTH_EXT */
-   { 16203, 0x0000862A }, /* GL_IDENTITY_NV */
-   { 16218, 0x00008150 }, /* GL_IGNORE_BORDER_HP */
-   { 16238, 0x00008B9B }, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT */
-   { 16274, 0x00008B9B }, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
-   { 16314, 0x00008B9A }, /* GL_IMPLEMENTATION_COLOR_READ_TYPE */
-   { 16348, 0x00008B9A }, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
-   { 16386, 0x00001E02 }, /* GL_INCR */
-   { 16394, 0x00008507 }, /* GL_INCR_WRAP */
-   { 16407, 0x00008507 }, /* GL_INCR_WRAP_EXT */
-   { 16424, 0x00008222 }, /* GL_INDEX */
-   { 16433, 0x00008077 }, /* GL_INDEX_ARRAY */
-   { 16448, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING */
-   { 16478, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING_ARB */
-   { 16512, 0x00008091 }, /* GL_INDEX_ARRAY_POINTER */
-   { 16535, 0x00008086 }, /* GL_INDEX_ARRAY_STRIDE */
-   { 16557, 0x00008085 }, /* GL_INDEX_ARRAY_TYPE */
-   { 16577, 0x00000D51 }, /* GL_INDEX_BITS */
-   { 16591, 0x00000C20 }, /* GL_INDEX_CLEAR_VALUE */
-   { 16612, 0x00000BF1 }, /* GL_INDEX_LOGIC_OP */
-   { 16630, 0x00000C30 }, /* GL_INDEX_MODE */
-   { 16644, 0x00000D13 }, /* GL_INDEX_OFFSET */
-   { 16660, 0x00000D12 }, /* GL_INDEX_SHIFT */
-   { 16675, 0x00000C21 }, /* GL_INDEX_WRITEMASK */
-   { 16694, 0x00008B84 }, /* GL_INFO_LOG_LENGTH */
-   { 16713, 0x00008254 }, /* GL_INNOCENT_CONTEXT_RESET_ARB */
-   { 16743, 0x00001404 }, /* GL_INT */
-   { 16750, 0x00008049 }, /* GL_INTENSITY */
-   { 16763, 0x0000804C }, /* GL_INTENSITY12 */
-   { 16778, 0x0000804C }, /* GL_INTENSITY12_EXT */
-   { 16797, 0x0000804D }, /* GL_INTENSITY16 */
-   { 16812, 0x00008D8B }, /* GL_INTENSITY16I_EXT */
-   { 16832, 0x00008D79 }, /* GL_INTENSITY16UI_EXT */
-   { 16853, 0x0000804D }, /* GL_INTENSITY16_EXT */
-   { 16872, 0x00008D85 }, /* GL_INTENSITY32I_EXT */
-   { 16892, 0x00008D73 }, /* GL_INTENSITY32UI_EXT */
-   { 16913, 0x0000804A }, /* GL_INTENSITY4 */
-   { 16927, 0x0000804A }, /* GL_INTENSITY4_EXT */
-   { 16945, 0x0000804B }, /* GL_INTENSITY8 */
-   { 16959, 0x00008D91 }, /* GL_INTENSITY8I_EXT */
-   { 16978, 0x00008D7F }, /* GL_INTENSITY8UI_EXT */
-   { 16998, 0x0000804B }, /* GL_INTENSITY8_EXT */
-   { 17016, 0x00008049 }, /* GL_INTENSITY_EXT */
-   { 17033, 0x00008C8C }, /* GL_INTERLEAVED_ATTRIBS */
-   { 17056, 0x00008C8C }, /* GL_INTERLEAVED_ATTRIBS_EXT */
-   { 17083, 0x00008575 }, /* GL_INTERPOLATE */
-   { 17098, 0x00008575 }, /* GL_INTERPOLATE_ARB */
-   { 17117, 0x00008575 }, /* GL_INTERPOLATE_EXT */
-   { 17136, 0x00008DF7 }, /* GL_INT_10_10_10_2_OES */
-   { 17158, 0x00008D9F }, /* GL_INT_2_10_10_10_REV */
-   { 17180, 0x00008DC9 }, /* GL_INT_SAMPLER_1D */
-   { 17198, 0x00008DCE }, /* GL_INT_SAMPLER_1D_ARRAY */
-   { 17222, 0x00008DCE }, /* GL_INT_SAMPLER_1D_ARRAY_EXT */
-   { 17250, 0x00008DC9 }, /* GL_INT_SAMPLER_1D_EXT */
-   { 17272, 0x00008DCA }, /* GL_INT_SAMPLER_2D */
-   { 17290, 0x00008DCF }, /* GL_INT_SAMPLER_2D_ARRAY */
-   { 17314, 0x00008DCF }, /* GL_INT_SAMPLER_2D_ARRAY_EXT */
-   { 17342, 0x00008DCA }, /* GL_INT_SAMPLER_2D_EXT */
-   { 17364, 0x00008DCD }, /* GL_INT_SAMPLER_2D_RECT */
-   { 17387, 0x00008DCD }, /* GL_INT_SAMPLER_2D_RECT_EXT */
-   { 17414, 0x00008DCB }, /* GL_INT_SAMPLER_3D */
-   { 17432, 0x00008DCB }, /* GL_INT_SAMPLER_3D_EXT */
-   { 17454, 0x00008DD0 }, /* GL_INT_SAMPLER_BUFFER */
-   { 17476, 0x00008DD0 }, /* GL_INT_SAMPLER_BUFFER_EXT */
-   { 17502, 0x00008DCC }, /* GL_INT_SAMPLER_CUBE */
-   { 17522, 0x00008DCC }, /* GL_INT_SAMPLER_CUBE_EXT */
-   { 17546, 0x00008B53 }, /* GL_INT_VEC2 */
-   { 17558, 0x00008B53 }, /* GL_INT_VEC2_ARB */
-   { 17574, 0x00008B54 }, /* GL_INT_VEC3 */
-   { 17586, 0x00008B54 }, /* GL_INT_VEC3_ARB */
-   { 17602, 0x00008B55 }, /* GL_INT_VEC4 */
-   { 17614, 0x00008B55 }, /* GL_INT_VEC4_ARB */
-   { 17630, 0x00000500 }, /* GL_INVALID_ENUM */
-   { 17646, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION */
-   { 17679, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION_EXT */
-   { 17716, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION_OES */
-   { 17753, 0x00000502 }, /* GL_INVALID_OPERATION */
-   { 17774, 0x00000501 }, /* GL_INVALID_VALUE */
-   { 17791, 0x0000862B }, /* GL_INVERSE_NV */
-   { 17805, 0x0000862D }, /* GL_INVERSE_TRANSPOSE_NV */
-   { 17829, 0x0000150A }, /* GL_INVERT */
-   { 17839, 0x00001E00 }, /* GL_KEEP */
-   { 17847, 0x00008E4E }, /* GL_LAST_VERTEX_CONVENTION */
-   { 17873, 0x00008E4E }, /* GL_LAST_VERTEX_CONVENTION_EXT */
-   { 17903, 0x00000406 }, /* GL_LEFT */
-   { 17911, 0x00000203 }, /* GL_LEQUAL */
-   { 17921, 0x00000201 }, /* GL_LESS */
-   { 17929, 0x00004000 }, /* GL_LIGHT0 */
-   { 17939, 0x00004001 }, /* GL_LIGHT1 */
-   { 17949, 0x00004002 }, /* GL_LIGHT2 */
-   { 17959, 0x00004003 }, /* GL_LIGHT3 */
-   { 17969, 0x00004004 }, /* GL_LIGHT4 */
-   { 17979, 0x00004005 }, /* GL_LIGHT5 */
-   { 17989, 0x00004006 }, /* GL_LIGHT6 */
-   { 17999, 0x00004007 }, /* GL_LIGHT7 */
-   { 18009, 0x00000B50 }, /* GL_LIGHTING */
-   { 18021, 0x00000040 }, /* GL_LIGHTING_BIT */
-   { 18037, 0x00000B53 }, /* GL_LIGHT_MODEL_AMBIENT */
-   { 18060, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL */
-   { 18089, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL_EXT */
-   { 18122, 0x00000B51 }, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
-   { 18150, 0x00000B52 }, /* GL_LIGHT_MODEL_TWO_SIDE */
-   { 18174, 0x00001B01 }, /* GL_LINE */
-   { 18182, 0x00002601 }, /* GL_LINEAR */
-   { 18192, 0x00001208 }, /* GL_LINEAR_ATTENUATION */
-   { 18214, 0x00008170 }, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
-   { 18244, 0x0000844F }, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
-   { 18275, 0x00002703 }, /* GL_LINEAR_MIPMAP_LINEAR */
-   { 18299, 0x00002701 }, /* GL_LINEAR_MIPMAP_NEAREST */
-   { 18324, 0x00000001 }, /* GL_LINES */
-   { 18333, 0x0000000A }, /* GL_LINES_ADJACENCY */
-   { 18352, 0x0000000A }, /* GL_LINES_ADJACENCY_ARB */
-   { 18375, 0x00000004 }, /* GL_LINE_BIT */
-   { 18387, 0x00000002 }, /* GL_LINE_LOOP */
-   { 18400, 0x00000707 }, /* GL_LINE_RESET_TOKEN */
-   { 18420, 0x00000B20 }, /* GL_LINE_SMOOTH */
-   { 18435, 0x00000C52 }, /* GL_LINE_SMOOTH_HINT */
-   { 18455, 0x00000B24 }, /* GL_LINE_STIPPLE */
-   { 18471, 0x00000B25 }, /* GL_LINE_STIPPLE_PATTERN */
-   { 18495, 0x00000B26 }, /* GL_LINE_STIPPLE_REPEAT */
-   { 18518, 0x00000003 }, /* GL_LINE_STRIP */
-   { 18532, 0x0000000B }, /* GL_LINE_STRIP_ADJACENCY */
-   { 18556, 0x0000000B }, /* GL_LINE_STRIP_ADJACENCY_ARB */
-   { 18584, 0x00000702 }, /* GL_LINE_TOKEN */
-   { 18598, 0x00000B21 }, /* GL_LINE_WIDTH */
-   { 18612, 0x00000B23 }, /* GL_LINE_WIDTH_GRANULARITY */
-   { 18638, 0x00000B22 }, /* GL_LINE_WIDTH_RANGE */
-   { 18658, 0x00008B82 }, /* GL_LINK_STATUS */
-   { 18673, 0x00000B32 }, /* GL_LIST_BASE */
-   { 18686, 0x00020000 }, /* GL_LIST_BIT */
-   { 18698, 0x00000B33 }, /* GL_LIST_INDEX */
-   { 18712, 0x00000B30 }, /* GL_LIST_MODE */
-   { 18725, 0x00000101 }, /* GL_LOAD */
-   { 18733, 0x00000BF1 }, /* GL_LOGIC_OP */
-   { 18745, 0x00000BF0 }, /* GL_LOGIC_OP_MODE */
-   { 18762, 0x00008252 }, /* GL_LOSE_CONTEXT_ON_RESET_ARB */
-   { 18791, 0x00008CA1 }, /* GL_LOWER_LEFT */
-   { 18805, 0x00008DF0 }, /* GL_LOW_FLOAT */
-   { 18818, 0x00008DF3 }, /* GL_LOW_INT */
-   { 18829, 0x00001909 }, /* GL_LUMINANCE */
-   { 18842, 0x00008041 }, /* GL_LUMINANCE12 */
-   { 18857, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12 */
-   { 18880, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12_EXT */
-   { 18907, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4 */
-   { 18929, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4_EXT */
-   { 18955, 0x00008041 }, /* GL_LUMINANCE12_EXT */
-   { 18974, 0x00008042 }, /* GL_LUMINANCE16 */
-   { 18989, 0x00008D8C }, /* GL_LUMINANCE16I_EXT */
-   { 19009, 0x00008D7A }, /* GL_LUMINANCE16UI_EXT */
-   { 19030, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16 */
-   { 19053, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16_EXT */
-   { 19080, 0x00008042 }, /* GL_LUMINANCE16_EXT */
-   { 19099, 0x00008D86 }, /* GL_LUMINANCE32I_EXT */
-   { 19119, 0x00008D74 }, /* GL_LUMINANCE32UI_EXT */
-   { 19140, 0x0000803F }, /* GL_LUMINANCE4 */
-   { 19154, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4 */
-   { 19175, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4_EXT */
-   { 19200, 0x0000803F }, /* GL_LUMINANCE4_EXT */
-   { 19218, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2 */
-   { 19239, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2_EXT */
-   { 19264, 0x00008040 }, /* GL_LUMINANCE8 */
-   { 19278, 0x00008D92 }, /* GL_LUMINANCE8I_EXT */
-   { 19297, 0x00008D80 }, /* GL_LUMINANCE8UI_EXT */
-   { 19317, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8 */
-   { 19338, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8_EXT */
-   { 19363, 0x00008040 }, /* GL_LUMINANCE8_EXT */
-   { 19381, 0x0000190A }, /* GL_LUMINANCE_ALPHA */
-   { 19400, 0x00008D8D }, /* GL_LUMINANCE_ALPHA16I_EXT */
-   { 19426, 0x00008D7B }, /* GL_LUMINANCE_ALPHA16UI_EXT */
-   { 19453, 0x00008D87 }, /* GL_LUMINANCE_ALPHA32I_EXT */
-   { 19479, 0x00008D75 }, /* GL_LUMINANCE_ALPHA32UI_EXT */
-   { 19506, 0x00008D93 }, /* GL_LUMINANCE_ALPHA8I_EXT */
-   { 19531, 0x00008D81 }, /* GL_LUMINANCE_ALPHA8UI_EXT */
-   { 19557, 0x00008D9D }, /* GL_LUMINANCE_ALPHA_INTEGER_EXT */
-   { 19588, 0x00008D9C }, /* GL_LUMINANCE_INTEGER_EXT */
-   { 19613, 0x0000821B }, /* GL_MAJOR_VERSION */
-   { 19630, 0x00000D90 }, /* GL_MAP1_COLOR_4 */
-   { 19646, 0x00000DD0 }, /* GL_MAP1_GRID_DOMAIN */
-   { 19666, 0x00000DD1 }, /* GL_MAP1_GRID_SEGMENTS */
-   { 19688, 0x00000D91 }, /* GL_MAP1_INDEX */
-   { 19702, 0x00000D92 }, /* GL_MAP1_NORMAL */
-   { 19717, 0x00000D93 }, /* GL_MAP1_TEXTURE_COORD_1 */
-   { 19741, 0x00000D94 }, /* GL_MAP1_TEXTURE_COORD_2 */
-   { 19765, 0x00000D95 }, /* GL_MAP1_TEXTURE_COORD_3 */
-   { 19789, 0x00000D96 }, /* GL_MAP1_TEXTURE_COORD_4 */
-   { 19813, 0x00000D97 }, /* GL_MAP1_VERTEX_3 */
-   { 19830, 0x00000D98 }, /* GL_MAP1_VERTEX_4 */
-   { 19847, 0x00008660 }, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
-   { 19875, 0x0000866A }, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
-   { 19904, 0x0000866B }, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
-   { 19933, 0x0000866C }, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
-   { 19962, 0x0000866D }, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
-   { 19991, 0x0000866E }, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
-   { 20020, 0x0000866F }, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
-   { 20049, 0x00008661 }, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
-   { 20077, 0x00008662 }, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
-   { 20105, 0x00008663 }, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
-   { 20133, 0x00008664 }, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
-   { 20161, 0x00008665 }, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
-   { 20189, 0x00008666 }, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
-   { 20217, 0x00008667 }, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
-   { 20245, 0x00008668 }, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
-   { 20273, 0x00008669 }, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
-   { 20301, 0x00000DB0 }, /* GL_MAP2_COLOR_4 */
-   { 20317, 0x00000DD2 }, /* GL_MAP2_GRID_DOMAIN */
-   { 20337, 0x00000DD3 }, /* GL_MAP2_GRID_SEGMENTS */
-   { 20359, 0x00000DB1 }, /* GL_MAP2_INDEX */
-   { 20373, 0x00000DB2 }, /* GL_MAP2_NORMAL */
-   { 20388, 0x00000DB3 }, /* GL_MAP2_TEXTURE_COORD_1 */
-   { 20412, 0x00000DB4 }, /* GL_MAP2_TEXTURE_COORD_2 */
-   { 20436, 0x00000DB5 }, /* GL_MAP2_TEXTURE_COORD_3 */
-   { 20460, 0x00000DB6 }, /* GL_MAP2_TEXTURE_COORD_4 */
-   { 20484, 0x00000DB7 }, /* GL_MAP2_VERTEX_3 */
-   { 20501, 0x00000DB8 }, /* GL_MAP2_VERTEX_4 */
-   { 20518, 0x00008670 }, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
-   { 20546, 0x0000867A }, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
-   { 20575, 0x0000867B }, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
-   { 20604, 0x0000867C }, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
-   { 20633, 0x0000867D }, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
-   { 20662, 0x0000867E }, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
-   { 20691, 0x0000867F }, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
-   { 20720, 0x00008671 }, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
-   { 20748, 0x00008672 }, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
-   { 20776, 0x00008673 }, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
-   { 20804, 0x00008674 }, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
-   { 20832, 0x00008675 }, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
-   { 20860, 0x00008676 }, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
-   { 20888, 0x00008677 }, /* GL_MAP2_VERTEX_ATTRIB7_4_NV */
-   { 20916, 0x00008678 }, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
-   { 20944, 0x00008679 }, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
-   { 20972, 0x00000D10 }, /* GL_MAP_COLOR */
-   { 20985, 0x00000010 }, /* GL_MAP_FLUSH_EXPLICIT_BIT */
-   { 21011, 0x00000008 }, /* GL_MAP_INVALIDATE_BUFFER_BIT */
-   { 21040, 0x00000004 }, /* GL_MAP_INVALIDATE_RANGE_BIT */
-   { 21068, 0x00000001 }, /* GL_MAP_READ_BIT */
-   { 21084, 0x00000D11 }, /* GL_MAP_STENCIL */
-   { 21099, 0x00000020 }, /* GL_MAP_UNSYNCHRONIZED_BIT */
-   { 21125, 0x00000002 }, /* GL_MAP_WRITE_BIT */
-   { 21142, 0x000088C0 }, /* GL_MATRIX0_ARB */
-   { 21157, 0x00008630 }, /* GL_MATRIX0_NV */
-   { 21171, 0x000088CA }, /* GL_MATRIX10_ARB */
-   { 21187, 0x000088CB }, /* GL_MATRIX11_ARB */
-   { 21203, 0x000088CC }, /* GL_MATRIX12_ARB */
-   { 21219, 0x000088CD }, /* GL_MATRIX13_ARB */
-   { 21235, 0x000088CE }, /* GL_MATRIX14_ARB */
-   { 21251, 0x000088CF }, /* GL_MATRIX15_ARB */
-   { 21267, 0x000088D0 }, /* GL_MATRIX16_ARB */
-   { 21283, 0x000088D1 }, /* GL_MATRIX17_ARB */
-   { 21299, 0x000088D2 }, /* GL_MATRIX18_ARB */
-   { 21315, 0x000088D3 }, /* GL_MATRIX19_ARB */
-   { 21331, 0x000088C1 }, /* GL_MATRIX1_ARB */
-   { 21346, 0x00008631 }, /* GL_MATRIX1_NV */
-   { 21360, 0x000088D4 }, /* GL_MATRIX20_ARB */
-   { 21376, 0x000088D5 }, /* GL_MATRIX21_ARB */
-   { 21392, 0x000088D6 }, /* GL_MATRIX22_ARB */
-   { 21408, 0x000088D7 }, /* GL_MATRIX23_ARB */
-   { 21424, 0x000088D8 }, /* GL_MATRIX24_ARB */
-   { 21440, 0x000088D9 }, /* GL_MATRIX25_ARB */
-   { 21456, 0x000088DA }, /* GL_MATRIX26_ARB */
-   { 21472, 0x000088DB }, /* GL_MATRIX27_ARB */
-   { 21488, 0x000088DC }, /* GL_MATRIX28_ARB */
-   { 21504, 0x000088DD }, /* GL_MATRIX29_ARB */
-   { 21520, 0x000088C2 }, /* GL_MATRIX2_ARB */
-   { 21535, 0x00008632 }, /* GL_MATRIX2_NV */
-   { 21549, 0x000088DE }, /* GL_MATRIX30_ARB */
-   { 21565, 0x000088DF }, /* GL_MATRIX31_ARB */
-   { 21581, 0x000088C3 }, /* GL_MATRIX3_ARB */
-   { 21596, 0x00008633 }, /* GL_MATRIX3_NV */
-   { 21610, 0x000088C4 }, /* GL_MATRIX4_ARB */
-   { 21625, 0x00008634 }, /* GL_MATRIX4_NV */
-   { 21639, 0x000088C5 }, /* GL_MATRIX5_ARB */
-   { 21654, 0x00008635 }, /* GL_MATRIX5_NV */
-   { 21668, 0x000088C6 }, /* GL_MATRIX6_ARB */
-   { 21683, 0x00008636 }, /* GL_MATRIX6_NV */
-   { 21697, 0x000088C7 }, /* GL_MATRIX7_ARB */
-   { 21712, 0x00008637 }, /* GL_MATRIX7_NV */
-   { 21726, 0x000088C8 }, /* GL_MATRIX8_ARB */
-   { 21741, 0x000088C9 }, /* GL_MATRIX9_ARB */
-   { 21756, 0x00008844 }, /* GL_MATRIX_INDEX_ARRAY_ARB */
-   { 21782, 0x00008B9E }, /* GL_MATRIX_INDEX_ARRAY_BUFFER_BINDING_OES */
-   { 21823, 0x00008844 }, /* GL_MATRIX_INDEX_ARRAY_OES */
-   { 21849, 0x00008849 }, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
-   { 21883, 0x00008849 }, /* GL_MATRIX_INDEX_ARRAY_POINTER_OES */
-   { 21917, 0x00008846 }, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
-   { 21948, 0x00008846 }, /* GL_MATRIX_INDEX_ARRAY_SIZE_OES */
-   { 21979, 0x00008848 }, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
-   { 22012, 0x00008848 }, /* GL_MATRIX_INDEX_ARRAY_STRIDE_OES */
-   { 22045, 0x00008847 }, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
-   { 22076, 0x00008847 }, /* GL_MATRIX_INDEX_ARRAY_TYPE_OES */
-   { 22107, 0x00000BA0 }, /* GL_MATRIX_MODE */
-   { 22122, 0x00008840 }, /* GL_MATRIX_PALETTE_ARB */
-   { 22144, 0x00008840 }, /* GL_MATRIX_PALETTE_OES */
-   { 22166, 0x00008008 }, /* GL_MAX */
-   { 22173, 0x00008073 }, /* GL_MAX_3D_TEXTURE_SIZE */
-   { 22196, 0x00008073 }, /* GL_MAX_3D_TEXTURE_SIZE_OES */
-   { 22223, 0x000088FF }, /* GL_MAX_ARRAY_TEXTURE_LAYERS */
-   { 22251, 0x000088FF }, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
-   { 22283, 0x00000D35 }, /* GL_MAX_ATTRIB_STACK_DEPTH */
-   { 22309, 0x00000D3B }, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
-   { 22342, 0x00008177 }, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
-   { 22368, 0x00008178 }, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-   { 22402, 0x00000D32 }, /* GL_MAX_CLIP_DISTANCES */
-   { 22424, 0x00000D32 }, /* GL_MAX_CLIP_PLANES */
-   { 22443, 0x00008CDF }, /* GL_MAX_COLOR_ATTACHMENTS */
-   { 22468, 0x00008CDF }, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
-   { 22497, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
-   { 22529, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI */
-   { 22565, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
-   { 22601, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB */
-   { 22641, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT */
-   { 22667, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT_EXT */
-   { 22697, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH */
-   { 22722, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH_EXT */
-   { 22751, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
-   { 22780, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB */
-   { 22813, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE_OES */
-   { 22846, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS */
-   { 22866, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ARB */
-   { 22890, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ATI */
-   { 22914, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_NV */
-   { 22937, 0x000080E9 }, /* GL_MAX_ELEMENTS_INDICES */
-   { 22961, 0x000080E8 }, /* GL_MAX_ELEMENTS_VERTICES */
-   { 22986, 0x00000D30 }, /* GL_MAX_EVAL_ORDER */
-   { 23004, 0x00008008 }, /* GL_MAX_EXT */
-   { 23015, 0x00009125 }, /* GL_MAX_FRAGMENT_INPUT_COMPONENTS */
-   { 23048, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
-   { 23083, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB */
-   { 23122, 0x00008DFD }, /* GL_MAX_FRAGMENT_UNIFORM_VECTORS */
-   { 23154, 0x00009123 }, /* GL_MAX_GEOMETRY_INPUT_COMPONENTS */
-   { 23187, 0x00009124 }, /* GL_MAX_GEOMETRY_OUTPUT_COMPONENTS */
-   { 23221, 0x00008DE0 }, /* GL_MAX_GEOMETRY_OUTPUT_VERTICES */
-   { 23253, 0x00008DE0 }, /* GL_MAX_GEOMETRY_OUTPUT_VERTICES_ARB */
-   { 23289, 0x00008C29 }, /* GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS */
-   { 23325, 0x00008C29 }, /* GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB */
-   { 23365, 0x00008DE1 }, /* GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS */
-   { 23405, 0x00008DE1 }, /* GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB */
-   { 23449, 0x00008DDF }, /* GL_MAX_GEOMETRY_UNIFORM_COMPONENTS */
-   { 23484, 0x00008DDF }, /* GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB */
-   { 23523, 0x00008DDD }, /* GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB */
-   { 23562, 0x00000D31 }, /* GL_MAX_LIGHTS */
-   { 23576, 0x00000B31 }, /* GL_MAX_LIST_NESTING */
-   { 23596, 0x00008841 }, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
-   { 23634, 0x00000D36 }, /* GL_MAX_MODELVIEW_STACK_DEPTH */
-   { 23663, 0x00000D37 }, /* GL_MAX_NAME_STACK_DEPTH */
-   { 23687, 0x00008842 }, /* GL_MAX_PALETTE_MATRICES_ARB */
-   { 23715, 0x00008842 }, /* GL_MAX_PALETTE_MATRICES_OES */
-   { 23743, 0x00000D34 }, /* GL_MAX_PIXEL_MAP_TABLE */
-   { 23766, 0x000088B1 }, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
-   { 23803, 0x0000880B }, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
-   { 23839, 0x000088AD }, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
-   { 23866, 0x000088F5 }, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
-   { 23895, 0x000088B5 }, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
-   { 23929, 0x000088F4 }, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
-   { 23965, 0x000088F6 }, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
-   { 23992, 0x000088A1 }, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
-   { 24024, 0x000088B4 }, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
-   { 24060, 0x000088F8 }, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
-   { 24089, 0x000088F7 }, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
-   { 24118, 0x0000862F }, /* GL_MAX_PROGRAM_MATRICES_ARB */
-   { 24146, 0x0000862E }, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
-   { 24184, 0x000088B3 }, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-   { 24228, 0x0000880E }, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-   { 24271, 0x000088AF }, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
-   { 24305, 0x000088A3 }, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-   { 24344, 0x000088AB }, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
-   { 24381, 0x000088A7 }, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
-   { 24419, 0x00008810 }, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-   { 24462, 0x0000880F }, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-   { 24505, 0x000088A9 }, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
-   { 24535, 0x000088A5 }, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
-   { 24566, 0x00008905 }, /* GL_MAX_PROGRAM_TEXEL_OFFSET */
-   { 24594, 0x0000880D }, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
-   { 24630, 0x0000880C }, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
-   { 24666, 0x00000D38 }, /* GL_MAX_PROJECTION_STACK_DEPTH */
-   { 24696, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE */
-   { 24726, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
-   { 24760, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_NV */
-   { 24793, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE */
-   { 24818, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
-   { 24847, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE_OES */
-   { 24876, 0x00008D57 }, /* GL_MAX_SAMPLES */
-   { 24891, 0x00008D57 }, /* GL_MAX_SAMPLES_EXT */
-   { 24910, 0x00009111 }, /* GL_MAX_SERVER_WAIT_TIMEOUT */
-   { 24937, 0x00008504 }, /* GL_MAX_SHININESS_NV */
-   { 24957, 0x00008505 }, /* GL_MAX_SPOT_EXPONENT_NV */
-   { 24981, 0x00008C2B }, /* GL_MAX_TEXTURE_BUFFER_SIZE */
-   { 25008, 0x00008C2B }, /* GL_MAX_TEXTURE_BUFFER_SIZE_ARB */
-   { 25039, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS */
-   { 25061, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS_ARB */
-   { 25087, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS */
-   { 25114, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS_ARB */
-   { 25145, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS */
-   { 25169, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS_EXT */
-   { 25197, 0x000084FF }, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
-   { 25231, 0x00000D33 }, /* GL_MAX_TEXTURE_SIZE */
-   { 25251, 0x00000D39 }, /* GL_MAX_TEXTURE_STACK_DEPTH */
-   { 25278, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS */
-   { 25299, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS_ARB */
-   { 25324, 0x0000862F }, /* GL_MAX_TRACK_MATRICES_NV */
-   { 25349, 0x0000862E }, /* GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV */
-   { 25384, 0x00008C8A }, /* GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS */
-   { 25433, 0x00008C8A }, /* GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_EXT */
-   { 25486, 0x00008C8B }, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS */
-   { 25529, 0x00008C8B }, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_EXT */
-   { 25576, 0x00008C80 }, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS */
-   { 25622, 0x00008C80 }, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_EXT */
-   { 25672, 0x00008B4B }, /* GL_MAX_VARYING_COMPONENTS */
-   { 25698, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS */
-   { 25720, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS_ARB */
-   { 25746, 0x00008DFC }, /* GL_MAX_VARYING_VECTORS */
-   { 25769, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS */
-   { 25791, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS_ARB */
-   { 25817, 0x00009122 }, /* GL_MAX_VERTEX_OUTPUT_COMPONENTS */
-   { 25849, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
-   { 25883, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
-   { 25921, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
-   { 25954, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB */
-   { 25991, 0x00008DFB }, /* GL_MAX_VERTEX_UNIFORM_VECTORS */
-   { 26021, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_ARB */
-   { 26045, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_OES */
-   { 26069, 0x00008DDE }, /* GL_MAX_VERTEX_VARYING_COMPONENTS_ARB */
-   { 26106, 0x00000D3A }, /* GL_MAX_VIEWPORT_DIMS */
-   { 26127, 0x00008DF1 }, /* GL_MEDIUM_FLOAT */
-   { 26143, 0x00008DF4 }, /* GL_MEDIUM_INT */
-   { 26157, 0x00008007 }, /* GL_MIN */
-   { 26164, 0x0000802E }, /* GL_MINMAX */
-   { 26174, 0x0000802E }, /* GL_MINMAX_EXT */
-   { 26188, 0x0000802F }, /* GL_MINMAX_FORMAT */
-   { 26205, 0x0000802F }, /* GL_MINMAX_FORMAT_EXT */
-   { 26226, 0x00008030 }, /* GL_MINMAX_SINK */
-   { 26241, 0x00008030 }, /* GL_MINMAX_SINK_EXT */
-   { 26260, 0x0000821C }, /* GL_MINOR_VERSION */
-   { 26277, 0x00008007 }, /* GL_MIN_EXT */
-   { 26288, 0x00008904 }, /* GL_MIN_PROGRAM_TEXEL_OFFSET */
-   { 26316, 0x00008370 }, /* GL_MIRRORED_REPEAT */
-   { 26335, 0x00008370 }, /* GL_MIRRORED_REPEAT_ARB */
-   { 26358, 0x00008370 }, /* GL_MIRRORED_REPEAT_IBM */
-   { 26381, 0x00008742 }, /* GL_MIRROR_CLAMP_ATI */
-   { 26401, 0x00008742 }, /* GL_MIRROR_CLAMP_EXT */
-   { 26421, 0x00008912 }, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
-   { 26451, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_ATI */
-   { 26479, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
-   { 26507, 0x00001700 }, /* GL_MODELVIEW */
-   { 26520, 0x00001700 }, /* GL_MODELVIEW0_ARB */
-   { 26538, 0x0000872A }, /* GL_MODELVIEW10_ARB */
-   { 26557, 0x0000872B }, /* GL_MODELVIEW11_ARB */
-   { 26576, 0x0000872C }, /* GL_MODELVIEW12_ARB */
-   { 26595, 0x0000872D }, /* GL_MODELVIEW13_ARB */
-   { 26614, 0x0000872E }, /* GL_MODELVIEW14_ARB */
-   { 26633, 0x0000872F }, /* GL_MODELVIEW15_ARB */
-   { 26652, 0x00008730 }, /* GL_MODELVIEW16_ARB */
-   { 26671, 0x00008731 }, /* GL_MODELVIEW17_ARB */
-   { 26690, 0x00008732 }, /* GL_MODELVIEW18_ARB */
-   { 26709, 0x00008733 }, /* GL_MODELVIEW19_ARB */
-   { 26728, 0x0000850A }, /* GL_MODELVIEW1_ARB */
-   { 26746, 0x00008734 }, /* GL_MODELVIEW20_ARB */
-   { 26765, 0x00008735 }, /* GL_MODELVIEW21_ARB */
-   { 26784, 0x00008736 }, /* GL_MODELVIEW22_ARB */
-   { 26803, 0x00008737 }, /* GL_MODELVIEW23_ARB */
-   { 26822, 0x00008738 }, /* GL_MODELVIEW24_ARB */
-   { 26841, 0x00008739 }, /* GL_MODELVIEW25_ARB */
-   { 26860, 0x0000873A }, /* GL_MODELVIEW26_ARB */
-   { 26879, 0x0000873B }, /* GL_MODELVIEW27_ARB */
-   { 26898, 0x0000873C }, /* GL_MODELVIEW28_ARB */
-   { 26917, 0x0000873D }, /* GL_MODELVIEW29_ARB */
-   { 26936, 0x00008722 }, /* GL_MODELVIEW2_ARB */
-   { 26954, 0x0000873E }, /* GL_MODELVIEW30_ARB */
-   { 26973, 0x0000873F }, /* GL_MODELVIEW31_ARB */
-   { 26992, 0x00008723 }, /* GL_MODELVIEW3_ARB */
-   { 27010, 0x00008724 }, /* GL_MODELVIEW4_ARB */
-   { 27028, 0x00008725 }, /* GL_MODELVIEW5_ARB */
-   { 27046, 0x00008726 }, /* GL_MODELVIEW6_ARB */
-   { 27064, 0x00008727 }, /* GL_MODELVIEW7_ARB */
-   { 27082, 0x00008728 }, /* GL_MODELVIEW8_ARB */
-   { 27100, 0x00008729 }, /* GL_MODELVIEW9_ARB */
-   { 27118, 0x00000BA6 }, /* GL_MODELVIEW_MATRIX */
-   { 27138, 0x0000898D }, /* GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES */
-   { 27180, 0x00008629 }, /* GL_MODELVIEW_PROJECTION_NV */
-   { 27207, 0x00000BA3 }, /* GL_MODELVIEW_STACK_DEPTH */
-   { 27232, 0x00002100 }, /* GL_MODULATE */
-   { 27244, 0x00008744 }, /* GL_MODULATE_ADD_ATI */
-   { 27264, 0x00008745 }, /* GL_MODULATE_SIGNED_ADD_ATI */
-   { 27291, 0x00008746 }, /* GL_MODULATE_SUBTRACT_ATI */
-   { 27316, 0x00000103 }, /* GL_MULT */
-   { 27324, 0x0000809D }, /* GL_MULTISAMPLE */
-   { 27339, 0x000086B2 }, /* GL_MULTISAMPLE_3DFX */
-   { 27359, 0x0000809D }, /* GL_MULTISAMPLE_ARB */
-   { 27378, 0x20000000 }, /* GL_MULTISAMPLE_BIT */
-   { 27397, 0x20000000 }, /* GL_MULTISAMPLE_BIT_3DFX */
-   { 27421, 0x20000000 }, /* GL_MULTISAMPLE_BIT_ARB */
-   { 27444, 0x00008534 }, /* GL_MULTISAMPLE_FILTER_HINT_NV */
-   { 27474, 0x00002A25 }, /* GL_N3F_V3F */
-   { 27485, 0x00000D70 }, /* GL_NAME_STACK_DEPTH */
-   { 27505, 0x0000150E }, /* GL_NAND */
-   { 27513, 0x00002600 }, /* GL_NEAREST */
-   { 27524, 0x0000844E }, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
-   { 27555, 0x0000844D }, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
-   { 27587, 0x00002702 }, /* GL_NEAREST_MIPMAP_LINEAR */
-   { 27612, 0x00002700 }, /* GL_NEAREST_MIPMAP_NEAREST */
-   { 27638, 0x00000200 }, /* GL_NEVER */
-   { 27647, 0x00001102 }, /* GL_NICEST */
-   { 27657, 0x00000000 }, /* GL_NONE */
-   { 27665, 0x00000000 }, /* GL_NONE_OES */
-   { 27677, 0x00001505 }, /* GL_NOOP */
-   { 27685, 0x00001508 }, /* GL_NOR */
-   { 27692, 0x00000BA1 }, /* GL_NORMALIZE */
-   { 27705, 0x00008075 }, /* GL_NORMAL_ARRAY */
-   { 27721, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
-   { 27752, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING_ARB */
-   { 27787, 0x0000808F }, /* GL_NORMAL_ARRAY_POINTER */
-   { 27811, 0x0000807F }, /* GL_NORMAL_ARRAY_STRIDE */
-   { 27834, 0x0000807E }, /* GL_NORMAL_ARRAY_TYPE */
-   { 27855, 0x00008511 }, /* GL_NORMAL_MAP */
-   { 27869, 0x00008511 }, /* GL_NORMAL_MAP_ARB */
-   { 27887, 0x00008511 }, /* GL_NORMAL_MAP_NV */
-   { 27904, 0x00008511 }, /* GL_NORMAL_MAP_OES */
-   { 27922, 0x00000205 }, /* GL_NOTEQUAL */
-   { 27934, 0x00000000 }, /* GL_NO_ERROR */
-   { 27946, 0x00008261 }, /* GL_NO_RESET_NOTIFICATION_ARB */
-   { 27975, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
-   { 28009, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB */
-   { 28047, 0x0000821D }, /* GL_NUM_EXTENSIONS */
-   { 28065, 0x000087FE }, /* GL_NUM_PROGRAM_BINARY_FORMATS */
-   { 28095, 0x000087FE }, /* GL_NUM_PROGRAM_BINARY_FORMATS_OES */
-   { 28129, 0x00008DF9 }, /* GL_NUM_SHADER_BINARY_FORMATS */
-   { 28158, 0x00008B89 }, /* GL_OBJECT_ACTIVE_ATTRIBUTES_ARB */
-   { 28190, 0x00008B8A }, /* GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB */
-   { 28232, 0x00008B86 }, /* GL_OBJECT_ACTIVE_UNIFORMS_ARB */
-   { 28262, 0x00008B87 }, /* GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB */
-   { 28302, 0x00008B85 }, /* GL_OBJECT_ATTACHED_OBJECTS_ARB */
-   { 28333, 0x00008B81 }, /* GL_OBJECT_COMPILE_STATUS_ARB */
-   { 28362, 0x00008B80 }, /* GL_OBJECT_DELETE_STATUS_ARB */
-   { 28390, 0x00008B84 }, /* GL_OBJECT_INFO_LOG_LENGTH_ARB */
-   { 28420, 0x00002401 }, /* GL_OBJECT_LINEAR */
-   { 28437, 0x00008B82 }, /* GL_OBJECT_LINK_STATUS_ARB */
-   { 28463, 0x00002501 }, /* GL_OBJECT_PLANE */
-   { 28479, 0x00008B88 }, /* GL_OBJECT_SHADER_SOURCE_LENGTH_ARB */
-   { 28514, 0x00008B4F }, /* GL_OBJECT_SUBTYPE_ARB */
-   { 28536, 0x00009112 }, /* GL_OBJECT_TYPE */
-   { 28551, 0x00008B4E }, /* GL_OBJECT_TYPE_ARB */
-   { 28570, 0x00008B83 }, /* GL_OBJECT_VALIDATE_STATUS_ARB */
-   { 28600, 0x00008165 }, /* GL_OCCLUSION_TEST_HP */
-   { 28621, 0x00008166 }, /* GL_OCCLUSION_TEST_RESULT_HP */
-   { 28649, 0x00000001 }, /* GL_ONE */
-   { 28656, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA */
-   { 28684, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA_EXT */
-   { 28716, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR */
-   { 28744, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR_EXT */
-   { 28776, 0x00000305 }, /* GL_ONE_MINUS_DST_ALPHA */
-   { 28799, 0x00000307 }, /* GL_ONE_MINUS_DST_COLOR */
-   { 28822, 0x00000303 }, /* GL_ONE_MINUS_SRC_ALPHA */
-   { 28845, 0x00000301 }, /* GL_ONE_MINUS_SRC_COLOR */
-   { 28868, 0x00008598 }, /* GL_OPERAND0_ALPHA */
-   { 28886, 0x00008598 }, /* GL_OPERAND0_ALPHA_ARB */
-   { 28908, 0x00008598 }, /* GL_OPERAND0_ALPHA_EXT */
-   { 28930, 0x00008590 }, /* GL_OPERAND0_RGB */
-   { 28946, 0x00008590 }, /* GL_OPERAND0_RGB_ARB */
-   { 28966, 0x00008590 }, /* GL_OPERAND0_RGB_EXT */
-   { 28986, 0x00008599 }, /* GL_OPERAND1_ALPHA */
-   { 29004, 0x00008599 }, /* GL_OPERAND1_ALPHA_ARB */
-   { 29026, 0x00008599 }, /* GL_OPERAND1_ALPHA_EXT */
-   { 29048, 0x00008591 }, /* GL_OPERAND1_RGB */
-   { 29064, 0x00008591 }, /* GL_OPERAND1_RGB_ARB */
-   { 29084, 0x00008591 }, /* GL_OPERAND1_RGB_EXT */
-   { 29104, 0x0000859A }, /* GL_OPERAND2_ALPHA */
-   { 29122, 0x0000859A }, /* GL_OPERAND2_ALPHA_ARB */
-   { 29144, 0x0000859A }, /* GL_OPERAND2_ALPHA_EXT */
-   { 29166, 0x00008592 }, /* GL_OPERAND2_RGB */
-   { 29182, 0x00008592 }, /* GL_OPERAND2_RGB_ARB */
-   { 29202, 0x00008592 }, /* GL_OPERAND2_RGB_EXT */
-   { 29222, 0x0000859B }, /* GL_OPERAND3_ALPHA_NV */
-   { 29243, 0x00008593 }, /* GL_OPERAND3_RGB_NV */
-   { 29262, 0x00001507 }, /* GL_OR */
-   { 29268, 0x00000A01 }, /* GL_ORDER */
-   { 29277, 0x0000150D }, /* GL_OR_INVERTED */
-   { 29292, 0x0000150B }, /* GL_OR_REVERSE */
-   { 29306, 0x00000505 }, /* GL_OUT_OF_MEMORY */
-   { 29323, 0x00000D05 }, /* GL_PACK_ALIGNMENT */
-   { 29341, 0x0000806C }, /* GL_PACK_IMAGE_HEIGHT */
-   { 29362, 0x00008758 }, /* GL_PACK_INVERT_MESA */
-   { 29382, 0x00000D01 }, /* GL_PACK_LSB_FIRST */
-   { 29400, 0x00000D02 }, /* GL_PACK_ROW_LENGTH */
-   { 29419, 0x0000806B }, /* GL_PACK_SKIP_IMAGES */
-   { 29439, 0x00000D04 }, /* GL_PACK_SKIP_PIXELS */
-   { 29459, 0x00000D03 }, /* GL_PACK_SKIP_ROWS */
-   { 29477, 0x00000D00 }, /* GL_PACK_SWAP_BYTES */
-   { 29496, 0x00008B92 }, /* GL_PALETTE4_R5_G6_B5_OES */
-   { 29521, 0x00008B94 }, /* GL_PALETTE4_RGB5_A1_OES */
-   { 29545, 0x00008B90 }, /* GL_PALETTE4_RGB8_OES */
-   { 29566, 0x00008B93 }, /* GL_PALETTE4_RGBA4_OES */
-   { 29588, 0x00008B91 }, /* GL_PALETTE4_RGBA8_OES */
-   { 29610, 0x00008B97 }, /* GL_PALETTE8_R5_G6_B5_OES */
-   { 29635, 0x00008B99 }, /* GL_PALETTE8_RGB5_A1_OES */
-   { 29659, 0x00008B95 }, /* GL_PALETTE8_RGB8_OES */
-   { 29680, 0x00008B98 }, /* GL_PALETTE8_RGBA4_OES */
-   { 29702, 0x00008B96 }, /* GL_PALETTE8_RGBA8_OES */
-   { 29724, 0x00000700 }, /* GL_PASS_THROUGH_TOKEN */
-   { 29746, 0x00000C50 }, /* GL_PERSPECTIVE_CORRECTION_HINT */
-   { 29777, 0x00000C79 }, /* GL_PIXEL_MAP_A_TO_A */
-   { 29797, 0x00000CB9 }, /* GL_PIXEL_MAP_A_TO_A_SIZE */
-   { 29822, 0x00000C78 }, /* GL_PIXEL_MAP_B_TO_B */
-   { 29842, 0x00000CB8 }, /* GL_PIXEL_MAP_B_TO_B_SIZE */
-   { 29867, 0x00000C77 }, /* GL_PIXEL_MAP_G_TO_G */
-   { 29887, 0x00000CB7 }, /* GL_PIXEL_MAP_G_TO_G_SIZE */
-   { 29912, 0x00000C75 }, /* GL_PIXEL_MAP_I_TO_A */
-   { 29932, 0x00000CB5 }, /* GL_PIXEL_MAP_I_TO_A_SIZE */
-   { 29957, 0x00000C74 }, /* GL_PIXEL_MAP_I_TO_B */
-   { 29977, 0x00000CB4 }, /* GL_PIXEL_MAP_I_TO_B_SIZE */
-   { 30002, 0x00000C73 }, /* GL_PIXEL_MAP_I_TO_G */
-   { 30022, 0x00000CB3 }, /* GL_PIXEL_MAP_I_TO_G_SIZE */
-   { 30047, 0x00000C70 }, /* GL_PIXEL_MAP_I_TO_I */
-   { 30067, 0x00000CB0 }, /* GL_PIXEL_MAP_I_TO_I_SIZE */
-   { 30092, 0x00000C72 }, /* GL_PIXEL_MAP_I_TO_R */
-   { 30112, 0x00000CB2 }, /* GL_PIXEL_MAP_I_TO_R_SIZE */
-   { 30137, 0x00000C76 }, /* GL_PIXEL_MAP_R_TO_R */
-   { 30157, 0x00000CB6 }, /* GL_PIXEL_MAP_R_TO_R_SIZE */
-   { 30182, 0x00000C71 }, /* GL_PIXEL_MAP_S_TO_S */
-   { 30202, 0x00000CB1 }, /* GL_PIXEL_MAP_S_TO_S_SIZE */
-   { 30227, 0x00000020 }, /* GL_PIXEL_MODE_BIT */
-   { 30245, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER */
-   { 30266, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING */
-   { 30295, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING_EXT */
-   { 30328, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER_EXT */
-   { 30353, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER */
-   { 30376, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
-   { 30407, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING_EXT */
-   { 30442, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER_EXT */
-   { 30469, 0x00001B00 }, /* GL_POINT */
-   { 30478, 0x00000000 }, /* GL_POINTS */
-   { 30488, 0x00000002 }, /* GL_POINT_BIT */
-   { 30501, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION */
-   { 30531, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_ARB */
-   { 30565, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_EXT */
-   { 30599, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_SGIS */
-   { 30634, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE */
-   { 30663, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_ARB */
-   { 30696, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_EXT */
-   { 30729, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_SGIS */
-   { 30763, 0x00000B11 }, /* GL_POINT_SIZE */
-   { 30777, 0x00008B9F }, /* GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES */
-   { 30816, 0x00008B9C }, /* GL_POINT_SIZE_ARRAY_OES */
-   { 30840, 0x0000898C }, /* GL_POINT_SIZE_ARRAY_POINTER_OES */
-   { 30872, 0x0000898B }, /* GL_POINT_SIZE_ARRAY_STRIDE_OES */
-   { 30903, 0x0000898A }, /* GL_POINT_SIZE_ARRAY_TYPE_OES */
-   { 30932, 0x00000B13 }, /* GL_POINT_SIZE_GRANULARITY */
-   { 30958, 0x00008127 }, /* GL_POINT_SIZE_MAX */
-   { 30976, 0x00008127 }, /* GL_POINT_SIZE_MAX_ARB */
-   { 30998, 0x00008127 }, /* GL_POINT_SIZE_MAX_EXT */
-   { 31020, 0x00008127 }, /* GL_POINT_SIZE_MAX_SGIS */
-   { 31043, 0x00008126 }, /* GL_POINT_SIZE_MIN */
-   { 31061, 0x00008126 }, /* GL_POINT_SIZE_MIN_ARB */
-   { 31083, 0x00008126 }, /* GL_POINT_SIZE_MIN_EXT */
-   { 31105, 0x00008126 }, /* GL_POINT_SIZE_MIN_SGIS */
-   { 31128, 0x00000B12 }, /* GL_POINT_SIZE_RANGE */
-   { 31148, 0x00000B10 }, /* GL_POINT_SMOOTH */
-   { 31164, 0x00000C51 }, /* GL_POINT_SMOOTH_HINT */
-   { 31185, 0x00008861 }, /* GL_POINT_SPRITE */
-   { 31201, 0x00008861 }, /* GL_POINT_SPRITE_ARB */
-   { 31221, 0x00008CA0 }, /* GL_POINT_SPRITE_COORD_ORIGIN */
-   { 31250, 0x00008861 }, /* GL_POINT_SPRITE_NV */
-   { 31269, 0x00008861 }, /* GL_POINT_SPRITE_OES */
-   { 31289, 0x00008863 }, /* GL_POINT_SPRITE_R_MODE_NV */
-   { 31315, 0x00000701 }, /* GL_POINT_TOKEN */
-   { 31330, 0x00000009 }, /* GL_POLYGON */
-   { 31341, 0x00000008 }, /* GL_POLYGON_BIT */
-   { 31356, 0x00000B40 }, /* GL_POLYGON_MODE */
-   { 31372, 0x00008039 }, /* GL_POLYGON_OFFSET_BIAS */
-   { 31395, 0x00008038 }, /* GL_POLYGON_OFFSET_FACTOR */
-   { 31420, 0x00008037 }, /* GL_POLYGON_OFFSET_FILL */
-   { 31443, 0x00002A02 }, /* GL_POLYGON_OFFSET_LINE */
-   { 31466, 0x00002A01 }, /* GL_POLYGON_OFFSET_POINT */
-   { 31490, 0x00002A00 }, /* GL_POLYGON_OFFSET_UNITS */
-   { 31514, 0x00000B41 }, /* GL_POLYGON_SMOOTH */
-   { 31532, 0x00000C53 }, /* GL_POLYGON_SMOOTH_HINT */
-   { 31555, 0x00000B42 }, /* GL_POLYGON_STIPPLE */
-   { 31574, 0x00000010 }, /* GL_POLYGON_STIPPLE_BIT */
-   { 31597, 0x00000703 }, /* GL_POLYGON_TOKEN */
-   { 31614, 0x00001203 }, /* GL_POSITION */
-   { 31626, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
-   { 31658, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI */
-   { 31694, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
-   { 31727, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI */
-   { 31764, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
-   { 31795, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI */
-   { 31830, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
-   { 31862, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI */
-   { 31898, 0x000080D2 }, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
-   { 31931, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
-   { 31963, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI */
-   { 31999, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
-   { 32032, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI */
-   { 32069, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS */
-   { 32099, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS_SGI */
-   { 32133, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE */
-   { 32164, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE_SGI */
-   { 32199, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
-   { 32230, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS_EXT */
-   { 32265, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
-   { 32297, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE_EXT */
-   { 32333, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS */
-   { 32363, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS_EXT */
-   { 32397, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE */
-   { 32428, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE_EXT */
-   { 32463, 0x000080D1 }, /* GL_POST_CONVOLUTION_COLOR_TABLE */
-   { 32495, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS */
-   { 32526, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS_EXT */
-   { 32561, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE */
-   { 32593, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE_EXT */
-   { 32629, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS */
-   { 32658, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS_EXT */
-   { 32691, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE */
-   { 32721, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE_EXT */
-   { 32755, 0x0000817B }, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
-   { 32794, 0x00008179 }, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
-   { 32827, 0x0000817C }, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
-   { 32867, 0x0000817A }, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
-   { 32901, 0x00008578 }, /* GL_PREVIOUS */
-   { 32913, 0x00008578 }, /* GL_PREVIOUS_ARB */
-   { 32929, 0x00008578 }, /* GL_PREVIOUS_EXT */
-   { 32945, 0x00008577 }, /* GL_PRIMARY_COLOR */
-   { 32962, 0x00008577 }, /* GL_PRIMARY_COLOR_ARB */
-   { 32983, 0x00008577 }, /* GL_PRIMARY_COLOR_EXT */
-   { 33004, 0x00008C87 }, /* GL_PRIMITIVES_GENERATED */
-   { 33028, 0x00008C87 }, /* GL_PRIMITIVES_GENERATED_EXT */
-   { 33056, 0x00008F9D }, /* GL_PRIMITIVE_RESTART */
-   { 33077, 0x00008F9E }, /* GL_PRIMITIVE_RESTART_INDEX */
-   { 33104, 0x00008559 }, /* GL_PRIMITIVE_RESTART_INDEX_NV */
-   { 33134, 0x00008558 }, /* GL_PRIMITIVE_RESTART_NV */
-   { 33158, 0x000088B0 }, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
-   { 33191, 0x00008805 }, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
-   { 33223, 0x000088AC }, /* GL_PROGRAM_ATTRIBS_ARB */
-   { 33246, 0x000087FF }, /* GL_PROGRAM_BINARY_FORMATS */
-   { 33272, 0x000087FF }, /* GL_PROGRAM_BINARY_FORMATS_OES */
-   { 33302, 0x00008741 }, /* GL_PROGRAM_BINARY_LENGTH */
-   { 33327, 0x00008741 }, /* GL_PROGRAM_BINARY_LENGTH_OES */
-   { 33356, 0x00008257 }, /* GL_PROGRAM_BINARY_RETRIEVABLE_HINT */
-   { 33391, 0x00008677 }, /* GL_PROGRAM_BINDING_ARB */
-   { 33414, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_ARB */
-   { 33444, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_NV */
-   { 33473, 0x00008874 }, /* GL_PROGRAM_ERROR_STRING_ARB */
-   { 33501, 0x00008876 }, /* GL_PROGRAM_FORMAT_ARB */
-   { 33523, 0x00008875 }, /* GL_PROGRAM_FORMAT_ASCII_ARB */
-   { 33551, 0x000088A0 }, /* GL_PROGRAM_INSTRUCTIONS_ARB */
-   { 33579, 0x00008627 }, /* GL_PROGRAM_LENGTH_ARB */
-   { 33601, 0x00008627 }, /* GL_PROGRAM_LENGTH_NV */
-   { 33622, 0x000088B2 }, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-   { 33662, 0x00008808 }, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-   { 33701, 0x000088AE }, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
-   { 33731, 0x000088A2 }, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-   { 33766, 0x000088AA }, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
-   { 33799, 0x000088A6 }, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
-   { 33833, 0x0000880A }, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-   { 33872, 0x00008809 }, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-   { 33911, 0x00008B40 }, /* GL_PROGRAM_OBJECT_ARB */
-   { 33933, 0x000088A8 }, /* GL_PROGRAM_PARAMETERS_ARB */
-   { 33959, 0x00008644 }, /* GL_PROGRAM_PARAMETER_NV */
-   { 33983, 0x00008642 }, /* GL_PROGRAM_POINT_SIZE */
-   { 34005, 0x00008642 }, /* GL_PROGRAM_POINT_SIZE_ARB */
-   { 34031, 0x00008647 }, /* GL_PROGRAM_RESIDENT_NV */
-   { 34054, 0x00008628 }, /* GL_PROGRAM_STRING_ARB */
-   { 34076, 0x00008628 }, /* GL_PROGRAM_STRING_NV */
-   { 34097, 0x00008646 }, /* GL_PROGRAM_TARGET_NV */
-   { 34118, 0x000088A4 }, /* GL_PROGRAM_TEMPORARIES_ARB */
-   { 34145, 0x00008807 }, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
-   { 34177, 0x00008806 }, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
-   { 34209, 0x000088B6 }, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
-   { 34244, 0x00001701 }, /* GL_PROJECTION */
-   { 34258, 0x00000BA7 }, /* GL_PROJECTION_MATRIX */
-   { 34279, 0x0000898E }, /* GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES */
-   { 34322, 0x00000BA4 }, /* GL_PROJECTION_STACK_DEPTH */
-   { 34348, 0x00008E4F }, /* GL_PROVOKING_VERTEX */
-   { 34368, 0x00008E4F }, /* GL_PROVOKING_VERTEX_EXT */
-   { 34392, 0x000080D3 }, /* GL_PROXY_COLOR_TABLE */
-   { 34413, 0x00008025 }, /* GL_PROXY_HISTOGRAM */
-   { 34432, 0x00008025 }, /* GL_PROXY_HISTOGRAM_EXT */
-   { 34455, 0x000080D5 }, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
-   { 34494, 0x000080D4 }, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
-   { 34532, 0x00008063 }, /* GL_PROXY_TEXTURE_1D */
-   { 34552, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY */
-   { 34578, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
-   { 34608, 0x00008063 }, /* GL_PROXY_TEXTURE_1D_EXT */
-   { 34632, 0x00008064 }, /* GL_PROXY_TEXTURE_2D */
-   { 34652, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY */
-   { 34678, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
-   { 34708, 0x00008064 }, /* GL_PROXY_TEXTURE_2D_EXT */
-   { 34732, 0x00008070 }, /* GL_PROXY_TEXTURE_3D */
-   { 34752, 0x000080BD }, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
-   { 34785, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP */
-   { 34811, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP_ARB */
-   { 34841, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE */
-   { 34868, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
-   { 34899, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_NV */
-   { 34929, 0x00008A1D }, /* GL_PURGEABLE_APPLE */
-   { 34948, 0x00002003 }, /* GL_Q */
-   { 34953, 0x00001209 }, /* GL_QUADRATIC_ATTENUATION */
-   { 34978, 0x00000007 }, /* GL_QUADS */
-   { 34987, 0x00008E4C }, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION */
-   { 35031, 0x00008E4C }, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT */
-   { 35079, 0x00008614 }, /* GL_QUAD_MESH_SUN */
-   { 35096, 0x00000008 }, /* GL_QUAD_STRIP */
-   { 35110, 0x00008E16 }, /* GL_QUERY_BY_REGION_NO_WAIT */
-   { 35137, 0x00008E16 }, /* GL_QUERY_BY_REGION_NO_WAIT_NV */
-   { 35167, 0x00008E15 }, /* GL_QUERY_BY_REGION_WAIT */
-   { 35191, 0x00008E15 }, /* GL_QUERY_BY_REGION_WAIT_NV */
-   { 35218, 0x00008864 }, /* GL_QUERY_COUNTER_BITS */
-   { 35240, 0x00008864 }, /* GL_QUERY_COUNTER_BITS_ARB */
-   { 35266, 0x00008E14 }, /* GL_QUERY_NO_WAIT */
-   { 35283, 0x00008E14 }, /* GL_QUERY_NO_WAIT_NV */
-   { 35303, 0x00008866 }, /* GL_QUERY_RESULT */
-   { 35319, 0x00008866 }, /* GL_QUERY_RESULT_ARB */
-   { 35339, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE */
-   { 35365, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE_ARB */
-   { 35395, 0x00008E13 }, /* GL_QUERY_WAIT */
-   { 35409, 0x00008E13 }, /* GL_QUERY_WAIT_NV */
-   { 35426, 0x00002002 }, /* GL_R */
-   { 35431, 0x00008C3A }, /* GL_R11F_G11F_B10F */
-   { 35449, 0x00008F98 }, /* GL_R16_SNORM */
-   { 35462, 0x00002A10 }, /* GL_R3_G3_B2 */
-   { 35474, 0x00008F94 }, /* GL_R8_SNORM */
-   { 35486, 0x00008C89 }, /* GL_RASTERIZER_DISCARD */
-   { 35508, 0x00008C89 }, /* GL_RASTERIZER_DISCARD_EXT */
-   { 35534, 0x00019262 }, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
-   { 35567, 0x00000C02 }, /* GL_READ_BUFFER */
-   { 35582, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER */
-   { 35602, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING */
-   { 35630, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
-   { 35662, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER_EXT */
-   { 35686, 0x000088B8 }, /* GL_READ_ONLY */
-   { 35699, 0x000088B8 }, /* GL_READ_ONLY_ARB */
-   { 35716, 0x000088BA }, /* GL_READ_WRITE */
-   { 35730, 0x000088BA }, /* GL_READ_WRITE_ARB */
-   { 35748, 0x00001903 }, /* GL_RED */
-   { 35755, 0x00008016 }, /* GL_REDUCE */
-   { 35765, 0x00008016 }, /* GL_REDUCE_EXT */
-   { 35779, 0x00000D15 }, /* GL_RED_BIAS */
-   { 35791, 0x00000D52 }, /* GL_RED_BITS */
-   { 35803, 0x00008D94 }, /* GL_RED_INTEGER */
-   { 35818, 0x00008D94 }, /* GL_RED_INTEGER_EXT */
-   { 35837, 0x00000D14 }, /* GL_RED_SCALE */
-   { 35850, 0x00008F90 }, /* GL_RED_SNORM */
-   { 35863, 0x00008512 }, /* GL_REFLECTION_MAP */
-   { 35881, 0x00008512 }, /* GL_REFLECTION_MAP_ARB */
-   { 35903, 0x00008512 }, /* GL_REFLECTION_MAP_NV */
-   { 35924, 0x00008512 }, /* GL_REFLECTION_MAP_OES */
-   { 35946, 0x00008A19 }, /* GL_RELEASED_APPLE */
-   { 35964, 0x00001C00 }, /* GL_RENDER */
-   { 35974, 0x00008D41 }, /* GL_RENDERBUFFER */
-   { 35990, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE */
-   { 36017, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE_OES */
-   { 36048, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING */
-   { 36072, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_EXT */
-   { 36100, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_OES */
-   { 36128, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE */
-   { 36154, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE_OES */
-   { 36184, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE */
-   { 36211, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE_OES */
-   { 36242, 0x00008D41 }, /* GL_RENDERBUFFER_EXT */
-   { 36262, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE */
-   { 36289, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE_OES */
-   { 36320, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT */
-   { 36343, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_EXT */
-   { 36370, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_OES */
-   { 36397, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
-   { 36429, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_EXT */
-   { 36465, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_OES */
-   { 36501, 0x00008D41 }, /* GL_RENDERBUFFER_OES */
-   { 36521, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE */
-   { 36546, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE_OES */
-   { 36575, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES */
-   { 36599, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES_EXT */
-   { 36627, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE */
-   { 36656, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE_OES */
-   { 36689, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH */
-   { 36711, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_EXT */
-   { 36737, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_OES */
-   { 36763, 0x00001F01 }, /* GL_RENDERER */
-   { 36775, 0x00000C40 }, /* GL_RENDER_MODE */
-   { 36790, 0x00002901 }, /* GL_REPEAT */
-   { 36800, 0x00001E01 }, /* GL_REPLACE */
-   { 36811, 0x00008062 }, /* GL_REPLACE_EXT */
-   { 36826, 0x00008153 }, /* GL_REPLICATE_BORDER_HP */
-   { 36849, 0x00008D68 }, /* GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES */
-   { 36885, 0x0000803A }, /* GL_RESCALE_NORMAL */
-   { 36903, 0x0000803A }, /* GL_RESCALE_NORMAL_EXT */
-   { 36925, 0x00008256 }, /* GL_RESET_NOTIFICATION_STRATEGY_ARB */
-   { 36960, 0x00008A1B }, /* GL_RETAINED_APPLE */
-   { 36978, 0x00000102 }, /* GL_RETURN */
-   { 36988, 0x00008F99 }, /* GL_RG16_SNORM */
-   { 37002, 0x00008F95 }, /* GL_RG8_SNORM */
-   { 37015, 0x00001907 }, /* GL_RGB */
-   { 37022, 0x00008052 }, /* GL_RGB10 */
-   { 37031, 0x00008059 }, /* GL_RGB10_A2 */
-   { 37043, 0x0000906F }, /* GL_RGB10_A2UI */
-   { 37057, 0x00008059 }, /* GL_RGB10_A2_EXT */
-   { 37073, 0x00008052 }, /* GL_RGB10_EXT */
-   { 37086, 0x00008053 }, /* GL_RGB12 */
-   { 37095, 0x00008053 }, /* GL_RGB12_EXT */
-   { 37108, 0x00008054 }, /* GL_RGB16 */
-   { 37117, 0x0000881B }, /* GL_RGB16F */
-   { 37127, 0x00008D89 }, /* GL_RGB16I */
-   { 37137, 0x00008D89 }, /* GL_RGB16I_EXT */
-   { 37151, 0x00008D77 }, /* GL_RGB16UI */
-   { 37162, 0x00008D77 }, /* GL_RGB16UI_EXT */
-   { 37177, 0x00008054 }, /* GL_RGB16_EXT */
-   { 37190, 0x00008F9A }, /* GL_RGB16_SNORM */
-   { 37205, 0x0000804E }, /* GL_RGB2_EXT */
-   { 37217, 0x00008815 }, /* GL_RGB32F */
-   { 37227, 0x00008D83 }, /* GL_RGB32I */
-   { 37237, 0x00008D83 }, /* GL_RGB32I_EXT */
-   { 37251, 0x00008D71 }, /* GL_RGB32UI */
-   { 37262, 0x00008D71 }, /* GL_RGB32UI_EXT */
-   { 37277, 0x0000804F }, /* GL_RGB4 */
-   { 37285, 0x0000804F }, /* GL_RGB4_EXT */
-   { 37297, 0x000083A1 }, /* GL_RGB4_S3TC */
-   { 37310, 0x00008050 }, /* GL_RGB5 */
-   { 37318, 0x00008D62 }, /* GL_RGB565 */
-   { 37328, 0x00008D62 }, /* GL_RGB565_OES */
-   { 37342, 0x00008057 }, /* GL_RGB5_A1 */
-   { 37353, 0x00008057 }, /* GL_RGB5_A1_EXT */
-   { 37368, 0x00008057 }, /* GL_RGB5_A1_OES */
-   { 37383, 0x00008050 }, /* GL_RGB5_EXT */
-   { 37395, 0x00008051 }, /* GL_RGB8 */
-   { 37403, 0x00008D8F }, /* GL_RGB8I */
-   { 37412, 0x00008D8F }, /* GL_RGB8I_EXT */
-   { 37425, 0x00008D7D }, /* GL_RGB8UI */
-   { 37435, 0x00008D7D }, /* GL_RGB8UI_EXT */
-   { 37449, 0x00008051 }, /* GL_RGB8_EXT */
-   { 37461, 0x00008051 }, /* GL_RGB8_OES */
-   { 37473, 0x00008F96 }, /* GL_RGB8_SNORM */
-   { 37487, 0x00008C3D }, /* GL_RGB9_E5 */
-   { 37498, 0x00001908 }, /* GL_RGBA */
-   { 37506, 0x0000805A }, /* GL_RGBA12 */
-   { 37516, 0x0000805A }, /* GL_RGBA12_EXT */
-   { 37530, 0x0000805B }, /* GL_RGBA16 */
-   { 37540, 0x0000881A }, /* GL_RGBA16F */
-   { 37551, 0x00008D88 }, /* GL_RGBA16I */
-   { 37562, 0x00008D88 }, /* GL_RGBA16I_EXT */
-   { 37577, 0x00008D76 }, /* GL_RGBA16UI */
-   { 37589, 0x00008D76 }, /* GL_RGBA16UI_EXT */
-   { 37605, 0x0000805B }, /* GL_RGBA16_EXT */
-   { 37619, 0x00008F9B }, /* GL_RGBA16_SNORM */
-   { 37635, 0x00008055 }, /* GL_RGBA2 */
-   { 37644, 0x00008055 }, /* GL_RGBA2_EXT */
-   { 37657, 0x00008814 }, /* GL_RGBA32F */
-   { 37668, 0x00008D82 }, /* GL_RGBA32I */
-   { 37679, 0x00008D82 }, /* GL_RGBA32I_EXT */
-   { 37694, 0x00008D70 }, /* GL_RGBA32UI */
-   { 37706, 0x00008D70 }, /* GL_RGBA32UI_EXT */
-   { 37722, 0x00008056 }, /* GL_RGBA4 */
-   { 37731, 0x000083A5 }, /* GL_RGBA4_DXT5_S3TC */
-   { 37750, 0x00008056 }, /* GL_RGBA4_EXT */
-   { 37763, 0x00008056 }, /* GL_RGBA4_OES */
-   { 37776, 0x000083A3 }, /* GL_RGBA4_S3TC */
-   { 37790, 0x00008058 }, /* GL_RGBA8 */
-   { 37799, 0x00008D8E }, /* GL_RGBA8I */
-   { 37809, 0x00008D8E }, /* GL_RGBA8I_EXT */
-   { 37823, 0x00008D7C }, /* GL_RGBA8UI */
-   { 37834, 0x00008D7C }, /* GL_RGBA8UI_EXT */
-   { 37849, 0x00008058 }, /* GL_RGBA8_EXT */
-   { 37862, 0x00008058 }, /* GL_RGBA8_OES */
-   { 37875, 0x00008F97 }, /* GL_RGBA8_SNORM */
-   { 37890, 0x000083A4 }, /* GL_RGBA_DXT5_S3TC */
-   { 37908, 0x00008820 }, /* GL_RGBA_FLOAT_MODE_ARB */
-   { 37931, 0x00008D99 }, /* GL_RGBA_INTEGER */
-   { 37947, 0x00008D99 }, /* GL_RGBA_INTEGER_EXT */
-   { 37967, 0x00008D9E }, /* GL_RGBA_INTEGER_MODE_EXT */
-   { 37992, 0x00000C31 }, /* GL_RGBA_MODE */
-   { 38005, 0x000083A2 }, /* GL_RGBA_S3TC */
-   { 38018, 0x00008F93 }, /* GL_RGBA_SNORM */
-   { 38032, 0x00008D98 }, /* GL_RGB_INTEGER */
-   { 38047, 0x00008D98 }, /* GL_RGB_INTEGER_EXT */
-   { 38066, 0x000083A0 }, /* GL_RGB_S3TC */
-   { 38078, 0x00008573 }, /* GL_RGB_SCALE */
-   { 38091, 0x00008573 }, /* GL_RGB_SCALE_ARB */
-   { 38108, 0x00008573 }, /* GL_RGB_SCALE_EXT */
-   { 38125, 0x00008F92 }, /* GL_RGB_SNORM */
-   { 38138, 0x00008F91 }, /* GL_RG_SNORM */
-   { 38150, 0x00000407 }, /* GL_RIGHT */
-   { 38159, 0x00002000 }, /* GL_S */
-   { 38164, 0x00008B5D }, /* GL_SAMPLER_1D */
-   { 38178, 0x00008DC0 }, /* GL_SAMPLER_1D_ARRAY */
-   { 38198, 0x00008DC0 }, /* GL_SAMPLER_1D_ARRAY_EXT */
-   { 38222, 0x00008DC3 }, /* GL_SAMPLER_1D_ARRAY_SHADOW */
-   { 38249, 0x00008DC3 }, /* GL_SAMPLER_1D_ARRAY_SHADOW_EXT */
-   { 38280, 0x00008B61 }, /* GL_SAMPLER_1D_SHADOW */
-   { 38301, 0x00008B5E }, /* GL_SAMPLER_2D */
-   { 38315, 0x00008DC1 }, /* GL_SAMPLER_2D_ARRAY */
-   { 38335, 0x00008DC1 }, /* GL_SAMPLER_2D_ARRAY_EXT */
-   { 38359, 0x00008DC4 }, /* GL_SAMPLER_2D_ARRAY_SHADOW */
-   { 38386, 0x00008DC4 }, /* GL_SAMPLER_2D_ARRAY_SHADOW_EXT */
-   { 38417, 0x00008B63 }, /* GL_SAMPLER_2D_RECT */
-   { 38436, 0x00008B64 }, /* GL_SAMPLER_2D_RECT_SHADOW */
-   { 38462, 0x00008B62 }, /* GL_SAMPLER_2D_SHADOW */
-   { 38483, 0x00008B5F }, /* GL_SAMPLER_3D */
-   { 38497, 0x00008B5F }, /* GL_SAMPLER_3D_OES */
-   { 38515, 0x00008919 }, /* GL_SAMPLER_BINDING */
-   { 38534, 0x00008DC2 }, /* GL_SAMPLER_BUFFER */
-   { 38552, 0x00008DC2 }, /* GL_SAMPLER_BUFFER_EXT */
-   { 38574, 0x00008B60 }, /* GL_SAMPLER_CUBE */
-   { 38590, 0x00008DC5 }, /* GL_SAMPLER_CUBE_SHADOW */
-   { 38613, 0x00008DC5 }, /* GL_SAMPLER_CUBE_SHADOW_EXT */
-   { 38640, 0x00008D66 }, /* GL_SAMPLER_EXTERNAL_OES */
-   { 38664, 0x000080A9 }, /* GL_SAMPLES */
-   { 38675, 0x000086B4 }, /* GL_SAMPLES_3DFX */
-   { 38691, 0x000080A9 }, /* GL_SAMPLES_ARB */
-   { 38706, 0x00008914 }, /* GL_SAMPLES_PASSED */
-   { 38724, 0x00008914 }, /* GL_SAMPLES_PASSED_ARB */
-   { 38746, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
-   { 38774, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE_ARB */
-   { 38806, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE */
-   { 38829, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE_ARB */
-   { 38856, 0x000080A8 }, /* GL_SAMPLE_BUFFERS */
-   { 38874, 0x000086B3 }, /* GL_SAMPLE_BUFFERS_3DFX */
-   { 38897, 0x000080A8 }, /* GL_SAMPLE_BUFFERS_ARB */
-   { 38919, 0x000080A0 }, /* GL_SAMPLE_COVERAGE */
-   { 38938, 0x000080A0 }, /* GL_SAMPLE_COVERAGE_ARB */
-   { 38961, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT */
-   { 38987, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT_ARB */
-   { 39017, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE */
-   { 39042, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE_ARB */
-   { 39071, 0x00080000 }, /* GL_SCISSOR_BIT */
-   { 39086, 0x00000C10 }, /* GL_SCISSOR_BOX */
-   { 39101, 0x00000C11 }, /* GL_SCISSOR_TEST */
-   { 39117, 0x0000845E }, /* GL_SECONDARY_COLOR_ARRAY */
-   { 39142, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
-   { 39182, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB */
-   { 39226, 0x0000845D }, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
-   { 39259, 0x0000845A }, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
-   { 39289, 0x0000845C }, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
-   { 39321, 0x0000845B }, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
-   { 39351, 0x00001C02 }, /* GL_SELECT */
-   { 39361, 0x00000DF3 }, /* GL_SELECTION_BUFFER_POINTER */
-   { 39389, 0x00000DF4 }, /* GL_SELECTION_BUFFER_SIZE */
-   { 39414, 0x00008012 }, /* GL_SEPARABLE_2D */
-   { 39430, 0x00008C8D }, /* GL_SEPARATE_ATTRIBS */
-   { 39450, 0x00008C8D }, /* GL_SEPARATE_ATTRIBS_EXT */
-   { 39474, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR */
-   { 39501, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR_EXT */
-   { 39532, 0x0000150F }, /* GL_SET */
-   { 39539, 0x00008DF8 }, /* GL_SHADER_BINARY_FORMATS */
-   { 39564, 0x00008DFA }, /* GL_SHADER_COMPILER */
-   { 39583, 0x00008B48 }, /* GL_SHADER_OBJECT_ARB */
-   { 39604, 0x00008B88 }, /* GL_SHADER_SOURCE_LENGTH */
-   { 39628, 0x00008B4F }, /* GL_SHADER_TYPE */
-   { 39643, 0x00000B54 }, /* GL_SHADE_MODEL */
-   { 39658, 0x00008B8C }, /* GL_SHADING_LANGUAGE_VERSION */
-   { 39686, 0x000080BF }, /* GL_SHADOW_AMBIENT_SGIX */
-   { 39709, 0x000081FB }, /* GL_SHARED_TEXTURE_PALETTE_EXT */
-   { 39739, 0x00001601 }, /* GL_SHININESS */
-   { 39752, 0x00001402 }, /* GL_SHORT */
-   { 39761, 0x00009119 }, /* GL_SIGNALED */
-   { 39773, 0x00008F9C }, /* GL_SIGNED_NORMALIZED */
-   { 39794, 0x000081F9 }, /* GL_SINGLE_COLOR */
-   { 39810, 0x000081F9 }, /* GL_SINGLE_COLOR_EXT */
-   { 39830, 0x000085CC }, /* GL_SLICE_ACCUM_SUN */
-   { 39849, 0x00008C46 }, /* GL_SLUMINANCE */
-   { 39863, 0x00008C47 }, /* GL_SLUMINANCE8 */
-   { 39878, 0x00008C45 }, /* GL_SLUMINANCE8_ALPHA8 */
-   { 39900, 0x00008C44 }, /* GL_SLUMINANCE_ALPHA */
-   { 39920, 0x00001D01 }, /* GL_SMOOTH */
-   { 39930, 0x00000B23 }, /* GL_SMOOTH_LINE_WIDTH_GRANULARITY */
-   { 39963, 0x00000B22 }, /* GL_SMOOTH_LINE_WIDTH_RANGE */
-   { 39990, 0x00000B13 }, /* GL_SMOOTH_POINT_SIZE_GRANULARITY */
-   { 40023, 0x00000B12 }, /* GL_SMOOTH_POINT_SIZE_RANGE */
-   { 40050, 0x00008588 }, /* GL_SOURCE0_ALPHA */
-   { 40067, 0x00008588 }, /* GL_SOURCE0_ALPHA_ARB */
-   { 40088, 0x00008588 }, /* GL_SOURCE0_ALPHA_EXT */
-   { 40109, 0x00008580 }, /* GL_SOURCE0_RGB */
-   { 40124, 0x00008580 }, /* GL_SOURCE0_RGB_ARB */
-   { 40143, 0x00008580 }, /* GL_SOURCE0_RGB_EXT */
-   { 40162, 0x00008589 }, /* GL_SOURCE1_ALPHA */
-   { 40179, 0x00008589 }, /* GL_SOURCE1_ALPHA_ARB */
-   { 40200, 0x00008589 }, /* GL_SOURCE1_ALPHA_EXT */
-   { 40221, 0x00008581 }, /* GL_SOURCE1_RGB */
-   { 40236, 0x00008581 }, /* GL_SOURCE1_RGB_ARB */
-   { 40255, 0x00008581 }, /* GL_SOURCE1_RGB_EXT */
-   { 40274, 0x0000858A }, /* GL_SOURCE2_ALPHA */
-   { 40291, 0x0000858A }, /* GL_SOURCE2_ALPHA_ARB */
-   { 40312, 0x0000858A }, /* GL_SOURCE2_ALPHA_EXT */
-   { 40333, 0x00008582 }, /* GL_SOURCE2_RGB */
-   { 40348, 0x00008582 }, /* GL_SOURCE2_RGB_ARB */
-   { 40367, 0x00008582 }, /* GL_SOURCE2_RGB_EXT */
-   { 40386, 0x0000858B }, /* GL_SOURCE3_ALPHA_NV */
-   { 40406, 0x00008583 }, /* GL_SOURCE3_RGB_NV */
-   { 40424, 0x00001202 }, /* GL_SPECULAR */
-   { 40436, 0x00002402 }, /* GL_SPHERE_MAP */
-   { 40450, 0x00001206 }, /* GL_SPOT_CUTOFF */
-   { 40465, 0x00001204 }, /* GL_SPOT_DIRECTION */
-   { 40483, 0x00001205 }, /* GL_SPOT_EXPONENT */
-   { 40500, 0x00008588 }, /* GL_SRC0_ALPHA */
-   { 40514, 0x00008580 }, /* GL_SRC0_RGB */
-   { 40526, 0x00008589 }, /* GL_SRC1_ALPHA */
-   { 40540, 0x00008581 }, /* GL_SRC1_RGB */
-   { 40552, 0x0000858A }, /* GL_SRC2_ALPHA */
-   { 40566, 0x00008582 }, /* GL_SRC2_RGB */
-   { 40578, 0x00000302 }, /* GL_SRC_ALPHA */
-   { 40591, 0x00000308 }, /* GL_SRC_ALPHA_SATURATE */
-   { 40613, 0x00000300 }, /* GL_SRC_COLOR */
-   { 40626, 0x00008C40 }, /* GL_SRGB */
-   { 40634, 0x00008C41 }, /* GL_SRGB8 */
-   { 40643, 0x00008C43 }, /* GL_SRGB8_ALPHA8 */
-   { 40659, 0x00008C42 }, /* GL_SRGB_ALPHA */
-   { 40673, 0x00000503 }, /* GL_STACK_OVERFLOW */
-   { 40691, 0x00000504 }, /* GL_STACK_UNDERFLOW */
-   { 40710, 0x000088E6 }, /* GL_STATIC_COPY */
-   { 40725, 0x000088E6 }, /* GL_STATIC_COPY_ARB */
-   { 40744, 0x000088E4 }, /* GL_STATIC_DRAW */
-   { 40759, 0x000088E4 }, /* GL_STATIC_DRAW_ARB */
-   { 40778, 0x000088E5 }, /* GL_STATIC_READ */
-   { 40793, 0x000088E5 }, /* GL_STATIC_READ_ARB */
-   { 40812, 0x00001802 }, /* GL_STENCIL */
-   { 40823, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT */
-   { 40845, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_EXT */
-   { 40871, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_OES */
-   { 40897, 0x00008801 }, /* GL_STENCIL_BACK_FAIL */
-   { 40918, 0x00008801 }, /* GL_STENCIL_BACK_FAIL_ATI */
-   { 40943, 0x00008800 }, /* GL_STENCIL_BACK_FUNC */
-   { 40964, 0x00008800 }, /* GL_STENCIL_BACK_FUNC_ATI */
-   { 40989, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
-   { 41021, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI */
-   { 41057, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
-   { 41089, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI */
-   { 41125, 0x00008CA3 }, /* GL_STENCIL_BACK_REF */
-   { 41145, 0x00008CA4 }, /* GL_STENCIL_BACK_VALUE_MASK */
-   { 41172, 0x00008CA5 }, /* GL_STENCIL_BACK_WRITEMASK */
-   { 41198, 0x00000D57 }, /* GL_STENCIL_BITS */
-   { 41214, 0x00008224 }, /* GL_STENCIL_BUFFER */
-   { 41232, 0x00000400 }, /* GL_STENCIL_BUFFER_BIT */
-   { 41254, 0x00000B91 }, /* GL_STENCIL_CLEAR_VALUE */
-   { 41277, 0x00000B94 }, /* GL_STENCIL_FAIL */
-   { 41293, 0x00000B92 }, /* GL_STENCIL_FUNC */
-   { 41309, 0x00001901 }, /* GL_STENCIL_INDEX */
-   { 41326, 0x00008D46 }, /* GL_STENCIL_INDEX1 */
-   { 41344, 0x00008D49 }, /* GL_STENCIL_INDEX16 */
-   { 41363, 0x00008D49 }, /* GL_STENCIL_INDEX16_EXT */
-   { 41386, 0x00008D46 }, /* GL_STENCIL_INDEX1_EXT */
-   { 41408, 0x00008D46 }, /* GL_STENCIL_INDEX1_OES */
-   { 41430, 0x00008D47 }, /* GL_STENCIL_INDEX4 */
-   { 41448, 0x00008D47 }, /* GL_STENCIL_INDEX4_EXT */
-   { 41470, 0x00008D47 }, /* GL_STENCIL_INDEX4_OES */
-   { 41492, 0x00008D48 }, /* GL_STENCIL_INDEX8 */
-   { 41510, 0x00008D48 }, /* GL_STENCIL_INDEX8_EXT */
-   { 41532, 0x00008D48 }, /* GL_STENCIL_INDEX8_OES */
-   { 41554, 0x00008D45 }, /* GL_STENCIL_INDEX_EXT */
-   { 41575, 0x00000B95 }, /* GL_STENCIL_PASS_DEPTH_FAIL */
-   { 41602, 0x00000B96 }, /* GL_STENCIL_PASS_DEPTH_PASS */
-   { 41629, 0x00000B97 }, /* GL_STENCIL_REF */
-   { 41644, 0x00000B90 }, /* GL_STENCIL_TEST */
-   { 41660, 0x00008910 }, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
-   { 41689, 0x00000B93 }, /* GL_STENCIL_VALUE_MASK */
-   { 41711, 0x00000B98 }, /* GL_STENCIL_WRITEMASK */
-   { 41732, 0x00000C33 }, /* GL_STEREO */
-   { 41742, 0x000085BE }, /* GL_STORAGE_CACHED_APPLE */
-   { 41766, 0x000085BD }, /* GL_STORAGE_PRIVATE_APPLE */
-   { 41791, 0x000085BF }, /* GL_STORAGE_SHARED_APPLE */
-   { 41815, 0x000088E2 }, /* GL_STREAM_COPY */
-   { 41830, 0x000088E2 }, /* GL_STREAM_COPY_ARB */
-   { 41849, 0x000088E0 }, /* GL_STREAM_DRAW */
-   { 41864, 0x000088E0 }, /* GL_STREAM_DRAW_ARB */
-   { 41883, 0x000088E1 }, /* GL_STREAM_READ */
-   { 41898, 0x000088E1 }, /* GL_STREAM_READ_ARB */
-   { 41917, 0x00000D50 }, /* GL_SUBPIXEL_BITS */
-   { 41934, 0x000084E7 }, /* GL_SUBTRACT */
-   { 41946, 0x000084E7 }, /* GL_SUBTRACT_ARB */
-   { 41962, 0x00009113 }, /* GL_SYNC_CONDITION */
-   { 41980, 0x00009116 }, /* GL_SYNC_FENCE */
-   { 41994, 0x00009115 }, /* GL_SYNC_FLAGS */
-   { 42008, 0x00000001 }, /* GL_SYNC_FLUSH_COMMANDS_BIT */
-   { 42035, 0x00009117 }, /* GL_SYNC_GPU_COMMANDS_COMPLETE */
-   { 42065, 0x00009114 }, /* GL_SYNC_STATUS */
-   { 42080, 0x00002001 }, /* GL_T */
-   { 42085, 0x00002A2A }, /* GL_T2F_C3F_V3F */
-   { 42100, 0x00002A2C }, /* GL_T2F_C4F_N3F_V3F */
-   { 42119, 0x00002A29 }, /* GL_T2F_C4UB_V3F */
-   { 42135, 0x00002A2B }, /* GL_T2F_N3F_V3F */
-   { 42150, 0x00002A27 }, /* GL_T2F_V3F */
-   { 42161, 0x00002A2D }, /* GL_T4F_C4F_N3F_V4F */
-   { 42180, 0x00002A28 }, /* GL_T4F_V4F */
-   { 42191, 0x00008031 }, /* GL_TABLE_TOO_LARGE_EXT */
-   { 42214, 0x00001702 }, /* GL_TEXTURE */
-   { 42225, 0x000084C0 }, /* GL_TEXTURE0 */
-   { 42237, 0x000084C0 }, /* GL_TEXTURE0_ARB */
-   { 42253, 0x000084C1 }, /* GL_TEXTURE1 */
-   { 42265, 0x000084CA }, /* GL_TEXTURE10 */
-   { 42278, 0x000084CA }, /* GL_TEXTURE10_ARB */
-   { 42295, 0x000084CB }, /* GL_TEXTURE11 */
-   { 42308, 0x000084CB }, /* GL_TEXTURE11_ARB */
-   { 42325, 0x000084CC }, /* GL_TEXTURE12 */
-   { 42338, 0x000084CC }, /* GL_TEXTURE12_ARB */
-   { 42355, 0x000084CD }, /* GL_TEXTURE13 */
-   { 42368, 0x000084CD }, /* GL_TEXTURE13_ARB */
-   { 42385, 0x000084CE }, /* GL_TEXTURE14 */
-   { 42398, 0x000084CE }, /* GL_TEXTURE14_ARB */
-   { 42415, 0x000084CF }, /* GL_TEXTURE15 */
-   { 42428, 0x000084CF }, /* GL_TEXTURE15_ARB */
-   { 42445, 0x000084D0 }, /* GL_TEXTURE16 */
-   { 42458, 0x000084D0 }, /* GL_TEXTURE16_ARB */
-   { 42475, 0x000084D1 }, /* GL_TEXTURE17 */
-   { 42488, 0x000084D1 }, /* GL_TEXTURE17_ARB */
-   { 42505, 0x000084D2 }, /* GL_TEXTURE18 */
-   { 42518, 0x000084D2 }, /* GL_TEXTURE18_ARB */
-   { 42535, 0x000084D3 }, /* GL_TEXTURE19 */
-   { 42548, 0x000084D3 }, /* GL_TEXTURE19_ARB */
-   { 42565, 0x000084C1 }, /* GL_TEXTURE1_ARB */
-   { 42581, 0x000084C2 }, /* GL_TEXTURE2 */
-   { 42593, 0x000084D4 }, /* GL_TEXTURE20 */
-   { 42606, 0x000084D4 }, /* GL_TEXTURE20_ARB */
-   { 42623, 0x000084D5 }, /* GL_TEXTURE21 */
-   { 42636, 0x000084D5 }, /* GL_TEXTURE21_ARB */
-   { 42653, 0x000084D6 }, /* GL_TEXTURE22 */
-   { 42666, 0x000084D6 }, /* GL_TEXTURE22_ARB */
-   { 42683, 0x000084D7 }, /* GL_TEXTURE23 */
-   { 42696, 0x000084D7 }, /* GL_TEXTURE23_ARB */
-   { 42713, 0x000084D8 }, /* GL_TEXTURE24 */
-   { 42726, 0x000084D8 }, /* GL_TEXTURE24_ARB */
-   { 42743, 0x000084D9 }, /* GL_TEXTURE25 */
-   { 42756, 0x000084D9 }, /* GL_TEXTURE25_ARB */
-   { 42773, 0x000084DA }, /* GL_TEXTURE26 */
-   { 42786, 0x000084DA }, /* GL_TEXTURE26_ARB */
-   { 42803, 0x000084DB }, /* GL_TEXTURE27 */
-   { 42816, 0x000084DB }, /* GL_TEXTURE27_ARB */
-   { 42833, 0x000084DC }, /* GL_TEXTURE28 */
-   { 42846, 0x000084DC }, /* GL_TEXTURE28_ARB */
-   { 42863, 0x000084DD }, /* GL_TEXTURE29 */
-   { 42876, 0x000084DD }, /* GL_TEXTURE29_ARB */
-   { 42893, 0x000084C2 }, /* GL_TEXTURE2_ARB */
-   { 42909, 0x000084C3 }, /* GL_TEXTURE3 */
-   { 42921, 0x000084DE }, /* GL_TEXTURE30 */
-   { 42934, 0x000084DE }, /* GL_TEXTURE30_ARB */
-   { 42951, 0x000084DF }, /* GL_TEXTURE31 */
-   { 42964, 0x000084DF }, /* GL_TEXTURE31_ARB */
-   { 42981, 0x000084C3 }, /* GL_TEXTURE3_ARB */
-   { 42997, 0x000084C4 }, /* GL_TEXTURE4 */
-   { 43009, 0x000084C4 }, /* GL_TEXTURE4_ARB */
-   { 43025, 0x000084C5 }, /* GL_TEXTURE5 */
-   { 43037, 0x000084C5 }, /* GL_TEXTURE5_ARB */
-   { 43053, 0x000084C6 }, /* GL_TEXTURE6 */
-   { 43065, 0x000084C6 }, /* GL_TEXTURE6_ARB */
-   { 43081, 0x000084C7 }, /* GL_TEXTURE7 */
-   { 43093, 0x000084C7 }, /* GL_TEXTURE7_ARB */
-   { 43109, 0x000084C8 }, /* GL_TEXTURE8 */
-   { 43121, 0x000084C8 }, /* GL_TEXTURE8_ARB */
-   { 43137, 0x000084C9 }, /* GL_TEXTURE9 */
-   { 43149, 0x000084C9 }, /* GL_TEXTURE9_ARB */
-   { 43165, 0x00000DE0 }, /* GL_TEXTURE_1D */
-   { 43179, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY */
-   { 43199, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY_EXT */
-   { 43223, 0x00000DE1 }, /* GL_TEXTURE_2D */
-   { 43237, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY */
-   { 43257, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY_EXT */
-   { 43281, 0x0000806F }, /* GL_TEXTURE_3D */
-   { 43295, 0x0000806F }, /* GL_TEXTURE_3D_OES */
-   { 43313, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE */
-   { 43335, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE_EXT */
-   { 43361, 0x0000813C }, /* GL_TEXTURE_BASE_LEVEL */
-   { 43383, 0x00008068 }, /* GL_TEXTURE_BINDING_1D */
-   { 43405, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY */
-   { 43433, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
-   { 43465, 0x00008069 }, /* GL_TEXTURE_BINDING_2D */
-   { 43487, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY */
-   { 43515, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
-   { 43547, 0x0000806A }, /* GL_TEXTURE_BINDING_3D */
-   { 43569, 0x0000806A }, /* GL_TEXTURE_BINDING_3D_OES */
-   { 43595, 0x00008C2C }, /* GL_TEXTURE_BINDING_BUFFER */
-   { 43621, 0x00008C2C }, /* GL_TEXTURE_BINDING_BUFFER_ARB */
-   { 43651, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP */
-   { 43679, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_ARB */
-   { 43711, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_OES */
-   { 43743, 0x00008D67 }, /* GL_TEXTURE_BINDING_EXTERNAL_OES */
-   { 43775, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE */
-   { 43804, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
-   { 43837, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_NV */
-   { 43869, 0x00040000 }, /* GL_TEXTURE_BIT */
-   { 43884, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE */
-   { 43905, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE_EXT */
-   { 43930, 0x00001005 }, /* GL_TEXTURE_BORDER */
-   { 43948, 0x00001004 }, /* GL_TEXTURE_BORDER_COLOR */
-   { 43972, 0x00008C2A }, /* GL_TEXTURE_BUFFER */
-   { 43990, 0x00008C2A }, /* GL_TEXTURE_BUFFER_ARB */
-   { 44012, 0x00008C2D }, /* GL_TEXTURE_BUFFER_DATA_STORE_BINDING */
-   { 44049, 0x00008C2D }, /* GL_TEXTURE_BUFFER_DATA_STORE_BINDING_ARB */
-   { 44090, 0x00008C2E }, /* GL_TEXTURE_BUFFER_FORMAT */
-   { 44115, 0x00008C2E }, /* GL_TEXTURE_BUFFER_FORMAT_ARB */
-   { 44144, 0x00008171 }, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
-   { 44175, 0x00008176 }, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
-   { 44205, 0x00008172 }, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
-   { 44235, 0x00008175 }, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
-   { 44270, 0x00008173 }, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
-   { 44301, 0x00008174 }, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-   { 44339, 0x000080BC }, /* GL_TEXTURE_COLOR_TABLE_SGI */
-   { 44366, 0x000081EF }, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
-   { 44398, 0x000080BF }, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
-   { 44432, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC */
-   { 44456, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC_ARB */
-   { 44484, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE */
-   { 44508, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE_ARB */
-   { 44536, 0x0000819B }, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
-   { 44569, 0x0000819A }, /* GL_TEXTURE_COMPARE_SGIX */
-   { 44593, 0x00001003 }, /* GL_TEXTURE_COMPONENTS */
-   { 44615, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED */
-   { 44637, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED_ARB */
-   { 44663, 0x000086A3 }, /* GL_TEXTURE_COMPRESSED_FORMATS_ARB */
-   { 44697, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
-   { 44730, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB */
-   { 44767, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT */
-   { 44795, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT_ARB */
-   { 44827, 0x00008078 }, /* GL_TEXTURE_COORD_ARRAY */
-   { 44850, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
-   { 44888, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB */
-   { 44930, 0x00008092 }, /* GL_TEXTURE_COORD_ARRAY_POINTER */
-   { 44961, 0x00008088 }, /* GL_TEXTURE_COORD_ARRAY_SIZE */
-   { 44989, 0x0000808A }, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
-   { 45019, 0x00008089 }, /* GL_TEXTURE_COORD_ARRAY_TYPE */
-   { 45047, 0x00008B9D }, /* GL_TEXTURE_CROP_RECT_OES */
-   { 45072, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP */
-   { 45092, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_ARB */
-   { 45116, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
-   { 45147, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB */
-   { 45182, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES */
-   { 45217, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
-   { 45248, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB */
-   { 45283, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES */
-   { 45318, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
-   { 45349, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB */
-   { 45384, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES */
-   { 45419, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_OES */
-   { 45443, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
-   { 45474, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB */
-   { 45509, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES */
-   { 45544, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
-   { 45575, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB */
-   { 45610, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES */
-   { 45645, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
-   { 45676, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB */
-   { 45711, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES */
-   { 45746, 0x0000884F }, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
-   { 45775, 0x00008071 }, /* GL_TEXTURE_DEPTH */
-   { 45792, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE */
-   { 45814, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE_ARB */
-   { 45840, 0x00002300 }, /* GL_TEXTURE_ENV */
-   { 45855, 0x00002201 }, /* GL_TEXTURE_ENV_COLOR */
-   { 45876, 0x00002200 }, /* GL_TEXTURE_ENV_MODE */
-   { 45896, 0x00008D65 }, /* GL_TEXTURE_EXTERNAL_OES */
-   { 45920, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL */
-   { 45946, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL_EXT */
-   { 45976, 0x00002500 }, /* GL_TEXTURE_GEN_MODE */
-   { 45996, 0x00002500 }, /* GL_TEXTURE_GEN_MODE_OES */
-   { 46020, 0x00000C63 }, /* GL_TEXTURE_GEN_Q */
-   { 46037, 0x00000C62 }, /* GL_TEXTURE_GEN_R */
-   { 46054, 0x00000C60 }, /* GL_TEXTURE_GEN_S */
-   { 46071, 0x00008D60 }, /* GL_TEXTURE_GEN_STR_OES */
-   { 46094, 0x00000C61 }, /* GL_TEXTURE_GEN_T */
-   { 46111, 0x0000819D }, /* GL_TEXTURE_GEQUAL_R_SGIX */
-   { 46136, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE */
-   { 46158, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE_EXT */
-   { 46184, 0x00001001 }, /* GL_TEXTURE_HEIGHT */
-   { 46202, 0x000080ED }, /* GL_TEXTURE_INDEX_SIZE_EXT */
-   { 46228, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE */
-   { 46254, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE_EXT */
-   { 46284, 0x00001003 }, /* GL_TEXTURE_INTERNAL_FORMAT */
-   { 46311, 0x0000819C }, /* GL_TEXTURE_LEQUAL_R_SGIX */
-   { 46336, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS */
-   { 46356, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS_EXT */
-   { 46380, 0x00008190 }, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
-   { 46407, 0x0000818E }, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
-   { 46434, 0x0000818F }, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
-   { 46461, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE */
-   { 46487, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE_EXT */
-   { 46517, 0x00002800 }, /* GL_TEXTURE_MAG_FILTER */
-   { 46539, 0x00000BA8 }, /* GL_TEXTURE_MATRIX */
-   { 46557, 0x0000898F }, /* GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES */
-   { 46597, 0x000084FE }, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
-   { 46627, 0x0000836B }, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
-   { 46655, 0x00008369 }, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
-   { 46683, 0x0000836A }, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
-   { 46711, 0x0000813D }, /* GL_TEXTURE_MAX_LEVEL */
-   { 46732, 0x0000813B }, /* GL_TEXTURE_MAX_LOD */
-   { 46751, 0x00002801 }, /* GL_TEXTURE_MIN_FILTER */
-   { 46773, 0x0000813A }, /* GL_TEXTURE_MIN_LOD */
-   { 46792, 0x00008066 }, /* GL_TEXTURE_PRIORITY */
-   { 46812, 0x000085B7 }, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
-   { 46842, 0x000085B8 }, /* GL_TEXTURE_RANGE_POINTER_APPLE */
-   { 46873, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE */
-   { 46894, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_ARB */
-   { 46919, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_NV */
-   { 46943, 0x0000805C }, /* GL_TEXTURE_RED_SIZE */
-   { 46963, 0x0000805C }, /* GL_TEXTURE_RED_SIZE_EXT */
-   { 46987, 0x00008067 }, /* GL_TEXTURE_RESIDENT */
-   { 47007, 0x00008C3F }, /* GL_TEXTURE_SHARED_SIZE */
-   { 47030, 0x00000BA5 }, /* GL_TEXTURE_STACK_DEPTH */
-   { 47053, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE */
-   { 47077, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE_EXT */
-   { 47105, 0x000085BC }, /* GL_TEXTURE_STORAGE_HINT_APPLE */
-   { 47135, 0x00008065 }, /* GL_TEXTURE_TOO_LARGE_EXT */
-   { 47160, 0x0000888F }, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
-   { 47194, 0x00001000 }, /* GL_TEXTURE_WIDTH */
-   { 47211, 0x00008072 }, /* GL_TEXTURE_WRAP_R */
-   { 47229, 0x00008072 }, /* GL_TEXTURE_WRAP_R_OES */
-   { 47251, 0x00002802 }, /* GL_TEXTURE_WRAP_S */
-   { 47269, 0x00002803 }, /* GL_TEXTURE_WRAP_T */
-   { 47287, 0x0000911B }, /* GL_TIMEOUT_EXPIRED */
-   { 47306, 0x000088BF }, /* GL_TIME_ELAPSED_EXT */
-   { 47326, 0x00008648 }, /* GL_TRACK_MATRIX_NV */
-   { 47345, 0x00008649 }, /* GL_TRACK_MATRIX_TRANSFORM_NV */
-   { 47374, 0x00001000 }, /* GL_TRANSFORM_BIT */
-   { 47391, 0x00008E22 }, /* GL_TRANSFORM_FEEDBACK */
-   { 47413, 0x00008E25 }, /* GL_TRANSFORM_FEEDBACK_BINDING */
-   { 47443, 0x00008C8E }, /* GL_TRANSFORM_FEEDBACK_BUFFER */
-   { 47472, 0x00008E24 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE */
-   { 47508, 0x00008C8F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING */
-   { 47545, 0x00008C8F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT */
-   { 47586, 0x00008C8E }, /* GL_TRANSFORM_FEEDBACK_BUFFER_EXT */
-   { 47619, 0x00008C7F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE */
-   { 47653, 0x00008C7F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT */
-   { 47691, 0x00008E23 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED */
-   { 47727, 0x00008C85 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE */
-   { 47761, 0x00008C85 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT */
-   { 47799, 0x00008C84 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_START */
-   { 47834, 0x00008C84 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT */
-   { 47873, 0x00008C88 }, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN */
-   { 47914, 0x00008C88 }, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT */
-   { 47959, 0x00008C83 }, /* GL_TRANSFORM_FEEDBACK_VARYINGS */
-   { 47990, 0x00008C83 }, /* GL_TRANSFORM_FEEDBACK_VARYINGS_EXT */
-   { 48025, 0x00008C76 }, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH */
-   { 48066, 0x00008C76 }, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT */
-   { 48111, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX */
-   { 48137, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX_ARB */
-   { 48167, 0x000088B7 }, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
-   { 48199, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
-   { 48229, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX_ARB */
-   { 48263, 0x0000862C }, /* GL_TRANSPOSE_NV */
-   { 48279, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX */
-   { 48310, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX_ARB */
-   { 48345, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX */
-   { 48373, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX_ARB */
-   { 48405, 0x00000004 }, /* GL_TRIANGLES */
-   { 48418, 0x0000000C }, /* GL_TRIANGLES_ADJACENCY */
-   { 48441, 0x0000000C }, /* GL_TRIANGLES_ADJACENCY_ARB */
-   { 48468, 0x00000006 }, /* GL_TRIANGLE_FAN */
-   { 48484, 0x00008615 }, /* GL_TRIANGLE_MESH_SUN */
-   { 48505, 0x00000005 }, /* GL_TRIANGLE_STRIP */
-   { 48523, 0x0000000D }, /* GL_TRIANGLE_STRIP_ADJACENCY */
-   { 48551, 0x0000000D }, /* GL_TRIANGLE_STRIP_ADJACENCY_ARB */
-   { 48583, 0x00000001 }, /* GL_TRUE */
-   { 48591, 0x00008A1C }, /* GL_UNDEFINED_APPLE */
-   { 48610, 0x00008255 }, /* GL_UNKNOWN_CONTEXT_RESET_ARB */
-   { 48639, 0x00000CF5 }, /* GL_UNPACK_ALIGNMENT */
-   { 48659, 0x0000806E }, /* GL_UNPACK_IMAGE_HEIGHT */
-   { 48682, 0x00000CF1 }, /* GL_UNPACK_LSB_FIRST */
-   { 48702, 0x00000CF2 }, /* GL_UNPACK_ROW_LENGTH */
-   { 48723, 0x0000806D }, /* GL_UNPACK_SKIP_IMAGES */
-   { 48745, 0x00000CF4 }, /* GL_UNPACK_SKIP_PIXELS */
-   { 48767, 0x00000CF3 }, /* GL_UNPACK_SKIP_ROWS */
-   { 48787, 0x00000CF0 }, /* GL_UNPACK_SWAP_BYTES */
-   { 48808, 0x00009118 }, /* GL_UNSIGNALED */
-   { 48822, 0x00001401 }, /* GL_UNSIGNED_BYTE */
-   { 48839, 0x00008362 }, /* GL_UNSIGNED_BYTE_2_3_3_REV */
-   { 48866, 0x00008032 }, /* GL_UNSIGNED_BYTE_3_3_2 */
-   { 48889, 0x00001405 }, /* GL_UNSIGNED_INT */
-   { 48905, 0x00008C3B }, /* GL_UNSIGNED_INT_10F_11F_11F_REV */
-   { 48937, 0x00008036 }, /* GL_UNSIGNED_INT_10_10_10_2 */
-   { 48964, 0x00008DF6 }, /* GL_UNSIGNED_INT_10_10_10_2_OES */
-   { 48995, 0x000084FA }, /* GL_UNSIGNED_INT_24_8 */
-   { 49016, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_EXT */
-   { 49041, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_NV */
-   { 49065, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_OES */
-   { 49090, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV */
-   { 49121, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV_EXT */
-   { 49156, 0x00008C3E }, /* GL_UNSIGNED_INT_5_9_9_9_REV */
-   { 49184, 0x00008035 }, /* GL_UNSIGNED_INT_8_8_8_8 */
-   { 49208, 0x00008367 }, /* GL_UNSIGNED_INT_8_8_8_8_REV */
-   { 49236, 0x00008DD1 }, /* GL_UNSIGNED_INT_SAMPLER_1D */
-   { 49263, 0x00008DD6 }, /* GL_UNSIGNED_INT_SAMPLER_1D_ARRAY */
-   { 49296, 0x00008DD6 }, /* GL_UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT */
-   { 49333, 0x00008DD1 }, /* GL_UNSIGNED_INT_SAMPLER_1D_EXT */
-   { 49364, 0x00008DD2 }, /* GL_UNSIGNED_INT_SAMPLER_2D */
-   { 49391, 0x00008DD7 }, /* GL_UNSIGNED_INT_SAMPLER_2D_ARRAY */
-   { 49424, 0x00008DD7 }, /* GL_UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT */
-   { 49461, 0x00008DD2 }, /* GL_UNSIGNED_INT_SAMPLER_2D_EXT */
-   { 49492, 0x00008DD5 }, /* GL_UNSIGNED_INT_SAMPLER_2D_RECT */
-   { 49524, 0x00008DD5 }, /* GL_UNSIGNED_INT_SAMPLER_2D_RECT_EXT */
-   { 49560, 0x00008DD3 }, /* GL_UNSIGNED_INT_SAMPLER_3D */
-   { 49587, 0x00008DD3 }, /* GL_UNSIGNED_INT_SAMPLER_3D_EXT */
-   { 49618, 0x00008DD8 }, /* GL_UNSIGNED_INT_SAMPLER_BUFFER */
-   { 49649, 0x00008DD8 }, /* GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT */
-   { 49684, 0x00008DD4 }, /* GL_UNSIGNED_INT_SAMPLER_CUBE */
-   { 49713, 0x00008DD4 }, /* GL_UNSIGNED_INT_SAMPLER_CUBE_EXT */
-   { 49746, 0x00008DC6 }, /* GL_UNSIGNED_INT_VEC2 */
-   { 49767, 0x00008DC6 }, /* GL_UNSIGNED_INT_VEC2_EXT */
-   { 49792, 0x00008DC7 }, /* GL_UNSIGNED_INT_VEC3 */
-   { 49813, 0x00008DC7 }, /* GL_UNSIGNED_INT_VEC3_EXT */
-   { 49838, 0x00008DC8 }, /* GL_UNSIGNED_INT_VEC4 */
-   { 49859, 0x00008DC8 }, /* GL_UNSIGNED_INT_VEC4_EXT */
-   { 49884, 0x00008C17 }, /* GL_UNSIGNED_NORMALIZED */
-   { 49907, 0x00001403 }, /* GL_UNSIGNED_SHORT */
-   { 49925, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
-   { 49955, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT */
-   { 49989, 0x00008033 }, /* GL_UNSIGNED_SHORT_4_4_4_4 */
-   { 50015, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
-   { 50045, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT */
-   { 50079, 0x00008034 }, /* GL_UNSIGNED_SHORT_5_5_5_1 */
-   { 50105, 0x00008363 }, /* GL_UNSIGNED_SHORT_5_6_5 */
-   { 50129, 0x00008364 }, /* GL_UNSIGNED_SHORT_5_6_5_REV */
-   { 50157, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_APPLE */
-   { 50185, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_MESA */
-   { 50212, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
-   { 50244, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_MESA */
-   { 50275, 0x00008CA2 }, /* GL_UPPER_LEFT */
-   { 50289, 0x00002A20 }, /* GL_V2F */
-   { 50296, 0x00002A21 }, /* GL_V3F */
-   { 50303, 0x00008B83 }, /* GL_VALIDATE_STATUS */
-   { 50322, 0x00001F00 }, /* GL_VENDOR */
-   { 50332, 0x00001F02 }, /* GL_VERSION */
-   { 50343, 0x00008074 }, /* GL_VERTEX_ARRAY */
-   { 50359, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING */
-   { 50383, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */
-   { 50413, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
-   { 50444, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
-   { 50479, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
-   { 50503, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
-   { 50524, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
-   { 50547, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
-   { 50568, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-   { 50595, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-   { 50623, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-   { 50651, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-   { 50679, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-   { 50707, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-   { 50735, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
-   { 50763, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-   { 50790, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-   { 50817, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-   { 50844, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-   { 50871, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-   { 50898, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-   { 50925, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-   { 50952, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-   { 50979, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-   { 51006, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
-   { 51044, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
-   { 51086, 0x000088FE }, /* GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB */
-   { 51121, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
-   { 51152, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
-   { 51187, 0x000088FD }, /* GL_VERTEX_ATTRIB_ARRAY_INTEGER */
-   { 51218, 0x000088FD }, /* GL_VERTEX_ATTRIB_ARRAY_INTEGER_EXT */
-   { 51253, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
-   { 51287, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
-   { 51325, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
-   { 51356, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
-   { 51391, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
-   { 51419, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
-   { 51451, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
-   { 51481, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
-   { 51515, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
-   { 51543, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
-   { 51575, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
-   { 51595, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
-   { 51617, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
-   { 51646, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
-   { 51667, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE */
-   { 51696, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
-   { 51729, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
-   { 51761, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE */
-   { 51788, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
-   { 51819, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
-   { 51849, 0x00008B31 }, /* GL_VERTEX_SHADER */
-   { 51866, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
-   { 51887, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
-   { 51914, 0x00000BA2 }, /* GL_VIEWPORT */
-   { 51926, 0x00000800 }, /* GL_VIEWPORT_BIT */
-   { 51942, 0x00008A1A }, /* GL_VOLATILE_APPLE */
-   { 51960, 0x0000911D }, /* GL_WAIT_FAILED */
-   { 51975, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
-   { 51995, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-   { 52026, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
-   { 52061, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_OES */
-   { 52096, 0x000086AD }, /* GL_WEIGHT_ARRAY_OES */
-   { 52116, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-   { 52144, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_OES */
-   { 52172, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-   { 52197, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_OES */
-   { 52222, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-   { 52249, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_OES */
-   { 52276, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-   { 52301, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_OES */
-   { 52326, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
-   { 52350, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
-   { 52369, 0x000088B9 }, /* GL_WRITE_ONLY */
-   { 52383, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
-   { 52401, 0x000088B9 }, /* GL_WRITE_ONLY_OES */
-   { 52419, 0x00001506 }, /* GL_XOR */
-   { 52426, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
-   { 52445, 0x00008757 }, /* GL_YCBCR_MESA */
-   { 52459, 0x00000000 }, /* GL_ZERO */
-   { 52467, 0x00000D16 }, /* GL_ZOOM_X */
-   { 52477, 0x00000D17 }, /* GL_ZOOM_Y */
+   {  8196, 0x00008244 }, /* GL_DEBUG_CALLBACK_FUNCTION_ARB */
+   {  8227, 0x00008245 }, /* GL_DEBUG_CALLBACK_USER_PARAM_ARB */
+   {  8260, 0x00009145 }, /* GL_DEBUG_LOGGED_MESSAGES_ARB */
+   {  8289, 0x00008243 }, /* GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_ARB */
+   {  8329, 0x00008759 }, /* GL_DEBUG_OBJECT_MESA */
+   {  8350, 0x00008242 }, /* GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB */
+   {  8382, 0x0000875A }, /* GL_DEBUG_PRINT_MESA */
+   {  8402, 0x00009146 }, /* GL_DEBUG_SEVERITY_HIGH_ARB */
+   {  8429, 0x00009148 }, /* GL_DEBUG_SEVERITY_LOW_ARB */
+   {  8455, 0x00009147 }, /* GL_DEBUG_SEVERITY_MEDIUM_ARB */
+   {  8484, 0x00008246 }, /* GL_DEBUG_SOURCE_API_ARB */
+   {  8508, 0x0000824A }, /* GL_DEBUG_SOURCE_APPLICATION_ARB */
+   {  8540, 0x0000824B }, /* GL_DEBUG_SOURCE_OTHER_ARB */
+   {  8566, 0x00008248 }, /* GL_DEBUG_SOURCE_SHADER_COMPILER_ARB */
+   {  8602, 0x00008249 }, /* GL_DEBUG_SOURCE_THIRD_PARTY_ARB */
+   {  8634, 0x00008247 }, /* GL_DEBUG_SOURCE_WINDOW_SYSTEM_ARB */
+   {  8668, 0x0000824D }, /* GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_ARB */
+   {  8706, 0x0000824C }, /* GL_DEBUG_TYPE_ERROR_ARB */
+   {  8730, 0x00008251 }, /* GL_DEBUG_TYPE_OTHER_ARB */
+   {  8754, 0x00008250 }, /* GL_DEBUG_TYPE_PERFORMANCE_ARB */
+   {  8784, 0x0000824F }, /* GL_DEBUG_TYPE_PORTABILITY_ARB */
+   {  8814, 0x0000824E }, /* GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_ARB */
+   {  8851, 0x00002101 }, /* GL_DECAL */
+   {  8860, 0x00001E03 }, /* GL_DECR */
+   {  8868, 0x00008508 }, /* GL_DECR_WRAP */
+   {  8881, 0x00008508 }, /* GL_DECR_WRAP_EXT */
+   {  8898, 0x00008B80 }, /* GL_DELETE_STATUS */
+   {  8915, 0x00001801 }, /* GL_DEPTH */
+   {  8924, 0x000088F0 }, /* GL_DEPTH24_STENCIL8 */
+   {  8944, 0x000088F0 }, /* GL_DEPTH24_STENCIL8_EXT */
+   {  8968, 0x000088F0 }, /* GL_DEPTH24_STENCIL8_OES */
+   {  8992, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT */
+   {  9012, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT_EXT */
+   {  9036, 0x00008D00 }, /* GL_DEPTH_ATTACHMENT_OES */
+   {  9060, 0x00000D1F }, /* GL_DEPTH_BIAS */
+   {  9074, 0x00000D56 }, /* GL_DEPTH_BITS */
+   {  9088, 0x00008891 }, /* GL_DEPTH_BOUNDS_EXT */
+   {  9108, 0x00008890 }, /* GL_DEPTH_BOUNDS_TEST_EXT */
+   {  9133, 0x00008223 }, /* GL_DEPTH_BUFFER */
+   {  9149, 0x00000100 }, /* GL_DEPTH_BUFFER_BIT */
+   {  9169, 0x0000864F }, /* GL_DEPTH_CLAMP */
+   {  9184, 0x0000864F }, /* GL_DEPTH_CLAMP_NV */
+   {  9202, 0x00000B73 }, /* GL_DEPTH_CLEAR_VALUE */
+   {  9223, 0x00001902 }, /* GL_DEPTH_COMPONENT */
+   {  9242, 0x000081A5 }, /* GL_DEPTH_COMPONENT16 */
+   {  9263, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_ARB */
+   {  9288, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_OES */
+   {  9313, 0x000081A5 }, /* GL_DEPTH_COMPONENT16_SGIX */
+   {  9339, 0x000081A6 }, /* GL_DEPTH_COMPONENT24 */
+   {  9360, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_ARB */
+   {  9385, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_OES */
+   {  9410, 0x000081A6 }, /* GL_DEPTH_COMPONENT24_SGIX */
+   {  9436, 0x000081A7 }, /* GL_DEPTH_COMPONENT32 */
+   {  9457, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_ARB */
+   {  9482, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_OES */
+   {  9507, 0x000081A7 }, /* GL_DEPTH_COMPONENT32_SGIX */
+   {  9533, 0x00000B74 }, /* GL_DEPTH_FUNC */
+   {  9547, 0x00000B70 }, /* GL_DEPTH_RANGE */
+   {  9562, 0x00000D1E }, /* GL_DEPTH_SCALE */
+   {  9577, 0x000084F9 }, /* GL_DEPTH_STENCIL */
+   {  9594, 0x0000821A }, /* GL_DEPTH_STENCIL_ATTACHMENT */
+   {  9622, 0x000084F9 }, /* GL_DEPTH_STENCIL_EXT */
+   {  9643, 0x000084F9 }, /* GL_DEPTH_STENCIL_NV */
+   {  9663, 0x000084F9 }, /* GL_DEPTH_STENCIL_OES */
+   {  9684, 0x0000886F }, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
+   {  9712, 0x0000886E }, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
+   {  9740, 0x00000B71 }, /* GL_DEPTH_TEST */
+   {  9754, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE */
+   {  9776, 0x0000884B }, /* GL_DEPTH_TEXTURE_MODE_ARB */
+   {  9802, 0x00000B72 }, /* GL_DEPTH_WRITEMASK */
+   {  9821, 0x00001201 }, /* GL_DIFFUSE */
+   {  9832, 0x00000BD0 }, /* GL_DITHER */
+   {  9842, 0x00000A02 }, /* GL_DOMAIN */
+   {  9852, 0x00001100 }, /* GL_DONT_CARE */
+   {  9865, 0x000086AE }, /* GL_DOT3_RGB */
+   {  9877, 0x000086AF }, /* GL_DOT3_RGBA */
+   {  9890, 0x000086AF }, /* GL_DOT3_RGBA_ARB */
+   {  9907, 0x00008741 }, /* GL_DOT3_RGBA_EXT */
+   {  9924, 0x000086AE }, /* GL_DOT3_RGB_ARB */
+   {  9940, 0x00008740 }, /* GL_DOT3_RGB_EXT */
+   {  9956, 0x0000140A }, /* GL_DOUBLE */
+   {  9966, 0x00000C32 }, /* GL_DOUBLEBUFFER */
+   {  9982, 0x00000C01 }, /* GL_DRAW_BUFFER */
+   {  9997, 0x00008825 }, /* GL_DRAW_BUFFER0 */
+   { 10013, 0x00008825 }, /* GL_DRAW_BUFFER0_ARB */
+   { 10033, 0x00008825 }, /* GL_DRAW_BUFFER0_ATI */
+   { 10053, 0x00008825 }, /* GL_DRAW_BUFFER0_NV */
+   { 10072, 0x00008826 }, /* GL_DRAW_BUFFER1 */
+   { 10088, 0x0000882F }, /* GL_DRAW_BUFFER10 */
+   { 10105, 0x0000882F }, /* GL_DRAW_BUFFER10_ARB */
+   { 10126, 0x0000882F }, /* GL_DRAW_BUFFER10_ATI */
+   { 10147, 0x0000882F }, /* GL_DRAW_BUFFER10_NV */
+   { 10167, 0x00008830 }, /* GL_DRAW_BUFFER11 */
+   { 10184, 0x00008830 }, /* GL_DRAW_BUFFER11_ARB */
+   { 10205, 0x00008830 }, /* GL_DRAW_BUFFER11_ATI */
+   { 10226, 0x00008830 }, /* GL_DRAW_BUFFER11_NV */
+   { 10246, 0x00008831 }, /* GL_DRAW_BUFFER12 */
+   { 10263, 0x00008831 }, /* GL_DRAW_BUFFER12_ARB */
+   { 10284, 0x00008831 }, /* GL_DRAW_BUFFER12_ATI */
+   { 10305, 0x00008831 }, /* GL_DRAW_BUFFER12_NV */
+   { 10325, 0x00008832 }, /* GL_DRAW_BUFFER13 */
+   { 10342, 0x00008832 }, /* GL_DRAW_BUFFER13_ARB */
+   { 10363, 0x00008832 }, /* GL_DRAW_BUFFER13_ATI */
+   { 10384, 0x00008832 }, /* GL_DRAW_BUFFER13_NV */
+   { 10404, 0x00008833 }, /* GL_DRAW_BUFFER14 */
+   { 10421, 0x00008833 }, /* GL_DRAW_BUFFER14_ARB */
+   { 10442, 0x00008833 }, /* GL_DRAW_BUFFER14_ATI */
+   { 10463, 0x00008833 }, /* GL_DRAW_BUFFER14_NV */
+   { 10483, 0x00008834 }, /* GL_DRAW_BUFFER15 */
+   { 10500, 0x00008834 }, /* GL_DRAW_BUFFER15_ARB */
+   { 10521, 0x00008834 }, /* GL_DRAW_BUFFER15_ATI */
+   { 10542, 0x00008834 }, /* GL_DRAW_BUFFER15_NV */
+   { 10562, 0x00008826 }, /* GL_DRAW_BUFFER1_ARB */
+   { 10582, 0x00008826 }, /* GL_DRAW_BUFFER1_ATI */
+   { 10602, 0x00008826 }, /* GL_DRAW_BUFFER1_NV */
+   { 10621, 0x00008827 }, /* GL_DRAW_BUFFER2 */
+   { 10637, 0x00008827 }, /* GL_DRAW_BUFFER2_ARB */
+   { 10657, 0x00008827 }, /* GL_DRAW_BUFFER2_ATI */
+   { 10677, 0x00008827 }, /* GL_DRAW_BUFFER2_NV */
+   { 10696, 0x00008828 }, /* GL_DRAW_BUFFER3 */
+   { 10712, 0x00008828 }, /* GL_DRAW_BUFFER3_ARB */
+   { 10732, 0x00008828 }, /* GL_DRAW_BUFFER3_ATI */
+   { 10752, 0x00008828 }, /* GL_DRAW_BUFFER3_NV */
+   { 10771, 0x00008829 }, /* GL_DRAW_BUFFER4 */
+   { 10787, 0x00008829 }, /* GL_DRAW_BUFFER4_ARB */
+   { 10807, 0x00008829 }, /* GL_DRAW_BUFFER4_ATI */
+   { 10827, 0x00008829 }, /* GL_DRAW_BUFFER4_NV */
+   { 10846, 0x0000882A }, /* GL_DRAW_BUFFER5 */
+   { 10862, 0x0000882A }, /* GL_DRAW_BUFFER5_ARB */
+   { 10882, 0x0000882A }, /* GL_DRAW_BUFFER5_ATI */
+   { 10902, 0x0000882A }, /* GL_DRAW_BUFFER5_NV */
+   { 10921, 0x0000882B }, /* GL_DRAW_BUFFER6 */
+   { 10937, 0x0000882B }, /* GL_DRAW_BUFFER6_ARB */
+   { 10957, 0x0000882B }, /* GL_DRAW_BUFFER6_ATI */
+   { 10977, 0x0000882B }, /* GL_DRAW_BUFFER6_NV */
+   { 10996, 0x0000882C }, /* GL_DRAW_BUFFER7 */
+   { 11012, 0x0000882C }, /* GL_DRAW_BUFFER7_ARB */
+   { 11032, 0x0000882C }, /* GL_DRAW_BUFFER7_ATI */
+   { 11052, 0x0000882C }, /* GL_DRAW_BUFFER7_NV */
+   { 11071, 0x0000882D }, /* GL_DRAW_BUFFER8 */
+   { 11087, 0x0000882D }, /* GL_DRAW_BUFFER8_ARB */
+   { 11107, 0x0000882D }, /* GL_DRAW_BUFFER8_ATI */
+   { 11127, 0x0000882D }, /* GL_DRAW_BUFFER8_NV */
+   { 11146, 0x0000882E }, /* GL_DRAW_BUFFER9 */
+   { 11162, 0x0000882E }, /* GL_DRAW_BUFFER9_ARB */
+   { 11182, 0x0000882E }, /* GL_DRAW_BUFFER9_ATI */
+   { 11202, 0x0000882E }, /* GL_DRAW_BUFFER9_NV */
+   { 11221, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER */
+   { 11241, 0x00008CA6 }, /* GL_DRAW_FRAMEBUFFER_BINDING */
+   { 11269, 0x00008CA6 }, /* GL_DRAW_FRAMEBUFFER_BINDING_EXT */
+   { 11301, 0x00008CA9 }, /* GL_DRAW_FRAMEBUFFER_EXT */
+   { 11325, 0x00000705 }, /* GL_DRAW_PIXEL_TOKEN */
+   { 11345, 0x00000304 }, /* GL_DST_ALPHA */
+   { 11358, 0x00000306 }, /* GL_DST_COLOR */
+   { 11371, 0x0000877A }, /* GL_DU8DV8_ATI */
+   { 11385, 0x00008779 }, /* GL_DUDV_ATI */
+   { 11397, 0x000088EA }, /* GL_DYNAMIC_COPY */
+   { 11413, 0x000088EA }, /* GL_DYNAMIC_COPY_ARB */
+   { 11433, 0x000088E8 }, /* GL_DYNAMIC_DRAW */
+   { 11449, 0x000088E8 }, /* GL_DYNAMIC_DRAW_ARB */
+   { 11469, 0x000088E9 }, /* GL_DYNAMIC_READ */
+   { 11485, 0x000088E9 }, /* GL_DYNAMIC_READ_ARB */
+   { 11505, 0x00000B43 }, /* GL_EDGE_FLAG */
+   { 11518, 0x00008079 }, /* GL_EDGE_FLAG_ARRAY */
+   { 11537, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
+   { 11571, 0x0000889B }, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB */
+   { 11609, 0x00008093 }, /* GL_EDGE_FLAG_ARRAY_POINTER */
+   { 11636, 0x0000808C }, /* GL_EDGE_FLAG_ARRAY_STRIDE */
+   { 11662, 0x00008893 }, /* GL_ELEMENT_ARRAY_BUFFER */
+   { 11686, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
+   { 11718, 0x00008895 }, /* GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB */
+   { 11754, 0x00001600 }, /* GL_EMISSION */
+   { 11766, 0x00002000 }, /* GL_ENABLE_BIT */
+   { 11780, 0x00000202 }, /* GL_EQUAL */
+   { 11789, 0x00001509 }, /* GL_EQUIV */
+   { 11798, 0x00008D64 }, /* GL_ETC1_RGB8_OES */
+   { 11815, 0x00010000 }, /* GL_EVAL_BIT */
+   { 11827, 0x00000800 }, /* GL_EXP */
+   { 11834, 0x00000801 }, /* GL_EXP2 */
+   { 11842, 0x00001F03 }, /* GL_EXTENSIONS */
+   { 11856, 0x00002400 }, /* GL_EYE_LINEAR */
+   { 11870, 0x00002502 }, /* GL_EYE_PLANE */
+   { 11883, 0x0000855C }, /* GL_EYE_PLANE_ABSOLUTE_NV */
+   { 11908, 0x0000855B }, /* GL_EYE_RADIAL_NV */
+   { 11925, 0x00000000 }, /* GL_FALSE */
+   { 11934, 0x00001101 }, /* GL_FASTEST */
+   { 11945, 0x00001C01 }, /* GL_FEEDBACK */
+   { 11957, 0x00000DF0 }, /* GL_FEEDBACK_BUFFER_POINTER */
+   { 11984, 0x00000DF1 }, /* GL_FEEDBACK_BUFFER_SIZE */
+   { 12008, 0x00000DF2 }, /* GL_FEEDBACK_BUFFER_TYPE */
+   { 12032, 0x00001B02 }, /* GL_FILL */
+   { 12040, 0x00008E4D }, /* GL_FIRST_VERTEX_CONVENTION */
+   { 12067, 0x00008E4D }, /* GL_FIRST_VERTEX_CONVENTION_EXT */
+   { 12098, 0x0000140C }, /* GL_FIXED */
+   { 12107, 0x0000140C }, /* GL_FIXED_OES */
+   { 12120, 0x0000891D }, /* GL_FIXED_ONLY */
+   { 12134, 0x0000891D }, /* GL_FIXED_ONLY_ARB */
+   { 12152, 0x00001D00 }, /* GL_FLAT */
+   { 12160, 0x00001406 }, /* GL_FLOAT */
+   { 12169, 0x00008B5A }, /* GL_FLOAT_MAT2 */
+   { 12183, 0x00008B5A }, /* GL_FLOAT_MAT2_ARB */
+   { 12201, 0x00008B65 }, /* GL_FLOAT_MAT2x3 */
+   { 12217, 0x00008B66 }, /* GL_FLOAT_MAT2x4 */
+   { 12233, 0x00008B5B }, /* GL_FLOAT_MAT3 */
+   { 12247, 0x00008B5B }, /* GL_FLOAT_MAT3_ARB */
+   { 12265, 0x00008B67 }, /* GL_FLOAT_MAT3x2 */
+   { 12281, 0x00008B68 }, /* GL_FLOAT_MAT3x4 */
+   { 12297, 0x00008B5C }, /* GL_FLOAT_MAT4 */
+   { 12311, 0x00008B5C }, /* GL_FLOAT_MAT4_ARB */
+   { 12329, 0x00008B69 }, /* GL_FLOAT_MAT4x2 */
+   { 12345, 0x00008B6A }, /* GL_FLOAT_MAT4x3 */
+   { 12361, 0x00008B50 }, /* GL_FLOAT_VEC2 */
+   { 12375, 0x00008B50 }, /* GL_FLOAT_VEC2_ARB */
+   { 12393, 0x00008B51 }, /* GL_FLOAT_VEC3 */
+   { 12407, 0x00008B51 }, /* GL_FLOAT_VEC3_ARB */
+   { 12425, 0x00008B52 }, /* GL_FLOAT_VEC4 */
+   { 12439, 0x00008B52 }, /* GL_FLOAT_VEC4_ARB */
+   { 12457, 0x00000B60 }, /* GL_FOG */
+   { 12464, 0x00000080 }, /* GL_FOG_BIT */
+   { 12475, 0x00000B66 }, /* GL_FOG_COLOR */
+   { 12488, 0x00008451 }, /* GL_FOG_COORD */
+   { 12501, 0x00008451 }, /* GL_FOG_COORDINATE */
+   { 12519, 0x00008457 }, /* GL_FOG_COORDINATE_ARRAY */
+   { 12543, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
+   { 12582, 0x0000889D }, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB */
+   { 12625, 0x00008456 }, /* GL_FOG_COORDINATE_ARRAY_POINTER */
+   { 12657, 0x00008455 }, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
+   { 12688, 0x00008454 }, /* GL_FOG_COORDINATE_ARRAY_TYPE */
+   { 12717, 0x00008450 }, /* GL_FOG_COORDINATE_SOURCE */
+   { 12742, 0x00008457 }, /* GL_FOG_COORD_ARRAY */
+   { 12761, 0x0000889D }, /* GL_FOG_COORD_ARRAY_BUFFER_BINDING */
+   { 12795, 0x00008456 }, /* GL_FOG_COORD_ARRAY_POINTER */
+   { 12822, 0x00008455 }, /* GL_FOG_COORD_ARRAY_STRIDE */
+   { 12848, 0x00008454 }, /* GL_FOG_COORD_ARRAY_TYPE */
+   { 12872, 0x00008450 }, /* GL_FOG_COORD_SRC */
+   { 12889, 0x00000B62 }, /* GL_FOG_DENSITY */
+   { 12904, 0x0000855A }, /* GL_FOG_DISTANCE_MODE_NV */
+   { 12928, 0x00000B64 }, /* GL_FOG_END */
+   { 12939, 0x00000C54 }, /* GL_FOG_HINT */
+   { 12951, 0x00000B61 }, /* GL_FOG_INDEX */
+   { 12964, 0x00000B65 }, /* GL_FOG_MODE */
+   { 12976, 0x00008198 }, /* GL_FOG_OFFSET_SGIX */
+   { 12995, 0x00008199 }, /* GL_FOG_OFFSET_VALUE_SGIX */
+   { 13020, 0x00000B63 }, /* GL_FOG_START */
+   { 13033, 0x00008452 }, /* GL_FRAGMENT_DEPTH */
+   { 13051, 0x00008804 }, /* GL_FRAGMENT_PROGRAM_ARB */
+   { 13075, 0x00008B30 }, /* GL_FRAGMENT_SHADER */
+   { 13094, 0x00008B30 }, /* GL_FRAGMENT_SHADER_ARB */
+   { 13117, 0x00008B8B }, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
+   { 13152, 0x00008B8B }, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT_OES */
+   { 13191, 0x00008D40 }, /* GL_FRAMEBUFFER */
+   { 13206, 0x00008215 }, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
+   { 13243, 0x00008214 }, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
+   { 13279, 0x00008210 }, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
+   { 13320, 0x00008211 }, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
+   { 13361, 0x00008216 }, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
+   { 13398, 0x00008213 }, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
+   { 13435, 0x00008DA7 }, /* GL_FRAMEBUFFER_ATTACHMENT_LAYERED */
+   { 13469, 0x00008DA7 }, /* GL_FRAMEBUFFER_ATTACHMENT_LAYERED_ARB */
+   { 13507, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
+   { 13545, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT */
+   { 13587, 0x00008CD1 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_OES */
+   { 13629, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
+   { 13667, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT */
+   { 13709, 0x00008CD0 }, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_OES */
+   { 13751, 0x00008212 }, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
+   { 13786, 0x00008217 }, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
+   { 13825, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT */
+   { 13874, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_OES */
+   { 13923, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
+   { 13971, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT */
+   { 14023, 0x00008CD3 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_OES */
+   { 14075, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
+   { 14115, 0x00008CD4 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */
+   { 14159, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
+   { 14199, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT */
+   { 14243, 0x00008CD2 }, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_OES */
+   { 14287, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING */
+   { 14310, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING_EXT */
+   { 14337, 0x00008CA6 }, /* GL_FRAMEBUFFER_BINDING_OES */
+   { 14364, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE */
+   { 14388, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE_EXT */
+   { 14416, 0x00008CD5 }, /* GL_FRAMEBUFFER_COMPLETE_OES */
+   { 14444, 0x00008218 }, /* GL_FRAMEBUFFER_DEFAULT */
+   { 14467, 0x00008D40 }, /* GL_FRAMEBUFFER_EXT */
+   { 14486, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
+   { 14523, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT */
+   { 14564, 0x00008CD6 }, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_OES */
+   { 14605, 0x00008CD9 }, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS */
+   { 14642, 0x00008CD9 }, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
+   { 14683, 0x00008CD9 }, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_OES */
+   { 14724, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER */
+   { 14762, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT */
+   { 14804, 0x00008CDB }, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_OES */
+   { 14846, 0x00008CD8 }, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
+   { 14897, 0x00008CDA }, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
+   { 14935, 0x00008CDA }, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_OES */
+   { 14973, 0x00008DA9 }, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB */
+   { 15015, 0x00008DA8 }, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS */
+   { 15055, 0x00008DA8 }, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_ARB */
+   { 15099, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
+   { 15144, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT */
+   { 15193, 0x00008CD7 }, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_OES */
+   { 15242, 0x00008D56 }, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
+   { 15280, 0x00008D56 }, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT */
+   { 15322, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER */
+   { 15360, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT */
+   { 15402, 0x00008CDC }, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_OES */
+   { 15444, 0x00008D40 }, /* GL_FRAMEBUFFER_OES */
+   { 15463, 0x00008CDE }, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
+   { 15495, 0x00008219 }, /* GL_FRAMEBUFFER_UNDEFINED */
+   { 15520, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED */
+   { 15547, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED_EXT */
+   { 15578, 0x00008CDD }, /* GL_FRAMEBUFFER_UNSUPPORTED_OES */
+   { 15609, 0x00000404 }, /* GL_FRONT */
+   { 15618, 0x00000408 }, /* GL_FRONT_AND_BACK */
+   { 15636, 0x00000B46 }, /* GL_FRONT_FACE */
+   { 15650, 0x00000400 }, /* GL_FRONT_LEFT */
+   { 15664, 0x00000401 }, /* GL_FRONT_RIGHT */
+   { 15679, 0x00008006 }, /* GL_FUNC_ADD */
+   { 15691, 0x00008006 }, /* GL_FUNC_ADD_EXT */
+   { 15707, 0x00008006 }, /* GL_FUNC_ADD_OES */
+   { 15723, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT */
+   { 15748, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT_EXT */
+   { 15777, 0x0000800B }, /* GL_FUNC_REVERSE_SUBTRACT_OES */
+   { 15806, 0x0000800A }, /* GL_FUNC_SUBTRACT */
+   { 15823, 0x0000800A }, /* GL_FUNC_SUBTRACT_EXT */
+   { 15844, 0x0000800A }, /* GL_FUNC_SUBTRACT_OES */
+   { 15865, 0x00008191 }, /* GL_GENERATE_MIPMAP */
+   { 15884, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT */
+   { 15908, 0x00008192 }, /* GL_GENERATE_MIPMAP_HINT_SGIS */
+   { 15937, 0x00008191 }, /* GL_GENERATE_MIPMAP_SGIS */
+   { 15961, 0x00008917 }, /* GL_GEOMETRY_INPUT_TYPE */
+   { 15984, 0x00008DDB }, /* GL_GEOMETRY_INPUT_TYPE_ARB */
+   { 16011, 0x00008918 }, /* GL_GEOMETRY_OUTPUT_TYPE */
+   { 16035, 0x00008DDC }, /* GL_GEOMETRY_OUTPUT_TYPE_ARB */
+   { 16063, 0x00008DD9 }, /* GL_GEOMETRY_SHADER */
+   { 16082, 0x00008DD9 }, /* GL_GEOMETRY_SHADER_ARB */
+   { 16105, 0x00008916 }, /* GL_GEOMETRY_VERTICES_OUT */
+   { 16130, 0x00008DDA }, /* GL_GEOMETRY_VERTICES_OUT_ARB */
+   { 16159, 0x00000206 }, /* GL_GEQUAL */
+   { 16169, 0x0000912F }, /* GL_GL_TEXTURE_IMMUTABLE_FORMAT */
+   { 16200, 0x00000204 }, /* GL_GREATER */
+   { 16211, 0x00001904 }, /* GL_GREEN */
+   { 16220, 0x00000D19 }, /* GL_GREEN_BIAS */
+   { 16234, 0x00000D53 }, /* GL_GREEN_BITS */
+   { 16248, 0x00008D95 }, /* GL_GREEN_INTEGER */
+   { 16265, 0x00008D95 }, /* GL_GREEN_INTEGER_EXT */
+   { 16286, 0x00000D18 }, /* GL_GREEN_SCALE */
+   { 16301, 0x00008253 }, /* GL_GUILTY_CONTEXT_RESET_ARB */
+   { 16329, 0x0000140B }, /* GL_HALF_FLOAT */
+   { 16343, 0x00008D61 }, /* GL_HALF_FLOAT_OES */
+   { 16361, 0x00008DF2 }, /* GL_HIGH_FLOAT */
+   { 16375, 0x00008DF5 }, /* GL_HIGH_INT */
+   { 16387, 0x00008000 }, /* GL_HINT_BIT */
+   { 16399, 0x00008024 }, /* GL_HISTOGRAM */
+   { 16412, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE */
+   { 16436, 0x0000802B }, /* GL_HISTOGRAM_ALPHA_SIZE_EXT */
+   { 16464, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE */
+   { 16487, 0x0000802A }, /* GL_HISTOGRAM_BLUE_SIZE_EXT */
+   { 16514, 0x00008024 }, /* GL_HISTOGRAM_EXT */
+   { 16531, 0x00008027 }, /* GL_HISTOGRAM_FORMAT */
+   { 16551, 0x00008027 }, /* GL_HISTOGRAM_FORMAT_EXT */
+   { 16575, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE */
+   { 16599, 0x00008029 }, /* GL_HISTOGRAM_GREEN_SIZE_EXT */
+   { 16627, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE */
+   { 16655, 0x0000802C }, /* GL_HISTOGRAM_LUMINANCE_SIZE_EXT */
+   { 16687, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE */
+   { 16709, 0x00008028 }, /* GL_HISTOGRAM_RED_SIZE_EXT */
+   { 16735, 0x0000802D }, /* GL_HISTOGRAM_SINK */
+   { 16753, 0x0000802D }, /* GL_HISTOGRAM_SINK_EXT */
+   { 16775, 0x00008026 }, /* GL_HISTOGRAM_WIDTH */
+   { 16794, 0x00008026 }, /* GL_HISTOGRAM_WIDTH_EXT */
+   { 16817, 0x0000862A }, /* GL_IDENTITY_NV */
+   { 16832, 0x00008150 }, /* GL_IGNORE_BORDER_HP */
+   { 16852, 0x00008B9B }, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT */
+   { 16888, 0x00008B9B }, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES */
+   { 16928, 0x00008B9A }, /* GL_IMPLEMENTATION_COLOR_READ_TYPE */
+   { 16962, 0x00008B9A }, /* GL_IMPLEMENTATION_COLOR_READ_TYPE_OES */
+   { 17000, 0x00001E02 }, /* GL_INCR */
+   { 17008, 0x00008507 }, /* GL_INCR_WRAP */
+   { 17021, 0x00008507 }, /* GL_INCR_WRAP_EXT */
+   { 17038, 0x00008222 }, /* GL_INDEX */
+   { 17047, 0x00008077 }, /* GL_INDEX_ARRAY */
+   { 17062, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING */
+   { 17092, 0x00008899 }, /* GL_INDEX_ARRAY_BUFFER_BINDING_ARB */
+   { 17126, 0x00008091 }, /* GL_INDEX_ARRAY_POINTER */
+   { 17149, 0x00008086 }, /* GL_INDEX_ARRAY_STRIDE */
+   { 17171, 0x00008085 }, /* GL_INDEX_ARRAY_TYPE */
+   { 17191, 0x00000D51 }, /* GL_INDEX_BITS */
+   { 17205, 0x00000C20 }, /* GL_INDEX_CLEAR_VALUE */
+   { 17226, 0x00000BF1 }, /* GL_INDEX_LOGIC_OP */
+   { 17244, 0x00000C30 }, /* GL_INDEX_MODE */
+   { 17258, 0x00000D13 }, /* GL_INDEX_OFFSET */
+   { 17274, 0x00000D12 }, /* GL_INDEX_SHIFT */
+   { 17289, 0x00000C21 }, /* GL_INDEX_WRITEMASK */
+   { 17308, 0x00008B84 }, /* GL_INFO_LOG_LENGTH */
+   { 17327, 0x00008254 }, /* GL_INNOCENT_CONTEXT_RESET_ARB */
+   { 17357, 0x00001404 }, /* GL_INT */
+   { 17364, 0x00008049 }, /* GL_INTENSITY */
+   { 17377, 0x0000804C }, /* GL_INTENSITY12 */
+   { 17392, 0x0000804C }, /* GL_INTENSITY12_EXT */
+   { 17411, 0x0000804D }, /* GL_INTENSITY16 */
+   { 17426, 0x00008D8B }, /* GL_INTENSITY16I_EXT */
+   { 17446, 0x00008D79 }, /* GL_INTENSITY16UI_EXT */
+   { 17467, 0x0000804D }, /* GL_INTENSITY16_EXT */
+   { 17486, 0x00008D85 }, /* GL_INTENSITY32I_EXT */
+   { 17506, 0x00008D73 }, /* GL_INTENSITY32UI_EXT */
+   { 17527, 0x0000804A }, /* GL_INTENSITY4 */
+   { 17541, 0x0000804A }, /* GL_INTENSITY4_EXT */
+   { 17559, 0x0000804B }, /* GL_INTENSITY8 */
+   { 17573, 0x00008D91 }, /* GL_INTENSITY8I_EXT */
+   { 17592, 0x00008D7F }, /* GL_INTENSITY8UI_EXT */
+   { 17612, 0x0000804B }, /* GL_INTENSITY8_EXT */
+   { 17630, 0x00008049 }, /* GL_INTENSITY_EXT */
+   { 17647, 0x00008C8C }, /* GL_INTERLEAVED_ATTRIBS */
+   { 17670, 0x00008C8C }, /* GL_INTERLEAVED_ATTRIBS_EXT */
+   { 17697, 0x00008575 }, /* GL_INTERPOLATE */
+   { 17712, 0x00008575 }, /* GL_INTERPOLATE_ARB */
+   { 17731, 0x00008575 }, /* GL_INTERPOLATE_EXT */
+   { 17750, 0x00008DF7 }, /* GL_INT_10_10_10_2_OES */
+   { 17772, 0x00008D9F }, /* GL_INT_2_10_10_10_REV */
+   { 17794, 0x00008DC9 }, /* GL_INT_SAMPLER_1D */
+   { 17812, 0x00008DCE }, /* GL_INT_SAMPLER_1D_ARRAY */
+   { 17836, 0x00008DCE }, /* GL_INT_SAMPLER_1D_ARRAY_EXT */
+   { 17864, 0x00008DC9 }, /* GL_INT_SAMPLER_1D_EXT */
+   { 17886, 0x00008DCA }, /* GL_INT_SAMPLER_2D */
+   { 17904, 0x00008DCF }, /* GL_INT_SAMPLER_2D_ARRAY */
+   { 17928, 0x00008DCF }, /* GL_INT_SAMPLER_2D_ARRAY_EXT */
+   { 17956, 0x00008DCA }, /* GL_INT_SAMPLER_2D_EXT */
+   { 17978, 0x00008DCD }, /* GL_INT_SAMPLER_2D_RECT */
+   { 18001, 0x00008DCD }, /* GL_INT_SAMPLER_2D_RECT_EXT */
+   { 18028, 0x00008DCB }, /* GL_INT_SAMPLER_3D */
+   { 18046, 0x00008DCB }, /* GL_INT_SAMPLER_3D_EXT */
+   { 18068, 0x00008DD0 }, /* GL_INT_SAMPLER_BUFFER */
+   { 18090, 0x00008DD0 }, /* GL_INT_SAMPLER_BUFFER_EXT */
+   { 18116, 0x00008DCC }, /* GL_INT_SAMPLER_CUBE */
+   { 18136, 0x00008DCC }, /* GL_INT_SAMPLER_CUBE_EXT */
+   { 18160, 0x00008B53 }, /* GL_INT_VEC2 */
+   { 18172, 0x00008B53 }, /* GL_INT_VEC2_ARB */
+   { 18188, 0x00008B54 }, /* GL_INT_VEC3 */
+   { 18200, 0x00008B54 }, /* GL_INT_VEC3_ARB */
+   { 18216, 0x00008B55 }, /* GL_INT_VEC4 */
+   { 18228, 0x00008B55 }, /* GL_INT_VEC4_ARB */
+   { 18244, 0x00000500 }, /* GL_INVALID_ENUM */
+   { 18260, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION */
+   { 18293, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION_EXT */
+   { 18330, 0x00000506 }, /* GL_INVALID_FRAMEBUFFER_OPERATION_OES */
+   { 18367, 0x00000502 }, /* GL_INVALID_OPERATION */
+   { 18388, 0x00000501 }, /* GL_INVALID_VALUE */
+   { 18405, 0x0000862B }, /* GL_INVERSE_NV */
+   { 18419, 0x0000862D }, /* GL_INVERSE_TRANSPOSE_NV */
+   { 18443, 0x0000150A }, /* GL_INVERT */
+   { 18453, 0x00001E00 }, /* GL_KEEP */
+   { 18461, 0x00008E4E }, /* GL_LAST_VERTEX_CONVENTION */
+   { 18487, 0x00008E4E }, /* GL_LAST_VERTEX_CONVENTION_EXT */
+   { 18517, 0x00000406 }, /* GL_LEFT */
+   { 18525, 0x00000203 }, /* GL_LEQUAL */
+   { 18535, 0x00000201 }, /* GL_LESS */
+   { 18543, 0x00004000 }, /* GL_LIGHT0 */
+   { 18553, 0x00004001 }, /* GL_LIGHT1 */
+   { 18563, 0x00004002 }, /* GL_LIGHT2 */
+   { 18573, 0x00004003 }, /* GL_LIGHT3 */
+   { 18583, 0x00004004 }, /* GL_LIGHT4 */
+   { 18593, 0x00004005 }, /* GL_LIGHT5 */
+   { 18603, 0x00004006 }, /* GL_LIGHT6 */
+   { 18613, 0x00004007 }, /* GL_LIGHT7 */
+   { 18623, 0x00000B50 }, /* GL_LIGHTING */
+   { 18635, 0x00000040 }, /* GL_LIGHTING_BIT */
+   { 18651, 0x00000B53 }, /* GL_LIGHT_MODEL_AMBIENT */
+   { 18674, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL */
+   { 18703, 0x000081F8 }, /* GL_LIGHT_MODEL_COLOR_CONTROL_EXT */
+   { 18736, 0x00000B51 }, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
+   { 18764, 0x00000B52 }, /* GL_LIGHT_MODEL_TWO_SIDE */
+   { 18788, 0x00001B01 }, /* GL_LINE */
+   { 18796, 0x00002601 }, /* GL_LINEAR */
+   { 18806, 0x00001208 }, /* GL_LINEAR_ATTENUATION */
+   { 18828, 0x00008170 }, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
+   { 18858, 0x0000844F }, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
+   { 18889, 0x00002703 }, /* GL_LINEAR_MIPMAP_LINEAR */
+   { 18913, 0x00002701 }, /* GL_LINEAR_MIPMAP_NEAREST */
+   { 18938, 0x00000001 }, /* GL_LINES */
+   { 18947, 0x0000000A }, /* GL_LINES_ADJACENCY */
+   { 18966, 0x0000000A }, /* GL_LINES_ADJACENCY_ARB */
+   { 18989, 0x00000004 }, /* GL_LINE_BIT */
+   { 19001, 0x00000002 }, /* GL_LINE_LOOP */
+   { 19014, 0x00000707 }, /* GL_LINE_RESET_TOKEN */
+   { 19034, 0x00000B20 }, /* GL_LINE_SMOOTH */
+   { 19049, 0x00000C52 }, /* GL_LINE_SMOOTH_HINT */
+   { 19069, 0x00000B24 }, /* GL_LINE_STIPPLE */
+   { 19085, 0x00000B25 }, /* GL_LINE_STIPPLE_PATTERN */
+   { 19109, 0x00000B26 }, /* GL_LINE_STIPPLE_REPEAT */
+   { 19132, 0x00000003 }, /* GL_LINE_STRIP */
+   { 19146, 0x0000000B }, /* GL_LINE_STRIP_ADJACENCY */
+   { 19170, 0x0000000B }, /* GL_LINE_STRIP_ADJACENCY_ARB */
+   { 19198, 0x00000702 }, /* GL_LINE_TOKEN */
+   { 19212, 0x00000B21 }, /* GL_LINE_WIDTH */
+   { 19226, 0x00000B23 }, /* GL_LINE_WIDTH_GRANULARITY */
+   { 19252, 0x00000B22 }, /* GL_LINE_WIDTH_RANGE */
+   { 19272, 0x00008B82 }, /* GL_LINK_STATUS */
+   { 19287, 0x00000B32 }, /* GL_LIST_BASE */
+   { 19300, 0x00020000 }, /* GL_LIST_BIT */
+   { 19312, 0x00000B33 }, /* GL_LIST_INDEX */
+   { 19326, 0x00000B30 }, /* GL_LIST_MODE */
+   { 19339, 0x00000101 }, /* GL_LOAD */
+   { 19347, 0x00000BF1 }, /* GL_LOGIC_OP */
+   { 19359, 0x00000BF0 }, /* GL_LOGIC_OP_MODE */
+   { 19376, 0x00008252 }, /* GL_LOSE_CONTEXT_ON_RESET_ARB */
+   { 19405, 0x00008CA1 }, /* GL_LOWER_LEFT */
+   { 19419, 0x00008DF0 }, /* GL_LOW_FLOAT */
+   { 19432, 0x00008DF3 }, /* GL_LOW_INT */
+   { 19443, 0x00001909 }, /* GL_LUMINANCE */
+   { 19456, 0x00008041 }, /* GL_LUMINANCE12 */
+   { 19471, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12 */
+   { 19494, 0x00008047 }, /* GL_LUMINANCE12_ALPHA12_EXT */
+   { 19521, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4 */
+   { 19543, 0x00008046 }, /* GL_LUMINANCE12_ALPHA4_EXT */
+   { 19569, 0x00008041 }, /* GL_LUMINANCE12_EXT */
+   { 19588, 0x00008042 }, /* GL_LUMINANCE16 */
+   { 19603, 0x00008D8C }, /* GL_LUMINANCE16I_EXT */
+   { 19623, 0x00008D7A }, /* GL_LUMINANCE16UI_EXT */
+   { 19644, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16 */
+   { 19667, 0x00008048 }, /* GL_LUMINANCE16_ALPHA16_EXT */
+   { 19694, 0x00008042 }, /* GL_LUMINANCE16_EXT */
+   { 19713, 0x00008D86 }, /* GL_LUMINANCE32I_EXT */
+   { 19733, 0x00008D74 }, /* GL_LUMINANCE32UI_EXT */
+   { 19754, 0x0000803F }, /* GL_LUMINANCE4 */
+   { 19768, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4 */
+   { 19789, 0x00008043 }, /* GL_LUMINANCE4_ALPHA4_EXT */
+   { 19814, 0x0000803F }, /* GL_LUMINANCE4_EXT */
+   { 19832, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2 */
+   { 19853, 0x00008044 }, /* GL_LUMINANCE6_ALPHA2_EXT */
+   { 19878, 0x00008040 }, /* GL_LUMINANCE8 */
+   { 19892, 0x00008D92 }, /* GL_LUMINANCE8I_EXT */
+   { 19911, 0x00008D80 }, /* GL_LUMINANCE8UI_EXT */
+   { 19931, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8 */
+   { 19952, 0x00008045 }, /* GL_LUMINANCE8_ALPHA8_EXT */
+   { 19977, 0x00008040 }, /* GL_LUMINANCE8_EXT */
+   { 19995, 0x0000190A }, /* GL_LUMINANCE_ALPHA */
+   { 20014, 0x00008D8D }, /* GL_LUMINANCE_ALPHA16I_EXT */
+   { 20040, 0x00008D7B }, /* GL_LUMINANCE_ALPHA16UI_EXT */
+   { 20067, 0x00008D87 }, /* GL_LUMINANCE_ALPHA32I_EXT */
+   { 20093, 0x00008D75 }, /* GL_LUMINANCE_ALPHA32UI_EXT */
+   { 20120, 0x00008D93 }, /* GL_LUMINANCE_ALPHA8I_EXT */
+   { 20145, 0x00008D81 }, /* GL_LUMINANCE_ALPHA8UI_EXT */
+   { 20171, 0x00008D9D }, /* GL_LUMINANCE_ALPHA_INTEGER_EXT */
+   { 20202, 0x00008D9C }, /* GL_LUMINANCE_INTEGER_EXT */
+   { 20227, 0x0000821B }, /* GL_MAJOR_VERSION */
+   { 20244, 0x00000D90 }, /* GL_MAP1_COLOR_4 */
+   { 20260, 0x00000DD0 }, /* GL_MAP1_GRID_DOMAIN */
+   { 20280, 0x00000DD1 }, /* GL_MAP1_GRID_SEGMENTS */
+   { 20302, 0x00000D91 }, /* GL_MAP1_INDEX */
+   { 20316, 0x00000D92 }, /* GL_MAP1_NORMAL */
+   { 20331, 0x00000D93 }, /* GL_MAP1_TEXTURE_COORD_1 */
+   { 20355, 0x00000D94 }, /* GL_MAP1_TEXTURE_COORD_2 */
+   { 20379, 0x00000D95 }, /* GL_MAP1_TEXTURE_COORD_3 */
+   { 20403, 0x00000D96 }, /* GL_MAP1_TEXTURE_COORD_4 */
+   { 20427, 0x00000D97 }, /* GL_MAP1_VERTEX_3 */
+   { 20444, 0x00000D98 }, /* GL_MAP1_VERTEX_4 */
+   { 20461, 0x00008660 }, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
+   { 20489, 0x0000866A }, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
+   { 20518, 0x0000866B }, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
+   { 20547, 0x0000866C }, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
+   { 20576, 0x0000866D }, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
+   { 20605, 0x0000866E }, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
+   { 20634, 0x0000866F }, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
+   { 20663, 0x00008661 }, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
+   { 20691, 0x00008662 }, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
+   { 20719, 0x00008663 }, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
+   { 20747, 0x00008664 }, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
+   { 20775, 0x00008665 }, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
+   { 20803, 0x00008666 }, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
+   { 20831, 0x00008667 }, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
+   { 20859, 0x00008668 }, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
+   { 20887, 0x00008669 }, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
+   { 20915, 0x00000DB0 }, /* GL_MAP2_COLOR_4 */
+   { 20931, 0x00000DD2 }, /* GL_MAP2_GRID_DOMAIN */
+   { 20951, 0x00000DD3 }, /* GL_MAP2_GRID_SEGMENTS */
+   { 20973, 0x00000DB1 }, /* GL_MAP2_INDEX */
+   { 20987, 0x00000DB2 }, /* GL_MAP2_NORMAL */
+   { 21002, 0x00000DB3 }, /* GL_MAP2_TEXTURE_COORD_1 */
+   { 21026, 0x00000DB4 }, /* GL_MAP2_TEXTURE_COORD_2 */
+   { 21050, 0x00000DB5 }, /* GL_MAP2_TEXTURE_COORD_3 */
+   { 21074, 0x00000DB6 }, /* GL_MAP2_TEXTURE_COORD_4 */
+   { 21098, 0x00000DB7 }, /* GL_MAP2_VERTEX_3 */
+   { 21115, 0x00000DB8 }, /* GL_MAP2_VERTEX_4 */
+   { 21132, 0x00008670 }, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
+   { 21160, 0x0000867A }, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
+   { 21189, 0x0000867B }, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
+   { 21218, 0x0000867C }, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
+   { 21247, 0x0000867D }, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
+   { 21276, 0x0000867E }, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
+   { 21305, 0x0000867F }, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
+   { 21334, 0x00008671 }, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
+   { 21362, 0x00008672 }, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
+   { 21390, 0x00008673 }, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
+   { 21418, 0x00008674 }, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
+   { 21446, 0x00008675 }, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
+   { 21474, 0x00008676 }, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
+   { 21502, 0x00008677 }, /* GL_MAP2_VERTEX_ATTRIB7_4_NV */
+   { 21530, 0x00008678 }, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
+   { 21558, 0x00008679 }, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
+   { 21586, 0x00000D10 }, /* GL_MAP_COLOR */
+   { 21599, 0x00000010 }, /* GL_MAP_FLUSH_EXPLICIT_BIT */
+   { 21625, 0x00000008 }, /* GL_MAP_INVALIDATE_BUFFER_BIT */
+   { 21654, 0x00000004 }, /* GL_MAP_INVALIDATE_RANGE_BIT */
+   { 21682, 0x00000001 }, /* GL_MAP_READ_BIT */
+   { 21698, 0x00000D11 }, /* GL_MAP_STENCIL */
+   { 21713, 0x00000020 }, /* GL_MAP_UNSYNCHRONIZED_BIT */
+   { 21739, 0x00000002 }, /* GL_MAP_WRITE_BIT */
+   { 21756, 0x000088C0 }, /* GL_MATRIX0_ARB */
+   { 21771, 0x00008630 }, /* GL_MATRIX0_NV */
+   { 21785, 0x000088CA }, /* GL_MATRIX10_ARB */
+   { 21801, 0x000088CB }, /* GL_MATRIX11_ARB */
+   { 21817, 0x000088CC }, /* GL_MATRIX12_ARB */
+   { 21833, 0x000088CD }, /* GL_MATRIX13_ARB */
+   { 21849, 0x000088CE }, /* GL_MATRIX14_ARB */
+   { 21865, 0x000088CF }, /* GL_MATRIX15_ARB */
+   { 21881, 0x000088D0 }, /* GL_MATRIX16_ARB */
+   { 21897, 0x000088D1 }, /* GL_MATRIX17_ARB */
+   { 21913, 0x000088D2 }, /* GL_MATRIX18_ARB */
+   { 21929, 0x000088D3 }, /* GL_MATRIX19_ARB */
+   { 21945, 0x000088C1 }, /* GL_MATRIX1_ARB */
+   { 21960, 0x00008631 }, /* GL_MATRIX1_NV */
+   { 21974, 0x000088D4 }, /* GL_MATRIX20_ARB */
+   { 21990, 0x000088D5 }, /* GL_MATRIX21_ARB */
+   { 22006, 0x000088D6 }, /* GL_MATRIX22_ARB */
+   { 22022, 0x000088D7 }, /* GL_MATRIX23_ARB */
+   { 22038, 0x000088D8 }, /* GL_MATRIX24_ARB */
+   { 22054, 0x000088D9 }, /* GL_MATRIX25_ARB */
+   { 22070, 0x000088DA }, /* GL_MATRIX26_ARB */
+   { 22086, 0x000088DB }, /* GL_MATRIX27_ARB */
+   { 22102, 0x000088DC }, /* GL_MATRIX28_ARB */
+   { 22118, 0x000088DD }, /* GL_MATRIX29_ARB */
+   { 22134, 0x000088C2 }, /* GL_MATRIX2_ARB */
+   { 22149, 0x00008632 }, /* GL_MATRIX2_NV */
+   { 22163, 0x000088DE }, /* GL_MATRIX30_ARB */
+   { 22179, 0x000088DF }, /* GL_MATRIX31_ARB */
+   { 22195, 0x000088C3 }, /* GL_MATRIX3_ARB */
+   { 22210, 0x00008633 }, /* GL_MATRIX3_NV */
+   { 22224, 0x000088C4 }, /* GL_MATRIX4_ARB */
+   { 22239, 0x00008634 }, /* GL_MATRIX4_NV */
+   { 22253, 0x000088C5 }, /* GL_MATRIX5_ARB */
+   { 22268, 0x00008635 }, /* GL_MATRIX5_NV */
+   { 22282, 0x000088C6 }, /* GL_MATRIX6_ARB */
+   { 22297, 0x00008636 }, /* GL_MATRIX6_NV */
+   { 22311, 0x000088C7 }, /* GL_MATRIX7_ARB */
+   { 22326, 0x00008637 }, /* GL_MATRIX7_NV */
+   { 22340, 0x000088C8 }, /* GL_MATRIX8_ARB */
+   { 22355, 0x000088C9 }, /* GL_MATRIX9_ARB */
+   { 22370, 0x00008844 }, /* GL_MATRIX_INDEX_ARRAY_ARB */
+   { 22396, 0x00008B9E }, /* GL_MATRIX_INDEX_ARRAY_BUFFER_BINDING_OES */
+   { 22437, 0x00008844 }, /* GL_MATRIX_INDEX_ARRAY_OES */
+   { 22463, 0x00008849 }, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
+   { 22497, 0x00008849 }, /* GL_MATRIX_INDEX_ARRAY_POINTER_OES */
+   { 22531, 0x00008846 }, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
+   { 22562, 0x00008846 }, /* GL_MATRIX_INDEX_ARRAY_SIZE_OES */
+   { 22593, 0x00008848 }, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
+   { 22626, 0x00008848 }, /* GL_MATRIX_INDEX_ARRAY_STRIDE_OES */
+   { 22659, 0x00008847 }, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
+   { 22690, 0x00008847 }, /* GL_MATRIX_INDEX_ARRAY_TYPE_OES */
+   { 22721, 0x00000BA0 }, /* GL_MATRIX_MODE */
+   { 22736, 0x00008840 }, /* GL_MATRIX_PALETTE_ARB */
+   { 22758, 0x00008840 }, /* GL_MATRIX_PALETTE_OES */
+   { 22780, 0x00008008 }, /* GL_MAX */
+   { 22787, 0x00008073 }, /* GL_MAX_3D_TEXTURE_SIZE */
+   { 22810, 0x00008073 }, /* GL_MAX_3D_TEXTURE_SIZE_OES */
+   { 22837, 0x000088FF }, /* GL_MAX_ARRAY_TEXTURE_LAYERS */
+   { 22865, 0x000088FF }, /* GL_MAX_ARRAY_TEXTURE_LAYERS_EXT */
+   { 22897, 0x00000D35 }, /* GL_MAX_ATTRIB_STACK_DEPTH */
+   { 22923, 0x00000D3B }, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
+   { 22956, 0x00008177 }, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
+   { 22982, 0x00008178 }, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+   { 23016, 0x00000D32 }, /* GL_MAX_CLIP_DISTANCES */
+   { 23038, 0x00000D32 }, /* GL_MAX_CLIP_PLANES */
+   { 23057, 0x00008CDF }, /* GL_MAX_COLOR_ATTACHMENTS */
+   { 23082, 0x00008CDF }, /* GL_MAX_COLOR_ATTACHMENTS_EXT */
+   { 23111, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
+   { 23143, 0x000080B3 }, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI */
+   { 23179, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
+   { 23215, 0x00008B4D }, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB */
+   { 23255, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT */
+   { 23281, 0x0000801B }, /* GL_MAX_CONVOLUTION_HEIGHT_EXT */
+   { 23311, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH */
+   { 23336, 0x0000801A }, /* GL_MAX_CONVOLUTION_WIDTH_EXT */
+   { 23365, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
+   { 23394, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB */
+   { 23427, 0x0000851C }, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE_OES */
+   { 23460, 0x00009144 }, /* GL_MAX_DEBUG_LOGGED_MESSAGES_ARB */
+   { 23493, 0x00009143 }, /* GL_MAX_DEBUG_MESSAGE_LENGTH_ARB */
+   { 23525, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS */
+   { 23545, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ARB */
+   { 23569, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_ATI */
+   { 23593, 0x00008824 }, /* GL_MAX_DRAW_BUFFERS_NV */
+   { 23616, 0x000080E9 }, /* GL_MAX_ELEMENTS_INDICES */
+   { 23640, 0x000080E8 }, /* GL_MAX_ELEMENTS_VERTICES */
+   { 23665, 0x00000D30 }, /* GL_MAX_EVAL_ORDER */
+   { 23683, 0x00008008 }, /* GL_MAX_EXT */
+   { 23694, 0x00009125 }, /* GL_MAX_FRAGMENT_INPUT_COMPONENTS */
+   { 23727, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
+   { 23762, 0x00008B49 }, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB */
+   { 23801, 0x00008DFD }, /* GL_MAX_FRAGMENT_UNIFORM_VECTORS */
+   { 23833, 0x00009123 }, /* GL_MAX_GEOMETRY_INPUT_COMPONENTS */
+   { 23866, 0x00009124 }, /* GL_MAX_GEOMETRY_OUTPUT_COMPONENTS */
+   { 23900, 0x00008DE0 }, /* GL_MAX_GEOMETRY_OUTPUT_VERTICES */
+   { 23932, 0x00008DE0 }, /* GL_MAX_GEOMETRY_OUTPUT_VERTICES_ARB */
+   { 23968, 0x00008C29 }, /* GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS */
+   { 24004, 0x00008C29 }, /* GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_ARB */
+   { 24044, 0x00008DE1 }, /* GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS */
+   { 24084, 0x00008DE1 }, /* GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_ARB */
+   { 24128, 0x00008DDF }, /* GL_MAX_GEOMETRY_UNIFORM_COMPONENTS */
+   { 24163, 0x00008DDF }, /* GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_ARB */
+   { 24202, 0x00008DDD }, /* GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB */
+   { 24241, 0x00000D31 }, /* GL_MAX_LIGHTS */
+   { 24255, 0x00000B31 }, /* GL_MAX_LIST_NESTING */
+   { 24275, 0x00008841 }, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
+   { 24313, 0x00000D36 }, /* GL_MAX_MODELVIEW_STACK_DEPTH */
+   { 24342, 0x00000D37 }, /* GL_MAX_NAME_STACK_DEPTH */
+   { 24366, 0x00008842 }, /* GL_MAX_PALETTE_MATRICES_ARB */
+   { 24394, 0x00008842 }, /* GL_MAX_PALETTE_MATRICES_OES */
+   { 24422, 0x00000D34 }, /* GL_MAX_PIXEL_MAP_TABLE */
+   { 24445, 0x000088B1 }, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
+   { 24482, 0x0000880B }, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
+   { 24518, 0x000088AD }, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
+   { 24545, 0x000088F5 }, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
+   { 24574, 0x000088B5 }, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
+   { 24608, 0x000088F4 }, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
+   { 24644, 0x000088F6 }, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
+   { 24671, 0x000088A1 }, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
+   { 24703, 0x000088B4 }, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
+   { 24739, 0x000088F8 }, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
+   { 24768, 0x000088F7 }, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
+   { 24797, 0x0000862F }, /* GL_MAX_PROGRAM_MATRICES_ARB */
+   { 24825, 0x0000862E }, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
+   { 24863, 0x000088B3 }, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+   { 24907, 0x0000880E }, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+   { 24950, 0x000088AF }, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
+   { 24984, 0x000088A3 }, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+   { 25023, 0x000088AB }, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
+   { 25060, 0x000088A7 }, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
+   { 25098, 0x00008810 }, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+   { 25141, 0x0000880F }, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+   { 25184, 0x000088A9 }, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
+   { 25214, 0x000088A5 }, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
+   { 25245, 0x00008905 }, /* GL_MAX_PROGRAM_TEXEL_OFFSET */
+   { 25273, 0x0000880D }, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
+   { 25309, 0x0000880C }, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
+   { 25345, 0x00000D38 }, /* GL_MAX_PROJECTION_STACK_DEPTH */
+   { 25375, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE */
+   { 25405, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB */
+   { 25439, 0x000084F8 }, /* GL_MAX_RECTANGLE_TEXTURE_SIZE_NV */
+   { 25472, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE */
+   { 25497, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE_EXT */
+   { 25526, 0x000084E8 }, /* GL_MAX_RENDERBUFFER_SIZE_OES */
+   { 25555, 0x00008D57 }, /* GL_MAX_SAMPLES */
+   { 25570, 0x00008D57 }, /* GL_MAX_SAMPLES_EXT */
+   { 25589, 0x00009111 }, /* GL_MAX_SERVER_WAIT_TIMEOUT */
+   { 25616, 0x00008504 }, /* GL_MAX_SHININESS_NV */
+   { 25636, 0x00008505 }, /* GL_MAX_SPOT_EXPONENT_NV */
+   { 25660, 0x00008C2B }, /* GL_MAX_TEXTURE_BUFFER_SIZE */
+   { 25687, 0x00008C2B }, /* GL_MAX_TEXTURE_BUFFER_SIZE_ARB */
+   { 25718, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS */
+   { 25740, 0x00008871 }, /* GL_MAX_TEXTURE_COORDS_ARB */
+   { 25766, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS */
+   { 25793, 0x00008872 }, /* GL_MAX_TEXTURE_IMAGE_UNITS_ARB */
+   { 25824, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS */
+   { 25848, 0x000084FD }, /* GL_MAX_TEXTURE_LOD_BIAS_EXT */
+   { 25876, 0x000084FF }, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
+   { 25910, 0x00000D33 }, /* GL_MAX_TEXTURE_SIZE */
+   { 25930, 0x00000D39 }, /* GL_MAX_TEXTURE_STACK_DEPTH */
+   { 25957, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS */
+   { 25978, 0x000084E2 }, /* GL_MAX_TEXTURE_UNITS_ARB */
+   { 26003, 0x0000862F }, /* GL_MAX_TRACK_MATRICES_NV */
+   { 26028, 0x0000862E }, /* GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV */
+   { 26063, 0x00008C8A }, /* GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS */
+   { 26112, 0x00008C8A }, /* GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_EXT */
+   { 26165, 0x00008C8B }, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS */
+   { 26208, 0x00008C8B }, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_EXT */
+   { 26255, 0x00008C80 }, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS */
+   { 26301, 0x00008C80 }, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_EXT */
+   { 26351, 0x00008B4B }, /* GL_MAX_VARYING_COMPONENTS */
+   { 26377, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS */
+   { 26399, 0x00008B4B }, /* GL_MAX_VARYING_FLOATS_ARB */
+   { 26425, 0x00008DFC }, /* GL_MAX_VARYING_VECTORS */
+   { 26448, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS */
+   { 26470, 0x00008869 }, /* GL_MAX_VERTEX_ATTRIBS_ARB */
+   { 26496, 0x00009122 }, /* GL_MAX_VERTEX_OUTPUT_COMPONENTS */
+   { 26528, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
+   { 26562, 0x00008B4C }, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */
+   { 26600, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
+   { 26633, 0x00008B4A }, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB */
+   { 26670, 0x00008DFB }, /* GL_MAX_VERTEX_UNIFORM_VECTORS */
+   { 26700, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_ARB */
+   { 26724, 0x000086A4 }, /* GL_MAX_VERTEX_UNITS_OES */
+   { 26748, 0x00008DDE }, /* GL_MAX_VERTEX_VARYING_COMPONENTS_ARB */
+   { 26785, 0x00000D3A }, /* GL_MAX_VIEWPORT_DIMS */
+   { 26806, 0x00008DF1 }, /* GL_MEDIUM_FLOAT */
+   { 26822, 0x00008DF4 }, /* GL_MEDIUM_INT */
+   { 26836, 0x00008007 }, /* GL_MIN */
+   { 26843, 0x0000802E }, /* GL_MINMAX */
+   { 26853, 0x0000802E }, /* GL_MINMAX_EXT */
+   { 26867, 0x0000802F }, /* GL_MINMAX_FORMAT */
+   { 26884, 0x0000802F }, /* GL_MINMAX_FORMAT_EXT */
+   { 26905, 0x00008030 }, /* GL_MINMAX_SINK */
+   { 26920, 0x00008030 }, /* GL_MINMAX_SINK_EXT */
+   { 26939, 0x0000821C }, /* GL_MINOR_VERSION */
+   { 26956, 0x00008007 }, /* GL_MIN_EXT */
+   { 26967, 0x00008904 }, /* GL_MIN_PROGRAM_TEXEL_OFFSET */
+   { 26995, 0x00008370 }, /* GL_MIRRORED_REPEAT */
+   { 27014, 0x00008370 }, /* GL_MIRRORED_REPEAT_ARB */
+   { 27037, 0x00008370 }, /* GL_MIRRORED_REPEAT_IBM */
+   { 27060, 0x00008742 }, /* GL_MIRROR_CLAMP_ATI */
+   { 27080, 0x00008742 }, /* GL_MIRROR_CLAMP_EXT */
+   { 27100, 0x00008912 }, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
+   { 27130, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_ATI */
+   { 27158, 0x00008743 }, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
+   { 27186, 0x00001700 }, /* GL_MODELVIEW */
+   { 27199, 0x00001700 }, /* GL_MODELVIEW0_ARB */
+   { 27217, 0x0000872A }, /* GL_MODELVIEW10_ARB */
+   { 27236, 0x0000872B }, /* GL_MODELVIEW11_ARB */
+   { 27255, 0x0000872C }, /* GL_MODELVIEW12_ARB */
+   { 27274, 0x0000872D }, /* GL_MODELVIEW13_ARB */
+   { 27293, 0x0000872E }, /* GL_MODELVIEW14_ARB */
+   { 27312, 0x0000872F }, /* GL_MODELVIEW15_ARB */
+   { 27331, 0x00008730 }, /* GL_MODELVIEW16_ARB */
+   { 27350, 0x00008731 }, /* GL_MODELVIEW17_ARB */
+   { 27369, 0x00008732 }, /* GL_MODELVIEW18_ARB */
+   { 27388, 0x00008733 }, /* GL_MODELVIEW19_ARB */
+   { 27407, 0x0000850A }, /* GL_MODELVIEW1_ARB */
+   { 27425, 0x00008734 }, /* GL_MODELVIEW20_ARB */
+   { 27444, 0x00008735 }, /* GL_MODELVIEW21_ARB */
+   { 27463, 0x00008736 }, /* GL_MODELVIEW22_ARB */
+   { 27482, 0x00008737 }, /* GL_MODELVIEW23_ARB */
+   { 27501, 0x00008738 }, /* GL_MODELVIEW24_ARB */
+   { 27520, 0x00008739 }, /* GL_MODELVIEW25_ARB */
+   { 27539, 0x0000873A }, /* GL_MODELVIEW26_ARB */
+   { 27558, 0x0000873B }, /* GL_MODELVIEW27_ARB */
+   { 27577, 0x0000873C }, /* GL_MODELVIEW28_ARB */
+   { 27596, 0x0000873D }, /* GL_MODELVIEW29_ARB */
+   { 27615, 0x00008722 }, /* GL_MODELVIEW2_ARB */
+   { 27633, 0x0000873E }, /* GL_MODELVIEW30_ARB */
+   { 27652, 0x0000873F }, /* GL_MODELVIEW31_ARB */
+   { 27671, 0x00008723 }, /* GL_MODELVIEW3_ARB */
+   { 27689, 0x00008724 }, /* GL_MODELVIEW4_ARB */
+   { 27707, 0x00008725 }, /* GL_MODELVIEW5_ARB */
+   { 27725, 0x00008726 }, /* GL_MODELVIEW6_ARB */
+   { 27743, 0x00008727 }, /* GL_MODELVIEW7_ARB */
+   { 27761, 0x00008728 }, /* GL_MODELVIEW8_ARB */
+   { 27779, 0x00008729 }, /* GL_MODELVIEW9_ARB */
+   { 27797, 0x00000BA6 }, /* GL_MODELVIEW_MATRIX */
+   { 27817, 0x0000898D }, /* GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES */
+   { 27859, 0x00008629 }, /* GL_MODELVIEW_PROJECTION_NV */
+   { 27886, 0x00000BA3 }, /* GL_MODELVIEW_STACK_DEPTH */
+   { 27911, 0x00002100 }, /* GL_MODULATE */
+   { 27923, 0x00008744 }, /* GL_MODULATE_ADD_ATI */
+   { 27943, 0x00008745 }, /* GL_MODULATE_SIGNED_ADD_ATI */
+   { 27970, 0x00008746 }, /* GL_MODULATE_SUBTRACT_ATI */
+   { 27995, 0x00000103 }, /* GL_MULT */
+   { 28003, 0x0000809D }, /* GL_MULTISAMPLE */
+   { 28018, 0x000086B2 }, /* GL_MULTISAMPLE_3DFX */
+   { 28038, 0x0000809D }, /* GL_MULTISAMPLE_ARB */
+   { 28057, 0x20000000 }, /* GL_MULTISAMPLE_BIT */
+   { 28076, 0x20000000 }, /* GL_MULTISAMPLE_BIT_3DFX */
+   { 28100, 0x20000000 }, /* GL_MULTISAMPLE_BIT_ARB */
+   { 28123, 0x00008534 }, /* GL_MULTISAMPLE_FILTER_HINT_NV */
+   { 28153, 0x00002A25 }, /* GL_N3F_V3F */
+   { 28164, 0x00000D70 }, /* GL_NAME_STACK_DEPTH */
+   { 28184, 0x0000150E }, /* GL_NAND */
+   { 28192, 0x00002600 }, /* GL_NEAREST */
+   { 28203, 0x0000844E }, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
+   { 28234, 0x0000844D }, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
+   { 28266, 0x00002702 }, /* GL_NEAREST_MIPMAP_LINEAR */
+   { 28291, 0x00002700 }, /* GL_NEAREST_MIPMAP_NEAREST */
+   { 28317, 0x00000200 }, /* GL_NEVER */
+   { 28326, 0x00001102 }, /* GL_NICEST */
+   { 28336, 0x00000000 }, /* GL_NONE */
+   { 28344, 0x00000000 }, /* GL_NONE_OES */
+   { 28356, 0x00001505 }, /* GL_NOOP */
+   { 28364, 0x00001508 }, /* GL_NOR */
+   { 28371, 0x00000BA1 }, /* GL_NORMALIZE */
+   { 28384, 0x00008075 }, /* GL_NORMAL_ARRAY */
+   { 28400, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
+   { 28431, 0x00008897 }, /* GL_NORMAL_ARRAY_BUFFER_BINDING_ARB */
+   { 28466, 0x0000808F }, /* GL_NORMAL_ARRAY_POINTER */
+   { 28490, 0x0000807F }, /* GL_NORMAL_ARRAY_STRIDE */
+   { 28513, 0x0000807E }, /* GL_NORMAL_ARRAY_TYPE */
+   { 28534, 0x00008511 }, /* GL_NORMAL_MAP */
+   { 28548, 0x00008511 }, /* GL_NORMAL_MAP_ARB */
+   { 28566, 0x00008511 }, /* GL_NORMAL_MAP_NV */
+   { 28583, 0x00008511 }, /* GL_NORMAL_MAP_OES */
+   { 28601, 0x00000205 }, /* GL_NOTEQUAL */
+   { 28613, 0x00000000 }, /* GL_NO_ERROR */
+   { 28625, 0x00008261 }, /* GL_NO_RESET_NOTIFICATION_ARB */
+   { 28654, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
+   { 28688, 0x000086A2 }, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB */
+   { 28726, 0x0000821D }, /* GL_NUM_EXTENSIONS */
+   { 28744, 0x000087FE }, /* GL_NUM_PROGRAM_BINARY_FORMATS */
+   { 28774, 0x000087FE }, /* GL_NUM_PROGRAM_BINARY_FORMATS_OES */
+   { 28808, 0x00008DF9 }, /* GL_NUM_SHADER_BINARY_FORMATS */
+   { 28837, 0x00008B89 }, /* GL_OBJECT_ACTIVE_ATTRIBUTES_ARB */
+   { 28869, 0x00008B8A }, /* GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB */
+   { 28911, 0x00008B86 }, /* GL_OBJECT_ACTIVE_UNIFORMS_ARB */
+   { 28941, 0x00008B87 }, /* GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB */
+   { 28981, 0x00008B85 }, /* GL_OBJECT_ATTACHED_OBJECTS_ARB */
+   { 29012, 0x00008B81 }, /* GL_OBJECT_COMPILE_STATUS_ARB */
+   { 29041, 0x00008B80 }, /* GL_OBJECT_DELETE_STATUS_ARB */
+   { 29069, 0x00008B84 }, /* GL_OBJECT_INFO_LOG_LENGTH_ARB */
+   { 29099, 0x00002401 }, /* GL_OBJECT_LINEAR */
+   { 29116, 0x00008B82 }, /* GL_OBJECT_LINK_STATUS_ARB */
+   { 29142, 0x00002501 }, /* GL_OBJECT_PLANE */
+   { 29158, 0x00008B88 }, /* GL_OBJECT_SHADER_SOURCE_LENGTH_ARB */
+   { 29193, 0x00008B4F }, /* GL_OBJECT_SUBTYPE_ARB */
+   { 29215, 0x00009112 }, /* GL_OBJECT_TYPE */
+   { 29230, 0x00008B4E }, /* GL_OBJECT_TYPE_ARB */
+   { 29249, 0x00008B83 }, /* GL_OBJECT_VALIDATE_STATUS_ARB */
+   { 29279, 0x00008165 }, /* GL_OCCLUSION_TEST_HP */
+   { 29300, 0x00008166 }, /* GL_OCCLUSION_TEST_RESULT_HP */
+   { 29328, 0x00000001 }, /* GL_ONE */
+   { 29335, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA */
+   { 29363, 0x00008004 }, /* GL_ONE_MINUS_CONSTANT_ALPHA_EXT */
+   { 29395, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR */
+   { 29423, 0x00008002 }, /* GL_ONE_MINUS_CONSTANT_COLOR_EXT */
+   { 29455, 0x00000305 }, /* GL_ONE_MINUS_DST_ALPHA */
+   { 29478, 0x00000307 }, /* GL_ONE_MINUS_DST_COLOR */
+   { 29501, 0x00000303 }, /* GL_ONE_MINUS_SRC_ALPHA */
+   { 29524, 0x00000301 }, /* GL_ONE_MINUS_SRC_COLOR */
+   { 29547, 0x00008598 }, /* GL_OPERAND0_ALPHA */
+   { 29565, 0x00008598 }, /* GL_OPERAND0_ALPHA_ARB */
+   { 29587, 0x00008598 }, /* GL_OPERAND0_ALPHA_EXT */
+   { 29609, 0x00008590 }, /* GL_OPERAND0_RGB */
+   { 29625, 0x00008590 }, /* GL_OPERAND0_RGB_ARB */
+   { 29645, 0x00008590 }, /* GL_OPERAND0_RGB_EXT */
+   { 29665, 0x00008599 }, /* GL_OPERAND1_ALPHA */
+   { 29683, 0x00008599 }, /* GL_OPERAND1_ALPHA_ARB */
+   { 29705, 0x00008599 }, /* GL_OPERAND1_ALPHA_EXT */
+   { 29727, 0x00008591 }, /* GL_OPERAND1_RGB */
+   { 29743, 0x00008591 }, /* GL_OPERAND1_RGB_ARB */
+   { 29763, 0x00008591 }, /* GL_OPERAND1_RGB_EXT */
+   { 29783, 0x0000859A }, /* GL_OPERAND2_ALPHA */
+   { 29801, 0x0000859A }, /* GL_OPERAND2_ALPHA_ARB */
+   { 29823, 0x0000859A }, /* GL_OPERAND2_ALPHA_EXT */
+   { 29845, 0x00008592 }, /* GL_OPERAND2_RGB */
+   { 29861, 0x00008592 }, /* GL_OPERAND2_RGB_ARB */
+   { 29881, 0x00008592 }, /* GL_OPERAND2_RGB_EXT */
+   { 29901, 0x0000859B }, /* GL_OPERAND3_ALPHA_NV */
+   { 29922, 0x00008593 }, /* GL_OPERAND3_RGB_NV */
+   { 29941, 0x00001507 }, /* GL_OR */
+   { 29947, 0x00000A01 }, /* GL_ORDER */
+   { 29956, 0x0000150D }, /* GL_OR_INVERTED */
+   { 29971, 0x0000150B }, /* GL_OR_REVERSE */
+   { 29985, 0x00000505 }, /* GL_OUT_OF_MEMORY */
+   { 30002, 0x00000D05 }, /* GL_PACK_ALIGNMENT */
+   { 30020, 0x0000806C }, /* GL_PACK_IMAGE_HEIGHT */
+   { 30041, 0x00008758 }, /* GL_PACK_INVERT_MESA */
+   { 30061, 0x00000D01 }, /* GL_PACK_LSB_FIRST */
+   { 30079, 0x00000D02 }, /* GL_PACK_ROW_LENGTH */
+   { 30098, 0x0000806B }, /* GL_PACK_SKIP_IMAGES */
+   { 30118, 0x00000D04 }, /* GL_PACK_SKIP_PIXELS */
+   { 30138, 0x00000D03 }, /* GL_PACK_SKIP_ROWS */
+   { 30156, 0x00000D00 }, /* GL_PACK_SWAP_BYTES */
+   { 30175, 0x00008B92 }, /* GL_PALETTE4_R5_G6_B5_OES */
+   { 30200, 0x00008B94 }, /* GL_PALETTE4_RGB5_A1_OES */
+   { 30224, 0x00008B90 }, /* GL_PALETTE4_RGB8_OES */
+   { 30245, 0x00008B93 }, /* GL_PALETTE4_RGBA4_OES */
+   { 30267, 0x00008B91 }, /* GL_PALETTE4_RGBA8_OES */
+   { 30289, 0x00008B97 }, /* GL_PALETTE8_R5_G6_B5_OES */
+   { 30314, 0x00008B99 }, /* GL_PALETTE8_RGB5_A1_OES */
+   { 30338, 0x00008B95 }, /* GL_PALETTE8_RGB8_OES */
+   { 30359, 0x00008B98 }, /* GL_PALETTE8_RGBA4_OES */
+   { 30381, 0x00008B96 }, /* GL_PALETTE8_RGBA8_OES */
+   { 30403, 0x00000700 }, /* GL_PASS_THROUGH_TOKEN */
+   { 30425, 0x00000C50 }, /* GL_PERSPECTIVE_CORRECTION_HINT */
+   { 30456, 0x00000C79 }, /* GL_PIXEL_MAP_A_TO_A */
+   { 30476, 0x00000CB9 }, /* GL_PIXEL_MAP_A_TO_A_SIZE */
+   { 30501, 0x00000C78 }, /* GL_PIXEL_MAP_B_TO_B */
+   { 30521, 0x00000CB8 }, /* GL_PIXEL_MAP_B_TO_B_SIZE */
+   { 30546, 0x00000C77 }, /* GL_PIXEL_MAP_G_TO_G */
+   { 30566, 0x00000CB7 }, /* GL_PIXEL_MAP_G_TO_G_SIZE */
+   { 30591, 0x00000C75 }, /* GL_PIXEL_MAP_I_TO_A */
+   { 30611, 0x00000CB5 }, /* GL_PIXEL_MAP_I_TO_A_SIZE */
+   { 30636, 0x00000C74 }, /* GL_PIXEL_MAP_I_TO_B */
+   { 30656, 0x00000CB4 }, /* GL_PIXEL_MAP_I_TO_B_SIZE */
+   { 30681, 0x00000C73 }, /* GL_PIXEL_MAP_I_TO_G */
+   { 30701, 0x00000CB3 }, /* GL_PIXEL_MAP_I_TO_G_SIZE */
+   { 30726, 0x00000C70 }, /* GL_PIXEL_MAP_I_TO_I */
+   { 30746, 0x00000CB0 }, /* GL_PIXEL_MAP_I_TO_I_SIZE */
+   { 30771, 0x00000C72 }, /* GL_PIXEL_MAP_I_TO_R */
+   { 30791, 0x00000CB2 }, /* GL_PIXEL_MAP_I_TO_R_SIZE */
+   { 30816, 0x00000C76 }, /* GL_PIXEL_MAP_R_TO_R */
+   { 30836, 0x00000CB6 }, /* GL_PIXEL_MAP_R_TO_R_SIZE */
+   { 30861, 0x00000C71 }, /* GL_PIXEL_MAP_S_TO_S */
+   { 30881, 0x00000CB1 }, /* GL_PIXEL_MAP_S_TO_S_SIZE */
+   { 30906, 0x00000020 }, /* GL_PIXEL_MODE_BIT */
+   { 30924, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER */
+   { 30945, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING */
+   { 30974, 0x000088ED }, /* GL_PIXEL_PACK_BUFFER_BINDING_EXT */
+   { 31007, 0x000088EB }, /* GL_PIXEL_PACK_BUFFER_EXT */
+   { 31032, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER */
+   { 31055, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
+   { 31086, 0x000088EF }, /* GL_PIXEL_UNPACK_BUFFER_BINDING_EXT */
+   { 31121, 0x000088EC }, /* GL_PIXEL_UNPACK_BUFFER_EXT */
+   { 31148, 0x00001B00 }, /* GL_POINT */
+   { 31157, 0x00000000 }, /* GL_POINTS */
+   { 31167, 0x00000002 }, /* GL_POINT_BIT */
+   { 31180, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION */
+   { 31210, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_ARB */
+   { 31244, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_EXT */
+   { 31278, 0x00008129 }, /* GL_POINT_DISTANCE_ATTENUATION_SGIS */
+   { 31313, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE */
+   { 31342, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_ARB */
+   { 31375, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_EXT */
+   { 31408, 0x00008128 }, /* GL_POINT_FADE_THRESHOLD_SIZE_SGIS */
+   { 31442, 0x00000B11 }, /* GL_POINT_SIZE */
+   { 31456, 0x00008B9F }, /* GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES */
+   { 31495, 0x00008B9C }, /* GL_POINT_SIZE_ARRAY_OES */
+   { 31519, 0x0000898C }, /* GL_POINT_SIZE_ARRAY_POINTER_OES */
+   { 31551, 0x0000898B }, /* GL_POINT_SIZE_ARRAY_STRIDE_OES */
+   { 31582, 0x0000898A }, /* GL_POINT_SIZE_ARRAY_TYPE_OES */
+   { 31611, 0x00000B13 }, /* GL_POINT_SIZE_GRANULARITY */
+   { 31637, 0x00008127 }, /* GL_POINT_SIZE_MAX */
+   { 31655, 0x00008127 }, /* GL_POINT_SIZE_MAX_ARB */
+   { 31677, 0x00008127 }, /* GL_POINT_SIZE_MAX_EXT */
+   { 31699, 0x00008127 }, /* GL_POINT_SIZE_MAX_SGIS */
+   { 31722, 0x00008126 }, /* GL_POINT_SIZE_MIN */
+   { 31740, 0x00008126 }, /* GL_POINT_SIZE_MIN_ARB */
+   { 31762, 0x00008126 }, /* GL_POINT_SIZE_MIN_EXT */
+   { 31784, 0x00008126 }, /* GL_POINT_SIZE_MIN_SGIS */
+   { 31807, 0x00000B12 }, /* GL_POINT_SIZE_RANGE */
+   { 31827, 0x00000B10 }, /* GL_POINT_SMOOTH */
+   { 31843, 0x00000C51 }, /* GL_POINT_SMOOTH_HINT */
+   { 31864, 0x00008861 }, /* GL_POINT_SPRITE */
+   { 31880, 0x00008861 }, /* GL_POINT_SPRITE_ARB */
+   { 31900, 0x00008CA0 }, /* GL_POINT_SPRITE_COORD_ORIGIN */
+   { 31929, 0x00008861 }, /* GL_POINT_SPRITE_NV */
+   { 31948, 0x00008861 }, /* GL_POINT_SPRITE_OES */
+   { 31968, 0x00008863 }, /* GL_POINT_SPRITE_R_MODE_NV */
+   { 31994, 0x00000701 }, /* GL_POINT_TOKEN */
+   { 32009, 0x00000009 }, /* GL_POLYGON */
+   { 32020, 0x00000008 }, /* GL_POLYGON_BIT */
+   { 32035, 0x00000B40 }, /* GL_POLYGON_MODE */
+   { 32051, 0x00008039 }, /* GL_POLYGON_OFFSET_BIAS */
+   { 32074, 0x00008038 }, /* GL_POLYGON_OFFSET_FACTOR */
+   { 32099, 0x00008037 }, /* GL_POLYGON_OFFSET_FILL */
+   { 32122, 0x00002A02 }, /* GL_POLYGON_OFFSET_LINE */
+   { 32145, 0x00002A01 }, /* GL_POLYGON_OFFSET_POINT */
+   { 32169, 0x00002A00 }, /* GL_POLYGON_OFFSET_UNITS */
+   { 32193, 0x00000B41 }, /* GL_POLYGON_SMOOTH */
+   { 32211, 0x00000C53 }, /* GL_POLYGON_SMOOTH_HINT */
+   { 32234, 0x00000B42 }, /* GL_POLYGON_STIPPLE */
+   { 32253, 0x00000010 }, /* GL_POLYGON_STIPPLE_BIT */
+   { 32276, 0x00000703 }, /* GL_POLYGON_TOKEN */
+   { 32293, 0x00001203 }, /* GL_POSITION */
+   { 32305, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
+   { 32337, 0x000080BB }, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI */
+   { 32373, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
+   { 32406, 0x000080B7 }, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI */
+   { 32443, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
+   { 32474, 0x000080BA }, /* GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI */
+   { 32509, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
+   { 32541, 0x000080B6 }, /* GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI */
+   { 32577, 0x000080D2 }, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
+   { 32610, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
+   { 32642, 0x000080B9 }, /* GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI */
+   { 32678, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
+   { 32711, 0x000080B5 }, /* GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI */
+   { 32748, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS */
+   { 32778, 0x000080B8 }, /* GL_POST_COLOR_MATRIX_RED_BIAS_SGI */
+   { 32812, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE */
+   { 32843, 0x000080B4 }, /* GL_POST_COLOR_MATRIX_RED_SCALE_SGI */
+   { 32878, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
+   { 32909, 0x00008023 }, /* GL_POST_CONVOLUTION_ALPHA_BIAS_EXT */
+   { 32944, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
+   { 32976, 0x0000801F }, /* GL_POST_CONVOLUTION_ALPHA_SCALE_EXT */
+   { 33012, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS */
+   { 33042, 0x00008022 }, /* GL_POST_CONVOLUTION_BLUE_BIAS_EXT */
+   { 33076, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE */
+   { 33107, 0x0000801E }, /* GL_POST_CONVOLUTION_BLUE_SCALE_EXT */
+   { 33142, 0x000080D1 }, /* GL_POST_CONVOLUTION_COLOR_TABLE */
+   { 33174, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS */
+   { 33205, 0x00008021 }, /* GL_POST_CONVOLUTION_GREEN_BIAS_EXT */
+   { 33240, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE */
+   { 33272, 0x0000801D }, /* GL_POST_CONVOLUTION_GREEN_SCALE_EXT */
+   { 33308, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS */
+   { 33337, 0x00008020 }, /* GL_POST_CONVOLUTION_RED_BIAS_EXT */
+   { 33370, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE */
+   { 33400, 0x0000801C }, /* GL_POST_CONVOLUTION_RED_SCALE_EXT */
+   { 33434, 0x0000817B }, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
+   { 33473, 0x00008179 }, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
+   { 33506, 0x0000817C }, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
+   { 33546, 0x0000817A }, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
+   { 33580, 0x00008578 }, /* GL_PREVIOUS */
+   { 33592, 0x00008578 }, /* GL_PREVIOUS_ARB */
+   { 33608, 0x00008578 }, /* GL_PREVIOUS_EXT */
+   { 33624, 0x00008577 }, /* GL_PRIMARY_COLOR */
+   { 33641, 0x00008577 }, /* GL_PRIMARY_COLOR_ARB */
+   { 33662, 0x00008577 }, /* GL_PRIMARY_COLOR_EXT */
+   { 33683, 0x00008C87 }, /* GL_PRIMITIVES_GENERATED */
+   { 33707, 0x00008C87 }, /* GL_PRIMITIVES_GENERATED_EXT */
+   { 33735, 0x00008F9D }, /* GL_PRIMITIVE_RESTART */
+   { 33756, 0x00008F9E }, /* GL_PRIMITIVE_RESTART_INDEX */
+   { 33783, 0x00008559 }, /* GL_PRIMITIVE_RESTART_INDEX_NV */
+   { 33813, 0x00008558 }, /* GL_PRIMITIVE_RESTART_NV */
+   { 33837, 0x000088B0 }, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
+   { 33870, 0x00008805 }, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
+   { 33902, 0x000088AC }, /* GL_PROGRAM_ATTRIBS_ARB */
+   { 33925, 0x000087FF }, /* GL_PROGRAM_BINARY_FORMATS */
+   { 33951, 0x000087FF }, /* GL_PROGRAM_BINARY_FORMATS_OES */
+   { 33981, 0x00008741 }, /* GL_PROGRAM_BINARY_LENGTH */
+   { 34006, 0x00008741 }, /* GL_PROGRAM_BINARY_LENGTH_OES */
+   { 34035, 0x00008257 }, /* GL_PROGRAM_BINARY_RETRIEVABLE_HINT */
+   { 34070, 0x00008677 }, /* GL_PROGRAM_BINDING_ARB */
+   { 34093, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_ARB */
+   { 34123, 0x0000864B }, /* GL_PROGRAM_ERROR_POSITION_NV */
+   { 34152, 0x00008874 }, /* GL_PROGRAM_ERROR_STRING_ARB */
+   { 34180, 0x00008876 }, /* GL_PROGRAM_FORMAT_ARB */
+   { 34202, 0x00008875 }, /* GL_PROGRAM_FORMAT_ASCII_ARB */
+   { 34230, 0x000088A0 }, /* GL_PROGRAM_INSTRUCTIONS_ARB */
+   { 34258, 0x00008627 }, /* GL_PROGRAM_LENGTH_ARB */
+   { 34280, 0x00008627 }, /* GL_PROGRAM_LENGTH_NV */
+   { 34301, 0x000088B2 }, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+   { 34341, 0x00008808 }, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+   { 34380, 0x000088AE }, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
+   { 34410, 0x000088A2 }, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+   { 34445, 0x000088AA }, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
+   { 34478, 0x000088A6 }, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
+   { 34512, 0x0000880A }, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+   { 34551, 0x00008809 }, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+   { 34590, 0x00008B40 }, /* GL_PROGRAM_OBJECT_ARB */
+   { 34612, 0x000088A8 }, /* GL_PROGRAM_PARAMETERS_ARB */
+   { 34638, 0x00008644 }, /* GL_PROGRAM_PARAMETER_NV */
+   { 34662, 0x00008642 }, /* GL_PROGRAM_POINT_SIZE */
+   { 34684, 0x00008642 }, /* GL_PROGRAM_POINT_SIZE_ARB */
+   { 34710, 0x00008647 }, /* GL_PROGRAM_RESIDENT_NV */
+   { 34733, 0x00008628 }, /* GL_PROGRAM_STRING_ARB */
+   { 34755, 0x00008628 }, /* GL_PROGRAM_STRING_NV */
+   { 34776, 0x00008646 }, /* GL_PROGRAM_TARGET_NV */
+   { 34797, 0x000088A4 }, /* GL_PROGRAM_TEMPORARIES_ARB */
+   { 34824, 0x00008807 }, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
+   { 34856, 0x00008806 }, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
+   { 34888, 0x000088B6 }, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
+   { 34923, 0x00001701 }, /* GL_PROJECTION */
+   { 34937, 0x00000BA7 }, /* GL_PROJECTION_MATRIX */
+   { 34958, 0x0000898E }, /* GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES */
+   { 35001, 0x00000BA4 }, /* GL_PROJECTION_STACK_DEPTH */
+   { 35027, 0x00008E4F }, /* GL_PROVOKING_VERTEX */
+   { 35047, 0x00008E4F }, /* GL_PROVOKING_VERTEX_EXT */
+   { 35071, 0x000080D3 }, /* GL_PROXY_COLOR_TABLE */
+   { 35092, 0x00008025 }, /* GL_PROXY_HISTOGRAM */
+   { 35111, 0x00008025 }, /* GL_PROXY_HISTOGRAM_EXT */
+   { 35134, 0x000080D5 }, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
+   { 35173, 0x000080D4 }, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
+   { 35211, 0x00008063 }, /* GL_PROXY_TEXTURE_1D */
+   { 35231, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY */
+   { 35257, 0x00008C19 }, /* GL_PROXY_TEXTURE_1D_ARRAY_EXT */
+   { 35287, 0x00008063 }, /* GL_PROXY_TEXTURE_1D_EXT */
+   { 35311, 0x00008064 }, /* GL_PROXY_TEXTURE_2D */
+   { 35331, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY */
+   { 35357, 0x00008C1B }, /* GL_PROXY_TEXTURE_2D_ARRAY_EXT */
+   { 35387, 0x00008064 }, /* GL_PROXY_TEXTURE_2D_EXT */
+   { 35411, 0x00008070 }, /* GL_PROXY_TEXTURE_3D */
+   { 35431, 0x000080BD }, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
+   { 35464, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP */
+   { 35490, 0x0000851B }, /* GL_PROXY_TEXTURE_CUBE_MAP_ARB */
+   { 35520, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE */
+   { 35547, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_ARB */
+   { 35578, 0x000084F7 }, /* GL_PROXY_TEXTURE_RECTANGLE_NV */
+   { 35608, 0x00008A1D }, /* GL_PURGEABLE_APPLE */
+   { 35627, 0x00002003 }, /* GL_Q */
+   { 35632, 0x00001209 }, /* GL_QUADRATIC_ATTENUATION */
+   { 35657, 0x00000007 }, /* GL_QUADS */
+   { 35666, 0x00008E4C }, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION */
+   { 35710, 0x00008E4C }, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT */
+   { 35758, 0x00008614 }, /* GL_QUAD_MESH_SUN */
+   { 35775, 0x00000008 }, /* GL_QUAD_STRIP */
+   { 35789, 0x00008E16 }, /* GL_QUERY_BY_REGION_NO_WAIT */
+   { 35816, 0x00008E16 }, /* GL_QUERY_BY_REGION_NO_WAIT_NV */
+   { 35846, 0x00008E15 }, /* GL_QUERY_BY_REGION_WAIT */
+   { 35870, 0x00008E15 }, /* GL_QUERY_BY_REGION_WAIT_NV */
+   { 35897, 0x00008864 }, /* GL_QUERY_COUNTER_BITS */
+   { 35919, 0x00008864 }, /* GL_QUERY_COUNTER_BITS_ARB */
+   { 35945, 0x00008E14 }, /* GL_QUERY_NO_WAIT */
+   { 35962, 0x00008E14 }, /* GL_QUERY_NO_WAIT_NV */
+   { 35982, 0x00008866 }, /* GL_QUERY_RESULT */
+   { 35998, 0x00008866 }, /* GL_QUERY_RESULT_ARB */
+   { 36018, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE */
+   { 36044, 0x00008867 }, /* GL_QUERY_RESULT_AVAILABLE_ARB */
+   { 36074, 0x00008E13 }, /* GL_QUERY_WAIT */
+   { 36088, 0x00008E13 }, /* GL_QUERY_WAIT_NV */
+   { 36105, 0x00002002 }, /* GL_R */
+   { 36110, 0x00008C3A }, /* GL_R11F_G11F_B10F */
+   { 36128, 0x00008F98 }, /* GL_R16_SNORM */
+   { 36141, 0x00002A10 }, /* GL_R3_G3_B2 */
+   { 36153, 0x00008F94 }, /* GL_R8_SNORM */
+   { 36165, 0x00008C89 }, /* GL_RASTERIZER_DISCARD */
+   { 36187, 0x00008C89 }, /* GL_RASTERIZER_DISCARD_EXT */
+   { 36213, 0x00019262 }, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
+   { 36246, 0x00000C02 }, /* GL_READ_BUFFER */
+   { 36261, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER */
+   { 36281, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING */
+   { 36309, 0x00008CAA }, /* GL_READ_FRAMEBUFFER_BINDING_EXT */
+   { 36341, 0x00008CA8 }, /* GL_READ_FRAMEBUFFER_EXT */
+   { 36365, 0x000088B8 }, /* GL_READ_ONLY */
+   { 36378, 0x000088B8 }, /* GL_READ_ONLY_ARB */
+   { 36395, 0x000088BA }, /* GL_READ_WRITE */
+   { 36409, 0x000088BA }, /* GL_READ_WRITE_ARB */
+   { 36427, 0x00001903 }, /* GL_RED */
+   { 36434, 0x00008016 }, /* GL_REDUCE */
+   { 36444, 0x00008016 }, /* GL_REDUCE_EXT */
+   { 36458, 0x00000D15 }, /* GL_RED_BIAS */
+   { 36470, 0x00000D52 }, /* GL_RED_BITS */
+   { 36482, 0x00008D94 }, /* GL_RED_INTEGER */
+   { 36497, 0x00008D94 }, /* GL_RED_INTEGER_EXT */
+   { 36516, 0x00000D14 }, /* GL_RED_SCALE */
+   { 36529, 0x00008F90 }, /* GL_RED_SNORM */
+   { 36542, 0x00008512 }, /* GL_REFLECTION_MAP */
+   { 36560, 0x00008512 }, /* GL_REFLECTION_MAP_ARB */
+   { 36582, 0x00008512 }, /* GL_REFLECTION_MAP_NV */
+   { 36603, 0x00008512 }, /* GL_REFLECTION_MAP_OES */
+   { 36625, 0x00008A19 }, /* GL_RELEASED_APPLE */
+   { 36643, 0x00001C00 }, /* GL_RENDER */
+   { 36653, 0x00008D41 }, /* GL_RENDERBUFFER */
+   { 36669, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE */
+   { 36696, 0x00008D53 }, /* GL_RENDERBUFFER_ALPHA_SIZE_OES */
+   { 36727, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING */
+   { 36751, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_EXT */
+   { 36779, 0x00008CA7 }, /* GL_RENDERBUFFER_BINDING_OES */
+   { 36807, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE */
+   { 36833, 0x00008D52 }, /* GL_RENDERBUFFER_BLUE_SIZE_OES */
+   { 36863, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE */
+   { 36890, 0x00008D54 }, /* GL_RENDERBUFFER_DEPTH_SIZE_OES */
+   { 36921, 0x00008D41 }, /* GL_RENDERBUFFER_EXT */
+   { 36941, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE */
+   { 36968, 0x00008D51 }, /* GL_RENDERBUFFER_GREEN_SIZE_OES */
+   { 36999, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT */
+   { 37022, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_EXT */
+   { 37049, 0x00008D43 }, /* GL_RENDERBUFFER_HEIGHT_OES */
+   { 37076, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
+   { 37108, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_EXT */
+   { 37144, 0x00008D44 }, /* GL_RENDERBUFFER_INTERNAL_FORMAT_OES */
+   { 37180, 0x00008D41 }, /* GL_RENDERBUFFER_OES */
+   { 37200, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE */
+   { 37225, 0x00008D50 }, /* GL_RENDERBUFFER_RED_SIZE_OES */
+   { 37254, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES */
+   { 37278, 0x00008CAB }, /* GL_RENDERBUFFER_SAMPLES_EXT */
+   { 37306, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE */
+   { 37335, 0x00008D55 }, /* GL_RENDERBUFFER_STENCIL_SIZE_OES */
+   { 37368, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH */
+   { 37390, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_EXT */
+   { 37416, 0x00008D42 }, /* GL_RENDERBUFFER_WIDTH_OES */
+   { 37442, 0x00001F01 }, /* GL_RENDERER */
+   { 37454, 0x00000C40 }, /* GL_RENDER_MODE */
+   { 37469, 0x00002901 }, /* GL_REPEAT */
+   { 37479, 0x00001E01 }, /* GL_REPLACE */
+   { 37490, 0x00008062 }, /* GL_REPLACE_EXT */
+   { 37505, 0x00008153 }, /* GL_REPLICATE_BORDER_HP */
+   { 37528, 0x00008D68 }, /* GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES */
+   { 37564, 0x0000803A }, /* GL_RESCALE_NORMAL */
+   { 37582, 0x0000803A }, /* GL_RESCALE_NORMAL_EXT */
+   { 37604, 0x00008256 }, /* GL_RESET_NOTIFICATION_STRATEGY_ARB */
+   { 37639, 0x00008A1B }, /* GL_RETAINED_APPLE */
+   { 37657, 0x00000102 }, /* GL_RETURN */
+   { 37667, 0x00008F99 }, /* GL_RG16_SNORM */
+   { 37681, 0x00008F95 }, /* GL_RG8_SNORM */
+   { 37694, 0x00001907 }, /* GL_RGB */
+   { 37701, 0x00008052 }, /* GL_RGB10 */
+   { 37710, 0x00008059 }, /* GL_RGB10_A2 */
+   { 37722, 0x0000906F }, /* GL_RGB10_A2UI */
+   { 37736, 0x00008059 }, /* GL_RGB10_A2_EXT */
+   { 37752, 0x00008052 }, /* GL_RGB10_EXT */
+   { 37765, 0x00008053 }, /* GL_RGB12 */
+   { 37774, 0x00008053 }, /* GL_RGB12_EXT */
+   { 37787, 0x00008054 }, /* GL_RGB16 */
+   { 37796, 0x0000881B }, /* GL_RGB16F */
+   { 37806, 0x00008D89 }, /* GL_RGB16I */
+   { 37816, 0x00008D89 }, /* GL_RGB16I_EXT */
+   { 37830, 0x00008D77 }, /* GL_RGB16UI */
+   { 37841, 0x00008D77 }, /* GL_RGB16UI_EXT */
+   { 37856, 0x00008054 }, /* GL_RGB16_EXT */
+   { 37869, 0x00008F9A }, /* GL_RGB16_SNORM */
+   { 37884, 0x0000804E }, /* GL_RGB2_EXT */
+   { 37896, 0x00008815 }, /* GL_RGB32F */
+   { 37906, 0x00008D83 }, /* GL_RGB32I */
+   { 37916, 0x00008D83 }, /* GL_RGB32I_EXT */
+   { 37930, 0x00008D71 }, /* GL_RGB32UI */
+   { 37941, 0x00008D71 }, /* GL_RGB32UI_EXT */
+   { 37956, 0x0000804F }, /* GL_RGB4 */
+   { 37964, 0x0000804F }, /* GL_RGB4_EXT */
+   { 37976, 0x000083A1 }, /* GL_RGB4_S3TC */
+   { 37989, 0x00008050 }, /* GL_RGB5 */
+   { 37997, 0x00008D62 }, /* GL_RGB565 */
+   { 38007, 0x00008D62 }, /* GL_RGB565_OES */
+   { 38021, 0x00008057 }, /* GL_RGB5_A1 */
+   { 38032, 0x00008057 }, /* GL_RGB5_A1_EXT */
+   { 38047, 0x00008057 }, /* GL_RGB5_A1_OES */
+   { 38062, 0x00008050 }, /* GL_RGB5_EXT */
+   { 38074, 0x00008051 }, /* GL_RGB8 */
+   { 38082, 0x00008D8F }, /* GL_RGB8I */
+   { 38091, 0x00008D8F }, /* GL_RGB8I_EXT */
+   { 38104, 0x00008D7D }, /* GL_RGB8UI */
+   { 38114, 0x00008D7D }, /* GL_RGB8UI_EXT */
+   { 38128, 0x00008051 }, /* GL_RGB8_EXT */
+   { 38140, 0x00008051 }, /* GL_RGB8_OES */
+   { 38152, 0x00008F96 }, /* GL_RGB8_SNORM */
+   { 38166, 0x00008C3D }, /* GL_RGB9_E5 */
+   { 38177, 0x00001908 }, /* GL_RGBA */
+   { 38185, 0x0000805A }, /* GL_RGBA12 */
+   { 38195, 0x0000805A }, /* GL_RGBA12_EXT */
+   { 38209, 0x0000805B }, /* GL_RGBA16 */
+   { 38219, 0x0000881A }, /* GL_RGBA16F */
+   { 38230, 0x00008D88 }, /* GL_RGBA16I */
+   { 38241, 0x00008D88 }, /* GL_RGBA16I_EXT */
+   { 38256, 0x00008D76 }, /* GL_RGBA16UI */
+   { 38268, 0x00008D76 }, /* GL_RGBA16UI_EXT */
+   { 38284, 0x0000805B }, /* GL_RGBA16_EXT */
+   { 38298, 0x00008F9B }, /* GL_RGBA16_SNORM */
+   { 38314, 0x00008055 }, /* GL_RGBA2 */
+   { 38323, 0x00008055 }, /* GL_RGBA2_EXT */
+   { 38336, 0x00008814 }, /* GL_RGBA32F */
+   { 38347, 0x00008D82 }, /* GL_RGBA32I */
+   { 38358, 0x00008D82 }, /* GL_RGBA32I_EXT */
+   { 38373, 0x00008D70 }, /* GL_RGBA32UI */
+   { 38385, 0x00008D70 }, /* GL_RGBA32UI_EXT */
+   { 38401, 0x00008056 }, /* GL_RGBA4 */
+   { 38410, 0x000083A5 }, /* GL_RGBA4_DXT5_S3TC */
+   { 38429, 0x00008056 }, /* GL_RGBA4_EXT */
+   { 38442, 0x00008056 }, /* GL_RGBA4_OES */
+   { 38455, 0x000083A3 }, /* GL_RGBA4_S3TC */
+   { 38469, 0x00008058 }, /* GL_RGBA8 */
+   { 38478, 0x00008D8E }, /* GL_RGBA8I */
+   { 38488, 0x00008D8E }, /* GL_RGBA8I_EXT */
+   { 38502, 0x00008D7C }, /* GL_RGBA8UI */
+   { 38513, 0x00008D7C }, /* GL_RGBA8UI_EXT */
+   { 38528, 0x00008058 }, /* GL_RGBA8_EXT */
+   { 38541, 0x00008058 }, /* GL_RGBA8_OES */
+   { 38554, 0x00008F97 }, /* GL_RGBA8_SNORM */
+   { 38569, 0x000083A4 }, /* GL_RGBA_DXT5_S3TC */
+   { 38587, 0x00008820 }, /* GL_RGBA_FLOAT_MODE_ARB */
+   { 38610, 0x00008D99 }, /* GL_RGBA_INTEGER */
+   { 38626, 0x00008D99 }, /* GL_RGBA_INTEGER_EXT */
+   { 38646, 0x00008D9E }, /* GL_RGBA_INTEGER_MODE_EXT */
+   { 38671, 0x00000C31 }, /* GL_RGBA_MODE */
+   { 38684, 0x000083A2 }, /* GL_RGBA_S3TC */
+   { 38697, 0x00008F93 }, /* GL_RGBA_SNORM */
+   { 38711, 0x00008D98 }, /* GL_RGB_INTEGER */
+   { 38726, 0x00008D98 }, /* GL_RGB_INTEGER_EXT */
+   { 38745, 0x000083A0 }, /* GL_RGB_S3TC */
+   { 38757, 0x00008573 }, /* GL_RGB_SCALE */
+   { 38770, 0x00008573 }, /* GL_RGB_SCALE_ARB */
+   { 38787, 0x00008573 }, /* GL_RGB_SCALE_EXT */
+   { 38804, 0x00008F92 }, /* GL_RGB_SNORM */
+   { 38817, 0x00008F91 }, /* GL_RG_SNORM */
+   { 38829, 0x00000407 }, /* GL_RIGHT */
+   { 38838, 0x00002000 }, /* GL_S */
+   { 38843, 0x00008B5D }, /* GL_SAMPLER_1D */
+   { 38857, 0x00008DC0 }, /* GL_SAMPLER_1D_ARRAY */
+   { 38877, 0x00008DC0 }, /* GL_SAMPLER_1D_ARRAY_EXT */
+   { 38901, 0x00008DC3 }, /* GL_SAMPLER_1D_ARRAY_SHADOW */
+   { 38928, 0x00008DC3 }, /* GL_SAMPLER_1D_ARRAY_SHADOW_EXT */
+   { 38959, 0x00008B61 }, /* GL_SAMPLER_1D_SHADOW */
+   { 38980, 0x00008B5E }, /* GL_SAMPLER_2D */
+   { 38994, 0x00008DC1 }, /* GL_SAMPLER_2D_ARRAY */
+   { 39014, 0x00008DC1 }, /* GL_SAMPLER_2D_ARRAY_EXT */
+   { 39038, 0x00008DC4 }, /* GL_SAMPLER_2D_ARRAY_SHADOW */
+   { 39065, 0x00008DC4 }, /* GL_SAMPLER_2D_ARRAY_SHADOW_EXT */
+   { 39096, 0x00008B63 }, /* GL_SAMPLER_2D_RECT */
+   { 39115, 0x00008B64 }, /* GL_SAMPLER_2D_RECT_SHADOW */
+   { 39141, 0x00008B62 }, /* GL_SAMPLER_2D_SHADOW */
+   { 39162, 0x00008B5F }, /* GL_SAMPLER_3D */
+   { 39176, 0x00008B5F }, /* GL_SAMPLER_3D_OES */
+   { 39194, 0x00008919 }, /* GL_SAMPLER_BINDING */
+   { 39213, 0x00008DC2 }, /* GL_SAMPLER_BUFFER */
+   { 39231, 0x00008DC2 }, /* GL_SAMPLER_BUFFER_EXT */
+   { 39253, 0x00008B60 }, /* GL_SAMPLER_CUBE */
+   { 39269, 0x00008DC5 }, /* GL_SAMPLER_CUBE_SHADOW */
+   { 39292, 0x00008DC5 }, /* GL_SAMPLER_CUBE_SHADOW_EXT */
+   { 39319, 0x00008D66 }, /* GL_SAMPLER_EXTERNAL_OES */
+   { 39343, 0x000080A9 }, /* GL_SAMPLES */
+   { 39354, 0x000086B4 }, /* GL_SAMPLES_3DFX */
+   { 39370, 0x000080A9 }, /* GL_SAMPLES_ARB */
+   { 39385, 0x00008914 }, /* GL_SAMPLES_PASSED */
+   { 39403, 0x00008914 }, /* GL_SAMPLES_PASSED_ARB */
+   { 39425, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
+   { 39453, 0x0000809E }, /* GL_SAMPLE_ALPHA_TO_COVERAGE_ARB */
+   { 39485, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE */
+   { 39508, 0x0000809F }, /* GL_SAMPLE_ALPHA_TO_ONE_ARB */
+   { 39535, 0x000080A8 }, /* GL_SAMPLE_BUFFERS */
+   { 39553, 0x000086B3 }, /* GL_SAMPLE_BUFFERS_3DFX */
+   { 39576, 0x000080A8 }, /* GL_SAMPLE_BUFFERS_ARB */
+   { 39598, 0x000080A0 }, /* GL_SAMPLE_COVERAGE */
+   { 39617, 0x000080A0 }, /* GL_SAMPLE_COVERAGE_ARB */
+   { 39640, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT */
+   { 39666, 0x000080AB }, /* GL_SAMPLE_COVERAGE_INVERT_ARB */
+   { 39696, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE */
+   { 39721, 0x000080AA }, /* GL_SAMPLE_COVERAGE_VALUE_ARB */
+   { 39750, 0x00080000 }, /* GL_SCISSOR_BIT */
+   { 39765, 0x00000C10 }, /* GL_SCISSOR_BOX */
+   { 39780, 0x00000C11 }, /* GL_SCISSOR_TEST */
+   { 39796, 0x0000845E }, /* GL_SECONDARY_COLOR_ARRAY */
+   { 39821, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
+   { 39861, 0x0000889C }, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB */
+   { 39905, 0x0000845D }, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
+   { 39938, 0x0000845A }, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
+   { 39968, 0x0000845C }, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
+   { 40000, 0x0000845B }, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
+   { 40030, 0x00001C02 }, /* GL_SELECT */
+   { 40040, 0x00000DF3 }, /* GL_SELECTION_BUFFER_POINTER */
+   { 40068, 0x00000DF4 }, /* GL_SELECTION_BUFFER_SIZE */
+   { 40093, 0x00008012 }, /* GL_SEPARABLE_2D */
+   { 40109, 0x00008C8D }, /* GL_SEPARATE_ATTRIBS */
+   { 40129, 0x00008C8D }, /* GL_SEPARATE_ATTRIBS_EXT */
+   { 40153, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR */
+   { 40180, 0x000081FA }, /* GL_SEPARATE_SPECULAR_COLOR_EXT */
+   { 40211, 0x0000150F }, /* GL_SET */
+   { 40218, 0x00008DF8 }, /* GL_SHADER_BINARY_FORMATS */
+   { 40243, 0x00008DFA }, /* GL_SHADER_COMPILER */
+   { 40262, 0x00008B48 }, /* GL_SHADER_OBJECT_ARB */
+   { 40283, 0x00008B88 }, /* GL_SHADER_SOURCE_LENGTH */
+   { 40307, 0x00008B4F }, /* GL_SHADER_TYPE */
+   { 40322, 0x00000B54 }, /* GL_SHADE_MODEL */
+   { 40337, 0x00008B8C }, /* GL_SHADING_LANGUAGE_VERSION */
+   { 40365, 0x000080BF }, /* GL_SHADOW_AMBIENT_SGIX */
+   { 40388, 0x000081FB }, /* GL_SHARED_TEXTURE_PALETTE_EXT */
+   { 40418, 0x00001601 }, /* GL_SHININESS */
+   { 40431, 0x00001402 }, /* GL_SHORT */
+   { 40440, 0x00009119 }, /* GL_SIGNALED */
+   { 40452, 0x00008F9C }, /* GL_SIGNED_NORMALIZED */
+   { 40473, 0x000081F9 }, /* GL_SINGLE_COLOR */
+   { 40489, 0x000081F9 }, /* GL_SINGLE_COLOR_EXT */
+   { 40509, 0x000085CC }, /* GL_SLICE_ACCUM_SUN */
+   { 40528, 0x00008C46 }, /* GL_SLUMINANCE */
+   { 40542, 0x00008C47 }, /* GL_SLUMINANCE8 */
+   { 40557, 0x00008C45 }, /* GL_SLUMINANCE8_ALPHA8 */
+   { 40579, 0x00008C44 }, /* GL_SLUMINANCE_ALPHA */
+   { 40599, 0x00001D01 }, /* GL_SMOOTH */
+   { 40609, 0x00000B23 }, /* GL_SMOOTH_LINE_WIDTH_GRANULARITY */
+   { 40642, 0x00000B22 }, /* GL_SMOOTH_LINE_WIDTH_RANGE */
+   { 40669, 0x00000B13 }, /* GL_SMOOTH_POINT_SIZE_GRANULARITY */
+   { 40702, 0x00000B12 }, /* GL_SMOOTH_POINT_SIZE_RANGE */
+   { 40729, 0x00008588 }, /* GL_SOURCE0_ALPHA */
+   { 40746, 0x00008588 }, /* GL_SOURCE0_ALPHA_ARB */
+   { 40767, 0x00008588 }, /* GL_SOURCE0_ALPHA_EXT */
+   { 40788, 0x00008580 }, /* GL_SOURCE0_RGB */
+   { 40803, 0x00008580 }, /* GL_SOURCE0_RGB_ARB */
+   { 40822, 0x00008580 }, /* GL_SOURCE0_RGB_EXT */
+   { 40841, 0x00008589 }, /* GL_SOURCE1_ALPHA */
+   { 40858, 0x00008589 }, /* GL_SOURCE1_ALPHA_ARB */
+   { 40879, 0x00008589 }, /* GL_SOURCE1_ALPHA_EXT */
+   { 40900, 0x00008581 }, /* GL_SOURCE1_RGB */
+   { 40915, 0x00008581 }, /* GL_SOURCE1_RGB_ARB */
+   { 40934, 0x00008581 }, /* GL_SOURCE1_RGB_EXT */
+   { 40953, 0x0000858A }, /* GL_SOURCE2_ALPHA */
+   { 40970, 0x0000858A }, /* GL_SOURCE2_ALPHA_ARB */
+   { 40991, 0x0000858A }, /* GL_SOURCE2_ALPHA_EXT */
+   { 41012, 0x00008582 }, /* GL_SOURCE2_RGB */
+   { 41027, 0x00008582 }, /* GL_SOURCE2_RGB_ARB */
+   { 41046, 0x00008582 }, /* GL_SOURCE2_RGB_EXT */
+   { 41065, 0x0000858B }, /* GL_SOURCE3_ALPHA_NV */
+   { 41085, 0x00008583 }, /* GL_SOURCE3_RGB_NV */
+   { 41103, 0x00001202 }, /* GL_SPECULAR */
+   { 41115, 0x00002402 }, /* GL_SPHERE_MAP */
+   { 41129, 0x00001206 }, /* GL_SPOT_CUTOFF */
+   { 41144, 0x00001204 }, /* GL_SPOT_DIRECTION */
+   { 41162, 0x00001205 }, /* GL_SPOT_EXPONENT */
+   { 41179, 0x00008588 }, /* GL_SRC0_ALPHA */
+   { 41193, 0x00008580 }, /* GL_SRC0_RGB */
+   { 41205, 0x00008589 }, /* GL_SRC1_ALPHA */
+   { 41219, 0x00008581 }, /* GL_SRC1_RGB */
+   { 41231, 0x0000858A }, /* GL_SRC2_ALPHA */
+   { 41245, 0x00008582 }, /* GL_SRC2_RGB */
+   { 41257, 0x00000302 }, /* GL_SRC_ALPHA */
+   { 41270, 0x00000308 }, /* GL_SRC_ALPHA_SATURATE */
+   { 41292, 0x00000300 }, /* GL_SRC_COLOR */
+   { 41305, 0x00008C40 }, /* GL_SRGB */
+   { 41313, 0x00008C41 }, /* GL_SRGB8 */
+   { 41322, 0x00008C43 }, /* GL_SRGB8_ALPHA8 */
+   { 41338, 0x00008C42 }, /* GL_SRGB_ALPHA */
+   { 41352, 0x00000503 }, /* GL_STACK_OVERFLOW */
+   { 41370, 0x00000504 }, /* GL_STACK_UNDERFLOW */
+   { 41389, 0x000088E6 }, /* GL_STATIC_COPY */
+   { 41404, 0x000088E6 }, /* GL_STATIC_COPY_ARB */
+   { 41423, 0x000088E4 }, /* GL_STATIC_DRAW */
+   { 41438, 0x000088E4 }, /* GL_STATIC_DRAW_ARB */
+   { 41457, 0x000088E5 }, /* GL_STATIC_READ */
+   { 41472, 0x000088E5 }, /* GL_STATIC_READ_ARB */
+   { 41491, 0x00001802 }, /* GL_STENCIL */
+   { 41502, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT */
+   { 41524, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_EXT */
+   { 41550, 0x00008D20 }, /* GL_STENCIL_ATTACHMENT_OES */
+   { 41576, 0x00008801 }, /* GL_STENCIL_BACK_FAIL */
+   { 41597, 0x00008801 }, /* GL_STENCIL_BACK_FAIL_ATI */
+   { 41622, 0x00008800 }, /* GL_STENCIL_BACK_FUNC */
+   { 41643, 0x00008800 }, /* GL_STENCIL_BACK_FUNC_ATI */
+   { 41668, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
+   { 41700, 0x00008802 }, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI */
+   { 41736, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
+   { 41768, 0x00008803 }, /* GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI */
+   { 41804, 0x00008CA3 }, /* GL_STENCIL_BACK_REF */
+   { 41824, 0x00008CA4 }, /* GL_STENCIL_BACK_VALUE_MASK */
+   { 41851, 0x00008CA5 }, /* GL_STENCIL_BACK_WRITEMASK */
+   { 41877, 0x00000D57 }, /* GL_STENCIL_BITS */
+   { 41893, 0x00008224 }, /* GL_STENCIL_BUFFER */
+   { 41911, 0x00000400 }, /* GL_STENCIL_BUFFER_BIT */
+   { 41933, 0x00000B91 }, /* GL_STENCIL_CLEAR_VALUE */
+   { 41956, 0x00000B94 }, /* GL_STENCIL_FAIL */
+   { 41972, 0x00000B92 }, /* GL_STENCIL_FUNC */
+   { 41988, 0x00001901 }, /* GL_STENCIL_INDEX */
+   { 42005, 0x00008D46 }, /* GL_STENCIL_INDEX1 */
+   { 42023, 0x00008D49 }, /* GL_STENCIL_INDEX16 */
+   { 42042, 0x00008D49 }, /* GL_STENCIL_INDEX16_EXT */
+   { 42065, 0x00008D46 }, /* GL_STENCIL_INDEX1_EXT */
+   { 42087, 0x00008D46 }, /* GL_STENCIL_INDEX1_OES */
+   { 42109, 0x00008D47 }, /* GL_STENCIL_INDEX4 */
+   { 42127, 0x00008D47 }, /* GL_STENCIL_INDEX4_EXT */
+   { 42149, 0x00008D47 }, /* GL_STENCIL_INDEX4_OES */
+   { 42171, 0x00008D48 }, /* GL_STENCIL_INDEX8 */
+   { 42189, 0x00008D48 }, /* GL_STENCIL_INDEX8_EXT */
+   { 42211, 0x00008D48 }, /* GL_STENCIL_INDEX8_OES */
+   { 42233, 0x00008D45 }, /* GL_STENCIL_INDEX_EXT */
+   { 42254, 0x00000B95 }, /* GL_STENCIL_PASS_DEPTH_FAIL */
+   { 42281, 0x00000B96 }, /* GL_STENCIL_PASS_DEPTH_PASS */
+   { 42308, 0x00000B97 }, /* GL_STENCIL_REF */
+   { 42323, 0x00000B90 }, /* GL_STENCIL_TEST */
+   { 42339, 0x00008910 }, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
+   { 42368, 0x00000B93 }, /* GL_STENCIL_VALUE_MASK */
+   { 42390, 0x00000B98 }, /* GL_STENCIL_WRITEMASK */
+   { 42411, 0x00000C33 }, /* GL_STEREO */
+   { 42421, 0x000085BE }, /* GL_STORAGE_CACHED_APPLE */
+   { 42445, 0x000085BD }, /* GL_STORAGE_PRIVATE_APPLE */
+   { 42470, 0x000085BF }, /* GL_STORAGE_SHARED_APPLE */
+   { 42494, 0x000088E2 }, /* GL_STREAM_COPY */
+   { 42509, 0x000088E2 }, /* GL_STREAM_COPY_ARB */
+   { 42528, 0x000088E0 }, /* GL_STREAM_DRAW */
+   { 42543, 0x000088E0 }, /* GL_STREAM_DRAW_ARB */
+   { 42562, 0x000088E1 }, /* GL_STREAM_READ */
+   { 42577, 0x000088E1 }, /* GL_STREAM_READ_ARB */
+   { 42596, 0x00000D50 }, /* GL_SUBPIXEL_BITS */
+   { 42613, 0x000084E7 }, /* GL_SUBTRACT */
+   { 42625, 0x000084E7 }, /* GL_SUBTRACT_ARB */
+   { 42641, 0x00009113 }, /* GL_SYNC_CONDITION */
+   { 42659, 0x00009116 }, /* GL_SYNC_FENCE */
+   { 42673, 0x00009115 }, /* GL_SYNC_FLAGS */
+   { 42687, 0x00000001 }, /* GL_SYNC_FLUSH_COMMANDS_BIT */
+   { 42714, 0x00009117 }, /* GL_SYNC_GPU_COMMANDS_COMPLETE */
+   { 42744, 0x00009114 }, /* GL_SYNC_STATUS */
+   { 42759, 0x00002001 }, /* GL_T */
+   { 42764, 0x00002A2A }, /* GL_T2F_C3F_V3F */
+   { 42779, 0x00002A2C }, /* GL_T2F_C4F_N3F_V3F */
+   { 42798, 0x00002A29 }, /* GL_T2F_C4UB_V3F */
+   { 42814, 0x00002A2B }, /* GL_T2F_N3F_V3F */
+   { 42829, 0x00002A27 }, /* GL_T2F_V3F */
+   { 42840, 0x00002A2D }, /* GL_T4F_C4F_N3F_V4F */
+   { 42859, 0x00002A28 }, /* GL_T4F_V4F */
+   { 42870, 0x00008031 }, /* GL_TABLE_TOO_LARGE_EXT */
+   { 42893, 0x00001702 }, /* GL_TEXTURE */
+   { 42904, 0x000084C0 }, /* GL_TEXTURE0 */
+   { 42916, 0x000084C0 }, /* GL_TEXTURE0_ARB */
+   { 42932, 0x000084C1 }, /* GL_TEXTURE1 */
+   { 42944, 0x000084CA }, /* GL_TEXTURE10 */
+   { 42957, 0x000084CA }, /* GL_TEXTURE10_ARB */
+   { 42974, 0x000084CB }, /* GL_TEXTURE11 */
+   { 42987, 0x000084CB }, /* GL_TEXTURE11_ARB */
+   { 43004, 0x000084CC }, /* GL_TEXTURE12 */
+   { 43017, 0x000084CC }, /* GL_TEXTURE12_ARB */
+   { 43034, 0x000084CD }, /* GL_TEXTURE13 */
+   { 43047, 0x000084CD }, /* GL_TEXTURE13_ARB */
+   { 43064, 0x000084CE }, /* GL_TEXTURE14 */
+   { 43077, 0x000084CE }, /* GL_TEXTURE14_ARB */
+   { 43094, 0x000084CF }, /* GL_TEXTURE15 */
+   { 43107, 0x000084CF }, /* GL_TEXTURE15_ARB */
+   { 43124, 0x000084D0 }, /* GL_TEXTURE16 */
+   { 43137, 0x000084D0 }, /* GL_TEXTURE16_ARB */
+   { 43154, 0x000084D1 }, /* GL_TEXTURE17 */
+   { 43167, 0x000084D1 }, /* GL_TEXTURE17_ARB */
+   { 43184, 0x000084D2 }, /* GL_TEXTURE18 */
+   { 43197, 0x000084D2 }, /* GL_TEXTURE18_ARB */
+   { 43214, 0x000084D3 }, /* GL_TEXTURE19 */
+   { 43227, 0x000084D3 }, /* GL_TEXTURE19_ARB */
+   { 43244, 0x000084C1 }, /* GL_TEXTURE1_ARB */
+   { 43260, 0x000084C2 }, /* GL_TEXTURE2 */
+   { 43272, 0x000084D4 }, /* GL_TEXTURE20 */
+   { 43285, 0x000084D4 }, /* GL_TEXTURE20_ARB */
+   { 43302, 0x000084D5 }, /* GL_TEXTURE21 */
+   { 43315, 0x000084D5 }, /* GL_TEXTURE21_ARB */
+   { 43332, 0x000084D6 }, /* GL_TEXTURE22 */
+   { 43345, 0x000084D6 }, /* GL_TEXTURE22_ARB */
+   { 43362, 0x000084D7 }, /* GL_TEXTURE23 */
+   { 43375, 0x000084D7 }, /* GL_TEXTURE23_ARB */
+   { 43392, 0x000084D8 }, /* GL_TEXTURE24 */
+   { 43405, 0x000084D8 }, /* GL_TEXTURE24_ARB */
+   { 43422, 0x000084D9 }, /* GL_TEXTURE25 */
+   { 43435, 0x000084D9 }, /* GL_TEXTURE25_ARB */
+   { 43452, 0x000084DA }, /* GL_TEXTURE26 */
+   { 43465, 0x000084DA }, /* GL_TEXTURE26_ARB */
+   { 43482, 0x000084DB }, /* GL_TEXTURE27 */
+   { 43495, 0x000084DB }, /* GL_TEXTURE27_ARB */
+   { 43512, 0x000084DC }, /* GL_TEXTURE28 */
+   { 43525, 0x000084DC }, /* GL_TEXTURE28_ARB */
+   { 43542, 0x000084DD }, /* GL_TEXTURE29 */
+   { 43555, 0x000084DD }, /* GL_TEXTURE29_ARB */
+   { 43572, 0x000084C2 }, /* GL_TEXTURE2_ARB */
+   { 43588, 0x000084C3 }, /* GL_TEXTURE3 */
+   { 43600, 0x000084DE }, /* GL_TEXTURE30 */
+   { 43613, 0x000084DE }, /* GL_TEXTURE30_ARB */
+   { 43630, 0x000084DF }, /* GL_TEXTURE31 */
+   { 43643, 0x000084DF }, /* GL_TEXTURE31_ARB */
+   { 43660, 0x000084C3 }, /* GL_TEXTURE3_ARB */
+   { 43676, 0x000084C4 }, /* GL_TEXTURE4 */
+   { 43688, 0x000084C4 }, /* GL_TEXTURE4_ARB */
+   { 43704, 0x000084C5 }, /* GL_TEXTURE5 */
+   { 43716, 0x000084C5 }, /* GL_TEXTURE5_ARB */
+   { 43732, 0x000084C6 }, /* GL_TEXTURE6 */
+   { 43744, 0x000084C6 }, /* GL_TEXTURE6_ARB */
+   { 43760, 0x000084C7 }, /* GL_TEXTURE7 */
+   { 43772, 0x000084C7 }, /* GL_TEXTURE7_ARB */
+   { 43788, 0x000084C8 }, /* GL_TEXTURE8 */
+   { 43800, 0x000084C8 }, /* GL_TEXTURE8_ARB */
+   { 43816, 0x000084C9 }, /* GL_TEXTURE9 */
+   { 43828, 0x000084C9 }, /* GL_TEXTURE9_ARB */
+   { 43844, 0x00000DE0 }, /* GL_TEXTURE_1D */
+   { 43858, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY */
+   { 43878, 0x00008C18 }, /* GL_TEXTURE_1D_ARRAY_EXT */
+   { 43902, 0x00000DE1 }, /* GL_TEXTURE_2D */
+   { 43916, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY */
+   { 43936, 0x00008C1A }, /* GL_TEXTURE_2D_ARRAY_EXT */
+   { 43960, 0x0000806F }, /* GL_TEXTURE_3D */
+   { 43974, 0x0000806F }, /* GL_TEXTURE_3D_OES */
+   { 43992, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE */
+   { 44014, 0x0000805F }, /* GL_TEXTURE_ALPHA_SIZE_EXT */
+   { 44040, 0x0000813C }, /* GL_TEXTURE_BASE_LEVEL */
+   { 44062, 0x00008068 }, /* GL_TEXTURE_BINDING_1D */
+   { 44084, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY */
+   { 44112, 0x00008C1C }, /* GL_TEXTURE_BINDING_1D_ARRAY_EXT */
+   { 44144, 0x00008069 }, /* GL_TEXTURE_BINDING_2D */
+   { 44166, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY */
+   { 44194, 0x00008C1D }, /* GL_TEXTURE_BINDING_2D_ARRAY_EXT */
+   { 44226, 0x0000806A }, /* GL_TEXTURE_BINDING_3D */
+   { 44248, 0x0000806A }, /* GL_TEXTURE_BINDING_3D_OES */
+   { 44274, 0x00008C2C }, /* GL_TEXTURE_BINDING_BUFFER */
+   { 44300, 0x00008C2C }, /* GL_TEXTURE_BINDING_BUFFER_ARB */
+   { 44330, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP */
+   { 44358, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_ARB */
+   { 44390, 0x00008514 }, /* GL_TEXTURE_BINDING_CUBE_MAP_OES */
+   { 44422, 0x00008D67 }, /* GL_TEXTURE_BINDING_EXTERNAL_OES */
+   { 44454, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE */
+   { 44483, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_ARB */
+   { 44516, 0x000084F6 }, /* GL_TEXTURE_BINDING_RECTANGLE_NV */
+   { 44548, 0x00040000 }, /* GL_TEXTURE_BIT */
+   { 44563, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE */
+   { 44584, 0x0000805E }, /* GL_TEXTURE_BLUE_SIZE_EXT */
+   { 44609, 0x00001005 }, /* GL_TEXTURE_BORDER */
+   { 44627, 0x00001004 }, /* GL_TEXTURE_BORDER_COLOR */
+   { 44651, 0x00008C2A }, /* GL_TEXTURE_BUFFER */
+   { 44669, 0x00008C2A }, /* GL_TEXTURE_BUFFER_ARB */
+   { 44691, 0x00008C2D }, /* GL_TEXTURE_BUFFER_DATA_STORE_BINDING */
+   { 44728, 0x00008C2D }, /* GL_TEXTURE_BUFFER_DATA_STORE_BINDING_ARB */
+   { 44769, 0x00008C2E }, /* GL_TEXTURE_BUFFER_FORMAT */
+   { 44794, 0x00008C2E }, /* GL_TEXTURE_BUFFER_FORMAT_ARB */
+   { 44823, 0x00008171 }, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
+   { 44854, 0x00008176 }, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
+   { 44884, 0x00008172 }, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
+   { 44914, 0x00008175 }, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
+   { 44949, 0x00008173 }, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
+   { 44980, 0x00008174 }, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+   { 45018, 0x000080BC }, /* GL_TEXTURE_COLOR_TABLE_SGI */
+   { 45045, 0x000081EF }, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
+   { 45077, 0x000080BF }, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+   { 45111, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC */
+   { 45135, 0x0000884D }, /* GL_TEXTURE_COMPARE_FUNC_ARB */
+   { 45163, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE */
+   { 45187, 0x0000884C }, /* GL_TEXTURE_COMPARE_MODE_ARB */
+   { 45215, 0x0000819B }, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
+   { 45248, 0x0000819A }, /* GL_TEXTURE_COMPARE_SGIX */
+   { 45272, 0x00001003 }, /* GL_TEXTURE_COMPONENTS */
+   { 45294, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED */
+   { 45316, 0x000086A1 }, /* GL_TEXTURE_COMPRESSED_ARB */
+   { 45342, 0x000086A3 }, /* GL_TEXTURE_COMPRESSED_FORMATS_ARB */
+   { 45376, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
+   { 45409, 0x000086A0 }, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB */
+   { 45446, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT */
+   { 45474, 0x000084EF }, /* GL_TEXTURE_COMPRESSION_HINT_ARB */
+   { 45506, 0x00008078 }, /* GL_TEXTURE_COORD_ARRAY */
+   { 45529, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
+   { 45567, 0x0000889A }, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB */
+   { 45609, 0x00008092 }, /* GL_TEXTURE_COORD_ARRAY_POINTER */
+   { 45640, 0x00008088 }, /* GL_TEXTURE_COORD_ARRAY_SIZE */
+   { 45668, 0x0000808A }, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
+   { 45698, 0x00008089 }, /* GL_TEXTURE_COORD_ARRAY_TYPE */
+   { 45726, 0x00008B9D }, /* GL_TEXTURE_CROP_RECT_OES */
+   { 45751, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP */
+   { 45771, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_ARB */
+   { 45795, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
+   { 45826, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB */
+   { 45861, 0x00008516 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X_OES */
+   { 45896, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
+   { 45927, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB */
+   { 45962, 0x00008518 }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_OES */
+   { 45997, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
+   { 46028, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB */
+   { 46063, 0x0000851A }, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_OES */
+   { 46098, 0x00008513 }, /* GL_TEXTURE_CUBE_MAP_OES */
+   { 46122, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
+   { 46153, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB */
+   { 46188, 0x00008515 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X_OES */
+   { 46223, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
+   { 46254, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB */
+   { 46289, 0x00008517 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y_OES */
+   { 46324, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
+   { 46355, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB */
+   { 46390, 0x00008519 }, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z_OES */
+   { 46425, 0x0000884F }, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
+   { 46454, 0x00008071 }, /* GL_TEXTURE_DEPTH */
+   { 46471, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE */
+   { 46493, 0x0000884A }, /* GL_TEXTURE_DEPTH_SIZE_ARB */
+   { 46519, 0x00002300 }, /* GL_TEXTURE_ENV */
+   { 46534, 0x00002201 }, /* GL_TEXTURE_ENV_COLOR */
+   { 46555, 0x00002200 }, /* GL_TEXTURE_ENV_MODE */
+   { 46575, 0x00008D65 }, /* GL_TEXTURE_EXTERNAL_OES */
+   { 46599, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL */
+   { 46625, 0x00008500 }, /* GL_TEXTURE_FILTER_CONTROL_EXT */
+   { 46655, 0x00002500 }, /* GL_TEXTURE_GEN_MODE */
+   { 46675, 0x00002500 }, /* GL_TEXTURE_GEN_MODE_OES */
+   { 46699, 0x00000C63 }, /* GL_TEXTURE_GEN_Q */
+   { 46716, 0x00000C62 }, /* GL_TEXTURE_GEN_R */
+   { 46733, 0x00000C60 }, /* GL_TEXTURE_GEN_S */
+   { 46750, 0x00008D60 }, /* GL_TEXTURE_GEN_STR_OES */
+   { 46773, 0x00000C61 }, /* GL_TEXTURE_GEN_T */
+   { 46790, 0x0000819D }, /* GL_TEXTURE_GEQUAL_R_SGIX */
+   { 46815, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE */
+   { 46837, 0x0000805D }, /* GL_TEXTURE_GREEN_SIZE_EXT */
+   { 46863, 0x00001001 }, /* GL_TEXTURE_HEIGHT */
+   { 46881, 0x000080ED }, /* GL_TEXTURE_INDEX_SIZE_EXT */
+   { 46907, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE */
+   { 46933, 0x00008061 }, /* GL_TEXTURE_INTENSITY_SIZE_EXT */
+   { 46963, 0x00001003 }, /* GL_TEXTURE_INTERNAL_FORMAT */
+   { 46990, 0x0000819C }, /* GL_TEXTURE_LEQUAL_R_SGIX */
+   { 47015, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS */
+   { 47035, 0x00008501 }, /* GL_TEXTURE_LOD_BIAS_EXT */
+   { 47059, 0x00008190 }, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
+   { 47086, 0x0000818E }, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
+   { 47113, 0x0000818F }, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
+   { 47140, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE */
+   { 47166, 0x00008060 }, /* GL_TEXTURE_LUMINANCE_SIZE_EXT */
+   { 47196, 0x00002800 }, /* GL_TEXTURE_MAG_FILTER */
+   { 47218, 0x00000BA8 }, /* GL_TEXTURE_MATRIX */
+   { 47236, 0x0000898F }, /* GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES */
+   { 47276, 0x000084FE }, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
+   { 47306, 0x0000836B }, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
+   { 47334, 0x00008369 }, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
+   { 47362, 0x0000836A }, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
+   { 47390, 0x0000813D }, /* GL_TEXTURE_MAX_LEVEL */
+   { 47411, 0x0000813B }, /* GL_TEXTURE_MAX_LOD */
+   { 47430, 0x00002801 }, /* GL_TEXTURE_MIN_FILTER */
+   { 47452, 0x0000813A }, /* GL_TEXTURE_MIN_LOD */
+   { 47471, 0x00008066 }, /* GL_TEXTURE_PRIORITY */
+   { 47491, 0x000085B7 }, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
+   { 47521, 0x000085B8 }, /* GL_TEXTURE_RANGE_POINTER_APPLE */
+   { 47552, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE */
+   { 47573, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_ARB */
+   { 47598, 0x000084F5 }, /* GL_TEXTURE_RECTANGLE_NV */
+   { 47622, 0x0000805C }, /* GL_TEXTURE_RED_SIZE */
+   { 47642, 0x0000805C }, /* GL_TEXTURE_RED_SIZE_EXT */
+   { 47666, 0x00008067 }, /* GL_TEXTURE_RESIDENT */
+   { 47686, 0x00008C3F }, /* GL_TEXTURE_SHARED_SIZE */
+   { 47709, 0x00000BA5 }, /* GL_TEXTURE_STACK_DEPTH */
+   { 47732, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE */
+   { 47756, 0x000088F1 }, /* GL_TEXTURE_STENCIL_SIZE_EXT */
+   { 47784, 0x000085BC }, /* GL_TEXTURE_STORAGE_HINT_APPLE */
+   { 47814, 0x00008065 }, /* GL_TEXTURE_TOO_LARGE_EXT */
+   { 47839, 0x0000888F }, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
+   { 47873, 0x00001000 }, /* GL_TEXTURE_WIDTH */
+   { 47890, 0x00008072 }, /* GL_TEXTURE_WRAP_R */
+   { 47908, 0x00008072 }, /* GL_TEXTURE_WRAP_R_OES */
+   { 47930, 0x00002802 }, /* GL_TEXTURE_WRAP_S */
+   { 47948, 0x00002803 }, /* GL_TEXTURE_WRAP_T */
+   { 47966, 0x0000911B }, /* GL_TIMEOUT_EXPIRED */
+   { 47985, 0x000088BF }, /* GL_TIME_ELAPSED_EXT */
+   { 48005, 0x00008648 }, /* GL_TRACK_MATRIX_NV */
+   { 48024, 0x00008649 }, /* GL_TRACK_MATRIX_TRANSFORM_NV */
+   { 48053, 0x00001000 }, /* GL_TRANSFORM_BIT */
+   { 48070, 0x00008E22 }, /* GL_TRANSFORM_FEEDBACK */
+   { 48092, 0x00008E25 }, /* GL_TRANSFORM_FEEDBACK_BINDING */
+   { 48122, 0x00008C8E }, /* GL_TRANSFORM_FEEDBACK_BUFFER */
+   { 48151, 0x00008E24 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE */
+   { 48187, 0x00008C8F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING */
+   { 48224, 0x00008C8F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_EXT */
+   { 48265, 0x00008C8E }, /* GL_TRANSFORM_FEEDBACK_BUFFER_EXT */
+   { 48298, 0x00008C7F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE */
+   { 48332, 0x00008C7F }, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE_EXT */
+   { 48370, 0x00008E23 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED */
+   { 48406, 0x00008C85 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE */
+   { 48440, 0x00008C85 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_EXT */
+   { 48478, 0x00008C84 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_START */
+   { 48513, 0x00008C84 }, /* GL_TRANSFORM_FEEDBACK_BUFFER_START_EXT */
+   { 48552, 0x00008C88 }, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN */
+   { 48593, 0x00008C88 }, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_EXT */
+   { 48638, 0x00008C83 }, /* GL_TRANSFORM_FEEDBACK_VARYINGS */
+   { 48669, 0x00008C83 }, /* GL_TRANSFORM_FEEDBACK_VARYINGS_EXT */
+   { 48704, 0x00008C76 }, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH */
+   { 48745, 0x00008C76 }, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT */
+   { 48790, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX */
+   { 48816, 0x000084E6 }, /* GL_TRANSPOSE_COLOR_MATRIX_ARB */
+   { 48846, 0x000088B7 }, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
+   { 48878, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
+   { 48908, 0x000084E3 }, /* GL_TRANSPOSE_MODELVIEW_MATRIX_ARB */
+   { 48942, 0x0000862C }, /* GL_TRANSPOSE_NV */
+   { 48958, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX */
+   { 48989, 0x000084E4 }, /* GL_TRANSPOSE_PROJECTION_MATRIX_ARB */
+   { 49024, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX */
+   { 49052, 0x000084E5 }, /* GL_TRANSPOSE_TEXTURE_MATRIX_ARB */
+   { 49084, 0x00000004 }, /* GL_TRIANGLES */
+   { 49097, 0x0000000C }, /* GL_TRIANGLES_ADJACENCY */
+   { 49120, 0x0000000C }, /* GL_TRIANGLES_ADJACENCY_ARB */
+   { 49147, 0x00000006 }, /* GL_TRIANGLE_FAN */
+   { 49163, 0x00008615 }, /* GL_TRIANGLE_MESH_SUN */
+   { 49184, 0x00000005 }, /* GL_TRIANGLE_STRIP */
+   { 49202, 0x0000000D }, /* GL_TRIANGLE_STRIP_ADJACENCY */
+   { 49230, 0x0000000D }, /* GL_TRIANGLE_STRIP_ADJACENCY_ARB */
+   { 49262, 0x00000001 }, /* GL_TRUE */
+   { 49270, 0x00008A1C }, /* GL_UNDEFINED_APPLE */
+   { 49289, 0x00008255 }, /* GL_UNKNOWN_CONTEXT_RESET_ARB */
+   { 49318, 0x00000CF5 }, /* GL_UNPACK_ALIGNMENT */
+   { 49338, 0x0000806E }, /* GL_UNPACK_IMAGE_HEIGHT */
+   { 49361, 0x00000CF1 }, /* GL_UNPACK_LSB_FIRST */
+   { 49381, 0x00000CF2 }, /* GL_UNPACK_ROW_LENGTH */
+   { 49402, 0x0000806D }, /* GL_UNPACK_SKIP_IMAGES */
+   { 49424, 0x00000CF4 }, /* GL_UNPACK_SKIP_PIXELS */
+   { 49446, 0x00000CF3 }, /* GL_UNPACK_SKIP_ROWS */
+   { 49466, 0x00000CF0 }, /* GL_UNPACK_SWAP_BYTES */
+   { 49487, 0x00009118 }, /* GL_UNSIGNALED */
+   { 49501, 0x00001401 }, /* GL_UNSIGNED_BYTE */
+   { 49518, 0x00008362 }, /* GL_UNSIGNED_BYTE_2_3_3_REV */
+   { 49545, 0x00008032 }, /* GL_UNSIGNED_BYTE_3_3_2 */
+   { 49568, 0x00001405 }, /* GL_UNSIGNED_INT */
+   { 49584, 0x00008C3B }, /* GL_UNSIGNED_INT_10F_11F_11F_REV */
+   { 49616, 0x00008036 }, /* GL_UNSIGNED_INT_10_10_10_2 */
+   { 49643, 0x00008DF6 }, /* GL_UNSIGNED_INT_10_10_10_2_OES */
+   { 49674, 0x000084FA }, /* GL_UNSIGNED_INT_24_8 */
+   { 49695, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_EXT */
+   { 49720, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_NV */
+   { 49744, 0x000084FA }, /* GL_UNSIGNED_INT_24_8_OES */
+   { 49769, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV */
+   { 49800, 0x00008368 }, /* GL_UNSIGNED_INT_2_10_10_10_REV_EXT */
+   { 49835, 0x00008C3E }, /* GL_UNSIGNED_INT_5_9_9_9_REV */
+   { 49863, 0x00008035 }, /* GL_UNSIGNED_INT_8_8_8_8 */
+   { 49887, 0x00008367 }, /* GL_UNSIGNED_INT_8_8_8_8_REV */
+   { 49915, 0x00008DD1 }, /* GL_UNSIGNED_INT_SAMPLER_1D */
+   { 49942, 0x00008DD6 }, /* GL_UNSIGNED_INT_SAMPLER_1D_ARRAY */
+   { 49975, 0x00008DD6 }, /* GL_UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT */
+   { 50012, 0x00008DD1 }, /* GL_UNSIGNED_INT_SAMPLER_1D_EXT */
+   { 50043, 0x00008DD2 }, /* GL_UNSIGNED_INT_SAMPLER_2D */
+   { 50070, 0x00008DD7 }, /* GL_UNSIGNED_INT_SAMPLER_2D_ARRAY */
+   { 50103, 0x00008DD7 }, /* GL_UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT */
+   { 50140, 0x00008DD2 }, /* GL_UNSIGNED_INT_SAMPLER_2D_EXT */
+   { 50171, 0x00008DD5 }, /* GL_UNSIGNED_INT_SAMPLER_2D_RECT */
+   { 50203, 0x00008DD5 }, /* GL_UNSIGNED_INT_SAMPLER_2D_RECT_EXT */
+   { 50239, 0x00008DD3 }, /* GL_UNSIGNED_INT_SAMPLER_3D */
+   { 50266, 0x00008DD3 }, /* GL_UNSIGNED_INT_SAMPLER_3D_EXT */
+   { 50297, 0x00008DD8 }, /* GL_UNSIGNED_INT_SAMPLER_BUFFER */
+   { 50328, 0x00008DD8 }, /* GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT */
+   { 50363, 0x00008DD4 }, /* GL_UNSIGNED_INT_SAMPLER_CUBE */
+   { 50392, 0x00008DD4 }, /* GL_UNSIGNED_INT_SAMPLER_CUBE_EXT */
+   { 50425, 0x00008DC6 }, /* GL_UNSIGNED_INT_VEC2 */
+   { 50446, 0x00008DC6 }, /* GL_UNSIGNED_INT_VEC2_EXT */
+   { 50471, 0x00008DC7 }, /* GL_UNSIGNED_INT_VEC3 */
+   { 50492, 0x00008DC7 }, /* GL_UNSIGNED_INT_VEC3_EXT */
+   { 50517, 0x00008DC8 }, /* GL_UNSIGNED_INT_VEC4 */
+   { 50538, 0x00008DC8 }, /* GL_UNSIGNED_INT_VEC4_EXT */
+   { 50563, 0x00008C17 }, /* GL_UNSIGNED_NORMALIZED */
+   { 50586, 0x00001403 }, /* GL_UNSIGNED_SHORT */
+   { 50604, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
+   { 50634, 0x00008366 }, /* GL_UNSIGNED_SHORT_1_5_5_5_REV_EXT */
+   { 50668, 0x00008033 }, /* GL_UNSIGNED_SHORT_4_4_4_4 */
+   { 50694, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
+   { 50724, 0x00008365 }, /* GL_UNSIGNED_SHORT_4_4_4_4_REV_EXT */
+   { 50758, 0x00008034 }, /* GL_UNSIGNED_SHORT_5_5_5_1 */
+   { 50784, 0x00008363 }, /* GL_UNSIGNED_SHORT_5_6_5 */
+   { 50808, 0x00008364 }, /* GL_UNSIGNED_SHORT_5_6_5_REV */
+   { 50836, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_APPLE */
+   { 50864, 0x000085BA }, /* GL_UNSIGNED_SHORT_8_8_MESA */
+   { 50891, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
+   { 50923, 0x000085BB }, /* GL_UNSIGNED_SHORT_8_8_REV_MESA */
+   { 50954, 0x00008CA2 }, /* GL_UPPER_LEFT */
+   { 50968, 0x00002A20 }, /* GL_V2F */
+   { 50975, 0x00002A21 }, /* GL_V3F */
+   { 50982, 0x00008B83 }, /* GL_VALIDATE_STATUS */
+   { 51001, 0x00001F00 }, /* GL_VENDOR */
+   { 51011, 0x00001F02 }, /* GL_VERSION */
+   { 51022, 0x00008074 }, /* GL_VERTEX_ARRAY */
+   { 51038, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING */
+   { 51062, 0x000085B5 }, /* GL_VERTEX_ARRAY_BINDING_APPLE */
+   { 51092, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
+   { 51123, 0x00008896 }, /* GL_VERTEX_ARRAY_BUFFER_BINDING_ARB */
+   { 51158, 0x0000808E }, /* GL_VERTEX_ARRAY_POINTER */
+   { 51182, 0x0000807A }, /* GL_VERTEX_ARRAY_SIZE */
+   { 51203, 0x0000807C }, /* GL_VERTEX_ARRAY_STRIDE */
+   { 51226, 0x0000807B }, /* GL_VERTEX_ARRAY_TYPE */
+   { 51247, 0x00008650 }, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
+   { 51274, 0x0000865A }, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
+   { 51302, 0x0000865B }, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
+   { 51330, 0x0000865C }, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
+   { 51358, 0x0000865D }, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
+   { 51386, 0x0000865E }, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
+   { 51414, 0x0000865F }, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
+   { 51442, 0x00008651 }, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
+   { 51469, 0x00008652 }, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
+   { 51496, 0x00008653 }, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
+   { 51523, 0x00008654 }, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
+   { 51550, 0x00008655 }, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
+   { 51577, 0x00008656 }, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
+   { 51604, 0x00008657 }, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
+   { 51631, 0x00008658 }, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
+   { 51658, 0x00008659 }, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
+   { 51685, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
+   { 51723, 0x0000889F }, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB */
+   { 51765, 0x000088FE }, /* GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB */
+   { 51800, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
+   { 51831, 0x00008622 }, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB */
+   { 51866, 0x000088FD }, /* GL_VERTEX_ATTRIB_ARRAY_INTEGER */
+   { 51897, 0x000088FD }, /* GL_VERTEX_ATTRIB_ARRAY_INTEGER_EXT */
+   { 51932, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
+   { 51966, 0x0000886A }, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB */
+   { 52004, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
+   { 52035, 0x00008645 }, /* GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB */
+   { 52070, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
+   { 52098, 0x00008623 }, /* GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB */
+   { 52130, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
+   { 52160, 0x00008624 }, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB */
+   { 52194, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
+   { 52222, 0x00008625 }, /* GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB */
+   { 52254, 0x000086A7 }, /* GL_VERTEX_BLEND_ARB */
+   { 52274, 0x00008620 }, /* GL_VERTEX_PROGRAM_ARB */
+   { 52296, 0x0000864A }, /* GL_VERTEX_PROGRAM_BINDING_NV */
+   { 52325, 0x00008620 }, /* GL_VERTEX_PROGRAM_NV */
+   { 52346, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE */
+   { 52375, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_ARB */
+   { 52408, 0x00008642 }, /* GL_VERTEX_PROGRAM_POINT_SIZE_NV */
+   { 52440, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE */
+   { 52467, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_ARB */
+   { 52498, 0x00008643 }, /* GL_VERTEX_PROGRAM_TWO_SIDE_NV */
+   { 52528, 0x00008B31 }, /* GL_VERTEX_SHADER */
+   { 52545, 0x00008B31 }, /* GL_VERTEX_SHADER_ARB */
+   { 52566, 0x00008621 }, /* GL_VERTEX_STATE_PROGRAM_NV */
+   { 52593, 0x00000BA2 }, /* GL_VIEWPORT */
+   { 52605, 0x00000800 }, /* GL_VIEWPORT_BIT */
+   { 52621, 0x00008A1A }, /* GL_VOLATILE_APPLE */
+   { 52639, 0x0000911D }, /* GL_WAIT_FAILED */
+   { 52654, 0x000086AD }, /* GL_WEIGHT_ARRAY_ARB */
+   { 52674, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
+   { 52705, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB */
+   { 52740, 0x0000889E }, /* GL_WEIGHT_ARRAY_BUFFER_BINDING_OES */
+   { 52775, 0x000086AD }, /* GL_WEIGHT_ARRAY_OES */
+   { 52795, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_ARB */
+   { 52823, 0x000086AC }, /* GL_WEIGHT_ARRAY_POINTER_OES */
+   { 52851, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_ARB */
+   { 52876, 0x000086AB }, /* GL_WEIGHT_ARRAY_SIZE_OES */
+   { 52901, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
+   { 52928, 0x000086AA }, /* GL_WEIGHT_ARRAY_STRIDE_OES */
+   { 52955, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_ARB */
+   { 52980, 0x000086A9 }, /* GL_WEIGHT_ARRAY_TYPE_OES */
+   { 53005, 0x000086A6 }, /* GL_WEIGHT_SUM_UNITY_ARB */
+   { 53029, 0x000081D4 }, /* GL_WRAP_BORDER_SUN */
+   { 53048, 0x000088B9 }, /* GL_WRITE_ONLY */
+   { 53062, 0x000088B9 }, /* GL_WRITE_ONLY_ARB */
+   { 53080, 0x000088B9 }, /* GL_WRITE_ONLY_OES */
+   { 53098, 0x00001506 }, /* GL_XOR */
+   { 53105, 0x000085B9 }, /* GL_YCBCR_422_APPLE */
+   { 53124, 0x00008757 }, /* GL_YCBCR_MESA */
+   { 53138, 0x00000000 }, /* GL_ZERO */
+   { 53146, 0x00000D16 }, /* GL_ZOOM_X */
+   { 53156, 0x00000D17 }, /* GL_ZOOM_Y */
 };
 
-static const unsigned reduced_enums[1572] =
+static const unsigned reduced_enums[1594] =
 {
-       556, /* GL_FALSE */
-       853, /* GL_LINES */
-       857, /* GL_LINE_LOOP */
-       864, /* GL_LINE_STRIP */
-      2179, /* GL_TRIANGLES */
-      2184, /* GL_TRIANGLE_STRIP */
-      2182, /* GL_TRIANGLE_FAN */
-      1539, /* GL_QUADS */
-      1543, /* GL_QUAD_STRIP */
-      1407, /* GL_POLYGON */
-       854, /* GL_LINES_ADJACENCY */
-       865, /* GL_LINE_STRIP_ADJACENCY */
-      2180, /* GL_TRIANGLES_ADJACENCY */
-      2185, /* GL_TRIANGLE_STRIP_ADJACENCY */
-      1419, /* GL_POLYGON_STIPPLE_BIT */
-      1362, /* GL_PIXEL_MODE_BIT */
-       840, /* GL_LIGHTING_BIT */
-       590, /* GL_FOG_BIT */
+       576, /* GL_FALSE */
+       873, /* GL_LINES */
+       877, /* GL_LINE_LOOP */
+       884, /* GL_LINE_STRIP */
+      2201, /* GL_TRIANGLES */
+      2206, /* GL_TRIANGLE_STRIP */
+      2204, /* GL_TRIANGLE_FAN */
+      1561, /* GL_QUADS */
+      1565, /* GL_QUAD_STRIP */
+      1429, /* GL_POLYGON */
+       874, /* GL_LINES_ADJACENCY */
+       885, /* GL_LINE_STRIP_ADJACENCY */
+      2202, /* GL_TRIANGLES_ADJACENCY */
+      2207, /* GL_TRIANGLE_STRIP_ADJACENCY */
+      1441, /* GL_POLYGON_STIPPLE_BIT */
+      1384, /* GL_PIXEL_MODE_BIT */
+       860, /* GL_LIGHTING_BIT */
+       610, /* GL_FOG_BIT */
          8, /* GL_ACCUM */
-       876, /* GL_LOAD */
-      1630, /* GL_RETURN */
-      1227, /* GL_MULT */
+       896, /* GL_LOAD */
+      1652, /* GL_RETURN */
+      1249, /* GL_MULT */
         24, /* GL_ADD */
-      1243, /* GL_NEVER */
-       830, /* GL_LESS */
-       545, /* GL_EQUAL */
-       829, /* GL_LEQUAL */
-       714, /* GL_GREATER */
-      1260, /* GL_NOTEQUAL */
-       712, /* GL_GEQUAL */
+      1265, /* GL_NEVER */
+       850, /* GL_LESS */
+       565, /* GL_EQUAL */
+       849, /* GL_LEQUAL */
+       734, /* GL_GREATER */
+      1282, /* GL_NOTEQUAL */
+       732, /* GL_GEQUAL */
         55, /* GL_ALWAYS */
-      1841, /* GL_SRC_COLOR */
-      1295, /* GL_ONE_MINUS_SRC_COLOR */
-      1839, /* GL_SRC_ALPHA */
-      1294, /* GL_ONE_MINUS_SRC_ALPHA */
-       524, /* GL_DST_ALPHA */
-      1292, /* GL_ONE_MINUS_DST_ALPHA */
-       525, /* GL_DST_COLOR */
-      1293, /* GL_ONE_MINUS_DST_COLOR */
-      1840, /* GL_SRC_ALPHA_SATURATE */
-       689, /* GL_FRONT_LEFT */
-       690, /* GL_FRONT_RIGHT */
+      1863, /* GL_SRC_COLOR */
+      1317, /* GL_ONE_MINUS_SRC_COLOR */
+      1861, /* GL_SRC_ALPHA */
+      1316, /* GL_ONE_MINUS_SRC_ALPHA */
+       544, /* GL_DST_ALPHA */
+      1314, /* GL_ONE_MINUS_DST_ALPHA */
+       545, /* GL_DST_COLOR */
+      1315, /* GL_ONE_MINUS_DST_COLOR */
+      1862, /* GL_SRC_ALPHA_SATURATE */
+       709, /* GL_FRONT_LEFT */
+       710, /* GL_FRONT_RIGHT */
         77, /* GL_BACK_LEFT */
         78, /* GL_BACK_RIGHT */
-       686, /* GL_FRONT */
+       706, /* GL_FRONT */
         76, /* GL_BACK */
-       828, /* GL_LEFT */
-      1721, /* GL_RIGHT */
-       687, /* GL_FRONT_AND_BACK */
+       848, /* GL_LEFT */
+      1743, /* GL_RIGHT */
+       707, /* GL_FRONT_AND_BACK */
         71, /* GL_AUX0 */
         72, /* GL_AUX1 */
         73, /* GL_AUX2 */
         74, /* GL_AUX3 */
-       816, /* GL_INVALID_ENUM */
-       821, /* GL_INVALID_VALUE */
-       820, /* GL_INVALID_OPERATION */
-      1846, /* GL_STACK_OVERFLOW */
-      1847, /* GL_STACK_UNDERFLOW */
-      1320, /* GL_OUT_OF_MEMORY */
-       817, /* GL_INVALID_FRAMEBUFFER_OPERATION */
+       836, /* GL_INVALID_ENUM */
+       841, /* GL_INVALID_VALUE */
+       840, /* GL_INVALID_OPERATION */
+      1868, /* GL_STACK_OVERFLOW */
+      1869, /* GL_STACK_UNDERFLOW */
+      1342, /* GL_OUT_OF_MEMORY */
+       837, /* GL_INVALID_FRAMEBUFFER_OPERATION */
          0, /* GL_2D */
          2, /* GL_3D */
          3, /* GL_3D_COLOR */
          4, /* GL_3D_COLOR_TEXTURE */
          6, /* GL_4D_COLOR_TEXTURE */
-      1340, /* GL_PASS_THROUGH_TOKEN */
-      1406, /* GL_POINT_TOKEN */
-       867, /* GL_LINE_TOKEN */
-      1420, /* GL_POLYGON_TOKEN */
+      1362, /* GL_PASS_THROUGH_TOKEN */
+      1428, /* GL_POINT_TOKEN */
+       887, /* GL_LINE_TOKEN */
+      1442, /* GL_POLYGON_TOKEN */
         87, /* GL_BITMAP_TOKEN */
-       523, /* GL_DRAW_PIXEL_TOKEN */
+       543, /* GL_DRAW_PIXEL_TOKEN */
        353, /* GL_COPY_PIXEL_TOKEN */
-       858, /* GL_LINE_RESET_TOKEN */
-       549, /* GL_EXP */
-       550, /* GL_EXP2 */
+       878, /* GL_LINE_RESET_TOKEN */
+       569, /* GL_EXP */
+       570, /* GL_EXP2 */
        390, /* GL_CW */
        154, /* GL_CCW */
        187, /* GL_COEFF */
-      1317, /* GL_ORDER */
-       444, /* GL_DOMAIN */
+      1339, /* GL_ORDER */
+       464, /* GL_DOMAIN */
        363, /* GL_CURRENT_COLOR */
        366, /* GL_CURRENT_INDEX */
        372, /* GL_CURRENT_NORMAL */
@@ -4815,337 +4859,337 @@ static const unsigned reduced_enums[1572] =
        381, /* GL_CURRENT_RASTER_POSITION */
        382, /* GL_CURRENT_RASTER_POSITION_VALID */
        379, /* GL_CURRENT_RASTER_DISTANCE */
-      1398, /* GL_POINT_SMOOTH */
-      1382, /* GL_POINT_SIZE */
-      1397, /* GL_POINT_SIZE_RANGE */
-      1388, /* GL_POINT_SIZE_GRANULARITY */
-       859, /* GL_LINE_SMOOTH */
-       868, /* GL_LINE_WIDTH */
-       870, /* GL_LINE_WIDTH_RANGE */
-       869, /* GL_LINE_WIDTH_GRANULARITY */
-       861, /* GL_LINE_STIPPLE */
-       862, /* GL_LINE_STIPPLE_PATTERN */
-       863, /* GL_LINE_STIPPLE_REPEAT */
-       875, /* GL_LIST_MODE */
-      1084, /* GL_MAX_LIST_NESTING */
-       872, /* GL_LIST_BASE */
-       874, /* GL_LIST_INDEX */
-      1409, /* GL_POLYGON_MODE */
-      1416, /* GL_POLYGON_SMOOTH */
-      1418, /* GL_POLYGON_STIPPLE */
-       534, /* GL_EDGE_FLAG */
+      1420, /* GL_POINT_SMOOTH */
+      1404, /* GL_POINT_SIZE */
+      1419, /* GL_POINT_SIZE_RANGE */
+      1410, /* GL_POINT_SIZE_GRANULARITY */
+       879, /* GL_LINE_SMOOTH */
+       888, /* GL_LINE_WIDTH */
+       890, /* GL_LINE_WIDTH_RANGE */
+       889, /* GL_LINE_WIDTH_GRANULARITY */
+       881, /* GL_LINE_STIPPLE */
+       882, /* GL_LINE_STIPPLE_PATTERN */
+       883, /* GL_LINE_STIPPLE_REPEAT */
+       895, /* GL_LIST_MODE */
+      1106, /* GL_MAX_LIST_NESTING */
+       892, /* GL_LIST_BASE */
+       894, /* GL_LIST_INDEX */
+      1431, /* GL_POLYGON_MODE */
+      1438, /* GL_POLYGON_SMOOTH */
+      1440, /* GL_POLYGON_STIPPLE */
+       554, /* GL_EDGE_FLAG */
        356, /* GL_CULL_FACE */
        357, /* GL_CULL_FACE_MODE */
-       688, /* GL_FRONT_FACE */
-       839, /* GL_LIGHTING */
-       844, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
-       845, /* GL_LIGHT_MODEL_TWO_SIDE */
-       841, /* GL_LIGHT_MODEL_AMBIENT */
-      1788, /* GL_SHADE_MODEL */
+       708, /* GL_FRONT_FACE */
+       859, /* GL_LIGHTING */
+       864, /* GL_LIGHT_MODEL_LOCAL_VIEWER */
+       865, /* GL_LIGHT_MODEL_TWO_SIDE */
+       861, /* GL_LIGHT_MODEL_AMBIENT */
+      1810, /* GL_SHADE_MODEL */
        235, /* GL_COLOR_MATERIAL_FACE */
        236, /* GL_COLOR_MATERIAL_PARAMETER */
        234, /* GL_COLOR_MATERIAL */
-       589, /* GL_FOG */
-       611, /* GL_FOG_INDEX */
-       607, /* GL_FOG_DENSITY */
-       615, /* GL_FOG_START */
-       609, /* GL_FOG_END */
-       612, /* GL_FOG_MODE */
-       591, /* GL_FOG_COLOR */
-       429, /* GL_DEPTH_RANGE */
-       438, /* GL_DEPTH_TEST */
-       441, /* GL_DEPTH_WRITEMASK */
-       414, /* GL_DEPTH_CLEAR_VALUE */
-       428, /* GL_DEPTH_FUNC */
+       609, /* GL_FOG */
+       631, /* GL_FOG_INDEX */
+       627, /* GL_FOG_DENSITY */
+       635, /* GL_FOG_START */
+       629, /* GL_FOG_END */
+       632, /* GL_FOG_MODE */
+       611, /* GL_FOG_COLOR */
+       449, /* GL_DEPTH_RANGE */
+       458, /* GL_DEPTH_TEST */
+       461, /* GL_DEPTH_WRITEMASK */
+       434, /* GL_DEPTH_CLEAR_VALUE */
+       448, /* GL_DEPTH_FUNC */
         12, /* GL_ACCUM_CLEAR_VALUE */
-      1891, /* GL_STENCIL_TEST */
-      1872, /* GL_STENCIL_CLEAR_VALUE */
-      1874, /* GL_STENCIL_FUNC */
-      1893, /* GL_STENCIL_VALUE_MASK */
-      1873, /* GL_STENCIL_FAIL */
-      1888, /* GL_STENCIL_PASS_DEPTH_FAIL */
-      1889, /* GL_STENCIL_PASS_DEPTH_PASS */
-      1890, /* GL_STENCIL_REF */
-      1894, /* GL_STENCIL_WRITEMASK */
-      1033, /* GL_MATRIX_MODE */
-      1249, /* GL_NORMALIZE */
-      2312, /* GL_VIEWPORT */
-      1222, /* GL_MODELVIEW_STACK_DEPTH */
-      1513, /* GL_PROJECTION_STACK_DEPTH */
-      2133, /* GL_TEXTURE_STACK_DEPTH */
-      1219, /* GL_MODELVIEW_MATRIX */
-      1511, /* GL_PROJECTION_MATRIX */
-      2113, /* GL_TEXTURE_MATRIX */
+      1913, /* GL_STENCIL_TEST */
+      1894, /* GL_STENCIL_CLEAR_VALUE */
+      1896, /* GL_STENCIL_FUNC */
+      1915, /* GL_STENCIL_VALUE_MASK */
+      1895, /* GL_STENCIL_FAIL */
+      1910, /* GL_STENCIL_PASS_DEPTH_FAIL */
+      1911, /* GL_STENCIL_PASS_DEPTH_PASS */
+      1912, /* GL_STENCIL_REF */
+      1916, /* GL_STENCIL_WRITEMASK */
+      1053, /* GL_MATRIX_MODE */
+      1271, /* GL_NORMALIZE */
+      2334, /* GL_VIEWPORT */
+      1244, /* GL_MODELVIEW_STACK_DEPTH */
+      1535, /* GL_PROJECTION_STACK_DEPTH */
+      2155, /* GL_TEXTURE_STACK_DEPTH */
+      1241, /* GL_MODELVIEW_MATRIX */
+      1533, /* GL_PROJECTION_MATRIX */
+      2135, /* GL_TEXTURE_MATRIX */
         69, /* GL_ATTRIB_STACK_DEPTH */
        169, /* GL_CLIENT_ATTRIB_STACK_DEPTH */
         51, /* GL_ALPHA_TEST */
         52, /* GL_ALPHA_TEST_FUNC */
         53, /* GL_ALPHA_TEST_REF */
-       443, /* GL_DITHER */
+       463, /* GL_DITHER */
         91, /* GL_BLEND_DST */
        105, /* GL_BLEND_SRC */
         88, /* GL_BLEND */
-       878, /* GL_LOGIC_OP_MODE */
-       763, /* GL_INDEX_LOGIC_OP */
+       898, /* GL_LOGIC_OP_MODE */
+       783, /* GL_INDEX_LOGIC_OP */
        233, /* GL_COLOR_LOGIC_OP */
         75, /* GL_AUX_BUFFERS */
-       454, /* GL_DRAW_BUFFER */
-      1566, /* GL_READ_BUFFER */
-      1765, /* GL_SCISSOR_BOX */
-      1766, /* GL_SCISSOR_TEST */
-       762, /* GL_INDEX_CLEAR_VALUE */
-       767, /* GL_INDEX_WRITEMASK */
+       474, /* GL_DRAW_BUFFER */
+      1588, /* GL_READ_BUFFER */
+      1787, /* GL_SCISSOR_BOX */
+      1788, /* GL_SCISSOR_TEST */
+       782, /* GL_INDEX_CLEAR_VALUE */
+       787, /* GL_INDEX_WRITEMASK */
        230, /* GL_COLOR_CLEAR_VALUE */
        272, /* GL_COLOR_WRITEMASK */
-       764, /* GL_INDEX_MODE */
-      1710, /* GL_RGBA_MODE */
-       453, /* GL_DOUBLEBUFFER */
-      1895, /* GL_STEREO */
-      1620, /* GL_RENDER_MODE */
-      1341, /* GL_PERSPECTIVE_CORRECTION_HINT */
-      1399, /* GL_POINT_SMOOTH_HINT */
-       860, /* GL_LINE_SMOOTH_HINT */
-      1417, /* GL_POLYGON_SMOOTH_HINT */
-       610, /* GL_FOG_HINT */
-      2093, /* GL_TEXTURE_GEN_S */
-      2095, /* GL_TEXTURE_GEN_T */
-      2092, /* GL_TEXTURE_GEN_R */
-      2091, /* GL_TEXTURE_GEN_Q */
-      1354, /* GL_PIXEL_MAP_I_TO_I */
-      1360, /* GL_PIXEL_MAP_S_TO_S */
-      1356, /* GL_PIXEL_MAP_I_TO_R */
-      1352, /* GL_PIXEL_MAP_I_TO_G */
-      1350, /* GL_PIXEL_MAP_I_TO_B */
-      1348, /* GL_PIXEL_MAP_I_TO_A */
-      1358, /* GL_PIXEL_MAP_R_TO_R */
-      1346, /* GL_PIXEL_MAP_G_TO_G */
-      1344, /* GL_PIXEL_MAP_B_TO_B */
-      1342, /* GL_PIXEL_MAP_A_TO_A */
-      1355, /* GL_PIXEL_MAP_I_TO_I_SIZE */
-      1361, /* GL_PIXEL_MAP_S_TO_S_SIZE */
-      1357, /* GL_PIXEL_MAP_I_TO_R_SIZE */
-      1353, /* GL_PIXEL_MAP_I_TO_G_SIZE */
-      1351, /* GL_PIXEL_MAP_I_TO_B_SIZE */
-      1349, /* GL_PIXEL_MAP_I_TO_A_SIZE */
-      1359, /* GL_PIXEL_MAP_R_TO_R_SIZE */
-      1347, /* GL_PIXEL_MAP_G_TO_G_SIZE */
-      1345, /* GL_PIXEL_MAP_B_TO_B_SIZE */
-      1343, /* GL_PIXEL_MAP_A_TO_A_SIZE */
-      2197, /* GL_UNPACK_SWAP_BYTES */
-      2192, /* GL_UNPACK_LSB_FIRST */
-      2193, /* GL_UNPACK_ROW_LENGTH */
-      2196, /* GL_UNPACK_SKIP_ROWS */
-      2195, /* GL_UNPACK_SKIP_PIXELS */
-      2190, /* GL_UNPACK_ALIGNMENT */
-      1329, /* GL_PACK_SWAP_BYTES */
-      1324, /* GL_PACK_LSB_FIRST */
-      1325, /* GL_PACK_ROW_LENGTH */
-      1328, /* GL_PACK_SKIP_ROWS */
-      1327, /* GL_PACK_SKIP_PIXELS */
-      1321, /* GL_PACK_ALIGNMENT */
-       974, /* GL_MAP_COLOR */
-       979, /* GL_MAP_STENCIL */
-       766, /* GL_INDEX_SHIFT */
-       765, /* GL_INDEX_OFFSET */
-      1582, /* GL_RED_SCALE */
-      1578, /* GL_RED_BIAS */
-      2338, /* GL_ZOOM_X */
-      2339, /* GL_ZOOM_Y */
-       720, /* GL_GREEN_SCALE */
-       716, /* GL_GREEN_BIAS */
+       784, /* GL_INDEX_MODE */
+      1732, /* GL_RGBA_MODE */
+       473, /* GL_DOUBLEBUFFER */
+      1917, /* GL_STEREO */
+      1642, /* GL_RENDER_MODE */
+      1363, /* GL_PERSPECTIVE_CORRECTION_HINT */
+      1421, /* GL_POINT_SMOOTH_HINT */
+       880, /* GL_LINE_SMOOTH_HINT */
+      1439, /* GL_POLYGON_SMOOTH_HINT */
+       630, /* GL_FOG_HINT */
+      2115, /* GL_TEXTURE_GEN_S */
+      2117, /* GL_TEXTURE_GEN_T */
+      2114, /* GL_TEXTURE_GEN_R */
+      2113, /* GL_TEXTURE_GEN_Q */
+      1376, /* GL_PIXEL_MAP_I_TO_I */
+      1382, /* GL_PIXEL_MAP_S_TO_S */
+      1378, /* GL_PIXEL_MAP_I_TO_R */
+      1374, /* GL_PIXEL_MAP_I_TO_G */
+      1372, /* GL_PIXEL_MAP_I_TO_B */
+      1370, /* GL_PIXEL_MAP_I_TO_A */
+      1380, /* GL_PIXEL_MAP_R_TO_R */
+      1368, /* GL_PIXEL_MAP_G_TO_G */
+      1366, /* GL_PIXEL_MAP_B_TO_B */
+      1364, /* GL_PIXEL_MAP_A_TO_A */
+      1377, /* GL_PIXEL_MAP_I_TO_I_SIZE */
+      1383, /* GL_PIXEL_MAP_S_TO_S_SIZE */
+      1379, /* GL_PIXEL_MAP_I_TO_R_SIZE */
+      1375, /* GL_PIXEL_MAP_I_TO_G_SIZE */
+      1373, /* GL_PIXEL_MAP_I_TO_B_SIZE */
+      1371, /* GL_PIXEL_MAP_I_TO_A_SIZE */
+      1381, /* GL_PIXEL_MAP_R_TO_R_SIZE */
+      1369, /* GL_PIXEL_MAP_G_TO_G_SIZE */
+      1367, /* GL_PIXEL_MAP_B_TO_B_SIZE */
+      1365, /* GL_PIXEL_MAP_A_TO_A_SIZE */
+      2219, /* GL_UNPACK_SWAP_BYTES */
+      2214, /* GL_UNPACK_LSB_FIRST */
+      2215, /* GL_UNPACK_ROW_LENGTH */
+      2218, /* GL_UNPACK_SKIP_ROWS */
+      2217, /* GL_UNPACK_SKIP_PIXELS */
+      2212, /* GL_UNPACK_ALIGNMENT */
+      1351, /* GL_PACK_SWAP_BYTES */
+      1346, /* GL_PACK_LSB_FIRST */
+      1347, /* GL_PACK_ROW_LENGTH */
+      1350, /* GL_PACK_SKIP_ROWS */
+      1349, /* GL_PACK_SKIP_PIXELS */
+      1343, /* GL_PACK_ALIGNMENT */
+       994, /* GL_MAP_COLOR */
+       999, /* GL_MAP_STENCIL */
+       786, /* GL_INDEX_SHIFT */
+       785, /* GL_INDEX_OFFSET */
+      1604, /* GL_RED_SCALE */
+      1600, /* GL_RED_BIAS */
+      2360, /* GL_ZOOM_X */
+      2361, /* GL_ZOOM_Y */
+       740, /* GL_GREEN_SCALE */
+       736, /* GL_GREEN_BIAS */
        115, /* GL_BLUE_SCALE */
        111, /* GL_BLUE_BIAS */
         50, /* GL_ALPHA_SCALE */
         47, /* GL_ALPHA_BIAS */
-       430, /* GL_DEPTH_SCALE */
-       406, /* GL_DEPTH_BIAS */
-      1066, /* GL_MAX_EVAL_ORDER */
-      1083, /* GL_MAX_LIGHTS */
-      1045, /* GL_MAX_CLIP_DISTANCES */
-      1138, /* GL_MAX_TEXTURE_SIZE */
-      1090, /* GL_MAX_PIXEL_MAP_TABLE */
-      1041, /* GL_MAX_ATTRIB_STACK_DEPTH */
-      1086, /* GL_MAX_MODELVIEW_STACK_DEPTH */
-      1087, /* GL_MAX_NAME_STACK_DEPTH */
-      1117, /* GL_MAX_PROJECTION_STACK_DEPTH */
-      1139, /* GL_MAX_TEXTURE_STACK_DEPTH */
-      1165, /* GL_MAX_VIEWPORT_DIMS */
-      1042, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
-      1905, /* GL_SUBPIXEL_BITS */
-       761, /* GL_INDEX_BITS */
-      1579, /* GL_RED_BITS */
-       717, /* GL_GREEN_BITS */
+       450, /* GL_DEPTH_SCALE */
+       426, /* GL_DEPTH_BIAS */
+      1088, /* GL_MAX_EVAL_ORDER */
+      1105, /* GL_MAX_LIGHTS */
+      1065, /* GL_MAX_CLIP_DISTANCES */
+      1160, /* GL_MAX_TEXTURE_SIZE */
+      1112, /* GL_MAX_PIXEL_MAP_TABLE */
+      1061, /* GL_MAX_ATTRIB_STACK_DEPTH */
+      1108, /* GL_MAX_MODELVIEW_STACK_DEPTH */
+      1109, /* GL_MAX_NAME_STACK_DEPTH */
+      1139, /* GL_MAX_PROJECTION_STACK_DEPTH */
+      1161, /* GL_MAX_TEXTURE_STACK_DEPTH */
+      1187, /* GL_MAX_VIEWPORT_DIMS */
+      1062, /* GL_MAX_CLIENT_ATTRIB_STACK_DEPTH */
+      1927, /* GL_SUBPIXEL_BITS */
+       781, /* GL_INDEX_BITS */
+      1601, /* GL_RED_BITS */
+       737, /* GL_GREEN_BITS */
        112, /* GL_BLUE_BITS */
         48, /* GL_ALPHA_BITS */
-       407, /* GL_DEPTH_BITS */
-      1869, /* GL_STENCIL_BITS */
+       427, /* GL_DEPTH_BITS */
+      1891, /* GL_STENCIL_BITS */
         14, /* GL_ACCUM_RED_BITS */
         13, /* GL_ACCUM_GREEN_BITS */
         10, /* GL_ACCUM_BLUE_BITS */
          9, /* GL_ACCUM_ALPHA_BITS */
-      1236, /* GL_NAME_STACK_DEPTH */
+      1258, /* GL_NAME_STACK_DEPTH */
         70, /* GL_AUTO_NORMAL */
-       920, /* GL_MAP1_COLOR_4 */
-       923, /* GL_MAP1_INDEX */
-       924, /* GL_MAP1_NORMAL */
-       925, /* GL_MAP1_TEXTURE_COORD_1 */
-       926, /* GL_MAP1_TEXTURE_COORD_2 */
-       927, /* GL_MAP1_TEXTURE_COORD_3 */
-       928, /* GL_MAP1_TEXTURE_COORD_4 */
-       929, /* GL_MAP1_VERTEX_3 */
-       930, /* GL_MAP1_VERTEX_4 */
-       947, /* GL_MAP2_COLOR_4 */
-       950, /* GL_MAP2_INDEX */
-       951, /* GL_MAP2_NORMAL */
-       952, /* GL_MAP2_TEXTURE_COORD_1 */
-       953, /* GL_MAP2_TEXTURE_COORD_2 */
-       954, /* GL_MAP2_TEXTURE_COORD_3 */
-       955, /* GL_MAP2_TEXTURE_COORD_4 */
-       956, /* GL_MAP2_VERTEX_3 */
-       957, /* GL_MAP2_VERTEX_4 */
-       921, /* GL_MAP1_GRID_DOMAIN */
-       922, /* GL_MAP1_GRID_SEGMENTS */
-       948, /* GL_MAP2_GRID_DOMAIN */
-       949, /* GL_MAP2_GRID_SEGMENTS */
-      1988, /* GL_TEXTURE_1D */
-      1991, /* GL_TEXTURE_2D */
-       559, /* GL_FEEDBACK_BUFFER_POINTER */
-       560, /* GL_FEEDBACK_BUFFER_SIZE */
-       561, /* GL_FEEDBACK_BUFFER_TYPE */
-      1775, /* GL_SELECTION_BUFFER_POINTER */
-      1776, /* GL_SELECTION_BUFFER_SIZE */
-      2139, /* GL_TEXTURE_WIDTH */
-      2099, /* GL_TEXTURE_HEIGHT */
-      2042, /* GL_TEXTURE_COMPONENTS */
-      2020, /* GL_TEXTURE_BORDER_COLOR */
-      2019, /* GL_TEXTURE_BORDER */
-       445, /* GL_DONT_CARE */
-       557, /* GL_FASTEST */
-      1244, /* GL_NICEST */
+       940, /* GL_MAP1_COLOR_4 */
+       943, /* GL_MAP1_INDEX */
+       944, /* GL_MAP1_NORMAL */
+       945, /* GL_MAP1_TEXTURE_COORD_1 */
+       946, /* GL_MAP1_TEXTURE_COORD_2 */
+       947, /* GL_MAP1_TEXTURE_COORD_3 */
+       948, /* GL_MAP1_TEXTURE_COORD_4 */
+       949, /* GL_MAP1_VERTEX_3 */
+       950, /* GL_MAP1_VERTEX_4 */
+       967, /* GL_MAP2_COLOR_4 */
+       970, /* GL_MAP2_INDEX */
+       971, /* GL_MAP2_NORMAL */
+       972, /* GL_MAP2_TEXTURE_COORD_1 */
+       973, /* GL_MAP2_TEXTURE_COORD_2 */
+       974, /* GL_MAP2_TEXTURE_COORD_3 */
+       975, /* GL_MAP2_TEXTURE_COORD_4 */
+       976, /* GL_MAP2_VERTEX_3 */
+       977, /* GL_MAP2_VERTEX_4 */
+       941, /* GL_MAP1_GRID_DOMAIN */
+       942, /* GL_MAP1_GRID_SEGMENTS */
+       968, /* GL_MAP2_GRID_DOMAIN */
+       969, /* GL_MAP2_GRID_SEGMENTS */
+      2010, /* GL_TEXTURE_1D */
+      2013, /* GL_TEXTURE_2D */
+       579, /* GL_FEEDBACK_BUFFER_POINTER */
+       580, /* GL_FEEDBACK_BUFFER_SIZE */
+       581, /* GL_FEEDBACK_BUFFER_TYPE */
+      1797, /* GL_SELECTION_BUFFER_POINTER */
+      1798, /* GL_SELECTION_BUFFER_SIZE */
+      2161, /* GL_TEXTURE_WIDTH */
+      2121, /* GL_TEXTURE_HEIGHT */
+      2064, /* GL_TEXTURE_COMPONENTS */
+      2042, /* GL_TEXTURE_BORDER_COLOR */
+      2041, /* GL_TEXTURE_BORDER */
+       465, /* GL_DONT_CARE */
+       577, /* GL_FASTEST */
+      1266, /* GL_NICEST */
         56, /* GL_AMBIENT */
-       442, /* GL_DIFFUSE */
-      1828, /* GL_SPECULAR */
-      1421, /* GL_POSITION */
-      1831, /* GL_SPOT_DIRECTION */
-      1832, /* GL_SPOT_EXPONENT */
-      1830, /* GL_SPOT_CUTOFF */
+       462, /* GL_DIFFUSE */
+      1850, /* GL_SPECULAR */
+      1443, /* GL_POSITION */
+      1853, /* GL_SPOT_DIRECTION */
+      1854, /* GL_SPOT_EXPONENT */
+      1852, /* GL_SPOT_CUTOFF */
        320, /* GL_CONSTANT_ATTENUATION */
-       848, /* GL_LINEAR_ATTENUATION */
-      1538, /* GL_QUADRATIC_ATTENUATION */
+       868, /* GL_LINEAR_ATTENUATION */
+      1560, /* GL_QUADRATIC_ATTENUATION */
        287, /* GL_COMPILE */
        288, /* GL_COMPILE_AND_EXECUTE */
        149, /* GL_BYTE */
-      2199, /* GL_UNSIGNED_BYTE */
-      1793, /* GL_SHORT */
-      2238, /* GL_UNSIGNED_SHORT */
-       770, /* GL_INT */
-      2202, /* GL_UNSIGNED_INT */
-       570, /* GL_FLOAT */
+      2221, /* GL_UNSIGNED_BYTE */
+      1815, /* GL_SHORT */
+      2260, /* GL_UNSIGNED_SHORT */
+       790, /* GL_INT */
+      2224, /* GL_UNSIGNED_INT */
+       590, /* GL_FLOAT */
          1, /* GL_2_BYTES */
          5, /* GL_3_BYTES */
          7, /* GL_4_BYTES */
-       452, /* GL_DOUBLE */
-       722, /* GL_HALF_FLOAT */
-       565, /* GL_FIXED */
+       472, /* GL_DOUBLE */
+       742, /* GL_HALF_FLOAT */
+       585, /* GL_FIXED */
        165, /* GL_CLEAR */
         58, /* GL_AND */
         60, /* GL_AND_REVERSE */
        351, /* GL_COPY */
         59, /* GL_AND_INVERTED */
-      1247, /* GL_NOOP */
-      2334, /* GL_XOR */
-      1316, /* GL_OR */
-      1248, /* GL_NOR */
-       546, /* GL_EQUIV */
-       824, /* GL_INVERT */
-      1319, /* GL_OR_REVERSE */
+      1269, /* GL_NOOP */
+      2356, /* GL_XOR */
+      1338, /* GL_OR */
+      1270, /* GL_NOR */
+       566, /* GL_EQUIV */
+       844, /* GL_INVERT */
+      1341, /* GL_OR_REVERSE */
        352, /* GL_COPY_INVERTED */
-      1318, /* GL_OR_INVERTED */
-      1237, /* GL_NAND */
-      1782, /* GL_SET */
-       543, /* GL_EMISSION */
-      1792, /* GL_SHININESS */
+      1340, /* GL_OR_INVERTED */
+      1259, /* GL_NAND */
+      1804, /* GL_SET */
+       563, /* GL_EMISSION */
+      1814, /* GL_SHININESS */
         57, /* GL_AMBIENT_AND_DIFFUSE */
        232, /* GL_COLOR_INDEXES */
-      1186, /* GL_MODELVIEW */
-      1510, /* GL_PROJECTION */
-      1923, /* GL_TEXTURE */
+      1208, /* GL_MODELVIEW */
+      1532, /* GL_PROJECTION */
+      1945, /* GL_TEXTURE */
        188, /* GL_COLOR */
-       399, /* GL_DEPTH */
-      1854, /* GL_STENCIL */
+       419, /* GL_DEPTH */
+      1876, /* GL_STENCIL */
        231, /* GL_COLOR_INDEX */
-      1875, /* GL_STENCIL_INDEX */
-       415, /* GL_DEPTH_COMPONENT */
-      1575, /* GL_RED */
-       715, /* GL_GREEN */
+      1897, /* GL_STENCIL_INDEX */
+       435, /* GL_DEPTH_COMPONENT */
+      1597, /* GL_RED */
+       735, /* GL_GREEN */
        110, /* GL_BLUE */
         32, /* GL_ALPHA */
-      1633, /* GL_RGB */
-      1674, /* GL_RGBA */
-       883, /* GL_LUMINANCE */
-       910, /* GL_LUMINANCE_ALPHA */
+      1655, /* GL_RGB */
+      1696, /* GL_RGBA */
+       903, /* GL_LUMINANCE */
+       930, /* GL_LUMINANCE_ALPHA */
         86, /* GL_BITMAP */
-      1371, /* GL_POINT */
-       846, /* GL_LINE */
-       562, /* GL_FILL */
-      1589, /* GL_RENDER */
-       558, /* GL_FEEDBACK */
-      1774, /* GL_SELECT */
-       569, /* GL_FLAT */
-      1803, /* GL_SMOOTH */
-       825, /* GL_KEEP */
-      1622, /* GL_REPLACE */
-       751, /* GL_INCR */
-       395, /* GL_DECR */
-      2255, /* GL_VENDOR */
-      1619, /* GL_RENDERER */
-      2256, /* GL_VERSION */
-       551, /* GL_EXTENSIONS */
-      1722, /* GL_S */
-      1914, /* GL_T */
-      1558, /* GL_R */
-      1537, /* GL_Q */
-      1223, /* GL_MODULATE */
-       394, /* GL_DECAL */
-      2085, /* GL_TEXTURE_ENV_MODE */
-      2084, /* GL_TEXTURE_ENV_COLOR */
-      2083, /* GL_TEXTURE_ENV */
-       552, /* GL_EYE_LINEAR */
-      1277, /* GL_OBJECT_LINEAR */
-      1829, /* GL_SPHERE_MAP */
-      2089, /* GL_TEXTURE_GEN_MODE */
-      1279, /* GL_OBJECT_PLANE */
-       553, /* GL_EYE_PLANE */
-      1238, /* GL_NEAREST */
-       847, /* GL_LINEAR */
-      1242, /* GL_NEAREST_MIPMAP_NEAREST */
-       852, /* GL_LINEAR_MIPMAP_NEAREST */
-      1241, /* GL_NEAREST_MIPMAP_LINEAR */
-       851, /* GL_LINEAR_MIPMAP_LINEAR */
-      2112, /* GL_TEXTURE_MAG_FILTER */
-      2121, /* GL_TEXTURE_MIN_FILTER */
-      2142, /* GL_TEXTURE_WRAP_S */
-      2143, /* GL_TEXTURE_WRAP_T */
+      1393, /* GL_POINT */
+       866, /* GL_LINE */
+       582, /* GL_FILL */
+      1611, /* GL_RENDER */
+       578, /* GL_FEEDBACK */
+      1796, /* GL_SELECT */
+       589, /* GL_FLAT */
+      1825, /* GL_SMOOTH */
+       845, /* GL_KEEP */
+      1644, /* GL_REPLACE */
+       771, /* GL_INCR */
+       415, /* GL_DECR */
+      2277, /* GL_VENDOR */
+      1641, /* GL_RENDERER */
+      2278, /* GL_VERSION */
+       571, /* GL_EXTENSIONS */
+      1744, /* GL_S */
+      1936, /* GL_T */
+      1580, /* GL_R */
+      1559, /* GL_Q */
+      1245, /* GL_MODULATE */
+       414, /* GL_DECAL */
+      2107, /* GL_TEXTURE_ENV_MODE */
+      2106, /* GL_TEXTURE_ENV_COLOR */
+      2105, /* GL_TEXTURE_ENV */
+       572, /* GL_EYE_LINEAR */
+      1299, /* GL_OBJECT_LINEAR */
+      1851, /* GL_SPHERE_MAP */
+      2111, /* GL_TEXTURE_GEN_MODE */
+      1301, /* GL_OBJECT_PLANE */
+       573, /* GL_EYE_PLANE */
+      1260, /* GL_NEAREST */
+       867, /* GL_LINEAR */
+      1264, /* GL_NEAREST_MIPMAP_NEAREST */
+       872, /* GL_LINEAR_MIPMAP_NEAREST */
+      1263, /* GL_NEAREST_MIPMAP_LINEAR */
+       871, /* GL_LINEAR_MIPMAP_LINEAR */
+      2134, /* GL_TEXTURE_MAG_FILTER */
+      2143, /* GL_TEXTURE_MIN_FILTER */
+      2164, /* GL_TEXTURE_WRAP_S */
+      2165, /* GL_TEXTURE_WRAP_T */
        155, /* GL_CLAMP */
-      1621, /* GL_REPEAT */
-      1415, /* GL_POLYGON_OFFSET_UNITS */
-      1414, /* GL_POLYGON_OFFSET_POINT */
-      1413, /* GL_POLYGON_OFFSET_LINE */
-      1561, /* GL_R3_G3_B2 */
-      2252, /* GL_V2F */
-      2253, /* GL_V3F */
+      1643, /* GL_REPEAT */
+      1437, /* GL_POLYGON_OFFSET_UNITS */
+      1436, /* GL_POLYGON_OFFSET_POINT */
+      1435, /* GL_POLYGON_OFFSET_LINE */
+      1583, /* GL_R3_G3_B2 */
+      2274, /* GL_V2F */
+      2275, /* GL_V3F */
        152, /* GL_C4UB_V2F */
        153, /* GL_C4UB_V3F */
        150, /* GL_C3F_V3F */
-      1235, /* GL_N3F_V3F */
+      1257, /* GL_N3F_V3F */
        151, /* GL_C4F_N3F_V3F */
-      1919, /* GL_T2F_V3F */
-      1921, /* GL_T4F_V4F */
-      1917, /* GL_T2F_C4UB_V3F */
-      1915, /* GL_T2F_C3F_V3F */
-      1918, /* GL_T2F_N3F_V3F */
-      1916, /* GL_T2F_C4F_N3F_V3F */
-      1920, /* GL_T4F_C4F_N3F_V4F */
+      1941, /* GL_T2F_V3F */
+      1943, /* GL_T4F_V4F */
+      1939, /* GL_T2F_C4UB_V3F */
+      1937, /* GL_T2F_C3F_V3F */
+      1940, /* GL_T2F_N3F_V3F */
+      1938, /* GL_T2F_C4F_N3F_V3F */
+      1942, /* GL_T4F_C4F_N3F_V4F */
        172, /* GL_CLIP_DISTANCE0 */
        173, /* GL_CLIP_DISTANCE1 */
        174, /* GL_CLIP_DISTANCE2 */
@@ -5154,184 +5198,184 @@ static const unsigned reduced_enums[1572] =
        177, /* GL_CLIP_DISTANCE5 */
        178, /* GL_CLIP_DISTANCE6 */
        179, /* GL_CLIP_DISTANCE7 */
-       831, /* GL_LIGHT0 */
-       832, /* GL_LIGHT1 */
-       833, /* GL_LIGHT2 */
-       834, /* GL_LIGHT3 */
-       835, /* GL_LIGHT4 */
-       836, /* GL_LIGHT5 */
-       837, /* GL_LIGHT6 */
-       838, /* GL_LIGHT7 */
-       726, /* GL_HINT_BIT */
+       851, /* GL_LIGHT0 */
+       852, /* GL_LIGHT1 */
+       853, /* GL_LIGHT2 */
+       854, /* GL_LIGHT3 */
+       855, /* GL_LIGHT4 */
+       856, /* GL_LIGHT5 */
+       857, /* GL_LIGHT6 */
+       858, /* GL_LIGHT7 */
+       746, /* GL_HINT_BIT */
        322, /* GL_CONSTANT_COLOR */
-      1290, /* GL_ONE_MINUS_CONSTANT_COLOR */
+      1312, /* GL_ONE_MINUS_CONSTANT_COLOR */
        317, /* GL_CONSTANT_ALPHA */
-      1288, /* GL_ONE_MINUS_CONSTANT_ALPHA */
+      1310, /* GL_ONE_MINUS_CONSTANT_ALPHA */
         89, /* GL_BLEND_COLOR */
-       691, /* GL_FUNC_ADD */
-      1168, /* GL_MIN */
-      1036, /* GL_MAX */
+       711, /* GL_FUNC_ADD */
+      1190, /* GL_MIN */
+      1056, /* GL_MAX */
         96, /* GL_BLEND_EQUATION */
-       697, /* GL_FUNC_SUBTRACT */
-       694, /* GL_FUNC_REVERSE_SUBTRACT */
+       717, /* GL_FUNC_SUBTRACT */
+       714, /* GL_FUNC_REVERSE_SUBTRACT */
        331, /* GL_CONVOLUTION_1D */
        332, /* GL_CONVOLUTION_2D */
-      1777, /* GL_SEPARABLE_2D */
+      1799, /* GL_SEPARABLE_2D */
        335, /* GL_CONVOLUTION_BORDER_MODE */
        339, /* GL_CONVOLUTION_FILTER_SCALE */
        337, /* GL_CONVOLUTION_FILTER_BIAS */
-      1576, /* GL_REDUCE */
+      1598, /* GL_REDUCE */
        341, /* GL_CONVOLUTION_FORMAT */
        345, /* GL_CONVOLUTION_WIDTH */
        343, /* GL_CONVOLUTION_HEIGHT */
-      1055, /* GL_MAX_CONVOLUTION_WIDTH */
-      1053, /* GL_MAX_CONVOLUTION_HEIGHT */
-      1454, /* GL_POST_CONVOLUTION_RED_SCALE */
-      1450, /* GL_POST_CONVOLUTION_GREEN_SCALE */
-      1445, /* GL_POST_CONVOLUTION_BLUE_SCALE */
-      1441, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
-      1452, /* GL_POST_CONVOLUTION_RED_BIAS */
-      1448, /* GL_POST_CONVOLUTION_GREEN_BIAS */
-      1443, /* GL_POST_CONVOLUTION_BLUE_BIAS */
-      1439, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
-       727, /* GL_HISTOGRAM */
-      1517, /* GL_PROXY_HISTOGRAM */
-       743, /* GL_HISTOGRAM_WIDTH */
-       733, /* GL_HISTOGRAM_FORMAT */
-       739, /* GL_HISTOGRAM_RED_SIZE */
-       735, /* GL_HISTOGRAM_GREEN_SIZE */
-       730, /* GL_HISTOGRAM_BLUE_SIZE */
-       728, /* GL_HISTOGRAM_ALPHA_SIZE */
-       737, /* GL_HISTOGRAM_LUMINANCE_SIZE */
-       741, /* GL_HISTOGRAM_SINK */
-      1169, /* GL_MINMAX */
-      1171, /* GL_MINMAX_FORMAT */
-      1173, /* GL_MINMAX_SINK */
-      1922, /* GL_TABLE_TOO_LARGE_EXT */
-      2201, /* GL_UNSIGNED_BYTE_3_3_2 */
-      2241, /* GL_UNSIGNED_SHORT_4_4_4_4 */
-      2244, /* GL_UNSIGNED_SHORT_5_5_5_1 */
-      2213, /* GL_UNSIGNED_INT_8_8_8_8 */
-      2204, /* GL_UNSIGNED_INT_10_10_10_2 */
-      1412, /* GL_POLYGON_OFFSET_FILL */
-      1411, /* GL_POLYGON_OFFSET_FACTOR */
-      1410, /* GL_POLYGON_OFFSET_BIAS */
-      1626, /* GL_RESCALE_NORMAL */
+      1075, /* GL_MAX_CONVOLUTION_WIDTH */
+      1073, /* GL_MAX_CONVOLUTION_HEIGHT */
+      1476, /* GL_POST_CONVOLUTION_RED_SCALE */
+      1472, /* GL_POST_CONVOLUTION_GREEN_SCALE */
+      1467, /* GL_POST_CONVOLUTION_BLUE_SCALE */
+      1463, /* GL_POST_CONVOLUTION_ALPHA_SCALE */
+      1474, /* GL_POST_CONVOLUTION_RED_BIAS */
+      1470, /* GL_POST_CONVOLUTION_GREEN_BIAS */
+      1465, /* GL_POST_CONVOLUTION_BLUE_BIAS */
+      1461, /* GL_POST_CONVOLUTION_ALPHA_BIAS */
+       747, /* GL_HISTOGRAM */
+      1539, /* GL_PROXY_HISTOGRAM */
+       763, /* GL_HISTOGRAM_WIDTH */
+       753, /* GL_HISTOGRAM_FORMAT */
+       759, /* GL_HISTOGRAM_RED_SIZE */
+       755, /* GL_HISTOGRAM_GREEN_SIZE */
+       750, /* GL_HISTOGRAM_BLUE_SIZE */
+       748, /* GL_HISTOGRAM_ALPHA_SIZE */
+       757, /* GL_HISTOGRAM_LUMINANCE_SIZE */
+       761, /* GL_HISTOGRAM_SINK */
+      1191, /* GL_MINMAX */
+      1193, /* GL_MINMAX_FORMAT */
+      1195, /* GL_MINMAX_SINK */
+      1944, /* GL_TABLE_TOO_LARGE_EXT */
+      2223, /* GL_UNSIGNED_BYTE_3_3_2 */
+      2263, /* GL_UNSIGNED_SHORT_4_4_4_4 */
+      2266, /* GL_UNSIGNED_SHORT_5_5_5_1 */
+      2235, /* GL_UNSIGNED_INT_8_8_8_8 */
+      2226, /* GL_UNSIGNED_INT_10_10_10_2 */
+      1434, /* GL_POLYGON_OFFSET_FILL */
+      1433, /* GL_POLYGON_OFFSET_FACTOR */
+      1432, /* GL_POLYGON_OFFSET_BIAS */
+      1648, /* GL_RESCALE_NORMAL */
         41, /* GL_ALPHA4 */
         43, /* GL_ALPHA8 */
         33, /* GL_ALPHA12 */
         35, /* GL_ALPHA16 */
-       898, /* GL_LUMINANCE4 */
-       904, /* GL_LUMINANCE8 */
-       884, /* GL_LUMINANCE12 */
-       890, /* GL_LUMINANCE16 */
-       899, /* GL_LUMINANCE4_ALPHA4 */
-       902, /* GL_LUMINANCE6_ALPHA2 */
-       907, /* GL_LUMINANCE8_ALPHA8 */
-       887, /* GL_LUMINANCE12_ALPHA4 */
-       885, /* GL_LUMINANCE12_ALPHA12 */
-       893, /* GL_LUMINANCE16_ALPHA16 */
-       771, /* GL_INTENSITY */
-       780, /* GL_INTENSITY4 */
-       782, /* GL_INTENSITY8 */
-       772, /* GL_INTENSITY12 */
-       774, /* GL_INTENSITY16 */
-      1649, /* GL_RGB2_EXT */
-      1655, /* GL_RGB4 */
-      1658, /* GL_RGB5 */
-      1665, /* GL_RGB8 */
-      1634, /* GL_RGB10 */
-      1639, /* GL_RGB12 */
-      1641, /* GL_RGB16 */
-      1685, /* GL_RGBA2 */
-      1692, /* GL_RGBA4 */
-      1661, /* GL_RGB5_A1 */
-      1697, /* GL_RGBA8 */
-      1635, /* GL_RGB10_A2 */
-      1675, /* GL_RGBA12 */
-      1677, /* GL_RGBA16 */
-      2129, /* GL_TEXTURE_RED_SIZE */
-      2097, /* GL_TEXTURE_GREEN_SIZE */
-      2017, /* GL_TEXTURE_BLUE_SIZE */
-      1996, /* GL_TEXTURE_ALPHA_SIZE */
-      2110, /* GL_TEXTURE_LUMINANCE_SIZE */
-      2101, /* GL_TEXTURE_INTENSITY_SIZE */
-      1623, /* GL_REPLACE_EXT */
-      1521, /* GL_PROXY_TEXTURE_1D */
-      1525, /* GL_PROXY_TEXTURE_2D */
-      2137, /* GL_TEXTURE_TOO_LARGE_EXT */
-      2123, /* GL_TEXTURE_PRIORITY */
-      2131, /* GL_TEXTURE_RESIDENT */
-      1999, /* GL_TEXTURE_BINDING_1D */
-      2002, /* GL_TEXTURE_BINDING_2D */
-      2005, /* GL_TEXTURE_BINDING_3D */
-      1326, /* GL_PACK_SKIP_IMAGES */
-      1322, /* GL_PACK_IMAGE_HEIGHT */
-      2194, /* GL_UNPACK_SKIP_IMAGES */
-      2191, /* GL_UNPACK_IMAGE_HEIGHT */
-      1994, /* GL_TEXTURE_3D */
-      1529, /* GL_PROXY_TEXTURE_3D */
-      2080, /* GL_TEXTURE_DEPTH */
-      2140, /* GL_TEXTURE_WRAP_R */
-      1037, /* GL_MAX_3D_TEXTURE_SIZE */
-      2257, /* GL_VERTEX_ARRAY */
-      1250, /* GL_NORMAL_ARRAY */
+       918, /* GL_LUMINANCE4 */
+       924, /* GL_LUMINANCE8 */
+       904, /* GL_LUMINANCE12 */
+       910, /* GL_LUMINANCE16 */
+       919, /* GL_LUMINANCE4_ALPHA4 */
+       922, /* GL_LUMINANCE6_ALPHA2 */
+       927, /* GL_LUMINANCE8_ALPHA8 */
+       907, /* GL_LUMINANCE12_ALPHA4 */
+       905, /* GL_LUMINANCE12_ALPHA12 */
+       913, /* GL_LUMINANCE16_ALPHA16 */
+       791, /* GL_INTENSITY */
+       800, /* GL_INTENSITY4 */
+       802, /* GL_INTENSITY8 */
+       792, /* GL_INTENSITY12 */
+       794, /* GL_INTENSITY16 */
+      1671, /* GL_RGB2_EXT */
+      1677, /* GL_RGB4 */
+      1680, /* GL_RGB5 */
+      1687, /* GL_RGB8 */
+      1656, /* GL_RGB10 */
+      1661, /* GL_RGB12 */
+      1663, /* GL_RGB16 */
+      1707, /* GL_RGBA2 */
+      1714, /* GL_RGBA4 */
+      1683, /* GL_RGB5_A1 */
+      1719, /* GL_RGBA8 */
+      1657, /* GL_RGB10_A2 */
+      1697, /* GL_RGBA12 */
+      1699, /* GL_RGBA16 */
+      2151, /* GL_TEXTURE_RED_SIZE */
+      2119, /* GL_TEXTURE_GREEN_SIZE */
+      2039, /* GL_TEXTURE_BLUE_SIZE */
+      2018, /* GL_TEXTURE_ALPHA_SIZE */
+      2132, /* GL_TEXTURE_LUMINANCE_SIZE */
+      2123, /* GL_TEXTURE_INTENSITY_SIZE */
+      1645, /* GL_REPLACE_EXT */
+      1543, /* GL_PROXY_TEXTURE_1D */
+      1547, /* GL_PROXY_TEXTURE_2D */
+      2159, /* GL_TEXTURE_TOO_LARGE_EXT */
+      2145, /* GL_TEXTURE_PRIORITY */
+      2153, /* GL_TEXTURE_RESIDENT */
+      2021, /* GL_TEXTURE_BINDING_1D */
+      2024, /* GL_TEXTURE_BINDING_2D */
+      2027, /* GL_TEXTURE_BINDING_3D */
+      1348, /* GL_PACK_SKIP_IMAGES */
+      1344, /* GL_PACK_IMAGE_HEIGHT */
+      2216, /* GL_UNPACK_SKIP_IMAGES */
+      2213, /* GL_UNPACK_IMAGE_HEIGHT */
+      2016, /* GL_TEXTURE_3D */
+      1551, /* GL_PROXY_TEXTURE_3D */
+      2102, /* GL_TEXTURE_DEPTH */
+      2162, /* GL_TEXTURE_WRAP_R */
+      1057, /* GL_MAX_3D_TEXTURE_SIZE */
+      2279, /* GL_VERTEX_ARRAY */
+      1272, /* GL_NORMAL_ARRAY */
        189, /* GL_COLOR_ARRAY */
-       755, /* GL_INDEX_ARRAY */
-      2050, /* GL_TEXTURE_COORD_ARRAY */
-       535, /* GL_EDGE_FLAG_ARRAY */
-      2263, /* GL_VERTEX_ARRAY_SIZE */
-      2265, /* GL_VERTEX_ARRAY_TYPE */
-      2264, /* GL_VERTEX_ARRAY_STRIDE */
-      1255, /* GL_NORMAL_ARRAY_TYPE */
-      1254, /* GL_NORMAL_ARRAY_STRIDE */
+       775, /* GL_INDEX_ARRAY */
+      2072, /* GL_TEXTURE_COORD_ARRAY */
+       555, /* GL_EDGE_FLAG_ARRAY */
+      2285, /* GL_VERTEX_ARRAY_SIZE */
+      2287, /* GL_VERTEX_ARRAY_TYPE */
+      2286, /* GL_VERTEX_ARRAY_STRIDE */
+      1277, /* GL_NORMAL_ARRAY_TYPE */
+      1276, /* GL_NORMAL_ARRAY_STRIDE */
        193, /* GL_COLOR_ARRAY_SIZE */
        195, /* GL_COLOR_ARRAY_TYPE */
        194, /* GL_COLOR_ARRAY_STRIDE */
-       760, /* GL_INDEX_ARRAY_TYPE */
-       759, /* GL_INDEX_ARRAY_STRIDE */
-      2054, /* GL_TEXTURE_COORD_ARRAY_SIZE */
-      2056, /* GL_TEXTURE_COORD_ARRAY_TYPE */
-      2055, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
-       539, /* GL_EDGE_FLAG_ARRAY_STRIDE */
-      2262, /* GL_VERTEX_ARRAY_POINTER */
-      1253, /* GL_NORMAL_ARRAY_POINTER */
+       780, /* GL_INDEX_ARRAY_TYPE */
+       779, /* GL_INDEX_ARRAY_STRIDE */
+      2076, /* GL_TEXTURE_COORD_ARRAY_SIZE */
+      2078, /* GL_TEXTURE_COORD_ARRAY_TYPE */
+      2077, /* GL_TEXTURE_COORD_ARRAY_STRIDE */
+       559, /* GL_EDGE_FLAG_ARRAY_STRIDE */
+      2284, /* GL_VERTEX_ARRAY_POINTER */
+      1275, /* GL_NORMAL_ARRAY_POINTER */
        192, /* GL_COLOR_ARRAY_POINTER */
-       758, /* GL_INDEX_ARRAY_POINTER */
-      2053, /* GL_TEXTURE_COORD_ARRAY_POINTER */
-       538, /* GL_EDGE_FLAG_ARRAY_POINTER */
-      1228, /* GL_MULTISAMPLE */
-      1751, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
-      1753, /* GL_SAMPLE_ALPHA_TO_ONE */
-      1758, /* GL_SAMPLE_COVERAGE */
-      1755, /* GL_SAMPLE_BUFFERS */
-      1746, /* GL_SAMPLES */
-      1762, /* GL_SAMPLE_COVERAGE_VALUE */
-      1760, /* GL_SAMPLE_COVERAGE_INVERT */
+       778, /* GL_INDEX_ARRAY_POINTER */
+      2075, /* GL_TEXTURE_COORD_ARRAY_POINTER */
+       558, /* GL_EDGE_FLAG_ARRAY_POINTER */
+      1250, /* GL_MULTISAMPLE */
+      1773, /* GL_SAMPLE_ALPHA_TO_COVERAGE */
+      1775, /* GL_SAMPLE_ALPHA_TO_ONE */
+      1780, /* GL_SAMPLE_COVERAGE */
+      1777, /* GL_SAMPLE_BUFFERS */
+      1768, /* GL_SAMPLES */
+      1784, /* GL_SAMPLE_COVERAGE_VALUE */
+      1782, /* GL_SAMPLE_COVERAGE_INVERT */
        237, /* GL_COLOR_MATRIX */
        239, /* GL_COLOR_MATRIX_STACK_DEPTH */
-      1049, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
-      1437, /* GL_POST_COLOR_MATRIX_RED_SCALE */
-      1433, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
-      1428, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
-      1424, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
-      1435, /* GL_POST_COLOR_MATRIX_RED_BIAS */
-      1431, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
-      1426, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
-      1422, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
-      2033, /* GL_TEXTURE_COLOR_TABLE_SGI */
-      1530, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
-      2035, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
+      1069, /* GL_MAX_COLOR_MATRIX_STACK_DEPTH */
+      1459, /* GL_POST_COLOR_MATRIX_RED_SCALE */
+      1455, /* GL_POST_COLOR_MATRIX_GREEN_SCALE */
+      1450, /* GL_POST_COLOR_MATRIX_BLUE_SCALE */
+      1446, /* GL_POST_COLOR_MATRIX_ALPHA_SCALE */
+      1457, /* GL_POST_COLOR_MATRIX_RED_BIAS */
+      1453, /* GL_POST_COLOR_MATRIX_GREEN_BIAS */
+      1448, /* GL_POST_COLOR_MATRIX_BLUE_BIAS */
+      1444, /* GL_POST_COLOR_MATRIX_ALPHA_BIAS */
+      2055, /* GL_TEXTURE_COLOR_TABLE_SGI */
+      1552, /* GL_PROXY_TEXTURE_COLOR_TABLE_SGI */
+      2057, /* GL_TEXTURE_COMPARE_FAIL_VALUE_ARB */
         94, /* GL_BLEND_DST_RGB */
        108, /* GL_BLEND_SRC_RGB */
         92, /* GL_BLEND_DST_ALPHA */
        106, /* GL_BLEND_SRC_ALPHA */
        243, /* GL_COLOR_TABLE */
-      1447, /* GL_POST_CONVOLUTION_COLOR_TABLE */
-      1430, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
-      1516, /* GL_PROXY_COLOR_TABLE */
-      1520, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
-      1519, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
+      1469, /* GL_POST_CONVOLUTION_COLOR_TABLE */
+      1452, /* GL_POST_COLOR_MATRIX_COLOR_TABLE */
+      1538, /* GL_PROXY_COLOR_TABLE */
+      1542, /* GL_PROXY_POST_CONVOLUTION_COLOR_TABLE */
+      1541, /* GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE */
        267, /* GL_COLOR_TABLE_SCALE */
        247, /* GL_COLOR_TABLE_BIAS */
        252, /* GL_COLOR_TABLE_FORMAT */
@@ -5344,400 +5388,416 @@ static const unsigned reduced_enums[1572] =
        258, /* GL_COLOR_TABLE_INTENSITY_SIZE */
         79, /* GL_BGR */
         80, /* GL_BGRA */
-      1065, /* GL_MAX_ELEMENTS_VERTICES */
-      1064, /* GL_MAX_ELEMENTS_INDICES */
-      2100, /* GL_TEXTURE_INDEX_SIZE_EXT */
+      1087, /* GL_MAX_ELEMENTS_VERTICES */
+      1086, /* GL_MAX_ELEMENTS_INDICES */
+      2122, /* GL_TEXTURE_INDEX_SIZE_EXT */
        186, /* GL_CLIP_VOLUME_CLIPPING_HINT_EXT */
-      1393, /* GL_POINT_SIZE_MIN */
-      1389, /* GL_POINT_SIZE_MAX */
-      1378, /* GL_POINT_FADE_THRESHOLD_SIZE */
-      1374, /* GL_POINT_DISTANCE_ATTENUATION */
+      1415, /* GL_POINT_SIZE_MIN */
+      1411, /* GL_POINT_SIZE_MAX */
+      1400, /* GL_POINT_FADE_THRESHOLD_SIZE */
+      1396, /* GL_POINT_DISTANCE_ATTENUATION */
        159, /* GL_CLAMP_TO_BORDER */
        162, /* GL_CLAMP_TO_EDGE */
-      2122, /* GL_TEXTURE_MIN_LOD */
-      2120, /* GL_TEXTURE_MAX_LOD */
-      1998, /* GL_TEXTURE_BASE_LEVEL */
-      2119, /* GL_TEXTURE_MAX_LEVEL */
-       746, /* GL_IGNORE_BORDER_HP */
+      2144, /* GL_TEXTURE_MIN_LOD */
+      2142, /* GL_TEXTURE_MAX_LOD */
+      2020, /* GL_TEXTURE_BASE_LEVEL */
+      2141, /* GL_TEXTURE_MAX_LEVEL */
+       766, /* GL_IGNORE_BORDER_HP */
        321, /* GL_CONSTANT_BORDER_HP */
-      1624, /* GL_REPLICATE_BORDER_HP */
+      1646, /* GL_REPLICATE_BORDER_HP */
        333, /* GL_CONVOLUTION_BORDER_COLOR */
-      1285, /* GL_OCCLUSION_TEST_HP */
-      1286, /* GL_OCCLUSION_TEST_RESULT_HP */
-       849, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
-      2027, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
-      2029, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
-      2031, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
-      2032, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-      2030, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
-      2028, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
-      1043, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
-      1044, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
-      1457, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
-      1459, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
-      1456, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
-      1458, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
-      2108, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
-      2109, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
-      2107, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
-       700, /* GL_GENERATE_MIPMAP */
-       701, /* GL_GENERATE_MIPMAP_HINT */
-       613, /* GL_FOG_OFFSET_SGIX */
-       614, /* GL_FOG_OFFSET_VALUE_SGIX */
-      2041, /* GL_TEXTURE_COMPARE_SGIX */
-      2040, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
-      2104, /* GL_TEXTURE_LEQUAL_R_SGIX */
-      2096, /* GL_TEXTURE_GEQUAL_R_SGIX */
-       416, /* GL_DEPTH_COMPONENT16 */
-       420, /* GL_DEPTH_COMPONENT24 */
-       424, /* GL_DEPTH_COMPONENT32 */
+      1307, /* GL_OCCLUSION_TEST_HP */
+      1308, /* GL_OCCLUSION_TEST_RESULT_HP */
+       869, /* GL_LINEAR_CLIPMAP_LINEAR_SGIX */
+      2049, /* GL_TEXTURE_CLIPMAP_CENTER_SGIX */
+      2051, /* GL_TEXTURE_CLIPMAP_FRAME_SGIX */
+      2053, /* GL_TEXTURE_CLIPMAP_OFFSET_SGIX */
+      2054, /* GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+      2052, /* GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX */
+      2050, /* GL_TEXTURE_CLIPMAP_DEPTH_SGIX */
+      1063, /* GL_MAX_CLIPMAP_DEPTH_SGIX */
+      1064, /* GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX */
+      1479, /* GL_POST_TEXTURE_FILTER_BIAS_SGIX */
+      1481, /* GL_POST_TEXTURE_FILTER_SCALE_SGIX */
+      1478, /* GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX */
+      1480, /* GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX */
+      2130, /* GL_TEXTURE_LOD_BIAS_S_SGIX */
+      2131, /* GL_TEXTURE_LOD_BIAS_T_SGIX */
+      2129, /* GL_TEXTURE_LOD_BIAS_R_SGIX */
+       720, /* GL_GENERATE_MIPMAP */
+       721, /* GL_GENERATE_MIPMAP_HINT */
+       633, /* GL_FOG_OFFSET_SGIX */
+       634, /* GL_FOG_OFFSET_VALUE_SGIX */
+      2063, /* GL_TEXTURE_COMPARE_SGIX */
+      2062, /* GL_TEXTURE_COMPARE_OPERATOR_SGIX */
+      2126, /* GL_TEXTURE_LEQUAL_R_SGIX */
+      2118, /* GL_TEXTURE_GEQUAL_R_SGIX */
+       436, /* GL_DEPTH_COMPONENT16 */
+       440, /* GL_DEPTH_COMPONENT24 */
+       444, /* GL_DEPTH_COMPONENT32 */
        358, /* GL_CULL_VERTEX_EXT */
        360, /* GL_CULL_VERTEX_OBJECT_POSITION_EXT */
        359, /* GL_CULL_VERTEX_EYE_POSITION_EXT */
-      2330, /* GL_WRAP_BORDER_SUN */
-      2034, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
-       842, /* GL_LIGHT_MODEL_COLOR_CONTROL */
-      1796, /* GL_SINGLE_COLOR */
-      1780, /* GL_SEPARATE_SPECULAR_COLOR */
-      1791, /* GL_SHARED_TEXTURE_PALETTE_EXT */
-       625, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
-       626, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
-       637, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
-       628, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
-       624, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
-       623, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
-       627, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
-       638, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
-       655, /* GL_FRAMEBUFFER_DEFAULT */
-       682, /* GL_FRAMEBUFFER_UNDEFINED */
-       432, /* GL_DEPTH_STENCIL_ATTACHMENT */
-       919, /* GL_MAJOR_VERSION */
-      1175, /* GL_MINOR_VERSION */
-      1265, /* GL_NUM_EXTENSIONS */
+      2352, /* GL_WRAP_BORDER_SUN */
+      2056, /* GL_TEXTURE_COLOR_WRITEMASK_SGIS */
+       862, /* GL_LIGHT_MODEL_COLOR_CONTROL */
+      1818, /* GL_SINGLE_COLOR */
+      1802, /* GL_SEPARATE_SPECULAR_COLOR */
+      1813, /* GL_SHARED_TEXTURE_PALETTE_EXT */
+       645, /* GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING */
+       646, /* GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE */
+       657, /* GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE */
+       648, /* GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE */
+       644, /* GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE */
+       643, /* GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE */
+       647, /* GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE */
+       658, /* GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE */
+       675, /* GL_FRAMEBUFFER_DEFAULT */
+       702, /* GL_FRAMEBUFFER_UNDEFINED */
+       452, /* GL_DEPTH_STENCIL_ATTACHMENT */
+       939, /* GL_MAJOR_VERSION */
+      1197, /* GL_MINOR_VERSION */
+      1287, /* GL_NUM_EXTENSIONS */
        327, /* GL_CONTEXT_FLAGS */
-       754, /* GL_INDEX */
-       410, /* GL_DEPTH_BUFFER */
-      1870, /* GL_STENCIL_BUFFER */
+       774, /* GL_INDEX */
+       430, /* GL_DEPTH_BUFFER */
+      1892, /* GL_STENCIL_BUFFER */
        298, /* GL_COMPRESSED_RED */
        299, /* GL_COMPRESSED_RG */
-       879, /* GL_LOSE_CONTEXT_ON_RESET_ARB */
-       721, /* GL_GUILTY_CONTEXT_RESET_ARB */
-       769, /* GL_INNOCENT_CONTEXT_RESET_ARB */
-      2189, /* GL_UNKNOWN_CONTEXT_RESET_ARB */
-      1628, /* GL_RESET_NOTIFICATION_STRATEGY_ARB */
-      1479, /* GL_PROGRAM_BINARY_RETRIEVABLE_HINT */
-      1262, /* GL_NO_RESET_NOTIFICATION_ARB */
-      2200, /* GL_UNSIGNED_BYTE_2_3_3_REV */
-      2245, /* GL_UNSIGNED_SHORT_5_6_5 */
-      2246, /* GL_UNSIGNED_SHORT_5_6_5_REV */
-      2242, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
-      2239, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
-      2214, /* GL_UNSIGNED_INT_8_8_8_8_REV */
-      2210, /* GL_UNSIGNED_INT_2_10_10_10_REV */
-      2117, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
-      2118, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
-      2116, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
-      1178, /* GL_MIRRORED_REPEAT */
-      1715, /* GL_RGB_S3TC */
-      1657, /* GL_RGB4_S3TC */
-      1711, /* GL_RGBA_S3TC */
-      1696, /* GL_RGBA4_S3TC */
-      1705, /* GL_RGBA_DXT5_S3TC */
-      1693, /* GL_RGBA4_DXT5_S3TC */
+       397, /* GL_DEBUG_OUTPUT_SYNCHRONOUS_ARB */
+       395, /* GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_ARB */
+       392, /* GL_DEBUG_CALLBACK_FUNCTION_ARB */
+       393, /* GL_DEBUG_CALLBACK_USER_PARAM_ARB */
+       402, /* GL_DEBUG_SOURCE_API_ARB */
+       407, /* GL_DEBUG_SOURCE_WINDOW_SYSTEM_ARB */
+       405, /* GL_DEBUG_SOURCE_SHADER_COMPILER_ARB */
+       406, /* GL_DEBUG_SOURCE_THIRD_PARTY_ARB */
+       403, /* GL_DEBUG_SOURCE_APPLICATION_ARB */
+       404, /* GL_DEBUG_SOURCE_OTHER_ARB */
+       409, /* GL_DEBUG_TYPE_ERROR_ARB */
+       408, /* GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_ARB */
+       413, /* GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_ARB */
+       412, /* GL_DEBUG_TYPE_PORTABILITY_ARB */
+       411, /* GL_DEBUG_TYPE_PERFORMANCE_ARB */
+       410, /* GL_DEBUG_TYPE_OTHER_ARB */
+       899, /* GL_LOSE_CONTEXT_ON_RESET_ARB */
+       741, /* GL_GUILTY_CONTEXT_RESET_ARB */
+       789, /* GL_INNOCENT_CONTEXT_RESET_ARB */
+      2211, /* GL_UNKNOWN_CONTEXT_RESET_ARB */
+      1650, /* GL_RESET_NOTIFICATION_STRATEGY_ARB */
+      1501, /* GL_PROGRAM_BINARY_RETRIEVABLE_HINT */
+      1284, /* GL_NO_RESET_NOTIFICATION_ARB */
+      2222, /* GL_UNSIGNED_BYTE_2_3_3_REV */
+      2267, /* GL_UNSIGNED_SHORT_5_6_5 */
+      2268, /* GL_UNSIGNED_SHORT_5_6_5_REV */
+      2264, /* GL_UNSIGNED_SHORT_4_4_4_4_REV */
+      2261, /* GL_UNSIGNED_SHORT_1_5_5_5_REV */
+      2236, /* GL_UNSIGNED_INT_8_8_8_8_REV */
+      2232, /* GL_UNSIGNED_INT_2_10_10_10_REV */
+      2139, /* GL_TEXTURE_MAX_CLAMP_S_SGIX */
+      2140, /* GL_TEXTURE_MAX_CLAMP_T_SGIX */
+      2138, /* GL_TEXTURE_MAX_CLAMP_R_SGIX */
+      1200, /* GL_MIRRORED_REPEAT */
+      1737, /* GL_RGB_S3TC */
+      1679, /* GL_RGB4_S3TC */
+      1733, /* GL_RGBA_S3TC */
+      1718, /* GL_RGBA4_S3TC */
+      1727, /* GL_RGBA_DXT5_S3TC */
+      1715, /* GL_RGBA4_DXT5_S3TC */
        309, /* GL_COMPRESSED_RGB_S3TC_DXT1_EXT */
        304, /* GL_COMPRESSED_RGBA_S3TC_DXT1_EXT */
        305, /* GL_COMPRESSED_RGBA_S3TC_DXT3_EXT */
        306, /* GL_COMPRESSED_RGBA_S3TC_DXT5_EXT */
-      1240, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
-      1239, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
-       850, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
-       600, /* GL_FOG_COORDINATE_SOURCE */
-       592, /* GL_FOG_COORD */
-       616, /* GL_FRAGMENT_DEPTH */
+      1262, /* GL_NEAREST_CLIPMAP_NEAREST_SGIX */
+      1261, /* GL_NEAREST_CLIPMAP_LINEAR_SGIX */
+       870, /* GL_LINEAR_CLIPMAP_NEAREST_SGIX */
+       620, /* GL_FOG_COORDINATE_SOURCE */
+       612, /* GL_FOG_COORD */
+       636, /* GL_FRAGMENT_DEPTH */
        364, /* GL_CURRENT_FOG_COORD */
-       599, /* GL_FOG_COORDINATE_ARRAY_TYPE */
-       598, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
-       597, /* GL_FOG_COORDINATE_ARRAY_POINTER */
-       594, /* GL_FOG_COORDINATE_ARRAY */
+       619, /* GL_FOG_COORDINATE_ARRAY_TYPE */
+       618, /* GL_FOG_COORDINATE_ARRAY_STRIDE */
+       617, /* GL_FOG_COORDINATE_ARRAY_POINTER */
+       614, /* GL_FOG_COORDINATE_ARRAY */
        241, /* GL_COLOR_SUM */
        385, /* GL_CURRENT_SECONDARY_COLOR */
-      1771, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
-      1773, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
-      1772, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
-      1770, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
-      1767, /* GL_SECONDARY_COLOR_ARRAY */
+      1793, /* GL_SECONDARY_COLOR_ARRAY_SIZE */
+      1795, /* GL_SECONDARY_COLOR_ARRAY_TYPE */
+      1794, /* GL_SECONDARY_COLOR_ARRAY_STRIDE */
+      1792, /* GL_SECONDARY_COLOR_ARRAY_POINTER */
+      1789, /* GL_SECONDARY_COLOR_ARRAY */
        383, /* GL_CURRENT_RASTER_SECONDARY_COLOR */
         29, /* GL_ALIASED_POINT_SIZE_RANGE */
         28, /* GL_ALIASED_LINE_WIDTH_RANGE */
-      1924, /* GL_TEXTURE0 */
-      1926, /* GL_TEXTURE1 */
-      1948, /* GL_TEXTURE2 */
-      1970, /* GL_TEXTURE3 */
-      1976, /* GL_TEXTURE4 */
-      1978, /* GL_TEXTURE5 */
-      1980, /* GL_TEXTURE6 */
-      1982, /* GL_TEXTURE7 */
-      1984, /* GL_TEXTURE8 */
-      1986, /* GL_TEXTURE9 */
-      1927, /* GL_TEXTURE10 */
-      1929, /* GL_TEXTURE11 */
-      1931, /* GL_TEXTURE12 */
-      1933, /* GL_TEXTURE13 */
-      1935, /* GL_TEXTURE14 */
-      1937, /* GL_TEXTURE15 */
-      1939, /* GL_TEXTURE16 */
-      1941, /* GL_TEXTURE17 */
-      1943, /* GL_TEXTURE18 */
-      1945, /* GL_TEXTURE19 */
-      1949, /* GL_TEXTURE20 */
-      1951, /* GL_TEXTURE21 */
-      1953, /* GL_TEXTURE22 */
-      1955, /* GL_TEXTURE23 */
-      1957, /* GL_TEXTURE24 */
-      1959, /* GL_TEXTURE25 */
-      1961, /* GL_TEXTURE26 */
-      1963, /* GL_TEXTURE27 */
-      1965, /* GL_TEXTURE28 */
-      1967, /* GL_TEXTURE29 */
-      1971, /* GL_TEXTURE30 */
-      1973, /* GL_TEXTURE31 */
+      1946, /* GL_TEXTURE0 */
+      1948, /* GL_TEXTURE1 */
+      1970, /* GL_TEXTURE2 */
+      1992, /* GL_TEXTURE3 */
+      1998, /* GL_TEXTURE4 */
+      2000, /* GL_TEXTURE5 */
+      2002, /* GL_TEXTURE6 */
+      2004, /* GL_TEXTURE7 */
+      2006, /* GL_TEXTURE8 */
+      2008, /* GL_TEXTURE9 */
+      1949, /* GL_TEXTURE10 */
+      1951, /* GL_TEXTURE11 */
+      1953, /* GL_TEXTURE12 */
+      1955, /* GL_TEXTURE13 */
+      1957, /* GL_TEXTURE14 */
+      1959, /* GL_TEXTURE15 */
+      1961, /* GL_TEXTURE16 */
+      1963, /* GL_TEXTURE17 */
+      1965, /* GL_TEXTURE18 */
+      1967, /* GL_TEXTURE19 */
+      1971, /* GL_TEXTURE20 */
+      1973, /* GL_TEXTURE21 */
+      1975, /* GL_TEXTURE22 */
+      1977, /* GL_TEXTURE23 */
+      1979, /* GL_TEXTURE24 */
+      1981, /* GL_TEXTURE25 */
+      1983, /* GL_TEXTURE26 */
+      1985, /* GL_TEXTURE27 */
+      1987, /* GL_TEXTURE28 */
+      1989, /* GL_TEXTURE29 */
+      1993, /* GL_TEXTURE30 */
+      1995, /* GL_TEXTURE31 */
         19, /* GL_ACTIVE_TEXTURE */
        166, /* GL_CLIENT_ACTIVE_TEXTURE */
-      1140, /* GL_MAX_TEXTURE_UNITS */
-      2172, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
-      2175, /* GL_TRANSPOSE_PROJECTION_MATRIX */
-      2177, /* GL_TRANSPOSE_TEXTURE_MATRIX */
-      2169, /* GL_TRANSPOSE_COLOR_MATRIX */
-      1906, /* GL_SUBTRACT */
-      1121, /* GL_MAX_RENDERBUFFER_SIZE */
+      1162, /* GL_MAX_TEXTURE_UNITS */
+      2194, /* GL_TRANSPOSE_MODELVIEW_MATRIX */
+      2197, /* GL_TRANSPOSE_PROJECTION_MATRIX */
+      2199, /* GL_TRANSPOSE_TEXTURE_MATRIX */
+      2191, /* GL_TRANSPOSE_COLOR_MATRIX */
+      1928, /* GL_SUBTRACT */
+      1143, /* GL_MAX_RENDERBUFFER_SIZE */
        290, /* GL_COMPRESSED_ALPHA */
        294, /* GL_COMPRESSED_LUMINANCE */
        295, /* GL_COMPRESSED_LUMINANCE_ALPHA */
        292, /* GL_COMPRESSED_INTENSITY */
        300, /* GL_COMPRESSED_RGB */
        301, /* GL_COMPRESSED_RGBA */
-      2048, /* GL_TEXTURE_COMPRESSION_HINT */
-      2126, /* GL_TEXTURE_RECTANGLE */
-      2013, /* GL_TEXTURE_BINDING_RECTANGLE */
-      1533, /* GL_PROXY_TEXTURE_RECTANGLE */
-      1118, /* GL_MAX_RECTANGLE_TEXTURE_SIZE */
-       431, /* GL_DEPTH_STENCIL */
-      2206, /* GL_UNSIGNED_INT_24_8 */
-      1135, /* GL_MAX_TEXTURE_LOD_BIAS */
-      2115, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
-      1137, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
-      2087, /* GL_TEXTURE_FILTER_CONTROL */
-      2105, /* GL_TEXTURE_LOD_BIAS */
+      2070, /* GL_TEXTURE_COMPRESSION_HINT */
+      2148, /* GL_TEXTURE_RECTANGLE */
+      2035, /* GL_TEXTURE_BINDING_RECTANGLE */
+      1555, /* GL_PROXY_TEXTURE_RECTANGLE */
+      1140, /* GL_MAX_RECTANGLE_TEXTURE_SIZE */
+       451, /* GL_DEPTH_STENCIL */
+      2228, /* GL_UNSIGNED_INT_24_8 */
+      1157, /* GL_MAX_TEXTURE_LOD_BIAS */
+      2137, /* GL_TEXTURE_MAX_ANISOTROPY_EXT */
+      1159, /* GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT */
+      2109, /* GL_TEXTURE_FILTER_CONTROL */
+      2127, /* GL_TEXTURE_LOD_BIAS */
        274, /* GL_COMBINE4 */
-      1127, /* GL_MAX_SHININESS_NV */
-      1128, /* GL_MAX_SPOT_EXPONENT_NV */
-       752, /* GL_INCR_WRAP */
-       396, /* GL_DECR_WRAP */
-      1198, /* GL_MODELVIEW1_ARB */
-      1256, /* GL_NORMAL_MAP */
-      1584, /* GL_REFLECTION_MAP */
-      2058, /* GL_TEXTURE_CUBE_MAP */
-      2009, /* GL_TEXTURE_BINDING_CUBE_MAP */
-      2070, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
-      2060, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
-      2073, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
-      2063, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
-      2076, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
-      2066, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
-      1531, /* GL_PROXY_TEXTURE_CUBE_MAP */
-      1057, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
-      1234, /* GL_MULTISAMPLE_FILTER_HINT_NV */
-      1471, /* GL_PRIMITIVE_RESTART_NV */
-      1470, /* GL_PRIMITIVE_RESTART_INDEX_NV */
-       608, /* GL_FOG_DISTANCE_MODE_NV */
-       555, /* GL_EYE_RADIAL_NV */
-       554, /* GL_EYE_PLANE_ABSOLUTE_NV */
+      1149, /* GL_MAX_SHININESS_NV */
+      1150, /* GL_MAX_SPOT_EXPONENT_NV */
+       772, /* GL_INCR_WRAP */
+       416, /* GL_DECR_WRAP */
+      1220, /* GL_MODELVIEW1_ARB */
+      1278, /* GL_NORMAL_MAP */
+      1606, /* GL_REFLECTION_MAP */
+      2080, /* GL_TEXTURE_CUBE_MAP */
+      2031, /* GL_TEXTURE_BINDING_CUBE_MAP */
+      2092, /* GL_TEXTURE_CUBE_MAP_POSITIVE_X */
+      2082, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_X */
+      2095, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Y */
+      2085, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Y */
+      2098, /* GL_TEXTURE_CUBE_MAP_POSITIVE_Z */
+      2088, /* GL_TEXTURE_CUBE_MAP_NEGATIVE_Z */
+      1553, /* GL_PROXY_TEXTURE_CUBE_MAP */
+      1077, /* GL_MAX_CUBE_MAP_TEXTURE_SIZE */
+      1256, /* GL_MULTISAMPLE_FILTER_HINT_NV */
+      1493, /* GL_PRIMITIVE_RESTART_NV */
+      1492, /* GL_PRIMITIVE_RESTART_INDEX_NV */
+       628, /* GL_FOG_DISTANCE_MODE_NV */
+       575, /* GL_EYE_RADIAL_NV */
+       574, /* GL_EYE_PLANE_ABSOLUTE_NV */
        273, /* GL_COMBINE */
        280, /* GL_COMBINE_RGB */
        275, /* GL_COMBINE_ALPHA */
-      1716, /* GL_RGB_SCALE */
+      1738, /* GL_RGB_SCALE */
         25, /* GL_ADD_SIGNED */
-       789, /* GL_INTERPOLATE */
+       809, /* GL_INTERPOLATE */
        316, /* GL_CONSTANT */
-      1463, /* GL_PRIMARY_COLOR */
-      1460, /* GL_PREVIOUS */
-      1811, /* GL_SOURCE0_RGB */
-      1817, /* GL_SOURCE1_RGB */
-      1823, /* GL_SOURCE2_RGB */
-      1827, /* GL_SOURCE3_RGB_NV */
-      1808, /* GL_SOURCE0_ALPHA */
-      1814, /* GL_SOURCE1_ALPHA */
-      1820, /* GL_SOURCE2_ALPHA */
-      1826, /* GL_SOURCE3_ALPHA_NV */
-      1299, /* GL_OPERAND0_RGB */
-      1305, /* GL_OPERAND1_RGB */
-      1311, /* GL_OPERAND2_RGB */
-      1315, /* GL_OPERAND3_RGB_NV */
-      1296, /* GL_OPERAND0_ALPHA */
-      1302, /* GL_OPERAND1_ALPHA */
-      1308, /* GL_OPERAND2_ALPHA */
-      1314, /* GL_OPERAND3_ALPHA_NV */
+      1485, /* GL_PRIMARY_COLOR */
+      1482, /* GL_PREVIOUS */
+      1833, /* GL_SOURCE0_RGB */
+      1839, /* GL_SOURCE1_RGB */
+      1845, /* GL_SOURCE2_RGB */
+      1849, /* GL_SOURCE3_RGB_NV */
+      1830, /* GL_SOURCE0_ALPHA */
+      1836, /* GL_SOURCE1_ALPHA */
+      1842, /* GL_SOURCE2_ALPHA */
+      1848, /* GL_SOURCE3_ALPHA_NV */
+      1321, /* GL_OPERAND0_RGB */
+      1327, /* GL_OPERAND1_RGB */
+      1333, /* GL_OPERAND2_RGB */
+      1337, /* GL_OPERAND3_RGB_NV */
+      1318, /* GL_OPERAND0_ALPHA */
+      1324, /* GL_OPERAND1_ALPHA */
+      1330, /* GL_OPERAND2_ALPHA */
+      1336, /* GL_OPERAND3_ALPHA_NV */
        137, /* GL_BUFFER_OBJECT_APPLE */
-      2258, /* GL_VERTEX_ARRAY_BINDING */
-      2124, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
-      2125, /* GL_TEXTURE_RANGE_POINTER_APPLE */
-      2335, /* GL_YCBCR_422_APPLE */
-      2247, /* GL_UNSIGNED_SHORT_8_8_APPLE */
-      2249, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
-      2136, /* GL_TEXTURE_STORAGE_HINT_APPLE */
-      1897, /* GL_STORAGE_PRIVATE_APPLE */
-      1896, /* GL_STORAGE_CACHED_APPLE */
-      1898, /* GL_STORAGE_SHARED_APPLE */
-      1798, /* GL_SLICE_ACCUM_SUN */
-      1542, /* GL_QUAD_MESH_SUN */
-      2183, /* GL_TRIANGLE_MESH_SUN */
-      2300, /* GL_VERTEX_PROGRAM_ARB */
-      2311, /* GL_VERTEX_STATE_PROGRAM_NV */
-      2285, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
-      2293, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
-      2295, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
-      2297, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
+      2280, /* GL_VERTEX_ARRAY_BINDING */
+      2146, /* GL_TEXTURE_RANGE_LENGTH_APPLE */
+      2147, /* GL_TEXTURE_RANGE_POINTER_APPLE */
+      2357, /* GL_YCBCR_422_APPLE */
+      2269, /* GL_UNSIGNED_SHORT_8_8_APPLE */
+      2271, /* GL_UNSIGNED_SHORT_8_8_REV_APPLE */
+      2158, /* GL_TEXTURE_STORAGE_HINT_APPLE */
+      1919, /* GL_STORAGE_PRIVATE_APPLE */
+      1918, /* GL_STORAGE_CACHED_APPLE */
+      1920, /* GL_STORAGE_SHARED_APPLE */
+      1820, /* GL_SLICE_ACCUM_SUN */
+      1564, /* GL_QUAD_MESH_SUN */
+      2205, /* GL_TRIANGLE_MESH_SUN */
+      2322, /* GL_VERTEX_PROGRAM_ARB */
+      2333, /* GL_VERTEX_STATE_PROGRAM_NV */
+      2307, /* GL_VERTEX_ATTRIB_ARRAY_ENABLED */
+      2315, /* GL_VERTEX_ATTRIB_ARRAY_SIZE */
+      2317, /* GL_VERTEX_ATTRIB_ARRAY_STRIDE */
+      2319, /* GL_VERTEX_ATTRIB_ARRAY_TYPE */
        387, /* GL_CURRENT_VERTEX_ATTRIB */
-      1487, /* GL_PROGRAM_LENGTH_ARB */
-      1503, /* GL_PROGRAM_STRING_ARB */
-      1221, /* GL_MODELVIEW_PROJECTION_NV */
-       745, /* GL_IDENTITY_NV */
-       822, /* GL_INVERSE_NV */
-      2174, /* GL_TRANSPOSE_NV */
-       823, /* GL_INVERSE_TRANSPOSE_NV */
-      1103, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
-      1102, /* GL_MAX_PROGRAM_MATRICES_ARB */
-       983, /* GL_MATRIX0_NV */
-       995, /* GL_MATRIX1_NV */
-      1007, /* GL_MATRIX2_NV */
-      1011, /* GL_MATRIX3_NV */
-      1013, /* GL_MATRIX4_NV */
-      1015, /* GL_MATRIX5_NV */
-      1017, /* GL_MATRIX6_NV */
-      1019, /* GL_MATRIX7_NV */
+      1509, /* GL_PROGRAM_LENGTH_ARB */
+      1525, /* GL_PROGRAM_STRING_ARB */
+      1243, /* GL_MODELVIEW_PROJECTION_NV */
+       765, /* GL_IDENTITY_NV */
+       842, /* GL_INVERSE_NV */
+      2196, /* GL_TRANSPOSE_NV */
+       843, /* GL_INVERSE_TRANSPOSE_NV */
+      1125, /* GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB */
+      1124, /* GL_MAX_PROGRAM_MATRICES_ARB */
+      1003, /* GL_MATRIX0_NV */
+      1015, /* GL_MATRIX1_NV */
+      1027, /* GL_MATRIX2_NV */
+      1031, /* GL_MATRIX3_NV */
+      1033, /* GL_MATRIX4_NV */
+      1035, /* GL_MATRIX5_NV */
+      1037, /* GL_MATRIX6_NV */
+      1039, /* GL_MATRIX7_NV */
        370, /* GL_CURRENT_MATRIX_STACK_DEPTH_ARB */
        367, /* GL_CURRENT_MATRIX_ARB */
-      1500, /* GL_PROGRAM_POINT_SIZE */
-      2306, /* GL_VERTEX_PROGRAM_TWO_SIDE */
-      1499, /* GL_PROGRAM_PARAMETER_NV */
-      2291, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
-      1505, /* GL_PROGRAM_TARGET_NV */
-      1502, /* GL_PROGRAM_RESIDENT_NV */
-      2146, /* GL_TRACK_MATRIX_NV */
-      2147, /* GL_TRACK_MATRIX_TRANSFORM_NV */
-      2301, /* GL_VERTEX_PROGRAM_BINDING_NV */
-      1481, /* GL_PROGRAM_ERROR_POSITION_ARB */
-       412, /* GL_DEPTH_CLAMP */
-      2266, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
-      2273, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
-      2274, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
-      2275, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
-      2276, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
-      2277, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
-      2278, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
-      2279, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
-      2280, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
-      2281, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
-      2267, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
-      2268, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
-      2269, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
-      2270, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
-      2271, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
-      2272, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
-       931, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
-       938, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
-       939, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
-       940, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
-       941, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
-       942, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
-       943, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
-       944, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
-       945, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
-       946, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
-       932, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
-       933, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
-       934, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
-       935, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
-       936, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
-       937, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
-       958, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
-       965, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
-       966, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
-       967, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
-       968, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
-       969, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
-       970, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
-      1480, /* GL_PROGRAM_BINDING_ARB */
-       972, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
-       973, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
-       959, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
-       960, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
-       961, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
-       962, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
-       963, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
-       964, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
-      2046, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
-      2043, /* GL_TEXTURE_COMPRESSED */
-      1263, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
+      1522, /* GL_PROGRAM_POINT_SIZE */
+      2328, /* GL_VERTEX_PROGRAM_TWO_SIDE */
+      1521, /* GL_PROGRAM_PARAMETER_NV */
+      2313, /* GL_VERTEX_ATTRIB_ARRAY_POINTER */
+      1527, /* GL_PROGRAM_TARGET_NV */
+      1524, /* GL_PROGRAM_RESIDENT_NV */
+      2168, /* GL_TRACK_MATRIX_NV */
+      2169, /* GL_TRACK_MATRIX_TRANSFORM_NV */
+      2323, /* GL_VERTEX_PROGRAM_BINDING_NV */
+      1503, /* GL_PROGRAM_ERROR_POSITION_ARB */
+       432, /* GL_DEPTH_CLAMP */
+      2288, /* GL_VERTEX_ATTRIB_ARRAY0_NV */
+      2295, /* GL_VERTEX_ATTRIB_ARRAY1_NV */
+      2296, /* GL_VERTEX_ATTRIB_ARRAY2_NV */
+      2297, /* GL_VERTEX_ATTRIB_ARRAY3_NV */
+      2298, /* GL_VERTEX_ATTRIB_ARRAY4_NV */
+      2299, /* GL_VERTEX_ATTRIB_ARRAY5_NV */
+      2300, /* GL_VERTEX_ATTRIB_ARRAY6_NV */
+      2301, /* GL_VERTEX_ATTRIB_ARRAY7_NV */
+      2302, /* GL_VERTEX_ATTRIB_ARRAY8_NV */
+      2303, /* GL_VERTEX_ATTRIB_ARRAY9_NV */
+      2289, /* GL_VERTEX_ATTRIB_ARRAY10_NV */
+      2290, /* GL_VERTEX_ATTRIB_ARRAY11_NV */
+      2291, /* GL_VERTEX_ATTRIB_ARRAY12_NV */
+      2292, /* GL_VERTEX_ATTRIB_ARRAY13_NV */
+      2293, /* GL_VERTEX_ATTRIB_ARRAY14_NV */
+      2294, /* GL_VERTEX_ATTRIB_ARRAY15_NV */
+       951, /* GL_MAP1_VERTEX_ATTRIB0_4_NV */
+       958, /* GL_MAP1_VERTEX_ATTRIB1_4_NV */
+       959, /* GL_MAP1_VERTEX_ATTRIB2_4_NV */
+       960, /* GL_MAP1_VERTEX_ATTRIB3_4_NV */
+       961, /* GL_MAP1_VERTEX_ATTRIB4_4_NV */
+       962, /* GL_MAP1_VERTEX_ATTRIB5_4_NV */
+       963, /* GL_MAP1_VERTEX_ATTRIB6_4_NV */
+       964, /* GL_MAP1_VERTEX_ATTRIB7_4_NV */
+       965, /* GL_MAP1_VERTEX_ATTRIB8_4_NV */
+       966, /* GL_MAP1_VERTEX_ATTRIB9_4_NV */
+       952, /* GL_MAP1_VERTEX_ATTRIB10_4_NV */
+       953, /* GL_MAP1_VERTEX_ATTRIB11_4_NV */
+       954, /* GL_MAP1_VERTEX_ATTRIB12_4_NV */
+       955, /* GL_MAP1_VERTEX_ATTRIB13_4_NV */
+       956, /* GL_MAP1_VERTEX_ATTRIB14_4_NV */
+       957, /* GL_MAP1_VERTEX_ATTRIB15_4_NV */
+       978, /* GL_MAP2_VERTEX_ATTRIB0_4_NV */
+       985, /* GL_MAP2_VERTEX_ATTRIB1_4_NV */
+       986, /* GL_MAP2_VERTEX_ATTRIB2_4_NV */
+       987, /* GL_MAP2_VERTEX_ATTRIB3_4_NV */
+       988, /* GL_MAP2_VERTEX_ATTRIB4_4_NV */
+       989, /* GL_MAP2_VERTEX_ATTRIB5_4_NV */
+       990, /* GL_MAP2_VERTEX_ATTRIB6_4_NV */
+      1502, /* GL_PROGRAM_BINDING_ARB */
+       992, /* GL_MAP2_VERTEX_ATTRIB8_4_NV */
+       993, /* GL_MAP2_VERTEX_ATTRIB9_4_NV */
+       979, /* GL_MAP2_VERTEX_ATTRIB10_4_NV */
+       980, /* GL_MAP2_VERTEX_ATTRIB11_4_NV */
+       981, /* GL_MAP2_VERTEX_ATTRIB12_4_NV */
+       982, /* GL_MAP2_VERTEX_ATTRIB13_4_NV */
+       983, /* GL_MAP2_VERTEX_ATTRIB14_4_NV */
+       984, /* GL_MAP2_VERTEX_ATTRIB15_4_NV */
+      2068, /* GL_TEXTURE_COMPRESSED_IMAGE_SIZE */
+      2065, /* GL_TEXTURE_COMPRESSED */
+      1285, /* GL_NUM_COMPRESSED_TEXTURE_FORMATS */
        314, /* GL_COMPRESSED_TEXTURE_FORMATS */
-      1162, /* GL_MAX_VERTEX_UNITS_ARB */
+      1184, /* GL_MAX_VERTEX_UNITS_ARB */
         23, /* GL_ACTIVE_VERTEX_UNITS_ARB */
-      2329, /* GL_WEIGHT_SUM_UNITY_ARB */
-      2299, /* GL_VERTEX_BLEND_ARB */
+      2351, /* GL_WEIGHT_SUM_UNITY_ARB */
+      2321, /* GL_VERTEX_BLEND_ARB */
        389, /* GL_CURRENT_WEIGHT_ARB */
-      2327, /* GL_WEIGHT_ARRAY_TYPE_ARB */
-      2325, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
-      2323, /* GL_WEIGHT_ARRAY_SIZE_ARB */
-      2321, /* GL_WEIGHT_ARRAY_POINTER_ARB */
-      2316, /* GL_WEIGHT_ARRAY_ARB */
-       446, /* GL_DOT3_RGB */
-       447, /* GL_DOT3_RGBA */
+      2349, /* GL_WEIGHT_ARRAY_TYPE_ARB */
+      2347, /* GL_WEIGHT_ARRAY_STRIDE_ARB */
+      2345, /* GL_WEIGHT_ARRAY_SIZE_ARB */
+      2343, /* GL_WEIGHT_ARRAY_POINTER_ARB */
+      2338, /* GL_WEIGHT_ARRAY_ARB */
+       466, /* GL_DOT3_RGB */
+       467, /* GL_DOT3_RGBA */
        308, /* GL_COMPRESSED_RGB_FXT1_3DFX */
        303, /* GL_COMPRESSED_RGBA_FXT1_3DFX */
-      1229, /* GL_MULTISAMPLE_3DFX */
-      1756, /* GL_SAMPLE_BUFFERS_3DFX */
-      1747, /* GL_SAMPLES_3DFX */
-      1209, /* GL_MODELVIEW2_ARB */
-      1212, /* GL_MODELVIEW3_ARB */
-      1213, /* GL_MODELVIEW4_ARB */
-      1214, /* GL_MODELVIEW5_ARB */
-      1215, /* GL_MODELVIEW6_ARB */
-      1216, /* GL_MODELVIEW7_ARB */
-      1217, /* GL_MODELVIEW8_ARB */
-      1218, /* GL_MODELVIEW9_ARB */
-      1188, /* GL_MODELVIEW10_ARB */
-      1189, /* GL_MODELVIEW11_ARB */
-      1190, /* GL_MODELVIEW12_ARB */
-      1191, /* GL_MODELVIEW13_ARB */
-      1192, /* GL_MODELVIEW14_ARB */
-      1193, /* GL_MODELVIEW15_ARB */
-      1194, /* GL_MODELVIEW16_ARB */
-      1195, /* GL_MODELVIEW17_ARB */
-      1196, /* GL_MODELVIEW18_ARB */
-      1197, /* GL_MODELVIEW19_ARB */
-      1199, /* GL_MODELVIEW20_ARB */
-      1200, /* GL_MODELVIEW21_ARB */
-      1201, /* GL_MODELVIEW22_ARB */
-      1202, /* GL_MODELVIEW23_ARB */
-      1203, /* GL_MODELVIEW24_ARB */
-      1204, /* GL_MODELVIEW25_ARB */
-      1205, /* GL_MODELVIEW26_ARB */
-      1206, /* GL_MODELVIEW27_ARB */
-      1207, /* GL_MODELVIEW28_ARB */
-      1208, /* GL_MODELVIEW29_ARB */
-      1210, /* GL_MODELVIEW30_ARB */
-      1211, /* GL_MODELVIEW31_ARB */
-       451, /* GL_DOT3_RGB_EXT */
-      1477, /* GL_PROGRAM_BINARY_LENGTH */
-      1182, /* GL_MIRROR_CLAMP_EXT */
-      1185, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
-      1224, /* GL_MODULATE_ADD_ATI */
-      1225, /* GL_MODULATE_SIGNED_ADD_ATI */
-      1226, /* GL_MODULATE_SUBTRACT_ATI */
-      2336, /* GL_YCBCR_MESA */
-      1323, /* GL_PACK_INVERT_MESA */
-       392, /* GL_DEBUG_OBJECT_MESA */
-       393, /* GL_DEBUG_PRINT_MESA */
+      1251, /* GL_MULTISAMPLE_3DFX */
+      1778, /* GL_SAMPLE_BUFFERS_3DFX */
+      1769, /* GL_SAMPLES_3DFX */
+      1231, /* GL_MODELVIEW2_ARB */
+      1234, /* GL_MODELVIEW3_ARB */
+      1235, /* GL_MODELVIEW4_ARB */
+      1236, /* GL_MODELVIEW5_ARB */
+      1237, /* GL_MODELVIEW6_ARB */
+      1238, /* GL_MODELVIEW7_ARB */
+      1239, /* GL_MODELVIEW8_ARB */
+      1240, /* GL_MODELVIEW9_ARB */
+      1210, /* GL_MODELVIEW10_ARB */
+      1211, /* GL_MODELVIEW11_ARB */
+      1212, /* GL_MODELVIEW12_ARB */
+      1213, /* GL_MODELVIEW13_ARB */
+      1214, /* GL_MODELVIEW14_ARB */
+      1215, /* GL_MODELVIEW15_ARB */
+      1216, /* GL_MODELVIEW16_ARB */
+      1217, /* GL_MODELVIEW17_ARB */
+      1218, /* GL_MODELVIEW18_ARB */
+      1219, /* GL_MODELVIEW19_ARB */
+      1221, /* GL_MODELVIEW20_ARB */
+      1222, /* GL_MODELVIEW21_ARB */
+      1223, /* GL_MODELVIEW22_ARB */
+      1224, /* GL_MODELVIEW23_ARB */
+      1225, /* GL_MODELVIEW24_ARB */
+      1226, /* GL_MODELVIEW25_ARB */
+      1227, /* GL_MODELVIEW26_ARB */
+      1228, /* GL_MODELVIEW27_ARB */
+      1229, /* GL_MODELVIEW28_ARB */
+      1230, /* GL_MODELVIEW29_ARB */
+      1232, /* GL_MODELVIEW30_ARB */
+      1233, /* GL_MODELVIEW31_ARB */
+       471, /* GL_DOT3_RGB_EXT */
+      1499, /* GL_PROGRAM_BINARY_LENGTH */
+      1204, /* GL_MIRROR_CLAMP_EXT */
+      1207, /* GL_MIRROR_CLAMP_TO_EDGE_EXT */
+      1246, /* GL_MODULATE_ADD_ATI */
+      1247, /* GL_MODULATE_SIGNED_ADD_ATI */
+      1248, /* GL_MODULATE_SUBTRACT_ATI */
+      2358, /* GL_YCBCR_MESA */
+      1345, /* GL_PACK_INVERT_MESA */
+       396, /* GL_DEBUG_OBJECT_MESA */
+       398, /* GL_DEBUG_PRINT_MESA */
        391, /* GL_DEBUG_ASSERT_MESA */
        139, /* GL_BUFFER_SIZE */
        141, /* GL_BUFFER_USAGE */
@@ -5745,355 +5805,355 @@ static const unsigned reduced_enums[1572] =
        146, /* GL_BUMP_ROT_MATRIX_SIZE_ATI */
        144, /* GL_BUMP_NUM_TEX_UNITS_ATI */
        148, /* GL_BUMP_TEX_UNITS_ATI */
-       527, /* GL_DUDV_ATI */
-       526, /* GL_DU8DV8_ATI */
+       547, /* GL_DUDV_ATI */
+       546, /* GL_DU8DV8_ATI */
        143, /* GL_BUMP_ENVMAP_ATI */
        147, /* GL_BUMP_TARGET_ATI */
-      1266, /* GL_NUM_PROGRAM_BINARY_FORMATS */
-      1475, /* GL_PROGRAM_BINARY_FORMATS */
-      1860, /* GL_STENCIL_BACK_FUNC */
-      1858, /* GL_STENCIL_BACK_FAIL */
-      1862, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
-      1864, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
-       617, /* GL_FRAGMENT_PROGRAM_ARB */
-      1473, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
-      1508, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
-      1507, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
-      1490, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-      1496, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-      1495, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-      1092, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
-      1116, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
-      1115, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
-      1105, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
-      1111, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
-      1110, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
-      1687, /* GL_RGBA32F */
-      1650, /* GL_RGB32F */
-      1678, /* GL_RGBA16F */
-      1642, /* GL_RGB16F */
-      1706, /* GL_RGBA_FLOAT_MODE_ARB */
-      1060, /* GL_MAX_DRAW_BUFFERS */
-       455, /* GL_DRAW_BUFFER0 */
-       459, /* GL_DRAW_BUFFER1 */
-       487, /* GL_DRAW_BUFFER2 */
-       491, /* GL_DRAW_BUFFER3 */
-       495, /* GL_DRAW_BUFFER4 */
-       499, /* GL_DRAW_BUFFER5 */
-       503, /* GL_DRAW_BUFFER6 */
-       507, /* GL_DRAW_BUFFER7 */
-       511, /* GL_DRAW_BUFFER8 */
-       515, /* GL_DRAW_BUFFER9 */
-       460, /* GL_DRAW_BUFFER10 */
-       464, /* GL_DRAW_BUFFER11 */
-       468, /* GL_DRAW_BUFFER12 */
-       472, /* GL_DRAW_BUFFER13 */
-       476, /* GL_DRAW_BUFFER14 */
-       480, /* GL_DRAW_BUFFER15 */
+      1288, /* GL_NUM_PROGRAM_BINARY_FORMATS */
+      1497, /* GL_PROGRAM_BINARY_FORMATS */
+      1882, /* GL_STENCIL_BACK_FUNC */
+      1880, /* GL_STENCIL_BACK_FAIL */
+      1884, /* GL_STENCIL_BACK_PASS_DEPTH_FAIL */
+      1886, /* GL_STENCIL_BACK_PASS_DEPTH_PASS */
+       637, /* GL_FRAGMENT_PROGRAM_ARB */
+      1495, /* GL_PROGRAM_ALU_INSTRUCTIONS_ARB */
+      1530, /* GL_PROGRAM_TEX_INSTRUCTIONS_ARB */
+      1529, /* GL_PROGRAM_TEX_INDIRECTIONS_ARB */
+      1512, /* GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+      1518, /* GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+      1517, /* GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+      1114, /* GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB */
+      1138, /* GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB */
+      1137, /* GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB */
+      1127, /* GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB */
+      1133, /* GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB */
+      1132, /* GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB */
+      1709, /* GL_RGBA32F */
+      1672, /* GL_RGB32F */
+      1700, /* GL_RGBA16F */
+      1664, /* GL_RGB16F */
+      1728, /* GL_RGBA_FLOAT_MODE_ARB */
+      1082, /* GL_MAX_DRAW_BUFFERS */
+       475, /* GL_DRAW_BUFFER0 */
+       479, /* GL_DRAW_BUFFER1 */
+       507, /* GL_DRAW_BUFFER2 */
+       511, /* GL_DRAW_BUFFER3 */
+       515, /* GL_DRAW_BUFFER4 */
+       519, /* GL_DRAW_BUFFER5 */
+       523, /* GL_DRAW_BUFFER6 */
+       527, /* GL_DRAW_BUFFER7 */
+       531, /* GL_DRAW_BUFFER8 */
+       535, /* GL_DRAW_BUFFER9 */
+       480, /* GL_DRAW_BUFFER10 */
+       484, /* GL_DRAW_BUFFER11 */
+       488, /* GL_DRAW_BUFFER12 */
+       492, /* GL_DRAW_BUFFER13 */
+       496, /* GL_DRAW_BUFFER14 */
+       500, /* GL_DRAW_BUFFER15 */
         97, /* GL_BLEND_EQUATION_ALPHA */
-      1034, /* GL_MATRIX_PALETTE_ARB */
-      1085, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
-      1088, /* GL_MAX_PALETTE_MATRICES_ARB */
+      1054, /* GL_MATRIX_PALETTE_ARB */
+      1107, /* GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB */
+      1110, /* GL_MAX_PALETTE_MATRICES_ARB */
        373, /* GL_CURRENT_PALETTE_MATRIX_ARB */
-      1022, /* GL_MATRIX_INDEX_ARRAY_ARB */
+      1042, /* GL_MATRIX_INDEX_ARRAY_ARB */
        368, /* GL_CURRENT_MATRIX_INDEX_ARB */
-      1027, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
-      1031, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
-      1029, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
-      1025, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
-      2081, /* GL_TEXTURE_DEPTH_SIZE */
-       439, /* GL_DEPTH_TEXTURE_MODE */
-      2038, /* GL_TEXTURE_COMPARE_MODE */
-      2036, /* GL_TEXTURE_COMPARE_FUNC */
+      1047, /* GL_MATRIX_INDEX_ARRAY_SIZE_ARB */
+      1051, /* GL_MATRIX_INDEX_ARRAY_TYPE_ARB */
+      1049, /* GL_MATRIX_INDEX_ARRAY_STRIDE_ARB */
+      1045, /* GL_MATRIX_INDEX_ARRAY_POINTER_ARB */
+      2103, /* GL_TEXTURE_DEPTH_SIZE */
+       459, /* GL_DEPTH_TEXTURE_MODE */
+      2060, /* GL_TEXTURE_COMPARE_MODE */
+      2058, /* GL_TEXTURE_COMPARE_FUNC */
        284, /* GL_COMPARE_REF_TO_TEXTURE */
-      2079, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
-      1400, /* GL_POINT_SPRITE */
+      2101, /* GL_TEXTURE_CUBE_MAP_SEAMLESS */
+      1422, /* GL_POINT_SPRITE */
        347, /* GL_COORD_REPLACE */
-      1405, /* GL_POINT_SPRITE_R_MODE_NV */
-      1548, /* GL_QUERY_COUNTER_BITS */
+      1427, /* GL_POINT_SPRITE_R_MODE_NV */
+      1570, /* GL_QUERY_COUNTER_BITS */
        376, /* GL_CURRENT_QUERY */
-      1552, /* GL_QUERY_RESULT */
-      1554, /* GL_QUERY_RESULT_AVAILABLE */
-      1154, /* GL_MAX_VERTEX_ATTRIBS */
-      2289, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
-       437, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
-       436, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
-      1131, /* GL_MAX_TEXTURE_COORDS */
-      1133, /* GL_MAX_TEXTURE_IMAGE_UNITS */
-      1483, /* GL_PROGRAM_ERROR_STRING_ARB */
-      1485, /* GL_PROGRAM_FORMAT_ASCII_ARB */
-      1484, /* GL_PROGRAM_FORMAT_ARB */
-      2138, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
-       409, /* GL_DEPTH_BOUNDS_TEST_EXT */
-       408, /* GL_DEPTH_BOUNDS_EXT */
+      1574, /* GL_QUERY_RESULT */
+      1576, /* GL_QUERY_RESULT_AVAILABLE */
+      1176, /* GL_MAX_VERTEX_ATTRIBS */
+      2311, /* GL_VERTEX_ATTRIB_ARRAY_NORMALIZED */
+       457, /* GL_DEPTH_STENCIL_TO_RGBA_NV */
+       456, /* GL_DEPTH_STENCIL_TO_BGRA_NV */
+      1153, /* GL_MAX_TEXTURE_COORDS */
+      1155, /* GL_MAX_TEXTURE_IMAGE_UNITS */
+      1505, /* GL_PROGRAM_ERROR_STRING_ARB */
+      1507, /* GL_PROGRAM_FORMAT_ASCII_ARB */
+      1506, /* GL_PROGRAM_FORMAT_ARB */
+      2160, /* GL_TEXTURE_UNSIGNED_REMAP_MODE_NV */
+       429, /* GL_DEPTH_BOUNDS_TEST_EXT */
+       428, /* GL_DEPTH_BOUNDS_EXT */
         61, /* GL_ARRAY_BUFFER */
-       540, /* GL_ELEMENT_ARRAY_BUFFER */
+       560, /* GL_ELEMENT_ARRAY_BUFFER */
         62, /* GL_ARRAY_BUFFER_BINDING */
-       541, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
-      2260, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
-      1251, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
+       561, /* GL_ELEMENT_ARRAY_BUFFER_BINDING */
+      2282, /* GL_VERTEX_ARRAY_BUFFER_BINDING */
+      1273, /* GL_NORMAL_ARRAY_BUFFER_BINDING */
        190, /* GL_COLOR_ARRAY_BUFFER_BINDING */
-       756, /* GL_INDEX_ARRAY_BUFFER_BINDING */
-      2051, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
-       536, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
-      1768, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
-       595, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
-      2317, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
-      2282, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
-      1486, /* GL_PROGRAM_INSTRUCTIONS_ARB */
-      1098, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
-      1492, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-      1107, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
-      1506, /* GL_PROGRAM_TEMPORARIES_ARB */
-      1113, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
-      1494, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
-      1109, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
-      1498, /* GL_PROGRAM_PARAMETERS_ARB */
-      1112, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
-      1493, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
-      1108, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
-      1474, /* GL_PROGRAM_ATTRIBS_ARB */
-      1093, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
-      1491, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
-      1106, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
-      1472, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
-      1091, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
-      1489, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-      1104, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
-      1099, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
-      1095, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
-      1509, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
-      2171, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
-      1571, /* GL_READ_ONLY */
-      2331, /* GL_WRITE_ONLY */
-      1573, /* GL_READ_WRITE */
+       776, /* GL_INDEX_ARRAY_BUFFER_BINDING */
+      2073, /* GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING */
+       556, /* GL_EDGE_FLAG_ARRAY_BUFFER_BINDING */
+      1790, /* GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING */
+       615, /* GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING */
+      2339, /* GL_WEIGHT_ARRAY_BUFFER_BINDING */
+      2304, /* GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING */
+      1508, /* GL_PROGRAM_INSTRUCTIONS_ARB */
+      1120, /* GL_MAX_PROGRAM_INSTRUCTIONS_ARB */
+      1514, /* GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+      1129, /* GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB */
+      1528, /* GL_PROGRAM_TEMPORARIES_ARB */
+      1135, /* GL_MAX_PROGRAM_TEMPORARIES_ARB */
+      1516, /* GL_PROGRAM_NATIVE_TEMPORARIES_ARB */
+      1131, /* GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB */
+      1520, /* GL_PROGRAM_PARAMETERS_ARB */
+      1134, /* GL_MAX_PROGRAM_PARAMETERS_ARB */
+      1515, /* GL_PROGRAM_NATIVE_PARAMETERS_ARB */
+      1130, /* GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB */
+      1496, /* GL_PROGRAM_ATTRIBS_ARB */
+      1115, /* GL_MAX_PROGRAM_ATTRIBS_ARB */
+      1513, /* GL_PROGRAM_NATIVE_ATTRIBS_ARB */
+      1128, /* GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB */
+      1494, /* GL_PROGRAM_ADDRESS_REGISTERS_ARB */
+      1113, /* GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB */
+      1511, /* GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+      1126, /* GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB */
+      1121, /* GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB */
+      1117, /* GL_MAX_PROGRAM_ENV_PARAMETERS_ARB */
+      1531, /* GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB */
+      2193, /* GL_TRANSPOSE_CURRENT_MATRIX_ARB */
+      1593, /* GL_READ_ONLY */
+      2353, /* GL_WRITE_ONLY */
+      1595, /* GL_READ_WRITE */
        124, /* GL_BUFFER_ACCESS */
        129, /* GL_BUFFER_MAPPED */
        134, /* GL_BUFFER_MAP_POINTER */
-      2145, /* GL_TIME_ELAPSED_EXT */
-       982, /* GL_MATRIX0_ARB */
-       994, /* GL_MATRIX1_ARB */
-      1006, /* GL_MATRIX2_ARB */
-      1010, /* GL_MATRIX3_ARB */
-      1012, /* GL_MATRIX4_ARB */
-      1014, /* GL_MATRIX5_ARB */
-      1016, /* GL_MATRIX6_ARB */
-      1018, /* GL_MATRIX7_ARB */
-      1020, /* GL_MATRIX8_ARB */
-      1021, /* GL_MATRIX9_ARB */
-       984, /* GL_MATRIX10_ARB */
-       985, /* GL_MATRIX11_ARB */
-       986, /* GL_MATRIX12_ARB */
-       987, /* GL_MATRIX13_ARB */
-       988, /* GL_MATRIX14_ARB */
-       989, /* GL_MATRIX15_ARB */
-       990, /* GL_MATRIX16_ARB */
-       991, /* GL_MATRIX17_ARB */
-       992, /* GL_MATRIX18_ARB */
-       993, /* GL_MATRIX19_ARB */
-       996, /* GL_MATRIX20_ARB */
-       997, /* GL_MATRIX21_ARB */
-       998, /* GL_MATRIX22_ARB */
-       999, /* GL_MATRIX23_ARB */
-      1000, /* GL_MATRIX24_ARB */
-      1001, /* GL_MATRIX25_ARB */
-      1002, /* GL_MATRIX26_ARB */
-      1003, /* GL_MATRIX27_ARB */
-      1004, /* GL_MATRIX28_ARB */
-      1005, /* GL_MATRIX29_ARB */
-      1008, /* GL_MATRIX30_ARB */
-      1009, /* GL_MATRIX31_ARB */
-      1901, /* GL_STREAM_DRAW */
-      1903, /* GL_STREAM_READ */
-      1899, /* GL_STREAM_COPY */
-      1850, /* GL_STATIC_DRAW */
-      1852, /* GL_STATIC_READ */
-      1848, /* GL_STATIC_COPY */
-       530, /* GL_DYNAMIC_DRAW */
-       532, /* GL_DYNAMIC_READ */
-       528, /* GL_DYNAMIC_COPY */
-      1363, /* GL_PIXEL_PACK_BUFFER */
-      1367, /* GL_PIXEL_UNPACK_BUFFER */
-      1364, /* GL_PIXEL_PACK_BUFFER_BINDING */
-      1368, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
-       400, /* GL_DEPTH24_STENCIL8 */
-      2134, /* GL_TEXTURE_STENCIL_SIZE */
-      1096, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
-      1094, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
-      1097, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
-      1101, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
-      1100, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
-      2287, /* GL_VERTEX_ATTRIB_ARRAY_INTEGER */
-      2284, /* GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB */
-      1039, /* GL_MAX_ARRAY_TEXTURE_LAYERS */
-      1177, /* GL_MIN_PROGRAM_TEXEL_OFFSET */
-      1114, /* GL_MAX_PROGRAM_TEXEL_OFFSET */
-      1892, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
+      2167, /* GL_TIME_ELAPSED_EXT */
+      1002, /* GL_MATRIX0_ARB */
+      1014, /* GL_MATRIX1_ARB */
+      1026, /* GL_MATRIX2_ARB */
+      1030, /* GL_MATRIX3_ARB */
+      1032, /* GL_MATRIX4_ARB */
+      1034, /* GL_MATRIX5_ARB */
+      1036, /* GL_MATRIX6_ARB */
+      1038, /* GL_MATRIX7_ARB */
+      1040, /* GL_MATRIX8_ARB */
+      1041, /* GL_MATRIX9_ARB */
+      1004, /* GL_MATRIX10_ARB */
+      1005, /* GL_MATRIX11_ARB */
+      1006, /* GL_MATRIX12_ARB */
+      1007, /* GL_MATRIX13_ARB */
+      1008, /* GL_MATRIX14_ARB */
+      1009, /* GL_MATRIX15_ARB */
+      1010, /* GL_MATRIX16_ARB */
+      1011, /* GL_MATRIX17_ARB */
+      1012, /* GL_MATRIX18_ARB */
+      1013, /* GL_MATRIX19_ARB */
+      1016, /* GL_MATRIX20_ARB */
+      1017, /* GL_MATRIX21_ARB */
+      1018, /* GL_MATRIX22_ARB */
+      1019, /* GL_MATRIX23_ARB */
+      1020, /* GL_MATRIX24_ARB */
+      1021, /* GL_MATRIX25_ARB */
+      1022, /* GL_MATRIX26_ARB */
+      1023, /* GL_MATRIX27_ARB */
+      1024, /* GL_MATRIX28_ARB */
+      1025, /* GL_MATRIX29_ARB */
+      1028, /* GL_MATRIX30_ARB */
+      1029, /* GL_MATRIX31_ARB */
+      1923, /* GL_STREAM_DRAW */
+      1925, /* GL_STREAM_READ */
+      1921, /* GL_STREAM_COPY */
+      1872, /* GL_STATIC_DRAW */
+      1874, /* GL_STATIC_READ */
+      1870, /* GL_STATIC_COPY */
+       550, /* GL_DYNAMIC_DRAW */
+       552, /* GL_DYNAMIC_READ */
+       548, /* GL_DYNAMIC_COPY */
+      1385, /* GL_PIXEL_PACK_BUFFER */
+      1389, /* GL_PIXEL_UNPACK_BUFFER */
+      1386, /* GL_PIXEL_PACK_BUFFER_BINDING */
+      1390, /* GL_PIXEL_UNPACK_BUFFER_BINDING */
+       420, /* GL_DEPTH24_STENCIL8 */
+      2156, /* GL_TEXTURE_STENCIL_SIZE */
+      1118, /* GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */
+      1116, /* GL_MAX_PROGRAM_CALL_DEPTH_NV */
+      1119, /* GL_MAX_PROGRAM_IF_DEPTH_NV */
+      1123, /* GL_MAX_PROGRAM_LOOP_DEPTH_NV */
+      1122, /* GL_MAX_PROGRAM_LOOP_COUNT_NV */
+      2309, /* GL_VERTEX_ATTRIB_ARRAY_INTEGER */
+      2306, /* GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB */
+      1059, /* GL_MAX_ARRAY_TEXTURE_LAYERS */
+      1199, /* GL_MIN_PROGRAM_TEXEL_OFFSET */
+      1136, /* GL_MAX_PROGRAM_TEXEL_OFFSET */
+      1914, /* GL_STENCIL_TEST_TWO_SIDE_EXT */
         18, /* GL_ACTIVE_STENCIL_FACE_EXT */
-      1183, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
-      1749, /* GL_SAMPLES_PASSED */
-       710, /* GL_GEOMETRY_VERTICES_OUT */
-       704, /* GL_GEOMETRY_INPUT_TYPE */
-       706, /* GL_GEOMETRY_OUTPUT_TYPE */
-      1739, /* GL_SAMPLER_BINDING */
+      1205, /* GL_MIRROR_CLAMP_TO_BORDER_EXT */
+      1771, /* GL_SAMPLES_PASSED */
+       730, /* GL_GEOMETRY_VERTICES_OUT */
+       724, /* GL_GEOMETRY_INPUT_TYPE */
+       726, /* GL_GEOMETRY_OUTPUT_TYPE */
+      1761, /* GL_SAMPLER_BINDING */
        164, /* GL_CLAMP_VERTEX_COLOR_ARB */
        156, /* GL_CLAMP_FRAGMENT_COLOR_ARB */
        157, /* GL_CLAMP_READ_COLOR */
-       567, /* GL_FIXED_ONLY */
-      1387, /* GL_POINT_SIZE_ARRAY_TYPE_OES */
-      1386, /* GL_POINT_SIZE_ARRAY_STRIDE_OES */
-      1385, /* GL_POINT_SIZE_ARRAY_POINTER_OES */
-      1220, /* GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES */
-      1512, /* GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES */
-      2114, /* GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES */
+       587, /* GL_FIXED_ONLY */
+      1409, /* GL_POINT_SIZE_ARRAY_TYPE_OES */
+      1408, /* GL_POINT_SIZE_ARRAY_STRIDE_OES */
+      1407, /* GL_POINT_SIZE_ARRAY_POINTER_OES */
+      1242, /* GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES */
+      1534, /* GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES */
+      2136, /* GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES */
        138, /* GL_BUFFER_SERIALIZED_MODIFY_APPLE */
        128, /* GL_BUFFER_FLUSHING_UNMAP_APPLE */
-      1588, /* GL_RELEASED_APPLE */
-      2314, /* GL_VOLATILE_APPLE */
-      1629, /* GL_RETAINED_APPLE */
-      2188, /* GL_UNDEFINED_APPLE */
-      1536, /* GL_PURGEABLE_APPLE */
-       618, /* GL_FRAGMENT_SHADER */
-      2309, /* GL_VERTEX_SHADER */
-      1497, /* GL_PROGRAM_OBJECT_ARB */
-      1785, /* GL_SHADER_OBJECT_ARB */
-      1069, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
-      1159, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
-      1150, /* GL_MAX_VARYING_COMPONENTS */
-      1157, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
-      1051, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
-      1283, /* GL_OBJECT_TYPE_ARB */
-      1787, /* GL_SHADER_TYPE */
-       583, /* GL_FLOAT_VEC2 */
-       585, /* GL_FLOAT_VEC3 */
-       587, /* GL_FLOAT_VEC4 */
-       810, /* GL_INT_VEC2 */
-       812, /* GL_INT_VEC3 */
-       814, /* GL_INT_VEC4 */
+      1610, /* GL_RELEASED_APPLE */
+      2336, /* GL_VOLATILE_APPLE */
+      1651, /* GL_RETAINED_APPLE */
+      2210, /* GL_UNDEFINED_APPLE */
+      1558, /* GL_PURGEABLE_APPLE */
+       638, /* GL_FRAGMENT_SHADER */
+      2331, /* GL_VERTEX_SHADER */
+      1519, /* GL_PROGRAM_OBJECT_ARB */
+      1807, /* GL_SHADER_OBJECT_ARB */
+      1091, /* GL_MAX_FRAGMENT_UNIFORM_COMPONENTS */
+      1181, /* GL_MAX_VERTEX_UNIFORM_COMPONENTS */
+      1172, /* GL_MAX_VARYING_COMPONENTS */
+      1179, /* GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS */
+      1071, /* GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS */
+      1305, /* GL_OBJECT_TYPE_ARB */
+      1809, /* GL_SHADER_TYPE */
+       603, /* GL_FLOAT_VEC2 */
+       605, /* GL_FLOAT_VEC3 */
+       607, /* GL_FLOAT_VEC4 */
+       830, /* GL_INT_VEC2 */
+       832, /* GL_INT_VEC3 */
+       834, /* GL_INT_VEC4 */
        116, /* GL_BOOL */
        118, /* GL_BOOL_VEC2 */
        120, /* GL_BOOL_VEC3 */
        122, /* GL_BOOL_VEC4 */
-       571, /* GL_FLOAT_MAT2 */
-       575, /* GL_FLOAT_MAT3 */
-       579, /* GL_FLOAT_MAT4 */
-      1723, /* GL_SAMPLER_1D */
-      1729, /* GL_SAMPLER_2D */
-      1737, /* GL_SAMPLER_3D */
-      1742, /* GL_SAMPLER_CUBE */
-      1728, /* GL_SAMPLER_1D_SHADOW */
-      1736, /* GL_SAMPLER_2D_SHADOW */
-      1734, /* GL_SAMPLER_2D_RECT */
-      1735, /* GL_SAMPLER_2D_RECT_SHADOW */
-       573, /* GL_FLOAT_MAT2x3 */
-       574, /* GL_FLOAT_MAT2x4 */
-       577, /* GL_FLOAT_MAT3x2 */
-       578, /* GL_FLOAT_MAT3x4 */
-       581, /* GL_FLOAT_MAT4x2 */
-       582, /* GL_FLOAT_MAT4x3 */
-       398, /* GL_DELETE_STATUS */
+       591, /* GL_FLOAT_MAT2 */
+       595, /* GL_FLOAT_MAT3 */
+       599, /* GL_FLOAT_MAT4 */
+      1745, /* GL_SAMPLER_1D */
+      1751, /* GL_SAMPLER_2D */
+      1759, /* GL_SAMPLER_3D */
+      1764, /* GL_SAMPLER_CUBE */
+      1750, /* GL_SAMPLER_1D_SHADOW */
+      1758, /* GL_SAMPLER_2D_SHADOW */
+      1756, /* GL_SAMPLER_2D_RECT */
+      1757, /* GL_SAMPLER_2D_RECT_SHADOW */
+       593, /* GL_FLOAT_MAT2x3 */
+       594, /* GL_FLOAT_MAT2x4 */
+       597, /* GL_FLOAT_MAT3x2 */
+       598, /* GL_FLOAT_MAT3x4 */
+       601, /* GL_FLOAT_MAT4x2 */
+       602, /* GL_FLOAT_MAT4x3 */
+       418, /* GL_DELETE_STATUS */
        289, /* GL_COMPILE_STATUS */
-       871, /* GL_LINK_STATUS */
-      2254, /* GL_VALIDATE_STATUS */
-       768, /* GL_INFO_LOG_LENGTH */
+       891, /* GL_LINK_STATUS */
+      2276, /* GL_VALIDATE_STATUS */
+       788, /* GL_INFO_LOG_LENGTH */
         64, /* GL_ATTACHED_SHADERS */
         21, /* GL_ACTIVE_UNIFORMS */
         22, /* GL_ACTIVE_UNIFORM_MAX_LENGTH */
-      1786, /* GL_SHADER_SOURCE_LENGTH */
+      1808, /* GL_SHADER_SOURCE_LENGTH */
         15, /* GL_ACTIVE_ATTRIBUTES */
         16, /* GL_ACTIVE_ATTRIBUTE_MAX_LENGTH */
-       620, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
-      1789, /* GL_SHADING_LANGUAGE_VERSION */
+       640, /* GL_FRAGMENT_SHADER_DERIVATIVE_HINT */
+      1811, /* GL_SHADING_LANGUAGE_VERSION */
        375, /* GL_CURRENT_PROGRAM */
-      1332, /* GL_PALETTE4_RGB8_OES */
-      1334, /* GL_PALETTE4_RGBA8_OES */
-      1330, /* GL_PALETTE4_R5_G6_B5_OES */
-      1333, /* GL_PALETTE4_RGBA4_OES */
-      1331, /* GL_PALETTE4_RGB5_A1_OES */
-      1337, /* GL_PALETTE8_RGB8_OES */
-      1339, /* GL_PALETTE8_RGBA8_OES */
-      1335, /* GL_PALETTE8_R5_G6_B5_OES */
-      1338, /* GL_PALETTE8_RGBA4_OES */
-      1336, /* GL_PALETTE8_RGB5_A1_OES */
-       749, /* GL_IMPLEMENTATION_COLOR_READ_TYPE */
-       747, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT */
-      1384, /* GL_POINT_SIZE_ARRAY_OES */
-      2057, /* GL_TEXTURE_CROP_RECT_OES */
-      1023, /* GL_MATRIX_INDEX_ARRAY_BUFFER_BINDING_OES */
-      1383, /* GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES */
-      2237, /* GL_UNSIGNED_NORMALIZED */
-      1989, /* GL_TEXTURE_1D_ARRAY */
-      1522, /* GL_PROXY_TEXTURE_1D_ARRAY */
-      1992, /* GL_TEXTURE_2D_ARRAY */
-      1526, /* GL_PROXY_TEXTURE_2D_ARRAY */
-      2000, /* GL_TEXTURE_BINDING_1D_ARRAY */
-      2003, /* GL_TEXTURE_BINDING_2D_ARRAY */
-      1076, /* GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS */
-      2021, /* GL_TEXTURE_BUFFER */
-      1129, /* GL_MAX_TEXTURE_BUFFER_SIZE */
-      2007, /* GL_TEXTURE_BINDING_BUFFER */
-      2023, /* GL_TEXTURE_BUFFER_DATA_STORE_BINDING */
-      2025, /* GL_TEXTURE_BUFFER_FORMAT */
-      1559, /* GL_R11F_G11F_B10F */
-      2203, /* GL_UNSIGNED_INT_10F_11F_11F_REV */
-      1673, /* GL_RGB9_E5 */
-      2212, /* GL_UNSIGNED_INT_5_9_9_9_REV */
-      2132, /* GL_TEXTURE_SHARED_SIZE */
-      1842, /* GL_SRGB */
-      1843, /* GL_SRGB8 */
-      1845, /* GL_SRGB_ALPHA */
-      1844, /* GL_SRGB8_ALPHA8 */
-      1802, /* GL_SLUMINANCE_ALPHA */
-      1801, /* GL_SLUMINANCE8_ALPHA8 */
-      1799, /* GL_SLUMINANCE */
-      1800, /* GL_SLUMINANCE8 */
+      1354, /* GL_PALETTE4_RGB8_OES */
+      1356, /* GL_PALETTE4_RGBA8_OES */
+      1352, /* GL_PALETTE4_R5_G6_B5_OES */
+      1355, /* GL_PALETTE4_RGBA4_OES */
+      1353, /* GL_PALETTE4_RGB5_A1_OES */
+      1359, /* GL_PALETTE8_RGB8_OES */
+      1361, /* GL_PALETTE8_RGBA8_OES */
+      1357, /* GL_PALETTE8_R5_G6_B5_OES */
+      1360, /* GL_PALETTE8_RGBA4_OES */
+      1358, /* GL_PALETTE8_RGB5_A1_OES */
+       769, /* GL_IMPLEMENTATION_COLOR_READ_TYPE */
+       767, /* GL_IMPLEMENTATION_COLOR_READ_FORMAT */
+      1406, /* GL_POINT_SIZE_ARRAY_OES */
+      2079, /* GL_TEXTURE_CROP_RECT_OES */
+      1043, /* GL_MATRIX_INDEX_ARRAY_BUFFER_BINDING_OES */
+      1405, /* GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES */
+      2259, /* GL_UNSIGNED_NORMALIZED */
+      2011, /* GL_TEXTURE_1D_ARRAY */
+      1544, /* GL_PROXY_TEXTURE_1D_ARRAY */
+      2014, /* GL_TEXTURE_2D_ARRAY */
+      1548, /* GL_PROXY_TEXTURE_2D_ARRAY */
+      2022, /* GL_TEXTURE_BINDING_1D_ARRAY */
+      2025, /* GL_TEXTURE_BINDING_2D_ARRAY */
+      1098, /* GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS */
+      2043, /* GL_TEXTURE_BUFFER */
+      1151, /* GL_MAX_TEXTURE_BUFFER_SIZE */
+      2029, /* GL_TEXTURE_BINDING_BUFFER */
+      2045, /* GL_TEXTURE_BUFFER_DATA_STORE_BINDING */
+      2047, /* GL_TEXTURE_BUFFER_FORMAT */
+      1581, /* GL_R11F_G11F_B10F */
+      2225, /* GL_UNSIGNED_INT_10F_11F_11F_REV */
+      1695, /* GL_RGB9_E5 */
+      2234, /* GL_UNSIGNED_INT_5_9_9_9_REV */
+      2154, /* GL_TEXTURE_SHARED_SIZE */
+      1864, /* GL_SRGB */
+      1865, /* GL_SRGB8 */
+      1867, /* GL_SRGB_ALPHA */
+      1866, /* GL_SRGB8_ALPHA8 */
+      1824, /* GL_SLUMINANCE_ALPHA */
+      1823, /* GL_SLUMINANCE8_ALPHA8 */
+      1821, /* GL_SLUMINANCE */
+      1822, /* GL_SLUMINANCE8 */
        312, /* GL_COMPRESSED_SRGB */
        313, /* GL_COMPRESSED_SRGB_ALPHA */
        310, /* GL_COMPRESSED_SLUMINANCE */
        311, /* GL_COMPRESSED_SLUMINANCE_ALPHA */
-      2167, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH */
-      2156, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE */
-      1148, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS */
-      2165, /* GL_TRANSFORM_FEEDBACK_VARYINGS */
-      2161, /* GL_TRANSFORM_FEEDBACK_BUFFER_START */
-      2159, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE */
-      1466, /* GL_PRIMITIVES_GENERATED */
-      2163, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN */
-      1563, /* GL_RASTERIZER_DISCARD */
-      1144, /* GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS */
-      1146, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS */
-       787, /* GL_INTERLEAVED_ATTRIBS */
-      1778, /* GL_SEPARATE_ATTRIBS */
-      2151, /* GL_TRANSFORM_FEEDBACK_BUFFER */
-      2153, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING */
-      1402, /* GL_POINT_SPRITE_COORD_ORIGIN */
-       880, /* GL_LOWER_LEFT */
-      2251, /* GL_UPPER_LEFT */
-      1866, /* GL_STENCIL_BACK_REF */
-      1867, /* GL_STENCIL_BACK_VALUE_MASK */
-      1868, /* GL_STENCIL_BACK_WRITEMASK */
-       520, /* GL_DRAW_FRAMEBUFFER_BINDING */
-      1593, /* GL_RENDERBUFFER_BINDING */
-      1567, /* GL_READ_FRAMEBUFFER */
-       519, /* GL_DRAW_FRAMEBUFFER */
-      1568, /* GL_READ_FRAMEBUFFER_BINDING */
-      1612, /* GL_RENDERBUFFER_SAMPLES */
-       634, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
-       631, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
-       646, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
-       641, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
-       644, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
-       652, /* GL_FRAMEBUFFER_COMPLETE */
-       657, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
-       672, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
-       666, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
-       661, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
-       667, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
-       663, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER */
-       677, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER */
-       683, /* GL_FRAMEBUFFER_UNSUPPORTED */
-       681, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
-      1047, /* GL_MAX_COLOR_ATTACHMENTS */
+      2189, /* GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH */
+      2178, /* GL_TRANSFORM_FEEDBACK_BUFFER_MODE */
+      1170, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS */
+      2187, /* GL_TRANSFORM_FEEDBACK_VARYINGS */
+      2183, /* GL_TRANSFORM_FEEDBACK_BUFFER_START */
+      2181, /* GL_TRANSFORM_FEEDBACK_BUFFER_SIZE */
+      1488, /* GL_PRIMITIVES_GENERATED */
+      2185, /* GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN */
+      1585, /* GL_RASTERIZER_DISCARD */
+      1166, /* GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS */
+      1168, /* GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS */
+       807, /* GL_INTERLEAVED_ATTRIBS */
+      1800, /* GL_SEPARATE_ATTRIBS */
+      2173, /* GL_TRANSFORM_FEEDBACK_BUFFER */
+      2175, /* GL_TRANSFORM_FEEDBACK_BUFFER_BINDING */
+      1424, /* GL_POINT_SPRITE_COORD_ORIGIN */
+       900, /* GL_LOWER_LEFT */
+      2273, /* GL_UPPER_LEFT */
+      1888, /* GL_STENCIL_BACK_REF */
+      1889, /* GL_STENCIL_BACK_VALUE_MASK */
+      1890, /* GL_STENCIL_BACK_WRITEMASK */
+       540, /* GL_DRAW_FRAMEBUFFER_BINDING */
+      1615, /* GL_RENDERBUFFER_BINDING */
+      1589, /* GL_READ_FRAMEBUFFER */
+       539, /* GL_DRAW_FRAMEBUFFER */
+      1590, /* GL_READ_FRAMEBUFFER_BINDING */
+      1634, /* GL_RENDERBUFFER_SAMPLES */
+       654, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE */
+       651, /* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME */
+       666, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL */
+       661, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE */
+       664, /* GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER */
+       672, /* GL_FRAMEBUFFER_COMPLETE */
+       677, /* GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT */
+       692, /* GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT */
+       686, /* GL_FRAMEBUFFER_INCOMPLETE_DUPLICATE_ATTACHMENT_EXT */
+       681, /* GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT */
+       687, /* GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT */
+       683, /* GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER */
+       697, /* GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER */
+       703, /* GL_FRAMEBUFFER_UNSUPPORTED */
+       701, /* GL_FRAMEBUFFER_STATUS_ERROR_EXT */
+      1067, /* GL_MAX_COLOR_ATTACHMENTS */
        196, /* GL_COLOR_ATTACHMENT0 */
        199, /* GL_COLOR_ATTACHMENT1 */
        213, /* GL_COLOR_ATTACHMENT2 */
@@ -6110,192 +6170,198 @@ static const unsigned reduced_enums[1572] =
        206, /* GL_COLOR_ATTACHMENT13 */
        208, /* GL_COLOR_ATTACHMENT14 */
        210, /* GL_COLOR_ATTACHMENT15 */
-       403, /* GL_DEPTH_ATTACHMENT */
-      1855, /* GL_STENCIL_ATTACHMENT */
-       622, /* GL_FRAMEBUFFER */
-      1590, /* GL_RENDERBUFFER */
-      1616, /* GL_RENDERBUFFER_WIDTH */
-      1603, /* GL_RENDERBUFFER_HEIGHT */
-      1606, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
-      1887, /* GL_STENCIL_INDEX_EXT */
-      1876, /* GL_STENCIL_INDEX1 */
-      1881, /* GL_STENCIL_INDEX4 */
-      1884, /* GL_STENCIL_INDEX8 */
-      1877, /* GL_STENCIL_INDEX16 */
-      1610, /* GL_RENDERBUFFER_RED_SIZE */
-      1601, /* GL_RENDERBUFFER_GREEN_SIZE */
-      1596, /* GL_RENDERBUFFER_BLUE_SIZE */
-      1591, /* GL_RENDERBUFFER_ALPHA_SIZE */
-      1598, /* GL_RENDERBUFFER_DEPTH_SIZE */
-      1614, /* GL_RENDERBUFFER_STENCIL_SIZE */
-       675, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
-      1124, /* GL_MAX_SAMPLES */
-      2094, /* GL_TEXTURE_GEN_STR_OES */
-       723, /* GL_HALF_FLOAT_OES */
-      1659, /* GL_RGB565 */
-       547, /* GL_ETC1_RGB8_OES */
-      2086, /* GL_TEXTURE_EXTERNAL_OES */
-      1745, /* GL_SAMPLER_EXTERNAL_OES */
-      2012, /* GL_TEXTURE_BINDING_EXTERNAL_OES */
-      1625, /* GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES */
-      1690, /* GL_RGBA32UI */
-      1653, /* GL_RGB32UI */
+       423, /* GL_DEPTH_ATTACHMENT */
+      1877, /* GL_STENCIL_ATTACHMENT */
+       642, /* GL_FRAMEBUFFER */
+      1612, /* GL_RENDERBUFFER */
+      1638, /* GL_RENDERBUFFER_WIDTH */
+      1625, /* GL_RENDERBUFFER_HEIGHT */
+      1628, /* GL_RENDERBUFFER_INTERNAL_FORMAT */
+      1909, /* GL_STENCIL_INDEX_EXT */
+      1898, /* GL_STENCIL_INDEX1 */
+      1903, /* GL_STENCIL_INDEX4 */
+      1906, /* GL_STENCIL_INDEX8 */
+      1899, /* GL_STENCIL_INDEX16 */
+      1632, /* GL_RENDERBUFFER_RED_SIZE */
+      1623, /* GL_RENDERBUFFER_GREEN_SIZE */
+      1618, /* GL_RENDERBUFFER_BLUE_SIZE */
+      1613, /* GL_RENDERBUFFER_ALPHA_SIZE */
+      1620, /* GL_RENDERBUFFER_DEPTH_SIZE */
+      1636, /* GL_RENDERBUFFER_STENCIL_SIZE */
+       695, /* GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE */
+      1146, /* GL_MAX_SAMPLES */
+      2116, /* GL_TEXTURE_GEN_STR_OES */
+       743, /* GL_HALF_FLOAT_OES */
+      1681, /* GL_RGB565 */
+       567, /* GL_ETC1_RGB8_OES */
+      2108, /* GL_TEXTURE_EXTERNAL_OES */
+      1767, /* GL_SAMPLER_EXTERNAL_OES */
+      2034, /* GL_TEXTURE_BINDING_EXTERNAL_OES */
+      1647, /* GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES */
+      1712, /* GL_RGBA32UI */
+      1675, /* GL_RGB32UI */
         40, /* GL_ALPHA32UI_EXT */
-       779, /* GL_INTENSITY32UI_EXT */
-       897, /* GL_LUMINANCE32UI_EXT */
-       914, /* GL_LUMINANCE_ALPHA32UI_EXT */
-      1681, /* GL_RGBA16UI */
-      1645, /* GL_RGB16UI */
+       799, /* GL_INTENSITY32UI_EXT */
+       917, /* GL_LUMINANCE32UI_EXT */
+       934, /* GL_LUMINANCE_ALPHA32UI_EXT */
+      1703, /* GL_RGBA16UI */
+      1667, /* GL_RGB16UI */
         37, /* GL_ALPHA16UI_EXT */
-       776, /* GL_INTENSITY16UI_EXT */
-       892, /* GL_LUMINANCE16UI_EXT */
-       912, /* GL_LUMINANCE_ALPHA16UI_EXT */
-      1700, /* GL_RGBA8UI */
-      1668, /* GL_RGB8UI */
+       796, /* GL_INTENSITY16UI_EXT */
+       912, /* GL_LUMINANCE16UI_EXT */
+       932, /* GL_LUMINANCE_ALPHA16UI_EXT */
+      1722, /* GL_RGBA8UI */
+      1690, /* GL_RGB8UI */
         45, /* GL_ALPHA8UI_EXT */
-       784, /* GL_INTENSITY8UI_EXT */
-       906, /* GL_LUMINANCE8UI_EXT */
-       916, /* GL_LUMINANCE_ALPHA8UI_EXT */
-      1688, /* GL_RGBA32I */
-      1651, /* GL_RGB32I */
+       804, /* GL_INTENSITY8UI_EXT */
+       926, /* GL_LUMINANCE8UI_EXT */
+       936, /* GL_LUMINANCE_ALPHA8UI_EXT */
+      1710, /* GL_RGBA32I */
+      1673, /* GL_RGB32I */
         39, /* GL_ALPHA32I_EXT */
-       778, /* GL_INTENSITY32I_EXT */
-       896, /* GL_LUMINANCE32I_EXT */
-       913, /* GL_LUMINANCE_ALPHA32I_EXT */
-      1679, /* GL_RGBA16I */
-      1643, /* GL_RGB16I */
+       798, /* GL_INTENSITY32I_EXT */
+       916, /* GL_LUMINANCE32I_EXT */
+       933, /* GL_LUMINANCE_ALPHA32I_EXT */
+      1701, /* GL_RGBA16I */
+      1665, /* GL_RGB16I */
         36, /* GL_ALPHA16I_EXT */
-       775, /* GL_INTENSITY16I_EXT */
-       891, /* GL_LUMINANCE16I_EXT */
-       911, /* GL_LUMINANCE_ALPHA16I_EXT */
-      1698, /* GL_RGBA8I */
-      1666, /* GL_RGB8I */
+       795, /* GL_INTENSITY16I_EXT */
+       911, /* GL_LUMINANCE16I_EXT */
+       931, /* GL_LUMINANCE_ALPHA16I_EXT */
+      1720, /* GL_RGBA8I */
+      1688, /* GL_RGB8I */
         44, /* GL_ALPHA8I_EXT */
-       783, /* GL_INTENSITY8I_EXT */
-       905, /* GL_LUMINANCE8I_EXT */
-       915, /* GL_LUMINANCE_ALPHA8I_EXT */
-      1580, /* GL_RED_INTEGER */
-       718, /* GL_GREEN_INTEGER */
+       803, /* GL_INTENSITY8I_EXT */
+       925, /* GL_LUMINANCE8I_EXT */
+       935, /* GL_LUMINANCE_ALPHA8I_EXT */
+      1602, /* GL_RED_INTEGER */
+       738, /* GL_GREEN_INTEGER */
        113, /* GL_BLUE_INTEGER */
         49, /* GL_ALPHA_INTEGER_EXT */
-      1713, /* GL_RGB_INTEGER */
-      1707, /* GL_RGBA_INTEGER */
+      1735, /* GL_RGB_INTEGER */
+      1729, /* GL_RGBA_INTEGER */
         84, /* GL_BGR_INTEGER */
         82, /* GL_BGRA_INTEGER */
-       918, /* GL_LUMINANCE_INTEGER_EXT */
-       917, /* GL_LUMINANCE_ALPHA_INTEGER_EXT */
-      1709, /* GL_RGBA_INTEGER_MODE_EXT */
-       793, /* GL_INT_2_10_10_10_REV */
-       629, /* GL_FRAMEBUFFER_ATTACHMENT_LAYERED */
-       670, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS */
-       669, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB */
-      1724, /* GL_SAMPLER_1D_ARRAY */
-      1730, /* GL_SAMPLER_2D_ARRAY */
-      1740, /* GL_SAMPLER_BUFFER */
-      1726, /* GL_SAMPLER_1D_ARRAY_SHADOW */
-      1732, /* GL_SAMPLER_2D_ARRAY_SHADOW */
-      1743, /* GL_SAMPLER_CUBE_SHADOW */
-      2231, /* GL_UNSIGNED_INT_VEC2 */
-      2233, /* GL_UNSIGNED_INT_VEC3 */
-      2235, /* GL_UNSIGNED_INT_VEC4 */
-       794, /* GL_INT_SAMPLER_1D */
-       798, /* GL_INT_SAMPLER_2D */
-       804, /* GL_INT_SAMPLER_3D */
-       808, /* GL_INT_SAMPLER_CUBE */
-       802, /* GL_INT_SAMPLER_2D_RECT */
-       795, /* GL_INT_SAMPLER_1D_ARRAY */
-       799, /* GL_INT_SAMPLER_2D_ARRAY */
-       806, /* GL_INT_SAMPLER_BUFFER */
-      2215, /* GL_UNSIGNED_INT_SAMPLER_1D */
-      2219, /* GL_UNSIGNED_INT_SAMPLER_2D */
-      2225, /* GL_UNSIGNED_INT_SAMPLER_3D */
-      2229, /* GL_UNSIGNED_INT_SAMPLER_CUBE */
-      2223, /* GL_UNSIGNED_INT_SAMPLER_2D_RECT */
-      2216, /* GL_UNSIGNED_INT_SAMPLER_1D_ARRAY */
-      2220, /* GL_UNSIGNED_INT_SAMPLER_2D_ARRAY */
-      2227, /* GL_UNSIGNED_INT_SAMPLER_BUFFER */
-       708, /* GL_GEOMETRY_SHADER */
-       711, /* GL_GEOMETRY_VERTICES_OUT_ARB */
-       705, /* GL_GEOMETRY_INPUT_TYPE_ARB */
-       707, /* GL_GEOMETRY_OUTPUT_TYPE_ARB */
-      1082, /* GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB */
-      1164, /* GL_MAX_VERTEX_VARYING_COMPONENTS_ARB */
-      1080, /* GL_MAX_GEOMETRY_UNIFORM_COMPONENTS */
-      1074, /* GL_MAX_GEOMETRY_OUTPUT_VERTICES */
-      1078, /* GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS */
-       881, /* GL_LOW_FLOAT */
-      1166, /* GL_MEDIUM_FLOAT */
-       724, /* GL_HIGH_FLOAT */
-       882, /* GL_LOW_INT */
-      1167, /* GL_MEDIUM_INT */
-       725, /* GL_HIGH_INT */
-      2205, /* GL_UNSIGNED_INT_10_10_10_2_OES */
-       792, /* GL_INT_10_10_10_2_OES */
-      1783, /* GL_SHADER_BINARY_FORMATS */
-      1268, /* GL_NUM_SHADER_BINARY_FORMATS */
-      1784, /* GL_SHADER_COMPILER */
-      1161, /* GL_MAX_VERTEX_UNIFORM_VECTORS */
-      1153, /* GL_MAX_VARYING_VECTORS */
-      1071, /* GL_MAX_FRAGMENT_UNIFORM_VECTORS */
-      1556, /* GL_QUERY_WAIT */
-      1550, /* GL_QUERY_NO_WAIT */
-      1546, /* GL_QUERY_BY_REGION_WAIT */
-      1544, /* GL_QUERY_BY_REGION_NO_WAIT */
-      2149, /* GL_TRANSFORM_FEEDBACK */
-      2158, /* GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED */
-      2152, /* GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE */
-      2150, /* GL_TRANSFORM_FEEDBACK_BINDING */
-      1540, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION */
-       563, /* GL_FIRST_VERTEX_CONVENTION */
-       826, /* GL_LAST_VERTEX_CONVENTION */
-      1514, /* GL_PROVOKING_VERTEX */
+       938, /* GL_LUMINANCE_INTEGER_EXT */
+       937, /* GL_LUMINANCE_ALPHA_INTEGER_EXT */
+      1731, /* GL_RGBA_INTEGER_MODE_EXT */
+       813, /* GL_INT_2_10_10_10_REV */
+       649, /* GL_FRAMEBUFFER_ATTACHMENT_LAYERED */
+       690, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS */
+       689, /* GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB */
+      1746, /* GL_SAMPLER_1D_ARRAY */
+      1752, /* GL_SAMPLER_2D_ARRAY */
+      1762, /* GL_SAMPLER_BUFFER */
+      1748, /* GL_SAMPLER_1D_ARRAY_SHADOW */
+      1754, /* GL_SAMPLER_2D_ARRAY_SHADOW */
+      1765, /* GL_SAMPLER_CUBE_SHADOW */
+      2253, /* GL_UNSIGNED_INT_VEC2 */
+      2255, /* GL_UNSIGNED_INT_VEC3 */
+      2257, /* GL_UNSIGNED_INT_VEC4 */
+       814, /* GL_INT_SAMPLER_1D */
+       818, /* GL_INT_SAMPLER_2D */
+       824, /* GL_INT_SAMPLER_3D */
+       828, /* GL_INT_SAMPLER_CUBE */
+       822, /* GL_INT_SAMPLER_2D_RECT */
+       815, /* GL_INT_SAMPLER_1D_ARRAY */
+       819, /* GL_INT_SAMPLER_2D_ARRAY */
+       826, /* GL_INT_SAMPLER_BUFFER */
+      2237, /* GL_UNSIGNED_INT_SAMPLER_1D */
+      2241, /* GL_UNSIGNED_INT_SAMPLER_2D */
+      2247, /* GL_UNSIGNED_INT_SAMPLER_3D */
+      2251, /* GL_UNSIGNED_INT_SAMPLER_CUBE */
+      2245, /* GL_UNSIGNED_INT_SAMPLER_2D_RECT */
+      2238, /* GL_UNSIGNED_INT_SAMPLER_1D_ARRAY */
+      2242, /* GL_UNSIGNED_INT_SAMPLER_2D_ARRAY */
+      2249, /* GL_UNSIGNED_INT_SAMPLER_BUFFER */
+       728, /* GL_GEOMETRY_SHADER */
+       731, /* GL_GEOMETRY_VERTICES_OUT_ARB */
+       725, /* GL_GEOMETRY_INPUT_TYPE_ARB */
+       727, /* GL_GEOMETRY_OUTPUT_TYPE_ARB */
+      1104, /* GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB */
+      1186, /* GL_MAX_VERTEX_VARYING_COMPONENTS_ARB */
+      1102, /* GL_MAX_GEOMETRY_UNIFORM_COMPONENTS */
+      1096, /* GL_MAX_GEOMETRY_OUTPUT_VERTICES */
+      1100, /* GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS */
+       901, /* GL_LOW_FLOAT */
+      1188, /* GL_MEDIUM_FLOAT */
+       744, /* GL_HIGH_FLOAT */
+       902, /* GL_LOW_INT */
+      1189, /* GL_MEDIUM_INT */
+       745, /* GL_HIGH_INT */
+      2227, /* GL_UNSIGNED_INT_10_10_10_2_OES */
+       812, /* GL_INT_10_10_10_2_OES */
+      1805, /* GL_SHADER_BINARY_FORMATS */
+      1290, /* GL_NUM_SHADER_BINARY_FORMATS */
+      1806, /* GL_SHADER_COMPILER */
+      1183, /* GL_MAX_VERTEX_UNIFORM_VECTORS */
+      1175, /* GL_MAX_VARYING_VECTORS */
+      1093, /* GL_MAX_FRAGMENT_UNIFORM_VECTORS */
+      1578, /* GL_QUERY_WAIT */
+      1572, /* GL_QUERY_NO_WAIT */
+      1568, /* GL_QUERY_BY_REGION_WAIT */
+      1566, /* GL_QUERY_BY_REGION_NO_WAIT */
+      2171, /* GL_TRANSFORM_FEEDBACK */
+      2180, /* GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED */
+      2174, /* GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE */
+      2172, /* GL_TRANSFORM_FEEDBACK_BINDING */
+      1562, /* GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION */
+       583, /* GL_FIRST_VERTEX_CONVENTION */
+       846, /* GL_LAST_VERTEX_CONVENTION */
+      1536, /* GL_PROVOKING_VERTEX */
        354, /* GL_COPY_READ_BUFFER */
        355, /* GL_COPY_WRITE_BUFFER */
-      1583, /* GL_RED_SNORM */
-      1720, /* GL_RG_SNORM */
-      1719, /* GL_RGB_SNORM */
-      1712, /* GL_RGBA_SNORM */
-      1562, /* GL_R8_SNORM */
-      1632, /* GL_RG8_SNORM */
-      1672, /* GL_RGB8_SNORM */
-      1704, /* GL_RGBA8_SNORM */
-      1560, /* GL_R16_SNORM */
-      1631, /* GL_RG16_SNORM */
-      1648, /* GL_RGB16_SNORM */
-      1684, /* GL_RGBA16_SNORM */
-      1795, /* GL_SIGNED_NORMALIZED */
-      1468, /* GL_PRIMITIVE_RESTART */
-      1469, /* GL_PRIMITIVE_RESTART_INDEX */
-      1636, /* GL_RGB10_A2UI */
-      1126, /* GL_MAX_SERVER_WAIT_TIMEOUT */
-      1282, /* GL_OBJECT_TYPE */
-      1908, /* GL_SYNC_CONDITION */
-      1913, /* GL_SYNC_STATUS */
-      1910, /* GL_SYNC_FLAGS */
-      1909, /* GL_SYNC_FENCE */
-      1912, /* GL_SYNC_GPU_COMMANDS_COMPLETE */
-      2198, /* GL_UNSIGNALED */
-      1794, /* GL_SIGNALED */
+      1605, /* GL_RED_SNORM */
+      1742, /* GL_RG_SNORM */
+      1741, /* GL_RGB_SNORM */
+      1734, /* GL_RGBA_SNORM */
+      1584, /* GL_R8_SNORM */
+      1654, /* GL_RG8_SNORM */
+      1694, /* GL_RGB8_SNORM */
+      1726, /* GL_RGBA8_SNORM */
+      1582, /* GL_R16_SNORM */
+      1653, /* GL_RG16_SNORM */
+      1670, /* GL_RGB16_SNORM */
+      1706, /* GL_RGBA16_SNORM */
+      1817, /* GL_SIGNED_NORMALIZED */
+      1490, /* GL_PRIMITIVE_RESTART */
+      1491, /* GL_PRIMITIVE_RESTART_INDEX */
+      1658, /* GL_RGB10_A2UI */
+      1148, /* GL_MAX_SERVER_WAIT_TIMEOUT */
+      1304, /* GL_OBJECT_TYPE */
+      1930, /* GL_SYNC_CONDITION */
+      1935, /* GL_SYNC_STATUS */
+      1932, /* GL_SYNC_FLAGS */
+      1931, /* GL_SYNC_FENCE */
+      1934, /* GL_SYNC_GPU_COMMANDS_COMPLETE */
+      2220, /* GL_UNSIGNALED */
+      1816, /* GL_SIGNALED */
         54, /* GL_ALREADY_SIGNALED */
-      2144, /* GL_TIMEOUT_EXPIRED */
+      2166, /* GL_TIMEOUT_EXPIRED */
        315, /* GL_CONDITION_SATISFIED */
-      2315, /* GL_WAIT_FAILED */
+      2337, /* GL_WAIT_FAILED */
        126, /* GL_BUFFER_ACCESS_FLAGS */
        132, /* GL_BUFFER_MAP_LENGTH */
        133, /* GL_BUFFER_MAP_OFFSET */
-      1156, /* GL_MAX_VERTEX_OUTPUT_COMPONENTS */
-      1072, /* GL_MAX_GEOMETRY_INPUT_COMPONENTS */
-      1073, /* GL_MAX_GEOMETRY_OUTPUT_COMPONENTS */
-      1068, /* GL_MAX_FRAGMENT_INPUT_COMPONENTS */
+      1178, /* GL_MAX_VERTEX_OUTPUT_COMPONENTS */
+      1094, /* GL_MAX_GEOMETRY_INPUT_COMPONENTS */
+      1095, /* GL_MAX_GEOMETRY_OUTPUT_COMPONENTS */
+      1090, /* GL_MAX_FRAGMENT_INPUT_COMPONENTS */
        330, /* GL_CONTEXT_PROFILE_MASK */
-       713, /* GL_GL_TEXTURE_IMMUTABLE_FORMAT */
-       548, /* GL_EVAL_BIT */
-      1565, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
-       873, /* GL_LIST_BIT */
-      2016, /* GL_TEXTURE_BIT */
-      1764, /* GL_SCISSOR_BIT */
+       733, /* GL_GL_TEXTURE_IMMUTABLE_FORMAT */
+      1081, /* GL_MAX_DEBUG_MESSAGE_LENGTH_ARB */
+      1080, /* GL_MAX_DEBUG_LOGGED_MESSAGES_ARB */
+       394, /* GL_DEBUG_LOGGED_MESSAGES_ARB */
+       399, /* GL_DEBUG_SEVERITY_HIGH_ARB */
+       401, /* GL_DEBUG_SEVERITY_MEDIUM_ARB */
+       400, /* GL_DEBUG_SEVERITY_LOW_ARB */
+       568, /* GL_EVAL_BIT */
+      1587, /* GL_RASTER_POSITION_UNCLIPPED_IBM */
+       893, /* GL_LIST_BIT */
+      2038, /* GL_TEXTURE_BIT */
+      1786, /* GL_SCISSOR_BIT */
         30, /* GL_ALL_ATTRIB_BITS */
-      1231, /* GL_MULTISAMPLE_BIT */
+      1253, /* GL_MULTISAMPLE_BIT */
         31, /* GL_ALL_CLIENT_ATTRIB_BITS */
 };
 
diff --git a/mesalib/src/mesa/main/errors.c b/mesalib/src/mesa/main/errors.c
new file mode 100644
index 000000000..22561003a
--- /dev/null
+++ b/mesalib/src/mesa/main/errors.c
@@ -0,0 +1,1065 @@
+/**
+ * \file errors.c
+ * Mesa debugging and error handling functions.
+ */
+
+/*
+ * Mesa 3-D graphics library
+ * Version:  7.1
+ *
+ * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+#include "errors.h"
+
+#include "imports.h"
+#include "context.h"
+#include "dispatch.h"
+#include "hash.h"
+#include "mtypes.h"
+#include "version.h"
+
+
+#define MAXSTRING MAX_DEBUG_MESSAGE_LENGTH
+
+
+struct gl_client_severity
+{
+   struct simple_node link;
+   GLuint ID;
+};
+
+static char out_of_memory[] = "Debugging error: out of memory";
+
+#define enum_is(e, kind1, kind2) \
+   ((e) == GL_DEBUG_##kind1##_##kind2##_ARB || (e) == GL_DONT_CARE)
+#define severity_is(sev, kind) enum_is(sev, SEVERITY, kind)
+#define source_is(s, kind) enum_is(s, SOURCE, kind)
+#define type_is(t, kind) enum_is(t, TYPE, kind)
+
+/* Prevent define collision on Windows */
+#undef ERROR
+
+enum {
+   SOURCE_APPLICATION,
+   SOURCE_THIRD_PARTY,
+
+   SOURCE_COUNT,
+   SOURCE_ANY = -1
+};
+
+enum {
+   TYPE_ERROR,
+   TYPE_DEPRECATED,
+   TYPE_UNDEFINED,
+   TYPE_PORTABILITY,
+   TYPE_PERFORMANCE,
+   TYPE_OTHER,
+
+   TYPE_COUNT,
+   TYPE_ANY = -1
+};
+
+enum {
+   SEVERITY_LOW,
+   SEVERITY_MEDIUM,
+   SEVERITY_HIGH,
+
+   SEVERITY_COUNT,
+   SEVERITY_ANY = -1
+};
+
+static int
+enum_to_index(GLenum e)
+{
+   switch (e) {
+   case GL_DEBUG_SOURCE_APPLICATION_ARB:
+      return (int)SOURCE_APPLICATION;
+   case GL_DEBUG_SOURCE_THIRD_PARTY_ARB:
+      return (int)SOURCE_THIRD_PARTY;
+
+   case GL_DEBUG_TYPE_ERROR_ARB:
+      return (int)TYPE_ERROR;
+   case GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_ARB:
+      return (int)TYPE_DEPRECATED;
+   case GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_ARB:
+      return (int)TYPE_UNDEFINED;
+   case GL_DEBUG_TYPE_PERFORMANCE_ARB:
+      return (int)TYPE_PERFORMANCE;
+   case GL_DEBUG_TYPE_PORTABILITY_ARB:
+      return (int)TYPE_PORTABILITY;
+   case GL_DEBUG_TYPE_OTHER_ARB:
+      return (int)TYPE_OTHER;
+
+   case GL_DEBUG_SEVERITY_LOW_ARB:
+      return (int)SEVERITY_LOW;
+   case GL_DEBUG_SEVERITY_MEDIUM_ARB:
+      return (int)SEVERITY_MEDIUM;
+   case GL_DEBUG_SEVERITY_HIGH_ARB:
+      return (int)SEVERITY_HIGH;
+
+   case GL_DONT_CARE:
+      return (int)TYPE_ANY;
+
+   default:
+      assert(0 && "unreachable");
+      return -2;
+   };
+}
+
+
+/*
+ * We store a bitfield in the hash table, with five possible values total.
+ *
+ * The ENABLED_BIT's purpose is self-explanatory.
+ *
+ * The FOUND_BIT is needed to differentiate the value of DISABLED from
+ * the value returned by HashTableLookup() when it can't find the given key.
+ *
+ * The KNOWN_SEVERITY bit is a bit complicated:
+ *
+ * A client may call Control() with an array of IDs, then call Control()
+ * on all message IDs of a certain severity, then Insert() one of the
+ * previously specified IDs, giving us a known severity level, then call
+ * Control() on all message IDs of a certain severity level again.
+ *
+ * After the first call, those IDs will have a FOUND_BIT, but will not
+ * exist in any severity-specific list, so the second call will not
+ * impact them. This is undesirable but unavoidable given the API:
+ * The only entrypoint that gives a severity for a client-defined ID
+ * is the Insert() call.
+ *
+ * For the sake of Control(), we want to maintain the invariant
+ * that an ID will either appear in none of the three severity lists,
+ * or appear once, to minimize pointless duplication and potential surprises.
+ *
+ * Because Insert() is the only place that will learn an ID's severity,
+ * it should insert an ID into the appropriate list, but only if the ID
+ * doesn't exist in it or any other list yet. Because searching all three
+ * lists at O(n) is needlessly expensive, we store KNOWN_SEVERITY.
+ */
+enum {
+   FOUND_BIT = 1 << 0,
+   ENABLED_BIT = 1 << 1,
+   KNOWN_SEVERITY = 1 << 2,
+
+   /* HashTable reserves zero as a return value meaning 'not found' */
+   NOT_FOUND = 0,
+   DISABLED = FOUND_BIT,
+   ENABLED = ENABLED_BIT | FOUND_BIT
+};
+
+/**
+ * Returns the state of the given message ID in a client-controlled
+ * namespace.
+ * 'source', 'type', and 'severity' are array indices like TYPE_ERROR,
+ * not GL enums.
+ */
+static GLboolean
+get_message_state(struct gl_context *ctx, int source, int type,
+                  GLuint id, int severity)
+{
+   struct gl_client_namespace *nspace =
+         &ctx->Debug.ClientIDs.Namespaces[source][type];
+   uintptr_t state;
+
+   /* In addition to not being able to store zero as a value, HashTable also
+      can't use zero as a key. */
+   if (id)
+      state = (uintptr_t)_mesa_HashLookup(nspace->IDs, id);
+   else
+      state = nspace->ZeroID;
+
+   /* Only do this once for each ID. This makes sure the ID exists in,
+      at most, one list, and does not pointlessly appear multiple times. */
+   if (!(state & KNOWN_SEVERITY)) {
+      struct gl_client_severity *entry;
+
+      if (state == NOT_FOUND) {
+         if (ctx->Debug.ClientIDs.Defaults[severity][source][type])
+            state = ENABLED;
+         else
+            state = DISABLED;
+      }
+
+      entry = malloc(sizeof *entry);
+      if (!entry)
+         goto out;
+
+      state |= KNOWN_SEVERITY;
+
+      if (id)
+         _mesa_HashInsert(nspace->IDs, id, (void*)state);
+      else
+         nspace->ZeroID = state;
+
+      entry->ID = id;
+      insert_at_tail(&nspace->Severity[severity], &entry->link);
+   }
+
+out:
+   return !!(state & ENABLED_BIT);
+}
+
+/**
+ * Sets the state of the given message ID in a client-controlled
+ * namespace.
+ * 'source' and 'type' are array indices like TYPE_ERROR, not GL enums.
+ */
+static void
+set_message_state(struct gl_context *ctx, int source, int type,
+                  GLuint id, GLboolean enabled)
+{
+   struct gl_client_namespace *nspace =
+         &ctx->Debug.ClientIDs.Namespaces[source][type];
+   uintptr_t state;
+
+   /* In addition to not being able to store zero as a value, HashTable also
+      can't use zero as a key. */
+   if (id)
+      state = (uintptr_t)_mesa_HashLookup(nspace->IDs, id);
+   else
+      state = nspace->ZeroID;
+
+   if (state == NOT_FOUND)
+      state = enabled ? ENABLED : DISABLED;
+   else {
+      if (enabled)
+         state |= ENABLED_BIT;
+      else
+         state &= ~ENABLED_BIT;
+   }
+
+   if (id)
+      _mesa_HashInsert(nspace->IDs, id, (void*)state);
+   else
+      nspace->ZeroID = state;
+}
+
+/**
+ * Whether a debugging message should be logged or not.
+ * For implementation-controlled namespaces, we keep an array
+ * of booleans per namespace, per context, recording whether
+ * each individual message is enabled or not. The message ID
+ * is an index into the namespace's array.
+ */
+static GLboolean
+should_log(struct gl_context *ctx, GLenum source, GLenum type,
+           GLuint id, GLenum severity)
+{
+   if (source == GL_DEBUG_SOURCE_APPLICATION_ARB ||
+       source == GL_DEBUG_SOURCE_THIRD_PARTY_ARB) {
+      int s, t, sev;
+      s = enum_to_index(source);
+      t = enum_to_index(type);
+      sev = enum_to_index(severity);
+
+      return get_message_state(ctx, s, t, sev, id);
+   }
+
+   if (type_is(type, ERROR)) {
+      if (source_is(source, API))
+         return ctx->Debug.ApiErrors[id];
+      if (source_is(source, WINDOW_SYSTEM))
+         return ctx->Debug.WinsysErrors[id];
+      if (source_is(source, SHADER_COMPILER))
+         return ctx->Debug.ShaderErrors[id];
+      if (source_is(source, OTHER))
+         return ctx->Debug.OtherErrors[id];
+   }
+
+   return (severity != GL_DEBUG_SEVERITY_LOW_ARB);
+}
+
+/**
+ * 'buf' is not necessarily a null-terminated string. When logging, copy
+ * 'len' characters from it, store them in a new, null-terminated string,
+ * and remember the number of bytes used by that string, *including*
+ * the null terminator this time.
+ */
+static void
+_mesa_log_msg(struct gl_context *ctx, GLenum source, GLenum type,
+              GLuint id, GLenum severity, GLint len, const char *buf)
+{
+   GLint nextEmpty;
+   struct gl_debug_msg *emptySlot;
+
+   assert(len >= 0 && len < MAX_DEBUG_MESSAGE_LENGTH);
+
+   if (!should_log(ctx, source, type, id, severity))
+      return;
+
+   if (ctx->Debug.Callback) {
+      ctx->Debug.Callback(source, type, id, severity,
+                          len, buf, ctx->Debug.CallbackData);
+      return;
+   }
+
+   if (ctx->Debug.NumMessages == MAX_DEBUG_LOGGED_MESSAGES)
+      return;
+
+   nextEmpty = (ctx->Debug.NextMsg + ctx->Debug.NumMessages)
+                          % MAX_DEBUG_LOGGED_MESSAGES;
+   emptySlot = &ctx->Debug.Log[nextEmpty];
+
+   assert(!emptySlot->message && !emptySlot->length);
+
+   emptySlot->message = MALLOC(len+1);
+   if (emptySlot->message) {
+      (void) strncpy(emptySlot->message, buf, (size_t)len);
+      emptySlot->message[len] = '\0';
+
+      emptySlot->length = len+1;
+      emptySlot->source = source;
+      emptySlot->type = type;
+      emptySlot->id = id;
+      emptySlot->severity = severity;
+   } else {
+      /* malloc failed! */
+      emptySlot->message = out_of_memory;
+      emptySlot->length = strlen(out_of_memory)+1;
+      emptySlot->source = GL_DEBUG_SOURCE_OTHER_ARB;
+      emptySlot->type = GL_DEBUG_TYPE_ERROR_ARB;
+      emptySlot->id = OTHER_ERROR_OUT_OF_MEMORY;
+      emptySlot->severity = GL_DEBUG_SEVERITY_HIGH_ARB;
+   }
+
+   if (ctx->Debug.NumMessages == 0)
+      ctx->Debug.NextMsgLength = ctx->Debug.Log[ctx->Debug.NextMsg].length;
+
+   ctx->Debug.NumMessages++;
+}
+
+/**
+ * Pop the oldest debug message out of the log.
+ * Writes the message string, including the null terminator, into 'buf',
+ * using up to 'bufSize' bytes. If 'bufSize' is too small, or
+ * if 'buf' is NULL, nothing is written.
+ *
+ * Returns the number of bytes written on success, or when 'buf' is NULL,
+ * the number that would have been written. A return value of 0
+ * indicates failure.
+ */
+static GLsizei
+_mesa_get_msg(struct gl_context *ctx, GLenum *source, GLenum *type,
+              GLuint *id, GLenum *severity, GLsizei bufSize, char *buf)
+{
+   struct gl_debug_msg *msg;
+   GLsizei length;
+
+   if (ctx->Debug.NumMessages == 0)
+      return 0;
+
+   msg = &ctx->Debug.Log[ctx->Debug.NextMsg];
+   length = msg->length;
+
+   assert(length > 0 && length == ctx->Debug.NextMsgLength);
+
+   if (bufSize < length && buf != NULL)
+      return 0;
+
+   if (severity)
+      *severity = msg->severity;
+   if (source)
+      *source = msg->source;
+   if (type)
+      *type = msg->type;
+   if (id)
+      *id = msg->id;
+
+   if (buf) {
+      assert(msg->message[length-1] == '\0');
+      (void) strncpy(buf, msg->message, (size_t)length);
+   }
+
+   if (msg->message != (char*)out_of_memory)
+      FREE(msg->message);
+   msg->message = NULL;
+   msg->length = 0;
+
+   ctx->Debug.NumMessages--;
+   ctx->Debug.NextMsg++;
+   ctx->Debug.NextMsg %= MAX_DEBUG_LOGGED_MESSAGES;
+   ctx->Debug.NextMsgLength = ctx->Debug.Log[ctx->Debug.NextMsg].length;
+
+   return length;
+}
+
+/**
+ * Verify that source, type, and severity are valid enums.
+ * glDebugMessageInsertARB only accepts two values for 'source',
+ * and glDebugMessageControlARB will additionally accept GL_DONT_CARE
+ * in any parameter, so handle those cases specially.
+ */
+static GLboolean
+validate_params(struct gl_context *ctx, unsigned caller,
+                GLenum source, GLenum type, GLenum severity)
+{
+#define INSERT 1
+#define CONTROL 2
+   switch(source) {
+   case GL_DEBUG_SOURCE_APPLICATION_ARB:
+   case GL_DEBUG_SOURCE_THIRD_PARTY_ARB:
+      break;
+   case GL_DEBUG_SOURCE_API_ARB:
+   case GL_DEBUG_SOURCE_SHADER_COMPILER_ARB:
+   case GL_DEBUG_SOURCE_WINDOW_SYSTEM_ARB:
+   case GL_DEBUG_SOURCE_OTHER_ARB:
+      if (caller != INSERT)
+         break;
+   case GL_DONT_CARE:
+      if (caller == CONTROL)
+         break;
+   default:
+      goto error;
+   }
+
+   switch(type) {
+   case GL_DEBUG_TYPE_ERROR_ARB:
+   case GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_ARB:
+   case GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_ARB:
+   case GL_DEBUG_TYPE_PERFORMANCE_ARB:
+   case GL_DEBUG_TYPE_PORTABILITY_ARB:
+   case GL_DEBUG_TYPE_OTHER_ARB:
+      break;
+   case GL_DONT_CARE:
+      if (caller == CONTROL)
+         break;
+   default:
+      goto error;
+   }
+
+   switch(severity) {
+   case GL_DEBUG_SEVERITY_HIGH_ARB:
+   case GL_DEBUG_SEVERITY_MEDIUM_ARB:
+   case GL_DEBUG_SEVERITY_LOW_ARB:
+      break;
+   case GL_DONT_CARE:
+      if (caller == CONTROL)
+         break;
+   default:
+      goto error;
+   }
+   return GL_TRUE;
+
+error:
+   {
+      const char *callerstr;
+      if (caller == INSERT)
+         callerstr = "glDebugMessageInsertARB";
+      else if (caller == CONTROL)
+         callerstr = "glDebugMessageControlARB";
+      else
+         return GL_FALSE;
+
+      _mesa_error( ctx, GL_INVALID_ENUM, "bad values passed to %s"
+                  "(source=0x%x, type=0x%x, severity=0x%x)", callerstr,
+                  source, type, severity);
+   }
+   return GL_FALSE;
+}
+
+static void GLAPIENTRY
+_mesa_DebugMessageInsertARB(GLenum source, GLenum type, GLuint id,
+                            GLenum severity, GLint length,
+                            const GLcharARB* buf)
+{
+   GET_CURRENT_CONTEXT(ctx);
+
+   if (!validate_params(ctx, INSERT, source, type, severity))
+      return; /* GL_INVALID_ENUM */
+
+   if (length < 0)
+      length = strlen(buf);
+
+   if (length >= MAX_DEBUG_MESSAGE_LENGTH) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glDebugMessageInsertARB"
+                 "(length=%d, which is not less than "
+                 "GL_MAX_DEBUG_MESSAGE_LENGTH_ARB=%d)", length,
+                 MAX_DEBUG_MESSAGE_LENGTH);
+      return;
+   }
+
+   _mesa_log_msg(ctx, source, type, id, severity, length, buf);
+}
+
+static GLuint GLAPIENTRY
+_mesa_GetDebugMessageLogARB(GLuint count, GLsizei logSize, GLenum* sources,
+                            GLenum* types, GLenum* ids, GLenum* severities,
+                            GLsizei* lengths, GLcharARB* messageLog)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint ret;
+
+   if (!messageLog)
+      logSize = 0;
+
+   if (logSize < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glGetDebugMessageLogARB"
+                 "(logSize=%d : logSize must not be negative)", logSize);
+      return 0;
+   }
+
+   for (ret = 0; ret < count; ret++) {
+      GLsizei written = _mesa_get_msg(ctx, sources, types, ids, severities,
+                                      logSize, messageLog);
+      if (!written)
+         break;
+
+      if (messageLog) {
+         messageLog += written;
+         logSize -= written;
+      }
+      if (lengths) {
+         *lengths = written;
+         lengths++;
+      }
+
+      if (severities)
+         severities++;
+      if (sources)
+         sources++;
+      if (types)
+         types++;
+      if (ids)
+         ids++;
+   }
+
+   return ret;
+}
+
+/**
+ * 'array' is an array representing a particular debugging-message namespace.
+ * I.e., the set of all API errors, or the set of all Shader Compiler errors.
+ * 'size' is the size of 'array'. 'count' is the size of 'ids', an array
+ * of indices into 'array'. All the elements of 'array' at the indices
+ * listed in 'ids' will be overwritten with the value of 'enabled'.
+ *
+ * If 'count' is zero, all elements in 'array' are overwritten with the
+ * value of 'enabled'.
+ */
+static void
+control_messages(GLboolean *array, GLuint size,
+                 GLsizei count, const GLuint *ids, GLboolean enabled)
+{
+   GLsizei i;
+
+   if (!count) {
+      GLuint id;
+      for (id = 0; id < size; id++) {
+         array[id] = enabled;
+      }
+      return;
+   }
+
+   for (i = 0; i < count; i++) {
+      if (ids[i] >= size) {
+         /* XXX: The spec doesn't say what to do with a non-existent ID. */
+         continue;
+      }
+      array[ids[i]] = enabled;
+   }
+}
+
+/**
+ * Set the state of all message IDs found in the given intersection
+ * of 'source', 'type', and 'severity'. Note that all three of these
+ * parameters are array indices, not the corresponding GL enums.
+ *
+ * This requires both setting the state of all previously seen message
+ * IDs in the hash table, and setting the default state for all
+ * applicable combinations of source/type/severity, so that all the
+ * yet-unknown message IDs that may be used in the future will be
+ * impacted as if they were already known.
+ */
+static void
+control_app_messages_by_group(struct gl_context *ctx, int source, int type,
+                              int severity, GLboolean enabled)
+{
+   struct gl_client_debug *ClientIDs = &ctx->Debug.ClientIDs;
+   int s, t, sev, smax, tmax, sevmax;
+
+   if (source == SOURCE_ANY) {
+      source = 0;
+      smax = SOURCE_COUNT;
+   } else {
+      smax = source+1;
+   }
+
+   if (type == TYPE_ANY) {
+      type = 0;
+      tmax = TYPE_COUNT;
+   } else {
+      tmax = type+1;
+   }
+
+   if (severity == SEVERITY_ANY) {
+      severity = 0;
+      sevmax = SEVERITY_COUNT;
+   } else {
+      sevmax = severity+1;
+   }
+
+   for (sev = severity; sev < sevmax; sev++)
+      for (s = source; s < smax; s++)
+         for (t = type; t < tmax; t++) {
+            struct simple_node *node;
+            struct gl_client_severity *entry;
+
+            /* change the default for IDs we've never seen before. */
+            ClientIDs->Defaults[sev][s][t] = enabled;
+
+            /* Now change the state of IDs we *have* seen... */
+            foreach(node, &ClientIDs->Namespaces[s][t].Severity[sev]) {
+               entry = (struct gl_client_severity *)node;
+               set_message_state(ctx, s, t, entry->ID, enabled);
+            }
+         }
+}
+
+/**
+ * Debugging-message namespaces with the source APPLICATION or THIRD_PARTY
+ * require special handling, since the IDs in them are controlled by clients,
+ * not the OpenGL implementation.
+ *
+ * 'count' is the length of the array 'ids'. If 'count' is nonzero, all
+ * the given IDs in the namespace defined by 'esource' and 'etype'
+ * will be affected.
+ *
+ * If 'count' is zero, this sets the state of all IDs that match
+ * the combination of 'esource', 'etype', and 'eseverity'.
+ */
+static void
+control_app_messages(struct gl_context *ctx, GLenum esource, GLenum etype,
+                     GLenum eseverity, GLsizei count, const GLuint *ids,
+                     GLboolean enabled)
+{
+   int source, type, severity;
+   GLsizei i;
+
+   source = enum_to_index(esource);
+   type = enum_to_index(etype);
+   severity = enum_to_index(eseverity);
+
+   if (count)
+      assert(severity == SEVERITY_ANY && type != TYPE_ANY
+             && source != SOURCE_ANY);
+
+   for (i = 0; i < count; i++)
+      set_message_state(ctx, source, type, ids[i], enabled);
+
+   if (count)
+      return;
+
+   control_app_messages_by_group(ctx, source, type, severity, enabled);
+}
+
+static void GLAPIENTRY
+_mesa_DebugMessageControlARB(GLenum source, GLenum type, GLenum severity,
+                             GLsizei count, const GLuint *ids,
+                             GLboolean enabled)
+{
+   GET_CURRENT_CONTEXT(ctx);
+
+   if (count < 0) {
+      _mesa_error(ctx, GL_INVALID_VALUE, "glDebugMessageControlARB"
+                 "(count=%d : count must not be negative)", count);
+      return;
+   }
+
+   if (!validate_params(ctx, CONTROL, source, type, severity))
+      return; /* GL_INVALID_ENUM */
+
+   if (count && (severity != GL_DONT_CARE || type == GL_DONT_CARE
+                 || source == GL_DONT_CARE)) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glDebugMessageControlARB"
+                 "(When passing an array of ids, severity must be"
+         " GL_DONT_CARE, and source and type must not be GL_DONT_CARE.");
+      return;
+   }
+
+   if (source_is(source, APPLICATION) || source_is(source, THIRD_PARTY))
+      control_app_messages(ctx, source, type, severity, count, ids, enabled);
+
+   if (severity_is(severity, HIGH)) {
+      if (type_is(type, ERROR)) {
+         if (source_is(source, API))
+            control_messages(ctx->Debug.ApiErrors, API_ERROR_COUNT,
+                             count, ids, enabled);
+         if (source_is(source, WINDOW_SYSTEM))
+            control_messages(ctx->Debug.WinsysErrors, WINSYS_ERROR_COUNT,
+                             count, ids, enabled);
+         if (source_is(source, SHADER_COMPILER))
+            control_messages(ctx->Debug.ShaderErrors, SHADER_ERROR_COUNT,
+                             count, ids, enabled);
+         if (source_is(source, OTHER))
+            control_messages(ctx->Debug.OtherErrors, OTHER_ERROR_COUNT,
+                             count, ids, enabled);
+      }
+   }
+}
+
+static void GLAPIENTRY
+_mesa_DebugMessageCallbackARB(GLvoid *callback, GLvoid *userParam)
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ctx->Debug.Callback = (GLDEBUGPROCARB)callback;
+   ctx->Debug.CallbackData = userParam;
+}
+
+void
+_mesa_init_errors_dispatch(struct _glapi_table *disp)
+{
+   SET_DebugMessageCallbackARB(disp, _mesa_DebugMessageCallbackARB);
+   SET_DebugMessageControlARB(disp, _mesa_DebugMessageControlARB);
+   SET_DebugMessageInsertARB(disp, _mesa_DebugMessageInsertARB);
+   SET_GetDebugMessageLogARB(disp, _mesa_GetDebugMessageLogARB);
+}
+
+void
+_mesa_init_errors(struct gl_context *ctx)
+{
+   int s, t, sev;
+   struct gl_client_debug *ClientIDs = &ctx->Debug.ClientIDs;
+
+   ctx->Debug.Callback = NULL;
+   ctx->Debug.SyncOutput = GL_FALSE;
+   ctx->Debug.Log[0].length = 0;
+   ctx->Debug.NumMessages = 0;
+   ctx->Debug.NextMsg = 0;
+   ctx->Debug.NextMsgLength = 0;
+
+   /* Enable all the messages with severity HIGH or MEDIUM by default. */
+   memset(ctx->Debug.ApiErrors, GL_TRUE, sizeof ctx->Debug.ApiErrors);
+   memset(ctx->Debug.WinsysErrors, GL_TRUE, sizeof ctx->Debug.WinsysErrors);
+   memset(ctx->Debug.ShaderErrors, GL_TRUE, sizeof ctx->Debug.ShaderErrors);
+   memset(ctx->Debug.OtherErrors, GL_TRUE, sizeof ctx->Debug.OtherErrors);
+   memset(ClientIDs->Defaults[SEVERITY_HIGH], GL_TRUE,
+          sizeof ClientIDs->Defaults[SEVERITY_HIGH]);
+   memset(ClientIDs->Defaults[SEVERITY_MEDIUM], GL_TRUE,
+          sizeof ClientIDs->Defaults[SEVERITY_MEDIUM]);
+   memset(ClientIDs->Defaults[SEVERITY_LOW], GL_FALSE,
+          sizeof ClientIDs->Defaults[SEVERITY_LOW]);
+
+   /* Initialize state for filtering client-provided debug messages. */
+   for (s = 0; s < SOURCE_COUNT; s++)
+      for (t = 0; t < TYPE_COUNT; t++) {
+         ClientIDs->Namespaces[s][t].IDs = _mesa_NewHashTable();
+         assert(ClientIDs->Namespaces[s][t].IDs);
+
+         for (sev = 0; sev < SEVERITY_COUNT; sev++)
+            make_empty_list(&ClientIDs->Namespaces[s][t].Severity[sev]);
+      }
+}
+
+void
+_mesa_free_errors_data(struct gl_context *ctx)
+{
+   int s, t, sev;
+   struct gl_client_debug *ClientIDs = &ctx->Debug.ClientIDs;
+
+   /* Tear down state for filtering client-provided debug messages. */
+   for (s = 0; s < SOURCE_COUNT; s++)
+      for (t = 0; t < TYPE_COUNT; t++) {
+         _mesa_DeleteHashTable(ClientIDs->Namespaces[s][t].IDs);
+         for (sev = 0; sev < SEVERITY_COUNT; sev++) {
+            struct simple_node *node, *tmp;
+            struct gl_client_severity *entry;
+
+            foreach_s(node, tmp, &ClientIDs->Namespaces[s][t].Severity[sev]) {
+               entry = (struct gl_client_severity *)node;
+               FREE(entry);
+            }
+         }
+      }
+}
+
+/**********************************************************************/
+/** \name Diagnostics */
+/*@{*/
+
+static void
+output_if_debug(const char *prefixString, const char *outputString,
+                GLboolean newline)
+{
+   static int debug = -1;
+
+   /* Check the MESA_DEBUG environment variable if it hasn't
+    * been checked yet.  We only have to check it once...
+    */
+   if (debug == -1) {
+      char *env = _mesa_getenv("MESA_DEBUG");
+
+      /* In a debug build, we print warning messages *unless*
+       * MESA_DEBUG is 0.  In a non-debug build, we don't
+       * print warning messages *unless* MESA_DEBUG is
+       * set *to any value*.
+       */
+#ifdef DEBUG
+      debug = (env != NULL && atoi(env) == 0) ? 0 : 1;
+#else
+      debug = (env != NULL) ? 1 : 0;
+#endif
+   }
+
+   /* Now only print the string if we're required to do so. */
+   if (debug) {
+      fprintf(stderr, "%s: %s", prefixString, outputString);
+      if (newline)
+         fprintf(stderr, "\n");
+
+#if defined(_WIN32) && !defined(_WIN32_WCE)
+      /* stderr from windows applications without console is not usually 
+       * visible, so communicate with the debugger instead */ 
+      {
+         char buf[4096];
+         _mesa_snprintf(buf, sizeof(buf), "%s: %s%s", prefixString, outputString, newline ? "\n" : "");
+         OutputDebugStringA(buf);
+      }
+#endif
+   }
+}
+
+
+/**
+ * Return string version of GL error code.
+ */
+static const char *
+error_string( GLenum error )
+{
+   switch (error) {
+   case GL_NO_ERROR:
+      return "GL_NO_ERROR";
+   case GL_INVALID_VALUE:
+      return "GL_INVALID_VALUE";
+   case GL_INVALID_ENUM:
+      return "GL_INVALID_ENUM";
+   case GL_INVALID_OPERATION:
+      return "GL_INVALID_OPERATION";
+   case GL_STACK_OVERFLOW:
+      return "GL_STACK_OVERFLOW";
+   case GL_STACK_UNDERFLOW:
+      return "GL_STACK_UNDERFLOW";
+   case GL_OUT_OF_MEMORY:
+      return "GL_OUT_OF_MEMORY";
+   case GL_TABLE_TOO_LARGE:
+      return "GL_TABLE_TOO_LARGE";
+   case GL_INVALID_FRAMEBUFFER_OPERATION_EXT:
+      return "GL_INVALID_FRAMEBUFFER_OPERATION";
+   default:
+      return "unknown";
+   }
+}
+
+
+/**
+ * When a new type of error is recorded, print a message describing
+ * previous errors which were accumulated.
+ */
+static void
+flush_delayed_errors( struct gl_context *ctx )
+{
+   char s[MAXSTRING];
+
+   if (ctx->ErrorDebugCount) {
+      _mesa_snprintf(s, MAXSTRING, "%d similar %s errors", 
+                     ctx->ErrorDebugCount,
+                     error_string(ctx->ErrorValue));
+
+      output_if_debug("Mesa", s, GL_TRUE);
+
+      ctx->ErrorDebugCount = 0;
+   }
+}
+
+
+/**
+ * Report a warning (a recoverable error condition) to stderr if
+ * either DEBUG is defined or the MESA_DEBUG env var is set.
+ *
+ * \param ctx GL context.
+ * \param fmtString printf()-like format string.
+ */
+void
+_mesa_warning( struct gl_context *ctx, const char *fmtString, ... )
+{
+   char str[MAXSTRING];
+   va_list args;
+   va_start( args, fmtString );  
+   (void) _mesa_vsnprintf( str, MAXSTRING, fmtString, args );
+   va_end( args );
+   
+   if (ctx)
+      flush_delayed_errors( ctx );
+
+   output_if_debug("Mesa warning", str, GL_TRUE);
+}
+
+
+/**
+ * Report an internal implementation problem.
+ * Prints the message to stderr via fprintf().
+ *
+ * \param ctx GL context.
+ * \param fmtString problem description string.
+ */
+void
+_mesa_problem( const struct gl_context *ctx, const char *fmtString, ... )
+{
+   va_list args;
+   char str[MAXSTRING];
+   static int numCalls = 0;
+
+   (void) ctx;
+
+   if (numCalls < 50) {
+      numCalls++;
+
+      va_start( args, fmtString );  
+      _mesa_vsnprintf( str, MAXSTRING, fmtString, args );
+      va_end( args );
+      fprintf(stderr, "Mesa %s implementation error: %s\n",
+              MESA_VERSION_STRING, str);
+      fprintf(stderr, "Please report at bugs.freedesktop.org\n");
+   }
+}
+
+static GLboolean
+should_output(struct gl_context *ctx, GLenum error, const char *fmtString)
+{
+   static GLint debug = -1;
+
+   /* Check debug environment variable only once:
+    */
+   if (debug == -1) {
+      const char *debugEnv = _mesa_getenv("MESA_DEBUG");
+
+#ifdef DEBUG
+      if (debugEnv && strstr(debugEnv, "silent"))
+         debug = GL_FALSE;
+      else
+         debug = GL_TRUE;
+#else
+      if (debugEnv)
+         debug = GL_TRUE;
+      else
+         debug = GL_FALSE;
+#endif
+   }
+
+   if (debug) {
+      if (ctx->ErrorValue != error ||
+          ctx->ErrorDebugFmtString != fmtString) {
+         flush_delayed_errors( ctx );
+         ctx->ErrorDebugFmtString = fmtString;
+         ctx->ErrorDebugCount = 0;
+         return GL_TRUE;
+      }
+      ctx->ErrorDebugCount++;
+   }
+   return GL_FALSE;
+}
+
+
+/**
+ * Record an OpenGL state error.  These usually occur when the user
+ * passes invalid parameters to a GL function.
+ *
+ * If debugging is enabled (either at compile-time via the DEBUG macro, or
+ * run-time via the MESA_DEBUG environment variable), report the error with
+ * _mesa_debug().
+ * 
+ * \param ctx the GL context.
+ * \param error the error value.
+ * \param fmtString printf() style format string, followed by optional args
+ */
+void
+_mesa_error( struct gl_context *ctx, GLenum error, const char *fmtString, ... )
+{
+   GLboolean do_output, do_log;
+
+   do_output = should_output(ctx, error, fmtString);
+   do_log = should_log(ctx, GL_DEBUG_SOURCE_API_ARB, GL_DEBUG_TYPE_ERROR_ARB,
+                       API_ERROR_UNKNOWN, GL_DEBUG_SEVERITY_HIGH_ARB);
+
+   if (do_output || do_log) {
+      char s[MAXSTRING], s2[MAXSTRING];
+      int len;
+      va_list args;
+
+      va_start(args, fmtString);
+      len = _mesa_vsnprintf(s, MAXSTRING, fmtString, args);
+      va_end(args);
+
+      if (len >= MAXSTRING) {
+         /* Too long error message. Whoever calls _mesa_error should use
+          * shorter strings. */
+         ASSERT(0);
+         return;
+      }
+
+      len = _mesa_snprintf(s2, MAXSTRING, "%s in %s", error_string(error), s);
+      if (len >= MAXSTRING) {
+         /* Same as above. */
+         ASSERT(0);
+         return;
+      }
+
+      /* Print the error to stderr if needed. */
+      if (do_output) {
+         output_if_debug("Mesa: User error", s2, GL_TRUE);
+      }
+
+      /* Log the error via ARB_debug_output if needed.*/
+      if (do_log) {
+         _mesa_log_msg(ctx, GL_DEBUG_SOURCE_API_ARB, GL_DEBUG_TYPE_ERROR_ARB,
+                       API_ERROR_UNKNOWN, GL_DEBUG_SEVERITY_HIGH_ARB, len, s2);
+      }
+   }
+
+   /* Set the GL context error state for glGetError. */
+   _mesa_record_error(ctx, error);
+}
+
+
+/**
+ * Report debug information.  Print error message to stderr via fprintf().
+ * No-op if DEBUG mode not enabled.
+ * 
+ * \param ctx GL context.
+ * \param fmtString printf()-style format string, followed by optional args.
+ */
+void
+_mesa_debug( const struct gl_context *ctx, const char *fmtString, ... )
+{
+#ifdef DEBUG
+   char s[MAXSTRING];
+   va_list args;
+   va_start(args, fmtString);
+   _mesa_vsnprintf(s, MAXSTRING, fmtString, args);
+   va_end(args);
+   output_if_debug("Mesa", s, GL_FALSE);
+#endif /* DEBUG */
+   (void) ctx;
+   (void) fmtString;
+}
+
+/*@}*/
diff --git a/mesalib/src/mesa/main/errors.h b/mesalib/src/mesa/main/errors.h
new file mode 100644
index 000000000..ed1c6fc7f
--- /dev/null
+++ b/mesalib/src/mesa/main/errors.h
@@ -0,0 +1,76 @@
+/*
+ * Mesa 3-D graphics library
+ * Version:  7.5
+ *
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+
+/**
+ * \file errors.h
+ * Mesa debugging and error handling functions.
+ *
+ * This file provides functions to record errors, warnings, and miscellaneous
+ * debug information.
+ */
+
+
+#ifndef ERRORS_H
+#define ERRORS_H
+
+
+#include "compiler.h"
+#include "glheader.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct _glapi_table;
+struct gl_context;
+
+extern void
+_mesa_init_errors_dispatch(struct _glapi_table *disp);
+
+extern void
+_mesa_init_errors( struct gl_context *ctx );
+
+extern void
+_mesa_free_errors_data( struct gl_context *ctx );
+
+extern void
+_mesa_warning( struct gl_context *gc, const char *fmtString, ... ) PRINTFLIKE(2, 3);
+
+extern void
+_mesa_problem( const struct gl_context *ctx, const char *fmtString, ... ) PRINTFLIKE(2, 3);
+
+extern void
+_mesa_error( struct gl_context *ctx, GLenum error, const char *fmtString, ... ) PRINTFLIKE(3, 4);
+
+extern void
+_mesa_debug( const struct gl_context *ctx, const char *fmtString, ... ) PRINTFLIKE(2, 3);
+
+#ifdef __cplusplus
+}
+#endif
+
+
+#endif /* ERRORS_H */
diff --git a/mesalib/src/mesa/main/extensions.c b/mesalib/src/mesa/main/extensions.c
index d945124d2..732b9a6ec 100644
--- a/mesalib/src/mesa/main/extensions.c
+++ b/mesalib/src/mesa/main/extensions.c
@@ -82,6 +82,7 @@ static const struct extension extension_table[] = {
    { "GL_ARB_color_buffer_float",                  o(ARB_color_buffer_float),                  GL,             2004 },
    { "GL_ARB_copy_buffer",                         o(ARB_copy_buffer),                         GL,             2008 },
    { "GL_ARB_conservative_depth",                  o(ARB_conservative_depth),                  GL,             2011 },
+   { "GL_ARB_debug_output",                        o(dummy_true),                              GL,             2009 },
    { "GL_ARB_depth_buffer_float",                  o(ARB_depth_buffer_float),                  GL,             2008 },
    { "GL_ARB_depth_clamp",                         o(ARB_depth_clamp),                         GL,             2003 },
    { "GL_ARB_depth_texture",                       o(ARB_depth_texture),                       GL,             2001 },
diff --git a/mesalib/src/mesa/main/get.c b/mesalib/src/mesa/main/get.c
index 5ad601242..9a5ca5334 100644
--- a/mesalib/src/mesa/main/get.c
+++ b/mesalib/src/mesa/main/get.c
@@ -1297,6 +1297,13 @@ static const struct value_desc values[] = {
 
    /* GL_ARB_robustness */
    { GL_RESET_NOTIFICATION_STRATEGY_ARB, CONTEXT_ENUM(Const.ResetStrategy), NO_EXTRA },
+
+   /* GL_ARB_debug_output */
+   { GL_DEBUG_LOGGED_MESSAGES_ARB, CONTEXT_INT(Debug.NumMessages), NO_EXTRA },
+   { GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH_ARB, CONTEXT_INT(Debug.NextMsgLength), NO_EXTRA },
+   { GL_MAX_DEBUG_LOGGED_MESSAGES_ARB, CONST(MAX_DEBUG_LOGGED_MESSAGES), NO_EXTRA },
+   { GL_MAX_DEBUG_MESSAGE_LENGTH_ARB, CONST(MAX_DEBUG_MESSAGE_LENGTH), NO_EXTRA },
+
 #endif /* FEATURE_GL */
 };
 
diff --git a/mesalib/src/mesa/main/getstring.c b/mesalib/src/mesa/main/getstring.c
index dbf6c3f5e..90e028055 100644
--- a/mesalib/src/mesa/main/getstring.c
+++ b/mesalib/src/mesa/main/getstring.c
@@ -224,6 +224,12 @@ _mesa_GetPointerv( GLenum pname, GLvoid **params )
          *params = (GLvoid *) ctx->Array.ArrayObj->VertexAttrib[VERT_ATTRIB_POINT_SIZE].Ptr;
          break;
 #endif
+      case GL_DEBUG_CALLBACK_FUNCTION_ARB:
+         *params = (GLvoid *) ctx->Debug.Callback;
+         break;
+      case GL_DEBUG_CALLBACK_USER_PARAM_ARB:
+         *params = ctx->Debug.CallbackData;
+         break;
       default:
          _mesa_error( ctx, GL_INVALID_ENUM, "glGetPointerv" );
          return;
diff --git a/mesalib/src/mesa/main/imports.c b/mesalib/src/mesa/main/imports.c
index 82713a13b..2d592a68e 100644
--- a/mesalib/src/mesa/main/imports.c
+++ b/mesalib/src/mesa/main/imports.c
@@ -57,8 +57,6 @@
 #endif
 
 
-#define MAXSTRING 4000  /* for vsnprintf() */
-
 #ifdef WIN32
 #define vsnprintf _vsnprintf
 #elif defined(__IBMC__) || defined(__IBMCPP__) || ( defined(__VMS) && __CRTL_VER < 70312000 )
@@ -794,6 +792,13 @@ _mesa_str_checksum(const char *str)
 /*@}*/
 
 
+/** Needed due to #ifdef's, above. */
+int
+_mesa_vsnprintf(char *str, size_t size, const char *fmt, va_list args)
+{
+   return vsnprintf( str, size, fmt, args);
+}
+
 /** Wrapper around vsnprintf() */
 int
 _mesa_snprintf( char *str, size_t size, const char *fmt, ... )
@@ -807,239 +812,3 @@ _mesa_snprintf( char *str, size_t size, const char *fmt, ... )
 }
 
 
-/**********************************************************************/
-/** \name Diagnostics */
-/*@{*/
-
-static void
-output_if_debug(const char *prefixString, const char *outputString,
-                GLboolean newline)
-{
-   static int debug = -1;
-
-   /* Check the MESA_DEBUG environment variable if it hasn't
-    * been checked yet.  We only have to check it once...
-    */
-   if (debug == -1) {
-      char *env = _mesa_getenv("MESA_DEBUG");
-
-      /* In a debug build, we print warning messages *unless*
-       * MESA_DEBUG is 0.  In a non-debug build, we don't
-       * print warning messages *unless* MESA_DEBUG is
-       * set *to any value*.
-       */
-#ifdef DEBUG
-      debug = (env != NULL && atoi(env) == 0) ? 0 : 1;
-#else
-      debug = (env != NULL) ? 1 : 0;
-#endif
-   }
-
-   /* Now only print the string if we're required to do so. */
-   if (debug) {
-      fprintf(stderr, "%s: %s", prefixString, outputString);
-      if (newline)
-         fprintf(stderr, "\n");
-
-#if defined(_WIN32) && !defined(_WIN32_WCE)
-      /* stderr from windows applications without console is not usually 
-       * visible, so communicate with the debugger instead */ 
-      {
-         char buf[4096];
-         _mesa_snprintf(buf, sizeof(buf), "%s: %s%s", prefixString, outputString, newline ? "\n" : "");
-         OutputDebugStringA(buf);
-      }
-#endif
-   }
-}
-
-
-/**
- * Return string version of GL error code.
- */
-static const char *
-error_string( GLenum error )
-{
-   switch (error) {
-   case GL_NO_ERROR:
-      return "GL_NO_ERROR";
-   case GL_INVALID_VALUE:
-      return "GL_INVALID_VALUE";
-   case GL_INVALID_ENUM:
-      return "GL_INVALID_ENUM";
-   case GL_INVALID_OPERATION:
-      return "GL_INVALID_OPERATION";
-   case GL_STACK_OVERFLOW:
-      return "GL_STACK_OVERFLOW";
-   case GL_STACK_UNDERFLOW:
-      return "GL_STACK_UNDERFLOW";
-   case GL_OUT_OF_MEMORY:
-      return "GL_OUT_OF_MEMORY";
-   case GL_TABLE_TOO_LARGE:
-      return "GL_TABLE_TOO_LARGE";
-   case GL_INVALID_FRAMEBUFFER_OPERATION_EXT:
-      return "GL_INVALID_FRAMEBUFFER_OPERATION";
-   default:
-      return "unknown";
-   }
-}
-
-
-/**
- * When a new type of error is recorded, print a message describing
- * previous errors which were accumulated.
- */
-static void
-flush_delayed_errors( struct gl_context *ctx )
-{
-   char s[MAXSTRING];
-
-   if (ctx->ErrorDebugCount) {
-      _mesa_snprintf(s, MAXSTRING, "%d similar %s errors", 
-                     ctx->ErrorDebugCount,
-                     error_string(ctx->ErrorValue));
-
-      output_if_debug("Mesa", s, GL_TRUE);
-
-      ctx->ErrorDebugCount = 0;
-   }
-}
-
-
-/**
- * Report a warning (a recoverable error condition) to stderr if
- * either DEBUG is defined or the MESA_DEBUG env var is set.
- *
- * \param ctx GL context.
- * \param fmtString printf()-like format string.
- */
-void
-_mesa_warning( struct gl_context *ctx, const char *fmtString, ... )
-{
-   char str[MAXSTRING];
-   va_list args;
-   va_start( args, fmtString );  
-   (void) vsnprintf( str, MAXSTRING, fmtString, args );
-   va_end( args );
-   
-   if (ctx)
-      flush_delayed_errors( ctx );
-
-   output_if_debug("Mesa warning", str, GL_TRUE);
-}
-
-
-/**
- * Report an internal implementation problem.
- * Prints the message to stderr via fprintf().
- *
- * \param ctx GL context.
- * \param fmtString problem description string.
- */
-void
-_mesa_problem( const struct gl_context *ctx, const char *fmtString, ... )
-{
-   va_list args;
-   char str[MAXSTRING];
-   static int numCalls = 0;
-
-   (void) ctx;
-
-   if (numCalls < 50) {
-      numCalls++;
-
-      va_start( args, fmtString );  
-      vsnprintf( str, MAXSTRING, fmtString, args );
-      va_end( args );
-      fprintf(stderr, "Mesa %s implementation error: %s\n",
-              MESA_VERSION_STRING, str);
-      fprintf(stderr, "Please report at bugs.freedesktop.org\n");
-   }
-}
-
-
-/**
- * Record an OpenGL state error.  These usually occur when the user
- * passes invalid parameters to a GL function.
- *
- * If debugging is enabled (either at compile-time via the DEBUG macro, or
- * run-time via the MESA_DEBUG environment variable), report the error with
- * _mesa_debug().
- * 
- * \param ctx the GL context.
- * \param error the error value.
- * \param fmtString printf() style format string, followed by optional args
- */
-void
-_mesa_error( struct gl_context *ctx, GLenum error, const char *fmtString, ... )
-{
-   static GLint debug = -1;
-
-   /* Check debug environment variable only once:
-    */
-   if (debug == -1) {
-      const char *debugEnv = _mesa_getenv("MESA_DEBUG");
-
-#ifdef DEBUG
-      if (debugEnv && strstr(debugEnv, "silent"))
-         debug = GL_FALSE;
-      else
-         debug = GL_TRUE;
-#else
-      if (debugEnv)
-         debug = GL_TRUE;
-      else
-         debug = GL_FALSE;
-#endif
-   }
-
-   if (debug) {      
-      if (ctx->ErrorValue == error &&
-          ctx->ErrorDebugFmtString == fmtString) {
-         ctx->ErrorDebugCount++;
-      }
-      else {
-         char s[MAXSTRING], s2[MAXSTRING];
-         va_list args;
-
-         flush_delayed_errors( ctx );
-         
-         va_start(args, fmtString);
-         vsnprintf(s, MAXSTRING, fmtString, args);
-         va_end(args);
-
-         _mesa_snprintf(s2, MAXSTRING, "%s in %s", error_string(error), s);
-         output_if_debug("Mesa: User error", s2, GL_TRUE);
-         
-         ctx->ErrorDebugFmtString = fmtString;
-         ctx->ErrorDebugCount = 0;
-      }
-   }
-
-   _mesa_record_error(ctx, error);
-}
-
-
-/**
- * Report debug information.  Print error message to stderr via fprintf().
- * No-op if DEBUG mode not enabled.
- * 
- * \param ctx GL context.
- * \param fmtString printf()-style format string, followed by optional args.
- */
-void
-_mesa_debug( const struct gl_context *ctx, const char *fmtString, ... )
-{
-#ifdef DEBUG
-   char s[MAXSTRING];
-   va_list args;
-   va_start(args, fmtString);
-   vsnprintf(s, MAXSTRING, fmtString, args);
-   va_end(args);
-   output_if_debug("Mesa", s, GL_FALSE);
-#endif /* DEBUG */
-   (void) ctx;
-   (void) fmtString;
-}
-
-/*@}*/
diff --git a/mesalib/src/mesa/main/imports.h b/mesalib/src/mesa/main/imports.h
index ce7b45d77..aa5eb3200 100644
--- a/mesalib/src/mesa/main/imports.h
+++ b/mesalib/src/mesa/main/imports.h
@@ -38,7 +38,7 @@
 
 #include "compiler.h"
 #include "glheader.h"
-
+#include "errors.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -622,19 +622,8 @@ _mesa_str_checksum(const char *str);
 extern int
 _mesa_snprintf( char *str, size_t size, const char *fmt, ... ) PRINTFLIKE(3, 4);
 
-struct gl_context;
-
-extern void
-_mesa_warning( struct gl_context *gc, const char *fmtString, ... ) PRINTFLIKE(2, 3);
-
-extern void
-_mesa_problem( const struct gl_context *ctx, const char *fmtString, ... ) PRINTFLIKE(2, 3);
-
-extern void
-_mesa_error( struct gl_context *ctx, GLenum error, const char *fmtString, ... ) PRINTFLIKE(3, 4);
-
-extern void
-_mesa_debug( const struct gl_context *ctx, const char *fmtString, ... ) PRINTFLIKE(2, 3);
+extern int
+_mesa_vsnprintf(char *str, size_t size, const char *fmt, va_list arg);
 
 
 #if defined(_MSC_VER) && !defined(snprintf)
diff --git a/mesalib/src/mesa/main/mtypes.h b/mesalib/src/mesa/main/mtypes.h
index 480b1cf28..9b88f9938 100644
--- a/mesalib/src/mesa/main/mtypes.h
+++ b/mesalib/src/mesa/main/mtypes.h
@@ -3186,6 +3186,70 @@ struct gl_dlist_state
    } Current;
 };
 
+/**
+ * An error, warning, or other piece of debug information for an application
+ * to consume via GL_ARB_debug_output.
+ */
+struct gl_debug_msg
+{
+   GLenum source;
+   GLenum type;
+   GLuint id;
+   GLenum severity;
+   GLsizei length;
+   GLcharARB *message;
+};
+
+typedef enum {
+   API_ERROR_UNKNOWN,
+   API_ERROR_COUNT
+} gl_api_error;
+
+typedef enum {
+   WINSYS_ERROR_UNKNOWN,
+   WINSYS_ERROR_COUNT
+} gl_winsys_error;
+
+typedef enum {
+   SHADER_ERROR_UNKNOWN,
+   SHADER_ERROR_COUNT
+} gl_shader_error;
+
+typedef enum {
+   OTHER_ERROR_UNKNOWN,
+   OTHER_ERROR_OUT_OF_MEMORY,
+   OTHER_ERROR_COUNT
+} gl_other_error;
+
+struct gl_client_namespace
+{
+   struct _mesa_HashTable *IDs;
+   unsigned ZeroID; /* a HashTable won't take zero, so store its state here */
+   struct simple_node Severity[3]; /* lists of IDs in the hash table */
+};
+
+struct gl_client_debug
+{
+   GLboolean Defaults[3][2][6]; /* severity, source, type */
+   struct gl_client_namespace Namespaces[2][6]; /* source, type */
+};
+
+struct gl_debug_state
+{
+   GLDEBUGPROCARB Callback;
+   GLvoid *CallbackData;
+   GLboolean SyncOutput;
+   GLboolean ApiErrors[API_ERROR_COUNT];
+   GLboolean WinsysErrors[WINSYS_ERROR_COUNT];
+   GLboolean ShaderErrors[SHADER_ERROR_COUNT];
+   GLboolean OtherErrors[OTHER_ERROR_COUNT];
+   struct gl_client_debug ClientIDs;
+   struct gl_debug_msg Log[MAX_DEBUG_LOGGED_MESSAGES];
+   GLint NumMessages;
+   GLint NextMsg;
+   GLint NextMsgLength; /* redundant, but copied here from Log[NextMsg].length
+                           for the sake of the offsetof() code in get.c */
+};
 
 /**
  * Enum for the OpenGL APIs we know about and may support.
@@ -3351,6 +3415,9 @@ struct gl_context
    const char *ErrorDebugFmtString;
    GLuint ErrorDebugCount;
 
+   /* GL_ARB_debug_output */
+   struct gl_debug_state Debug;
+
    GLenum RenderMode;        /**< either GL_RENDER, GL_SELECT, GL_FEEDBACK */
    GLbitfield NewState;      /**< bitwise-or of _NEW_* flags */
 
diff --git a/mesalib/src/mesa/main/remap_helper.h b/mesalib/src/mesa/main/remap_helper.h
index db13fb985..78048615e 100644
--- a/mesalib/src/mesa/main/remap_helper.h
+++ b/mesalib/src/mesa/main/remap_helper.h
@@ -73,5036 +73,5052 @@ static const char _mesa_function_pool[] =
    "\0"
    "glLoadIdentity\0"
    "\0"
-   /* _mesa_function_pool[216]: TexCoordP2uiv (will be remapped) */
-   "ip\0"
-   "glTexCoordP2uiv\0"
+   /* _mesa_function_pool[216]: GetCombinerOutputParameterfvNV (will be remapped) */
+   "iiip\0"
+   "glGetCombinerOutputParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[236]: SampleCoverageARB (will be remapped) */
+   /* _mesa_function_pool[255]: SampleCoverageARB (will be remapped) */
    "fi\0"
    "glSampleCoverage\0"
    "glSampleCoverageARB\0"
    "\0"
-   /* _mesa_function_pool[277]: ConvolutionFilter1D (offset 348) */
+   /* _mesa_function_pool[296]: ConvolutionFilter1D (offset 348) */
    "iiiiip\0"
    "glConvolutionFilter1D\0"
    "glConvolutionFilter1DEXT\0"
    "\0"
-   /* _mesa_function_pool[332]: BeginQueryARB (will be remapped) */
+   /* _mesa_function_pool[351]: BeginQueryARB (will be remapped) */
    "ii\0"
    "glBeginQuery\0"
    "glBeginQueryARB\0"
    "\0"
-   /* _mesa_function_pool[365]: RasterPos3dv (offset 71) */
+   /* _mesa_function_pool[384]: RasterPos3dv (offset 71) */
    "p\0"
    "glRasterPos3dv\0"
    "\0"
-   /* _mesa_function_pool[383]: PointParameteriNV (will be remapped) */
+   /* _mesa_function_pool[402]: PointParameteriNV (will be remapped) */
    "ii\0"
    "glPointParameteri\0"
    "glPointParameteriNV\0"
    "\0"
-   /* _mesa_function_pool[425]: GetProgramiv (will be remapped) */
+   /* _mesa_function_pool[444]: GetProgramiv (will be remapped) */
    "iip\0"
    "glGetProgramiv\0"
    "\0"
-   /* _mesa_function_pool[445]: MultiTexCoord3sARB (offset 398) */
+   /* _mesa_function_pool[464]: MultiTexCoord3sARB (offset 398) */
    "iiii\0"
    "glMultiTexCoord3s\0"
    "glMultiTexCoord3sARB\0"
    "\0"
-   /* _mesa_function_pool[490]: SecondaryColor3iEXT (will be remapped) */
+   /* _mesa_function_pool[509]: SecondaryColor3iEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3i\0"
    "glSecondaryColor3iEXT\0"
    "\0"
-   /* _mesa_function_pool[536]: WindowPos3fMESA (will be remapped) */
+   /* _mesa_function_pool[555]: WindowPos3fMESA (will be remapped) */
    "fff\0"
    "glWindowPos3f\0"
    "glWindowPos3fARB\0"
    "glWindowPos3fMESA\0"
    "\0"
-   /* _mesa_function_pool[590]: TexCoord1iv (offset 99) */
+   /* _mesa_function_pool[609]: TexCoord1iv (offset 99) */
    "p\0"
    "glTexCoord1iv\0"
    "\0"
-   /* _mesa_function_pool[607]: TexCoord4sv (offset 125) */
+   /* _mesa_function_pool[626]: TexCoord4sv (offset 125) */
    "p\0"
    "glTexCoord4sv\0"
    "\0"
-   /* _mesa_function_pool[624]: RasterPos4s (offset 84) */
+   /* _mesa_function_pool[643]: RasterPos4s (offset 84) */
    "iiii\0"
    "glRasterPos4s\0"
    "\0"
-   /* _mesa_function_pool[644]: PixelTexGenParameterfvSGIS (will be remapped) */
+   /* _mesa_function_pool[663]: PixelTexGenParameterfvSGIS (will be remapped) */
    "ip\0"
    "glPixelTexGenParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[677]: ActiveTextureARB (offset 374) */
+   /* _mesa_function_pool[696]: ActiveTextureARB (offset 374) */
    "i\0"
    "glActiveTexture\0"
    "glActiveTextureARB\0"
    "\0"
-   /* _mesa_function_pool[715]: BlitFramebufferEXT (will be remapped) */
+   /* _mesa_function_pool[734]: BlitFramebufferEXT (will be remapped) */
    "iiiiiiiiii\0"
    "glBlitFramebuffer\0"
    "glBlitFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[766]: TexCoord1f (offset 96) */
+   /* _mesa_function_pool[785]: TexCoord1f (offset 96) */
    "f\0"
    "glTexCoord1f\0"
    "\0"
-   /* _mesa_function_pool[782]: TexCoord1d (offset 94) */
+   /* _mesa_function_pool[801]: TexCoord1d (offset 94) */
    "d\0"
    "glTexCoord1d\0"
    "\0"
-   /* _mesa_function_pool[798]: VertexAttrib4ubvNV (will be remapped) */
+   /* _mesa_function_pool[817]: VertexAttrib4ubvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4ubvNV\0"
    "\0"
-   /* _mesa_function_pool[823]: TexCoord1i (offset 98) */
+   /* _mesa_function_pool[842]: TexCoord1i (offset 98) */
    "i\0"
    "glTexCoord1i\0"
    "\0"
-   /* _mesa_function_pool[839]: GetProgramNamedParameterdvNV (will be remapped) */
+   /* _mesa_function_pool[858]: GetProgramNamedParameterdvNV (will be remapped) */
    "iipp\0"
    "glGetProgramNamedParameterdvNV\0"
    "\0"
-   /* _mesa_function_pool[876]: Histogram (offset 367) */
+   /* _mesa_function_pool[895]: Histogram (offset 367) */
    "iiii\0"
    "glHistogram\0"
    "glHistogramEXT\0"
    "\0"
-   /* _mesa_function_pool[909]: TexCoord1s (offset 100) */
+   /* _mesa_function_pool[928]: TexCoord1s (offset 100) */
    "i\0"
    "glTexCoord1s\0"
    "\0"
-   /* _mesa_function_pool[925]: GetMapfv (offset 267) */
+   /* _mesa_function_pool[944]: GetMapfv (offset 267) */
    "iip\0"
    "glGetMapfv\0"
    "\0"
-   /* _mesa_function_pool[941]: EvalCoord1f (offset 230) */
+   /* _mesa_function_pool[960]: EvalCoord1f (offset 230) */
    "f\0"
    "glEvalCoord1f\0"
    "\0"
-   /* _mesa_function_pool[958]: FramebufferTexture (will be remapped) */
+   /* _mesa_function_pool[977]: FramebufferTexture (will be remapped) */
    "iiii\0"
    "glFramebufferTexture\0"
    "\0"
-   /* _mesa_function_pool[985]: GetGraphicsResetStatusARB (will be remapped) */
+   /* _mesa_function_pool[1004]: GetGraphicsResetStatusARB (will be remapped) */
    "\0"
    "glGetGraphicsResetStatusARB\0"
    "\0"
-   /* _mesa_function_pool[1015]: TexImage4DSGIS (dynamic) */
+   /* _mesa_function_pool[1034]: TexImage4DSGIS (dynamic) */
    "iiiiiiiiiip\0"
    "glTexImage4DSGIS\0"
    "\0"
-   /* _mesa_function_pool[1045]: PolygonStipple (offset 175) */
+   /* _mesa_function_pool[1064]: PolygonStipple (offset 175) */
    "p\0"
    "glPolygonStipple\0"
    "\0"
-   /* _mesa_function_pool[1065]: WindowPos2dvMESA (will be remapped) */
+   /* _mesa_function_pool[1084]: WindowPos2dvMESA (will be remapped) */
    "p\0"
    "glWindowPos2dv\0"
    "glWindowPos2dvARB\0"
    "glWindowPos2dvMESA\0"
    "\0"
-   /* _mesa_function_pool[1120]: ReplacementCodeuiColor3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[1139]: ReplacementCodeuiColor3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[1164]: BlendEquationSeparateEXT (will be remapped) */
+   /* _mesa_function_pool[1183]: BlendEquationSeparateEXT (will be remapped) */
    "ii\0"
    "glBlendEquationSeparate\0"
    "glBlendEquationSeparateEXT\0"
    "glBlendEquationSeparateATI\0"
    "\0"
-   /* _mesa_function_pool[1246]: ListParameterfSGIX (dynamic) */
+   /* _mesa_function_pool[1265]: ListParameterfSGIX (dynamic) */
    "iif\0"
    "glListParameterfSGIX\0"
    "\0"
-   /* _mesa_function_pool[1272]: TexStorage1D (will be remapped) */
+   /* _mesa_function_pool[1291]: TexStorage1D (will be remapped) */
    "iiii\0"
    "glTexStorage1D\0"
    "\0"
-   /* _mesa_function_pool[1293]: SecondaryColor3bEXT (will be remapped) */
+   /* _mesa_function_pool[1312]: SecondaryColor3bEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3b\0"
    "glSecondaryColor3bEXT\0"
    "\0"
-   /* _mesa_function_pool[1339]: TexCoord4fColor4fNormal3fVertex4fvSUN (dynamic) */
+   /* _mesa_function_pool[1358]: TexCoord4fColor4fNormal3fVertex4fvSUN (dynamic) */
    "pppp\0"
    "glTexCoord4fColor4fNormal3fVertex4fvSUN\0"
    "\0"
-   /* _mesa_function_pool[1385]: GetnPolygonStippleARB (will be remapped) */
+   /* _mesa_function_pool[1404]: GetnPolygonStippleARB (will be remapped) */
    "ip\0"
    "glGetnPolygonStippleARB\0"
    "\0"
-   /* _mesa_function_pool[1413]: GetPixelMapfv (offset 271) */
+   /* _mesa_function_pool[1432]: GetPixelMapfv (offset 271) */
    "ip\0"
    "glGetPixelMapfv\0"
    "\0"
-   /* _mesa_function_pool[1433]: Color3uiv (offset 22) */
+   /* _mesa_function_pool[1452]: Color3uiv (offset 22) */
    "p\0"
    "glColor3uiv\0"
    "\0"
-   /* _mesa_function_pool[1448]: IsEnabled (offset 286) */
+   /* _mesa_function_pool[1467]: IsEnabled (offset 286) */
    "i\0"
    "glIsEnabled\0"
    "\0"
-   /* _mesa_function_pool[1463]: VertexAttrib4svNV (will be remapped) */
+   /* _mesa_function_pool[1482]: DebugMessageCallbackARB (will be remapped) */
+   "pp\0"
+   "glDebugMessageCallbackARB\0"
+   "\0"
+   /* _mesa_function_pool[1512]: VertexAttrib4svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4svNV\0"
    "\0"
-   /* _mesa_function_pool[1487]: EvalCoord2fv (offset 235) */
+   /* _mesa_function_pool[1536]: EvalCoord2fv (offset 235) */
    "p\0"
    "glEvalCoord2fv\0"
    "\0"
-   /* _mesa_function_pool[1505]: GetBufferSubDataARB (will be remapped) */
+   /* _mesa_function_pool[1554]: GetBufferSubDataARB (will be remapped) */
    "iiip\0"
    "glGetBufferSubData\0"
    "glGetBufferSubDataARB\0"
    "\0"
-   /* _mesa_function_pool[1552]: BufferSubDataARB (will be remapped) */
+   /* _mesa_function_pool[1601]: BufferSubDataARB (will be remapped) */
    "iiip\0"
    "glBufferSubData\0"
    "glBufferSubDataARB\0"
    "\0"
-   /* _mesa_function_pool[1593]: TexCoord2fColor4ubVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[1642]: TexCoord2fColor4ubVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fColor4ubVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[1631]: AttachShader (will be remapped) */
+   /* _mesa_function_pool[1680]: AttachShader (will be remapped) */
    "ii\0"
    "glAttachShader\0"
    "\0"
-   /* _mesa_function_pool[1650]: GetCombinerInputParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[1699]: GetCombinerInputParameterfvNV (will be remapped) */
    "iiiip\0"
    "glGetCombinerInputParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[1689]: MultiTexCoordP2ui (will be remapped) */
+   /* _mesa_function_pool[1738]: MultiTexCoordP2ui (will be remapped) */
    "iii\0"
    "glMultiTexCoordP2ui\0"
    "\0"
-   /* _mesa_function_pool[1714]: VertexAttrib2fARB (will be remapped) */
+   /* _mesa_function_pool[1763]: VertexAttrib2fARB (will be remapped) */
    "iff\0"
    "glVertexAttrib2f\0"
    "glVertexAttrib2fARB\0"
    "\0"
-   /* _mesa_function_pool[1756]: GetDebugLogLengthMESA (dynamic) */
+   /* _mesa_function_pool[1805]: GetDebugLogLengthMESA (dynamic) */
    "iii\0"
    "glGetDebugLogLengthMESA\0"
    "\0"
-   /* _mesa_function_pool[1785]: GetMapiv (offset 268) */
+   /* _mesa_function_pool[1834]: GetMapiv (offset 268) */
    "iip\0"
    "glGetMapiv\0"
    "\0"
-   /* _mesa_function_pool[1801]: VertexAttrib3fARB (will be remapped) */
+   /* _mesa_function_pool[1850]: VertexAttrib3fARB (will be remapped) */
    "ifff\0"
    "glVertexAttrib3f\0"
    "glVertexAttrib3fARB\0"
    "\0"
-   /* _mesa_function_pool[1844]: Indexubv (offset 316) */
+   /* _mesa_function_pool[1893]: Indexubv (offset 316) */
    "p\0"
    "glIndexubv\0"
    "\0"
-   /* _mesa_function_pool[1858]: GetQueryivARB (will be remapped) */
+   /* _mesa_function_pool[1907]: GetQueryivARB (will be remapped) */
    "iip\0"
    "glGetQueryiv\0"
    "glGetQueryivARB\0"
    "\0"
-   /* _mesa_function_pool[1892]: TexImage3D (offset 371) */
+   /* _mesa_function_pool[1941]: TexImage3D (offset 371) */
    "iiiiiiiiip\0"
    "glTexImage3D\0"
    "glTexImage3DEXT\0"
    "\0"
-   /* _mesa_function_pool[1933]: BindFragDataLocationEXT (will be remapped) */
+   /* _mesa_function_pool[1982]: BindFragDataLocationEXT (will be remapped) */
    "iip\0"
    "glBindFragDataLocationEXT\0"
    "glBindFragDataLocation\0"
    "\0"
-   /* _mesa_function_pool[1987]: TexCoordP4ui (will be remapped) */
+   /* _mesa_function_pool[2036]: TexCoordP4ui (will be remapped) */
    "ii\0"
    "glTexCoordP4ui\0"
    "\0"
-   /* _mesa_function_pool[2006]: ReplacementCodeuiVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[2055]: ReplacementCodeuiVertex3fvSUN (dynamic) */
    "pp\0"
    "glReplacementCodeuiVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[2042]: EdgeFlagPointer (offset 312) */
+   /* _mesa_function_pool[2091]: EdgeFlagPointer (offset 312) */
    "ip\0"
    "glEdgeFlagPointer\0"
    "\0"
-   /* _mesa_function_pool[2064]: Color3ubv (offset 20) */
+   /* _mesa_function_pool[2113]: Color3ubv (offset 20) */
    "p\0"
    "glColor3ubv\0"
    "\0"
-   /* _mesa_function_pool[2079]: GetQueryObjectivARB (will be remapped) */
+   /* _mesa_function_pool[2128]: GetQueryObjectivARB (will be remapped) */
    "iip\0"
    "glGetQueryObjectiv\0"
    "glGetQueryObjectivARB\0"
    "\0"
-   /* _mesa_function_pool[2125]: Vertex3dv (offset 135) */
+   /* _mesa_function_pool[2174]: Vertex3dv (offset 135) */
    "p\0"
    "glVertex3dv\0"
    "\0"
-   /* _mesa_function_pool[2140]: ReplacementCodeuiTexCoord2fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[2189]: ReplacementCodeuiTexCoord2fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiTexCoord2fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[2187]: CompressedTexSubImage2DARB (will be remapped) */
+   /* _mesa_function_pool[2236]: CompressedTexSubImage2DARB (will be remapped) */
    "iiiiiiiip\0"
    "glCompressedTexSubImage2D\0"
    "glCompressedTexSubImage2DARB\0"
    "\0"
-   /* _mesa_function_pool[2253]: CombinerOutputNV (will be remapped) */
+   /* _mesa_function_pool[2302]: CombinerOutputNV (will be remapped) */
    "iiiiiiiiii\0"
    "glCombinerOutputNV\0"
    "\0"
-   /* _mesa_function_pool[2284]: VertexAttribs3fvNV (will be remapped) */
+   /* _mesa_function_pool[2333]: VertexAttribs3fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs3fvNV\0"
    "\0"
-   /* _mesa_function_pool[2310]: GetnMapivARB (will be remapped) */
+   /* _mesa_function_pool[2359]: GetnMapivARB (will be remapped) */
    "iiip\0"
    "glGetnMapivARB\0"
    "\0"
-   /* _mesa_function_pool[2331]: Uniform2fARB (will be remapped) */
+   /* _mesa_function_pool[2380]: Uniform2fARB (will be remapped) */
    "iff\0"
    "glUniform2f\0"
    "glUniform2fARB\0"
    "\0"
-   /* _mesa_function_pool[2363]: LightModeliv (offset 166) */
+   /* _mesa_function_pool[2412]: LightModeliv (offset 166) */
    "ip\0"
    "glLightModeliv\0"
    "\0"
-   /* _mesa_function_pool[2382]: VertexAttrib1svARB (will be remapped) */
+   /* _mesa_function_pool[2431]: VertexAttrib1svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib1sv\0"
    "glVertexAttrib1svARB\0"
    "\0"
-   /* _mesa_function_pool[2425]: VertexAttribs1dvNV (will be remapped) */
+   /* _mesa_function_pool[2474]: VertexAttribs1dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1dvNV\0"
    "\0"
-   /* _mesa_function_pool[2451]: VertexP3ui (will be remapped) */
+   /* _mesa_function_pool[2500]: VertexP3ui (will be remapped) */
    "ii\0"
    "glVertexP3ui\0"
    "\0"
-   /* _mesa_function_pool[2468]: Uniform2ivARB (will be remapped) */
+   /* _mesa_function_pool[2517]: Uniform2ivARB (will be remapped) */
    "iip\0"
    "glUniform2iv\0"
    "glUniform2ivARB\0"
    "\0"
-   /* _mesa_function_pool[2502]: GetImageTransformParameterfvHP (dynamic) */
+   /* _mesa_function_pool[2551]: GetImageTransformParameterfvHP (dynamic) */
    "iip\0"
    "glGetImageTransformParameterfvHP\0"
    "\0"
-   /* _mesa_function_pool[2540]: Normal3bv (offset 53) */
+   /* _mesa_function_pool[2589]: Normal3bv (offset 53) */
    "p\0"
    "glNormal3bv\0"
    "\0"
-   /* _mesa_function_pool[2555]: TexGeniv (offset 193) */
+   /* _mesa_function_pool[2604]: TexGeniv (offset 193) */
    "iip\0"
    "glTexGeniv\0"
    "\0"
-   /* _mesa_function_pool[2571]: TexCoordP1uiv (will be remapped) */
+   /* _mesa_function_pool[2620]: TexCoordP1uiv (will be remapped) */
    "ip\0"
    "glTexCoordP1uiv\0"
    "\0"
-   /* _mesa_function_pool[2591]: WeightubvARB (dynamic) */
+   /* _mesa_function_pool[2640]: WeightubvARB (dynamic) */
    "ip\0"
    "glWeightubvARB\0"
    "\0"
-   /* _mesa_function_pool[2610]: VertexAttrib1fvNV (will be remapped) */
+   /* _mesa_function_pool[2659]: VertexAttrib1fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1fvNV\0"
    "\0"
-   /* _mesa_function_pool[2634]: Vertex3iv (offset 139) */
+   /* _mesa_function_pool[2683]: Vertex3iv (offset 139) */
    "p\0"
    "glVertex3iv\0"
    "\0"
-   /* _mesa_function_pool[2649]: CopyConvolutionFilter1D (offset 354) */
+   /* _mesa_function_pool[2698]: CopyConvolutionFilter1D (offset 354) */
    "iiiii\0"
    "glCopyConvolutionFilter1D\0"
    "glCopyConvolutionFilter1DEXT\0"
    "\0"
-   /* _mesa_function_pool[2711]: VertexAttribI1uiEXT (will be remapped) */
+   /* _mesa_function_pool[2760]: VertexAttribI1uiEXT (will be remapped) */
    "ii\0"
    "glVertexAttribI1uiEXT\0"
    "glVertexAttribI1ui\0"
    "\0"
-   /* _mesa_function_pool[2756]: ReplacementCodeuiNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[2805]: ReplacementCodeuiNormal3fVertex3fSUN (dynamic) */
    "iffffff\0"
    "glReplacementCodeuiNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[2804]: TexCoordP1ui (will be remapped) */
+   /* _mesa_function_pool[2853]: TexCoordP1ui (will be remapped) */
    "ii\0"
    "glTexCoordP1ui\0"
    "\0"
-   /* _mesa_function_pool[2823]: DeleteSync (will be remapped) */
+   /* _mesa_function_pool[2872]: DeleteSync (will be remapped) */
    "i\0"
    "glDeleteSync\0"
    "\0"
-   /* _mesa_function_pool[2839]: FragmentMaterialfvSGIX (dynamic) */
+   /* _mesa_function_pool[2888]: FragmentMaterialfvSGIX (dynamic) */
    "iip\0"
    "glFragmentMaterialfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[2869]: BlendColor (offset 336) */
+   /* _mesa_function_pool[2918]: BlendColor (offset 336) */
    "ffff\0"
    "glBlendColor\0"
    "glBlendColorEXT\0"
    "\0"
-   /* _mesa_function_pool[2904]: UniformMatrix4fvARB (will be remapped) */
+   /* _mesa_function_pool[2953]: UniformMatrix4fvARB (will be remapped) */
    "iiip\0"
    "glUniformMatrix4fv\0"
    "glUniformMatrix4fvARB\0"
    "\0"
-   /* _mesa_function_pool[2951]: DeleteVertexArraysAPPLE (will be remapped) */
+   /* _mesa_function_pool[3000]: DeleteVertexArraysAPPLE (will be remapped) */
    "ip\0"
    "glDeleteVertexArrays\0"
    "glDeleteVertexArraysAPPLE\0"
    "\0"
-   /* _mesa_function_pool[3002]: TexBuffer (will be remapped) */
-   "iii\0"
-   "glTexBuffer\0"
+   /* _mesa_function_pool[3051]: GetDebugMessageLogARB (will be remapped) */
+   "iipppppp\0"
+   "glGetDebugMessageLogARB\0"
    "\0"
-   /* _mesa_function_pool[3019]: ReadInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[3085]: ReadInstrumentsSGIX (dynamic) */
    "i\0"
    "glReadInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[3044]: CallLists (offset 3) */
+   /* _mesa_function_pool[3110]: CallLists (offset 3) */
    "iip\0"
    "glCallLists\0"
    "\0"
-   /* _mesa_function_pool[3061]: UniformMatrix2x4fv (will be remapped) */
+   /* _mesa_function_pool[3127]: DeformationMap3dSGIX (dynamic) */
+   "iddiiddiiddiip\0"
+   "glDeformationMap3dSGIX\0"
+   "\0"
+   /* _mesa_function_pool[3166]: UniformMatrix2x4fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix2x4fv\0"
    "\0"
-   /* _mesa_function_pool[3088]: ReadnPixelsARB (will be remapped) */
+   /* _mesa_function_pool[3193]: ReadnPixelsARB (will be remapped) */
    "iiiiiiip\0"
    "glReadnPixelsARB\0"
    "\0"
-   /* _mesa_function_pool[3115]: Color4ubVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[3220]: Color4ubVertex3fvSUN (dynamic) */
    "pp\0"
    "glColor4ubVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[3142]: Normal3iv (offset 59) */
+   /* _mesa_function_pool[3247]: Normal3iv (offset 59) */
    "p\0"
    "glNormal3iv\0"
    "\0"
-   /* _mesa_function_pool[3157]: PassThrough (offset 199) */
+   /* _mesa_function_pool[3262]: PassThrough (offset 199) */
    "f\0"
    "glPassThrough\0"
    "\0"
-   /* _mesa_function_pool[3174]: GetnPixelMapusvARB (will be remapped) */
+   /* _mesa_function_pool[3279]: GetnPixelMapusvARB (will be remapped) */
    "iip\0"
    "glGetnPixelMapusvARB\0"
    "\0"
-   /* _mesa_function_pool[3200]: TexParameterIivEXT (will be remapped) */
+   /* _mesa_function_pool[3305]: TexParameterIivEXT (will be remapped) */
    "iip\0"
    "glTexParameterIivEXT\0"
    "glTexParameterIiv\0"
    "\0"
-   /* _mesa_function_pool[3244]: FramebufferTextureLayerEXT (will be remapped) */
+   /* _mesa_function_pool[3349]: FramebufferTextureLayerEXT (will be remapped) */
    "iiiii\0"
    "glFramebufferTextureLayer\0"
    "glFramebufferTextureLayerARB\0"
    "glFramebufferTextureLayerEXT\0"
    "\0"
-   /* _mesa_function_pool[3335]: GetListParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[3440]: GetListParameterfvSGIX (dynamic) */
    "iip\0"
    "glGetListParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[3365]: Viewport (offset 305) */
+   /* _mesa_function_pool[3470]: Viewport (offset 305) */
    "iiii\0"
    "glViewport\0"
    "\0"
-   /* _mesa_function_pool[3382]: VertexAttrib4NusvARB (will be remapped) */
+   /* _mesa_function_pool[3487]: VertexAttrib4NusvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nusv\0"
    "glVertexAttrib4NusvARB\0"
    "\0"
-   /* _mesa_function_pool[3429]: VertexP4uiv (will be remapped) */
+   /* _mesa_function_pool[3534]: VertexP4uiv (will be remapped) */
    "ip\0"
    "glVertexP4uiv\0"
    "\0"
-   /* _mesa_function_pool[3447]: VertexAttribP3ui (will be remapped) */
+   /* _mesa_function_pool[3552]: VertexAttribP3ui (will be remapped) */
    "iiii\0"
    "glVertexAttribP3ui\0"
    "\0"
-   /* _mesa_function_pool[3472]: WindowPos4svMESA (will be remapped) */
+   /* _mesa_function_pool[3577]: WindowPos4svMESA (will be remapped) */
    "p\0"
    "glWindowPos4svMESA\0"
    "\0"
-   /* _mesa_function_pool[3494]: CreateProgramObjectARB (will be remapped) */
+   /* _mesa_function_pool[3599]: CreateProgramObjectARB (will be remapped) */
    "\0"
    "glCreateProgramObjectARB\0"
    "\0"
-   /* _mesa_function_pool[3521]: DeleteTransformFeedbacks (will be remapped) */
+   /* _mesa_function_pool[3626]: DeleteTransformFeedbacks (will be remapped) */
    "ip\0"
    "glDeleteTransformFeedbacks\0"
    "\0"
-   /* _mesa_function_pool[3552]: UniformMatrix4x3fv (will be remapped) */
+   /* _mesa_function_pool[3657]: UniformMatrix4x3fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix4x3fv\0"
    "\0"
-   /* _mesa_function_pool[3579]: PrioritizeTextures (offset 331) */
+   /* _mesa_function_pool[3684]: PrioritizeTextures (offset 331) */
    "ipp\0"
    "glPrioritizeTextures\0"
    "glPrioritizeTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[3629]: VertexAttribI3uiEXT (will be remapped) */
+   /* _mesa_function_pool[3734]: VertexAttribI3uiEXT (will be remapped) */
    "iiii\0"
    "glVertexAttribI3uiEXT\0"
    "glVertexAttribI3ui\0"
    "\0"
-   /* _mesa_function_pool[3676]: AsyncMarkerSGIX (dynamic) */
+   /* _mesa_function_pool[3781]: AsyncMarkerSGIX (dynamic) */
    "i\0"
    "glAsyncMarkerSGIX\0"
    "\0"
-   /* _mesa_function_pool[3697]: GlobalAlphaFactorubSUN (dynamic) */
+   /* _mesa_function_pool[3802]: GlobalAlphaFactorubSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorubSUN\0"
    "\0"
-   /* _mesa_function_pool[3725]: ClearColorIuiEXT (will be remapped) */
+   /* _mesa_function_pool[3830]: ClearColorIuiEXT (will be remapped) */
    "iiii\0"
    "glClearColorIuiEXT\0"
    "\0"
-   /* _mesa_function_pool[3750]: ClearDebugLogMESA (dynamic) */
+   /* _mesa_function_pool[3855]: ClearDebugLogMESA (dynamic) */
    "iii\0"
    "glClearDebugLogMESA\0"
    "\0"
-   /* _mesa_function_pool[3775]: Uniform4uiEXT (will be remapped) */
+   /* _mesa_function_pool[3880]: Uniform4uiEXT (will be remapped) */
    "iiiii\0"
    "glUniform4uiEXT\0"
    "glUniform4ui\0"
    "\0"
-   /* _mesa_function_pool[3811]: ResetHistogram (offset 369) */
+   /* _mesa_function_pool[3916]: ResetHistogram (offset 369) */
    "i\0"
    "glResetHistogram\0"
    "glResetHistogramEXT\0"
    "\0"
-   /* _mesa_function_pool[3851]: GetProgramNamedParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[3956]: GetProgramNamedParameterfvNV (will be remapped) */
    "iipp\0"
    "glGetProgramNamedParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[3888]: PointParameterfEXT (will be remapped) */
+   /* _mesa_function_pool[3993]: PointParameterfEXT (will be remapped) */
    "if\0"
    "glPointParameterf\0"
    "glPointParameterfARB\0"
    "glPointParameterfEXT\0"
    "glPointParameterfSGIS\0"
    "\0"
-   /* _mesa_function_pool[3974]: MultiTexCoordP4uiv (will be remapped) */
+   /* _mesa_function_pool[4079]: MultiTexCoordP4uiv (will be remapped) */
    "iip\0"
    "glMultiTexCoordP4uiv\0"
    "\0"
-   /* _mesa_function_pool[4000]: LoadIdentityDeformationMapSGIX (dynamic) */
+   /* _mesa_function_pool[4105]: LoadIdentityDeformationMapSGIX (dynamic) */
    "i\0"
    "glLoadIdentityDeformationMapSGIX\0"
    "\0"
-   /* _mesa_function_pool[4036]: GenFencesNV (will be remapped) */
+   /* _mesa_function_pool[4141]: GenFencesNV (will be remapped) */
    "ip\0"
    "glGenFencesNV\0"
    "\0"
-   /* _mesa_function_pool[4054]: ImageTransformParameterfHP (dynamic) */
+   /* _mesa_function_pool[4159]: ImageTransformParameterfHP (dynamic) */
    "iif\0"
    "glImageTransformParameterfHP\0"
    "\0"
-   /* _mesa_function_pool[4088]: MatrixIndexusvARB (dynamic) */
+   /* _mesa_function_pool[4193]: MatrixIndexusvARB (dynamic) */
    "ip\0"
    "glMatrixIndexusvARB\0"
    "\0"
-   /* _mesa_function_pool[4112]: DrawElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[4217]: DrawElementsBaseVertex (will be remapped) */
    "iiipi\0"
    "glDrawElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[4144]: DisableVertexAttribArrayARB (will be remapped) */
+   /* _mesa_function_pool[4249]: DisableVertexAttribArrayARB (will be remapped) */
    "i\0"
    "glDisableVertexAttribArray\0"
    "glDisableVertexAttribArrayARB\0"
    "\0"
-   /* _mesa_function_pool[4204]: GetnConvolutionFilterARB (will be remapped) */
+   /* _mesa_function_pool[4309]: VertexAttribI4ubvEXT (will be remapped) */
+   "ip\0"
+   "glVertexAttribI4ubvEXT\0"
+   "glVertexAttribI4ubv\0"
+   "\0"
+   /* _mesa_function_pool[4356]: GetnConvolutionFilterARB (will be remapped) */
    "iiiip\0"
    "glGetnConvolutionFilterARB\0"
    "\0"
-   /* _mesa_function_pool[4238]: TexCoord2sv (offset 109) */
+   /* _mesa_function_pool[4390]: TexCoord2sv (offset 109) */
    "p\0"
    "glTexCoord2sv\0"
    "\0"
-   /* _mesa_function_pool[4255]: ColorP4uiv (will be remapped) */
+   /* _mesa_function_pool[4407]: ColorP4uiv (will be remapped) */
    "ip\0"
    "glColorP4uiv\0"
    "\0"
-   /* _mesa_function_pool[4272]: Vertex4dv (offset 143) */
+   /* _mesa_function_pool[4424]: Vertex4dv (offset 143) */
    "p\0"
    "glVertex4dv\0"
    "\0"
-   /* _mesa_function_pool[4287]: StencilMaskSeparate (will be remapped) */
+   /* _mesa_function_pool[4439]: StencilMaskSeparate (will be remapped) */
    "ii\0"
    "glStencilMaskSeparate\0"
    "\0"
-   /* _mesa_function_pool[4313]: ProgramLocalParameter4dARB (will be remapped) */
+   /* _mesa_function_pool[4465]: ProgramLocalParameter4dARB (will be remapped) */
    "iidddd\0"
    "glProgramLocalParameter4dARB\0"
    "\0"
-   /* _mesa_function_pool[4350]: CompressedTexImage3DARB (will be remapped) */
+   /* _mesa_function_pool[4502]: CompressedTexImage3DARB (will be remapped) */
    "iiiiiiiip\0"
    "glCompressedTexImage3D\0"
    "glCompressedTexImage3DARB\0"
    "\0"
-   /* _mesa_function_pool[4410]: Color3sv (offset 18) */
+   /* _mesa_function_pool[4562]: Color3sv (offset 18) */
    "p\0"
    "glColor3sv\0"
    "\0"
-   /* _mesa_function_pool[4424]: GetConvolutionParameteriv (offset 358) */
+   /* _mesa_function_pool[4576]: GetConvolutionParameteriv (offset 358) */
    "iip\0"
    "glGetConvolutionParameteriv\0"
    "glGetConvolutionParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[4488]: DeleteSamplers (will be remapped) */
+   /* _mesa_function_pool[4640]: DeleteSamplers (will be remapped) */
    "ip\0"
    "glDeleteSamplers\0"
    "\0"
-   /* _mesa_function_pool[4509]: VertexAttrib1fARB (will be remapped) */
+   /* _mesa_function_pool[4661]: VertexAttrib1fARB (will be remapped) */
    "if\0"
    "glVertexAttrib1f\0"
    "glVertexAttrib1fARB\0"
    "\0"
-   /* _mesa_function_pool[4550]: Vertex2dv (offset 127) */
+   /* _mesa_function_pool[4702]: Vertex2dv (offset 127) */
    "p\0"
    "glVertex2dv\0"
    "\0"
-   /* _mesa_function_pool[4565]: TestFenceNV (will be remapped) */
+   /* _mesa_function_pool[4717]: TestFenceNV (will be remapped) */
    "i\0"
    "glTestFenceNV\0"
    "\0"
-   /* _mesa_function_pool[4582]: GetVertexAttribIuivEXT (will be remapped) */
-   "iip\0"
-   "glGetVertexAttribIuivEXT\0"
-   "glGetVertexAttribIuiv\0"
-   "\0"
-   /* _mesa_function_pool[4634]: MultiTexCoord1fvARB (offset 379) */
+   /* _mesa_function_pool[4734]: MultiTexCoord1fvARB (offset 379) */
    "ip\0"
    "glMultiTexCoord1fv\0"
    "glMultiTexCoord1fvARB\0"
    "\0"
-   /* _mesa_function_pool[4679]: TexCoord3iv (offset 115) */
+   /* _mesa_function_pool[4779]: TexCoord3iv (offset 115) */
    "p\0"
    "glTexCoord3iv\0"
    "\0"
-   /* _mesa_function_pool[4696]: Uniform2uivEXT (will be remapped) */
+   /* _mesa_function_pool[4796]: Uniform2uivEXT (will be remapped) */
    "iip\0"
    "glUniform2uivEXT\0"
    "glUniform2uiv\0"
    "\0"
-   /* _mesa_function_pool[4732]: ColorFragmentOp2ATI (will be remapped) */
+   /* _mesa_function_pool[4832]: ColorFragmentOp2ATI (will be remapped) */
    "iiiiiiiiii\0"
    "glColorFragmentOp2ATI\0"
    "\0"
-   /* _mesa_function_pool[4766]: TexStorage2D (will be remapped) */
+   /* _mesa_function_pool[4866]: TexStorage2D (will be remapped) */
    "iiiii\0"
    "glTexStorage2D\0"
    "\0"
-   /* _mesa_function_pool[4788]: SecondaryColorPointerListIBM (dynamic) */
+   /* _mesa_function_pool[4888]: SecondaryColorPointerListIBM (dynamic) */
    "iiipi\0"
    "glSecondaryColorPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[4826]: GetPixelTexGenParameterivSGIS (will be remapped) */
+   /* _mesa_function_pool[4926]: GetPixelTexGenParameterivSGIS (will be remapped) */
    "ip\0"
    "glGetPixelTexGenParameterivSGIS\0"
    "\0"
-   /* _mesa_function_pool[4862]: Color3fv (offset 14) */
+   /* _mesa_function_pool[4962]: Color3fv (offset 14) */
    "p\0"
    "glColor3fv\0"
    "\0"
-   /* _mesa_function_pool[4876]: GetnPixelMapfvARB (will be remapped) */
+   /* _mesa_function_pool[4976]: GetnPixelMapfvARB (will be remapped) */
    "iip\0"
    "glGetnPixelMapfvARB\0"
    "\0"
-   /* _mesa_function_pool[4901]: TextureStorage1DEXT (will be remapped) */
+   /* _mesa_function_pool[5001]: TextureStorage1DEXT (will be remapped) */
    "iiiii\0"
    "glTextureStorage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[4930]: ReplacementCodeubSUN (dynamic) */
+   /* _mesa_function_pool[5030]: ReplacementCodeubSUN (dynamic) */
    "i\0"
    "glReplacementCodeubSUN\0"
    "\0"
-   /* _mesa_function_pool[4956]: FinishAsyncSGIX (dynamic) */
+   /* _mesa_function_pool[5056]: FinishAsyncSGIX (dynamic) */
    "p\0"
    "glFinishAsyncSGIX\0"
    "\0"
-   /* _mesa_function_pool[4977]: GetnUniformfvARB (will be remapped) */
+   /* _mesa_function_pool[5077]: GetnUniformfvARB (will be remapped) */
    "iiip\0"
    "glGetnUniformfvARB\0"
    "\0"
-   /* _mesa_function_pool[5002]: GetDebugLogMESA (dynamic) */
+   /* _mesa_function_pool[5102]: GetDebugLogMESA (dynamic) */
    "iiiipp\0"
    "glGetDebugLogMESA\0"
    "\0"
-   /* _mesa_function_pool[5028]: FogCoorddEXT (will be remapped) */
+   /* _mesa_function_pool[5128]: FogCoorddEXT (will be remapped) */
    "d\0"
    "glFogCoordd\0"
    "glFogCoorddEXT\0"
    "\0"
-   /* _mesa_function_pool[5058]: BeginConditionalRenderNV (will be remapped) */
+   /* _mesa_function_pool[5158]: BeginConditionalRenderNV (will be remapped) */
    "ii\0"
    "glBeginConditionalRenderNV\0"
    "glBeginConditionalRender\0"
    "\0"
-   /* _mesa_function_pool[5114]: Color4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[5214]: Color4ubVertex3fSUN (dynamic) */
    "iiiifff\0"
    "glColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[5145]: FogCoordfEXT (will be remapped) */
+   /* _mesa_function_pool[5245]: FogCoordfEXT (will be remapped) */
    "f\0"
    "glFogCoordf\0"
    "glFogCoordfEXT\0"
    "\0"
-   /* _mesa_function_pool[5175]: PointSize (offset 173) */
+   /* _mesa_function_pool[5275]: PointSize (offset 173) */
    "f\0"
    "glPointSize\0"
    "\0"
-   /* _mesa_function_pool[5190]: VertexAttribI2uivEXT (will be remapped) */
+   /* _mesa_function_pool[5290]: VertexAttribI2uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI2uivEXT\0"
    "glVertexAttribI2uiv\0"
    "\0"
-   /* _mesa_function_pool[5237]: TexCoord2fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[5337]: TexCoord2fVertex3fSUN (dynamic) */
    "fffff\0"
    "glTexCoord2fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[5268]: PopName (offset 200) */
+   /* _mesa_function_pool[5368]: PopName (offset 200) */
    "\0"
    "glPopName\0"
    "\0"
-   /* _mesa_function_pool[5280]: GetSamplerParameterfv (will be remapped) */
+   /* _mesa_function_pool[5380]: GetSamplerParameterfv (will be remapped) */
    "iip\0"
    "glGetSamplerParameterfv\0"
    "\0"
-   /* _mesa_function_pool[5309]: GlobalAlphaFactoriSUN (dynamic) */
+   /* _mesa_function_pool[5409]: GlobalAlphaFactoriSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactoriSUN\0"
    "\0"
-   /* _mesa_function_pool[5336]: VertexAttrib2dNV (will be remapped) */
+   /* _mesa_function_pool[5436]: VertexAttrib2dNV (will be remapped) */
    "idd\0"
    "glVertexAttrib2dNV\0"
    "\0"
-   /* _mesa_function_pool[5360]: GetProgramInfoLog (will be remapped) */
+   /* _mesa_function_pool[5460]: GetProgramInfoLog (will be remapped) */
    "iipp\0"
    "glGetProgramInfoLog\0"
    "\0"
-   /* _mesa_function_pool[5386]: VertexP2ui (will be remapped) */
+   /* _mesa_function_pool[5486]: VertexP2ui (will be remapped) */
    "ii\0"
    "glVertexP2ui\0"
    "\0"
-   /* _mesa_function_pool[5403]: VertexAttrib4NbvARB (will be remapped) */
+   /* _mesa_function_pool[5503]: VertexAttrib4NbvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nbv\0"
    "glVertexAttrib4NbvARB\0"
    "\0"
-   /* _mesa_function_pool[5448]: GetActiveAttribARB (will be remapped) */
+   /* _mesa_function_pool[5548]: GetActiveAttribARB (will be remapped) */
    "iiipppp\0"
    "glGetActiveAttrib\0"
    "glGetActiveAttribARB\0"
    "\0"
-   /* _mesa_function_pool[5496]: Vertex4sv (offset 149) */
+   /* _mesa_function_pool[5596]: Vertex4sv (offset 149) */
    "p\0"
    "glVertex4sv\0"
    "\0"
-   /* _mesa_function_pool[5511]: VertexAttrib4ubNV (will be remapped) */
+   /* _mesa_function_pool[5611]: VertexAttrib4ubNV (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4ubNV\0"
    "\0"
-   /* _mesa_function_pool[5538]: VertexAttribI1ivEXT (will be remapped) */
+   /* _mesa_function_pool[5638]: VertexAttribI1ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI1ivEXT\0"
    "glVertexAttribI1iv\0"
    "\0"
-   /* _mesa_function_pool[5583]: ClampColor (will be remapped) */
+   /* _mesa_function_pool[5683]: ClampColor (will be remapped) */
    "ii\0"
    "glClampColor\0"
    "\0"
-   /* _mesa_function_pool[5600]: TextureRangeAPPLE (will be remapped) */
+   /* _mesa_function_pool[5700]: TextureRangeAPPLE (will be remapped) */
    "iip\0"
    "glTextureRangeAPPLE\0"
    "\0"
-   /* _mesa_function_pool[5625]: GetTexEnvfv (offset 276) */
+   /* _mesa_function_pool[5725]: GetTexEnvfv (offset 276) */
    "iip\0"
    "glGetTexEnvfv\0"
    "\0"
-   /* _mesa_function_pool[5644]: VertexAttribP2uiv (will be remapped) */
+   /* _mesa_function_pool[5744]: VertexAttribP2uiv (will be remapped) */
    "iiip\0"
    "glVertexAttribP2uiv\0"
    "\0"
-   /* _mesa_function_pool[5670]: BindTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[5770]: BindTransformFeedback (will be remapped) */
    "ii\0"
    "glBindTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[5698]: TexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[5798]: TexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
    "ffffffffffff\0"
    "glTexCoord2fColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[5751]: Indexub (offset 315) */
+   /* _mesa_function_pool[5851]: Indexub (offset 315) */
    "i\0"
    "glIndexub\0"
    "\0"
-   /* _mesa_function_pool[5764]: VertexAttrib4fNV (will be remapped) */
+   /* _mesa_function_pool[5864]: VertexAttrib4fNV (will be remapped) */
    "iffff\0"
    "glVertexAttrib4fNV\0"
    "\0"
-   /* _mesa_function_pool[5790]: TexEnvi (offset 186) */
+   /* _mesa_function_pool[5890]: TexEnvi (offset 186) */
    "iii\0"
    "glTexEnvi\0"
    "\0"
-   /* _mesa_function_pool[5805]: GetClipPlane (offset 259) */
+   /* _mesa_function_pool[5905]: GetClipPlane (offset 259) */
    "ip\0"
    "glGetClipPlane\0"
    "\0"
-   /* _mesa_function_pool[5824]: CombinerParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[5924]: CombinerParameterfvNV (will be remapped) */
    "ip\0"
    "glCombinerParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[5852]: TexCoordP4uiv (will be remapped) */
+   /* _mesa_function_pool[5952]: TexCoordP4uiv (will be remapped) */
    "ip\0"
    "glTexCoordP4uiv\0"
    "\0"
-   /* _mesa_function_pool[5872]: VertexAttribs3dvNV (will be remapped) */
+   /* _mesa_function_pool[5972]: VertexAttribs3dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs3dvNV\0"
    "\0"
-   /* _mesa_function_pool[5898]: VertexAttribI2uiEXT (will be remapped) */
+   /* _mesa_function_pool[5998]: VertexAttribI2uiEXT (will be remapped) */
    "iii\0"
    "glVertexAttribI2uiEXT\0"
    "glVertexAttribI2ui\0"
    "\0"
-   /* _mesa_function_pool[5944]: VertexAttribs4fvNV (will be remapped) */
+   /* _mesa_function_pool[6044]: VertexAttribs4fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4fvNV\0"
    "\0"
-   /* _mesa_function_pool[5970]: VertexArrayRangeNV (will be remapped) */
+   /* _mesa_function_pool[6070]: VertexArrayRangeNV (will be remapped) */
    "ip\0"
    "glVertexArrayRangeNV\0"
    "\0"
-   /* _mesa_function_pool[5995]: FragmentLightiSGIX (dynamic) */
+   /* _mesa_function_pool[6095]: FragmentLightiSGIX (dynamic) */
    "iii\0"
    "glFragmentLightiSGIX\0"
    "\0"
-   /* _mesa_function_pool[6021]: PolygonOffsetEXT (will be remapped) */
+   /* _mesa_function_pool[6121]: PolygonOffsetEXT (will be remapped) */
    "ff\0"
    "glPolygonOffsetEXT\0"
    "\0"
-   /* _mesa_function_pool[6044]: VertexAttribI4uivEXT (will be remapped) */
+   /* _mesa_function_pool[6144]: VertexAttribI4uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4uivEXT\0"
    "glVertexAttribI4uiv\0"
    "\0"
-   /* _mesa_function_pool[6091]: PollAsyncSGIX (dynamic) */
+   /* _mesa_function_pool[6191]: PollAsyncSGIX (dynamic) */
    "p\0"
    "glPollAsyncSGIX\0"
    "\0"
-   /* _mesa_function_pool[6110]: DeleteFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[6210]: DeleteFragmentShaderATI (will be remapped) */
    "i\0"
    "glDeleteFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[6139]: Scaled (offset 301) */
+   /* _mesa_function_pool[6239]: Scaled (offset 301) */
    "ddd\0"
    "glScaled\0"
    "\0"
-   /* _mesa_function_pool[6153]: ResumeTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[6253]: ResumeTransformFeedback (will be remapped) */
    "\0"
    "glResumeTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[6181]: Scalef (offset 302) */
+   /* _mesa_function_pool[6281]: Scalef (offset 302) */
    "fff\0"
    "glScalef\0"
    "\0"
-   /* _mesa_function_pool[6195]: TexCoord2fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[6295]: TexCoord2fNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[6233]: ProgramEnvParameters4fvEXT (will be remapped) */
+   /* _mesa_function_pool[6333]: ProgramEnvParameters4fvEXT (will be remapped) */
    "iiip\0"
    "glProgramEnvParameters4fvEXT\0"
    "\0"
-   /* _mesa_function_pool[6268]: MultTransposeMatrixdARB (will be remapped) */
+   /* _mesa_function_pool[6368]: MultTransposeMatrixdARB (will be remapped) */
    "p\0"
    "glMultTransposeMatrixd\0"
    "glMultTransposeMatrixdARB\0"
    "\0"
-   /* _mesa_function_pool[6320]: ColorMaskIndexedEXT (will be remapped) */
-   "iiiii\0"
-   "glColorMaskIndexedEXT\0"
-   "glColorMaski\0"
-   "\0"
-   /* _mesa_function_pool[6362]: ObjectUnpurgeableAPPLE (will be remapped) */
+   /* _mesa_function_pool[6420]: ObjectUnpurgeableAPPLE (will be remapped) */
    "iii\0"
    "glObjectUnpurgeableAPPLE\0"
    "\0"
-   /* _mesa_function_pool[6392]: TexCoordP3ui (will be remapped) */
+   /* _mesa_function_pool[6450]: TexCoordP3ui (will be remapped) */
    "ii\0"
    "glTexCoordP3ui\0"
    "\0"
-   /* _mesa_function_pool[6411]: AlphaFunc (offset 240) */
+   /* _mesa_function_pool[6469]: AlphaFunc (offset 240) */
    "if\0"
    "glAlphaFunc\0"
    "\0"
-   /* _mesa_function_pool[6427]: WindowPos2svMESA (will be remapped) */
+   /* _mesa_function_pool[6485]: WindowPos2svMESA (will be remapped) */
    "p\0"
    "glWindowPos2sv\0"
    "glWindowPos2svARB\0"
    "glWindowPos2svMESA\0"
    "\0"
-   /* _mesa_function_pool[6482]: EdgeFlag (offset 41) */
+   /* _mesa_function_pool[6540]: EdgeFlag (offset 41) */
    "i\0"
    "glEdgeFlag\0"
    "\0"
-   /* _mesa_function_pool[6496]: TexCoord2iv (offset 107) */
+   /* _mesa_function_pool[6554]: TexCoord2iv (offset 107) */
    "p\0"
    "glTexCoord2iv\0"
    "\0"
-   /* _mesa_function_pool[6513]: CompressedTexImage1DARB (will be remapped) */
+   /* _mesa_function_pool[6571]: CompressedTexImage1DARB (will be remapped) */
    "iiiiiip\0"
    "glCompressedTexImage1D\0"
    "glCompressedTexImage1DARB\0"
    "\0"
-   /* _mesa_function_pool[6571]: Rotated (offset 299) */
+   /* _mesa_function_pool[6629]: Rotated (offset 299) */
    "dddd\0"
    "glRotated\0"
    "\0"
-   /* _mesa_function_pool[6587]: GetTexParameterIuivEXT (will be remapped) */
+   /* _mesa_function_pool[6645]: GetTexParameterIuivEXT (will be remapped) */
    "iip\0"
    "glGetTexParameterIuivEXT\0"
    "glGetTexParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[6639]: VertexAttrib2sNV (will be remapped) */
+   /* _mesa_function_pool[6697]: VertexAttrib2sNV (will be remapped) */
    "iii\0"
    "glVertexAttrib2sNV\0"
    "\0"
-   /* _mesa_function_pool[6663]: ReadPixels (offset 256) */
+   /* _mesa_function_pool[6721]: ReadPixels (offset 256) */
    "iiiiiip\0"
    "glReadPixels\0"
    "\0"
-   /* _mesa_function_pool[6685]: VertexAttribDivisorARB (will be remapped) */
+   /* _mesa_function_pool[6743]: VertexAttribDivisorARB (will be remapped) */
    "ii\0"
    "glVertexAttribDivisorARB\0"
    "\0"
-   /* _mesa_function_pool[6714]: EdgeFlagv (offset 42) */
+   /* _mesa_function_pool[6772]: EdgeFlagv (offset 42) */
    "p\0"
    "glEdgeFlagv\0"
    "\0"
-   /* _mesa_function_pool[6729]: NormalPointerListIBM (dynamic) */
+   /* _mesa_function_pool[6787]: NormalPointerListIBM (dynamic) */
    "iipi\0"
    "glNormalPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[6758]: IndexPointerEXT (will be remapped) */
+   /* _mesa_function_pool[6816]: IndexPointerEXT (will be remapped) */
    "iiip\0"
    "glIndexPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[6782]: Color4iv (offset 32) */
+   /* _mesa_function_pool[6840]: Color4iv (offset 32) */
    "p\0"
    "glColor4iv\0"
    "\0"
-   /* _mesa_function_pool[6796]: TexParameterf (offset 178) */
+   /* _mesa_function_pool[6854]: TexParameterf (offset 178) */
    "iif\0"
    "glTexParameterf\0"
    "\0"
-   /* _mesa_function_pool[6817]: TexParameteri (offset 180) */
+   /* _mesa_function_pool[6875]: TexParameteri (offset 180) */
    "iii\0"
    "glTexParameteri\0"
    "\0"
-   /* _mesa_function_pool[6838]: NormalPointerEXT (will be remapped) */
+   /* _mesa_function_pool[6896]: NormalPointerEXT (will be remapped) */
    "iiip\0"
    "glNormalPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[6863]: MultiTexCoord3dARB (offset 392) */
+   /* _mesa_function_pool[6921]: MultiTexCoord3dARB (offset 392) */
    "iddd\0"
    "glMultiTexCoord3d\0"
    "glMultiTexCoord3dARB\0"
    "\0"
-   /* _mesa_function_pool[6908]: MultiTexCoord2iARB (offset 388) */
+   /* _mesa_function_pool[6966]: MultiTexCoord2iARB (offset 388) */
    "iii\0"
    "glMultiTexCoord2i\0"
    "glMultiTexCoord2iARB\0"
    "\0"
-   /* _mesa_function_pool[6952]: DrawPixels (offset 257) */
+   /* _mesa_function_pool[7010]: DrawPixels (offset 257) */
    "iiiip\0"
    "glDrawPixels\0"
    "\0"
-   /* _mesa_function_pool[6972]: ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[7030]: ReplacementCodeuiTexCoord2fNormal3fVertex3fSUN (dynamic) */
    "iffffffff\0"
    "glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[7032]: MultiTexCoord2svARB (offset 391) */
+   /* _mesa_function_pool[7090]: MultiTexCoord2svARB (offset 391) */
    "ip\0"
    "glMultiTexCoord2sv\0"
    "glMultiTexCoord2svARB\0"
    "\0"
-   /* _mesa_function_pool[7077]: ReplacementCodeubvSUN (dynamic) */
+   /* _mesa_function_pool[7135]: ReplacementCodeubvSUN (dynamic) */
    "p\0"
    "glReplacementCodeubvSUN\0"
    "\0"
-   /* _mesa_function_pool[7104]: Uniform3iARB (will be remapped) */
+   /* _mesa_function_pool[7162]: Uniform3iARB (will be remapped) */
    "iiii\0"
    "glUniform3i\0"
    "glUniform3iARB\0"
    "\0"
-   /* _mesa_function_pool[7137]: DrawTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[7195]: DrawTransformFeedback (will be remapped) */
    "ii\0"
    "glDrawTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[7165]: DrawElementsInstancedARB (will be remapped) */
+   /* _mesa_function_pool[7223]: DrawElementsInstancedARB (will be remapped) */
    "iiipi\0"
    "glDrawElementsInstancedARB\0"
    "glDrawElementsInstancedEXT\0"
    "glDrawElementsInstanced\0"
    "\0"
-   /* _mesa_function_pool[7250]: GetShaderInfoLog (will be remapped) */
+   /* _mesa_function_pool[7308]: GetShaderInfoLog (will be remapped) */
    "iipp\0"
    "glGetShaderInfoLog\0"
    "\0"
-   /* _mesa_function_pool[7275]: WeightivARB (dynamic) */
+   /* _mesa_function_pool[7333]: WeightivARB (dynamic) */
    "ip\0"
    "glWeightivARB\0"
    "\0"
-   /* _mesa_function_pool[7293]: PollInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[7351]: PollInstrumentsSGIX (dynamic) */
    "p\0"
    "glPollInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[7318]: GlobalAlphaFactordSUN (dynamic) */
+   /* _mesa_function_pool[7376]: GlobalAlphaFactordSUN (dynamic) */
    "d\0"
    "glGlobalAlphaFactordSUN\0"
    "\0"
-   /* _mesa_function_pool[7345]: GetFinalCombinerInputParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[7403]: GetFinalCombinerInputParameterfvNV (will be remapped) */
    "iip\0"
    "glGetFinalCombinerInputParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[7387]: GenerateMipmapEXT (will be remapped) */
+   /* _mesa_function_pool[7445]: GenerateMipmapEXT (will be remapped) */
    "i\0"
    "glGenerateMipmap\0"
    "glGenerateMipmapEXT\0"
    "\0"
-   /* _mesa_function_pool[7427]: GenLists (offset 5) */
+   /* _mesa_function_pool[7485]: GenLists (offset 5) */
    "i\0"
    "glGenLists\0"
    "\0"
-   /* _mesa_function_pool[7441]: DepthRangef (will be remapped) */
+   /* _mesa_function_pool[7499]: DepthRangef (will be remapped) */
    "ff\0"
    "glDepthRangef\0"
    "\0"
-   /* _mesa_function_pool[7459]: GetMapAttribParameterivNV (dynamic) */
+   /* _mesa_function_pool[7517]: GetMapAttribParameterivNV (dynamic) */
    "iiip\0"
    "glGetMapAttribParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[7493]: CreateShaderObjectARB (will be remapped) */
+   /* _mesa_function_pool[7551]: CreateShaderObjectARB (will be remapped) */
    "i\0"
    "glCreateShaderObjectARB\0"
    "\0"
-   /* _mesa_function_pool[7520]: GetSharpenTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[7578]: GetSharpenTexFuncSGIS (dynamic) */
    "ip\0"
    "glGetSharpenTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[7548]: BufferDataARB (will be remapped) */
+   /* _mesa_function_pool[7606]: BufferDataARB (will be remapped) */
    "iipi\0"
    "glBufferData\0"
    "glBufferDataARB\0"
    "\0"
-   /* _mesa_function_pool[7583]: FlushVertexArrayRangeNV (will be remapped) */
+   /* _mesa_function_pool[7641]: FlushVertexArrayRangeNV (will be remapped) */
    "\0"
    "glFlushVertexArrayRangeNV\0"
    "\0"
-   /* _mesa_function_pool[7611]: MapGrid2d (offset 226) */
+   /* _mesa_function_pool[7669]: MapGrid2d (offset 226) */
    "iddidd\0"
    "glMapGrid2d\0"
    "\0"
-   /* _mesa_function_pool[7631]: MapGrid2f (offset 227) */
+   /* _mesa_function_pool[7689]: MapGrid2f (offset 227) */
    "iffiff\0"
    "glMapGrid2f\0"
    "\0"
-   /* _mesa_function_pool[7651]: SampleMapATI (will be remapped) */
+   /* _mesa_function_pool[7709]: SampleMapATI (will be remapped) */
    "iii\0"
    "glSampleMapATI\0"
    "\0"
-   /* _mesa_function_pool[7671]: VertexPointerEXT (will be remapped) */
+   /* _mesa_function_pool[7729]: VertexPointerEXT (will be remapped) */
    "iiiip\0"
    "glVertexPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[7697]: GetTexFilterFuncSGIS (dynamic) */
+   /* _mesa_function_pool[7755]: GetTexFilterFuncSGIS (dynamic) */
    "iip\0"
    "glGetTexFilterFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[7725]: Scissor (offset 176) */
+   /* _mesa_function_pool[7783]: Scissor (offset 176) */
    "iiii\0"
    "glScissor\0"
    "\0"
-   /* _mesa_function_pool[7741]: Fogf (offset 153) */
+   /* _mesa_function_pool[7799]: Fogf (offset 153) */
    "if\0"
    "glFogf\0"
    "\0"
-   /* _mesa_function_pool[7752]: ReplacementCodeuiColor4ubVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[7810]: ReplacementCodeuiColor4ubVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiColor4ubVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[7797]: TexSubImage1D (offset 332) */
+   /* _mesa_function_pool[7855]: TexSubImage1D (offset 332) */
    "iiiiiip\0"
    "glTexSubImage1D\0"
    "glTexSubImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[7841]: VertexAttrib1sARB (will be remapped) */
+   /* _mesa_function_pool[7899]: VertexAttrib1sARB (will be remapped) */
    "ii\0"
    "glVertexAttrib1s\0"
    "glVertexAttrib1sARB\0"
    "\0"
-   /* _mesa_function_pool[7882]: FenceSync (will be remapped) */
+   /* _mesa_function_pool[7940]: FenceSync (will be remapped) */
    "ii\0"
    "glFenceSync\0"
    "\0"
-   /* _mesa_function_pool[7898]: Color4usv (offset 40) */
+   /* _mesa_function_pool[7956]: Color4usv (offset 40) */
    "p\0"
    "glColor4usv\0"
    "\0"
-   /* _mesa_function_pool[7913]: Fogi (offset 155) */
+   /* _mesa_function_pool[7971]: Fogi (offset 155) */
    "ii\0"
    "glFogi\0"
    "\0"
-   /* _mesa_function_pool[7924]: DepthRange (offset 288) */
+   /* _mesa_function_pool[7982]: DepthRange (offset 288) */
    "dd\0"
    "glDepthRange\0"
    "\0"
-   /* _mesa_function_pool[7941]: RasterPos3iv (offset 75) */
+   /* _mesa_function_pool[7999]: RasterPos3iv (offset 75) */
    "p\0"
    "glRasterPos3iv\0"
    "\0"
-   /* _mesa_function_pool[7959]: FinalCombinerInputNV (will be remapped) */
+   /* _mesa_function_pool[8017]: FinalCombinerInputNV (will be remapped) */
    "iiii\0"
    "glFinalCombinerInputNV\0"
    "\0"
-   /* _mesa_function_pool[7988]: TexCoord2i (offset 106) */
+   /* _mesa_function_pool[8046]: TexCoord2i (offset 106) */
    "ii\0"
    "glTexCoord2i\0"
    "\0"
-   /* _mesa_function_pool[8005]: PixelMapfv (offset 251) */
+   /* _mesa_function_pool[8063]: PixelMapfv (offset 251) */
    "iip\0"
    "glPixelMapfv\0"
    "\0"
-   /* _mesa_function_pool[8023]: Color4ui (offset 37) */
+   /* _mesa_function_pool[8081]: Color4ui (offset 37) */
    "iiii\0"
    "glColor4ui\0"
    "\0"
-   /* _mesa_function_pool[8040]: RasterPos3s (offset 76) */
+   /* _mesa_function_pool[8098]: RasterPos3s (offset 76) */
    "iii\0"
    "glRasterPos3s\0"
    "\0"
-   /* _mesa_function_pool[8059]: Color3usv (offset 24) */
+   /* _mesa_function_pool[8117]: Color3usv (offset 24) */
    "p\0"
    "glColor3usv\0"
    "\0"
-   /* _mesa_function_pool[8074]: FlushRasterSGIX (dynamic) */
+   /* _mesa_function_pool[8132]: FlushRasterSGIX (dynamic) */
    "\0"
    "glFlushRasterSGIX\0"
    "\0"
-   /* _mesa_function_pool[8094]: TexCoord2f (offset 104) */
+   /* _mesa_function_pool[8152]: TexCoord2f (offset 104) */
    "ff\0"
    "glTexCoord2f\0"
    "\0"
-   /* _mesa_function_pool[8111]: ReplacementCodeuiTexCoord2fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[8169]: ReplacementCodeuiTexCoord2fVertex3fSUN (dynamic) */
    "ifffff\0"
    "glReplacementCodeuiTexCoord2fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[8160]: TexCoord2d (offset 102) */
+   /* _mesa_function_pool[8218]: TexCoord2d (offset 102) */
    "dd\0"
    "glTexCoord2d\0"
    "\0"
-   /* _mesa_function_pool[8177]: RasterPos3d (offset 70) */
+   /* _mesa_function_pool[8235]: RasterPos3d (offset 70) */
    "ddd\0"
    "glRasterPos3d\0"
    "\0"
-   /* _mesa_function_pool[8196]: RasterPos3f (offset 72) */
+   /* _mesa_function_pool[8254]: RasterPos3f (offset 72) */
    "fff\0"
    "glRasterPos3f\0"
    "\0"
-   /* _mesa_function_pool[8215]: Uniform1fARB (will be remapped) */
+   /* _mesa_function_pool[8273]: Uniform1fARB (will be remapped) */
    "if\0"
    "glUniform1f\0"
    "glUniform1fARB\0"
    "\0"
-   /* _mesa_function_pool[8246]: AreTexturesResident (offset 322) */
+   /* _mesa_function_pool[8304]: AreTexturesResident (offset 322) */
    "ipp\0"
    "glAreTexturesResident\0"
    "glAreTexturesResidentEXT\0"
    "\0"
-   /* _mesa_function_pool[8298]: TexCoord2s (offset 108) */
+   /* _mesa_function_pool[8356]: TexCoord2s (offset 108) */
    "ii\0"
    "glTexCoord2s\0"
    "\0"
-   /* _mesa_function_pool[8315]: StencilOpSeparate (will be remapped) */
+   /* _mesa_function_pool[8373]: StencilOpSeparate (will be remapped) */
    "iiii\0"
    "glStencilOpSeparate\0"
    "glStencilOpSeparateATI\0"
    "\0"
-   /* _mesa_function_pool[8364]: ColorTableParameteriv (offset 341) */
+   /* _mesa_function_pool[8422]: ColorTableParameteriv (offset 341) */
    "iip\0"
    "glColorTableParameteriv\0"
    "glColorTableParameterivSGI\0"
    "\0"
-   /* _mesa_function_pool[8420]: FogCoordPointerListIBM (dynamic) */
+   /* _mesa_function_pool[8478]: FogCoordPointerListIBM (dynamic) */
    "iipi\0"
    "glFogCoordPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[8451]: WindowPos3dMESA (will be remapped) */
+   /* _mesa_function_pool[8509]: WindowPos3dMESA (will be remapped) */
    "ddd\0"
    "glWindowPos3d\0"
    "glWindowPos3dARB\0"
    "glWindowPos3dMESA\0"
    "\0"
-   /* _mesa_function_pool[8505]: Color4us (offset 39) */
+   /* _mesa_function_pool[8563]: Color4us (offset 39) */
    "iiii\0"
    "glColor4us\0"
    "\0"
-   /* _mesa_function_pool[8522]: PointParameterfvEXT (will be remapped) */
+   /* _mesa_function_pool[8580]: PointParameterfvEXT (will be remapped) */
    "ip\0"
    "glPointParameterfv\0"
    "glPointParameterfvARB\0"
    "glPointParameterfvEXT\0"
    "glPointParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[8612]: Color3bv (offset 10) */
+   /* _mesa_function_pool[8670]: Color3bv (offset 10) */
    "p\0"
    "glColor3bv\0"
    "\0"
-   /* _mesa_function_pool[8626]: GetnCompressedTexImageARB (will be remapped) */
+   /* _mesa_function_pool[8684]: GetnCompressedTexImageARB (will be remapped) */
    "iiip\0"
    "glGetnCompressedTexImageARB\0"
    "\0"
-   /* _mesa_function_pool[8660]: WindowPos2fvMESA (will be remapped) */
+   /* _mesa_function_pool[8718]: WindowPos2fvMESA (will be remapped) */
    "p\0"
    "glWindowPos2fv\0"
    "glWindowPos2fvARB\0"
    "glWindowPos2fvMESA\0"
    "\0"
-   /* _mesa_function_pool[8715]: SecondaryColor3bvEXT (will be remapped) */
+   /* _mesa_function_pool[8773]: SecondaryColor3bvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3bv\0"
    "glSecondaryColor3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[8761]: VertexPointerListIBM (dynamic) */
+   /* _mesa_function_pool[8819]: VertexPointerListIBM (dynamic) */
    "iiipi\0"
    "glVertexPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[8791]: GetProgramLocalParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[8849]: GetProgramLocalParameterfvARB (will be remapped) */
    "iip\0"
    "glGetProgramLocalParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[8828]: FragmentMaterialfSGIX (dynamic) */
+   /* _mesa_function_pool[8886]: FragmentMaterialfSGIX (dynamic) */
    "iif\0"
    "glFragmentMaterialfSGIX\0"
    "\0"
-   /* _mesa_function_pool[8857]: BindSampler (will be remapped) */
+   /* _mesa_function_pool[8915]: BindSampler (will be remapped) */
    "ii\0"
    "glBindSampler\0"
    "\0"
-   /* _mesa_function_pool[8875]: RenderbufferStorageEXT (will be remapped) */
+   /* _mesa_function_pool[8933]: RenderbufferStorageEXT (will be remapped) */
    "iiii\0"
    "glRenderbufferStorage\0"
    "glRenderbufferStorageEXT\0"
    "\0"
-   /* _mesa_function_pool[8928]: IsFenceNV (will be remapped) */
+   /* _mesa_function_pool[8986]: IsFenceNV (will be remapped) */
    "i\0"
    "glIsFenceNV\0"
    "\0"
-   /* _mesa_function_pool[8943]: AttachObjectARB (will be remapped) */
+   /* _mesa_function_pool[9001]: AttachObjectARB (will be remapped) */
    "ii\0"
    "glAttachObjectARB\0"
    "\0"
-   /* _mesa_function_pool[8965]: GetFragmentLightivSGIX (dynamic) */
+   /* _mesa_function_pool[9023]: GetFragmentLightivSGIX (dynamic) */
    "iip\0"
    "glGetFragmentLightivSGIX\0"
    "\0"
-   /* _mesa_function_pool[8995]: UniformMatrix2fvARB (will be remapped) */
+   /* _mesa_function_pool[9053]: UniformMatrix2fvARB (will be remapped) */
    "iiip\0"
    "glUniformMatrix2fv\0"
    "glUniformMatrix2fvARB\0"
    "\0"
-   /* _mesa_function_pool[9042]: MultiTexCoord2fARB (offset 386) */
+   /* _mesa_function_pool[9100]: MultiTexCoord2fARB (offset 386) */
    "iff\0"
    "glMultiTexCoord2f\0"
    "glMultiTexCoord2fARB\0"
    "\0"
-   /* _mesa_function_pool[9086]: ColorTable (offset 339) */
+   /* _mesa_function_pool[9144]: ColorTable (offset 339) */
    "iiiiip\0"
    "glColorTable\0"
    "glColorTableSGI\0"
    "glColorTableEXT\0"
    "\0"
-   /* _mesa_function_pool[9139]: IndexPointer (offset 314) */
+   /* _mesa_function_pool[9197]: IndexPointer (offset 314) */
    "iip\0"
    "glIndexPointer\0"
    "\0"
-   /* _mesa_function_pool[9159]: Accum (offset 213) */
+   /* _mesa_function_pool[9217]: Accum (offset 213) */
    "if\0"
    "glAccum\0"
    "\0"
-   /* _mesa_function_pool[9171]: GetTexImage (offset 281) */
+   /* _mesa_function_pool[9229]: GetTexImage (offset 281) */
    "iiiip\0"
    "glGetTexImage\0"
    "\0"
-   /* _mesa_function_pool[9192]: MapControlPointsNV (dynamic) */
+   /* _mesa_function_pool[9250]: MapControlPointsNV (dynamic) */
    "iiiiiiiip\0"
    "glMapControlPointsNV\0"
    "\0"
-   /* _mesa_function_pool[9224]: ConvolutionFilter2D (offset 349) */
+   /* _mesa_function_pool[9282]: ConvolutionFilter2D (offset 349) */
    "iiiiiip\0"
    "glConvolutionFilter2D\0"
    "glConvolutionFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[9280]: Finish (offset 216) */
+   /* _mesa_function_pool[9338]: Finish (offset 216) */
    "\0"
    "glFinish\0"
    "\0"
-   /* _mesa_function_pool[9291]: MapParameterfvNV (dynamic) */
+   /* _mesa_function_pool[9349]: MapParameterfvNV (dynamic) */
    "iip\0"
    "glMapParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[9315]: ClearStencil (offset 207) */
+   /* _mesa_function_pool[9373]: ClearStencil (offset 207) */
    "i\0"
    "glClearStencil\0"
    "\0"
-   /* _mesa_function_pool[9333]: VertexAttrib3dvARB (will be remapped) */
+   /* _mesa_function_pool[9391]: VertexAttrib3dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3dv\0"
    "glVertexAttrib3dvARB\0"
    "\0"
-   /* _mesa_function_pool[9376]: Uniform4uivEXT (will be remapped) */
+   /* _mesa_function_pool[9434]: Uniform4uivEXT (will be remapped) */
    "iip\0"
    "glUniform4uivEXT\0"
    "glUniform4uiv\0"
    "\0"
-   /* _mesa_function_pool[9412]: HintPGI (dynamic) */
+   /* _mesa_function_pool[9470]: HintPGI (dynamic) */
    "ii\0"
    "glHintPGI\0"
    "\0"
-   /* _mesa_function_pool[9426]: ConvolutionParameteriv (offset 353) */
+   /* _mesa_function_pool[9484]: ConvolutionParameteriv (offset 353) */
    "iip\0"
    "glConvolutionParameteriv\0"
    "glConvolutionParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[9484]: Color4s (offset 33) */
+   /* _mesa_function_pool[9542]: Color4s (offset 33) */
    "iiii\0"
    "glColor4s\0"
    "\0"
-   /* _mesa_function_pool[9500]: InterleavedArrays (offset 317) */
+   /* _mesa_function_pool[9558]: InterleavedArrays (offset 317) */
    "iip\0"
    "glInterleavedArrays\0"
    "\0"
-   /* _mesa_function_pool[9525]: RasterPos2fv (offset 65) */
+   /* _mesa_function_pool[9583]: RasterPos2fv (offset 65) */
    "p\0"
    "glRasterPos2fv\0"
    "\0"
-   /* _mesa_function_pool[9543]: TexCoord1fv (offset 97) */
+   /* _mesa_function_pool[9601]: TexCoord1fv (offset 97) */
    "p\0"
    "glTexCoord1fv\0"
    "\0"
-   /* _mesa_function_pool[9560]: Vertex2d (offset 126) */
+   /* _mesa_function_pool[9618]: Vertex2d (offset 126) */
    "dd\0"
    "glVertex2d\0"
    "\0"
-   /* _mesa_function_pool[9575]: CullParameterdvEXT (dynamic) */
+   /* _mesa_function_pool[9633]: CullParameterdvEXT (dynamic) */
    "ip\0"
    "glCullParameterdvEXT\0"
    "\0"
-   /* _mesa_function_pool[9600]: ProgramNamedParameter4fNV (will be remapped) */
+   /* _mesa_function_pool[9658]: ProgramNamedParameter4fNV (will be remapped) */
    "iipffff\0"
    "glProgramNamedParameter4fNV\0"
    "\0"
-   /* _mesa_function_pool[9637]: Color3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[9695]: Color3fVertex3fSUN (dynamic) */
    "ffffff\0"
    "glColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[9666]: ProgramEnvParameter4fvARB (will be remapped) */
+   /* _mesa_function_pool[9724]: ProgramEnvParameter4fvARB (will be remapped) */
    "iip\0"
    "glProgramEnvParameter4fvARB\0"
    "glProgramParameter4fvNV\0"
    "\0"
-   /* _mesa_function_pool[9723]: Color4i (offset 31) */
+   /* _mesa_function_pool[9781]: Color4i (offset 31) */
    "iiii\0"
    "glColor4i\0"
    "\0"
-   /* _mesa_function_pool[9739]: Color4f (offset 29) */
+   /* _mesa_function_pool[9797]: Color4f (offset 29) */
    "ffff\0"
    "glColor4f\0"
    "\0"
-   /* _mesa_function_pool[9755]: RasterPos4fv (offset 81) */
+   /* _mesa_function_pool[9813]: RasterPos4fv (offset 81) */
    "p\0"
    "glRasterPos4fv\0"
    "\0"
-   /* _mesa_function_pool[9773]: Color4d (offset 27) */
+   /* _mesa_function_pool[9831]: Color4d (offset 27) */
    "dddd\0"
    "glColor4d\0"
    "\0"
-   /* _mesa_function_pool[9789]: ClearIndex (offset 205) */
+   /* _mesa_function_pool[9847]: ClearIndex (offset 205) */
    "f\0"
    "glClearIndex\0"
    "\0"
-   /* _mesa_function_pool[9805]: Color4b (offset 25) */
+   /* _mesa_function_pool[9863]: Color4b (offset 25) */
    "iiii\0"
    "glColor4b\0"
    "\0"
-   /* _mesa_function_pool[9821]: LoadMatrixd (offset 292) */
+   /* _mesa_function_pool[9879]: LoadMatrixd (offset 292) */
    "p\0"
    "glLoadMatrixd\0"
    "\0"
-   /* _mesa_function_pool[9838]: FragmentLightModeliSGIX (dynamic) */
+   /* _mesa_function_pool[9896]: FragmentLightModeliSGIX (dynamic) */
    "ii\0"
    "glFragmentLightModeliSGIX\0"
    "\0"
-   /* _mesa_function_pool[9868]: RasterPos2dv (offset 63) */
+   /* _mesa_function_pool[9926]: RasterPos2dv (offset 63) */
    "p\0"
    "glRasterPos2dv\0"
    "\0"
-   /* _mesa_function_pool[9886]: ConvolutionParameterfv (offset 351) */
+   /* _mesa_function_pool[9944]: ConvolutionParameterfv (offset 351) */
    "iip\0"
    "glConvolutionParameterfv\0"
    "glConvolutionParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[9944]: TbufferMask3DFX (dynamic) */
+   /* _mesa_function_pool[10002]: TbufferMask3DFX (dynamic) */
    "i\0"
    "glTbufferMask3DFX\0"
    "\0"
-   /* _mesa_function_pool[9965]: GetTexGendv (offset 278) */
+   /* _mesa_function_pool[10023]: GetTexGendv (offset 278) */
    "iip\0"
    "glGetTexGendv\0"
    "\0"
-   /* _mesa_function_pool[9984]: GetVertexAttribfvNV (will be remapped) */
+   /* _mesa_function_pool[10042]: GetVertexAttribfvNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribfvNV\0"
    "\0"
-   /* _mesa_function_pool[10011]: BeginTransformFeedbackEXT (will be remapped) */
+   /* _mesa_function_pool[10069]: BeginTransformFeedbackEXT (will be remapped) */
    "i\0"
    "glBeginTransformFeedbackEXT\0"
    "glBeginTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[10067]: LoadProgramNV (will be remapped) */
+   /* _mesa_function_pool[10125]: LoadProgramNV (will be remapped) */
    "iiip\0"
    "glLoadProgramNV\0"
    "\0"
-   /* _mesa_function_pool[10089]: WaitSync (will be remapped) */
+   /* _mesa_function_pool[10147]: WaitSync (will be remapped) */
    "iii\0"
    "glWaitSync\0"
    "\0"
-   /* _mesa_function_pool[10105]: EndList (offset 1) */
+   /* _mesa_function_pool[10163]: EndList (offset 1) */
    "\0"
    "glEndList\0"
    "\0"
-   /* _mesa_function_pool[10117]: VertexP4ui (will be remapped) */
+   /* _mesa_function_pool[10175]: VertexP4ui (will be remapped) */
    "ii\0"
    "glVertexP4ui\0"
    "\0"
-   /* _mesa_function_pool[10134]: VertexAttrib4fvNV (will be remapped) */
+   /* _mesa_function_pool[10192]: VertexAttrib4fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4fvNV\0"
    "\0"
-   /* _mesa_function_pool[10158]: GetAttachedObjectsARB (will be remapped) */
+   /* _mesa_function_pool[10216]: GetAttachedObjectsARB (will be remapped) */
    "iipp\0"
    "glGetAttachedObjectsARB\0"
    "\0"
-   /* _mesa_function_pool[10188]: Uniform3fvARB (will be remapped) */
+   /* _mesa_function_pool[10246]: Uniform3fvARB (will be remapped) */
    "iip\0"
    "glUniform3fv\0"
    "glUniform3fvARB\0"
    "\0"
-   /* _mesa_function_pool[10222]: EvalCoord1fv (offset 231) */
+   /* _mesa_function_pool[10280]: EvalCoord1fv (offset 231) */
    "p\0"
    "glEvalCoord1fv\0"
    "\0"
-   /* _mesa_function_pool[10240]: DrawRangeElements (offset 338) */
+   /* _mesa_function_pool[10298]: DrawRangeElements (offset 338) */
    "iiiiip\0"
    "glDrawRangeElements\0"
    "glDrawRangeElementsEXT\0"
    "\0"
-   /* _mesa_function_pool[10291]: EvalMesh2 (offset 238) */
+   /* _mesa_function_pool[10349]: EvalMesh2 (offset 238) */
    "iiiii\0"
    "glEvalMesh2\0"
    "\0"
-   /* _mesa_function_pool[10310]: Vertex4fv (offset 145) */
+   /* _mesa_function_pool[10368]: Vertex4fv (offset 145) */
    "p\0"
    "glVertex4fv\0"
    "\0"
-   /* _mesa_function_pool[10325]: GenTransformFeedbacks (will be remapped) */
+   /* _mesa_function_pool[10383]: GenTransformFeedbacks (will be remapped) */
    "ip\0"
    "glGenTransformFeedbacks\0"
    "\0"
-   /* _mesa_function_pool[10353]: SpriteParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[10411]: SpriteParameterfvSGIX (dynamic) */
    "ip\0"
    "glSpriteParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[10381]: CheckFramebufferStatusEXT (will be remapped) */
+   /* _mesa_function_pool[10439]: CheckFramebufferStatusEXT (will be remapped) */
    "i\0"
    "glCheckFramebufferStatus\0"
    "glCheckFramebufferStatusEXT\0"
    "\0"
-   /* _mesa_function_pool[10437]: GlobalAlphaFactoruiSUN (dynamic) */
+   /* _mesa_function_pool[10495]: GlobalAlphaFactoruiSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactoruiSUN\0"
    "\0"
-   /* _mesa_function_pool[10465]: GetHandleARB (will be remapped) */
+   /* _mesa_function_pool[10523]: GetHandleARB (will be remapped) */
    "i\0"
    "glGetHandleARB\0"
    "\0"
-   /* _mesa_function_pool[10483]: GetVertexAttribivARB (will be remapped) */
+   /* _mesa_function_pool[10541]: DebugMessageControlARB (will be remapped) */
+   "iiiipi\0"
+   "glDebugMessageControlARB\0"
+   "\0"
+   /* _mesa_function_pool[10574]: GetVertexAttribivARB (will be remapped) */
    "iip\0"
    "glGetVertexAttribiv\0"
    "glGetVertexAttribivARB\0"
    "\0"
-   /* _mesa_function_pool[10531]: BlendFunciARB (will be remapped) */
+   /* _mesa_function_pool[10622]: BlendFunciARB (will be remapped) */
    "iii\0"
    "glBlendFunciARB\0"
    "glBlendFuncIndexedAMD\0"
    "\0"
-   /* _mesa_function_pool[10574]: VertexAttribP1ui (will be remapped) */
+   /* _mesa_function_pool[10665]: VertexAttribP1ui (will be remapped) */
    "iiii\0"
    "glVertexAttribP1ui\0"
    "\0"
-   /* _mesa_function_pool[10599]: GetnUniformivARB (will be remapped) */
+   /* _mesa_function_pool[10690]: GetnUniformivARB (will be remapped) */
    "iiip\0"
    "glGetnUniformivARB\0"
    "\0"
-   /* _mesa_function_pool[10624]: GetTexParameterIivEXT (will be remapped) */
+   /* _mesa_function_pool[10715]: GetTexParameterIivEXT (will be remapped) */
    "iip\0"
    "glGetTexParameterIivEXT\0"
    "glGetTexParameterIiv\0"
    "\0"
-   /* _mesa_function_pool[10674]: CreateProgram (will be remapped) */
+   /* _mesa_function_pool[10765]: CreateProgram (will be remapped) */
    "\0"
    "glCreateProgram\0"
    "\0"
-   /* _mesa_function_pool[10692]: LoadTransposeMatrixdARB (will be remapped) */
+   /* _mesa_function_pool[10783]: LoadTransposeMatrixdARB (will be remapped) */
    "p\0"
    "glLoadTransposeMatrixd\0"
    "glLoadTransposeMatrixdARB\0"
    "\0"
-   /* _mesa_function_pool[10744]: ReleaseShaderCompiler (will be remapped) */
+   /* _mesa_function_pool[10835]: ReleaseShaderCompiler (will be remapped) */
    "\0"
    "glReleaseShaderCompiler\0"
    "\0"
-   /* _mesa_function_pool[10770]: GetMinmax (offset 364) */
+   /* _mesa_function_pool[10861]: GetMinmax (offset 364) */
    "iiiip\0"
    "glGetMinmax\0"
    "glGetMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[10804]: StencilFuncSeparate (will be remapped) */
+   /* _mesa_function_pool[10895]: StencilFuncSeparate (will be remapped) */
    "iiii\0"
    "glStencilFuncSeparate\0"
    "\0"
-   /* _mesa_function_pool[10832]: SecondaryColor3sEXT (will be remapped) */
+   /* _mesa_function_pool[10923]: SecondaryColor3sEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3s\0"
    "glSecondaryColor3sEXT\0"
    "\0"
-   /* _mesa_function_pool[10878]: Color3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[10969]: Color3fVertex3fvSUN (dynamic) */
    "pp\0"
    "glColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[10904]: GetInteger64i_v (will be remapped) */
+   /* _mesa_function_pool[10995]: GetInteger64i_v (will be remapped) */
    "iip\0"
    "glGetInteger64i_v\0"
    "\0"
-   /* _mesa_function_pool[10927]: GetVertexAttribdvNV (will be remapped) */
+   /* _mesa_function_pool[11018]: GetVertexAttribdvNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribdvNV\0"
    "\0"
-   /* _mesa_function_pool[10954]: Normal3fv (offset 57) */
+   /* _mesa_function_pool[11045]: Normal3fv (offset 57) */
    "p\0"
    "glNormal3fv\0"
    "\0"
-   /* _mesa_function_pool[10969]: GlobalAlphaFactorbSUN (dynamic) */
+   /* _mesa_function_pool[11060]: GlobalAlphaFactorbSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorbSUN\0"
    "\0"
-   /* _mesa_function_pool[10996]: Color3us (offset 23) */
+   /* _mesa_function_pool[11087]: Color3us (offset 23) */
    "iii\0"
    "glColor3us\0"
    "\0"
-   /* _mesa_function_pool[11012]: ImageTransformParameterfvHP (dynamic) */
+   /* _mesa_function_pool[11103]: ImageTransformParameterfvHP (dynamic) */
    "iip\0"
    "glImageTransformParameterfvHP\0"
    "\0"
-   /* _mesa_function_pool[11047]: VertexAttrib4ivARB (will be remapped) */
+   /* _mesa_function_pool[11138]: VertexAttrib4ivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4iv\0"
    "glVertexAttrib4ivARB\0"
    "\0"
-   /* _mesa_function_pool[11090]: End (offset 43) */
+   /* _mesa_function_pool[11181]: End (offset 43) */
    "\0"
    "glEnd\0"
    "\0"
-   /* _mesa_function_pool[11098]: VertexAttrib3fNV (will be remapped) */
+   /* _mesa_function_pool[11189]: VertexAttrib3fNV (will be remapped) */
    "ifff\0"
    "glVertexAttrib3fNV\0"
    "\0"
-   /* _mesa_function_pool[11123]: MultiTexCoordP3uiv (will be remapped) */
+   /* _mesa_function_pool[11214]: MultiTexCoordP3uiv (will be remapped) */
    "iip\0"
    "glMultiTexCoordP3uiv\0"
    "\0"
-   /* _mesa_function_pool[11149]: VertexAttribs2dvNV (will be remapped) */
+   /* _mesa_function_pool[11240]: VertexAttribs2dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2dvNV\0"
    "\0"
-   /* _mesa_function_pool[11175]: GetQueryObjectui64vEXT (will be remapped) */
+   /* _mesa_function_pool[11266]: GetQueryObjectui64vEXT (will be remapped) */
    "iip\0"
    "glGetQueryObjectui64vEXT\0"
    "\0"
-   /* _mesa_function_pool[11205]: MultiTexCoord3fvARB (offset 395) */
+   /* _mesa_function_pool[11296]: MultiTexCoord3fvARB (offset 395) */
    "ip\0"
    "glMultiTexCoord3fv\0"
    "glMultiTexCoord3fvARB\0"
    "\0"
-   /* _mesa_function_pool[11250]: SecondaryColor3dEXT (will be remapped) */
+   /* _mesa_function_pool[11341]: SecondaryColor3dEXT (will be remapped) */
    "ddd\0"
    "glSecondaryColor3d\0"
    "glSecondaryColor3dEXT\0"
    "\0"
-   /* _mesa_function_pool[11296]: Color3ub (offset 19) */
+   /* _mesa_function_pool[11387]: Color3ub (offset 19) */
    "iii\0"
    "glColor3ub\0"
    "\0"
-   /* _mesa_function_pool[11312]: GetProgramParameterfvNV (will be remapped) */
+   /* _mesa_function_pool[11403]: GetProgramParameterfvNV (will be remapped) */
    "iiip\0"
    "glGetProgramParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[11344]: TangentPointerEXT (dynamic) */
+   /* _mesa_function_pool[11435]: TangentPointerEXT (dynamic) */
    "iip\0"
    "glTangentPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[11369]: Color4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[11460]: Color4fNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[11404]: GetInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[11495]: GetInstrumentsSGIX (dynamic) */
    "\0"
    "glGetInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[11427]: GetUniformuivEXT (will be remapped) */
+   /* _mesa_function_pool[11518]: GetUniformuivEXT (will be remapped) */
    "iip\0"
    "glGetUniformuivEXT\0"
    "glGetUniformuiv\0"
    "\0"
-   /* _mesa_function_pool[11467]: Color3ui (offset 21) */
+   /* _mesa_function_pool[11558]: Color3ui (offset 21) */
    "iii\0"
    "glColor3ui\0"
    "\0"
-   /* _mesa_function_pool[11483]: EvalMapsNV (dynamic) */
+   /* _mesa_function_pool[11574]: EvalMapsNV (dynamic) */
    "ii\0"
    "glEvalMapsNV\0"
    "\0"
-   /* _mesa_function_pool[11500]: TexSubImage2D (offset 333) */
+   /* _mesa_function_pool[11591]: TexSubImage2D (offset 333) */
    "iiiiiiiip\0"
    "glTexSubImage2D\0"
    "glTexSubImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[11546]: FragmentLightivSGIX (dynamic) */
+   /* _mesa_function_pool[11637]: FragmentLightivSGIX (dynamic) */
    "iip\0"
    "glFragmentLightivSGIX\0"
    "\0"
-   /* _mesa_function_pool[11573]: GetTexParameterPointervAPPLE (will be remapped) */
+   /* _mesa_function_pool[11664]: GetTexParameterPointervAPPLE (will be remapped) */
    "iip\0"
    "glGetTexParameterPointervAPPLE\0"
    "\0"
-   /* _mesa_function_pool[11609]: TexGenfv (offset 191) */
+   /* _mesa_function_pool[11700]: TexGenfv (offset 191) */
    "iip\0"
    "glTexGenfv\0"
    "\0"
-   /* _mesa_function_pool[11625]: GetTransformFeedbackVaryingEXT (will be remapped) */
+   /* _mesa_function_pool[11716]: GetTransformFeedbackVaryingEXT (will be remapped) */
    "iiipppp\0"
    "glGetTransformFeedbackVaryingEXT\0"
    "glGetTransformFeedbackVarying\0"
    "\0"
-   /* _mesa_function_pool[11697]: VertexAttrib4bvARB (will be remapped) */
+   /* _mesa_function_pool[11788]: VertexAttrib4bvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4bv\0"
    "glVertexAttrib4bvARB\0"
    "\0"
-   /* _mesa_function_pool[11740]: ShaderBinary (will be remapped) */
+   /* _mesa_function_pool[11831]: ShaderBinary (will be remapped) */
    "ipipi\0"
    "glShaderBinary\0"
    "\0"
-   /* _mesa_function_pool[11762]: GetIntegerIndexedvEXT (will be remapped) */
+   /* _mesa_function_pool[11853]: GetIntegerIndexedvEXT (will be remapped) */
    "iip\0"
    "glGetIntegerIndexedvEXT\0"
    "glGetIntegeri_v\0"
    "\0"
-   /* _mesa_function_pool[11807]: MultiTexCoord4sARB (offset 406) */
+   /* _mesa_function_pool[11898]: MultiTexCoord4sARB (offset 406) */
    "iiiii\0"
    "glMultiTexCoord4s\0"
    "glMultiTexCoord4sARB\0"
    "\0"
-   /* _mesa_function_pool[11853]: GetFragmentMaterialivSGIX (dynamic) */
+   /* _mesa_function_pool[11944]: GetFragmentMaterialivSGIX (dynamic) */
    "iip\0"
    "glGetFragmentMaterialivSGIX\0"
    "\0"
-   /* _mesa_function_pool[11886]: WindowPos4dMESA (will be remapped) */
+   /* _mesa_function_pool[11977]: WindowPos4dMESA (will be remapped) */
    "dddd\0"
    "glWindowPos4dMESA\0"
    "\0"
-   /* _mesa_function_pool[11910]: WeightPointerARB (dynamic) */
+   /* _mesa_function_pool[12001]: WeightPointerARB (dynamic) */
    "iiip\0"
    "glWeightPointerARB\0"
    "\0"
-   /* _mesa_function_pool[11935]: WindowPos2dMESA (will be remapped) */
+   /* _mesa_function_pool[12026]: WindowPos2dMESA (will be remapped) */
    "dd\0"
    "glWindowPos2d\0"
    "glWindowPos2dARB\0"
    "glWindowPos2dMESA\0"
    "\0"
-   /* _mesa_function_pool[11988]: FramebufferTexture3DEXT (will be remapped) */
+   /* _mesa_function_pool[12079]: FramebufferTexture3DEXT (will be remapped) */
    "iiiiii\0"
    "glFramebufferTexture3D\0"
    "glFramebufferTexture3DEXT\0"
    "\0"
-   /* _mesa_function_pool[12045]: BlendEquation (offset 337) */
+   /* _mesa_function_pool[12136]: BlendEquation (offset 337) */
    "i\0"
    "glBlendEquation\0"
    "glBlendEquationEXT\0"
    "\0"
-   /* _mesa_function_pool[12083]: VertexAttrib3dNV (will be remapped) */
+   /* _mesa_function_pool[12174]: VertexAttrib3dNV (will be remapped) */
    "iddd\0"
    "glVertexAttrib3dNV\0"
    "\0"
-   /* _mesa_function_pool[12108]: VertexAttrib3dARB (will be remapped) */
+   /* _mesa_function_pool[12199]: VertexAttrib3dARB (will be remapped) */
    "iddd\0"
    "glVertexAttrib3d\0"
    "glVertexAttrib3dARB\0"
    "\0"
-   /* _mesa_function_pool[12151]: VertexAttribI4usvEXT (will be remapped) */
+   /* _mesa_function_pool[12242]: VertexAttribI4usvEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4usvEXT\0"
    "glVertexAttribI4usv\0"
    "\0"
-   /* _mesa_function_pool[12198]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[12289]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
    "ppppp\0"
    "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[12262]: VertexAttrib4fARB (will be remapped) */
+   /* _mesa_function_pool[12353]: VertexAttrib4fARB (will be remapped) */
    "iffff\0"
    "glVertexAttrib4f\0"
    "glVertexAttrib4fARB\0"
    "\0"
-   /* _mesa_function_pool[12306]: GetError (offset 261) */
+   /* _mesa_function_pool[12397]: GetError (offset 261) */
    "\0"
    "glGetError\0"
    "\0"
-   /* _mesa_function_pool[12319]: IndexFuncEXT (dynamic) */
+   /* _mesa_function_pool[12410]: IndexFuncEXT (dynamic) */
    "if\0"
    "glIndexFuncEXT\0"
    "\0"
-   /* _mesa_function_pool[12338]: TexCoord3dv (offset 111) */
+   /* _mesa_function_pool[12429]: TexCoord3dv (offset 111) */
    "p\0"
    "glTexCoord3dv\0"
    "\0"
-   /* _mesa_function_pool[12355]: Indexdv (offset 45) */
+   /* _mesa_function_pool[12446]: Indexdv (offset 45) */
    "p\0"
    "glIndexdv\0"
    "\0"
-   /* _mesa_function_pool[12368]: FramebufferTexture2DEXT (will be remapped) */
+   /* _mesa_function_pool[12459]: FramebufferTexture2DEXT (will be remapped) */
    "iiiii\0"
    "glFramebufferTexture2D\0"
    "glFramebufferTexture2DEXT\0"
    "\0"
-   /* _mesa_function_pool[12424]: Normal3s (offset 60) */
+   /* _mesa_function_pool[12515]: Normal3s (offset 60) */
    "iii\0"
    "glNormal3s\0"
    "\0"
-   /* _mesa_function_pool[12440]: GetObjectParameterivAPPLE (will be remapped) */
+   /* _mesa_function_pool[12531]: GetObjectParameterivAPPLE (will be remapped) */
    "iiip\0"
    "glGetObjectParameterivAPPLE\0"
    "\0"
-   /* _mesa_function_pool[12474]: PushName (offset 201) */
+   /* _mesa_function_pool[12565]: PushName (offset 201) */
    "i\0"
    "glPushName\0"
    "\0"
-   /* _mesa_function_pool[12488]: MultiTexCoord2dvARB (offset 385) */
+   /* _mesa_function_pool[12579]: MultiTexCoord2dvARB (offset 385) */
    "ip\0"
    "glMultiTexCoord2dv\0"
    "glMultiTexCoord2dvARB\0"
    "\0"
-   /* _mesa_function_pool[12533]: CullParameterfvEXT (dynamic) */
+   /* _mesa_function_pool[12624]: CullParameterfvEXT (dynamic) */
    "ip\0"
    "glCullParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[12558]: Normal3i (offset 58) */
+   /* _mesa_function_pool[12649]: Normal3i (offset 58) */
    "iii\0"
    "glNormal3i\0"
    "\0"
-   /* _mesa_function_pool[12574]: ProgramNamedParameter4fvNV (will be remapped) */
+   /* _mesa_function_pool[12665]: ProgramNamedParameter4fvNV (will be remapped) */
    "iipp\0"
    "glProgramNamedParameter4fvNV\0"
    "\0"
-   /* _mesa_function_pool[12609]: SecondaryColorPointerEXT (will be remapped) */
+   /* _mesa_function_pool[12700]: SecondaryColorPointerEXT (will be remapped) */
    "iiip\0"
    "glSecondaryColorPointer\0"
    "glSecondaryColorPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[12666]: VertexAttrib4fvARB (will be remapped) */
+   /* _mesa_function_pool[12757]: VertexAttrib4fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4fv\0"
    "glVertexAttrib4fvARB\0"
    "\0"
-   /* _mesa_function_pool[12709]: PixelTexGenSGIX (will be remapped) */
+   /* _mesa_function_pool[12800]: PixelTexGenSGIX (will be remapped) */
    "i\0"
    "glPixelTexGenSGIX\0"
    "\0"
-   /* _mesa_function_pool[12730]: GetActiveUniformARB (will be remapped) */
+   /* _mesa_function_pool[12821]: GetActiveUniformARB (will be remapped) */
    "iiipppp\0"
    "glGetActiveUniform\0"
    "glGetActiveUniformARB\0"
    "\0"
-   /* _mesa_function_pool[12780]: ImageTransformParameteriHP (dynamic) */
+   /* _mesa_function_pool[12871]: ImageTransformParameteriHP (dynamic) */
    "iii\0"
    "glImageTransformParameteriHP\0"
    "\0"
-   /* _mesa_function_pool[12814]: Normal3b (offset 52) */
+   /* _mesa_function_pool[12905]: Normal3b (offset 52) */
    "iii\0"
    "glNormal3b\0"
    "\0"
-   /* _mesa_function_pool[12830]: Normal3d (offset 54) */
+   /* _mesa_function_pool[12921]: Normal3d (offset 54) */
    "ddd\0"
    "glNormal3d\0"
    "\0"
-   /* _mesa_function_pool[12846]: Uniform1uiEXT (will be remapped) */
+   /* _mesa_function_pool[12937]: Uniform1uiEXT (will be remapped) */
    "ii\0"
    "glUniform1uiEXT\0"
    "glUniform1ui\0"
    "\0"
-   /* _mesa_function_pool[12879]: Normal3f (offset 56) */
+   /* _mesa_function_pool[12970]: Normal3f (offset 56) */
    "fff\0"
    "glNormal3f\0"
    "\0"
-   /* _mesa_function_pool[12895]: MultiTexCoord1svARB (offset 383) */
+   /* _mesa_function_pool[12986]: MultiTexCoord1svARB (offset 383) */
    "ip\0"
    "glMultiTexCoord1sv\0"
    "glMultiTexCoord1svARB\0"
    "\0"
-   /* _mesa_function_pool[12940]: Indexi (offset 48) */
+   /* _mesa_function_pool[13031]: Indexi (offset 48) */
    "i\0"
    "glIndexi\0"
    "\0"
-   /* _mesa_function_pool[12952]: EGLImageTargetTexture2DOES (will be remapped) */
+   /* _mesa_function_pool[13043]: EGLImageTargetTexture2DOES (will be remapped) */
    "ip\0"
    "glEGLImageTargetTexture2DOES\0"
    "\0"
-   /* _mesa_function_pool[12985]: EndQueryARB (will be remapped) */
+   /* _mesa_function_pool[13076]: EndQueryARB (will be remapped) */
    "i\0"
    "glEndQuery\0"
    "glEndQueryARB\0"
    "\0"
-   /* _mesa_function_pool[13013]: DeleteFencesNV (will be remapped) */
+   /* _mesa_function_pool[13104]: DeleteFencesNV (will be remapped) */
    "ip\0"
    "glDeleteFencesNV\0"
    "\0"
-   /* _mesa_function_pool[13034]: ColorPointerListIBM (dynamic) */
+   /* _mesa_function_pool[13125]: ColorPointerListIBM (dynamic) */
    "iiipi\0"
    "glColorPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[13063]: BindBufferRangeEXT (will be remapped) */
+   /* _mesa_function_pool[13154]: BindBufferRangeEXT (will be remapped) */
    "iiiii\0"
    "glBindBufferRangeEXT\0"
    "glBindBufferRange\0"
    "\0"
-   /* _mesa_function_pool[13109]: DepthMask (offset 211) */
+   /* _mesa_function_pool[13200]: DepthMask (offset 211) */
    "i\0"
    "glDepthMask\0"
    "\0"
-   /* _mesa_function_pool[13124]: IsShader (will be remapped) */
+   /* _mesa_function_pool[13215]: IsShader (will be remapped) */
    "i\0"
    "glIsShader\0"
    "\0"
-   /* _mesa_function_pool[13138]: Indexf (offset 46) */
+   /* _mesa_function_pool[13229]: Indexf (offset 46) */
    "f\0"
    "glIndexf\0"
    "\0"
-   /* _mesa_function_pool[13150]: GetImageTransformParameterivHP (dynamic) */
+   /* _mesa_function_pool[13241]: GetImageTransformParameterivHP (dynamic) */
    "iip\0"
    "glGetImageTransformParameterivHP\0"
    "\0"
-   /* _mesa_function_pool[13188]: Indexd (offset 44) */
+   /* _mesa_function_pool[13279]: Indexd (offset 44) */
    "d\0"
    "glIndexd\0"
    "\0"
-   /* _mesa_function_pool[13200]: GetMaterialiv (offset 270) */
+   /* _mesa_function_pool[13291]: GetMaterialiv (offset 270) */
    "iip\0"
    "glGetMaterialiv\0"
    "\0"
-   /* _mesa_function_pool[13221]: StencilOp (offset 244) */
+   /* _mesa_function_pool[13312]: StencilOp (offset 244) */
    "iii\0"
    "glStencilOp\0"
    "\0"
-   /* _mesa_function_pool[13238]: WindowPos4ivMESA (will be remapped) */
+   /* _mesa_function_pool[13329]: WindowPos4ivMESA (will be remapped) */
    "p\0"
    "glWindowPos4ivMESA\0"
    "\0"
-   /* _mesa_function_pool[13260]: MultiTexCoord3svARB (offset 399) */
+   /* _mesa_function_pool[13351]: MultiTexCoord3svARB (offset 399) */
    "ip\0"
    "glMultiTexCoord3sv\0"
    "glMultiTexCoord3svARB\0"
    "\0"
-   /* _mesa_function_pool[13305]: TexEnvfv (offset 185) */
+   /* _mesa_function_pool[13396]: TexEnvfv (offset 185) */
    "iip\0"
    "glTexEnvfv\0"
    "\0"
-   /* _mesa_function_pool[13321]: MultiTexCoord4iARB (offset 404) */
+   /* _mesa_function_pool[13412]: MultiTexCoord4iARB (offset 404) */
    "iiiii\0"
    "glMultiTexCoord4i\0"
    "glMultiTexCoord4iARB\0"
    "\0"
-   /* _mesa_function_pool[13367]: Indexs (offset 50) */
+   /* _mesa_function_pool[13458]: Indexs (offset 50) */
    "i\0"
    "glIndexs\0"
    "\0"
-   /* _mesa_function_pool[13379]: Binormal3ivEXT (dynamic) */
+   /* _mesa_function_pool[13470]: Binormal3ivEXT (dynamic) */
    "p\0"
    "glBinormal3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[13399]: ResizeBuffersMESA (will be remapped) */
+   /* _mesa_function_pool[13490]: ResizeBuffersMESA (will be remapped) */
    "\0"
    "glResizeBuffersMESA\0"
    "\0"
-   /* _mesa_function_pool[13421]: MultiTexCoordP1uiv (will be remapped) */
+   /* _mesa_function_pool[13512]: MultiTexCoordP1uiv (will be remapped) */
    "iip\0"
    "glMultiTexCoordP1uiv\0"
    "\0"
-   /* _mesa_function_pool[13447]: BlendFuncSeparateiARB (will be remapped) */
+   /* _mesa_function_pool[13538]: BlendFuncSeparateiARB (will be remapped) */
    "iiiii\0"
    "glBlendFuncSeparateiARB\0"
    "glBlendFuncSeparateIndexedAMD\0"
    "\0"
-   /* _mesa_function_pool[13508]: GetUniformivARB (will be remapped) */
+   /* _mesa_function_pool[13599]: GetUniformivARB (will be remapped) */
    "iip\0"
    "glGetUniformiv\0"
    "glGetUniformivARB\0"
    "\0"
-   /* _mesa_function_pool[13546]: PixelTexGenParameteriSGIS (will be remapped) */
+   /* _mesa_function_pool[13637]: PixelTexGenParameteriSGIS (will be remapped) */
    "ii\0"
    "glPixelTexGenParameteriSGIS\0"
    "\0"
-   /* _mesa_function_pool[13578]: VertexPointervINTEL (dynamic) */
+   /* _mesa_function_pool[13669]: VertexPointervINTEL (dynamic) */
    "iip\0"
    "glVertexPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[13605]: Vertex2i (offset 130) */
+   /* _mesa_function_pool[13696]: Vertex2i (offset 130) */
    "ii\0"
    "glVertex2i\0"
    "\0"
-   /* _mesa_function_pool[13620]: LoadMatrixf (offset 291) */
+   /* _mesa_function_pool[13711]: LoadMatrixf (offset 291) */
    "p\0"
    "glLoadMatrixf\0"
    "\0"
-   /* _mesa_function_pool[13637]: VertexAttribI1uivEXT (will be remapped) */
+   /* _mesa_function_pool[13728]: VertexAttribI1uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI1uivEXT\0"
    "glVertexAttribI1uiv\0"
    "\0"
-   /* _mesa_function_pool[13684]: Vertex2f (offset 128) */
+   /* _mesa_function_pool[13775]: Vertex2f (offset 128) */
    "ff\0"
    "glVertex2f\0"
    "\0"
-   /* _mesa_function_pool[13699]: ReplacementCodeuiColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[13790]: ReplacementCodeuiColor4fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glReplacementCodeuiColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[13752]: Color4bv (offset 26) */
+   /* _mesa_function_pool[13843]: Color4bv (offset 26) */
    "p\0"
    "glColor4bv\0"
    "\0"
-   /* _mesa_function_pool[13766]: VertexPointer (offset 321) */
+   /* _mesa_function_pool[13857]: VertexPointer (offset 321) */
    "iiip\0"
    "glVertexPointer\0"
    "\0"
-   /* _mesa_function_pool[13788]: SecondaryColor3uiEXT (will be remapped) */
+   /* _mesa_function_pool[13879]: SecondaryColor3uiEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3ui\0"
    "glSecondaryColor3uiEXT\0"
    "\0"
-   /* _mesa_function_pool[13836]: StartInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[13927]: StartInstrumentsSGIX (dynamic) */
    "\0"
    "glStartInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[13861]: SecondaryColor3usvEXT (will be remapped) */
+   /* _mesa_function_pool[13952]: SecondaryColor3usvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3usv\0"
    "glSecondaryColor3usvEXT\0"
    "\0"
-   /* _mesa_function_pool[13909]: VertexAttrib2fvNV (will be remapped) */
+   /* _mesa_function_pool[14000]: VertexAttrib2fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2fvNV\0"
    "\0"
-   /* _mesa_function_pool[13933]: ProgramLocalParameter4dvARB (will be remapped) */
+   /* _mesa_function_pool[14024]: ProgramLocalParameter4dvARB (will be remapped) */
    "iip\0"
    "glProgramLocalParameter4dvARB\0"
    "\0"
-   /* _mesa_function_pool[13968]: DeleteLists (offset 4) */
+   /* _mesa_function_pool[14059]: DeleteLists (offset 4) */
    "ii\0"
    "glDeleteLists\0"
    "\0"
-   /* _mesa_function_pool[13986]: LogicOp (offset 242) */
+   /* _mesa_function_pool[14077]: LogicOp (offset 242) */
    "i\0"
    "glLogicOp\0"
    "\0"
-   /* _mesa_function_pool[13999]: MatrixIndexuivARB (dynamic) */
+   /* _mesa_function_pool[14090]: MatrixIndexuivARB (dynamic) */
    "ip\0"
    "glMatrixIndexuivARB\0"
    "\0"
-   /* _mesa_function_pool[14023]: Vertex2s (offset 132) */
+   /* _mesa_function_pool[14114]: Vertex2s (offset 132) */
    "ii\0"
    "glVertex2s\0"
    "\0"
-   /* _mesa_function_pool[14038]: RenderbufferStorageMultisample (will be remapped) */
+   /* _mesa_function_pool[14129]: RenderbufferStorageMultisample (will be remapped) */
    "iiiii\0"
    "glRenderbufferStorageMultisample\0"
    "glRenderbufferStorageMultisampleEXT\0"
    "\0"
-   /* _mesa_function_pool[14114]: TexCoord4fv (offset 121) */
+   /* _mesa_function_pool[14205]: TexCoord4fv (offset 121) */
    "p\0"
    "glTexCoord4fv\0"
    "\0"
-   /* _mesa_function_pool[14131]: Tangent3sEXT (dynamic) */
+   /* _mesa_function_pool[14222]: Tangent3sEXT (dynamic) */
    "iii\0"
    "glTangent3sEXT\0"
    "\0"
-   /* _mesa_function_pool[14151]: GlobalAlphaFactorfSUN (dynamic) */
+   /* _mesa_function_pool[14242]: GlobalAlphaFactorfSUN (dynamic) */
    "f\0"
    "glGlobalAlphaFactorfSUN\0"
    "\0"
-   /* _mesa_function_pool[14178]: MultiTexCoord3iARB (offset 396) */
+   /* _mesa_function_pool[14269]: MultiTexCoord3iARB (offset 396) */
    "iiii\0"
    "glMultiTexCoord3i\0"
    "glMultiTexCoord3iARB\0"
    "\0"
-   /* _mesa_function_pool[14223]: IsProgram (will be remapped) */
+   /* _mesa_function_pool[14314]: IsProgram (will be remapped) */
    "i\0"
    "glIsProgram\0"
    "\0"
-   /* _mesa_function_pool[14238]: TexCoordPointerListIBM (dynamic) */
+   /* _mesa_function_pool[14329]: TexCoordPointerListIBM (dynamic) */
    "iiipi\0"
    "glTexCoordPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[14270]: VertexAttribI4svEXT (will be remapped) */
+   /* _mesa_function_pool[14361]: VertexAttribI4svEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4svEXT\0"
    "glVertexAttribI4sv\0"
    "\0"
-   /* _mesa_function_pool[14315]: GlobalAlphaFactorusSUN (dynamic) */
+   /* _mesa_function_pool[14406]: GlobalAlphaFactorusSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorusSUN\0"
    "\0"
-   /* _mesa_function_pool[14343]: VertexAttrib2dvNV (will be remapped) */
+   /* _mesa_function_pool[14434]: VertexAttrib2dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2dvNV\0"
    "\0"
-   /* _mesa_function_pool[14367]: FramebufferRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[14458]: FramebufferRenderbufferEXT (will be remapped) */
    "iiii\0"
    "glFramebufferRenderbuffer\0"
    "glFramebufferRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[14428]: ClearBufferuiv (will be remapped) */
+   /* _mesa_function_pool[14519]: ClearBufferuiv (will be remapped) */
    "iip\0"
    "glClearBufferuiv\0"
    "\0"
-   /* _mesa_function_pool[14450]: VertexAttrib1dvNV (will be remapped) */
+   /* _mesa_function_pool[14541]: VertexAttrib1dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1dvNV\0"
    "\0"
-   /* _mesa_function_pool[14474]: GenTextures (offset 328) */
+   /* _mesa_function_pool[14565]: GenTextures (offset 328) */
    "ip\0"
    "glGenTextures\0"
    "glGenTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[14509]: FramebufferTextureARB (will be remapped) */
+   /* _mesa_function_pool[14600]: FramebufferTextureARB (will be remapped) */
    "iiii\0"
    "glFramebufferTextureARB\0"
    "\0"
-   /* _mesa_function_pool[14539]: SetFenceNV (will be remapped) */
+   /* _mesa_function_pool[14630]: SetFenceNV (will be remapped) */
    "ii\0"
    "glSetFenceNV\0"
    "\0"
-   /* _mesa_function_pool[14556]: FramebufferTexture1DEXT (will be remapped) */
+   /* _mesa_function_pool[14647]: FramebufferTexture1DEXT (will be remapped) */
    "iiiii\0"
    "glFramebufferTexture1D\0"
    "glFramebufferTexture1DEXT\0"
    "\0"
-   /* _mesa_function_pool[14612]: GetCombinerOutputParameterivNV (will be remapped) */
+   /* _mesa_function_pool[14703]: GetCombinerOutputParameterivNV (will be remapped) */
    "iiip\0"
    "glGetCombinerOutputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[14651]: MultiModeDrawArraysIBM (will be remapped) */
-   "pppii\0"
-   "glMultiModeDrawArraysIBM\0"
-   "\0"
-   /* _mesa_function_pool[14683]: PixelTexGenParameterivSGIS (will be remapped) */
+   /* _mesa_function_pool[14742]: PixelTexGenParameterivSGIS (will be remapped) */
    "ip\0"
    "glPixelTexGenParameterivSGIS\0"
    "\0"
-   /* _mesa_function_pool[14716]: TextureNormalEXT (dynamic) */
+   /* _mesa_function_pool[14775]: TextureNormalEXT (dynamic) */
    "i\0"
    "glTextureNormalEXT\0"
    "\0"
-   /* _mesa_function_pool[14738]: IndexPointerListIBM (dynamic) */
+   /* _mesa_function_pool[14797]: IndexPointerListIBM (dynamic) */
    "iipi\0"
    "glIndexPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[14766]: WeightfvARB (dynamic) */
+   /* _mesa_function_pool[14825]: WeightfvARB (dynamic) */
    "ip\0"
    "glWeightfvARB\0"
    "\0"
-   /* _mesa_function_pool[14784]: GetCombinerOutputParameterfvNV (will be remapped) */
-   "iiip\0"
-   "glGetCombinerOutputParameterfvNV\0"
-   "\0"
-   /* _mesa_function_pool[14823]: MultiTexCoordP3ui (will be remapped) */
+   /* _mesa_function_pool[14843]: MultiTexCoordP3ui (will be remapped) */
    "iii\0"
    "glMultiTexCoordP3ui\0"
    "\0"
-   /* _mesa_function_pool[14848]: RasterPos2sv (offset 69) */
+   /* _mesa_function_pool[14868]: RasterPos2sv (offset 69) */
    "p\0"
    "glRasterPos2sv\0"
    "\0"
-   /* _mesa_function_pool[14866]: Color4ubv (offset 36) */
+   /* _mesa_function_pool[14886]: Color4ubv (offset 36) */
    "p\0"
    "glColor4ubv\0"
    "\0"
-   /* _mesa_function_pool[14881]: DrawBuffer (offset 202) */
+   /* _mesa_function_pool[14901]: DrawBuffer (offset 202) */
    "i\0"
    "glDrawBuffer\0"
    "\0"
-   /* _mesa_function_pool[14897]: TexCoord2fv (offset 105) */
+   /* _mesa_function_pool[14917]: TexCoord2fv (offset 105) */
    "p\0"
    "glTexCoord2fv\0"
    "\0"
-   /* _mesa_function_pool[14914]: WindowPos4fMESA (will be remapped) */
+   /* _mesa_function_pool[14934]: WindowPos4fMESA (will be remapped) */
    "ffff\0"
    "glWindowPos4fMESA\0"
    "\0"
-   /* _mesa_function_pool[14938]: TexCoord1sv (offset 101) */
+   /* _mesa_function_pool[14958]: TexCoord1sv (offset 101) */
    "p\0"
    "glTexCoord1sv\0"
    "\0"
-   /* _mesa_function_pool[14955]: WindowPos3dvMESA (will be remapped) */
+   /* _mesa_function_pool[14975]: WindowPos3dvMESA (will be remapped) */
    "p\0"
    "glWindowPos3dv\0"
    "glWindowPos3dvARB\0"
    "glWindowPos3dvMESA\0"
    "\0"
-   /* _mesa_function_pool[15010]: VertexAttribP1uiv (will be remapped) */
+   /* _mesa_function_pool[15030]: VertexAttribP1uiv (will be remapped) */
    "iiip\0"
    "glVertexAttribP1uiv\0"
    "\0"
-   /* _mesa_function_pool[15036]: VertexAttribP4ui (will be remapped) */
+   /* _mesa_function_pool[15056]: VertexAttribP4ui (will be remapped) */
    "iiii\0"
    "glVertexAttribP4ui\0"
    "\0"
-   /* _mesa_function_pool[15061]: DepthFunc (offset 245) */
+   /* _mesa_function_pool[15081]: DepthFunc (offset 245) */
    "i\0"
    "glDepthFunc\0"
    "\0"
-   /* _mesa_function_pool[15076]: PixelMapusv (offset 253) */
+   /* _mesa_function_pool[15096]: PixelMapusv (offset 253) */
    "iip\0"
    "glPixelMapusv\0"
    "\0"
-   /* _mesa_function_pool[15095]: GetQueryObjecti64vEXT (will be remapped) */
+   /* _mesa_function_pool[15115]: GetQueryObjecti64vEXT (will be remapped) */
    "iip\0"
    "glGetQueryObjecti64vEXT\0"
    "\0"
-   /* _mesa_function_pool[15124]: MultiTexCoord1dARB (offset 376) */
+   /* _mesa_function_pool[15144]: MultiTexCoord1dARB (offset 376) */
    "id\0"
    "glMultiTexCoord1d\0"
    "glMultiTexCoord1dARB\0"
    "\0"
-   /* _mesa_function_pool[15167]: PointParameterivNV (will be remapped) */
+   /* _mesa_function_pool[15187]: PointParameterivNV (will be remapped) */
    "ip\0"
    "glPointParameteriv\0"
    "glPointParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[15211]: IsSampler (will be remapped) */
+   /* _mesa_function_pool[15231]: IsSampler (will be remapped) */
    "i\0"
    "glIsSampler\0"
    "\0"
-   /* _mesa_function_pool[15226]: BlendFunc (offset 241) */
+   /* _mesa_function_pool[15246]: BlendFunc (offset 241) */
    "ii\0"
    "glBlendFunc\0"
    "\0"
-   /* _mesa_function_pool[15242]: EndTransformFeedbackEXT (will be remapped) */
+   /* _mesa_function_pool[15262]: EndTransformFeedbackEXT (will be remapped) */
    "\0"
    "glEndTransformFeedbackEXT\0"
    "glEndTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[15293]: Uniform2fvARB (will be remapped) */
+   /* _mesa_function_pool[15313]: Uniform2fvARB (will be remapped) */
    "iip\0"
    "glUniform2fv\0"
    "glUniform2fvARB\0"
    "\0"
-   /* _mesa_function_pool[15327]: BufferParameteriAPPLE (will be remapped) */
+   /* _mesa_function_pool[15347]: BufferParameteriAPPLE (will be remapped) */
    "iii\0"
    "glBufferParameteriAPPLE\0"
    "\0"
-   /* _mesa_function_pool[15356]: MultiTexCoord3dvARB (offset 393) */
+   /* _mesa_function_pool[15376]: MultiTexCoord3dvARB (offset 393) */
    "ip\0"
    "glMultiTexCoord3dv\0"
    "glMultiTexCoord3dvARB\0"
    "\0"
-   /* _mesa_function_pool[15401]: ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[15421]: ReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[15457]: DeleteObjectARB (will be remapped) */
+   /* _mesa_function_pool[15477]: DeleteObjectARB (will be remapped) */
    "i\0"
    "glDeleteObjectARB\0"
    "\0"
-   /* _mesa_function_pool[15478]: GetShaderPrecisionFormat (will be remapped) */
+   /* _mesa_function_pool[15498]: GetShaderPrecisionFormat (will be remapped) */
    "iipp\0"
    "glGetShaderPrecisionFormat\0"
    "\0"
-   /* _mesa_function_pool[15511]: MatrixIndexPointerARB (dynamic) */
+   /* _mesa_function_pool[15531]: MatrixIndexPointerARB (dynamic) */
    "iiip\0"
    "glMatrixIndexPointerARB\0"
    "\0"
-   /* _mesa_function_pool[15541]: ProgramNamedParameter4dvNV (will be remapped) */
+   /* _mesa_function_pool[15561]: ProgramNamedParameter4dvNV (will be remapped) */
    "iipp\0"
    "glProgramNamedParameter4dvNV\0"
    "\0"
-   /* _mesa_function_pool[15576]: Tangent3fvEXT (dynamic) */
+   /* _mesa_function_pool[15596]: Tangent3fvEXT (dynamic) */
    "p\0"
    "glTangent3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[15595]: Flush (offset 217) */
+   /* _mesa_function_pool[15615]: Flush (offset 217) */
    "\0"
    "glFlush\0"
    "\0"
-   /* _mesa_function_pool[15605]: Color4uiv (offset 38) */
+   /* _mesa_function_pool[15625]: Color4uiv (offset 38) */
    "p\0"
    "glColor4uiv\0"
    "\0"
-   /* _mesa_function_pool[15620]: VertexAttribI4iEXT (will be remapped) */
+   /* _mesa_function_pool[15640]: VertexAttribI4iEXT (will be remapped) */
    "iiiii\0"
    "glVertexAttribI4iEXT\0"
    "glVertexAttribI4i\0"
    "\0"
-   /* _mesa_function_pool[15666]: GenVertexArrays (will be remapped) */
+   /* _mesa_function_pool[15686]: GenVertexArrays (will be remapped) */
    "ip\0"
    "glGenVertexArrays\0"
    "\0"
-   /* _mesa_function_pool[15688]: Uniform3uivEXT (will be remapped) */
+   /* _mesa_function_pool[15708]: Uniform3uivEXT (will be remapped) */
    "iip\0"
    "glUniform3uivEXT\0"
    "glUniform3uiv\0"
    "\0"
-   /* _mesa_function_pool[15724]: RasterPos3sv (offset 77) */
+   /* _mesa_function_pool[15744]: RasterPos3sv (offset 77) */
    "p\0"
    "glRasterPos3sv\0"
    "\0"
-   /* _mesa_function_pool[15742]: TexCoordP2ui (will be remapped) */
+   /* _mesa_function_pool[15762]: TexCoordP2ui (will be remapped) */
    "ii\0"
    "glTexCoordP2ui\0"
    "\0"
-   /* _mesa_function_pool[15761]: BindFramebufferEXT (will be remapped) */
+   /* _mesa_function_pool[15781]: BindFramebufferEXT (will be remapped) */
    "ii\0"
    "glBindFramebuffer\0"
    "glBindFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[15804]: ReferencePlaneSGIX (dynamic) */
+   /* _mesa_function_pool[15824]: ReferencePlaneSGIX (dynamic) */
    "p\0"
    "glReferencePlaneSGIX\0"
    "\0"
-   /* _mesa_function_pool[15828]: PushAttrib (offset 219) */
+   /* _mesa_function_pool[15848]: PushAttrib (offset 219) */
    "i\0"
    "glPushAttrib\0"
    "\0"
-   /* _mesa_function_pool[15844]: RasterPos2i (offset 66) */
+   /* _mesa_function_pool[15864]: RasterPos2i (offset 66) */
    "ii\0"
    "glRasterPos2i\0"
    "\0"
-   /* _mesa_function_pool[15862]: ValidateProgramARB (will be remapped) */
+   /* _mesa_function_pool[15882]: ValidateProgramARB (will be remapped) */
    "i\0"
    "glValidateProgram\0"
    "glValidateProgramARB\0"
    "\0"
-   /* _mesa_function_pool[15904]: TexParameteriv (offset 181) */
+   /* _mesa_function_pool[15924]: TexParameteriv (offset 181) */
    "iip\0"
    "glTexParameteriv\0"
    "\0"
-   /* _mesa_function_pool[15926]: UnlockArraysEXT (will be remapped) */
+   /* _mesa_function_pool[15946]: UnlockArraysEXT (will be remapped) */
    "\0"
    "glUnlockArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[15946]: TexCoord2fColor3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[15966]: TexCoord2fColor3fVertex3fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord2fColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[15987]: WindowPos3fvMESA (will be remapped) */
+   /* _mesa_function_pool[16007]: WindowPos3fvMESA (will be remapped) */
    "p\0"
    "glWindowPos3fv\0"
    "glWindowPos3fvARB\0"
    "glWindowPos3fvMESA\0"
    "\0"
-   /* _mesa_function_pool[16042]: RasterPos2f (offset 64) */
+   /* _mesa_function_pool[16062]: RasterPos2f (offset 64) */
    "ff\0"
    "glRasterPos2f\0"
    "\0"
-   /* _mesa_function_pool[16060]: VertexAttrib1svNV (will be remapped) */
+   /* _mesa_function_pool[16080]: VertexAttrib1svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib1svNV\0"
    "\0"
-   /* _mesa_function_pool[16084]: RasterPos2d (offset 62) */
+   /* _mesa_function_pool[16104]: RasterPos2d (offset 62) */
    "dd\0"
    "glRasterPos2d\0"
    "\0"
-   /* _mesa_function_pool[16102]: RasterPos3fv (offset 73) */
+   /* _mesa_function_pool[16122]: RasterPos3fv (offset 73) */
    "p\0"
    "glRasterPos3fv\0"
    "\0"
-   /* _mesa_function_pool[16120]: CopyTexSubImage3D (offset 373) */
+   /* _mesa_function_pool[16140]: CopyTexSubImage3D (offset 373) */
    "iiiiiiiii\0"
    "glCopyTexSubImage3D\0"
    "glCopyTexSubImage3DEXT\0"
    "\0"
-   /* _mesa_function_pool[16174]: VertexAttrib2dARB (will be remapped) */
+   /* _mesa_function_pool[16194]: VertexAttrib2dARB (will be remapped) */
    "idd\0"
    "glVertexAttrib2d\0"
    "glVertexAttrib2dARB\0"
    "\0"
-   /* _mesa_function_pool[16216]: Color4ub (offset 35) */
+   /* _mesa_function_pool[16236]: Color4ub (offset 35) */
    "iiii\0"
    "glColor4ub\0"
    "\0"
-   /* _mesa_function_pool[16233]: GetInteger64v (will be remapped) */
+   /* _mesa_function_pool[16253]: GetInteger64v (will be remapped) */
    "ip\0"
    "glGetInteger64v\0"
    "\0"
-   /* _mesa_function_pool[16253]: TextureColorMaskSGIS (dynamic) */
+   /* _mesa_function_pool[16273]: TextureColorMaskSGIS (dynamic) */
    "iiii\0"
    "glTextureColorMaskSGIS\0"
    "\0"
-   /* _mesa_function_pool[16282]: RasterPos2s (offset 68) */
+   /* _mesa_function_pool[16302]: RasterPos2s (offset 68) */
    "ii\0"
    "glRasterPos2s\0"
    "\0"
-   /* _mesa_function_pool[16300]: GetColorTable (offset 343) */
+   /* _mesa_function_pool[16320]: GetColorTable (offset 343) */
    "iiip\0"
    "glGetColorTable\0"
    "glGetColorTableSGI\0"
    "glGetColorTableEXT\0"
    "\0"
-   /* _mesa_function_pool[16360]: SelectBuffer (offset 195) */
+   /* _mesa_function_pool[16380]: SelectBuffer (offset 195) */
    "ip\0"
    "glSelectBuffer\0"
    "\0"
-   /* _mesa_function_pool[16379]: Indexiv (offset 49) */
+   /* _mesa_function_pool[16399]: Indexiv (offset 49) */
    "p\0"
    "glIndexiv\0"
    "\0"
-   /* _mesa_function_pool[16392]: TexCoord3i (offset 114) */
+   /* _mesa_function_pool[16412]: TexCoord3i (offset 114) */
    "iii\0"
    "glTexCoord3i\0"
    "\0"
-   /* _mesa_function_pool[16410]: CopyColorTable (offset 342) */
+   /* _mesa_function_pool[16430]: CopyColorTable (offset 342) */
    "iiiii\0"
    "glCopyColorTable\0"
    "glCopyColorTableSGI\0"
    "\0"
-   /* _mesa_function_pool[16454]: GetHistogramParameterfv (offset 362) */
+   /* _mesa_function_pool[16474]: GetHistogramParameterfv (offset 362) */
    "iip\0"
    "glGetHistogramParameterfv\0"
    "glGetHistogramParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[16514]: Frustum (offset 289) */
+   /* _mesa_function_pool[16534]: Frustum (offset 289) */
    "dddddd\0"
    "glFrustum\0"
    "\0"
-   /* _mesa_function_pool[16532]: GetString (offset 275) */
+   /* _mesa_function_pool[16552]: GetString (offset 275) */
    "i\0"
    "glGetString\0"
    "\0"
-   /* _mesa_function_pool[16547]: ColorPointervINTEL (dynamic) */
+   /* _mesa_function_pool[16567]: ColorPointervINTEL (dynamic) */
    "iip\0"
    "glColorPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[16573]: TexEnvf (offset 184) */
+   /* _mesa_function_pool[16593]: TexEnvf (offset 184) */
    "iif\0"
    "glTexEnvf\0"
    "\0"
-   /* _mesa_function_pool[16588]: VertexP2uiv (will be remapped) */
+   /* _mesa_function_pool[16608]: VertexP2uiv (will be remapped) */
    "ip\0"
    "glVertexP2uiv\0"
    "\0"
-   /* _mesa_function_pool[16606]: TexCoord3d (offset 110) */
+   /* _mesa_function_pool[16626]: TexCoord3d (offset 110) */
    "ddd\0"
    "glTexCoord3d\0"
    "\0"
-   /* _mesa_function_pool[16624]: AlphaFragmentOp1ATI (will be remapped) */
+   /* _mesa_function_pool[16644]: AlphaFragmentOp1ATI (will be remapped) */
    "iiiiii\0"
    "glAlphaFragmentOp1ATI\0"
    "\0"
-   /* _mesa_function_pool[16654]: TexCoord3f (offset 112) */
+   /* _mesa_function_pool[16674]: TexCoord3f (offset 112) */
    "fff\0"
    "glTexCoord3f\0"
    "\0"
-   /* _mesa_function_pool[16672]: MultiTexCoord3ivARB (offset 397) */
+   /* _mesa_function_pool[16692]: MultiTexCoord3ivARB (offset 397) */
    "ip\0"
    "glMultiTexCoord3iv\0"
    "glMultiTexCoord3ivARB\0"
    "\0"
-   /* _mesa_function_pool[16717]: MultiTexCoord2sARB (offset 390) */
+   /* _mesa_function_pool[16737]: MultiTexCoord2sARB (offset 390) */
    "iii\0"
    "glMultiTexCoord2s\0"
    "glMultiTexCoord2sARB\0"
    "\0"
-   /* _mesa_function_pool[16761]: VertexAttrib1dvARB (will be remapped) */
+   /* _mesa_function_pool[16781]: VertexAttrib1dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib1dv\0"
    "glVertexAttrib1dvARB\0"
    "\0"
-   /* _mesa_function_pool[16804]: GetnHistogramARB (will be remapped) */
+   /* _mesa_function_pool[16824]: GetnHistogramARB (will be remapped) */
    "iiiiip\0"
    "glGetnHistogramARB\0"
    "\0"
-   /* _mesa_function_pool[16831]: DeleteTextures (offset 327) */
+   /* _mesa_function_pool[16851]: DeleteTextures (offset 327) */
    "ip\0"
    "glDeleteTextures\0"
    "glDeleteTexturesEXT\0"
    "\0"
-   /* _mesa_function_pool[16872]: TexCoordPointerEXT (will be remapped) */
+   /* _mesa_function_pool[16892]: TexCoordPointerEXT (will be remapped) */
    "iiiip\0"
    "glTexCoordPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[16900]: TexSubImage4DSGIS (dynamic) */
+   /* _mesa_function_pool[16920]: TexSubImage4DSGIS (dynamic) */
    "iiiiiiiiiiiip\0"
    "glTexSubImage4DSGIS\0"
    "\0"
-   /* _mesa_function_pool[16935]: TexCoord3s (offset 116) */
+   /* _mesa_function_pool[16955]: TexCoord3s (offset 116) */
    "iii\0"
    "glTexCoord3s\0"
    "\0"
-   /* _mesa_function_pool[16953]: GetTexLevelParameteriv (offset 285) */
+   /* _mesa_function_pool[16973]: GetTexLevelParameteriv (offset 285) */
    "iiip\0"
    "glGetTexLevelParameteriv\0"
    "\0"
-   /* _mesa_function_pool[16984]: CombinerStageParameterfvNV (dynamic) */
+   /* _mesa_function_pool[17004]: CombinerStageParameterfvNV (dynamic) */
    "iip\0"
    "glCombinerStageParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[17018]: VertexAttribP4uiv (will be remapped) */
+   /* _mesa_function_pool[17038]: VertexAttribP4uiv (will be remapped) */
    "iiip\0"
    "glVertexAttribP4uiv\0"
    "\0"
-   /* _mesa_function_pool[17044]: StopInstrumentsSGIX (dynamic) */
+   /* _mesa_function_pool[17064]: StopInstrumentsSGIX (dynamic) */
    "i\0"
    "glStopInstrumentsSGIX\0"
    "\0"
-   /* _mesa_function_pool[17069]: TexCoord4fColor4fNormal3fVertex4fSUN (dynamic) */
+   /* _mesa_function_pool[17089]: TexCoord4fColor4fNormal3fVertex4fSUN (dynamic) */
    "fffffffffffffff\0"
    "glTexCoord4fColor4fNormal3fVertex4fSUN\0"
    "\0"
-   /* _mesa_function_pool[17125]: ClearAccum (offset 204) */
+   /* _mesa_function_pool[17145]: ClearAccum (offset 204) */
    "ffff\0"
    "glClearAccum\0"
    "\0"
-   /* _mesa_function_pool[17144]: DeformSGIX (dynamic) */
+   /* _mesa_function_pool[17164]: DeformSGIX (dynamic) */
    "i\0"
    "glDeformSGIX\0"
    "\0"
-   /* _mesa_function_pool[17160]: GetVertexAttribfvARB (will be remapped) */
+   /* _mesa_function_pool[17180]: GetVertexAttribfvARB (will be remapped) */
    "iip\0"
    "glGetVertexAttribfv\0"
    "glGetVertexAttribfvARB\0"
    "\0"
-   /* _mesa_function_pool[17208]: SecondaryColor3ivEXT (will be remapped) */
+   /* _mesa_function_pool[17228]: SecondaryColor3ivEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3iv\0"
    "glSecondaryColor3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[17254]: TexCoord4iv (offset 123) */
+   /* _mesa_function_pool[17274]: TexCoord4iv (offset 123) */
    "p\0"
    "glTexCoord4iv\0"
    "\0"
-   /* _mesa_function_pool[17271]: VertexAttribI4uiEXT (will be remapped) */
+   /* _mesa_function_pool[17291]: VertexAttribI4uiEXT (will be remapped) */
    "iiiii\0"
    "glVertexAttribI4uiEXT\0"
    "glVertexAttribI4ui\0"
    "\0"
-   /* _mesa_function_pool[17319]: GetFragmentMaterialfvSGIX (dynamic) */
+   /* _mesa_function_pool[17339]: GetFragmentMaterialfvSGIX (dynamic) */
    "iip\0"
    "glGetFragmentMaterialfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[17352]: UniformMatrix4x2fv (will be remapped) */
+   /* _mesa_function_pool[17372]: UniformMatrix4x2fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix4x2fv\0"
    "\0"
-   /* _mesa_function_pool[17379]: GetDetailTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[17399]: GetDetailTexFuncSGIS (dynamic) */
    "ip\0"
    "glGetDetailTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[17406]: GetCombinerStageParameterfvNV (dynamic) */
+   /* _mesa_function_pool[17426]: GetCombinerStageParameterfvNV (dynamic) */
    "iip\0"
    "glGetCombinerStageParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[17443]: SamplerParameterIiv (will be remapped) */
+   /* _mesa_function_pool[17463]: SamplerParameterIiv (will be remapped) */
    "iip\0"
    "glSamplerParameterIiv\0"
    "\0"
-   /* _mesa_function_pool[17470]: PolygonOffset (offset 319) */
+   /* _mesa_function_pool[17490]: PolygonOffset (offset 319) */
    "ff\0"
    "glPolygonOffset\0"
    "\0"
-   /* _mesa_function_pool[17490]: BindVertexArray (will be remapped) */
+   /* _mesa_function_pool[17510]: BindVertexArray (will be remapped) */
    "i\0"
    "glBindVertexArray\0"
    "\0"
-   /* _mesa_function_pool[17511]: Color4ubVertex2fvSUN (dynamic) */
+   /* _mesa_function_pool[17531]: Color4ubVertex2fvSUN (dynamic) */
    "pp\0"
    "glColor4ubVertex2fvSUN\0"
    "\0"
-   /* _mesa_function_pool[17538]: VertexP3uiv (will be remapped) */
+   /* _mesa_function_pool[17558]: VertexP3uiv (will be remapped) */
    "ip\0"
    "glVertexP3uiv\0"
    "\0"
-   /* _mesa_function_pool[17556]: Rectd (offset 86) */
+   /* _mesa_function_pool[17576]: Rectd (offset 86) */
    "dddd\0"
    "glRectd\0"
    "\0"
-   /* _mesa_function_pool[17570]: TexFilterFuncSGIS (dynamic) */
+   /* _mesa_function_pool[17590]: TexFilterFuncSGIS (dynamic) */
    "iiip\0"
    "glTexFilterFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[17596]: TextureBarrierNV (will be remapped) */
+   /* _mesa_function_pool[17616]: TextureBarrierNV (will be remapped) */
    "\0"
    "glTextureBarrierNV\0"
    "\0"
-   /* _mesa_function_pool[17617]: SamplerParameterfv (will be remapped) */
+   /* _mesa_function_pool[17637]: SamplerParameterfv (will be remapped) */
    "iip\0"
    "glSamplerParameterfv\0"
    "\0"
-   /* _mesa_function_pool[17643]: VertexAttribI4ubvEXT (will be remapped) */
-   "ip\0"
-   "glVertexAttribI4ubvEXT\0"
-   "glVertexAttribI4ubv\0"
+   /* _mesa_function_pool[17663]: ColorMaskIndexedEXT (will be remapped) */
+   "iiiii\0"
+   "glColorMaskIndexedEXT\0"
+   "glColorMaski\0"
    "\0"
-   /* _mesa_function_pool[17690]: GetAttribLocationARB (will be remapped) */
+   /* _mesa_function_pool[17705]: GetAttribLocationARB (will be remapped) */
    "ip\0"
    "glGetAttribLocation\0"
    "glGetAttribLocationARB\0"
    "\0"
-   /* _mesa_function_pool[17737]: RasterPos3i (offset 74) */
+   /* _mesa_function_pool[17752]: RasterPos3i (offset 74) */
    "iii\0"
    "glRasterPos3i\0"
    "\0"
-   /* _mesa_function_pool[17756]: BlendEquationSeparateiARB (will be remapped) */
-   "iii\0"
-   "glBlendEquationSeparateiARB\0"
-   "glBlendEquationSeparateIndexedAMD\0"
-   "\0"
-   /* _mesa_function_pool[17823]: VertexAttrib4ubvARB (will be remapped) */
+   /* _mesa_function_pool[17771]: VertexAttrib4ubvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4ubv\0"
    "glVertexAttrib4ubvARB\0"
    "\0"
-   /* _mesa_function_pool[17868]: DetailTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[17816]: DetailTexFuncSGIS (dynamic) */
    "iip\0"
    "glDetailTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[17893]: Normal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[17841]: Normal3fVertex3fSUN (dynamic) */
    "ffffff\0"
    "glNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[17923]: CopyTexImage2D (offset 324) */
+   /* _mesa_function_pool[17871]: CopyTexImage2D (offset 324) */
    "iiiiiiii\0"
    "glCopyTexImage2D\0"
    "glCopyTexImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[17970]: GetBufferPointervARB (will be remapped) */
+   /* _mesa_function_pool[17918]: GetBufferPointervARB (will be remapped) */
    "iip\0"
    "glGetBufferPointerv\0"
    "glGetBufferPointervARB\0"
    "\0"
-   /* _mesa_function_pool[18018]: ProgramEnvParameter4fARB (will be remapped) */
+   /* _mesa_function_pool[17966]: ProgramEnvParameter4fARB (will be remapped) */
    "iiffff\0"
    "glProgramEnvParameter4fARB\0"
    "glProgramParameter4fNV\0"
    "\0"
-   /* _mesa_function_pool[18076]: Uniform3ivARB (will be remapped) */
+   /* _mesa_function_pool[18024]: Uniform3ivARB (will be remapped) */
    "iip\0"
    "glUniform3iv\0"
    "glUniform3ivARB\0"
    "\0"
-   /* _mesa_function_pool[18110]: Lightfv (offset 160) */
+   /* _mesa_function_pool[18058]: Lightfv (offset 160) */
    "iip\0"
    "glLightfv\0"
    "\0"
-   /* _mesa_function_pool[18125]: PrimitiveRestartIndexNV (will be remapped) */
+   /* _mesa_function_pool[18073]: PrimitiveRestartIndexNV (will be remapped) */
    "i\0"
    "glPrimitiveRestartIndexNV\0"
    "glPrimitiveRestartIndex\0"
    "\0"
-   /* _mesa_function_pool[18178]: ClearDepth (offset 208) */
+   /* _mesa_function_pool[18126]: ClearDepth (offset 208) */
    "d\0"
    "glClearDepth\0"
    "\0"
-   /* _mesa_function_pool[18194]: GetFenceivNV (will be remapped) */
+   /* _mesa_function_pool[18142]: GetFenceivNV (will be remapped) */
    "iip\0"
    "glGetFenceivNV\0"
    "\0"
-   /* _mesa_function_pool[18214]: WindowPos4dvMESA (will be remapped) */
+   /* _mesa_function_pool[18162]: WindowPos4dvMESA (will be remapped) */
    "p\0"
    "glWindowPos4dvMESA\0"
    "\0"
-   /* _mesa_function_pool[18236]: ColorSubTable (offset 346) */
+   /* _mesa_function_pool[18184]: ColorSubTable (offset 346) */
    "iiiiip\0"
    "glColorSubTable\0"
    "glColorSubTableEXT\0"
    "\0"
-   /* _mesa_function_pool[18279]: Color4fv (offset 30) */
+   /* _mesa_function_pool[18227]: Color4fv (offset 30) */
    "p\0"
    "glColor4fv\0"
    "\0"
-   /* _mesa_function_pool[18293]: MultiTexCoord4ivARB (offset 405) */
+   /* _mesa_function_pool[18241]: MultiTexCoord4ivARB (offset 405) */
    "ip\0"
    "glMultiTexCoord4iv\0"
    "glMultiTexCoord4ivARB\0"
    "\0"
-   /* _mesa_function_pool[18338]: GetnMinmaxARB (will be remapped) */
+   /* _mesa_function_pool[18286]: GetnMinmaxARB (will be remapped) */
    "iiiiip\0"
    "glGetnMinmaxARB\0"
    "\0"
-   /* _mesa_function_pool[18362]: ProgramLocalParameters4fvEXT (will be remapped) */
+   /* _mesa_function_pool[18310]: ProgramLocalParameters4fvEXT (will be remapped) */
    "iiip\0"
    "glProgramLocalParameters4fvEXT\0"
    "\0"
-   /* _mesa_function_pool[18399]: ColorPointer (offset 308) */
+   /* _mesa_function_pool[18347]: ColorPointer (offset 308) */
    "iiip\0"
    "glColorPointer\0"
    "\0"
-   /* _mesa_function_pool[18420]: Rects (offset 92) */
+   /* _mesa_function_pool[18368]: Rects (offset 92) */
    "iiii\0"
    "glRects\0"
    "\0"
-   /* _mesa_function_pool[18434]: GetMapAttribParameterfvNV (dynamic) */
+   /* _mesa_function_pool[18382]: GetMapAttribParameterfvNV (dynamic) */
    "iiip\0"
    "glGetMapAttribParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[18468]: CreateShaderProgramEXT (will be remapped) */
+   /* _mesa_function_pool[18416]: CreateShaderProgramEXT (will be remapped) */
    "ip\0"
    "glCreateShaderProgramEXT\0"
    "\0"
-   /* _mesa_function_pool[18497]: ActiveProgramEXT (will be remapped) */
+   /* _mesa_function_pool[18445]: ActiveProgramEXT (will be remapped) */
    "i\0"
    "glActiveProgramEXT\0"
    "\0"
-   /* _mesa_function_pool[18519]: Lightiv (offset 162) */
+   /* _mesa_function_pool[18467]: Lightiv (offset 162) */
    "iip\0"
    "glLightiv\0"
    "\0"
-   /* _mesa_function_pool[18534]: VertexAttrib4sARB (will be remapped) */
+   /* _mesa_function_pool[18482]: VertexAttrib4sARB (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4s\0"
    "glVertexAttrib4sARB\0"
    "\0"
-   /* _mesa_function_pool[18578]: GetQueryObjectuivARB (will be remapped) */
+   /* _mesa_function_pool[18526]: GetQueryObjectuivARB (will be remapped) */
    "iip\0"
    "glGetQueryObjectuiv\0"
    "glGetQueryObjectuivARB\0"
    "\0"
-   /* _mesa_function_pool[18626]: GetTexParameteriv (offset 283) */
+   /* _mesa_function_pool[18574]: GetTexParameteriv (offset 283) */
    "iip\0"
    "glGetTexParameteriv\0"
    "\0"
-   /* _mesa_function_pool[18651]: MapParameterivNV (dynamic) */
+   /* _mesa_function_pool[18599]: MapParameterivNV (dynamic) */
    "iip\0"
    "glMapParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[18675]: GenRenderbuffersEXT (will be remapped) */
+   /* _mesa_function_pool[18623]: GenRenderbuffersEXT (will be remapped) */
    "ip\0"
    "glGenRenderbuffers\0"
    "glGenRenderbuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[18720]: ClearBufferfv (will be remapped) */
+   /* _mesa_function_pool[18668]: ClearBufferfv (will be remapped) */
    "iip\0"
    "glClearBufferfv\0"
    "\0"
-   /* _mesa_function_pool[18741]: VertexAttrib2dvARB (will be remapped) */
+   /* _mesa_function_pool[18689]: VertexAttrib2dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2dv\0"
    "glVertexAttrib2dvARB\0"
    "\0"
-   /* _mesa_function_pool[18784]: EdgeFlagPointerEXT (will be remapped) */
+   /* _mesa_function_pool[18732]: EdgeFlagPointerEXT (will be remapped) */
    "iip\0"
    "glEdgeFlagPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[18810]: VertexAttribs2svNV (will be remapped) */
+   /* _mesa_function_pool[18758]: VertexAttribs2svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2svNV\0"
    "\0"
-   /* _mesa_function_pool[18836]: WeightbvARB (dynamic) */
+   /* _mesa_function_pool[18784]: WeightbvARB (dynamic) */
    "ip\0"
    "glWeightbvARB\0"
    "\0"
-   /* _mesa_function_pool[18854]: VertexAttrib2fvARB (will be remapped) */
+   /* _mesa_function_pool[18802]: VertexAttrib2fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2fv\0"
    "glVertexAttrib2fvARB\0"
    "\0"
-   /* _mesa_function_pool[18897]: GetBufferParameterivARB (will be remapped) */
+   /* _mesa_function_pool[18845]: GetBufferParameterivARB (will be remapped) */
    "iip\0"
    "glGetBufferParameteriv\0"
    "glGetBufferParameterivARB\0"
    "\0"
-   /* _mesa_function_pool[18951]: Rectdv (offset 87) */
+   /* _mesa_function_pool[18899]: Rectdv (offset 87) */
    "pp\0"
    "glRectdv\0"
    "\0"
-   /* _mesa_function_pool[18964]: ListParameteriSGIX (dynamic) */
+   /* _mesa_function_pool[18912]: ListParameteriSGIX (dynamic) */
    "iii\0"
    "glListParameteriSGIX\0"
    "\0"
-   /* _mesa_function_pool[18990]: BlendEquationiARB (will be remapped) */
+   /* _mesa_function_pool[18938]: BlendEquationiARB (will be remapped) */
    "ii\0"
    "glBlendEquationiARB\0"
    "glBlendEquationIndexedAMD\0"
    "\0"
-   /* _mesa_function_pool[19040]: ReplacementCodeuiColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[18988]: ReplacementCodeuiColor4fNormal3fVertex3fSUN (dynamic) */
    "iffffffffff\0"
    "glReplacementCodeuiColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[19099]: InstrumentsBufferSGIX (dynamic) */
+   /* _mesa_function_pool[19047]: InstrumentsBufferSGIX (dynamic) */
    "ip\0"
    "glInstrumentsBufferSGIX\0"
    "\0"
-   /* _mesa_function_pool[19127]: VertexAttrib4NivARB (will be remapped) */
+   /* _mesa_function_pool[19075]: VertexAttrib4NivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Niv\0"
    "glVertexAttrib4NivARB\0"
    "\0"
-   /* _mesa_function_pool[19172]: DrawArraysInstancedARB (will be remapped) */
+   /* _mesa_function_pool[19120]: DrawArraysInstancedARB (will be remapped) */
    "iiii\0"
    "glDrawArraysInstancedARB\0"
    "glDrawArraysInstancedEXT\0"
    "glDrawArraysInstanced\0"
    "\0"
-   /* _mesa_function_pool[19250]: GetAttachedShaders (will be remapped) */
+   /* _mesa_function_pool[19198]: GetAttachedShaders (will be remapped) */
    "iipp\0"
    "glGetAttachedShaders\0"
    "\0"
-   /* _mesa_function_pool[19277]: GenVertexArraysAPPLE (will be remapped) */
+   /* _mesa_function_pool[19225]: GenVertexArraysAPPLE (will be remapped) */
    "ip\0"
    "glGenVertexArraysAPPLE\0"
    "\0"
-   /* _mesa_function_pool[19304]: ClearBufferfi (will be remapped) */
+   /* _mesa_function_pool[19252]: ClearBufferfi (will be remapped) */
    "iifi\0"
    "glClearBufferfi\0"
    "\0"
-   /* _mesa_function_pool[19326]: Materialiv (offset 172) */
+   /* _mesa_function_pool[19274]: Materialiv (offset 172) */
    "iip\0"
    "glMaterialiv\0"
    "\0"
-   /* _mesa_function_pool[19344]: PushClientAttrib (offset 335) */
+   /* _mesa_function_pool[19292]: PushClientAttrib (offset 335) */
    "i\0"
    "glPushClientAttrib\0"
    "\0"
-   /* _mesa_function_pool[19366]: SamplerParameteriv (will be remapped) */
+   /* _mesa_function_pool[19314]: SamplerParameteriv (will be remapped) */
    "iip\0"
    "glSamplerParameteriv\0"
    "\0"
-   /* _mesa_function_pool[19392]: TexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[19340]: TexCoord2fColor4fNormal3fVertex3fvSUN (dynamic) */
    "pppp\0"
    "glTexCoord2fColor4fNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[19438]: WindowPos2iMESA (will be remapped) */
+   /* _mesa_function_pool[19386]: WindowPos2iMESA (will be remapped) */
    "ii\0"
    "glWindowPos2i\0"
    "glWindowPos2iARB\0"
    "glWindowPos2iMESA\0"
    "\0"
-   /* _mesa_function_pool[19491]: SampleMaskSGIS (will be remapped) */
+   /* _mesa_function_pool[19439]: SampleMaskSGIS (will be remapped) */
    "fi\0"
    "glSampleMaskSGIS\0"
    "glSampleMaskEXT\0"
    "\0"
-   /* _mesa_function_pool[19528]: SecondaryColor3fvEXT (will be remapped) */
+   /* _mesa_function_pool[19476]: SecondaryColor3fvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3fv\0"
    "glSecondaryColor3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[19574]: PolygonMode (offset 174) */
+   /* _mesa_function_pool[19522]: PolygonMode (offset 174) */
    "ii\0"
    "glPolygonMode\0"
    "\0"
-   /* _mesa_function_pool[19592]: CompressedTexSubImage1DARB (will be remapped) */
+   /* _mesa_function_pool[19540]: CompressedTexSubImage1DARB (will be remapped) */
    "iiiiiip\0"
    "glCompressedTexSubImage1D\0"
    "glCompressedTexSubImage1DARB\0"
    "\0"
-   /* _mesa_function_pool[19656]: VertexAttribI1iEXT (will be remapped) */
+   /* _mesa_function_pool[19604]: VertexAttribI1iEXT (will be remapped) */
    "ii\0"
    "glVertexAttribI1iEXT\0"
    "glVertexAttribI1i\0"
    "\0"
-   /* _mesa_function_pool[19699]: TexCoord2fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[19647]: TexCoord2fNormal3fVertex3fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord2fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[19741]: GetVertexAttribivNV (will be remapped) */
+   /* _mesa_function_pool[19689]: GetVertexAttribivNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribivNV\0"
    "\0"
-   /* _mesa_function_pool[19768]: GetProgramStringARB (will be remapped) */
+   /* _mesa_function_pool[19716]: GetProgramStringARB (will be remapped) */
    "iip\0"
    "glGetProgramStringARB\0"
    "\0"
-   /* _mesa_function_pool[19795]: GetnUniformdvARB (will be remapped) */
+   /* _mesa_function_pool[19743]: GetnUniformdvARB (will be remapped) */
    "iiip\0"
    "glGetnUniformdvARB\0"
    "\0"
-   /* _mesa_function_pool[19820]: DrawElementsInstancedBaseVertex (will be remapped) */
+   /* _mesa_function_pool[19768]: DrawElementsInstancedBaseVertex (will be remapped) */
    "iiipii\0"
    "glDrawElementsInstancedBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[19862]: VertexAttribIPointerEXT (will be remapped) */
+   /* _mesa_function_pool[19810]: TexBuffer (will be remapped) */
+   "iii\0"
+   "glTexBuffer\0"
+   "\0"
+   /* _mesa_function_pool[19827]: VertexAttribIPointerEXT (will be remapped) */
    "iiiip\0"
    "glVertexAttribIPointerEXT\0"
    "glVertexAttribIPointer\0"
    "\0"
-   /* _mesa_function_pool[19918]: TexBumpParameterfvATI (will be remapped) */
+   /* _mesa_function_pool[19883]: TexBumpParameterfvATI (will be remapped) */
    "ip\0"
    "glTexBumpParameterfvATI\0"
    "\0"
-   /* _mesa_function_pool[19946]: Tangent3ivEXT (dynamic) */
+   /* _mesa_function_pool[19911]: Tangent3ivEXT (dynamic) */
    "p\0"
    "glTangent3ivEXT\0"
    "\0"
-   /* _mesa_function_pool[19965]: CompileShaderARB (will be remapped) */
+   /* _mesa_function_pool[19930]: CompileShaderARB (will be remapped) */
    "i\0"
    "glCompileShader\0"
    "glCompileShaderARB\0"
    "\0"
-   /* _mesa_function_pool[20003]: DeleteShader (will be remapped) */
+   /* _mesa_function_pool[19968]: DeleteShader (will be remapped) */
    "i\0"
    "glDeleteShader\0"
    "\0"
-   /* _mesa_function_pool[20021]: DisableClientState (offset 309) */
+   /* _mesa_function_pool[19986]: DisableClientState (offset 309) */
    "i\0"
    "glDisableClientState\0"
    "\0"
-   /* _mesa_function_pool[20045]: TexGeni (offset 192) */
+   /* _mesa_function_pool[20010]: TexGeni (offset 192) */
    "iii\0"
    "glTexGeni\0"
    "\0"
-   /* _mesa_function_pool[20060]: TexGenf (offset 190) */
+   /* _mesa_function_pool[20025]: TexGenf (offset 190) */
    "iif\0"
    "glTexGenf\0"
    "\0"
-   /* _mesa_function_pool[20075]: Uniform3fARB (will be remapped) */
+   /* _mesa_function_pool[20040]: Uniform3fARB (will be remapped) */
    "ifff\0"
    "glUniform3f\0"
    "glUniform3fARB\0"
    "\0"
-   /* _mesa_function_pool[20108]: TexGend (offset 188) */
+   /* _mesa_function_pool[20073]: TexGend (offset 188) */
    "iid\0"
    "glTexGend\0"
    "\0"
-   /* _mesa_function_pool[20123]: ListParameterfvSGIX (dynamic) */
+   /* _mesa_function_pool[20088]: ListParameterfvSGIX (dynamic) */
    "iip\0"
    "glListParameterfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[20150]: GetPolygonStipple (offset 274) */
+   /* _mesa_function_pool[20115]: GetPolygonStipple (offset 274) */
    "p\0"
    "glGetPolygonStipple\0"
    "\0"
-   /* _mesa_function_pool[20173]: ColorP3ui (will be remapped) */
+   /* _mesa_function_pool[20138]: ColorP3ui (will be remapped) */
    "ii\0"
    "glColorP3ui\0"
    "\0"
-   /* _mesa_function_pool[20189]: Tangent3dvEXT (dynamic) */
+   /* _mesa_function_pool[20154]: Tangent3dvEXT (dynamic) */
    "p\0"
    "glTangent3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[20208]: BindBufferOffsetEXT (will be remapped) */
+   /* _mesa_function_pool[20173]: BindBufferOffsetEXT (will be remapped) */
    "iiii\0"
    "glBindBufferOffsetEXT\0"
    "\0"
-   /* _mesa_function_pool[20236]: WindowPos3sMESA (will be remapped) */
+   /* _mesa_function_pool[20201]: WindowPos3sMESA (will be remapped) */
    "iii\0"
    "glWindowPos3s\0"
    "glWindowPos3sARB\0"
    "glWindowPos3sMESA\0"
    "\0"
-   /* _mesa_function_pool[20290]: VertexAttrib2svNV (will be remapped) */
+   /* _mesa_function_pool[20255]: VertexAttrib2svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib2svNV\0"
    "\0"
-   /* _mesa_function_pool[20314]: DisableIndexedEXT (will be remapped) */
+   /* _mesa_function_pool[20279]: DisableIndexedEXT (will be remapped) */
    "ii\0"
    "glDisableIndexedEXT\0"
    "glDisablei\0"
    "\0"
-   /* _mesa_function_pool[20349]: NormalP3uiv (will be remapped) */
+   /* _mesa_function_pool[20314]: NormalP3uiv (will be remapped) */
    "ip\0"
    "glNormalP3uiv\0"
    "\0"
-   /* _mesa_function_pool[20367]: SecondaryColorP3uiv (will be remapped) */
+   /* _mesa_function_pool[20332]: SecondaryColorP3uiv (will be remapped) */
    "ip\0"
    "glSecondaryColorP3uiv\0"
    "\0"
-   /* _mesa_function_pool[20393]: BindBufferBaseEXT (will be remapped) */
+   /* _mesa_function_pool[20358]: BindBufferBaseEXT (will be remapped) */
    "iii\0"
    "glBindBufferBaseEXT\0"
    "glBindBufferBase\0"
    "\0"
-   /* _mesa_function_pool[20435]: TexCoord2fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[20400]: TexCoord2fVertex3fvSUN (dynamic) */
    "pp\0"
    "glTexCoord2fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[20464]: WindowPos4sMESA (will be remapped) */
+   /* _mesa_function_pool[20429]: WindowPos4sMESA (will be remapped) */
    "iiii\0"
    "glWindowPos4sMESA\0"
    "\0"
-   /* _mesa_function_pool[20488]: GetnPixelMapuivARB (will be remapped) */
+   /* _mesa_function_pool[20453]: GetnPixelMapuivARB (will be remapped) */
    "iip\0"
    "glGetnPixelMapuivARB\0"
    "\0"
-   /* _mesa_function_pool[20514]: VertexAttrib4NuivARB (will be remapped) */
+   /* _mesa_function_pool[20479]: VertexAttrib4NuivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nuiv\0"
    "glVertexAttrib4NuivARB\0"
    "\0"
-   /* _mesa_function_pool[20561]: ClientActiveTextureARB (offset 375) */
+   /* _mesa_function_pool[20526]: ClientActiveTextureARB (offset 375) */
    "i\0"
    "glClientActiveTexture\0"
    "glClientActiveTextureARB\0"
    "\0"
-   /* _mesa_function_pool[20611]: GetSamplerParameterIuiv (will be remapped) */
+   /* _mesa_function_pool[20576]: GetSamplerParameterIuiv (will be remapped) */
    "iip\0"
    "glGetSamplerParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[20642]: ReplacementCodeusvSUN (dynamic) */
+   /* _mesa_function_pool[20607]: ReplacementCodeusvSUN (dynamic) */
    "p\0"
    "glReplacementCodeusvSUN\0"
    "\0"
-   /* _mesa_function_pool[20669]: Uniform4fARB (will be remapped) */
+   /* _mesa_function_pool[20634]: Uniform4fARB (will be remapped) */
    "iffff\0"
    "glUniform4f\0"
    "glUniform4fARB\0"
    "\0"
-   /* _mesa_function_pool[20703]: Color4sv (offset 34) */
+   /* _mesa_function_pool[20668]: Color4sv (offset 34) */
    "p\0"
    "glColor4sv\0"
    "\0"
-   /* _mesa_function_pool[20717]: FlushMappedBufferRange (will be remapped) */
+   /* _mesa_function_pool[20682]: FlushMappedBufferRange (will be remapped) */
    "iii\0"
    "glFlushMappedBufferRange\0"
    "\0"
-   /* _mesa_function_pool[20747]: IsProgramNV (will be remapped) */
+   /* _mesa_function_pool[20712]: IsProgramNV (will be remapped) */
    "i\0"
    "glIsProgramARB\0"
    "glIsProgramNV\0"
    "\0"
-   /* _mesa_function_pool[20779]: FlushMappedBufferRangeAPPLE (will be remapped) */
+   /* _mesa_function_pool[20744]: FlushMappedBufferRangeAPPLE (will be remapped) */
    "iii\0"
    "glFlushMappedBufferRangeAPPLE\0"
    "\0"
-   /* _mesa_function_pool[20814]: PixelZoom (offset 246) */
+   /* _mesa_function_pool[20779]: PixelZoom (offset 246) */
    "ff\0"
    "glPixelZoom\0"
    "\0"
-   /* _mesa_function_pool[20830]: ReplacementCodePointerSUN (dynamic) */
+   /* _mesa_function_pool[20795]: ReplacementCodePointerSUN (dynamic) */
    "iip\0"
    "glReplacementCodePointerSUN\0"
    "\0"
-   /* _mesa_function_pool[20863]: ProgramEnvParameter4dARB (will be remapped) */
+   /* _mesa_function_pool[20828]: ProgramEnvParameter4dARB (will be remapped) */
    "iidddd\0"
    "glProgramEnvParameter4dARB\0"
    "glProgramParameter4dNV\0"
    "\0"
-   /* _mesa_function_pool[20921]: ColorTableParameterfv (offset 340) */
+   /* _mesa_function_pool[20886]: ColorTableParameterfv (offset 340) */
    "iip\0"
    "glColorTableParameterfv\0"
    "glColorTableParameterfvSGI\0"
    "\0"
-   /* _mesa_function_pool[20977]: FragmentLightModelfSGIX (dynamic) */
+   /* _mesa_function_pool[20942]: FragmentLightModelfSGIX (dynamic) */
    "if\0"
    "glFragmentLightModelfSGIX\0"
    "\0"
-   /* _mesa_function_pool[21007]: Binormal3bvEXT (dynamic) */
+   /* _mesa_function_pool[20972]: Binormal3bvEXT (dynamic) */
    "p\0"
    "glBinormal3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[21027]: PixelMapuiv (offset 252) */
+   /* _mesa_function_pool[20992]: PixelMapuiv (offset 252) */
    "iip\0"
    "glPixelMapuiv\0"
    "\0"
-   /* _mesa_function_pool[21046]: Color3dv (offset 12) */
+   /* _mesa_function_pool[21011]: Color3dv (offset 12) */
    "p\0"
    "glColor3dv\0"
    "\0"
-   /* _mesa_function_pool[21060]: IsTexture (offset 330) */
+   /* _mesa_function_pool[21025]: IsTexture (offset 330) */
    "i\0"
    "glIsTexture\0"
    "glIsTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[21090]: GenSamplers (will be remapped) */
+   /* _mesa_function_pool[21055]: GenSamplers (will be remapped) */
    "ip\0"
    "glGenSamplers\0"
    "\0"
-   /* _mesa_function_pool[21108]: VertexAttribP3uiv (will be remapped) */
+   /* _mesa_function_pool[21073]: VertexAttribP3uiv (will be remapped) */
    "iiip\0"
    "glVertexAttribP3uiv\0"
    "\0"
-   /* _mesa_function_pool[21134]: VertexWeightfvEXT (dynamic) */
+   /* _mesa_function_pool[21099]: VertexWeightfvEXT (dynamic) */
    "p\0"
    "glVertexWeightfvEXT\0"
    "\0"
-   /* _mesa_function_pool[21157]: VertexAttrib1dARB (will be remapped) */
+   /* _mesa_function_pool[21122]: VertexAttrib1dARB (will be remapped) */
    "id\0"
    "glVertexAttrib1d\0"
    "glVertexAttrib1dARB\0"
    "\0"
-   /* _mesa_function_pool[21198]: ImageTransformParameterivHP (dynamic) */
+   /* _mesa_function_pool[21163]: ImageTransformParameterivHP (dynamic) */
    "iip\0"
    "glImageTransformParameterivHP\0"
    "\0"
-   /* _mesa_function_pool[21233]: TexCoord4i (offset 122) */
+   /* _mesa_function_pool[21198]: TexCoord4i (offset 122) */
    "iiii\0"
    "glTexCoord4i\0"
    "\0"
-   /* _mesa_function_pool[21252]: DeleteQueriesARB (will be remapped) */
+   /* _mesa_function_pool[21217]: DeleteQueriesARB (will be remapped) */
    "ip\0"
    "glDeleteQueries\0"
    "glDeleteQueriesARB\0"
    "\0"
-   /* _mesa_function_pool[21291]: Color4ubVertex2fSUN (dynamic) */
+   /* _mesa_function_pool[21256]: Color4ubVertex2fSUN (dynamic) */
    "iiiiff\0"
    "glColor4ubVertex2fSUN\0"
    "\0"
-   /* _mesa_function_pool[21321]: FragmentColorMaterialSGIX (dynamic) */
+   /* _mesa_function_pool[21286]: FragmentColorMaterialSGIX (dynamic) */
    "ii\0"
    "glFragmentColorMaterialSGIX\0"
    "\0"
-   /* _mesa_function_pool[21353]: CurrentPaletteMatrixARB (dynamic) */
+   /* _mesa_function_pool[21318]: CurrentPaletteMatrixARB (dynamic) */
    "i\0"
    "glCurrentPaletteMatrixARB\0"
    "\0"
-   /* _mesa_function_pool[21382]: GetMapdv (offset 266) */
+   /* _mesa_function_pool[21347]: GetMapdv (offset 266) */
    "iip\0"
    "glGetMapdv\0"
    "\0"
-   /* _mesa_function_pool[21398]: ObjectPurgeableAPPLE (will be remapped) */
+   /* _mesa_function_pool[21363]: ObjectPurgeableAPPLE (will be remapped) */
    "iii\0"
    "glObjectPurgeableAPPLE\0"
    "\0"
-   /* _mesa_function_pool[21426]: GetStringi (will be remapped) */
+   /* _mesa_function_pool[21391]: GetStringi (will be remapped) */
    "ii\0"
    "glGetStringi\0"
    "\0"
-   /* _mesa_function_pool[21443]: SamplePatternSGIS (will be remapped) */
+   /* _mesa_function_pool[21408]: SamplePatternSGIS (will be remapped) */
    "i\0"
    "glSamplePatternSGIS\0"
    "glSamplePatternEXT\0"
    "\0"
-   /* _mesa_function_pool[21485]: PixelStoref (offset 249) */
+   /* _mesa_function_pool[21450]: PixelStoref (offset 249) */
    "if\0"
    "glPixelStoref\0"
    "\0"
-   /* _mesa_function_pool[21503]: IsQueryARB (will be remapped) */
+   /* _mesa_function_pool[21468]: IsQueryARB (will be remapped) */
    "i\0"
    "glIsQuery\0"
    "glIsQueryARB\0"
    "\0"
-   /* _mesa_function_pool[21529]: ReplacementCodeuiColor4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[21494]: ReplacementCodeuiColor4ubVertex3fSUN (dynamic) */
    "iiiiifff\0"
    "glReplacementCodeuiColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[21578]: PixelStorei (offset 250) */
+   /* _mesa_function_pool[21543]: PixelStorei (offset 250) */
    "ii\0"
    "glPixelStorei\0"
    "\0"
-   /* _mesa_function_pool[21596]: VertexAttrib4usvARB (will be remapped) */
+   /* _mesa_function_pool[21561]: VertexAttrib4usvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4usv\0"
    "glVertexAttrib4usvARB\0"
    "\0"
-   /* _mesa_function_pool[21641]: LinkProgramARB (will be remapped) */
+   /* _mesa_function_pool[21606]: LinkProgramARB (will be remapped) */
    "i\0"
    "glLinkProgram\0"
    "glLinkProgramARB\0"
    "\0"
-   /* _mesa_function_pool[21675]: VertexAttrib2fNV (will be remapped) */
+   /* _mesa_function_pool[21640]: VertexAttrib2fNV (will be remapped) */
    "iff\0"
    "glVertexAttrib2fNV\0"
    "\0"
-   /* _mesa_function_pool[21699]: ShaderSourceARB (will be remapped) */
+   /* _mesa_function_pool[21664]: ShaderSourceARB (will be remapped) */
    "iipp\0"
    "glShaderSource\0"
    "glShaderSourceARB\0"
    "\0"
-   /* _mesa_function_pool[21738]: FragmentMaterialiSGIX (dynamic) */
+   /* _mesa_function_pool[21703]: FragmentMaterialiSGIX (dynamic) */
    "iii\0"
    "glFragmentMaterialiSGIX\0"
    "\0"
-   /* _mesa_function_pool[21767]: EvalCoord2dv (offset 233) */
+   /* _mesa_function_pool[21732]: EvalCoord2dv (offset 233) */
    "p\0"
    "glEvalCoord2dv\0"
    "\0"
-   /* _mesa_function_pool[21785]: VertexAttrib3svARB (will be remapped) */
+   /* _mesa_function_pool[21750]: VertexAttrib3svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3sv\0"
    "glVertexAttrib3svARB\0"
    "\0"
-   /* _mesa_function_pool[21828]: ColorMaterial (offset 151) */
+   /* _mesa_function_pool[21793]: ColorMaterial (offset 151) */
    "ii\0"
    "glColorMaterial\0"
    "\0"
-   /* _mesa_function_pool[21848]: CompressedTexSubImage3DARB (will be remapped) */
+   /* _mesa_function_pool[21813]: CompressedTexSubImage3DARB (will be remapped) */
    "iiiiiiiiiip\0"
    "glCompressedTexSubImage3D\0"
    "glCompressedTexSubImage3DARB\0"
    "\0"
-   /* _mesa_function_pool[21916]: WindowPos2ivMESA (will be remapped) */
+   /* _mesa_function_pool[21881]: WindowPos2ivMESA (will be remapped) */
    "p\0"
    "glWindowPos2iv\0"
    "glWindowPos2ivARB\0"
    "glWindowPos2ivMESA\0"
    "\0"
-   /* _mesa_function_pool[21971]: IsFramebufferEXT (will be remapped) */
+   /* _mesa_function_pool[21936]: IsFramebufferEXT (will be remapped) */
    "i\0"
    "glIsFramebuffer\0"
    "glIsFramebufferEXT\0"
    "\0"
-   /* _mesa_function_pool[22009]: Uniform4ivARB (will be remapped) */
+   /* _mesa_function_pool[21974]: Uniform4ivARB (will be remapped) */
    "iip\0"
    "glUniform4iv\0"
    "glUniform4ivARB\0"
    "\0"
-   /* _mesa_function_pool[22043]: GetVertexAttribdvARB (will be remapped) */
+   /* _mesa_function_pool[22008]: GetVertexAttribdvARB (will be remapped) */
    "iip\0"
    "glGetVertexAttribdv\0"
    "glGetVertexAttribdvARB\0"
    "\0"
-   /* _mesa_function_pool[22091]: TexBumpParameterivATI (will be remapped) */
+   /* _mesa_function_pool[22056]: TexBumpParameterivATI (will be remapped) */
    "ip\0"
    "glTexBumpParameterivATI\0"
    "\0"
-   /* _mesa_function_pool[22119]: GetSeparableFilter (offset 359) */
+   /* _mesa_function_pool[22084]: GetSeparableFilter (offset 359) */
    "iiippp\0"
    "glGetSeparableFilter\0"
    "glGetSeparableFilterEXT\0"
    "\0"
-   /* _mesa_function_pool[22172]: Binormal3dEXT (dynamic) */
+   /* _mesa_function_pool[22137]: Binormal3dEXT (dynamic) */
    "ddd\0"
    "glBinormal3dEXT\0"
    "\0"
-   /* _mesa_function_pool[22193]: SpriteParameteriSGIX (dynamic) */
+   /* _mesa_function_pool[22158]: SpriteParameteriSGIX (dynamic) */
    "ii\0"
    "glSpriteParameteriSGIX\0"
    "\0"
-   /* _mesa_function_pool[22220]: RequestResidentProgramsNV (will be remapped) */
+   /* _mesa_function_pool[22185]: RequestResidentProgramsNV (will be remapped) */
    "ip\0"
    "glRequestResidentProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[22252]: TagSampleBufferSGIX (dynamic) */
+   /* _mesa_function_pool[22217]: TagSampleBufferSGIX (dynamic) */
    "\0"
    "glTagSampleBufferSGIX\0"
    "\0"
-   /* _mesa_function_pool[22276]: TransformFeedbackVaryingsEXT (will be remapped) */
+   /* _mesa_function_pool[22241]: TransformFeedbackVaryingsEXT (will be remapped) */
    "iipi\0"
    "glTransformFeedbackVaryingsEXT\0"
    "glTransformFeedbackVaryings\0"
    "\0"
-   /* _mesa_function_pool[22341]: FeedbackBuffer (offset 194) */
+   /* _mesa_function_pool[22306]: FeedbackBuffer (offset 194) */
    "iip\0"
    "glFeedbackBuffer\0"
    "\0"
-   /* _mesa_function_pool[22363]: RasterPos2iv (offset 67) */
+   /* _mesa_function_pool[22328]: RasterPos2iv (offset 67) */
    "p\0"
    "glRasterPos2iv\0"
    "\0"
-   /* _mesa_function_pool[22381]: TexImage1D (offset 182) */
+   /* _mesa_function_pool[22346]: TexImage1D (offset 182) */
    "iiiiiiip\0"
    "glTexImage1D\0"
    "\0"
-   /* _mesa_function_pool[22404]: ListParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[22369]: ListParameterivSGIX (dynamic) */
    "iip\0"
    "glListParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[22431]: MultiDrawElementsEXT (will be remapped) */
+   /* _mesa_function_pool[22396]: MultiDrawElementsEXT (will be remapped) */
    "ipipi\0"
    "glMultiDrawElements\0"
    "glMultiDrawElementsEXT\0"
    "\0"
-   /* _mesa_function_pool[22481]: Color3s (offset 17) */
+   /* _mesa_function_pool[22446]: Color3s (offset 17) */
    "iii\0"
    "glColor3s\0"
    "\0"
-   /* _mesa_function_pool[22496]: Uniform1ivARB (will be remapped) */
+   /* _mesa_function_pool[22461]: Uniform1ivARB (will be remapped) */
    "iip\0"
    "glUniform1iv\0"
    "glUniform1ivARB\0"
    "\0"
-   /* _mesa_function_pool[22530]: WindowPos2sMESA (will be remapped) */
+   /* _mesa_function_pool[22495]: WindowPos2sMESA (will be remapped) */
    "ii\0"
    "glWindowPos2s\0"
    "glWindowPos2sARB\0"
    "glWindowPos2sMESA\0"
    "\0"
-   /* _mesa_function_pool[22583]: WeightusvARB (dynamic) */
+   /* _mesa_function_pool[22548]: WeightusvARB (dynamic) */
    "ip\0"
    "glWeightusvARB\0"
    "\0"
-   /* _mesa_function_pool[22602]: ColorP4ui (will be remapped) */
+   /* _mesa_function_pool[22567]: ColorP4ui (will be remapped) */
    "ii\0"
    "glColorP4ui\0"
    "\0"
-   /* _mesa_function_pool[22618]: TexCoordPointer (offset 320) */
+   /* _mesa_function_pool[22583]: TexCoordPointer (offset 320) */
    "iiip\0"
    "glTexCoordPointer\0"
    "\0"
-   /* _mesa_function_pool[22642]: FogCoordPointerEXT (will be remapped) */
+   /* _mesa_function_pool[22607]: FogCoordPointerEXT (will be remapped) */
    "iip\0"
    "glFogCoordPointer\0"
    "glFogCoordPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[22686]: GetnSeparableFilterARB (will be remapped) */
+   /* _mesa_function_pool[22651]: GetnSeparableFilterARB (will be remapped) */
    "iiiipipp\0"
    "glGetnSeparableFilterARB\0"
    "\0"
-   /* _mesa_function_pool[22721]: IndexMaterialEXT (dynamic) */
+   /* _mesa_function_pool[22686]: IndexMaterialEXT (dynamic) */
    "ii\0"
    "glIndexMaterialEXT\0"
    "\0"
-   /* _mesa_function_pool[22744]: Color3i (offset 15) */
+   /* _mesa_function_pool[22709]: Color3i (offset 15) */
    "iii\0"
    "glColor3i\0"
    "\0"
-   /* _mesa_function_pool[22759]: FrontFace (offset 157) */
+   /* _mesa_function_pool[22724]: FrontFace (offset 157) */
    "i\0"
    "glFrontFace\0"
    "\0"
-   /* _mesa_function_pool[22774]: EvalCoord2d (offset 232) */
+   /* _mesa_function_pool[22739]: EvalCoord2d (offset 232) */
    "dd\0"
    "glEvalCoord2d\0"
    "\0"
-   /* _mesa_function_pool[22792]: SecondaryColor3ubvEXT (will be remapped) */
+   /* _mesa_function_pool[22757]: SecondaryColor3ubvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3ubv\0"
    "glSecondaryColor3ubvEXT\0"
    "\0"
-   /* _mesa_function_pool[22840]: EvalCoord2f (offset 234) */
+   /* _mesa_function_pool[22805]: EvalCoord2f (offset 234) */
    "ff\0"
    "glEvalCoord2f\0"
    "\0"
-   /* _mesa_function_pool[22858]: VertexAttrib4dvARB (will be remapped) */
+   /* _mesa_function_pool[22823]: VertexAttrib4dvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4dv\0"
    "glVertexAttrib4dvARB\0"
    "\0"
-   /* _mesa_function_pool[22901]: BindAttribLocationARB (will be remapped) */
+   /* _mesa_function_pool[22866]: BindAttribLocationARB (will be remapped) */
    "iip\0"
    "glBindAttribLocation\0"
    "glBindAttribLocationARB\0"
    "\0"
-   /* _mesa_function_pool[22951]: Color3b (offset 9) */
+   /* _mesa_function_pool[22916]: Color3b (offset 9) */
    "iii\0"
    "glColor3b\0"
    "\0"
-   /* _mesa_function_pool[22966]: MultiTexCoord2dARB (offset 384) */
+   /* _mesa_function_pool[22931]: MultiTexCoord2dARB (offset 384) */
    "idd\0"
    "glMultiTexCoord2d\0"
    "glMultiTexCoord2dARB\0"
    "\0"
-   /* _mesa_function_pool[23010]: ExecuteProgramNV (will be remapped) */
+   /* _mesa_function_pool[22975]: ExecuteProgramNV (will be remapped) */
    "iip\0"
    "glExecuteProgramNV\0"
    "\0"
-   /* _mesa_function_pool[23034]: Color3f (offset 13) */
+   /* _mesa_function_pool[22999]: Color3f (offset 13) */
    "fff\0"
    "glColor3f\0"
    "\0"
-   /* _mesa_function_pool[23049]: LightEnviSGIX (dynamic) */
+   /* _mesa_function_pool[23014]: LightEnviSGIX (dynamic) */
    "ii\0"
    "glLightEnviSGIX\0"
    "\0"
-   /* _mesa_function_pool[23069]: Color3d (offset 11) */
+   /* _mesa_function_pool[23034]: Color3d (offset 11) */
    "ddd\0"
    "glColor3d\0"
    "\0"
-   /* _mesa_function_pool[23084]: Normal3dv (offset 55) */
+   /* _mesa_function_pool[23049]: Normal3dv (offset 55) */
    "p\0"
    "glNormal3dv\0"
    "\0"
-   /* _mesa_function_pool[23099]: Lightf (offset 159) */
+   /* _mesa_function_pool[23064]: Lightf (offset 159) */
    "iif\0"
    "glLightf\0"
    "\0"
-   /* _mesa_function_pool[23113]: ReplacementCodeuiSUN (dynamic) */
+   /* _mesa_function_pool[23078]: ReplacementCodeuiSUN (dynamic) */
    "i\0"
    "glReplacementCodeuiSUN\0"
    "\0"
-   /* _mesa_function_pool[23139]: MatrixMode (offset 293) */
+   /* _mesa_function_pool[23104]: MatrixMode (offset 293) */
    "i\0"
    "glMatrixMode\0"
    "\0"
-   /* _mesa_function_pool[23155]: GetPixelMapusv (offset 273) */
+   /* _mesa_function_pool[23120]: GetPixelMapusv (offset 273) */
    "ip\0"
    "glGetPixelMapusv\0"
    "\0"
-   /* _mesa_function_pool[23176]: Lighti (offset 161) */
+   /* _mesa_function_pool[23141]: Lighti (offset 161) */
    "iii\0"
    "glLighti\0"
    "\0"
-   /* _mesa_function_pool[23190]: VertexAttribPointerNV (will be remapped) */
+   /* _mesa_function_pool[23155]: VertexAttribPointerNV (will be remapped) */
    "iiiip\0"
    "glVertexAttribPointerNV\0"
    "\0"
-   /* _mesa_function_pool[23221]: ClearDepthf (will be remapped) */
+   /* _mesa_function_pool[23186]: ClearDepthf (will be remapped) */
    "f\0"
    "glClearDepthf\0"
    "\0"
-   /* _mesa_function_pool[23238]: GetBooleanIndexedvEXT (will be remapped) */
+   /* _mesa_function_pool[23203]: GetBooleanIndexedvEXT (will be remapped) */
    "iip\0"
    "glGetBooleanIndexedvEXT\0"
    "glGetBooleani_v\0"
    "\0"
-   /* _mesa_function_pool[23283]: GetFramebufferAttachmentParameterivEXT (will be remapped) */
+   /* _mesa_function_pool[23248]: GetFramebufferAttachmentParameterivEXT (will be remapped) */
    "iiip\0"
    "glGetFramebufferAttachmentParameteriv\0"
    "glGetFramebufferAttachmentParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[23368]: PixelTransformParameterfEXT (dynamic) */
+   /* _mesa_function_pool[23333]: PixelTransformParameterfEXT (dynamic) */
    "iif\0"
    "glPixelTransformParameterfEXT\0"
    "\0"
-   /* _mesa_function_pool[23403]: MultiTexCoord4dvARB (offset 401) */
+   /* _mesa_function_pool[23368]: MultiTexCoord4dvARB (offset 401) */
    "ip\0"
    "glMultiTexCoord4dv\0"
    "glMultiTexCoord4dvARB\0"
    "\0"
-   /* _mesa_function_pool[23448]: PixelTransformParameteriEXT (dynamic) */
+   /* _mesa_function_pool[23413]: PixelTransformParameteriEXT (dynamic) */
    "iii\0"
    "glPixelTransformParameteriEXT\0"
    "\0"
-   /* _mesa_function_pool[23483]: GetDoublev (offset 260) */
+   /* _mesa_function_pool[23448]: GetDoublev (offset 260) */
    "ip\0"
    "glGetDoublev\0"
    "\0"
-   /* _mesa_function_pool[23500]: MultiTexCoordP4ui (will be remapped) */
+   /* _mesa_function_pool[23465]: MultiTexCoordP4ui (will be remapped) */
    "iii\0"
    "glMultiTexCoordP4ui\0"
    "\0"
-   /* _mesa_function_pool[23525]: MultMatrixd (offset 295) */
+   /* _mesa_function_pool[23490]: TexCoordP2uiv (will be remapped) */
+   "ip\0"
+   "glTexCoordP2uiv\0"
+   "\0"
+   /* _mesa_function_pool[23510]: MultMatrixd (offset 295) */
    "p\0"
    "glMultMatrixd\0"
    "\0"
-   /* _mesa_function_pool[23542]: MultMatrixf (offset 294) */
+   /* _mesa_function_pool[23527]: MultMatrixf (offset 294) */
    "p\0"
    "glMultMatrixf\0"
    "\0"
-   /* _mesa_function_pool[23559]: VertexAttribI4bvEXT (will be remapped) */
+   /* _mesa_function_pool[23544]: VertexAttribI4bvEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4bvEXT\0"
    "glVertexAttribI4bv\0"
    "\0"
-   /* _mesa_function_pool[23604]: TexCoord2fColor4ubVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[23589]: TexCoord2fColor4ubVertex3fSUN (dynamic) */
    "ffiiiifff\0"
    "glTexCoord2fColor4ubVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[23647]: Uniform1iARB (will be remapped) */
+   /* _mesa_function_pool[23632]: Uniform1iARB (will be remapped) */
    "ii\0"
    "glUniform1i\0"
    "glUniform1iARB\0"
    "\0"
-   /* _mesa_function_pool[23678]: GetnMapfvARB (will be remapped) */
+   /* _mesa_function_pool[23663]: GetnMapfvARB (will be remapped) */
    "iiip\0"
    "glGetnMapfvARB\0"
    "\0"
-   /* _mesa_function_pool[23699]: VertexAttribPointerARB (will be remapped) */
+   /* _mesa_function_pool[23684]: VertexAttribPointerARB (will be remapped) */
    "iiiiip\0"
    "glVertexAttribPointer\0"
    "glVertexAttribPointerARB\0"
    "\0"
-   /* _mesa_function_pool[23754]: VertexAttrib3sNV (will be remapped) */
+   /* _mesa_function_pool[23739]: VertexAttrib3sNV (will be remapped) */
    "iiii\0"
    "glVertexAttrib3sNV\0"
    "\0"
-   /* _mesa_function_pool[23779]: SharpenTexFuncSGIS (dynamic) */
+   /* _mesa_function_pool[23764]: SharpenTexFuncSGIS (dynamic) */
    "iip\0"
    "glSharpenTexFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[23805]: MultiTexCoord4fvARB (offset 403) */
+   /* _mesa_function_pool[23790]: MultiTexCoord4fvARB (offset 403) */
    "ip\0"
    "glMultiTexCoord4fv\0"
    "glMultiTexCoord4fvARB\0"
    "\0"
-   /* _mesa_function_pool[23850]: Uniform2uiEXT (will be remapped) */
+   /* _mesa_function_pool[23835]: Uniform2uiEXT (will be remapped) */
    "iii\0"
    "glUniform2uiEXT\0"
    "glUniform2ui\0"
    "\0"
-   /* _mesa_function_pool[23884]: TexCoordP3uiv (will be remapped) */
+   /* _mesa_function_pool[23869]: TexCoordP3uiv (will be remapped) */
    "ip\0"
    "glTexCoordP3uiv\0"
    "\0"
-   /* _mesa_function_pool[23904]: UniformMatrix2x3fv (will be remapped) */
+   /* _mesa_function_pool[23889]: UniformMatrix2x3fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix2x3fv\0"
    "\0"
-   /* _mesa_function_pool[23931]: SamplerParameteri (will be remapped) */
+   /* _mesa_function_pool[23916]: SamplerParameteri (will be remapped) */
    "iii\0"
    "glSamplerParameteri\0"
    "\0"
-   /* _mesa_function_pool[23956]: SamplerParameterf (will be remapped) */
+   /* _mesa_function_pool[23941]: SamplerParameterf (will be remapped) */
    "iif\0"
    "glSamplerParameterf\0"
    "\0"
-   /* _mesa_function_pool[23981]: CombinerParameteriNV (will be remapped) */
+   /* _mesa_function_pool[23966]: CombinerParameteriNV (will be remapped) */
    "ii\0"
    "glCombinerParameteriNV\0"
    "\0"
-   /* _mesa_function_pool[24008]: DeleteAsyncMarkersSGIX (dynamic) */
+   /* _mesa_function_pool[23993]: DeleteAsyncMarkersSGIX (dynamic) */
    "ii\0"
    "glDeleteAsyncMarkersSGIX\0"
    "\0"
-   /* _mesa_function_pool[24037]: ReplacementCodeusSUN (dynamic) */
+   /* _mesa_function_pool[24022]: ReplacementCodeusSUN (dynamic) */
    "i\0"
    "glReplacementCodeusSUN\0"
    "\0"
-   /* _mesa_function_pool[24063]: IsAsyncMarkerSGIX (dynamic) */
+   /* _mesa_function_pool[24048]: IsAsyncMarkerSGIX (dynamic) */
    "i\0"
    "glIsAsyncMarkerSGIX\0"
    "\0"
-   /* _mesa_function_pool[24086]: FrameZoomSGIX (dynamic) */
+   /* _mesa_function_pool[24071]: FrameZoomSGIX (dynamic) */
    "i\0"
    "glFrameZoomSGIX\0"
    "\0"
-   /* _mesa_function_pool[24105]: Normal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[24090]: Normal3fVertex3fvSUN (dynamic) */
    "pp\0"
    "glNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[24132]: GetnUniformuivARB (will be remapped) */
+   /* _mesa_function_pool[24117]: GetnUniformuivARB (will be remapped) */
    "iiip\0"
    "glGetnUniformuivARB\0"
    "\0"
-   /* _mesa_function_pool[24158]: RasterPos4sv (offset 85) */
+   /* _mesa_function_pool[24143]: RasterPos4sv (offset 85) */
    "p\0"
    "glRasterPos4sv\0"
    "\0"
-   /* _mesa_function_pool[24176]: VertexAttrib4NsvARB (will be remapped) */
+   /* _mesa_function_pool[24161]: VertexAttrib4NsvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nsv\0"
    "glVertexAttrib4NsvARB\0"
    "\0"
-   /* _mesa_function_pool[24221]: VertexAttrib3fvARB (will be remapped) */
+   /* _mesa_function_pool[24206]: VertexAttrib3fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib3fv\0"
    "glVertexAttrib3fvARB\0"
    "\0"
-   /* _mesa_function_pool[24264]: ClearColor (offset 206) */
+   /* _mesa_function_pool[24249]: ClearColor (offset 206) */
    "ffff\0"
    "glClearColor\0"
    "\0"
-   /* _mesa_function_pool[24283]: GetSynciv (will be remapped) */
+   /* _mesa_function_pool[24268]: GetSynciv (will be remapped) */
    "iiipp\0"
    "glGetSynciv\0"
    "\0"
-   /* _mesa_function_pool[24302]: ClearColorIiEXT (will be remapped) */
+   /* _mesa_function_pool[24287]: ClearColorIiEXT (will be remapped) */
    "iiii\0"
    "glClearColorIiEXT\0"
    "\0"
-   /* _mesa_function_pool[24326]: DeleteFramebuffersEXT (will be remapped) */
+   /* _mesa_function_pool[24311]: DeleteFramebuffersEXT (will be remapped) */
    "ip\0"
    "glDeleteFramebuffers\0"
    "glDeleteFramebuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[24375]: GlobalAlphaFactorsSUN (dynamic) */
+   /* _mesa_function_pool[24360]: GlobalAlphaFactorsSUN (dynamic) */
    "i\0"
    "glGlobalAlphaFactorsSUN\0"
    "\0"
-   /* _mesa_function_pool[24402]: IsEnabledIndexedEXT (will be remapped) */
+   /* _mesa_function_pool[24387]: IsEnabledIndexedEXT (will be remapped) */
    "ii\0"
    "glIsEnabledIndexedEXT\0"
    "glIsEnabledi\0"
    "\0"
-   /* _mesa_function_pool[24441]: TexEnviv (offset 187) */
+   /* _mesa_function_pool[24426]: TexEnviv (offset 187) */
    "iip\0"
    "glTexEnviv\0"
    "\0"
-   /* _mesa_function_pool[24457]: TexSubImage3D (offset 372) */
+   /* _mesa_function_pool[24442]: TexSubImage3D (offset 372) */
    "iiiiiiiiiip\0"
    "glTexSubImage3D\0"
    "glTexSubImage3DEXT\0"
    "\0"
-   /* _mesa_function_pool[24505]: Tangent3fEXT (dynamic) */
+   /* _mesa_function_pool[24490]: Tangent3fEXT (dynamic) */
    "fff\0"
    "glTangent3fEXT\0"
    "\0"
-   /* _mesa_function_pool[24525]: SecondaryColor3uivEXT (will be remapped) */
+   /* _mesa_function_pool[24510]: SecondaryColor3uivEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3uiv\0"
    "glSecondaryColor3uivEXT\0"
    "\0"
-   /* _mesa_function_pool[24573]: MatrixIndexubvARB (dynamic) */
+   /* _mesa_function_pool[24558]: MatrixIndexubvARB (dynamic) */
    "ip\0"
    "glMatrixIndexubvARB\0"
    "\0"
-   /* _mesa_function_pool[24597]: Color4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[24582]: Color4fNormal3fVertex3fSUN (dynamic) */
    "ffffffffff\0"
    "glColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[24638]: PixelTexGenParameterfSGIS (will be remapped) */
+   /* _mesa_function_pool[24623]: PixelTexGenParameterfSGIS (will be remapped) */
    "if\0"
    "glPixelTexGenParameterfSGIS\0"
    "\0"
-   /* _mesa_function_pool[24670]: CreateShader (will be remapped) */
+   /* _mesa_function_pool[24655]: CreateShader (will be remapped) */
    "i\0"
    "glCreateShader\0"
    "\0"
-   /* _mesa_function_pool[24688]: GetColorTableParameterfv (offset 344) */
+   /* _mesa_function_pool[24673]: GetColorTableParameterfv (offset 344) */
    "iip\0"
    "glGetColorTableParameterfv\0"
    "glGetColorTableParameterfvSGI\0"
    "glGetColorTableParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[24780]: FragmentLightModelfvSGIX (dynamic) */
+   /* _mesa_function_pool[24765]: FragmentLightModelfvSGIX (dynamic) */
    "ip\0"
    "glFragmentLightModelfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[24811]: Bitmap (offset 8) */
+   /* _mesa_function_pool[24796]: Bitmap (offset 8) */
    "iiffffp\0"
    "glBitmap\0"
    "\0"
-   /* _mesa_function_pool[24829]: MultiTexCoord3fARB (offset 394) */
+   /* _mesa_function_pool[24814]: MultiTexCoord3fARB (offset 394) */
    "ifff\0"
    "glMultiTexCoord3f\0"
    "glMultiTexCoord3fARB\0"
    "\0"
-   /* _mesa_function_pool[24874]: GetTexLevelParameterfv (offset 284) */
+   /* _mesa_function_pool[24859]: GetTexLevelParameterfv (offset 284) */
    "iiip\0"
    "glGetTexLevelParameterfv\0"
    "\0"
-   /* _mesa_function_pool[24905]: GetPixelTexGenParameterfvSGIS (will be remapped) */
+   /* _mesa_function_pool[24890]: GetPixelTexGenParameterfvSGIS (will be remapped) */
    "ip\0"
    "glGetPixelTexGenParameterfvSGIS\0"
    "\0"
-   /* _mesa_function_pool[24941]: GenFramebuffersEXT (will be remapped) */
+   /* _mesa_function_pool[24926]: GenFramebuffersEXT (will be remapped) */
    "ip\0"
    "glGenFramebuffers\0"
    "glGenFramebuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[24984]: VertexAttribDivisor (will be remapped) */
+   /* _mesa_function_pool[24969]: VertexAttribDivisor (will be remapped) */
    "ii\0"
    "glVertexAttribDivisor\0"
    "\0"
-   /* _mesa_function_pool[25010]: GetProgramParameterdvNV (will be remapped) */
+   /* _mesa_function_pool[24995]: GetProgramParameterdvNV (will be remapped) */
    "iiip\0"
    "glGetProgramParameterdvNV\0"
    "\0"
-   /* _mesa_function_pool[25042]: Vertex2sv (offset 133) */
+   /* _mesa_function_pool[25027]: Vertex2sv (offset 133) */
    "p\0"
    "glVertex2sv\0"
    "\0"
-   /* _mesa_function_pool[25057]: GetIntegerv (offset 263) */
+   /* _mesa_function_pool[25042]: GetIntegerv (offset 263) */
    "ip\0"
    "glGetIntegerv\0"
    "\0"
-   /* _mesa_function_pool[25075]: IsVertexArrayAPPLE (will be remapped) */
+   /* _mesa_function_pool[25060]: IsVertexArrayAPPLE (will be remapped) */
    "i\0"
    "glIsVertexArray\0"
    "glIsVertexArrayAPPLE\0"
    "\0"
-   /* _mesa_function_pool[25115]: FragmentLightfvSGIX (dynamic) */
+   /* _mesa_function_pool[25100]: FragmentLightfvSGIX (dynamic) */
    "iip\0"
    "glFragmentLightfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[25142]: GetnMapdvARB (will be remapped) */
+   /* _mesa_function_pool[25127]: GetnMapdvARB (will be remapped) */
    "iiip\0"
    "glGetnMapdvARB\0"
    "\0"
-   /* _mesa_function_pool[25163]: DetachShader (will be remapped) */
+   /* _mesa_function_pool[25148]: DetachShader (will be remapped) */
    "ii\0"
    "glDetachShader\0"
    "\0"
-   /* _mesa_function_pool[25182]: VertexAttrib4NubARB (will be remapped) */
+   /* _mesa_function_pool[25167]: VertexAttrib4NubARB (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4Nub\0"
    "glVertexAttrib4NubARB\0"
    "\0"
-   /* _mesa_function_pool[25230]: GetProgramEnvParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[25215]: GetProgramEnvParameterfvARB (will be remapped) */
    "iip\0"
    "glGetProgramEnvParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[25265]: GetTrackMatrixivNV (will be remapped) */
+   /* _mesa_function_pool[25250]: GetTrackMatrixivNV (will be remapped) */
    "iiip\0"
    "glGetTrackMatrixivNV\0"
    "\0"
-   /* _mesa_function_pool[25292]: VertexAttrib3svNV (will be remapped) */
+   /* _mesa_function_pool[25277]: VertexAttrib3svNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3svNV\0"
    "\0"
-   /* _mesa_function_pool[25316]: Uniform4fvARB (will be remapped) */
+   /* _mesa_function_pool[25301]: Uniform4fvARB (will be remapped) */
    "iip\0"
    "glUniform4fv\0"
    "glUniform4fvARB\0"
    "\0"
-   /* _mesa_function_pool[25350]: MultTransposeMatrixfARB (will be remapped) */
+   /* _mesa_function_pool[25335]: MultTransposeMatrixfARB (will be remapped) */
    "p\0"
    "glMultTransposeMatrixf\0"
    "glMultTransposeMatrixfARB\0"
    "\0"
-   /* _mesa_function_pool[25402]: GetTexEnviv (offset 277) */
+   /* _mesa_function_pool[25387]: GetTexEnviv (offset 277) */
    "iip\0"
    "glGetTexEnviv\0"
    "\0"
-   /* _mesa_function_pool[25421]: ColorFragmentOp1ATI (will be remapped) */
+   /* _mesa_function_pool[25406]: ColorFragmentOp1ATI (will be remapped) */
    "iiiiiii\0"
    "glColorFragmentOp1ATI\0"
    "\0"
-   /* _mesa_function_pool[25452]: GetUniformfvARB (will be remapped) */
+   /* _mesa_function_pool[25437]: GetUniformfvARB (will be remapped) */
    "iip\0"
    "glGetUniformfv\0"
    "glGetUniformfvARB\0"
    "\0"
-   /* _mesa_function_pool[25490]: EGLImageTargetRenderbufferStorageOES (will be remapped) */
+   /* _mesa_function_pool[25475]: EGLImageTargetRenderbufferStorageOES (will be remapped) */
    "ip\0"
    "glEGLImageTargetRenderbufferStorageOES\0"
    "\0"
-   /* _mesa_function_pool[25533]: VertexAttribI2ivEXT (will be remapped) */
+   /* _mesa_function_pool[25518]: VertexAttribI2ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI2ivEXT\0"
    "glVertexAttribI2iv\0"
    "\0"
-   /* _mesa_function_pool[25578]: PopClientAttrib (offset 334) */
+   /* _mesa_function_pool[25563]: PopClientAttrib (offset 334) */
    "\0"
    "glPopClientAttrib\0"
    "\0"
-   /* _mesa_function_pool[25598]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[25583]: ReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN (dynamic) */
    "iffffffffffff\0"
    "glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[25669]: DetachObjectARB (will be remapped) */
+   /* _mesa_function_pool[25654]: DetachObjectARB (will be remapped) */
    "ii\0"
    "glDetachObjectARB\0"
    "\0"
-   /* _mesa_function_pool[25691]: VertexBlendARB (dynamic) */
+   /* _mesa_function_pool[25676]: VertexBlendARB (dynamic) */
    "i\0"
    "glVertexBlendARB\0"
    "\0"
-   /* _mesa_function_pool[25711]: WindowPos3iMESA (will be remapped) */
+   /* _mesa_function_pool[25696]: WindowPos3iMESA (will be remapped) */
    "iii\0"
    "glWindowPos3i\0"
    "glWindowPos3iARB\0"
    "glWindowPos3iMESA\0"
    "\0"
-   /* _mesa_function_pool[25765]: SeparableFilter2D (offset 360) */
+   /* _mesa_function_pool[25750]: SeparableFilter2D (offset 360) */
    "iiiiiipp\0"
    "glSeparableFilter2D\0"
    "glSeparableFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[25818]: ProgramParameteriARB (will be remapped) */
+   /* _mesa_function_pool[25803]: ProgramParameteriARB (will be remapped) */
    "iii\0"
    "glProgramParameteriARB\0"
    "\0"
-   /* _mesa_function_pool[25846]: Map1d (offset 220) */
+   /* _mesa_function_pool[25831]: Map1d (offset 220) */
    "iddiip\0"
    "glMap1d\0"
    "\0"
-   /* _mesa_function_pool[25862]: Map1f (offset 221) */
+   /* _mesa_function_pool[25847]: Map1f (offset 221) */
    "iffiip\0"
    "glMap1f\0"
    "\0"
-   /* _mesa_function_pool[25878]: CompressedTexImage2DARB (will be remapped) */
+   /* _mesa_function_pool[25863]: CompressedTexImage2DARB (will be remapped) */
    "iiiiiiip\0"
    "glCompressedTexImage2D\0"
    "glCompressedTexImage2DARB\0"
    "\0"
-   /* _mesa_function_pool[25937]: ArrayElement (offset 306) */
+   /* _mesa_function_pool[25922]: ArrayElement (offset 306) */
    "i\0"
    "glArrayElement\0"
    "glArrayElementEXT\0"
    "\0"
-   /* _mesa_function_pool[25973]: TexImage2D (offset 183) */
+   /* _mesa_function_pool[25958]: TexImage2D (offset 183) */
    "iiiiiiiip\0"
    "glTexImage2D\0"
    "\0"
-   /* _mesa_function_pool[25997]: DepthBoundsEXT (will be remapped) */
+   /* _mesa_function_pool[25982]: DepthBoundsEXT (will be remapped) */
    "dd\0"
    "glDepthBoundsEXT\0"
    "\0"
-   /* _mesa_function_pool[26018]: ProgramParameters4fvNV (will be remapped) */
+   /* _mesa_function_pool[26003]: ProgramParameters4fvNV (will be remapped) */
    "iiip\0"
    "glProgramParameters4fvNV\0"
    "\0"
-   /* _mesa_function_pool[26049]: DeformationMap3fSGIX (dynamic) */
+   /* _mesa_function_pool[26034]: DeformationMap3fSGIX (dynamic) */
    "iffiiffiiffiip\0"
    "glDeformationMap3fSGIX\0"
    "\0"
-   /* _mesa_function_pool[26088]: GetProgramivNV (will be remapped) */
+   /* _mesa_function_pool[26073]: GetProgramivNV (will be remapped) */
    "iip\0"
    "glGetProgramivNV\0"
    "\0"
-   /* _mesa_function_pool[26110]: GetFragDataLocationEXT (will be remapped) */
+   /* _mesa_function_pool[26095]: GetFragDataLocationEXT (will be remapped) */
    "ip\0"
    "glGetFragDataLocationEXT\0"
    "glGetFragDataLocation\0"
    "\0"
-   /* _mesa_function_pool[26161]: GetMinmaxParameteriv (offset 366) */
+   /* _mesa_function_pool[26146]: GetMinmaxParameteriv (offset 366) */
    "iip\0"
    "glGetMinmaxParameteriv\0"
    "glGetMinmaxParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[26215]: PixelTransferf (offset 247) */
+   /* _mesa_function_pool[26200]: PixelTransferf (offset 247) */
    "if\0"
    "glPixelTransferf\0"
    "\0"
-   /* _mesa_function_pool[26236]: CopyTexImage1D (offset 323) */
+   /* _mesa_function_pool[26221]: CopyTexImage1D (offset 323) */
    "iiiiiii\0"
    "glCopyTexImage1D\0"
    "glCopyTexImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[26282]: PushMatrix (offset 298) */
+   /* _mesa_function_pool[26267]: PushMatrix (offset 298) */
    "\0"
    "glPushMatrix\0"
    "\0"
-   /* _mesa_function_pool[26297]: Fogiv (offset 156) */
+   /* _mesa_function_pool[26282]: Fogiv (offset 156) */
    "ip\0"
    "glFogiv\0"
    "\0"
-   /* _mesa_function_pool[26309]: TexCoord1dv (offset 95) */
+   /* _mesa_function_pool[26294]: TexCoord1dv (offset 95) */
    "p\0"
    "glTexCoord1dv\0"
    "\0"
-   /* _mesa_function_pool[26326]: AlphaFragmentOp3ATI (will be remapped) */
+   /* _mesa_function_pool[26311]: AlphaFragmentOp3ATI (will be remapped) */
    "iiiiiiiiiiii\0"
    "glAlphaFragmentOp3ATI\0"
    "\0"
-   /* _mesa_function_pool[26362]: PixelTransferi (offset 248) */
+   /* _mesa_function_pool[26347]: PixelTransferi (offset 248) */
    "ii\0"
    "glPixelTransferi\0"
    "\0"
-   /* _mesa_function_pool[26383]: GetnColorTableARB (will be remapped) */
+   /* _mesa_function_pool[26368]: GetnColorTableARB (will be remapped) */
    "iiiip\0"
    "glGetnColorTableARB\0"
    "\0"
-   /* _mesa_function_pool[26410]: VertexAttrib3fvNV (will be remapped) */
+   /* _mesa_function_pool[26395]: VertexAttrib3fvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3fvNV\0"
    "\0"
-   /* _mesa_function_pool[26434]: Rotatef (offset 300) */
+   /* _mesa_function_pool[26419]: Rotatef (offset 300) */
    "ffff\0"
    "glRotatef\0"
    "\0"
-   /* _mesa_function_pool[26450]: GetFinalCombinerInputParameterivNV (will be remapped) */
+   /* _mesa_function_pool[26435]: GetFinalCombinerInputParameterivNV (will be remapped) */
    "iip\0"
    "glGetFinalCombinerInputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[26492]: Vertex3i (offset 138) */
+   /* _mesa_function_pool[26477]: Vertex3i (offset 138) */
    "iii\0"
    "glVertex3i\0"
    "\0"
-   /* _mesa_function_pool[26508]: SecondaryColorP3ui (will be remapped) */
+   /* _mesa_function_pool[26493]: SecondaryColorP3ui (will be remapped) */
    "ii\0"
    "glSecondaryColorP3ui\0"
    "\0"
-   /* _mesa_function_pool[26533]: Vertex3f (offset 136) */
+   /* _mesa_function_pool[26518]: Vertex3f (offset 136) */
    "fff\0"
    "glVertex3f\0"
    "\0"
-   /* _mesa_function_pool[26549]: Clear (offset 203) */
+   /* _mesa_function_pool[26534]: Clear (offset 203) */
    "i\0"
    "glClear\0"
    "\0"
-   /* _mesa_function_pool[26560]: Vertex3d (offset 134) */
+   /* _mesa_function_pool[26545]: Vertex3d (offset 134) */
    "ddd\0"
    "glVertex3d\0"
    "\0"
-   /* _mesa_function_pool[26576]: GetMapParameterivNV (dynamic) */
+   /* _mesa_function_pool[26561]: GetMapParameterivNV (dynamic) */
    "iip\0"
    "glGetMapParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[26603]: Uniform4iARB (will be remapped) */
+   /* _mesa_function_pool[26588]: Uniform4iARB (will be remapped) */
    "iiiii\0"
    "glUniform4i\0"
    "glUniform4iARB\0"
    "\0"
-   /* _mesa_function_pool[26637]: ReadBuffer (offset 254) */
+   /* _mesa_function_pool[26622]: ReadBuffer (offset 254) */
    "i\0"
    "glReadBuffer\0"
    "\0"
-   /* _mesa_function_pool[26653]: ConvolutionParameteri (offset 352) */
+   /* _mesa_function_pool[26638]: ConvolutionParameteri (offset 352) */
    "iii\0"
    "glConvolutionParameteri\0"
    "glConvolutionParameteriEXT\0"
    "\0"
-   /* _mesa_function_pool[26709]: Ortho (offset 296) */
+   /* _mesa_function_pool[26694]: Ortho (offset 296) */
    "dddddd\0"
    "glOrtho\0"
    "\0"
-   /* _mesa_function_pool[26725]: Binormal3sEXT (dynamic) */
+   /* _mesa_function_pool[26710]: Binormal3sEXT (dynamic) */
    "iii\0"
    "glBinormal3sEXT\0"
    "\0"
-   /* _mesa_function_pool[26746]: ListBase (offset 6) */
+   /* _mesa_function_pool[26731]: ListBase (offset 6) */
    "i\0"
    "glListBase\0"
    "\0"
-   /* _mesa_function_pool[26760]: VertexAttribI3ivEXT (will be remapped) */
+   /* _mesa_function_pool[26745]: VertexAttribI3ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI3ivEXT\0"
    "glVertexAttribI3iv\0"
    "\0"
-   /* _mesa_function_pool[26805]: MultiTexCoordP1ui (will be remapped) */
+   /* _mesa_function_pool[26790]: MultiTexCoordP1ui (will be remapped) */
    "iii\0"
    "glMultiTexCoordP1ui\0"
    "\0"
-   /* _mesa_function_pool[26830]: Vertex3s (offset 140) */
+   /* _mesa_function_pool[26815]: Vertex3s (offset 140) */
    "iii\0"
    "glVertex3s\0"
    "\0"
-   /* _mesa_function_pool[26846]: ConvolutionParameterf (offset 350) */
+   /* _mesa_function_pool[26831]: ConvolutionParameterf (offset 350) */
    "iif\0"
    "glConvolutionParameterf\0"
    "glConvolutionParameterfEXT\0"
    "\0"
-   /* _mesa_function_pool[26902]: GetColorTableParameteriv (offset 345) */
+   /* _mesa_function_pool[26887]: GetColorTableParameteriv (offset 345) */
    "iip\0"
    "glGetColorTableParameteriv\0"
    "glGetColorTableParameterivSGI\0"
    "glGetColorTableParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[26994]: ProgramEnvParameter4dvARB (will be remapped) */
+   /* _mesa_function_pool[26979]: ProgramEnvParameter4dvARB (will be remapped) */
    "iip\0"
    "glProgramEnvParameter4dvARB\0"
    "glProgramParameter4dvNV\0"
    "\0"
-   /* _mesa_function_pool[27051]: ShadeModel (offset 177) */
+   /* _mesa_function_pool[27036]: ShadeModel (offset 177) */
    "i\0"
    "glShadeModel\0"
    "\0"
-   /* _mesa_function_pool[27067]: VertexAttribs2fvNV (will be remapped) */
+   /* _mesa_function_pool[27052]: VertexAttribs2fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs2fvNV\0"
    "\0"
-   /* _mesa_function_pool[27093]: Rectiv (offset 91) */
+   /* _mesa_function_pool[27078]: Rectiv (offset 91) */
    "pp\0"
    "glRectiv\0"
    "\0"
-   /* _mesa_function_pool[27106]: UseProgramObjectARB (will be remapped) */
+   /* _mesa_function_pool[27091]: UseProgramObjectARB (will be remapped) */
    "i\0"
    "glUseProgram\0"
    "glUseProgramObjectARB\0"
    "\0"
-   /* _mesa_function_pool[27144]: GetMapParameterfvNV (dynamic) */
+   /* _mesa_function_pool[27129]: GetMapParameterfvNV (dynamic) */
    "iip\0"
    "glGetMapParameterfvNV\0"
    "\0"
-   /* _mesa_function_pool[27171]: EndConditionalRenderNV (will be remapped) */
+   /* _mesa_function_pool[27156]: EndConditionalRenderNV (will be remapped) */
    "\0"
    "glEndConditionalRenderNV\0"
    "glEndConditionalRender\0"
    "\0"
-   /* _mesa_function_pool[27221]: PassTexCoordATI (will be remapped) */
+   /* _mesa_function_pool[27206]: PassTexCoordATI (will be remapped) */
    "iii\0"
    "glPassTexCoordATI\0"
    "\0"
-   /* _mesa_function_pool[27244]: DeleteProgram (will be remapped) */
+   /* _mesa_function_pool[27229]: DeleteProgram (will be remapped) */
    "i\0"
    "glDeleteProgram\0"
    "\0"
-   /* _mesa_function_pool[27263]: GetSamplerParameteriv (will be remapped) */
+   /* _mesa_function_pool[27248]: GetSamplerParameteriv (will be remapped) */
    "iip\0"
    "glGetSamplerParameteriv\0"
    "\0"
-   /* _mesa_function_pool[27292]: Tangent3dEXT (dynamic) */
+   /* _mesa_function_pool[27277]: Tangent3dEXT (dynamic) */
    "ddd\0"
    "glTangent3dEXT\0"
    "\0"
-   /* _mesa_function_pool[27312]: SecondaryColor3dvEXT (will be remapped) */
+   /* _mesa_function_pool[27297]: SecondaryColor3dvEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3dv\0"
    "glSecondaryColor3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[27358]: AlphaFragmentOp2ATI (will be remapped) */
+   /* _mesa_function_pool[27343]: AlphaFragmentOp2ATI (will be remapped) */
    "iiiiiiiii\0"
    "glAlphaFragmentOp2ATI\0"
    "\0"
-   /* _mesa_function_pool[27391]: Vertex2fv (offset 129) */
+   /* _mesa_function_pool[27376]: Vertex2fv (offset 129) */
    "p\0"
    "glVertex2fv\0"
    "\0"
-   /* _mesa_function_pool[27406]: MultiDrawArraysEXT (will be remapped) */
+   /* _mesa_function_pool[27391]: MultiDrawArraysEXT (will be remapped) */
    "ippi\0"
    "glMultiDrawArrays\0"
    "glMultiDrawArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[27451]: BindRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[27436]: BindRenderbufferEXT (will be remapped) */
    "ii\0"
    "glBindRenderbuffer\0"
    "glBindRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[27496]: MultiTexCoord4dARB (offset 400) */
+   /* _mesa_function_pool[27481]: MultiTexCoord4dARB (offset 400) */
    "idddd\0"
    "glMultiTexCoord4d\0"
    "glMultiTexCoord4dARB\0"
    "\0"
-   /* _mesa_function_pool[27542]: FramebufferTextureFaceARB (will be remapped) */
+   /* _mesa_function_pool[27527]: FramebufferTextureFaceARB (will be remapped) */
    "iiiii\0"
    "glFramebufferTextureFaceARB\0"
    "\0"
-   /* _mesa_function_pool[27577]: Vertex3sv (offset 141) */
+   /* _mesa_function_pool[27562]: Vertex3sv (offset 141) */
    "p\0"
    "glVertex3sv\0"
    "\0"
-   /* _mesa_function_pool[27592]: SecondaryColor3usEXT (will be remapped) */
+   /* _mesa_function_pool[27577]: SecondaryColor3usEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3us\0"
    "glSecondaryColor3usEXT\0"
    "\0"
-   /* _mesa_function_pool[27640]: ProgramLocalParameter4fvARB (will be remapped) */
+   /* _mesa_function_pool[27625]: ProgramLocalParameter4fvARB (will be remapped) */
    "iip\0"
    "glProgramLocalParameter4fvARB\0"
    "\0"
-   /* _mesa_function_pool[27675]: DeleteProgramsNV (will be remapped) */
+   /* _mesa_function_pool[27660]: DeleteProgramsNV (will be remapped) */
    "ip\0"
    "glDeleteProgramsARB\0"
    "glDeleteProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[27718]: EvalMesh1 (offset 236) */
+   /* _mesa_function_pool[27703]: EvalMesh1 (offset 236) */
    "iii\0"
    "glEvalMesh1\0"
    "\0"
-   /* _mesa_function_pool[27735]: PauseTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[27720]: PauseTransformFeedback (will be remapped) */
    "\0"
    "glPauseTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[27762]: MultiTexCoord1sARB (offset 382) */
+   /* _mesa_function_pool[27747]: MultiTexCoord1sARB (offset 382) */
    "ii\0"
    "glMultiTexCoord1s\0"
    "glMultiTexCoord1sARB\0"
    "\0"
-   /* _mesa_function_pool[27805]: ReplacementCodeuiColor3fVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[27790]: ReplacementCodeuiColor3fVertex3fSUN (dynamic) */
    "iffffff\0"
    "glReplacementCodeuiColor3fVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[27852]: GetVertexAttribPointervNV (will be remapped) */
+   /* _mesa_function_pool[27837]: GetVertexAttribPointervNV (will be remapped) */
    "iip\0"
    "glGetVertexAttribPointerv\0"
    "glGetVertexAttribPointervARB\0"
    "glGetVertexAttribPointervNV\0"
    "\0"
-   /* _mesa_function_pool[27940]: VertexAttribs1fvNV (will be remapped) */
+   /* _mesa_function_pool[27925]: VertexAttribs1fvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1fvNV\0"
    "\0"
-   /* _mesa_function_pool[27966]: MultiTexCoord1dvARB (offset 377) */
+   /* _mesa_function_pool[27951]: MultiTexCoord1dvARB (offset 377) */
    "ip\0"
    "glMultiTexCoord1dv\0"
    "glMultiTexCoord1dvARB\0"
    "\0"
-   /* _mesa_function_pool[28011]: Uniform2iARB (will be remapped) */
+   /* _mesa_function_pool[27996]: Uniform2iARB (will be remapped) */
    "iii\0"
    "glUniform2i\0"
    "glUniform2iARB\0"
    "\0"
-   /* _mesa_function_pool[28043]: Vertex2iv (offset 131) */
+   /* _mesa_function_pool[28028]: Vertex2iv (offset 131) */
    "p\0"
    "glVertex2iv\0"
    "\0"
-   /* _mesa_function_pool[28058]: GetProgramStringNV (will be remapped) */
+   /* _mesa_function_pool[28043]: GetProgramStringNV (will be remapped) */
    "iip\0"
    "glGetProgramStringNV\0"
    "\0"
-   /* _mesa_function_pool[28084]: ColorPointerEXT (will be remapped) */
+   /* _mesa_function_pool[28069]: ColorPointerEXT (will be remapped) */
    "iiiip\0"
    "glColorPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[28109]: LineWidth (offset 168) */
+   /* _mesa_function_pool[28094]: LineWidth (offset 168) */
    "f\0"
    "glLineWidth\0"
    "\0"
-   /* _mesa_function_pool[28124]: MapBufferARB (will be remapped) */
+   /* _mesa_function_pool[28109]: Tangent3svEXT (dynamic) */
+   "p\0"
+   "glTangent3svEXT\0"
+   "\0"
+   /* _mesa_function_pool[28128]: MapBufferARB (will be remapped) */
    "ii\0"
    "glMapBuffer\0"
    "glMapBufferARB\0"
    "\0"
-   /* _mesa_function_pool[28155]: MultiDrawElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[28159]: MultiDrawElementsBaseVertex (will be remapped) */
    "ipipip\0"
    "glMultiDrawElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[28193]: TexParameterIuivEXT (will be remapped) */
+   /* _mesa_function_pool[28197]: TexParameterIuivEXT (will be remapped) */
    "iip\0"
    "glTexParameterIuivEXT\0"
    "glTexParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[28239]: Binormal3svEXT (dynamic) */
+   /* _mesa_function_pool[28243]: Binormal3svEXT (dynamic) */
    "p\0"
    "glBinormal3svEXT\0"
    "\0"
-   /* _mesa_function_pool[28259]: ApplyTextureEXT (dynamic) */
+   /* _mesa_function_pool[28263]: ApplyTextureEXT (dynamic) */
    "i\0"
    "glApplyTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[28280]: GetBufferParameteri64v (will be remapped) */
+   /* _mesa_function_pool[28284]: GetBufferParameteri64v (will be remapped) */
    "iip\0"
    "glGetBufferParameteri64v\0"
    "\0"
-   /* _mesa_function_pool[28310]: TexGendv (offset 189) */
+   /* _mesa_function_pool[28314]: TexGendv (offset 189) */
    "iip\0"
    "glTexGendv\0"
    "\0"
-   /* _mesa_function_pool[28326]: VertexAttribI3iEXT (will be remapped) */
+   /* _mesa_function_pool[28330]: VertexAttribI3iEXT (will be remapped) */
    "iiii\0"
    "glVertexAttribI3iEXT\0"
    "glVertexAttribI3i\0"
    "\0"
-   /* _mesa_function_pool[28371]: EnableIndexedEXT (will be remapped) */
+   /* _mesa_function_pool[28375]: EnableIndexedEXT (will be remapped) */
    "ii\0"
    "glEnableIndexedEXT\0"
    "glEnablei\0"
    "\0"
-   /* _mesa_function_pool[28404]: TextureMaterialEXT (dynamic) */
+   /* _mesa_function_pool[28408]: TextureMaterialEXT (dynamic) */
    "ii\0"
    "glTextureMaterialEXT\0"
    "\0"
-   /* _mesa_function_pool[28429]: TextureLightEXT (dynamic) */
+   /* _mesa_function_pool[28433]: TextureLightEXT (dynamic) */
    "i\0"
    "glTextureLightEXT\0"
    "\0"
-   /* _mesa_function_pool[28450]: ResetMinmax (offset 370) */
+   /* _mesa_function_pool[28454]: ResetMinmax (offset 370) */
    "i\0"
    "glResetMinmax\0"
    "glResetMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[28484]: SpriteParameterfSGIX (dynamic) */
+   /* _mesa_function_pool[28488]: SpriteParameterfSGIX (dynamic) */
    "if\0"
    "glSpriteParameterfSGIX\0"
    "\0"
-   /* _mesa_function_pool[28511]: EnableClientState (offset 313) */
+   /* _mesa_function_pool[28515]: EnableClientState (offset 313) */
    "i\0"
    "glEnableClientState\0"
    "\0"
-   /* _mesa_function_pool[28534]: VertexAttrib4sNV (will be remapped) */
+   /* _mesa_function_pool[28538]: VertexAttrib4sNV (will be remapped) */
    "iiiii\0"
    "glVertexAttrib4sNV\0"
    "\0"
-   /* _mesa_function_pool[28560]: GetConvolutionParameterfv (offset 357) */
+   /* _mesa_function_pool[28564]: GetConvolutionParameterfv (offset 357) */
    "iip\0"
    "glGetConvolutionParameterfv\0"
    "glGetConvolutionParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[28624]: VertexAttribs4dvNV (will be remapped) */
+   /* _mesa_function_pool[28628]: VertexAttribs4dvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4dvNV\0"
    "\0"
-   /* _mesa_function_pool[28650]: VertexAttrib4dARB (will be remapped) */
+   /* _mesa_function_pool[28654]: MultiModeDrawArraysIBM (will be remapped) */
+   "pppii\0"
+   "glMultiModeDrawArraysIBM\0"
+   "\0"
+   /* _mesa_function_pool[28686]: VertexAttrib4dARB (will be remapped) */
    "idddd\0"
    "glVertexAttrib4d\0"
    "glVertexAttrib4dARB\0"
    "\0"
-   /* _mesa_function_pool[28694]: GetTexBumpParameterfvATI (will be remapped) */
+   /* _mesa_function_pool[28730]: GetTexBumpParameterfvATI (will be remapped) */
    "ip\0"
    "glGetTexBumpParameterfvATI\0"
    "\0"
-   /* _mesa_function_pool[28725]: ProgramNamedParameter4dNV (will be remapped) */
+   /* _mesa_function_pool[28761]: ProgramNamedParameter4dNV (will be remapped) */
    "iipdddd\0"
    "glProgramNamedParameter4dNV\0"
    "\0"
-   /* _mesa_function_pool[28762]: GetMaterialfv (offset 269) */
+   /* _mesa_function_pool[28798]: GetMaterialfv (offset 269) */
    "iip\0"
    "glGetMaterialfv\0"
    "\0"
-   /* _mesa_function_pool[28783]: VertexWeightfEXT (dynamic) */
+   /* _mesa_function_pool[28819]: VertexWeightfEXT (dynamic) */
    "f\0"
    "glVertexWeightfEXT\0"
    "\0"
-   /* _mesa_function_pool[28805]: SetFragmentShaderConstantATI (will be remapped) */
+   /* _mesa_function_pool[28841]: SetFragmentShaderConstantATI (will be remapped) */
    "ip\0"
    "glSetFragmentShaderConstantATI\0"
    "\0"
-   /* _mesa_function_pool[28840]: Binormal3fEXT (dynamic) */
+   /* _mesa_function_pool[28876]: Binormal3fEXT (dynamic) */
    "fff\0"
    "glBinormal3fEXT\0"
    "\0"
-   /* _mesa_function_pool[28861]: CallList (offset 2) */
+   /* _mesa_function_pool[28897]: CallList (offset 2) */
    "i\0"
    "glCallList\0"
    "\0"
-   /* _mesa_function_pool[28875]: Materialfv (offset 170) */
+   /* _mesa_function_pool[28911]: Materialfv (offset 170) */
    "iip\0"
    "glMaterialfv\0"
    "\0"
-   /* _mesa_function_pool[28893]: TexCoord3fv (offset 113) */
+   /* _mesa_function_pool[28929]: TexCoord3fv (offset 113) */
    "p\0"
    "glTexCoord3fv\0"
    "\0"
-   /* _mesa_function_pool[28910]: FogCoordfvEXT (will be remapped) */
+   /* _mesa_function_pool[28946]: FogCoordfvEXT (will be remapped) */
    "p\0"
    "glFogCoordfv\0"
    "glFogCoordfvEXT\0"
    "\0"
-   /* _mesa_function_pool[28942]: MultiTexCoord1ivARB (offset 381) */
+   /* _mesa_function_pool[28978]: MultiTexCoord1ivARB (offset 381) */
    "ip\0"
    "glMultiTexCoord1iv\0"
    "glMultiTexCoord1ivARB\0"
    "\0"
-   /* _mesa_function_pool[28987]: SecondaryColor3ubEXT (will be remapped) */
+   /* _mesa_function_pool[29023]: SecondaryColor3ubEXT (will be remapped) */
    "iii\0"
    "glSecondaryColor3ub\0"
    "glSecondaryColor3ubEXT\0"
    "\0"
-   /* _mesa_function_pool[29035]: MultiTexCoord2ivARB (offset 389) */
+   /* _mesa_function_pool[29071]: MultiTexCoord2ivARB (offset 389) */
    "ip\0"
    "glMultiTexCoord2iv\0"
    "glMultiTexCoord2ivARB\0"
    "\0"
-   /* _mesa_function_pool[29080]: FogFuncSGIS (dynamic) */
+   /* _mesa_function_pool[29116]: FogFuncSGIS (dynamic) */
    "ip\0"
    "glFogFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[29098]: CopyTexSubImage2D (offset 326) */
+   /* _mesa_function_pool[29134]: CopyTexSubImage2D (offset 326) */
    "iiiiiiii\0"
    "glCopyTexSubImage2D\0"
    "glCopyTexSubImage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[29151]: GetObjectParameterivARB (will be remapped) */
+   /* _mesa_function_pool[29187]: GetObjectParameterivARB (will be remapped) */
    "iip\0"
    "glGetObjectParameterivARB\0"
    "\0"
-   /* _mesa_function_pool[29182]: Color3iv (offset 16) */
+   /* _mesa_function_pool[29218]: Color3iv (offset 16) */
    "p\0"
    "glColor3iv\0"
    "\0"
-   /* _mesa_function_pool[29196]: TexCoord4fVertex4fSUN (dynamic) */
+   /* _mesa_function_pool[29232]: TexCoord4fVertex4fSUN (dynamic) */
    "ffffffff\0"
    "glTexCoord4fVertex4fSUN\0"
    "\0"
-   /* _mesa_function_pool[29230]: DrawElements (offset 311) */
+   /* _mesa_function_pool[29266]: DrawElements (offset 311) */
    "iiip\0"
    "glDrawElements\0"
    "\0"
-   /* _mesa_function_pool[29251]: BindVertexArrayAPPLE (will be remapped) */
+   /* _mesa_function_pool[29287]: BindVertexArrayAPPLE (will be remapped) */
    "i\0"
    "glBindVertexArrayAPPLE\0"
    "\0"
-   /* _mesa_function_pool[29277]: GetProgramLocalParameterdvARB (will be remapped) */
+   /* _mesa_function_pool[29313]: GetProgramLocalParameterdvARB (will be remapped) */
    "iip\0"
    "glGetProgramLocalParameterdvARB\0"
    "\0"
-   /* _mesa_function_pool[29314]: GetHistogramParameteriv (offset 363) */
+   /* _mesa_function_pool[29350]: GetHistogramParameteriv (offset 363) */
    "iip\0"
    "glGetHistogramParameteriv\0"
    "glGetHistogramParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[29374]: MultiTexCoord1iARB (offset 380) */
+   /* _mesa_function_pool[29410]: MultiTexCoord1iARB (offset 380) */
    "ii\0"
    "glMultiTexCoord1i\0"
    "glMultiTexCoord1iARB\0"
    "\0"
-   /* _mesa_function_pool[29417]: GetConvolutionFilter (offset 356) */
+   /* _mesa_function_pool[29453]: GetConvolutionFilter (offset 356) */
    "iiip\0"
    "glGetConvolutionFilter\0"
    "glGetConvolutionFilterEXT\0"
    "\0"
-   /* _mesa_function_pool[29472]: GetProgramivARB (will be remapped) */
+   /* _mesa_function_pool[29508]: GetProgramivARB (will be remapped) */
    "iip\0"
    "glGetProgramivARB\0"
    "\0"
-   /* _mesa_function_pool[29495]: TexBufferARB (will be remapped) */
+   /* _mesa_function_pool[29531]: TexBufferARB (will be remapped) */
    "iii\0"
    "glTexBufferARB\0"
    "\0"
-   /* _mesa_function_pool[29515]: BlendFuncSeparateEXT (will be remapped) */
+   /* _mesa_function_pool[29551]: BlendFuncSeparateEXT (will be remapped) */
    "iiii\0"
    "glBlendFuncSeparate\0"
    "glBlendFuncSeparateEXT\0"
    "glBlendFuncSeparateINGR\0"
    "\0"
-   /* _mesa_function_pool[29588]: MapBufferRange (will be remapped) */
+   /* _mesa_function_pool[29624]: MapBufferRange (will be remapped) */
    "iiii\0"
    "glMapBufferRange\0"
    "\0"
-   /* _mesa_function_pool[29611]: ProgramParameters4dvNV (will be remapped) */
+   /* _mesa_function_pool[29647]: ProgramParameters4dvNV (will be remapped) */
    "iiip\0"
    "glProgramParameters4dvNV\0"
    "\0"
-   /* _mesa_function_pool[29642]: TexCoord2fColor3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[29678]: TexCoord2fColor3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glTexCoord2fColor3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[29679]: EvalPoint2 (offset 239) */
+   /* _mesa_function_pool[29715]: EvalPoint2 (offset 239) */
    "ii\0"
    "glEvalPoint2\0"
    "\0"
-   /* _mesa_function_pool[29696]: Uniform1uivEXT (will be remapped) */
+   /* _mesa_function_pool[29732]: Uniform1uivEXT (will be remapped) */
    "iip\0"
    "glUniform1uivEXT\0"
    "glUniform1uiv\0"
    "\0"
-   /* _mesa_function_pool[29732]: EvalPoint1 (offset 237) */
+   /* _mesa_function_pool[29768]: EvalPoint1 (offset 237) */
    "i\0"
    "glEvalPoint1\0"
    "\0"
-   /* _mesa_function_pool[29748]: Binormal3dvEXT (dynamic) */
+   /* _mesa_function_pool[29784]: Binormal3dvEXT (dynamic) */
    "p\0"
    "glBinormal3dvEXT\0"
    "\0"
-   /* _mesa_function_pool[29768]: PopMatrix (offset 297) */
+   /* _mesa_function_pool[29804]: PopMatrix (offset 297) */
    "\0"
    "glPopMatrix\0"
    "\0"
-   /* _mesa_function_pool[29782]: FinishFenceNV (will be remapped) */
+   /* _mesa_function_pool[29818]: GetVertexAttribIuivEXT (will be remapped) */
+   "iip\0"
+   "glGetVertexAttribIuivEXT\0"
+   "glGetVertexAttribIuiv\0"
+   "\0"
+   /* _mesa_function_pool[29870]: FinishFenceNV (will be remapped) */
    "i\0"
    "glFinishFenceNV\0"
    "\0"
-   /* _mesa_function_pool[29801]: GetFogFuncSGIS (dynamic) */
+   /* _mesa_function_pool[29889]: GetFogFuncSGIS (dynamic) */
    "p\0"
    "glGetFogFuncSGIS\0"
    "\0"
-   /* _mesa_function_pool[29821]: GetUniformLocationARB (will be remapped) */
+   /* _mesa_function_pool[29909]: GetUniformLocationARB (will be remapped) */
    "ip\0"
    "glGetUniformLocation\0"
    "glGetUniformLocationARB\0"
    "\0"
-   /* _mesa_function_pool[29870]: SecondaryColor3fEXT (will be remapped) */
+   /* _mesa_function_pool[29958]: SecondaryColor3fEXT (will be remapped) */
    "fff\0"
    "glSecondaryColor3f\0"
    "glSecondaryColor3fEXT\0"
    "\0"
-   /* _mesa_function_pool[29916]: GetTexGeniv (offset 280) */
+   /* _mesa_function_pool[30004]: GetTexGeniv (offset 280) */
    "iip\0"
    "glGetTexGeniv\0"
    "\0"
-   /* _mesa_function_pool[29935]: CombinerInputNV (will be remapped) */
+   /* _mesa_function_pool[30023]: CombinerInputNV (will be remapped) */
    "iiiiii\0"
    "glCombinerInputNV\0"
    "\0"
-   /* _mesa_function_pool[29961]: VertexAttrib3sARB (will be remapped) */
+   /* _mesa_function_pool[30049]: VertexAttrib3sARB (will be remapped) */
    "iiii\0"
    "glVertexAttrib3s\0"
    "glVertexAttrib3sARB\0"
    "\0"
-   /* _mesa_function_pool[30004]: IsTransformFeedback (will be remapped) */
+   /* _mesa_function_pool[30092]: IsTransformFeedback (will be remapped) */
    "i\0"
    "glIsTransformFeedback\0"
    "\0"
-   /* _mesa_function_pool[30029]: ReplacementCodeuiNormal3fVertex3fvSUN (dynamic) */
+   /* _mesa_function_pool[30117]: ReplacementCodeuiNormal3fVertex3fvSUN (dynamic) */
    "ppp\0"
    "glReplacementCodeuiNormal3fVertex3fvSUN\0"
    "\0"
-   /* _mesa_function_pool[30074]: Map2d (offset 222) */
+   /* _mesa_function_pool[30162]: Map2d (offset 222) */
    "iddiiddiip\0"
    "glMap2d\0"
    "\0"
-   /* _mesa_function_pool[30094]: Map2f (offset 223) */
+   /* _mesa_function_pool[30182]: Map2f (offset 223) */
    "iffiiffiip\0"
    "glMap2f\0"
    "\0"
-   /* _mesa_function_pool[30114]: ProgramStringARB (will be remapped) */
+   /* _mesa_function_pool[30202]: ProgramStringARB (will be remapped) */
    "iiip\0"
    "glProgramStringARB\0"
    "\0"
-   /* _mesa_function_pool[30139]: Vertex4s (offset 148) */
+   /* _mesa_function_pool[30227]: Vertex4s (offset 148) */
    "iiii\0"
    "glVertex4s\0"
    "\0"
-   /* _mesa_function_pool[30156]: TexCoord4fVertex4fvSUN (dynamic) */
+   /* _mesa_function_pool[30244]: TexCoord4fVertex4fvSUN (dynamic) */
    "pp\0"
    "glTexCoord4fVertex4fvSUN\0"
    "\0"
-   /* _mesa_function_pool[30185]: TextureStorage3DEXT (will be remapped) */
+   /* _mesa_function_pool[30273]: TextureStorage3DEXT (will be remapped) */
    "iiiiiii\0"
    "glTextureStorage3DEXT\0"
    "\0"
-   /* _mesa_function_pool[30216]: FragmentLightModelivSGIX (dynamic) */
+   /* _mesa_function_pool[30304]: FragmentLightModelivSGIX (dynamic) */
    "ip\0"
    "glFragmentLightModelivSGIX\0"
    "\0"
-   /* _mesa_function_pool[30247]: VertexAttrib1fNV (will be remapped) */
+   /* _mesa_function_pool[30335]: VertexAttrib1fNV (will be remapped) */
    "if\0"
    "glVertexAttrib1fNV\0"
    "\0"
-   /* _mesa_function_pool[30270]: Vertex4f (offset 144) */
+   /* _mesa_function_pool[30358]: Vertex4f (offset 144) */
    "ffff\0"
    "glVertex4f\0"
    "\0"
-   /* _mesa_function_pool[30287]: EvalCoord1d (offset 228) */
+   /* _mesa_function_pool[30375]: EvalCoord1d (offset 228) */
    "d\0"
    "glEvalCoord1d\0"
    "\0"
-   /* _mesa_function_pool[30304]: Vertex4d (offset 142) */
+   /* _mesa_function_pool[30392]: Vertex4d (offset 142) */
    "dddd\0"
    "glVertex4d\0"
    "\0"
-   /* _mesa_function_pool[30321]: RasterPos4dv (offset 79) */
+   /* _mesa_function_pool[30409]: RasterPos4dv (offset 79) */
    "p\0"
    "glRasterPos4dv\0"
    "\0"
-   /* _mesa_function_pool[30339]: UseShaderProgramEXT (will be remapped) */
+   /* _mesa_function_pool[30427]: UseShaderProgramEXT (will be remapped) */
    "ii\0"
    "glUseShaderProgramEXT\0"
    "\0"
-   /* _mesa_function_pool[30365]: FragmentLightfSGIX (dynamic) */
+   /* _mesa_function_pool[30453]: FragmentLightfSGIX (dynamic) */
    "iif\0"
    "glFragmentLightfSGIX\0"
    "\0"
-   /* _mesa_function_pool[30391]: TextureStorage2DEXT (will be remapped) */
+   /* _mesa_function_pool[30479]: TextureStorage2DEXT (will be remapped) */
    "iiiiii\0"
    "glTextureStorage2DEXT\0"
    "\0"
-   /* _mesa_function_pool[30421]: GetCompressedTexImageARB (will be remapped) */
+   /* _mesa_function_pool[30509]: GetCompressedTexImageARB (will be remapped) */
    "iip\0"
    "glGetCompressedTexImage\0"
    "glGetCompressedTexImageARB\0"
    "\0"
-   /* _mesa_function_pool[30477]: GetTexGenfv (offset 279) */
+   /* _mesa_function_pool[30565]: GetTexGenfv (offset 279) */
    "iip\0"
    "glGetTexGenfv\0"
    "\0"
-   /* _mesa_function_pool[30496]: Vertex4i (offset 146) */
+   /* _mesa_function_pool[30584]: Vertex4i (offset 146) */
    "iiii\0"
    "glVertex4i\0"
    "\0"
-   /* _mesa_function_pool[30513]: VertexWeightPointerEXT (dynamic) */
+   /* _mesa_function_pool[30601]: VertexWeightPointerEXT (dynamic) */
    "iiip\0"
    "glVertexWeightPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[30544]: GetHistogram (offset 361) */
+   /* _mesa_function_pool[30632]: GetHistogram (offset 361) */
    "iiiip\0"
    "glGetHistogram\0"
    "glGetHistogramEXT\0"
    "\0"
-   /* _mesa_function_pool[30584]: ActiveStencilFaceEXT (will be remapped) */
+   /* _mesa_function_pool[30672]: ActiveStencilFaceEXT (will be remapped) */
    "i\0"
    "glActiveStencilFaceEXT\0"
    "\0"
-   /* _mesa_function_pool[30610]: TexStorage3D (will be remapped) */
+   /* _mesa_function_pool[30698]: TexStorage3D (will be remapped) */
    "iiiiii\0"
    "glTexStorage3D\0"
    "\0"
-   /* _mesa_function_pool[30633]: StencilFuncSeparateATI (will be remapped) */
+   /* _mesa_function_pool[30721]: StencilFuncSeparateATI (will be remapped) */
    "iiii\0"
    "glStencilFuncSeparateATI\0"
    "\0"
-   /* _mesa_function_pool[30664]: Materialf (offset 169) */
+   /* _mesa_function_pool[30752]: Materialf (offset 169) */
    "iif\0"
    "glMaterialf\0"
    "\0"
-   /* _mesa_function_pool[30681]: GetShaderSourceARB (will be remapped) */
+   /* _mesa_function_pool[30769]: GetShaderSourceARB (will be remapped) */
    "iipp\0"
    "glGetShaderSource\0"
    "glGetShaderSourceARB\0"
    "\0"
-   /* _mesa_function_pool[30726]: IglooInterfaceSGIX (dynamic) */
+   /* _mesa_function_pool[30814]: IglooInterfaceSGIX (dynamic) */
    "ip\0"
    "glIglooInterfaceSGIX\0"
    "\0"
-   /* _mesa_function_pool[30751]: Materiali (offset 171) */
+   /* _mesa_function_pool[30839]: Materiali (offset 171) */
    "iii\0"
    "glMateriali\0"
    "\0"
-   /* _mesa_function_pool[30768]: VertexAttrib4dNV (will be remapped) */
+   /* _mesa_function_pool[30856]: VertexAttrib4dNV (will be remapped) */
    "idddd\0"
    "glVertexAttrib4dNV\0"
    "\0"
-   /* _mesa_function_pool[30794]: MultiModeDrawElementsIBM (will be remapped) */
+   /* _mesa_function_pool[30882]: MultiModeDrawElementsIBM (will be remapped) */
    "ppipii\0"
    "glMultiModeDrawElementsIBM\0"
    "\0"
-   /* _mesa_function_pool[30829]: Indexsv (offset 51) */
+   /* _mesa_function_pool[30917]: Indexsv (offset 51) */
    "p\0"
    "glIndexsv\0"
    "\0"
-   /* _mesa_function_pool[30842]: MultiTexCoord4svARB (offset 407) */
+   /* _mesa_function_pool[30930]: MultiTexCoord4svARB (offset 407) */
    "ip\0"
    "glMultiTexCoord4sv\0"
    "glMultiTexCoord4svARB\0"
    "\0"
-   /* _mesa_function_pool[30887]: LightModelfv (offset 164) */
+   /* _mesa_function_pool[30975]: LightModelfv (offset 164) */
    "ip\0"
    "glLightModelfv\0"
    "\0"
-   /* _mesa_function_pool[30906]: TexCoord2dv (offset 103) */
+   /* _mesa_function_pool[30994]: TexCoord2dv (offset 103) */
    "p\0"
    "glTexCoord2dv\0"
    "\0"
-   /* _mesa_function_pool[30923]: GenQueriesARB (will be remapped) */
+   /* _mesa_function_pool[31011]: GenQueriesARB (will be remapped) */
    "ip\0"
    "glGenQueries\0"
    "glGenQueriesARB\0"
    "\0"
-   /* _mesa_function_pool[30956]: EvalCoord1dv (offset 229) */
+   /* _mesa_function_pool[31044]: EvalCoord1dv (offset 229) */
    "p\0"
    "glEvalCoord1dv\0"
    "\0"
-   /* _mesa_function_pool[30974]: ReplacementCodeuiVertex3fSUN (dynamic) */
+   /* _mesa_function_pool[31062]: ReplacementCodeuiVertex3fSUN (dynamic) */
    "ifff\0"
    "glReplacementCodeuiVertex3fSUN\0"
    "\0"
-   /* _mesa_function_pool[31011]: Translated (offset 303) */
+   /* _mesa_function_pool[31099]: Translated (offset 303) */
    "ddd\0"
    "glTranslated\0"
    "\0"
-   /* _mesa_function_pool[31029]: Translatef (offset 304) */
+   /* _mesa_function_pool[31117]: Translatef (offset 304) */
    "fff\0"
    "glTranslatef\0"
    "\0"
-   /* _mesa_function_pool[31047]: Uniform3uiEXT (will be remapped) */
+   /* _mesa_function_pool[31135]: Uniform3uiEXT (will be remapped) */
    "iiii\0"
    "glUniform3uiEXT\0"
    "glUniform3ui\0"
    "\0"
-   /* _mesa_function_pool[31082]: StencilMask (offset 209) */
+   /* _mesa_function_pool[31170]: StencilMask (offset 209) */
    "i\0"
    "glStencilMask\0"
    "\0"
-   /* _mesa_function_pool[31099]: Tangent3iEXT (dynamic) */
+   /* _mesa_function_pool[31187]: Tangent3iEXT (dynamic) */
    "iii\0"
    "glTangent3iEXT\0"
    "\0"
-   /* _mesa_function_pool[31119]: ClampColorARB (will be remapped) */
+   /* _mesa_function_pool[31207]: ClampColorARB (will be remapped) */
    "ii\0"
    "glClampColorARB\0"
    "\0"
-   /* _mesa_function_pool[31139]: GetLightiv (offset 265) */
+   /* _mesa_function_pool[31227]: GetLightiv (offset 265) */
    "iip\0"
    "glGetLightiv\0"
    "\0"
-   /* _mesa_function_pool[31157]: GetSamplerParameterIiv (will be remapped) */
+   /* _mesa_function_pool[31245]: GetSamplerParameterIiv (will be remapped) */
    "iip\0"
    "glGetSamplerParameterIiv\0"
    "\0"
-   /* _mesa_function_pool[31187]: DrawMeshArraysSUN (dynamic) */
+   /* _mesa_function_pool[31275]: DrawMeshArraysSUN (dynamic) */
    "iiii\0"
    "glDrawMeshArraysSUN\0"
    "\0"
-   /* _mesa_function_pool[31213]: IsList (offset 287) */
+   /* _mesa_function_pool[31301]: IsList (offset 287) */
    "i\0"
    "glIsList\0"
    "\0"
-   /* _mesa_function_pool[31225]: IsSync (will be remapped) */
+   /* _mesa_function_pool[31313]: IsSync (will be remapped) */
    "i\0"
    "glIsSync\0"
    "\0"
-   /* _mesa_function_pool[31237]: RenderMode (offset 196) */
+   /* _mesa_function_pool[31325]: RenderMode (offset 196) */
    "i\0"
    "glRenderMode\0"
    "\0"
-   /* _mesa_function_pool[31253]: GetMapControlPointsNV (dynamic) */
+   /* _mesa_function_pool[31341]: GetMapControlPointsNV (dynamic) */
    "iiiiiip\0"
    "glGetMapControlPointsNV\0"
    "\0"
-   /* _mesa_function_pool[31286]: DrawBuffersARB (will be remapped) */
+   /* _mesa_function_pool[31374]: DrawBuffersARB (will be remapped) */
    "ip\0"
    "glDrawBuffers\0"
    "glDrawBuffersARB\0"
    "glDrawBuffersATI\0"
    "glDrawBuffersNV\0"
    "\0"
-   /* _mesa_function_pool[31354]: ClearBufferiv (will be remapped) */
+   /* _mesa_function_pool[31442]: ClearBufferiv (will be remapped) */
    "iip\0"
    "glClearBufferiv\0"
    "\0"
-   /* _mesa_function_pool[31375]: ProgramLocalParameter4fARB (will be remapped) */
+   /* _mesa_function_pool[31463]: ProgramLocalParameter4fARB (will be remapped) */
    "iiffff\0"
    "glProgramLocalParameter4fARB\0"
    "\0"
-   /* _mesa_function_pool[31412]: SpriteParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[31500]: SpriteParameterivSGIX (dynamic) */
    "ip\0"
    "glSpriteParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[31440]: ProvokingVertexEXT (will be remapped) */
+   /* _mesa_function_pool[31528]: ProvokingVertexEXT (will be remapped) */
    "i\0"
    "glProvokingVertexEXT\0"
    "glProvokingVertex\0"
    "\0"
-   /* _mesa_function_pool[31482]: MultiTexCoord1fARB (offset 378) */
+   /* _mesa_function_pool[31570]: MultiTexCoord1fARB (offset 378) */
    "if\0"
    "glMultiTexCoord1f\0"
    "glMultiTexCoord1fARB\0"
    "\0"
-   /* _mesa_function_pool[31525]: LoadName (offset 198) */
+   /* _mesa_function_pool[31613]: LoadName (offset 198) */
    "i\0"
    "glLoadName\0"
    "\0"
-   /* _mesa_function_pool[31539]: VertexAttribs4ubvNV (will be remapped) */
+   /* _mesa_function_pool[31627]: VertexAttribs4ubvNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4ubvNV\0"
    "\0"
-   /* _mesa_function_pool[31566]: WeightsvARB (dynamic) */
+   /* _mesa_function_pool[31654]: WeightsvARB (dynamic) */
    "ip\0"
    "glWeightsvARB\0"
    "\0"
-   /* _mesa_function_pool[31584]: NormalP3ui (will be remapped) */
+   /* _mesa_function_pool[31672]: NormalP3ui (will be remapped) */
    "ii\0"
    "glNormalP3ui\0"
    "\0"
-   /* _mesa_function_pool[31601]: VertexAttribP2ui (will be remapped) */
-   "iiii\0"
-   "glVertexAttribP2ui\0"
-   "\0"
-   /* _mesa_function_pool[31626]: Uniform1fvARB (will be remapped) */
+   /* _mesa_function_pool[31689]: Uniform1fvARB (will be remapped) */
    "iip\0"
    "glUniform1fv\0"
    "glUniform1fvARB\0"
    "\0"
-   /* _mesa_function_pool[31660]: CopyTexSubImage1D (offset 325) */
+   /* _mesa_function_pool[31723]: CopyTexSubImage1D (offset 325) */
    "iiiiii\0"
    "glCopyTexSubImage1D\0"
    "glCopyTexSubImage1DEXT\0"
    "\0"
-   /* _mesa_function_pool[31711]: CullFace (offset 152) */
+   /* _mesa_function_pool[31774]: CullFace (offset 152) */
    "i\0"
    "glCullFace\0"
    "\0"
-   /* _mesa_function_pool[31725]: BindTexture (offset 307) */
+   /* _mesa_function_pool[31788]: BindTexture (offset 307) */
    "ii\0"
    "glBindTexture\0"
    "glBindTextureEXT\0"
    "\0"
-   /* _mesa_function_pool[31760]: BeginFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[31823]: BeginFragmentShaderATI (will be remapped) */
    "\0"
    "glBeginFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[31787]: MultiTexCoord4fARB (offset 402) */
+   /* _mesa_function_pool[31850]: MultiTexCoord4fARB (offset 402) */
    "iffff\0"
    "glMultiTexCoord4f\0"
    "glMultiTexCoord4fARB\0"
    "\0"
-   /* _mesa_function_pool[31833]: VertexAttribs3svNV (will be remapped) */
+   /* _mesa_function_pool[31896]: VertexAttribs3svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs3svNV\0"
    "\0"
-   /* _mesa_function_pool[31859]: StencilFunc (offset 243) */
+   /* _mesa_function_pool[31922]: StencilFunc (offset 243) */
    "iii\0"
    "glStencilFunc\0"
    "\0"
-   /* _mesa_function_pool[31878]: CopyPixels (offset 255) */
+   /* _mesa_function_pool[31941]: CopyPixels (offset 255) */
    "iiiii\0"
    "glCopyPixels\0"
    "\0"
-   /* _mesa_function_pool[31898]: Rectsv (offset 93) */
+   /* _mesa_function_pool[31961]: Rectsv (offset 93) */
    "pp\0"
    "glRectsv\0"
    "\0"
-   /* _mesa_function_pool[31911]: ReplacementCodeuivSUN (dynamic) */
+   /* _mesa_function_pool[31974]: ReplacementCodeuivSUN (dynamic) */
    "p\0"
    "glReplacementCodeuivSUN\0"
    "\0"
-   /* _mesa_function_pool[31938]: MultiTexCoordP2uiv (will be remapped) */
+   /* _mesa_function_pool[32001]: MultiTexCoordP2uiv (will be remapped) */
    "iip\0"
    "glMultiTexCoordP2uiv\0"
    "\0"
-   /* _mesa_function_pool[31964]: EnableVertexAttribArrayARB (will be remapped) */
+   /* _mesa_function_pool[32027]: EnableVertexAttribArrayARB (will be remapped) */
    "i\0"
    "glEnableVertexAttribArray\0"
    "glEnableVertexAttribArrayARB\0"
    "\0"
-   /* _mesa_function_pool[32022]: NormalPointervINTEL (dynamic) */
+   /* _mesa_function_pool[32085]: NormalPointervINTEL (dynamic) */
    "ip\0"
    "glNormalPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[32048]: CopyConvolutionFilter2D (offset 355) */
+   /* _mesa_function_pool[32111]: CopyConvolutionFilter2D (offset 355) */
    "iiiiii\0"
    "glCopyConvolutionFilter2D\0"
    "glCopyConvolutionFilter2DEXT\0"
    "\0"
-   /* _mesa_function_pool[32111]: WindowPos3ivMESA (will be remapped) */
+   /* _mesa_function_pool[32174]: WindowPos3ivMESA (will be remapped) */
    "p\0"
    "glWindowPos3iv\0"
    "glWindowPos3ivARB\0"
    "glWindowPos3ivMESA\0"
    "\0"
-   /* _mesa_function_pool[32166]: CopyBufferSubData (will be remapped) */
+   /* _mesa_function_pool[32229]: CopyBufferSubData (will be remapped) */
    "iiiii\0"
    "glCopyBufferSubData\0"
    "\0"
-   /* _mesa_function_pool[32193]: NormalPointer (offset 318) */
+   /* _mesa_function_pool[32256]: NormalPointer (offset 318) */
    "iip\0"
    "glNormalPointer\0"
    "\0"
-   /* _mesa_function_pool[32214]: TexParameterfv (offset 179) */
+   /* _mesa_function_pool[32277]: TexParameterfv (offset 179) */
    "iip\0"
    "glTexParameterfv\0"
    "\0"
-   /* _mesa_function_pool[32236]: IsBufferARB (will be remapped) */
+   /* _mesa_function_pool[32299]: IsBufferARB (will be remapped) */
    "i\0"
    "glIsBuffer\0"
    "glIsBufferARB\0"
    "\0"
-   /* _mesa_function_pool[32264]: WindowPos4iMESA (will be remapped) */
+   /* _mesa_function_pool[32327]: WindowPos4iMESA (will be remapped) */
    "iiii\0"
    "glWindowPos4iMESA\0"
    "\0"
-   /* _mesa_function_pool[32288]: VertexAttrib4uivARB (will be remapped) */
+   /* _mesa_function_pool[32351]: VertexAttrib4uivARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4uiv\0"
    "glVertexAttrib4uivARB\0"
    "\0"
-   /* _mesa_function_pool[32333]: Tangent3bvEXT (dynamic) */
+   /* _mesa_function_pool[32396]: Tangent3bvEXT (dynamic) */
    "p\0"
    "glTangent3bvEXT\0"
    "\0"
-   /* _mesa_function_pool[32352]: VertexAttribI3uivEXT (will be remapped) */
+   /* _mesa_function_pool[32415]: VertexAttribI3uivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI3uivEXT\0"
    "glVertexAttribI3uiv\0"
    "\0"
-   /* _mesa_function_pool[32399]: UniformMatrix3x4fv (will be remapped) */
+   /* _mesa_function_pool[32462]: UniformMatrix3x4fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3x4fv\0"
    "\0"
-   /* _mesa_function_pool[32426]: ClipPlane (offset 150) */
+   /* _mesa_function_pool[32489]: ClipPlane (offset 150) */
    "ip\0"
    "glClipPlane\0"
    "\0"
-   /* _mesa_function_pool[32442]: Recti (offset 90) */
+   /* _mesa_function_pool[32505]: Recti (offset 90) */
    "iiii\0"
    "glRecti\0"
    "\0"
-   /* _mesa_function_pool[32456]: TrackMatrixNV (will be remapped) */
+   /* _mesa_function_pool[32519]: TrackMatrixNV (will be remapped) */
    "iiii\0"
    "glTrackMatrixNV\0"
    "\0"
-   /* _mesa_function_pool[32478]: DrawRangeElementsBaseVertex (will be remapped) */
+   /* _mesa_function_pool[32541]: DrawRangeElementsBaseVertex (will be remapped) */
    "iiiiipi\0"
    "glDrawRangeElementsBaseVertex\0"
    "\0"
-   /* _mesa_function_pool[32517]: SamplerParameterIuiv (will be remapped) */
+   /* _mesa_function_pool[32580]: SamplerParameterIuiv (will be remapped) */
    "iip\0"
    "glSamplerParameterIuiv\0"
    "\0"
-   /* _mesa_function_pool[32545]: TexCoordPointervINTEL (dynamic) */
+   /* _mesa_function_pool[32608]: TexCoordPointervINTEL (dynamic) */
    "iip\0"
    "glTexCoordPointervINTEL\0"
    "\0"
-   /* _mesa_function_pool[32574]: DeleteBuffersARB (will be remapped) */
+   /* _mesa_function_pool[32637]: DeleteBuffersARB (will be remapped) */
    "ip\0"
    "glDeleteBuffers\0"
    "glDeleteBuffersARB\0"
    "\0"
-   /* _mesa_function_pool[32613]: PixelTransformParameterfvEXT (dynamic) */
+   /* _mesa_function_pool[32676]: PixelTransformParameterfvEXT (dynamic) */
    "iip\0"
    "glPixelTransformParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[32649]: PrimitiveRestartNV (will be remapped) */
+   /* _mesa_function_pool[32712]: PrimitiveRestartNV (will be remapped) */
    "\0"
    "glPrimitiveRestartNV\0"
    "\0"
-   /* _mesa_function_pool[32672]: WindowPos4fvMESA (will be remapped) */
+   /* _mesa_function_pool[32735]: WindowPos4fvMESA (will be remapped) */
    "p\0"
    "glWindowPos4fvMESA\0"
    "\0"
-   /* _mesa_function_pool[32694]: GetPixelMapuiv (offset 272) */
+   /* _mesa_function_pool[32757]: GetPixelMapuiv (offset 272) */
    "ip\0"
    "glGetPixelMapuiv\0"
    "\0"
-   /* _mesa_function_pool[32715]: Rectf (offset 88) */
+   /* _mesa_function_pool[32778]: Rectf (offset 88) */
    "ffff\0"
    "glRectf\0"
    "\0"
-   /* _mesa_function_pool[32729]: VertexAttrib1sNV (will be remapped) */
+   /* _mesa_function_pool[32792]: VertexAttrib1sNV (will be remapped) */
    "ii\0"
    "glVertexAttrib1sNV\0"
    "\0"
-   /* _mesa_function_pool[32752]: Indexfv (offset 47) */
+   /* _mesa_function_pool[32815]: Indexfv (offset 47) */
    "p\0"
    "glIndexfv\0"
    "\0"
-   /* _mesa_function_pool[32765]: ColorP3uiv (will be remapped) */
+   /* _mesa_function_pool[32828]: ColorP3uiv (will be remapped) */
    "ip\0"
    "glColorP3uiv\0"
    "\0"
-   /* _mesa_function_pool[32782]: SecondaryColor3svEXT (will be remapped) */
+   /* _mesa_function_pool[32845]: SecondaryColor3svEXT (will be remapped) */
    "p\0"
    "glSecondaryColor3sv\0"
    "glSecondaryColor3svEXT\0"
    "\0"
-   /* _mesa_function_pool[32828]: LoadTransposeMatrixfARB (will be remapped) */
+   /* _mesa_function_pool[32891]: LoadTransposeMatrixfARB (will be remapped) */
    "p\0"
    "glLoadTransposeMatrixf\0"
    "glLoadTransposeMatrixfARB\0"
    "\0"
-   /* _mesa_function_pool[32880]: GetPointerv (offset 329) */
+   /* _mesa_function_pool[32943]: GetPointerv (offset 329) */
    "ip\0"
    "glGetPointerv\0"
    "glGetPointervEXT\0"
    "\0"
-   /* _mesa_function_pool[32915]: Tangent3bEXT (dynamic) */
+   /* _mesa_function_pool[32978]: Tangent3bEXT (dynamic) */
    "iii\0"
    "glTangent3bEXT\0"
    "\0"
-   /* _mesa_function_pool[32935]: CombinerParameterfNV (will be remapped) */
+   /* _mesa_function_pool[32998]: CombinerParameterfNV (will be remapped) */
    "if\0"
    "glCombinerParameterfNV\0"
    "\0"
-   /* _mesa_function_pool[32962]: IndexMask (offset 212) */
+   /* _mesa_function_pool[33025]: IndexMask (offset 212) */
    "i\0"
    "glIndexMask\0"
    "\0"
-   /* _mesa_function_pool[32977]: BindProgramNV (will be remapped) */
+   /* _mesa_function_pool[33040]: BindProgramNV (will be remapped) */
    "ii\0"
    "glBindProgramARB\0"
    "glBindProgramNV\0"
    "\0"
-   /* _mesa_function_pool[33014]: VertexAttrib4svARB (will be remapped) */
+   /* _mesa_function_pool[33077]: VertexAttrib4svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4sv\0"
    "glVertexAttrib4svARB\0"
    "\0"
-   /* _mesa_function_pool[33057]: GetFloatv (offset 262) */
+   /* _mesa_function_pool[33120]: GetFloatv (offset 262) */
    "ip\0"
    "glGetFloatv\0"
    "\0"
-   /* _mesa_function_pool[33073]: CreateDebugObjectMESA (dynamic) */
+   /* _mesa_function_pool[33136]: CreateDebugObjectMESA (dynamic) */
    "\0"
    "glCreateDebugObjectMESA\0"
    "\0"
-   /* _mesa_function_pool[33099]: GetShaderiv (will be remapped) */
+   /* _mesa_function_pool[33162]: GetShaderiv (will be remapped) */
    "iip\0"
    "glGetShaderiv\0"
    "\0"
-   /* _mesa_function_pool[33118]: ClientWaitSync (will be remapped) */
+   /* _mesa_function_pool[33181]: ClientWaitSync (will be remapped) */
    "iii\0"
    "glClientWaitSync\0"
    "\0"
-   /* _mesa_function_pool[33140]: TexCoord4s (offset 124) */
+   /* _mesa_function_pool[33203]: TexCoord4s (offset 124) */
    "iiii\0"
    "glTexCoord4s\0"
    "\0"
-   /* _mesa_function_pool[33159]: TexCoord3sv (offset 117) */
+   /* _mesa_function_pool[33222]: TexCoord3sv (offset 117) */
    "p\0"
    "glTexCoord3sv\0"
    "\0"
-   /* _mesa_function_pool[33176]: BindFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[33239]: BindFragmentShaderATI (will be remapped) */
    "i\0"
    "glBindFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[33203]: PopAttrib (offset 218) */
+   /* _mesa_function_pool[33266]: PopAttrib (offset 218) */
    "\0"
    "glPopAttrib\0"
    "\0"
-   /* _mesa_function_pool[33217]: Fogfv (offset 154) */
+   /* _mesa_function_pool[33280]: Fogfv (offset 154) */
    "ip\0"
    "glFogfv\0"
    "\0"
-   /* _mesa_function_pool[33229]: UnmapBufferARB (will be remapped) */
+   /* _mesa_function_pool[33292]: UnmapBufferARB (will be remapped) */
    "i\0"
    "glUnmapBuffer\0"
    "glUnmapBufferARB\0"
    "\0"
-   /* _mesa_function_pool[33263]: InitNames (offset 197) */
+   /* _mesa_function_pool[33326]: InitNames (offset 197) */
    "\0"
    "glInitNames\0"
    "\0"
-   /* _mesa_function_pool[33277]: Normal3sv (offset 61) */
+   /* _mesa_function_pool[33340]: Normal3sv (offset 61) */
    "p\0"
    "glNormal3sv\0"
    "\0"
-   /* _mesa_function_pool[33292]: Minmax (offset 368) */
+   /* _mesa_function_pool[33355]: Minmax (offset 368) */
    "iii\0"
    "glMinmax\0"
    "glMinmaxEXT\0"
    "\0"
-   /* _mesa_function_pool[33318]: TexCoord4d (offset 118) */
+   /* _mesa_function_pool[33381]: TexCoord4d (offset 118) */
    "dddd\0"
    "glTexCoord4d\0"
    "\0"
-   /* _mesa_function_pool[33337]: DeformationMap3dSGIX (dynamic) */
-   "iddiiddiiddiip\0"
-   "glDeformationMap3dSGIX\0"
-   "\0"
-   /* _mesa_function_pool[33376]: TexCoord4f (offset 120) */
+   /* _mesa_function_pool[33400]: TexCoord4f (offset 120) */
    "ffff\0"
    "glTexCoord4f\0"
    "\0"
-   /* _mesa_function_pool[33395]: FogCoorddvEXT (will be remapped) */
+   /* _mesa_function_pool[33419]: FogCoorddvEXT (will be remapped) */
    "p\0"
    "glFogCoorddv\0"
    "glFogCoorddvEXT\0"
    "\0"
-   /* _mesa_function_pool[33427]: FinishTextureSUNX (dynamic) */
+   /* _mesa_function_pool[33451]: FinishTextureSUNX (dynamic) */
    "\0"
    "glFinishTextureSUNX\0"
    "\0"
-   /* _mesa_function_pool[33449]: GetFragmentLightfvSGIX (dynamic) */
+   /* _mesa_function_pool[33473]: GetFragmentLightfvSGIX (dynamic) */
    "iip\0"
    "glGetFragmentLightfvSGIX\0"
    "\0"
-   /* _mesa_function_pool[33479]: Binormal3fvEXT (dynamic) */
+   /* _mesa_function_pool[33503]: Binormal3fvEXT (dynamic) */
    "p\0"
    "glBinormal3fvEXT\0"
    "\0"
-   /* _mesa_function_pool[33499]: GetBooleanv (offset 258) */
+   /* _mesa_function_pool[33523]: GetBooleanv (offset 258) */
    "ip\0"
    "glGetBooleanv\0"
    "\0"
-   /* _mesa_function_pool[33517]: ColorFragmentOp3ATI (will be remapped) */
+   /* _mesa_function_pool[33541]: ColorFragmentOp3ATI (will be remapped) */
    "iiiiiiiiiiiii\0"
    "glColorFragmentOp3ATI\0"
    "\0"
-   /* _mesa_function_pool[33554]: Hint (offset 158) */
+   /* _mesa_function_pool[33578]: Hint (offset 158) */
    "ii\0"
    "glHint\0"
    "\0"
-   /* _mesa_function_pool[33565]: Color4dv (offset 28) */
+   /* _mesa_function_pool[33589]: Color4dv (offset 28) */
    "p\0"
    "glColor4dv\0"
    "\0"
-   /* _mesa_function_pool[33579]: VertexAttrib2svARB (will be remapped) */
+   /* _mesa_function_pool[33603]: VertexAttrib2svARB (will be remapped) */
    "ip\0"
    "glVertexAttrib2sv\0"
    "glVertexAttrib2svARB\0"
    "\0"
-   /* _mesa_function_pool[33622]: AreProgramsResidentNV (will be remapped) */
+   /* _mesa_function_pool[33646]: AreProgramsResidentNV (will be remapped) */
    "ipp\0"
    "glAreProgramsResidentNV\0"
    "\0"
-   /* _mesa_function_pool[33651]: WindowPos3svMESA (will be remapped) */
+   /* _mesa_function_pool[33675]: WindowPos3svMESA (will be remapped) */
    "p\0"
    "glWindowPos3sv\0"
    "glWindowPos3svARB\0"
    "glWindowPos3svMESA\0"
    "\0"
-   /* _mesa_function_pool[33706]: CopyColorSubTable (offset 347) */
+   /* _mesa_function_pool[33730]: CopyColorSubTable (offset 347) */
    "iiiii\0"
    "glCopyColorSubTable\0"
    "glCopyColorSubTableEXT\0"
    "\0"
-   /* _mesa_function_pool[33756]: WeightdvARB (dynamic) */
+   /* _mesa_function_pool[33780]: WeightdvARB (dynamic) */
    "ip\0"
    "glWeightdvARB\0"
    "\0"
-   /* _mesa_function_pool[33774]: DeleteRenderbuffersEXT (will be remapped) */
+   /* _mesa_function_pool[33798]: DeleteRenderbuffersEXT (will be remapped) */
    "ip\0"
    "glDeleteRenderbuffers\0"
    "glDeleteRenderbuffersEXT\0"
    "\0"
-   /* _mesa_function_pool[33825]: VertexAttrib4NubvARB (will be remapped) */
+   /* _mesa_function_pool[33849]: VertexAttrib4NubvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib4Nubv\0"
    "glVertexAttrib4NubvARB\0"
    "\0"
-   /* _mesa_function_pool[33872]: VertexAttrib3dvNV (will be remapped) */
+   /* _mesa_function_pool[33896]: VertexAttrib3dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib3dvNV\0"
    "\0"
-   /* _mesa_function_pool[33896]: GetObjectParameterfvARB (will be remapped) */
+   /* _mesa_function_pool[33920]: GetObjectParameterfvARB (will be remapped) */
    "iip\0"
    "glGetObjectParameterfvARB\0"
    "\0"
-   /* _mesa_function_pool[33927]: Vertex4iv (offset 147) */
+   /* _mesa_function_pool[33951]: Vertex4iv (offset 147) */
    "p\0"
    "glVertex4iv\0"
    "\0"
-   /* _mesa_function_pool[33942]: GetProgramEnvParameterdvARB (will be remapped) */
+   /* _mesa_function_pool[33966]: GetProgramEnvParameterdvARB (will be remapped) */
    "iip\0"
    "glGetProgramEnvParameterdvARB\0"
    "\0"
-   /* _mesa_function_pool[33977]: TexCoord4dv (offset 119) */
+   /* _mesa_function_pool[34001]: TexCoord4dv (offset 119) */
    "p\0"
    "glTexCoord4dv\0"
    "\0"
-   /* _mesa_function_pool[33994]: LockArraysEXT (will be remapped) */
+   /* _mesa_function_pool[34018]: LockArraysEXT (will be remapped) */
    "ii\0"
    "glLockArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[34014]: Begin (offset 7) */
+   /* _mesa_function_pool[34038]: Begin (offset 7) */
    "i\0"
    "glBegin\0"
    "\0"
-   /* _mesa_function_pool[34025]: LightModeli (offset 165) */
+   /* _mesa_function_pool[34049]: LightModeli (offset 165) */
    "ii\0"
    "glLightModeli\0"
    "\0"
-   /* _mesa_function_pool[34043]: VertexAttribI4ivEXT (will be remapped) */
+   /* _mesa_function_pool[34067]: VertexAttribI4ivEXT (will be remapped) */
    "ip\0"
    "glVertexAttribI4ivEXT\0"
    "glVertexAttribI4iv\0"
    "\0"
-   /* _mesa_function_pool[34088]: Rectfv (offset 89) */
+   /* _mesa_function_pool[34112]: Rectfv (offset 89) */
    "pp\0"
    "glRectfv\0"
    "\0"
-   /* _mesa_function_pool[34101]: LightModelf (offset 163) */
+   /* _mesa_function_pool[34125]: BlendEquationSeparateiARB (will be remapped) */
+   "iii\0"
+   "glBlendEquationSeparateiARB\0"
+   "glBlendEquationSeparateIndexedAMD\0"
+   "\0"
+   /* _mesa_function_pool[34192]: LightModelf (offset 163) */
    "if\0"
    "glLightModelf\0"
    "\0"
-   /* _mesa_function_pool[34119]: GetTexParameterfv (offset 282) */
+   /* _mesa_function_pool[34210]: GetTexParameterfv (offset 282) */
    "iip\0"
    "glGetTexParameterfv\0"
    "\0"
-   /* _mesa_function_pool[34144]: GetLightfv (offset 264) */
+   /* _mesa_function_pool[34235]: GetLightfv (offset 264) */
    "iip\0"
    "glGetLightfv\0"
    "\0"
-   /* _mesa_function_pool[34162]: PixelTransformParameterivEXT (dynamic) */
+   /* _mesa_function_pool[34253]: PixelTransformParameterivEXT (dynamic) */
    "iip\0"
    "glPixelTransformParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[34198]: BinormalPointerEXT (dynamic) */
+   /* _mesa_function_pool[34289]: BinormalPointerEXT (dynamic) */
    "iip\0"
    "glBinormalPointerEXT\0"
    "\0"
-   /* _mesa_function_pool[34224]: VertexAttrib1dNV (will be remapped) */
+   /* _mesa_function_pool[34315]: VertexAttrib1dNV (will be remapped) */
    "id\0"
    "glVertexAttrib1dNV\0"
    "\0"
-   /* _mesa_function_pool[34247]: GetCombinerInputParameterivNV (will be remapped) */
+   /* _mesa_function_pool[34338]: GetCombinerInputParameterivNV (will be remapped) */
    "iiiip\0"
    "glGetCombinerInputParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[34286]: Disable (offset 214) */
+   /* _mesa_function_pool[34377]: Disable (offset 214) */
    "i\0"
    "glDisable\0"
    "\0"
-   /* _mesa_function_pool[34299]: MultiTexCoord2fvARB (offset 387) */
+   /* _mesa_function_pool[34390]: MultiTexCoord2fvARB (offset 387) */
    "ip\0"
    "glMultiTexCoord2fv\0"
    "glMultiTexCoord2fvARB\0"
    "\0"
-   /* _mesa_function_pool[34344]: GetRenderbufferParameterivEXT (will be remapped) */
+   /* _mesa_function_pool[34435]: GetRenderbufferParameterivEXT (will be remapped) */
    "iip\0"
    "glGetRenderbufferParameteriv\0"
    "glGetRenderbufferParameterivEXT\0"
    "\0"
-   /* _mesa_function_pool[34410]: CombinerParameterivNV (will be remapped) */
+   /* _mesa_function_pool[34501]: CombinerParameterivNV (will be remapped) */
    "ip\0"
    "glCombinerParameterivNV\0"
    "\0"
-   /* _mesa_function_pool[34438]: GenFragmentShadersATI (will be remapped) */
+   /* _mesa_function_pool[34529]: GenFragmentShadersATI (will be remapped) */
    "i\0"
    "glGenFragmentShadersATI\0"
    "\0"
-   /* _mesa_function_pool[34465]: DrawArrays (offset 310) */
+   /* _mesa_function_pool[34556]: DrawArrays (offset 310) */
    "iii\0"
    "glDrawArrays\0"
    "glDrawArraysEXT\0"
    "\0"
-   /* _mesa_function_pool[34499]: WeightuivARB (dynamic) */
+   /* _mesa_function_pool[34590]: WeightuivARB (dynamic) */
    "ip\0"
    "glWeightuivARB\0"
    "\0"
-   /* _mesa_function_pool[34518]: GetVertexAttribIivEXT (will be remapped) */
+   /* _mesa_function_pool[34609]: GetVertexAttribIivEXT (will be remapped) */
    "iip\0"
    "glGetVertexAttribIivEXT\0"
    "glGetVertexAttribIiv\0"
    "\0"
-   /* _mesa_function_pool[34568]: VertexAttrib2sARB (will be remapped) */
+   /* _mesa_function_pool[34659]: VertexAttrib2sARB (will be remapped) */
    "iii\0"
    "glVertexAttrib2s\0"
    "glVertexAttrib2sARB\0"
    "\0"
-   /* _mesa_function_pool[34610]: GetnTexImageARB (will be remapped) */
+   /* _mesa_function_pool[34701]: GetnTexImageARB (will be remapped) */
    "iiiiip\0"
    "glGetnTexImageARB\0"
    "\0"
-   /* _mesa_function_pool[34636]: ColorMask (offset 210) */
+   /* _mesa_function_pool[34727]: ColorMask (offset 210) */
    "iiii\0"
    "glColorMask\0"
    "\0"
-   /* _mesa_function_pool[34654]: GenAsyncMarkersSGIX (dynamic) */
+   /* _mesa_function_pool[34745]: GenAsyncMarkersSGIX (dynamic) */
    "i\0"
    "glGenAsyncMarkersSGIX\0"
    "\0"
-   /* _mesa_function_pool[34679]: Tangent3svEXT (dynamic) */
-   "p\0"
-   "glTangent3svEXT\0"
+   /* _mesa_function_pool[34770]: DebugMessageInsertARB (will be remapped) */
+   "iiiiip\0"
+   "glDebugMessageInsertARB\0"
    "\0"
-   /* _mesa_function_pool[34698]: GetListParameterivSGIX (dynamic) */
+   /* _mesa_function_pool[34802]: GetListParameterivSGIX (dynamic) */
    "iip\0"
    "glGetListParameterivSGIX\0"
    "\0"
-   /* _mesa_function_pool[34728]: BindBufferARB (will be remapped) */
+   /* _mesa_function_pool[34832]: BindBufferARB (will be remapped) */
    "ii\0"
    "glBindBuffer\0"
    "glBindBufferARB\0"
    "\0"
-   /* _mesa_function_pool[34761]: GetInfoLogARB (will be remapped) */
+   /* _mesa_function_pool[34865]: GetInfoLogARB (will be remapped) */
    "iipp\0"
    "glGetInfoLogARB\0"
    "\0"
-   /* _mesa_function_pool[34783]: RasterPos4iv (offset 83) */
+   /* _mesa_function_pool[34887]: RasterPos4iv (offset 83) */
    "p\0"
    "glRasterPos4iv\0"
    "\0"
-   /* _mesa_function_pool[34801]: Enable (offset 215) */
+   /* _mesa_function_pool[34905]: Enable (offset 215) */
    "i\0"
    "glEnable\0"
    "\0"
-   /* _mesa_function_pool[34813]: LineStipple (offset 167) */
+   /* _mesa_function_pool[34917]: LineStipple (offset 167) */
    "ii\0"
    "glLineStipple\0"
    "\0"
-   /* _mesa_function_pool[34831]: VertexAttribs4svNV (will be remapped) */
+   /* _mesa_function_pool[34935]: VertexAttribP2ui (will be remapped) */
+   "iiii\0"
+   "glVertexAttribP2ui\0"
+   "\0"
+   /* _mesa_function_pool[34960]: VertexAttribs4svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs4svNV\0"
    "\0"
-   /* _mesa_function_pool[34857]: EdgeFlagPointerListIBM (dynamic) */
+   /* _mesa_function_pool[34986]: EdgeFlagPointerListIBM (dynamic) */
    "ipi\0"
    "glEdgeFlagPointerListIBM\0"
    "\0"
-   /* _mesa_function_pool[34887]: UniformMatrix3x2fv (will be remapped) */
+   /* _mesa_function_pool[35016]: UniformMatrix3x2fv (will be remapped) */
    "iiip\0"
    "glUniformMatrix3x2fv\0"
    "\0"
-   /* _mesa_function_pool[34914]: GetMinmaxParameterfv (offset 365) */
+   /* _mesa_function_pool[35043]: GetMinmaxParameterfv (offset 365) */
    "iip\0"
    "glGetMinmaxParameterfv\0"
    "glGetMinmaxParameterfvEXT\0"
    "\0"
-   /* _mesa_function_pool[34968]: VertexAttrib1fvARB (will be remapped) */
+   /* _mesa_function_pool[35097]: VertexAttrib1fvARB (will be remapped) */
    "ip\0"
    "glVertexAttrib1fv\0"
    "glVertexAttrib1fvARB\0"
    "\0"
-   /* _mesa_function_pool[35011]: GenBuffersARB (will be remapped) */
+   /* _mesa_function_pool[35140]: GenBuffersARB (will be remapped) */
    "ip\0"
    "glGenBuffers\0"
    "glGenBuffersARB\0"
    "\0"
-   /* _mesa_function_pool[35044]: VertexAttribs1svNV (will be remapped) */
+   /* _mesa_function_pool[35173]: VertexAttribs1svNV (will be remapped) */
    "iip\0"
    "glVertexAttribs1svNV\0"
    "\0"
-   /* _mesa_function_pool[35070]: Vertex3fv (offset 137) */
+   /* _mesa_function_pool[35199]: Vertex3fv (offset 137) */
    "p\0"
    "glVertex3fv\0"
    "\0"
-   /* _mesa_function_pool[35085]: GetTexBumpParameterivATI (will be remapped) */
+   /* _mesa_function_pool[35214]: GetTexBumpParameterivATI (will be remapped) */
    "ip\0"
    "glGetTexBumpParameterivATI\0"
    "\0"
-   /* _mesa_function_pool[35116]: Binormal3bEXT (dynamic) */
+   /* _mesa_function_pool[35245]: Binormal3bEXT (dynamic) */
    "iii\0"
    "glBinormal3bEXT\0"
    "\0"
-   /* _mesa_function_pool[35137]: FragmentMaterialivSGIX (dynamic) */
+   /* _mesa_function_pool[35266]: FragmentMaterialivSGIX (dynamic) */
    "iip\0"
    "glFragmentMaterialivSGIX\0"
    "\0"
-   /* _mesa_function_pool[35167]: IsRenderbufferEXT (will be remapped) */
+   /* _mesa_function_pool[35296]: IsRenderbufferEXT (will be remapped) */
    "i\0"
    "glIsRenderbuffer\0"
    "glIsRenderbufferEXT\0"
    "\0"
-   /* _mesa_function_pool[35207]: GenProgramsNV (will be remapped) */
+   /* _mesa_function_pool[35336]: GenProgramsNV (will be remapped) */
    "ip\0"
    "glGenProgramsARB\0"
    "glGenProgramsNV\0"
    "\0"
-   /* _mesa_function_pool[35244]: VertexAttrib4dvNV (will be remapped) */
+   /* _mesa_function_pool[35373]: VertexAttrib4dvNV (will be remapped) */
    "ip\0"
    "glVertexAttrib4dvNV\0"
    "\0"
-   /* _mesa_function_pool[35268]: EndFragmentShaderATI (will be remapped) */
+   /* _mesa_function_pool[35397]: EndFragmentShaderATI (will be remapped) */
    "\0"
    "glEndFragmentShaderATI\0"
    "\0"
-   /* _mesa_function_pool[35293]: Binormal3iEXT (dynamic) */
+   /* _mesa_function_pool[35422]: Binormal3iEXT (dynamic) */
    "iii\0"
    "glBinormal3iEXT\0"
    "\0"
-   /* _mesa_function_pool[35314]: WindowPos2fMESA (will be remapped) */
+   /* _mesa_function_pool[35443]: WindowPos2fMESA (will be remapped) */
    "ff\0"
    "glWindowPos2f\0"
    "glWindowPos2fARB\0"
@@ -5112,681 +5128,685 @@ static const char _mesa_function_pool[] =
 
 /* these functions need to be remapped */
 static const struct gl_function_pool_remap MESA_remap_table_functions[] = {
-   {  1631, AttachShader_remap_index },
-   { 10674, CreateProgram_remap_index },
-   { 24670, CreateShader_remap_index },
-   { 27244, DeleteProgram_remap_index },
-   { 20003, DeleteShader_remap_index },
-   { 25163, DetachShader_remap_index },
-   { 19250, GetAttachedShaders_remap_index },
-   {  5360, GetProgramInfoLog_remap_index },
-   {   425, GetProgramiv_remap_index },
-   {  7250, GetShaderInfoLog_remap_index },
-   { 33099, GetShaderiv_remap_index },
-   { 14223, IsProgram_remap_index },
-   { 13124, IsShader_remap_index },
-   { 10804, StencilFuncSeparate_remap_index },
-   {  4287, StencilMaskSeparate_remap_index },
-   {  8315, StencilOpSeparate_remap_index },
-   { 23904, UniformMatrix2x3fv_remap_index },
-   {  3061, UniformMatrix2x4fv_remap_index },
-   { 34887, UniformMatrix3x2fv_remap_index },
-   { 32399, UniformMatrix3x4fv_remap_index },
-   { 17352, UniformMatrix4x2fv_remap_index },
-   {  3552, UniformMatrix4x3fv_remap_index },
-   {  5583, ClampColor_remap_index },
-   { 19304, ClearBufferfi_remap_index },
-   { 18720, ClearBufferfv_remap_index },
-   { 31354, ClearBufferiv_remap_index },
-   { 14428, ClearBufferuiv_remap_index },
-   { 21426, GetStringi_remap_index },
-   {  3002, TexBuffer_remap_index },
-   {   958, FramebufferTexture_remap_index },
-   { 28280, GetBufferParameteri64v_remap_index },
-   { 10904, GetInteger64i_v_remap_index },
-   { 24984, VertexAttribDivisor_remap_index },
-   { 10692, LoadTransposeMatrixdARB_remap_index },
-   { 32828, LoadTransposeMatrixfARB_remap_index },
-   {  6268, MultTransposeMatrixdARB_remap_index },
-   { 25350, MultTransposeMatrixfARB_remap_index },
-   {   236, SampleCoverageARB_remap_index },
-   {  6513, CompressedTexImage1DARB_remap_index },
-   { 25878, CompressedTexImage2DARB_remap_index },
-   {  4350, CompressedTexImage3DARB_remap_index },
-   { 19592, CompressedTexSubImage1DARB_remap_index },
-   {  2187, CompressedTexSubImage2DARB_remap_index },
-   { 21848, CompressedTexSubImage3DARB_remap_index },
-   { 30421, GetCompressedTexImageARB_remap_index },
-   {  4144, DisableVertexAttribArrayARB_remap_index },
-   { 31964, EnableVertexAttribArrayARB_remap_index },
-   { 33942, GetProgramEnvParameterdvARB_remap_index },
-   { 25230, GetProgramEnvParameterfvARB_remap_index },
-   { 29277, GetProgramLocalParameterdvARB_remap_index },
-   {  8791, GetProgramLocalParameterfvARB_remap_index },
-   { 19768, GetProgramStringARB_remap_index },
-   { 29472, GetProgramivARB_remap_index },
-   { 22043, GetVertexAttribdvARB_remap_index },
-   { 17160, GetVertexAttribfvARB_remap_index },
-   { 10483, GetVertexAttribivARB_remap_index },
-   { 20863, ProgramEnvParameter4dARB_remap_index },
-   { 26994, ProgramEnvParameter4dvARB_remap_index },
-   { 18018, ProgramEnvParameter4fARB_remap_index },
-   {  9666, ProgramEnvParameter4fvARB_remap_index },
-   {  4313, ProgramLocalParameter4dARB_remap_index },
-   { 13933, ProgramLocalParameter4dvARB_remap_index },
-   { 31375, ProgramLocalParameter4fARB_remap_index },
-   { 27640, ProgramLocalParameter4fvARB_remap_index },
-   { 30114, ProgramStringARB_remap_index },
-   { 21157, VertexAttrib1dARB_remap_index },
-   { 16761, VertexAttrib1dvARB_remap_index },
-   {  4509, VertexAttrib1fARB_remap_index },
-   { 34968, VertexAttrib1fvARB_remap_index },
-   {  7841, VertexAttrib1sARB_remap_index },
-   {  2382, VertexAttrib1svARB_remap_index },
-   { 16174, VertexAttrib2dARB_remap_index },
-   { 18741, VertexAttrib2dvARB_remap_index },
-   {  1714, VertexAttrib2fARB_remap_index },
-   { 18854, VertexAttrib2fvARB_remap_index },
-   { 34568, VertexAttrib2sARB_remap_index },
-   { 33579, VertexAttrib2svARB_remap_index },
-   { 12108, VertexAttrib3dARB_remap_index },
-   {  9333, VertexAttrib3dvARB_remap_index },
-   {  1801, VertexAttrib3fARB_remap_index },
-   { 24221, VertexAttrib3fvARB_remap_index },
-   { 29961, VertexAttrib3sARB_remap_index },
-   { 21785, VertexAttrib3svARB_remap_index },
-   {  5403, VertexAttrib4NbvARB_remap_index },
-   { 19127, VertexAttrib4NivARB_remap_index },
-   { 24176, VertexAttrib4NsvARB_remap_index },
-   { 25182, VertexAttrib4NubARB_remap_index },
-   { 33825, VertexAttrib4NubvARB_remap_index },
-   { 20514, VertexAttrib4NuivARB_remap_index },
-   {  3382, VertexAttrib4NusvARB_remap_index },
-   { 11697, VertexAttrib4bvARB_remap_index },
-   { 28650, VertexAttrib4dARB_remap_index },
-   { 22858, VertexAttrib4dvARB_remap_index },
-   { 12262, VertexAttrib4fARB_remap_index },
-   { 12666, VertexAttrib4fvARB_remap_index },
-   { 11047, VertexAttrib4ivARB_remap_index },
-   { 18534, VertexAttrib4sARB_remap_index },
-   { 33014, VertexAttrib4svARB_remap_index },
-   { 17823, VertexAttrib4ubvARB_remap_index },
-   { 32288, VertexAttrib4uivARB_remap_index },
-   { 21596, VertexAttrib4usvARB_remap_index },
-   { 23699, VertexAttribPointerARB_remap_index },
-   { 34728, BindBufferARB_remap_index },
-   {  7548, BufferDataARB_remap_index },
-   {  1552, BufferSubDataARB_remap_index },
-   { 32574, DeleteBuffersARB_remap_index },
-   { 35011, GenBuffersARB_remap_index },
-   { 18897, GetBufferParameterivARB_remap_index },
-   { 17970, GetBufferPointervARB_remap_index },
-   {  1505, GetBufferSubDataARB_remap_index },
-   { 32236, IsBufferARB_remap_index },
-   { 28124, MapBufferARB_remap_index },
-   { 33229, UnmapBufferARB_remap_index },
-   {   332, BeginQueryARB_remap_index },
-   { 21252, DeleteQueriesARB_remap_index },
-   { 12985, EndQueryARB_remap_index },
-   { 30923, GenQueriesARB_remap_index },
-   {  2079, GetQueryObjectivARB_remap_index },
-   { 18578, GetQueryObjectuivARB_remap_index },
-   {  1858, GetQueryivARB_remap_index },
-   { 21503, IsQueryARB_remap_index },
-   {  8943, AttachObjectARB_remap_index },
-   { 19965, CompileShaderARB_remap_index },
-   {  3494, CreateProgramObjectARB_remap_index },
-   {  7493, CreateShaderObjectARB_remap_index },
-   { 15457, DeleteObjectARB_remap_index },
-   { 25669, DetachObjectARB_remap_index },
-   { 12730, GetActiveUniformARB_remap_index },
-   { 10158, GetAttachedObjectsARB_remap_index },
-   { 10465, GetHandleARB_remap_index },
-   { 34761, GetInfoLogARB_remap_index },
-   { 33896, GetObjectParameterfvARB_remap_index },
-   { 29151, GetObjectParameterivARB_remap_index },
-   { 30681, GetShaderSourceARB_remap_index },
-   { 29821, GetUniformLocationARB_remap_index },
-   { 25452, GetUniformfvARB_remap_index },
-   { 13508, GetUniformivARB_remap_index },
-   { 21641, LinkProgramARB_remap_index },
-   { 21699, ShaderSourceARB_remap_index },
-   {  8215, Uniform1fARB_remap_index },
-   { 31626, Uniform1fvARB_remap_index },
-   { 23647, Uniform1iARB_remap_index },
-   { 22496, Uniform1ivARB_remap_index },
-   {  2331, Uniform2fARB_remap_index },
-   { 15293, Uniform2fvARB_remap_index },
-   { 28011, Uniform2iARB_remap_index },
-   {  2468, Uniform2ivARB_remap_index },
-   { 20075, Uniform3fARB_remap_index },
-   { 10188, Uniform3fvARB_remap_index },
-   {  7104, Uniform3iARB_remap_index },
-   { 18076, Uniform3ivARB_remap_index },
-   { 20669, Uniform4fARB_remap_index },
-   { 25316, Uniform4fvARB_remap_index },
-   { 26603, Uniform4iARB_remap_index },
-   { 22009, Uniform4ivARB_remap_index },
-   {  8995, UniformMatrix2fvARB_remap_index },
+   {  1680, AttachShader_remap_index },
+   { 10765, CreateProgram_remap_index },
+   { 24655, CreateShader_remap_index },
+   { 27229, DeleteProgram_remap_index },
+   { 19968, DeleteShader_remap_index },
+   { 25148, DetachShader_remap_index },
+   { 19198, GetAttachedShaders_remap_index },
+   {  5460, GetProgramInfoLog_remap_index },
+   {   444, GetProgramiv_remap_index },
+   {  7308, GetShaderInfoLog_remap_index },
+   { 33162, GetShaderiv_remap_index },
+   { 14314, IsProgram_remap_index },
+   { 13215, IsShader_remap_index },
+   { 10895, StencilFuncSeparate_remap_index },
+   {  4439, StencilMaskSeparate_remap_index },
+   {  8373, StencilOpSeparate_remap_index },
+   { 23889, UniformMatrix2x3fv_remap_index },
+   {  3166, UniformMatrix2x4fv_remap_index },
+   { 35016, UniformMatrix3x2fv_remap_index },
+   { 32462, UniformMatrix3x4fv_remap_index },
+   { 17372, UniformMatrix4x2fv_remap_index },
+   {  3657, UniformMatrix4x3fv_remap_index },
+   {  5683, ClampColor_remap_index },
+   { 19252, ClearBufferfi_remap_index },
+   { 18668, ClearBufferfv_remap_index },
+   { 31442, ClearBufferiv_remap_index },
+   { 14519, ClearBufferuiv_remap_index },
+   { 21391, GetStringi_remap_index },
+   { 19810, TexBuffer_remap_index },
+   {   977, FramebufferTexture_remap_index },
+   { 28284, GetBufferParameteri64v_remap_index },
+   { 10995, GetInteger64i_v_remap_index },
+   { 24969, VertexAttribDivisor_remap_index },
+   { 10783, LoadTransposeMatrixdARB_remap_index },
+   { 32891, LoadTransposeMatrixfARB_remap_index },
+   {  6368, MultTransposeMatrixdARB_remap_index },
+   { 25335, MultTransposeMatrixfARB_remap_index },
+   {   255, SampleCoverageARB_remap_index },
+   {  6571, CompressedTexImage1DARB_remap_index },
+   { 25863, CompressedTexImage2DARB_remap_index },
+   {  4502, CompressedTexImage3DARB_remap_index },
+   { 19540, CompressedTexSubImage1DARB_remap_index },
+   {  2236, CompressedTexSubImage2DARB_remap_index },
+   { 21813, CompressedTexSubImage3DARB_remap_index },
+   { 30509, GetCompressedTexImageARB_remap_index },
+   {  4249, DisableVertexAttribArrayARB_remap_index },
+   { 32027, EnableVertexAttribArrayARB_remap_index },
+   { 33966, GetProgramEnvParameterdvARB_remap_index },
+   { 25215, GetProgramEnvParameterfvARB_remap_index },
+   { 29313, GetProgramLocalParameterdvARB_remap_index },
+   {  8849, GetProgramLocalParameterfvARB_remap_index },
+   { 19716, GetProgramStringARB_remap_index },
+   { 29508, GetProgramivARB_remap_index },
+   { 22008, GetVertexAttribdvARB_remap_index },
+   { 17180, GetVertexAttribfvARB_remap_index },
+   { 10574, GetVertexAttribivARB_remap_index },
+   { 20828, ProgramEnvParameter4dARB_remap_index },
+   { 26979, ProgramEnvParameter4dvARB_remap_index },
+   { 17966, ProgramEnvParameter4fARB_remap_index },
+   {  9724, ProgramEnvParameter4fvARB_remap_index },
+   {  4465, ProgramLocalParameter4dARB_remap_index },
+   { 14024, ProgramLocalParameter4dvARB_remap_index },
+   { 31463, ProgramLocalParameter4fARB_remap_index },
+   { 27625, ProgramLocalParameter4fvARB_remap_index },
+   { 30202, ProgramStringARB_remap_index },
+   { 21122, VertexAttrib1dARB_remap_index },
+   { 16781, VertexAttrib1dvARB_remap_index },
+   {  4661, VertexAttrib1fARB_remap_index },
+   { 35097, VertexAttrib1fvARB_remap_index },
+   {  7899, VertexAttrib1sARB_remap_index },
+   {  2431, VertexAttrib1svARB_remap_index },
+   { 16194, VertexAttrib2dARB_remap_index },
+   { 18689, VertexAttrib2dvARB_remap_index },
+   {  1763, VertexAttrib2fARB_remap_index },
+   { 18802, VertexAttrib2fvARB_remap_index },
+   { 34659, VertexAttrib2sARB_remap_index },
+   { 33603, VertexAttrib2svARB_remap_index },
+   { 12199, VertexAttrib3dARB_remap_index },
+   {  9391, VertexAttrib3dvARB_remap_index },
+   {  1850, VertexAttrib3fARB_remap_index },
+   { 24206, VertexAttrib3fvARB_remap_index },
+   { 30049, VertexAttrib3sARB_remap_index },
+   { 21750, VertexAttrib3svARB_remap_index },
+   {  5503, VertexAttrib4NbvARB_remap_index },
+   { 19075, VertexAttrib4NivARB_remap_index },
+   { 24161, VertexAttrib4NsvARB_remap_index },
+   { 25167, VertexAttrib4NubARB_remap_index },
+   { 33849, VertexAttrib4NubvARB_remap_index },
+   { 20479, VertexAttrib4NuivARB_remap_index },
+   {  3487, VertexAttrib4NusvARB_remap_index },
+   { 11788, VertexAttrib4bvARB_remap_index },
+   { 28686, VertexAttrib4dARB_remap_index },
+   { 22823, VertexAttrib4dvARB_remap_index },
+   { 12353, VertexAttrib4fARB_remap_index },
+   { 12757, VertexAttrib4fvARB_remap_index },
+   { 11138, VertexAttrib4ivARB_remap_index },
+   { 18482, VertexAttrib4sARB_remap_index },
+   { 33077, VertexAttrib4svARB_remap_index },
+   { 17771, VertexAttrib4ubvARB_remap_index },
+   { 32351, VertexAttrib4uivARB_remap_index },
+   { 21561, VertexAttrib4usvARB_remap_index },
+   { 23684, VertexAttribPointerARB_remap_index },
+   { 34832, BindBufferARB_remap_index },
+   {  7606, BufferDataARB_remap_index },
+   {  1601, BufferSubDataARB_remap_index },
+   { 32637, DeleteBuffersARB_remap_index },
+   { 35140, GenBuffersARB_remap_index },
+   { 18845, GetBufferParameterivARB_remap_index },
+   { 17918, GetBufferPointervARB_remap_index },
+   {  1554, GetBufferSubDataARB_remap_index },
+   { 32299, IsBufferARB_remap_index },
+   { 28128, MapBufferARB_remap_index },
+   { 33292, UnmapBufferARB_remap_index },
+   {   351, BeginQueryARB_remap_index },
+   { 21217, DeleteQueriesARB_remap_index },
+   { 13076, EndQueryARB_remap_index },
+   { 31011, GenQueriesARB_remap_index },
+   {  2128, GetQueryObjectivARB_remap_index },
+   { 18526, GetQueryObjectuivARB_remap_index },
+   {  1907, GetQueryivARB_remap_index },
+   { 21468, IsQueryARB_remap_index },
+   {  9001, AttachObjectARB_remap_index },
+   { 19930, CompileShaderARB_remap_index },
+   {  3599, CreateProgramObjectARB_remap_index },
+   {  7551, CreateShaderObjectARB_remap_index },
+   { 15477, DeleteObjectARB_remap_index },
+   { 25654, DetachObjectARB_remap_index },
+   { 12821, GetActiveUniformARB_remap_index },
+   { 10216, GetAttachedObjectsARB_remap_index },
+   { 10523, GetHandleARB_remap_index },
+   { 34865, GetInfoLogARB_remap_index },
+   { 33920, GetObjectParameterfvARB_remap_index },
+   { 29187, GetObjectParameterivARB_remap_index },
+   { 30769, GetShaderSourceARB_remap_index },
+   { 29909, GetUniformLocationARB_remap_index },
+   { 25437, GetUniformfvARB_remap_index },
+   { 13599, GetUniformivARB_remap_index },
+   { 21606, LinkProgramARB_remap_index },
+   { 21664, ShaderSourceARB_remap_index },
+   {  8273, Uniform1fARB_remap_index },
+   { 31689, Uniform1fvARB_remap_index },
+   { 23632, Uniform1iARB_remap_index },
+   { 22461, Uniform1ivARB_remap_index },
+   {  2380, Uniform2fARB_remap_index },
+   { 15313, Uniform2fvARB_remap_index },
+   { 27996, Uniform2iARB_remap_index },
+   {  2517, Uniform2ivARB_remap_index },
+   { 20040, Uniform3fARB_remap_index },
+   { 10246, Uniform3fvARB_remap_index },
+   {  7162, Uniform3iARB_remap_index },
+   { 18024, Uniform3ivARB_remap_index },
+   { 20634, Uniform4fARB_remap_index },
+   { 25301, Uniform4fvARB_remap_index },
+   { 26588, Uniform4iARB_remap_index },
+   { 21974, Uniform4ivARB_remap_index },
+   {  9053, UniformMatrix2fvARB_remap_index },
    {    17, UniformMatrix3fvARB_remap_index },
-   {  2904, UniformMatrix4fvARB_remap_index },
-   { 27106, UseProgramObjectARB_remap_index },
-   { 15862, ValidateProgramARB_remap_index },
-   { 22901, BindAttribLocationARB_remap_index },
-   {  5448, GetActiveAttribARB_remap_index },
-   { 17690, GetAttribLocationARB_remap_index },
-   { 31286, DrawBuffersARB_remap_index },
-   { 31119, ClampColorARB_remap_index },
-   { 19172, DrawArraysInstancedARB_remap_index },
-   {  7165, DrawElementsInstancedARB_remap_index },
-   { 14038, RenderbufferStorageMultisample_remap_index },
-   { 14509, FramebufferTextureARB_remap_index },
-   { 27542, FramebufferTextureFaceARB_remap_index },
-   { 25818, ProgramParameteriARB_remap_index },
-   {  6685, VertexAttribDivisorARB_remap_index },
-   { 20717, FlushMappedBufferRange_remap_index },
-   { 29588, MapBufferRange_remap_index },
-   { 29495, TexBufferARB_remap_index },
-   { 17490, BindVertexArray_remap_index },
-   { 15666, GenVertexArrays_remap_index },
-   { 32166, CopyBufferSubData_remap_index },
-   { 33118, ClientWaitSync_remap_index },
-   {  2823, DeleteSync_remap_index },
-   {  7882, FenceSync_remap_index },
-   { 16233, GetInteger64v_remap_index },
-   { 24283, GetSynciv_remap_index },
-   { 31225, IsSync_remap_index },
-   { 10089, WaitSync_remap_index },
-   {  4112, DrawElementsBaseVertex_remap_index },
-   { 19820, DrawElementsInstancedBaseVertex_remap_index },
-   { 32478, DrawRangeElementsBaseVertex_remap_index },
-   { 28155, MultiDrawElementsBaseVertex_remap_index },
-   { 17756, BlendEquationSeparateiARB_remap_index },
-   { 18990, BlendEquationiARB_remap_index },
-   { 13447, BlendFuncSeparateiARB_remap_index },
-   { 10531, BlendFunciARB_remap_index },
-   {  8857, BindSampler_remap_index },
-   {  4488, DeleteSamplers_remap_index },
-   { 21090, GenSamplers_remap_index },
-   { 31157, GetSamplerParameterIiv_remap_index },
-   { 20611, GetSamplerParameterIuiv_remap_index },
-   {  5280, GetSamplerParameterfv_remap_index },
-   { 27263, GetSamplerParameteriv_remap_index },
-   { 15211, IsSampler_remap_index },
-   { 17443, SamplerParameterIiv_remap_index },
-   { 32517, SamplerParameterIuiv_remap_index },
-   { 23956, SamplerParameterf_remap_index },
-   { 17617, SamplerParameterfv_remap_index },
-   { 23931, SamplerParameteri_remap_index },
-   { 19366, SamplerParameteriv_remap_index },
-   { 20173, ColorP3ui_remap_index },
-   { 32765, ColorP3uiv_remap_index },
-   { 22602, ColorP4ui_remap_index },
-   {  4255, ColorP4uiv_remap_index },
-   { 26805, MultiTexCoordP1ui_remap_index },
-   { 13421, MultiTexCoordP1uiv_remap_index },
-   {  1689, MultiTexCoordP2ui_remap_index },
-   { 31938, MultiTexCoordP2uiv_remap_index },
-   { 14823, MultiTexCoordP3ui_remap_index },
-   { 11123, MultiTexCoordP3uiv_remap_index },
-   { 23500, MultiTexCoordP4ui_remap_index },
-   {  3974, MultiTexCoordP4uiv_remap_index },
-   { 31584, NormalP3ui_remap_index },
-   { 20349, NormalP3uiv_remap_index },
-   { 26508, SecondaryColorP3ui_remap_index },
-   { 20367, SecondaryColorP3uiv_remap_index },
-   {  2804, TexCoordP1ui_remap_index },
-   {  2571, TexCoordP1uiv_remap_index },
-   { 15742, TexCoordP2ui_remap_index },
-   {   216, TexCoordP2uiv_remap_index },
-   {  6392, TexCoordP3ui_remap_index },
-   { 23884, TexCoordP3uiv_remap_index },
-   {  1987, TexCoordP4ui_remap_index },
-   {  5852, TexCoordP4uiv_remap_index },
-   { 10574, VertexAttribP1ui_remap_index },
-   { 15010, VertexAttribP1uiv_remap_index },
-   { 31601, VertexAttribP2ui_remap_index },
-   {  5644, VertexAttribP2uiv_remap_index },
-   {  3447, VertexAttribP3ui_remap_index },
-   { 21108, VertexAttribP3uiv_remap_index },
-   { 15036, VertexAttribP4ui_remap_index },
-   { 17018, VertexAttribP4uiv_remap_index },
-   {  5386, VertexP2ui_remap_index },
-   { 16588, VertexP2uiv_remap_index },
-   {  2451, VertexP3ui_remap_index },
-   { 17538, VertexP3uiv_remap_index },
-   { 10117, VertexP4ui_remap_index },
-   {  3429, VertexP4uiv_remap_index },
-   {  5670, BindTransformFeedback_remap_index },
-   {  3521, DeleteTransformFeedbacks_remap_index },
-   {  7137, DrawTransformFeedback_remap_index },
-   { 10325, GenTransformFeedbacks_remap_index },
-   { 30004, IsTransformFeedback_remap_index },
-   { 27735, PauseTransformFeedback_remap_index },
-   {  6153, ResumeTransformFeedback_remap_index },
-   { 23221, ClearDepthf_remap_index },
-   {  7441, DepthRangef_remap_index },
-   { 15478, GetShaderPrecisionFormat_remap_index },
-   { 10744, ReleaseShaderCompiler_remap_index },
-   { 11740, ShaderBinary_remap_index },
-   {   985, GetGraphicsResetStatusARB_remap_index },
-   { 26383, GetnColorTableARB_remap_index },
-   {  8626, GetnCompressedTexImageARB_remap_index },
-   {  4204, GetnConvolutionFilterARB_remap_index },
-   { 16804, GetnHistogramARB_remap_index },
-   { 25142, GetnMapdvARB_remap_index },
-   { 23678, GetnMapfvARB_remap_index },
-   {  2310, GetnMapivARB_remap_index },
-   { 18338, GetnMinmaxARB_remap_index },
-   {  4876, GetnPixelMapfvARB_remap_index },
-   { 20488, GetnPixelMapuivARB_remap_index },
-   {  3174, GetnPixelMapusvARB_remap_index },
-   {  1385, GetnPolygonStippleARB_remap_index },
-   { 22686, GetnSeparableFilterARB_remap_index },
-   { 34610, GetnTexImageARB_remap_index },
-   { 19795, GetnUniformdvARB_remap_index },
-   {  4977, GetnUniformfvARB_remap_index },
-   { 10599, GetnUniformivARB_remap_index },
-   { 24132, GetnUniformuivARB_remap_index },
-   {  3088, ReadnPixelsARB_remap_index },
-   {  1272, TexStorage1D_remap_index },
-   {  4766, TexStorage2D_remap_index },
-   { 30610, TexStorage3D_remap_index },
-   {  4901, TextureStorage1DEXT_remap_index },
-   { 30391, TextureStorage2DEXT_remap_index },
-   { 30185, TextureStorage3DEXT_remap_index },
-   {  6021, PolygonOffsetEXT_remap_index },
-   { 24905, GetPixelTexGenParameterfvSGIS_remap_index },
-   {  4826, GetPixelTexGenParameterivSGIS_remap_index },
-   { 24638, PixelTexGenParameterfSGIS_remap_index },
-   {   644, PixelTexGenParameterfvSGIS_remap_index },
-   { 13546, PixelTexGenParameteriSGIS_remap_index },
-   { 14683, PixelTexGenParameterivSGIS_remap_index },
-   { 19491, SampleMaskSGIS_remap_index },
-   { 21443, SamplePatternSGIS_remap_index },
-   { 28084, ColorPointerEXT_remap_index },
-   { 18784, EdgeFlagPointerEXT_remap_index },
-   {  6758, IndexPointerEXT_remap_index },
-   {  6838, NormalPointerEXT_remap_index },
-   { 16872, TexCoordPointerEXT_remap_index },
-   {  7671, VertexPointerEXT_remap_index },
-   {  3888, PointParameterfEXT_remap_index },
-   {  8522, PointParameterfvEXT_remap_index },
-   { 33994, LockArraysEXT_remap_index },
-   { 15926, UnlockArraysEXT_remap_index },
-   {  1293, SecondaryColor3bEXT_remap_index },
-   {  8715, SecondaryColor3bvEXT_remap_index },
-   { 11250, SecondaryColor3dEXT_remap_index },
-   { 27312, SecondaryColor3dvEXT_remap_index },
-   { 29870, SecondaryColor3fEXT_remap_index },
-   { 19528, SecondaryColor3fvEXT_remap_index },
-   {   490, SecondaryColor3iEXT_remap_index },
-   { 17208, SecondaryColor3ivEXT_remap_index },
-   { 10832, SecondaryColor3sEXT_remap_index },
-   { 32782, SecondaryColor3svEXT_remap_index },
-   { 28987, SecondaryColor3ubEXT_remap_index },
-   { 22792, SecondaryColor3ubvEXT_remap_index },
-   { 13788, SecondaryColor3uiEXT_remap_index },
-   { 24525, SecondaryColor3uivEXT_remap_index },
-   { 27592, SecondaryColor3usEXT_remap_index },
-   { 13861, SecondaryColor3usvEXT_remap_index },
-   { 12609, SecondaryColorPointerEXT_remap_index },
-   { 27406, MultiDrawArraysEXT_remap_index },
-   { 22431, MultiDrawElementsEXT_remap_index },
-   { 22642, FogCoordPointerEXT_remap_index },
-   {  5028, FogCoorddEXT_remap_index },
-   { 33395, FogCoorddvEXT_remap_index },
-   {  5145, FogCoordfEXT_remap_index },
-   { 28910, FogCoordfvEXT_remap_index },
-   { 12709, PixelTexGenSGIX_remap_index },
-   { 29515, BlendFuncSeparateEXT_remap_index },
-   {  7583, FlushVertexArrayRangeNV_remap_index },
-   {  5970, VertexArrayRangeNV_remap_index },
-   { 29935, CombinerInputNV_remap_index },
-   {  2253, CombinerOutputNV_remap_index },
-   { 32935, CombinerParameterfNV_remap_index },
-   {  5824, CombinerParameterfvNV_remap_index },
-   { 23981, CombinerParameteriNV_remap_index },
-   { 34410, CombinerParameterivNV_remap_index },
-   {  7959, FinalCombinerInputNV_remap_index },
-   {  1650, GetCombinerInputParameterfvNV_remap_index },
-   { 34247, GetCombinerInputParameterivNV_remap_index },
-   { 14784, GetCombinerOutputParameterfvNV_remap_index },
-   { 14612, GetCombinerOutputParameterivNV_remap_index },
-   {  7345, GetFinalCombinerInputParameterfvNV_remap_index },
-   { 26450, GetFinalCombinerInputParameterivNV_remap_index },
-   { 13399, ResizeBuffersMESA_remap_index },
-   { 11935, WindowPos2dMESA_remap_index },
-   {  1065, WindowPos2dvMESA_remap_index },
-   { 35314, WindowPos2fMESA_remap_index },
-   {  8660, WindowPos2fvMESA_remap_index },
-   { 19438, WindowPos2iMESA_remap_index },
-   { 21916, WindowPos2ivMESA_remap_index },
-   { 22530, WindowPos2sMESA_remap_index },
-   {  6427, WindowPos2svMESA_remap_index },
-   {  8451, WindowPos3dMESA_remap_index },
-   { 14955, WindowPos3dvMESA_remap_index },
-   {   536, WindowPos3fMESA_remap_index },
-   { 15987, WindowPos3fvMESA_remap_index },
-   { 25711, WindowPos3iMESA_remap_index },
-   { 32111, WindowPos3ivMESA_remap_index },
-   { 20236, WindowPos3sMESA_remap_index },
-   { 33651, WindowPos3svMESA_remap_index },
-   { 11886, WindowPos4dMESA_remap_index },
-   { 18214, WindowPos4dvMESA_remap_index },
-   { 14914, WindowPos4fMESA_remap_index },
-   { 32672, WindowPos4fvMESA_remap_index },
-   { 32264, WindowPos4iMESA_remap_index },
-   { 13238, WindowPos4ivMESA_remap_index },
-   { 20464, WindowPos4sMESA_remap_index },
-   {  3472, WindowPos4svMESA_remap_index },
-   { 14651, MultiModeDrawArraysIBM_remap_index },
-   { 30794, MultiModeDrawElementsIBM_remap_index },
-   { 13013, DeleteFencesNV_remap_index },
-   { 29782, FinishFenceNV_remap_index },
-   {  4036, GenFencesNV_remap_index },
-   { 18194, GetFenceivNV_remap_index },
-   {  8928, IsFenceNV_remap_index },
-   { 14539, SetFenceNV_remap_index },
-   {  4565, TestFenceNV_remap_index },
-   { 33622, AreProgramsResidentNV_remap_index },
-   { 32977, BindProgramNV_remap_index },
-   { 27675, DeleteProgramsNV_remap_index },
-   { 23010, ExecuteProgramNV_remap_index },
-   { 35207, GenProgramsNV_remap_index },
-   { 25010, GetProgramParameterdvNV_remap_index },
-   { 11312, GetProgramParameterfvNV_remap_index },
-   { 28058, GetProgramStringNV_remap_index },
-   { 26088, GetProgramivNV_remap_index },
-   { 25265, GetTrackMatrixivNV_remap_index },
-   { 27852, GetVertexAttribPointervNV_remap_index },
-   { 10927, GetVertexAttribdvNV_remap_index },
-   {  9984, GetVertexAttribfvNV_remap_index },
-   { 19741, GetVertexAttribivNV_remap_index },
-   { 20747, IsProgramNV_remap_index },
-   { 10067, LoadProgramNV_remap_index },
-   { 29611, ProgramParameters4dvNV_remap_index },
-   { 26018, ProgramParameters4fvNV_remap_index },
-   { 22220, RequestResidentProgramsNV_remap_index },
-   { 32456, TrackMatrixNV_remap_index },
-   { 34224, VertexAttrib1dNV_remap_index },
-   { 14450, VertexAttrib1dvNV_remap_index },
-   { 30247, VertexAttrib1fNV_remap_index },
-   {  2610, VertexAttrib1fvNV_remap_index },
-   { 32729, VertexAttrib1sNV_remap_index },
-   { 16060, VertexAttrib1svNV_remap_index },
-   {  5336, VertexAttrib2dNV_remap_index },
-   { 14343, VertexAttrib2dvNV_remap_index },
-   { 21675, VertexAttrib2fNV_remap_index },
-   { 13909, VertexAttrib2fvNV_remap_index },
-   {  6639, VertexAttrib2sNV_remap_index },
-   { 20290, VertexAttrib2svNV_remap_index },
-   { 12083, VertexAttrib3dNV_remap_index },
-   { 33872, VertexAttrib3dvNV_remap_index },
-   { 11098, VertexAttrib3fNV_remap_index },
-   { 26410, VertexAttrib3fvNV_remap_index },
-   { 23754, VertexAttrib3sNV_remap_index },
-   { 25292, VertexAttrib3svNV_remap_index },
-   { 30768, VertexAttrib4dNV_remap_index },
-   { 35244, VertexAttrib4dvNV_remap_index },
-   {  5764, VertexAttrib4fNV_remap_index },
-   { 10134, VertexAttrib4fvNV_remap_index },
-   { 28534, VertexAttrib4sNV_remap_index },
-   {  1463, VertexAttrib4svNV_remap_index },
-   {  5511, VertexAttrib4ubNV_remap_index },
-   {   798, VertexAttrib4ubvNV_remap_index },
-   { 23190, VertexAttribPointerNV_remap_index },
-   {  2425, VertexAttribs1dvNV_remap_index },
-   { 27940, VertexAttribs1fvNV_remap_index },
-   { 35044, VertexAttribs1svNV_remap_index },
-   { 11149, VertexAttribs2dvNV_remap_index },
-   { 27067, VertexAttribs2fvNV_remap_index },
-   { 18810, VertexAttribs2svNV_remap_index },
-   {  5872, VertexAttribs3dvNV_remap_index },
-   {  2284, VertexAttribs3fvNV_remap_index },
-   { 31833, VertexAttribs3svNV_remap_index },
-   { 28624, VertexAttribs4dvNV_remap_index },
-   {  5944, VertexAttribs4fvNV_remap_index },
-   { 34831, VertexAttribs4svNV_remap_index },
-   { 31539, VertexAttribs4ubvNV_remap_index },
-   { 28694, GetTexBumpParameterfvATI_remap_index },
-   { 35085, GetTexBumpParameterivATI_remap_index },
-   { 19918, TexBumpParameterfvATI_remap_index },
-   { 22091, TexBumpParameterivATI_remap_index },
-   { 16624, AlphaFragmentOp1ATI_remap_index },
-   { 27358, AlphaFragmentOp2ATI_remap_index },
-   { 26326, AlphaFragmentOp3ATI_remap_index },
-   { 31760, BeginFragmentShaderATI_remap_index },
-   { 33176, BindFragmentShaderATI_remap_index },
-   { 25421, ColorFragmentOp1ATI_remap_index },
-   {  4732, ColorFragmentOp2ATI_remap_index },
-   { 33517, ColorFragmentOp3ATI_remap_index },
-   {  6110, DeleteFragmentShaderATI_remap_index },
-   { 35268, EndFragmentShaderATI_remap_index },
-   { 34438, GenFragmentShadersATI_remap_index },
-   { 27221, PassTexCoordATI_remap_index },
-   {  7651, SampleMapATI_remap_index },
-   { 28805, SetFragmentShaderConstantATI_remap_index },
-   {   383, PointParameteriNV_remap_index },
-   { 15167, PointParameterivNV_remap_index },
-   { 30584, ActiveStencilFaceEXT_remap_index },
-   { 29251, BindVertexArrayAPPLE_remap_index },
-   {  2951, DeleteVertexArraysAPPLE_remap_index },
-   { 19277, GenVertexArraysAPPLE_remap_index },
-   { 25075, IsVertexArrayAPPLE_remap_index },
-   {   839, GetProgramNamedParameterdvNV_remap_index },
-   {  3851, GetProgramNamedParameterfvNV_remap_index },
-   { 28725, ProgramNamedParameter4dNV_remap_index },
-   { 15541, ProgramNamedParameter4dvNV_remap_index },
-   {  9600, ProgramNamedParameter4fNV_remap_index },
-   { 12574, ProgramNamedParameter4fvNV_remap_index },
-   { 18125, PrimitiveRestartIndexNV_remap_index },
-   { 32649, PrimitiveRestartNV_remap_index },
-   { 25997, DepthBoundsEXT_remap_index },
-   {  1164, BlendEquationSeparateEXT_remap_index },
-   { 15761, BindFramebufferEXT_remap_index },
-   { 27451, BindRenderbufferEXT_remap_index },
-   { 10381, CheckFramebufferStatusEXT_remap_index },
-   { 24326, DeleteFramebuffersEXT_remap_index },
-   { 33774, DeleteRenderbuffersEXT_remap_index },
-   { 14367, FramebufferRenderbufferEXT_remap_index },
-   { 14556, FramebufferTexture1DEXT_remap_index },
-   { 12368, FramebufferTexture2DEXT_remap_index },
-   { 11988, FramebufferTexture3DEXT_remap_index },
-   { 24941, GenFramebuffersEXT_remap_index },
-   { 18675, GenRenderbuffersEXT_remap_index },
-   {  7387, GenerateMipmapEXT_remap_index },
-   { 23283, GetFramebufferAttachmentParameterivEXT_remap_index },
-   { 34344, GetRenderbufferParameterivEXT_remap_index },
-   { 21971, IsFramebufferEXT_remap_index },
-   { 35167, IsRenderbufferEXT_remap_index },
-   {  8875, RenderbufferStorageEXT_remap_index },
-   {   715, BlitFramebufferEXT_remap_index },
-   { 15327, BufferParameteriAPPLE_remap_index },
-   { 20779, FlushMappedBufferRangeAPPLE_remap_index },
-   {  1933, BindFragDataLocationEXT_remap_index },
-   { 26110, GetFragDataLocationEXT_remap_index },
-   { 11427, GetUniformuivEXT_remap_index },
-   { 34518, GetVertexAttribIivEXT_remap_index },
-   {  4582, GetVertexAttribIuivEXT_remap_index },
-   { 12846, Uniform1uiEXT_remap_index },
-   { 29696, Uniform1uivEXT_remap_index },
-   { 23850, Uniform2uiEXT_remap_index },
-   {  4696, Uniform2uivEXT_remap_index },
-   { 31047, Uniform3uiEXT_remap_index },
-   { 15688, Uniform3uivEXT_remap_index },
-   {  3775, Uniform4uiEXT_remap_index },
-   {  9376, Uniform4uivEXT_remap_index },
-   { 19656, VertexAttribI1iEXT_remap_index },
-   {  5538, VertexAttribI1ivEXT_remap_index },
-   {  2711, VertexAttribI1uiEXT_remap_index },
-   { 13637, VertexAttribI1uivEXT_remap_index },
+   {  2953, UniformMatrix4fvARB_remap_index },
+   { 27091, UseProgramObjectARB_remap_index },
+   { 15882, ValidateProgramARB_remap_index },
+   { 22866, BindAttribLocationARB_remap_index },
+   {  5548, GetActiveAttribARB_remap_index },
+   { 17705, GetAttribLocationARB_remap_index },
+   { 31374, DrawBuffersARB_remap_index },
+   { 31207, ClampColorARB_remap_index },
+   { 19120, DrawArraysInstancedARB_remap_index },
+   {  7223, DrawElementsInstancedARB_remap_index },
+   { 14129, RenderbufferStorageMultisample_remap_index },
+   { 14600, FramebufferTextureARB_remap_index },
+   { 27527, FramebufferTextureFaceARB_remap_index },
+   { 25803, ProgramParameteriARB_remap_index },
+   {  6743, VertexAttribDivisorARB_remap_index },
+   { 20682, FlushMappedBufferRange_remap_index },
+   { 29624, MapBufferRange_remap_index },
+   { 29531, TexBufferARB_remap_index },
+   { 17510, BindVertexArray_remap_index },
+   { 15686, GenVertexArrays_remap_index },
+   { 32229, CopyBufferSubData_remap_index },
+   { 33181, ClientWaitSync_remap_index },
+   {  2872, DeleteSync_remap_index },
+   {  7940, FenceSync_remap_index },
+   { 16253, GetInteger64v_remap_index },
+   { 24268, GetSynciv_remap_index },
+   { 31313, IsSync_remap_index },
+   { 10147, WaitSync_remap_index },
+   {  4217, DrawElementsBaseVertex_remap_index },
+   { 19768, DrawElementsInstancedBaseVertex_remap_index },
+   { 32541, DrawRangeElementsBaseVertex_remap_index },
+   { 28159, MultiDrawElementsBaseVertex_remap_index },
+   { 34125, BlendEquationSeparateiARB_remap_index },
+   { 18938, BlendEquationiARB_remap_index },
+   { 13538, BlendFuncSeparateiARB_remap_index },
+   { 10622, BlendFunciARB_remap_index },
+   {  8915, BindSampler_remap_index },
+   {  4640, DeleteSamplers_remap_index },
+   { 21055, GenSamplers_remap_index },
+   { 31245, GetSamplerParameterIiv_remap_index },
+   { 20576, GetSamplerParameterIuiv_remap_index },
+   {  5380, GetSamplerParameterfv_remap_index },
+   { 27248, GetSamplerParameteriv_remap_index },
+   { 15231, IsSampler_remap_index },
+   { 17463, SamplerParameterIiv_remap_index },
+   { 32580, SamplerParameterIuiv_remap_index },
+   { 23941, SamplerParameterf_remap_index },
+   { 17637, SamplerParameterfv_remap_index },
+   { 23916, SamplerParameteri_remap_index },
+   { 19314, SamplerParameteriv_remap_index },
+   { 20138, ColorP3ui_remap_index },
+   { 32828, ColorP3uiv_remap_index },
+   { 22567, ColorP4ui_remap_index },
+   {  4407, ColorP4uiv_remap_index },
+   { 26790, MultiTexCoordP1ui_remap_index },
+   { 13512, MultiTexCoordP1uiv_remap_index },
+   {  1738, MultiTexCoordP2ui_remap_index },
+   { 32001, MultiTexCoordP2uiv_remap_index },
+   { 14843, MultiTexCoordP3ui_remap_index },
+   { 11214, MultiTexCoordP3uiv_remap_index },
+   { 23465, MultiTexCoordP4ui_remap_index },
+   {  4079, MultiTexCoordP4uiv_remap_index },
+   { 31672, NormalP3ui_remap_index },
+   { 20314, NormalP3uiv_remap_index },
+   { 26493, SecondaryColorP3ui_remap_index },
+   { 20332, SecondaryColorP3uiv_remap_index },
+   {  2853, TexCoordP1ui_remap_index },
+   {  2620, TexCoordP1uiv_remap_index },
+   { 15762, TexCoordP2ui_remap_index },
+   { 23490, TexCoordP2uiv_remap_index },
+   {  6450, TexCoordP3ui_remap_index },
+   { 23869, TexCoordP3uiv_remap_index },
+   {  2036, TexCoordP4ui_remap_index },
+   {  5952, TexCoordP4uiv_remap_index },
+   { 10665, VertexAttribP1ui_remap_index },
+   { 15030, VertexAttribP1uiv_remap_index },
+   { 34935, VertexAttribP2ui_remap_index },
+   {  5744, VertexAttribP2uiv_remap_index },
+   {  3552, VertexAttribP3ui_remap_index },
+   { 21073, VertexAttribP3uiv_remap_index },
+   { 15056, VertexAttribP4ui_remap_index },
+   { 17038, VertexAttribP4uiv_remap_index },
+   {  5486, VertexP2ui_remap_index },
+   { 16608, VertexP2uiv_remap_index },
+   {  2500, VertexP3ui_remap_index },
+   { 17558, VertexP3uiv_remap_index },
+   { 10175, VertexP4ui_remap_index },
+   {  3534, VertexP4uiv_remap_index },
+   {  5770, BindTransformFeedback_remap_index },
+   {  3626, DeleteTransformFeedbacks_remap_index },
+   {  7195, DrawTransformFeedback_remap_index },
+   { 10383, GenTransformFeedbacks_remap_index },
+   { 30092, IsTransformFeedback_remap_index },
+   { 27720, PauseTransformFeedback_remap_index },
+   {  6253, ResumeTransformFeedback_remap_index },
+   { 23186, ClearDepthf_remap_index },
+   {  7499, DepthRangef_remap_index },
+   { 15498, GetShaderPrecisionFormat_remap_index },
+   { 10835, ReleaseShaderCompiler_remap_index },
+   { 11831, ShaderBinary_remap_index },
+   {  1482, DebugMessageCallbackARB_remap_index },
+   { 10541, DebugMessageControlARB_remap_index },
+   { 34770, DebugMessageInsertARB_remap_index },
+   {  3051, GetDebugMessageLogARB_remap_index },
+   {  1004, GetGraphicsResetStatusARB_remap_index },
+   { 26368, GetnColorTableARB_remap_index },
+   {  8684, GetnCompressedTexImageARB_remap_index },
+   {  4356, GetnConvolutionFilterARB_remap_index },
+   { 16824, GetnHistogramARB_remap_index },
+   { 25127, GetnMapdvARB_remap_index },
+   { 23663, GetnMapfvARB_remap_index },
+   {  2359, GetnMapivARB_remap_index },
+   { 18286, GetnMinmaxARB_remap_index },
+   {  4976, GetnPixelMapfvARB_remap_index },
+   { 20453, GetnPixelMapuivARB_remap_index },
+   {  3279, GetnPixelMapusvARB_remap_index },
+   {  1404, GetnPolygonStippleARB_remap_index },
+   { 22651, GetnSeparableFilterARB_remap_index },
+   { 34701, GetnTexImageARB_remap_index },
+   { 19743, GetnUniformdvARB_remap_index },
+   {  5077, GetnUniformfvARB_remap_index },
+   { 10690, GetnUniformivARB_remap_index },
+   { 24117, GetnUniformuivARB_remap_index },
+   {  3193, ReadnPixelsARB_remap_index },
+   {  1291, TexStorage1D_remap_index },
+   {  4866, TexStorage2D_remap_index },
+   { 30698, TexStorage3D_remap_index },
+   {  5001, TextureStorage1DEXT_remap_index },
+   { 30479, TextureStorage2DEXT_remap_index },
+   { 30273, TextureStorage3DEXT_remap_index },
+   {  6121, PolygonOffsetEXT_remap_index },
+   { 24890, GetPixelTexGenParameterfvSGIS_remap_index },
+   {  4926, GetPixelTexGenParameterivSGIS_remap_index },
+   { 24623, PixelTexGenParameterfSGIS_remap_index },
+   {   663, PixelTexGenParameterfvSGIS_remap_index },
+   { 13637, PixelTexGenParameteriSGIS_remap_index },
+   { 14742, PixelTexGenParameterivSGIS_remap_index },
+   { 19439, SampleMaskSGIS_remap_index },
+   { 21408, SamplePatternSGIS_remap_index },
+   { 28069, ColorPointerEXT_remap_index },
+   { 18732, EdgeFlagPointerEXT_remap_index },
+   {  6816, IndexPointerEXT_remap_index },
+   {  6896, NormalPointerEXT_remap_index },
+   { 16892, TexCoordPointerEXT_remap_index },
+   {  7729, VertexPointerEXT_remap_index },
+   {  3993, PointParameterfEXT_remap_index },
+   {  8580, PointParameterfvEXT_remap_index },
+   { 34018, LockArraysEXT_remap_index },
+   { 15946, UnlockArraysEXT_remap_index },
+   {  1312, SecondaryColor3bEXT_remap_index },
+   {  8773, SecondaryColor3bvEXT_remap_index },
+   { 11341, SecondaryColor3dEXT_remap_index },
+   { 27297, SecondaryColor3dvEXT_remap_index },
+   { 29958, SecondaryColor3fEXT_remap_index },
+   { 19476, SecondaryColor3fvEXT_remap_index },
+   {   509, SecondaryColor3iEXT_remap_index },
+   { 17228, SecondaryColor3ivEXT_remap_index },
+   { 10923, SecondaryColor3sEXT_remap_index },
+   { 32845, SecondaryColor3svEXT_remap_index },
+   { 29023, SecondaryColor3ubEXT_remap_index },
+   { 22757, SecondaryColor3ubvEXT_remap_index },
+   { 13879, SecondaryColor3uiEXT_remap_index },
+   { 24510, SecondaryColor3uivEXT_remap_index },
+   { 27577, SecondaryColor3usEXT_remap_index },
+   { 13952, SecondaryColor3usvEXT_remap_index },
+   { 12700, SecondaryColorPointerEXT_remap_index },
+   { 27391, MultiDrawArraysEXT_remap_index },
+   { 22396, MultiDrawElementsEXT_remap_index },
+   { 22607, FogCoordPointerEXT_remap_index },
+   {  5128, FogCoorddEXT_remap_index },
+   { 33419, FogCoorddvEXT_remap_index },
+   {  5245, FogCoordfEXT_remap_index },
+   { 28946, FogCoordfvEXT_remap_index },
+   { 12800, PixelTexGenSGIX_remap_index },
+   { 29551, BlendFuncSeparateEXT_remap_index },
+   {  7641, FlushVertexArrayRangeNV_remap_index },
+   {  6070, VertexArrayRangeNV_remap_index },
+   { 30023, CombinerInputNV_remap_index },
+   {  2302, CombinerOutputNV_remap_index },
+   { 32998, CombinerParameterfNV_remap_index },
+   {  5924, CombinerParameterfvNV_remap_index },
+   { 23966, CombinerParameteriNV_remap_index },
+   { 34501, CombinerParameterivNV_remap_index },
+   {  8017, FinalCombinerInputNV_remap_index },
+   {  1699, GetCombinerInputParameterfvNV_remap_index },
+   { 34338, GetCombinerInputParameterivNV_remap_index },
+   {   216, GetCombinerOutputParameterfvNV_remap_index },
+   { 14703, GetCombinerOutputParameterivNV_remap_index },
+   {  7403, GetFinalCombinerInputParameterfvNV_remap_index },
+   { 26435, GetFinalCombinerInputParameterivNV_remap_index },
+   { 13490, ResizeBuffersMESA_remap_index },
+   { 12026, WindowPos2dMESA_remap_index },
+   {  1084, WindowPos2dvMESA_remap_index },
+   { 35443, WindowPos2fMESA_remap_index },
+   {  8718, WindowPos2fvMESA_remap_index },
+   { 19386, WindowPos2iMESA_remap_index },
+   { 21881, WindowPos2ivMESA_remap_index },
+   { 22495, WindowPos2sMESA_remap_index },
+   {  6485, WindowPos2svMESA_remap_index },
+   {  8509, WindowPos3dMESA_remap_index },
+   { 14975, WindowPos3dvMESA_remap_index },
+   {   555, WindowPos3fMESA_remap_index },
+   { 16007, WindowPos3fvMESA_remap_index },
+   { 25696, WindowPos3iMESA_remap_index },
+   { 32174, WindowPos3ivMESA_remap_index },
+   { 20201, WindowPos3sMESA_remap_index },
+   { 33675, WindowPos3svMESA_remap_index },
+   { 11977, WindowPos4dMESA_remap_index },
+   { 18162, WindowPos4dvMESA_remap_index },
+   { 14934, WindowPos4fMESA_remap_index },
+   { 32735, WindowPos4fvMESA_remap_index },
+   { 32327, WindowPos4iMESA_remap_index },
+   { 13329, WindowPos4ivMESA_remap_index },
+   { 20429, WindowPos4sMESA_remap_index },
+   {  3577, WindowPos4svMESA_remap_index },
+   { 28654, MultiModeDrawArraysIBM_remap_index },
+   { 30882, MultiModeDrawElementsIBM_remap_index },
+   { 13104, DeleteFencesNV_remap_index },
+   { 29870, FinishFenceNV_remap_index },
+   {  4141, GenFencesNV_remap_index },
+   { 18142, GetFenceivNV_remap_index },
+   {  8986, IsFenceNV_remap_index },
+   { 14630, SetFenceNV_remap_index },
+   {  4717, TestFenceNV_remap_index },
+   { 33646, AreProgramsResidentNV_remap_index },
+   { 33040, BindProgramNV_remap_index },
+   { 27660, DeleteProgramsNV_remap_index },
+   { 22975, ExecuteProgramNV_remap_index },
+   { 35336, GenProgramsNV_remap_index },
+   { 24995, GetProgramParameterdvNV_remap_index },
+   { 11403, GetProgramParameterfvNV_remap_index },
+   { 28043, GetProgramStringNV_remap_index },
+   { 26073, GetProgramivNV_remap_index },
+   { 25250, GetTrackMatrixivNV_remap_index },
+   { 27837, GetVertexAttribPointervNV_remap_index },
+   { 11018, GetVertexAttribdvNV_remap_index },
+   { 10042, GetVertexAttribfvNV_remap_index },
+   { 19689, GetVertexAttribivNV_remap_index },
+   { 20712, IsProgramNV_remap_index },
+   { 10125, LoadProgramNV_remap_index },
+   { 29647, ProgramParameters4dvNV_remap_index },
+   { 26003, ProgramParameters4fvNV_remap_index },
+   { 22185, RequestResidentProgramsNV_remap_index },
+   { 32519, TrackMatrixNV_remap_index },
+   { 34315, VertexAttrib1dNV_remap_index },
+   { 14541, VertexAttrib1dvNV_remap_index },
+   { 30335, VertexAttrib1fNV_remap_index },
+   {  2659, VertexAttrib1fvNV_remap_index },
+   { 32792, VertexAttrib1sNV_remap_index },
+   { 16080, VertexAttrib1svNV_remap_index },
+   {  5436, VertexAttrib2dNV_remap_index },
+   { 14434, VertexAttrib2dvNV_remap_index },
+   { 21640, VertexAttrib2fNV_remap_index },
+   { 14000, VertexAttrib2fvNV_remap_index },
+   {  6697, VertexAttrib2sNV_remap_index },
+   { 20255, VertexAttrib2svNV_remap_index },
+   { 12174, VertexAttrib3dNV_remap_index },
+   { 33896, VertexAttrib3dvNV_remap_index },
+   { 11189, VertexAttrib3fNV_remap_index },
+   { 26395, VertexAttrib3fvNV_remap_index },
+   { 23739, VertexAttrib3sNV_remap_index },
+   { 25277, VertexAttrib3svNV_remap_index },
+   { 30856, VertexAttrib4dNV_remap_index },
+   { 35373, VertexAttrib4dvNV_remap_index },
+   {  5864, VertexAttrib4fNV_remap_index },
+   { 10192, VertexAttrib4fvNV_remap_index },
+   { 28538, VertexAttrib4sNV_remap_index },
+   {  1512, VertexAttrib4svNV_remap_index },
+   {  5611, VertexAttrib4ubNV_remap_index },
+   {   817, VertexAttrib4ubvNV_remap_index },
+   { 23155, VertexAttribPointerNV_remap_index },
+   {  2474, VertexAttribs1dvNV_remap_index },
+   { 27925, VertexAttribs1fvNV_remap_index },
+   { 35173, VertexAttribs1svNV_remap_index },
+   { 11240, VertexAttribs2dvNV_remap_index },
+   { 27052, VertexAttribs2fvNV_remap_index },
+   { 18758, VertexAttribs2svNV_remap_index },
+   {  5972, VertexAttribs3dvNV_remap_index },
+   {  2333, VertexAttribs3fvNV_remap_index },
+   { 31896, VertexAttribs3svNV_remap_index },
+   { 28628, VertexAttribs4dvNV_remap_index },
+   {  6044, VertexAttribs4fvNV_remap_index },
+   { 34960, VertexAttribs4svNV_remap_index },
+   { 31627, VertexAttribs4ubvNV_remap_index },
+   { 28730, GetTexBumpParameterfvATI_remap_index },
+   { 35214, GetTexBumpParameterivATI_remap_index },
+   { 19883, TexBumpParameterfvATI_remap_index },
+   { 22056, TexBumpParameterivATI_remap_index },
+   { 16644, AlphaFragmentOp1ATI_remap_index },
+   { 27343, AlphaFragmentOp2ATI_remap_index },
+   { 26311, AlphaFragmentOp3ATI_remap_index },
+   { 31823, BeginFragmentShaderATI_remap_index },
+   { 33239, BindFragmentShaderATI_remap_index },
+   { 25406, ColorFragmentOp1ATI_remap_index },
+   {  4832, ColorFragmentOp2ATI_remap_index },
+   { 33541, ColorFragmentOp3ATI_remap_index },
+   {  6210, DeleteFragmentShaderATI_remap_index },
+   { 35397, EndFragmentShaderATI_remap_index },
+   { 34529, GenFragmentShadersATI_remap_index },
+   { 27206, PassTexCoordATI_remap_index },
+   {  7709, SampleMapATI_remap_index },
+   { 28841, SetFragmentShaderConstantATI_remap_index },
+   {   402, PointParameteriNV_remap_index },
+   { 15187, PointParameterivNV_remap_index },
+   { 30672, ActiveStencilFaceEXT_remap_index },
+   { 29287, BindVertexArrayAPPLE_remap_index },
+   {  3000, DeleteVertexArraysAPPLE_remap_index },
+   { 19225, GenVertexArraysAPPLE_remap_index },
+   { 25060, IsVertexArrayAPPLE_remap_index },
+   {   858, GetProgramNamedParameterdvNV_remap_index },
+   {  3956, GetProgramNamedParameterfvNV_remap_index },
+   { 28761, ProgramNamedParameter4dNV_remap_index },
+   { 15561, ProgramNamedParameter4dvNV_remap_index },
+   {  9658, ProgramNamedParameter4fNV_remap_index },
+   { 12665, ProgramNamedParameter4fvNV_remap_index },
+   { 18073, PrimitiveRestartIndexNV_remap_index },
+   { 32712, PrimitiveRestartNV_remap_index },
+   { 25982, DepthBoundsEXT_remap_index },
+   {  1183, BlendEquationSeparateEXT_remap_index },
+   { 15781, BindFramebufferEXT_remap_index },
+   { 27436, BindRenderbufferEXT_remap_index },
+   { 10439, CheckFramebufferStatusEXT_remap_index },
+   { 24311, DeleteFramebuffersEXT_remap_index },
+   { 33798, DeleteRenderbuffersEXT_remap_index },
+   { 14458, FramebufferRenderbufferEXT_remap_index },
+   { 14647, FramebufferTexture1DEXT_remap_index },
+   { 12459, FramebufferTexture2DEXT_remap_index },
+   { 12079, FramebufferTexture3DEXT_remap_index },
+   { 24926, GenFramebuffersEXT_remap_index },
+   { 18623, GenRenderbuffersEXT_remap_index },
+   {  7445, GenerateMipmapEXT_remap_index },
+   { 23248, GetFramebufferAttachmentParameterivEXT_remap_index },
+   { 34435, GetRenderbufferParameterivEXT_remap_index },
+   { 21936, IsFramebufferEXT_remap_index },
+   { 35296, IsRenderbufferEXT_remap_index },
+   {  8933, RenderbufferStorageEXT_remap_index },
+   {   734, BlitFramebufferEXT_remap_index },
+   { 15347, BufferParameteriAPPLE_remap_index },
+   { 20744, FlushMappedBufferRangeAPPLE_remap_index },
+   {  1982, BindFragDataLocationEXT_remap_index },
+   { 26095, GetFragDataLocationEXT_remap_index },
+   { 11518, GetUniformuivEXT_remap_index },
+   { 34609, GetVertexAttribIivEXT_remap_index },
+   { 29818, GetVertexAttribIuivEXT_remap_index },
+   { 12937, Uniform1uiEXT_remap_index },
+   { 29732, Uniform1uivEXT_remap_index },
+   { 23835, Uniform2uiEXT_remap_index },
+   {  4796, Uniform2uivEXT_remap_index },
+   { 31135, Uniform3uiEXT_remap_index },
+   { 15708, Uniform3uivEXT_remap_index },
+   {  3880, Uniform4uiEXT_remap_index },
+   {  9434, Uniform4uivEXT_remap_index },
+   { 19604, VertexAttribI1iEXT_remap_index },
+   {  5638, VertexAttribI1ivEXT_remap_index },
+   {  2760, VertexAttribI1uiEXT_remap_index },
+   { 13728, VertexAttribI1uivEXT_remap_index },
    {    81, VertexAttribI2iEXT_remap_index },
-   { 25533, VertexAttribI2ivEXT_remap_index },
-   {  5898, VertexAttribI2uiEXT_remap_index },
-   {  5190, VertexAttribI2uivEXT_remap_index },
-   { 28326, VertexAttribI3iEXT_remap_index },
-   { 26760, VertexAttribI3ivEXT_remap_index },
-   {  3629, VertexAttribI3uiEXT_remap_index },
-   { 32352, VertexAttribI3uivEXT_remap_index },
-   { 23559, VertexAttribI4bvEXT_remap_index },
-   { 15620, VertexAttribI4iEXT_remap_index },
-   { 34043, VertexAttribI4ivEXT_remap_index },
-   { 14270, VertexAttribI4svEXT_remap_index },
-   { 17643, VertexAttribI4ubvEXT_remap_index },
-   { 17271, VertexAttribI4uiEXT_remap_index },
-   {  6044, VertexAttribI4uivEXT_remap_index },
-   { 12151, VertexAttribI4usvEXT_remap_index },
-   { 19862, VertexAttribIPointerEXT_remap_index },
-   {  3244, FramebufferTextureLayerEXT_remap_index },
-   {  6320, ColorMaskIndexedEXT_remap_index },
-   { 20314, DisableIndexedEXT_remap_index },
-   { 28371, EnableIndexedEXT_remap_index },
-   { 23238, GetBooleanIndexedvEXT_remap_index },
-   { 11762, GetIntegerIndexedvEXT_remap_index },
-   { 24402, IsEnabledIndexedEXT_remap_index },
-   { 24302, ClearColorIiEXT_remap_index },
-   {  3725, ClearColorIuiEXT_remap_index },
-   { 10624, GetTexParameterIivEXT_remap_index },
-   {  6587, GetTexParameterIuivEXT_remap_index },
-   {  3200, TexParameterIivEXT_remap_index },
-   { 28193, TexParameterIuivEXT_remap_index },
-   {  5058, BeginConditionalRenderNV_remap_index },
-   { 27171, EndConditionalRenderNV_remap_index },
-   { 10011, BeginTransformFeedbackEXT_remap_index },
-   { 20393, BindBufferBaseEXT_remap_index },
-   { 20208, BindBufferOffsetEXT_remap_index },
-   { 13063, BindBufferRangeEXT_remap_index },
-   { 15242, EndTransformFeedbackEXT_remap_index },
-   { 11625, GetTransformFeedbackVaryingEXT_remap_index },
-   { 22276, TransformFeedbackVaryingsEXT_remap_index },
-   { 31440, ProvokingVertexEXT_remap_index },
-   { 11573, GetTexParameterPointervAPPLE_remap_index },
-   {  5600, TextureRangeAPPLE_remap_index },
-   { 12440, GetObjectParameterivAPPLE_remap_index },
-   { 21398, ObjectPurgeableAPPLE_remap_index },
-   {  6362, ObjectUnpurgeableAPPLE_remap_index },
-   { 18497, ActiveProgramEXT_remap_index },
-   { 18468, CreateShaderProgramEXT_remap_index },
-   { 30339, UseShaderProgramEXT_remap_index },
-   { 17596, TextureBarrierNV_remap_index },
-   { 30633, StencilFuncSeparateATI_remap_index },
-   {  6233, ProgramEnvParameters4fvEXT_remap_index },
-   { 18362, ProgramLocalParameters4fvEXT_remap_index },
-   { 15095, GetQueryObjecti64vEXT_remap_index },
-   { 11175, GetQueryObjectui64vEXT_remap_index },
-   { 25490, EGLImageTargetRenderbufferStorageOES_remap_index },
-   { 12952, EGLImageTargetTexture2DOES_remap_index },
+   { 25518, VertexAttribI2ivEXT_remap_index },
+   {  5998, VertexAttribI2uiEXT_remap_index },
+   {  5290, VertexAttribI2uivEXT_remap_index },
+   { 28330, VertexAttribI3iEXT_remap_index },
+   { 26745, VertexAttribI3ivEXT_remap_index },
+   {  3734, VertexAttribI3uiEXT_remap_index },
+   { 32415, VertexAttribI3uivEXT_remap_index },
+   { 23544, VertexAttribI4bvEXT_remap_index },
+   { 15640, VertexAttribI4iEXT_remap_index },
+   { 34067, VertexAttribI4ivEXT_remap_index },
+   { 14361, VertexAttribI4svEXT_remap_index },
+   {  4309, VertexAttribI4ubvEXT_remap_index },
+   { 17291, VertexAttribI4uiEXT_remap_index },
+   {  6144, VertexAttribI4uivEXT_remap_index },
+   { 12242, VertexAttribI4usvEXT_remap_index },
+   { 19827, VertexAttribIPointerEXT_remap_index },
+   {  3349, FramebufferTextureLayerEXT_remap_index },
+   { 17663, ColorMaskIndexedEXT_remap_index },
+   { 20279, DisableIndexedEXT_remap_index },
+   { 28375, EnableIndexedEXT_remap_index },
+   { 23203, GetBooleanIndexedvEXT_remap_index },
+   { 11853, GetIntegerIndexedvEXT_remap_index },
+   { 24387, IsEnabledIndexedEXT_remap_index },
+   { 24287, ClearColorIiEXT_remap_index },
+   {  3830, ClearColorIuiEXT_remap_index },
+   { 10715, GetTexParameterIivEXT_remap_index },
+   {  6645, GetTexParameterIuivEXT_remap_index },
+   {  3305, TexParameterIivEXT_remap_index },
+   { 28197, TexParameterIuivEXT_remap_index },
+   {  5158, BeginConditionalRenderNV_remap_index },
+   { 27156, EndConditionalRenderNV_remap_index },
+   { 10069, BeginTransformFeedbackEXT_remap_index },
+   { 20358, BindBufferBaseEXT_remap_index },
+   { 20173, BindBufferOffsetEXT_remap_index },
+   { 13154, BindBufferRangeEXT_remap_index },
+   { 15262, EndTransformFeedbackEXT_remap_index },
+   { 11716, GetTransformFeedbackVaryingEXT_remap_index },
+   { 22241, TransformFeedbackVaryingsEXT_remap_index },
+   { 31528, ProvokingVertexEXT_remap_index },
+   { 11664, GetTexParameterPointervAPPLE_remap_index },
+   {  5700, TextureRangeAPPLE_remap_index },
+   { 12531, GetObjectParameterivAPPLE_remap_index },
+   { 21363, ObjectPurgeableAPPLE_remap_index },
+   {  6420, ObjectUnpurgeableAPPLE_remap_index },
+   { 18445, ActiveProgramEXT_remap_index },
+   { 18416, CreateShaderProgramEXT_remap_index },
+   { 30427, UseShaderProgramEXT_remap_index },
+   { 17616, TextureBarrierNV_remap_index },
+   { 30721, StencilFuncSeparateATI_remap_index },
+   {  6333, ProgramEnvParameters4fvEXT_remap_index },
+   { 18310, ProgramLocalParameters4fvEXT_remap_index },
+   { 15115, GetQueryObjecti64vEXT_remap_index },
+   { 11266, GetQueryObjectui64vEXT_remap_index },
+   { 25475, EGLImageTargetRenderbufferStorageOES_remap_index },
+   { 13043, 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 */
-   {  2869, _gloffset_BlendColor },
+   {  2918, _gloffset_BlendColor },
    /* from GL_EXT_blend_minmax */
-   { 12045, _gloffset_BlendEquation },
+   { 12136, _gloffset_BlendEquation },
    /* from GL_EXT_color_subtable */
-   { 18236, _gloffset_ColorSubTable },
-   { 33706, _gloffset_CopyColorSubTable },
+   { 18184, _gloffset_ColorSubTable },
+   { 33730, _gloffset_CopyColorSubTable },
    /* from GL_EXT_convolution */
-   {   277, _gloffset_ConvolutionFilter1D },
-   {  2649, _gloffset_CopyConvolutionFilter1D },
-   {  4424, _gloffset_GetConvolutionParameteriv },
-   {  9224, _gloffset_ConvolutionFilter2D },
-   {  9426, _gloffset_ConvolutionParameteriv },
-   {  9886, _gloffset_ConvolutionParameterfv },
-   { 22119, _gloffset_GetSeparableFilter },
-   { 25765, _gloffset_SeparableFilter2D },
-   { 26653, _gloffset_ConvolutionParameteri },
-   { 26846, _gloffset_ConvolutionParameterf },
-   { 28560, _gloffset_GetConvolutionParameterfv },
-   { 29417, _gloffset_GetConvolutionFilter },
-   { 32048, _gloffset_CopyConvolutionFilter2D },
+   {   296, _gloffset_ConvolutionFilter1D },
+   {  2698, _gloffset_CopyConvolutionFilter1D },
+   {  4576, _gloffset_GetConvolutionParameteriv },
+   {  9282, _gloffset_ConvolutionFilter2D },
+   {  9484, _gloffset_ConvolutionParameteriv },
+   {  9944, _gloffset_ConvolutionParameterfv },
+   { 22084, _gloffset_GetSeparableFilter },
+   { 25750, _gloffset_SeparableFilter2D },
+   { 26638, _gloffset_ConvolutionParameteri },
+   { 26831, _gloffset_ConvolutionParameterf },
+   { 28564, _gloffset_GetConvolutionParameterfv },
+   { 29453, _gloffset_GetConvolutionFilter },
+   { 32111, _gloffset_CopyConvolutionFilter2D },
    /* from GL_EXT_copy_texture */
-   { 16120, _gloffset_CopyTexSubImage3D },
-   { 17923, _gloffset_CopyTexImage2D },
-   { 26236, _gloffset_CopyTexImage1D },
-   { 29098, _gloffset_CopyTexSubImage2D },
-   { 31660, _gloffset_CopyTexSubImage1D },
+   { 16140, _gloffset_CopyTexSubImage3D },
+   { 17871, _gloffset_CopyTexImage2D },
+   { 26221, _gloffset_CopyTexImage1D },
+   { 29134, _gloffset_CopyTexSubImage2D },
+   { 31723, _gloffset_CopyTexSubImage1D },
    /* from GL_EXT_draw_range_elements */
-   { 10240, _gloffset_DrawRangeElements },
+   { 10298, _gloffset_DrawRangeElements },
    /* from GL_EXT_histogram */
-   {   876, _gloffset_Histogram },
-   {  3811, _gloffset_ResetHistogram },
-   { 10770, _gloffset_GetMinmax },
-   { 16454, _gloffset_GetHistogramParameterfv },
-   { 26161, _gloffset_GetMinmaxParameteriv },
-   { 28450, _gloffset_ResetMinmax },
-   { 29314, _gloffset_GetHistogramParameteriv },
-   { 30544, _gloffset_GetHistogram },
-   { 33292, _gloffset_Minmax },
-   { 34914, _gloffset_GetMinmaxParameterfv },
+   {   895, _gloffset_Histogram },
+   {  3916, _gloffset_ResetHistogram },
+   { 10861, _gloffset_GetMinmax },
+   { 16474, _gloffset_GetHistogramParameterfv },
+   { 26146, _gloffset_GetMinmaxParameteriv },
+   { 28454, _gloffset_ResetMinmax },
+   { 29350, _gloffset_GetHistogramParameteriv },
+   { 30632, _gloffset_GetHistogram },
+   { 33355, _gloffset_Minmax },
+   { 35043, _gloffset_GetMinmaxParameterfv },
    /* from GL_EXT_paletted_texture */
-   {  9086, _gloffset_ColorTable },
-   { 16300, _gloffset_GetColorTable },
-   { 24688, _gloffset_GetColorTableParameterfv },
-   { 26902, _gloffset_GetColorTableParameteriv },
+   {  9144, _gloffset_ColorTable },
+   { 16320, _gloffset_GetColorTable },
+   { 24673, _gloffset_GetColorTableParameterfv },
+   { 26887, _gloffset_GetColorTableParameteriv },
    /* from GL_EXT_subtexture */
-   {  7797, _gloffset_TexSubImage1D },
-   { 11500, _gloffset_TexSubImage2D },
+   {  7855, _gloffset_TexSubImage1D },
+   { 11591, _gloffset_TexSubImage2D },
    /* from GL_EXT_texture3D */
-   {  1892, _gloffset_TexImage3D },
-   { 24457, _gloffset_TexSubImage3D },
+   {  1941, _gloffset_TexImage3D },
+   { 24442, _gloffset_TexSubImage3D },
    /* from GL_EXT_texture_object */
-   {  3579, _gloffset_PrioritizeTextures },
-   {  8246, _gloffset_AreTexturesResident },
-   { 14474, _gloffset_GenTextures },
-   { 16831, _gloffset_DeleteTextures },
-   { 21060, _gloffset_IsTexture },
-   { 31725, _gloffset_BindTexture },
+   {  3684, _gloffset_PrioritizeTextures },
+   {  8304, _gloffset_AreTexturesResident },
+   { 14565, _gloffset_GenTextures },
+   { 16851, _gloffset_DeleteTextures },
+   { 21025, _gloffset_IsTexture },
+   { 31788, _gloffset_BindTexture },
    /* from GL_EXT_vertex_array */
-   { 25937, _gloffset_ArrayElement },
-   { 32880, _gloffset_GetPointerv },
-   { 34465, _gloffset_DrawArrays },
+   { 25922, _gloffset_ArrayElement },
+   { 32943, _gloffset_GetPointerv },
+   { 34556, _gloffset_DrawArrays },
    /* from GL_SGI_color_table */
-   {  8364, _gloffset_ColorTableParameteriv },
-   {  9086, _gloffset_ColorTable },
-   { 16300, _gloffset_GetColorTable },
-   { 16410, _gloffset_CopyColorTable },
-   { 20921, _gloffset_ColorTableParameterfv },
-   { 24688, _gloffset_GetColorTableParameterfv },
-   { 26902, _gloffset_GetColorTableParameteriv },
+   {  8422, _gloffset_ColorTableParameteriv },
+   {  9144, _gloffset_ColorTable },
+   { 16320, _gloffset_GetColorTable },
+   { 16430, _gloffset_CopyColorTable },
+   { 20886, _gloffset_ColorTableParameterfv },
+   { 24673, _gloffset_GetColorTableParameterfv },
+   { 26887, _gloffset_GetColorTableParameteriv },
    /* from GL_VERSION_1_3 */
-   {   445, _gloffset_MultiTexCoord3sARB },
-   {   677, _gloffset_ActiveTextureARB },
-   {  4634, _gloffset_MultiTexCoord1fvARB },
-   {  6863, _gloffset_MultiTexCoord3dARB },
-   {  6908, _gloffset_MultiTexCoord2iARB },
-   {  7032, _gloffset_MultiTexCoord2svARB },
-   {  9042, _gloffset_MultiTexCoord2fARB },
-   { 11205, _gloffset_MultiTexCoord3fvARB },
-   { 11807, _gloffset_MultiTexCoord4sARB },
-   { 12488, _gloffset_MultiTexCoord2dvARB },
-   { 12895, _gloffset_MultiTexCoord1svARB },
-   { 13260, _gloffset_MultiTexCoord3svARB },
-   { 13321, _gloffset_MultiTexCoord4iARB },
-   { 14178, _gloffset_MultiTexCoord3iARB },
-   { 15124, _gloffset_MultiTexCoord1dARB },
-   { 15356, _gloffset_MultiTexCoord3dvARB },
-   { 16672, _gloffset_MultiTexCoord3ivARB },
-   { 16717, _gloffset_MultiTexCoord2sARB },
-   { 18293, _gloffset_MultiTexCoord4ivARB },
-   { 20561, _gloffset_ClientActiveTextureARB },
-   { 22966, _gloffset_MultiTexCoord2dARB },
-   { 23403, _gloffset_MultiTexCoord4dvARB },
-   { 23805, _gloffset_MultiTexCoord4fvARB },
-   { 24829, _gloffset_MultiTexCoord3fARB },
-   { 27496, _gloffset_MultiTexCoord4dARB },
-   { 27762, _gloffset_MultiTexCoord1sARB },
-   { 27966, _gloffset_MultiTexCoord1dvARB },
-   { 28942, _gloffset_MultiTexCoord1ivARB },
-   { 29035, _gloffset_MultiTexCoord2ivARB },
-   { 29374, _gloffset_MultiTexCoord1iARB },
-   { 30842, _gloffset_MultiTexCoord4svARB },
-   { 31482, _gloffset_MultiTexCoord1fARB },
-   { 31787, _gloffset_MultiTexCoord4fARB },
-   { 34299, _gloffset_MultiTexCoord2fvARB },
+   {   464, _gloffset_MultiTexCoord3sARB },
+   {   696, _gloffset_ActiveTextureARB },
+   {  4734, _gloffset_MultiTexCoord1fvARB },
+   {  6921, _gloffset_MultiTexCoord3dARB },
+   {  6966, _gloffset_MultiTexCoord2iARB },
+   {  7090, _gloffset_MultiTexCoord2svARB },
+   {  9100, _gloffset_MultiTexCoord2fARB },
+   { 11296, _gloffset_MultiTexCoord3fvARB },
+   { 11898, _gloffset_MultiTexCoord4sARB },
+   { 12579, _gloffset_MultiTexCoord2dvARB },
+   { 12986, _gloffset_MultiTexCoord1svARB },
+   { 13351, _gloffset_MultiTexCoord3svARB },
+   { 13412, _gloffset_MultiTexCoord4iARB },
+   { 14269, _gloffset_MultiTexCoord3iARB },
+   { 15144, _gloffset_MultiTexCoord1dARB },
+   { 15376, _gloffset_MultiTexCoord3dvARB },
+   { 16692, _gloffset_MultiTexCoord3ivARB },
+   { 16737, _gloffset_MultiTexCoord2sARB },
+   { 18241, _gloffset_MultiTexCoord4ivARB },
+   { 20526, _gloffset_ClientActiveTextureARB },
+   { 22931, _gloffset_MultiTexCoord2dARB },
+   { 23368, _gloffset_MultiTexCoord4dvARB },
+   { 23790, _gloffset_MultiTexCoord4fvARB },
+   { 24814, _gloffset_MultiTexCoord3fARB },
+   { 27481, _gloffset_MultiTexCoord4dARB },
+   { 27747, _gloffset_MultiTexCoord1sARB },
+   { 27951, _gloffset_MultiTexCoord1dvARB },
+   { 28978, _gloffset_MultiTexCoord1ivARB },
+   { 29071, _gloffset_MultiTexCoord2ivARB },
+   { 29410, _gloffset_MultiTexCoord1iARB },
+   { 30930, _gloffset_MultiTexCoord4svARB },
+   { 31570, _gloffset_MultiTexCoord1fARB },
+   { 31850, _gloffset_MultiTexCoord4fARB },
+   { 34390, _gloffset_MultiTexCoord2fvARB },
    {    -1, -1 }
 };
 
diff --git a/mesalib/src/mesa/main/texgetimage.c b/mesalib/src/mesa/main/texgetimage.c
index 44a828adf..05b052a01 100644
--- a/mesalib/src/mesa/main/texgetimage.c
+++ b/mesalib/src/mesa/main/texgetimage.c
@@ -298,6 +298,8 @@ get_tex_rgba_uncompressed(struct gl_context *ctx, GLuint dimensions,
    const gl_format texFormat =
       _mesa_get_srgb_format_linear(texImage->TexFormat);
    const GLuint width = texImage->Width;
+   const GLenum destBaseFormat = _mesa_base_tex_format(ctx, format);
+   GLenum rebaseFormat = GL_NONE;
    GLuint height = texImage->Height;
    GLuint depth = texImage->Depth;
    GLuint img, row;
@@ -318,6 +320,28 @@ get_tex_rgba_uncompressed(struct gl_context *ctx, GLuint dimensions,
       height = 1;
    }
 
+   if (texImage->_BaseFormat == GL_LUMINANCE ||
+       texImage->_BaseFormat == GL_INTENSITY ||
+       texImage->_BaseFormat == GL_LUMINANCE_ALPHA) {
+      /* If a luminance (or intensity) texture is read back as RGB(A), the
+       * returned value should be (L,0,0,1), not (L,L,L,1).  Set rebaseFormat
+       * here to get G=B=0.
+       */
+      rebaseFormat = texImage->_BaseFormat;
+   }
+   else if ((texImage->_BaseFormat == GL_RGBA ||
+             texImage->_BaseFormat == GL_RGB) &&
+            (destBaseFormat == GL_LUMINANCE ||
+             destBaseFormat == GL_LUMINANCE_ALPHA ||
+             destBaseFormat == GL_LUMINANCE_INTEGER_EXT ||
+             destBaseFormat == GL_LUMINANCE_ALPHA_INTEGER_EXT)) {
+      /* If we're reading back an RGB(A) texture as luminance then we need
+       * to return L=tex(R).  Note, that's different from glReadPixels which
+       * returns L=R+G+B.
+       */
+      rebaseFormat = GL_LUMINANCE_ALPHA; /* this covers GL_LUMINANCE too */
+   }
+
    for (img = 0; img < depth; img++) {
       GLubyte *srcMap;
       GLint rowstride;
@@ -335,12 +359,14 @@ get_tex_rgba_uncompressed(struct gl_context *ctx, GLuint dimensions,
 
 	    if (is_integer) {
 	       _mesa_unpack_uint_rgba_row(texFormat, width, src, rgba_uint);
-               _mesa_rebase_rgba_uint(width, rgba_uint, texImage->_BaseFormat);
+               if (rebaseFormat)
+                  _mesa_rebase_rgba_uint(width, rgba_uint, rebaseFormat);
 	       _mesa_pack_rgba_span_int(ctx, width, rgba_uint,
 					format, type, dest);
 	    } else {
 	       _mesa_unpack_rgba_row(texFormat, width, src, rgba);
-               _mesa_rebase_rgba_float(width, rgba, texImage->_BaseFormat);
+               if (rebaseFormat)
+                  _mesa_rebase_rgba_float(width, rgba, rebaseFormat);
 	       _mesa_pack_rgba_span_float(ctx, width, (GLfloat (*)[4]) rgba,
 					  format, type, dest,
 					  &ctx->Pack, transferOps);
diff --git a/mesalib/src/mesa/sources.mak b/mesalib/src/mesa/sources.mak
index b57a10e4d..c746b8afa 100644
--- a/mesalib/src/mesa/sources.mak
+++ b/mesalib/src/mesa/sources.mak
@@ -33,6 +33,7 @@ MAIN_SOURCES = \
 	main/drawtex.c \
 	main/enable.c \
 	main/enums.c \
+	main/errors.c \
 	main/eval.c \
 	main/execmem.c \
 	main/extensions.c \
diff --git a/xorg-server/xkeyboard-config/Makefile.am b/xorg-server/xkeyboard-config/Makefile.am
index fe8f08c84..ed3a0a326 100644
--- a/xorg-server/xkeyboard-config/Makefile.am
+++ b/xorg-server/xkeyboard-config/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign
 
-SUBDIRS = compat geometry keycodes keymap po rules semantics symbols types docs man
+SUBDIRS = compat geometry keycodes po rules symbols types docs man
 
 pkgconfigdir = $(datadir)/pkgconfig
 pkgconfig_DATA = xkeyboard-config.pc
diff --git a/xorg-server/xkeyboard-config/compat/Makefile.am b/xorg-server/xkeyboard-config/compat/Makefile.am
index 54a659eec..2be8154a2 100644
--- a/xorg-server/xkeyboard-config/compat/Makefile.am
+++ b/xorg-server/xkeyboard-config/compat/Makefile.am
@@ -3,9 +3,9 @@ compatdir = $(xkb_base)/compat
 dist_compat_DATA = \
 accessx basic caps complete \
 default iso9995 \
-japan keypad ledcaps \
+japan ledcaps \
 lednum ledscroll level5 \
-misc mousekeys norepeat \
+misc mousekeys \
 olpc pc pc98 xfree86 \
 xtest README
 
diff --git a/xorg-server/xkeyboard-config/compat/keypad b/xorg-server/xkeyboard-config/compat/keypad
deleted file mode 100644
index f28ca1497..000000000
--- a/xorg-server/xkeyboard-config/compat/keypad
+++ /dev/null
@@ -1,58 +0,0 @@
-// Interpretations needed to implement the numeric keypad

-// as an overlay instead of a modifier.

-

-partial hidden xkb_compatibility "overlay"  {

-    include "keypad(overlay1)"

-};

-partial hidden xkb_compatibility "overlay1"  {

-    virtual_modifiers NumLock,AltGr;

-

-    interpret.repeat= False;

-    setMods.clearLocks= True;

-    latchMods.clearLocks= True;

-    latchMods.latchToLock= True;

-

-    interpret Num_Lock {

-	virtualModifier= NumLock;

-	action= LockControls(ctrls=overlay1);

-    };

-    interpret Num_Lock+Any {

-	virtualModifier= NumLock;

-	action= LockControls(ctrls=overlay1);

-    };

-

-    indicator.allowExplicit= True;

-    indicator.driveskbd= True;

-    replace indicator "Num Lock" {

-	whichModState= Locked;

-	modifiers= NumLock;

-	controls= Overlay1;

-    };

-    indicator.allowExplicit= True;

-};

-partial hidden xkb_compatibility "overlay2"  {

-    virtual_modifiers NumLock,AltGr;

-

-    interpret.repeat= False;

-    setMods.clearLocks= True;

-    latchMods.clearLocks= True;

-    latchMods.latchToLock= True;

-

-    interpret Num_Lock {

-	virtualModifier= NumLock;

-	action= LockControls(ctrls=overlay2);

-    };

-    interpret Num_Lock+Any {

-	virtualModifier= NumLock;

-	action= LockControls(ctrls=overlay1);

-    };

-

-    indicator.allowExplicit= True;

-    indicator.driveskbd= True;

-    replace indicator "Num Lock" {

-	whichModState= Locked;

-	modifiers= NumLock;

-	controls= Overlay2;

-    };

-    indicator.allowExplicit= True;

-};

diff --git a/xorg-server/xkeyboard-config/compat/norepeat b/xorg-server/xkeyboard-config/compat/norepeat
deleted file mode 100644
index 1f47d7e17..000000000
--- a/xorg-server/xkeyboard-config/compat/norepeat
+++ /dev/null
@@ -1,9 +0,0 @@
-// Put any otherwise normal keys that you don't want to repeat in

-// this file

-

-default partial xkb_compatibility "norepeat"  {

-    interpret Return {

-	action= NoAction();

-	repeat= False;

-    };

-};

diff --git a/xorg-server/xkeyboard-config/configure.in b/xorg-server/xkeyboard-config/configure.in
index 4229f3fd9..3b9fac2e0 100644
--- a/xorg-server/xkeyboard-config/configure.in
+++ b/xorg-server/xkeyboard-config/configure.in
@@ -90,11 +90,6 @@ geometry/sgi_vndr/Makefile
 keycodes/Makefile
 keycodes/digital_vndr/Makefile
 keycodes/sgi_vndr/Makefile
-keymap/Makefile
-keymap/digital_vndr/Makefile
-keymap/sgi_vndr/Makefile
-keymap/sun_vndr/Makefile
-semantics/Makefile
 rules/Makefile
 rules/bin/Makefile
 rules/compat/Makefile
diff --git a/xorg-server/xkeyboard-config/keymap/Makefile.am b/xorg-server/xkeyboard-config/keymap/Makefile.am
deleted file mode 100644
index 98da8f2b0..000000000
--- a/xorg-server/xkeyboard-config/keymap/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-SUBDIRS = digital_vndr sgi_vndr sun_vndr
-
-keymapdir = $(xkb_base)/keymap
-
-dist_keymap_DATA = \
-amiga ataritt macintosh \
-sony xfree86 xfree98 \
-README
-
-dir_data = $(dist_keymap_DATA)
-
-include $(top_srcdir)/xkbrules.am
diff --git a/xorg-server/xkeyboard-config/keymap/README b/xorg-server/xkeyboard-config/keymap/README
deleted file mode 100644
index 318089e09..000000000
--- a/xorg-server/xkeyboard-config/keymap/README
+++ /dev/null
@@ -1,6 +0,0 @@
-The keymap component provides a way how to set up one pre-defined keyboard
-mapping from a given set. It has been obsoleted by 'rules' component which
-is simplier and more flexible. The directory is preserved for compatibility
-reasons. Avoid using it if it is possible.
-
-The keymap files are in .xkm format and useful when using xkbcomp.  
diff --git a/xorg-server/xkeyboard-config/keymap/amiga b/xorg-server/xkeyboard-config/keymap/amiga
deleted file mode 100644
index 10a7142a6..000000000
--- a/xorg-server/xkeyboard-config/keymap/amiga
+++ /dev/null
@@ -1,15 +0,0 @@
-default xkb_keymap "usa1" {

-    xkb_keycodes	{ include "amiga(usa1)"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "amiga(usa1)"		};

-    xkb_geometry	{ include "amiga(usa1)"		};

-};

-

-xkb_keymap "de" {

-    xkb_keycodes	{ include "amiga(de)"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "amiga(de)"		};

-    xkb_geometry	{ include "amiga(de)"		};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/ataritt b/xorg-server/xkeyboard-config/keymap/ataritt
deleted file mode 100644
index 1f8449131..000000000
--- a/xorg-server/xkeyboard-config/keymap/ataritt
+++ /dev/null
@@ -1,14 +0,0 @@
-default xkb_keymap "us" {

-    xkb_keycodes	{ include "ataritt(us)"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "ataritt(us)"		};

-    xkb_geometry	{ include "ataritt(us)"		};

-};

-xkb_keymap "de" {

-    xkb_keycodes	{ include "ataritt(de)"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "ataritt(de)"		};

-    xkb_geometry	{ include "ataritt(de)"		};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/digital_vndr/Makefile.am b/xorg-server/xkeyboard-config/keymap/digital_vndr/Makefile.am
deleted file mode 100644
index b1961e5b1..000000000
--- a/xorg-server/xkeyboard-config/keymap/digital_vndr/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-keymapdir = $(xkb_base)/keymap/digital_vndr
-
-dist_keymap_DATA = \
-us
diff --git a/xorg-server/xkeyboard-config/keymap/digital_vndr/us b/xorg-server/xkeyboard-config/keymap/digital_vndr/us
deleted file mode 100644
index 8a600fc2e..000000000
--- a/xorg-server/xkeyboard-config/keymap/digital_vndr/us
+++ /dev/null
@@ -1,187 +0,0 @@
-//

-//Copyright (c) 1996  Digital Equipment 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 sell copies of the Software, and to

-//permit persons to whom the Software is furnished to do so, subject to

-//the following conditions:

-//

-//The above copyright notice and this permission notice shall be included

-//in all copies or substantial portions of the Software.

-//

-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

-//OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-//IN NO EVENT SHALL DIGITAL EQUIPMENT CORPORATION 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.

-//

-//Except as contained in this notice, the name of the Digital Equipment 

-//Corporation shall not be used in advertising or otherwise to promote

-//the sale, use or other dealings in this Software without prior written

-//authorization from Digital Equipment Corporation.

-//

-// HISTORY

-// Log: us,v 

-// Revision 1.3  1996/06/18  09:14:51  erik

-// use flags correctly, assorted cleanups and consortium fixes

-//

-// Revision 1.1.6.2  1995/10/25  21:00:53  William_Walker

-// 	Add pc104-key support

-// 	[1995/10/23  15:46:24  William_Walker]

-//

-// Revision 1.1.2.6  1995/06/27  12:18:05  William_Walker

-// 	Add LK201 and LK450 support as well as TW and DP variants.

-// 	[1995/06/26  20:26:19  William_Walker]

-// 

-// Revision 1.1.2.5  1995/06/05  19:23:12  William_Walker

-// 	New file.  I love keymaps.

-// 	[1995/06/05  18:14:04  William_Walker]

-// 

-// EndLog

-// 

-// @(#)RCSfile: us,v  Revision: 1.3  (DEC) Date: 1996/02/02 14:21:15

-// 

-

-// **************************************************************

-// *								*

-// * Keymaps for en_US.ISO8859-1 - English for U.S.		*

-// *								*

-// **************************************************************

-

-xkb_keymap "lk201" {

-    xkb_keycodes        { include "digital_vndr/lk(lk201)" 		};

-    xkb_types           { include "default"    	        	};

-    xkb_compatibility   { include "default"			};

-    xkb_symbols         { include "digital_vndr/us(vt105)"		};

-    xkb_geometry	{ description = "Digital US LK201";

-			  include "digital_vndr/lk(lk201)"		};

-};

-

-xkb_keymap "lk401" {

-    xkb_keycodes        { include "digital_vndr/lk(lk401)" 		};

-    xkb_types           { include "default"    	        	};

-    xkb_compatibility   { include "default"			};

-    xkb_symbols         { include "digital_vndr/us(vt108)"		};

-    xkb_geometry	{ description = "Digital US LK401";

-			  include "digital_vndr/lk(lk401)"		};

-};

-

-xkb_keymap "lk411" {

-    xkb_keycodes        { include "digital_vndr/pc(lk411)" 		};

-    xkb_types           { include "default"    	        	};

-    xkb_compatibility   { include "default"			};

-    xkb_symbols         { include "digital_vndr/us(vt108)"		};

-    xkb_geometry	{ description = "Digital US LK411";

-			  include "digital_vndr/lk(lk401)"		};

-};

-

-xkb_keymap "lk421" {

-    xkb_keycodes        { include "digital_vndr/lk(lk421)"		};

-    xkb_types           { include "default"    	        	};

-    xkb_compatibility   { include "default"	        	};

-    xkb_symbols         { include "digital_vndr/us(unix)"		};

-    xkb_geometry	{ description = "Digital US LK421";

-			  include "digital_vndr/unix(unix)"		};

-};

-

-xkb_keymap "lk441" {

-    xkb_keycodes        { include "digital_vndr/lk(lk443)" 		};

-    xkb_types           { include "default"    	        	};

-    xkb_compatibility   { include "default"			};

-    xkb_symbols         { include "digital_vndr/us(lk44x)"		};

-    xkb_geometry	{ description = "Digital US LK441";

-			  include "digital_vndr/pc(pc101)"

-			  include "digital_vndr/pc(leds_alone)"	};

-};

-

-xkb_keymap "lk443" {

-    xkb_keycodes        { include "digital_vndr/lk(lk443)" 		};

-    xkb_types           { include "default"    	        	};

-    xkb_compatibility   { include "default"			};

-    xkb_symbols         { include "digital_vndr/us(lk44x)"		};

-    xkb_geometry	{ description = "Digital US LK443";

-			  include "digital_vndr/pc(pc101)"

-			  include "digital_vndr/pc(leds_alone)"	};

-};

-

-xkb_keymap "lk44x" {

-    xkb_keycodes        { include "digital_vndr/lk(lk443)" 		};

-    xkb_types           { include "default"    	        	};

-    xkb_compatibility   { include "default"			};

-    xkb_symbols         { include "digital_vndr/us(lk44x)"		};

-    xkb_geometry	{ description = "Digital US LK443";

-			  include "digital_vndr/pc(pc101)"

-			  include "digital_vndr/pc(leds_alone)"	};

-};

-

-xkb_keymap "lk450" {

-    xkb_keycodes        { include "digital_vndr/pc(lk450)" 		};

-    xkb_types           { include "default"    	        	};

-    xkb_compatibility   { include "default"			};

-    xkb_symbols         { include "digital_vndr/us(vt108)"		};

-    xkb_geometry	{ description = "Digital US LK450";

-			  include "digital_vndr/lk(lk450)"		};

-};

-

-xkb_keymap "pcxalaa" {

-    xkb_keycodes        { include "digital_vndr/pc(pc101)" 		};

-    xkb_types           { include "default"   	 		};

-    xkb_compatibility   { include "default"			};

-    xkb_symbols         { include "digital_vndr/us(pcxalaa)"		};

-    xkb_geometry	{ description = "Digital US PCXAL-AA";

-			  include "digital_vndr/pc(pc101)"

-			  include "digital_vndr/pc(leds_alone)"	};

-};

-

-xkb_keymap "pcxalfa" {

-    xkb_keycodes        { include "digital_vndr/pc(pc101)" 		};

-    xkb_types           { include "default"   	 		};

-    xkb_compatibility   { include "default"			};

-    xkb_symbols         { include "digital_vndr/us(pcxalfa)"		};

-    xkb_geometry	{ description = "Digital US PCXAL-FA";

-			  include "digital_vndr/pc(pc101)"

-			  include "digital_vndr/pc(leds_on_keys)"	};

-};

-

-xkb_keymap "pcxalga" {

-    xkb_keycodes        { include "digital_vndr/pc(pc101)" 		};

-    xkb_types           { include "default"   	 		};

-    xkb_compatibility   { include "default"			};

-    xkb_symbols         { include "digital_vndr/us(pcxalga)"		};

-    xkb_geometry	{ description = "Digital US PCXAL-GA";

-			  include "digital_vndr/pc(pc101)"

-			  include "digital_vndr/pc(leds_alone)"	};

-};

-

-xkb_keymap "pcxalka" {

-    xkb_keycodes        { include "digital_vndr/pc(pc101)" 		};

-    xkb_types           { include "default"   	 		};

-    xkb_compatibility   { include "default"			};

-    xkb_symbols         { include "digital_vndr/us(pcxalka)"		};

-    xkb_geometry	{ description = "Digital US PCXAL-KA";

-			  include "digital_vndr/pc(pc101)"

-			  include "digital_vndr/pc(leds_alone)"	};

-};

-

-xkb_keymap "pcxal" {

-    xkb_keycodes        { include "digital_vndr/pc(pc101)" 		};

-    xkb_types           { include "default"   	 		};

-    xkb_compatibility   { include "default"			};

-    xkb_symbols         { include "digital_vndr/us(pcxal)"		};

-    xkb_geometry	{ description = "Digital US PCXAL";

-			  include "digital_vndr/pc(pc101)"

-			  include "digital_vndr/pc(leds_alone)"	};

-};

-

-xkb_keymap "mnk" {

-    xkb_keycodes        { include "digital_vndr/pc(pc104)" 		};

-    xkb_types           { include "default"   	 		};

-    xkb_compatibility   { include "default"			};

-    xkb_symbols         { include "digital_vndr/us(pc104)"		};

-    xkb_geometry	{ include "microsoft"			};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/macintosh b/xorg-server/xkeyboard-config/keymap/macintosh
deleted file mode 100644
index 345667054..000000000
--- a/xorg-server/xkeyboard-config/keymap/macintosh
+++ /dev/null
@@ -1,15 +0,0 @@
-default xkb_keymap "macintosh" {

-    xkb_keycodes	{ include "macintosh"				};

-    xkb_types		{ include "default"				};

-    xkb_compatibility	{ include "default"				};

-    xkb_symbols		{ include "macintosh_vndr/us(extended)"		};

-    xkb_geometry	{ include "macintosh"				};

-};

-

-xkb_keymap "macintosh_old" {

-    xkb_keycodes	{ include "macintosh(old)"				};

-    xkb_types		{ include "default"				};

-    xkb_compatibility	{ include "default"				};

-    xkb_symbols		{ include "macintosh_vndr/us(extended)"		};

-    xkb_geometry	{ include "macintosh"				};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/Makefile.am b/xorg-server/xkeyboard-config/keymap/sgi_vndr/Makefile.am
deleted file mode 100644
index 234a336db..000000000
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-keymapdir = $(xkb_base)/keymap/sgi_vndr
-
-dist_keymap_DATA = \
-be bg ca \
-ch cz de \
-dk dvorak \
-es fi \
-fr gb \
-hu it jp \
-no pl pt \
-ru se sk \
-th us
diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/be b/xorg-server/xkeyboard-config/keymap/sgi_vndr/be
deleted file mode 100644
index 1301e5596..000000000
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/be
+++ /dev/null
@@ -1,32 +0,0 @@
-default xkb_keymap "indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "en_US(pc_universal)+be"	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indy_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ 

-	include "en_US(pc_universal_nodeadkeys)+be(nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

-};

-xkb_keymap "indigo" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "en_US(pc102)+be"	};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

-xkb_keymap "indigo_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ 

-	include "en_US(pc102_nodeadkeys)+be(nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/bg b/xorg-server/xkeyboard-config/keymap/sgi_vndr/bg
deleted file mode 100644
index 556f1146b..000000000
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/bg
+++ /dev/null
@@ -1,18 +0,0 @@
-default xkb_keymap "indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols  { 

-	include "us(pc_universal)+bg+group(shifts_toggle)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

-};

-xkb_keymap "indigo" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols { 

-	include "us(pc102)+bg+group(shifts_toggle)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/ca b/xorg-server/xkeyboard-config/keymap/sgi_vndr/ca
deleted file mode 100644
index 528b0642a..000000000
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/ca
+++ /dev/null
@@ -1,32 +0,0 @@
-default xkb_keymap "indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "en_US(pc_universal)+ca"	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indy_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ 

-	include "en_US(pc_universal_nodeadkeys)+ca(nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

-};

-xkb_keymap "indigo" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "en_US(pc102)+ca"	};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

-xkb_keymap "indigo_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{

-	include "en_US(pc102_nodeadkeys)+ca(nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/ch b/xorg-server/xkeyboard-config/keymap/sgi_vndr/ch
deleted file mode 100644
index ca35be7d9..000000000
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/ch
+++ /dev/null
@@ -1,65 +0,0 @@
-default xkb_keymap "de_indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "en_US(pc_universal)+ch(de)"	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "de_indy_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ 

-	include "en_US(pc_universal_nodeadkeys)+ch(de_nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

-};

-xkb_keymap "de_indigo" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "en_US(pc102)+ch(de)"	};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

-xkb_keymap "de_indigo_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ 

-	include "en_US(pc102_nodeadkeys)+ch(dr_nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

-

-default xkb_keymap "fr_indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "en_US(pc_universal)+ch(fr)"	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "fr_indy_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ 

-	include "en_US(pc_universal_nodeadkeys)+ch(fr_nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

-};

-xkb_keymap "fr_indigo" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "en_US(pc102)+ch(fr)"	};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

-xkb_keymap "fr_indigo_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ 

-	include "en_US(pc102_nodeadkeys)+ch(fr_nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/cz b/xorg-server/xkeyboard-config/keymap/sgi_vndr/cz
deleted file mode 100644
index 8e4a0a79c..000000000
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/cz
+++ /dev/null
@@ -1,29 +0,0 @@
-default xkb_keymap "indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "us(pc_universal)+cz"		};

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indigo" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "us(pc102)+cz"		};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

-};

-

-default xkb_keymap "indy_qwerty" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "us(pc_universal)+cz(qwerty)"  };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indigo_qwerty" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "us(pc102)+cz(qwerty)"		};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/de b/xorg-server/xkeyboard-config/keymap/sgi_vndr/de
deleted file mode 100644
index c63caf9b0..000000000
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/de
+++ /dev/null
@@ -1,32 +0,0 @@
-default xkb_keymap "indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};

-    xkb_types		{ include "default"				};

-    xkb_compatibility	{ include "default"				};

-    xkb_symbols 	{ include "en_US(pc_universal)+de"		};

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};

-};

-xkb_keymap "indy_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ 

-	include "en_US(pc_universal_nodeadkeys)+de(nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indigo" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "en_US(pc102)+de"		};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

-};

-xkb_keymap "indigo_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols {

-	include "en_US(pc102_nodeadkeys)+de(nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/dk b/xorg-server/xkeyboard-config/keymap/sgi_vndr/dk
deleted file mode 100644
index 017443d56..000000000
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/dk
+++ /dev/null
@@ -1,32 +0,0 @@
-default xkb_keymap "indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};

-    xkb_types		{ include "default"				};

-    xkb_compatibility	{ include "default"				};

-    xkb_symbols 	{ include "en_US(pc_universal)+dk"		};

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};

-};

-xkb_keymap "indy_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ 

-	include "en_US(pc_universal_nodeadkeys)+dk(nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indigo" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "en_US(pc102)+dk"		};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

-};

-xkb_keymap "indigo_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ 

-	include "en_US(pc102_nodeadkeys)+dk(nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/dvorak b/xorg-server/xkeyboard-config/keymap/sgi_vndr/dvorak
deleted file mode 100644
index b84bc5659..000000000
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/dvorak
+++ /dev/null
@@ -1,14 +0,0 @@
-default xkb_keymap "indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "us(pc_universal)+dvorak"	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc101)"		};

-};

-xkb_keymap "indigo" {

-    xkb_keycodes	{ include "sgi_vndr/indigo"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "us(pc101)+dvorak"	};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc101)"	};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/en_US b/xorg-server/xkeyboard-config/keymap/sgi_vndr/en_US
deleted file mode 100644
index 184d4b896..000000000
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/en_US
+++ /dev/null
@@ -1,56 +0,0 @@
-default xkb_keymap "indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "en_US(pc_universal)"	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

-};

-xkb_keymap "indy_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};

-    xkb_types		{ include "default"				};

-    xkb_compatibility	{ include "default"				};

-    xkb_symbols 	{ include "en_US(pc_universal_nodeadkeys)"	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};

-};

-xkb_keymap "indy101" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "en_US(pc_universal)"	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc101)"	};

-};

-xkb_keymap "indy101_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};

-    xkb_types		{ include "default"				};

-    xkb_compatibility	{ include "default"				};

-    xkb_symbols 	{ include "en_US(pc_universal_nodeadkeys)"	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc101)"			};

-};

-xkb_keymap "indy104" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "en_US(pc_universal)"	};

-    xkb_geometry	{ include "microsoft(natural)"	};

-};

-xkb_keymap "indy104_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};

-    xkb_types		{ include "default"				};

-    xkb_compatibility	{ include "default"				};

-    xkb_symbols 	{ include "en_US(pc_universal_nodeadkeys)"	};

-    xkb_geometry	{ include "microsoft(natural)"			};

-};

-xkb_keymap "indigo" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "en_US(pc102)"	};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

-xkb_keymap "indigo_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "en_US(pc102_nodeadkeys)"	};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/es b/xorg-server/xkeyboard-config/keymap/sgi_vndr/es
deleted file mode 100644
index 96898c6e3..000000000
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/es
+++ /dev/null
@@ -1,32 +0,0 @@
-default xkb_keymap "indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "en_US(pc_universal)+es"	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indy_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{

-	include "en_US(pc_universal_nodeadkeys)+es(nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

-};

-xkb_keymap "indigo" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "en_US(pc102)+es"	};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

-xkb_keymap "indigo_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{

-	include "en_US(pc102_nodeadkeys)+es(nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/fi b/xorg-server/xkeyboard-config/keymap/sgi_vndr/fi
deleted file mode 100644
index ca99af149..000000000
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/fi
+++ /dev/null
@@ -1,32 +0,0 @@
-default xkb_keymap "indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "en_US(pc_universal)+fi"	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indy_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{

-	include "en_US(pc_universal_nodeadkeys)+fi(nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

-};

-xkb_keymap "indigo" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "en_US(pc102)+fi"	};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

-xkb_keymap "indigo_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{

-	include "en_US(pc102_nodeadkeys)+fi(nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/fr b/xorg-server/xkeyboard-config/keymap/sgi_vndr/fr
deleted file mode 100644
index fa84b65a7..000000000
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/fr
+++ /dev/null
@@ -1,32 +0,0 @@
-default xkb_keymap "indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "en_US(pc_universal)+fr"	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indy_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols  { 

-	include "en_US(pc_universal_nodeadkeys)+fr(nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

-};

-xkb_keymap "indigo" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "en_US(pc102)+fr"	};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

-xkb_keymap "indigo_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ 

-	include "en_US(pc102_nodeadkeys)+fr(nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/gb b/xorg-server/xkeyboard-config/keymap/sgi_vndr/gb
deleted file mode 100644
index 90f79c194..000000000
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/gb
+++ /dev/null
@@ -1,32 +0,0 @@
-default xkb_keymap "indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "en_US(pc_universal)+gb"	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indy_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{

-	include "en_US(pc_universal_nodeadkeys)+gb(nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

-};

-xkb_keymap "indigo" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "en_US(pc102)+gb"	};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

-xkb_keymap "indigo_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{

-	include "en_US(pc102_nodeadkeys)+gb(nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/hu b/xorg-server/xkeyboard-config/keymap/sgi_vndr/hu
deleted file mode 100644
index 653236f2f..000000000
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/hu
+++ /dev/null
@@ -1,104 +0,0 @@
-default xkb_keymap "indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};

-    xkb_types		{ include "default"				};

-    xkb_compatibility	{ include "default"				};

-    xkb_symbols 	{ include "en_US(pc_universal)+hu(basic)"	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};

-};

-xkb_keymap "indy_toggle" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols { 

-	include "en_US(pc_universal)+hu(basic)+group(toggle)" 

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indy_shift_toggle" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols { 

-	include "en_US(pc_universal)+hu(basic)+group(shifts_toggle)" 

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indy_ctrl_shift_toggle" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols { 

-	include "en_US(pc_universal)+hu(basic)+group(ctrl_shift_toggle)" 

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indy_ctrl_alt_toggle" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols { 

-	include "en_US(pc_universal)+hu(basic)+group(ctrl_alt_toggle)" 

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indy_caps_toggle" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols { 

-	include "en_US(pc_universal)+hu(basic)+group(caps_toggle)" 

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indigo" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "en_US(pc102)+hu(basic)"	};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

-};

-xkb_keymap "indigo_toggle" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols { 

-	include "en_US(pc102)+hu(basic)+group(toggle)" 

-    };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

-};

-xkb_keymap "indigo_shift_toggle" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols { 

-	include "en_US(pc102)+hu(basic)+group(shifts_toggle)" 

-    };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

-};

-xkb_keymap "indigo_ctrl_shift_toggle" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols { 

-	include "en_US(pc102)+hu(basic)+group(ctrl_shift_toggle)" 

-    };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

-};

-xkb_keymap "indigo_ctrl_alt_toggle" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols { 

-	include "en_US(pc102)+hu(basic)+group(ctrl_alt_toggle)" 

-    };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

-};

-xkb_keymap "indigo_caps_toggle" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols { 

-	include "en_US(pc102)+hu(basic)+group(caps_toggle)" 

-    };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/it b/xorg-server/xkeyboard-config/keymap/sgi_vndr/it
deleted file mode 100644
index 64a413d4d..000000000
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/it
+++ /dev/null
@@ -1,32 +0,0 @@
-default xkb_keymap "indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "en_US(pc_universal)+it"	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indy_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{

-	include "en_US(pc_universal_nodeadkeys)+it(nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

-};

-xkb_keymap "indigo" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "en_US(pc102)+it"	};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

-xkb_keymap "indigo_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{

-	include "en_US(pc102_nodeadkeys)+it(nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/jp b/xorg-server/xkeyboard-config/keymap/sgi_vndr/jp
deleted file mode 100644
index 96280c105..000000000
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/jp
+++ /dev/null
@@ -1,7 +0,0 @@
-default xkb_keymap "indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(jp106)"			};

-    xkb_types		{ include "default"				};

-    xkb_compatibility	{ include "default"				};

-    xkb_symbols 	{ include "us(pc101)+sgi_vndr/jp"			};

-    xkb_geometry	{ include "sgi_vndr/indy(jp106)"			};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/no b/xorg-server/xkeyboard-config/keymap/sgi_vndr/no
deleted file mode 100644
index 8fc326abe..000000000
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/no
+++ /dev/null
@@ -1,32 +0,0 @@
-default xkb_keymap "indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "en_US(pc_universal)+no"	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indy_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{

-	include "en_US(pc_universal_nodeadkeys)+no(nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

-};

-xkb_keymap "indigo" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "en_US(pc102)+no"	};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

-xkb_keymap "indigo_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{

-	include "en_US(pc102_nodeadkeys)+no(nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/pl b/xorg-server/xkeyboard-config/keymap/sgi_vndr/pl
deleted file mode 100644
index 623e06f8f..000000000
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/pl
+++ /dev/null
@@ -1,28 +0,0 @@
-default xkb_keymap "indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "us(pc_universal)+pl"	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

-};

-xkb_keymap "indy_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};

-    xkb_types		{ include "default"				};

-    xkb_compatibility	{ include "default"				};

-    xkb_symbols 	{ include "us(pc_universal)+pl(nodeadkeys)" 	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};

-};

-xkb_keymap "indigo" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "us(pc102)+pl"	};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

-xkb_keymap "indigo_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "us(pc102)+pl(nodeadkeys)" };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/pt b/xorg-server/xkeyboard-config/keymap/sgi_vndr/pt
deleted file mode 100644
index 6be76ddb9..000000000
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/pt
+++ /dev/null
@@ -1,32 +0,0 @@
-default xkb_keymap "indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "en_US(pc_universal)+pt"	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indy_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{

-	include "en_US(pc_universal_nodeadkeys)+pt(nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

-};

-xkb_keymap "indigo" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "en_US(pc102)+pt"	};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

-xkb_keymap "indigo_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{

-	include "en_US(pc102_nodeadkeys)+pt(nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/ru b/xorg-server/xkeyboard-config/keymap/sgi_vndr/ru
deleted file mode 100644
index 45ebdf76f..000000000
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/ru
+++ /dev/null
@@ -1,104 +0,0 @@
-default xkb_keymap "indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"			};

-    xkb_types		{ include "default"				};

-    xkb_compatibility	{ include "default"				};

-    xkb_symbols 	{ include "en_US(pc_universal)+ru(basic)"	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"			};

-};

-xkb_keymap "indy_toggle" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols { 

-	include "en_US(pc_universal)+ru(basic)+group(toggle)" 

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indy_shift_toggle" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols { 

-	include "en_US(pc_universal)+ru(basic)+group(shifts_toggle)" 

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indy_ctrl_shift_toggle" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols { 

-	include "en_US(pc_universal)+ru(basic)+group(ctrl_shift_toggle)" 

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indy_ctrl_alt_toggle" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols { 

-	include "en_US(pc_universal)+ru(basic)+group(ctrl_alt_toggle)" 

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indy_caps_toggle" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols { 

-	include "en_US(pc_universal)+ru(basic)+group(caps_toggle)" 

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indigo" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "en_US(pc102)+ru(basic)"	};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

-};

-xkb_keymap "indigo_toggle" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols { 

-	include "en_US(pc102)+ru(basic)+group(toggle)" 

-    };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

-};

-xkb_keymap "indigo_shift_toggle" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols { 

-	include "en_US(pc102)+ru(basic)+group(shifts_toggle)" 

-    };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

-};

-xkb_keymap "indigo_ctrl_shift_toggle" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols { 

-	include "en_US(pc102)+ru(basic)+group(ctrl_shift_toggle)" 

-    };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

-};

-xkb_keymap "indigo_ctrl_alt_toggle" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols { 

-	include "en_US(pc102)+ru(basic)+group(ctrl_alt_toggle)" 

-    };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

-};

-xkb_keymap "indigo_caps_toggle" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols { 

-	include "en_US(pc102)+ru(basic)+group(caps_toggle)" 

-    };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/se b/xorg-server/xkeyboard-config/keymap/sgi_vndr/se
deleted file mode 100644
index 7ac2fbc6b..000000000
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/se
+++ /dev/null
@@ -1,32 +0,0 @@
-default xkb_keymap "indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "en_US(pc_universal)+se"	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indy_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{

-	include "en_US(pc_universal_nodeadkeys)+se(nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

-};

-xkb_keymap "indigo" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "en_US(pc102)+se"	};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

-xkb_keymap "indigo_nodeadkeys" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ 

-	include "en_US(pc102_nodeadkeys)+se(nodeadkeys)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/sk b/xorg-server/xkeyboard-config/keymap/sgi_vndr/sk
deleted file mode 100644
index 53c5ebd84..000000000
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/sk
+++ /dev/null
@@ -1,29 +0,0 @@
-default xkb_keymap "indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "us(pc_universal)+sk"		};

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indigo" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "us(pc102)+sk"		};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

-};

-

-default xkb_keymap "indy_qwerty" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "us(pc_universal)+sk(qwerty)"	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"		};

-};

-xkb_keymap "indigo_qwerty" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "us(pc102)+sk(qwerty)"		};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"		};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/th b/xorg-server/xkeyboard-config/keymap/sgi_vndr/th
deleted file mode 100644
index a1fb26601..000000000
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/th
+++ /dev/null
@@ -1,16 +0,0 @@
-default xkb_keymap "indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{

-	include "en_US(pc_universal)+th+group(shifts_toggle)"

-    };

-    xkb_geometry	{ include "sgi_vndr/indy(pc102)"	};

-};

-xkb_keymap "indigo" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc102)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "en_US(pc102)+th+group(shifts_toggle)"	};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc102)"	};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sgi_vndr/us b/xorg-server/xkeyboard-config/keymap/sgi_vndr/us
deleted file mode 100644
index 156e3684d..000000000
--- a/xorg-server/xkeyboard-config/keymap/sgi_vndr/us
+++ /dev/null
@@ -1,42 +0,0 @@
-default xkb_keymap "indy" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"		};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols 	{ include "us(pc_universal)"		};

-    xkb_geometry	{ include "sgi_vndr/indy(pc101)"		};

-};

-xkb_keymap "indy101_euro" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "us(pc_universal)"	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc101)"	};

-};

-xkb_keymap "indy_compose" {

-    xkb_keycodes	{ include "sgi_vndr/indy(universal)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "us(pc_universal)"	};

-    xkb_geometry	{ include "sgi_vndr/indy(pc101)"	};

-};

-xkb_keymap "indigo" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc101)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "us(pc101)"		};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc101)"	};

-};

-xkb_keymap "indigo_compose" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc101)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "us(pc101compose)"	};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc101)"	};

-};

-xkb_keymap "indigo101_compose" {

-    xkb_keycodes	{ include "sgi_vndr/indigo(pc101)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "us(pc101euro)"	};

-    xkb_geometry	{ include "sgi_vndr/indigo(pc101)"	};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sony b/xorg-server/xkeyboard-config/keymap/sony
deleted file mode 100644
index ce4f566df..000000000
--- a/xorg-server/xkeyboard-config/keymap/sony
+++ /dev/null
@@ -1,32 +0,0 @@
-//

-//Copyright 1996, 1998  The Open Group

-//

-//Permission to use, copy, modify, distribute, and sell this software and its

-//documentation for any purpose is hereby granted without fee, provided that

-//the above copyright notice appear in all copies and that both that

-//copyright notice and this permission notice appear in supporting

-//documentation.

-//

-//The above copyright notice and this permission notice shall be

-//included in all copies or substantial portions of the Software.

-//

-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-//IN NO EVENT SHALL THE OPEN GROUP 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.

-//

-//Except as contained in this notice, the name of The Open Group shall

-//not be used in advertising or otherwise to promote the sale, use or

-//other dealings in this Software without prior written authorization

-//from The Open Group.

-//

-xkb_keymap "news5000-nwp5461" {

-    xkb_keycodes	{ include "sony(nwp5461)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "sony_vndr/us(nwp5461)"	};

-    xkb_geometry	{ include "sony(nwp5461)"	};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sun_vndr/Makefile.am b/xorg-server/xkeyboard-config/keymap/sun_vndr/Makefile.am
deleted file mode 100644
index 551162d3e..000000000
--- a/xorg-server/xkeyboard-config/keymap/sun_vndr/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-keymapdir = $(xkb_base)/keymap/sun_vndr
-
-dist_keymap_DATA = \
-all de es fi \
-fr no pl \
-ru se uk \
-us
diff --git a/xorg-server/xkeyboard-config/keymap/sun_vndr/all b/xorg-server/xkeyboard-config/keymap/sun_vndr/all
deleted file mode 100644
index 71a1813eb..000000000
--- a/xorg-server/xkeyboard-config/keymap/sun_vndr/all
+++ /dev/null
@@ -1,1091 +0,0 @@
-//  x86 KEYBOARDS

-// 

-//  Generally, x86 keyboards fall into either pc101 (101-key) or pc102

-//  (102-key European) categories.  Symbol tables are typically formed by

-//  augmenting sun/us(pc101) or sun/us(pc102) with the "extra" symbols

-//  from the type5 definition.  Geometries and keycodes for many of

-//  these fall under sun(x86) or sun(x86tuv).

-// 

-//  USB KEYBOARDS

-//  

-//  Only the keycodes (scancodes) change in the Universal Serial Bus

-//  keyboard definitions.  Symbols are kept the same as in the type5

-//  case.  The USB HID spec is confusing on this point, but the

-//  scancodes described in it relate to physical keys, not symbols, as

-//  it might lead one to believe.

-//

-//  HOBO KEYBOARDS

-//

-//  Hobo keyboards are derived from type5 keyboards, which in turn,

-//  are all derived from the type5 US keyboard.  Use the

-//  appropriate set of keycodes and geometry (either type5hobo or

-//  type5tuvhobo) and select the symbol set sun/us(type5hobo) to

-//  replace sun/us(type5).  For example, Sweden5_Hobo:

-// 

-// xkb_keymap "Sweden5_Hobo" {

-//     xkb_keycodes	{ include "sun(type5tuvhobo)"	};

-//     xkb_types		{ include "default"		};

-//     xkb_compatibility	{ include "default"		};

-//     xkb_symbols		{ include "sun/us(type5hobo)+sun/se(type5)"};

-//     xkb_geometry	{ include "sun(type5tuvhobo)"	};

-// };

-// 

-//  Doing it this way allows all the symbol changes for a particular

-//  type5 keyboard to hold for a Hobo keyboard; both keyboards, in

-//  this case, would use sun/se(type5) to augment the symbols in the

-//  US keboard definition.

-

-xkb_keymap "Belgian6" {

-    xkb_keycodes	{ include "sun(type6tuv)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+be"	};

-    xkb_geometry	{ include "sun(type6tuv)"	};

-};

-

-xkb_keymap "Belgian6_usb" {

-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+be"	};

-    xkb_geometry	{ include "sun(type6tuv)"	};

-};

-

-xkb_keymap "Canada4" {

-    xkb_keycodes	{ include "sun(type4_ca)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/ca(type4)"	};

-    xkb_geometry	{ include "sun(type4_ca)"	};

-};

-

-xkb_keymap "Canada_Fr5" {

-    xkb_keycodes	{ include "sun(type5tuv)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+sun/ca(type5)"};

-    xkb_geometry	{ include "sun(type5tuv)"	};

-};

-

-xkb_keymap "Canada_Fr5_Hobo" {

-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5hobo)+sun/ca(type5)"};

-    xkb_geometry	{ include "sun(type5tuvhobo)"	};

-};

-

-xkb_keymap "Canada_Fr5_TBITS5" {

-    xkb_keycodes	{ include "sun(type5tuv)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+sun/ca(type5tbits5)"};

-    xkb_geometry	{ include "sun(type5tuv)"	};

-};

-

-xkb_keymap "Canada_Fr_x86" {

-    xkb_keycodes	{ include "sun(x86ca)"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(pc101)+sun/ca(x86)"};

-    xkb_geometry	{ include "sun(x86ca)"		};

-};

-

-xkb_keymap "Switzer_Fr4" {

-    xkb_keycodes	{ include "sun(type4tuv)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/sw(type4fr)"	};

-    xkb_geometry	{ include "sun(type4tuv)"	};

-};

-

-xkb_keymap "Switzer_Fr5" {

-    xkb_keycodes	{ include "sun(type5tuv)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+sun/sw(type5fr)"	};

-    xkb_geometry	{ include "sun(type5tuv)"	};

-};

-

-xkb_keymap "Switzer_Fr5_Hobo" {

-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5hobo)+sun/sw(type5fr)"};

-    xkb_geometry	{ include "sun(type5tuvhobo)"	};

-};

-

-xkb_keymap "Switzer_Fr6" {

-    xkb_keycodes	{ include "sun(type6tuv)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+sun/sw(type5fr)"};

-    xkb_geometry	{ include "sun(type6tuv)"	};

-};

-

-xkb_keymap "Switzer_Fr6_usb" {

-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+sun/sw(type5fr)"};

-    xkb_geometry	{ include "sun(type6tuv)"	};

-};

-

-xkb_keymap "Switzer_Fr_x86" {

-    xkb_keycodes	{ include "sun(x86tuv)"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(pc102)+sun/sw(type5fr)"};

-    xkb_geometry	{ include "sun(x86tuv)"		};

-};

-

-xkb_keymap "Switzer_Ge4" {

-    xkb_keycodes	{ include "sun(type4tuv)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/sw(type4de)"	};

-    xkb_geometry	{ include "sun(type4tuv)"	};

-};

-

-xkb_keymap "Switzer_Ge5" {

-    xkb_keycodes	{ include "sun(type5tuv)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+sun/sw(type5de)"};

-    xkb_geometry	{ include "sun(type5tuv)"	};

-};

-

-xkb_keymap "Switzer_Ge5_Hobo" {

-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5hobo)+sun/sw(type5de)"};

-    xkb_geometry	{ include "sun(type5tuvhobo)"	};

-};

-

-xkb_keymap "Switzer_Ge6" {

-    xkb_keycodes	{ include "sun(type6tuv)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+sun/sw(type5de)"};

-    xkb_geometry	{ include "sun(type6tuv)"	};

-};

-

-xkb_keymap "Switzer_Ge6_usb" {

-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+sun/sw(type5de)"};

-    xkb_geometry	{ include "sun(type6tuv)"	};

-};

-

-xkb_keymap "Switzer_Ge_x86" {

-    xkb_keycodes	{ include "sun(x86tuv)"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(pc102)+sun/sw(type5de)"};

-    xkb_geometry	{ include "sun(x86tuv)"		};

-};

-

-xkb_keymap "Czech5" {

-    xkb_keycodes	{ include "sun(type5tuv)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/cz(type5)"	};

-    xkb_geometry	{ include "sun(type5tuv)"	};

-};

-

-

-xkb_keymap "Germany4" {

-    xkb_keycodes	{ include "sun(type4tuv)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/de(type4)"	};

-    xkb_geometry	{ include "sun(type4tuv)"	};

-};

-

-xkb_keymap "Germany5" {

-    xkb_keycodes	{ include "sun(type5tuv)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+de"	};

-    xkb_geometry	{ include "sun(type5tuv)"	};

-};

-

-xkb_keymap "Germany5_Hobo" {

-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5hobo)+de"};

-    xkb_geometry	{ include "sun(type5tuvhobo)"	};

-};

-

-xkb_keymap "Germany6" {

-    xkb_keycodes	{ include "sun(type6tuv)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+de"	};

-    xkb_geometry	{ include "sun(type6tuv)"	};

-};

-

-xkb_keymap "Germany6_usb" {

-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+de"	};

-    xkb_geometry	{ include "sun(type6tuv)"	};

-};

-

-xkb_keymap "Germany_x86" {

-    xkb_keycodes	{ include "sun(x86tuv)"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(pc102)+de"};

-    xkb_geometry	{ include "sun(x86tuv)"		};

-};

-

-xkb_keymap "Denmark4" {

-    xkb_keycodes	{ include "sun(type4tuv)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/dk(type4)"	};

-    xkb_geometry	{ include "sun(type4tuv)"	};

-};

-

-xkb_keymap "Denmark5" {

-    xkb_keycodes	{ include "sun(type5tuv)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+sun/dk(type5)"	};

-    xkb_geometry	{ include "sun(type5tuv)"	};

-};

-

-xkb_keymap "Denmark5_Hobo" {

-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5hobo)+sun/dk(type5)"	};

-    xkb_geometry	{ include "sun(type5tuvhobo)"	};

-};

-

-xkb_keymap "Denmark6" {

-    xkb_keycodes	{ include "sun(type6tuv)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+sun/dk(type5)"	};

-    xkb_geometry	{ include "sun(type6tuv)"	};

-};

-

-xkb_keymap "Denmark6_usb" {

-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+sun/dk(type5)"	};

-    xkb_geometry	{ include "sun(type6tuv)"	};

-};

-

-xkb_keymap "Denmark_x86" {

-    xkb_keycodes	{ include "sun(x86tuv)"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(pc102)+sun/dk(type5)"	};

-    xkb_geometry	{ include "sun(x86tuv)"		};

-};

-

-xkb_keymap "SpainLatAm4" {

-    xkb_keycodes	{ include "sun(type4tuv)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/es(type4)"	};

-    xkb_geometry	{ include "sun(type4tuv)"	};

-};

-

-xkb_keymap "Spain5" {

-    xkb_keycodes	{ include "sun(type5tuv)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+sun/es(type5)"	};

-    xkb_geometry	{ include "sun(type5tuv)"	};

-};

-

-xkb_keymap "Spain5_Hobo" {

-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5hobo)+sun/es(type5)"};

-    xkb_geometry	{ include "sun(type5tuvhobo)"	};

-};

-

-xkb_keymap "Spain6" {

-    xkb_keycodes	{ include "sun(type6tuv)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+sun/es(type5)"	};

-    xkb_geometry	{ include "sun(type6tuv)"	};

-};

-

-xkb_keymap "Spain6_usb" {

-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+sun/es(type5)"	};

-    xkb_geometry	{ include "sun(type6tuv)"	};

-};

-

-xkb_keymap "Spain_x86" {

-    xkb_keycodes	{ include "sun(x86tuv)"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(pc102)+sun/es(type5)"	};

-    xkb_geometry	{ include "sun(x86tuv)"		};

-};

-

-

-xkb_keymap "Finnish6" {

-    xkb_keycodes	{ include "sun(type6tuv)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+sun/fi"};

-    xkb_geometry	{ include "sun(type6tuv)"	};

-};

-

-xkb_keymap "Finnish6_usb" {

-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+sun/fi"};

-    xkb_geometry	{ include "sun(type6tuv)"	};

-};

-

-

-xkb_keymap "FranceBelg4" {

-    xkb_keycodes	{ include "sun(type4tuv)"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/fr(type4)"	};

-    xkb_geometry	{ include "sun(type4tuv)"	};

-};

-

-xkb_keymap "France5" {

-    xkb_keycodes	{ include "sun(type5tuv)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+sun/fr(type5)" };

-    xkb_geometry	{ include "sun(type5tuv)"	};

-};

-

-xkb_keymap "France5_Hobo" {

-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5hobo)+sun/fr(type5)"};

-    xkb_geometry	{ include "sun(type5tuvhobo)"	};

-};

-

-xkb_keymap "France6" {

-    xkb_keycodes	{ include "sun(type6tuv)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+sun/fr(type5)"	};

-    xkb_geometry	{ include "sun(type6tuv)"	};

-};

-

-xkb_keymap "France6_usb" {

-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+sun/fr(type5)"	};

-    xkb_geometry	{ include "sun(type6tuv)"	};

-};

-

-xkb_keymap "France_x86" {

-    xkb_keycodes	{ include "sun(x86tuv)"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(pc102)+sun/fr(type5)"	};

-    xkb_geometry	{ include "sun(x86tuv)"		};

-};

-

-xkb_keymap "Greece5" {

-    xkb_keycodes	{ include "sun(type5tuv)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/gr(type5)"	};

-    xkb_geometry	{ include "sun(type5tuv)"	};

-};

-

-

-xkb_keymap "Hungary5" {

-    xkb_keycodes	{ include "sun(type5tuv)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5basic)+sun/hu(type5)"	};

-    xkb_geometry	{ include "sun(type5tuv)"	};

-};

-

-

-xkb_keymap "Italy4" {

-    xkb_keycodes	{ include "sun(type4tuv)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/it(type4)"	};

-    xkb_geometry	{ include "sun(type4tuv)"	};

-};

-

-xkb_keymap "Italy5" {

-    xkb_keycodes	{ include "sun(type5tuv)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+sun/it(type5)"	};

-    xkb_geometry	{ include "sun(type5tuv)"	};

-};

-

-xkb_keymap "Italy5_Hobo" {

-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5hobo)+sun/it(type5)"};

-    xkb_geometry	{ include "sun(type5tuvhobo)"	};

-};

-

-xkb_keymap "Italy6" {

-    xkb_keycodes	{ include "sun(type6tuv)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+sun/it(type5)"	};

-    xkb_geometry	{ include "sun(type6tuv)"	};

-};

-

-xkb_keymap "Italy6_usb" {

-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+sun/it(type5)"	};

-    xkb_geometry	{ include "sun(type6tuv)"	};

-};

-

-xkb_keymap "Italy_x86" {

-    xkb_keycodes	{ include "sun(x86tuv)"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(pc102)+sun/it(type5)"	};

-    xkb_geometry	{ include "sun(x86tuv)"		};

-};

-

-xkb_keymap "Japan4" {

-    xkb_keycodes	{ include "sun(type4_jp)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/jp(type4)"	};

-    xkb_geometry	{ include "sun(type4jp)"	};

-};

-

-xkb_keymap "Japan5" {

-    xkb_keycodes	{ include "sun(type5_jp)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/jp(type5)"	};

-    xkb_geometry	{ include "sun(type5jp)"	};

-};

-

-xkb_keymap "Japan5_Hobo" {

-    xkb_keycodes	{ include "sun(type5_jphobo)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/jp(type5hobo)"	};

-    xkb_geometry	{ include "sun(type5jphobo)"	};

-};

-

-xkb_keymap "Japan6" {

-    xkb_keycodes	{ include "sun(type6_jp)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default+japan(kana_lock)"	};

-    xkb_symbols		{ include "sun/jp(type6)"	};

-    xkb_geometry	{ include "sun(type6jp)"	};

-};

-

-xkb_keymap "Japan6_usb" {

-    xkb_keycodes	{ include "sun(type6_jp_usb)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default+japan(kana_lock)"	};

-    xkb_symbols		{ include "sun/jp(type6)"	};

-    xkb_geometry	{ include "sun(type6jp)"	};

-};

-

-xkb_keymap "Japan_x86" {

-    xkb_keycodes	{ include "sun(x86jp)"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/jp(x86)"		};

-    xkb_geometry	{ include "sun(x86jp)"		};

-};

-

-xkb_keymap "J3100" {

-    xkb_keycodes	{ include "sun(x86tuv)"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/jp(J3100)"		};

-    xkb_geometry	{ include "sun(x86tuv)"		};

-};

-

-xkb_keymap "Japan_Muhenkan_x86" {

-    xkb_keycodes	{ include "sun(x86jp)"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/jp(Muhenkan_x86)"		};

-    xkb_geometry	{ include "sun(x86jp)"		};

-};

-

-xkb_keymap "Korea4" {

-    xkb_keycodes	{ include "sun(type4)"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/ko(type4)"	};

-    xkb_geometry	{ include "sun(type4)"		};

-};

-

-xkb_keymap "Korea5" {

-    xkb_keycodes	{ include "sun(type5)"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+sun/ko(type5)"	};

-    xkb_geometry	{ include "sun(type5)"		};

-};

-

-xkb_keymap "Korea5_Hobo" {

-    xkb_keycodes	{ include "sun(type5hobo)"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5hobo)+sun/ko(type5)"};

-    xkb_geometry	{ include "sun(type5hobo)"		};

-};

-

-xkb_keymap "Korea6" {

-    xkb_keycodes	{ include "sun(type6)"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+sun/ko(type5)"	};

-    xkb_geometry	{ include "sun(type6)"		};

-};

-

-xkb_keymap "Korea6_usb" {

-    xkb_keycodes	{ include "sun(type6_usb)"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+sun/ko(type5)"	};

-    xkb_geometry	{ include "sun(type6)"		};

-};

-

-xkb_keymap "Korea_x86" {

-    xkb_keycodes	{ include "sun(x86ko)"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(pc101)+sun/ko(type5)"	};

-    xkb_geometry	{ include "sun(x86ko)"		};

-};

-

-xkb_keymap "Lithuania5" {

-    xkb_keycodes	{ include "sun(type5tuv)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5basic)+sun/lt(type5)" };

-    xkb_geometry	{ include "sun(type5tuv)"	};

-};

-

-

-xkb_keymap "Latvia5" {

-    xkb_keycodes	{ include "sun(type5tuv)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5basic)+sun/lv(type5)"	};

-    xkb_geometry	{ include "sun(type5tuv)"	};

-};

-

-xkb_keymap "MS_US101A_x86" {

-    xkb_keycodes	{ include "sun(MS_x86)"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(pc104)"		};

-    xkb_geometry	{ include "sun(MS_x86)"		};

-};

-

-xkb_keymap "Netherland4" {

-    xkb_keycodes	{ include "sun(type4tuv)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/nl(type4)"	};

-    xkb_geometry	{ include "sun(type4tuv)"	};

-};

-

-xkb_keymap "Netherland5" {

-    xkb_keycodes	{ include "sun(type5tuv)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+nl"	};

-    xkb_geometry	{ include "sun(type5tuv)"	};

-};

-

-xkb_keymap "Netherland5_Hobo" {

-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5hobo)+nl"	};

-    xkb_geometry	{ include "sun(type5tuvhobo)"	};

-};

-

-xkb_keymap "Netherland6" {

-    xkb_keycodes	{ include "sun(type6tuv)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+nl"	};

-    xkb_geometry	{ include "sun(type6tuv)"	};

-};

-

-xkb_keymap "Netherland6_usb" {

-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+nl"	};

-    xkb_geometry	{ include "sun(type6tuv)"	};

-};

-

-xkb_keymap "Netherland_x86" {

-    xkb_keycodes	{ include "sun(x86tuv)"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(pc102)+nl"	};

-    xkb_geometry	{ include "sun(x86tuv)"		};

-};

-

-xkb_keymap "Norway4" {

-    xkb_keycodes	{ include "sun(type4tuv)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/no(type4)"	};

-    xkb_geometry	{ include "sun(type4tuv)"	};

-};

-

-xkb_keymap "Norway5" {

-    xkb_keycodes	{ include "sun(type5tuv)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+sun/no(type5)"};

-    xkb_geometry	{ include "sun(type5tuv)"	};

-};

-

-xkb_keymap "Norway5_Hobo" {

-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5hobo)+sun/no(type5)"};

-    xkb_geometry	{ include "sun(type5tuvhobo)"	};

-};

-

-xkb_keymap "Norway6" {

-    xkb_keycodes	{ include "sun(type6tuv)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+sun/no(type5)"	};

-    xkb_geometry	{ include "sun(type6tuv)"	};

-};

-

-xkb_keymap "Norway6_usb" {

-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+sun/no(type5)"	};

-    xkb_geometry	{ include "sun(type6tuv)"	};

-};

-

-xkb_keymap "Norway_x86" {

-    xkb_keycodes	{ include "sun(x86tuv)"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(pc102)+sun/no(type5)"	};

-    xkb_geometry	{ include "sun(x86tuv)"		};

-};

-

-xkb_keymap "Poland5" {

-    xkb_keycodes	{ include "sun(type5tuv)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/pl"		};

-    xkb_geometry	{ include "sun(type5tuv)"	};

-};

-

-xkb_keymap "Portugal4" {

-    xkb_keycodes	{ include "sun(type4tuv)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/pt(type4)"	};

-    xkb_geometry	{ include "sun(type4tuv)"	};

-};

-

-xkb_keymap "Portugal5" {

-    xkb_keycodes	{ include "sun(type5tuv)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+sun/pt(type5)"	};

-    xkb_geometry	{ include "sun(type5tuv)"	};

-};

-

-xkb_keymap "Portugal5_Hobo" {

-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5hobo)+sun/pt(type5)"};

-    xkb_geometry	{ include "sun(type5tuvhobo)"	};

-};

-

-xkb_keymap "Portugal6" {

-    xkb_keycodes	{ include "sun(type6tuv)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+sun/pt(type5)"	};

-    xkb_geometry	{ include "sun(type6tuv)"	};

-};

-

-xkb_keymap "Portugal6_usb" {

-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+sun/pt(type5)"	};

-    xkb_geometry	{ include "sun(type6tuv)"	};

-};

-

-xkb_keymap "Portugal_x86" {

-    xkb_keycodes	{ include "sun(x86tuv)"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(pc102)+sun/pt(type5)"	};

-    xkb_geometry	{ include "sun(x86tuv)"		};

-};

-

-// xkb_keymap "Russia4" {

-//     xkb_keycodes	{ include "sun(type4)"		};

-//     xkb_types		{ include "default"		};

-//     xkb_compatibility	{ include "default"		};

-//     xkb_symbols		{ include "sun/ru"		};

-//     xkb_geometry	{ include "sun(type4)"		};

-// };

-

-xkb_keymap "Russia5" {

-    xkb_keycodes	{ include "sun(type5tuv)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+sun/ru"};

-    xkb_geometry	{ include "sun(type5tuv)"	};

-};

-

-xkb_keymap "Russia6" {

-    xkb_keycodes	{ include "sun(type6tuv)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+sun/ru"};

-    xkb_geometry	{ include "sun(type6tuv)"	};

-};

-

-xkb_keymap "Russia6_usb" {

-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+sun/ru"};

-    xkb_geometry	{ include "sun(type6tuv)"	};

-};

-

-xkb_keymap "SwedenFin4" {

-    xkb_keycodes	{ include "sun(type4tuv)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/se(type4)"	};

-    xkb_geometry	{ include "sun(type4tuv)"	};

-};

-

-xkb_keymap "Sweden5" {

-    xkb_keycodes	{ include "sun(type5tuv)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+sun/se(type5)"};

-    xkb_geometry	{ include "sun(type5tuv)"	};

-};

-

-xkb_keymap "Sweden5_Hobo" {

-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5hobo)+sun/se(type5)"};

-    xkb_geometry	{ include "sun(type5tuvhobo)"	};

-};

-

-xkb_keymap "Sweden6" {

-    xkb_keycodes	{ include "sun(type6tuv)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+sun/se(type5)"	};

-    xkb_geometry	{ include "sun(type6tuv)"	};

-};

-

-xkb_keymap "Sweden6_usb" {

-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+sun/se(type5)"	};

-    xkb_geometry	{ include "sun(type6tuv)"	};

-};

-

-xkb_keymap "Sweden_x86" {

-    xkb_keycodes	{ include "sun(x86tuv)"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(pc102)+sun/se(type5)"	};

-    xkb_geometry	{ include "sun(x86tuv)"		};

-};

-

-xkb_keymap "Turkey5" {

-    xkb_keycodes	{ include "sun(type5tuv)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+sun/tr"	};

-    xkb_geometry	{ include "sun(type5tuv)"	};

-};

-

-xkb_keymap "Turkey6" {

-    xkb_keycodes	{ include "sun(type6tuv)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+sun/tr"};

-    xkb_geometry	{ include "sun(type6tuv)"	};

-};

-

-xkb_keymap "Turkey6_usb" {

-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+sun/tr"};

-    xkb_geometry	{ include "sun(type6tuv)"	};

-};

-

-xkb_keymap "TurkeyQ6" {

-    xkb_keycodes	{ include "sun(type6tuv)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+sun/tr(type6Q)"};

-    xkb_geometry	{ include "sun(type6tuv)"	};

-};

-

-xkb_keymap "TurkeyQ6_usb" {

-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+sun/tr(type6Q)"};

-    xkb_geometry	{ include "sun(type6tuv)"	};

-};

-

-xkb_keymap "TurkeyF6" {

-    xkb_keycodes	{ include "sun(type6tuv)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+sun/tr(type6F)"};

-    xkb_geometry	{ include "sun(type6)"	};

-};

-

-xkb_keymap "TurkeyF6_usb" {

-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+sun/tr(type6F)"};

-    xkb_geometry	{ include "sun(type6)"	};

-};

-

-xkb_keymap "Taiwan4" {

-    xkb_keycodes	{ include "sun(type4)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/tw(type4)"	};

-    xkb_geometry	{ include "sun(type4)"	};

-};

-

-xkb_keymap "Taiwan5" {

-    xkb_keycodes	{ include "sun(type5)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+sun/tw(type5)"	};

-    xkb_geometry	{ include "sun(type5)"	};

-};

-

-xkb_keymap "Taiwan5_Hobo" {

-    xkb_keycodes	{ include "sun(type5hobo)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5hobo)+sun/tw(type5)"	};

-    xkb_geometry	{ include "sun(type5hobo)"	};

-};

-

-xkb_keymap "Taiwan6" {

-    xkb_keycodes	{ include "sun(type6)"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+sun/tw(type5)"	};

-    xkb_geometry	{ include "sun(type6)"	};

-};

-

-xkb_keymap "Taiwan6_usb" {

-    xkb_keycodes	{ include "sun(type6_usb)"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+sun/tw(type5)"	};

-    xkb_geometry	{ include "sun(type6)"	};

-};

-

-xkb_keymap "Taiwan_x86" {

-    xkb_keycodes	{ include "sun(x86)"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "us(pc101)"	};

-    xkb_geometry	{ include "sun(x86)"		};

-};

-

-xkb_keymap "UK4" {

-    xkb_keycodes	{ include "sun(type4)"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/gb(type4)"	};

-    xkb_geometry	{ include "sun(type4)"		};

-};

-

-xkb_keymap "UK5" {

-    xkb_keycodes	{ include "sun(type5tuv)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5)+sun/gb(type5)"	};

-    xkb_geometry	{ include "sun(type5tuv)"	};

-};

-

-xkb_keymap "UK5_Hobo" {

-    xkb_keycodes	{ include "sun(type5tuvhobo)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type5hobo)+sun/gb(type5)"	};

-    xkb_geometry	{ include "sun(type5tuvhobo)"	};

-};

-

-xkb_keymap "UK6" {

-    xkb_keycodes	{ include "sun(type6tuv)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type6)+sun/gb(type5)"	};

-    xkb_geometry	{ include "sun(type6tuv)"	};

-};

-

-xkb_keymap "UK6_usb" {

-    xkb_keycodes	{ include "sun(type6tuv_usb)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(type6)+sun/gb(type5)"	};

-    xkb_geometry	{ include "sun(type6tuv)"	};

-};

-

-xkb_keymap "UK_x86" {

-    xkb_keycodes	{ include "sun(x86tuv)"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(pc102)+gb"	};

-    xkb_geometry	{ include "sun(x86tuv)"		};

-};

-

-xkb_keymap "US101A_PC" {

-    xkb_keycodes	{ include "sun(type5x86)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(pc101)+sun/us(pc101currency)"};

-    xkb_geometry	{ include "sun(x86)"		};

-};

-

-xkb_keymap "US101A_Sun" {

-    xkb_keycodes	{ include "sun(type5x86)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "sun/us(pc101)+sun/us(US101A_Sun)"	};

-    xkb_geometry	{ include "sun(x86)"		};

-};

-

-xkb_keymap "US101A_x86" {

-    xkb_keycodes	{ include "sun(x86)"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "us(pc101)"		};

-    xkb_geometry	{ include "sun(x86)"		};

-};

-

-xkb_keymap "US4" {

-    xkb_keycodes	{ include "sun(type4)"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "sun/us(type4)"	};

-    xkb_geometry	{ include "sun(type4)"		};

-};

-

-xkb_keymap "US5" {

-    xkb_keycodes	{ include "sun(type5)"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "sun/us(type5)"	};

-    xkb_geometry	{ include "sun(type5)"		};

-};

-

-xkb_keymap "US5_Hobo" {

-    xkb_keycodes	{ include "sun(type5hobo)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "sun/us(type5hobo)"	};

-    xkb_geometry	{ include "sun(type5hobo)"	};

-};

-

-xkb_keymap "US_UNIX5" {

-    xkb_keycodes	{ include "sun(type5)"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "sun/us(type5)"	};

-    xkb_geometry	{ include "sun(type5unix)"	};

-};

-

-xkb_keymap "US_UNIX5_Hobo" {

-    // Same as US5_Hobo

-    xkb_keycodes	{ include "sun(type5hobo)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "sun/us(type5hobo)"	};

-    xkb_geometry	{ include "sun(type5hobo)"	};

-};

-

-xkb_keymap "US6" {

-    xkb_keycodes	{ include "sun(type6)"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "sun/us(type6)"	};

-    xkb_geometry	{ include "sun(type6)"		};

-};

-

-xkb_keymap "US6_usb" {

-    xkb_keycodes	{ include "sun(type6_usb)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "sun/us(type6)"	};

-    xkb_geometry	{ include "sun(type6)"		};

-};

-

-xkb_keymap "US_UNIX6" {

-    xkb_keycodes	{ include "sun(type6)"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "sun/us(type6)"	};

-    xkb_geometry	{ include "sun(type6unix)"	};

-};

-

-xkb_keymap "US_UNIX6_usb" {

-    xkb_keycodes	{ include "sun(type6_usb)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "sun/us(type6)"	};

-    xkb_geometry	{ include "sun(type6unix)"	};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sun_vndr/de b/xorg-server/xkeyboard-config/keymap/sun_vndr/de
deleted file mode 100644
index e05fdf384..000000000
--- a/xorg-server/xkeyboard-config/keymap/sun_vndr/de
+++ /dev/null
@@ -1,77 +0,0 @@
-//

-//Copyright 1996, 1998  The Open Group

-//

-//Permission to use, copy, modify, distribute, and sell this software and its

-//documentation for any purpose is hereby granted without fee, provided that

-//the above copyright notice appear in all copies and that both that

-//copyright notice and this permission notice appear in supporting

-//documentation.

-//

-//The above copyright notice and this permission notice shall be

-//included in all copies or substantial portions of the Software.

-//

-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-//IN NO EVENT SHALL THE OPEN GROUP 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.

-//

-//Except as contained in this notice, the name of The Open Group shall

-//not be used in advertising or otherwise to promote the sale, use or

-//other dealings in this Software without prior written authorization

-//from The Open Group.

-//

-xkb_keymap "type4_de" {

-    xkb_keycodes	{ include "sun(type4_euro)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ 

-	include "sun_vndr/us(sun4)+iso9995-3(basic)+de"

-    };

-    xkb_geometry	{ include "sun(type4)"		};

-};

-xkb_keymap "type4_de_nodeadkeys" {

-    xkb_keycodes	{ include "sun(type4_euro)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ 

-	include "sun_vndr/us(sun4)+iso9995-3(nodeadkeys)+de(nodeadkeys)"

-    };

-    xkb_geometry	{ include "sun(type4)"		};

-};

-xkb_keymap "type4_de_openlook" {

-    xkb_keycodes	{ include "sun(type4_euro)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ 

-	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+de"

-    };

-    xkb_geometry	{ include "sun(type4)"		};

-};

-default xkb_keymap "type5_de" {

-    xkb_keycodes	{ include "sun(type5_euro)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ 

-	include "sun_vndr/us(sun5)+iso9995-3(basic)+de"

-    };

-    xkb_geometry	{ include "sun(type5euro)"	};

-};

-xkb_keymap "type5_de_nodeadkeys" {

-    xkb_keycodes	{ include "sun(type5_euro)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ 

-	include "sun_vndr/us(sun5)+iso9995-3(nodeadkeys)+de(nodeadkeys)" 

-    };

-    xkb_geometry	{ include "sun(type5euro)"	};

-};

-xkb_keymap "type5_de_openlook" {

-    xkb_keycodes	{ include "sun(type5_euro)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+de"	};

-    xkb_geometry	{ include "sun(type5euro)"	};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sun_vndr/es b/xorg-server/xkeyboard-config/keymap/sun_vndr/es
deleted file mode 100644
index 5af8e4222..000000000
--- a/xorg-server/xkeyboard-config/keymap/sun_vndr/es
+++ /dev/null
@@ -1,59 +0,0 @@
-//

-//Copyright 1996, 1998  The Open Group

-//

-//Permission to use, copy, modify, distribute, and sell this software and its

-//documentation for any purpose is hereby granted without fee, provided that

-//the above copyright notice appear in all copies and that both that

-//copyright notice and this permission notice appear in supporting

-//documentation.

-//

-//The above copyright notice and this permission notice shall be

-//included in all copies or substantial portions of the Software.

-//

-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-//IN NO EVENT SHALL THE OPEN GROUP 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.

-//

-//Except as contained in this notice, the name of The Open Group shall

-//not be used in advertising or otherwise to promote the sale, use or

-//other dealings in this Software without prior written authorization

-//from The Open Group.

-//

-xkb_keymap "type4_es" {

-    xkb_keycodes	{ include "sun(type4_euro)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ 

-	include "sun_vndr/us(sun4)+iso9995-3(basic)+es"

-    };

-    xkb_geometry	{ include "sun(type4)"		};

-};

-xkb_keymap "type4_es_openlook" {

-    xkb_keycodes	{ include "sun(type4_euro)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ 

-	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+es"

-    };

-    xkb_geometry	{ include "sun(type4)"		};

-};

-default xkb_keymap "type5_es" {

-    xkb_keycodes	{ include "sun(type5_euro)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ 

-	include "sun_vndr/us(sun5)+iso9995-3(basic)+es"

-    };

-    xkb_geometry	{ include "sun(type5euro)"	};

-};

-xkb_keymap "type5_es_openlook" {

-    xkb_keycodes	{ include "sun(type5_euro)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+es"	};

-    xkb_geometry	{ include "sun(type5euro)"	};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sun_vndr/fi b/xorg-server/xkeyboard-config/keymap/sun_vndr/fi
deleted file mode 100644
index 3e48c7f43..000000000
--- a/xorg-server/xkeyboard-config/keymap/sun_vndr/fi
+++ /dev/null
@@ -1,59 +0,0 @@
-//

-//Copyright 1996, 1998  The Open Group

-//

-//Permission to use, copy, modify, distribute, and sell this software and its

-//documentation for any purpose is hereby granted without fee, provided that

-//the above copyright notice appear in all copies and that both that

-//copyright notice and this permission notice appear in supporting

-//documentation.

-//

-//The above copyright notice and this permission notice shall be

-//included in all copies or substantial portions of the Software.

-//

-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-//IN NO EVENT SHALL THE OPEN GROUP 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.

-//

-//Except as contained in this notice, the name of The Open Group shall

-//not be used in advertising or otherwise to promote the sale, use or

-//other dealings in this Software without prior written authorization

-//from The Open Group.

-//

-xkb_keymap "type4_fi" {

-    xkb_keycodes	{ include "sun(type4_euro)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ 

-	include "sun_vndr/us(sun4)+iso9995-3(basic)+fi"

-    };

-    xkb_geometry	{ include "sun(type4)"		};

-};

-xkb_keymap "type4_fi_openlook" {

-    xkb_keycodes	{ include "sun(type4_euro)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ 

-	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+fi"

-    };

-    xkb_geometry	{ include "sun(type4)"		};

-};

-default xkb_keymap "type5_fi" {

-    xkb_keycodes	{ include "sun(type5_euro)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ 

-	include "sun_vndr/us(sun5)+iso9995-3(basic)+fi"

-    };

-    xkb_geometry	{ include "sun(type5euro)"	};

-};

-xkb_keymap "type5_fi_openlook" {

-    xkb_keycodes	{ include "sun(type5_euro)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+fi"	};

-    xkb_geometry	{ include "sun(type5euro)"	};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sun_vndr/fr b/xorg-server/xkeyboard-config/keymap/sun_vndr/fr
deleted file mode 100644
index 8e15ca017..000000000
--- a/xorg-server/xkeyboard-config/keymap/sun_vndr/fr
+++ /dev/null
@@ -1,59 +0,0 @@
-//

-//Copyright 1996, 1998  The Open Group

-//

-//Permission to use, copy, modify, distribute, and sell this software and its

-//documentation for any purpose is hereby granted without fee, provided that

-//the above copyright notice appear in all copies and that both that

-//copyright notice and this permission notice appear in supporting

-//documentation.

-//

-//The above copyright notice and this permission notice shall be

-//included in all copies or substantial portions of the Software.

-//

-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-//IN NO EVENT SHALL THE OPEN GROUP 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.

-//

-//Except as contained in this notice, the name of The Open Group shall

-//not be used in advertising or otherwise to promote the sale, use or

-//other dealings in this Software without prior written authorization

-//from The Open Group.

-//

-xkb_keymap "type4_fr" {

-    xkb_keycodes	{ include "sun(type4_euro)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ 

-	include "sun_vndr/us(sun4)+iso9995-3(basic)+fr"

-    };

-    xkb_geometry	{ include "sun(type4)"		};

-};

-xkb_keymap "type4_fr_openlook" {

-    xkb_keycodes	{ include "sun(type4_euro)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ 

-	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+fr"

-    };

-    xkb_geometry	{ include "sun(type4)"		};

-};

-default xkb_keymap "type5_fr" {

-    xkb_keycodes	{ include "sun(type5_euro)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ 

-	include "sun_vndr/us(sun5)+iso9995-3(basic)+fr"

-    };

-    xkb_geometry	{ include "sun(type5euro)"	};

-};

-xkb_keymap "type5_fr_openlook" {

-    xkb_keycodes	{ include "sun(type5_euro)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+fr"	};

-    xkb_geometry	{ include "sun(type5euro)"	};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sun_vndr/no b/xorg-server/xkeyboard-config/keymap/sun_vndr/no
deleted file mode 100644
index 200df8910..000000000
--- a/xorg-server/xkeyboard-config/keymap/sun_vndr/no
+++ /dev/null
@@ -1,59 +0,0 @@
-//

-//Copyright 1996, 1998  The Open Group

-//

-//Permission to use, copy, modify, distribute, and sell this software and its

-//documentation for any purpose is hereby granted without fee, provided that

-//the above copyright notice appear in all copies and that both that

-//copyright notice and this permission notice appear in supporting

-//documentation.

-//

-//The above copyright notice and this permission notice shall be

-//included in all copies or substantial portions of the Software.

-//

-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-//IN NO EVENT SHALL THE OPEN GROUP 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.

-//

-//Except as contained in this notice, the name of The Open Group shall

-//not be used in advertising or otherwise to promote the sale, use or

-//other dealings in this Software without prior written authorization

-//from The Open Group.

-//

-xkb_keymap "type4_no" {

-    xkb_keycodes	{ include "sun(type4_euro)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ 

-	include "sun_vndr/us(sun4)+iso9995-3(basic)+no"

-    };

-    xkb_geometry	{ include "sun(type4)"		};

-};

-xkb_keymap "type4_no_openlook" {

-    xkb_keycodes	{ include "sun(type4_euro)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ 

-	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+no"

-    };

-    xkb_geometry	{ include "sun(type4)"		};

-};

-default xkb_keymap "type5_no" {

-    xkb_keycodes	{ include "sun(type5_euro)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ 

-	include "sun_vndr/us(sun5)+iso9995-3(basic)+no"

-    };

-    xkb_geometry	{ include "sun(type5euro)"	};

-};

-xkb_keymap "type5_no_openlook" {

-    xkb_keycodes	{ include "sun(type5_euro)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+no"	};

-    xkb_geometry	{ include "sun(type5euro)"	};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sun_vndr/pl b/xorg-server/xkeyboard-config/keymap/sun_vndr/pl
deleted file mode 100644
index 2da430f27..000000000
--- a/xorg-server/xkeyboard-config/keymap/sun_vndr/pl
+++ /dev/null
@@ -1,59 +0,0 @@
-//

-//Copyright 1996, 1998  The Open Group

-//

-//Permission to use, copy, modify, distribute, and sell this software and its

-//documentation for any purpose is hereby granted without fee, provided that

-//the above copyright notice appear in all copies and that both that

-//copyright notice and this permission notice appear in supporting

-//documentation.

-//

-//The above copyright notice and this permission notice shall be

-//included in all copies or substantial portions of the Software.

-//

-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-//IN NO EVENT SHALL THE OPEN GROUP 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.

-//

-//Except as contained in this notice, the name of The Open Group shall

-//not be used in advertising or otherwise to promote the sale, use or

-//other dealings in this Software without prior written authorization

-//from The Open Group.

-//

-xkb_keymap "type4_pl" {

-    xkb_keycodes	{ include "sun(type4_euro)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ 

-	include "sun_vndr/us(sun4)+iso9995-3(basic)+pl"

-    };

-    xkb_geometry	{ include "sun(type4)"		};

-};

-xkb_keymap "type4_pl_openlook" {

-    xkb_keycodes	{ include "sun(type4_euro)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ 

-	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+pl"

-    };

-    xkb_geometry	{ include "sun(type4)"		};

-};

-default xkb_keymap "type5_pl" {

-    xkb_keycodes	{ include "sun(type5_euro)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ 

-	include "sun_vndr/us(sun5)+iso9995-3(basic)+pl"

-    };

-    xkb_geometry	{ include "sun(type5euro)"	};

-};

-xkb_keymap "type5_pl_openlook" {

-    xkb_keycodes	{ include "sun(type5_euro)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+pl"	};

-    xkb_geometry	{ include "sun(type5euro)"	};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sun_vndr/ru b/xorg-server/xkeyboard-config/keymap/sun_vndr/ru
deleted file mode 100644
index 005f27f3c..000000000
--- a/xorg-server/xkeyboard-config/keymap/sun_vndr/ru
+++ /dev/null
@@ -1,59 +0,0 @@
-//

-//Copyright 1996, 1998  The Open Group

-//

-//Permission to use, copy, modify, distribute, and sell this software and its

-//documentation for any purpose is hereby granted without fee, provided that

-//the above copyright notice appear in all copies and that both that

-//copyright notice and this permission notice appear in supporting

-//documentation.

-//

-//The above copyright notice and this permission notice shall be

-//included in all copies or substantial portions of the Software.

-//

-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-//IN NO EVENT SHALL THE OPEN GROUP 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.

-//

-//Except as contained in this notice, the name of The Open Group shall

-//not be used in advertising or otherwise to promote the sale, use or

-//other dealings in this Software without prior written authorization

-//from The Open Group.

-//

-xkb_keymap "type4_ru" {

-    xkb_keycodes	{ include "sun(type4_euro)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ 

-	include "sun_vndr/us(sun4)+iso9995-3(basic)+ru"

-    };

-    xkb_geometry	{ include "sun(type4)"		};

-};

-xkb_keymap "type4_ru_openlook" {

-    xkb_keycodes	{ include "sun(type4_euro)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ 

-	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+ru"

-    };

-    xkb_geometry	{ include "sun(type4)"		};

-};

-default xkb_keymap "type5_ru" {

-    xkb_keycodes	{ include "sun(type5_euro)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ 

-	include "sun_vndr/us(sun5)+iso9995-3(basic)+ru"

-    };

-    xkb_geometry	{ include "sun(type5euro)"	};

-};

-xkb_keymap "type5_ru_openlook" {

-    xkb_keycodes	{ include "sun(type5_euro)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+ru"	};

-    xkb_geometry	{ include "sun(type5euro)"	};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sun_vndr/se b/xorg-server/xkeyboard-config/keymap/sun_vndr/se
deleted file mode 100644
index cb3cc6d00..000000000
--- a/xorg-server/xkeyboard-config/keymap/sun_vndr/se
+++ /dev/null
@@ -1,54 +0,0 @@
-default xkb_keymap "type5c_se_fixdollar" {

-    xkb_keycodes	{ include "sun(type5_se)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ 

-	include "sun_vndr/se(sun5)+se(fixdollar)"

-    };

-    xkb_geometry	{ include "sun(type5c_se)"	};

-};

-xkb_keymap "type5c_se" {

-    xkb_keycodes	{ include "sun(type5_se)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ 

-	include "sun_vndr/se(sun5)"

-    };

-    xkb_geometry	{ include "sun(type5c_se)"	};

-};

-xkb_keymap "type5_se" {

-    xkb_keycodes	{ include "sun(type5_se)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ 

-	include "sun_vndr/se(sun5)"

-    };

-    xkb_geometry	{ include "sun(type5_se)"	};

-};

-xkb_keymap "type4_se_fixdollar_swapctl" {

-    xkb_keycodes	{ include "sun(type4_se_swapctl)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ 

-	include "sun_vndr/se(sun4)+se(fixdollar)"

-    };

-    xkb_geometry	{ include "sun(type4_se)"	};

-};

-xkb_keymap "type4_se_fixdollar" {

-    xkb_keycodes	{ include "sun(type4_se)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ 

-	include "sun_vndr/se(sun4)+se(fixdollar)"

-    };

-    xkb_geometry	{ include "sun(type4_se)"	};

-};

-xkb_keymap "type4_se" {

-    xkb_keycodes	{ include "sun(type4_se)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ 

-	include "sun_vndr/se(sun4)"

-    };

-    xkb_geometry	{ include "sun(type4_se)"	};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sun_vndr/uk b/xorg-server/xkeyboard-config/keymap/sun_vndr/uk
deleted file mode 100644
index 11b3efd58..000000000
--- a/xorg-server/xkeyboard-config/keymap/sun_vndr/uk
+++ /dev/null
@@ -1,59 +0,0 @@
-//

-//Copyright 1996, 1998  The Open Group

-//

-//Permission to use, copy, modify, distribute, and sell this software and its

-//documentation for any purpose is hereby granted without fee, provided that

-//the above copyright notice appear in all copies and that both that

-//copyright notice and this permission notice appear in supporting

-//documentation.

-//

-//The above copyright notice and this permission notice shall be

-//included in all copies or substantial portions of the Software.

-//

-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-//IN NO EVENT SHALL THE OPEN GROUP 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.

-//

-//Except as contained in this notice, the name of The Open Group shall

-//not be used in advertising or otherwise to promote the sale, use or

-//other dealings in this Software without prior written authorization

-//from The Open Group.

-//

-xkb_keymap "type4_uk" {

-    xkb_keycodes	{ include "sun(type4_euro)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ 

-	include "sun_vndr/us(sun4)+iso9995-3(basic)+uk"

-    };

-    xkb_geometry	{ include "sun(type4)"		};

-};

-xkb_keymap "type4_uk_openlook" {

-    xkb_keycodes	{ include "sun(type4_euro)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ 

-	include "sun_vndr/us(sun4ol)+iso9995-3(basic)+uk"

-    };

-    xkb_geometry	{ include "sun(type4)"		};

-};

-default xkb_keymap "type5_uk" {

-    xkb_keycodes	{ include "sun(type5_euro)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ 

-	include "sun_vndr/us(sun5)+iso9995-3(basic)+uk"

-    };

-    xkb_geometry	{ include "sun(type5euro)"	};

-};

-xkb_keymap "type5_uk_openlook" {

-    xkb_keycodes	{ include "sun(type5_euro)"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "sun_vndr/us(sun5ol)+iso9995-3+uk"	};

-    xkb_geometry	{ include "sun(type5euro)"	};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/sun_vndr/us b/xorg-server/xkeyboard-config/keymap/sun_vndr/us
deleted file mode 100644
index 68b41de4b..000000000
--- a/xorg-server/xkeyboard-config/keymap/sun_vndr/us
+++ /dev/null
@@ -1,67 +0,0 @@
-//

-//Copyright 1996, 1998  The Open Group

-//

-//Permission to use, copy, modify, distribute, and sell this software and its

-//documentation for any purpose is hereby granted without fee, provided that

-//the above copyright notice appear in all copies and that both that

-//copyright notice and this permission notice appear in supporting

-//documentation.

-//

-//The above copyright notice and this permission notice shall be

-//included in all copies or substantial portions of the Software.

-//

-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-//IN NO EVENT SHALL THE OPEN GROUP 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.

-//

-//Except as contained in this notice, the name of The Open Group shall

-//not be used in advertising or otherwise to promote the sale, use or

-//other dealings in this Software without prior written authorization

-//from The Open Group.

-//

-xkb_keymap "type4_us" {

-    xkb_keycodes	{ include "sun(type4)"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "sun_vndr/us(sun4)"	};

-    xkb_geometry	{ include "sun(type4)"		};

-};

-xkb_keymap "type4_us_openlook" {

-    xkb_keycodes	{ include "sun(type4)"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "sun_vndr/us(sun4ol)"	};

-    xkb_geometry	{ include "sun(type4)"		};

-};

-default xkb_keymap "type5_us" {

-    xkb_keycodes	{ include "sun(type5)"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "sun_vndr/us(sun5)"	};

-    xkb_geometry	{ include "sun(type5)"		};

-};

-xkb_keymap "type5_us_openlook" {

-    xkb_keycodes	{ include "sun(type5)"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "sun_vndr/us(sun5ol)"	};

-    xkb_geometry	{ include "sun(type5)"		};

-};

-xkb_keymap "type5_unix" {

-    xkb_keycodes	{ include "sun(type5)"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "sun_vndr/us(sun5)"	};

-    xkb_geometry	{ include "sun(type5unix)"	};

-};

-xkb_keymap "type5_unix_openlook" {

-    xkb_keycodes	{ include "sun(type5)"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "sun_vndr/us(sun5ol)"	};

-    xkb_geometry	{ include "sun(type5unix)"	};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/xfree86 b/xorg-server/xkeyboard-config/keymap/xfree86
deleted file mode 100644
index b65efa12f..000000000
--- a/xorg-server/xkeyboard-config/keymap/xfree86
+++ /dev/null
@@ -1,374 +0,0 @@
-default xkb_keymap "us" {

-    xkb_keycodes	{ include "xfree86"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "pc(pc105)"		};

-    xkb_geometry	{ include "pc"			};

-};

-

-// "ar" addition by Arabeyes Team, <support@arabeyes.org>

-xkb_keymap "ar" {

-    xkb_keycodes	{ include "xfree86"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "pc(pc105)+ara"	};

-    xkb_geometry	{ include "pc(pc102)"		};

-};

-xkb_keymap "be"	{

-    xkb_keycodes	{ include "xfree86"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "pc(pc105)+be"	};

-    xkb_geometry 	{ include "pc(pc102)"		};

-};

-xkb_keymap "bg"	{

-    xkb_keycodes	{ include "xfree86"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "pc(pc105)+bg"	};

-    xkb_geometry 	{ include "pc(pc102)"		};

-};

-// us_intl and br by Ricardo Y. Igarashi (iga@that.com.br)

-xkb_keymap "br"	{

-    xkb_keycodes	{ include "xfree86"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "pc(pc105)+br"	};

-    xkb_geometry 	{ include "pc(abnt2)"		};

-};

-// cz and sk keymaps by Kamil Toman (ktoman@email.cz) 

-// are designed to replace old czechoslovakian and czsk keyboards

-// and their prog variants. Those are now obsolete and should not be used anymore.

-xkb_keymap "cz" {

-    xkb_keycodes	{ include "xfree86"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "pc(pc105)+cz"	};

-    xkb_geometry	{ include "pc"			};

-};

-xkb_keymap "de"	{

-    xkb_keycodes	{ include "xfree86"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "pc(pc105)+de"	};

-    xkb_geometry 	{ include "pc(pc102)"		};

-};

-xkb_keymap "ch_de"	{

-    xkb_keycodes	{ include "xfree86"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "pc(pc105)+ch(de)"	};

-    xkb_geometry 	{ include "pc(pc102)"		};

-};

-xkb_keymap "ch_fr"	{

-    xkb_keycodes	{ include "xfree86"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "pc(pc105)+ch(fr)"	};

-    xkb_geometry 	{ include "pc(pc102)"		};

-};

-xkb_keymap "dk"	{

-    xkb_keycodes	{ include "xfree86"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "pc(pc105)+dk"	};

-    xkb_geometry 	{ include "pc(pc102)"		};

-};

-xkb_keymap "dvorak" {

-    xkb_keycodes	{ include "xfree86"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "pc(pc105)+us(dvorak)"};

-    xkb_geometry	{ include "pc(pc102)"		};

-};

-xkb_keymap "en_US" {

-    xkb_keycodes	{ include "xfree86"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols 	{ include "pc(pc105)"	};

-    xkb_geometry 	{ include "pc"			};

-};

-xkb_keymap "es"	{

-    xkb_keycodes	{ include "xfree86"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "pc(pc105)+es"	};

-    xkb_geometry 	{ include "pc(pc102)"		};

-};

-xkb_keymap "fr"	{

-    xkb_keycodes	{ include "xfree86"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "pc(pc105)+fr"	};

-    xkb_geometry 	{ include "pc(pc102)"		};

-};

-xkb_keymap "fr-latin9" {

-    xkb_keycodes        { include "xfree86"             };

-    xkb_types           { include "default"             };

-    xkb_compatibility   { include "default"             };

-    xkb_symbols         { include "pc(pc105)+fr-latin9" };

-    xkb_geometry        { include "pc"           	};

-};

-xkb_keymap "fr_CA"	{

-    xkb_keycodes	{ include "xfree86"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "pc(pc105)+ca"	};

-    xkb_geometry 	{ include "pc(pc102)"		};

-};

-xkb_keymap "gb"	{

-    xkb_keycodes	{ include "xfree86"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "pc(pc105)+gb"	};

-    xkb_geometry 	{ include "pc(pc102)"		};

-};

-xkb_keymap "hr"	{

-    xkb_keycodes	{ include "xfree86"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "pc(pc105)+hr"	};

-    xkb_geometry 	{ include "pc(pc102)"		};

-};

-xkb_keymap "it"	{

-    xkb_keycodes	{ include "xfree86"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "pc(pc105)+it"	};

-    xkb_geometry 	{ include "pc(pc102)"		};

-};

-xkb_keymap "jp106" {

-    xkb_keycodes	{ include "xfree86"	};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "jp(jp106)"		};

-    xkb_geometry	{ include "pc(jp106)"		};

-};

-xkb_keymap "lt"	{

-    xkb_keycodes	{ include "xfree86"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "pc(pc105)+lt"	};

-    xkb_geometry 	{ include "pc(pc102)"		};

-};

-xkb_keymap "lt_std"	{

-    xkb_keycodes	{ include "xfree86"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "pc(pc105)+lt(std)"	};

-    xkb_geometry 	{ include "pc(pc102)"		};

-};

-xkb_keymap "lv"	{

-    xkb_keycodes	{ include "xfree86"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "pc(pc105)+lv"	};

-    xkb_geometry 	{ include "pc(pc102)"		};

-};

-xkb_keymap "mk" {

-    xkb_keycodes	{ include "xfree86"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "pc(pc105)+mk"	};

-    xkb_geometry	{ include "pc(pc102)"		};

-};

-xkb_keymap "mt" {

-    xkb_keycodes	{ include "xfree86"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "pc(pc105)+mt"	};

-    xkb_geometry	{ include "pc(pc102)"		};

-};

-xkb_keymap "no"	{

-    xkb_keycodes	{ include "xfree86"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "pc(pc105)+no"	};

-    xkb_geometry 	{ include "pc(pc102)"		};

-};

-xkb_keymap "pl"	{

-    xkb_keycodes	{ include "xfree86"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "pc(pc105)+pl"	};

-    xkb_geometry 	{ include "pc(pc102)"		};

-};

-xkb_keymap "pt"	{

-    xkb_keycodes	{ include "xfree86"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "pc(pc105)+pt"	};

-    xkb_geometry 	{ include "pc(pc102)"		};

-};

-// ro: additions by Cristian Gafton, <gafton@redhat.com>

-xkb_keymap "ro" {

-    xkb_keycodes	{ include "xfree86"			};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols		{ include "pc(pc105)+ro(pc101)"	};

-    xkb_geometry	{ include "pc(pc101)"			};

-};

-xkb_keymap "ro_microsoft" {

-    xkb_keycodes	{ include "xfree86"			};

-    xkb_types		{ include "default"			};

-    xkb_compatibility	{ include "default"			};

-    xkb_symbols		{ include "pc(pc105)+ro(pc105)"	};

-    xkb_geometry	{ include "pc(pc105)"			};

-};

-xkb_keymap "ru"	{

-    xkb_keycodes	{ include "xfree86"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "pc(pc105)+ru"	};

-    xkb_geometry 	{ include "pc(pc102)"		};

-};

-xkb_keymap "se_FI"	{

-    xkb_keycodes	{ include "xfree86"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "pc(pc105)+fi"	};

-    xkb_geometry 	{ include "pc(pc102)"		};

-};

-xkb_keymap "se_SE"	{

-    xkb_keycodes	{ include "xfree86"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "pc(pc105)+se"	};

-    xkb_geometry 	{ include "pc(pc102)"		};

-};

-xkb_keymap "sl" {

-    xkb_keycodes	{ include "xfree86"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "pc(pc105)+si"	};

-    xkb_geometry	{ include "pc(pc102)"		};

-};

-xkb_keymap "sl_SI" {

-    xkb_keycodes	{ include "xfree86"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "pc(pc105)+si"	};

-    xkb_geometry	{ include "pc(pc102)"		};

-};

-// cz and sk keymaps by Kamil Toman (ktoman@email.cz) 

-// are designed to replace old czechoslovakian and czsk keyboards

-// and their prog variants. Those are now obsolete and should not be used anymore.

-xkb_keymap "sk" {

-    xkb_keycodes	{ include "xfree86"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "pc(pc105)+sk"	};

-    xkb_geometry	{ include "pc"			};

-};

-// Additions by Emil Soleyman-Zomalan, <emil@nishra.com>

-xkb_keymap "syr" {

-    xkb_keycodes	{ include "xfree86"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default" 		};

-    xkb_symbols		{ include "pc(pc105)+syr"	};

-    xkb_geometry	{ include "pc(pc102)"		};

-};    

-xkb_keymap "th"	{

-    xkb_keycodes	{ include "xfree86"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "pc(pc105)+th"	};

-    xkb_geometry 	{ include "pc(pc102)"		};

-};

-xkb_keymap "th_tis"	{

-    xkb_keycodes	{ include "xfree86"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "pc(pc105)+th(tis)"	};

-    xkb_geometry 	{ include "pc(pc102)"		};

-};

-xkb_keymap "th_pat"	{

-    xkb_keycodes	{ include "xfree86"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "pc(pc105)+th(pat)"	};

-    xkb_geometry 	{ include "pc(pc102)"		};

-};

-xkb_keymap "tr" {

-    xkb_keycodes	{ include "xfree86"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "pc(pc105)+tr"	};

-    xkb_geometry	{ include "pc(pc102)"		};

-};

-xkb_keymap "uk" {

-    xkb_keycodes	{ include "xfree86"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "pc(pc105)+uk)"	};

-    xkb_geometry	{ include "pc(pc102)"		};

-};

-xkb_keymap "us_flexpro" {

-    xkb_keycodes	{ include "xfree86"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "us(pc105)"		};

-    xkb_geometry	{ include "keytronic(FlexPro)"	};

-};

-// us_intl and br by Ricardo Y. Igarashi (iga@that.com.br)

-// us_intl means standard us keyboard plus dead_keys symbols

-// these keyboards are very popular in Brazil

-xkb_keymap "us_intl" {

-    xkb_keycodes	{ include "xfree86"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "us(pc101)+us(intl)"	};

-    xkb_geometry	{ include "pc"			};

-};

-xkb_keymap "us_microsoft" {

-    xkb_keycodes	{ include "xfree86"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "us(pc105)"		};

-    xkb_geometry	{ include "microsoft"		};

-};

-

-xkb_keymap "uz" {

-    xkb_keycodes	{ include "xfree86"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "pc(pc105)+uz"	};

-    xkb_geometry	{ include "pc(pc102)"		};

-};

-

-# svu: compatibility keymaps, based on variants

-xkb_keymap "cz_qwerty" {

-    xkb_keycodes	{ include "xfree86"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "pc(pc105)+cz(qwerty)"	};

-    xkb_geometry	{ include "pc"			};

-};

-xkb_keymap "de_CH"	{

-    xkb_keycodes	{ include "xfree86"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "pc(pc105)+ch(de)"	};

-    xkb_geometry 	{ include "pc(pc102)"		};

-};

-xkb_keymap "fr_CH"	{

-    xkb_keycodes	{ include "xfree86"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "pc(pc105)+ch(fr)"	};

-    xkb_geometry 	{ include "pc(pc102)"		};

-};

-xkb_keymap "mt_us" {

-    xkb_keycodes	{ include "xfree86"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "pc(pc105)+mt(us)"	};

-    xkb_geometry	{ include "pc(pc102)"		};

-};

-xkb_keymap "sk_qwerty" {

-    xkb_keycodes	{ include "xfree86"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "pc(pc105)+sk(qwerty)"	};

-    xkb_geometry	{ include "pc"			};

-};

diff --git a/xorg-server/xkeyboard-config/keymap/xfree98 b/xorg-server/xkeyboard-config/keymap/xfree98
deleted file mode 100644
index c9beb560e..000000000
--- a/xorg-server/xkeyboard-config/keymap/xfree98
+++ /dev/null
@@ -1,33 +0,0 @@
-//

-//Copyright 1996, 1998  The Open Group

-//

-//Permission to use, copy, modify, distribute, and sell this software and its

-//documentation for any purpose is hereby granted without fee, provided that

-//the above copyright notice appear in all copies and that both that

-//copyright notice and this permission notice appear in supporting

-//documentation.

-//

-//The above copyright notice and this permission notice shall be

-//included in all copies or substantial portions of the Software.

-//

-//THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

-//EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

-//MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.

-//IN NO EVENT SHALL THE OPEN GROUP 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.

-//

-//Except as contained in this notice, the name of The Open Group shall

-//not be used in advertising or otherwise to promote the sale, use or

-//other dealings in this Software without prior written authorization

-//from The Open Group.

-//

-

-default xkb_keymap "jp" {

-    xkb_keycodes	{ include "xfree98"		};

-    xkb_types		{ include "default"		};

-    xkb_compatibility	{ include "default"		};

-    xkb_symbols		{ include "nec_vndr/jp(pc98)"	};

-    xkb_geometry	{ include "nec(pc98)"		};

-};

diff --git a/xorg-server/xkeyboard-config/semantics/Makefile.am b/xorg-server/xkeyboard-config/semantics/Makefile.am
deleted file mode 100644
index 9e92daaca..000000000
--- a/xorg-server/xkeyboard-config/semantics/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-semanticsdir = $(xkb_base)/semantics
-
-dist_semantics_DATA = \
-basic complete default \
-xtest
-
-dir_data = $(dist_semantics_DATA)
-
-include $(top_srcdir)/xkbrules.am
diff --git a/xorg-server/xkeyboard-config/semantics/basic b/xorg-server/xkeyboard-config/semantics/basic
deleted file mode 100644
index 71575a3a3..000000000
--- a/xorg-server/xkeyboard-config/semantics/basic
+++ /dev/null
@@ -1,6 +0,0 @@
-default xkb_semantics "basic" {

-

-xkb_types		{ include "basic" 	};

-xkb_compatibility	{ include "basic"	};

-

-};

diff --git a/xorg-server/xkeyboard-config/semantics/complete b/xorg-server/xkeyboard-config/semantics/complete
deleted file mode 100644
index 08152e563..000000000
--- a/xorg-server/xkeyboard-config/semantics/complete
+++ /dev/null
@@ -1,6 +0,0 @@
-default xkb_semantics "complete" {

-

-xkb_types		{ include "complete" 	};

-xkb_compatibility	{ include "complete"	};

-

-};

diff --git a/xorg-server/xkeyboard-config/semantics/default b/xorg-server/xkeyboard-config/semantics/default
deleted file mode 100644
index 2b8defc80..000000000
--- a/xorg-server/xkeyboard-config/semantics/default
+++ /dev/null
@@ -1,6 +0,0 @@
-default xkb_semantics "default" {

-

-xkb_types		{ include "default" 	};

-xkb_compatibility	{ include "default"	};

-

-};

diff --git a/xorg-server/xkeyboard-config/semantics/xtest b/xorg-server/xkeyboard-config/semantics/xtest
deleted file mode 100644
index 64a35459b..000000000
--- a/xorg-server/xkeyboard-config/semantics/xtest
+++ /dev/null
@@ -1,6 +0,0 @@
-default xkb_semantics "xtest" {

-

-xkb_types		{ include "basic" 	};

-xkb_compatibility	{ include "xtest"	};

-

-};

diff --git a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/dk b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/dk
index a2ac773e7..11e38598c 100644
--- a/xorg-server/xkeyboard-config/symbols/macintosh_vndr/dk
+++ b/xorg-server/xkeyboard-config/symbols/macintosh_vndr/dk
@@ -1,76 +1,68 @@
-partial alphanumeric_keys 

-xkb_symbols "basic" {

-

-    // Describes the differences between a very simple en_US

-    // keyboard and a Danish keyboard with dead key support

-    // and all of ISO-8859-1 characters available.

-

-    include "latin"

-    name[Group1]= "Denmark - Mac";

-

-    key <TLDE> {	[  onehalf,         section,    threequarters,       paragraph	]};

-    key <LSGT> {	[     less,         greater,        backslash,         notsign	]};

-    key <SPCE> {	[    space,           space,     nobreakspace,    nobreakspace	]};

-    key <AE01> {	[        1,          exclam,       exclamdown,     onesuperior	]};

-    key <AE02> {	[        2,        quotedbl,               at,     twosuperior	]};

-    key <AE03> {	[        3,      numbersign,         sterling,   threesuperior	]};

-    key <AE04> {	[        4,        EuroSign,           dollar,      onequarter	]};

-    key <AE05> {	[        5,         percent,         NoSymbol,            cent	]};

-    key <AE06> {	[        6,       ampersand,              yen,        NoSymbol	]};

-    key <AE07> {	[        7,           slash,        braceleft,        division	]};

-    key <AE08> {	[        8,       parenleft,      bracketleft,   guillemotleft	]};

-    key <AE09> {	[        9,      parenright,     bracketright,  guillemotright	]};

-    key <AE10> {	[        0,           equal,       braceright,          degree	]};

-    key <AB08> {	[    comma,       semicolon,     dead_cedilla,     dead_ogonek	]};

-    key <AB09> {	[   period,           colon,   periodcentered,   dead_abovedot	]};

-    key <AB03> {	[        c,               C,        copyright,        NoSymbol	]};

-    key <AB10> {	[    minus,      underscore,           hyphen,          macron	]};

-    key <AC01> {        [        a,               A,      ordfeminine,       masculine      ]};

-    key <AC03> {        [        d,               D,              eth,             ETH      ]};

-    key <AD03> {        [        e,               E,         EuroSign,            cent      ]};

-    key <AD04> {        [        r,               R,       registered,        NoSymbol      ]};

-    key <AD05> {        [        t,               T,            thorn,           THORN      ]};

-    key <AD08> {        [        i,               I,         NoSymbol,        NoSymbol      ]};

-    key <AD09> {        [        o,               O,               oe,              OE      ]};

-    key	<AC10> {	[	ae,               AE	]};

-    key <AE11> {	[     plus,        question,        plusminus,    questiondown	]};

-    key <AC11> {	[   oslash,        Ooblique 	]};

-    key <BKSL> {	[ apostrophe,        asterisk, dead_doubleacute,        multiply	]};

-    key <AD11> {	[    aring,           Aring 	]};

-    key <AE12> {   	[ dead_acute,      dead_grave,              bar,       brokenbar	]};

-    key <AD12> {   	[ dead_diaeresis, dead_circumflex,       dead_tilde,      dead_caron      ]};

-

-    // End alphanumeric section

-

-    include "eurosign(e)"

-    include "level3(ralt_switch)"

-};

-

-

-partial default alphanumeric_keys 

-xkb_symbols "full" {

-    include "iso9995-3(full)"

-    include "dk(basic)"

-};

-

-

-partial alphanumeric_keys 

-xkb_symbols "nodeadkeys" {

-    include "macintosh_vndr/dk(basic)"

-    name[Group1]= "Denmark - Mac, eliminate dead keys";

-

-    key <AE12> {	[           acute,           grave,              bar,          ogonek	]	};

-    key <AD12> {	[       diaeresis,     asciicircum,       asciitilde,     dead_macron     	]      	};

-};

-

-partial alphanumeric_keys

-xkb_symbols "macbookpro" {

-

-    include "level3(win_switch)"

-    include "macintosh_vndr/dk(basic)"

-

-    name[Group1]= "Denmark - Mac, MacBook Pro";

-

-    key <BKSL>  { [apostrophe, asterisk,        at,        at ] };

-    key <TLDE>  { [    dollar,  section,    dollar,    dollar ] };

-};

+partial alphanumeric_keys 
+xkb_symbols "basic" {
+
+    // Describes the differences between a very simple en_US
+    // keyboard and a Danish keyboard with dead key support
+    // and all of ISO-8859-1 characters available.
+
+    include "latin"
+    name[Group1]= "Denmark - Mac";
+
+    key <TLDE> {	[  onehalf,         section,    threequarters,       paragraph	]};
+    key <LSGT> {	[     less,         greater,        backslash,         notsign	]};
+    key <SPCE> {	[    space,           space,     nobreakspace,    nobreakspace	]};
+    key <AE01> {	[        1,          exclam,       exclamdown,     onesuperior	]};
+    key <AE02> {	[        2,        quotedbl,               at,     twosuperior	]};
+    key <AE03> {	[        3,      numbersign,         sterling,   threesuperior	]};
+    key <AE04> {	[        4,        EuroSign,           dollar,      onequarter	]};
+    key <AE05> {	[        5,         percent,         NoSymbol,            cent	]};
+    key <AE06> {	[        6,       ampersand,              yen,        NoSymbol	]};
+    key <AE07> {	[        7,           slash,        braceleft,        division	]};
+    key <AE08> {	[        8,       parenleft,      bracketleft,   guillemotleft	]};
+    key <AE09> {	[        9,      parenright,     bracketright,  guillemotright	]};
+    key <AE10> {	[        0,           equal,       braceright,          degree	]};
+    key <AB08> {	[    comma,       semicolon,     dead_cedilla,     dead_ogonek	]};
+    key <AB09> {	[   period,           colon,   periodcentered,   dead_abovedot	]};
+    key <AB03> {	[        c,               C,        copyright,        NoSymbol	]};
+    key <AB10> {	[    minus,      underscore,           hyphen,          macron	]};
+    key <AC01> {        [        a,               A,      ordfeminine,       masculine      ]};
+    key <AC03> {        [        d,               D,              eth,             ETH      ]};
+    key <AD03> {        [        e,               E,         EuroSign,            cent      ]};
+    key <AD04> {        [        r,               R,       registered,        NoSymbol      ]};
+    key <AD05> {        [        t,               T,            thorn,           THORN      ]};
+    key <AD08> {        [        i,               I,         NoSymbol,        NoSymbol      ]};
+    key <AD09> {        [        o,               O,               oe,              OE      ]};
+    key	<AC10> {	[	ae,               AE	]};
+    key <AE11> {	[     plus,        question,        plusminus,    questiondown	]};
+    key <AC11> {	[   oslash,        Ooblique 	]};
+    key <BKSL> {	[ apostrophe,        asterisk, dead_doubleacute,        multiply	]};
+    key <AD11> {	[    aring,           Aring 	]};
+    key <AE12> {   	[ dead_acute,      dead_grave,              bar,       brokenbar	]};
+    key <AD12> {   	[ dead_diaeresis, dead_circumflex,       dead_tilde,      dead_caron      ]};
+
+    // End alphanumeric section
+
+    include "eurosign(e)"
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "nodeadkeys" {
+    include "macintosh_vndr/dk(basic)"
+    name[Group1]= "Denmark - Mac, eliminate dead keys";
+
+    key <AE12> {	[           acute,           grave,              bar,          ogonek	]	};
+    key <AD12> {	[       diaeresis,     asciicircum,       asciitilde,     dead_macron     	]      	};
+};
+
+partial alphanumeric_keys
+xkb_symbols "macbookpro" {
+
+    include "level3(win_switch)"
+    include "macintosh_vndr/dk(basic)"
+
+    name[Group1]= "Denmark - Mac, MacBook Pro";
+
+    key <BKSL>  { [apostrophe, asterisk,        at,        at ] };
+    key <TLDE>  { [    dollar,  section,    dollar,    dollar ] };
+};
diff --git a/xorg-server/xkeyboard-config/symbols/us b/xorg-server/xkeyboard-config/symbols/us
index 7c3ee2499..5cdd1e351 100644
--- a/xorg-server/xkeyboard-config/symbols/us
+++ b/xorg-server/xkeyboard-config/symbols/us
@@ -1129,6 +1129,8 @@ xkb_symbols "hbs" {
 
   key <TLDE> { [ grave, asciitilde ] };
   key <AE06> { [ 6, dead_caron, asciicircum, asciicircum ] };
+  key <AE08> { [ 8, asterisk, multiply, division ] };
+  key <AE11> { [ minus, underscore, endash, emdash ] };
   key <AC09> { [ l, L, U1C9, U1C8 ] };
   key <AB06> { [ n, N, U1CC, U1CB ] };
   key <AB01> { [ z, Z, U1C6, U1C5 ] };
@@ -1136,8 +1138,8 @@ xkb_symbols "hbs" {
   key <AC03> { [ d, D, dstroke, Dstroke ] };
   key <AC11> { [ dead_acute, quotedbl, apostrophe, apostrophe ] };
   key <SPCE> { [ space, space, nobreakspace, nobreakspace ] };
-  key <AB08> { [ comma, less, NoSymbol, guillemotright ] };
-  key <AB09> { [ period, greater, NoSymbol, guillemotleft ] };
+  key <AB08> { [ comma, less, U3003, guillemotright ] };
+  key <AB09> { [ period, greater, ellipsis, guillemotleft ] };
 
   include "level3(ralt_switch)"
 };