Merge remote-tracking branch 'origin/released'

* origin/released: xserver mesa xkbcomp git update 5 nov 2012 Conflicts: mesalib/src/glsl/.gitignore mesalib/src/mesa/main/.gitignore xorg-server/Xi/chgdctl.c xorg-server/dix/getevents.c xorg-server/hw/xwin/winprefs.c xorg-server/os/utils.c
author: marha <marha@users.sourceforge.net> 2012-11-07 08:02:14 +0100
committer: marha <marha@users.sourceforge.net> 2012-11-07 08:02:14 +0100
commit: 2c345c9da4dedfafe791557ca3fcf891ce26249d (patch)
tree: 18dc73394bd3921415b57b5847f03a9753374e99
parent: 7c531937cfab42f2fd3233c096c409ebdd5b59af (diff)
parent: 1cc98f5a48924d750fbef7ea6b05a1ba49c28589 (diff)
download: vcxsrv-2c345c9da4dedfafe791557ca3fcf891ce26249d.tar.gz
vcxsrv-2c345c9da4dedfafe791557ca3fcf891ce26249d.tar.bz2
vcxsrv-2c345c9da4dedfafe791557ca3fcf891ce26249d.zip
78 files changed, 5822 insertions, 8410 deletions
diff --git a/mesalib/configure.ac b/mesalib/configure.ac
index 6b97a26fc..55a9fa712 100644
--- a/mesalib/configure.ac
+++ b/mesalib/configure.ac
@@ -10,7 +10,7 @@ AC_INIT([Mesa], [9.1.0],
     [https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa])
 AC_CONFIG_AUX_DIR([bin])
 AC_CONFIG_MACRO_DIR([m4])
-AC_CANONICAL_HOST
+AC_CANONICAL_SYSTEM
 AM_INIT_AUTOMAKE([foreign])
 
 dnl http://people.gnome.org/~walters/docs/build-api.txt
@@ -24,9 +24,6 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 
-LT_PREREQ([2.2])
-LT_INIT([disable-static])
-
 dnl Set internal versions
 OSMESA_VERSION=8
 AC_SUBST([OSMESA_VERSION])
@@ -45,7 +42,9 @@ LIBKMS_XORG_REQUIRED=1.0.0
 dnl Check for progs
 AC_PROG_CPP
 AC_PROG_CC
+AX_PROG_CC_FOR_BUILD
 AC_PROG_CXX
+AX_PROG_CXX_FOR_BUILD
 AM_PROG_CC_C_O
 AM_PROG_AS
 AC_CHECK_PROGS([MAKE], [gmake make])
@@ -54,6 +53,9 @@ AC_PROG_SED
 AC_PROG_MKDIR_P
 AC_PATH_PROG([MKDEP], [makedepend])
 
+LT_PREREQ([2.2])
+LT_INIT([disable-static])
+
 if test "x$MKDEP" = "x"; then
     AC_MSG_ERROR([makedepend is required to build Mesa])
 fi
@@ -155,6 +157,21 @@ dnl Cache LDFLAGS and CPPFLAGS so we can add to them and restore later
 _SAVE_LDFLAGS="$LDFLAGS"
 _SAVE_CPPFLAGS="$CPPFLAGS"
 
+dnl build host compiler macros
+DEFINES_FOR_BUILD=""
+AC_SUBST([DEFINES_FOR_BUILD])
+case "$build_os" in
+linux*|*-gnu*|gnu*)
+    DEFINES_FOR_BUILD="$DEFINES_FOR_BUILD -D_GNU_SOURCE"
+    ;;
+solaris*)
+    DEFINES_FOR_BUILD="$DEFINES_FOR_BUILD -DSVR4"
+    ;;
+cygwin*)
+    DEFINES_FOR_BUILD="$DEFINES_FOR_BUILD"
+    ;;
+esac
+
 dnl Compiler macros
 DEFINES=""
 AC_SUBST([DEFINES])
@@ -177,6 +194,7 @@ if test "x$GCC" = xyes; then
         CFLAGS="$CFLAGS -Wall -std=gnu99"
         ;;
     *)
+        CFLAGS_FOR_BUILD="$CFLAGS_FOR_BUILD -Wall -std=c99"
         CFLAGS="$CFLAGS -Wall -std=c99"
         ;;
     esac
@@ -206,13 +224,16 @@ if test "x$GCC" = xyes; then
     CFLAGS=$save_CFLAGS
 
     # Work around aliasing bugs - developers should comment this out
+    CFLAGS_FOR_BUILD="$CFLAGS_FOR_BUILD -fno-strict-aliasing"
     CFLAGS="$CFLAGS -fno-strict-aliasing"
 
     # gcc's builtin memcmp is slower than glibc's
     # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43052
+    CFLAGS_FOR_BUILD="$CFLAGS_FOR_BUILD -fno-builtin-memcmp"
     CFLAGS="$CFLAGS -fno-builtin-memcmp"
 fi
 if test "x$GXX" = xyes; then
+    CXXFLAGS_FOR_BUILD="$CXXFLAGS_FOR_BUILD -Wall"
     CXXFLAGS="$CXXFLAGS -Wall"
 
     # Enable -fvisibility=hidden if using a gcc that supports it
@@ -229,10 +250,12 @@ if test "x$GXX" = xyes; then
     CXXFLAGS=$save_CXXFLAGS
 
     # Work around aliasing bugs - developers should comment this out
+    CXXFLAGS_FOR_BUILD="$CXXFLAGS_FOR_BUILD -fno-strict-aliasing"
     CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
 
     # gcc's builtin memcmp is slower than glibc's
     # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=43052
+    CXXFLAGS_FOR_BUILD="$CXXFLAGS_FOR_BUILD -fno-builtin-memcmp"
     CXXFLAGS="$CXXFLAGS -fno-builtin-memcmp"
 fi
 
@@ -316,6 +339,14 @@ AC_ARG_ENABLE([debug],
     [enable_debug=no]
 )
 if test "x$enable_debug" = xyes; then
+    DEFINES_FOR_BUILD="$DEFINES_FOR_BUILD -DDEBUG"
+    if test "x$GCC_FOR_BUILD" = xyes; then
+        CFLAGS_FOR_BUILD="$CFLAGS_FOR_BUILD -g"
+    fi
+    if test "x$GXX_FOR_BUILD" = xyes; then
+        CXXFLAGS_FOR_BUILD="$CXXFLAGS_FOR_BUILD -g"
+    fi
+
     DEFINES="$DEFINES -DDEBUG"
     if test "x$GCC" = xyes; then
         CFLAGS="$CFLAGS -g"
@@ -1748,15 +1779,23 @@ gallium_require_drm_loader() {
 }
 
 radeon_llvm_check() {
-    LLVM_VERSION_MAJOR=`echo $LLVM_VERSION | cut -d. -f1`
-    if test "$LLVM_VERSION_MAJOR" -lt "3" -o "x$LLVM_VERSION" = "x3.0"; then
-        AC_MSG_ERROR([LLVM 3.1 or newer is required for the r600/radeonsi llvm compiler.])
+    LLVM_REQUIRED_VERSION_MAJOR="3"
+    LLVM_REQUIRED_VERSION_MINOR="2"
+    LLVM_AVAILABLE_VERSION_MAJOR=`echo $LLVM_VERSION | cut -d. -f1`
+    LLVM_AVAILABLE_VERSION_MINOR=`echo $LLVM_VERSION | cut -d. -f2`
+    if test "$LLVM_AVAILABLE_VERSION_MAJOR" -lt "$LLVM_REQUIRED_VERSION_MAJOR" -o [ "$LLVM_AVAILABLE_VERSION_MAJOR" -eq "$LLVM_REQUIRED_VERSION_MAJOR" -a "$LLVM_AVAILABLE_VERSION_MINOR" -lt "$LLVM_REQUIRED_VERSION_MINOR" ] ; then
+        AC_MSG_ERROR([LLVM $LLVM_REQUIRED_VERSION_MAJOR.$LLVM_REQUIRED_VERSION_MINOR or newer with AMDGPU target enabled is required.
+                     To use the r600/radeonsi LLVM backend, you need to fetch the LLVM source from:
+                     git://people.freedesktop.org/~tstellar/llvm master
+                     and build with --enable-experimental-targets=AMDGPU])
     fi
-    if test "$LLVM_VERSION_MAJOR" -ge "3" -a "x$LLVM_VERSION" != "x3.1" && $LLVM_CONFIG --targets-built | grep -qv '\<AMDGPU\>' ; then
-        AC_MSG_ERROR([To use the r600/radeonsi LLVM backend with LLVM 3.2 and newer, you need to fetch the LLVM source from:
+    if test true && $LLVM_CONFIG --targets-built | grep -qv '\<AMDGPU\>' ; then
+        AC_MSG_ERROR([LLVM AMDGPU Target not enabled.
+                      To use the r600/radeonsi LLVM backend, you need to fetch the LLVM source from:
                       git://people.freedesktop.org/~tstellar/llvm master
                       and build with --enable-experimental-targets=AMDGPU])
     fi
+    AC_MSG_WARN([Please ensure you use the latest llvm tree from git://people.freedesktop.org/~tstellar/llvm master before submitting a bug])
     if test "x$LLVM_VERSION" = "x3.2"; then
         LLVM_LIBS="$LLVM_LIBS `$LLVM_CONFIG --libs amdgpu`"
     fi
@@ -1940,6 +1979,7 @@ AC_CONFIG_FILES([configs/current
 		src/gbm/Makefile
 		src/gbm/main/gbm.pc
 		src/glsl/Makefile
+		src/glsl/builtin_compiler/Makefile
 		src/glsl/glcpp/Makefile
 		src/glsl/tests/Makefile
 		src/glx/Makefile
diff --git a/mesalib/m4/ax_prog_cc_for_build.m4 b/mesalib/m4/ax_prog_cc_for_build.m4
new file mode 100644
index 000000000..08095a83d
--- /dev/null
+++ b/mesalib/m4/ax_prog_cc_for_build.m4
@@ -0,0 +1,140 @@
+# ===========================================================================
+#   http://www.gnu.org/software/autoconf-archive/ax_prog_cc_for_build.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_PROG_CC_FOR_BUILD
+#
+# DESCRIPTION
+#
+#   This macro searches for a C compiler that generates native executables,
+#   that is a C compiler that surely is not a cross-compiler. This can be
+#   useful if you have to generate source code at compile-time like for
+#   example GCC does.
+#
+#   The macro sets the CC_FOR_BUILD and CPP_FOR_BUILD macros to anything
+#   needed to compile or link (CC_FOR_BUILD) and preprocess (CPP_FOR_BUILD).
+#   The value of these variables can be overridden by the user by specifying
+#   a compiler with an environment variable (like you do for standard CC).
+#
+#   It also sets BUILD_EXEEXT and BUILD_OBJEXT to the executable and object
+#   file extensions for the build platform, and GCC_FOR_BUILD to `yes' if
+#   the compiler we found is GCC. All these variables but GCC_FOR_BUILD are
+#   substituted in the Makefile.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Paolo Bonzini <bonzini@gnu.org>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 5
+
+AU_ALIAS([AC_PROG_CC_FOR_BUILD], [AX_PROG_CC_FOR_BUILD])
+AC_DEFUN([AX_PROG_CC_FOR_BUILD], [dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_CPP])dnl
+AC_REQUIRE([AC_EXEEXT])dnl
+AC_REQUIRE([AC_CANONICAL_SYSTEM])dnl
+dnl
+pushdef([AC_TRY_COMPILER], [
+cat > conftest.$ac_ext << EOF
+#line __oline__ "configure"
+#include "confdefs.h"
+[$1]
+EOF
+# If we can't run a trivial program, we are probably using a cross
+compiler.
+# Fail miserably.
+if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} && (./conftest;
+exit) 2>/dev/null; then
+  [$2]=yes
+else
+  echo "configure: failed program was:" >&AC_FD_CC
+  cat conftest.$ac_ext >&AC_FD_CC
+  [$2]=no
+fi
+[$3]=no
+rm -fr conftest*])dnl
+
+dnl Use the standard macros, but make them use other variable names
+dnl
+pushdef([cross_compiling], [#])dnl
+pushdef([ac_cv_prog_CPP], ac_cv_build_prog_CPP)dnl
+pushdef([ac_cv_prog_gcc], ac_cv_build_prog_gcc)dnl
+pushdef([ac_cv_prog_cc_works], ac_cv_build_prog_cc_works)dnl
+pushdef([ac_cv_prog_cc_cross], ac_cv_build_prog_cc_cross)dnl
+pushdef([ac_cv_prog_cc_g], ac_cv_build_prog_cc_g)dnl
+pushdef([ac_cv_exeext], ac_cv_build_exeext)dnl
+pushdef([ac_cv_objext], ac_cv_build_objext)dnl
+pushdef([ac_exeext], ac_build_exeext)dnl
+pushdef([ac_objext], ac_build_objext)dnl
+pushdef([CC], CC_FOR_BUILD)dnl
+pushdef([CPP], CPP_FOR_BUILD)dnl
+pushdef([CFLAGS], CFLAGS_FOR_BUILD)dnl
+pushdef([CPPFLAGS], CPPFLAGS_FOR_BUILD)dnl
+pushdef([LDFLAGS], LDFLAGS_FOR_BUILD)dnl
+pushdef([host], build)dnl
+pushdef([host_alias], build_alias)dnl
+pushdef([host_cpu], build_cpu)dnl
+pushdef([host_vendor], build_vendor)dnl
+pushdef([host_os], build_os)dnl
+pushdef([ac_cv_host], ac_cv_build)dnl
+pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl
+pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl
+pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl
+pushdef([ac_cv_host_os], ac_cv_build_os)dnl
+pushdef([ac_cpp], ac_build_cpp)dnl
+pushdef([ac_compile], ac_build_compile)dnl
+pushdef([ac_link], ac_build_link)dnl
+pushdef([ac_tool_prefix], [#])dnl
+
+AC_PROG_CC
+AC_PROG_CPP
+AC_EXEEXT
+
+dnl Restore the old definitions
+dnl
+popdef([AC_TRY_COMPILER])dnl
+popdef([ac_tool_prefix])dnl
+popdef([ac_link])dnl
+popdef([ac_compile])dnl
+popdef([ac_cpp])dnl
+popdef([ac_cv_host_os])dnl
+popdef([ac_cv_host_vendor])dnl
+popdef([ac_cv_host_cpu])dnl
+popdef([ac_cv_host_alias])dnl
+popdef([ac_cv_host])dnl
+popdef([host_os])dnl
+popdef([host_vendor])dnl
+popdef([host_cpu])dnl
+popdef([host_alias])dnl
+popdef([host])dnl
+popdef([CPPFLAGS])dnl
+popdef([CFLAGS])dnl
+popdef([CPP])dnl
+popdef([CC])dnl
+popdef([ac_objext])dnl
+popdef([ac_exeext])dnl
+popdef([ac_cv_objext])dnl
+popdef([ac_cv_exeext])dnl
+popdef([ac_cv_prog_cc_g])dnl
+popdef([ac_cv_prog_cc_works])dnl
+popdef([ac_cv_prog_cc_cross])dnl
+popdef([ac_cv_prog_gcc])dnl
+popdef([cross_compiling])dnl
+
+dnl Finally, set Makefile variables
+dnl
+BUILD_EXEEXT=$ac_build_exeext
+BUILD_OBJEXT=$ac_build_objext
+AC_SUBST(BUILD_EXEEXT)dnl
+AC_SUBST(BUILD_OBJEXT)dnl
+AC_SUBST([CFLAGS_FOR_BUILD])dnl
+AC_SUBST([CPPFLAGS_FOR_BUILD])dnl
+AC_SUBST([LDFLAGS_FOR_BUILD])dnl
+])
diff --git a/mesalib/m4/ax_prog_cxx_for_build.m4 b/mesalib/m4/ax_prog_cxx_for_build.m4
new file mode 100644
index 000000000..4a099f9fb
--- /dev/null
+++ b/mesalib/m4/ax_prog_cxx_for_build.m4
@@ -0,0 +1,123 @@
+# ===========================================================================
+#   http://www.gnu.org/software/autoconf-archive/ax_prog_cxx_for_build.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_PROG_CXX_FOR_BUILD
+#
+# DESCRIPTION
+#
+#   This macro searches for a C++ compiler that generates native executables,
+#   that is a C++ compiler that surely is not a cross-compiler. This can be
+#   useful if you have to generate source code at compile-time like for
+#   example GCC does.
+#
+#   The macro sets the CXX_FOR_BUILD and CXXCPP_FOR_BUILD macros to anything
+#   needed to compile or link (CXX_FOR_BUILD) and preprocess (CXXCPP_FOR_BUILD).
+#   The value of these variables can be overridden by the user by specifying
+#   a compiler with an environment variable (like you do for standard CXX).
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Paolo Bonzini <bonzini@gnu.org>
+#   Copyright (c) 2012 Avionic Design GmbH
+#
+#   Based on the AX_PROG_CC_FOR_BUILD macro by Paolo Bonzini.
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 5
+
+AU_ALIAS([AC_PROG_CXX_FOR_BUILD], [AX_PROG_CXX_FOR_BUILD])
+AC_DEFUN([AX_PROG_CXX_FOR_BUILD], [dnl
+AC_REQUIRE([AX_PROG_CC_FOR_BUILD])dnl
+AC_REQUIRE([AC_PROG_CXX])dnl
+AC_REQUIRE([AC_PROG_CXXCPP])dnl
+AC_REQUIRE([AC_CANONICAL_SYSTEM])dnl
+dnl
+pushdef([AC_TRY_COMPILER], [
+cat > conftest.$ac_ext << EOF
+#line __oline__ "configure"
+#include "confdefs.h"
+[$1]
+EOF
+# If we can't run a trivial program, we are probably using a cross
+compiler.
+# Fail miserably.
+if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} && (./conftest;
+exit) 2>/dev/null; then
+  [$2]=yes
+else
+  echo "configure: failed program was:" >&AC_FD_CC
+  cat conftest.$ac_ext >&AC_FD_CC
+  [$2]=no
+fi
+[$3]=no
+rm -fr conftest*])dnl
+
+dnl Use the standard macros, but make them use other variable names
+dnl
+pushdef([cross_compiling], [#])dnl
+pushdef([ac_cv_prog_CXXCPP], ac_cv_build_prog_CXXCPP)dnl
+pushdef([ac_cv_prog_gxx], ac_cv_build_prog_gxx)dnl
+pushdef([ac_cv_prog_cxx_works], ac_cv_build_prog_cxx_works)dnl
+pushdef([ac_cv_prog_cxx_cross], ac_cv_build_prog_cxx_cross)dnl
+pushdef([ac_cv_prog_cxx_g], ac_cv_build_prog_cxx_g)dnl
+pushdef([CXX], CXX_FOR_BUILD)dnl
+pushdef([CXXCPP], CXXCPP_FOR_BUILD)dnl
+pushdef([CXXFLAGS], CXXFLAGS_FOR_BUILD)dnl
+pushdef([CXXCPPFLAGS], CXXCPPFLAGS_FOR_BUILD)dnl
+pushdef([host], build)dnl
+pushdef([host_alias], build_alias)dnl
+pushdef([host_cpu], build_cpu)dnl
+pushdef([host_vendor], build_vendor)dnl
+pushdef([host_os], build_os)dnl
+pushdef([ac_cv_host], ac_cv_build)dnl
+pushdef([ac_cv_host_alias], ac_cv_build_alias)dnl
+pushdef([ac_cv_host_cpu], ac_cv_build_cpu)dnl
+pushdef([ac_cv_host_vendor], ac_cv_build_vendor)dnl
+pushdef([ac_cv_host_os], ac_cv_build_os)dnl
+pushdef([ac_cxxcpp], ac_build_cxxcpp)dnl
+pushdef([ac_compile], ac_build_compile)dnl
+pushdef([ac_link], ac_build_link)dnl
+pushdef([ac_tool_prefix], [#])dnl
+
+AC_PROG_CXX
+AC_PROG_CXXCPP
+
+dnl Restore the old definitions
+dnl
+popdef([AC_TRY_COMPILER])dnl
+popdef([ac_tool_prefix])dnl
+popdef([ac_link])dnl
+popdef([ac_compile])dnl
+popdef([ac_cxxcpp])dnl
+popdef([ac_cv_host_os])dnl
+popdef([ac_cv_host_vendor])dnl
+popdef([ac_cv_host_cpu])dnl
+popdef([ac_cv_host_alias])dnl
+popdef([ac_cv_host])dnl
+popdef([host_os])dnl
+popdef([host_vendor])dnl
+popdef([host_cpu])dnl
+popdef([host_alias])dnl
+popdef([host])dnl
+popdef([CXXCPPFLAGS])dnl
+popdef([CXXFLAGS])dnl
+popdef([CXXCPP])dnl
+popdef([CXX])dnl
+popdef([ac_cv_prog_cxx_g])dnl
+popdef([ac_cv_prog_cxx_works])dnl
+popdef([ac_cv_prog_cxx_cross])dnl
+popdef([ac_cv_prog_gxx])dnl
+popdef([cross_compiling])dnl
+
+dnl Finally, set Makefile variables
+dnl
+AC_SUBST([CXXFLAGS_FOR_BUILD])dnl
+AC_SUBST([CXXCPPFLAGS_FOR_BUILD])dnl
+])
diff --git a/mesalib/src/gallium/auxiliary/util/u_vbuf.c b/mesalib/src/gallium/auxiliary/util/u_vbuf.c
index 7fb492882..b712b52de 100644
--- a/mesalib/src/gallium/auxiliary/util/u_vbuf.c
+++ b/mesalib/src/gallium/auxiliary/util/u_vbuf.c
@@ -25,6 +25,66 @@
  *
  **************************************************************************/
 
+/**
+ * This module uploads user buffers and translates the vertex buffers which
+ * contain incompatible vertices (i.e. not supported by the driver/hardware)
+ * into compatible ones, based on the Gallium CAPs.
+ *
+ * It does not upload index buffers.
+ *
+ * The module heavily uses bitmasks to represent per-buffer and
+ * per-vertex-element flags to avoid looping over the list of buffers just
+ * to see if there's a non-zero stride, or user buffer, or unsupported format,
+ * etc.
+ *
+ * There are 3 categories of vertex elements, which are processed separately:
+ * - per-vertex attribs (stride != 0, instance_divisor == 0)
+ * - instanced attribs (stride != 0, instance_divisor > 0)
+ * - constant attribs (stride == 0)
+ *
+ * All needed uploads and translations are performed every draw command, but
+ * only the subset of vertices needed for that draw command is uploaded or
+ * translated. (the module never translates whole buffers)
+ *
+ *
+ * The module consists of two main parts:
+ *
+ *
+ * 1) Translate (u_vbuf_translate_begin/end)
+ *
+ * This is pretty much a vertex fetch fallback. It translates vertices from
+ * one vertex buffer to another in an unused vertex buffer slot. It does
+ * whatever is needed to make the vertices readable by the hardware (changes
+ * vertex formats and aligns offsets and strides). The translate module is
+ * used here.
+ *
+ * Each of the 3 categories is translated to a separate buffer.
+ * Only the [min_index, max_index] range is translated. For instanced attribs,
+ * the range is [start_instance, start_instance+instance_count]. For constant
+ * attribs, the range is [0, 1].
+ *
+ *
+ * 2) User buffer uploading (u_vbuf_upload_buffers)
+ *
+ * Only the [min_index, max_index] range is uploaded (just like Translate)
+ * with a single memcpy.
+ *
+ * This method works best for non-indexed draw operations or indexed draw
+ * operations where the [min_index, max_index] range is not being way bigger
+ * than the vertex count.
+ *
+ * If the range is too big (e.g. one triangle with indices {0, 1, 10000}),
+ * the per-vertex attribs are uploaded via the translate module, all packed
+ * into one vertex buffer, and the indexed draw call is turned into
+ * a non-indexed one in the process. This adds additional complexity
+ * to the translate part, but it prevents bad apps from bringing your frame
+ * rate down.
+ *
+ *
+ * If there is nothing to do, it forwards every command to the driver.
+ * The module also has its own CSO cache of vertex element states.
+ */
+
 #include "util/u_vbuf.h"
 
 #include "util/u_dump.h"
@@ -49,6 +109,8 @@ struct u_vbuf_elements {
    enum pipe_format native_format[PIPE_MAX_ATTRIBS];
    unsigned native_format_size[PIPE_MAX_ATTRIBS];
 
+   /* Which buffers are used by the vertex element state. */
+   uint32_t used_vb_mask;
    /* This might mean two things:
     * - src_format != native_format, as discussed above.
     * - src_offset % 4 != 0 (if the caps don't allow such an offset). */
@@ -430,6 +492,8 @@ u_vbuf_translate_begin(struct u_vbuf *mgr,
    struct translate_key key[VB_NUM];
    unsigned elem_index[VB_NUM][PIPE_MAX_ATTRIBS]; /* ... into key.elements */
    unsigned i, type;
+   unsigned incompatible_vb_mask = mgr->incompatible_vb_mask &
+                                   mgr->ve->used_vb_mask;
 
    int start[VB_NUM] = {
       start_vertex,     /* VERTEX */
@@ -453,20 +517,20 @@ u_vbuf_translate_begin(struct u_vbuf *mgr,
 
       if (!mgr->vertex_buffer[vb_index].stride) {
          if (!(mgr->ve->incompatible_elem_mask & (1 << i)) &&
-             !(mgr->incompatible_vb_mask & (1 << vb_index))) {
+             !(incompatible_vb_mask & (1 << vb_index))) {
             continue;
          }
          mask[VB_CONST] |= 1 << vb_index;
       } else if (mgr->ve->ve[i].instance_divisor) {
          if (!(mgr->ve->incompatible_elem_mask & (1 << i)) &&
-             !(mgr->incompatible_vb_mask & (1 << vb_index))) {
+             !(incompatible_vb_mask & (1 << vb_index))) {
             continue;
          }
          mask[VB_INSTANCE] |= 1 << vb_index;
       } else {
          if (!unroll_indices &&
              !(mgr->ve->incompatible_elem_mask & (1 << i)) &&
-             !(mgr->incompatible_vb_mask & (1 << vb_index))) {
+             !(incompatible_vb_mask & (1 << vb_index))) {
             continue;
          }
          mask[VB_VERTEX] |= 1 << vb_index;
@@ -488,7 +552,7 @@ u_vbuf_translate_begin(struct u_vbuf *mgr,
       bit = 1 << vb_index;
 
       if (!(mgr->ve->incompatible_elem_mask & (1 << i)) &&
-          !(mgr->incompatible_vb_mask & (1 << vb_index)) &&
+          !(incompatible_vb_mask & (1 << vb_index)) &&
           (!unroll_indices || !(mask[VB_VERTEX] & bit))) {
          continue;
       }
@@ -690,6 +754,7 @@ u_vbuf_create_vertex_elements(struct u_vbuf *mgr, unsigned count,
       }
    }
 
+   ve->used_vb_mask = used_buffers;
    ve->compatible_vb_mask_all = ~ve->incompatible_vb_mask_any & used_buffers;
    ve->incompatible_vb_mask_all = ~ve->compatible_vb_mask_any & used_buffers;
 
@@ -826,18 +891,18 @@ u_vbuf_upload_buffers(struct u_vbuf *mgr,
 {
    unsigned i;
    unsigned nr_velems = mgr->ve->count;
-   unsigned nr_vbufs = util_last_bit(mgr->enabled_vb_mask);
    struct pipe_vertex_element *velems =
          mgr->using_translate ? mgr->fallback_velems : mgr->ve->ve;
    unsigned start_offset[PIPE_MAX_ATTRIBS];
-   unsigned end_offset[PIPE_MAX_ATTRIBS] = {0};
+   unsigned end_offset[PIPE_MAX_ATTRIBS];
+   uint32_t buffer_mask = 0;
 
    /* Determine how much data needs to be uploaded. */
    for (i = 0; i < nr_velems; i++) {
       struct pipe_vertex_element *velem = &velems[i];
       unsigned index = velem->vertex_buffer_index;
       struct pipe_vertex_buffer *vb = &mgr->vertex_buffer[index];
-      unsigned instance_div, first, size;
+      unsigned instance_div, first, size, index_bit;
 
       /* Skip the buffers generated by translate. */
       if (index == mgr->fallback_vbs[VB_VERTEX] ||
@@ -867,8 +932,10 @@ u_vbuf_upload_buffers(struct u_vbuf *mgr,
          size = vb->stride * (num_vertices - 1) + mgr->ve->src_format_size[i];
       }
 
+      index_bit = 1 << index;
+
       /* Update offsets. */
-      if (!end_offset[index]) {
+      if (!(buffer_mask & index_bit)) {
          start_offset[index] = first;
          end_offset[index] = first + size;
       } else {
@@ -877,19 +944,20 @@ u_vbuf_upload_buffers(struct u_vbuf *mgr,
          if (first + size > end_offset[index])
             end_offset[index] = first + size;
       }
+
+      buffer_mask |= index_bit;
    }
 
    /* Upload buffers. */
-   for (i = 0; i < nr_vbufs; i++) {
-      unsigned start, end = end_offset[i];
+   while (buffer_mask) {
+      unsigned start, end;
       struct pipe_vertex_buffer *real_vb;
       const uint8_t *ptr;
 
-      if (!end) {
-         continue;
-      }
+      i = u_bit_scan(&buffer_mask);
 
       start = start_offset[i];
+      end = end_offset[i];
       assert(start < end);
 
       real_vb = &mgr->real_vertex_buffer[i];
@@ -907,9 +975,10 @@ static boolean u_vbuf_need_minmax_index(struct u_vbuf *mgr)
    /* See if there are any per-vertex attribs which will be uploaded or
     * translated. Use bitmasks to get the info instead of looping over vertex
     * elements. */
-   return ((mgr->user_vb_mask | mgr->incompatible_vb_mask |
-            mgr->ve->incompatible_vb_mask_any) &
-           mgr->ve->noninstance_vb_mask_any & mgr->nonzero_stride_vb_mask) != 0;
+   return (mgr->ve->used_vb_mask &
+           ((mgr->user_vb_mask | mgr->incompatible_vb_mask |
+             mgr->ve->incompatible_vb_mask_any) &
+            mgr->ve->noninstance_vb_mask_any & mgr->nonzero_stride_vb_mask)) != 0;
 }
 
 static boolean u_vbuf_mapping_vertex_buffer_blocks(struct u_vbuf *mgr)
@@ -918,9 +987,10 @@ static boolean u_vbuf_mapping_vertex_buffer_blocks(struct u_vbuf *mgr)
     *
     * We could query whether each buffer is busy, but that would
     * be way more costly than this. */
-   return (~mgr->user_vb_mask & ~mgr->incompatible_vb_mask &
-           mgr->ve->compatible_vb_mask_all & mgr->ve->noninstance_vb_mask_any &
-           mgr->nonzero_stride_vb_mask) != 0;
+   return (mgr->ve->used_vb_mask &
+           (~mgr->user_vb_mask & ~mgr->incompatible_vb_mask &
+            mgr->ve->compatible_vb_mask_all & mgr->ve->noninstance_vb_mask_any &
+            mgr->nonzero_stride_vb_mask)) != 0;
 }
 
 static void u_vbuf_get_minmax_index(struct pipe_context *pipe,
@@ -1041,15 +1111,17 @@ void u_vbuf_draw_vbo(struct u_vbuf *mgr, const struct pipe_draw_info *info)
    int start_vertex, min_index;
    unsigned num_vertices;
    boolean unroll_indices = FALSE;
-   uint32_t user_vb_mask = mgr->user_vb_mask;
+   uint32_t used_vb_mask = mgr->ve->used_vb_mask;
+   uint32_t user_vb_mask = mgr->user_vb_mask & used_vb_mask;
+   uint32_t incompatible_vb_mask = mgr->incompatible_vb_mask & used_vb_mask;
 
    /* Normal draw. No fallback and no user buffers. */
-   if (!mgr->incompatible_vb_mask &&
+   if (!incompatible_vb_mask &&
        !mgr->ve->incompatible_elem_mask &&
        !user_vb_mask) {
 
       /* Set vertex buffers if needed. */
-      if (mgr->dirty_real_vb_mask) {
+      if (mgr->dirty_real_vb_mask & used_vb_mask) {
          u_vbuf_set_driver_vertex_buffers(mgr);
       }
 
@@ -1102,7 +1174,7 @@ void u_vbuf_draw_vbo(struct u_vbuf *mgr, const struct pipe_draw_info *info)
 
    /* Translate vertices with non-native layouts or formats. */
    if (unroll_indices ||
-       mgr->incompatible_vb_mask ||
+       incompatible_vb_mask ||
        mgr->ve->incompatible_elem_mask) {
       /* XXX check the return value */
       u_vbuf_translate_begin(mgr, start_vertex, num_vertices,
@@ -1110,7 +1182,7 @@ void u_vbuf_draw_vbo(struct u_vbuf *mgr, const struct pipe_draw_info *info)
                              info->start, info->count, min_index,
                              unroll_indices);
 
-      user_vb_mask &= ~(mgr->incompatible_vb_mask |
+      user_vb_mask &= ~(incompatible_vb_mask |
                         mgr->ve->incompatible_vb_mask_all);
    }
 
diff --git a/mesalib/src/gallium/auxiliary/util/u_vbuf.h b/mesalib/src/gallium/auxiliary/util/u_vbuf.h
index 0f8227164..a608184e5 100644
--- a/mesalib/src/gallium/auxiliary/util/u_vbuf.h
+++ b/mesalib/src/gallium/auxiliary/util/u_vbuf.h
@@ -28,9 +28,9 @@
 #ifndef U_VBUF_H
 #define U_VBUF_H
 
-/* This module builds upon u_upload_mgr and translate_cache and takes care of
- * user buffer uploads and vertex format fallbacks. It's designed
- * for the drivers which don't always use the Draw module. (e.g. for HWTCL)
+/* This module takes care of user buffer uploads and vertex format fallbacks.
+ * It's designed for the drivers which don't want to use the Draw module.
+ * There is a more detailed description at the beginning of the .c file.
  */
 
 #include "pipe/p_context.h"
diff --git a/mesalib/src/glsl/.gitignore b/mesalib/src/glsl/.gitignore
index 5b4fc6c9c..9f6fbd69e 100644
--- a/mesalib/src/glsl/.gitignore
+++ b/mesalib/src/glsl/.gitignore
@@ -4,6 +4,5 @@ glsl_parser.cc
 glsl_parser.h
 glsl_parser.output
 builtin_function.cpp
-builtin_compiler
 glsl_test
 /Makefile
diff --git a/mesalib/src/glsl/Android.mk b/mesalib/src/glsl/Android.mk
index 87a02f51b..f975d03d1 100644
--- a/mesalib/src/glsl/Android.mk
+++ b/mesalib/src/glsl/Android.mk
@@ -60,7 +60,7 @@ LOCAL_SRC_FILES := \
 	$(LIBGLCPP_FILES) \
 	$(LIBGLSL_FILES) \
 	$(LIBGLSL_CXX_FILES) \
-	$(BUILTIN_COMPILER_CXX_FILES) \
+	$(GLSL_SRCDIR)/builtin_compiler/builtin_stubs.cpp \
 	$(GLSL_COMPILER_CXX_FILES)
 
 LOCAL_C_INCLUDES := \
diff --git a/mesalib/src/glsl/Makefile.am b/mesalib/src/glsl/Makefile.am
index 1ecc0036c..6fb3d2d9d 100644
--- a/mesalib/src/glsl/Makefile.am
+++ b/mesalib/src/glsl/Makefile.am
@@ -19,9 +19,7 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-
-# builtin_compiler is built before libglsl to generate builtin_function.cpp for libglsl.
-# For this to work, a dummy version of builtin_function.cpp, builtin_stubs.cpp, is used.
+SUBDIRS = builtin_compiler glcpp
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/include \
@@ -38,32 +36,23 @@ AM_LFLAGS = --nounistd -o$(LEX_OUTPUT_ROOT).c
 
 include Makefile.sources
 
-noinst_LTLIBRARIES = libglslcommon.la libglsl.la
-noinst_PROGRAMS = glsl_compiler glsl_test builtin_compiler
+noinst_LTLIBRARIES = libglsl.la
+noinst_PROGRAMS = glsl_compiler glsl_test
 
-# common sources for builtin_compiler and libglsl
-libglslcommon_la_SOURCES = \
+libglsl_la_SOURCES = \
 	glsl_lexer.ll \
 	glsl_parser.cc \
 	$(LIBGLSL_FILES) \
-	$(LIBGLSL_CXX_FILES)
-
-libglslcommon_la_LIBADD = glcpp/libglcpp.la
-
-# common sources for builtin_compiler and glsl_compiler
-GLSL2_SOURCES = \
-	$(top_srcdir)/src/mesa/program/hash_table.c \
-	$(top_srcdir)/src/mesa/program/symbol_table.c \
-	$(GLSL_COMPILER_CXX_FILES)
-
-libglsl_la_SOURCES = \
+	$(LIBGLSL_CXX_FILES) \
 	builtin_function.cpp
 
-libglsl_la_LIBADD = libglslcommon.la
+libglsl_la_LIBADD = glcpp/libglcpp.la
 libglsl_la_LDFLAGS =
 
 glsl_compiler_SOURCES = \
-	$(GLSL2_SOURCES)
+	$(top_srcdir)/src/mesa/program/hash_table.c \
+	$(top_srcdir)/src/mesa/program/symbol_table.c \
+	$(GLSL_COMPILER_CXX_FILES)
 
 glsl_compiler_LDADD = libglsl.la
 
@@ -76,12 +65,6 @@ glsl_test_SOURCES = \
 
 glsl_test_LDADD = libglsl.la
 
-builtin_compiler_SOURCES = \
-	$(GLSL2_SOURCES) \
-	builtin_stubs.cpp
-
-builtin_compiler_LDADD = libglslcommon.la
-
 # automake <=1.11 and automake >=1.12 have different conventions for naming C++ header files
 # made by yacc.  To work with both, we write our own rule rather than using automake's.
 # When (if) we require automake >=1.12 in configure.ac, this can be removed, and we can use
@@ -89,16 +72,11 @@ builtin_compiler_LDADD = libglslcommon.la
 glsl_parser.cc glsl_parser.h: glsl_parser.yy
 	$(AM_V_GEN) $(YACC) -v -o glsl_parser.cc -p "_mesa_glsl_" --defines=glsl_parser.h $<
 
-BUILT_SOURCES = glsl_parser.h builtin_function.cpp
-CLEANFILES = glsl_lexer.cc glsl_parser.cc $(BUILT_SOURCES)
-
-builtin_function.cpp: $(srcdir)/builtins/profiles/* $(srcdir)/builtins/ir/* $(srcdir)/builtins/glsl/* $(srcdir)/builtins/tools/generate_builtins.py $(srcdir)/builtins/tools/texture_builtins.py builtin_compiler$(EXEEXT)
-	$(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/builtins/tools/generate_builtins.py ./builtin_compiler > builtin_function.cpp || rm -f builtin_function.cpp
-
-glcpp/libglcpp.la:
-	cd glcpp ; $(MAKE) $(AM_MAKEFLAGS)
+BUILT_SOURCES = glsl_parser.h
+CLEANFILES = glsl_lexer.cc glsl_parser.cc $(BUILT_SOURCES) builtin_function.cpp
 
-SUBDIRS = glcpp
+builtin_function.cpp: $(srcdir)/builtins/profiles/* $(srcdir)/builtins/ir/* $(srcdir)/builtins/glsl/* $(srcdir)/builtins/tools/generate_builtins.py $(srcdir)/builtins/tools/texture_builtins.py builtin_compiler/builtin_compiler$(BUILD_EXEEXT)
+	$(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/builtins/tools/generate_builtins.py builtin_compiler/builtin_compiler$(BUILD_EXEEXT) > builtin_function.cpp || rm -f builtin_function.cpp
 
 # Provide compatibility with scripts for the old Mesa build system for
 # a while by putting a link to the library in the current directory.
diff --git a/mesalib/src/glsl/SConscript b/mesalib/src/glsl/SConscript
index 6314c7551..89014ee3c 100644
--- a/mesalib/src/glsl/SConscript
+++ b/mesalib/src/glsl/SConscript
@@ -71,9 +71,10 @@ else:
     compiler_objs += mesa_objs
 
     builtin_compiler = env.Program(
-        target = 'builtin_compiler',
-        source = compiler_objs + glsl_sources + \
-            source_lists['BUILTIN_COMPILER_CXX_FILES'],
+        target = 'builtin_compiler/builtin_compiler',
+        source = compiler_objs + glsl_sources + [
+            'builtin_compiler/builtin_stubs.cpp',
+        ]
     )
 
     # SCons builtin dependency scanner doesn't detect that glsl_lexer.ll
diff --git a/mesalib/src/glsl/builtin_compiler/.gitignore b/mesalib/src/glsl/builtin_compiler/.gitignore
new file mode 100644
index 000000000..40c551baa
--- /dev/null
+++ b/mesalib/src/glsl/builtin_compiler/.gitignore
@@ -0,0 +1,6 @@
+builtin_compiler
+glcpp-lex.c
+glcpp-parse.c
+glcpp-parse.h
+glcpp-parse.output
+/Makefile
diff --git a/mesalib/src/glsl/builtin_compiler/Makefile.am b/mesalib/src/glsl/builtin_compiler/Makefile.am
new file mode 100644
index 000000000..72032b524
--- /dev/null
+++ b/mesalib/src/glsl/builtin_compiler/Makefile.am
@@ -0,0 +1,68 @@
+# Copyright © 2012 Jon TURNEY
+# Copyright © 2012 Thierry Reding
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+
+CC = @CC_FOR_BUILD@
+CFLAGS = @CFLAGS_FOR_BUILD@
+CPP = @CPP_FOR_BUILD@
+CPPFLAGS = @CPPFLAGS_FOR_BUILD@
+CXX = @CXX_FOR_BUILD@
+CXXFLAGS = @CXXFLAGS_FOR_BUILD@
+LD = @LD_FOR_BUILD@
+LDFLAGS = @LDFLAGS_FOR_BUILD@
+
+AM_CFLAGS = \
+	-I $(top_srcdir)/include \
+	-I $(top_srcdir)/src/mapi \
+	-I $(top_srcdir)/src/mesa \
+	-I $(GLSL_SRCDIR) \
+	-I $(GLSL_SRCDIR)/glcpp \
+	$(DEFINES_FOR_BUILD)
+
+AM_CXXFLAGS = $(AM_CFLAGS)
+
+AM_YFLAGS = -v -d -p "glcpp_parser_"
+AM_LFLAGS = --nounistd -o$(LEX_OUTPUT_ROOT).c
+
+include ../Makefile.sources
+
+noinst_PROGRAMS = builtin_compiler
+
+builtin_compiler_SOURCES = \
+	$(GLSL_SRCDIR)/glcpp/glcpp-lex.l \
+	$(GLSL_SRCDIR)/glcpp/glcpp-parse.y \
+	$(LIBGLCPP_FILES) \
+	$(GLSL_SRCDIR)/glsl_lexer.ll \
+	$(GLSL_SRCDIR)/glsl_parser.cc \
+	$(LIBGLSL_FILES) \
+	$(LIBGLSL_CXX_FILES) \
+	$(top_srcdir)/src/mesa/program/hash_table.c \
+	$(top_srcdir)/src/mesa/program/symbol_table.c \
+	$(GLSL_COMPILER_CXX_FILES) \
+	builtin_stubs.cpp
+
+BUILT_SOURCES = \
+	glcpp-lex.c \
+	glcpp-parse.c \
+	glcpp-parse.h \
+	glsl_lexer.cc
+
+CLEANFILES = $(BUILT_SOURCES)
diff --git a/mesalib/src/glsl/builtin_stubs.cpp b/mesalib/src/glsl/builtin_compiler/builtin_stubs.cpp
index dfa5d324e..dfa5d324e 100644
--- a/mesalib/src/glsl/builtin_stubs.cpp
+++ b/mesalib/src/glsl/builtin_compiler/builtin_stubs.cpp
diff --git a/mesalib/src/mapi/glapi/SConscript b/mesalib/src/mapi/glapi/SConscript
index c336c2510..153374cc5 100644
--- a/mesalib/src/mapi/glapi/SConscript
+++ b/mesalib/src/mapi/glapi/SConscript
@@ -61,7 +61,7 @@ if env['gcc'] and env['platform'] not in ('cygwin', 'darwin', 'windows'):
         env.CodeGenerate(
             target = 'glapi_x86.S',
             script = GLAPI + 'gen/gl_x86_asm.py',
-            source = GLAPI + 'gen/gl_API.xml',
+            source = GLAPI + 'gen/gl_and_es_API.xml',
             command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET'
             )
     elif env['machine'] == 'x86_64':
@@ -74,7 +74,7 @@ if env['gcc'] and env['platform'] not in ('cygwin', 'darwin', 'windows'):
         env.CodeGenerate(
             target = 'glapi_x86-64.S',
             script = GLAPI + 'gen/gl_x86-64_asm.py',
-            source = GLAPI + 'gen/gl_API.xml',
+            source = GLAPI + 'gen/gl_and_es_API.xml',
             command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET'
             )
     elif env['machine'] == 'sparc':
@@ -87,7 +87,7 @@ if env['gcc'] and env['platform'] not in ('cygwin', 'darwin', 'windows'):
         env.CodeGenerate(
             target = 'glapi_sparc.S',
             script = GLAPI + 'gen/gl_SPARC_asm.py',
-            source = GLAPI + 'gen/gl_API.xml',
+            source = GLAPI + 'gen/gl_and_es_API.xml',
             command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET'
             )
     else:
diff --git a/mesalib/src/mapi/glapi/gen/ARB_geometry_shader4.xml b/mesalib/src/mapi/glapi/gen/ARB_geometry_shader4.xml
index d9e540fc9..97a4e2e8f 100644
--- a/mesalib/src/mapi/glapi/gen/ARB_geometry_shader4.xml
+++ b/mesalib/src/mapi/glapi/gen/ARB_geometry_shader4.xml
@@ -27,12 +27,12 @@
     <enum name="FRAMEBUFFER_ATTACHMENT_LAYERED_ARB"   value="0x8DA7"/>
     <enum name="FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER" value="0x8CD4"/>
     <enum name="PROGRAM_POINT_SIZE_ARB" value="0x8642"/>
-    <function name="ProgramParameteriARB"  offset="assign">
+    <function name="ProgramParameteriARB"  alias="ProgramParameteri">
         <param name="program" type="GLuint"/>
         <param name="pname" type="GLenum"/>
         <param name="value" type="GLint"/>
     </function>
-    <function name="FramebufferTextureARB"  offset="assign">
+    <function name="FramebufferTextureARB"  alias="FramebufferTexture">
         <param name="target" type="GLenum"/>
         <param name="attachment" type="GLenum"/>
         <param name="texture" type="GLuint"/>
diff --git a/mesalib/src/mapi/glapi/gen/Makefile.am b/mesalib/src/mapi/glapi/gen/Makefile.am
index 40aaf51cd..14bb2dfe6 100644
--- a/mesalib/src/mapi/glapi/gen/Makefile.am
+++ b/mesalib/src/mapi/glapi/gen/Makefile.am
@@ -135,10 +135,11 @@ API_XML = \
 	GL3x.xml
 
 
-COMMON = $(API_XML) gl_XML.py glX_XML.py license.py typeexpr.py
-
-COMMON_ES = \
-	$(COMMON) \
+COMMON = $(API_XML) \
+	gl_XML.py \
+	glX_XML.py \
+	license.py \
+	typeexpr.py \
 	gl_and_es_API.xml \
 	es_EXT.xml \
 	ARB_ES2_compatibility.xml \
@@ -182,43 +183,43 @@ $(XORG_GLAPI_DIR)/%.h: $(MESA_GLAPI_DIR)/%.h
 
 ######################################################################
 
-$(MESA_GLAPI_DIR)/glapi_mapi_tmp.h: $(MESA_MAPI_DIR)/mapi_abi.py $(COMMON_ES)
+$(MESA_GLAPI_DIR)/glapi_mapi_tmp.h: $(MESA_MAPI_DIR)/mapi_abi.py $(COMMON)
 	$(PYTHON_GEN) $< \
 		--printer glapi --mode lib $(srcdir)/gl_and_es_API.xml > $@
 
 $(MESA_GLAPI_DIR)/glprocs.h: gl_procs.py $(COMMON)
-	$(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml > $@
+	$(PYTHON_GEN) $< -f $(srcdir)/gl_and_es_API.xml > $@
 
 $(MESA_GLAPI_DIR)/glapitemp.h: gl_apitemp.py $(COMMON)
-	$(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml > $@
+	$(PYTHON_GEN) $< -f $(srcdir)/gl_and_es_API.xml > $@
 
 $(MESA_GLAPI_DIR)/glapitable.h: gl_table.py $(COMMON)
-	$(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml > $@
+	$(PYTHON_GEN) $< -f $(srcdir)/gl_and_es_API.xml > $@
 
 $(MESA_GLAPI_DIR)/glapi_gentable.c: gl_gentable.py $(COMMON)
-	$(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml > $@
+	$(PYTHON_GEN) $< -f $(srcdir)/gl_and_es_API.xml > $@
 
 ######################################################################
 
 $(MESA_GLAPI_DIR)/glapi_x86.S: gl_x86_asm.py $(COMMON)
-	$(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml > $@
+	$(PYTHON_GEN) $< -f $(srcdir)/gl_and_es_API.xml > $@
 
 $(MESA_GLAPI_DIR)/glapi_x86-64.S: gl_x86-64_asm.py $(COMMON)
-	$(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml > $@
+	$(PYTHON_GEN) $< -f $(srcdir)/gl_and_es_API.xml > $@
 
 $(MESA_GLAPI_DIR)/glapi_sparc.S: gl_SPARC_asm.py $(COMMON)
-	$(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml > $@
+	$(PYTHON_GEN) $< -f $(srcdir)/gl_and_es_API.xml > $@
 
 ######################################################################
 
-$(MESA_DIR)/main/enums.c: gl_enums.py $(COMMON_ES)
+$(MESA_DIR)/main/enums.c: gl_enums.py $(COMMON)
 	$(PYTHON_GEN) $< -f $(srcdir)/gl_and_es_API.xml > $@
 
 $(MESA_DIR)/main/dispatch.h: gl_table.py $(COMMON)
-	$(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml -m remap_table > $@
+	$(PYTHON_GEN) $< -f $(srcdir)/gl_and_es_API.xml -m remap_table > $@
 
 $(MESA_DIR)/main/remap_helper.h: remap_helper.py $(COMMON)
-	$(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml > $@
+	$(PYTHON_GEN) $< -f $(srcdir)/gl_and_es_API.xml > $@
 
 ######################################################################
 
diff --git a/mesalib/src/mapi/glapi/gen/SConscript b/mesalib/src/mapi/glapi/gen/SConscript
index e8bb22731..353d02175 100644
--- a/mesalib/src/mapi/glapi/gen/SConscript
+++ b/mesalib/src/mapi/glapi/gen/SConscript
@@ -14,35 +14,35 @@ glapi_headers = []
 glapi_headers += env.CodeGenerate(
     target = '#src/mesa/main/dispatch.h',
     script = GLAPI + 'gen/gl_table.py',
-    source = GLAPI + 'gen/gl_API.xml',
+    source = GLAPI + 'gen/gl_and_es_API.xml',
     command = python_cmd + ' $SCRIPT -m remap_table -f $SOURCE > $TARGET',
     )
 
 glapi_headers += env.CodeGenerate(
     target = '#src/mapi/glapi/glapitable.h',
     script = GLAPI + 'gen/gl_table.py',
-    source = GLAPI + 'gen/gl_API.xml',
+    source = GLAPI + 'gen/gl_and_es_API.xml',
     command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET'
     )
 
 glapi_headers += env.CodeGenerate(
     target = '#src/mapi/glapi/glapitemp.h',
     script = GLAPI + 'gen/gl_apitemp.py',
-    source = GLAPI + 'gen/gl_API.xml',
+    source = GLAPI + 'gen/gl_and_es_API.xml',
     command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET'
     )
 
 glapi_headers += env.CodeGenerate(
     target = '#src/mapi/glapi/glprocs.h',
     script = GLAPI + 'gen/gl_procs.py',
-    source = GLAPI + 'gen/gl_API.xml',
+    source = GLAPI + 'gen/gl_and_es_API.xml',
     command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET'
     )
 
 glapi_headers += env.CodeGenerate(
     target = '#src/mesa/main/remap_helper.h',
     script = GLAPI + 'gen/remap_helper.py',
-    source = GLAPI + 'gen/gl_API.xml',
+    source = GLAPI + 'gen/gl_and_es_API.xml',
     command = python_cmd + ' $SCRIPT -f $SOURCE > $TARGET'
     )
 
diff --git a/mesalib/src/mapi/glapi/gen/gl_API.xml b/mesalib/src/mapi/glapi/gen/gl_API.xml
index 2f6cf195f..af564726a 100644
--- a/mesalib/src/mapi/glapi/gen/gl_API.xml
+++ b/mesalib/src/mapi/glapi/gen/gl_API.xml
@@ -12731,4 +12731,7 @@
 <xi:include href="NV_texture_barrier.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
 <xi:include href="EXT_transform_feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+<xi:include href="ARB_get_program_binary.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
 </OpenGLAPI>
diff --git a/mesalib/src/mapi/glapi/gen/gl_XML.py b/mesalib/src/mapi/glapi/gen/gl_XML.py
index ef7ed519b..019687912 100644
--- a/mesalib/src/mapi/glapi/gen/gl_XML.py
+++ b/mesalib/src/mapi/glapi/gen/gl_XML.py
@@ -757,8 +757,11 @@ class gl_function( gl_item ):
         return self.images
 
 
-    def parameterIterator(self):
-        return self.parameters.__iter__();
+    def parameterIterator(self, name = None):
+        if name is not None:
+            return self.entry_point_parameters[name].__iter__();
+        else:
+            return self.parameters.__iter__();
 
 
     def get_parameter_string(self, entrypoint = None):
diff --git a/mesalib/src/mapi/glapi/gen/gl_and_es_API.xml b/mesalib/src/mapi/glapi/gen/gl_and_es_API.xml
index 8e000a8bc..7495a2e56 100644
--- a/mesalib/src/mapi/glapi/gen/gl_and_es_API.xml
+++ b/mesalib/src/mapi/glapi/gen/gl_and_es_API.xml
@@ -8,7 +8,6 @@
 <xi:include href="gl_API.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
 <!-- these can be moved to gl_API.xml -->
-<xi:include href="ARB_get_program_binary.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 <xi:include href="OES_fixed_point.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 <xi:include href="OES_single_precision.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
 
diff --git a/mesalib/src/mapi/glapi/gen/gl_apitemp.py b/mesalib/src/mapi/glapi/gen/gl_apitemp.py
index c9a6e2937..4157032c5 100644
--- a/mesalib/src/mapi/glapi/gen/gl_apitemp.py
+++ b/mesalib/src/mapi/glapi/gen/gl_apitemp.py
@@ -66,7 +66,7 @@ class PrintGlOffsets(gl_XML.gl_print_base):
 
         silence = ''
         space = ''
-        for p in f.parameterIterator():
+        for p in f.parameterIterator(name):
             if p.is_padding:
                 continue
 
diff --git a/mesalib/src/mapi/glapi/gen/gl_gentable.py b/mesalib/src/mapi/glapi/gen/gl_gentable.py
index 74611a76b..c0495c09a 100644
--- a/mesalib/src/mapi/glapi/gen/gl_gentable.py
+++ b/mesalib/src/mapi/glapi/gen/gl_gentable.py
@@ -54,7 +54,7 @@ header = """/* GLXEXT is the define used in the xserver when the GLX extension i
 #include <stdlib.h>
 #include <stdio.h>
 
-#include <GL/gl.h>
+#include "glheader.h"
 
 #include "glapi.h"
 #include "glapitable.h"
diff --git a/mesalib/src/mesa/Android.gen.mk b/mesalib/src/mesa/Android.gen.mk
index 893fa4199..ffa36db4d 100644
--- a/mesalib/src/mesa/Android.gen.mk
+++ b/mesalib/src/mesa/Android.gen.mk
@@ -32,9 +32,6 @@ intermediates := $(call local-intermediates-dir)
 # This is the list of auto-generated files: sources and headers
 sources := \
 	main/enums.c \
-	main/api_exec_es1.c \
-	main/api_exec_es1_dispatch.h \
-	main/api_exec_es1_remap_helper.h \
 	program/program_parse.tab.c \
 	program/lex.yy.c \
 	main/dispatch.h \
@@ -60,13 +57,7 @@ LOCAL_GENERATED_SOURCES += $(sources)
 
 glapi := $(MESA_TOP)/src/mapi/glapi/gen
 
-es_src_deps := \
-	$(LOCAL_PATH)/main/APIspec.xml \
-	$(LOCAL_PATH)/main/es_generator.py \
-	$(LOCAL_PATH)/main/APIspecutil.py \
-	$(LOCAL_PATH)/main/APIspec.py
-
-es_hdr_deps := \
+dispatch_deps := \
 	$(wildcard $(glapi)/*.py) \
 	$(wildcard $(glapi)/*.xml)
 
@@ -88,22 +79,6 @@ define es-gen
 	$(hide) $(PRIVATE_SCRIPT) $(1) $(PRIVATE_XML) > $@
 endef
 
-$(intermediates)/main/api_exec_%.c: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/main/es_generator.py
-$(intermediates)/main/api_exec_%.c: PRIVATE_XML := -S $(LOCAL_PATH)/main/APIspec.xml
-$(intermediates)/main/api_exec_%_dispatch.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(glapi)/gl_table.py
-$(intermediates)/main/api_exec_%_dispatch.h: PRIVATE_XML := -f $(glapi)/gl_and_es_API.xml
-$(intermediates)/main/api_exec_%_remap_helper.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(glapi)/remap_helper.py
-$(intermediates)/main/api_exec_%_remap_helper.h: PRIVATE_XML := -f $(glapi)/gl_and_es_API.xml
-
-$(intermediates)/main/api_exec_es1.c: $(es_src_deps)
-	$(call es-gen, -V GLES1.1)
-
-$(intermediates)/main/api_exec_%_dispatch.h: $(es_hdr_deps)
-	$(call es-gen, -c $* -m remap_table)
-
-$(intermediates)/main/api_exec_%_remap_helper.h: $(es_hdr_deps)
-	$(call es-gen, -c $*)
-
 $(intermediates)/program/program_parse.tab.c: $(LOCAL_PATH)/program/program_parse.y
 	$(mesa_local-y-to-c-and-h)
 
@@ -133,19 +108,19 @@ $(intermediates)/x86/matypes.h: $(matypes_deps)
 $(intermediates)/main/dispatch.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(glapi)/gl_table.py
 $(intermediates)/main/dispatch.h: PRIVATE_XML := -f $(glapi)/gl_and_es_API.xml
 
-$(intermediates)/main/dispatch.h: $(es_hdr_deps)
+$(intermediates)/main/dispatch.h: $(dispatch_deps)
 	$(call es-gen, $* -m remap_table)
 
 $(intermediates)/main/remap_helper.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(glapi)/remap_helper.py
 $(intermediates)/main/remap_helper.h: PRIVATE_XML := -f $(glapi)/gl_and_es_API.xml
 
-$(intermediates)/main/remap_helper.h: $(es_hdr_deps)
+$(intermediates)/main/remap_helper.h: $(dispatch_deps)
 	$(call es-gen, $*)
 
 $(intermediates)/main/enums.c: PRIVATE_SCRIPT :=$(MESA_PYTHON2) $(glapi)/gl_enums.py
 $(intermediates)/main/enums.c: PRIVATE_XML := -f $(glapi)/gl_and_es_API.xml
 
-$(intermediates)/main/enums.c: $(es_src_deps)
+$(intermediates)/main/enums.c: $(dispatch_deps)
 	$(call es-gen)
 
 GET_HASH_GEN := $(LOCAL_PATH)/main/get_hash_generator.py
diff --git a/mesalib/src/mesa/Makefile.am b/mesalib/src/mesa/Makefile.am
index 1dc3132c7..1f897257e 100644
--- a/mesalib/src/mesa/Makefile.am
+++ b/mesalib/src/mesa/Makefile.am
@@ -53,9 +53,6 @@ include $(GLAPI)/glapi_gen.mk
 
 BUILT_SOURCES = \
 	main/git_sha1.h \
-	main/api_exec_es1_dispatch.h \
-	main/api_exec_es1_remap_helper.h \
-	main/api_exec_es1.c \
 	main/get_hash.h \
 	program/program_parse.tab.c \
 	program/program_parse.tab.h \
@@ -64,18 +61,6 @@ CLEANFILES = \
 	$(BUILT_SOURCES) \
 	git_sha1.h.tmp
 
-main/api_exec_es1_dispatch.h: $(GLAPI)/gl_and_es_API.xml $(glapi_gen_dispatch_deps)
-	$(call glapi_gen_dispatch,$<,es1)
-
-main/api_exec_es1_remap_helper.h: $(GLAPI)/gl_and_es_API.xml $(glapi_gen_remap_deps)
-	$(call glapi_gen_remap,$<,es1)
-
-main/api_exec_es1.o: main/api_exec_es1_dispatch.h main/api_exec_es1_remap_helper.h
-
-main/api_exec_es1.c: main/APIspec.xml main/es_generator.py main/APIspecutil.py main/APIspec.py
-	$(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/main/es_generator.py \
-	  -S $(srcdir)/main/APIspec.xml -V GLES1.1 > $@
-
 program/program_parse.tab.c program/program_parse.tab.h: program/program_parse.y
 	$(MKDIR_P) program
 	$(AM_V_GEN) $(YACC) -p "_mesa_program_" -v -d --output=program/program_parse.tab.c $<
diff --git a/mesalib/src/mesa/SConscript b/mesalib/src/mesa/SConscript
index 12bb70aec..53e5ee8c2 100644
--- a/mesalib/src/mesa/SConscript
+++ b/mesalib/src/mesa/SConscript
@@ -339,27 +339,9 @@ if env['gles']:
 
     # generate GLES sources
     gles_sources = ['main/es1_conversion.c',]
-    gles_sources += env.CodeGenerate(
-        target = 'main/api_exec_es1.c',
-        script = 'main/es_generator.py',
-        source = 'main/APIspec.xml',
-        command = python_cmd + ' $SCRIPT -S $SOURCE -V GLES1.1 > $TARGET'
-    )
 
     # generate GLES headers
     gles_headers = []
-    gles_headers += env.CodeGenerate(
-        target = 'main/api_exec_es1_dispatch.h',
-        script = GLAPI + 'gen/gl_table.py',
-        source = GLAPI + 'gen/gl_and_es_API.xml',
-        command = python_cmd + ' $SCRIPT -c es1 -m remap_table -f $SOURCE > $TARGET',
-    )
-    gles_headers += env.CodeGenerate(
-        target = 'main/api_exec_es1_remap_helper.h',
-        script = GLAPI + 'gen/remap_helper.py',
-        source = GLAPI + 'gen/gl_and_es_API.xml',
-        command = python_cmd + ' $SCRIPT -c es1 -f $SOURCE > $TARGET',
-    )
 
     env.Depends(gles_sources, gles_headers)
 
diff --git a/mesalib/src/mesa/main/.gitignore b/mesalib/src/mesa/main/.gitignore
index edbdfb598..12c88372a 100644
--- a/mesalib/src/mesa/main/.gitignore
+++ b/mesalib/src/mesa/main/.gitignore
@@ -1,12 +1,9 @@
-api_exec_es1.c
 dispatch.h
 enums.c
 get_es1.c
 get_es2.c
 git_sha1.h
 git_sha1.h.tmp
-api_exec_es1_dispatch.h
-api_exec_es1_remap_helper.h
 remap_helper.h
 get_hash.h
 get_hash.h.tmp
diff --git a/mesalib/src/mesa/main/APIspec.py b/mesalib/src/mesa/main/APIspec.py
deleted file mode 100644
index 6947f7301..000000000
--- a/mesalib/src/mesa/main/APIspec.py
+++ /dev/null
@@ -1,617 +0,0 @@
-#!/usr/bin/python
-#
-# Copyright (C) 2009 Chia-I Wu <olv@0xlab.org>
-#
-# 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
-# on the rights to use, copy, modify, merge, publish, distribute, sub
-# license, and/or sell copies of the Software, and to permit persons to whom
-# the Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
-# IBM AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
-"""
-A parser for APIspec.
-"""
-
-class SpecError(Exception):
-    """Error in the spec file."""
-
-
-class Spec(object):
-    """A Spec is an abstraction of the API spec."""
-
-    def __init__(self, doc):
-        self.doc = doc
-
-        self.spec_node = doc.getRootElement()
-        self.tmpl_nodes = {}
-        self.api_nodes = {}
-        self.impl_node = None
-
-        # parse <apispec>
-        node = self.spec_node.children
-        while node:
-            if node.type == "element":
-                if node.name == "template":
-                    self.tmpl_nodes[node.prop("name")] = node
-                elif node.name == "api":
-                    self.api_nodes[node.prop("name")] = node
-                else:
-                    raise SpecError("unexpected node %s in apispec" %
-                            node.name)
-            node = node.next
-
-        # find an implementation
-        for name, node in self.api_nodes.iteritems():
-            if node.prop("implementation") == "true":
-                self.impl_node = node
-                break
-        if not self.impl_node:
-            raise SpecError("unable to find an implementation")
-
-    def get_impl(self):
-        """Return the implementation."""
-        return API(self, self.impl_node)
-
-    def get_api(self, name):
-        """Return an API."""
-        return API(self, self.api_nodes[name])
-
-
-class API(object):
-    """An API consists of categories and functions."""
-
-    def __init__(self, spec, api_node):
-        self.name = api_node.prop("name")
-        self.is_impl = (api_node.prop("implementation") == "true")
-
-        self.categories = []
-        self.functions = []
-
-        # parse <api>
-        func_nodes = []
-        node = api_node.children
-        while node:
-            if node.type == "element":
-                if node.name == "category":
-                    cat = node.prop("name")
-                    self.categories.append(cat)
-                elif node.name == "function":
-                    func_nodes.append(node)
-                else:
-                    raise SpecError("unexpected node %s in api" % node.name)
-            node = node.next
-
-        # realize functions
-        for func_node in func_nodes:
-            tmpl_node = spec.tmpl_nodes[func_node.prop("template")]
-            try:
-                func = Function(tmpl_node, func_node, self.is_impl,
-                                self.categories)
-            except SpecError, e:
-                func_name = func_node.prop("name")
-                raise SpecError("failed to parse %s: %s" % (func_name, e))
-            self.functions.append(func)
-
-    def match(self, func, conversions={}):
-        """Find a matching function in the API."""
-        match = None
-        need_conv = False
-        for f in self.functions:
-            matched, conv = f.match(func, conversions)
-            if matched:
-                match = f
-                need_conv = conv
-                # exact match
-                if not need_conv:
-                    break
-        return (match, need_conv)
-
-
-class Function(object):
-    """Parse and realize a <template> node."""
-
-    def __init__(self, tmpl_node, func_node, force_skip_desc=False, categories=[]):
-        self.tmpl_name = tmpl_node.prop("name")
-        self.direction = tmpl_node.prop("direction")
-
-        self.name = func_node.prop("name")
-        self.prefix = func_node.prop("default_prefix")
-        self.is_external = (func_node.prop("external") == "true")
-
-        if force_skip_desc:
-            self._skip_desc = True
-        else:
-            self._skip_desc = (func_node.prop("skip_desc") == "true")
-
-        self._categories = categories
-
-        # these attributes decide how the template is realized
-        self._gltype = func_node.prop("gltype")
-        if func_node.hasProp("vector_size"):
-            self._vector_size = int(func_node.prop("vector_size"))
-        else:
-            self._vector_size = 0
-        self._expand_vector = (func_node.prop("expand_vector") == "true")
-
-        self.return_type = "void"
-        param_nodes = []
-
-        # find <proto>
-        proto_node = tmpl_node.children
-        while proto_node:
-            if proto_node.type == "element" and proto_node.name == "proto":
-                break
-            proto_node = proto_node.next
-        if not proto_node:
-            raise SpecError("no proto")
-        # and parse it
-        node = proto_node.children
-        while node:
-            if node.type == "element":
-                if node.name == "return":
-                    self.return_type = node.prop("type")
-                elif node.name == "param" or node.name == "vector":
-                    if self.support_node(node):
-                        # make sure the node is not hidden
-                        if not (self._expand_vector and
-                                (node.prop("hide_if_expanded") == "true")):
-                            param_nodes.append(node)
-                else:
-                    raise SpecError("unexpected node %s in proto" % node.name)
-            node = node.next
-
-        self._init_params(param_nodes)
-        self._init_descs(tmpl_node, param_nodes)
-
-    def __str__(self):
-        return "%s %s%s(%s)" % (self.return_type, self.prefix, self.name,
-                self.param_string(True))
-
-    def _init_params(self, param_nodes):
-        """Parse and initialize parameters."""
-        self.params = []
-
-        for param_node in param_nodes:
-            size = self.param_node_size(param_node)
-            # when no expansion, vector is just like param
-            if param_node.name == "param" or not self._expand_vector:
-                param = Parameter(param_node, self._gltype, size)
-                self.params.append(param)
-                continue
-
-            if not size or size > param_node.lsCountNode():
-                raise SpecError("could not expand %s with unknown or "
-                                "mismatch sizes" % param.name)
-
-            # expand the vector
-            expanded_params = []
-            child = param_node.children
-            while child:
-                if (child.type == "element" and child.name == "param" and
-                    self.support_node(child)):
-                    expanded_params.append(Parameter(child, self._gltype))
-                    if len(expanded_params) == size:
-                        break
-                child = child.next
-            # just in case that lsCountNode counts unknown nodes
-            if len(expanded_params) < size:
-                raise SpecError("not enough named parameters")
-
-            self.params.extend(expanded_params)
-
-    def _init_descs(self, tmpl_node, param_nodes):
-        """Parse and initialize parameter descriptions."""
-        self.checker = Checker()
-        if self._skip_desc:
-            return
-
-        node = tmpl_node.children
-        while node:
-            if node.type == "element" and node.name == "desc":
-                if self.support_node(node):
-                    # parse <desc>
-                    desc = Description(node, self._categories)
-                    self.checker.add_desc(desc)
-            node = node.next
-
-        self.checker.validate(self, param_nodes)
-
-    def support_node(self, node):
-        """Return true if a node is in the supported category."""
-        return (not node.hasProp("category") or
-                node.prop("category") in self._categories)
-
-    def get_param(self, name):
-        """Return the named parameter."""
-        for param in self.params:
-            if param.name == name:
-                return param
-        return None
-
-    def param_node_size(self, param):
-        """Return the size of a vector."""
-        if param.name != "vector":
-            return 0
-
-        size = param.prop("size")
-        if size.isdigit():
-            size = int(size)
-        else:
-            size = 0
-        if not size:
-            size = self._vector_size
-            if not size and self._expand_vector:
-                # return the number of named parameters
-                size = param.lsCountNode()
-        return size
-
-    def param_string(self, declaration):
-        """Return the C code of the parameters."""
-        args = []
-        if declaration:
-            for param in self.params:
-                sep = "" if param.type.endswith("*") else " "
-                args.append("%s%s%s" % (param.type, sep, param.name))
-            if not args:
-                args.append("void")
-        else:
-            for param in self.params:
-                args.append(param.name)
-        return ", ".join(args)
-
-    def match(self, other, conversions={}):
-        """Return true if the functions match, probably with a conversion."""
-        if (self.tmpl_name != other.tmpl_name or
-            self.return_type != other.return_type or
-            len(self.params) != len(other.params)):
-            return (False, False)
-
-        need_conv = False
-        for i in xrange(len(self.params)):
-            src = other.params[i]
-            dst = self.params[i]
-            if (src.is_vector != dst.is_vector or src.size != dst.size):
-                return (False, False)
-            if src.type != dst.type:
-                if dst.base_type() in conversions.get(src.base_type(), []):
-                    need_conv = True
-                else:
-                    # unable to convert
-                    return (False, False)
-
-        return (True, need_conv)
-
-
-class Parameter(object):
-    """A parameter of a function."""
-
-    def __init__(self, param_node, gltype=None, size=0):
-        self.is_vector = (param_node.name == "vector")
-
-        self.name = param_node.prop("name")
-        self.size = size
-
-        type = param_node.prop("type")
-        if gltype:
-            type = type.replace("GLtype", gltype)
-        elif type.find("GLtype") != -1:
-            raise SpecError("parameter %s has unresolved type" % self.name)
-
-        self.type = type
-
-    def base_type(self):
-        """Return the base GL type by stripping qualifiers."""
-        return [t for t in self.type.split(" ") if t.startswith("GL")][0]
-
-
-class Checker(object):
-    """A checker is the collection of all descriptions on the same level.
-    Descriptions of the same parameter are concatenated.
-    """
-
-    def __init__(self):
-        self.switches = {}
-        self.switch_constants = {}
-
-    def add_desc(self, desc):
-        """Add a description."""
-        # TODO allow index to vary
-        const_attrs = ["index", "error", "convert", "size_str"]
-        if desc.name not in self.switches:
-            self.switches[desc.name] = []
-            self.switch_constants[desc.name] = {}
-            for attr in const_attrs:
-                self.switch_constants[desc.name][attr] = None
-
-        # some attributes, like error code, should be the same for all descs
-        consts = self.switch_constants[desc.name]
-        for attr in const_attrs:
-            if getattr(desc, attr) is not None:
-                if (consts[attr] is not None and
-                    consts[attr] != getattr(desc, attr)):
-                    raise SpecError("mismatch %s for %s" % (attr, desc.name))
-                consts[attr] = getattr(desc, attr)
-
-        self.switches[desc.name].append(desc)
-
-    def validate(self, func, param_nodes):
-        """Validate the checker against a function."""
-        tmp = Checker()
-
-        for switch in self.switches.itervalues():
-            valid_descs = []
-            for desc in switch:
-                if desc.validate(func, param_nodes):
-                    valid_descs.append(desc)
-            # no possible values
-            if not valid_descs:
-                return False
-            for desc in valid_descs:
-                if not desc._is_noop:
-                    tmp.add_desc(desc)
-
-        self.switches = tmp.switches
-        self.switch_constants = tmp.switch_constants
-        return True
-
-    def flatten(self, name=None):
-        """Return a flat list of all descriptions of the named parameter."""
-        flat_list = []
-        for switch in self.switches.itervalues():
-            for desc in switch:
-                if not name or desc.name == name:
-                    flat_list.append(desc)
-                flat_list.extend(desc.checker.flatten(name))
-        return flat_list
-
-    def always_check(self, name):
-        """Return true if the parameter is checked in all possible pathes."""
-        if name in self.switches:
-            return True
-
-        # a param is always checked if any of the switch always checks it
-        for switch in self.switches.itervalues():
-            # a switch always checks it if all of the descs always check it
-            always = True
-            for desc in switch:
-                if not desc.checker.always_check(name):
-                    always = False
-                    break
-            if always:
-                return True
-        return False
-
-    def _c_switch(self, name, indent="\t"):
-        """Output C switch-statement for the named parameter, for debug."""
-        switch = self.switches.get(name, [])
-        # make sure there are valid values
-        need_switch = False
-        for desc in switch:
-            if desc.values:
-                need_switch = True
-        if not need_switch:
-            return []
-
-        stmts = []
-        var = switch[0].name
-        if switch[0].index >= 0:
-            var += "[%d]" % switch[0].index
-        stmts.append("switch (%s) { /* assume GLenum */" % var)
-
-        for desc in switch:
-            if desc.values:
-                for val in desc.values:
-                    stmts.append("case %s:" % val)
-                for dep_name in desc.checker.switches.iterkeys():
-                    dep_stmts = [indent + s for s in desc.checker._c_switch(dep_name, indent)]
-                    stmts.extend(dep_stmts)
-                stmts.append(indent + "break;")
-
-        stmts.append("default:")
-        stmts.append(indent + "ON_ERROR(%s);" % switch[0].error);
-        stmts.append(indent + "break;")
-        stmts.append("}")
-
-        return stmts
-
-    def dump(self, indent="\t"):
-        """Dump the descriptions in C code."""
-        stmts = []
-        for name in self.switches.iterkeys():
-            c_switch = self._c_switch(name)
-            print "\n".join(c_switch)
-
-
-class Description(object):
-    """A description desribes a parameter and its relationship with other
-    parameters.
-    """
-
-    def __init__(self, desc_node, categories=[]):
-        self._categories = categories
-        self._is_noop = False
-
-        self.name = desc_node.prop("name")
-        self.index = -1
-
-        self.error = desc_node.prop("error") or "GL_INVALID_ENUM"
-        # vector_size may be C code
-        self.size_str = desc_node.prop("vector_size")
-
-        self._has_enum = False
-        self.values = []
-        dep_nodes = []
-
-        # parse <desc>
-        valid_names = ["value", "range", "desc"]
-        node = desc_node.children
-        while node:
-            if node.type == "element":
-                if node.name in valid_names:
-                    # ignore nodes that require unsupported categories
-                    if (node.prop("category") and
-                        node.prop("category") not in self._categories):
-                        node = node.next
-                        continue
-                else:
-                    raise SpecError("unexpected node %s in desc" % node.name)
-
-                if node.name == "value":
-                    val = node.prop("name")
-                    if not self._has_enum and val.startswith("GL_"):
-                        self._has_enum = True
-                    self.values.append(val)
-                elif node.name == "range":
-                    first = int(node.prop("from"))
-                    last = int(node.prop("to"))
-                    base = node.prop("base") or ""
-                    if not self._has_enum and base.startswith("GL_"):
-                        self._has_enum = True
-                    # expand range
-                    for i in xrange(first, last + 1):
-                        self.values.append("%s%d" % (base, i))
-                else: # dependent desc
-                    dep_nodes.append(node)
-            node = node.next
-
-        # default to convert if there is no enum
-        self.convert = not self._has_enum
-        if desc_node.hasProp("convert"):
-            self.convert = (desc_node.prop("convert") == "true")
-
-        self._init_deps(dep_nodes)
-
-    def _init_deps(self, dep_nodes):
-        """Parse and initialize dependents."""
-        self.checker = Checker()
-
-        for dep_node in dep_nodes:
-            # recursion!
-            dep = Description(dep_node, self._categories)
-            self.checker.add_desc(dep)
-
-    def _search_param_node(self, param_nodes, name=None):
-        """Search the template parameters for the named node."""
-        param_node = None
-        param_index = -1
-
-        if not name:
-            name = self.name
-        for node in param_nodes:
-            if name == node.prop("name"):
-                param_node = node
-            elif node.name == "vector":
-                child = node.children
-                idx = 0
-                while child:
-                    if child.type == "element" and child.name == "param":
-                        if name == child.prop("name"):
-                            param_node = node
-                            param_index = idx
-                            break
-                        idx += 1
-                    child = child.next
-            if param_node:
-                break
-        return (param_node, param_index)
-
-    def _find_final(self, func, param_nodes):
-        """Find the final parameter."""
-        param = func.get_param(self.name)
-        param_index = -1
-
-        # the described param is not in the final function
-        if not param:
-            # search the template parameters
-            node, index = self._search_param_node(param_nodes)
-            if not node:
-                raise SpecError("invalid desc %s in %s" %
-                        (self.name, func.name))
-
-            # a named parameter of a vector
-            if index >= 0:
-                param = func.get_param(node.prop("name"))
-                param_index = index
-            elif node.name == "vector":
-                # must be an expanded vector, check its size
-                if self.size_str and self.size_str.isdigit():
-                    size = int(self.size_str)
-                    expanded_size = func.param_node_size(node)
-                    if size != expanded_size:
-                        return (False, None, -1)
-            # otherwise, it is a valid, but no-op, description
-
-        return (True, param, param_index)
-
-    def validate(self, func, param_nodes):
-        """Validate a description against certain function."""
-        if self.checker.switches and not self.values:
-            raise SpecError("no valid values for %s" % self.name)
-
-        valid, param, param_index = self._find_final(func, param_nodes)
-        if not valid:
-            return False
-
-        # the description is valid, but the param is gone
-        # mark it no-op so that it will be skipped
-        if not param:
-            self._is_noop = True
-            return True
-
-        if param.is_vector:
-            # if param was known, this should have been done in __init__
-            if self._has_enum:
-                self.size_str = "1"
-            # size mismatch
-            if (param.size and self.size_str and self.size_str.isdigit() and
-                param.size != int(self.size_str)):
-                return False
-        elif self.size_str:
-            # only vector accepts vector_size
-            raise SpecError("vector_size is invalid for %s" % param.name)
-
-        if not self.checker.validate(func, param_nodes):
-            return False
-
-        # update the description
-        self.name = param.name
-        self.index = param_index
-
-        return True
-
-
-def main():
-    import libxml2
-
-    filename = "APIspec.xml"
-    apinames = ["GLES1.1", "GLES2.0"]
-
-    doc = libxml2.readFile(filename, None,
-            libxml2.XML_PARSE_DTDLOAD +
-            libxml2.XML_PARSE_DTDVALID +
-            libxml2.XML_PARSE_NOBLANKS)
-
-    spec = Spec(doc)
-    impl = spec.get_impl()
-    for apiname in apinames:
-        spec.get_api(apiname)
-
-    doc.freeDoc()
-
-    print "%s is successfully parsed" % filename
-
-
-if __name__ == "__main__":
-    main()
diff --git a/mesalib/src/mesa/main/APIspec.xml b/mesalib/src/mesa/main/APIspec.xml
deleted file mode 100644
index c3969526f..000000000
--- a/mesalib/src/mesa/main/APIspec.xml
+++ /dev/null
@@ -1,2383 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE apispec SYSTEM "APIspec.dtd">
-
-<!-- A function is generated from a template.  Multiple functions can be
-     generated from a single template with different arguments.  For example,
-     glColor3f can be generated from
-
-     <function name="Color3f" template="Color" gltype="GLfloat" vector_size="3" expand_vector="true"/>
-
-     and glColor4iv can be generated from
-
-     <function name="Color4iv" template="Color" gltype="GLint" vector_size="4"/>
-
-     In a template, there are <desc>s that describe the properties of
-     parameters.  A <desc> can enumerate the valid values of a parameter.  It
-     can also specify the error code when an invalid value is given, and etc.
-     By nesting <desc>s, they can create dependency between parameters.
-
-     A function can be marked as external.  It means that the function cannot
-     be dispatched to the corresponding mesa function, if one exists, directly,
-     and requires an external implementation.
--->
-
-<apispec>
-
-<template name="Color">
-	<proto>
-		<return type="void"/>
-		<vector name="v" type="const GLtype *" size="dynamic">
-			<param name="red" type="GLtype"/>
-			<param name="green" type="GLtype"/>
-			<param name="blue" type="GLtype"/>
-			<param name="alpha" type="GLtype"/>
-		</vector>
-	</proto>
-</template>
-
-<template name="ClipPlane">
-	<proto>
-		<return type="void"/>
-		<param name="plane" type="GLenum"/>
-		<vector name="equation" type="const GLtype *" size="4"/>
-	</proto>
-</template>
-
-<template name="CullFace">
-	<proto>
-		<return type="void"/>
-		<param name="mode" type="GLenum"/>
-	</proto>
-</template>
-
-<template name="Fog">
-	<proto>
-		<return type="void"/>
-		<param name="pname" type="GLenum"/>
-		<vector name="params" type="const GLtype *" size="dynamic">
-			<param name="param" type="GLtype"/>
-		</vector>
-	</proto>
-</template>
-
-<template name="FrontFace">
-	<proto>
-		<return type="void"/>
-		<param name="mode" type="GLenum"/>
-	</proto>
-</template>
-
-<template name="Hint">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="mode" type="GLenum"/>
-	</proto>
-</template>
-
-<template name="Light">
-	<proto>
-		<return type="void"/>
-		<param name="light" type="GLenum"/>
-		<param name="pname" type="GLenum"/>
-		<vector name="params" type="const GLtype *" size="dynamic">
-			<param name="param" type="GLtype"/>
-		</vector>
-	</proto>
-</template>
-
-<template name="LightModel">
-	<proto>
-		<return type="void"/>
-		<param name="pname" type="GLenum"/>
-		<vector name="params" type="const GLtype *" size="dynamic">
-			<param name="param" type="GLtype"/>
-		</vector>
-	</proto>
-</template>
-
-<template name="LineWidth">
-	<proto>
-		<return type="void"/>
-		<param name="width" type="GLtype"/>
-	</proto>
-</template>
-
-<template name="Material">
-	<proto>
-		<return type="void"/>
-		<param name="face" type="GLenum"/>
-		<param name="pname" type="GLenum"/>
-		<vector name="params" type="const GLtype *" size="dynamic">
-			<param name="param" type="GLtype"/>
-		</vector>
-	</proto>
-</template>
-
-<template name="PointSize">
-	<proto>
-		<return type="void"/>
-		<param name="size" type="GLtype"/>
-	</proto>
-</template>
-
-<template name="PointSizePointer">
-	<proto>
-		<return type="void"/>
-		<param name="type" type="GLenum"/>
-		<param name="stride" type="GLsizei"/>
-		<param name="pointer" type="const GLvoid *"/>
-	</proto>
-</template>
-
-<template name="Scissor">
-	<proto>
-		<return type="void"/>
-		<param name="x" type="GLint"/>
-		<param name="y" type="GLint"/>
-		<param name="width" type="GLsizei"/>
-		<param name="height" type="GLsizei"/>
-	</proto>
-</template>
-
-<template name="ShadeModel">
-	<proto>
-		<return type="void"/>
-		<param name="mode" type="GLenum"/>
-	</proto>
-</template>
-
-<template name="TexParameter">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="pname" type="GLenum"/>
-		<vector name="params" type="const GLtype *" size="dynamic">
-			<param name="param" type="GLtype"/>
-		</vector>
-	</proto>
-</template>
-
-<template name="TexImage2D">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="level" type="GLint"/>
-		<param name="internalFormat" type="GLint"/> <!-- should be GLenum -->
-		<param name="width" type="GLsizei"/>
-		<param name="height" type="GLsizei"/>
-		<param name="border" type="GLint"/>
-		<param name="format" type="GLenum"/>
-		<param name="type" type="GLenum"/>
-		<param name="pixels" type="const GLvoid *"/>
-	</proto>
-</template>
-
-<template name="TexEnv">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="pname" type="GLenum"/>
-		<vector name="params" type="const GLtype *" size="dynamic">
-			<param name="param" type="GLtype"/>
-		</vector>
-	</proto>
-</template>
-
-<template name="TexGen">
-	<proto>
-		<return type="void"/>
-		<param name="coord" type="GLenum"/>
-		<param name="pname" type="GLenum"/>
-		<vector name="params" type="const GLtype *" size="dynamic">
-			<param name="param" type="GLtype"/>
-		</vector>
-	</proto>
-</template>
-
-<template name="Clear">
-	<proto>
-		<return type="void"/>
-		<param name="mask" type="GLbitfield"/>
-	</proto>
-</template>
-
-<template name="ClearColor">
-	<proto>
-		<return type="void"/>
-		<param name="red" type="GLtype"/>
-		<param name="green" type="GLtype"/>
-		<param name="blue" type="GLtype"/>
-		<param name="alpha" type="GLtype"/>
-	</proto>
-</template>
-
-<template name="ClearStencil">
-	<proto>
-		<return type="void"/>
-		<param name="s" type="GLint"/>
-	</proto>
-</template>
-
-<template name="ClearDepth">
-	<proto>
-		<return type="void"/>
-		<param name="depth" type="GLtype"/>
-	</proto>
-</template>
-
-<template name="StencilMask">
-	<proto>
-		<return type="void"/>
-		<param name="mask" type="GLuint"/>
-	</proto>
-</template>
-
-<template name="StencilMaskSeparate">
-	<proto>
-		<return type="void"/>
-		<param name="face" type="GLenum"/>
-		<param name="mask" type="GLuint"/>
-	</proto>
-</template>
-
-<template name="ColorMask">
-	<proto>
-		<return type="void"/>
-		<param name="red" type="GLboolean"/>
-		<param name="green" type="GLboolean"/>
-		<param name="blue" type="GLboolean"/>
-		<param name="alpha" type="GLboolean"/>
-	</proto>
-</template>
-
-<template name="DepthMask">
-	<proto>
-		<return type="void"/>
-		<param name="flag" type="GLboolean"/>
-	</proto>
-</template>
-
-<template name="Disable">
-	<proto>
-		<return type="void"/>
-		<param name="cap" type="GLenum"/>
-	</proto>
-</template>
-
-<!-- it is exactly the same as Disable -->
-<template name="Enable">
-	<proto>
-		<return type="void"/>
-		<param name="cap" type="GLenum"/>
-	</proto>
-</template>
-
-<template name="Finish">
-	<proto>
-		<return type="void"/>
-	</proto>
-</template>
-
-<template name="Flush">
-	<proto>
-		<return type="void"/>
-	</proto>
-</template>
-
-<template name="AlphaFunc">
-	<proto>
-		<return type="void"/>
-		<param name="func" type="GLenum"/>
-		<param name="ref" type="GLtype"/>
-	</proto>
-</template>
-
-<template name="BlendFunc">
-	<proto>
-		<return type="void"/>
-		<param name="sfactor" type="GLenum"/>
-		<param name="dfactor" type="GLenum"/>
-	</proto>
-</template>
-
-<template name="LogicOp">
-	<proto>
-		<return type="void"/>
-		<param name="opcode" type="GLenum"/>
-	</proto>
-</template>
-
-<template name="StencilFunc">
-	<proto>
-		<return type="void"/>
-		<param name="func" type="GLenum"/>
-		<param name="ref" type="GLint"/>
-		<param name="mask" type="GLuint"/>
-	</proto>
-</template>
-
-<template name="StencilFuncSeparate">
-	<proto>
-		<return type="void"/>
-		<param name="face" type="GLenum"/>
-		<param name="func" type="GLenum"/>
-		<param name="ref" type="GLint"/>
-		<param name="mask" type="GLuint"/>
-	</proto>
-</template>
-
-<template name="StencilOp">
-	<proto>
-		<return type="void"/>
-		<param name="fail" type="GLenum"/>
-		<param name="zfail" type="GLenum"/>
-		<param name="zpass" type="GLenum"/>
-	</proto>
-</template>
-
-<template name="StencilOpSeparate">
-	<proto>
-		<return type="void"/>
-		<param name="face" type="GLenum"/>
-		<param name="fail" type="GLenum"/>
-		<param name="zfail" type="GLenum"/>
-		<param name="zpass" type="GLenum"/>
-	</proto>
-</template>
-
-<template name="DepthFunc">
-	<proto>
-		<return type="void"/>
-		<param name="func" type="GLenum"/>
-	</proto>
-</template>
-
-<template name="PixelStore">
-	<proto>
-		<return type="void"/>
-		<param name="pname" type="GLenum"/>
-		<param name="param" type="GLtype"/>
-	</proto>
-</template>
-
-<template name="ReadPixels" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="x" type="GLint"/>
-		<param name="y" type="GLint"/>
-		<param name="width" type="GLsizei"/>
-		<param name="height" type="GLsizei"/>
-		<param name="format" type="GLenum"/>
-		<param name="type" type="GLenum"/>
-		<param name="pixels" type="GLvoid *"/>
-	</proto>
-</template>
-
-<template name="GetClipPlane" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="plane" type="GLenum"/>
-		<vector name="equation" type="GLtype *" size="4"/>
-	</proto>
-</template>
-
-<template name="GetError" direction="get">
-	<proto>
-		<return type="GLenum"/>
-	</proto>
-</template>
-
-<!-- template for GetFloatv, GetIntegerv, GetBoolean, and GetFixedv -->
-<template name="GetState" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="pname" type="GLenum"/>
-		<vector name="params" type="GLtype *" size="dynamic"/>
-	</proto>
-	<!-- param checking is done in mesa -->
-</template>
-
-<template name="GetLight" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="light" type="GLenum"/>
-		<param name="pname" type="GLenum"/>
-		<vector name="params" type="GLtype *" size="dynamic"/>
-	</proto>
-</template>
-
-<template name="GetMaterial" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="face" type="GLenum"/>
-		<param name="pname" type="GLenum"/>
-		<vector name="params" type="GLtype *" size="dynamic">
-			<param name="param" type="GLtype"/>
-		</vector>
-	</proto>
-</template>
-
-<template name="GetString" direction="get">
-	<proto>
-		<return type="const GLubyte *"/>
-		<param name="name" type="GLenum"/>
-	</proto>
-</template>
-
-<template name="GetTexEnv" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="pname" type="GLenum"/>
-		<vector name="params" type="GLtype *" size="dynamic"/>
-	</proto>
-</template>
-
-<template name="GetTexGen" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="coord" type="GLenum"/>
-		<param name="pname" type="GLenum"/>
-		<vector name="params" type="GLtype *" size="dynamic"/>
-	</proto>
-</template>
-
-<template name="GetTexParameter" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="pname" type="GLenum"/>
-		<vector name="params" type="GLtype *" size="dynamic"/>
-	</proto>
-</template>
-
-<template name="IsEnabled" direction="get">
-	<proto>
-		<return type="GLboolean"/>
-		<param name="cap" type="GLenum"/>
-	</proto>
-</template>
-
-<template name="DepthRange">
-	<proto>
-		<return type="void"/>
-		<param name="zNear" type="GLtype"/>
-		<param name="zFar" type="GLtype"/>
-	</proto>
-</template>
-
-<template name="Frustum">
-	<proto>
-		<return type="void"/>
-		<param name="left" type="GLtype"/>
-		<param name="right" type="GLtype"/>
-		<param name="bottom" type="GLtype"/>
-		<param name="top" type="GLtype"/>
-		<param name="zNear" type="GLtype"/>
-		<param name="zFar" type="GLtype"/>
-	</proto>
-</template>
-
-<template name="LoadIdentity">
-	<proto>
-		<return type="void"/>
-	</proto>
-</template>
-
-<template name="LoadMatrix">
-	<proto>
-		<return type="void"/>
-		<vector name="m" type="const GLtype *" size="16"/>
-	</proto>
-</template>
-
-<template name="MatrixMode">
-	<proto>
-		<return type="void"/>
-		<param name="mode" type="GLenum"/>
-	</proto>
-</template>
-
-<template name="MultMatrix">
-	<proto>
-		<return type="void"/>
-		<vector name="m" type="const GLtype *" size="16"/>
-	</proto>
-</template>
-
-<template name="Ortho">
-	<proto>
-		<return type="void"/>
-		<param name="left" type="GLtype"/>
-		<param name="right" type="GLtype"/>
-		<param name="bottom" type="GLtype"/>
-		<param name="top" type="GLtype"/>
-		<param name="zNear" type="GLtype"/>
-		<param name="zFar" type="GLtype"/>
-	</proto>
-</template>
-
-<template name="PopMatrix">
-	<proto>
-		<return type="void"/>
-	</proto>
-</template>
-
-<template name="PushMatrix">
-	<proto>
-		<return type="void"/>
-	</proto>
-</template>
-
-<template name="Rotate">
-	<proto>
-		<return type="void"/>
-		<param name="angle" type="GLtype"/>
-		<param name="x" type="GLtype"/>
-		<param name="y" type="GLtype"/>
-		<param name="z" type="GLtype"/>
-	</proto>
-</template>
-
-<template name="Scale">
-	<proto>
-		<return type="void"/>
-		<param name="x" type="GLtype"/>
-		<param name="y" type="GLtype"/>
-		<param name="z" type="GLtype"/>
-	</proto>
-</template>
-
-<template name="Translate">
-	<proto>
-		<return type="void"/>
-		<param name="x" type="GLtype"/>
-		<param name="y" type="GLtype"/>
-		<param name="z" type="GLtype"/>
-	</proto>
-</template>
-
-<template name="Viewport">
-	<proto>
-		<return type="void"/>
-		<param name="x" type="GLint"/>
-		<param name="y" type="GLint"/>
-		<param name="width" type="GLsizei"/>
-		<param name="height" type="GLsizei"/>
-	</proto>
-</template>
-
-<template name="ColorPointer">
-	<proto>
-		<return type="void"/>
-		<param name="size" type="GLint"/>
-		<param name="type" type="GLenum"/>
-		<param name="stride" type="GLsizei"/>
-		<param name="pointer" type="const GLvoid *"/>
-	</proto>
-</template>
-
-<template name="DisableClientState">
-	<proto>
-		<return type="void"/>
-		<param name="array" type="GLenum"/>
-	</proto>
-</template>
-
-<template name="DrawArrays">
-	<proto>
-		<return type="void"/>
-		<param name="mode" type="GLenum"/>
-		<param name="first" type="GLint"/>
-		<param name="count" type="GLsizei"/>
-	</proto>
-</template>
-
-<template name="DrawElements">
-	<proto>
-		<return type="void"/>
-		<param name="mode" type="GLenum"/>
-		<param name="count" type="GLsizei"/>
-		<param name="type" type="GLenum"/>
-		<param name="indices" type="const GLvoid *"/>
-	</proto>
-</template>
-
-<template name="EnableClientState">
-	<proto>
-		<return type="void"/>
-		<param name="array" type="GLenum"/>
-	</proto>
-</template>
-
-<template name="GetPointer" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="pname" type="GLenum"/>
-		<vector name="params" type="GLvoid **" size="dynamic"/>
-	</proto>
-</template>
-
-<template name="Normal">
-	<proto>
-		<return type="void"/>
-		<vector name="v" type="const GLtype *" size="3">
-			<param name="nx" type="GLtype"/>
-			<param name="ny" type="GLtype"/>
-			<param name="nz" type="GLtype"/>
-		</vector>
-	</proto>
-</template>
-
-<template name="NormalPointer">
-	<proto>
-		<return type="void"/>
-		<param name="type" type="GLenum"/>
-		<param name="stride" type="GLsizei"/>
-		<param name="pointer" type="const GLvoid *"/>
-	</proto>
-</template>
-
-<template name="TexCoordPointer">
-	<proto>
-		<return type="void"/>
-		<param name="size" type="GLint"/>
-		<param name="type" type="GLenum"/>
-		<param name="stride" type="GLsizei"/>
-		<param name="pointer" type="const GLvoid *"/>
-	</proto>
-</template>
-
-<template name="VertexPointer">
-	<proto>
-		<return type="void"/>
-		<param name="size" type="GLint"/>
-		<param name="type" type="GLenum"/>
-		<param name="stride" type="GLsizei"/>
-		<param name="pointer" type="const GLvoid *"/>
-	</proto>
-</template>
-
-<template name="PolygonOffset">
-	<proto>
-		<return type="void"/>
-		<param name="factor" type="GLtype"/>
-		<param name="units" type="GLtype"/>
-	</proto>
-</template>
-
-<template name="CopyTexImage2D">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="level" type="GLint"/>
-		<param name="internalFormat" type="GLenum"/>
-		<param name="x" type="GLint"/>
-		<param name="y" type="GLint"/>
-		<param name="width" type="GLsizei"/>
-		<param name="height" type="GLsizei"/>
-		<param name="border" type="GLint"/>
-	</proto>
-</template>
-
-<template name="CopyTexSubImage2D">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="level" type="GLint"/>
-		<param name="xoffset" type="GLint"/>
-		<param name="yoffset" type="GLint"/>
-		<param name="x" type="GLint"/>
-		<param name="y" type="GLint"/>
-		<param name="width" type="GLsizei"/>
-		<param name="height" type="GLsizei"/>
-	</proto>
-</template>
-
-<template name="TexSubImage2D">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="level" type="GLint"/>
-		<param name="xoffset" type="GLint"/>
-		<param name="yoffset" type="GLint"/>
-		<param name="width" type="GLsizei"/>
-		<param name="height" type="GLsizei"/>
-		<param name="format" type="GLenum"/>
-		<param name="type" type="GLenum"/>
-		<param name="pixels" type="const GLvoid *"/>
-	</proto>
-</template>
-
-<template name="BindTexture">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="texture" type="GLuint"/>
-	</proto>
-</template>
-
-<template name="DeleteTextures">
-	<proto>
-		<return type="void"/>
-		<param name="n" type="GLsizei"/>
-		<param name="textures" type="const GLuint *"/>
-	</proto>
-</template>
-
-<template name="GenTextures" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="n" type="GLsizei"/>
-		<param name="textures" type="GLuint *"/>
-	</proto>
-</template>
-
-<template name="IsTexture" direction="get">
-	<proto>
-		<return type="GLboolean"/>
-		<param name="texture" type="GLuint"/>
-	</proto>
-</template>
-
-<template name="BlendColor">
-	<proto>
-		<return type="void"/>
-		<param name="red" type="GLtype"/>
-		<param name="green" type="GLtype"/>
-		<param name="blue" type="GLtype"/>
-		<param name="alpha" type="GLtype"/>
-	</proto>
-</template>
-
-<template name="BlendEquation">
-	<proto>
-		<return type="void"/>
-		<param name="mode" type="GLenum"/>
-	</proto>
-</template>
-
-<template name="BlendEquationSeparate">
-	<proto>
-		<return type="void"/>
-		<param name="modeRGB" type="GLenum"/>
-		<param name="modeAlpha" type="GLenum"/>
-	</proto>
-</template>
-
-<template name="TexImage3D">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="level" type="GLint"/>
-		<param name="internalFormat" type="GLenum"/>
-		<param name="width" type="GLsizei"/>
-		<param name="height" type="GLsizei"/>
-		<param name="depth" type="GLsizei"/>
-		<param name="border" type="GLint"/>
-		<param name="format" type="GLenum"/>
-		<param name="type" type="GLenum"/>
-		<param name="pixels" type="const GLvoid *"/>
-	</proto>
-
-</template>
-
-<template name="TexSubImage3D">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="level" type="GLint"/>
-		<param name="xoffset" type="GLint"/>
-		<param name="yoffset" type="GLint"/>
-		<param name="zoffset" type="GLint"/>
-		<param name="width" type="GLsizei"/>
-		<param name="height" type="GLsizei"/>
-		<param name="depth" type="GLsizei"/>
-		<param name="format" type="GLenum"/>
-		<param name="type" type="GLenum"/>
-		<param name="pixels" type="const GLvoid *"/>
-	</proto>
-</template>
-
-<template name="CopyTexSubImage3D">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="level" type="GLint"/>
-		<param name="xoffset" type="GLint"/>
-		<param name="yoffset" type="GLint"/>
-		<param name="zoffset" type="GLint"/>
-		<param name="x" type="GLint"/>
-		<param name="y" type="GLint"/>
-		<param name="width" type="GLsizei"/>
-		<param name="height" type="GLsizei"/>
-	</proto>
-</template>
-
-<template name="MultiTexCoord">
-	<proto>
-		<return type="void"/>
-		<param name="texture" type="GLenum"/>
-		<vector name="v" type="const GLtype *" size="dynamic">
-			<param name="s" type="GLtype"/>
-			<param name="t" type="GLtype"/>
-			<param name="r" type="GLtype"/>
-			<param name="q" type="GLtype"/>
-		</vector>
-	</proto>
-</template>
-
-<template name="CompressedTexImage3D">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="level" type="GLint"/>
-		<param name="internalFormat" type="GLenum"/>
-		<param name="width" type="GLsizei"/>
-		<param name="height" type="GLsizei"/>
-		<param name="depth" type="GLsizei"/>
-		<param name="border" type="GLint"/>
-		<param name="imagesize" type="GLsizei"/>
-		<param name="data" type="const GLvoid *"/>
-	</proto>
-</template>
-
-<template name="CompressedTexSubImage3D">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="level" type="GLint"/>
-		<param name="xoffset" type="GLint"/>
-		<param name="yoffset" type="GLint"/>
-		<param name="zoffset" type="GLint"/>
-		<param name="width" type="GLsizei"/>
-		<param name="height" type="GLsizei"/>
-		<param name="depth" type="GLsizei"/>
-		<param name="format" type="GLenum"/>
-		<param name="imagesize" type="GLsizei"/>
-		<param name="data" type="const GLvoid *"/>
-	</proto>
-</template>
-
-<template name="ActiveTexture">
-	<proto>
-		<return type="void"/>
-		<param name="texture" type="GLenum"/>
-	</proto>
-</template>
-
-<template name="ClientActiveTexture">
-	<proto>
-		<return type="void"/>
-		<param name="texture" type="GLenum"/>
-	</proto>
-</template>
-
-<template name="SampleCoverage">
-	<proto>
-		<return type="void"/>
-		<param name="value" type="GLtype"/>
-		<param name="invert" type="GLboolean"/>
-	</proto>
-</template>
-
-<template name="CompressedTexImage2D">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="level" type="GLint"/>
-		<param name="internalFormat" type="GLenum"/>
-		<param name="width" type="GLsizei"/>
-		<param name="height" type="GLsizei"/>
-		<param name="border" type="GLint"/>
-		<param name="imageSize" type="GLsizei"/>
-		<param name="data" type="const GLvoid *"/>
-	</proto>
-</template>
-
-<template name="CompressedTexSubImage2D">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="level" type="GLint"/>
-		<param name="xoffset" type="GLint"/>
-		<param name="yoffset" type="GLint"/>
-		<param name="width" type="GLsizei"/>
-		<param name="height" type="GLsizei"/>
-		<param name="format" type="GLenum"/>
-		<param name="imageSize" type="GLsizei"/>
-		<param name="data" type="const GLvoid *"/>
-	</proto>
-</template>
-
-<template name="BlendFuncSeparate">
-	<proto>
-		<return type="void"/>
-		<param name="srcRGB" type="GLenum"/>
-		<param name="dstRGB" type="GLenum"/>
-		<param name="srcAlpha" type="GLenum"/>
-		<param name="dstAlpha" type="GLenum"/>
-	</proto>
-</template>
-
-<template name="PointParameter">
-	<proto>
-		<return type="void"/>
-		<param name="pname" type="GLenum"/>
-		<vector name="params" type="const GLtype *" size="dynamic">
-			<param name="param" type="GLtype"/>
-		</vector>
-	</proto>
-</template>
-
-<template name="VertexAttrib">
-	<proto>
-		<return type="void"/>
-		<param name="index" type="GLuint"/>
-		<vector name="v" type="const GLtype *" size="dynamic">
-			<param name="x" type="GLtype"/>
-			<param name="y" type="GLtype"/>
-			<param name="z" type="GLtype"/>
-			<param name="w" type="GLtype"/>
-		</vector>
-	</proto>
-</template>
-
-<template name="VertexAttribPointer">
-	<proto>
-		<return type="void"/>
-		<param name="index" type="GLuint"/>
-		<param name="size" type="GLint"/>
-		<param name="type" type="GLenum"/>
-		<param name="normalized" type="GLboolean"/>
-		<param name="stride" type="GLsizei"/>
-		<param name="pointer" type="const GLvoid *"/>
-	</proto>
-</template>
-
-<template name="EnableVertexAttribArray">
-	<proto>
-		<return type="void"/>
-		<param name="index" type="GLuint"/>
-	</proto>
-</template>
-
-<template name="DisableVertexAttribArray">
-	<proto>
-		<return type="void"/>
-		<param name="index" type="GLuint"/>
-	</proto>
-</template>
-
-<template name="IsProgram" direction="get">
-	<proto>
-		<return type="GLboolean"/>
-		<param name="program" type="GLuint"/>
-	</proto>
-</template>
-
-<template name="GetProgram" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="program" type="GLuint"/>
-		<param name="pname" type="GLenum"/>
-		<vector name="params" type="GLtype *" size="dynamic"/>
-	</proto>
-</template>
-
-<template name="GetVertexAttrib" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="index" type="GLuint"/>
-		<param name="pname" type="GLenum"/>
-		<vector name="params" type="GLtype *" size="dynamic"/>
-	</proto>
-</template>
-
-<template name="GetVertexAttribPointer" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="index" type="GLuint"/>
-		<param name="pname" type="GLenum"/>
-		<vector name="pointer" type="GLvoid **" size="dynamic"/>
-	</proto>
-</template>
-
-<template name="GetBufferPointer" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="pname" type="GLenum"/>
-		<vector name="params" type="GLvoid **" size="dynamic"/>
-	</proto>
-</template>
-
-<template name="MapBuffer" direction="get">
-	<proto>
-		<return type="void *"/>
-		<param name="target" type="GLenum"/>
-		<param name="access" type="GLenum"/>
-	</proto>
-</template>
-
-<template name="UnmapBuffer" direction="get">
-	<proto>
-		<return type="GLboolean"/>
-		<param name="target" type="GLenum"/>
-	</proto>
-</template>
-
-<template name="BindBuffer">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="buffer" type="GLuint"/>
-	</proto>
-</template>
-
-<template name="BufferData">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="size" type="GLsizeiptr"/>
-		<param name="data" type="const GLvoid *"/>
-		<param name="usage" type="GLenum"/>
-	</proto>
-</template>
-
-<template name="BufferSubData">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="offset" type="GLintptr"/>
-		<param name="size" type="GLsizeiptr"/>
-		<param name="data" type="const GLvoid *"/>
-	</proto>
-</template>
-
-<template name="DeleteBuffers">
-	<proto>
-		<return type="void"/>
-		<param name="n" type="GLsizei"/>
-		<param name="buffer" type="const GLuint *"/>
-	</proto>
-</template>
-
-<template name="GenBuffers" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="n" type="GLsizei"/>
-		<param name="buffer" type="GLuint *"/>
-	</proto>
-</template>
-
-<template name="GetBufferParameter" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="pname" type="GLenum"/>
-		<vector name="params" type="GLtype *" size="dynamic"/>
-	</proto>
-</template>
-
-<template name="IsBuffer" direction="get">
-	<proto>
-		<return type="GLboolean"/>
-		<param name="buffer" type="GLuint"/>
-	</proto>
-</template>
-
-<template name="CreateShader">
-	<proto>
-		<return type="GLuint"/>
-		<param name="type" type="GLenum"/>
-	</proto>
-</template>
-
-<template name="ShaderSource">
-	<proto>
-		<return type="void"/>
-		<param name="shader" type="GLuint"/>
-		<param name="count" type="GLsizei"/>
-		<param name="string" type="const GLchar * const *"/>
-		<param name="length" type="const int *"/>
-	</proto>
-</template>
-
-<template name="CompileShader">
-	<proto>
-		<return type="void"/>
-		<param name="shader" type="GLuint"/>
-	</proto>
-</template>
-
-<template name="ReleaseShaderCompiler">
-	<proto>
-		<return type="void"/>
-	</proto>
-</template>
-
-<template name="DeleteShader">
-	<proto>
-		<return type="void"/>
-		<param name="shader" type="GLuint"/>
-	</proto>
-</template>
-
-<template name="ShaderBinary">
-	<proto>
-		<return type="void"/>
-		<param name="n" type="GLsizei"/>
-		<param name="shaders" type="const GLuint *"/>
-		<param name="binaryformat" type="GLenum"/>
-		<param name="binary" type="const GLvoid *"/>
-		<param name="length" type="GLsizei"/>
-	</proto>
-</template>
-
-<template name="CreateProgram">
-	<proto>
-		<return type="GLuint"/>
-	</proto>
-</template>
-
-<template name="AttachShader">
-	<proto>
-		<return type="void"/>
-		<param name="program" type="GLuint"/>
-		<param name="shader" type="GLuint"/>
-	</proto>
-</template>
-
-<template name="DetachShader">
-	<proto>
-		<return type="void"/>
-		<param name="program" type="GLuint"/>
-		<param name="shader" type="GLuint"/>
-	</proto>
-</template>
-
-<template name="LinkProgram">
-	<proto>
-		<return type="void"/>
-		<param name="program" type="GLuint"/>
-	</proto>
-</template>
-
-<template name="UseProgram">
-	<proto>
-		<return type="void"/>
-		<param name="program" type="GLuint"/>
-	</proto>
-</template>
-
-<template name="DeleteProgram">
-	<proto>
-		<return type="void"/>
-		<param name="program" type="GLuint"/>
-	</proto>
-</template>
-
-<template name="GetActiveAttrib" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="program" type="GLuint"/>
-		<param name="index" type="GLuint"/>
-		<param name="bufSize" type="GLsizei"/>
-		<param name="length" type="GLsizei *"/>
-		<param name="size" type="GLint *"/>
-		<param name="type" type="GLenum *"/>
-		<param name="name" type="GLchar *"/>
-	</proto>
-</template>
-
-<template name="GetAttribLocation" direction="get">
-	<proto>
-		<return type="GLint"/>
-		<param name="program" type="GLuint"/>
-		<param name="name" type="const char *"/>
-	</proto>
-</template>
-
-<template name="BindAttribLocation">
-	<proto>
-		<return type="void"/>
-		<param name="program" type="GLuint"/>
-		<param name="index" type="GLuint"/>
-		<param name="name" type="const char *"/>
-	</proto>
-</template>
-
-<template name="GetUniformLocation" direction="get">
-	<proto>
-		<return type="GLint"/>
-		<param name="program" type="GLuint"/>
-		<param name="name" type="const char *"/>
-	</proto>
-</template>
-
-<template name="GetActiveUniform" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="program" type="GLuint"/>
-		<param name="index" type="GLuint"/>
-		<param name="bufSize" type="GLsizei"/>
-		<param name="length" type="GLsizei *"/>
-		<param name="size" type="GLint *"/>
-		<param name="type" type="GLenum *"/>
-		<param name="name" type="GLchar *"/>
-	</proto>
-</template>
-
-<template name="Uniform">
-	<proto>
-		<return type="void"/>
-		<param name="location" type="GLint"/>
-		<param name="count" type="GLsizei" hide_if_expanded="true"/>
-		<vector name="values" type="const GLtype *" size="dynamic">
-			<param name="v0" type="GLtype"/>
-			<param name="v1" type="GLtype"/>
-			<param name="v2" type="GLtype"/>
-			<param name="v3" type="GLtype"/>
-		</vector>
-	</proto>
-</template>
-
-<template name="UniformMatrix">
-	<proto>
-		<return type="void"/>
-		<param name="location" type="GLint"/>
-		<param name="count" type="GLsizei"/>
-		<param name="transpose" type="GLboolean"/>
-		<vector name="value" type="const GLtype *" size="dynamic"/>
-	</proto>
-</template>
-
-<template name="ValidateProgram">
-	<proto>
-		<return type="void"/>
-		<param name="program" type="GLuint"/>
-	</proto>
-</template>
-
-<template name="GenerateMipmap">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-	</proto>
-</template>
-
-<template name="BindFramebuffer">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="framebuffer" type="GLuint"/>
-	</proto>
-</template>
-
-<template name="DeleteFramebuffers">
-	<proto>
-		<return type="void"/>
-		<param name="n" type="GLsizei"/>
-		<param name="framebuffers" type="const GLuint *"/>
-	</proto>
-</template>
-
-<template name="GenFramebuffers">
-	<proto>
-		<return type="void"/>
-		<param name="n" type="GLsizei"/>
-		<param name="ids" type="GLuint *"/>
-	</proto>
-</template>
-
-<template name="BindRenderbuffer">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="renderbuffer" type="GLuint"/>
-	</proto>
-</template>
-
-<template name="DeleteRenderbuffers">
-	<proto>
-		<return type="void"/>
-		<param name="n" type="GLsizei"/>
-		<param name="renderbuffers" type="const GLuint *"/>
-	</proto>
-</template>
-
-<template name="GenRenderbuffers">
-	<proto>
-		<return type="void"/>
-		<param name="n" type="GLsizei"/>
-		<param name="renderbuffers" type="GLuint *"/>
-	</proto>
-</template>
-
-<template name="RenderbufferStorage">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="internalFormat" type="GLenum"/>
-		<param name="width" type="GLsizei"/>
-		<param name="height" type="GLsizei"/>
-	</proto>
-</template>
-
-<template name="FramebufferRenderbuffer">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="attachment" type="GLenum"/>
-		<param name="renderbuffertarget" type="GLenum"/>
-		<param name="renderbuffer" type="GLuint"/>
-	</proto>
-</template>
-
-<template name="FramebufferTexture2D">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="attachment" type="GLenum"/>
-		<param name="textarget" type="GLenum"/>
-		<param name="texture" type="GLuint"/>
-		<param name="level" type="GLint"/>
-	</proto>
-	<!-- According to the base specification, "level" must be 0.  But
-	     extension GL_OES_fbo_render_mipmap lifts that restriction,
-	     so no restriction is placed here. -->
-</template>
-
-<template name="FramebufferTexture3D">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="attachment" type="GLenum"/>
-		<param name="textarget" type="GLenum"/>
-		<param name="texture" type="GLuint"/>
-		<param name="level" type="GLint"/>
-		<param name="zoffset" type="GLint"/>
-	</proto>
-</template>
-
-<template name="CheckFramebufferStatus" direction="get">
-	<proto>
-		<return type="GLenum"/>
-		<param name="target" type="GLenum"/>
-	</proto>
-</template>
-
-<template name="GetFramebufferAttachmentParameter" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="attachment" type="GLenum"/>
-		<param name="pname" type="GLenum"/>
-		<vector name="params" type="GLtype *" size="dynamic"/>
-	</proto>
-</template>
-
-<template name="GetRenderbufferParameter" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="pname" type="GLenum"/>
-		<vector name="params" type="GLtype *" size="dynamic"/>
-	</proto>
-</template>
-
-<template name="IsRenderbuffer" direction="get">
-	<proto>
-		<return type="GLboolean"/>
-		<param name="renderbuffer" type="GLuint"/>
-	</proto>
-</template>
-
-<template name="IsFramebuffer" direction="get">
-	<proto>
-		<return type="GLboolean"/>
-		<param name="framebuffer" type="GLuint"/>
-	</proto>
-</template>
-
-<template name="IsShader" direction="get">
-	<proto>
-		<return type="GLboolean"/>
-		<param name="shader" type="GLuint"/>
-	</proto>
-</template>
-
-<template name="GetShader" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="shader" type="GLuint"/>
-		<param name="pname" type="GLenum"/>
-		<vector name="params" type="GLtype *" size="dynamic"/>
-	</proto>
-</template>
-
-<template name="GetAttachedShaders" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="program" type="GLuint"/>
-		<param name="maxCount" type="GLsizei"/>
-		<param name="count" type="GLsizei *"/>
-		<param name="shaders" type="GLuint *"/>
-	</proto>
-</template>
-
-<template name="GetShaderInfoLog" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="shader" type="GLuint"/>
-		<param name="bufSize" type="GLsizei"/>
-		<param name="length" type="GLsizei *"/>
-		<param name="infoLog" type="GLchar *"/>
-	</proto>
-</template>
-
-<template name="GetProgramInfoLog" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="program" type="GLuint"/>
-		<param name="bufSize" type="GLsizei"/>
-		<param name="length" type="GLsizei *"/>
-		<param name="infoLog" type="GLchar *"/>
-	</proto>
-</template>
-
-<template name="GetShaderSource" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="shader" type="GLuint"/>
-		<param name="bufSize" type="GLsizei"/>
-		<param name="length" type="GLsizei *"/>
-		<param name="source" type="GLchar *"/>
-	</proto>
-</template>
-
-<template name="GetShaderPrecisionFormat" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="shadertype" type="GLenum"/>
-		<param name="precisiontype" type="GLenum"/>
-		<param name="range" type="GLint *"/>
-		<param name="precision" type="GLint *"/>
-	</proto>
-</template>
-
-<template name="GetUniform" direction="get">
-	<proto>
-		<return type="void"/>
-		<param name="program" type="GLuint"/>
-		<param name="location" type="GLint"/>
-		<vector name="params" type="GLtype *" size="dynamic"/>
-	</proto>
-</template>
-
-<template name="QueryMatrix" direction="get">
-	<proto>
-		<return type="GLbitfield"/>
-		<vector name="mantissa" type="GLtype *" size="16"/>
-		<vector name="exponent" type="GLint *" size="16"/>
-	</proto>
-</template>
-
-<template name="DrawTex">
-	<proto>
-		<return type="void"/>
-		<vector name="coords" type="const GLtype *" size="5">
-			<param name="x" type="GLtype"/>
-			<param name="y" type="GLtype"/>
-			<param name="z" type="GLtype"/>
-			<param name="w" type="GLtype"/>
-			<param name="h" type="GLtype"/>
-		</vector>
-	</proto>
-</template>
-
-<template name="MultiDrawArrays">
-	<proto>
-		<return type="void"/>
-		<param name="mode" type="GLenum"/>
-		<param name="first" type="const GLint *"/>
-		<param name="count" type="const GLsizei *"/>
-		<param name="primcount" type="GLsizei"/>
-	</proto>
-</template>
-
-<template name="MultiDrawElements">
-	<proto>
-		<return type="void"/>
-		<param name="mode" type="GLenum"/>
-		<param name="count" type="const GLsizei *"/>
-		<param name="type" type="GLenum"/>
-		<param name="indices" type="const GLvoid **"/>
-		<param name="primcount" type="GLsizei"/>
-	</proto>
-</template>
-
-<template name="EGLImageTargetTexture2D">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="image" type="GLeglImageOES"/>
-	</proto>
-</template>
-
-<template name="EGLImageTargetRenderbufferStorage">
-	<proto>
-		<return type="void"/>
-		<param name="target" type="GLenum"/>
-		<param name="image" type="GLeglImageOES"/>
-	</proto>
-</template>
-
-<template name="DrawBuffers">
-	<proto>
-		<return type="void"/>
-		<param name="n" type="GLsizei"/>
-		<param name="bufs" type="const GLenum *"/>
-	</proto>
-</template>
-
-<template name="ReadBuffer">
-	<proto>
-		<return type="void"/>
-		<param name="mode" type="GLenum"/>
-	</proto>
-</template>
-
-<api name="mesa" implementation="true">
-	<category name="MESA"/>
-
-	<function name="Color4f"  default_prefix="_es_" template="Color" gltype="GLfloat" vector_size="4" expand_vector="true"/>
-	<function name="ClipPlane" template="ClipPlane" gltype="GLdouble"/>
-	<function name="CullFace" template="CullFace"/>
-
-	<function name="Fogf" template="Fog" gltype="GLfloat" expand_vector="true"/>
-	<function name="Fogfv" template="Fog" gltype="GLfloat"/>
-
-	<function name="FrontFace" template="FrontFace"/>
-	<function name="Hint" template="Hint"/>
-
-	<function name="Lightf" template="Light" gltype="GLfloat" expand_vector="true"/>
-	<function name="Lightfv" template="Light" gltype="GLfloat"/>
-
-	<function name="LightModelf" template="LightModel" gltype="GLfloat" expand_vector="true"/>
-	<function name="LightModelfv" template="LightModel" gltype="GLfloat"/>
-
-	<function name="LineWidth" template="LineWidth" gltype="GLfloat"/>
-
-	<function name="Materialf" default_prefix="_es_" template="Material" gltype="GLfloat" expand_vector="true"/>
-	<function name="Materialfv" default_prefix="_es_" template="Material" gltype="GLfloat"/>
-
-	<function name="PointSize" template="PointSize" gltype="GLfloat"/>
-	<function name="PointSizePointer" template="PointSizePointer"/>
-
-	<function name="Scissor" template="Scissor"/>
-	<function name="ShadeModel" template="ShadeModel"/>
-
-	<function name="TexParameterf" template="TexParameter" gltype="GLfloat" expand_vector="true"/>
-	<function name="TexParameterfv" template="TexParameter" gltype="GLfloat"/>
-	<function name="TexParameteri" template="TexParameter" gltype="GLint" expand_vector="true"/>
-	<function name="TexParameteriv" template="TexParameter" gltype="GLint"/>
-
-	<function name="TexImage2D" template="TexImage2D"/>
-
-	<function name="TexEnvf" template="TexEnv" gltype="GLfloat" expand_vector="true"/>
-	<function name="TexEnvi" template="TexEnv" gltype="GLint" expand_vector="true"/>
-	<function name="TexEnvfv" template="TexEnv" gltype="GLfloat"/>
-	<function name="TexEnviv" template="TexEnv" gltype="GLint"/>
-
-	<function name="TexGenf" template="TexGen" gltype="GLfloat" expand_vector="true"/>
-	<function name="TexGenfv" template="TexGen" gltype="GLfloat"/>
-
-	<function name="Clear" template="Clear"/>
-	<function name="ClearColor" template="ClearColor" gltype="GLclampf"/>
-	<function name="ClearStencil" template="ClearStencil"/>
-	<function name="ClearDepth" template="ClearDepth" gltype="GLclampd"/>
-	<function name="ClearDepthf" template="ClearDepth" gltype="GLclampf"/>
-
-	<function name="StencilMask" template="StencilMask"/>
-	<function name="StencilMaskSeparate" template="StencilMaskSeparate"/>
-	<function name="ColorMask" template="ColorMask"/>
-	<function name="DepthMask" template="DepthMask"/>
-	<function name="Disable" template="Disable"/>
-	<function name="Enable" template="Enable"/>
-	<function name="Finish" template="Finish"/>
-	<function name="Flush" template="Flush"/>
-
-	<function name="AlphaFunc" template="AlphaFunc" gltype="GLclampf"/>
-
-	<function name="BlendFunc" template="BlendFunc"/>
-	<function name="LogicOp" template="LogicOp"/>
-	<function name="StencilFunc" template="StencilFunc"/>
-	<function name="StencilFuncSeparate" template="StencilFuncSeparate"/>
-	<function name="StencilOp" template="StencilOp"/>
-	<function name="StencilOpSeparate" template="StencilOpSeparate"/>
-	<function name="DepthFunc" template="DepthFunc"/>
-	<function name="PixelStorei" template="PixelStore" gltype="GLint"/>
-
-	<function name="ReadPixels" template="ReadPixels"/>
-	<function name="GetBooleanv" template="GetState" gltype="GLboolean"/>
-	<function name="GetClipPlane" template="GetClipPlane" gltype="GLdouble"/>
-	<function name="GetError" template="GetError"/>
-	<function name="GetFloatv" template="GetState" gltype="GLfloat"/>
-	<function name="GetFixedv" template="GetState" gltype="GLfixed"/>
-	<function name="GetIntegerv" template="GetState" gltype="GLint"/>
-
-	<function name="GetLightfv" template="GetLight" gltype="GLfloat"/>
-	<function name="GetMaterialfv" template="GetMaterial" gltype="GLfloat"/>
-	<function name="GetMaterialiv" template="GetMaterial" gltype="GLint"/>
-
-	<function name="GetString" template="GetString"/>
-
-	<function name="GetTexEnvfv" template="GetTexEnv" gltype="GLfloat"/>
-	<function name="GetTexEnviv" template="GetTexEnv" gltype="GLint"/>
-	<function name="GetTexGenfv" template="GetTexGen" gltype="GLfloat"/>
-	<function name="GetTexParameterfv" template="GetTexParameter" gltype="GLfloat"/>
-	<function name="GetTexParameteriv" template="GetTexParameter" gltype="GLint"/>
-
-	<function name="IsEnabled" template="IsEnabled"/>
-
-	<function name="DepthRange" template="DepthRange" gltype="GLclampd"/>
-	<function name="DepthRangef" template="DepthRange" gltype="GLclampf"/>
-	<function name="Frustum" template="Frustum" gltype="GLdouble"/>
-
-	<function name="LoadIdentity" template="LoadIdentity"/>
-	<function name="LoadMatrixf" template="LoadMatrix" gltype="GLfloat"/>
-	<function name="MatrixMode" template="MatrixMode"/>
-
-	<function name="MultMatrixf" template="MultMatrix" gltype="GLfloat"/>
-	<function name="Ortho" template="Ortho" gltype="GLdouble"/>
-	<function name="PopMatrix" template="PopMatrix"/>
-	<function name="PushMatrix" template="PushMatrix"/>
-
-	<function name="Rotatef" template="Rotate" gltype="GLfloat"/>
-	<function name="Scalef" template="Scale" gltype="GLfloat"/>
-	<function name="Translatef" template="Translate" gltype="GLfloat"/>
-
-	<function name="Viewport" template="Viewport"/>
-
-	<function name="ColorPointer" template="ColorPointer"/>
-	<function name="DisableClientState" template="DisableClientState"/>
-	<function name="DrawArrays" template="DrawArrays"/>
-	<function name="DrawElements" template="DrawElements"/>
-	<function name="EnableClientState" template="EnableClientState"/>
-
-	<function name="GetPointerv" template="GetPointer"/>
-	<function name="Normal3f" default_prefix="_es_" template="Normal" gltype="GLfloat" expand_vector="true"/>
-	<function name="NormalPointer" template="NormalPointer"/>
-	<function name="TexCoordPointer" template="TexCoordPointer"/>
-	<function name="VertexPointer" template="VertexPointer"/>
-
-	<function name="PolygonOffset" template="PolygonOffset" gltype="GLfloat"/>
-	<function name="CopyTexImage2D" template="CopyTexImage2D"/>
-	<function name="CopyTexSubImage2D" template="CopyTexSubImage2D"/>
-	<function name="TexSubImage2D" template="TexSubImage2D"/>
-
-	<function name="BindTexture" template="BindTexture"/>
-	<function name="DeleteTextures" template="DeleteTextures"/>
-	<function name="GenTextures" template="GenTextures"/>
-	<function name="IsTexture" template="IsTexture"/>
-
-	<function name="BlendColor" template="BlendColor" gltype="GLclampf"/>
-	<function name="BlendEquation" template="BlendEquation"/>
-	<function name="BlendEquationSeparateEXT" template="BlendEquationSeparate"/>
-
-	<function name="TexImage3D" template="TexImage3D"/>
-	<function name="TexSubImage3D" template="TexSubImage3D"/>
-	<function name="CopyTexSubImage3D" template="CopyTexSubImage3D"/>
-
-	<function name="CompressedTexImage3DARB" template="CompressedTexImage3D"/>
-	<function name="CompressedTexSubImage3DARB" template="CompressedTexSubImage3D"/>
-
-	<function name="ActiveTextureARB" template="ActiveTexture"/>
-	<function name="ClientActiveTextureARB" template="ClientActiveTexture"/>
-
-	<function name="MultiTexCoord4f" default_prefix="_es_" template="MultiTexCoord" gltype="GLfloat" vector_size="4" expand_vector="true"/>
-
-	<function name="SampleCoverageARB" template="SampleCoverage" gltype="GLclampf"/>
-
-	<function name="CompressedTexImage2DARB" template="CompressedTexImage2D"/>
-	<function name="CompressedTexSubImage2DARB" template="CompressedTexSubImage2D"/>
-
-	<function name="BlendFuncSeparateEXT" template="BlendFuncSeparate"/>
-
-	<function name="PointParameterf" template="PointParameter" gltype="GLfloat" expand_vector="true"/>
-	<function name="PointParameterfv" template="PointParameter" gltype="GLfloat"/>
-
-	<function name="VertexAttrib1f" default_prefix="_es_" template="VertexAttrib" gltype="GLfloat" vector_size="1" expand_vector="true"/>
-	<function name="VertexAttrib2f" default_prefix="_es_" template="VertexAttrib" gltype="GLfloat" vector_size="2" expand_vector="true"/>
-	<function name="VertexAttrib3f" default_prefix="_es_" template="VertexAttrib" gltype="GLfloat" vector_size="3" expand_vector="true"/>
-	<function name="VertexAttrib4f" default_prefix="_es_" template="VertexAttrib" gltype="GLfloat" vector_size="4" expand_vector="true"/>
-	<function name="VertexAttrib1fv" default_prefix="_es_" template="VertexAttrib" gltype="GLfloat" vector_size="1"/>
-	<function name="VertexAttrib2fv" default_prefix="_es_" template="VertexAttrib" gltype="GLfloat" vector_size="2"/>
-	<function name="VertexAttrib3fv" default_prefix="_es_" template="VertexAttrib" gltype="GLfloat" vector_size="3"/>
-	<function name="VertexAttrib4fv" default_prefix="_es_" template="VertexAttrib" gltype="GLfloat" vector_size="4"/>
-
-	<function name="VertexAttribPointerARB" template="VertexAttribPointer"/>
-	<function name="EnableVertexAttribArrayARB" template="EnableVertexAttribArray"/>
-	<function name="DisableVertexAttribArrayARB" template="DisableVertexAttribArray"/>
-
-	<function name="IsProgram" template="IsProgram"/>
-	<function name="GetProgramiv" template="GetProgram" gltype="GLint"/>
-
-	<function name="GetVertexAttribfvARB" template="GetVertexAttrib" gltype="GLfloat"/>
-	<function name="GetVertexAttribivARB" template="GetVertexAttrib" gltype="GLint"/>
-	<function name="GetVertexAttribPointervARB" template="GetVertexAttribPointer"/>
-
-	<function name="GetBufferPointervARB" template="GetBufferPointer"/>
-	<function name="MapBufferARB" template="MapBuffer"/>
-	<function name="UnmapBufferARB" template="UnmapBuffer"/>
-	<function name="BindBufferARB" template="BindBuffer"/>
-	<function name="BufferDataARB" template="BufferData"/>
-	<function name="BufferSubDataARB" template="BufferSubData"/>
-	<function name="DeleteBuffersARB" template="DeleteBuffers"/>
-	<function name="GenBuffersARB" template="GenBuffers"/>
-	<function name="GetBufferParameterivARB" template="GetBufferParameter" gltype="GLint"/>
-	<function name="IsBufferARB" template="IsBuffer"/>
-
-	<function name="CreateShader" template="CreateShader"/>
-	<function name="ShaderSourceARB" template="ShaderSource"/>
-	<function name="CompileShaderARB" template="CompileShader"/>
-	<function name="ReleaseShaderCompiler" template="ReleaseShaderCompiler"/>
-	<function name="DeleteShader" template="DeleteShader"/>
-	<function name="ShaderBinary" template="ShaderBinary"/>
-	<function name="CreateProgram" template="CreateProgram"/>
-	<function name="AttachShader" template="AttachShader"/>
-	<function name="DetachShader" template="DetachShader"/>
-	<function name="LinkProgramARB" template="LinkProgram"/>
-	<function name="UseProgramObjectARB" template="UseProgram"/>
-	<function name="DeleteProgram" template="DeleteProgram"/>
-
-	<function name="GetActiveAttribARB" template="GetActiveAttrib"/>
-	<function name="GetAttribLocationARB" template="GetAttribLocation"/>
-	<function name="BindAttribLocationARB" template="BindAttribLocation"/>
-	<function name="GetUniformLocationARB" template="GetUniformLocation"/>
-	<function name="GetActiveUniformARB" template="GetActiveUniform"/>
-
-	<function name="Uniform1fARB" template="Uniform" gltype="GLfloat" vector_size="1" expand_vector="true"/>
-	<function name="Uniform2fARB" template="Uniform" gltype="GLfloat" vector_size="2" expand_vector="true"/>
-	<function name="Uniform3fARB" template="Uniform" gltype="GLfloat" vector_size="3" expand_vector="true"/>
-	<function name="Uniform4fARB" template="Uniform" gltype="GLfloat" vector_size="4" expand_vector="true"/>
-	<function name="Uniform1iARB" template="Uniform" gltype="GLint" vector_size="1" expand_vector="true"/>
-	<function name="Uniform2iARB" template="Uniform" gltype="GLint" vector_size="2" expand_vector="true"/>
-	<function name="Uniform3iARB" template="Uniform" gltype="GLint" vector_size="3" expand_vector="true"/>
-	<function name="Uniform4iARB" template="Uniform" gltype="GLint" vector_size="4" expand_vector="true"/>
-	<function name="Uniform1fvARB" template="Uniform" gltype="GLfloat" vector_size="1"/>
-	<function name="Uniform2fvARB" template="Uniform" gltype="GLfloat" vector_size="2"/>
-	<function name="Uniform3fvARB" template="Uniform" gltype="GLfloat" vector_size="3"/>
-	<function name="Uniform4fvARB" template="Uniform" gltype="GLfloat" vector_size="4"/>
-	<function name="Uniform1ivARB" template="Uniform" gltype="GLint" vector_size="1"/>
-	<function name="Uniform2ivARB" template="Uniform" gltype="GLint" vector_size="2"/>
-	<function name="Uniform3ivARB" template="Uniform" gltype="GLint" vector_size="3"/>
-	<function name="Uniform4ivARB" template="Uniform" gltype="GLint" vector_size="4"/>
-
-	<function name="UniformMatrix2fvARB" template="UniformMatrix" gltype="GLfloat" vector_size="2"/>
-	<function name="UniformMatrix3fvARB" template="UniformMatrix" gltype="GLfloat" vector_size="3"/>
-	<function name="UniformMatrix4fvARB" template="UniformMatrix" gltype="GLfloat" vector_size="4"/>
-
-	<function name="ValidateProgramARB" template="ValidateProgram"/>
-
-	<function name="GenerateMipmapEXT" template="GenerateMipmap"/>
-	<function name="BindFramebufferEXT" template="BindFramebuffer"/>
-	<function name="DeleteFramebuffersEXT" template="DeleteFramebuffers"/>
-	<function name="GenFramebuffersEXT" template="GenFramebuffers"/>
-	<function name="BindRenderbufferEXT" template="BindRenderbuffer"/>
-	<function name="DeleteRenderbuffersEXT" template="DeleteRenderbuffers"/>
-	<function name="GenRenderbuffersEXT" template="GenRenderbuffers"/>
-	<function name="RenderbufferStorageEXT" template="RenderbufferStorage"/>
-	<function name="FramebufferRenderbufferEXT" template="FramebufferRenderbuffer"/>
-	<function name="FramebufferTexture2DEXT" template="FramebufferTexture2D"/>
-	<function name="FramebufferTexture3DEXT" template="FramebufferTexture3D"/>
-	<function name="CheckFramebufferStatusEXT" template="CheckFramebufferStatus"/>
-	<function name="GetFramebufferAttachmentParameterivEXT" template="GetFramebufferAttachmentParameter" gltype="GLint"/>
-	<function name="GetRenderbufferParameterivEXT" template="GetRenderbufferParameter" gltype="GLint"/>
-	<function name="IsRenderbufferEXT" template="IsRenderbuffer"/>
-	<function name="IsFramebufferEXT" template="IsFramebuffer"/>
-
-	<function name="IsShader" template="IsShader"/>
-	<function name="GetShaderiv" template="GetShader" gltype="GLint"/>
-	<function name="GetAttachedShaders" template="GetAttachedShaders"/>
-	<function name="GetShaderInfoLog" template="GetShaderInfoLog"/>
-	<function name="GetProgramInfoLog" template="GetProgramInfoLog"/>
-	<function name="GetShaderSourceARB" template="GetShaderSource"/>
-	<function name="GetShaderPrecisionFormat" template="GetShaderPrecisionFormat"/>
-	<function name="GetUniformfvARB" template="GetUniform" gltype="GLfloat"/>
-	<function name="GetUniformivARB" template="GetUniform" gltype="GLint"/>
-
-	<function name="DrawTexf" template="DrawTex" gltype="GLfloat" expand_vector="true"/>
-	<function name="DrawTexfv" template="DrawTex" gltype="GLfloat"/>
-	<function name="DrawTexi" template="DrawTex" gltype="GLint" expand_vector="true"/>
-	<function name="DrawTexiv" template="DrawTex" gltype="GLint"/>
-	<function name="DrawTexs" template="DrawTex" gltype="GLshort" expand_vector="true"/>
-	<function name="DrawTexsv" template="DrawTex" gltype="GLshort"/>
-
-        <!-- EXT_multi_draw_arrays -->
-        <function name="MultiDrawArraysEXT" template="MultiDrawArrays"/>
-        <function name="MultiDrawElementsEXT" template="MultiDrawElements"/>
-
-        <!-- OES_EGL_image -->
-        <function name="EGLImageTargetTexture2DOES" template="EGLImageTargetTexture2D"/>
-        <function name="EGLImageTargetRenderbufferStorageOES" template="EGLImageTargetRenderbufferStorage"/>
-
-	<function name="DrawBuffersARB" template="DrawBuffers"/>
-
-	<function name="ReadBuffer" template="ReadBuffer"/>
-
-</api>
-
-<api name="GLES1.1">
-	<category name="GLES1.1"/>
-
-	<category name="OES_byte_coordinates"/>
-	<category name="OES_fixed_point"/>
-	<category name="OES_single_precision"/>
-	<category name="OES_matrix_get"/>
-	<category name="OES_read_format"/>
-	<category name="OES_compressed_paletted_texture"/>
-	<category name="OES_compressed_ETC1_RGB8_texture"/>
-	<category name="OES_point_size_array"/>
-	<category name="OES_point_sprite"/>
-	<category name="OES_query_matrix"/>
-	<category name="OES_draw_texture"/>
-	<category name="OES_blend_equation_separate"/>
-	<category name="OES_blend_func_separate"/>
-	<category name="OES_blend_subtract"/>
-	<category name="OES_stencil_wrap"/>
-	<category name="OES_texture_cube_map"/>
-	<category name="OES_texture_env_crossbar"/>
-	<category name="OES_texture_mirrored_repeat"/>
-	<category name="OES_framebuffer_object"/>
-	<category name="OES_depth24"/>
-	<category name="OES_depth32"/>
-	<category name="OES_fbo_render_mipmap"/>
-	<category name="OES_rgb8_rgba8"/>
-	<category name="OES_stencil1"/>
-	<category name="OES_stencil4"/>
-	<category name="OES_stencil8"/>
-	<category name="OES_element_index_uint"/>
-	<category name="OES_mapbuffer"/>
-	<category name="EXT_texture_filter_anisotropic"/>
-	<category name="EXT_texture_format_BGRA8888"/>
-	<category name="EXT_read_format_bgra"/>
-
-	<category name="ARB_texture_non_power_of_two"/>
-	<!-- disabled due to missing enums
-	<category name="EXT_texture_compression_dxt1"/>
-	-->
-	<category name="EXT_texture_lod_bias"/>
-	<category name="EXT_blend_minmax"/>
-	<category name="EXT_multi_draw_arrays"/>
-	<category name="OES_EGL_image"/>
-	<category name="OES_EGL_image_external"/>
-
-	<category name="OES_matrix_palette"/>
-
-	<function name="Color4f" external="true" template="Color" gltype="GLfloat" vector_size="4" expand_vector="true"/>
-	<function name="Color4ub" template="Color" gltype="GLubyte" vector_size="4" expand_vector="true"/>
-	<function name="Color4x" template="Color" gltype="GLfixed" vector_size="4" expand_vector="true"/>
-
-	<function name="ClipPlanef" template="ClipPlane" gltype="GLfloat"/>
-	<function name="ClipPlanex" template="ClipPlane" gltype="GLfixed"/>
-
-	<function name="CullFace" template="CullFace"/>
-
-	<function name="Fogf" template="Fog" gltype="GLfloat" expand_vector="true"/>
-	<function name="Fogx" template="Fog" gltype="GLfixed" expand_vector="true"/>
-	<function name="Fogfv" template="Fog" gltype="GLfloat"/>
-	<function name="Fogxv" template="Fog" gltype="GLfixed"/>
-
-	<function name="FrontFace" template="FrontFace"/>
-	<function name="Hint" template="Hint"/>
-
-	<function name="Lightf" template="Light" gltype="GLfloat" expand_vector="true"/>
-	<function name="Lightx" template="Light" gltype="GLfixed" expand_vector="true"/>
-	<function name="Lightfv" template="Light" gltype="GLfloat"/>
-	<function name="Lightxv" template="Light" gltype="GLfixed"/>
-
-	<function name="LightModelf" template="LightModel" gltype="GLfloat" expand_vector="true"/>
-	<function name="LightModelx" template="LightModel" gltype="GLfixed" expand_vector="true"/>
-	<function name="LightModelfv" template="LightModel" gltype="GLfloat"/>
-	<function name="LightModelxv" template="LightModel" gltype="GLfixed"/>
-
-	<function name="LineWidth" template="LineWidth" gltype="GLfloat"/>
-	<function name="LineWidthx" template="LineWidth" gltype="GLfixed"/>
-
-	<function name="Materialf" external="true" template="Material" gltype="GLfloat" expand_vector="true"/>
-	<function name="Materialfv" external="true" template="Material" gltype="GLfloat"/>
-	<function name="Materialx" template="Material" gltype="GLfixed" expand_vector="true"/>
-	<function name="Materialxv" template="Material" gltype="GLfixed"/>
-
-	<function name="PointSize" template="PointSize" gltype="GLfloat"/>
-	<function name="PointSizex" template="PointSize" gltype="GLfixed"/>
-	<function name="PointSizePointerOES" template="PointSizePointer"/>
-
-	<function name="Scissor" template="Scissor"/>
-	<function name="ShadeModel" template="ShadeModel"/>
-
-	<function name="TexParameterf" template="TexParameter" gltype="GLfloat" expand_vector="true"/>
-	<function name="TexParameterfv" template="TexParameter" gltype="GLfloat"/>
-	<function name="TexParameteri" template="TexParameter" gltype="GLint" expand_vector="true"/>
-	<function name="TexParameteriv" template="TexParameter" gltype="GLint"/>
-	<function name="TexParameterx" template="TexParameter" gltype="GLfixed" expand_vector="true"/>
-	<function name="TexParameterxv" template="TexParameter" gltype="GLfixed"/>
-
-	<function name="TexImage2D" template="TexImage2D"/>
-
-	<function name="TexEnvf" template="TexEnv" gltype="GLfloat" expand_vector="true"/>
-	<function name="TexEnvfv" template="TexEnv" gltype="GLfloat"/>
-	<function name="TexEnvi" template="TexEnv" gltype="GLint" expand_vector="true"/>
-	<function name="TexEnviv" template="TexEnv" gltype="GLint"/>
-	<function name="TexEnvx" template="TexEnv" gltype="GLfixed" expand_vector="true"/>
-	<function name="TexEnvxv" template="TexEnv" gltype="GLfixed"/>
-
-	<function name="TexGenfOES" external="true" template="TexGen" gltype="GLfloat" expand_vector="true"/>
-	<function name="TexGenfvOES" external="true" template="TexGen" gltype="GLfloat"/>
-	<function name="TexGeniOES" external="true" template="TexGen" gltype="GLint" expand_vector="true"/>
-	<function name="TexGenivOES" external="true" template="TexGen" gltype="GLint"/>
-	<function name="TexGenxOES" external="true" template="TexGen" gltype="GLfixed" expand_vector="true"/>
-	<function name="TexGenxvOES" external="true" template="TexGen" gltype="GLfixed"/>
-
-	<function name="Clear" template="Clear"/>
-	<function name="ClearColor" template="ClearColor" gltype="GLclampf"/>
-	<function name="ClearColorx" template="ClearColor" gltype="GLclampx"/>
-
-	<function name="ClearStencil" template="ClearStencil"/>
-	<function name="ClearDepthf" template="ClearDepth" gltype="GLclampf"/>
-	<function name="ClearDepthx" template="ClearDepth" gltype="GLclampx"/>
-
-	<function name="StencilMask" template="StencilMask"/>
-	<function name="ColorMask" template="ColorMask"/>
-	<function name="DepthMask" template="DepthMask"/>
-
-	<function name="Disable" template="Disable"/>
-	<function name="Enable" template="Enable"/>
-	<function name="Finish" template="Finish"/>
-	<function name="Flush" template="Flush"/>
-
-	<function name="AlphaFunc" template="AlphaFunc" gltype="GLclampf"/>
-	<function name="AlphaFuncx" template="AlphaFunc" gltype="GLclampx"/>
-
-	<function name="BlendFunc" template="BlendFunc"/>
-	<function name="LogicOp" template="LogicOp"/>
-	<function name="StencilFunc" template="StencilFunc"/>
-
-	<function name="StencilOp" template="StencilOp"/>
-	<function name="DepthFunc" template="DepthFunc"/>
-
-	<function name="PixelStorei" template="PixelStore" gltype="GLint"/>
-	<function name="ReadPixels" template="ReadPixels"/>
-
-	<function name="GetBooleanv" template="GetState" gltype="GLboolean"/>
-
-	<function name="GetClipPlanef" template="GetClipPlane" gltype="GLfloat"/>
-	<function name="GetClipPlanex" template="GetClipPlane" gltype="GLfixed"/>
-
-	<function name="GetError" template="GetError"/>
-	<function name="GetFloatv" template="GetState" gltype="GLfloat"/>
-	<function name="GetFixedv" template="GetState" gltype="GLfixed"/>
-	<function name="GetIntegerv" template="GetState" gltype="GLint"/>
-
-	<function name="GetLightfv" template="GetLight" gltype="GLfloat"/>
-	<function name="GetLightxv" template="GetLight" gltype="GLfixed"/>
-
-	<function name="GetMaterialfv" template="GetMaterial" gltype="GLfloat"/>
-	<function name="GetMaterialxv" template="GetMaterial" gltype="GLfixed"/>
-
-	<function name="GetString" template="GetString"/>
-
-	<function name="GetTexEnvfv" template="GetTexEnv" gltype="GLfloat"/>
-	<function name="GetTexEnviv" template="GetTexEnv" gltype="GLint"/>
-	<function name="GetTexEnvxv" template="GetTexEnv" gltype="GLfixed"/>
-
-	<function name="GetTexGenfvOES" external="true" template="GetTexGen" gltype="GLfloat"/>
-	<function name="GetTexGenivOES" external="true" template="GetTexGen" gltype="GLint"/>
-	<function name="GetTexGenxvOES" external="true" template="GetTexGen" gltype="GLfixed"/>
-
-	<function name="GetTexParameterfv" template="GetTexParameter" gltype="GLfloat"/>
-	<function name="GetTexParameteriv" template="GetTexParameter" gltype="GLint"/>
-	<function name="GetTexParameterxv" template="GetTexParameter" gltype="GLfixed"/>
-
-	<function name="IsEnabled" template="IsEnabled"/>
-
-	<function name="DepthRangef" template="DepthRange" gltype="GLclampf"/>
-	<function name="DepthRangex" template="DepthRange" gltype="GLclampx"/>
-
-	<function name="Frustumf" template="Frustum" gltype="GLfloat"/>
-	<function name="Frustumx" template="Frustum" gltype="GLfixed"/>
-
-	<function name="LoadIdentity" template="LoadIdentity"/>
-	<function name="LoadMatrixf" template="LoadMatrix" gltype="GLfloat"/>
-	<function name="LoadMatrixx" template="LoadMatrix" gltype="GLfixed"/>
-	<function name="MatrixMode" template="MatrixMode"/>
-
-	<function name="MultMatrixf" template="MultMatrix" gltype="GLfloat"/>
-	<function name="MultMatrixx" template="MultMatrix" gltype="GLfixed"/>
-	<function name="Orthof" template="Ortho" gltype="GLfloat"/>
-	<function name="Orthox" template="Ortho" gltype="GLfixed"/>
-
-	<function name="PopMatrix" template="PopMatrix"/>
-	<function name="PushMatrix" template="PushMatrix"/>
-
-	<function name="Rotatef" template="Rotate" gltype="GLfloat"/>
-	<function name="Rotatex" template="Rotate" gltype="GLfixed"/>
-	<function name="Scalef" template="Scale" gltype="GLfloat"/>
-	<function name="Scalex" template="Scale" gltype="GLfixed"/>
-	<function name="Translatef" template="Translate" gltype="GLfloat"/>
-	<function name="Translatex" template="Translate" gltype="GLfixed"/>
-
-	<function name="Viewport" template="Viewport"/>
-	<function name="ColorPointer" template="ColorPointer"/>
-	<function name="DisableClientState" template="DisableClientState"/>
-	<function name="DrawArrays" template="DrawArrays"/>
-	<function name="DrawElements" template="DrawElements"/>
-	<function name="EnableClientState" template="EnableClientState"/>
-
-	<function name="GetPointerv" template="GetPointer"/>
-
-	<function name="Normal3f" external="true" template="Normal" gltype="GLfloat" expand_vector="true"/>
-	<function name="Normal3x" template="Normal" gltype="GLfixed" expand_vector="true"/>
-	<function name="NormalPointer" template="NormalPointer"/>
-	<function name="TexCoordPointer" template="TexCoordPointer"/>
-	<function name="VertexPointer" template="VertexPointer"/>
-
-	<function name="PolygonOffset" template="PolygonOffset" gltype="GLfloat"/>
-	<function name="PolygonOffsetx" template="PolygonOffset" gltype="GLfixed"/>
-
-	<function name="CopyTexImage2D" template="CopyTexImage2D"/>
-	<function name="CopyTexSubImage2D" template="CopyTexSubImage2D"/>
-
-	<function name="TexSubImage2D" template="TexSubImage2D"/>
-
-	<function name="BindTexture" template="BindTexture"/>
-	<function name="DeleteTextures" template="DeleteTextures"/>
-	<function name="GenTextures" template="GenTextures"/>
-	<function name="IsTexture" template="IsTexture"/>
-
-	<function name="BlendEquationOES" template="BlendEquation"/>
-	<function name="BlendEquationSeparateOES" template="BlendEquationSeparate"/>
-
-	<function name="MultiTexCoord4x" template="MultiTexCoord" gltype="GLfixed" vector_size="4" expand_vector="true"/>
-
-	<function name="ActiveTexture" template="ActiveTexture"/>
-	<function name="ClientActiveTexture" template="ClientActiveTexture"/>
-
-	<function name="MultiTexCoord4f" external="true" template="MultiTexCoord" gltype="GLfloat" vector_size="4" expand_vector="true"/>
-
-	<function name="SampleCoverage" template="SampleCoverage" gltype="GLclampf"/>
-	<function name="SampleCoveragex" template="SampleCoverage" gltype="GLclampx"/>
-
-	<!-- CompressedTexImage2D calls out to two different functions based on
-	     whether the image is a paletted image or not -->
-	<function name="CompressedTexImage2D" template="CompressedTexImage2D"/>
-	<function name="CompressedTexSubImage2D" template="CompressedTexSubImage2D"/>
-
-	<function name="BlendFuncSeparateOES" template="BlendFuncSeparate"/>
-
-	<function name="PointParameterf" template="PointParameter" gltype="GLfloat" expand_vector="true"/>
-	<function name="PointParameterfv" template="PointParameter" gltype="GLfloat"/>
-	<function name="PointParameterx" template="PointParameter" gltype="GLfixed" expand_vector="true"/>
-	<function name="PointParameterxv" template="PointParameter" gltype="GLfixed"/>
-
-	<!-- OES_mapbuffer -->
-	<function name="GetBufferPointervOES" template="GetBufferPointer"/>
-	<function name="MapBufferOES" template="MapBuffer"/>
-	<function name="UnmapBufferOES" template="UnmapBuffer"/>
-
-	<function name="BindBuffer" template="BindBuffer"/>
-	<function name="BufferData" template="BufferData"/>
-	<function name="BufferSubData" template="BufferSubData"/>
-	<function name="DeleteBuffers" template="DeleteBuffers"/>
-	<function name="GenBuffers" template="GenBuffers"/>
-	<function name="GetBufferParameteriv" template="GetBufferParameter" gltype="GLint"/>
-	<function name="IsBuffer" template="IsBuffer"/>
-
-	<!-- OES_framebuffer_object -->
-	<function name="GenerateMipmapOES" template="GenerateMipmap"/>
-	<function name="BindFramebufferOES" template="BindFramebuffer"/>
-	<function name="DeleteFramebuffersOES" template="DeleteFramebuffers"/>
-	<function name="GenFramebuffersOES" template="GenFramebuffers"/>
-	<function name="BindRenderbufferOES" template="BindRenderbuffer"/>
-	<function name="DeleteRenderbuffersOES" template="DeleteRenderbuffers"/>
-	<function name="GenRenderbuffersOES" template="GenRenderbuffers"/>
-	<function name="RenderbufferStorageOES" external="true" template="RenderbufferStorage"/>
-	<function name="FramebufferRenderbufferOES" template="FramebufferRenderbuffer"/>
-	<function name="FramebufferTexture2DOES" template="FramebufferTexture2D"/>
-	<function name="CheckFramebufferStatusOES" template="CheckFramebufferStatus"/>
-	<function name="GetFramebufferAttachmentParameterivOES" template="GetFramebufferAttachmentParameter" gltype="GLint"/>
-	<function name="GetRenderbufferParameterivOES" template="GetRenderbufferParameter" gltype="GLint"/>
-	<function name="IsRenderbufferOES" template="IsRenderbuffer"/>
-	<function name="IsFramebufferOES" template="IsFramebuffer"/>
-
-	<!-- OES_query_matrix -->
-	<!-- QueryMatrixx returns values in an unusual, decomposed, fixed-value
-	     form; it has its own code for this -->
-	<function name="QueryMatrixxOES" external="true" template="QueryMatrix" gltype="GLfixed"/>
-
-	<!-- OES_draw_texture -->
-	<function name="DrawTexfOES" template="DrawTex" gltype="GLfloat" expand_vector="true"/>
-	<function name="DrawTexiOES" template="DrawTex" gltype="GLint" expand_vector="true"/>
-	<function name="DrawTexsOES" template="DrawTex" gltype="GLshort" expand_vector="true"/>
-	<function name="DrawTexxOES" template="DrawTex" gltype="GLfixed" expand_vector="true"/>
-	<function name="DrawTexfvOES" template="DrawTex" gltype="GLfloat"/>
-	<function name="DrawTexivOES" template="DrawTex" gltype="GLint"/>
-	<function name="DrawTexsvOES" template="DrawTex" gltype="GLshort"/>
-	<function name="DrawTexxvOES" template="DrawTex" gltype="GLfixed"/>
-
-        <!-- EXT_multi_draw_arrays -->
-        <function name="MultiDrawArraysEXT" template="MultiDrawArrays"/>
-        <function name="MultiDrawElementsEXT" template="MultiDrawElements"/>
-
-        <!-- OES_EGL_image -->
-        <function name="EGLImageTargetTexture2DOES" template="EGLImageTargetTexture2D"/>
-        <function name="EGLImageTargetRenderbufferStorageOES" template="EGLImageTargetRenderbufferStorage"/>
-</api>
-
-<api name="GLES2.0">
-	<category name="GLES2.0"/>
-
-	<category name="OES_compressed_paletted_texture"/>
-	<category name="OES_compressed_ETC1_RGB8_texture"/>
-	<category name="OES_depth24"/>
-	<category name="OES_depth32"/>
-	<category name="OES_fbo_render_mipmap"/>
-	<category name="OES_rgb8_rgba8"/>
-	<category name="OES_stencil1"/>
-	<category name="OES_stencil4"/>
-	<category name="OES_element_index_uint"/>
-	<category name="OES_mapbuffer"/>
-	<category name="OES_texture_3D"/>
-	<category name="OES_texture_npot"/>
-	<category name="EXT_texture_filter_anisotropic"/>
-	<category name="EXT_texture_type_2_10_10_10_REV"/>
-	<category name="OES_depth_texture"/>
-	<category name="OES_packed_depth_stencil"/>
-	<category name="OES_standard_derivatives"/>
-	<category name="EXT_texture_format_BGRA8888"/>
-	<category name="EXT_texture_rg"/>
-	<category name="EXT_read_format_bgra"/>
-
-	<category name="EXT_texture_compression_dxt1"/>
-	<category name="EXT_blend_minmax"/>
-	<category name="EXT_multi_draw_arrays"/>
-	<category name="OES_EGL_image"/>
-	<category name="OES_EGL_image_external"/>
-        <category name="EXT_unpack_subimage"/>
-
-	<category name="NV_draw_buffers"/>
-	<category name="NV_read_buffer"/>
-
-	<!-- GL_ANGLE_texture_compression_dxt -->
-	<category name="ANGLE_texture_compression_dxt"/>
-
-	<function name="DrawBuffersNV" template="DrawBuffers"/>
-	<function name="ReadBufferNV" template="ReadBuffer"/> 
-
-	<function name="CullFace" template="CullFace"/>
-
-	<function name="FrontFace" template="FrontFace"/>
-	<function name="Hint" template="Hint"/>
-
-	<function name="LineWidth" template="LineWidth" gltype="GLfloat"/>
-
-	<function name="Scissor" template="Scissor"/>
-
-	<function name="TexParameterf" template="TexParameter" gltype="GLfloat" expand_vector="true"/>
-	<function name="TexParameterfv" template="TexParameter" gltype="GLfloat"/>
-	<function name="TexParameteri" template="TexParameter" gltype="GLint" expand_vector="true"/>
-	<function name="TexParameteriv" template="TexParameter" gltype="GLint"/>
-
-	<function name="TexImage2D" template="TexImage2D"/>
-
-	<function name="Clear" template="Clear"/>
-	<function name="ClearColor" template="ClearColor" gltype="GLclampf"/>
-	<function name="ClearStencil" template="ClearStencil"/>
-	<function name="ClearDepthf" template="ClearDepth" gltype="GLclampf"/>
-
-	<function name="StencilMask" template="StencilMask"/>
-	<function name="StencilMaskSeparate" template="StencilMaskSeparate"/>
-	<function name="ColorMask" template="ColorMask"/>
-	<function name="DepthMask" template="DepthMask"/>
-	<function name="Disable" template="Disable"/>
-	<function name="Enable" template="Enable"/>
-	<function name="Finish" template="Finish"/>
-	<function name="Flush" template="Flush"/>
-
-	<function name="BlendFunc" template="BlendFunc"/>
-
-	<function name="StencilFunc" template="StencilFunc"/>
-	<function name="StencilFuncSeparate" template="StencilFuncSeparate"/>
-	<function name="StencilOp" template="StencilOp"/>
-	<function name="StencilOpSeparate" template="StencilOpSeparate"/>
-
-	<function name="DepthFunc" template="DepthFunc"/>
-
-	<function name="PixelStorei" template="PixelStore" gltype="GLint"/>
-	<function name="ReadPixels" template="ReadPixels"/>
-
-	<function name="GetBooleanv" template="GetState" gltype="GLboolean"/>
-	<function name="GetError" template="GetError"/>
-	<function name="GetFloatv" template="GetState" gltype="GLfloat"/>
-	<function name="GetIntegerv" template="GetState" gltype="GLint"/>
-
-	<function name="GetString" template="GetString"/>
-
-	<function name="GetTexParameterfv" template="GetTexParameter" gltype="GLfloat"/>
-	<function name="GetTexParameteriv" template="GetTexParameter" gltype="GLint"/>
-
-	<function name="IsEnabled" template="IsEnabled"/>
-
-	<function name="DepthRangef" template="DepthRange" gltype="GLclampf"/>
-
-	<function name="Viewport" template="Viewport"/>
-
-	<function name="DrawArrays" template="DrawArrays"/>
-	<function name="DrawElements" template="DrawElements"/>
-
-	<function name="PolygonOffset" template="PolygonOffset" gltype="GLfloat"/>
-	<function name="CopyTexImage2D" template="CopyTexImage2D"/>
-	<function name="CopyTexSubImage2D" template="CopyTexSubImage2D"/>
-	<function name="TexSubImage2D" template="TexSubImage2D"/>
-
-	<function name="BindTexture" template="BindTexture"/>
-	<function name="DeleteTextures" template="DeleteTextures"/>
-	<function name="GenTextures" template="GenTextures"/>
-	<function name="IsTexture" template="IsTexture"/>
-
-	<function name="BlendColor" template="BlendColor" gltype="GLclampf"/>
-	<function name="BlendEquation" template="BlendEquation"/>
-	<function name="BlendEquationSeparate" template="BlendEquationSeparate"/>
-
-	<function name="TexImage3DOES" template="TexImage3D"/>
-	<function name="TexSubImage3DOES" template="TexSubImage3D"/>
-	<function name="CopyTexSubImage3DOES" template="CopyTexSubImage3D"/>
-
-	<function name="CompressedTexImage3DOES" template="CompressedTexImage3D"/>
-	<function name="CompressedTexSubImage3DOES" template="CompressedTexSubImage3D"/>
-
-	<function name="ActiveTexture" template="ActiveTexture"/>
-
-	<function name="SampleCoverage" template="SampleCoverage" gltype="GLclampf"/>
-
-	<function name="CompressedTexImage2D" template="CompressedTexImage2D"/>
-	<function name="CompressedTexSubImage2D" template="CompressedTexSubImage2D"/>
-
-	<function name="BlendFuncSeparate" template="BlendFuncSeparate"/>
-
-	<function name="VertexAttrib1f" external="true" template="VertexAttrib" gltype="GLfloat" vector_size="1" expand_vector="true"/>
-	<function name="VertexAttrib2f" external="true" template="VertexAttrib" gltype="GLfloat" vector_size="2" expand_vector="true"/>
-	<function name="VertexAttrib3f" external="true" template="VertexAttrib" gltype="GLfloat" vector_size="3" expand_vector="true"/>
-	<function name="VertexAttrib4f" external="true" template="VertexAttrib" gltype="GLfloat" vector_size="4" expand_vector="true"/>
-	<function name="VertexAttrib1fv" external="true" template="VertexAttrib" gltype="GLfloat" vector_size="1"/>
-	<function name="VertexAttrib2fv" external="true" template="VertexAttrib" gltype="GLfloat" vector_size="2"/>
-	<function name="VertexAttrib3fv" external="true" template="VertexAttrib" gltype="GLfloat" vector_size="3"/>
-	<function name="VertexAttrib4fv" external="true" template="VertexAttrib" gltype="GLfloat" vector_size="4"/>
-
-	<function name="VertexAttribPointer" template="VertexAttribPointer"/>
-
-	<function name="EnableVertexAttribArray" template="EnableVertexAttribArray"/>
-	<function name="DisableVertexAttribArray" template="DisableVertexAttribArray"/>
-
-	<function name="IsProgram" template="IsProgram"/>
-	<function name="GetProgramiv" template="GetProgram" gltype="GLint"/>
-
-	<function name="GetVertexAttribfv" template="GetVertexAttrib" gltype="GLfloat"/>
-	<function name="GetVertexAttribiv" template="GetVertexAttrib" gltype="GLint"/>
-	<function name="GetVertexAttribPointerv" template="GetVertexAttribPointer"/>
-
-	<function name="GetBufferPointervOES" template="GetBufferPointer"/>
-	<function name="MapBufferOES" template="MapBuffer"/>
-	<function name="UnmapBufferOES" template="UnmapBuffer"/>
-	<function name="BindBuffer" template="BindBuffer"/>
-	<function name="BufferData" template="BufferData"/>
-	<function name="BufferSubData" template="BufferSubData"/>
-	<function name="DeleteBuffers" template="DeleteBuffers"/>
-	<function name="GenBuffers" template="GenBuffers"/>
-	<function name="GetBufferParameteriv" template="GetBufferParameter" gltype="GLint"/>
-	<function name="IsBuffer" template="IsBuffer"/>
-
-	<function name="CreateShader" template="CreateShader"/>
-	<function name="ShaderSource" template="ShaderSource"/>
-	<function name="CompileShader" template="CompileShader"/>
-	<function name="ReleaseShaderCompiler" template="ReleaseShaderCompiler"/>
-	<function name="DeleteShader" template="DeleteShader"/>
-	<function name="ShaderBinary" template="ShaderBinary"/>
-	<function name="CreateProgram" template="CreateProgram"/>
-	<function name="AttachShader" template="AttachShader"/>
-	<function name="DetachShader" template="DetachShader"/>
-	<function name="LinkProgram" template="LinkProgram"/>
-	<function name="UseProgram" template="UseProgram"/>
-	<function name="DeleteProgram" template="DeleteProgram"/>
-
-	<function name="GetActiveAttrib" template="GetActiveAttrib"/>
-	<function name="GetAttribLocation" template="GetAttribLocation"/>
-	<function name="BindAttribLocation" template="BindAttribLocation"/>
-	<function name="GetUniformLocation" template="GetUniformLocation"/>
-	<function name="GetActiveUniform" template="GetActiveUniform"/>
-
-	<function name="Uniform1f" template="Uniform" gltype="GLfloat" vector_size="1" expand_vector="true"/>
-	<function name="Uniform2f" template="Uniform" gltype="GLfloat" vector_size="2" expand_vector="true"/>
-	<function name="Uniform3f" template="Uniform" gltype="GLfloat" vector_size="3" expand_vector="true"/>
-	<function name="Uniform4f" template="Uniform" gltype="GLfloat" vector_size="4" expand_vector="true"/>
-	<function name="Uniform1i" template="Uniform" gltype="GLint" vector_size="1" expand_vector="true"/>
-	<function name="Uniform2i" template="Uniform" gltype="GLint" vector_size="2" expand_vector="true"/>
-	<function name="Uniform3i" template="Uniform" gltype="GLint" vector_size="3" expand_vector="true"/>
-	<function name="Uniform4i" template="Uniform" gltype="GLint" vector_size="4" expand_vector="true"/>
-
-	<function name="Uniform1fv" template="Uniform" gltype="GLfloat" vector_size="1"/>
-	<function name="Uniform2fv" template="Uniform" gltype="GLfloat" vector_size="2"/>
-	<function name="Uniform3fv" template="Uniform" gltype="GLfloat" vector_size="3"/>
-	<function name="Uniform4fv" template="Uniform" gltype="GLfloat" vector_size="4"/>
-	<function name="Uniform1iv" template="Uniform" gltype="GLint" vector_size="1"/>
-	<function name="Uniform2iv" template="Uniform" gltype="GLint" vector_size="2"/>
-	<function name="Uniform3iv" template="Uniform" gltype="GLint" vector_size="3"/>
-	<function name="Uniform4iv" template="Uniform" gltype="GLint" vector_size="4"/>
-
-	<function name="UniformMatrix2fv" template="UniformMatrix" gltype="GLfloat" vector_size="2"/>
-	<function name="UniformMatrix3fv" template="UniformMatrix" gltype="GLfloat" vector_size="3"/>
-	<function name="UniformMatrix4fv" template="UniformMatrix" gltype="GLfloat" vector_size="4"/>
-
-	<function name="ValidateProgram" template="ValidateProgram"/>
-
-	<function name="GenerateMipmap" template="GenerateMipmap"/>
-	<function name="BindFramebuffer" template="BindFramebuffer"/>
-	<function name="DeleteFramebuffers" template="DeleteFramebuffers"/>
-	<function name="GenFramebuffers" template="GenFramebuffers"/>
-	<function name="BindRenderbuffer" template="BindRenderbuffer"/>
-	<function name="DeleteRenderbuffers" template="DeleteRenderbuffers"/>
-	<function name="GenRenderbuffers" template="GenRenderbuffers"/>
-	<function name="RenderbufferStorage" external="true" template="RenderbufferStorage"/>
-	<function name="FramebufferRenderbuffer" template="FramebufferRenderbuffer"/>
-	<function name="FramebufferTexture2D" template="FramebufferTexture2D"/>
-	<function name="FramebufferTexture3DOES" template="FramebufferTexture3D"/>
-	<function name="CheckFramebufferStatus" template="CheckFramebufferStatus"/>
-	<function name="GetFramebufferAttachmentParameteriv" template="GetFramebufferAttachmentParameter" gltype="GLint"/>
-	<function name="GetRenderbufferParameteriv" template="GetRenderbufferParameter" gltype="GLint"/>
-	<function name="IsRenderbuffer" template="IsRenderbuffer"/>
-	<function name="IsFramebuffer" template="IsFramebuffer"/>
-
-	<function name="IsShader" template="IsShader"/>
-	<function name="GetShaderiv" template="GetShader" gltype="GLint"/>
-	<function name="GetAttachedShaders" template="GetAttachedShaders"/>
-	<function name="GetShaderInfoLog" template="GetShaderInfoLog"/>
-	<function name="GetProgramInfoLog" template="GetProgramInfoLog"/>
-	<function name="GetShaderSource" template="GetShaderSource"/>
-	<function name="GetShaderPrecisionFormat" template="GetShaderPrecisionFormat"/>
-	<function name="GetUniformfv" template="GetUniform" gltype="GLfloat"/>
-	<function name="GetUniformiv" template="GetUniform" gltype="GLint"/>
-
-        <!-- EXT_multi_draw_arrays -->
-        <function name="MultiDrawArraysEXT" template="MultiDrawArrays"/>
-        <function name="MultiDrawElementsEXT" template="MultiDrawElements"/>
-
-        <!-- OES_EGL_image -->
-        <function name="EGLImageTargetTexture2DOES" template="EGLImageTargetTexture2D"/>
-        <function name="EGLImageTargetRenderbufferStorageOES" template="EGLImageTargetRenderbufferStorage"/>
-</api>
-
-</apispec>
diff --git a/mesalib/src/mesa/main/APIspecutil.py b/mesalib/src/mesa/main/APIspecutil.py
deleted file mode 100644
index 3c1552809..000000000
--- a/mesalib/src/mesa/main/APIspecutil.py
+++ /dev/null
@@ -1,272 +0,0 @@
-#!/usr/bin/python
-#
-# Copyright (C) 2009 Chia-I Wu <olv@0xlab.org>
-#
-# 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
-# on the rights to use, copy, modify, merge, publish, distribute, sub
-# license, and/or sell copies of the Software, and to permit persons to whom
-# the Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice (including the next
-# paragraph) shall be included in all copies or substantial portions of the
-# Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
-# IBM AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-# IN THE SOFTWARE.
-"""
-Minimal apiutil.py interface for use by es_generator.py.
-"""
-
-import sys
-import libxml2
-
-import APIspec
-
-__spec = {}
-__functions = {}
-__aliases = {}
-
-def _ParseXML(filename, apiname):
-    conversions = {
-        # from           to
-        'GLfloat':  [ 'GLdouble' ],
-        'GLclampf': [ 'GLclampd' ],
-        'GLubyte':  [ 'GLfloat', 'GLdouble' ],
-        'GLint':    [ 'GLfloat', 'GLdouble' ],
-        'GLfixed':  [ 'GLfloat', 'GLdouble' ],
-        'GLclampx': [ 'GLclampf', 'GLclampd' ],
-    }
-
-    doc = libxml2.readFile(filename, None,
-            libxml2.XML_PARSE_DTDLOAD +
-            libxml2.XML_PARSE_DTDVALID +
-            libxml2.XML_PARSE_NOBLANKS)
-    spec = APIspec.Spec(doc)
-    impl = spec.get_impl()
-    api = spec.get_api(apiname)
-    doc.freeDoc()
-
-    __spec["impl"] = impl
-    __spec["api"] = api
-
-    for func in api.functions:
-        alias, need_conv = impl.match(func, conversions)
-        if not alias:
-            # external functions are manually dispatched
-            if not func.is_external:
-                print >>sys.stderr, "Error: unable to dispatch %s" % func.name
-            alias = func
-            need_conv = False
-
-        __functions[func.name] = func
-        __aliases[func.name] = (alias, need_conv)
-
-
-def AllSpecials(notused=None):
-    """Return a list of all external functions in the API."""
-    api = __spec["api"]
-
-    specials = []
-    for func in api.functions:
-        if func.is_external:
-            specials.append(func.name)
-
-    return specials
-
-
-def GetAllFunctions(filename, api):
-    """Return sorted list of all functions in the API."""
-    if not __spec:
-        _ParseXML(filename, api)
-
-    api = __spec["api"]
-    names = []
-    for func in api.functions:
-        names.append(func.name)
-    names.sort()
-    return names
-
-
-def ReturnType(funcname):
-    """Return the C return type of named function."""
-    func = __functions[funcname]
-    return func.return_type
-
-
-def Properties(funcname):
-    """Return list of properties of the named GL function."""
-    func = __functions[funcname]
-    return [func.direction]
-
-
-def _ValidValues(func, param):
-    """Return the valid values of a parameter."""
-    valid_values = []
-    switch = func.checker.switches.get(param.name, [])
-    for desc in switch:
-        # no dependent vector
-        if not desc.checker.switches:
-            for val in desc.values:
-                valid_values.append((val, None, None, [], desc.error, None))
-            continue
-
-        items = desc.checker.switches.items()
-        if len(items) > 1:
-            print >>sys.stderr, "%s: more than one parameter depend on %s" % \
-                    (func.name, desc.name)
-        dep_name, dep_switch = items[0]
-
-        for dep_desc in dep_switch:
-            if dep_desc.index >= 0 and dep_desc.index != 0:
-                print >>sys.stderr, "%s: not first element of a vector" % func.name
-            if dep_desc.checker.switches:
-                print >>sys.stderr, "%s: deep nested dependence" % func.name
-
-            convert = None if dep_desc.convert else "noconvert"
-            for val in desc.values:
-                valid_values.append((val, dep_desc.size_str, dep_desc.name,
-                                     dep_desc.values, dep_desc.error, convert))
-    return valid_values
-
-
-def _Conversion(func, src_param):
-    """Return the destination type of the conversion, or None."""
-    alias, need_conv = __aliases[func.name]
-    if need_conv:
-        dst_param = alias.get_param(src_param.name)
-        if src_param.type == dst_param.type:
-            need_conv = False
-    if not need_conv:
-        return (None, "none")
-
-    converts = { True: 0, False: 0 }
-
-    # In Fogx, for example,  pname may be GL_FOG_DENSITY/GL_FOG_START/GL_FOG_END
-    # or GL_FOG_MODE.  In the former three cases, param is not checked and the
-    # default is to convert.
-    if not func.checker.always_check(src_param.name):
-        converts[True] += 1
-
-    for desc in func.checker.flatten(src_param.name):
-        converts[desc.convert] += 1
-        if converts[True] and converts[False]:
-            break
-
-    # it should be "never", "sometimes", and "always"...
-    if converts[False]:
-        if converts[True]:
-            conversion = "some"
-        else:
-            conversion = "none"
-    else:
-        conversion = "all"
-
-    return (dst_param.base_type(), conversion)
-
-
-def _MaxVecSize(func, param):
-    """Return the largest possible size of a vector."""
-    if not param.is_vector:
-        return 0
-    if param.size:
-        return param.size
-
-    # need to look at all descriptions
-    size = 0
-    for desc in func.checker.flatten(param.name):
-        if desc.size_str and desc.size_str.isdigit():
-            s = int(desc.size_str)
-            if s > size:
-                size = s
-    if not size:
-        need_conv = __aliases[func.name][1]
-        if need_conv:
-            print >>sys.stderr, \
-                    "Error: unable to decide the max size of %s in %s" % \
-                    (param.name, func.name)
-    return size
-
-
-def _ParameterTuple(func, param):
-    """Return a parameter tuple.
-
-    [0] -- parameter name
-    [1] -- parameter type
-    [2] -- max vector size or 0
-    [3] -- dest type the parameter converts to, or None
-    [4] -- valid values
-    [5] -- how often does the conversion happen
-
-    """
-    vec_size = _MaxVecSize(func, param)
-    dst_type, conversion = _Conversion(func, param)
-    valid_values = _ValidValues(func, param)
-
-    return (param.name, param.type, vec_size, dst_type, valid_values, conversion)
-
-
-def Parameters(funcname):
-    """Return list of tuples of function parameters."""
-    func = __functions[funcname]
-    params = []
-    for param in func.params:
-        params.append(_ParameterTuple(func, param))
-
-    return params
-
-
-def FunctionPrefix(funcname):
-    """Return function specific prefix."""
-    func = __functions[funcname]
-
-    return func.prefix
-
-
-def FindParamIndex(params, paramname):
-    """Find the index of a named parameter."""
-    for i in xrange(len(params)):
-        if params[i][0] == paramname:
-            return i
-    return None
-
-
-def MakeDeclarationString(params):
-    """Return a C-style parameter declaration string."""
-    string = []
-    for p in params:
-        sep = "" if p[1].endswith("*") else " "
-        string.append("%s%s%s" % (p[1], sep, p[0]))
-    if not string:
-        return "void"
-    return ", ".join(string)
-
-
-def AliasPrefix(funcname):
-    """Return the prefix of the function the named function is an alias of."""
-    alias = __aliases[funcname][0]
-    return alias.prefix
-
-
-def Alias(funcname):
-    """Return the name of the function the named function is an alias of."""
-    alias, need_conv = __aliases[funcname]
-    return alias.name if not need_conv else None
-
-
-def ConversionFunction(funcname):
-    """Return the name of the function the named function converts to."""
-    alias, need_conv = __aliases[funcname]
-    return alias.name if need_conv else None
-
-
-def Categories(funcname):
-    """Return all the categories of the named GL function."""
-    api = __spec["api"]
-    return [api.name]
diff --git a/mesalib/src/mesa/main/api_exec.c b/mesalib/src/mesa/main/api_exec.c
index a670fba43..bc5f71f0d 100644
--- a/mesalib/src/mesa/main/api_exec.c
+++ b/mesalib/src/mesa/main/api_exec.c
@@ -49,9 +49,11 @@
 #include "depth.h"
 #include "dlist.h"
 #include "drawpix.h"
+#include "drawtex.h"
 #include "rastpos.h"
 #include "enable.h"
 #include "errors.h"
+#include "es1_conversion.h"
 #include "eval.h"
 #include "get.h"
 #include "feedback.h"
@@ -69,6 +71,7 @@
 #include "pixelstore.h"
 #include "points.h"
 #include "polygon.h"
+#include "querymatrix.h"
 #include "queryobj.h"
 #include "readpix.h"
 #include "samplerobj.h"
@@ -128,12 +131,14 @@ _mesa_create_exec_table(struct gl_context *ctx)
    SET_Disable(exec, _mesa_Disable);
    if (ctx->API == API_OPENGL || ctx->API == API_OPENGL_CORE)
       SET_DrawBuffer(exec, _mesa_DrawBuffer);
-   SET_ReadBuffer(exec, _mesa_ReadBuffer);
+   if (ctx->API != API_OPENGLES) {
+      SET_ReadBuffer(exec, _mesa_ReadBuffer);
+   }
    SET_Enable(exec, _mesa_Enable);
    SET_Finish(exec, _mesa_Finish);
    SET_Flush(exec, _mesa_Flush);
    SET_FrontFace(exec, _mesa_FrontFace);
-   if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) {
+   if (ctx->API == API_OPENGL) {
       SET_Frustum(exec, _mesa_Frustum);
    }
    SET_GetError(exec, _mesa_GetError);
@@ -153,6 +158,8 @@ _mesa_create_exec_table(struct gl_context *ctx)
    if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) {
       SET_MatrixMode(exec, _mesa_MatrixMode);
       SET_MultMatrixf(exec, _mesa_MultMatrixf);
+   }
+   if (ctx->API == API_OPENGL) {
       SET_Ortho(exec, _mesa_Ortho);
    }
    SET_PixelStorei(exec, _mesa_PixelStorei);
@@ -185,7 +192,7 @@ _mesa_create_exec_table(struct gl_context *ctx)
       _mesa_init_dlist_dispatch(exec);
    }
 
-   if (ctx->API != API_OPENGLES2) {
+   if (_mesa_is_desktop_gl(ctx)) {
       SET_ClearDepth(exec, _mesa_ClearDepth);
    }
 
@@ -197,11 +204,11 @@ _mesa_create_exec_table(struct gl_context *ctx)
    SET_DepthFunc(exec, _mesa_DepthFunc);
    SET_DepthMask(exec, _mesa_DepthMask);
 
-   if (ctx->API != API_OPENGLES2) {
+   if (_mesa_is_desktop_gl(ctx)) {
       SET_DepthRange(exec, _mesa_DepthRange);
    }
 
-   if (ctx->API != API_OPENGLES2 && ctx->API != API_OPENGL_CORE) {
+   if (ctx->API == API_OPENGL) {
       _mesa_init_drawpix_dispatch(exec);
    }
    if (ctx->API == API_OPENGL) {
@@ -210,33 +217,37 @@ _mesa_create_exec_table(struct gl_context *ctx)
 
    if (ctx->API == API_OPENGL) {
       SET_FogCoordPointerEXT(exec, _mesa_FogCoordPointerEXT);
-      SET_Fogf(exec, _mesa_Fogf);
-      SET_Fogfv(exec, _mesa_Fogfv);
       SET_Fogi(exec, _mesa_Fogi);
       SET_Fogiv(exec, _mesa_Fogiv);
       SET_GetClipPlane(exec, _mesa_GetClipPlane);
    }
+   if (ctx->API == API_OPENGL || ctx->API == API_OPENGLES) {
+      SET_Fogf(exec, _mesa_Fogf);
+      SET_Fogfv(exec, _mesa_Fogfv);
+   }
    SET_GetBooleanv(exec, _mesa_GetBooleanv);
-   if (ctx->API != API_OPENGLES2) {
+   if (_mesa_is_desktop_gl(ctx)) {
       SET_GetDoublev(exec, _mesa_GetDoublev);
    }
    SET_GetIntegerv(exec, _mesa_GetIntegerv);
    if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) {
       SET_GetLightfv(exec, _mesa_GetLightfv);
-      SET_GetLightiv(exec, _mesa_GetLightiv);
       SET_GetMaterialfv(exec, _mesa_GetMaterialfv);
-      SET_GetMaterialiv(exec, _mesa_GetMaterialiv);
-      SET_GetPolygonStipple(exec, _mesa_GetPolygonStipple);
       SET_GetTexEnvfv(exec, _mesa_GetTexEnvfv);
       SET_GetTexEnviv(exec, _mesa_GetTexEnviv);
    }
-   if (ctx->API != API_OPENGLES2) {
+   if (ctx->API == API_OPENGL) {
+      SET_GetLightiv(exec, _mesa_GetLightiv);
+      SET_GetMaterialiv(exec, _mesa_GetMaterialiv);
+      SET_GetPolygonStipple(exec, _mesa_GetPolygonStipple);
+   }
+   if (_mesa_is_desktop_gl(ctx)) {
       SET_GetTexLevelParameterfv(exec, _mesa_GetTexLevelParameterfv);
       SET_GetTexLevelParameteriv(exec, _mesa_GetTexLevelParameteriv);
    }
    SET_GetTexParameterfv(exec, _mesa_GetTexParameterfv);
    SET_GetTexParameteriv(exec, _mesa_GetTexParameteriv);
-   if (ctx->API != API_OPENGLES2) {
+   if (_mesa_is_desktop_gl(ctx)) {
       SET_GetTexImage(exec, _mesa_GetTexImage);
    }
    SET_Hint(exec, _mesa_Hint);
@@ -247,10 +258,12 @@ _mesa_create_exec_table(struct gl_context *ctx)
    if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) {
       SET_LightModelf(exec, _mesa_LightModelf);
       SET_LightModelfv(exec, _mesa_LightModelfv);
-      SET_LightModeli(exec, _mesa_LightModeli);
-      SET_LightModeliv(exec, _mesa_LightModeliv);
       SET_Lightf(exec, _mesa_Lightf);
       SET_Lightfv(exec, _mesa_Lightfv);
+   }
+   if (ctx->API == API_OPENGL) {
+      SET_LightModeli(exec, _mesa_LightModeli);
+      SET_LightModeliv(exec, _mesa_LightModeliv);
       SET_Lighti(exec, _mesa_Lighti);
       SET_Lightiv(exec, _mesa_Lightiv);
       SET_LoadMatrixd(exec, _mesa_LoadMatrixd);
@@ -263,10 +276,11 @@ _mesa_create_exec_table(struct gl_context *ctx)
    }
 
    if (ctx->API != API_OPENGLES2) {
-      SET_PixelStoref(exec, _mesa_PixelStoref);
-
       SET_PointSize(exec, _mesa_PointSize);
+   }
 
+   if (_mesa_is_desktop_gl(ctx)) {
+      SET_PixelStoref(exec, _mesa_PixelStoref);
       SET_PolygonMode(exec, _mesa_PolygonMode);
    }
 
@@ -278,19 +292,21 @@ _mesa_create_exec_table(struct gl_context *ctx)
    }
 
    SET_ReadPixels(exec, _mesa_ReadPixels);
-   if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) {
+   if (ctx->API == API_OPENGL) {
       SET_Rotated(exec, _mesa_Rotated);
       SET_Scaled(exec, _mesa_Scaled);
       SET_SecondaryColorPointerEXT(exec, _mesa_SecondaryColorPointerEXT);
+   }
+   if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) {
       SET_TexEnvf(exec, _mesa_TexEnvf);
       SET_TexEnviv(exec, _mesa_TexEnviv);
    }
 
    if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) {
-      _mesa_init_texgen_dispatch(exec);
+      _mesa_init_texgen_dispatch(ctx, exec);
    }
 
-   if (ctx->API != API_OPENGLES2) {
+   if (_mesa_is_desktop_gl(ctx)) {
       SET_TexImage1D(exec, _mesa_TexImage1D);
    }
    SET_TexParameterf(exec, _mesa_TexParameterf);
@@ -306,9 +322,11 @@ _mesa_create_exec_table(struct gl_context *ctx)
    SET_GenTextures(exec, _mesa_GenTextures);
    if (ctx->API == API_OPENGL) {
       SET_AreTexturesResident(exec, _mesa_AreTexturesResident);
+   }
+   if (ctx->API == API_OPENGL || ctx->API == API_OPENGLES) {
       SET_ColorPointer(exec, _mesa_ColorPointer);
    }
-   if (ctx->API != API_OPENGLES2) {
+   if (_mesa_is_desktop_gl(ctx)) {
       SET_CopyTexImage1D(exec, _mesa_CopyTexImage1D);
       SET_CopyTexSubImage1D(exec, _mesa_CopyTexSubImage1D);
       SET_TexSubImage1D(exec, _mesa_TexSubImage1D);
@@ -320,29 +338,41 @@ _mesa_create_exec_table(struct gl_context *ctx)
 
    if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) {
       SET_DisableClientState(exec, _mesa_DisableClientState);
-      SET_EdgeFlagPointer(exec, _mesa_EdgeFlagPointer);
       SET_EnableClientState(exec, _mesa_EnableClientState);
+   }
+   if (ctx->API == API_OPENGL) {
+      SET_EdgeFlagPointer(exec, _mesa_EdgeFlagPointer);
       SET_IndexPointer(exec, _mesa_IndexPointer);
       SET_InterleavedArrays(exec, _mesa_InterleavedArrays);
    }
    if (ctx->API != API_OPENGLES2) {
+      /* Note glGetPointerv is deprecated in GL CORE 3.1 through 4.2, but
+       * was re-added in GL CORE 4.3. We will just keep the function
+       * around in all GL CORE contexts.
+       */
       SET_GetPointerv(exec, _mesa_GetPointerv);
    }
    SET_IsTexture(exec, _mesa_IsTexture);
    if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) {
       SET_NormalPointer(exec, _mesa_NormalPointer);
-      SET_PrioritizeTextures(exec, _mesa_PrioritizeTextures);
       SET_TexCoordPointer(exec, _mesa_TexCoordPointer);
       SET_VertexPointer(exec, _mesa_VertexPointer);
    }
+   if (ctx->API == API_OPENGL) {
+      SET_PrioritizeTextures(exec, _mesa_PrioritizeTextures);
+   }
 
    /* 1.2 */
-   SET_CopyTexSubImage3D(exec, _mesa_CopyTexSubImage3D);
-   SET_TexImage3D(exec, _mesa_TexImage3D);
-   SET_TexSubImage3D(exec, _mesa_TexSubImage3D);
+   if (ctx->API != API_OPENGLES) {
+      SET_CopyTexSubImage3D(exec, _mesa_CopyTexSubImage3D);
+      SET_TexImage3D(exec, _mesa_TexImage3D);
+      SET_TexSubImage3D(exec, _mesa_TexSubImage3D);
+   }
 
    /* OpenGL 1.2  GL_ARB_imaging */
-   SET_BlendColor(exec, _mesa_BlendColor);
+   if (ctx->API != API_OPENGLES) {
+      SET_BlendColor(exec, _mesa_BlendColor);
+   }
    SET_BlendEquation(exec, _mesa_BlendEquation);
    SET_BlendEquationSeparateEXT(exec, _mesa_BlendEquationSeparateEXT);
 
@@ -353,9 +383,11 @@ _mesa_create_exec_table(struct gl_context *ctx)
    }
 
    /* OpenGL 2.0 */
-   SET_StencilFuncSeparate(exec, _mesa_StencilFuncSeparate);
-   SET_StencilMaskSeparate(exec, _mesa_StencilMaskSeparate);
-   SET_StencilOpSeparate(exec, _mesa_StencilOpSeparate);
+   if (ctx->API != API_OPENGLES) {
+      SET_StencilFuncSeparate(exec, _mesa_StencilFuncSeparate);
+      SET_StencilMaskSeparate(exec, _mesa_StencilMaskSeparate);
+      SET_StencilOpSeparate(exec, _mesa_StencilOpSeparate);
+   }
 
    _mesa_init_shader_dispatch(ctx, exec);
    _mesa_init_shader_uniform_dispatch(ctx, exec);
@@ -446,7 +478,7 @@ _mesa_create_exec_table(struct gl_context *ctx)
    /* part of _mesa_init_rastpos_dispatch(exec); */
 
    /* 200. GL_IBM_multimode_draw_arrays */
-   if (ctx->API != API_OPENGLES2) {
+   if (_mesa_is_desktop_gl(ctx)) {
       SET_MultiModeDrawArraysIBM(exec, _mesa_MultiModeDrawArraysIBM);
       SET_MultiModeDrawElementsIBM(exec, _mesa_MultiModeDrawElementsIBM);
    }
@@ -466,8 +498,10 @@ _mesa_create_exec_table(struct gl_context *ctx)
       SET_GenVertexArraysAPPLE(exec, _mesa_GenVertexArraysAPPLE);
    }
    /* Reused by ARB_vertex_array_object / OES_vertex_array_object */
-   SET_DeleteVertexArraysAPPLE(exec, _mesa_DeleteVertexArraysAPPLE);
-   SET_IsVertexArrayAPPLE(exec, _mesa_IsVertexArrayAPPLE);
+   if (ctx->API != API_OPENGLES) {
+      SET_DeleteVertexArraysAPPLE(exec, _mesa_DeleteVertexArraysAPPLE);
+      SET_IsVertexArrayAPPLE(exec, _mesa_IsVertexArrayAPPLE);
+   }
 
    /* 262. GL_NV_point_sprite */
    if (_mesa_is_desktop_gl(ctx)) {
@@ -481,23 +515,23 @@ _mesa_create_exec_table(struct gl_context *ctx)
    }
 
    /* 285. GL_NV_primitive_restart */
-   if (ctx->API != API_OPENGLES2) {
+   if (_mesa_is_desktop_gl(ctx)) {
       SET_PrimitiveRestartIndexNV(exec, _mesa_PrimitiveRestartIndex);
    }
 
    /* ???. GL_EXT_depth_bounds_test */
-   if (ctx->API != API_OPENGLES2) {
+   if (_mesa_is_desktop_gl(ctx)) {
       SET_DepthBoundsEXT(exec, _mesa_DepthBoundsEXT);
    }
 
    /* 352. GL_EXT_transform_feedback */
    /* ARB 93. GL_ARB_transform_feedback2 */
-   if (ctx->API != API_OPENGLES2 || _mesa_is_gles3(ctx)) {
+   if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) {
       _mesa_init_transform_feedback_dispatch(ctx, exec);
    }
 
    /* 364. GL_EXT_provoking_vertex */
-   if (ctx->API != API_OPENGLES2) {
+   if (_mesa_is_desktop_gl(ctx)) {
       SET_ProvokingVertexEXT(exec, _mesa_ProvokingVertexEXT);
    }
 
@@ -519,19 +553,23 @@ _mesa_create_exec_table(struct gl_context *ctx)
    SET_SampleCoverageARB(exec, _mesa_SampleCoverageARB);
 
    /* ARB 12. GL_ARB_texture_compression */
-   if (ctx->API != API_OPENGLES2) {
+   if (_mesa_is_desktop_gl(ctx)) {
       SET_CompressedTexImage1DARB(exec, _mesa_CompressedTexImage1DARB);
       SET_CompressedTexSubImage1DARB(exec, _mesa_CompressedTexSubImage1DARB);
       SET_GetCompressedTexImageARB(exec, _mesa_GetCompressedTexImageARB);
    }
 
-   SET_CompressedTexImage3DARB(exec, _mesa_CompressedTexImage3DARB);
+   if (ctx->API != API_OPENGLES) {
+      SET_CompressedTexImage3DARB(exec, _mesa_CompressedTexImage3DARB);
+   }
    SET_CompressedTexImage2DARB(exec, _mesa_CompressedTexImage2DARB);
-   SET_CompressedTexSubImage3DARB(exec, _mesa_CompressedTexSubImage3DARB);
+   if (ctx->API != API_OPENGLES) {
+      SET_CompressedTexSubImage3DARB(exec, _mesa_CompressedTexSubImage3DARB);
+   }
    SET_CompressedTexSubImage2DARB(exec, _mesa_CompressedTexSubImage2DARB);
 
    /* ARB 104. GL_ARB_robustness */
-   if (ctx->API != API_OPENGLES2) {
+   if (_mesa_is_desktop_gl(ctx)) {
       SET_GetnCompressedTexImageARB(exec, _mesa_GetnCompressedTexImageARB);
    }
 
@@ -576,10 +614,12 @@ _mesa_create_exec_table(struct gl_context *ctx)
    /* glVertexAttrib4NivARB handled in api_loopback.c */
    /* glVertexAttrib4NusvARB handled in api_loopback.c */
    /* glVertexAttrib4NuivARB handled in api_loopback.c */
-   SET_VertexAttribPointerARB(exec, _mesa_VertexAttribPointerARB);
-   SET_EnableVertexAttribArrayARB(exec, _mesa_EnableVertexAttribArrayARB);
-   SET_DisableVertexAttribArrayARB(exec, _mesa_DisableVertexAttribArrayARB);
-   if (ctx->API != API_OPENGLES2) {
+   if (ctx->API != API_OPENGLES) {
+      SET_VertexAttribPointerARB(exec, _mesa_VertexAttribPointerARB);
+      SET_EnableVertexAttribArrayARB(exec, _mesa_EnableVertexAttribArrayARB);
+      SET_DisableVertexAttribArrayARB(exec, _mesa_DisableVertexAttribArrayARB);
+   }
+   if (_mesa_is_desktop_gl(ctx)) {
       /* glBindProgramARB aliases glBindProgramNV */
       /* glDeleteProgramsARB aliases glDeleteProgramsNV */
       /* glGenProgramsARB aliases glGenProgramsNV */
@@ -590,9 +630,11 @@ _mesa_create_exec_table(struct gl_context *ctx)
       SET_ProgramStringARB(exec, _mesa_ProgramStringARB);
    }
 
-   SET_GetVertexAttribfvARB(exec, _mesa_GetVertexAttribfvARB);
-   SET_GetVertexAttribivARB(exec, _mesa_GetVertexAttribivARB);
-   SET_GetVertexAttribPointervNV(exec, _mesa_GetVertexAttribPointervARB);
+   if (ctx->API != API_OPENGLES) {
+      SET_GetVertexAttribfvARB(exec, _mesa_GetVertexAttribfvARB);
+      SET_GetVertexAttribivARB(exec, _mesa_GetVertexAttribivARB);
+      SET_GetVertexAttribPointervNV(exec, _mesa_GetVertexAttribPointervARB);
+   }
    if (ctx->API == API_OPENGL) {
       SET_ProgramEnvParameter4dARB(exec, _mesa_ProgramEnvParameter4dARB);
       SET_ProgramEnvParameter4dvARB(exec, _mesa_ProgramEnvParameter4dvARB);
@@ -614,25 +656,27 @@ _mesa_create_exec_table(struct gl_context *ctx)
    _mesa_init_bufferobj_dispatch(ctx, exec);
 
    /* ARB 29. GL_ARB_occlusion_query */
-   if (ctx->API != API_OPENGLES2 || _mesa_is_gles3(ctx)) {
+   if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) {
       _mesa_init_queryobj_dispatch(ctx, exec);
    }
 
    /* ARB 37. GL_ARB_draw_buffers */
-   SET_DrawBuffersARB(exec, _mesa_DrawBuffersARB);
+   if (ctx->API != API_OPENGLES) {
+      SET_DrawBuffersARB(exec, _mesa_DrawBuffersARB);
+   }
 
    /* ARB 66. GL_ARB_sync */
-   if (ctx->API != API_OPENGLES2 || _mesa_is_gles3(ctx)) {
+   if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) {
       _mesa_init_sync_dispatch(exec);
    }
 
    /* ARB 104. GL_ARB_debug_output */
-   if (ctx->API != API_OPENGLES2) {
+   if (_mesa_is_desktop_gl(ctx)) {
       _mesa_init_errors_dispatch(exec);
    }
 
    /* ARB 105. GL_ARB_robustness */
-   if (ctx->API != API_OPENGLES2) {
+   if (_mesa_is_desktop_gl(ctx)) {
       SET_GetGraphicsResetStatusARB(exec, _mesa_GetGraphicsResetStatusARB);
       SET_GetnPolygonStippleARB(exec, _mesa_GetnPolygonStippleARB);
       SET_GetnTexImageARB(exec, _mesa_GetnTexImageARB);
@@ -663,16 +707,18 @@ _mesa_create_exec_table(struct gl_context *ctx)
    SET_DeleteFramebuffersEXT(exec, _mesa_DeleteFramebuffersEXT);
    SET_GenFramebuffersEXT(exec, _mesa_GenFramebuffersEXT);
    SET_CheckFramebufferStatusEXT(exec, _mesa_CheckFramebufferStatusEXT);
-   if (ctx->API != API_OPENGLES2) {
+   if (_mesa_is_desktop_gl(ctx)) {
       SET_FramebufferTexture1DEXT(exec, _mesa_FramebufferTexture1DEXT);
    }
    SET_FramebufferTexture2DEXT(exec, _mesa_FramebufferTexture2DEXT);
-   SET_FramebufferTexture3DEXT(exec, _mesa_FramebufferTexture3DEXT);
+   if (ctx->API != API_OPENGLES) {
+      SET_FramebufferTexture3DEXT(exec, _mesa_FramebufferTexture3DEXT);
+   }
    SET_FramebufferRenderbufferEXT(exec, _mesa_FramebufferRenderbufferEXT);
    SET_GetFramebufferAttachmentParameterivEXT(exec, _mesa_GetFramebufferAttachmentParameterivEXT);
    SET_GenerateMipmapEXT(exec, _mesa_GenerateMipmapEXT);
 
-   if (ctx->API != API_OPENGLES2 || _mesa_is_gles3(ctx)) {
+   if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) {
       SET_BlitFramebufferEXT(exec, _mesa_BlitFramebufferEXT);
    }
 
@@ -683,7 +729,7 @@ _mesa_create_exec_table(struct gl_context *ctx)
    }
 
    /* GL_MESA_texture_array / GL_EXT_texture_array */
-   if (ctx->API != API_OPENGLES2 || _mesa_is_gles3(ctx)) {
+   if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) {
       SET_FramebufferTextureLayerEXT(exec, _mesa_FramebufferTextureLayerEXT);
    }
 
@@ -695,7 +741,7 @@ _mesa_create_exec_table(struct gl_context *ctx)
    /* The ARB_fbo functions are the union of
     * GL_EXT_fbo, GL_EXT_framebuffer_blit, GL_EXT_texture_array
     */
-   if (ctx->API != API_OPENGLES2 || _mesa_is_gles3(ctx)) {
+   if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) {
       SET_RenderbufferStorageMultisample(exec, _mesa_RenderbufferStorageMultisample);
    }
 
@@ -704,13 +750,15 @@ _mesa_create_exec_table(struct gl_context *ctx)
    SET_FlushMappedBufferRange(exec, _mesa_FlushMappedBufferRange);
 
    /* GL_ARB_copy_buffer */
-   if (ctx->API != API_OPENGLES2 || _mesa_is_gles3(ctx)) {
+   if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) {
       SET_CopyBufferSubData(exec, _mesa_CopyBufferSubData);
    }
 
    /* GL_ARB_vertex_array_object / GL_OES_vertex_array_object */
-   SET_BindVertexArray(exec, _mesa_BindVertexArray);
-   SET_GenVertexArrays(exec, _mesa_GenVertexArrays);
+   if (ctx->API != API_OPENGLES) {
+      SET_BindVertexArray(exec, _mesa_BindVertexArray);
+      SET_GenVertexArrays(exec, _mesa_GenVertexArrays);
+   }
 
    /* GL_EXT_draw_buffers2 */
    if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) {
@@ -725,7 +773,7 @@ _mesa_create_exec_table(struct gl_context *ctx)
    }
 
    /* GL_NV_conditional_render */
-   if (ctx->API != API_OPENGLES2) {
+   if (_mesa_is_desktop_gl(ctx)) {
       SET_BeginConditionalRenderNV(exec, _mesa_BeginConditionalRender);
       SET_EndConditionalRenderNV(exec, _mesa_EndConditionalRender);
    }
@@ -733,18 +781,13 @@ _mesa_create_exec_table(struct gl_context *ctx)
    SET_EGLImageTargetTexture2DOES(exec, _mesa_EGLImageTargetTexture2DOES);
    SET_EGLImageTargetRenderbufferStorageOES(exec, _mesa_EGLImageTargetRenderbufferStorageOES);
 
-   if (ctx->API != API_OPENGLES2) {
+   if (_mesa_is_desktop_gl(ctx)) {
       SET_ObjectPurgeableAPPLE(exec, _mesa_ObjectPurgeableAPPLE);
       SET_ObjectUnpurgeableAPPLE(exec, _mesa_ObjectUnpurgeableAPPLE);
       SET_GetObjectParameterivAPPLE(exec, _mesa_GetObjectParameterivAPPLE);
    }
 
-   if (ctx->API != API_OPENGLES2) {
-      SET_FramebufferTextureARB(exec, _mesa_FramebufferTextureARB);
-      SET_FramebufferTextureFaceARB(exec, _mesa_FramebufferTextureFaceARB);
-   }
-
-   if (ctx->API != API_OPENGLES2) {
+   if (_mesa_is_desktop_gl(ctx)) {
       SET_ClampColorARB(exec, _mesa_ClampColorARB);
    }
 
@@ -753,7 +796,7 @@ _mesa_create_exec_table(struct gl_context *ctx)
       SET_ClearColorIiEXT(exec, _mesa_ClearColorIiEXT);
       SET_ClearColorIuiEXT(exec, _mesa_ClearColorIuiEXT);
    }
-   if (ctx->API != API_OPENGLES2) {
+   if (_mesa_is_desktop_gl(ctx)) {
       SET_GetTexParameterIivEXT(exec, _mesa_GetTexParameterIiv);
       SET_GetTexParameterIuivEXT(exec, _mesa_GetTexParameterIuiv);
       SET_TexParameterIivEXT(exec, _mesa_TexParameterIiv);
@@ -761,14 +804,14 @@ _mesa_create_exec_table(struct gl_context *ctx)
    }
 
    /* GL_EXT_gpu_shader4 / OpenGL 3.0 */
-   if (ctx->API != API_OPENGLES2 || _mesa_is_gles3(ctx)) {
+   if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) {
       SET_GetVertexAttribIivEXT(exec, _mesa_GetVertexAttribIiv);
       SET_GetVertexAttribIuivEXT(exec, _mesa_GetVertexAttribIuiv);
       SET_VertexAttribIPointerEXT(exec, _mesa_VertexAttribIPointer);
    }
 
    /* GL 3.0 (functions not covered by other extensions) */
-   if (ctx->API != API_OPENGLES2 || _mesa_is_gles3(ctx)) {
+   if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) {
       SET_ClearBufferiv(exec, _mesa_ClearBufferiv);
       SET_ClearBufferuiv(exec, _mesa_ClearBufferuiv);
       SET_ClearBufferfv(exec, _mesa_ClearBufferfv);
@@ -777,12 +820,12 @@ _mesa_create_exec_table(struct gl_context *ctx)
    }
 
    /* GL_ARB_instanced_arrays */
-   if (ctx->API != API_OPENGLES2 || _mesa_is_gles3(ctx)) {
+   if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) {
       SET_VertexAttribDivisorARB(exec, _mesa_VertexAttribDivisor);
    }
 
    /* GL_ARB_draw_buffer_blend */
-   if (ctx->API != API_OPENGLES2) {
+   if (_mesa_is_desktop_gl(ctx)) {
       SET_BlendFunciARB(exec, _mesa_BlendFunci);
       SET_BlendFuncSeparateiARB(exec, _mesa_BlendFuncSeparatei);
       SET_BlendEquationiARB(exec, _mesa_BlendEquationi);
@@ -790,17 +833,17 @@ _mesa_create_exec_table(struct gl_context *ctx)
    }
 
    /* GL_NV_texture_barrier */
-   if (ctx->API != API_OPENGLES2) {
+   if (_mesa_is_desktop_gl(ctx)) {
       SET_TextureBarrierNV(exec, _mesa_TextureBarrierNV);
    }
  
    /* GL_ARB_texture_buffer_object */
-   if (ctx->API != API_OPENGLES2) {
+   if (_mesa_is_desktop_gl(ctx)) {
       SET_TexBufferARB(exec, _mesa_TexBuffer);
    }
 
    /* GL_ARB_texture_storage */
-   if (ctx->API != API_OPENGLES2) {
+   if (_mesa_is_desktop_gl(ctx)) {
       SET_TexStorage1D(exec, _mesa_TexStorage1D);
       SET_TextureStorage1DEXT(exec, _mesa_TextureStorage1DEXT);
    }
@@ -813,7 +856,7 @@ _mesa_create_exec_table(struct gl_context *ctx)
       SET_TextureStorage3DEXT(exec, _mesa_TextureStorage3DEXT);
    }
 
-   if (ctx->API != API_OPENGLES2 || _mesa_is_gles3(ctx)) {
+   if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) {
       _mesa_init_sampler_object_dispatch(ctx, exec);
    }
 
@@ -827,5 +870,66 @@ _mesa_create_exec_table(struct gl_context *ctx)
       SET_InvalidateFramebuffer(exec, _mesa_InvalidateFramebuffer);
    }
 
+#if FEATURE_ES1
+   if (ctx->API == API_OPENGLES) {
+      SET_AlphaFuncxOES(exec, _es_AlphaFuncx);
+      SET_ClearColorxOES(exec, _es_ClearColorx);
+      SET_ClearDepthxOES(exec, _es_ClearDepthx);
+      SET_ClipPlanefOES(exec, _es_ClipPlanef);
+      SET_ClipPlanexOES(exec, _es_ClipPlanex);
+      SET_Color4xOES(exec, _es_Color4x);
+      SET_DepthRangexOES(exec, _es_DepthRangex);
+      SET_DrawTexfOES(exec, _mesa_DrawTexf);
+      SET_DrawTexfvOES(exec, _mesa_DrawTexfv);
+      SET_DrawTexiOES(exec, _mesa_DrawTexi);
+      SET_DrawTexivOES(exec, _mesa_DrawTexiv);
+      SET_DrawTexsOES(exec, _mesa_DrawTexs);
+      SET_DrawTexsvOES(exec, _mesa_DrawTexsv);
+      SET_DrawTexxOES(exec, _es_DrawTexxOES);
+      SET_DrawTexxvOES(exec, _es_DrawTexxvOES);
+      SET_FogxOES(exec, _es_Fogx);
+      SET_FogxvOES(exec, _es_Fogxv);
+      SET_FrustumfOES(exec, _es_Frustumf);
+      SET_FrustumxOES(exec, _es_Frustumx);
+      SET_GetClipPlanefOES(exec, _es_GetClipPlanef);
+      SET_GetClipPlanexOES(exec, _es_GetClipPlanex);
+      SET_GetFixedvOES(exec, _mesa_GetFixedv);
+      SET_GetLightxvOES(exec, _es_GetLightxv);
+      SET_GetMaterialxvOES(exec, _es_GetMaterialxv);
+      SET_GetTexEnvxvOES(exec, _es_GetTexEnvxv);
+      SET_GetTexGenxvOES(exec, _check_GetTexGenxvOES);
+      SET_GetTexParameterxvOES(exec, _es_GetTexParameterxv);
+      SET_LightModelxOES(exec, _es_LightModelx);
+      SET_LightModelxvOES(exec, _es_LightModelxv);
+      SET_LightxOES(exec, _es_Lightx);
+      SET_LightxvOES(exec, _es_Lightxv);
+      SET_LineWidthxOES(exec, _es_LineWidthx);
+      SET_LoadMatrixxOES(exec, _es_LoadMatrixx);
+      SET_MaterialxOES(exec, _es_Materialx);
+      SET_MaterialxvOES(exec, _es_Materialxv);
+      SET_MultMatrixxOES(exec, _es_MultMatrixx);
+      SET_MultiTexCoord4xOES(exec, _es_MultiTexCoord4x);
+      SET_Normal3xOES(exec, _es_Normal3x);
+      SET_OrthofOES(exec, _es_Orthof);
+      SET_OrthoxOES(exec, _es_Orthox);
+      SET_PointParameterxOES(exec, _es_PointParameterx);
+      SET_PointParameterxvOES(exec, _es_PointParameterxv);
+      SET_PointSizePointerOES(exec, _mesa_PointSizePointer);
+      SET_PointSizexOES(exec, _es_PointSizex);
+      SET_PolygonOffsetxOES(exec, _es_PolygonOffsetx);
+      SET_QueryMatrixxOES(exec, _es_QueryMatrixxOES);
+      SET_RotatexOES(exec, _es_Rotatex);
+      SET_SampleCoveragexOES(exec, _es_SampleCoveragex);
+      SET_ScalexOES(exec, _es_Scalex);
+      SET_TexEnvxOES(exec, _es_TexEnvx);
+      SET_TexEnvxvOES(exec, _es_TexEnvxv);
+      SET_TexGenxOES(exec, _check_TexGenxOES);
+      SET_TexGenxvOES(exec, _check_TexGenxvOES);
+      SET_TexParameterxOES(exec, _es_TexParameterx);
+      SET_TexParameterxvOES(exec, _es_TexParameterxv);
+      SET_TranslatexOES(exec, _es_Translatex);
+   }
+#endif
+
    return exec;
 }
diff --git a/mesalib/src/mesa/main/api_exec.h b/mesalib/src/mesa/main/api_exec.h
index 100e97273..7d37ff754 100644
--- a/mesalib/src/mesa/main/api_exec.h
+++ b/mesalib/src/mesa/main/api_exec.h
@@ -36,11 +36,5 @@ _mesa_alloc_dispatch_table(int size);
 extern struct _glapi_table *
 _mesa_create_exec_table(struct gl_context *ctx);
 
-extern struct _glapi_table *
-_mesa_create_exec_table_es1(void);
-
-extern struct _glapi_table *
-_mesa_create_exec_table_es2(void);
-
 
 #endif
diff --git a/mesalib/src/mesa/main/api_loopback.c b/mesalib/src/mesa/main/api_loopback.c
index 330eb22f7..2d35f17ad 100644
--- a/mesalib/src/mesa/main/api_loopback.c
+++ b/mesalib/src/mesa/main/api_loopback.c
@@ -37,6 +37,7 @@
 #include "glapi/glthread.h"
 #include "main/dispatch.h"
 #include "mfeatures.h"
+#include "main/context.h"
 
 /* KW: A set of functions to convert unusual Color/Normal/Vertex/etc
  * calls to a smaller set of driver-provided formats.  Currently just
@@ -1503,6 +1504,10 @@ _mesa_loopback_init_api_table(const struct gl_context *ctx,
                               struct _glapi_table *dest)
 {
    if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) {
+      SET_Color4ub(dest, loopback_Color4ub_f);
+      SET_Materialf(dest, loopback_Materialf);
+   }
+   if (ctx->API == API_OPENGL) {
       SET_Color3b(dest, loopback_Color3b_f);
       SET_Color3d(dest, loopback_Color3d_f);
       SET_Color3i(dest, loopback_Color3i_f);
@@ -1516,7 +1521,6 @@ _mesa_loopback_init_api_table(const struct gl_context *ctx,
       SET_Color4s(dest, loopback_Color4s_f);
       SET_Color4ui(dest, loopback_Color4ui_f);
       SET_Color4us(dest, loopback_Color4us_f);
-      SET_Color4ub(dest, loopback_Color4ub_f);
       SET_Color3bv(dest, loopback_Color3bv_f);
       SET_Color3dv(dest, loopback_Color3dv_f);
       SET_Color3iv(dest, loopback_Color3iv_f);
@@ -1637,7 +1641,6 @@ _mesa_loopback_init_api_table(const struct gl_context *ctx,
       SET_EvalCoord1dv(dest, loopback_EvalCoord1dv);
       SET_EvalCoord1fv(dest, loopback_EvalCoord1fv);
       SET_EvalCoord1d(dest, loopback_EvalCoord1d);
-      SET_Materialf(dest, loopback_Materialf);
       SET_Materiali(dest, loopback_Materiali);
       SET_Materialiv(dest, loopback_Materialiv);
       SET_Rectd(dest, loopback_Rectd);
@@ -1685,7 +1688,7 @@ _mesa_loopback_init_api_table(const struct gl_context *ctx,
       SET_VertexAttribs4ubvNV(dest, loopback_VertexAttribs4ubvNV);
    }
 
-   if (ctx->API != API_OPENGLES2) {
+   if (_mesa_is_desktop_gl(ctx)) {
       SET_VertexAttrib1sARB(dest, loopback_VertexAttrib1sARB);
       SET_VertexAttrib1dARB(dest, loopback_VertexAttrib1dARB);
       SET_VertexAttrib2sARB(dest, loopback_VertexAttrib2sARB);
diff --git a/mesalib/src/mesa/main/arrayobj.c b/mesalib/src/mesa/main/arrayobj.c
index 5959260c2..926c753dd 100644
--- a/mesalib/src/mesa/main/arrayobj.c
+++ b/mesalib/src/mesa/main/arrayobj.c
@@ -359,7 +359,7 @@ bind_vertex_array(struct gl_context *ctx, GLuint id, GLboolean genRequired)
       newObj = lookup_arrayobj(ctx, id);
       if (!newObj) {
          if (genRequired) {
-            _mesa_error(ctx, GL_INVALID_OPERATION, "glBindVertexArray(id)");
+            _mesa_error(ctx, GL_INVALID_OPERATION, "glBindVertexArray(non-gen name)");
             return;
          }
 
diff --git a/mesalib/src/mesa/main/bufferobj.c b/mesalib/src/mesa/main/bufferobj.c
index 9820693fa..9697919fa 100644
--- a/mesalib/src/mesa/main/bufferobj.c
+++ b/mesalib/src/mesa/main/bufferobj.c
@@ -660,7 +660,7 @@ _mesa_free_buffer_objects( struct gl_context *ctx )
    ctx->UniformBufferBindings = NULL;
 }
 
-static void
+static bool
 handle_bind_buffer_gen(struct gl_context *ctx,
 		       GLenum target,
 		       GLuint buffer,
@@ -668,6 +668,11 @@ handle_bind_buffer_gen(struct gl_context *ctx,
 {
    struct gl_buffer_object *buf = *buf_handle;
 
+   if (!buf && ctx->API == API_OPENGL_CORE) {
+      _mesa_error(ctx, GL_INVALID_OPERATION, "glBindBuffer(non-gen name)");
+      return false;
+   }
+
    if (!buf || buf == &DummyBufferObject) {
       /* If this is a new buffer object id, or one which was generated but
        * never used before, allocate a buffer object now.
@@ -676,11 +681,13 @@ handle_bind_buffer_gen(struct gl_context *ctx,
       buf = ctx->Driver.NewBufferObject(ctx, buffer, target);
       if (!buf) {
 	 _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBindBufferARB");
-	 return;
+	 return false;
       }
       _mesa_HashInsert(ctx->Shared->BufferObjects, buffer, buf);
       *buf_handle = buf;
    }
+
+   return true;
 }
 
 /**
@@ -717,11 +724,8 @@ bind_buffer_object(struct gl_context *ctx, GLenum target, GLuint buffer)
    else {
       /* non-default buffer object */
       newBufObj = _mesa_lookup_bufferobj(ctx, buffer);
-      if (newBufObj == NULL && ctx->API == API_OPENGL_CORE) {
-         _mesa_error(ctx, GL_INVALID_OPERATION, "glBindBuffer(non-gen name)");
+      if (!handle_bind_buffer_gen(ctx, target, buffer, &newBufObj))
          return;
-      }
-      handle_bind_buffer_gen(ctx, target, buffer, &newBufObj);
    }
    
    /* bind new buffer */
@@ -2147,7 +2151,8 @@ _mesa_BindBufferRange(GLenum target, GLuint index,
    } else {
       bufObj = _mesa_lookup_bufferobj(ctx, buffer);
    }
-   handle_bind_buffer_gen(ctx, target, buffer, &bufObj);
+   if (!handle_bind_buffer_gen(ctx, target, buffer, &bufObj))
+      return;
 
    if (!bufObj) {
       _mesa_error(ctx, GL_INVALID_OPERATION,
@@ -2193,7 +2198,8 @@ _mesa_BindBufferBase(GLenum target, GLuint index, GLuint buffer)
    } else {
       bufObj = _mesa_lookup_bufferobj(ctx, buffer);
    }
-   handle_bind_buffer_gen(ctx, target, buffer, &bufObj);
+   if (!handle_bind_buffer_gen(ctx, target, buffer, &bufObj))
+      return;
 
    if (!bufObj) {
       _mesa_error(ctx, GL_INVALID_OPERATION,
@@ -2345,7 +2351,7 @@ _mesa_init_bufferobj_dispatch(struct gl_context *ctx, struct _glapi_table *disp)
     * exist for it.
     */
    SET_GetBufferPointervARB(disp, _mesa_GetBufferPointervARB);
-   if (ctx->API != API_OPENGLES2) {
+   if (_mesa_is_desktop_gl(ctx)) {
       SET_GetBufferSubDataARB(disp, _mesa_GetBufferSubDataARB);
    }
    SET_IsBufferARB(disp, _mesa_IsBufferARB);
diff --git a/mesalib/src/mesa/main/context.c b/mesalib/src/mesa/main/context.c
index a51073843..a4dedeea2 100644
--- a/mesalib/src/mesa/main/context.c
+++ b/mesalib/src/mesa/main/context.c
@@ -422,14 +422,7 @@ one_time_init( struct gl_context *ctx )
    if (!(api_init_mask & (1 << ctx->API))) {
       _mesa_init_get_hash(ctx);
 
-      /*
-       * This is fine as ES does not use the remap table, but it may not be
-       * future-proof.  We cannot always initialize the remap table because
-       * when an app is linked to libGLES*, there are not enough dynamic
-       * entries.
-       */
-      if (_mesa_is_desktop_gl(ctx) || ctx->API == API_OPENGLES2)
-         _mesa_init_remap_table();
+      _mesa_init_remap_table();
    }
 
    api_init_mask |= 1 << ctx->API;
@@ -943,23 +936,7 @@ _mesa_initialize_context(struct gl_context *ctx,
    }
 
    /* setup the API dispatch tables */
-   switch (ctx->API) {
-#if FEATURE_GL || FEATURE_ES2
-   case API_OPENGL:
-   case API_OPENGL_CORE:
-   case API_OPENGLES2:
-      ctx->Exec = _mesa_create_exec_table(ctx);
-      break;
-#endif
-#if FEATURE_ES1
-   case API_OPENGLES:
-      ctx->Exec = _mesa_create_exec_table_es1();
-      break;
-#endif
-   default:
-      _mesa_problem(ctx, "unknown or unsupported API");
-      break;
-   }
+   ctx->Exec = _mesa_create_exec_table(ctx);
 
    if (!ctx->Exec) {
       _mesa_reference_shared_state(ctx, &ctx->Shared, NULL);
diff --git a/mesalib/src/mesa/main/dlist.c b/mesalib/src/mesa/main/dlist.c
index d53879efd..c15043694 100644
--- a/mesalib/src/mesa/main/dlist.c
+++ b/mesalib/src/mesa/main/dlist.c
@@ -7177,7 +7177,7 @@ save_ProgramParameteri(GLuint program, GLenum pname, GLint value)
       n[3].i = value;
    }
    if (ctx->ExecuteFlag) {
-      CALL_ProgramParameteriARB(ctx->Exec, (program, pname, value));
+      CALL_ProgramParameteri(ctx->Exec, (program, pname, value));
    }
 }
 
@@ -7196,7 +7196,7 @@ save_FramebufferTexture(GLenum target, GLenum attachment,
       n[4].i = level;
    }
    if (ctx->ExecuteFlag) {
-      CALL_FramebufferTextureARB(ctx->Exec, (target, attachment, texture, level));
+      CALL_FramebufferTexture(ctx->Exec, (target, attachment, texture, level));
    }
 }
 
@@ -8509,10 +8509,10 @@ execute_list(struct gl_context *ctx, GLuint list)
 
          /* GL_ARB_geometry_shader4 */
          case OPCODE_PROGRAM_PARAMETERI:
-            CALL_ProgramParameteriARB(ctx->Exec, (n[1].ui, n[2].e, n[3].i));
+            CALL_ProgramParameteri(ctx->Exec, (n[1].ui, n[2].e, n[3].i));
             break;
          case OPCODE_FRAMEBUFFER_TEXTURE:
-            CALL_FramebufferTextureARB(ctx->Exec, (n[1].e, n[2].e,
+            CALL_FramebufferTexture(ctx->Exec, (n[1].e, n[2].e,
                                                    n[3].ui, n[4].i));
             break;
          case OPCODE_FRAMEBUFFER_TEXTURE_FACE:
@@ -10212,8 +10212,8 @@ _mesa_create_save_table(const struct gl_context *ctx)
    SET_BlendEquationSeparateiARB(table, save_BlendEquationSeparatei);
 
    /* GL_ARB_geometry_shader4 */
-   SET_ProgramParameteriARB(table, save_ProgramParameteri);
-   SET_FramebufferTextureARB(table, save_FramebufferTexture);
+   SET_ProgramParameteri(table, save_ProgramParameteri);
+   SET_FramebufferTexture(table, save_FramebufferTexture);
    SET_FramebufferTextureFaceARB(table, save_FramebufferTextureFace);
 
    /* GL_NV_conditional_render */
diff --git a/mesalib/src/mesa/main/es1_conversion.c b/mesalib/src/mesa/main/es1_conversion.c
index ae3c5badc..758fb1a66 100644
--- a/mesalib/src/mesa/main/es1_conversion.c
+++ b/mesalib/src/mesa/main/es1_conversion.c
@@ -29,10 +29,6 @@
 #include "main/drawtex.h"
 #include "vbo/vbo.h"
 
-#ifndef GL_APIENTRY
-#define GL_APIENTRY GLAPIENTRY
-#endif
-
 #include "main/es1_conversion.h"
 
 void GL_APIENTRY
diff --git a/mesalib/src/mesa/main/es1_conversion.h b/mesalib/src/mesa/main/es1_conversion.h
index ece3893a1..eb0734759 100644
--- a/mesalib/src/mesa/main/es1_conversion.h
+++ b/mesalib/src/mesa/main/es1_conversion.h
@@ -1,3 +1,33 @@
+/*
+ * Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, 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
+ * TUNGSTEN GRAPHICS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+ * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef ES1_CONVERSION_H
+#define ES1_CONVERSION_H
+
+#ifndef GL_APIENTRY
+#define GL_APIENTRY GLAPIENTRY
+#endif
+
 void GL_APIENTRY
 _es_AlphaFuncx(GLenum func, GLclampx ref);
 
@@ -155,3 +185,4 @@ _es_TexParameterxv(GLenum target, GLenum pname, const GLfixed *params);
 void GL_APIENTRY
 _es_Translatex(GLfixed x, GLfixed y, GLfixed z);
 
+#endif /* ES1_CONVERSION_H */
diff --git a/mesalib/src/mesa/main/es_generator.py b/mesalib/src/mesa/main/es_generator.py
deleted file mode 100644
index b074e9dcf..000000000
--- a/mesalib/src/mesa/main/es_generator.py
+++ /dev/null
@@ -1,765 +0,0 @@
-#*************************************************************************
-# Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
-# All Rights Reserved.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, 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
-# TUNGSTEN GRAPHICS 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.
-#*************************************************************************
-
-
-import sys, os
-import APIspecutil as apiutil
-
-# These dictionary entries are used for automatic conversion.
-# The string will be used as a format string with the conversion
-# variable.
-Converters = {
-    'GLfloat': {
-        'GLdouble': "(GLdouble) (%s)",
-        'GLfixed' : "(GLint) (%s * 65536)",
-    },
-    'GLfixed': {
-        'GLfloat': "(GLfloat) (%s / 65536.0f)",
-        'GLdouble': "(GLdouble) (%s / 65536.0)",
-    },
-    'GLdouble': {
-        'GLfloat': "(GLfloat) (%s)",
-        'GLfixed': "(GLfixed) (%s * 65536)",
-    },
-    'GLclampf': {
-        'GLclampd': "(GLclampd) (%s)",
-        'GLclampx': "(GLclampx) (%s * 65536)",
-    },
-    'GLclampx': {
-        'GLclampf': "(GLclampf) (%s / 65536.0f)",
-        'GLclampd': "(GLclampd) (%s / 65536.0)",
-    },
-    'GLubyte': {
-        'GLfloat': "(GLfloat) (%s / 255.0f)",
-    },
-}
-
-def GetBaseType(type):
-    typeTokens = type.split(' ')
-    baseType = None
-    typeModifiers = []
-    for t in typeTokens:
-        if t in ['const', '*']:
-            typeModifiers.append(t)
-        else:
-            baseType = t
-    return (baseType, typeModifiers)
-
-def ConvertValue(value, fromType, toType):
-    """Returns a string that represents the given parameter string, 
-    type-converted if necessary."""
-
-    if not Converters.has_key(fromType):
-        print >> sys.stderr, "No base converter for type '%s' found.  Ignoring." % fromType
-        return value
-
-    if not Converters[fromType].has_key(toType):
-        print >> sys.stderr, "No converter found for type '%s' to type '%s'.  Ignoring." % (fromType, toType)
-        return value
-
-    # This part is simple.  Return the proper conversion.
-    conversionString = Converters[fromType][toType]
-    return conversionString % value
-
-FormatStrings = {
-    'GLenum' : '0x%x',
-    'GLfloat' : '%f',
-    'GLint' : '%d',
-    'GLbitfield' : '0x%x',
-}
-def GetFormatString(type):
-    if FormatStrings.has_key(type):
-        return FormatStrings[type]
-    else:
-        return None
-
-
-######################################################################
-# Version-specific values to be used in the main script
-# header: which header file to include
-# api: what text specifies an API-level function
-VersionSpecificValues = {
-    'GLES1.1' : {
-        'description' : 'GLES1.1 functions',
-        'header' : 'GLES/gl.h',
-        'extheader' : 'GLES/glext.h',
-        'shortname' : 'es1'
-    },
-    'GLES2.0': {
-        'description' : 'GLES2.0 functions',
-        'header' : 'GLES2/gl2.h',
-        'extheader' : 'GLES2/gl2ext.h',
-        'shortname' : 'es2'
-    }
-}
-
-
-######################################################################
-# Main code for the script begins here.
-
-# Get the name of the program (without the directory part) for use in
-# error messages.
-program = os.path.basename(sys.argv[0])
-
-# Set default values
-verbose = 0
-functionList = "APIspec.xml"
-version = "GLES1.1"
-
-# Allow for command-line switches
-import getopt, time
-options = "hvV:S:"
-try:
-    optlist, args = getopt.getopt(sys.argv[1:], options)
-except getopt.GetoptError, message:
-    sys.stderr.write("%s: %s.  Use -h for help.\n" % (program, message))
-    sys.exit(1)
-
-for option, optarg in optlist:
-    if option == "-h":
-        sys.stderr.write("Usage: %s [-%s]\n" % (program, options))
-        sys.stderr.write("Parse an API specification file and generate wrapper functions for a given GLES version\n")
-        sys.stderr.write("-h gives help\n")
-        sys.stderr.write("-v is verbose\n")
-        sys.stderr.write("-V specifies GLES version to generate [%s]:\n" % version)
-        for key in VersionSpecificValues.keys():
-            sys.stderr.write("    %s - %s\n" % (key, VersionSpecificValues[key]['description']))
-        sys.stderr.write("-S specifies API specification file to use [%s]\n" % functionList)
-        sys.exit(1)
-    elif option == "-v":
-        verbose += 1
-    elif option == "-V":
-        version = optarg
-    elif option == "-S":
-        functionList = optarg
-
-# Beyond switches, we support no further command-line arguments
-if len(args) >  0:
-    sys.stderr.write("%s: only switch arguments are supported - use -h for help\n" % program)
-    sys.exit(1)
-
-# If we don't have a valid version, abort.
-if not VersionSpecificValues.has_key(version):
-    sys.stderr.write("%s: version '%s' is not valid - use -h for help\n" % (program, version))
-    sys.exit(1)
-
-# Grab the version-specific items we need to use
-versionHeader = VersionSpecificValues[version]['header']
-versionExtHeader = VersionSpecificValues[version]['extheader']
-shortname = VersionSpecificValues[version]['shortname']
-
-# If we get to here, we're good to go.  The "version" parameter
-# directs GetDispatchedFunctions to only allow functions from
-# that "category" (version in our parlance).  This allows 
-# functions with different declarations in different categories
-# to exist (glTexImage2D, for example, is different between
-# GLES1 and GLES2).
-keys = apiutil.GetAllFunctions(functionList, version)
-
-allSpecials = apiutil.AllSpecials()
-
-print """/* DO NOT EDIT *************************************************
- * THIS FILE AUTOMATICALLY GENERATED BY THE %s SCRIPT
- * API specification file:   %s
- * GLES version:             %s
- * date:                     %s
- */
-""" % (program, functionList, version, time.strftime("%Y-%m-%d %H:%M:%S"))
-
-# The headers we choose are version-specific.
-print """
-#include "%s"
-#include "%s"
-#include "main/mfeatures.h"
-#include "main/compiler.h"
-#include "main/api_exec.h"
-
-#if FEATURE_%s
-
-#ifndef GLAPIENTRYP
-#define GLAPIENTRYP GL_APIENTRYP
-#endif
-""" % (versionHeader, versionExtHeader, shortname.upper())
-
-if version == "GLES1.1":
-    print '#include "main/es1_conversion.h"'
-    print
-
-# Everyone needs these types.
-print """
-/* These types are needed for the Mesa veneer, but are not defined in
- * the standard GLES headers.
- */
-typedef double GLdouble;
-typedef double GLclampd;
-
-/* Mesa error handling requires these */
-extern void *_mesa_get_current_context(void);
-extern void _mesa_error(void *ctx, GLenum error, const char *fmtString, ... );
-"""
-
-# Finally we get to the all-important functions
-print """/*************************************************************
- * Generated functions begin here
- */
-"""
-for funcName in keys:
-    if verbose > 0: sys.stderr.write("%s: processing function %s\n" % (program, funcName))
-
-    # start figuring out what this function will look like.
-    returnType = apiutil.ReturnType(funcName)
-    props = apiutil.Properties(funcName)
-    params = apiutil.Parameters(funcName)
-    declarationString = apiutil.MakeDeclarationString(params)
-
-    # In case of error, a function may have to return.  Make
-    # sure we have valid return values in this case.
-    if returnType == "void":
-        errorReturn = "return"
-    elif returnType == "GLboolean":
-        errorReturn = "return GL_FALSE"
-    else:
-        errorReturn = "return (%s) 0" % returnType
-
-    # These are the output of this large calculation block.
-    # passthroughDeclarationString: a typed set of parameters that
-    # will be used to create the "extern" reference for the
-    # underlying Mesa or support function.  Note that as generated
-    # these have an extra ", " at the beginning, which will be
-    # removed before use.
-    # 
-    # passthroughDeclarationString: an untyped list of parameters
-    # that will be used to call the underlying Mesa or support
-    # function (including references to converted parameters).
-    # This will also be generated with an extra ", " at the
-    # beginning, which will be removed before use.
-    #
-    # variables: C code to create any local variables determined to
-    # be necessary.
-    # conversionCodeOutgoing: C code to convert application parameters
-    # to a necessary type before calling the underlying support code.
-    # May be empty if no conversion is required.  
-    # conversionCodeIncoming: C code to do the converse: convert 
-    # values returned by underlying Mesa code to the types needed
-    # by the application.
-    # Note that *either* the conversionCodeIncoming will be used (for
-    # generated query functions), *or* the conversionCodeOutgoing will
-    # be used (for generated non-query functions), never both.
-    passthroughFuncName = ""
-    passthroughDeclarationString = ""
-    passthroughCallString = ""
-    prefixOverride = None
-    variables = []
-    conversionCodeOutgoing = []
-    conversionCodeIncoming = []
-    switchCode = []
-
-    # Calculate the name of the underlying support function to call.
-    # By default, the passthrough function is named _mesa_<funcName>.
-    # We're allowed to override the prefix and/or the function name
-    # for each function record, though.  The "ConversionFunction"
-    # utility is poorly named, BTW...
-    if funcName in allSpecials:
-        # perform checks and pass through
-        funcPrefix = "_check_"
-        aliasprefix = "_es_"
-    else:
-        funcPrefix = "_es_"
-        aliasprefix = apiutil.AliasPrefix(funcName)
-    alias = apiutil.ConversionFunction(funcName)
-    prefixOverride = apiutil.FunctionPrefix(funcName)
-    if prefixOverride != "_mesa_":
-        aliasprefix = apiutil.FunctionPrefix(funcName)
-    if not alias:
-        # There may still be a Mesa alias for the function
-        if apiutil.Alias(funcName):
-            passthroughFuncName = "%s%s" % (aliasprefix, apiutil.Alias(funcName))
-        else:
-            passthroughFuncName = "%s%s" % (aliasprefix, funcName)
-    else: # a specific alias is provided
-        passthroughFuncName = "%s%s" % (aliasprefix, alias)
-
-    # Look at every parameter: each one may have only specific
-    # allowed values, or dependent parameters to check, or 
-    # variant-sized vector arrays to calculate
-    for (paramName, paramType, paramMaxVecSize, paramConvertToType, paramValidValues, paramValueConversion) in params:
-        # We'll need this below if we're doing conversions
-        (paramBaseType, paramTypeModifiers) = GetBaseType(paramType)
-
-        # Conversion management.
-        # We'll handle three cases, easiest to hardest: a parameter
-        # that doesn't require conversion, a scalar parameter that
-        # requires conversion, and a vector parameter that requires
-        # conversion.
-        if paramConvertToType == None:
-            # Unconverted parameters are easy, whether they're vector
-            # or scalar - just add them to the call list.  No conversions
-            # or anything to worry about.
-            passthroughDeclarationString += ", %s %s" % (paramType, paramName)
-            passthroughCallString += ", %s" % paramName
-
-        elif paramMaxVecSize == 0: # a scalar parameter that needs conversion
-            # A scalar to hold a converted parameter
-            variables.append("    %s converted_%s;" % (paramConvertToType, paramName))
-
-            # Outgoing conversion depends on whether we have to conditionally
-            # perform value conversion.
-            if paramValueConversion == "none":
-                conversionCodeOutgoing.append("    converted_%s = (%s) %s;" % (paramName, paramConvertToType, paramName))
-            elif paramValueConversion == "some":
-                # We'll need a conditional variable to keep track of
-                # whether we're converting values or not.
-                if ("    int convert_%s_value = 1;" % paramName) not in variables:
-                    variables.append("    int convert_%s_value = 1;" % paramName)
-
-                # Write code based on that conditional.
-                conversionCodeOutgoing.append("    if (convert_%s_value) {" % paramName)
-                conversionCodeOutgoing.append("        converted_%s = %s;" % (paramName, ConvertValue(paramName, paramBaseType, paramConvertToType))) 
-                conversionCodeOutgoing.append("    } else {")
-                conversionCodeOutgoing.append("        converted_%s = (%s) %s;" % (paramName, paramConvertToType, paramName))
-                conversionCodeOutgoing.append("    }")
-            else: # paramValueConversion == "all"
-                conversionCodeOutgoing.append("    converted_%s = %s;" % (paramName, ConvertValue(paramName, paramBaseType, paramConvertToType)))
-
-            # Note that there can be no incoming conversion for a
-            # scalar parameter; changing the scalar will only change
-            # the local value, and won't ultimately change anything
-            # that passes back to the application.
-
-            # Call strings.  The unusual " ".join() call will join the
-            # array of parameter modifiers with spaces as separators.
-            passthroughDeclarationString += ", %s %s %s" % (paramConvertToType, " ".join(paramTypeModifiers), paramName)
-            passthroughCallString += ", converted_%s" % paramName
-
-        else: # a vector parameter that needs conversion
-            # We'll need an index variable for conversions
-            if "    register unsigned int i;" not in variables:
-                variables.append("    register unsigned int i;")
-
-            # This variable will hold the (possibly variant) size of
-            # this array needing conversion.  By default, we'll set
-            # it to the maximal size (which is correct for functions
-            # with a constant-sized vector parameter); for true
-            # variant arrays, we'll modify it with other code.
-            variables.append("    unsigned int n_%s = %d;" % (paramName, paramMaxVecSize))
-
-            # This array will hold the actual converted values.
-            variables.append("    %s converted_%s[%d];" % (paramConvertToType, paramName, paramMaxVecSize))
-
-            # Again, we choose the conversion code based on whether we
-            # have to always convert values, never convert values, or 
-            # conditionally convert values.
-            if paramValueConversion == "none":
-                conversionCodeOutgoing.append("    for (i = 0; i < n_%s; i++) {" % paramName)
-                conversionCodeOutgoing.append("        converted_%s[i] = (%s) %s[i];" % (paramName, paramConvertToType, paramName))
-                conversionCodeOutgoing.append("    }")
-            elif paramValueConversion == "some":
-                # We'll need a conditional variable to keep track of
-                # whether we're converting values or not.
-                if ("    int convert_%s_value = 1;" % paramName) not in variables:
-                    variables.append("    int convert_%s_value = 1;" % paramName)
-                # Write code based on that conditional.
-                conversionCodeOutgoing.append("    if (convert_%s_value) {" % paramName)
-                conversionCodeOutgoing.append("        for (i = 0; i < n_%s; i++) {" % paramName)
-                conversionCodeOutgoing.append("            converted_%s[i] = %s;" % (paramName, ConvertValue("%s[i]" % paramName, paramBaseType, paramConvertToType))) 
-                conversionCodeOutgoing.append("        }")
-                conversionCodeOutgoing.append("    } else {")
-                conversionCodeOutgoing.append("        for (i = 0; i < n_%s; i++) {" % paramName)
-                conversionCodeOutgoing.append("            converted_%s[i] = (%s) %s[i];" % (paramName, paramConvertToType, paramName))
-                conversionCodeOutgoing.append("        }")
-                conversionCodeOutgoing.append("    }")
-            else: # paramValueConversion == "all"
-                conversionCodeOutgoing.append("    for (i = 0; i < n_%s; i++) {" % paramName)
-                conversionCodeOutgoing.append("        converted_%s[i] = %s;" % (paramName, ConvertValue("%s[i]" % paramName, paramBaseType, paramConvertToType)))
-
-                conversionCodeOutgoing.append("    }")
-
-            # If instead we need an incoming conversion (i.e. results
-            # from Mesa have to be converted before handing back
-            # to the application), this is it.  Fortunately, we don't
-            # have to worry about conditional value conversion - the
-            # functions that do (e.g. glGetFixedv()) are handled
-            # specially, outside this code generation.
-            #
-            # Whether we use incoming conversion or outgoing conversion
-            # is determined later - we only ever use one or the other.
-
-            if paramValueConversion == "none":
-                conversionCodeIncoming.append("    for (i = 0; i < n_%s; i++) {" % paramName)
-                conversionCodeIncoming.append("        %s[i] = (%s) converted_%s[i];" % (paramName, paramConvertToType, paramName))
-                conversionCodeIncoming.append("    }")
-            elif paramValueConversion == "some":
-                # We'll need a conditional variable to keep track of
-                # whether we're converting values or not.
-                if ("    int convert_%s_value = 1;" % paramName) not in variables:
-                    variables.append("    int convert_%s_value = 1;" % paramName)
-
-                # Write code based on that conditional.
-                conversionCodeIncoming.append("    if (convert_%s_value) {" % paramName)
-                conversionCodeIncoming.append("        for (i = 0; i < n_%s; i++) {" % paramName)
-                conversionCodeIncoming.append("            %s[i] = %s;" % (paramName, ConvertValue("converted_%s[i]" % paramName, paramConvertToType, paramBaseType))) 
-                conversionCodeIncoming.append("        }")
-                conversionCodeIncoming.append("    } else {")
-                conversionCodeIncoming.append("        for (i = 0; i < n_%s; i++) {" % paramName)
-                conversionCodeIncoming.append("            %s[i] = (%s) converted_%s[i];" % (paramName, paramBaseType, paramName))
-                conversionCodeIncoming.append("        }")
-                conversionCodeIncoming.append("    }")
-            else: # paramValueConversion == "all"
-                conversionCodeIncoming.append("    for (i = 0; i < n_%s; i++) {" % paramName)
-                conversionCodeIncoming.append("        %s[i] = %s;" % (paramName, ConvertValue("converted_%s[i]" % paramName, paramConvertToType, paramBaseType)))
-                conversionCodeIncoming.append("    }")
-
-            # Call strings.  The unusual " ".join() call will join the
-            # array of parameter modifiers with spaces as separators.
-            passthroughDeclarationString += ", %s %s %s" % (paramConvertToType, " ".join(paramTypeModifiers), paramName)
-            passthroughCallString += ", converted_%s" % paramName
-
-        # endif conversion management
-
-        # Parameter checking.  If the parameter has a specific list of
-        # valid values, we have to make sure that the passed-in values
-        # match these, or we make an error.
-        if len(paramValidValues) > 0:
-            # We're about to make a big switch statement with an
-            # error at the end.  By default, the error is GL_INVALID_ENUM,
-            # unless we find a "case" statement in the middle with a
-            # non-GLenum value.
-            errorDefaultCase = "GL_INVALID_ENUM"
-
-            # This parameter has specific valid values.  Make a big
-            # switch statement to handle it.  Note that the original
-            # parameters are always what is checked, not the
-            # converted parameters.
-            switchCode.append("    switch(%s) {" % paramName)
-
-            for valueIndex in range(len(paramValidValues)):
-                (paramValue, dependentVecSize, dependentParamName, dependentValidValues, errorCode, valueConvert) = paramValidValues[valueIndex]
-
-                # We're going to need information on the dependent param
-                # as well.
-                if dependentParamName:
-                    depParamIndex = apiutil.FindParamIndex(params, dependentParamName)
-                    if depParamIndex == None:
-                        sys.stderr.write("%s: can't find dependent param '%s' for function '%s'\n" % (program, dependentParamName, funcName))
-
-                    (depParamName, depParamType, depParamMaxVecSize, depParamConvertToType, depParamValidValues, depParamValueConversion) = params[depParamIndex]
-                else:
-                    (depParamName, depParamType, depParamMaxVecSize, depParamConvertToType, depParamValidValues, depParamValueConversion) = (None, None, None, None, [], None)
-
-                # This is a sneaky trick.  It's valid syntax for a parameter
-                # that is *not* going to be converted to be declared
-                # with a dependent vector size; but in this case, the
-                # dependent vector size is unused and unnecessary.
-                # So check for this and ignore the dependent vector size
-                # if the parameter is not going to be converted.
-                if depParamConvertToType:
-                    usedDependentVecSize = dependentVecSize
-                else:
-                    usedDependentVecSize = None
-
-                # We'll peek ahead at the next parameter, to see whether
-                # we can combine cases
-                if valueIndex + 1 < len(paramValidValues) :
-                    (nextParamValue, nextDependentVecSize, nextDependentParamName, nextDependentValidValues, nextErrorCode, nextValueConvert) = paramValidValues[valueIndex + 1]
-                    if depParamConvertToType:
-                        usedNextDependentVecSize = nextDependentVecSize
-                    else:
-                        usedNextDependentVecSize = None
-
-                # Create a case for this value.  As a mnemonic,
-                # if we have a dependent vector size that we're ignoring,
-                # add it as a comment.
-                if usedDependentVecSize == None and dependentVecSize != None:
-                    switchCode.append("        case %s: /* size %s */" % (paramValue, dependentVecSize))
-                else:
-                    switchCode.append("        case %s:" % paramValue)
-
-                # If this is not a GLenum case, then switch our error
-                # if no value is matched to be GL_INVALID_VALUE instead
-                # of GL_INVALID_ENUM.  (Yes, this does get confused
-                # if there are both values and GLenums in the same
-                # switch statement, which shouldn't happen.)
-                if paramValue[0:3] != "GL_":
-                    errorDefaultCase = "GL_INVALID_VALUE"
-
-                # If all the remaining parameters are identical to the
-                # next set, then we're done - we'll just create the
-                # official code on the next pass through, and the two
-                # cases will share the code.
-                if valueIndex + 1 < len(paramValidValues) and usedDependentVecSize == usedNextDependentVecSize and dependentParamName == nextDependentParamName and dependentValidValues == nextDependentValidValues and errorCode == nextErrorCode and valueConvert == nextValueConvert:
-                    continue
-
-                # Otherwise, we'll have to generate code for this case.
-                # Start off with a check: if there is a dependent parameter,
-                # and a list of valid values for that parameter, we need
-                # to generate an error if something other than one
-                # of those values is passed.
-                if len(dependentValidValues) > 0:
-                    conditional=""
-
-                    # If the parameter being checked is actually an array,
-                    # check only its first element.
-                    if depParamMaxVecSize == 0:
-                        valueToCheck = dependentParamName
-                    else:
-                        valueToCheck = "%s[0]" % dependentParamName
-
-                    for v in dependentValidValues:
-                        conditional += " && %s != %s" % (valueToCheck, v)
-                    switchCode.append("            if (%s) {" % conditional[4:])
-                    if errorCode == None:
-                        errorCode = "GL_INVALID_ENUM"
-                    switchCode.append('                _mesa_error(_mesa_get_current_context(), %s, "gl%s(%s=0x%s)", %s);' % (errorCode, funcName, paramName, "%x", paramName))
-                    switchCode.append("                %s;" % errorReturn)
-                    switchCode.append("            }")
-                # endif there are dependent valid values
-
-                # The dependent parameter may require conditional
-                # value conversion.  If it does, and we don't want
-                # to convert values, we'll have to generate code for that
-                if depParamValueConversion == "some" and valueConvert == "noconvert":
-                    switchCode.append("            convert_%s_value = 0;" % dependentParamName)
-
-                # If there's a dependent vector size for this parameter
-                # that we're actually going to use (i.e. we need conversion),
-                # mark it.
-                if usedDependentVecSize:
-                    switchCode.append("            n_%s = %s;" % (dependentParamName, dependentVecSize))
-
-                # In all cases, break out of the switch if any valid
-                # value is found.
-                switchCode.append("            break;")
-
-
-            # Need a default case to catch all the other, invalid
-            # parameter values.  These will all generate errors.
-            switchCode.append("        default:")
-            if errorCode == None:
-                errorCode = "GL_INVALID_ENUM"
-            formatString = GetFormatString(paramType)
-            if formatString == None:
-                switchCode.append('            _mesa_error(_mesa_get_current_context(), %s, "gl%s(%s)");' % (errorCode, funcName, paramName))
-            else:
-                switchCode.append('            _mesa_error(_mesa_get_current_context(), %s, "gl%s(%s=%s)", %s);' % (errorCode, funcName, paramName, formatString, paramName))
-            switchCode.append("            %s;" % errorReturn)
-
-            # End of our switch code.
-            switchCode.append("    }")
-
-        # endfor every recognized parameter value
-
-    # endfor every param
-
-    if conversionCodeOutgoing != [] or conversionCodeIncoming != []:
-        continue
-
-    # Here, the passthroughDeclarationString and passthroughCallString
-    # are complete; remove the extra ", " at the front of each.
-    passthroughDeclarationString = passthroughDeclarationString[2:]
-    passthroughCallString = passthroughCallString[2:]
-    if not passthroughDeclarationString:
-        passthroughDeclarationString = "void"
-
-    # The Mesa functions are scattered across all the Mesa
-    # header files.  The easiest way to manage declarations
-    # is to create them ourselves.
-    if funcName in allSpecials:
-        print "/* this function is special and is defined elsewhere */"
-    print "extern %s GL_APIENTRY %s(%s);" % (returnType, passthroughFuncName, passthroughDeclarationString)
-
-    # A function may be a core function (i.e. it exists in
-    # the core specification), a core addition (extension
-    # functions added officially to the core), a required
-    # extension (usually an extension for an earlier version
-    # that has been officially adopted), or an optional extension.
-    #
-    # Core functions have a simple category (e.g. "GLES1.1");
-    # we generate only a simple callback for them.
-    #
-    # Core additions have two category listings, one simple
-    # and one compound (e.g.  ["GLES1.1", "GLES1.1:OES_fixed_point"]).  
-    # We generate the core function, and also an extension function.
-    #
-    # Required extensions and implemented optional extensions
-    # have a single compound category "GLES1.1:OES_point_size_array".
-    # For these we generate just the extension function.
-    for categorySpec in apiutil.Categories(funcName):
-        compoundCategory = categorySpec.split(":")
-
-        # This category isn't for us, if the base category doesn't match
-        # our version
-        if compoundCategory[0] != version:
-            continue
-
-        # Otherwise, determine if we're writing code for a core
-        # function (no suffix) or an extension function.
-        if len(compoundCategory) == 1:
-            # This is a core function
-            extensionName = None
-            extensionSuffix = ""
-        else:
-            # This is an extension function.  We'll need to append
-            # the extension suffix.
-            extensionName = compoundCategory[1]
-            extensionSuffix = extensionName.split("_")[0]
-        fullFuncName = funcPrefix + funcName + extensionSuffix
-
-        # Now the generated function.  The text used to mark an API-level
-        # function, oddly, is version-specific.
-        if extensionName:
-            print "/* Extension %s */" % extensionName
-
-        if (not variables and
-            not switchCode and
-            not conversionCodeOutgoing and
-            not conversionCodeIncoming):
-            # pass through directly
-            print "#define %s %s" % (fullFuncName, passthroughFuncName)
-            print
-            continue
-
-        print "static %s GL_APIENTRY %s(%s)" % (returnType, fullFuncName, declarationString)
-        print "{"
-
-        # Start printing our code pieces.  Start with any local
-        # variables we need.  This unusual syntax joins the 
-        # lines in the variables[] array with the "\n" separator.
-        if len(variables) > 0:
-            print "\n".join(variables) + "\n"
-
-        # If there's any sort of parameter checking or variable
-        # array sizing, the switch code will contain it.
-        if len(switchCode) > 0:
-            print "\n".join(switchCode) + "\n"
-
-        # In the case of an outgoing conversion (i.e. parameters must
-        # be converted before calling the underlying Mesa function),
-        # use the appropriate code.
-        if "get" not in props and len(conversionCodeOutgoing) > 0:
-            print "\n".join(conversionCodeOutgoing) + "\n"
-
-        # Call the Mesa function.  Note that there are very few functions
-        # that return a value (i.e. returnType is not "void"), and that
-        # none of them require incoming translation; so we're safe
-        # to generate code that directly returns in those cases,
-        # even though it's not completely independent.
-
-        if returnType == "void":
-            print "    %s(%s);" % (passthroughFuncName, passthroughCallString)
-        else:
-            print "    return %s(%s);" % (passthroughFuncName, passthroughCallString)
-
-        # If the function is one that returns values (i.e. "get" in props),
-        # it might return values of a different type than we need, that
-        # require conversion before passing back to the application.
-        if "get" in props and len(conversionCodeIncoming) > 0:
-            print "\n".join(conversionCodeIncoming)
-
-        # All done.
-        print "}"
-        print
-    # end for each category provided for a function
-
-# end for each function
-
-print """
-#include "glapi/glapi.h"
-
-#if FEATURE_remap_table
-
-/* define esLocalRemapTable */
-#include "main/api_exec_%s_dispatch.h"
-
-#define need_MESA_remap_table
-#include "main/api_exec_%s_remap_helper.h"
-
-static void
-init_remap_table(void)
-{
-   _glthread_DECLARE_STATIC_MUTEX(mutex);
-   static GLboolean initialized = GL_FALSE;
-   const struct gl_function_pool_remap *remap = MESA_remap_table_functions;
-   int i;
-
-   _glthread_LOCK_MUTEX(mutex);
-   if (initialized) {
-      _glthread_UNLOCK_MUTEX(mutex);
-      return;
-   }
-
-   for (i = 0; i < esLocalRemapTable_size; i++) {
-      GLint offset;
-      const char *spec;
-
-      /* sanity check */
-      ASSERT(i == remap[i].remap_index);
-      spec = _mesa_function_pool + remap[i].pool_index;
-
-      offset = _mesa_map_function_spec(spec);
-      esLocalRemapTable[i] = offset;
-   }
-   initialized = GL_TRUE;
-   _glthread_UNLOCK_MUTEX(mutex);
-}
-
-#else /* FEATURE_remap_table */
-
-#include "%sapi/main/dispatch.h"
-
-static INLINE void
-init_remap_table(void)
-{
-}
-
-#endif /* FEATURE_remap_table */
-
-struct _glapi_table *
-_mesa_create_exec_table_%s(void)
-{
-   struct _glapi_table *exec;
-
-   exec = _mesa_alloc_dispatch_table(_gloffset_COUNT);
-   if (exec == NULL)
-      return NULL;
-
-   init_remap_table();
-""" % (shortname, shortname, shortname, shortname)
-
-for func in keys:
-    prefix = "_es_" if func not in allSpecials else "_check_"
-    for spec in apiutil.Categories(func):
-        ext = spec.split(":")
-        # version does not match
-        if ext.pop(0) != version:
-            continue
-        entry = func
-        if ext:
-            suffix = ext[0].split("_")[0]
-            entry += suffix
-        print "    SET_%s(exec, %s%s);" % (entry, prefix, entry)
-print ""
-print "   return exec;"
-print "}"
-
-print """
-#endif /* FEATURE_%s */""" % (shortname.upper())
diff --git a/mesalib/src/mesa/main/fbobject.c b/mesalib/src/mesa/main/fbobject.c
index 9cde52ae6..fc5681ccc 100644
--- a/mesalib/src/mesa/main/fbobject.c
+++ b/mesalib/src/mesa/main/fbobject.c
@@ -3055,27 +3055,6 @@ _mesa_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
 }
 
 
-void GLAPIENTRY
-_mesa_FramebufferTextureARB(GLenum target, GLenum attachment,
-                            GLuint texture, GLint level)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   _mesa_error(ctx, GL_INVALID_OPERATION,
-               "glFramebufferTextureARB "
-               "not implemented!");
-}
-
-
-void GLAPIENTRY
-_mesa_FramebufferTextureFaceARB(GLenum target, GLenum attachment,
-                                GLuint texture, GLint level, GLenum face)
-{
-   GET_CURRENT_CONTEXT(ctx);
-   _mesa_error(ctx, GL_INVALID_OPERATION,
-               "glFramebufferTextureFaceARB "
-               "not implemented!");
-}
-
 static void
 invalidate_framebuffer_storage(GLenum target, GLsizei numAttachments,
                                const GLenum *attachments, GLint x, GLint y,
diff --git a/mesalib/src/mesa/main/fbobject.h b/mesalib/src/mesa/main/fbobject.h
index 9cded3cfa..44d92d421 100644
--- a/mesalib/src/mesa/main/fbobject.h
+++ b/mesalib/src/mesa/main/fbobject.h
@@ -206,15 +206,6 @@ _mesa_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
                          GLbitfield mask, GLenum filter);
 
 extern void GLAPIENTRY
-_mesa_FramebufferTextureARB(GLenum target, GLenum attachment,
-                            GLuint texture, GLint level);
-
-extern void GLAPIENTRY
-_mesa_FramebufferTextureFaceARB(GLenum target, GLenum attachment,
-                                GLuint texture, GLint level, GLenum face);
-
-
-extern void GLAPIENTRY
 _mesa_InvalidateSubFramebuffer(GLenum target, GLsizei numAttachments,
                                const GLenum *attachments, GLint x, GLint y,
                                GLsizei width, GLsizei height);
diff --git a/mesalib/src/mesa/main/querymatrix.c b/mesalib/src/mesa/main/querymatrix.c
index 2843d5589..63d1d8e26 100644
--- a/mesalib/src/mesa/main/querymatrix.c
+++ b/mesalib/src/mesa/main/querymatrix.c
@@ -14,8 +14,9 @@
 
 #include <stdlib.h>
 #include <math.h>
-#include "GLES/gl.h"
-#include "GLES/glext.h"
+#include "glheader.h"
+#include "querymatrix.h"
+#include "main/get.h"
 
 
 /**
@@ -88,13 +89,7 @@ fpclassify(double x)
 
 #endif
 
-extern GLbitfield GL_APIENTRY _es_QueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16]);
-
-/* The Mesa functions we'll need */
-extern void GL_APIENTRY _mesa_GetIntegerv(GLenum pname, GLint *params);
-extern void GL_APIENTRY _mesa_GetFloatv(GLenum pname, GLfloat *params);
-
-GLbitfield GL_APIENTRY _es_QueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16])
+GLbitfield GLAPIENTRY _es_QueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16])
 {
     GLfloat matrix[16];
     GLint tmp;
diff --git a/mesalib/src/mesa/main/querymatrix.h b/mesalib/src/mesa/main/querymatrix.h
new file mode 100644
index 000000000..37a22e961
--- /dev/null
+++ b/mesalib/src/mesa/main/querymatrix.h
@@ -0,0 +1,39 @@
+/*
+ * Copyright © 2012 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+#ifndef QUERYMATRIX_H
+#define QUERYMATRIX_H
+
+
+#include "mfeatures.h"
+#include "mtypes.h"
+
+
+/*
+ * API functions
+ */
+
+extern GLbitfield GLAPIENTRY
+_es_QueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16]);
+
+#endif
diff --git a/mesalib/src/mesa/main/queryobj.c b/mesalib/src/mesa/main/queryobj.c
index 9c38dd1bc..8bfd964ea 100644
--- a/mesalib/src/mesa/main/queryobj.c
+++ b/mesalib/src/mesa/main/queryobj.c
@@ -321,13 +321,19 @@ _mesa_BeginQueryIndexed(GLenum target, GLuint index, GLuint id)
 
    q = _mesa_lookup_query_object(ctx, id);
    if (!q) {
-      /* create new object */
-      q = ctx->Driver.NewQueryObject(ctx, id);
-      if (!q) {
-         _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBeginQuery{Indexed}");
+      if (ctx->API == API_OPENGL_CORE) {
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "glBeginQuery{Indexed}(non-gen name)");
          return;
+      } else {
+         /* create new object */
+         q = ctx->Driver.NewQueryObject(ctx, id);
+         if (!q) {
+            _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBeginQuery{Indexed}");
+            return;
+         }
+         _mesa_HashInsert(ctx->Query.QueryObjects, id, q);
       }
-      _mesa_HashInsert(ctx->Query.QueryObjects, id, q);
    }
    else {
       /* pre-existing object */
diff --git a/mesalib/src/mesa/main/shaderapi.c b/mesalib/src/mesa/main/shaderapi.c
index d40a35376..9376b0f42 100644
--- a/mesalib/src/mesa/main/shaderapi.c
+++ b/mesalib/src/mesa/main/shaderapi.c
@@ -1692,7 +1692,7 @@ _mesa_init_shader_dispatch(const struct gl_context *ctx,
 {
 #if FEATURE_GL
    /* GL_ARB_vertex/fragment_shader */
-   if (ctx->API != API_OPENGLES2) {
+   if (_mesa_is_desktop_gl(ctx)) {
       SET_DeleteObjectARB(exec, _mesa_DeleteObjectARB);
       SET_GetHandleARB(exec, _mesa_GetHandleARB);
       SET_DetachObjectARB(exec, _mesa_DetachObjectARB);
@@ -1705,56 +1705,58 @@ _mesa_init_shader_dispatch(const struct gl_context *ctx,
       SET_GetAttachedObjectsARB(exec, _mesa_GetAttachedObjectsARB);
    }
 
-   SET_ShaderSourceARB(exec, _mesa_ShaderSourceARB);
-   SET_CompileShaderARB(exec, _mesa_CompileShaderARB);
-   SET_LinkProgramARB(exec, _mesa_LinkProgramARB);
-   SET_UseProgramObjectARB(exec, _mesa_UseProgramObjectARB);
-   SET_ValidateProgramARB(exec, _mesa_ValidateProgramARB);
-   SET_GetShaderSourceARB(exec, _mesa_GetShaderSourceARB);
-
-   /* OpenGL 2.0 */
-   SET_AttachShader(exec, _mesa_AttachShader);
-   SET_CreateProgram(exec, _mesa_CreateProgram);
-   SET_CreateShader(exec, _mesa_CreateShader);
-   SET_DeleteProgram(exec, _mesa_DeleteProgram);
-   SET_DeleteShader(exec, _mesa_DeleteShader);
-   SET_DetachShader(exec, _mesa_DetachShader);
-   SET_GetAttachedShaders(exec, _mesa_GetAttachedShaders);
-   SET_GetProgramiv(exec, _mesa_GetProgramiv);
-   SET_GetProgramInfoLog(exec, _mesa_GetProgramInfoLog);
-   SET_GetShaderiv(exec, _mesa_GetShaderiv);
-   SET_GetShaderInfoLog(exec, _mesa_GetShaderInfoLog);
-   SET_IsProgram(exec, _mesa_IsProgram);
-   SET_IsShader(exec, _mesa_IsShader);
-
-   /* GL_ARB_vertex_shader */
-   SET_BindAttribLocationARB(exec, _mesa_BindAttribLocationARB);
-   SET_GetActiveAttribARB(exec, _mesa_GetActiveAttribARB);
-   SET_GetAttribLocationARB(exec, _mesa_GetAttribLocationARB);
-
-   if (ctx->API != API_OPENGLES2) {
-      SET_ProgramParameteriARB(exec, _mesa_ProgramParameteriARB);
-
+   if (ctx->API != API_OPENGLES) {
+      SET_ShaderSourceARB(exec, _mesa_ShaderSourceARB);
+      SET_CompileShaderARB(exec, _mesa_CompileShaderARB);
+      SET_LinkProgramARB(exec, _mesa_LinkProgramARB);
+      SET_UseProgramObjectARB(exec, _mesa_UseProgramObjectARB);
+      SET_ValidateProgramARB(exec, _mesa_ValidateProgramARB);
+      SET_GetShaderSourceARB(exec, _mesa_GetShaderSourceARB);
+
+      /* OpenGL 2.0 */
+      SET_AttachShader(exec, _mesa_AttachShader);
+      SET_CreateProgram(exec, _mesa_CreateProgram);
+      SET_CreateShader(exec, _mesa_CreateShader);
+      SET_DeleteProgram(exec, _mesa_DeleteProgram);
+      SET_DeleteShader(exec, _mesa_DeleteShader);
+      SET_DetachShader(exec, _mesa_DetachShader);
+      SET_GetAttachedShaders(exec, _mesa_GetAttachedShaders);
+      SET_GetProgramiv(exec, _mesa_GetProgramiv);
+      SET_GetProgramInfoLog(exec, _mesa_GetProgramInfoLog);
+      SET_GetShaderiv(exec, _mesa_GetShaderiv);
+      SET_GetShaderInfoLog(exec, _mesa_GetShaderInfoLog);
+      SET_IsProgram(exec, _mesa_IsProgram);
+      SET_IsShader(exec, _mesa_IsShader);
+
+      /* GL_ARB_vertex_shader */
+      SET_BindAttribLocationARB(exec, _mesa_BindAttribLocationARB);
+      SET_GetActiveAttribARB(exec, _mesa_GetActiveAttribARB);
+      SET_GetAttribLocationARB(exec, _mesa_GetAttribLocationARB);
+   }
+
+   if (ctx->API == API_OPENGL) {
       SET_UseShaderProgramEXT(exec, _mesa_UseShaderProgramEXT);
       SET_ActiveProgramEXT(exec, _mesa_ActiveProgramEXT);
       SET_CreateShaderProgramEXT(exec, _mesa_CreateShaderProgramEXT);
    }
 
    /* GL_EXT_gpu_shader4 / GL 3.0 */
-   if (ctx->API != API_OPENGLES2) {
+   if (_mesa_is_desktop_gl(ctx)) {
       SET_BindFragDataLocationEXT(exec, _mesa_BindFragDataLocation);
    }
-   if (ctx->API != API_OPENGLES2 || _mesa_is_gles3(ctx)) {
+   if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) {
       SET_GetFragDataLocationEXT(exec, _mesa_GetFragDataLocation);
    }
 
    /* GL_ARB_ES2_compatibility */
-   SET_ReleaseShaderCompiler(exec, _mesa_ReleaseShaderCompiler);
-   SET_GetShaderPrecisionFormat(exec, _mesa_GetShaderPrecisionFormat);
-   SET_ShaderBinary(exec, _mesa_ShaderBinary);
+   if (ctx->API != API_OPENGLES) {
+      SET_ReleaseShaderCompiler(exec, _mesa_ReleaseShaderCompiler);
+      SET_GetShaderPrecisionFormat(exec, _mesa_GetShaderPrecisionFormat);
+      SET_ShaderBinary(exec, _mesa_ShaderBinary);
+   }
 
    /* GL_ARB_blend_func_extended */
-   if (ctx->API != API_OPENGLES2) {
+   if (_mesa_is_desktop_gl(ctx)) {
       SET_BindFragDataLocationIndexed(exec, _mesa_BindFragDataLocationIndexed);
       SET_GetFragDataIndex(exec, _mesa_GetFragDataIndex);
    }
diff --git a/mesalib/src/mesa/main/texgen.c b/mesalib/src/mesa/main/texgen.c
index 0b0f67335..c5a878644 100644
--- a/mesalib/src/mesa/main/texgen.c
+++ b/mesalib/src/mesa/main/texgen.c
@@ -426,15 +426,17 @@ _mesa_GetTexGeniv( GLenum coord, GLenum pname, GLint *params )
 
 
 void
-_mesa_init_texgen_dispatch(struct _glapi_table *disp)
+_mesa_init_texgen_dispatch(struct gl_context *ctx, struct _glapi_table *disp)
 {
-   SET_GetTexGendv(disp, _mesa_GetTexGendv);
    SET_GetTexGenfv(disp, _mesa_GetTexGenfv);
    SET_GetTexGeniv(disp, _mesa_GetTexGeniv);
-   SET_TexGend(disp, _mesa_TexGend);
-   SET_TexGendv(disp, _mesa_TexGendv);
    SET_TexGenf(disp, _mesa_TexGenf);
    SET_TexGenfv(disp, _mesa_TexGenfv);
    SET_TexGeni(disp, _mesa_TexGeni);
    SET_TexGeniv(disp, _mesa_TexGeniv);
+   if (ctx->API == API_OPENGL) {
+      SET_GetTexGendv(disp, _mesa_GetTexGendv);
+      SET_TexGend(disp, _mesa_TexGend);
+      SET_TexGendv(disp, _mesa_TexGendv);
+   }
 }
diff --git a/mesalib/src/mesa/main/texgen.h b/mesalib/src/mesa/main/texgen.h
index 35a799587..03dd49c61 100644
--- a/mesalib/src/mesa/main/texgen.h
+++ b/mesalib/src/mesa/main/texgen.h
@@ -50,7 +50,7 @@ extern void GLAPIENTRY
 _mesa_GetTexGeniv( GLenum coord, GLenum pname, GLint *params );
 
 extern void
-_mesa_init_texgen_dispatch(struct _glapi_table *disp);
+_mesa_init_texgen_dispatch(struct gl_context *ctx, struct _glapi_table *disp);
 
 
 extern void GLAPIENTRY
diff --git a/mesalib/src/mesa/main/texobj.c b/mesalib/src/mesa/main/texobj.c
index 224d8a825..8525ff9fd 100644
--- a/mesalib/src/mesa/main/texobj.c
+++ b/mesalib/src/mesa/main/texobj.c
@@ -1220,7 +1220,7 @@ _mesa_BindTexture( GLenum target, GLuint texName )
       }
       else {
          if (ctx->API == API_OPENGL_CORE) {
-            _mesa_error(ctx, GL_INVALID_OPERATION, "glBindTexture");
+            _mesa_error(ctx, GL_INVALID_OPERATION, "glBindTexture(non-gen name)");
             return;
          }
 
diff --git a/mesalib/src/mesa/main/uniforms.c b/mesalib/src/mesa/main/uniforms.c
index d89255aaa..861601efd 100644
--- a/mesalib/src/mesa/main/uniforms.c
+++ b/mesalib/src/mesa/main/uniforms.c
@@ -808,33 +808,35 @@ _mesa_init_shader_uniform_dispatch(const struct gl_context *ctx,
                                    struct _glapi_table *exec)
 {
 #if FEATURE_GL
-   SET_Uniform1fARB(exec, _mesa_Uniform1fARB);
-   SET_Uniform2fARB(exec, _mesa_Uniform2fARB);
-   SET_Uniform3fARB(exec, _mesa_Uniform3fARB);
-   SET_Uniform4fARB(exec, _mesa_Uniform4fARB);
-   SET_Uniform1iARB(exec, _mesa_Uniform1iARB);
-   SET_Uniform2iARB(exec, _mesa_Uniform2iARB);
-   SET_Uniform3iARB(exec, _mesa_Uniform3iARB);
-   SET_Uniform4iARB(exec, _mesa_Uniform4iARB);
-   SET_Uniform1fvARB(exec, _mesa_Uniform1fvARB);
-   SET_Uniform2fvARB(exec, _mesa_Uniform2fvARB);
-   SET_Uniform3fvARB(exec, _mesa_Uniform3fvARB);
-   SET_Uniform4fvARB(exec, _mesa_Uniform4fvARB);
-   SET_Uniform1ivARB(exec, _mesa_Uniform1ivARB);
-   SET_Uniform2ivARB(exec, _mesa_Uniform2ivARB);
-   SET_Uniform3ivARB(exec, _mesa_Uniform3ivARB);
-   SET_Uniform4ivARB(exec, _mesa_Uniform4ivARB);
-   SET_UniformMatrix2fvARB(exec, _mesa_UniformMatrix2fvARB);
-   SET_UniformMatrix3fvARB(exec, _mesa_UniformMatrix3fvARB);
-   SET_UniformMatrix4fvARB(exec, _mesa_UniformMatrix4fvARB);
-
-   SET_GetActiveUniformARB(exec, _mesa_GetActiveUniformARB);
-   SET_GetUniformLocationARB(exec, _mesa_GetUniformLocationARB);
-   SET_GetUniformfvARB(exec, _mesa_GetUniformfvARB);
-   SET_GetUniformivARB(exec, _mesa_GetUniformivARB);
+   if (ctx->API != API_OPENGLES) {
+      SET_Uniform1fARB(exec, _mesa_Uniform1fARB);
+      SET_Uniform2fARB(exec, _mesa_Uniform2fARB);
+      SET_Uniform3fARB(exec, _mesa_Uniform3fARB);
+      SET_Uniform4fARB(exec, _mesa_Uniform4fARB);
+      SET_Uniform1iARB(exec, _mesa_Uniform1iARB);
+      SET_Uniform2iARB(exec, _mesa_Uniform2iARB);
+      SET_Uniform3iARB(exec, _mesa_Uniform3iARB);
+      SET_Uniform4iARB(exec, _mesa_Uniform4iARB);
+      SET_Uniform1fvARB(exec, _mesa_Uniform1fvARB);
+      SET_Uniform2fvARB(exec, _mesa_Uniform2fvARB);
+      SET_Uniform3fvARB(exec, _mesa_Uniform3fvARB);
+      SET_Uniform4fvARB(exec, _mesa_Uniform4fvARB);
+      SET_Uniform1ivARB(exec, _mesa_Uniform1ivARB);
+      SET_Uniform2ivARB(exec, _mesa_Uniform2ivARB);
+      SET_Uniform3ivARB(exec, _mesa_Uniform3ivARB);
+      SET_Uniform4ivARB(exec, _mesa_Uniform4ivARB);
+      SET_UniformMatrix2fvARB(exec, _mesa_UniformMatrix2fvARB);
+      SET_UniformMatrix3fvARB(exec, _mesa_UniformMatrix3fvARB);
+      SET_UniformMatrix4fvARB(exec, _mesa_UniformMatrix4fvARB);
+
+      SET_GetActiveUniformARB(exec, _mesa_GetActiveUniformARB);
+      SET_GetUniformLocationARB(exec, _mesa_GetUniformLocationARB);
+      SET_GetUniformfvARB(exec, _mesa_GetUniformfvARB);
+      SET_GetUniformivARB(exec, _mesa_GetUniformivARB);
+   }
 
    /* OpenGL 2.1 */
-   if (ctx->API != API_OPENGLES2 || _mesa_is_gles3(ctx)) {
+   if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) {
       SET_UniformMatrix2x3fv(exec, _mesa_UniformMatrix2x3fv);
       SET_UniformMatrix3x2fv(exec, _mesa_UniformMatrix3x2fv);
       SET_UniformMatrix2x4fv(exec, _mesa_UniformMatrix2x4fv);
diff --git a/mesalib/src/mesa/main/vtxfmt.c b/mesalib/src/mesa/main/vtxfmt.c
index 462cc8849..5891a5231 100644
--- a/mesalib/src/mesa/main/vtxfmt.c
+++ b/mesalib/src/mesa/main/vtxfmt.c
@@ -47,10 +47,13 @@ install_vtxfmt(struct gl_context *ctx, struct _glapi_table *tab,
                const GLvertexformat *vfmt)
 {
    if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) {
+      SET_Color4f(tab, vfmt->Color4f);
+   }
+
+   if (ctx->API == API_OPENGL) {
       _mesa_install_arrayelt_vtxfmt(tab, vfmt);
       SET_Color3f(tab, vfmt->Color3f);
       SET_Color3fv(tab, vfmt->Color3fv);
-      SET_Color4f(tab, vfmt->Color4f);
       SET_Color4fv(tab, vfmt->Color4fv);
       SET_EdgeFlag(tab, vfmt->EdgeFlag);
    }
@@ -60,21 +63,27 @@ install_vtxfmt(struct gl_context *ctx, struct _glapi_table *tab,
    }
 
    if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) {
+      SET_Materialfv(tab, vfmt->Materialfv);
+      SET_MultiTexCoord4fARB(tab, vfmt->MultiTexCoord4fARB);
+      SET_Normal3f(tab, vfmt->Normal3f);
+   }
+
+   if (ctx->API == API_OPENGL) {
       SET_FogCoordfEXT(tab, vfmt->FogCoordfEXT);
       SET_FogCoordfvEXT(tab, vfmt->FogCoordfvEXT);
       SET_Indexf(tab, vfmt->Indexf);
       SET_Indexfv(tab, vfmt->Indexfv);
-      SET_Materialfv(tab, vfmt->Materialfv);
       SET_MultiTexCoord1fARB(tab, vfmt->MultiTexCoord1fARB);
       SET_MultiTexCoord1fvARB(tab, vfmt->MultiTexCoord1fvARB);
       SET_MultiTexCoord2fARB(tab, vfmt->MultiTexCoord2fARB);
       SET_MultiTexCoord2fvARB(tab, vfmt->MultiTexCoord2fvARB);
       SET_MultiTexCoord3fARB(tab, vfmt->MultiTexCoord3fARB);
       SET_MultiTexCoord3fvARB(tab, vfmt->MultiTexCoord3fvARB);
-      SET_MultiTexCoord4fARB(tab, vfmt->MultiTexCoord4fARB);
       SET_MultiTexCoord4fvARB(tab, vfmt->MultiTexCoord4fvARB);
-      SET_Normal3f(tab, vfmt->Normal3f);
       SET_Normal3fv(tab, vfmt->Normal3fv);
+   }
+
+   if (ctx->API == API_OPENGL) {
       SET_SecondaryColor3fEXT(tab, vfmt->SecondaryColor3fEXT);
       SET_SecondaryColor3fvEXT(tab, vfmt->SecondaryColor3fvEXT);
       SET_TexCoord1f(tab, vfmt->TexCoord1f);
@@ -105,13 +114,13 @@ install_vtxfmt(struct gl_context *ctx, struct _glapi_table *tab,
 
    SET_DrawArrays(tab, vfmt->DrawArrays);
    SET_DrawElements(tab, vfmt->DrawElements);
-   if (ctx->API != API_OPENGLES2 || _mesa_is_gles3(ctx)) {
+   if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) {
       SET_DrawRangeElements(tab, vfmt->DrawRangeElements);
    }
 
    SET_MultiDrawElementsEXT(tab, vfmt->MultiDrawElementsEXT);
 
-   if (ctx->API != API_OPENGLES2) {
+   if (_mesa_is_desktop_gl(ctx)) {
       SET_DrawElementsBaseVertex(tab, vfmt->DrawElementsBaseVertex);
       SET_DrawRangeElementsBaseVertex(tab, vfmt->DrawRangeElementsBaseVertex);
       SET_MultiDrawElementsBaseVertex(tab, vfmt->MultiDrawElementsBaseVertex);
@@ -121,12 +130,12 @@ install_vtxfmt(struct gl_context *ctx, struct _glapi_table *tab,
       SET_DrawElementsInstancedBaseVertexBaseInstance(tab, vfmt->DrawElementsInstancedBaseVertexBaseInstance);
    }
 
-   if (ctx->API != API_OPENGLES2 || _mesa_is_gles3(ctx)) {
+   if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) {
       SET_DrawArraysInstancedARB(tab, vfmt->DrawArraysInstanced);
       SET_DrawElementsInstancedARB(tab, vfmt->DrawElementsInstanced);
    }
 
-   if (ctx->API != API_OPENGLES2) {
+   if (_mesa_is_desktop_gl(ctx)) {
       SET_DrawTransformFeedback(tab, vfmt->DrawTransformFeedback);
       SET_DrawTransformFeedbackStream(tab, vfmt->DrawTransformFeedbackStream);
       SET_DrawTransformFeedbackInstanced(tab,
@@ -147,17 +156,19 @@ install_vtxfmt(struct gl_context *ctx, struct _glapi_table *tab,
       SET_VertexAttrib4fvNV(tab, vfmt->VertexAttrib4fvNV);
    }
 
-   SET_VertexAttrib1fARB(tab, vfmt->VertexAttrib1fARB);
-   SET_VertexAttrib1fvARB(tab, vfmt->VertexAttrib1fvARB);
-   SET_VertexAttrib2fARB(tab, vfmt->VertexAttrib2fARB);
-   SET_VertexAttrib2fvARB(tab, vfmt->VertexAttrib2fvARB);
-   SET_VertexAttrib3fARB(tab, vfmt->VertexAttrib3fARB);
-   SET_VertexAttrib3fvARB(tab, vfmt->VertexAttrib3fvARB);
-   SET_VertexAttrib4fARB(tab, vfmt->VertexAttrib4fARB);
-   SET_VertexAttrib4fvARB(tab, vfmt->VertexAttrib4fvARB);
+   if (ctx->API != API_OPENGLES) {
+      SET_VertexAttrib1fARB(tab, vfmt->VertexAttrib1fARB);
+      SET_VertexAttrib1fvARB(tab, vfmt->VertexAttrib1fvARB);
+      SET_VertexAttrib2fARB(tab, vfmt->VertexAttrib2fARB);
+      SET_VertexAttrib2fvARB(tab, vfmt->VertexAttrib2fvARB);
+      SET_VertexAttrib3fARB(tab, vfmt->VertexAttrib3fARB);
+      SET_VertexAttrib3fvARB(tab, vfmt->VertexAttrib3fvARB);
+      SET_VertexAttrib4fARB(tab, vfmt->VertexAttrib4fARB);
+      SET_VertexAttrib4fvARB(tab, vfmt->VertexAttrib4fvARB);
+   }
 
    /* GL_EXT_gpu_shader4 / OpenGL 3.0 */
-   if (ctx->API != API_OPENGLES2) {
+   if (_mesa_is_desktop_gl(ctx)) {
       SET_VertexAttribI1iEXT(tab, vfmt->VertexAttribI1i);
       SET_VertexAttribI2iEXT(tab, vfmt->VertexAttribI2i);
       SET_VertexAttribI3iEXT(tab, vfmt->VertexAttribI3i);
@@ -171,14 +182,14 @@ install_vtxfmt(struct gl_context *ctx, struct _glapi_table *tab,
       SET_VertexAttribI3uivEXT(tab, vfmt->VertexAttribI3uiv);
    }
 
-   if (ctx->API != API_OPENGLES2 || _mesa_is_gles3(ctx)) {
+   if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) {
       SET_VertexAttribI4iEXT(tab, vfmt->VertexAttribI4i);
       SET_VertexAttribI4ivEXT(tab, vfmt->VertexAttribI4iv);
       SET_VertexAttribI4uiEXT(tab, vfmt->VertexAttribI4ui);
       SET_VertexAttribI4uivEXT(tab, vfmt->VertexAttribI4uiv);
    }
 
-   if (ctx->API != API_OPENGL_CORE && ctx->API != API_OPENGLES2) {
+   if (ctx->API == API_OPENGL) {
       /* GL_ARB_vertex_type_10_10_10_2_rev / GL 3.3 */
       SET_VertexP2ui(tab, vfmt->VertexP2ui);
       SET_VertexP2uiv(tab, vfmt->VertexP2uiv);
@@ -217,7 +228,7 @@ install_vtxfmt(struct gl_context *ctx, struct _glapi_table *tab,
       SET_SecondaryColorP3uiv(tab, vfmt->SecondaryColorP3uiv);
    }
 
-   if (ctx->API != API_OPENGLES2) {
+   if (_mesa_is_desktop_gl(ctx)) {
       SET_VertexAttribP1ui(tab, vfmt->VertexAttribP1ui);
       SET_VertexAttribP2ui(tab, vfmt->VertexAttribP2ui);
       SET_VertexAttribP3ui(tab, vfmt->VertexAttribP3ui);
diff --git a/mesalib/src/mesa/sources.mak b/mesalib/src/mesa/sources.mak
index b14ec13ed..b4b58db6d 100644
--- a/mesalib/src/mesa/sources.mak
+++ b/mesalib/src/mesa/sources.mak
@@ -5,7 +5,6 @@
 
 # this is part of MAIN_FILES
 MAIN_ES_FILES = \
-	$(BUILDDIR)main/api_exec_es1.c \
 	$(SRCDIR)main/es1_conversion.c
 
 MAIN_FILES = \
diff --git a/mesalib/src/mesa/swrast/s_texfetch.c b/mesalib/src/mesa/swrast/s_texfetch.c
index 741dd876c..7bfe3b941 100644
--- a/mesalib/src/mesa/swrast/s_texfetch.c
+++ b/mesalib/src/mesa/swrast/s_texfetch.c
@@ -115,7 +115,7 @@ static struct {
    FetchTexelFunc Fetch2D;
    FetchTexelFunc Fetch3D;
 }
-texfetch_funcs[MESA_FORMAT_COUNT] =
+texfetch_funcs[] =
 {
    {
       MESA_FORMAT_NONE,
diff --git a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj
index 7b085be5d..b723270a4 100644
--- a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj
+++ b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj
@@ -94,7 +94,7 @@
     <ClCompile Include="..\..\..\..\src\glsl\ast_function.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\ast_to_hir.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\ast_type.cpp" />
-    <ClCompile Include="..\..\..\..\src\glsl\builtin_stubs.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\builtin_compiler\builtin_stubs.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\getopt.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-lex.c" />
     <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-parse.c" />
diff --git a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters
index 020239bc4..5389735d7 100644
--- a/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters
+++ b/mesalib/windows/VC8/mesa/glsl_apps_compile/glsl_apps_compile.vcxproj.filters
@@ -231,9 +231,6 @@
     <ClCompile Include="..\..\..\..\src\glsl\opt_swizzle_swizzle.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\glsl\builtin_stubs.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\src\glsl\opt_copy_propagation_elements.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -249,6 +246,9 @@
     <ClCompile Include="..\..\..\..\src\glsl\link_uniform_initializers.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\builtin_compiler\builtin_stubs.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\src\glsl\strtod.h">
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
index 28dafee1f..f9b8adbbd 100644
--- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
+++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -107,7 +107,7 @@
     <ClCompile Include="..\..\..\..\src\glsl\ast_function.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\ast_to_hir.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\ast_type.cpp" />
-    <ClCompile Include="..\..\..\..\src\glsl\builtin_stubs.cpp" />
+    <ClCompile Include="..\..\..\..\src\glsl\builtin_compiler\builtin_stubs.cpp" />
     <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-lex.c" />
     <ClCompile Include="..\..\..\..\src\glsl\glcpp\glcpp-parse.c" />
     <ClCompile Include="..\..\..\..\src\glsl\glcpp\pp.c" />
@@ -367,4 +367,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
+\ No newline at end of file
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
index 1b0466fa1..0105596e4 100644
--- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
+++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj.filters
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
@@ -656,9 +656,6 @@
     <ClCompile Include="..\..\..\..\src\mesa\program\sampler.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\..\src\glsl\builtin_stubs.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\..\src\glsl\opt_copy_propagation_elements.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -698,6 +695,9 @@
     <ClCompile Include="..\..\..\..\src\mesa\main\texcompress_cpal.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\src\glsl\builtin_compiler\builtin_stubs.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\..\src\glsl\strtod.h">
@@ -714,4 +714,4 @@
       <Filter>Source Files</Filter>
     </None>
   </ItemGroup>
-</Project>
+</Project>
+\ No newline at end of file
diff --git a/xkbcomp/parseutils.c b/xkbcomp/parseutils.c
index 025e1ef3f..4b2a3e605 100644
--- a/xkbcomp/parseutils.c
+++ b/xkbcomp/parseutils.c
@@ -802,7 +802,7 @@ XKBParseFile(FILE * file, XkbFile ** pRtrn)
 {
     if (file)
     {
-        yyin = file;
+        scan_set_file(file);
         rtrnValue = NULL;
         if (yyparse() == 0)
         {
diff --git a/xkbcomp/parseutils.h b/xkbcomp/parseutils.h
index 8b8a6c11d..8c381d408 100644
--- a/xkbcomp/parseutils.h
+++ b/xkbcomp/parseutils.h
@@ -198,11 +198,10 @@ extern int yywrap(void);
 
 extern int yylex(void);
 extern int yyparse(void);
+extern void scan_set_file(FILE *file);
 
 extern int setScanState(char * /* file */ ,
                         int     /* line */
     );
 
-extern FILE *yyin;
-
 #endif /* XKBPARSE_H */
diff --git a/xkbcomp/xkbcomp.c b/xkbcomp/xkbcomp.c
index c418ac196..834c777ee 100644
--- a/xkbcomp/xkbcomp.c
+++ b/xkbcomp/xkbcomp.c
@@ -883,7 +883,7 @@ main(int argc, char *argv[])
     XkbFileInfo result;
     Status status;
 
-    yyin = stdin;
+    scan_set_file(stdin);
     uSetEntryFile(NullString);
     uSetDebugFile(NullString);
     uSetErrorFile(NullString);
diff --git a/xkbcomp/xkbparse.y b/xkbcomp/xkbparse.y
index d2b23b0e3..87dd07f20 100644
--- a/xkbcomp/xkbparse.y
+++ b/xkbcomp/xkbparse.y
@@ -145,7 +145,7 @@ unsigned int parseDebug;
 %type <str>	KeyName MapName OptMapName KeySym
 %type <sval>	FieldSpec Ident Element String 
 %type <any>	DeclList Decl 
-%type <expr>	OptExprList ExprList Expr Term Lhs Terminal ArrayInit
+%type <expr>	OptExprList ExprList Expr Term Lhs Terminal ArrayInit KeySyms
 %type <expr>	OptKeySymList KeySymList Action ActionList Coord CoordList
 %type <var>	VarDecl VarDeclList SymbolsBody SymbolsVarDecl 
 %type <vmod>	VModDecl VModDefList VModDef
@@ -721,8 +721,12 @@ OptKeySymList	:	KeySymList			{ $$= $1; }
 
 KeySymList	:	KeySymList COMMA KeySym
 			{ $$= AppendKeysymList($1,$3); }
+                |       KeySymList COMMA KeySyms
+                        { $$= AppendKeysymList($1,strdup("NoSymbol")); }
 		|	KeySym
 			{ $$= CreateKeysymList($1); }
+		|	KeySyms
+			{ $$= CreateKeysymList(strdup("NoSymbol")); }
 		;
 
 KeySym		:	IDENT           { $$= strdup(scanBuf); }
@@ -734,6 +738,10 @@ KeySym		:	IDENT           { $$= strdup(scanBuf); }
 			}
 		;
 
+KeySyms         :       OBRACE KeySymList CBRACE
+                        { $$= $2; }
+                ;
+
 SignedNumber	:	MINUS Number    { $$= -$2; }
 		|	Number              { $$= $1; }
 		;
diff --git a/xkbcomp/xkbscan.c b/xkbcomp/xkbscan.c
index 4fb575536..3aa77472a 100644
--- a/xkbcomp/xkbscan.c
+++ b/xkbcomp/xkbscan.c
@@ -37,7 +37,7 @@
 
 unsigned int scanDebug;
 
-FILE *yyin = NULL;
+static FILE *yyin;
 
 static char scanFileBuf[1024] = {0};
 char *scanFile = scanFileBuf;
@@ -269,6 +269,14 @@ tokText(int tok)
 }
 #endif
 
+void
+scan_set_file(FILE *file)
+{
+    readBufLen = 0;
+    readBufPos = 0;
+    yyin = file;
+}
+
 static int
 scanchar(void)
 {
diff --git a/xorg-server/Xi/chgdctl.c b/xorg-server/Xi/chgdctl.c
index ec5975981..916226ea4 100644
--- a/xorg-server/Xi/chgdctl.c
+++ b/xorg-server/Xi/chgdctl.c
@@ -127,6 +127,7 @@ ProcXChangeDeviceControl(ClientPtr client)
     rep.RepType = X_ChangeDeviceControl;
     rep.sequenceNumber = client->sequence;
     rep.length = 0;
+    rep.status = Success;
 
     switch (stuff->control) {
     case DEVICE_RESOLUTION:
diff --git a/xorg-server/Xi/exevents.c b/xorg-server/Xi/exevents.c
index 2a097d74f..2a77ac22d 100644
--- a/xorg-server/Xi/exevents.c
+++ b/xorg-server/Xi/exevents.c
@@ -1866,6 +1866,11 @@ DeliverTouchEndEvent(DeviceIntPtr dev, TouchPointInfoPtr ti, InternalEvent *ev,
         goto out;
     }
 
+    if (listener->state == LISTENER_AWAITING_BEGIN) {
+        listener->state = LISTENER_HAS_END;
+        goto out;
+    }
+
     /* Event in response to reject */
     if (ev->device_event.flags & TOUCH_REJECT) {
         if (listener->state != LISTENER_HAS_END)
diff --git a/xorg-server/Xi/xiproperty.c b/xorg-server/Xi/xiproperty.c
index 39c55f823..ba5d99912 100644
--- a/xorg-server/Xi/xiproperty.c
+++ b/xorg-server/Xi/xiproperty.c
@@ -105,6 +105,9 @@ static struct dev_properties {
     {0, AXIS_LABEL_PROP_ABS_MT_BLOB_ID},
     {0, AXIS_LABEL_PROP_ABS_MT_TRACKING_ID},
     {0, AXIS_LABEL_PROP_ABS_MT_PRESSURE},
+    {0, AXIS_LABEL_PROP_ABS_MT_DISTANCE},
+    {0, AXIS_LABEL_PROP_ABS_MT_TOOL_X},
+    {0, AXIS_LABEL_PROP_ABS_MT_TOOL_Y},
     {0, AXIS_LABEL_PROP_ABS_MISC},
     {0, BTN_LABEL_PROP},
     {0, BTN_LABEL_PROP_BTN_UNKNOWN},
diff --git a/xorg-server/configure.ac b/xorg-server/configure.ac
index b6ed92cb3..86153ec81 100644
--- a/xorg-server/configure.ac
+++ b/xorg-server/configure.ac
@@ -420,7 +420,7 @@ case $host_os in
   darwin*)
 	AC_DEFINE(CSRG_BASED, 1, [System is BSD-like])
 	;;
-  cygwin*)
+  cygwin*|mingw*)
 	CFLAGS="$CFLAGS -DFD_SETSIZE=256"
 	;;
 esac
@@ -1904,7 +1904,7 @@ if test "x$XWIN" = xyes; then
 			XWIN_SERVER_NAME=Xming
 			AC_DEFINE(RELOCATE_PROJECTROOT,1,[Make PROJECT_ROOT relative to the xserver location])
 			AC_DEFINE(HAS_WINSOCK,1,[Use Windows sockets])
-			XWIN_SYS_LIBS=-lws2_32
+			XWIN_SYS_LIBS="-lpthread -lws2_32"
 			;;
 	esac
 
diff --git a/xorg-server/dix/getevents.c b/xorg-server/dix/getevents.c
index 4cf06406d..d4badc03d 100644
--- a/xorg-server/dix/getevents.c
+++ b/xorg-server/dix/getevents.c
@@ -1198,7 +1198,6 @@ transform(struct pixman_f_transform *m, double *x, double *y)
 
     pixman_f_transform_point(m, &p);
 
-
     *x = p.v[0];
     *y = p.v[1];
 }
@@ -1348,6 +1347,7 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type,
     RawDeviceEvent *raw;
     double screenx = 0.0, screeny = 0.0;        /* desktop coordinate system */
     double devx = 0.0, devy = 0.0;      /* desktop-wide in device coords */
+    int sx, sy;                         /* for POINTER_SCREEN */
     ValuatorMask mask;
     ScreenPtr scr;
 
@@ -1390,8 +1390,11 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type,
     /* valuators are in driver-native format (rel or abs) */
 
     if (flags & POINTER_ABSOLUTE) {
-        if (flags & POINTER_SCREEN)     /* valuators are in screen coords */
+        if (flags & POINTER_SCREEN) {    /* valuators are in screen coords */
+            sx = valuator_mask_get(&mask, 0);
+            sy = valuator_mask_get(&mask, 1);
             scale_from_screen(pDev, &mask);
+        }
 
         transformAbsolute(pDev, &mask);
         clipAbsolute(pDev, &mask);
@@ -1409,6 +1412,19 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type,
 
     /* valuators are in device coordinate system in absolute coordinates */
     scale_to_desktop(pDev, &mask, &devx, &devy, &screenx, &screeny);
+
+    /* #53037 XWarpPointer's scaling back and forth between screen and
+       device may leave us with rounding errors. End result is that the
+       pointer doesn't end up on the pixel it should.
+       Avoid this by forcing screenx/screeny back to what the input
+       coordinates were.
+     */
+    if (flags & POINTER_SCREEN) {
+        scr = miPointerGetScreen(pDev);
+        screenx = sx + scr->x;
+        screeny = sy + scr->y;
+    }
+
     scr = positionSprite(pDev, (flags & POINTER_ABSOLUTE) ? Absolute : Relative,
                          &mask, &devx, &devy, &screenx, &screeny);
 
diff --git a/xorg-server/dix/touch.c b/xorg-server/dix/touch.c
index e64a6262c..5f77be575 100644
--- a/xorg-server/dix/touch.c
+++ b/xorg-server/dix/touch.c
@@ -572,8 +572,8 @@ TouchBuildSprite(DeviceIntPtr sourcedev, TouchPointInfoPtr ti,
         return FALSE;
 
     /* Mark which grabs/event selections we're delivering to: max one grab per
-     * window plus the bottom-most event selection. */
-    ti->listeners = calloc(sprite->spriteTraceGood + 1, sizeof(*ti->listeners));
+     * window plus the bottom-most event selection, plus any active grab. */
+    ti->listeners = calloc(sprite->spriteTraceGood + 2, sizeof(*ti->listeners));
     if (!ti->listeners) {
         sprite->spriteTraceGood = 0;
         return FALSE;
diff --git a/xorg-server/doc/c-extensions b/xorg-server/doc/c-extensions
index 984022333..4a9006150 100644
--- a/xorg-server/doc/c-extensions
+++ b/xorg-server/doc/c-extensions
@@ -1,61 +1,68 @@
-First of all: C89 or better.  If you don't have that, port gcc first.
-
-Use of C language extensions throughout the X server tree
----------------------------------------------------------
-
-Optional extensions:
-The server will still build if your toolchain does not support these
-extensions, although the results may not be optimal.
-
-    * _X_SENTINEL(x): member x of the passed structure must be NULL, e.g.:
-                      void parseOptions(Option *options _X_SENTINEL(0));
-                      parseOptions("foo", "bar", NULL); /* this is OK */
-                      parseOptions("foo", "bar", "baz"); /* this is not */
-                      This definition comes from Xfuncproto.h in the core
-                      protocol headers.
-    * _X_ATTRIBUTE_PRINTF(x, y): This function has printf-like semantics;
-                                 check the format string when built with
-                                 -Wformat (gcc) or similar.
-    * _X_EXPORT: this function should appear in symbol tables.
-    * _X_HIDDEN: this function should not appear in the _dynamic_ symbol
-                 table.
-    * _X_INTERNAL: like _X_HIDDEN, but attempt to ensure that this function
-                   is never called from another module.
-    * _X_INLINE: inline this functon if possible (generally obeyed unless
-                 disabling optimisations).
-    * _X_DEPRECATED: warn on use of this function.
-
-Mandatory extensions:
-The server will not build if your toolchain does not support these extensions.
-
-    * named initialisers: explicitly initialising structure members, e.g.:
-                          struct foo bar = { .baz = quux, .brian = "dog" };
-    * variadic macros: macros with a variable number of arguments, e.g.:
-                       #define DebugF(x, ...) /**/
-    * interleaved code and declarations: { foo = TRUE; int bar; do_stuff(); }
-
-
-Use of OS and library facilities throughout the X server tree
--------------------------------------------------------------
-
-Non-OS-dependent code can assume facilities at least as good as
-the non-OS-facility parts of POSIX-1.2001.  Ideally this would
-be C99, but even gcc+glibc doesn't implement that yet.
-
-Unix-like systems are assumed to be at least as good as UNIX03.
-
-Linux systems must be at least 2.4 or later.  As a practical matter
-though, 2.4 kernels never receive any testing.  Use 2.6 already.
-
-TODO: Solaris.
-
-TODO: *BSD.
-
-Code that needs to be portable to Windows should be careful to,
-well, be portable.  Note that there are two Windows ports, cygwin and
-mingw.  Cygwin is more or less like Linux, but mingw is a bit more
-restrictive.  TODO: document which versions of Windows we actually care
-about.
-
-OSX support is generally limited to the most recent version.  Currently
-that means 10.5.
+First of all: C89 or better.  If you don't have that, port gcc first.
+
+Use of C language extensions throughout the X server tree
+---------------------------------------------------------
+
+Optional extensions:
+The server will still build if your toolchain does not support these
+extensions, although the results may not be optimal.
+
+    * _X_SENTINEL(x): member x of the passed structure must be NULL, e.g.:
+                      void parseOptions(Option *options _X_SENTINEL(0));
+                      parseOptions("foo", "bar", NULL); /* this is OK */
+                      parseOptions("foo", "bar", "baz"); /* this is not */
+                      This definition comes from Xfuncproto.h in the core
+                      protocol headers.
+    * _X_ATTRIBUTE_PRINTF(x, y): This function has printf-like semantics;
+                                 check the format string when built with
+                                 -Wformat (gcc) or similar.
+    * _X_EXPORT: this function should appear in symbol tables.
+    * _X_HIDDEN: this function should not appear in the _dynamic_ symbol
+                 table.
+    * _X_INTERNAL: like _X_HIDDEN, but attempt to ensure that this function
+                   is never called from another module.
+    * _X_INLINE: inline this functon if possible (generally obeyed unless
+                 disabling optimisations).
+    * _X_DEPRECATED: warn on use of this function.
+
+Mandatory extensions:
+The server will not build if your toolchain does not support these extensions.
+
+    * named initialisers: explicitly initialising structure members, e.g.:
+                          struct foo bar = { .baz = quux, .brian = "dog" };
+    * variadic macros: macros with a variable number of arguments, e.g.:
+                       #define DebugF(x, ...) /**/
+    * interleaved code and declarations: { foo = TRUE; int bar; do_stuff(); }
+
+
+Use of library facilities throughout the X server tree
+-------------------------------------------------------------
+
+Non-OS-dependent code can assume facilities at least as good as
+the non-OS-facility parts of POSIX-1.2001.  Ideally this would
+be C99, but even gcc+glibc doesn't implement that yet.
+
+Unix-like systems are assumed to be at least as good as UNIX03.
+
+Note that there are two Windows ports, Cygwin and MinGW:
+- Cygwin is more or less like Linux.
+- MinGW is more restrictive. Windows does not provide the required
+POSIX facilities, so some non-OS-dependent code is stubbed out or
+has an alternate implementation if WIN32 is defined.  Code that
+needs to be portable to Windows should be careful to, well, be portable.
+
+
+Required OS facilities
+-------------------------------------------------------------
+
+Linux systems must be at least 2.4 or later.  As a practical matter
+though, 2.4 kernels never receive any testing.  Use 2.6 already.
+
+TODO: Solaris.
+
+TODO: *BSD.
+
+Windows-dependent code assumes at least NT 5.1.
+
+OSX support is generally limited to the most recent version.  Currently
+that means 10.5.
diff --git a/xorg-server/glx/dispatch.h b/xorg-server/glx/dispatch.h
index 1c8738187..feab6b6ad 100644
--- a/xorg-server/glx/dispatch.h
+++ b/xorg-server/glx/dispatch.h
@@ -69,7 +69,7 @@
     } while(0)
 
 /* total number of offsets below */
-#define _gloffset_COUNT 970
+#define _gloffset_COUNT 969
 
 #define _gloffset_NewList 0
 #define _gloffset_EndList 1
@@ -504,550 +504,549 @@
 #define _gloffset_UniformMatrix3x4fv 427
 #define _gloffset_UniformMatrix4x2fv 428
 #define _gloffset_UniformMatrix4x3fv 429
-#define _gloffset_ClampColor 430
-#define _gloffset_ClearBufferfi 431
-#define _gloffset_ClearBufferfv 432
-#define _gloffset_ClearBufferiv 433
-#define _gloffset_ClearBufferuiv 434
-#define _gloffset_GetStringi 435
-#define _gloffset_FramebufferTexture 436
-#define _gloffset_GetBufferParameteri64v 437
-#define _gloffset_GetInteger64i_v 438
-#define _gloffset_VertexAttribDivisor 439
-#define _gloffset_LoadTransposeMatrixdARB 440
-#define _gloffset_LoadTransposeMatrixfARB 441
-#define _gloffset_MultTransposeMatrixdARB 442
-#define _gloffset_MultTransposeMatrixfARB 443
-#define _gloffset_SampleCoverageARB 444
-#define _gloffset_CompressedTexImage1DARB 445
-#define _gloffset_CompressedTexImage2DARB 446
-#define _gloffset_CompressedTexImage3DARB 447
-#define _gloffset_CompressedTexSubImage1DARB 448
-#define _gloffset_CompressedTexSubImage2DARB 449
-#define _gloffset_CompressedTexSubImage3DARB 450
-#define _gloffset_GetCompressedTexImageARB 451
-#define _gloffset_DisableVertexAttribArrayARB 452
-#define _gloffset_EnableVertexAttribArrayARB 453
-#define _gloffset_GetProgramEnvParameterdvARB 454
-#define _gloffset_GetProgramEnvParameterfvARB 455
-#define _gloffset_GetProgramLocalParameterdvARB 456
-#define _gloffset_GetProgramLocalParameterfvARB 457
-#define _gloffset_GetProgramStringARB 458
-#define _gloffset_GetProgramivARB 459
-#define _gloffset_GetVertexAttribdvARB 460
-#define _gloffset_GetVertexAttribfvARB 461
-#define _gloffset_GetVertexAttribivARB 462
-#define _gloffset_ProgramEnvParameter4dARB 463
-#define _gloffset_ProgramEnvParameter4dvARB 464
-#define _gloffset_ProgramEnvParameter4fARB 465
-#define _gloffset_ProgramEnvParameter4fvARB 466
-#define _gloffset_ProgramLocalParameter4dARB 467
-#define _gloffset_ProgramLocalParameter4dvARB 468
-#define _gloffset_ProgramLocalParameter4fARB 469
-#define _gloffset_ProgramLocalParameter4fvARB 470
-#define _gloffset_ProgramStringARB 471
-#define _gloffset_VertexAttrib1dARB 472
-#define _gloffset_VertexAttrib1dvARB 473
-#define _gloffset_VertexAttrib1fARB 474
-#define _gloffset_VertexAttrib1fvARB 475
-#define _gloffset_VertexAttrib1sARB 476
-#define _gloffset_VertexAttrib1svARB 477
-#define _gloffset_VertexAttrib2dARB 478
-#define _gloffset_VertexAttrib2dvARB 479
-#define _gloffset_VertexAttrib2fARB 480
-#define _gloffset_VertexAttrib2fvARB 481
-#define _gloffset_VertexAttrib2sARB 482
-#define _gloffset_VertexAttrib2svARB 483
-#define _gloffset_VertexAttrib3dARB 484
-#define _gloffset_VertexAttrib3dvARB 485
-#define _gloffset_VertexAttrib3fARB 486
-#define _gloffset_VertexAttrib3fvARB 487
-#define _gloffset_VertexAttrib3sARB 488
-#define _gloffset_VertexAttrib3svARB 489
-#define _gloffset_VertexAttrib4NbvARB 490
-#define _gloffset_VertexAttrib4NivARB 491
-#define _gloffset_VertexAttrib4NsvARB 492
-#define _gloffset_VertexAttrib4NubARB 493
-#define _gloffset_VertexAttrib4NubvARB 494
-#define _gloffset_VertexAttrib4NuivARB 495
-#define _gloffset_VertexAttrib4NusvARB 496
-#define _gloffset_VertexAttrib4bvARB 497
-#define _gloffset_VertexAttrib4dARB 498
-#define _gloffset_VertexAttrib4dvARB 499
-#define _gloffset_VertexAttrib4fARB 500
-#define _gloffset_VertexAttrib4fvARB 501
-#define _gloffset_VertexAttrib4ivARB 502
-#define _gloffset_VertexAttrib4sARB 503
-#define _gloffset_VertexAttrib4svARB 504
-#define _gloffset_VertexAttrib4ubvARB 505
-#define _gloffset_VertexAttrib4uivARB 506
-#define _gloffset_VertexAttrib4usvARB 507
-#define _gloffset_VertexAttribPointerARB 508
-#define _gloffset_BindBufferARB 509
-#define _gloffset_BufferDataARB 510
-#define _gloffset_BufferSubDataARB 511
-#define _gloffset_DeleteBuffersARB 512
-#define _gloffset_GenBuffersARB 513
-#define _gloffset_GetBufferParameterivARB 514
-#define _gloffset_GetBufferPointervARB 515
-#define _gloffset_GetBufferSubDataARB 516
-#define _gloffset_IsBufferARB 517
-#define _gloffset_MapBufferARB 518
-#define _gloffset_UnmapBufferARB 519
-#define _gloffset_BeginQueryARB 520
-#define _gloffset_DeleteQueriesARB 521
-#define _gloffset_EndQueryARB 522
-#define _gloffset_GenQueriesARB 523
-#define _gloffset_GetQueryObjectivARB 524
-#define _gloffset_GetQueryObjectuivARB 525
-#define _gloffset_GetQueryivARB 526
-#define _gloffset_IsQueryARB 527
-#define _gloffset_AttachObjectARB 528
-#define _gloffset_CompileShaderARB 529
-#define _gloffset_CreateProgramObjectARB 530
-#define _gloffset_CreateShaderObjectARB 531
-#define _gloffset_DeleteObjectARB 532
-#define _gloffset_DetachObjectARB 533
-#define _gloffset_GetActiveUniformARB 534
-#define _gloffset_GetAttachedObjectsARB 535
-#define _gloffset_GetHandleARB 536
-#define _gloffset_GetInfoLogARB 537
-#define _gloffset_GetObjectParameterfvARB 538
-#define _gloffset_GetObjectParameterivARB 539
-#define _gloffset_GetShaderSourceARB 540
-#define _gloffset_GetUniformLocationARB 541
-#define _gloffset_GetUniformfvARB 542
-#define _gloffset_GetUniformivARB 543
-#define _gloffset_LinkProgramARB 544
-#define _gloffset_ShaderSourceARB 545
-#define _gloffset_Uniform1fARB 546
-#define _gloffset_Uniform1fvARB 547
-#define _gloffset_Uniform1iARB 548
-#define _gloffset_Uniform1ivARB 549
-#define _gloffset_Uniform2fARB 550
-#define _gloffset_Uniform2fvARB 551
-#define _gloffset_Uniform2iARB 552
-#define _gloffset_Uniform2ivARB 553
-#define _gloffset_Uniform3fARB 554
-#define _gloffset_Uniform3fvARB 555
-#define _gloffset_Uniform3iARB 556
-#define _gloffset_Uniform3ivARB 557
-#define _gloffset_Uniform4fARB 558
-#define _gloffset_Uniform4fvARB 559
-#define _gloffset_Uniform4iARB 560
-#define _gloffset_Uniform4ivARB 561
-#define _gloffset_UniformMatrix2fvARB 562
-#define _gloffset_UniformMatrix3fvARB 563
-#define _gloffset_UniformMatrix4fvARB 564
-#define _gloffset_UseProgramObjectARB 565
-#define _gloffset_ValidateProgramARB 566
-#define _gloffset_BindAttribLocationARB 567
-#define _gloffset_GetActiveAttribARB 568
-#define _gloffset_GetAttribLocationARB 569
-#define _gloffset_DrawBuffersARB 570
-#define _gloffset_ClampColorARB 571
-#define _gloffset_DrawArraysInstancedARB 572
-#define _gloffset_DrawElementsInstancedARB 573
-#define _gloffset_RenderbufferStorageMultisample 574
-#define _gloffset_FramebufferTextureARB 575
-#define _gloffset_FramebufferTextureFaceARB 576
-#define _gloffset_ProgramParameteriARB 577
-#define _gloffset_VertexAttribDivisorARB 578
-#define _gloffset_FlushMappedBufferRange 579
-#define _gloffset_MapBufferRange 580
-#define _gloffset_TexBufferARB 581
-#define _gloffset_BindVertexArray 582
-#define _gloffset_GenVertexArrays 583
-#define _gloffset_GetActiveUniformBlockName 584
-#define _gloffset_GetActiveUniformBlockiv 585
-#define _gloffset_GetActiveUniformName 586
-#define _gloffset_GetActiveUniformsiv 587
-#define _gloffset_GetUniformBlockIndex 588
-#define _gloffset_GetUniformIndices 589
-#define _gloffset_UniformBlockBinding 590
-#define _gloffset_CopyBufferSubData 591
-#define _gloffset_ClientWaitSync 592
-#define _gloffset_DeleteSync 593
-#define _gloffset_FenceSync 594
-#define _gloffset_GetInteger64v 595
-#define _gloffset_GetSynciv 596
-#define _gloffset_IsSync 597
-#define _gloffset_WaitSync 598
-#define _gloffset_DrawElementsBaseVertex 599
-#define _gloffset_DrawElementsInstancedBaseVertex 600
-#define _gloffset_DrawRangeElementsBaseVertex 601
-#define _gloffset_MultiDrawElementsBaseVertex 602
-#define _gloffset_BlendEquationSeparateiARB 603
-#define _gloffset_BlendEquationiARB 604
-#define _gloffset_BlendFuncSeparateiARB 605
-#define _gloffset_BlendFunciARB 606
-#define _gloffset_BindFragDataLocationIndexed 607
-#define _gloffset_GetFragDataIndex 608
-#define _gloffset_BindSampler 609
-#define _gloffset_DeleteSamplers 610
-#define _gloffset_GenSamplers 611
-#define _gloffset_GetSamplerParameterIiv 612
-#define _gloffset_GetSamplerParameterIuiv 613
-#define _gloffset_GetSamplerParameterfv 614
-#define _gloffset_GetSamplerParameteriv 615
-#define _gloffset_IsSampler 616
-#define _gloffset_SamplerParameterIiv 617
-#define _gloffset_SamplerParameterIuiv 618
-#define _gloffset_SamplerParameterf 619
-#define _gloffset_SamplerParameterfv 620
-#define _gloffset_SamplerParameteri 621
-#define _gloffset_SamplerParameteriv 622
-#define _gloffset_QueryCounter 623
-#define _gloffset_ColorP3ui 624
-#define _gloffset_ColorP3uiv 625
-#define _gloffset_ColorP4ui 626
-#define _gloffset_ColorP4uiv 627
-#define _gloffset_MultiTexCoordP1ui 628
-#define _gloffset_MultiTexCoordP1uiv 629
-#define _gloffset_MultiTexCoordP2ui 630
-#define _gloffset_MultiTexCoordP2uiv 631
-#define _gloffset_MultiTexCoordP3ui 632
-#define _gloffset_MultiTexCoordP3uiv 633
-#define _gloffset_MultiTexCoordP4ui 634
-#define _gloffset_MultiTexCoordP4uiv 635
-#define _gloffset_NormalP3ui 636
-#define _gloffset_NormalP3uiv 637
-#define _gloffset_SecondaryColorP3ui 638
-#define _gloffset_SecondaryColorP3uiv 639
-#define _gloffset_TexCoordP1ui 640
-#define _gloffset_TexCoordP1uiv 641
-#define _gloffset_TexCoordP2ui 642
-#define _gloffset_TexCoordP2uiv 643
-#define _gloffset_TexCoordP3ui 644
-#define _gloffset_TexCoordP3uiv 645
-#define _gloffset_TexCoordP4ui 646
-#define _gloffset_TexCoordP4uiv 647
-#define _gloffset_VertexAttribP1ui 648
-#define _gloffset_VertexAttribP1uiv 649
-#define _gloffset_VertexAttribP2ui 650
-#define _gloffset_VertexAttribP2uiv 651
-#define _gloffset_VertexAttribP3ui 652
-#define _gloffset_VertexAttribP3uiv 653
-#define _gloffset_VertexAttribP4ui 654
-#define _gloffset_VertexAttribP4uiv 655
-#define _gloffset_VertexP2ui 656
-#define _gloffset_VertexP2uiv 657
-#define _gloffset_VertexP3ui 658
-#define _gloffset_VertexP3uiv 659
-#define _gloffset_VertexP4ui 660
-#define _gloffset_VertexP4uiv 661
-#define _gloffset_BindTransformFeedback 662
-#define _gloffset_DeleteTransformFeedbacks 663
-#define _gloffset_DrawTransformFeedback 664
-#define _gloffset_GenTransformFeedbacks 665
-#define _gloffset_IsTransformFeedback 666
-#define _gloffset_PauseTransformFeedback 667
-#define _gloffset_ResumeTransformFeedback 668
-#define _gloffset_BeginQueryIndexed 669
-#define _gloffset_DrawTransformFeedbackStream 670
-#define _gloffset_EndQueryIndexed 671
-#define _gloffset_GetQueryIndexediv 672
-#define _gloffset_ClearDepthf 673
-#define _gloffset_DepthRangef 674
-#define _gloffset_GetShaderPrecisionFormat 675
-#define _gloffset_ReleaseShaderCompiler 676
-#define _gloffset_ShaderBinary 677
-#define _gloffset_DebugMessageCallbackARB 678
-#define _gloffset_DebugMessageControlARB 679
-#define _gloffset_DebugMessageInsertARB 680
-#define _gloffset_GetDebugMessageLogARB 681
-#define _gloffset_GetGraphicsResetStatusARB 682
-#define _gloffset_GetnColorTableARB 683
-#define _gloffset_GetnCompressedTexImageARB 684
-#define _gloffset_GetnConvolutionFilterARB 685
-#define _gloffset_GetnHistogramARB 686
-#define _gloffset_GetnMapdvARB 687
-#define _gloffset_GetnMapfvARB 688
-#define _gloffset_GetnMapivARB 689
-#define _gloffset_GetnMinmaxARB 690
-#define _gloffset_GetnPixelMapfvARB 691
-#define _gloffset_GetnPixelMapuivARB 692
-#define _gloffset_GetnPixelMapusvARB 693
-#define _gloffset_GetnPolygonStippleARB 694
-#define _gloffset_GetnSeparableFilterARB 695
-#define _gloffset_GetnTexImageARB 696
-#define _gloffset_GetnUniformdvARB 697
-#define _gloffset_GetnUniformfvARB 698
-#define _gloffset_GetnUniformivARB 699
-#define _gloffset_GetnUniformuivARB 700
-#define _gloffset_ReadnPixelsARB 701
-#define _gloffset_DrawArraysInstancedBaseInstance 702
-#define _gloffset_DrawElementsInstancedBaseInstance 703
-#define _gloffset_DrawElementsInstancedBaseVertexBaseInstance 704
-#define _gloffset_DrawTransformFeedbackInstanced 705
-#define _gloffset_DrawTransformFeedbackStreamInstanced 706
-#define _gloffset_TexStorage1D 707
-#define _gloffset_TexStorage2D 708
-#define _gloffset_TexStorage3D 709
-#define _gloffset_TextureStorage1DEXT 710
-#define _gloffset_TextureStorage2DEXT 711
-#define _gloffset_TextureStorage3DEXT 712
-#define _gloffset_InvalidateBufferData 713
-#define _gloffset_InvalidateBufferSubData 714
-#define _gloffset_InvalidateFramebuffer 715
-#define _gloffset_InvalidateSubFramebuffer 716
-#define _gloffset_InvalidateTexImage 717
-#define _gloffset_InvalidateTexSubImage 718
-#define _gloffset_PolygonOffsetEXT 719
-#define _gloffset_SampleMaskSGIS 720
-#define _gloffset_SamplePatternSGIS 721
-#define _gloffset_ColorPointerEXT 722
-#define _gloffset_EdgeFlagPointerEXT 723
-#define _gloffset_IndexPointerEXT 724
-#define _gloffset_NormalPointerEXT 725
-#define _gloffset_TexCoordPointerEXT 726
-#define _gloffset_VertexPointerEXT 727
-#define _gloffset_PointParameterfEXT 728
-#define _gloffset_PointParameterfvEXT 729
-#define _gloffset_LockArraysEXT 730
-#define _gloffset_UnlockArraysEXT 731
-#define _gloffset_SecondaryColor3bEXT 732
-#define _gloffset_SecondaryColor3bvEXT 733
-#define _gloffset_SecondaryColor3dEXT 734
-#define _gloffset_SecondaryColor3dvEXT 735
-#define _gloffset_SecondaryColor3fEXT 736
-#define _gloffset_SecondaryColor3fvEXT 737
-#define _gloffset_SecondaryColor3iEXT 738
-#define _gloffset_SecondaryColor3ivEXT 739
-#define _gloffset_SecondaryColor3sEXT 740
-#define _gloffset_SecondaryColor3svEXT 741
-#define _gloffset_SecondaryColor3ubEXT 742
-#define _gloffset_SecondaryColor3ubvEXT 743
-#define _gloffset_SecondaryColor3uiEXT 744
-#define _gloffset_SecondaryColor3uivEXT 745
-#define _gloffset_SecondaryColor3usEXT 746
-#define _gloffset_SecondaryColor3usvEXT 747
-#define _gloffset_SecondaryColorPointerEXT 748
-#define _gloffset_MultiDrawArraysEXT 749
-#define _gloffset_MultiDrawElementsEXT 750
-#define _gloffset_FogCoordPointerEXT 751
-#define _gloffset_FogCoorddEXT 752
-#define _gloffset_FogCoorddvEXT 753
-#define _gloffset_FogCoordfEXT 754
-#define _gloffset_FogCoordfvEXT 755
-#define _gloffset_BlendFuncSeparateEXT 756
-#define _gloffset_ResizeBuffersMESA 757
-#define _gloffset_WindowPos2dMESA 758
-#define _gloffset_WindowPos2dvMESA 759
-#define _gloffset_WindowPos2fMESA 760
-#define _gloffset_WindowPos2fvMESA 761
-#define _gloffset_WindowPos2iMESA 762
-#define _gloffset_WindowPos2ivMESA 763
-#define _gloffset_WindowPos2sMESA 764
-#define _gloffset_WindowPos2svMESA 765
-#define _gloffset_WindowPos3dMESA 766
-#define _gloffset_WindowPos3dvMESA 767
-#define _gloffset_WindowPos3fMESA 768
-#define _gloffset_WindowPos3fvMESA 769
-#define _gloffset_WindowPos3iMESA 770
-#define _gloffset_WindowPos3ivMESA 771
-#define _gloffset_WindowPos3sMESA 772
-#define _gloffset_WindowPos3svMESA 773
-#define _gloffset_WindowPos4dMESA 774
-#define _gloffset_WindowPos4dvMESA 775
-#define _gloffset_WindowPos4fMESA 776
-#define _gloffset_WindowPos4fvMESA 777
-#define _gloffset_WindowPos4iMESA 778
-#define _gloffset_WindowPos4ivMESA 779
-#define _gloffset_WindowPos4sMESA 780
-#define _gloffset_WindowPos4svMESA 781
-#define _gloffset_MultiModeDrawArraysIBM 782
-#define _gloffset_MultiModeDrawElementsIBM 783
-#define _gloffset_AreProgramsResidentNV 784
-#define _gloffset_BindProgramNV 785
-#define _gloffset_DeleteProgramsNV 786
-#define _gloffset_ExecuteProgramNV 787
-#define _gloffset_GenProgramsNV 788
-#define _gloffset_GetProgramParameterdvNV 789
-#define _gloffset_GetProgramParameterfvNV 790
-#define _gloffset_GetProgramStringNV 791
-#define _gloffset_GetProgramivNV 792
-#define _gloffset_GetTrackMatrixivNV 793
-#define _gloffset_GetVertexAttribPointervNV 794
-#define _gloffset_GetVertexAttribdvNV 795
-#define _gloffset_GetVertexAttribfvNV 796
-#define _gloffset_GetVertexAttribivNV 797
-#define _gloffset_IsProgramNV 798
-#define _gloffset_LoadProgramNV 799
-#define _gloffset_ProgramParameters4dvNV 800
-#define _gloffset_ProgramParameters4fvNV 801
-#define _gloffset_RequestResidentProgramsNV 802
-#define _gloffset_TrackMatrixNV 803
-#define _gloffset_VertexAttrib1dNV 804
-#define _gloffset_VertexAttrib1dvNV 805
-#define _gloffset_VertexAttrib1fNV 806
-#define _gloffset_VertexAttrib1fvNV 807
-#define _gloffset_VertexAttrib1sNV 808
-#define _gloffset_VertexAttrib1svNV 809
-#define _gloffset_VertexAttrib2dNV 810
-#define _gloffset_VertexAttrib2dvNV 811
-#define _gloffset_VertexAttrib2fNV 812
-#define _gloffset_VertexAttrib2fvNV 813
-#define _gloffset_VertexAttrib2sNV 814
-#define _gloffset_VertexAttrib2svNV 815
-#define _gloffset_VertexAttrib3dNV 816
-#define _gloffset_VertexAttrib3dvNV 817
-#define _gloffset_VertexAttrib3fNV 818
-#define _gloffset_VertexAttrib3fvNV 819
-#define _gloffset_VertexAttrib3sNV 820
-#define _gloffset_VertexAttrib3svNV 821
-#define _gloffset_VertexAttrib4dNV 822
-#define _gloffset_VertexAttrib4dvNV 823
-#define _gloffset_VertexAttrib4fNV 824
-#define _gloffset_VertexAttrib4fvNV 825
-#define _gloffset_VertexAttrib4sNV 826
-#define _gloffset_VertexAttrib4svNV 827
-#define _gloffset_VertexAttrib4ubNV 828
-#define _gloffset_VertexAttrib4ubvNV 829
-#define _gloffset_VertexAttribPointerNV 830
-#define _gloffset_VertexAttribs1dvNV 831
-#define _gloffset_VertexAttribs1fvNV 832
-#define _gloffset_VertexAttribs1svNV 833
-#define _gloffset_VertexAttribs2dvNV 834
-#define _gloffset_VertexAttribs2fvNV 835
-#define _gloffset_VertexAttribs2svNV 836
-#define _gloffset_VertexAttribs3dvNV 837
-#define _gloffset_VertexAttribs3fvNV 838
-#define _gloffset_VertexAttribs3svNV 839
-#define _gloffset_VertexAttribs4dvNV 840
-#define _gloffset_VertexAttribs4fvNV 841
-#define _gloffset_VertexAttribs4svNV 842
-#define _gloffset_VertexAttribs4ubvNV 843
-#define _gloffset_GetTexBumpParameterfvATI 844
-#define _gloffset_GetTexBumpParameterivATI 845
-#define _gloffset_TexBumpParameterfvATI 846
-#define _gloffset_TexBumpParameterivATI 847
-#define _gloffset_AlphaFragmentOp1ATI 848
-#define _gloffset_AlphaFragmentOp2ATI 849
-#define _gloffset_AlphaFragmentOp3ATI 850
-#define _gloffset_BeginFragmentShaderATI 851
-#define _gloffset_BindFragmentShaderATI 852
-#define _gloffset_ColorFragmentOp1ATI 853
-#define _gloffset_ColorFragmentOp2ATI 854
-#define _gloffset_ColorFragmentOp3ATI 855
-#define _gloffset_DeleteFragmentShaderATI 856
-#define _gloffset_EndFragmentShaderATI 857
-#define _gloffset_GenFragmentShadersATI 858
-#define _gloffset_PassTexCoordATI 859
-#define _gloffset_SampleMapATI 860
-#define _gloffset_SetFragmentShaderConstantATI 861
-#define _gloffset_PointParameteriNV 862
-#define _gloffset_PointParameterivNV 863
-#define _gloffset_ActiveStencilFaceEXT 864
-#define _gloffset_BindVertexArrayAPPLE 865
-#define _gloffset_DeleteVertexArraysAPPLE 866
-#define _gloffset_GenVertexArraysAPPLE 867
-#define _gloffset_IsVertexArrayAPPLE 868
-#define _gloffset_GetProgramNamedParameterdvNV 869
-#define _gloffset_GetProgramNamedParameterfvNV 870
-#define _gloffset_ProgramNamedParameter4dNV 871
-#define _gloffset_ProgramNamedParameter4dvNV 872
-#define _gloffset_ProgramNamedParameter4fNV 873
-#define _gloffset_ProgramNamedParameter4fvNV 874
-#define _gloffset_PrimitiveRestartIndexNV 875
-#define _gloffset_PrimitiveRestartNV 876
-#define _gloffset_DepthBoundsEXT 877
-#define _gloffset_BlendEquationSeparateEXT 878
-#define _gloffset_BindFramebufferEXT 879
-#define _gloffset_BindRenderbufferEXT 880
-#define _gloffset_CheckFramebufferStatusEXT 881
-#define _gloffset_DeleteFramebuffersEXT 882
-#define _gloffset_DeleteRenderbuffersEXT 883
-#define _gloffset_FramebufferRenderbufferEXT 884
-#define _gloffset_FramebufferTexture1DEXT 885
-#define _gloffset_FramebufferTexture2DEXT 886
-#define _gloffset_FramebufferTexture3DEXT 887
-#define _gloffset_GenFramebuffersEXT 888
-#define _gloffset_GenRenderbuffersEXT 889
-#define _gloffset_GenerateMipmapEXT 890
-#define _gloffset_GetFramebufferAttachmentParameterivEXT 891
-#define _gloffset_GetRenderbufferParameterivEXT 892
-#define _gloffset_IsFramebufferEXT 893
-#define _gloffset_IsRenderbufferEXT 894
-#define _gloffset_RenderbufferStorageEXT 895
-#define _gloffset_BlitFramebufferEXT 896
-#define _gloffset_BufferParameteriAPPLE 897
-#define _gloffset_FlushMappedBufferRangeAPPLE 898
-#define _gloffset_BindFragDataLocationEXT 899
-#define _gloffset_GetFragDataLocationEXT 900
-#define _gloffset_GetUniformuivEXT 901
-#define _gloffset_GetVertexAttribIivEXT 902
-#define _gloffset_GetVertexAttribIuivEXT 903
-#define _gloffset_Uniform1uiEXT 904
-#define _gloffset_Uniform1uivEXT 905
-#define _gloffset_Uniform2uiEXT 906
-#define _gloffset_Uniform2uivEXT 907
-#define _gloffset_Uniform3uiEXT 908
-#define _gloffset_Uniform3uivEXT 909
-#define _gloffset_Uniform4uiEXT 910
-#define _gloffset_Uniform4uivEXT 911
-#define _gloffset_VertexAttribI1iEXT 912
-#define _gloffset_VertexAttribI1ivEXT 913
-#define _gloffset_VertexAttribI1uiEXT 914
-#define _gloffset_VertexAttribI1uivEXT 915
-#define _gloffset_VertexAttribI2iEXT 916
-#define _gloffset_VertexAttribI2ivEXT 917
-#define _gloffset_VertexAttribI2uiEXT 918
-#define _gloffset_VertexAttribI2uivEXT 919
-#define _gloffset_VertexAttribI3iEXT 920
-#define _gloffset_VertexAttribI3ivEXT 921
-#define _gloffset_VertexAttribI3uiEXT 922
-#define _gloffset_VertexAttribI3uivEXT 923
-#define _gloffset_VertexAttribI4bvEXT 924
-#define _gloffset_VertexAttribI4iEXT 925
-#define _gloffset_VertexAttribI4ivEXT 926
-#define _gloffset_VertexAttribI4svEXT 927
-#define _gloffset_VertexAttribI4ubvEXT 928
-#define _gloffset_VertexAttribI4uiEXT 929
-#define _gloffset_VertexAttribI4uivEXT 930
-#define _gloffset_VertexAttribI4usvEXT 931
-#define _gloffset_VertexAttribIPointerEXT 932
-#define _gloffset_FramebufferTextureLayerEXT 933
-#define _gloffset_ColorMaskIndexedEXT 934
-#define _gloffset_DisableIndexedEXT 935
-#define _gloffset_EnableIndexedEXT 936
-#define _gloffset_GetBooleanIndexedvEXT 937
-#define _gloffset_GetIntegerIndexedvEXT 938
-#define _gloffset_IsEnabledIndexedEXT 939
-#define _gloffset_ClearColorIiEXT 940
-#define _gloffset_ClearColorIuiEXT 941
-#define _gloffset_GetTexParameterIivEXT 942
-#define _gloffset_GetTexParameterIuivEXT 943
-#define _gloffset_TexParameterIivEXT 944
-#define _gloffset_TexParameterIuivEXT 945
-#define _gloffset_BeginConditionalRenderNV 946
-#define _gloffset_EndConditionalRenderNV 947
-#define _gloffset_BeginTransformFeedbackEXT 948
-#define _gloffset_BindBufferBaseEXT 949
-#define _gloffset_BindBufferOffsetEXT 950
-#define _gloffset_BindBufferRangeEXT 951
-#define _gloffset_EndTransformFeedbackEXT 952
-#define _gloffset_GetTransformFeedbackVaryingEXT 953
-#define _gloffset_TransformFeedbackVaryingsEXT 954
-#define _gloffset_ProvokingVertexEXT 955
-#define _gloffset_GetObjectParameterivAPPLE 956
-#define _gloffset_ObjectPurgeableAPPLE 957
-#define _gloffset_ObjectUnpurgeableAPPLE 958
-#define _gloffset_ActiveProgramEXT 959
-#define _gloffset_CreateShaderProgramEXT 960
-#define _gloffset_UseShaderProgramEXT 961
-#define _gloffset_TextureBarrierNV 962
-#define _gloffset_StencilFuncSeparateATI 963
-#define _gloffset_ProgramEnvParameters4fvEXT 964
-#define _gloffset_ProgramLocalParameters4fvEXT 965
-#define _gloffset_GetQueryObjecti64vEXT 966
-#define _gloffset_GetQueryObjectui64vEXT 967
-#define _gloffset_EGLImageTargetRenderbufferStorageOES 968
-#define _gloffset_EGLImageTargetTexture2DOES 969
+#define _gloffset_ClearBufferfi 430
+#define _gloffset_ClearBufferfv 431
+#define _gloffset_ClearBufferiv 432
+#define _gloffset_ClearBufferuiv 433
+#define _gloffset_GetStringi 434
+#define _gloffset_FramebufferTexture 435
+#define _gloffset_GetBufferParameteri64v 436
+#define _gloffset_GetInteger64i_v 437
+#define _gloffset_LoadTransposeMatrixdARB 438
+#define _gloffset_LoadTransposeMatrixfARB 439
+#define _gloffset_MultTransposeMatrixdARB 440
+#define _gloffset_MultTransposeMatrixfARB 441
+#define _gloffset_SampleCoverageARB 442
+#define _gloffset_CompressedTexImage1DARB 443
+#define _gloffset_CompressedTexImage2DARB 444
+#define _gloffset_CompressedTexImage3DARB 445
+#define _gloffset_CompressedTexSubImage1DARB 446
+#define _gloffset_CompressedTexSubImage2DARB 447
+#define _gloffset_CompressedTexSubImage3DARB 448
+#define _gloffset_GetCompressedTexImageARB 449
+#define _gloffset_DisableVertexAttribArrayARB 450
+#define _gloffset_EnableVertexAttribArrayARB 451
+#define _gloffset_GetProgramEnvParameterdvARB 452
+#define _gloffset_GetProgramEnvParameterfvARB 453
+#define _gloffset_GetProgramLocalParameterdvARB 454
+#define _gloffset_GetProgramLocalParameterfvARB 455
+#define _gloffset_GetProgramStringARB 456
+#define _gloffset_GetProgramivARB 457
+#define _gloffset_GetVertexAttribdvARB 458
+#define _gloffset_GetVertexAttribfvARB 459
+#define _gloffset_GetVertexAttribivARB 460
+#define _gloffset_ProgramEnvParameter4dARB 461
+#define _gloffset_ProgramEnvParameter4dvARB 462
+#define _gloffset_ProgramEnvParameter4fARB 463
+#define _gloffset_ProgramEnvParameter4fvARB 464
+#define _gloffset_ProgramLocalParameter4dARB 465
+#define _gloffset_ProgramLocalParameter4dvARB 466
+#define _gloffset_ProgramLocalParameter4fARB 467
+#define _gloffset_ProgramLocalParameter4fvARB 468
+#define _gloffset_ProgramStringARB 469
+#define _gloffset_VertexAttrib1dARB 470
+#define _gloffset_VertexAttrib1dvARB 471
+#define _gloffset_VertexAttrib1fARB 472
+#define _gloffset_VertexAttrib1fvARB 473
+#define _gloffset_VertexAttrib1sARB 474
+#define _gloffset_VertexAttrib1svARB 475
+#define _gloffset_VertexAttrib2dARB 476
+#define _gloffset_VertexAttrib2dvARB 477
+#define _gloffset_VertexAttrib2fARB 478
+#define _gloffset_VertexAttrib2fvARB 479
+#define _gloffset_VertexAttrib2sARB 480
+#define _gloffset_VertexAttrib2svARB 481
+#define _gloffset_VertexAttrib3dARB 482
+#define _gloffset_VertexAttrib3dvARB 483
+#define _gloffset_VertexAttrib3fARB 484
+#define _gloffset_VertexAttrib3fvARB 485
+#define _gloffset_VertexAttrib3sARB 486
+#define _gloffset_VertexAttrib3svARB 487
+#define _gloffset_VertexAttrib4NbvARB 488
+#define _gloffset_VertexAttrib4NivARB 489
+#define _gloffset_VertexAttrib4NsvARB 490
+#define _gloffset_VertexAttrib4NubARB 491
+#define _gloffset_VertexAttrib4NubvARB 492
+#define _gloffset_VertexAttrib4NuivARB 493
+#define _gloffset_VertexAttrib4NusvARB 494
+#define _gloffset_VertexAttrib4bvARB 495
+#define _gloffset_VertexAttrib4dARB 496
+#define _gloffset_VertexAttrib4dvARB 497
+#define _gloffset_VertexAttrib4fARB 498
+#define _gloffset_VertexAttrib4fvARB 499
+#define _gloffset_VertexAttrib4ivARB 500
+#define _gloffset_VertexAttrib4sARB 501
+#define _gloffset_VertexAttrib4svARB 502
+#define _gloffset_VertexAttrib4ubvARB 503
+#define _gloffset_VertexAttrib4uivARB 504
+#define _gloffset_VertexAttrib4usvARB 505
+#define _gloffset_VertexAttribPointerARB 506
+#define _gloffset_BindBufferARB 507
+#define _gloffset_BufferDataARB 508
+#define _gloffset_BufferSubDataARB 509
+#define _gloffset_DeleteBuffersARB 510
+#define _gloffset_GenBuffersARB 511
+#define _gloffset_GetBufferParameterivARB 512
+#define _gloffset_GetBufferPointervARB 513
+#define _gloffset_GetBufferSubDataARB 514
+#define _gloffset_IsBufferARB 515
+#define _gloffset_MapBufferARB 516
+#define _gloffset_UnmapBufferARB 517
+#define _gloffset_BeginQueryARB 518
+#define _gloffset_DeleteQueriesARB 519
+#define _gloffset_EndQueryARB 520
+#define _gloffset_GenQueriesARB 521
+#define _gloffset_GetQueryObjectivARB 522
+#define _gloffset_GetQueryObjectuivARB 523
+#define _gloffset_GetQueryivARB 524
+#define _gloffset_IsQueryARB 525
+#define _gloffset_AttachObjectARB 526
+#define _gloffset_CompileShaderARB 527
+#define _gloffset_CreateProgramObjectARB 528
+#define _gloffset_CreateShaderObjectARB 529
+#define _gloffset_DeleteObjectARB 530
+#define _gloffset_DetachObjectARB 531
+#define _gloffset_GetActiveUniformARB 532
+#define _gloffset_GetAttachedObjectsARB 533
+#define _gloffset_GetHandleARB 534
+#define _gloffset_GetInfoLogARB 535
+#define _gloffset_GetObjectParameterfvARB 536
+#define _gloffset_GetObjectParameterivARB 537
+#define _gloffset_GetShaderSourceARB 538
+#define _gloffset_GetUniformLocationARB 539
+#define _gloffset_GetUniformfvARB 540
+#define _gloffset_GetUniformivARB 541
+#define _gloffset_LinkProgramARB 542
+#define _gloffset_ShaderSourceARB 543
+#define _gloffset_Uniform1fARB 544
+#define _gloffset_Uniform1fvARB 545
+#define _gloffset_Uniform1iARB 546
+#define _gloffset_Uniform1ivARB 547
+#define _gloffset_Uniform2fARB 548
+#define _gloffset_Uniform2fvARB 549
+#define _gloffset_Uniform2iARB 550
+#define _gloffset_Uniform2ivARB 551
+#define _gloffset_Uniform3fARB 552
+#define _gloffset_Uniform3fvARB 553
+#define _gloffset_Uniform3iARB 554
+#define _gloffset_Uniform3ivARB 555
+#define _gloffset_Uniform4fARB 556
+#define _gloffset_Uniform4fvARB 557
+#define _gloffset_Uniform4iARB 558
+#define _gloffset_Uniform4ivARB 559
+#define _gloffset_UniformMatrix2fvARB 560
+#define _gloffset_UniformMatrix3fvARB 561
+#define _gloffset_UniformMatrix4fvARB 562
+#define _gloffset_UseProgramObjectARB 563
+#define _gloffset_ValidateProgramARB 564
+#define _gloffset_BindAttribLocationARB 565
+#define _gloffset_GetActiveAttribARB 566
+#define _gloffset_GetAttribLocationARB 567
+#define _gloffset_DrawBuffersARB 568
+#define _gloffset_ClampColorARB 569
+#define _gloffset_DrawArraysInstancedARB 570
+#define _gloffset_DrawElementsInstancedARB 571
+#define _gloffset_RenderbufferStorageMultisample 572
+#define _gloffset_FramebufferTextureFaceARB 573
+#define _gloffset_VertexAttribDivisorARB 574
+#define _gloffset_FlushMappedBufferRange 575
+#define _gloffset_MapBufferRange 576
+#define _gloffset_TexBufferARB 577
+#define _gloffset_BindVertexArray 578
+#define _gloffset_GenVertexArrays 579
+#define _gloffset_GetActiveUniformBlockName 580
+#define _gloffset_GetActiveUniformBlockiv 581
+#define _gloffset_GetActiveUniformName 582
+#define _gloffset_GetActiveUniformsiv 583
+#define _gloffset_GetUniformBlockIndex 584
+#define _gloffset_GetUniformIndices 585
+#define _gloffset_UniformBlockBinding 586
+#define _gloffset_CopyBufferSubData 587
+#define _gloffset_ClientWaitSync 588
+#define _gloffset_DeleteSync 589
+#define _gloffset_FenceSync 590
+#define _gloffset_GetInteger64v 591
+#define _gloffset_GetSynciv 592
+#define _gloffset_IsSync 593
+#define _gloffset_WaitSync 594
+#define _gloffset_DrawElementsBaseVertex 595
+#define _gloffset_DrawElementsInstancedBaseVertex 596
+#define _gloffset_DrawRangeElementsBaseVertex 597
+#define _gloffset_MultiDrawElementsBaseVertex 598
+#define _gloffset_BlendEquationSeparateiARB 599
+#define _gloffset_BlendEquationiARB 600
+#define _gloffset_BlendFuncSeparateiARB 601
+#define _gloffset_BlendFunciARB 602
+#define _gloffset_BindFragDataLocationIndexed 603
+#define _gloffset_GetFragDataIndex 604
+#define _gloffset_BindSampler 605
+#define _gloffset_DeleteSamplers 606
+#define _gloffset_GenSamplers 607
+#define _gloffset_GetSamplerParameterIiv 608
+#define _gloffset_GetSamplerParameterIuiv 609
+#define _gloffset_GetSamplerParameterfv 610
+#define _gloffset_GetSamplerParameteriv 611
+#define _gloffset_IsSampler 612
+#define _gloffset_SamplerParameterIiv 613
+#define _gloffset_SamplerParameterIuiv 614
+#define _gloffset_SamplerParameterf 615
+#define _gloffset_SamplerParameterfv 616
+#define _gloffset_SamplerParameteri 617
+#define _gloffset_SamplerParameteriv 618
+#define _gloffset_QueryCounter 619
+#define _gloffset_ColorP3ui 620
+#define _gloffset_ColorP3uiv 621
+#define _gloffset_ColorP4ui 622
+#define _gloffset_ColorP4uiv 623
+#define _gloffset_MultiTexCoordP1ui 624
+#define _gloffset_MultiTexCoordP1uiv 625
+#define _gloffset_MultiTexCoordP2ui 626
+#define _gloffset_MultiTexCoordP2uiv 627
+#define _gloffset_MultiTexCoordP3ui 628
+#define _gloffset_MultiTexCoordP3uiv 629
+#define _gloffset_MultiTexCoordP4ui 630
+#define _gloffset_MultiTexCoordP4uiv 631
+#define _gloffset_NormalP3ui 632
+#define _gloffset_NormalP3uiv 633
+#define _gloffset_SecondaryColorP3ui 634
+#define _gloffset_SecondaryColorP3uiv 635
+#define _gloffset_TexCoordP1ui 636
+#define _gloffset_TexCoordP1uiv 637
+#define _gloffset_TexCoordP2ui 638
+#define _gloffset_TexCoordP2uiv 639
+#define _gloffset_TexCoordP3ui 640
+#define _gloffset_TexCoordP3uiv 641
+#define _gloffset_TexCoordP4ui 642
+#define _gloffset_TexCoordP4uiv 643
+#define _gloffset_VertexAttribP1ui 644
+#define _gloffset_VertexAttribP1uiv 645
+#define _gloffset_VertexAttribP2ui 646
+#define _gloffset_VertexAttribP2uiv 647
+#define _gloffset_VertexAttribP3ui 648
+#define _gloffset_VertexAttribP3uiv 649
+#define _gloffset_VertexAttribP4ui 650
+#define _gloffset_VertexAttribP4uiv 651
+#define _gloffset_VertexP2ui 652
+#define _gloffset_VertexP2uiv 653
+#define _gloffset_VertexP3ui 654
+#define _gloffset_VertexP3uiv 655
+#define _gloffset_VertexP4ui 656
+#define _gloffset_VertexP4uiv 657
+#define _gloffset_BindTransformFeedback 658
+#define _gloffset_DeleteTransformFeedbacks 659
+#define _gloffset_DrawTransformFeedback 660
+#define _gloffset_GenTransformFeedbacks 661
+#define _gloffset_IsTransformFeedback 662
+#define _gloffset_PauseTransformFeedback 663
+#define _gloffset_ResumeTransformFeedback 664
+#define _gloffset_BeginQueryIndexed 665
+#define _gloffset_DrawTransformFeedbackStream 666
+#define _gloffset_EndQueryIndexed 667
+#define _gloffset_GetQueryIndexediv 668
+#define _gloffset_ClearDepthf 669
+#define _gloffset_DepthRangef 670
+#define _gloffset_GetShaderPrecisionFormat 671
+#define _gloffset_ReleaseShaderCompiler 672
+#define _gloffset_ShaderBinary 673
+#define _gloffset_GetProgramBinary 674
+#define _gloffset_ProgramBinary 675
+#define _gloffset_ProgramParameteri 676
+#define _gloffset_DebugMessageCallbackARB 677
+#define _gloffset_DebugMessageControlARB 678
+#define _gloffset_DebugMessageInsertARB 679
+#define _gloffset_GetDebugMessageLogARB 680
+#define _gloffset_GetGraphicsResetStatusARB 681
+#define _gloffset_GetnColorTableARB 682
+#define _gloffset_GetnCompressedTexImageARB 683
+#define _gloffset_GetnConvolutionFilterARB 684
+#define _gloffset_GetnHistogramARB 685
+#define _gloffset_GetnMapdvARB 686
+#define _gloffset_GetnMapfvARB 687
+#define _gloffset_GetnMapivARB 688
+#define _gloffset_GetnMinmaxARB 689
+#define _gloffset_GetnPixelMapfvARB 690
+#define _gloffset_GetnPixelMapuivARB 691
+#define _gloffset_GetnPixelMapusvARB 692
+#define _gloffset_GetnPolygonStippleARB 693
+#define _gloffset_GetnSeparableFilterARB 694
+#define _gloffset_GetnTexImageARB 695
+#define _gloffset_GetnUniformdvARB 696
+#define _gloffset_GetnUniformfvARB 697
+#define _gloffset_GetnUniformivARB 698
+#define _gloffset_GetnUniformuivARB 699
+#define _gloffset_ReadnPixelsARB 700
+#define _gloffset_DrawArraysInstancedBaseInstance 701
+#define _gloffset_DrawElementsInstancedBaseInstance 702
+#define _gloffset_DrawElementsInstancedBaseVertexBaseInstance 703
+#define _gloffset_DrawTransformFeedbackInstanced 704
+#define _gloffset_DrawTransformFeedbackStreamInstanced 705
+#define _gloffset_TexStorage1D 706
+#define _gloffset_TexStorage2D 707
+#define _gloffset_TexStorage3D 708
+#define _gloffset_TextureStorage1DEXT 709
+#define _gloffset_TextureStorage2DEXT 710
+#define _gloffset_TextureStorage3DEXT 711
+#define _gloffset_InvalidateBufferData 712
+#define _gloffset_InvalidateBufferSubData 713
+#define _gloffset_InvalidateFramebuffer 714
+#define _gloffset_InvalidateSubFramebuffer 715
+#define _gloffset_InvalidateTexImage 716
+#define _gloffset_InvalidateTexSubImage 717
+#define _gloffset_PolygonOffsetEXT 718
+#define _gloffset_SampleMaskSGIS 719
+#define _gloffset_SamplePatternSGIS 720
+#define _gloffset_ColorPointerEXT 721
+#define _gloffset_EdgeFlagPointerEXT 722
+#define _gloffset_IndexPointerEXT 723
+#define _gloffset_NormalPointerEXT 724
+#define _gloffset_TexCoordPointerEXT 725
+#define _gloffset_VertexPointerEXT 726
+#define _gloffset_PointParameterfEXT 727
+#define _gloffset_PointParameterfvEXT 728
+#define _gloffset_LockArraysEXT 729
+#define _gloffset_UnlockArraysEXT 730
+#define _gloffset_SecondaryColor3bEXT 731
+#define _gloffset_SecondaryColor3bvEXT 732
+#define _gloffset_SecondaryColor3dEXT 733
+#define _gloffset_SecondaryColor3dvEXT 734
+#define _gloffset_SecondaryColor3fEXT 735
+#define _gloffset_SecondaryColor3fvEXT 736
+#define _gloffset_SecondaryColor3iEXT 737
+#define _gloffset_SecondaryColor3ivEXT 738
+#define _gloffset_SecondaryColor3sEXT 739
+#define _gloffset_SecondaryColor3svEXT 740
+#define _gloffset_SecondaryColor3ubEXT 741
+#define _gloffset_SecondaryColor3ubvEXT 742
+#define _gloffset_SecondaryColor3uiEXT 743
+#define _gloffset_SecondaryColor3uivEXT 744
+#define _gloffset_SecondaryColor3usEXT 745
+#define _gloffset_SecondaryColor3usvEXT 746
+#define _gloffset_SecondaryColorPointerEXT 747
+#define _gloffset_MultiDrawArraysEXT 748
+#define _gloffset_MultiDrawElementsEXT 749
+#define _gloffset_FogCoordPointerEXT 750
+#define _gloffset_FogCoorddEXT 751
+#define _gloffset_FogCoorddvEXT 752
+#define _gloffset_FogCoordfEXT 753
+#define _gloffset_FogCoordfvEXT 754
+#define _gloffset_BlendFuncSeparateEXT 755
+#define _gloffset_ResizeBuffersMESA 756
+#define _gloffset_WindowPos2dMESA 757
+#define _gloffset_WindowPos2dvMESA 758
+#define _gloffset_WindowPos2fMESA 759
+#define _gloffset_WindowPos2fvMESA 760
+#define _gloffset_WindowPos2iMESA 761
+#define _gloffset_WindowPos2ivMESA 762
+#define _gloffset_WindowPos2sMESA 763
+#define _gloffset_WindowPos2svMESA 764
+#define _gloffset_WindowPos3dMESA 765
+#define _gloffset_WindowPos3dvMESA 766
+#define _gloffset_WindowPos3fMESA 767
+#define _gloffset_WindowPos3fvMESA 768
+#define _gloffset_WindowPos3iMESA 769
+#define _gloffset_WindowPos3ivMESA 770
+#define _gloffset_WindowPos3sMESA 771
+#define _gloffset_WindowPos3svMESA 772
+#define _gloffset_WindowPos4dMESA 773
+#define _gloffset_WindowPos4dvMESA 774
+#define _gloffset_WindowPos4fMESA 775
+#define _gloffset_WindowPos4fvMESA 776
+#define _gloffset_WindowPos4iMESA 777
+#define _gloffset_WindowPos4ivMESA 778
+#define _gloffset_WindowPos4sMESA 779
+#define _gloffset_WindowPos4svMESA 780
+#define _gloffset_MultiModeDrawArraysIBM 781
+#define _gloffset_MultiModeDrawElementsIBM 782
+#define _gloffset_AreProgramsResidentNV 783
+#define _gloffset_BindProgramNV 784
+#define _gloffset_DeleteProgramsNV 785
+#define _gloffset_ExecuteProgramNV 786
+#define _gloffset_GenProgramsNV 787
+#define _gloffset_GetProgramParameterdvNV 788
+#define _gloffset_GetProgramParameterfvNV 789
+#define _gloffset_GetProgramStringNV 790
+#define _gloffset_GetProgramivNV 791
+#define _gloffset_GetTrackMatrixivNV 792
+#define _gloffset_GetVertexAttribPointervNV 793
+#define _gloffset_GetVertexAttribdvNV 794
+#define _gloffset_GetVertexAttribfvNV 795
+#define _gloffset_GetVertexAttribivNV 796
+#define _gloffset_IsProgramNV 797
+#define _gloffset_LoadProgramNV 798
+#define _gloffset_ProgramParameters4dvNV 799
+#define _gloffset_ProgramParameters4fvNV 800
+#define _gloffset_RequestResidentProgramsNV 801
+#define _gloffset_TrackMatrixNV 802
+#define _gloffset_VertexAttrib1dNV 803
+#define _gloffset_VertexAttrib1dvNV 804
+#define _gloffset_VertexAttrib1fNV 805
+#define _gloffset_VertexAttrib1fvNV 806
+#define _gloffset_VertexAttrib1sNV 807
+#define _gloffset_VertexAttrib1svNV 808
+#define _gloffset_VertexAttrib2dNV 809
+#define _gloffset_VertexAttrib2dvNV 810
+#define _gloffset_VertexAttrib2fNV 811
+#define _gloffset_VertexAttrib2fvNV 812
+#define _gloffset_VertexAttrib2sNV 813
+#define _gloffset_VertexAttrib2svNV 814
+#define _gloffset_VertexAttrib3dNV 815
+#define _gloffset_VertexAttrib3dvNV 816
+#define _gloffset_VertexAttrib3fNV 817
+#define _gloffset_VertexAttrib3fvNV 818
+#define _gloffset_VertexAttrib3sNV 819
+#define _gloffset_VertexAttrib3svNV 820
+#define _gloffset_VertexAttrib4dNV 821
+#define _gloffset_VertexAttrib4dvNV 822
+#define _gloffset_VertexAttrib4fNV 823
+#define _gloffset_VertexAttrib4fvNV 824
+#define _gloffset_VertexAttrib4sNV 825
+#define _gloffset_VertexAttrib4svNV 826
+#define _gloffset_VertexAttrib4ubNV 827
+#define _gloffset_VertexAttrib4ubvNV 828
+#define _gloffset_VertexAttribPointerNV 829
+#define _gloffset_VertexAttribs1dvNV 830
+#define _gloffset_VertexAttribs1fvNV 831
+#define _gloffset_VertexAttribs1svNV 832
+#define _gloffset_VertexAttribs2dvNV 833
+#define _gloffset_VertexAttribs2fvNV 834
+#define _gloffset_VertexAttribs2svNV 835
+#define _gloffset_VertexAttribs3dvNV 836
+#define _gloffset_VertexAttribs3fvNV 837
+#define _gloffset_VertexAttribs3svNV 838
+#define _gloffset_VertexAttribs4dvNV 839
+#define _gloffset_VertexAttribs4fvNV 840
+#define _gloffset_VertexAttribs4svNV 841
+#define _gloffset_VertexAttribs4ubvNV 842
+#define _gloffset_GetTexBumpParameterfvATI 843
+#define _gloffset_GetTexBumpParameterivATI 844
+#define _gloffset_TexBumpParameterfvATI 845
+#define _gloffset_TexBumpParameterivATI 846
+#define _gloffset_AlphaFragmentOp1ATI 847
+#define _gloffset_AlphaFragmentOp2ATI 848
+#define _gloffset_AlphaFragmentOp3ATI 849
+#define _gloffset_BeginFragmentShaderATI 850
+#define _gloffset_BindFragmentShaderATI 851
+#define _gloffset_ColorFragmentOp1ATI 852
+#define _gloffset_ColorFragmentOp2ATI 853
+#define _gloffset_ColorFragmentOp3ATI 854
+#define _gloffset_DeleteFragmentShaderATI 855
+#define _gloffset_EndFragmentShaderATI 856
+#define _gloffset_GenFragmentShadersATI 857
+#define _gloffset_PassTexCoordATI 858
+#define _gloffset_SampleMapATI 859
+#define _gloffset_SetFragmentShaderConstantATI 860
+#define _gloffset_PointParameteriNV 861
+#define _gloffset_PointParameterivNV 862
+#define _gloffset_ActiveStencilFaceEXT 863
+#define _gloffset_BindVertexArrayAPPLE 864
+#define _gloffset_DeleteVertexArraysAPPLE 865
+#define _gloffset_GenVertexArraysAPPLE 866
+#define _gloffset_IsVertexArrayAPPLE 867
+#define _gloffset_GetProgramNamedParameterdvNV 868
+#define _gloffset_GetProgramNamedParameterfvNV 869
+#define _gloffset_ProgramNamedParameter4dNV 870
+#define _gloffset_ProgramNamedParameter4dvNV 871
+#define _gloffset_ProgramNamedParameter4fNV 872
+#define _gloffset_ProgramNamedParameter4fvNV 873
+#define _gloffset_PrimitiveRestartIndexNV 874
+#define _gloffset_PrimitiveRestartNV 875
+#define _gloffset_DepthBoundsEXT 876
+#define _gloffset_BlendEquationSeparateEXT 877
+#define _gloffset_BindFramebufferEXT 878
+#define _gloffset_BindRenderbufferEXT 879
+#define _gloffset_CheckFramebufferStatusEXT 880
+#define _gloffset_DeleteFramebuffersEXT 881
+#define _gloffset_DeleteRenderbuffersEXT 882
+#define _gloffset_FramebufferRenderbufferEXT 883
+#define _gloffset_FramebufferTexture1DEXT 884
+#define _gloffset_FramebufferTexture2DEXT 885
+#define _gloffset_FramebufferTexture3DEXT 886
+#define _gloffset_GenFramebuffersEXT 887
+#define _gloffset_GenRenderbuffersEXT 888
+#define _gloffset_GenerateMipmapEXT 889
+#define _gloffset_GetFramebufferAttachmentParameterivEXT 890
+#define _gloffset_GetRenderbufferParameterivEXT 891
+#define _gloffset_IsFramebufferEXT 892
+#define _gloffset_IsRenderbufferEXT 893
+#define _gloffset_RenderbufferStorageEXT 894
+#define _gloffset_BlitFramebufferEXT 895
+#define _gloffset_BufferParameteriAPPLE 896
+#define _gloffset_FlushMappedBufferRangeAPPLE 897
+#define _gloffset_BindFragDataLocationEXT 898
+#define _gloffset_GetFragDataLocationEXT 899
+#define _gloffset_GetUniformuivEXT 900
+#define _gloffset_GetVertexAttribIivEXT 901
+#define _gloffset_GetVertexAttribIuivEXT 902
+#define _gloffset_Uniform1uiEXT 903
+#define _gloffset_Uniform1uivEXT 904
+#define _gloffset_Uniform2uiEXT 905
+#define _gloffset_Uniform2uivEXT 906
+#define _gloffset_Uniform3uiEXT 907
+#define _gloffset_Uniform3uivEXT 908
+#define _gloffset_Uniform4uiEXT 909
+#define _gloffset_Uniform4uivEXT 910
+#define _gloffset_VertexAttribI1iEXT 911
+#define _gloffset_VertexAttribI1ivEXT 912
+#define _gloffset_VertexAttribI1uiEXT 913
+#define _gloffset_VertexAttribI1uivEXT 914
+#define _gloffset_VertexAttribI2iEXT 915
+#define _gloffset_VertexAttribI2ivEXT 916
+#define _gloffset_VertexAttribI2uiEXT 917
+#define _gloffset_VertexAttribI2uivEXT 918
+#define _gloffset_VertexAttribI3iEXT 919
+#define _gloffset_VertexAttribI3ivEXT 920
+#define _gloffset_VertexAttribI3uiEXT 921
+#define _gloffset_VertexAttribI3uivEXT 922
+#define _gloffset_VertexAttribI4bvEXT 923
+#define _gloffset_VertexAttribI4iEXT 924
+#define _gloffset_VertexAttribI4ivEXT 925
+#define _gloffset_VertexAttribI4svEXT 926
+#define _gloffset_VertexAttribI4ubvEXT 927
+#define _gloffset_VertexAttribI4uiEXT 928
+#define _gloffset_VertexAttribI4uivEXT 929
+#define _gloffset_VertexAttribI4usvEXT 930
+#define _gloffset_VertexAttribIPointerEXT 931
+#define _gloffset_FramebufferTextureLayerEXT 932
+#define _gloffset_ColorMaskIndexedEXT 933
+#define _gloffset_DisableIndexedEXT 934
+#define _gloffset_EnableIndexedEXT 935
+#define _gloffset_GetBooleanIndexedvEXT 936
+#define _gloffset_GetIntegerIndexedvEXT 937
+#define _gloffset_IsEnabledIndexedEXT 938
+#define _gloffset_ClearColorIiEXT 939
+#define _gloffset_ClearColorIuiEXT 940
+#define _gloffset_GetTexParameterIivEXT 941
+#define _gloffset_GetTexParameterIuivEXT 942
+#define _gloffset_TexParameterIivEXT 943
+#define _gloffset_TexParameterIuivEXT 944
+#define _gloffset_BeginConditionalRenderNV 945
+#define _gloffset_EndConditionalRenderNV 946
+#define _gloffset_BeginTransformFeedbackEXT 947
+#define _gloffset_BindBufferBaseEXT 948
+#define _gloffset_BindBufferOffsetEXT 949
+#define _gloffset_BindBufferRangeEXT 950
+#define _gloffset_EndTransformFeedbackEXT 951
+#define _gloffset_GetTransformFeedbackVaryingEXT 952
+#define _gloffset_TransformFeedbackVaryingsEXT 953
+#define _gloffset_ProvokingVertexEXT 954
+#define _gloffset_GetObjectParameterivAPPLE 955
+#define _gloffset_ObjectPurgeableAPPLE 956
+#define _gloffset_ObjectUnpurgeableAPPLE 957
+#define _gloffset_ActiveProgramEXT 958
+#define _gloffset_CreateShaderProgramEXT 959
+#define _gloffset_UseShaderProgramEXT 960
+#define _gloffset_TextureBarrierNV 961
+#define _gloffset_StencilFuncSeparateATI 962
+#define _gloffset_ProgramEnvParameters4fvEXT 963
+#define _gloffset_ProgramLocalParameters4fvEXT 964
+#define _gloffset_GetQueryObjecti64vEXT 965
+#define _gloffset_GetQueryObjectui64vEXT 966
+#define _gloffset_EGLImageTargetRenderbufferStorageOES 967
+#define _gloffset_EGLImageTargetTexture2DOES 968
 
 #else /* !FEATURE_remap_table */
 
-#define driDispatchRemapTable_size 562
+#define driDispatchRemapTable_size 561
 extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 
 #define AttachShader_remap_index 0
@@ -1072,546 +1071,545 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define UniformMatrix3x4fv_remap_index 19
 #define UniformMatrix4x2fv_remap_index 20
 #define UniformMatrix4x3fv_remap_index 21
-#define ClampColor_remap_index 22
-#define ClearBufferfi_remap_index 23
-#define ClearBufferfv_remap_index 24
-#define ClearBufferiv_remap_index 25
-#define ClearBufferuiv_remap_index 26
-#define GetStringi_remap_index 27
-#define FramebufferTexture_remap_index 28
-#define GetBufferParameteri64v_remap_index 29
-#define GetInteger64i_v_remap_index 30
-#define VertexAttribDivisor_remap_index 31
-#define LoadTransposeMatrixdARB_remap_index 32
-#define LoadTransposeMatrixfARB_remap_index 33
-#define MultTransposeMatrixdARB_remap_index 34
-#define MultTransposeMatrixfARB_remap_index 35
-#define SampleCoverageARB_remap_index 36
-#define CompressedTexImage1DARB_remap_index 37
-#define CompressedTexImage2DARB_remap_index 38
-#define CompressedTexImage3DARB_remap_index 39
-#define CompressedTexSubImage1DARB_remap_index 40
-#define CompressedTexSubImage2DARB_remap_index 41
-#define CompressedTexSubImage3DARB_remap_index 42
-#define GetCompressedTexImageARB_remap_index 43
-#define DisableVertexAttribArrayARB_remap_index 44
-#define EnableVertexAttribArrayARB_remap_index 45
-#define GetProgramEnvParameterdvARB_remap_index 46
-#define GetProgramEnvParameterfvARB_remap_index 47
-#define GetProgramLocalParameterdvARB_remap_index 48
-#define GetProgramLocalParameterfvARB_remap_index 49
-#define GetProgramStringARB_remap_index 50
-#define GetProgramivARB_remap_index 51
-#define GetVertexAttribdvARB_remap_index 52
-#define GetVertexAttribfvARB_remap_index 53
-#define GetVertexAttribivARB_remap_index 54
-#define ProgramEnvParameter4dARB_remap_index 55
-#define ProgramEnvParameter4dvARB_remap_index 56
-#define ProgramEnvParameter4fARB_remap_index 57
-#define ProgramEnvParameter4fvARB_remap_index 58
-#define ProgramLocalParameter4dARB_remap_index 59
-#define ProgramLocalParameter4dvARB_remap_index 60
-#define ProgramLocalParameter4fARB_remap_index 61
-#define ProgramLocalParameter4fvARB_remap_index 62
-#define ProgramStringARB_remap_index 63
-#define VertexAttrib1dARB_remap_index 64
-#define VertexAttrib1dvARB_remap_index 65
-#define VertexAttrib1fARB_remap_index 66
-#define VertexAttrib1fvARB_remap_index 67
-#define VertexAttrib1sARB_remap_index 68
-#define VertexAttrib1svARB_remap_index 69
-#define VertexAttrib2dARB_remap_index 70
-#define VertexAttrib2dvARB_remap_index 71
-#define VertexAttrib2fARB_remap_index 72
-#define VertexAttrib2fvARB_remap_index 73
-#define VertexAttrib2sARB_remap_index 74
-#define VertexAttrib2svARB_remap_index 75
-#define VertexAttrib3dARB_remap_index 76
-#define VertexAttrib3dvARB_remap_index 77
-#define VertexAttrib3fARB_remap_index 78
-#define VertexAttrib3fvARB_remap_index 79
-#define VertexAttrib3sARB_remap_index 80
-#define VertexAttrib3svARB_remap_index 81
-#define VertexAttrib4NbvARB_remap_index 82
-#define VertexAttrib4NivARB_remap_index 83
-#define VertexAttrib4NsvARB_remap_index 84
-#define VertexAttrib4NubARB_remap_index 85
-#define VertexAttrib4NubvARB_remap_index 86
-#define VertexAttrib4NuivARB_remap_index 87
-#define VertexAttrib4NusvARB_remap_index 88
-#define VertexAttrib4bvARB_remap_index 89
-#define VertexAttrib4dARB_remap_index 90
-#define VertexAttrib4dvARB_remap_index 91
-#define VertexAttrib4fARB_remap_index 92
-#define VertexAttrib4fvARB_remap_index 93
-#define VertexAttrib4ivARB_remap_index 94
-#define VertexAttrib4sARB_remap_index 95
-#define VertexAttrib4svARB_remap_index 96
-#define VertexAttrib4ubvARB_remap_index 97
-#define VertexAttrib4uivARB_remap_index 98
-#define VertexAttrib4usvARB_remap_index 99
-#define VertexAttribPointerARB_remap_index 100
-#define BindBufferARB_remap_index 101
-#define BufferDataARB_remap_index 102
-#define BufferSubDataARB_remap_index 103
-#define DeleteBuffersARB_remap_index 104
-#define GenBuffersARB_remap_index 105
-#define GetBufferParameterivARB_remap_index 106
-#define GetBufferPointervARB_remap_index 107
-#define GetBufferSubDataARB_remap_index 108
-#define IsBufferARB_remap_index 109
-#define MapBufferARB_remap_index 110
-#define UnmapBufferARB_remap_index 111
-#define BeginQueryARB_remap_index 112
-#define DeleteQueriesARB_remap_index 113
-#define EndQueryARB_remap_index 114
-#define GenQueriesARB_remap_index 115
-#define GetQueryObjectivARB_remap_index 116
-#define GetQueryObjectuivARB_remap_index 117
-#define GetQueryivARB_remap_index 118
-#define IsQueryARB_remap_index 119
-#define AttachObjectARB_remap_index 120
-#define CompileShaderARB_remap_index 121
-#define CreateProgramObjectARB_remap_index 122
-#define CreateShaderObjectARB_remap_index 123
-#define DeleteObjectARB_remap_index 124
-#define DetachObjectARB_remap_index 125
-#define GetActiveUniformARB_remap_index 126
-#define GetAttachedObjectsARB_remap_index 127
-#define GetHandleARB_remap_index 128
-#define GetInfoLogARB_remap_index 129
-#define GetObjectParameterfvARB_remap_index 130
-#define GetObjectParameterivARB_remap_index 131
-#define GetShaderSourceARB_remap_index 132
-#define GetUniformLocationARB_remap_index 133
-#define GetUniformfvARB_remap_index 134
-#define GetUniformivARB_remap_index 135
-#define LinkProgramARB_remap_index 136
-#define ShaderSourceARB_remap_index 137
-#define Uniform1fARB_remap_index 138
-#define Uniform1fvARB_remap_index 139
-#define Uniform1iARB_remap_index 140
-#define Uniform1ivARB_remap_index 141
-#define Uniform2fARB_remap_index 142
-#define Uniform2fvARB_remap_index 143
-#define Uniform2iARB_remap_index 144
-#define Uniform2ivARB_remap_index 145
-#define Uniform3fARB_remap_index 146
-#define Uniform3fvARB_remap_index 147
-#define Uniform3iARB_remap_index 148
-#define Uniform3ivARB_remap_index 149
-#define Uniform4fARB_remap_index 150
-#define Uniform4fvARB_remap_index 151
-#define Uniform4iARB_remap_index 152
-#define Uniform4ivARB_remap_index 153
-#define UniformMatrix2fvARB_remap_index 154
-#define UniformMatrix3fvARB_remap_index 155
-#define UniformMatrix4fvARB_remap_index 156
-#define UseProgramObjectARB_remap_index 157
-#define ValidateProgramARB_remap_index 158
-#define BindAttribLocationARB_remap_index 159
-#define GetActiveAttribARB_remap_index 160
-#define GetAttribLocationARB_remap_index 161
-#define DrawBuffersARB_remap_index 162
-#define ClampColorARB_remap_index 163
-#define DrawArraysInstancedARB_remap_index 164
-#define DrawElementsInstancedARB_remap_index 165
-#define RenderbufferStorageMultisample_remap_index 166
-#define FramebufferTextureARB_remap_index 167
-#define FramebufferTextureFaceARB_remap_index 168
-#define ProgramParameteriARB_remap_index 169
-#define VertexAttribDivisorARB_remap_index 170
-#define FlushMappedBufferRange_remap_index 171
-#define MapBufferRange_remap_index 172
-#define TexBufferARB_remap_index 173
-#define BindVertexArray_remap_index 174
-#define GenVertexArrays_remap_index 175
-#define GetActiveUniformBlockName_remap_index 176
-#define GetActiveUniformBlockiv_remap_index 177
-#define GetActiveUniformName_remap_index 178
-#define GetActiveUniformsiv_remap_index 179
-#define GetUniformBlockIndex_remap_index 180
-#define GetUniformIndices_remap_index 181
-#define UniformBlockBinding_remap_index 182
-#define CopyBufferSubData_remap_index 183
-#define ClientWaitSync_remap_index 184
-#define DeleteSync_remap_index 185
-#define FenceSync_remap_index 186
-#define GetInteger64v_remap_index 187
-#define GetSynciv_remap_index 188
-#define IsSync_remap_index 189
-#define WaitSync_remap_index 190
-#define DrawElementsBaseVertex_remap_index 191
-#define DrawElementsInstancedBaseVertex_remap_index 192
-#define DrawRangeElementsBaseVertex_remap_index 193
-#define MultiDrawElementsBaseVertex_remap_index 194
-#define BlendEquationSeparateiARB_remap_index 195
-#define BlendEquationiARB_remap_index 196
-#define BlendFuncSeparateiARB_remap_index 197
-#define BlendFunciARB_remap_index 198
-#define BindFragDataLocationIndexed_remap_index 199
-#define GetFragDataIndex_remap_index 200
-#define BindSampler_remap_index 201
-#define DeleteSamplers_remap_index 202
-#define GenSamplers_remap_index 203
-#define GetSamplerParameterIiv_remap_index 204
-#define GetSamplerParameterIuiv_remap_index 205
-#define GetSamplerParameterfv_remap_index 206
-#define GetSamplerParameteriv_remap_index 207
-#define IsSampler_remap_index 208
-#define SamplerParameterIiv_remap_index 209
-#define SamplerParameterIuiv_remap_index 210
-#define SamplerParameterf_remap_index 211
-#define SamplerParameterfv_remap_index 212
-#define SamplerParameteri_remap_index 213
-#define SamplerParameteriv_remap_index 214
-#define QueryCounter_remap_index 215
-#define ColorP3ui_remap_index 216
-#define ColorP3uiv_remap_index 217
-#define ColorP4ui_remap_index 218
-#define ColorP4uiv_remap_index 219
-#define MultiTexCoordP1ui_remap_index 220
-#define MultiTexCoordP1uiv_remap_index 221
-#define MultiTexCoordP2ui_remap_index 222
-#define MultiTexCoordP2uiv_remap_index 223
-#define MultiTexCoordP3ui_remap_index 224
-#define MultiTexCoordP3uiv_remap_index 225
-#define MultiTexCoordP4ui_remap_index 226
-#define MultiTexCoordP4uiv_remap_index 227
-#define NormalP3ui_remap_index 228
-#define NormalP3uiv_remap_index 229
-#define SecondaryColorP3ui_remap_index 230
-#define SecondaryColorP3uiv_remap_index 231
-#define TexCoordP1ui_remap_index 232
-#define TexCoordP1uiv_remap_index 233
-#define TexCoordP2ui_remap_index 234
-#define TexCoordP2uiv_remap_index 235
-#define TexCoordP3ui_remap_index 236
-#define TexCoordP3uiv_remap_index 237
-#define TexCoordP4ui_remap_index 238
-#define TexCoordP4uiv_remap_index 239
-#define VertexAttribP1ui_remap_index 240
-#define VertexAttribP1uiv_remap_index 241
-#define VertexAttribP2ui_remap_index 242
-#define VertexAttribP2uiv_remap_index 243
-#define VertexAttribP3ui_remap_index 244
-#define VertexAttribP3uiv_remap_index 245
-#define VertexAttribP4ui_remap_index 246
-#define VertexAttribP4uiv_remap_index 247
-#define VertexP2ui_remap_index 248
-#define VertexP2uiv_remap_index 249
-#define VertexP3ui_remap_index 250
-#define VertexP3uiv_remap_index 251
-#define VertexP4ui_remap_index 252
-#define VertexP4uiv_remap_index 253
-#define BindTransformFeedback_remap_index 254
-#define DeleteTransformFeedbacks_remap_index 255
-#define DrawTransformFeedback_remap_index 256
-#define GenTransformFeedbacks_remap_index 257
-#define IsTransformFeedback_remap_index 258
-#define PauseTransformFeedback_remap_index 259
-#define ResumeTransformFeedback_remap_index 260
-#define BeginQueryIndexed_remap_index 261
-#define DrawTransformFeedbackStream_remap_index 262
-#define EndQueryIndexed_remap_index 263
-#define GetQueryIndexediv_remap_index 264
-#define ClearDepthf_remap_index 265
-#define DepthRangef_remap_index 266
-#define GetShaderPrecisionFormat_remap_index 267
-#define ReleaseShaderCompiler_remap_index 268
-#define ShaderBinary_remap_index 269
-#define DebugMessageCallbackARB_remap_index 270
-#define DebugMessageControlARB_remap_index 271
-#define DebugMessageInsertARB_remap_index 272
-#define GetDebugMessageLogARB_remap_index 273
-#define GetGraphicsResetStatusARB_remap_index 274
-#define GetnColorTableARB_remap_index 275
-#define GetnCompressedTexImageARB_remap_index 276
-#define GetnConvolutionFilterARB_remap_index 277
-#define GetnHistogramARB_remap_index 278
-#define GetnMapdvARB_remap_index 279
-#define GetnMapfvARB_remap_index 280
-#define GetnMapivARB_remap_index 281
-#define GetnMinmaxARB_remap_index 282
-#define GetnPixelMapfvARB_remap_index 283
-#define GetnPixelMapuivARB_remap_index 284
-#define GetnPixelMapusvARB_remap_index 285
-#define GetnPolygonStippleARB_remap_index 286
-#define GetnSeparableFilterARB_remap_index 287
-#define GetnTexImageARB_remap_index 288
-#define GetnUniformdvARB_remap_index 289
-#define GetnUniformfvARB_remap_index 290
-#define GetnUniformivARB_remap_index 291
-#define GetnUniformuivARB_remap_index 292
-#define ReadnPixelsARB_remap_index 293
-#define DrawArraysInstancedBaseInstance_remap_index 294
-#define DrawElementsInstancedBaseInstance_remap_index 295
-#define DrawElementsInstancedBaseVertexBaseInstance_remap_index 296
-#define DrawTransformFeedbackInstanced_remap_index 297
-#define DrawTransformFeedbackStreamInstanced_remap_index 298
-#define TexStorage1D_remap_index 299
-#define TexStorage2D_remap_index 300
-#define TexStorage3D_remap_index 301
-#define TextureStorage1DEXT_remap_index 302
-#define TextureStorage2DEXT_remap_index 303
-#define TextureStorage3DEXT_remap_index 304
-#define InvalidateBufferData_remap_index 305
-#define InvalidateBufferSubData_remap_index 306
-#define InvalidateFramebuffer_remap_index 307
-#define InvalidateSubFramebuffer_remap_index 308
-#define InvalidateTexImage_remap_index 309
-#define InvalidateTexSubImage_remap_index 310
-#define PolygonOffsetEXT_remap_index 311
-#define SampleMaskSGIS_remap_index 312
-#define SamplePatternSGIS_remap_index 313
-#define ColorPointerEXT_remap_index 314
-#define EdgeFlagPointerEXT_remap_index 315
-#define IndexPointerEXT_remap_index 316
-#define NormalPointerEXT_remap_index 317
-#define TexCoordPointerEXT_remap_index 318
-#define VertexPointerEXT_remap_index 319
-#define PointParameterfEXT_remap_index 320
-#define PointParameterfvEXT_remap_index 321
-#define LockArraysEXT_remap_index 322
-#define UnlockArraysEXT_remap_index 323
-#define SecondaryColor3bEXT_remap_index 324
-#define SecondaryColor3bvEXT_remap_index 325
-#define SecondaryColor3dEXT_remap_index 326
-#define SecondaryColor3dvEXT_remap_index 327
-#define SecondaryColor3fEXT_remap_index 328
-#define SecondaryColor3fvEXT_remap_index 329
-#define SecondaryColor3iEXT_remap_index 330
-#define SecondaryColor3ivEXT_remap_index 331
-#define SecondaryColor3sEXT_remap_index 332
-#define SecondaryColor3svEXT_remap_index 333
-#define SecondaryColor3ubEXT_remap_index 334
-#define SecondaryColor3ubvEXT_remap_index 335
-#define SecondaryColor3uiEXT_remap_index 336
-#define SecondaryColor3uivEXT_remap_index 337
-#define SecondaryColor3usEXT_remap_index 338
-#define SecondaryColor3usvEXT_remap_index 339
-#define SecondaryColorPointerEXT_remap_index 340
-#define MultiDrawArraysEXT_remap_index 341
-#define MultiDrawElementsEXT_remap_index 342
-#define FogCoordPointerEXT_remap_index 343
-#define FogCoorddEXT_remap_index 344
-#define FogCoorddvEXT_remap_index 345
-#define FogCoordfEXT_remap_index 346
-#define FogCoordfvEXT_remap_index 347
-#define BlendFuncSeparateEXT_remap_index 348
-#define ResizeBuffersMESA_remap_index 349
-#define WindowPos2dMESA_remap_index 350
-#define WindowPos2dvMESA_remap_index 351
-#define WindowPos2fMESA_remap_index 352
-#define WindowPos2fvMESA_remap_index 353
-#define WindowPos2iMESA_remap_index 354
-#define WindowPos2ivMESA_remap_index 355
-#define WindowPos2sMESA_remap_index 356
-#define WindowPos2svMESA_remap_index 357
-#define WindowPos3dMESA_remap_index 358
-#define WindowPos3dvMESA_remap_index 359
-#define WindowPos3fMESA_remap_index 360
-#define WindowPos3fvMESA_remap_index 361
-#define WindowPos3iMESA_remap_index 362
-#define WindowPos3ivMESA_remap_index 363
-#define WindowPos3sMESA_remap_index 364
-#define WindowPos3svMESA_remap_index 365
-#define WindowPos4dMESA_remap_index 366
-#define WindowPos4dvMESA_remap_index 367
-#define WindowPos4fMESA_remap_index 368
-#define WindowPos4fvMESA_remap_index 369
-#define WindowPos4iMESA_remap_index 370
-#define WindowPos4ivMESA_remap_index 371
-#define WindowPos4sMESA_remap_index 372
-#define WindowPos4svMESA_remap_index 373
-#define MultiModeDrawArraysIBM_remap_index 374
-#define MultiModeDrawElementsIBM_remap_index 375
-#define AreProgramsResidentNV_remap_index 376
-#define BindProgramNV_remap_index 377
-#define DeleteProgramsNV_remap_index 378
-#define ExecuteProgramNV_remap_index 379
-#define GenProgramsNV_remap_index 380
-#define GetProgramParameterdvNV_remap_index 381
-#define GetProgramParameterfvNV_remap_index 382
-#define GetProgramStringNV_remap_index 383
-#define GetProgramivNV_remap_index 384
-#define GetTrackMatrixivNV_remap_index 385
-#define GetVertexAttribPointervNV_remap_index 386
-#define GetVertexAttribdvNV_remap_index 387
-#define GetVertexAttribfvNV_remap_index 388
-#define GetVertexAttribivNV_remap_index 389
-#define IsProgramNV_remap_index 390
-#define LoadProgramNV_remap_index 391
-#define ProgramParameters4dvNV_remap_index 392
-#define ProgramParameters4fvNV_remap_index 393
-#define RequestResidentProgramsNV_remap_index 394
-#define TrackMatrixNV_remap_index 395
-#define VertexAttrib1dNV_remap_index 396
-#define VertexAttrib1dvNV_remap_index 397
-#define VertexAttrib1fNV_remap_index 398
-#define VertexAttrib1fvNV_remap_index 399
-#define VertexAttrib1sNV_remap_index 400
-#define VertexAttrib1svNV_remap_index 401
-#define VertexAttrib2dNV_remap_index 402
-#define VertexAttrib2dvNV_remap_index 403
-#define VertexAttrib2fNV_remap_index 404
-#define VertexAttrib2fvNV_remap_index 405
-#define VertexAttrib2sNV_remap_index 406
-#define VertexAttrib2svNV_remap_index 407
-#define VertexAttrib3dNV_remap_index 408
-#define VertexAttrib3dvNV_remap_index 409
-#define VertexAttrib3fNV_remap_index 410
-#define VertexAttrib3fvNV_remap_index 411
-#define VertexAttrib3sNV_remap_index 412
-#define VertexAttrib3svNV_remap_index 413
-#define VertexAttrib4dNV_remap_index 414
-#define VertexAttrib4dvNV_remap_index 415
-#define VertexAttrib4fNV_remap_index 416
-#define VertexAttrib4fvNV_remap_index 417
-#define VertexAttrib4sNV_remap_index 418
-#define VertexAttrib4svNV_remap_index 419
-#define VertexAttrib4ubNV_remap_index 420
-#define VertexAttrib4ubvNV_remap_index 421
-#define VertexAttribPointerNV_remap_index 422
-#define VertexAttribs1dvNV_remap_index 423
-#define VertexAttribs1fvNV_remap_index 424
-#define VertexAttribs1svNV_remap_index 425
-#define VertexAttribs2dvNV_remap_index 426
-#define VertexAttribs2fvNV_remap_index 427
-#define VertexAttribs2svNV_remap_index 428
-#define VertexAttribs3dvNV_remap_index 429
-#define VertexAttribs3fvNV_remap_index 430
-#define VertexAttribs3svNV_remap_index 431
-#define VertexAttribs4dvNV_remap_index 432
-#define VertexAttribs4fvNV_remap_index 433
-#define VertexAttribs4svNV_remap_index 434
-#define VertexAttribs4ubvNV_remap_index 435
-#define GetTexBumpParameterfvATI_remap_index 436
-#define GetTexBumpParameterivATI_remap_index 437
-#define TexBumpParameterfvATI_remap_index 438
-#define TexBumpParameterivATI_remap_index 439
-#define AlphaFragmentOp1ATI_remap_index 440
-#define AlphaFragmentOp2ATI_remap_index 441
-#define AlphaFragmentOp3ATI_remap_index 442
-#define BeginFragmentShaderATI_remap_index 443
-#define BindFragmentShaderATI_remap_index 444
-#define ColorFragmentOp1ATI_remap_index 445
-#define ColorFragmentOp2ATI_remap_index 446
-#define ColorFragmentOp3ATI_remap_index 447
-#define DeleteFragmentShaderATI_remap_index 448
-#define EndFragmentShaderATI_remap_index 449
-#define GenFragmentShadersATI_remap_index 450
-#define PassTexCoordATI_remap_index 451
-#define SampleMapATI_remap_index 452
-#define SetFragmentShaderConstantATI_remap_index 453
-#define PointParameteriNV_remap_index 454
-#define PointParameterivNV_remap_index 455
-#define ActiveStencilFaceEXT_remap_index 456
-#define BindVertexArrayAPPLE_remap_index 457
-#define DeleteVertexArraysAPPLE_remap_index 458
-#define GenVertexArraysAPPLE_remap_index 459
-#define IsVertexArrayAPPLE_remap_index 460
-#define GetProgramNamedParameterdvNV_remap_index 461
-#define GetProgramNamedParameterfvNV_remap_index 462
-#define ProgramNamedParameter4dNV_remap_index 463
-#define ProgramNamedParameter4dvNV_remap_index 464
-#define ProgramNamedParameter4fNV_remap_index 465
-#define ProgramNamedParameter4fvNV_remap_index 466
-#define PrimitiveRestartIndexNV_remap_index 467
-#define PrimitiveRestartNV_remap_index 468
-#define DepthBoundsEXT_remap_index 469
-#define BlendEquationSeparateEXT_remap_index 470
-#define BindFramebufferEXT_remap_index 471
-#define BindRenderbufferEXT_remap_index 472
-#define CheckFramebufferStatusEXT_remap_index 473
-#define DeleteFramebuffersEXT_remap_index 474
-#define DeleteRenderbuffersEXT_remap_index 475
-#define FramebufferRenderbufferEXT_remap_index 476
-#define FramebufferTexture1DEXT_remap_index 477
-#define FramebufferTexture2DEXT_remap_index 478
-#define FramebufferTexture3DEXT_remap_index 479
-#define GenFramebuffersEXT_remap_index 480
-#define GenRenderbuffersEXT_remap_index 481
-#define GenerateMipmapEXT_remap_index 482
-#define GetFramebufferAttachmentParameterivEXT_remap_index 483
-#define GetRenderbufferParameterivEXT_remap_index 484
-#define IsFramebufferEXT_remap_index 485
-#define IsRenderbufferEXT_remap_index 486
-#define RenderbufferStorageEXT_remap_index 487
-#define BlitFramebufferEXT_remap_index 488
-#define BufferParameteriAPPLE_remap_index 489
-#define FlushMappedBufferRangeAPPLE_remap_index 490
-#define BindFragDataLocationEXT_remap_index 491
-#define GetFragDataLocationEXT_remap_index 492
-#define GetUniformuivEXT_remap_index 493
-#define GetVertexAttribIivEXT_remap_index 494
-#define GetVertexAttribIuivEXT_remap_index 495
-#define Uniform1uiEXT_remap_index 496
-#define Uniform1uivEXT_remap_index 497
-#define Uniform2uiEXT_remap_index 498
-#define Uniform2uivEXT_remap_index 499
-#define Uniform3uiEXT_remap_index 500
-#define Uniform3uivEXT_remap_index 501
-#define Uniform4uiEXT_remap_index 502
-#define Uniform4uivEXT_remap_index 503
-#define VertexAttribI1iEXT_remap_index 504
-#define VertexAttribI1ivEXT_remap_index 505
-#define VertexAttribI1uiEXT_remap_index 506
-#define VertexAttribI1uivEXT_remap_index 507
-#define VertexAttribI2iEXT_remap_index 508
-#define VertexAttribI2ivEXT_remap_index 509
-#define VertexAttribI2uiEXT_remap_index 510
-#define VertexAttribI2uivEXT_remap_index 511
-#define VertexAttribI3iEXT_remap_index 512
-#define VertexAttribI3ivEXT_remap_index 513
-#define VertexAttribI3uiEXT_remap_index 514
-#define VertexAttribI3uivEXT_remap_index 515
-#define VertexAttribI4bvEXT_remap_index 516
-#define VertexAttribI4iEXT_remap_index 517
-#define VertexAttribI4ivEXT_remap_index 518
-#define VertexAttribI4svEXT_remap_index 519
-#define VertexAttribI4ubvEXT_remap_index 520
-#define VertexAttribI4uiEXT_remap_index 521
-#define VertexAttribI4uivEXT_remap_index 522
-#define VertexAttribI4usvEXT_remap_index 523
-#define VertexAttribIPointerEXT_remap_index 524
-#define FramebufferTextureLayerEXT_remap_index 525
-#define ColorMaskIndexedEXT_remap_index 526
-#define DisableIndexedEXT_remap_index 527
-#define EnableIndexedEXT_remap_index 528
-#define GetBooleanIndexedvEXT_remap_index 529
-#define GetIntegerIndexedvEXT_remap_index 530
-#define IsEnabledIndexedEXT_remap_index 531
-#define ClearColorIiEXT_remap_index 532
-#define ClearColorIuiEXT_remap_index 533
-#define GetTexParameterIivEXT_remap_index 534
-#define GetTexParameterIuivEXT_remap_index 535
-#define TexParameterIivEXT_remap_index 536
-#define TexParameterIuivEXT_remap_index 537
-#define BeginConditionalRenderNV_remap_index 538
-#define EndConditionalRenderNV_remap_index 539
-#define BeginTransformFeedbackEXT_remap_index 540
-#define BindBufferBaseEXT_remap_index 541
-#define BindBufferOffsetEXT_remap_index 542
-#define BindBufferRangeEXT_remap_index 543
-#define EndTransformFeedbackEXT_remap_index 544
-#define GetTransformFeedbackVaryingEXT_remap_index 545
-#define TransformFeedbackVaryingsEXT_remap_index 546
-#define ProvokingVertexEXT_remap_index 547
-#define GetObjectParameterivAPPLE_remap_index 548
-#define ObjectPurgeableAPPLE_remap_index 549
-#define ObjectUnpurgeableAPPLE_remap_index 550
-#define ActiveProgramEXT_remap_index 551
-#define CreateShaderProgramEXT_remap_index 552
-#define UseShaderProgramEXT_remap_index 553
-#define TextureBarrierNV_remap_index 554
-#define StencilFuncSeparateATI_remap_index 555
-#define ProgramEnvParameters4fvEXT_remap_index 556
-#define ProgramLocalParameters4fvEXT_remap_index 557
-#define GetQueryObjecti64vEXT_remap_index 558
-#define GetQueryObjectui64vEXT_remap_index 559
-#define EGLImageTargetRenderbufferStorageOES_remap_index 560
-#define EGLImageTargetTexture2DOES_remap_index 561
+#define ClearBufferfi_remap_index 22
+#define ClearBufferfv_remap_index 23
+#define ClearBufferiv_remap_index 24
+#define ClearBufferuiv_remap_index 25
+#define GetStringi_remap_index 26
+#define FramebufferTexture_remap_index 27
+#define GetBufferParameteri64v_remap_index 28
+#define GetInteger64i_v_remap_index 29
+#define LoadTransposeMatrixdARB_remap_index 30
+#define LoadTransposeMatrixfARB_remap_index 31
+#define MultTransposeMatrixdARB_remap_index 32
+#define MultTransposeMatrixfARB_remap_index 33
+#define SampleCoverageARB_remap_index 34
+#define CompressedTexImage1DARB_remap_index 35
+#define CompressedTexImage2DARB_remap_index 36
+#define CompressedTexImage3DARB_remap_index 37
+#define CompressedTexSubImage1DARB_remap_index 38
+#define CompressedTexSubImage2DARB_remap_index 39
+#define CompressedTexSubImage3DARB_remap_index 40
+#define GetCompressedTexImageARB_remap_index 41
+#define DisableVertexAttribArrayARB_remap_index 42
+#define EnableVertexAttribArrayARB_remap_index 43
+#define GetProgramEnvParameterdvARB_remap_index 44
+#define GetProgramEnvParameterfvARB_remap_index 45
+#define GetProgramLocalParameterdvARB_remap_index 46
+#define GetProgramLocalParameterfvARB_remap_index 47
+#define GetProgramStringARB_remap_index 48
+#define GetProgramivARB_remap_index 49
+#define GetVertexAttribdvARB_remap_index 50
+#define GetVertexAttribfvARB_remap_index 51
+#define GetVertexAttribivARB_remap_index 52
+#define ProgramEnvParameter4dARB_remap_index 53
+#define ProgramEnvParameter4dvARB_remap_index 54
+#define ProgramEnvParameter4fARB_remap_index 55
+#define ProgramEnvParameter4fvARB_remap_index 56
+#define ProgramLocalParameter4dARB_remap_index 57
+#define ProgramLocalParameter4dvARB_remap_index 58
+#define ProgramLocalParameter4fARB_remap_index 59
+#define ProgramLocalParameter4fvARB_remap_index 60
+#define ProgramStringARB_remap_index 61
+#define VertexAttrib1dARB_remap_index 62
+#define VertexAttrib1dvARB_remap_index 63
+#define VertexAttrib1fARB_remap_index 64
+#define VertexAttrib1fvARB_remap_index 65
+#define VertexAttrib1sARB_remap_index 66
+#define VertexAttrib1svARB_remap_index 67
+#define VertexAttrib2dARB_remap_index 68
+#define VertexAttrib2dvARB_remap_index 69
+#define VertexAttrib2fARB_remap_index 70
+#define VertexAttrib2fvARB_remap_index 71
+#define VertexAttrib2sARB_remap_index 72
+#define VertexAttrib2svARB_remap_index 73
+#define VertexAttrib3dARB_remap_index 74
+#define VertexAttrib3dvARB_remap_index 75
+#define VertexAttrib3fARB_remap_index 76
+#define VertexAttrib3fvARB_remap_index 77
+#define VertexAttrib3sARB_remap_index 78
+#define VertexAttrib3svARB_remap_index 79
+#define VertexAttrib4NbvARB_remap_index 80
+#define VertexAttrib4NivARB_remap_index 81
+#define VertexAttrib4NsvARB_remap_index 82
+#define VertexAttrib4NubARB_remap_index 83
+#define VertexAttrib4NubvARB_remap_index 84
+#define VertexAttrib4NuivARB_remap_index 85
+#define VertexAttrib4NusvARB_remap_index 86
+#define VertexAttrib4bvARB_remap_index 87
+#define VertexAttrib4dARB_remap_index 88
+#define VertexAttrib4dvARB_remap_index 89
+#define VertexAttrib4fARB_remap_index 90
+#define VertexAttrib4fvARB_remap_index 91
+#define VertexAttrib4ivARB_remap_index 92
+#define VertexAttrib4sARB_remap_index 93
+#define VertexAttrib4svARB_remap_index 94
+#define VertexAttrib4ubvARB_remap_index 95
+#define VertexAttrib4uivARB_remap_index 96
+#define VertexAttrib4usvARB_remap_index 97
+#define VertexAttribPointerARB_remap_index 98
+#define BindBufferARB_remap_index 99
+#define BufferDataARB_remap_index 100
+#define BufferSubDataARB_remap_index 101
+#define DeleteBuffersARB_remap_index 102
+#define GenBuffersARB_remap_index 103
+#define GetBufferParameterivARB_remap_index 104
+#define GetBufferPointervARB_remap_index 105
+#define GetBufferSubDataARB_remap_index 106
+#define IsBufferARB_remap_index 107
+#define MapBufferARB_remap_index 108
+#define UnmapBufferARB_remap_index 109
+#define BeginQueryARB_remap_index 110
+#define DeleteQueriesARB_remap_index 111
+#define EndQueryARB_remap_index 112
+#define GenQueriesARB_remap_index 113
+#define GetQueryObjectivARB_remap_index 114
+#define GetQueryObjectuivARB_remap_index 115
+#define GetQueryivARB_remap_index 116
+#define IsQueryARB_remap_index 117
+#define AttachObjectARB_remap_index 118
+#define CompileShaderARB_remap_index 119
+#define CreateProgramObjectARB_remap_index 120
+#define CreateShaderObjectARB_remap_index 121
+#define DeleteObjectARB_remap_index 122
+#define DetachObjectARB_remap_index 123
+#define GetActiveUniformARB_remap_index 124
+#define GetAttachedObjectsARB_remap_index 125
+#define GetHandleARB_remap_index 126
+#define GetInfoLogARB_remap_index 127
+#define GetObjectParameterfvARB_remap_index 128
+#define GetObjectParameterivARB_remap_index 129
+#define GetShaderSourceARB_remap_index 130
+#define GetUniformLocationARB_remap_index 131
+#define GetUniformfvARB_remap_index 132
+#define GetUniformivARB_remap_index 133
+#define LinkProgramARB_remap_index 134
+#define ShaderSourceARB_remap_index 135
+#define Uniform1fARB_remap_index 136
+#define Uniform1fvARB_remap_index 137
+#define Uniform1iARB_remap_index 138
+#define Uniform1ivARB_remap_index 139
+#define Uniform2fARB_remap_index 140
+#define Uniform2fvARB_remap_index 141
+#define Uniform2iARB_remap_index 142
+#define Uniform2ivARB_remap_index 143
+#define Uniform3fARB_remap_index 144
+#define Uniform3fvARB_remap_index 145
+#define Uniform3iARB_remap_index 146
+#define Uniform3ivARB_remap_index 147
+#define Uniform4fARB_remap_index 148
+#define Uniform4fvARB_remap_index 149
+#define Uniform4iARB_remap_index 150
+#define Uniform4ivARB_remap_index 151
+#define UniformMatrix2fvARB_remap_index 152
+#define UniformMatrix3fvARB_remap_index 153
+#define UniformMatrix4fvARB_remap_index 154
+#define UseProgramObjectARB_remap_index 155
+#define ValidateProgramARB_remap_index 156
+#define BindAttribLocationARB_remap_index 157
+#define GetActiveAttribARB_remap_index 158
+#define GetAttribLocationARB_remap_index 159
+#define DrawBuffersARB_remap_index 160
+#define ClampColorARB_remap_index 161
+#define DrawArraysInstancedARB_remap_index 162
+#define DrawElementsInstancedARB_remap_index 163
+#define RenderbufferStorageMultisample_remap_index 164
+#define FramebufferTextureFaceARB_remap_index 165
+#define VertexAttribDivisorARB_remap_index 166
+#define FlushMappedBufferRange_remap_index 167
+#define MapBufferRange_remap_index 168
+#define TexBufferARB_remap_index 169
+#define BindVertexArray_remap_index 170
+#define GenVertexArrays_remap_index 171
+#define GetActiveUniformBlockName_remap_index 172
+#define GetActiveUniformBlockiv_remap_index 173
+#define GetActiveUniformName_remap_index 174
+#define GetActiveUniformsiv_remap_index 175
+#define GetUniformBlockIndex_remap_index 176
+#define GetUniformIndices_remap_index 177
+#define UniformBlockBinding_remap_index 178
+#define CopyBufferSubData_remap_index 179
+#define ClientWaitSync_remap_index 180
+#define DeleteSync_remap_index 181
+#define FenceSync_remap_index 182
+#define GetInteger64v_remap_index 183
+#define GetSynciv_remap_index 184
+#define IsSync_remap_index 185
+#define WaitSync_remap_index 186
+#define DrawElementsBaseVertex_remap_index 187
+#define DrawElementsInstancedBaseVertex_remap_index 188
+#define DrawRangeElementsBaseVertex_remap_index 189
+#define MultiDrawElementsBaseVertex_remap_index 190
+#define BlendEquationSeparateiARB_remap_index 191
+#define BlendEquationiARB_remap_index 192
+#define BlendFuncSeparateiARB_remap_index 193
+#define BlendFunciARB_remap_index 194
+#define BindFragDataLocationIndexed_remap_index 195
+#define GetFragDataIndex_remap_index 196
+#define BindSampler_remap_index 197
+#define DeleteSamplers_remap_index 198
+#define GenSamplers_remap_index 199
+#define GetSamplerParameterIiv_remap_index 200
+#define GetSamplerParameterIuiv_remap_index 201
+#define GetSamplerParameterfv_remap_index 202
+#define GetSamplerParameteriv_remap_index 203
+#define IsSampler_remap_index 204
+#define SamplerParameterIiv_remap_index 205
+#define SamplerParameterIuiv_remap_index 206
+#define SamplerParameterf_remap_index 207
+#define SamplerParameterfv_remap_index 208
+#define SamplerParameteri_remap_index 209
+#define SamplerParameteriv_remap_index 210
+#define QueryCounter_remap_index 211
+#define ColorP3ui_remap_index 212
+#define ColorP3uiv_remap_index 213
+#define ColorP4ui_remap_index 214
+#define ColorP4uiv_remap_index 215
+#define MultiTexCoordP1ui_remap_index 216
+#define MultiTexCoordP1uiv_remap_index 217
+#define MultiTexCoordP2ui_remap_index 218
+#define MultiTexCoordP2uiv_remap_index 219
+#define MultiTexCoordP3ui_remap_index 220
+#define MultiTexCoordP3uiv_remap_index 221
+#define MultiTexCoordP4ui_remap_index 222
+#define MultiTexCoordP4uiv_remap_index 223
+#define NormalP3ui_remap_index 224
+#define NormalP3uiv_remap_index 225
+#define SecondaryColorP3ui_remap_index 226
+#define SecondaryColorP3uiv_remap_index 227
+#define TexCoordP1ui_remap_index 228
+#define TexCoordP1uiv_remap_index 229
+#define TexCoordP2ui_remap_index 230
+#define TexCoordP2uiv_remap_index 231
+#define TexCoordP3ui_remap_index 232
+#define TexCoordP3uiv_remap_index 233
+#define TexCoordP4ui_remap_index 234
+#define TexCoordP4uiv_remap_index 235
+#define VertexAttribP1ui_remap_index 236
+#define VertexAttribP1uiv_remap_index 237
+#define VertexAttribP2ui_remap_index 238
+#define VertexAttribP2uiv_remap_index 239
+#define VertexAttribP3ui_remap_index 240
+#define VertexAttribP3uiv_remap_index 241
+#define VertexAttribP4ui_remap_index 242
+#define VertexAttribP4uiv_remap_index 243
+#define VertexP2ui_remap_index 244
+#define VertexP2uiv_remap_index 245
+#define VertexP3ui_remap_index 246
+#define VertexP3uiv_remap_index 247
+#define VertexP4ui_remap_index 248
+#define VertexP4uiv_remap_index 249
+#define BindTransformFeedback_remap_index 250
+#define DeleteTransformFeedbacks_remap_index 251
+#define DrawTransformFeedback_remap_index 252
+#define GenTransformFeedbacks_remap_index 253
+#define IsTransformFeedback_remap_index 254
+#define PauseTransformFeedback_remap_index 255
+#define ResumeTransformFeedback_remap_index 256
+#define BeginQueryIndexed_remap_index 257
+#define DrawTransformFeedbackStream_remap_index 258
+#define EndQueryIndexed_remap_index 259
+#define GetQueryIndexediv_remap_index 260
+#define ClearDepthf_remap_index 261
+#define DepthRangef_remap_index 262
+#define GetShaderPrecisionFormat_remap_index 263
+#define ReleaseShaderCompiler_remap_index 264
+#define ShaderBinary_remap_index 265
+#define GetProgramBinary_remap_index 266
+#define ProgramBinary_remap_index 267
+#define ProgramParameteri_remap_index 268
+#define DebugMessageCallbackARB_remap_index 269
+#define DebugMessageControlARB_remap_index 270
+#define DebugMessageInsertARB_remap_index 271
+#define GetDebugMessageLogARB_remap_index 272
+#define GetGraphicsResetStatusARB_remap_index 273
+#define GetnColorTableARB_remap_index 274
+#define GetnCompressedTexImageARB_remap_index 275
+#define GetnConvolutionFilterARB_remap_index 276
+#define GetnHistogramARB_remap_index 277
+#define GetnMapdvARB_remap_index 278
+#define GetnMapfvARB_remap_index 279
+#define GetnMapivARB_remap_index 280
+#define GetnMinmaxARB_remap_index 281
+#define GetnPixelMapfvARB_remap_index 282
+#define GetnPixelMapuivARB_remap_index 283
+#define GetnPixelMapusvARB_remap_index 284
+#define GetnPolygonStippleARB_remap_index 285
+#define GetnSeparableFilterARB_remap_index 286
+#define GetnTexImageARB_remap_index 287
+#define GetnUniformdvARB_remap_index 288
+#define GetnUniformfvARB_remap_index 289
+#define GetnUniformivARB_remap_index 290
+#define GetnUniformuivARB_remap_index 291
+#define ReadnPixelsARB_remap_index 292
+#define DrawArraysInstancedBaseInstance_remap_index 293
+#define DrawElementsInstancedBaseInstance_remap_index 294
+#define DrawElementsInstancedBaseVertexBaseInstance_remap_index 295
+#define DrawTransformFeedbackInstanced_remap_index 296
+#define DrawTransformFeedbackStreamInstanced_remap_index 297
+#define TexStorage1D_remap_index 298
+#define TexStorage2D_remap_index 299
+#define TexStorage3D_remap_index 300
+#define TextureStorage1DEXT_remap_index 301
+#define TextureStorage2DEXT_remap_index 302
+#define TextureStorage3DEXT_remap_index 303
+#define InvalidateBufferData_remap_index 304
+#define InvalidateBufferSubData_remap_index 305
+#define InvalidateFramebuffer_remap_index 306
+#define InvalidateSubFramebuffer_remap_index 307
+#define InvalidateTexImage_remap_index 308
+#define InvalidateTexSubImage_remap_index 309
+#define PolygonOffsetEXT_remap_index 310
+#define SampleMaskSGIS_remap_index 311
+#define SamplePatternSGIS_remap_index 312
+#define ColorPointerEXT_remap_index 313
+#define EdgeFlagPointerEXT_remap_index 314
+#define IndexPointerEXT_remap_index 315
+#define NormalPointerEXT_remap_index 316
+#define TexCoordPointerEXT_remap_index 317
+#define VertexPointerEXT_remap_index 318
+#define PointParameterfEXT_remap_index 319
+#define PointParameterfvEXT_remap_index 320
+#define LockArraysEXT_remap_index 321
+#define UnlockArraysEXT_remap_index 322
+#define SecondaryColor3bEXT_remap_index 323
+#define SecondaryColor3bvEXT_remap_index 324
+#define SecondaryColor3dEXT_remap_index 325
+#define SecondaryColor3dvEXT_remap_index 326
+#define SecondaryColor3fEXT_remap_index 327
+#define SecondaryColor3fvEXT_remap_index 328
+#define SecondaryColor3iEXT_remap_index 329
+#define SecondaryColor3ivEXT_remap_index 330
+#define SecondaryColor3sEXT_remap_index 331
+#define SecondaryColor3svEXT_remap_index 332
+#define SecondaryColor3ubEXT_remap_index 333
+#define SecondaryColor3ubvEXT_remap_index 334
+#define SecondaryColor3uiEXT_remap_index 335
+#define SecondaryColor3uivEXT_remap_index 336
+#define SecondaryColor3usEXT_remap_index 337
+#define SecondaryColor3usvEXT_remap_index 338
+#define SecondaryColorPointerEXT_remap_index 339
+#define MultiDrawArraysEXT_remap_index 340
+#define MultiDrawElementsEXT_remap_index 341
+#define FogCoordPointerEXT_remap_index 342
+#define FogCoorddEXT_remap_index 343
+#define FogCoorddvEXT_remap_index 344
+#define FogCoordfEXT_remap_index 345
+#define FogCoordfvEXT_remap_index 346
+#define BlendFuncSeparateEXT_remap_index 347
+#define ResizeBuffersMESA_remap_index 348
+#define WindowPos2dMESA_remap_index 349
+#define WindowPos2dvMESA_remap_index 350
+#define WindowPos2fMESA_remap_index 351
+#define WindowPos2fvMESA_remap_index 352
+#define WindowPos2iMESA_remap_index 353
+#define WindowPos2ivMESA_remap_index 354
+#define WindowPos2sMESA_remap_index 355
+#define WindowPos2svMESA_remap_index 356
+#define WindowPos3dMESA_remap_index 357
+#define WindowPos3dvMESA_remap_index 358
+#define WindowPos3fMESA_remap_index 359
+#define WindowPos3fvMESA_remap_index 360
+#define WindowPos3iMESA_remap_index 361
+#define WindowPos3ivMESA_remap_index 362
+#define WindowPos3sMESA_remap_index 363
+#define WindowPos3svMESA_remap_index 364
+#define WindowPos4dMESA_remap_index 365
+#define WindowPos4dvMESA_remap_index 366
+#define WindowPos4fMESA_remap_index 367
+#define WindowPos4fvMESA_remap_index 368
+#define WindowPos4iMESA_remap_index 369
+#define WindowPos4ivMESA_remap_index 370
+#define WindowPos4sMESA_remap_index 371
+#define WindowPos4svMESA_remap_index 372
+#define MultiModeDrawArraysIBM_remap_index 373
+#define MultiModeDrawElementsIBM_remap_index 374
+#define AreProgramsResidentNV_remap_index 375
+#define BindProgramNV_remap_index 376
+#define DeleteProgramsNV_remap_index 377
+#define ExecuteProgramNV_remap_index 378
+#define GenProgramsNV_remap_index 379
+#define GetProgramParameterdvNV_remap_index 380
+#define GetProgramParameterfvNV_remap_index 381
+#define GetProgramStringNV_remap_index 382
+#define GetProgramivNV_remap_index 383
+#define GetTrackMatrixivNV_remap_index 384
+#define GetVertexAttribPointervNV_remap_index 385
+#define GetVertexAttribdvNV_remap_index 386
+#define GetVertexAttribfvNV_remap_index 387
+#define GetVertexAttribivNV_remap_index 388
+#define IsProgramNV_remap_index 389
+#define LoadProgramNV_remap_index 390
+#define ProgramParameters4dvNV_remap_index 391
+#define ProgramParameters4fvNV_remap_index 392
+#define RequestResidentProgramsNV_remap_index 393
+#define TrackMatrixNV_remap_index 394
+#define VertexAttrib1dNV_remap_index 395
+#define VertexAttrib1dvNV_remap_index 396
+#define VertexAttrib1fNV_remap_index 397
+#define VertexAttrib1fvNV_remap_index 398
+#define VertexAttrib1sNV_remap_index 399
+#define VertexAttrib1svNV_remap_index 400
+#define VertexAttrib2dNV_remap_index 401
+#define VertexAttrib2dvNV_remap_index 402
+#define VertexAttrib2fNV_remap_index 403
+#define VertexAttrib2fvNV_remap_index 404
+#define VertexAttrib2sNV_remap_index 405
+#define VertexAttrib2svNV_remap_index 406
+#define VertexAttrib3dNV_remap_index 407
+#define VertexAttrib3dvNV_remap_index 408
+#define VertexAttrib3fNV_remap_index 409
+#define VertexAttrib3fvNV_remap_index 410
+#define VertexAttrib3sNV_remap_index 411
+#define VertexAttrib3svNV_remap_index 412
+#define VertexAttrib4dNV_remap_index 413
+#define VertexAttrib4dvNV_remap_index 414
+#define VertexAttrib4fNV_remap_index 415
+#define VertexAttrib4fvNV_remap_index 416
+#define VertexAttrib4sNV_remap_index 417
+#define VertexAttrib4svNV_remap_index 418
+#define VertexAttrib4ubNV_remap_index 419
+#define VertexAttrib4ubvNV_remap_index 420
+#define VertexAttribPointerNV_remap_index 421
+#define VertexAttribs1dvNV_remap_index 422
+#define VertexAttribs1fvNV_remap_index 423
+#define VertexAttribs1svNV_remap_index 424
+#define VertexAttribs2dvNV_remap_index 425
+#define VertexAttribs2fvNV_remap_index 426
+#define VertexAttribs2svNV_remap_index 427
+#define VertexAttribs3dvNV_remap_index 428
+#define VertexAttribs3fvNV_remap_index 429
+#define VertexAttribs3svNV_remap_index 430
+#define VertexAttribs4dvNV_remap_index 431
+#define VertexAttribs4fvNV_remap_index 432
+#define VertexAttribs4svNV_remap_index 433
+#define VertexAttribs4ubvNV_remap_index 434
+#define GetTexBumpParameterfvATI_remap_index 435
+#define GetTexBumpParameterivATI_remap_index 436
+#define TexBumpParameterfvATI_remap_index 437
+#define TexBumpParameterivATI_remap_index 438
+#define AlphaFragmentOp1ATI_remap_index 439
+#define AlphaFragmentOp2ATI_remap_index 440
+#define AlphaFragmentOp3ATI_remap_index 441
+#define BeginFragmentShaderATI_remap_index 442
+#define BindFragmentShaderATI_remap_index 443
+#define ColorFragmentOp1ATI_remap_index 444
+#define ColorFragmentOp2ATI_remap_index 445
+#define ColorFragmentOp3ATI_remap_index 446
+#define DeleteFragmentShaderATI_remap_index 447
+#define EndFragmentShaderATI_remap_index 448
+#define GenFragmentShadersATI_remap_index 449
+#define PassTexCoordATI_remap_index 450
+#define SampleMapATI_remap_index 451
+#define SetFragmentShaderConstantATI_remap_index 452
+#define PointParameteriNV_remap_index 453
+#define PointParameterivNV_remap_index 454
+#define ActiveStencilFaceEXT_remap_index 455
+#define BindVertexArrayAPPLE_remap_index 456
+#define DeleteVertexArraysAPPLE_remap_index 457
+#define GenVertexArraysAPPLE_remap_index 458
+#define IsVertexArrayAPPLE_remap_index 459
+#define GetProgramNamedParameterdvNV_remap_index 460
+#define GetProgramNamedParameterfvNV_remap_index 461
+#define ProgramNamedParameter4dNV_remap_index 462
+#define ProgramNamedParameter4dvNV_remap_index 463
+#define ProgramNamedParameter4fNV_remap_index 464
+#define ProgramNamedParameter4fvNV_remap_index 465
+#define PrimitiveRestartIndexNV_remap_index 466
+#define PrimitiveRestartNV_remap_index 467
+#define DepthBoundsEXT_remap_index 468
+#define BlendEquationSeparateEXT_remap_index 469
+#define BindFramebufferEXT_remap_index 470
+#define BindRenderbufferEXT_remap_index 471
+#define CheckFramebufferStatusEXT_remap_index 472
+#define DeleteFramebuffersEXT_remap_index 473
+#define DeleteRenderbuffersEXT_remap_index 474
+#define FramebufferRenderbufferEXT_remap_index 475
+#define FramebufferTexture1DEXT_remap_index 476
+#define FramebufferTexture2DEXT_remap_index 477
+#define FramebufferTexture3DEXT_remap_index 478
+#define GenFramebuffersEXT_remap_index 479
+#define GenRenderbuffersEXT_remap_index 480
+#define GenerateMipmapEXT_remap_index 481
+#define GetFramebufferAttachmentParameterivEXT_remap_index 482
+#define GetRenderbufferParameterivEXT_remap_index 483
+#define IsFramebufferEXT_remap_index 484
+#define IsRenderbufferEXT_remap_index 485
+#define RenderbufferStorageEXT_remap_index 486
+#define BlitFramebufferEXT_remap_index 487
+#define BufferParameteriAPPLE_remap_index 488
+#define FlushMappedBufferRangeAPPLE_remap_index 489
+#define BindFragDataLocationEXT_remap_index 490
+#define GetFragDataLocationEXT_remap_index 491
+#define GetUniformuivEXT_remap_index 492
+#define GetVertexAttribIivEXT_remap_index 493
+#define GetVertexAttribIuivEXT_remap_index 494
+#define Uniform1uiEXT_remap_index 495
+#define Uniform1uivEXT_remap_index 496
+#define Uniform2uiEXT_remap_index 497
+#define Uniform2uivEXT_remap_index 498
+#define Uniform3uiEXT_remap_index 499
+#define Uniform3uivEXT_remap_index 500
+#define Uniform4uiEXT_remap_index 501
+#define Uniform4uivEXT_remap_index 502
+#define VertexAttribI1iEXT_remap_index 503
+#define VertexAttribI1ivEXT_remap_index 504
+#define VertexAttribI1uiEXT_remap_index 505
+#define VertexAttribI1uivEXT_remap_index 506
+#define VertexAttribI2iEXT_remap_index 507
+#define VertexAttribI2ivEXT_remap_index 508
+#define VertexAttribI2uiEXT_remap_index 509
+#define VertexAttribI2uivEXT_remap_index 510
+#define VertexAttribI3iEXT_remap_index 511
+#define VertexAttribI3ivEXT_remap_index 512
+#define VertexAttribI3uiEXT_remap_index 513
+#define VertexAttribI3uivEXT_remap_index 514
+#define VertexAttribI4bvEXT_remap_index 515
+#define VertexAttribI4iEXT_remap_index 516
+#define VertexAttribI4ivEXT_remap_index 517
+#define VertexAttribI4svEXT_remap_index 518
+#define VertexAttribI4ubvEXT_remap_index 519
+#define VertexAttribI4uiEXT_remap_index 520
+#define VertexAttribI4uivEXT_remap_index 521
+#define VertexAttribI4usvEXT_remap_index 522
+#define VertexAttribIPointerEXT_remap_index 523
+#define FramebufferTextureLayerEXT_remap_index 524
+#define ColorMaskIndexedEXT_remap_index 525
+#define DisableIndexedEXT_remap_index 526
+#define EnableIndexedEXT_remap_index 527
+#define GetBooleanIndexedvEXT_remap_index 528
+#define GetIntegerIndexedvEXT_remap_index 529
+#define IsEnabledIndexedEXT_remap_index 530
+#define ClearColorIiEXT_remap_index 531
+#define ClearColorIuiEXT_remap_index 532
+#define GetTexParameterIivEXT_remap_index 533
+#define GetTexParameterIuivEXT_remap_index 534
+#define TexParameterIivEXT_remap_index 535
+#define TexParameterIuivEXT_remap_index 536
+#define BeginConditionalRenderNV_remap_index 537
+#define EndConditionalRenderNV_remap_index 538
+#define BeginTransformFeedbackEXT_remap_index 539
+#define BindBufferBaseEXT_remap_index 540
+#define BindBufferOffsetEXT_remap_index 541
+#define BindBufferRangeEXT_remap_index 542
+#define EndTransformFeedbackEXT_remap_index 543
+#define GetTransformFeedbackVaryingEXT_remap_index 544
+#define TransformFeedbackVaryingsEXT_remap_index 545
+#define ProvokingVertexEXT_remap_index 546
+#define GetObjectParameterivAPPLE_remap_index 547
+#define ObjectPurgeableAPPLE_remap_index 548
+#define ObjectUnpurgeableAPPLE_remap_index 549
+#define ActiveProgramEXT_remap_index 550
+#define CreateShaderProgramEXT_remap_index 551
+#define UseShaderProgramEXT_remap_index 552
+#define TextureBarrierNV_remap_index 553
+#define StencilFuncSeparateATI_remap_index 554
+#define ProgramEnvParameters4fvEXT_remap_index 555
+#define ProgramLocalParameters4fvEXT_remap_index 556
+#define GetQueryObjecti64vEXT_remap_index 557
+#define GetQueryObjectui64vEXT_remap_index 558
+#define EGLImageTargetRenderbufferStorageOES_remap_index 559
+#define EGLImageTargetTexture2DOES_remap_index 560
 
 #define _gloffset_AttachShader driDispatchRemapTable[AttachShader_remap_index]
 #define _gloffset_CreateProgram driDispatchRemapTable[CreateProgram_remap_index]
@@ -1635,7 +1633,6 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define _gloffset_UniformMatrix3x4fv driDispatchRemapTable[UniformMatrix3x4fv_remap_index]
 #define _gloffset_UniformMatrix4x2fv driDispatchRemapTable[UniformMatrix4x2fv_remap_index]
 #define _gloffset_UniformMatrix4x3fv driDispatchRemapTable[UniformMatrix4x3fv_remap_index]
-#define _gloffset_ClampColor driDispatchRemapTable[ClampColor_remap_index]
 #define _gloffset_ClearBufferfi driDispatchRemapTable[ClearBufferfi_remap_index]
 #define _gloffset_ClearBufferfv driDispatchRemapTable[ClearBufferfv_remap_index]
 #define _gloffset_ClearBufferiv driDispatchRemapTable[ClearBufferiv_remap_index]
@@ -1644,7 +1641,6 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define _gloffset_FramebufferTexture driDispatchRemapTable[FramebufferTexture_remap_index]
 #define _gloffset_GetBufferParameteri64v driDispatchRemapTable[GetBufferParameteri64v_remap_index]
 #define _gloffset_GetInteger64i_v driDispatchRemapTable[GetInteger64i_v_remap_index]
-#define _gloffset_VertexAttribDivisor driDispatchRemapTable[VertexAttribDivisor_remap_index]
 #define _gloffset_LoadTransposeMatrixdARB driDispatchRemapTable[LoadTransposeMatrixdARB_remap_index]
 #define _gloffset_LoadTransposeMatrixfARB driDispatchRemapTable[LoadTransposeMatrixfARB_remap_index]
 #define _gloffset_MultTransposeMatrixdARB driDispatchRemapTable[MultTransposeMatrixdARB_remap_index]
@@ -1780,9 +1776,7 @@ extern int driDispatchRemapTable[ driDispatchRemapTable_size ];
 #define _gloffset_DrawArraysInstancedARB driDispatchRemapTable[DrawArraysInstancedARB_remap_index]
 #define _gloffset_DrawElementsInstancedARB driDispatchRemapTable[DrawElementsInstancedARB_remap_index]
 #define _gloffset_RenderbufferStorageMultisample driDispatchRemapTable[RenderbufferStorageMultisample_remap_index]
-#define _gloffset_FramebufferTextureARB driDispatchRemapTable[FramebufferTextureARB_remap_index]
 #define _gloffset_FramebufferTextureFaceARB driDispatchRemapTable[FramebufferTextureFaceARB_remap_index]
-#define _gloffset_ProgramParameteriARB driDispatchRemapTable[ProgramParameteriARB_remap_index]
 #define _gloffset_VertexAttribDivisorARB driDispatchRemapTable[VertexAttribDivisorARB_remap_index]
 #define _gloffset_FlushMappedBufferRange driDispatchRemapTable[FlushMappedBufferRange_remap_index]
 #define _gloffset_MapBufferRange driDispatchRemapTable[MapBufferRange_remap_index]
@@ -1883,6 +1877,9 @@ 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_GetProgramBinary driDispatchRemapTable[GetProgramBinary_remap_index]
+#define _gloffset_ProgramBinary driDispatchRemapTable[ProgramBinary_remap_index]
+#define _gloffset_ProgramParameteri driDispatchRemapTable[ProgramParameteri_remap_index]
 #define _gloffset_DebugMessageCallbackARB driDispatchRemapTable[DebugMessageCallbackARB_remap_index]
 #define _gloffset_DebugMessageControlARB driDispatchRemapTable[DebugMessageControlARB_remap_index]
 #define _gloffset_DebugMessageInsertARB driDispatchRemapTable[DebugMessageInsertARB_remap_index]
@@ -6908,17 +6905,6 @@ static INLINE void SET_UniformMatrix4x3fv(struct _glapi_table *disp, void (GLAPI
    SET_by_offset(disp, _gloffset_UniformMatrix4x3fv, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_ClampColor)(GLenum, GLenum);
-#define CALL_ClampColor(disp, parameters) \
-    (* GET_ClampColor(disp)) parameters
-static INLINE _glptr_ClampColor GET_ClampColor(struct _glapi_table *disp) {
-   return (_glptr_ClampColor) (GET_by_offset(disp, _gloffset_ClampColor));
-}
-
-static INLINE void SET_ClampColor(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum)) {
-   SET_by_offset(disp, _gloffset_ClampColor, fn);
-}
-
 typedef void (GLAPIENTRYP _glptr_ClearBufferfi)(GLenum, GLint, GLfloat, GLint);
 #define CALL_ClearBufferfi(disp, parameters) \
     (* GET_ClearBufferfi(disp)) parameters
@@ -7007,17 +6993,6 @@ static INLINE void SET_GetInteger64i_v(struct _glapi_table *disp, void (GLAPIENT
    SET_by_offset(disp, _gloffset_GetInteger64i_v, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_VertexAttribDivisor)(GLuint, GLuint);
-#define CALL_VertexAttribDivisor(disp, parameters) \
-    (* GET_VertexAttribDivisor(disp)) parameters
-static INLINE _glptr_VertexAttribDivisor GET_VertexAttribDivisor(struct _glapi_table *disp) {
-   return (_glptr_VertexAttribDivisor) (GET_by_offset(disp, _gloffset_VertexAttribDivisor));
-}
-
-static INLINE void SET_VertexAttribDivisor(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLuint)) {
-   SET_by_offset(disp, _gloffset_VertexAttribDivisor, fn);
-}
-
 typedef void (GLAPIENTRYP _glptr_LoadTransposeMatrixdARB)(const GLdouble *);
 #define CALL_LoadTransposeMatrixdARB(disp, parameters) \
     (* GET_LoadTransposeMatrixdARB(disp)) parameters
@@ -8503,17 +8478,6 @@ static INLINE void SET_RenderbufferStorageMultisample(struct _glapi_table *disp,
    SET_by_offset(disp, _gloffset_RenderbufferStorageMultisample, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_FramebufferTextureARB)(GLenum, GLenum, GLuint, GLint);
-#define CALL_FramebufferTextureARB(disp, parameters) \
-    (* GET_FramebufferTextureARB(disp)) parameters
-static INLINE _glptr_FramebufferTextureARB GET_FramebufferTextureARB(struct _glapi_table *disp) {
-   return (_glptr_FramebufferTextureARB) (GET_by_offset(disp, _gloffset_FramebufferTextureARB));
-}
-
-static INLINE void SET_FramebufferTextureARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLenum, GLenum, GLuint, GLint)) {
-   SET_by_offset(disp, _gloffset_FramebufferTextureARB, fn);
-}
-
 typedef void (GLAPIENTRYP _glptr_FramebufferTextureFaceARB)(GLenum, GLenum, GLuint, GLint, GLenum);
 #define CALL_FramebufferTextureFaceARB(disp, parameters) \
     (* GET_FramebufferTextureFaceARB(disp)) parameters
@@ -8525,17 +8489,6 @@ static INLINE void SET_FramebufferTextureFaceARB(struct _glapi_table *disp, void
    SET_by_offset(disp, _gloffset_FramebufferTextureFaceARB, fn);
 }
 
-typedef void (GLAPIENTRYP _glptr_ProgramParameteriARB)(GLuint, GLenum, GLint);
-#define CALL_ProgramParameteriARB(disp, parameters) \
-    (* GET_ProgramParameteriARB(disp)) parameters
-static INLINE _glptr_ProgramParameteriARB GET_ProgramParameteriARB(struct _glapi_table *disp) {
-   return (_glptr_ProgramParameteriARB) (GET_by_offset(disp, _gloffset_ProgramParameteriARB));
-}
-
-static INLINE void SET_ProgramParameteriARB(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint)) {
-   SET_by_offset(disp, _gloffset_ProgramParameteriARB, fn);
-}
-
 typedef void (GLAPIENTRYP _glptr_VertexAttribDivisorARB)(GLuint, GLuint);
 #define CALL_VertexAttribDivisorARB(disp, parameters) \
     (* GET_VertexAttribDivisorARB(disp)) parameters
@@ -9636,6 +9589,39 @@ static INLINE void SET_ShaderBinary(struct _glapi_table *disp, void (GLAPIENTRYP
    SET_by_offset(disp, _gloffset_ShaderBinary, fn);
 }
 
+typedef void (GLAPIENTRYP _glptr_GetProgramBinary)(GLuint, GLsizei, GLsizei *, GLenum *, GLvoid *);
+#define CALL_GetProgramBinary(disp, parameters) \
+    (* GET_GetProgramBinary(disp)) parameters
+static INLINE _glptr_GetProgramBinary GET_GetProgramBinary(struct _glapi_table *disp) {
+   return (_glptr_GetProgramBinary) (GET_by_offset(disp, _gloffset_GetProgramBinary));
+}
+
+static INLINE void SET_GetProgramBinary(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLsizei, GLsizei *, GLenum *, GLvoid *)) {
+   SET_by_offset(disp, _gloffset_GetProgramBinary, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_ProgramBinary)(GLuint, GLenum, const GLvoid *, GLsizei);
+#define CALL_ProgramBinary(disp, parameters) \
+    (* GET_ProgramBinary(disp)) parameters
+static INLINE _glptr_ProgramBinary GET_ProgramBinary(struct _glapi_table *disp) {
+   return (_glptr_ProgramBinary) (GET_by_offset(disp, _gloffset_ProgramBinary));
+}
+
+static INLINE void SET_ProgramBinary(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, const GLvoid *, GLsizei)) {
+   SET_by_offset(disp, _gloffset_ProgramBinary, fn);
+}
+
+typedef void (GLAPIENTRYP _glptr_ProgramParameteri)(GLuint, GLenum, GLint);
+#define CALL_ProgramParameteri(disp, parameters) \
+    (* GET_ProgramParameteri(disp)) parameters
+static INLINE _glptr_ProgramParameteri GET_ProgramParameteri(struct _glapi_table *disp) {
+   return (_glptr_ProgramParameteri) (GET_by_offset(disp, _gloffset_ProgramParameteri));
+}
+
+static INLINE void SET_ProgramParameteri(struct _glapi_table *disp, void (GLAPIENTRYP fn)(GLuint, GLenum, GLint)) {
+   SET_by_offset(disp, _gloffset_ProgramParameteri, fn);
+}
+
 typedef void (GLAPIENTRYP _glptr_DebugMessageCallbackARB)(GLDEBUGPROCARB, const GLvoid *);
 #define CALL_DebugMessageCallbackARB(disp, parameters) \
     (* GET_DebugMessageCallbackARB(disp)) parameters
diff --git a/xorg-server/glx/glapi_gentable.c b/xorg-server/glx/glapi_gentable.c
index c4c0b79d2..cfbfb671f 100644
--- a/xorg-server/glx/glapi_gentable.c
+++ b/xorg-server/glx/glapi_gentable.c
@@ -48,7 +48,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include <GL/gl.h>
+#include "glheader.h"
 
 #include "glapi.h"
 #include "glapitable.h"
@@ -3769,13 +3769,6 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) {
     }
 
 
-    if(!disp->ClampColor) {
-        void ** procp = (void **) &disp->ClampColor;
-        snprintf(symboln, sizeof(symboln), "%sClampColor", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-
     if(!disp->ClearBufferfi) {
         void ** procp = (void **) &disp->ClearBufferfi;
         snprintf(symboln, sizeof(symboln), "%sClearBufferfi", symbol_prefix);
@@ -3813,6 +3806,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) {
 
     if(!disp->FramebufferTexture) {
         void ** procp = (void **) &disp->FramebufferTexture;
+        snprintf(symboln, sizeof(symboln), "%sFramebufferTextureARB", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->FramebufferTexture) {
+        void ** procp = (void **) &disp->FramebufferTexture;
         snprintf(symboln, sizeof(symboln), "%sFramebufferTexture", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
@@ -3832,13 +3832,6 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) {
     }
 
 
-    if(!disp->VertexAttribDivisor) {
-        void ** procp = (void **) &disp->VertexAttribDivisor;
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribDivisor", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-
     if(!disp->LoadTransposeMatrixdARB) {
         void ** procp = (void **) &disp->LoadTransposeMatrixdARB;
         snprintf(symboln, sizeof(symboln), "%sLoadTransposeMatrixd", symbol_prefix);
@@ -5540,6 +5533,13 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) {
     }
 
 
+    if(!disp->ClampColorARB) {
+        void ** procp = (void **) &disp->ClampColorARB;
+        snprintf(symboln, sizeof(symboln), "%sClampColor", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
     if(!disp->DrawArraysInstancedARB) {
         void ** procp = (void **) &disp->DrawArraysInstancedARB;
         snprintf(symboln, sizeof(symboln), "%sDrawArraysInstancedARB", symbol_prefix);
@@ -5596,13 +5596,6 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) {
     }
 
 
-    if(!disp->FramebufferTextureARB) {
-        void ** procp = (void **) &disp->FramebufferTextureARB;
-        snprintf(symboln, sizeof(symboln), "%sFramebufferTextureARB", symbol_prefix);
-        *procp = dlsym(handle, symboln);
-    }
-
-
     if(!disp->FramebufferTextureFaceARB) {
         void ** procp = (void **) &disp->FramebufferTextureFaceARB;
         snprintf(symboln, sizeof(symboln), "%sFramebufferTextureFaceARB", symbol_prefix);
@@ -5610,16 +5603,16 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) {
     }
 
 
-    if(!disp->ProgramParameteriARB) {
-        void ** procp = (void **) &disp->ProgramParameteriARB;
-        snprintf(symboln, sizeof(symboln), "%sProgramParameteriARB", symbol_prefix);
+    if(!disp->VertexAttribDivisorARB) {
+        void ** procp = (void **) &disp->VertexAttribDivisorARB;
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribDivisorARB", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
 
     if(!disp->VertexAttribDivisorARB) {
         void ** procp = (void **) &disp->VertexAttribDivisorARB;
-        snprintf(symboln, sizeof(symboln), "%sVertexAttribDivisorARB", symbol_prefix);
+        snprintf(symboln, sizeof(symboln), "%sVertexAttribDivisor", symbol_prefix);
         *procp = dlsym(handle, symboln);
     }
 
@@ -6352,6 +6345,34 @@ _glapi_create_table_from_handle(void *handle, const char *symbol_prefix) {
     }
 
 
+    if(!disp->GetProgramBinary) {
+        void ** procp = (void **) &disp->GetProgramBinary;
+        snprintf(symboln, sizeof(symboln), "%sGetProgramBinary", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->ProgramBinary) {
+        void ** procp = (void **) &disp->ProgramBinary;
+        snprintf(symboln, sizeof(symboln), "%sProgramBinary", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->ProgramParameteri) {
+        void ** procp = (void **) &disp->ProgramParameteri;
+        snprintf(symboln, sizeof(symboln), "%sProgramParameteriARB", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
+    if(!disp->ProgramParameteri) {
+        void ** procp = (void **) &disp->ProgramParameteri;
+        snprintf(symboln, sizeof(symboln), "%sProgramParameteri", symbol_prefix);
+        *procp = dlsym(handle, symboln);
+    }
+
+
     if(!disp->DebugMessageCallbackARB) {
         void ** procp = (void **) &disp->DebugMessageCallbackARB;
         snprintf(symboln, sizeof(symboln), "%sDebugMessageCallbackARB", symbol_prefix);
diff --git a/xorg-server/glx/glapitable.h b/xorg-server/glx/glapitable.h
index 9b6c08aca..70f3c83e5 100644
--- a/xorg-server/glx/glapitable.h
+++ b/xorg-server/glx/glapitable.h
@@ -471,546 +471,545 @@ struct _glapi_table
    void (GLAPIENTRYP UniformMatrix3x4fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 427 */
    void (GLAPIENTRYP UniformMatrix4x2fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 428 */
    void (GLAPIENTRYP UniformMatrix4x3fv)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 429 */
-   void (GLAPIENTRYP ClampColor)(GLenum target, GLenum clamp); /* 430 */
-   void (GLAPIENTRYP ClearBufferfi)(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil); /* 431 */
-   void (GLAPIENTRYP ClearBufferfv)(GLenum buffer, GLint drawbuffer, const GLfloat * value); /* 432 */
-   void (GLAPIENTRYP ClearBufferiv)(GLenum buffer, GLint drawbuffer, const GLint * value); /* 433 */
-   void (GLAPIENTRYP ClearBufferuiv)(GLenum buffer, GLint drawbuffer, const GLuint * value); /* 434 */
-   const GLubyte * (GLAPIENTRYP GetStringi)(GLenum name, GLuint index); /* 435 */
-   void (GLAPIENTRYP FramebufferTexture)(GLenum target, GLenum attachment, GLuint texture, GLint level); /* 436 */
-   void (GLAPIENTRYP GetBufferParameteri64v)(GLenum target, GLenum pname, GLint64 * params); /* 437 */
-   void (GLAPIENTRYP GetInteger64i_v)(GLenum cap, GLuint index, GLint64 * data); /* 438 */
-   void (GLAPIENTRYP VertexAttribDivisor)(GLuint index, GLuint divisor); /* 439 */
-   void (GLAPIENTRYP LoadTransposeMatrixdARB)(const GLdouble * m); /* 440 */
-   void (GLAPIENTRYP LoadTransposeMatrixfARB)(const GLfloat * m); /* 441 */
-   void (GLAPIENTRYP MultTransposeMatrixdARB)(const GLdouble * m); /* 442 */
-   void (GLAPIENTRYP MultTransposeMatrixfARB)(const GLfloat * m); /* 443 */
-   void (GLAPIENTRYP SampleCoverageARB)(GLclampf value, GLboolean invert); /* 444 */
-   void (GLAPIENTRYP CompressedTexImage1DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid * data); /* 445 */
-   void (GLAPIENTRYP CompressedTexImage2DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid * data); /* 446 */
-   void (GLAPIENTRYP CompressedTexImage3DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid * data); /* 447 */
-   void (GLAPIENTRYP CompressedTexSubImage1DARB)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid * data); /* 448 */
-   void (GLAPIENTRYP CompressedTexSubImage2DARB)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid * data); /* 449 */
-   void (GLAPIENTRYP CompressedTexSubImage3DARB)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid * data); /* 450 */
-   void (GLAPIENTRYP GetCompressedTexImageARB)(GLenum target, GLint level, GLvoid * img); /* 451 */
-   void (GLAPIENTRYP DisableVertexAttribArrayARB)(GLuint index); /* 452 */
-   void (GLAPIENTRYP EnableVertexAttribArrayARB)(GLuint index); /* 453 */
-   void (GLAPIENTRYP GetProgramEnvParameterdvARB)(GLenum target, GLuint index, GLdouble * params); /* 454 */
-   void (GLAPIENTRYP GetProgramEnvParameterfvARB)(GLenum target, GLuint index, GLfloat * params); /* 455 */
-   void (GLAPIENTRYP GetProgramLocalParameterdvARB)(GLenum target, GLuint index, GLdouble * params); /* 456 */
-   void (GLAPIENTRYP GetProgramLocalParameterfvARB)(GLenum target, GLuint index, GLfloat * params); /* 457 */
-   void (GLAPIENTRYP GetProgramStringARB)(GLenum target, GLenum pname, GLvoid * string); /* 458 */
-   void (GLAPIENTRYP GetProgramivARB)(GLenum target, GLenum pname, GLint * params); /* 459 */
-   void (GLAPIENTRYP GetVertexAttribdvARB)(GLuint index, GLenum pname, GLdouble * params); /* 460 */
-   void (GLAPIENTRYP GetVertexAttribfvARB)(GLuint index, GLenum pname, GLfloat * params); /* 461 */
-   void (GLAPIENTRYP GetVertexAttribivARB)(GLuint index, GLenum pname, GLint * params); /* 462 */
-   void (GLAPIENTRYP ProgramEnvParameter4dARB)(GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 463 */
-   void (GLAPIENTRYP ProgramEnvParameter4dvARB)(GLenum target, GLuint index, const GLdouble * params); /* 464 */
-   void (GLAPIENTRYP ProgramEnvParameter4fARB)(GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 465 */
-   void (GLAPIENTRYP ProgramEnvParameter4fvARB)(GLenum target, GLuint index, const GLfloat * params); /* 466 */
-   void (GLAPIENTRYP ProgramLocalParameter4dARB)(GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 467 */
-   void (GLAPIENTRYP ProgramLocalParameter4dvARB)(GLenum target, GLuint index, const GLdouble * params); /* 468 */
-   void (GLAPIENTRYP ProgramLocalParameter4fARB)(GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 469 */
-   void (GLAPIENTRYP ProgramLocalParameter4fvARB)(GLenum target, GLuint index, const GLfloat * params); /* 470 */
-   void (GLAPIENTRYP ProgramStringARB)(GLenum target, GLenum format, GLsizei len, const GLvoid * string); /* 471 */
-   void (GLAPIENTRYP VertexAttrib1dARB)(GLuint index, GLdouble x); /* 472 */
-   void (GLAPIENTRYP VertexAttrib1dvARB)(GLuint index, const GLdouble * v); /* 473 */
-   void (GLAPIENTRYP VertexAttrib1fARB)(GLuint index, GLfloat x); /* 474 */
-   void (GLAPIENTRYP VertexAttrib1fvARB)(GLuint index, const GLfloat * v); /* 475 */
-   void (GLAPIENTRYP VertexAttrib1sARB)(GLuint index, GLshort x); /* 476 */
-   void (GLAPIENTRYP VertexAttrib1svARB)(GLuint index, const GLshort * v); /* 477 */
-   void (GLAPIENTRYP VertexAttrib2dARB)(GLuint index, GLdouble x, GLdouble y); /* 478 */
-   void (GLAPIENTRYP VertexAttrib2dvARB)(GLuint index, const GLdouble * v); /* 479 */
-   void (GLAPIENTRYP VertexAttrib2fARB)(GLuint index, GLfloat x, GLfloat y); /* 480 */
-   void (GLAPIENTRYP VertexAttrib2fvARB)(GLuint index, const GLfloat * v); /* 481 */
-   void (GLAPIENTRYP VertexAttrib2sARB)(GLuint index, GLshort x, GLshort y); /* 482 */
-   void (GLAPIENTRYP VertexAttrib2svARB)(GLuint index, const GLshort * v); /* 483 */
-   void (GLAPIENTRYP VertexAttrib3dARB)(GLuint index, GLdouble x, GLdouble y, GLdouble z); /* 484 */
-   void (GLAPIENTRYP VertexAttrib3dvARB)(GLuint index, const GLdouble * v); /* 485 */
-   void (GLAPIENTRYP VertexAttrib3fARB)(GLuint index, GLfloat x, GLfloat y, GLfloat z); /* 486 */
-   void (GLAPIENTRYP VertexAttrib3fvARB)(GLuint index, const GLfloat * v); /* 487 */
-   void (GLAPIENTRYP VertexAttrib3sARB)(GLuint index, GLshort x, GLshort y, GLshort z); /* 488 */
-   void (GLAPIENTRYP VertexAttrib3svARB)(GLuint index, const GLshort * v); /* 489 */
-   void (GLAPIENTRYP VertexAttrib4NbvARB)(GLuint index, const GLbyte * v); /* 490 */
-   void (GLAPIENTRYP VertexAttrib4NivARB)(GLuint index, const GLint * v); /* 491 */
-   void (GLAPIENTRYP VertexAttrib4NsvARB)(GLuint index, const GLshort * v); /* 492 */
-   void (GLAPIENTRYP VertexAttrib4NubARB)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); /* 493 */
-   void (GLAPIENTRYP VertexAttrib4NubvARB)(GLuint index, const GLubyte * v); /* 494 */
-   void (GLAPIENTRYP VertexAttrib4NuivARB)(GLuint index, const GLuint * v); /* 495 */
-   void (GLAPIENTRYP VertexAttrib4NusvARB)(GLuint index, const GLushort * v); /* 496 */
-   void (GLAPIENTRYP VertexAttrib4bvARB)(GLuint index, const GLbyte * v); /* 497 */
-   void (GLAPIENTRYP VertexAttrib4dARB)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 498 */
-   void (GLAPIENTRYP VertexAttrib4dvARB)(GLuint index, const GLdouble * v); /* 499 */
-   void (GLAPIENTRYP VertexAttrib4fARB)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 500 */
-   void (GLAPIENTRYP VertexAttrib4fvARB)(GLuint index, const GLfloat * v); /* 501 */
-   void (GLAPIENTRYP VertexAttrib4ivARB)(GLuint index, const GLint * v); /* 502 */
-   void (GLAPIENTRYP VertexAttrib4sARB)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); /* 503 */
-   void (GLAPIENTRYP VertexAttrib4svARB)(GLuint index, const GLshort * v); /* 504 */
-   void (GLAPIENTRYP VertexAttrib4ubvARB)(GLuint index, const GLubyte * v); /* 505 */
-   void (GLAPIENTRYP VertexAttrib4uivARB)(GLuint index, const GLuint * v); /* 506 */
-   void (GLAPIENTRYP VertexAttrib4usvARB)(GLuint index, const GLushort * v); /* 507 */
-   void (GLAPIENTRYP VertexAttribPointerARB)(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid * pointer); /* 508 */
-   void (GLAPIENTRYP BindBufferARB)(GLenum target, GLuint buffer); /* 509 */
-   void (GLAPIENTRYP BufferDataARB)(GLenum target, GLsizeiptrARB size, const GLvoid * data, GLenum usage); /* 510 */
-   void (GLAPIENTRYP BufferSubDataARB)(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid * data); /* 511 */
-   void (GLAPIENTRYP DeleteBuffersARB)(GLsizei n, const GLuint * buffer); /* 512 */
-   void (GLAPIENTRYP GenBuffersARB)(GLsizei n, GLuint * buffer); /* 513 */
-   void (GLAPIENTRYP GetBufferParameterivARB)(GLenum target, GLenum pname, GLint * params); /* 514 */
-   void (GLAPIENTRYP GetBufferPointervARB)(GLenum target, GLenum pname, GLvoid ** params); /* 515 */
-   void (GLAPIENTRYP GetBufferSubDataARB)(GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid * data); /* 516 */
-   GLboolean (GLAPIENTRYP IsBufferARB)(GLuint buffer); /* 517 */
-   GLvoid * (GLAPIENTRYP MapBufferARB)(GLenum target, GLenum access); /* 518 */
-   GLboolean (GLAPIENTRYP UnmapBufferARB)(GLenum target); /* 519 */
-   void (GLAPIENTRYP BeginQueryARB)(GLenum target, GLuint id); /* 520 */
-   void (GLAPIENTRYP DeleteQueriesARB)(GLsizei n, const GLuint * ids); /* 521 */
-   void (GLAPIENTRYP EndQueryARB)(GLenum target); /* 522 */
-   void (GLAPIENTRYP GenQueriesARB)(GLsizei n, GLuint * ids); /* 523 */
-   void (GLAPIENTRYP GetQueryObjectivARB)(GLuint id, GLenum pname, GLint * params); /* 524 */
-   void (GLAPIENTRYP GetQueryObjectuivARB)(GLuint id, GLenum pname, GLuint * params); /* 525 */
-   void (GLAPIENTRYP GetQueryivARB)(GLenum target, GLenum pname, GLint * params); /* 526 */
-   GLboolean (GLAPIENTRYP IsQueryARB)(GLuint id); /* 527 */
-   void (GLAPIENTRYP AttachObjectARB)(GLhandleARB containerObj, GLhandleARB obj); /* 528 */
-   void (GLAPIENTRYP CompileShaderARB)(GLhandleARB shader); /* 529 */
-   GLhandleARB (GLAPIENTRYP CreateProgramObjectARB)(void); /* 530 */
-   GLhandleARB (GLAPIENTRYP CreateShaderObjectARB)(GLenum shaderType); /* 531 */
-   void (GLAPIENTRYP DeleteObjectARB)(GLhandleARB obj); /* 532 */
-   void (GLAPIENTRYP DetachObjectARB)(GLhandleARB containerObj, GLhandleARB attachedObj); /* 533 */
-   void (GLAPIENTRYP GetActiveUniformARB)(GLhandleARB program, GLuint index, GLsizei bufSize, GLsizei * length, GLint * size, GLenum * type, GLcharARB * name); /* 534 */
-   void (GLAPIENTRYP GetAttachedObjectsARB)(GLhandleARB containerObj, GLsizei maxLength, GLsizei * length, GLhandleARB * infoLog); /* 535 */
-   GLhandleARB (GLAPIENTRYP GetHandleARB)(GLenum pname); /* 536 */
-   void (GLAPIENTRYP GetInfoLogARB)(GLhandleARB obj, GLsizei maxLength, GLsizei * length, GLcharARB * infoLog); /* 537 */
-   void (GLAPIENTRYP GetObjectParameterfvARB)(GLhandleARB obj, GLenum pname, GLfloat * params); /* 538 */
-   void (GLAPIENTRYP GetObjectParameterivARB)(GLhandleARB obj, GLenum pname, GLint * params); /* 539 */
-   void (GLAPIENTRYP GetShaderSourceARB)(GLhandleARB shader, GLsizei bufSize, GLsizei * length, GLcharARB * source); /* 540 */
-   GLint (GLAPIENTRYP GetUniformLocationARB)(GLhandleARB program, const GLcharARB * name); /* 541 */
-   void (GLAPIENTRYP GetUniformfvARB)(GLhandleARB program, GLint location, GLfloat * params); /* 542 */
-   void (GLAPIENTRYP GetUniformivARB)(GLhandleARB program, GLint location, GLint * params); /* 543 */
-   void (GLAPIENTRYP LinkProgramARB)(GLhandleARB program); /* 544 */
-   void (GLAPIENTRYP ShaderSourceARB)(GLhandleARB shader, GLsizei count, const GLcharARB ** string, const GLint * length); /* 545 */
-   void (GLAPIENTRYP Uniform1fARB)(GLint location, GLfloat v0); /* 546 */
-   void (GLAPIENTRYP Uniform1fvARB)(GLint location, GLsizei count, const GLfloat * value); /* 547 */
-   void (GLAPIENTRYP Uniform1iARB)(GLint location, GLint v0); /* 548 */
-   void (GLAPIENTRYP Uniform1ivARB)(GLint location, GLsizei count, const GLint * value); /* 549 */
-   void (GLAPIENTRYP Uniform2fARB)(GLint location, GLfloat v0, GLfloat v1); /* 550 */
-   void (GLAPIENTRYP Uniform2fvARB)(GLint location, GLsizei count, const GLfloat * value); /* 551 */
-   void (GLAPIENTRYP Uniform2iARB)(GLint location, GLint v0, GLint v1); /* 552 */
-   void (GLAPIENTRYP Uniform2ivARB)(GLint location, GLsizei count, const GLint * value); /* 553 */
-   void (GLAPIENTRYP Uniform3fARB)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2); /* 554 */
-   void (GLAPIENTRYP Uniform3fvARB)(GLint location, GLsizei count, const GLfloat * value); /* 555 */
-   void (GLAPIENTRYP Uniform3iARB)(GLint location, GLint v0, GLint v1, GLint v2); /* 556 */
-   void (GLAPIENTRYP Uniform3ivARB)(GLint location, GLsizei count, const GLint * value); /* 557 */
-   void (GLAPIENTRYP Uniform4fARB)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); /* 558 */
-   void (GLAPIENTRYP Uniform4fvARB)(GLint location, GLsizei count, const GLfloat * value); /* 559 */
-   void (GLAPIENTRYP Uniform4iARB)(GLint location, GLint v0, GLint v1, GLint v2, GLint v3); /* 560 */
-   void (GLAPIENTRYP Uniform4ivARB)(GLint location, GLsizei count, const GLint * value); /* 561 */
-   void (GLAPIENTRYP UniformMatrix2fvARB)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 562 */
-   void (GLAPIENTRYP UniformMatrix3fvARB)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 563 */
-   void (GLAPIENTRYP UniformMatrix4fvARB)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 564 */
-   void (GLAPIENTRYP UseProgramObjectARB)(GLhandleARB program); /* 565 */
-   void (GLAPIENTRYP ValidateProgramARB)(GLhandleARB program); /* 566 */
-   void (GLAPIENTRYP BindAttribLocationARB)(GLhandleARB program, GLuint index, const GLcharARB * name); /* 567 */
-   void (GLAPIENTRYP GetActiveAttribARB)(GLhandleARB program, GLuint index, GLsizei bufSize, GLsizei * length, GLint * size, GLenum * type, GLcharARB * name); /* 568 */
-   GLint (GLAPIENTRYP GetAttribLocationARB)(GLhandleARB program, const GLcharARB * name); /* 569 */
-   void (GLAPIENTRYP DrawBuffersARB)(GLsizei n, const GLenum * bufs); /* 570 */
-   void (GLAPIENTRYP ClampColorARB)(GLenum target, GLenum clamp); /* 571 */
-   void (GLAPIENTRYP DrawArraysInstancedARB)(GLenum mode, GLint first, GLsizei count, GLsizei primcount); /* 572 */
-   void (GLAPIENTRYP DrawElementsInstancedARB)(GLenum mode, GLsizei count, GLenum type, const GLvoid * indices, GLsizei primcount); /* 573 */
-   void (GLAPIENTRYP RenderbufferStorageMultisample)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); /* 574 */
-   void (GLAPIENTRYP FramebufferTextureARB)(GLenum target, GLenum attachment, GLuint texture, GLint level); /* 575 */
-   void (GLAPIENTRYP FramebufferTextureFaceARB)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face); /* 576 */
-   void (GLAPIENTRYP ProgramParameteriARB)(GLuint program, GLenum pname, GLint value); /* 577 */
-   void (GLAPIENTRYP VertexAttribDivisorARB)(GLuint index, GLuint divisor); /* 578 */
-   void (GLAPIENTRYP FlushMappedBufferRange)(GLenum target, GLintptr offset, GLsizeiptr length); /* 579 */
-   GLvoid * (GLAPIENTRYP MapBufferRange)(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access); /* 580 */
-   void (GLAPIENTRYP TexBufferARB)(GLenum target, GLenum internalFormat, GLuint buffer); /* 581 */
-   void (GLAPIENTRYP BindVertexArray)(GLuint array); /* 582 */
-   void (GLAPIENTRYP GenVertexArrays)(GLsizei n, GLuint * arrays); /* 583 */
-   void (GLAPIENTRYP GetActiveUniformBlockName)(GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei * length, GLchar * uniformBlockName); /* 584 */
-   void (GLAPIENTRYP GetActiveUniformBlockiv)(GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint * params); /* 585 */
-   void (GLAPIENTRYP GetActiveUniformName)(GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei * length, GLchar * uniformName); /* 586 */
-   void (GLAPIENTRYP GetActiveUniformsiv)(GLuint program, GLsizei uniformCount, const GLuint * uniformIndices, GLenum pname, GLint * params); /* 587 */
-   GLuint (GLAPIENTRYP GetUniformBlockIndex)(GLuint program, const GLchar * uniformBlockName); /* 588 */
-   void (GLAPIENTRYP GetUniformIndices)(GLuint program, GLsizei uniformCount, const GLchar * const * uniformNames, GLuint * uniformIndices); /* 589 */
-   void (GLAPIENTRYP UniformBlockBinding)(GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding); /* 590 */
-   void (GLAPIENTRYP CopyBufferSubData)(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); /* 591 */
-   GLenum (GLAPIENTRYP ClientWaitSync)(GLsync sync, GLbitfield flags, GLuint64 timeout); /* 592 */
-   void (GLAPIENTRYP DeleteSync)(GLsync sync); /* 593 */
-   GLsync (GLAPIENTRYP FenceSync)(GLenum condition, GLbitfield flags); /* 594 */
-   void (GLAPIENTRYP GetInteger64v)(GLenum pname, GLint64 * params); /* 595 */
-   void (GLAPIENTRYP GetSynciv)(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * values); /* 596 */
-   GLboolean (GLAPIENTRYP IsSync)(GLsync sync); /* 597 */
-   void (GLAPIENTRYP WaitSync)(GLsync sync, GLbitfield flags, GLuint64 timeout); /* 598 */
-   void (GLAPIENTRYP DrawElementsBaseVertex)(GLenum mode, GLsizei count, GLenum type, const GLvoid * indices, GLint basevertex); /* 599 */
-   void (GLAPIENTRYP DrawElementsInstancedBaseVertex)(GLenum mode, GLsizei count, GLenum type, const GLvoid * indices, GLsizei primcount, GLint basevertex); /* 600 */
-   void (GLAPIENTRYP DrawRangeElementsBaseVertex)(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid * indices, GLint basevertex); /* 601 */
-   void (GLAPIENTRYP MultiDrawElementsBaseVertex)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, const GLint * basevertex); /* 602 */
-   void (GLAPIENTRYP BlendEquationSeparateiARB)(GLuint buf, GLenum modeRGB, GLenum modeA); /* 603 */
-   void (GLAPIENTRYP BlendEquationiARB)(GLuint buf, GLenum mode); /* 604 */
-   void (GLAPIENTRYP BlendFuncSeparateiARB)(GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcA, GLenum dstA); /* 605 */
-   void (GLAPIENTRYP BlendFunciARB)(GLuint buf, GLenum src, GLenum dst); /* 606 */
-   void (GLAPIENTRYP BindFragDataLocationIndexed)(GLuint program, GLuint colorNumber, GLuint index, const GLchar * name); /* 607 */
-   GLint (GLAPIENTRYP GetFragDataIndex)(GLuint program, const GLchar * name); /* 608 */
-   void (GLAPIENTRYP BindSampler)(GLuint unit, GLuint sampler); /* 609 */
-   void (GLAPIENTRYP DeleteSamplers)(GLsizei count, const GLuint * samplers); /* 610 */
-   void (GLAPIENTRYP GenSamplers)(GLsizei count, GLuint * samplers); /* 611 */
-   void (GLAPIENTRYP GetSamplerParameterIiv)(GLuint sampler, GLenum pname, GLint * params); /* 612 */
-   void (GLAPIENTRYP GetSamplerParameterIuiv)(GLuint sampler, GLenum pname, GLuint * params); /* 613 */
-   void (GLAPIENTRYP GetSamplerParameterfv)(GLuint sampler, GLenum pname, GLfloat * params); /* 614 */
-   void (GLAPIENTRYP GetSamplerParameteriv)(GLuint sampler, GLenum pname, GLint * params); /* 615 */
-   GLboolean (GLAPIENTRYP IsSampler)(GLuint sampler); /* 616 */
-   void (GLAPIENTRYP SamplerParameterIiv)(GLuint sampler, GLenum pname, const GLint * params); /* 617 */
-   void (GLAPIENTRYP SamplerParameterIuiv)(GLuint sampler, GLenum pname, const GLuint * params); /* 618 */
-   void (GLAPIENTRYP SamplerParameterf)(GLuint sampler, GLenum pname, GLfloat param); /* 619 */
-   void (GLAPIENTRYP SamplerParameterfv)(GLuint sampler, GLenum pname, const GLfloat * params); /* 620 */
-   void (GLAPIENTRYP SamplerParameteri)(GLuint sampler, GLenum pname, GLint param); /* 621 */
-   void (GLAPIENTRYP SamplerParameteriv)(GLuint sampler, GLenum pname, const GLint * params); /* 622 */
-   void (GLAPIENTRYP QueryCounter)(GLuint id, GLenum target); /* 623 */
-   void (GLAPIENTRYP ColorP3ui)(GLenum type, GLuint color); /* 624 */
-   void (GLAPIENTRYP ColorP3uiv)(GLenum type, const GLuint * color); /* 625 */
-   void (GLAPIENTRYP ColorP4ui)(GLenum type, GLuint color); /* 626 */
-   void (GLAPIENTRYP ColorP4uiv)(GLenum type, const GLuint * color); /* 627 */
-   void (GLAPIENTRYP MultiTexCoordP1ui)(GLenum texture, GLenum type, GLuint coords); /* 628 */
-   void (GLAPIENTRYP MultiTexCoordP1uiv)(GLenum texture, GLenum type, const GLuint * coords); /* 629 */
-   void (GLAPIENTRYP MultiTexCoordP2ui)(GLenum texture, GLenum type, GLuint coords); /* 630 */
-   void (GLAPIENTRYP MultiTexCoordP2uiv)(GLenum texture, GLenum type, const GLuint * coords); /* 631 */
-   void (GLAPIENTRYP MultiTexCoordP3ui)(GLenum texture, GLenum type, GLuint coords); /* 632 */
-   void (GLAPIENTRYP MultiTexCoordP3uiv)(GLenum texture, GLenum type, const GLuint * coords); /* 633 */
-   void (GLAPIENTRYP MultiTexCoordP4ui)(GLenum texture, GLenum type, GLuint coords); /* 634 */
-   void (GLAPIENTRYP MultiTexCoordP4uiv)(GLenum texture, GLenum type, const GLuint * coords); /* 635 */
-   void (GLAPIENTRYP NormalP3ui)(GLenum type, GLuint coords); /* 636 */
-   void (GLAPIENTRYP NormalP3uiv)(GLenum type, const GLuint * coords); /* 637 */
-   void (GLAPIENTRYP SecondaryColorP3ui)(GLenum type, GLuint color); /* 638 */
-   void (GLAPIENTRYP SecondaryColorP3uiv)(GLenum type, const GLuint * color); /* 639 */
-   void (GLAPIENTRYP TexCoordP1ui)(GLenum type, GLuint coords); /* 640 */
-   void (GLAPIENTRYP TexCoordP1uiv)(GLenum type, const GLuint * coords); /* 641 */
-   void (GLAPIENTRYP TexCoordP2ui)(GLenum type, GLuint coords); /* 642 */
-   void (GLAPIENTRYP TexCoordP2uiv)(GLenum type, const GLuint * coords); /* 643 */
-   void (GLAPIENTRYP TexCoordP3ui)(GLenum type, GLuint coords); /* 644 */
-   void (GLAPIENTRYP TexCoordP3uiv)(GLenum type, const GLuint * coords); /* 645 */
-   void (GLAPIENTRYP TexCoordP4ui)(GLenum type, GLuint coords); /* 646 */
-   void (GLAPIENTRYP TexCoordP4uiv)(GLenum type, const GLuint * coords); /* 647 */
-   void (GLAPIENTRYP VertexAttribP1ui)(GLuint index, GLenum type, GLboolean normalized, GLuint value); /* 648 */
-   void (GLAPIENTRYP VertexAttribP1uiv)(GLuint index, GLenum type, GLboolean normalized, const GLuint * value); /* 649 */
-   void (GLAPIENTRYP VertexAttribP2ui)(GLuint index, GLenum type, GLboolean normalized, GLuint value); /* 650 */
-   void (GLAPIENTRYP VertexAttribP2uiv)(GLuint index, GLenum type, GLboolean normalized, const GLuint * value); /* 651 */
-   void (GLAPIENTRYP VertexAttribP3ui)(GLuint index, GLenum type, GLboolean normalized, GLuint value); /* 652 */
-   void (GLAPIENTRYP VertexAttribP3uiv)(GLuint index, GLenum type, GLboolean normalized, const GLuint * value); /* 653 */
-   void (GLAPIENTRYP VertexAttribP4ui)(GLuint index, GLenum type, GLboolean normalized, GLuint value); /* 654 */
-   void (GLAPIENTRYP VertexAttribP4uiv)(GLuint index, GLenum type, GLboolean normalized, const GLuint * value); /* 655 */
-   void (GLAPIENTRYP VertexP2ui)(GLenum type, GLuint value); /* 656 */
-   void (GLAPIENTRYP VertexP2uiv)(GLenum type, const GLuint * value); /* 657 */
-   void (GLAPIENTRYP VertexP3ui)(GLenum type, GLuint value); /* 658 */
-   void (GLAPIENTRYP VertexP3uiv)(GLenum type, const GLuint * value); /* 659 */
-   void (GLAPIENTRYP VertexP4ui)(GLenum type, GLuint value); /* 660 */
-   void (GLAPIENTRYP VertexP4uiv)(GLenum type, const GLuint * value); /* 661 */
-   void (GLAPIENTRYP BindTransformFeedback)(GLenum target, GLuint id); /* 662 */
-   void (GLAPIENTRYP DeleteTransformFeedbacks)(GLsizei n, const GLuint * ids); /* 663 */
-   void (GLAPIENTRYP DrawTransformFeedback)(GLenum mode, GLuint id); /* 664 */
-   void (GLAPIENTRYP GenTransformFeedbacks)(GLsizei n, GLuint * ids); /* 665 */
-   GLboolean (GLAPIENTRYP IsTransformFeedback)(GLuint id); /* 666 */
-   void (GLAPIENTRYP PauseTransformFeedback)(void); /* 667 */
-   void (GLAPIENTRYP ResumeTransformFeedback)(void); /* 668 */
-   void (GLAPIENTRYP BeginQueryIndexed)(GLenum target, GLuint index, GLuint id); /* 669 */
-   void (GLAPIENTRYP DrawTransformFeedbackStream)(GLenum mode, GLuint id, GLuint stream); /* 670 */
-   void (GLAPIENTRYP EndQueryIndexed)(GLenum target, GLuint index); /* 671 */
-   void (GLAPIENTRYP GetQueryIndexediv)(GLenum target, GLuint index, GLenum pname, GLint * params); /* 672 */
-   void (GLAPIENTRYP ClearDepthf)(GLclampf depth); /* 673 */
-   void (GLAPIENTRYP DepthRangef)(GLclampf zNear, GLclampf zFar); /* 674 */
-   void (GLAPIENTRYP GetShaderPrecisionFormat)(GLenum shadertype, GLenum precisiontype, GLint * range, GLint * precision); /* 675 */
-   void (GLAPIENTRYP ReleaseShaderCompiler)(void); /* 676 */
-   void (GLAPIENTRYP ShaderBinary)(GLsizei n, const GLuint * shaders, GLenum binaryformat, const GLvoid * binary, GLsizei length); /* 677 */
-   void (GLAPIENTRYP DebugMessageCallbackARB)(GLDEBUGPROCARB callback, const GLvoid * userParam); /* 678 */
-   void (GLAPIENTRYP DebugMessageControlARB)(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint * ids, GLboolean enabled); /* 679 */
-   void (GLAPIENTRYP DebugMessageInsertARB)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLcharARB * buf); /* 680 */
-   GLuint (GLAPIENTRYP GetDebugMessageLogARB)(GLuint count, GLsizei bufsize, GLenum * sources, GLenum * types, GLuint * ids, GLenum * severities, GLsizei * lengths, GLcharARB * messageLog); /* 681 */
-   GLenum (GLAPIENTRYP GetGraphicsResetStatusARB)(void); /* 682 */
-   void (GLAPIENTRYP GetnColorTableARB)(GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid * table); /* 683 */
-   void (GLAPIENTRYP GetnCompressedTexImageARB)(GLenum target, GLint lod, GLsizei bufSize, GLvoid * img); /* 684 */
-   void (GLAPIENTRYP GetnConvolutionFilterARB)(GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid * image); /* 685 */
-   void (GLAPIENTRYP GetnHistogramARB)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid * values); /* 686 */
-   void (GLAPIENTRYP GetnMapdvARB)(GLenum target, GLenum query, GLsizei bufSize, GLdouble * v); /* 687 */
-   void (GLAPIENTRYP GetnMapfvARB)(GLenum target, GLenum query, GLsizei bufSize, GLfloat * v); /* 688 */
-   void (GLAPIENTRYP GetnMapivARB)(GLenum target, GLenum query, GLsizei bufSize, GLint * v); /* 689 */
-   void (GLAPIENTRYP GetnMinmaxARB)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid * values); /* 690 */
-   void (GLAPIENTRYP GetnPixelMapfvARB)(GLenum map, GLsizei bufSize, GLfloat * values); /* 691 */
-   void (GLAPIENTRYP GetnPixelMapuivARB)(GLenum map, GLsizei bufSize, GLuint * values); /* 692 */
-   void (GLAPIENTRYP GetnPixelMapusvARB)(GLenum map, GLsizei bufSize, GLushort * values); /* 693 */
-   void (GLAPIENTRYP GetnPolygonStippleARB)(GLsizei bufSize, GLubyte * pattern); /* 694 */
-   void (GLAPIENTRYP GetnSeparableFilterARB)(GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, GLvoid * row, GLsizei columnBufSize, GLvoid * column, GLvoid * span); /* 695 */
-   void (GLAPIENTRYP GetnTexImageARB)(GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, GLvoid * img); /* 696 */
-   void (GLAPIENTRYP GetnUniformdvARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLdouble * params); /* 697 */
-   void (GLAPIENTRYP GetnUniformfvARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLfloat * params); /* 698 */
-   void (GLAPIENTRYP GetnUniformivARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLint * params); /* 699 */
-   void (GLAPIENTRYP GetnUniformuivARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLuint * params); /* 700 */
-   void (GLAPIENTRYP ReadnPixelsARB)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, GLvoid * data); /* 701 */
-   void (GLAPIENTRYP DrawArraysInstancedBaseInstance)(GLenum mode, GLint first, GLsizei count, GLsizei primcount, GLuint baseinstance); /* 702 */
-   void (GLAPIENTRYP DrawElementsInstancedBaseInstance)(GLenum mode, GLsizei count, GLenum type, const GLvoid * indices, GLsizei primcount, GLuint baseinstance); /* 703 */
-   void (GLAPIENTRYP DrawElementsInstancedBaseVertexBaseInstance)(GLenum mode, GLsizei count, GLenum type, const GLvoid * indices, GLsizei primcount, GLint basevertex, GLuint baseinstance); /* 704 */
-   void (GLAPIENTRYP DrawTransformFeedbackInstanced)(GLenum mode, GLuint id, GLsizei primcount); /* 705 */
-   void (GLAPIENTRYP DrawTransformFeedbackStreamInstanced)(GLenum mode, GLuint id, GLuint stream, GLsizei primcount); /* 706 */
-   void (GLAPIENTRYP TexStorage1D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width); /* 707 */
-   void (GLAPIENTRYP TexStorage2D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height); /* 708 */
-   void (GLAPIENTRYP TexStorage3D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth); /* 709 */
-   void (GLAPIENTRYP TextureStorage1DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width); /* 710 */
-   void (GLAPIENTRYP TextureStorage2DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height); /* 711 */
-   void (GLAPIENTRYP TextureStorage3DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth); /* 712 */
-   void (GLAPIENTRYP InvalidateBufferData)(GLuint buffer); /* 713 */
-   void (GLAPIENTRYP InvalidateBufferSubData)(GLuint buffer, GLintptr offset, GLsizeiptr length); /* 714 */
-   void (GLAPIENTRYP InvalidateFramebuffer)(GLenum target, GLsizei numAttachments, const GLenum * attachments); /* 715 */
-   void (GLAPIENTRYP InvalidateSubFramebuffer)(GLenum target, GLsizei numAttachments, const GLenum * attachments, GLint x, GLint y, GLsizei width, GLsizei height); /* 716 */
-   void (GLAPIENTRYP InvalidateTexImage)(GLuint texture, GLint level); /* 717 */
-   void (GLAPIENTRYP InvalidateTexSubImage)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth); /* 718 */
-   void (GLAPIENTRYP PolygonOffsetEXT)(GLfloat factor, GLfloat bias); /* 719 */
-   void (GLAPIENTRYP SampleMaskSGIS)(GLclampf value, GLboolean invert); /* 720 */
-   void (GLAPIENTRYP SamplePatternSGIS)(GLenum pattern); /* 721 */
-   void (GLAPIENTRYP ColorPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 722 */
-   void (GLAPIENTRYP EdgeFlagPointerEXT)(GLsizei stride, GLsizei count, const GLboolean * pointer); /* 723 */
-   void (GLAPIENTRYP IndexPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 724 */
-   void (GLAPIENTRYP NormalPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 725 */
-   void (GLAPIENTRYP TexCoordPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 726 */
-   void (GLAPIENTRYP VertexPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 727 */
-   void (GLAPIENTRYP PointParameterfEXT)(GLenum pname, GLfloat param); /* 728 */
-   void (GLAPIENTRYP PointParameterfvEXT)(GLenum pname, const GLfloat * params); /* 729 */
-   void (GLAPIENTRYP LockArraysEXT)(GLint first, GLsizei count); /* 730 */
-   void (GLAPIENTRYP UnlockArraysEXT)(void); /* 731 */
-   void (GLAPIENTRYP SecondaryColor3bEXT)(GLbyte red, GLbyte green, GLbyte blue); /* 732 */
-   void (GLAPIENTRYP SecondaryColor3bvEXT)(const GLbyte * v); /* 733 */
-   void (GLAPIENTRYP SecondaryColor3dEXT)(GLdouble red, GLdouble green, GLdouble blue); /* 734 */
-   void (GLAPIENTRYP SecondaryColor3dvEXT)(const GLdouble * v); /* 735 */
-   void (GLAPIENTRYP SecondaryColor3fEXT)(GLfloat red, GLfloat green, GLfloat blue); /* 736 */
-   void (GLAPIENTRYP SecondaryColor3fvEXT)(const GLfloat * v); /* 737 */
-   void (GLAPIENTRYP SecondaryColor3iEXT)(GLint red, GLint green, GLint blue); /* 738 */
-   void (GLAPIENTRYP SecondaryColor3ivEXT)(const GLint * v); /* 739 */
-   void (GLAPIENTRYP SecondaryColor3sEXT)(GLshort red, GLshort green, GLshort blue); /* 740 */
-   void (GLAPIENTRYP SecondaryColor3svEXT)(const GLshort * v); /* 741 */
-   void (GLAPIENTRYP SecondaryColor3ubEXT)(GLubyte red, GLubyte green, GLubyte blue); /* 742 */
-   void (GLAPIENTRYP SecondaryColor3ubvEXT)(const GLubyte * v); /* 743 */
-   void (GLAPIENTRYP SecondaryColor3uiEXT)(GLuint red, GLuint green, GLuint blue); /* 744 */
-   void (GLAPIENTRYP SecondaryColor3uivEXT)(const GLuint * v); /* 745 */
-   void (GLAPIENTRYP SecondaryColor3usEXT)(GLushort red, GLushort green, GLushort blue); /* 746 */
-   void (GLAPIENTRYP SecondaryColor3usvEXT)(const GLushort * v); /* 747 */
-   void (GLAPIENTRYP SecondaryColorPointerEXT)(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 748 */
-   void (GLAPIENTRYP MultiDrawArraysEXT)(GLenum mode, const GLint * first, const GLsizei * count, GLsizei primcount); /* 749 */
-   void (GLAPIENTRYP MultiDrawElementsEXT)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid ** indices, GLsizei primcount); /* 750 */
-   void (GLAPIENTRYP FogCoordPointerEXT)(GLenum type, GLsizei stride, const GLvoid * pointer); /* 751 */
-   void (GLAPIENTRYP FogCoorddEXT)(GLdouble coord); /* 752 */
-   void (GLAPIENTRYP FogCoorddvEXT)(const GLdouble * coord); /* 753 */
-   void (GLAPIENTRYP FogCoordfEXT)(GLfloat coord); /* 754 */
-   void (GLAPIENTRYP FogCoordfvEXT)(const GLfloat * coord); /* 755 */
-   void (GLAPIENTRYP BlendFuncSeparateEXT)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); /* 756 */
-   void (GLAPIENTRYP ResizeBuffersMESA)(void); /* 757 */
-   void (GLAPIENTRYP WindowPos2dMESA)(GLdouble x, GLdouble y); /* 758 */
-   void (GLAPIENTRYP WindowPos2dvMESA)(const GLdouble * v); /* 759 */
-   void (GLAPIENTRYP WindowPos2fMESA)(GLfloat x, GLfloat y); /* 760 */
-   void (GLAPIENTRYP WindowPos2fvMESA)(const GLfloat * v); /* 761 */
-   void (GLAPIENTRYP WindowPos2iMESA)(GLint x, GLint y); /* 762 */
-   void (GLAPIENTRYP WindowPos2ivMESA)(const GLint * v); /* 763 */
-   void (GLAPIENTRYP WindowPos2sMESA)(GLshort x, GLshort y); /* 764 */
-   void (GLAPIENTRYP WindowPos2svMESA)(const GLshort * v); /* 765 */
-   void (GLAPIENTRYP WindowPos3dMESA)(GLdouble x, GLdouble y, GLdouble z); /* 766 */
-   void (GLAPIENTRYP WindowPos3dvMESA)(const GLdouble * v); /* 767 */
-   void (GLAPIENTRYP WindowPos3fMESA)(GLfloat x, GLfloat y, GLfloat z); /* 768 */
-   void (GLAPIENTRYP WindowPos3fvMESA)(const GLfloat * v); /* 769 */
-   void (GLAPIENTRYP WindowPos3iMESA)(GLint x, GLint y, GLint z); /* 770 */
-   void (GLAPIENTRYP WindowPos3ivMESA)(const GLint * v); /* 771 */
-   void (GLAPIENTRYP WindowPos3sMESA)(GLshort x, GLshort y, GLshort z); /* 772 */
-   void (GLAPIENTRYP WindowPos3svMESA)(const GLshort * v); /* 773 */
-   void (GLAPIENTRYP WindowPos4dMESA)(GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 774 */
-   void (GLAPIENTRYP WindowPos4dvMESA)(const GLdouble * v); /* 775 */
-   void (GLAPIENTRYP WindowPos4fMESA)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 776 */
-   void (GLAPIENTRYP WindowPos4fvMESA)(const GLfloat * v); /* 777 */
-   void (GLAPIENTRYP WindowPos4iMESA)(GLint x, GLint y, GLint z, GLint w); /* 778 */
-   void (GLAPIENTRYP WindowPos4ivMESA)(const GLint * v); /* 779 */
-   void (GLAPIENTRYP WindowPos4sMESA)(GLshort x, GLshort y, GLshort z, GLshort w); /* 780 */
-   void (GLAPIENTRYP WindowPos4svMESA)(const GLshort * v); /* 781 */
-   void (GLAPIENTRYP MultiModeDrawArraysIBM)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride); /* 782 */
-   void (GLAPIENTRYP MultiModeDrawElementsIBM)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride); /* 783 */
-   GLboolean (GLAPIENTRYP AreProgramsResidentNV)(GLsizei n, const GLuint * ids, GLboolean * residences); /* 784 */
-   void (GLAPIENTRYP BindProgramNV)(GLenum target, GLuint program); /* 785 */
-   void (GLAPIENTRYP DeleteProgramsNV)(GLsizei n, const GLuint * programs); /* 786 */
-   void (GLAPIENTRYP ExecuteProgramNV)(GLenum target, GLuint id, const GLfloat * params); /* 787 */
-   void (GLAPIENTRYP GenProgramsNV)(GLsizei n, GLuint * programs); /* 788 */
-   void (GLAPIENTRYP GetProgramParameterdvNV)(GLenum target, GLuint index, GLenum pname, GLdouble * params); /* 789 */
-   void (GLAPIENTRYP GetProgramParameterfvNV)(GLenum target, GLuint index, GLenum pname, GLfloat * params); /* 790 */
-   void (GLAPIENTRYP GetProgramStringNV)(GLuint id, GLenum pname, GLubyte * program); /* 791 */
-   void (GLAPIENTRYP GetProgramivNV)(GLuint id, GLenum pname, GLint * params); /* 792 */
-   void (GLAPIENTRYP GetTrackMatrixivNV)(GLenum target, GLuint address, GLenum pname, GLint * params); /* 793 */
-   void (GLAPIENTRYP GetVertexAttribPointervNV)(GLuint index, GLenum pname, GLvoid ** pointer); /* 794 */
-   void (GLAPIENTRYP GetVertexAttribdvNV)(GLuint index, GLenum pname, GLdouble * params); /* 795 */
-   void (GLAPIENTRYP GetVertexAttribfvNV)(GLuint index, GLenum pname, GLfloat * params); /* 796 */
-   void (GLAPIENTRYP GetVertexAttribivNV)(GLuint index, GLenum pname, GLint * params); /* 797 */
-   GLboolean (GLAPIENTRYP IsProgramNV)(GLuint program); /* 798 */
-   void (GLAPIENTRYP LoadProgramNV)(GLenum target, GLuint id, GLsizei len, const GLubyte * program); /* 799 */
-   void (GLAPIENTRYP ProgramParameters4dvNV)(GLenum target, GLuint index, GLsizei num, const GLdouble * params); /* 800 */
-   void (GLAPIENTRYP ProgramParameters4fvNV)(GLenum target, GLuint index, GLsizei num, const GLfloat * params); /* 801 */
-   void (GLAPIENTRYP RequestResidentProgramsNV)(GLsizei n, const GLuint * ids); /* 802 */
-   void (GLAPIENTRYP TrackMatrixNV)(GLenum target, GLuint address, GLenum matrix, GLenum transform); /* 803 */
-   void (GLAPIENTRYP VertexAttrib1dNV)(GLuint index, GLdouble x); /* 804 */
-   void (GLAPIENTRYP VertexAttrib1dvNV)(GLuint index, const GLdouble * v); /* 805 */
-   void (GLAPIENTRYP VertexAttrib1fNV)(GLuint index, GLfloat x); /* 806 */
-   void (GLAPIENTRYP VertexAttrib1fvNV)(GLuint index, const GLfloat * v); /* 807 */
-   void (GLAPIENTRYP VertexAttrib1sNV)(GLuint index, GLshort x); /* 808 */
-   void (GLAPIENTRYP VertexAttrib1svNV)(GLuint index, const GLshort * v); /* 809 */
-   void (GLAPIENTRYP VertexAttrib2dNV)(GLuint index, GLdouble x, GLdouble y); /* 810 */
-   void (GLAPIENTRYP VertexAttrib2dvNV)(GLuint index, const GLdouble * v); /* 811 */
-   void (GLAPIENTRYP VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y); /* 812 */
-   void (GLAPIENTRYP VertexAttrib2fvNV)(GLuint index, const GLfloat * v); /* 813 */
-   void (GLAPIENTRYP VertexAttrib2sNV)(GLuint index, GLshort x, GLshort y); /* 814 */
-   void (GLAPIENTRYP VertexAttrib2svNV)(GLuint index, const GLshort * v); /* 815 */
-   void (GLAPIENTRYP VertexAttrib3dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z); /* 816 */
-   void (GLAPIENTRYP VertexAttrib3dvNV)(GLuint index, const GLdouble * v); /* 817 */
-   void (GLAPIENTRYP VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z); /* 818 */
-   void (GLAPIENTRYP VertexAttrib3fvNV)(GLuint index, const GLfloat * v); /* 819 */
-   void (GLAPIENTRYP VertexAttrib3sNV)(GLuint index, GLshort x, GLshort y, GLshort z); /* 820 */
-   void (GLAPIENTRYP VertexAttrib3svNV)(GLuint index, const GLshort * v); /* 821 */
-   void (GLAPIENTRYP VertexAttrib4dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 822 */
-   void (GLAPIENTRYP VertexAttrib4dvNV)(GLuint index, const GLdouble * v); /* 823 */
-   void (GLAPIENTRYP VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 824 */
-   void (GLAPIENTRYP VertexAttrib4fvNV)(GLuint index, const GLfloat * v); /* 825 */
-   void (GLAPIENTRYP VertexAttrib4sNV)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); /* 826 */
-   void (GLAPIENTRYP VertexAttrib4svNV)(GLuint index, const GLshort * v); /* 827 */
-   void (GLAPIENTRYP VertexAttrib4ubNV)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); /* 828 */
-   void (GLAPIENTRYP VertexAttrib4ubvNV)(GLuint index, const GLubyte * v); /* 829 */
-   void (GLAPIENTRYP VertexAttribPointerNV)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 830 */
-   void (GLAPIENTRYP VertexAttribs1dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 831 */
-   void (GLAPIENTRYP VertexAttribs1fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 832 */
-   void (GLAPIENTRYP VertexAttribs1svNV)(GLuint index, GLsizei n, const GLshort * v); /* 833 */
-   void (GLAPIENTRYP VertexAttribs2dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 834 */
-   void (GLAPIENTRYP VertexAttribs2fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 835 */
-   void (GLAPIENTRYP VertexAttribs2svNV)(GLuint index, GLsizei n, const GLshort * v); /* 836 */
-   void (GLAPIENTRYP VertexAttribs3dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 837 */
-   void (GLAPIENTRYP VertexAttribs3fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 838 */
-   void (GLAPIENTRYP VertexAttribs3svNV)(GLuint index, GLsizei n, const GLshort * v); /* 839 */
-   void (GLAPIENTRYP VertexAttribs4dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 840 */
-   void (GLAPIENTRYP VertexAttribs4fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 841 */
-   void (GLAPIENTRYP VertexAttribs4svNV)(GLuint index, GLsizei n, const GLshort * v); /* 842 */
-   void (GLAPIENTRYP VertexAttribs4ubvNV)(GLuint index, GLsizei n, const GLubyte * v); /* 843 */
-   void (GLAPIENTRYP GetTexBumpParameterfvATI)(GLenum pname, GLfloat * param); /* 844 */
-   void (GLAPIENTRYP GetTexBumpParameterivATI)(GLenum pname, GLint * param); /* 845 */
-   void (GLAPIENTRYP TexBumpParameterfvATI)(GLenum pname, const GLfloat * param); /* 846 */
-   void (GLAPIENTRYP TexBumpParameterivATI)(GLenum pname, const GLint * param); /* 847 */
-   void (GLAPIENTRYP AlphaFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 848 */
-   void (GLAPIENTRYP AlphaFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 849 */
-   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); /* 850 */
-   void (GLAPIENTRYP BeginFragmentShaderATI)(void); /* 851 */
-   void (GLAPIENTRYP BindFragmentShaderATI)(GLuint id); /* 852 */
-   void (GLAPIENTRYP ColorFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 853 */
-   void (GLAPIENTRYP ColorFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 854 */
-   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); /* 855 */
-   void (GLAPIENTRYP DeleteFragmentShaderATI)(GLuint id); /* 856 */
-   void (GLAPIENTRYP EndFragmentShaderATI)(void); /* 857 */
-   GLuint (GLAPIENTRYP GenFragmentShadersATI)(GLuint range); /* 858 */
-   void (GLAPIENTRYP PassTexCoordATI)(GLuint dst, GLuint coord, GLenum swizzle); /* 859 */
-   void (GLAPIENTRYP SampleMapATI)(GLuint dst, GLuint interp, GLenum swizzle); /* 860 */
-   void (GLAPIENTRYP SetFragmentShaderConstantATI)(GLuint dst, const GLfloat * value); /* 861 */
-   void (GLAPIENTRYP PointParameteriNV)(GLenum pname, GLint param); /* 862 */
-   void (GLAPIENTRYP PointParameterivNV)(GLenum pname, const GLint * params); /* 863 */
-   void (GLAPIENTRYP ActiveStencilFaceEXT)(GLenum face); /* 864 */
-   void (GLAPIENTRYP BindVertexArrayAPPLE)(GLuint array); /* 865 */
-   void (GLAPIENTRYP DeleteVertexArraysAPPLE)(GLsizei n, const GLuint * arrays); /* 866 */
-   void (GLAPIENTRYP GenVertexArraysAPPLE)(GLsizei n, GLuint * arrays); /* 867 */
-   GLboolean (GLAPIENTRYP IsVertexArrayAPPLE)(GLuint array); /* 868 */
-   void (GLAPIENTRYP GetProgramNamedParameterdvNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble * params); /* 869 */
-   void (GLAPIENTRYP GetProgramNamedParameterfvNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat * params); /* 870 */
-   void (GLAPIENTRYP ProgramNamedParameter4dNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 871 */
-   void (GLAPIENTRYP ProgramNamedParameter4dvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLdouble * v); /* 872 */
-   void (GLAPIENTRYP ProgramNamedParameter4fNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 873 */
-   void (GLAPIENTRYP ProgramNamedParameter4fvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLfloat * v); /* 874 */
-   void (GLAPIENTRYP PrimitiveRestartIndexNV)(GLuint index); /* 875 */
-   void (GLAPIENTRYP PrimitiveRestartNV)(void); /* 876 */
-   void (GLAPIENTRYP DepthBoundsEXT)(GLclampd zmin, GLclampd zmax); /* 877 */
-   void (GLAPIENTRYP BlendEquationSeparateEXT)(GLenum modeRGB, GLenum modeA); /* 878 */
-   void (GLAPIENTRYP BindFramebufferEXT)(GLenum target, GLuint framebuffer); /* 879 */
-   void (GLAPIENTRYP BindRenderbufferEXT)(GLenum target, GLuint renderbuffer); /* 880 */
-   GLenum (GLAPIENTRYP CheckFramebufferStatusEXT)(GLenum target); /* 881 */
-   void (GLAPIENTRYP DeleteFramebuffersEXT)(GLsizei n, const GLuint * framebuffers); /* 882 */
-   void (GLAPIENTRYP DeleteRenderbuffersEXT)(GLsizei n, const GLuint * renderbuffers); /* 883 */
-   void (GLAPIENTRYP FramebufferRenderbufferEXT)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); /* 884 */
-   void (GLAPIENTRYP FramebufferTexture1DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 885 */
-   void (GLAPIENTRYP FramebufferTexture2DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 886 */
-   void (GLAPIENTRYP FramebufferTexture3DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); /* 887 */
-   void (GLAPIENTRYP GenFramebuffersEXT)(GLsizei n, GLuint * framebuffers); /* 888 */
-   void (GLAPIENTRYP GenRenderbuffersEXT)(GLsizei n, GLuint * renderbuffers); /* 889 */
-   void (GLAPIENTRYP GenerateMipmapEXT)(GLenum target); /* 890 */
-   void (GLAPIENTRYP GetFramebufferAttachmentParameterivEXT)(GLenum target, GLenum attachment, GLenum pname, GLint * params); /* 891 */
-   void (GLAPIENTRYP GetRenderbufferParameterivEXT)(GLenum target, GLenum pname, GLint * params); /* 892 */
-   GLboolean (GLAPIENTRYP IsFramebufferEXT)(GLuint framebuffer); /* 893 */
-   GLboolean (GLAPIENTRYP IsRenderbufferEXT)(GLuint renderbuffer); /* 894 */
-   void (GLAPIENTRYP RenderbufferStorageEXT)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height); /* 895 */
-   void (GLAPIENTRYP BlitFramebufferEXT)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); /* 896 */
-   void (GLAPIENTRYP BufferParameteriAPPLE)(GLenum target, GLenum pname, GLint param); /* 897 */
-   void (GLAPIENTRYP FlushMappedBufferRangeAPPLE)(GLenum target, GLintptr offset, GLsizeiptr size); /* 898 */
-   void (GLAPIENTRYP BindFragDataLocationEXT)(GLuint program, GLuint colorNumber, const GLchar * name); /* 899 */
-   GLint (GLAPIENTRYP GetFragDataLocationEXT)(GLuint program, const GLchar * name); /* 900 */
-   void (GLAPIENTRYP GetUniformuivEXT)(GLuint program, GLint location, GLuint * params); /* 901 */
-   void (GLAPIENTRYP GetVertexAttribIivEXT)(GLuint index, GLenum pname, GLint * params); /* 902 */
-   void (GLAPIENTRYP GetVertexAttribIuivEXT)(GLuint index, GLenum pname, GLuint * params); /* 903 */
-   void (GLAPIENTRYP Uniform1uiEXT)(GLint location, GLuint x); /* 904 */
-   void (GLAPIENTRYP Uniform1uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 905 */
-   void (GLAPIENTRYP Uniform2uiEXT)(GLint location, GLuint x, GLuint y); /* 906 */
-   void (GLAPIENTRYP Uniform2uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 907 */
-   void (GLAPIENTRYP Uniform3uiEXT)(GLint location, GLuint x, GLuint y, GLuint z); /* 908 */
-   void (GLAPIENTRYP Uniform3uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 909 */
-   void (GLAPIENTRYP Uniform4uiEXT)(GLint location, GLuint x, GLuint y, GLuint z, GLuint w); /* 910 */
-   void (GLAPIENTRYP Uniform4uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 911 */
-   void (GLAPIENTRYP VertexAttribI1iEXT)(GLuint index, GLint x); /* 912 */
-   void (GLAPIENTRYP VertexAttribI1ivEXT)(GLuint index, const GLint * v); /* 913 */
-   void (GLAPIENTRYP VertexAttribI1uiEXT)(GLuint index, GLuint x); /* 914 */
-   void (GLAPIENTRYP VertexAttribI1uivEXT)(GLuint index, const GLuint * v); /* 915 */
-   void (GLAPIENTRYP VertexAttribI2iEXT)(GLuint index, GLint x, GLint y); /* 916 */
-   void (GLAPIENTRYP VertexAttribI2ivEXT)(GLuint index, const GLint * v); /* 917 */
-   void (GLAPIENTRYP VertexAttribI2uiEXT)(GLuint index, GLuint x, GLuint y); /* 918 */
-   void (GLAPIENTRYP VertexAttribI2uivEXT)(GLuint index, const GLuint * v); /* 919 */
-   void (GLAPIENTRYP VertexAttribI3iEXT)(GLuint index, GLint x, GLint y, GLint z); /* 920 */
-   void (GLAPIENTRYP VertexAttribI3ivEXT)(GLuint index, const GLint * v); /* 921 */
-   void (GLAPIENTRYP VertexAttribI3uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z); /* 922 */
-   void (GLAPIENTRYP VertexAttribI3uivEXT)(GLuint index, const GLuint * v); /* 923 */
-   void (GLAPIENTRYP VertexAttribI4bvEXT)(GLuint index, const GLbyte * v); /* 924 */
-   void (GLAPIENTRYP VertexAttribI4iEXT)(GLuint index, GLint x, GLint y, GLint z, GLint w); /* 925 */
-   void (GLAPIENTRYP VertexAttribI4ivEXT)(GLuint index, const GLint * v); /* 926 */
-   void (GLAPIENTRYP VertexAttribI4svEXT)(GLuint index, const GLshort * v); /* 927 */
-   void (GLAPIENTRYP VertexAttribI4ubvEXT)(GLuint index, const GLubyte * v); /* 928 */
-   void (GLAPIENTRYP VertexAttribI4uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); /* 929 */
-   void (GLAPIENTRYP VertexAttribI4uivEXT)(GLuint index, const GLuint * v); /* 930 */
-   void (GLAPIENTRYP VertexAttribI4usvEXT)(GLuint index, const GLushort * v); /* 931 */
-   void (GLAPIENTRYP VertexAttribIPointerEXT)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 932 */
-   void (GLAPIENTRYP FramebufferTextureLayerEXT)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); /* 933 */
-   void (GLAPIENTRYP ColorMaskIndexedEXT)(GLuint buf, GLboolean r, GLboolean g, GLboolean b, GLboolean a); /* 934 */
-   void (GLAPIENTRYP DisableIndexedEXT)(GLenum target, GLuint index); /* 935 */
-   void (GLAPIENTRYP EnableIndexedEXT)(GLenum target, GLuint index); /* 936 */
-   void (GLAPIENTRYP GetBooleanIndexedvEXT)(GLenum value, GLuint index, GLboolean * data); /* 937 */
-   void (GLAPIENTRYP GetIntegerIndexedvEXT)(GLenum value, GLuint index, GLint * data); /* 938 */
-   GLboolean (GLAPIENTRYP IsEnabledIndexedEXT)(GLenum target, GLuint index); /* 939 */
-   void (GLAPIENTRYP ClearColorIiEXT)(GLint r, GLint g, GLint b, GLint a); /* 940 */
-   void (GLAPIENTRYP ClearColorIuiEXT)(GLuint r, GLuint g, GLuint b, GLuint a); /* 941 */
-   void (GLAPIENTRYP GetTexParameterIivEXT)(GLenum target, GLenum pname, GLint * params); /* 942 */
-   void (GLAPIENTRYP GetTexParameterIuivEXT)(GLenum target, GLenum pname, GLuint * params); /* 943 */
-   void (GLAPIENTRYP TexParameterIivEXT)(GLenum target, GLenum pname, const GLint * params); /* 944 */
-   void (GLAPIENTRYP TexParameterIuivEXT)(GLenum target, GLenum pname, const GLuint * params); /* 945 */
-   void (GLAPIENTRYP BeginConditionalRenderNV)(GLuint query, GLenum mode); /* 946 */
-   void (GLAPIENTRYP EndConditionalRenderNV)(void); /* 947 */
-   void (GLAPIENTRYP BeginTransformFeedbackEXT)(GLenum mode); /* 948 */
-   void (GLAPIENTRYP BindBufferBaseEXT)(GLenum target, GLuint index, GLuint buffer); /* 949 */
-   void (GLAPIENTRYP BindBufferOffsetEXT)(GLenum target, GLuint index, GLuint buffer, GLintptr offset); /* 950 */
-   void (GLAPIENTRYP BindBufferRangeEXT)(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); /* 951 */
-   void (GLAPIENTRYP EndTransformFeedbackEXT)(void); /* 952 */
-   void (GLAPIENTRYP GetTransformFeedbackVaryingEXT)(GLuint program, GLuint index, GLsizei bufSize, GLsizei * length, GLsizei * size, GLenum * type, GLchar * name); /* 953 */
-   void (GLAPIENTRYP TransformFeedbackVaryingsEXT)(GLuint program, GLsizei count, const char ** varyings, GLenum bufferMode); /* 954 */
-   void (GLAPIENTRYP ProvokingVertexEXT)(GLenum mode); /* 955 */
-   void (GLAPIENTRYP GetObjectParameterivAPPLE)(GLenum objectType, GLuint name, GLenum pname, GLint * value); /* 956 */
-   GLenum (GLAPIENTRYP ObjectPurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 957 */
-   GLenum (GLAPIENTRYP ObjectUnpurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 958 */
-   void (GLAPIENTRYP ActiveProgramEXT)(GLuint program); /* 959 */
-   GLuint (GLAPIENTRYP CreateShaderProgramEXT)(GLenum type, const GLchar * string); /* 960 */
-   void (GLAPIENTRYP UseShaderProgramEXT)(GLenum type, GLuint program); /* 961 */
-   void (GLAPIENTRYP TextureBarrierNV)(void); /* 962 */
-   void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 963 */
-   void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 964 */
-   void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 965 */
-   void (GLAPIENTRYP GetQueryObjecti64vEXT)(GLuint id, GLenum pname, GLint64EXT * params); /* 966 */
-   void (GLAPIENTRYP GetQueryObjectui64vEXT)(GLuint id, GLenum pname, GLuint64EXT * params); /* 967 */
-   void (GLAPIENTRYP EGLImageTargetRenderbufferStorageOES)(GLenum target, GLvoid * writeOffset); /* 968 */
-   void (GLAPIENTRYP EGLImageTargetTexture2DOES)(GLenum target, GLvoid * writeOffset); /* 969 */
+   void (GLAPIENTRYP ClearBufferfi)(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil); /* 430 */
+   void (GLAPIENTRYP ClearBufferfv)(GLenum buffer, GLint drawbuffer, const GLfloat * value); /* 431 */
+   void (GLAPIENTRYP ClearBufferiv)(GLenum buffer, GLint drawbuffer, const GLint * value); /* 432 */
+   void (GLAPIENTRYP ClearBufferuiv)(GLenum buffer, GLint drawbuffer, const GLuint * value); /* 433 */
+   const GLubyte * (GLAPIENTRYP GetStringi)(GLenum name, GLuint index); /* 434 */
+   void (GLAPIENTRYP FramebufferTexture)(GLenum target, GLenum attachment, GLuint texture, GLint level); /* 435 */
+   void (GLAPIENTRYP GetBufferParameteri64v)(GLenum target, GLenum pname, GLint64 * params); /* 436 */
+   void (GLAPIENTRYP GetInteger64i_v)(GLenum cap, GLuint index, GLint64 * data); /* 437 */
+   void (GLAPIENTRYP LoadTransposeMatrixdARB)(const GLdouble * m); /* 438 */
+   void (GLAPIENTRYP LoadTransposeMatrixfARB)(const GLfloat * m); /* 439 */
+   void (GLAPIENTRYP MultTransposeMatrixdARB)(const GLdouble * m); /* 440 */
+   void (GLAPIENTRYP MultTransposeMatrixfARB)(const GLfloat * m); /* 441 */
+   void (GLAPIENTRYP SampleCoverageARB)(GLclampf value, GLboolean invert); /* 442 */
+   void (GLAPIENTRYP CompressedTexImage1DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid * data); /* 443 */
+   void (GLAPIENTRYP CompressedTexImage2DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid * data); /* 444 */
+   void (GLAPIENTRYP CompressedTexImage3DARB)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid * data); /* 445 */
+   void (GLAPIENTRYP CompressedTexSubImage1DARB)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid * data); /* 446 */
+   void (GLAPIENTRYP CompressedTexSubImage2DARB)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid * data); /* 447 */
+   void (GLAPIENTRYP CompressedTexSubImage3DARB)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid * data); /* 448 */
+   void (GLAPIENTRYP GetCompressedTexImageARB)(GLenum target, GLint level, GLvoid * img); /* 449 */
+   void (GLAPIENTRYP DisableVertexAttribArrayARB)(GLuint index); /* 450 */
+   void (GLAPIENTRYP EnableVertexAttribArrayARB)(GLuint index); /* 451 */
+   void (GLAPIENTRYP GetProgramEnvParameterdvARB)(GLenum target, GLuint index, GLdouble * params); /* 452 */
+   void (GLAPIENTRYP GetProgramEnvParameterfvARB)(GLenum target, GLuint index, GLfloat * params); /* 453 */
+   void (GLAPIENTRYP GetProgramLocalParameterdvARB)(GLenum target, GLuint index, GLdouble * params); /* 454 */
+   void (GLAPIENTRYP GetProgramLocalParameterfvARB)(GLenum target, GLuint index, GLfloat * params); /* 455 */
+   void (GLAPIENTRYP GetProgramStringARB)(GLenum target, GLenum pname, GLvoid * string); /* 456 */
+   void (GLAPIENTRYP GetProgramivARB)(GLenum target, GLenum pname, GLint * params); /* 457 */
+   void (GLAPIENTRYP GetVertexAttribdvARB)(GLuint index, GLenum pname, GLdouble * params); /* 458 */
+   void (GLAPIENTRYP GetVertexAttribfvARB)(GLuint index, GLenum pname, GLfloat * params); /* 459 */
+   void (GLAPIENTRYP GetVertexAttribivARB)(GLuint index, GLenum pname, GLint * params); /* 460 */
+   void (GLAPIENTRYP ProgramEnvParameter4dARB)(GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 461 */
+   void (GLAPIENTRYP ProgramEnvParameter4dvARB)(GLenum target, GLuint index, const GLdouble * params); /* 462 */
+   void (GLAPIENTRYP ProgramEnvParameter4fARB)(GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 463 */
+   void (GLAPIENTRYP ProgramEnvParameter4fvARB)(GLenum target, GLuint index, const GLfloat * params); /* 464 */
+   void (GLAPIENTRYP ProgramLocalParameter4dARB)(GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 465 */
+   void (GLAPIENTRYP ProgramLocalParameter4dvARB)(GLenum target, GLuint index, const GLdouble * params); /* 466 */
+   void (GLAPIENTRYP ProgramLocalParameter4fARB)(GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 467 */
+   void (GLAPIENTRYP ProgramLocalParameter4fvARB)(GLenum target, GLuint index, const GLfloat * params); /* 468 */
+   void (GLAPIENTRYP ProgramStringARB)(GLenum target, GLenum format, GLsizei len, const GLvoid * string); /* 469 */
+   void (GLAPIENTRYP VertexAttrib1dARB)(GLuint index, GLdouble x); /* 470 */
+   void (GLAPIENTRYP VertexAttrib1dvARB)(GLuint index, const GLdouble * v); /* 471 */
+   void (GLAPIENTRYP VertexAttrib1fARB)(GLuint index, GLfloat x); /* 472 */
+   void (GLAPIENTRYP VertexAttrib1fvARB)(GLuint index, const GLfloat * v); /* 473 */
+   void (GLAPIENTRYP VertexAttrib1sARB)(GLuint index, GLshort x); /* 474 */
+   void (GLAPIENTRYP VertexAttrib1svARB)(GLuint index, const GLshort * v); /* 475 */
+   void (GLAPIENTRYP VertexAttrib2dARB)(GLuint index, GLdouble x, GLdouble y); /* 476 */
+   void (GLAPIENTRYP VertexAttrib2dvARB)(GLuint index, const GLdouble * v); /* 477 */
+   void (GLAPIENTRYP VertexAttrib2fARB)(GLuint index, GLfloat x, GLfloat y); /* 478 */
+   void (GLAPIENTRYP VertexAttrib2fvARB)(GLuint index, const GLfloat * v); /* 479 */
+   void (GLAPIENTRYP VertexAttrib2sARB)(GLuint index, GLshort x, GLshort y); /* 480 */
+   void (GLAPIENTRYP VertexAttrib2svARB)(GLuint index, const GLshort * v); /* 481 */
+   void (GLAPIENTRYP VertexAttrib3dARB)(GLuint index, GLdouble x, GLdouble y, GLdouble z); /* 482 */
+   void (GLAPIENTRYP VertexAttrib3dvARB)(GLuint index, const GLdouble * v); /* 483 */
+   void (GLAPIENTRYP VertexAttrib3fARB)(GLuint index, GLfloat x, GLfloat y, GLfloat z); /* 484 */
+   void (GLAPIENTRYP VertexAttrib3fvARB)(GLuint index, const GLfloat * v); /* 485 */
+   void (GLAPIENTRYP VertexAttrib3sARB)(GLuint index, GLshort x, GLshort y, GLshort z); /* 486 */
+   void (GLAPIENTRYP VertexAttrib3svARB)(GLuint index, const GLshort * v); /* 487 */
+   void (GLAPIENTRYP VertexAttrib4NbvARB)(GLuint index, const GLbyte * v); /* 488 */
+   void (GLAPIENTRYP VertexAttrib4NivARB)(GLuint index, const GLint * v); /* 489 */
+   void (GLAPIENTRYP VertexAttrib4NsvARB)(GLuint index, const GLshort * v); /* 490 */
+   void (GLAPIENTRYP VertexAttrib4NubARB)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); /* 491 */
+   void (GLAPIENTRYP VertexAttrib4NubvARB)(GLuint index, const GLubyte * v); /* 492 */
+   void (GLAPIENTRYP VertexAttrib4NuivARB)(GLuint index, const GLuint * v); /* 493 */
+   void (GLAPIENTRYP VertexAttrib4NusvARB)(GLuint index, const GLushort * v); /* 494 */
+   void (GLAPIENTRYP VertexAttrib4bvARB)(GLuint index, const GLbyte * v); /* 495 */
+   void (GLAPIENTRYP VertexAttrib4dARB)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 496 */
+   void (GLAPIENTRYP VertexAttrib4dvARB)(GLuint index, const GLdouble * v); /* 497 */
+   void (GLAPIENTRYP VertexAttrib4fARB)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 498 */
+   void (GLAPIENTRYP VertexAttrib4fvARB)(GLuint index, const GLfloat * v); /* 499 */
+   void (GLAPIENTRYP VertexAttrib4ivARB)(GLuint index, const GLint * v); /* 500 */
+   void (GLAPIENTRYP VertexAttrib4sARB)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); /* 501 */
+   void (GLAPIENTRYP VertexAttrib4svARB)(GLuint index, const GLshort * v); /* 502 */
+   void (GLAPIENTRYP VertexAttrib4ubvARB)(GLuint index, const GLubyte * v); /* 503 */
+   void (GLAPIENTRYP VertexAttrib4uivARB)(GLuint index, const GLuint * v); /* 504 */
+   void (GLAPIENTRYP VertexAttrib4usvARB)(GLuint index, const GLushort * v); /* 505 */
+   void (GLAPIENTRYP VertexAttribPointerARB)(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid * pointer); /* 506 */
+   void (GLAPIENTRYP BindBufferARB)(GLenum target, GLuint buffer); /* 507 */
+   void (GLAPIENTRYP BufferDataARB)(GLenum target, GLsizeiptrARB size, const GLvoid * data, GLenum usage); /* 508 */
+   void (GLAPIENTRYP BufferSubDataARB)(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid * data); /* 509 */
+   void (GLAPIENTRYP DeleteBuffersARB)(GLsizei n, const GLuint * buffer); /* 510 */
+   void (GLAPIENTRYP GenBuffersARB)(GLsizei n, GLuint * buffer); /* 511 */
+   void (GLAPIENTRYP GetBufferParameterivARB)(GLenum target, GLenum pname, GLint * params); /* 512 */
+   void (GLAPIENTRYP GetBufferPointervARB)(GLenum target, GLenum pname, GLvoid ** params); /* 513 */
+   void (GLAPIENTRYP GetBufferSubDataARB)(GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid * data); /* 514 */
+   GLboolean (GLAPIENTRYP IsBufferARB)(GLuint buffer); /* 515 */
+   GLvoid * (GLAPIENTRYP MapBufferARB)(GLenum target, GLenum access); /* 516 */
+   GLboolean (GLAPIENTRYP UnmapBufferARB)(GLenum target); /* 517 */
+   void (GLAPIENTRYP BeginQueryARB)(GLenum target, GLuint id); /* 518 */
+   void (GLAPIENTRYP DeleteQueriesARB)(GLsizei n, const GLuint * ids); /* 519 */
+   void (GLAPIENTRYP EndQueryARB)(GLenum target); /* 520 */
+   void (GLAPIENTRYP GenQueriesARB)(GLsizei n, GLuint * ids); /* 521 */
+   void (GLAPIENTRYP GetQueryObjectivARB)(GLuint id, GLenum pname, GLint * params); /* 522 */
+   void (GLAPIENTRYP GetQueryObjectuivARB)(GLuint id, GLenum pname, GLuint * params); /* 523 */
+   void (GLAPIENTRYP GetQueryivARB)(GLenum target, GLenum pname, GLint * params); /* 524 */
+   GLboolean (GLAPIENTRYP IsQueryARB)(GLuint id); /* 525 */
+   void (GLAPIENTRYP AttachObjectARB)(GLhandleARB containerObj, GLhandleARB obj); /* 526 */
+   void (GLAPIENTRYP CompileShaderARB)(GLhandleARB shader); /* 527 */
+   GLhandleARB (GLAPIENTRYP CreateProgramObjectARB)(void); /* 528 */
+   GLhandleARB (GLAPIENTRYP CreateShaderObjectARB)(GLenum shaderType); /* 529 */
+   void (GLAPIENTRYP DeleteObjectARB)(GLhandleARB obj); /* 530 */
+   void (GLAPIENTRYP DetachObjectARB)(GLhandleARB containerObj, GLhandleARB attachedObj); /* 531 */
+   void (GLAPIENTRYP GetActiveUniformARB)(GLhandleARB program, GLuint index, GLsizei bufSize, GLsizei * length, GLint * size, GLenum * type, GLcharARB * name); /* 532 */
+   void (GLAPIENTRYP GetAttachedObjectsARB)(GLhandleARB containerObj, GLsizei maxLength, GLsizei * length, GLhandleARB * infoLog); /* 533 */
+   GLhandleARB (GLAPIENTRYP GetHandleARB)(GLenum pname); /* 534 */
+   void (GLAPIENTRYP GetInfoLogARB)(GLhandleARB obj, GLsizei maxLength, GLsizei * length, GLcharARB * infoLog); /* 535 */
+   void (GLAPIENTRYP GetObjectParameterfvARB)(GLhandleARB obj, GLenum pname, GLfloat * params); /* 536 */
+   void (GLAPIENTRYP GetObjectParameterivARB)(GLhandleARB obj, GLenum pname, GLint * params); /* 537 */
+   void (GLAPIENTRYP GetShaderSourceARB)(GLhandleARB shader, GLsizei bufSize, GLsizei * length, GLcharARB * source); /* 538 */
+   GLint (GLAPIENTRYP GetUniformLocationARB)(GLhandleARB program, const GLcharARB * name); /* 539 */
+   void (GLAPIENTRYP GetUniformfvARB)(GLhandleARB program, GLint location, GLfloat * params); /* 540 */
+   void (GLAPIENTRYP GetUniformivARB)(GLhandleARB program, GLint location, GLint * params); /* 541 */
+   void (GLAPIENTRYP LinkProgramARB)(GLhandleARB program); /* 542 */
+   void (GLAPIENTRYP ShaderSourceARB)(GLhandleARB shader, GLsizei count, const GLcharARB ** string, const GLint * length); /* 543 */
+   void (GLAPIENTRYP Uniform1fARB)(GLint location, GLfloat v0); /* 544 */
+   void (GLAPIENTRYP Uniform1fvARB)(GLint location, GLsizei count, const GLfloat * value); /* 545 */
+   void (GLAPIENTRYP Uniform1iARB)(GLint location, GLint v0); /* 546 */
+   void (GLAPIENTRYP Uniform1ivARB)(GLint location, GLsizei count, const GLint * value); /* 547 */
+   void (GLAPIENTRYP Uniform2fARB)(GLint location, GLfloat v0, GLfloat v1); /* 548 */
+   void (GLAPIENTRYP Uniform2fvARB)(GLint location, GLsizei count, const GLfloat * value); /* 549 */
+   void (GLAPIENTRYP Uniform2iARB)(GLint location, GLint v0, GLint v1); /* 550 */
+   void (GLAPIENTRYP Uniform2ivARB)(GLint location, GLsizei count, const GLint * value); /* 551 */
+   void (GLAPIENTRYP Uniform3fARB)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2); /* 552 */
+   void (GLAPIENTRYP Uniform3fvARB)(GLint location, GLsizei count, const GLfloat * value); /* 553 */
+   void (GLAPIENTRYP Uniform3iARB)(GLint location, GLint v0, GLint v1, GLint v2); /* 554 */
+   void (GLAPIENTRYP Uniform3ivARB)(GLint location, GLsizei count, const GLint * value); /* 555 */
+   void (GLAPIENTRYP Uniform4fARB)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); /* 556 */
+   void (GLAPIENTRYP Uniform4fvARB)(GLint location, GLsizei count, const GLfloat * value); /* 557 */
+   void (GLAPIENTRYP Uniform4iARB)(GLint location, GLint v0, GLint v1, GLint v2, GLint v3); /* 558 */
+   void (GLAPIENTRYP Uniform4ivARB)(GLint location, GLsizei count, const GLint * value); /* 559 */
+   void (GLAPIENTRYP UniformMatrix2fvARB)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 560 */
+   void (GLAPIENTRYP UniformMatrix3fvARB)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 561 */
+   void (GLAPIENTRYP UniformMatrix4fvARB)(GLint location, GLsizei count, GLboolean transpose, const GLfloat * value); /* 562 */
+   void (GLAPIENTRYP UseProgramObjectARB)(GLhandleARB program); /* 563 */
+   void (GLAPIENTRYP ValidateProgramARB)(GLhandleARB program); /* 564 */
+   void (GLAPIENTRYP BindAttribLocationARB)(GLhandleARB program, GLuint index, const GLcharARB * name); /* 565 */
+   void (GLAPIENTRYP GetActiveAttribARB)(GLhandleARB program, GLuint index, GLsizei bufSize, GLsizei * length, GLint * size, GLenum * type, GLcharARB * name); /* 566 */
+   GLint (GLAPIENTRYP GetAttribLocationARB)(GLhandleARB program, const GLcharARB * name); /* 567 */
+   void (GLAPIENTRYP DrawBuffersARB)(GLsizei n, const GLenum * bufs); /* 568 */
+   void (GLAPIENTRYP ClampColorARB)(GLenum target, GLenum clamp); /* 569 */
+   void (GLAPIENTRYP DrawArraysInstancedARB)(GLenum mode, GLint first, GLsizei count, GLsizei primcount); /* 570 */
+   void (GLAPIENTRYP DrawElementsInstancedARB)(GLenum mode, GLsizei count, GLenum type, const GLvoid * indices, GLsizei primcount); /* 571 */
+   void (GLAPIENTRYP RenderbufferStorageMultisample)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); /* 572 */
+   void (GLAPIENTRYP FramebufferTextureFaceARB)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face); /* 573 */
+   void (GLAPIENTRYP VertexAttribDivisorARB)(GLuint index, GLuint divisor); /* 574 */
+   void (GLAPIENTRYP FlushMappedBufferRange)(GLenum target, GLintptr offset, GLsizeiptr length); /* 575 */
+   GLvoid * (GLAPIENTRYP MapBufferRange)(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access); /* 576 */
+   void (GLAPIENTRYP TexBufferARB)(GLenum target, GLenum internalFormat, GLuint buffer); /* 577 */
+   void (GLAPIENTRYP BindVertexArray)(GLuint array); /* 578 */
+   void (GLAPIENTRYP GenVertexArrays)(GLsizei n, GLuint * arrays); /* 579 */
+   void (GLAPIENTRYP GetActiveUniformBlockName)(GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei * length, GLchar * uniformBlockName); /* 580 */
+   void (GLAPIENTRYP GetActiveUniformBlockiv)(GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint * params); /* 581 */
+   void (GLAPIENTRYP GetActiveUniformName)(GLuint program, GLuint uniformIndex, GLsizei bufSize, GLsizei * length, GLchar * uniformName); /* 582 */
+   void (GLAPIENTRYP GetActiveUniformsiv)(GLuint program, GLsizei uniformCount, const GLuint * uniformIndices, GLenum pname, GLint * params); /* 583 */
+   GLuint (GLAPIENTRYP GetUniformBlockIndex)(GLuint program, const GLchar * uniformBlockName); /* 584 */
+   void (GLAPIENTRYP GetUniformIndices)(GLuint program, GLsizei uniformCount, const GLchar * const * uniformNames, GLuint * uniformIndices); /* 585 */
+   void (GLAPIENTRYP UniformBlockBinding)(GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding); /* 586 */
+   void (GLAPIENTRYP CopyBufferSubData)(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size); /* 587 */
+   GLenum (GLAPIENTRYP ClientWaitSync)(GLsync sync, GLbitfield flags, GLuint64 timeout); /* 588 */
+   void (GLAPIENTRYP DeleteSync)(GLsync sync); /* 589 */
+   GLsync (GLAPIENTRYP FenceSync)(GLenum condition, GLbitfield flags); /* 590 */
+   void (GLAPIENTRYP GetInteger64v)(GLenum pname, GLint64 * params); /* 591 */
+   void (GLAPIENTRYP GetSynciv)(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei * length, GLint * values); /* 592 */
+   GLboolean (GLAPIENTRYP IsSync)(GLsync sync); /* 593 */
+   void (GLAPIENTRYP WaitSync)(GLsync sync, GLbitfield flags, GLuint64 timeout); /* 594 */
+   void (GLAPIENTRYP DrawElementsBaseVertex)(GLenum mode, GLsizei count, GLenum type, const GLvoid * indices, GLint basevertex); /* 595 */
+   void (GLAPIENTRYP DrawElementsInstancedBaseVertex)(GLenum mode, GLsizei count, GLenum type, const GLvoid * indices, GLsizei primcount, GLint basevertex); /* 596 */
+   void (GLAPIENTRYP DrawRangeElementsBaseVertex)(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid * indices, GLint basevertex); /* 597 */
+   void (GLAPIENTRYP MultiDrawElementsBaseVertex)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, const GLint * basevertex); /* 598 */
+   void (GLAPIENTRYP BlendEquationSeparateiARB)(GLuint buf, GLenum modeRGB, GLenum modeA); /* 599 */
+   void (GLAPIENTRYP BlendEquationiARB)(GLuint buf, GLenum mode); /* 600 */
+   void (GLAPIENTRYP BlendFuncSeparateiARB)(GLuint buf, GLenum srcRGB, GLenum dstRGB, GLenum srcA, GLenum dstA); /* 601 */
+   void (GLAPIENTRYP BlendFunciARB)(GLuint buf, GLenum src, GLenum dst); /* 602 */
+   void (GLAPIENTRYP BindFragDataLocationIndexed)(GLuint program, GLuint colorNumber, GLuint index, const GLchar * name); /* 603 */
+   GLint (GLAPIENTRYP GetFragDataIndex)(GLuint program, const GLchar * name); /* 604 */
+   void (GLAPIENTRYP BindSampler)(GLuint unit, GLuint sampler); /* 605 */
+   void (GLAPIENTRYP DeleteSamplers)(GLsizei count, const GLuint * samplers); /* 606 */
+   void (GLAPIENTRYP GenSamplers)(GLsizei count, GLuint * samplers); /* 607 */
+   void (GLAPIENTRYP GetSamplerParameterIiv)(GLuint sampler, GLenum pname, GLint * params); /* 608 */
+   void (GLAPIENTRYP GetSamplerParameterIuiv)(GLuint sampler, GLenum pname, GLuint * params); /* 609 */
+   void (GLAPIENTRYP GetSamplerParameterfv)(GLuint sampler, GLenum pname, GLfloat * params); /* 610 */
+   void (GLAPIENTRYP GetSamplerParameteriv)(GLuint sampler, GLenum pname, GLint * params); /* 611 */
+   GLboolean (GLAPIENTRYP IsSampler)(GLuint sampler); /* 612 */
+   void (GLAPIENTRYP SamplerParameterIiv)(GLuint sampler, GLenum pname, const GLint * params); /* 613 */
+   void (GLAPIENTRYP SamplerParameterIuiv)(GLuint sampler, GLenum pname, const GLuint * params); /* 614 */
+   void (GLAPIENTRYP SamplerParameterf)(GLuint sampler, GLenum pname, GLfloat param); /* 615 */
+   void (GLAPIENTRYP SamplerParameterfv)(GLuint sampler, GLenum pname, const GLfloat * params); /* 616 */
+   void (GLAPIENTRYP SamplerParameteri)(GLuint sampler, GLenum pname, GLint param); /* 617 */
+   void (GLAPIENTRYP SamplerParameteriv)(GLuint sampler, GLenum pname, const GLint * params); /* 618 */
+   void (GLAPIENTRYP QueryCounter)(GLuint id, GLenum target); /* 619 */
+   void (GLAPIENTRYP ColorP3ui)(GLenum type, GLuint color); /* 620 */
+   void (GLAPIENTRYP ColorP3uiv)(GLenum type, const GLuint * color); /* 621 */
+   void (GLAPIENTRYP ColorP4ui)(GLenum type, GLuint color); /* 622 */
+   void (GLAPIENTRYP ColorP4uiv)(GLenum type, const GLuint * color); /* 623 */
+   void (GLAPIENTRYP MultiTexCoordP1ui)(GLenum texture, GLenum type, GLuint coords); /* 624 */
+   void (GLAPIENTRYP MultiTexCoordP1uiv)(GLenum texture, GLenum type, const GLuint * coords); /* 625 */
+   void (GLAPIENTRYP MultiTexCoordP2ui)(GLenum texture, GLenum type, GLuint coords); /* 626 */
+   void (GLAPIENTRYP MultiTexCoordP2uiv)(GLenum texture, GLenum type, const GLuint * coords); /* 627 */
+   void (GLAPIENTRYP MultiTexCoordP3ui)(GLenum texture, GLenum type, GLuint coords); /* 628 */
+   void (GLAPIENTRYP MultiTexCoordP3uiv)(GLenum texture, GLenum type, const GLuint * coords); /* 629 */
+   void (GLAPIENTRYP MultiTexCoordP4ui)(GLenum texture, GLenum type, GLuint coords); /* 630 */
+   void (GLAPIENTRYP MultiTexCoordP4uiv)(GLenum texture, GLenum type, const GLuint * coords); /* 631 */
+   void (GLAPIENTRYP NormalP3ui)(GLenum type, GLuint coords); /* 632 */
+   void (GLAPIENTRYP NormalP3uiv)(GLenum type, const GLuint * coords); /* 633 */
+   void (GLAPIENTRYP SecondaryColorP3ui)(GLenum type, GLuint color); /* 634 */
+   void (GLAPIENTRYP SecondaryColorP3uiv)(GLenum type, const GLuint * color); /* 635 */
+   void (GLAPIENTRYP TexCoordP1ui)(GLenum type, GLuint coords); /* 636 */
+   void (GLAPIENTRYP TexCoordP1uiv)(GLenum type, const GLuint * coords); /* 637 */
+   void (GLAPIENTRYP TexCoordP2ui)(GLenum type, GLuint coords); /* 638 */
+   void (GLAPIENTRYP TexCoordP2uiv)(GLenum type, const GLuint * coords); /* 639 */
+   void (GLAPIENTRYP TexCoordP3ui)(GLenum type, GLuint coords); /* 640 */
+   void (GLAPIENTRYP TexCoordP3uiv)(GLenum type, const GLuint * coords); /* 641 */
+   void (GLAPIENTRYP TexCoordP4ui)(GLenum type, GLuint coords); /* 642 */
+   void (GLAPIENTRYP TexCoordP4uiv)(GLenum type, const GLuint * coords); /* 643 */
+   void (GLAPIENTRYP VertexAttribP1ui)(GLuint index, GLenum type, GLboolean normalized, GLuint value); /* 644 */
+   void (GLAPIENTRYP VertexAttribP1uiv)(GLuint index, GLenum type, GLboolean normalized, const GLuint * value); /* 645 */
+   void (GLAPIENTRYP VertexAttribP2ui)(GLuint index, GLenum type, GLboolean normalized, GLuint value); /* 646 */
+   void (GLAPIENTRYP VertexAttribP2uiv)(GLuint index, GLenum type, GLboolean normalized, const GLuint * value); /* 647 */
+   void (GLAPIENTRYP VertexAttribP3ui)(GLuint index, GLenum type, GLboolean normalized, GLuint value); /* 648 */
+   void (GLAPIENTRYP VertexAttribP3uiv)(GLuint index, GLenum type, GLboolean normalized, const GLuint * value); /* 649 */
+   void (GLAPIENTRYP VertexAttribP4ui)(GLuint index, GLenum type, GLboolean normalized, GLuint value); /* 650 */
+   void (GLAPIENTRYP VertexAttribP4uiv)(GLuint index, GLenum type, GLboolean normalized, const GLuint * value); /* 651 */
+   void (GLAPIENTRYP VertexP2ui)(GLenum type, GLuint value); /* 652 */
+   void (GLAPIENTRYP VertexP2uiv)(GLenum type, const GLuint * value); /* 653 */
+   void (GLAPIENTRYP VertexP3ui)(GLenum type, GLuint value); /* 654 */
+   void (GLAPIENTRYP VertexP3uiv)(GLenum type, const GLuint * value); /* 655 */
+   void (GLAPIENTRYP VertexP4ui)(GLenum type, GLuint value); /* 656 */
+   void (GLAPIENTRYP VertexP4uiv)(GLenum type, const GLuint * value); /* 657 */
+   void (GLAPIENTRYP BindTransformFeedback)(GLenum target, GLuint id); /* 658 */
+   void (GLAPIENTRYP DeleteTransformFeedbacks)(GLsizei n, const GLuint * ids); /* 659 */
+   void (GLAPIENTRYP DrawTransformFeedback)(GLenum mode, GLuint id); /* 660 */
+   void (GLAPIENTRYP GenTransformFeedbacks)(GLsizei n, GLuint * ids); /* 661 */
+   GLboolean (GLAPIENTRYP IsTransformFeedback)(GLuint id); /* 662 */
+   void (GLAPIENTRYP PauseTransformFeedback)(void); /* 663 */
+   void (GLAPIENTRYP ResumeTransformFeedback)(void); /* 664 */
+   void (GLAPIENTRYP BeginQueryIndexed)(GLenum target, GLuint index, GLuint id); /* 665 */
+   void (GLAPIENTRYP DrawTransformFeedbackStream)(GLenum mode, GLuint id, GLuint stream); /* 666 */
+   void (GLAPIENTRYP EndQueryIndexed)(GLenum target, GLuint index); /* 667 */
+   void (GLAPIENTRYP GetQueryIndexediv)(GLenum target, GLuint index, GLenum pname, GLint * params); /* 668 */
+   void (GLAPIENTRYP ClearDepthf)(GLclampf depth); /* 669 */
+   void (GLAPIENTRYP DepthRangef)(GLclampf zNear, GLclampf zFar); /* 670 */
+   void (GLAPIENTRYP GetShaderPrecisionFormat)(GLenum shadertype, GLenum precisiontype, GLint * range, GLint * precision); /* 671 */
+   void (GLAPIENTRYP ReleaseShaderCompiler)(void); /* 672 */
+   void (GLAPIENTRYP ShaderBinary)(GLsizei n, const GLuint * shaders, GLenum binaryformat, const GLvoid * binary, GLsizei length); /* 673 */
+   void (GLAPIENTRYP GetProgramBinary)(GLuint program, GLsizei bufSize, GLsizei * length, GLenum * binaryFormat, GLvoid * binary); /* 674 */
+   void (GLAPIENTRYP ProgramBinary)(GLuint program, GLenum binaryFormat, const GLvoid * binary, GLsizei length); /* 675 */
+   void (GLAPIENTRYP ProgramParameteri)(GLuint program, GLenum pname, GLint value); /* 676 */
+   void (GLAPIENTRYP DebugMessageCallbackARB)(GLDEBUGPROCARB callback, const GLvoid * userParam); /* 677 */
+   void (GLAPIENTRYP DebugMessageControlARB)(GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint * ids, GLboolean enabled); /* 678 */
+   void (GLAPIENTRYP DebugMessageInsertARB)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLcharARB * buf); /* 679 */
+   GLuint (GLAPIENTRYP GetDebugMessageLogARB)(GLuint count, GLsizei bufsize, GLenum * sources, GLenum * types, GLuint * ids, GLenum * severities, GLsizei * lengths, GLcharARB * messageLog); /* 680 */
+   GLenum (GLAPIENTRYP GetGraphicsResetStatusARB)(void); /* 681 */
+   void (GLAPIENTRYP GetnColorTableARB)(GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid * table); /* 682 */
+   void (GLAPIENTRYP GetnCompressedTexImageARB)(GLenum target, GLint lod, GLsizei bufSize, GLvoid * img); /* 683 */
+   void (GLAPIENTRYP GetnConvolutionFilterARB)(GLenum target, GLenum format, GLenum type, GLsizei bufSize, GLvoid * image); /* 684 */
+   void (GLAPIENTRYP GetnHistogramARB)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid * values); /* 685 */
+   void (GLAPIENTRYP GetnMapdvARB)(GLenum target, GLenum query, GLsizei bufSize, GLdouble * v); /* 686 */
+   void (GLAPIENTRYP GetnMapfvARB)(GLenum target, GLenum query, GLsizei bufSize, GLfloat * v); /* 687 */
+   void (GLAPIENTRYP GetnMapivARB)(GLenum target, GLenum query, GLsizei bufSize, GLint * v); /* 688 */
+   void (GLAPIENTRYP GetnMinmaxARB)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLsizei bufSize, GLvoid * values); /* 689 */
+   void (GLAPIENTRYP GetnPixelMapfvARB)(GLenum map, GLsizei bufSize, GLfloat * values); /* 690 */
+   void (GLAPIENTRYP GetnPixelMapuivARB)(GLenum map, GLsizei bufSize, GLuint * values); /* 691 */
+   void (GLAPIENTRYP GetnPixelMapusvARB)(GLenum map, GLsizei bufSize, GLushort * values); /* 692 */
+   void (GLAPIENTRYP GetnPolygonStippleARB)(GLsizei bufSize, GLubyte * pattern); /* 693 */
+   void (GLAPIENTRYP GetnSeparableFilterARB)(GLenum target, GLenum format, GLenum type, GLsizei rowBufSize, GLvoid * row, GLsizei columnBufSize, GLvoid * column, GLvoid * span); /* 694 */
+   void (GLAPIENTRYP GetnTexImageARB)(GLenum target, GLint level, GLenum format, GLenum type, GLsizei bufSize, GLvoid * img); /* 695 */
+   void (GLAPIENTRYP GetnUniformdvARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLdouble * params); /* 696 */
+   void (GLAPIENTRYP GetnUniformfvARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLfloat * params); /* 697 */
+   void (GLAPIENTRYP GetnUniformivARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLint * params); /* 698 */
+   void (GLAPIENTRYP GetnUniformuivARB)(GLhandleARB program, GLint location, GLsizei bufSize, GLuint * params); /* 699 */
+   void (GLAPIENTRYP ReadnPixelsARB)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLsizei bufSize, GLvoid * data); /* 700 */
+   void (GLAPIENTRYP DrawArraysInstancedBaseInstance)(GLenum mode, GLint first, GLsizei count, GLsizei primcount, GLuint baseinstance); /* 701 */
+   void (GLAPIENTRYP DrawElementsInstancedBaseInstance)(GLenum mode, GLsizei count, GLenum type, const GLvoid * indices, GLsizei primcount, GLuint baseinstance); /* 702 */
+   void (GLAPIENTRYP DrawElementsInstancedBaseVertexBaseInstance)(GLenum mode, GLsizei count, GLenum type, const GLvoid * indices, GLsizei primcount, GLint basevertex, GLuint baseinstance); /* 703 */
+   void (GLAPIENTRYP DrawTransformFeedbackInstanced)(GLenum mode, GLuint id, GLsizei primcount); /* 704 */
+   void (GLAPIENTRYP DrawTransformFeedbackStreamInstanced)(GLenum mode, GLuint id, GLuint stream, GLsizei primcount); /* 705 */
+   void (GLAPIENTRYP TexStorage1D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width); /* 706 */
+   void (GLAPIENTRYP TexStorage2D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height); /* 707 */
+   void (GLAPIENTRYP TexStorage3D)(GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth); /* 708 */
+   void (GLAPIENTRYP TextureStorage1DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width); /* 709 */
+   void (GLAPIENTRYP TextureStorage2DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height); /* 710 */
+   void (GLAPIENTRYP TextureStorage3DEXT)(GLuint texture, GLenum target, GLsizei levels, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth); /* 711 */
+   void (GLAPIENTRYP InvalidateBufferData)(GLuint buffer); /* 712 */
+   void (GLAPIENTRYP InvalidateBufferSubData)(GLuint buffer, GLintptr offset, GLsizeiptr length); /* 713 */
+   void (GLAPIENTRYP InvalidateFramebuffer)(GLenum target, GLsizei numAttachments, const GLenum * attachments); /* 714 */
+   void (GLAPIENTRYP InvalidateSubFramebuffer)(GLenum target, GLsizei numAttachments, const GLenum * attachments, GLint x, GLint y, GLsizei width, GLsizei height); /* 715 */
+   void (GLAPIENTRYP InvalidateTexImage)(GLuint texture, GLint level); /* 716 */
+   void (GLAPIENTRYP InvalidateTexSubImage)(GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth); /* 717 */
+   void (GLAPIENTRYP PolygonOffsetEXT)(GLfloat factor, GLfloat bias); /* 718 */
+   void (GLAPIENTRYP SampleMaskSGIS)(GLclampf value, GLboolean invert); /* 719 */
+   void (GLAPIENTRYP SamplePatternSGIS)(GLenum pattern); /* 720 */
+   void (GLAPIENTRYP ColorPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 721 */
+   void (GLAPIENTRYP EdgeFlagPointerEXT)(GLsizei stride, GLsizei count, const GLboolean * pointer); /* 722 */
+   void (GLAPIENTRYP IndexPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 723 */
+   void (GLAPIENTRYP NormalPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 724 */
+   void (GLAPIENTRYP TexCoordPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 725 */
+   void (GLAPIENTRYP VertexPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid * pointer); /* 726 */
+   void (GLAPIENTRYP PointParameterfEXT)(GLenum pname, GLfloat param); /* 727 */
+   void (GLAPIENTRYP PointParameterfvEXT)(GLenum pname, const GLfloat * params); /* 728 */
+   void (GLAPIENTRYP LockArraysEXT)(GLint first, GLsizei count); /* 729 */
+   void (GLAPIENTRYP UnlockArraysEXT)(void); /* 730 */
+   void (GLAPIENTRYP SecondaryColor3bEXT)(GLbyte red, GLbyte green, GLbyte blue); /* 731 */
+   void (GLAPIENTRYP SecondaryColor3bvEXT)(const GLbyte * v); /* 732 */
+   void (GLAPIENTRYP SecondaryColor3dEXT)(GLdouble red, GLdouble green, GLdouble blue); /* 733 */
+   void (GLAPIENTRYP SecondaryColor3dvEXT)(const GLdouble * v); /* 734 */
+   void (GLAPIENTRYP SecondaryColor3fEXT)(GLfloat red, GLfloat green, GLfloat blue); /* 735 */
+   void (GLAPIENTRYP SecondaryColor3fvEXT)(const GLfloat * v); /* 736 */
+   void (GLAPIENTRYP SecondaryColor3iEXT)(GLint red, GLint green, GLint blue); /* 737 */
+   void (GLAPIENTRYP SecondaryColor3ivEXT)(const GLint * v); /* 738 */
+   void (GLAPIENTRYP SecondaryColor3sEXT)(GLshort red, GLshort green, GLshort blue); /* 739 */
+   void (GLAPIENTRYP SecondaryColor3svEXT)(const GLshort * v); /* 740 */
+   void (GLAPIENTRYP SecondaryColor3ubEXT)(GLubyte red, GLubyte green, GLubyte blue); /* 741 */
+   void (GLAPIENTRYP SecondaryColor3ubvEXT)(const GLubyte * v); /* 742 */
+   void (GLAPIENTRYP SecondaryColor3uiEXT)(GLuint red, GLuint green, GLuint blue); /* 743 */
+   void (GLAPIENTRYP SecondaryColor3uivEXT)(const GLuint * v); /* 744 */
+   void (GLAPIENTRYP SecondaryColor3usEXT)(GLushort red, GLushort green, GLushort blue); /* 745 */
+   void (GLAPIENTRYP SecondaryColor3usvEXT)(const GLushort * v); /* 746 */
+   void (GLAPIENTRYP SecondaryColorPointerEXT)(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 747 */
+   void (GLAPIENTRYP MultiDrawArraysEXT)(GLenum mode, const GLint * first, const GLsizei * count, GLsizei primcount); /* 748 */
+   void (GLAPIENTRYP MultiDrawElementsEXT)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid ** indices, GLsizei primcount); /* 749 */
+   void (GLAPIENTRYP FogCoordPointerEXT)(GLenum type, GLsizei stride, const GLvoid * pointer); /* 750 */
+   void (GLAPIENTRYP FogCoorddEXT)(GLdouble coord); /* 751 */
+   void (GLAPIENTRYP FogCoorddvEXT)(const GLdouble * coord); /* 752 */
+   void (GLAPIENTRYP FogCoordfEXT)(GLfloat coord); /* 753 */
+   void (GLAPIENTRYP FogCoordfvEXT)(const GLfloat * coord); /* 754 */
+   void (GLAPIENTRYP BlendFuncSeparateEXT)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); /* 755 */
+   void (GLAPIENTRYP ResizeBuffersMESA)(void); /* 756 */
+   void (GLAPIENTRYP WindowPos2dMESA)(GLdouble x, GLdouble y); /* 757 */
+   void (GLAPIENTRYP WindowPos2dvMESA)(const GLdouble * v); /* 758 */
+   void (GLAPIENTRYP WindowPos2fMESA)(GLfloat x, GLfloat y); /* 759 */
+   void (GLAPIENTRYP WindowPos2fvMESA)(const GLfloat * v); /* 760 */
+   void (GLAPIENTRYP WindowPos2iMESA)(GLint x, GLint y); /* 761 */
+   void (GLAPIENTRYP WindowPos2ivMESA)(const GLint * v); /* 762 */
+   void (GLAPIENTRYP WindowPos2sMESA)(GLshort x, GLshort y); /* 763 */
+   void (GLAPIENTRYP WindowPos2svMESA)(const GLshort * v); /* 764 */
+   void (GLAPIENTRYP WindowPos3dMESA)(GLdouble x, GLdouble y, GLdouble z); /* 765 */
+   void (GLAPIENTRYP WindowPos3dvMESA)(const GLdouble * v); /* 766 */
+   void (GLAPIENTRYP WindowPos3fMESA)(GLfloat x, GLfloat y, GLfloat z); /* 767 */
+   void (GLAPIENTRYP WindowPos3fvMESA)(const GLfloat * v); /* 768 */
+   void (GLAPIENTRYP WindowPos3iMESA)(GLint x, GLint y, GLint z); /* 769 */
+   void (GLAPIENTRYP WindowPos3ivMESA)(const GLint * v); /* 770 */
+   void (GLAPIENTRYP WindowPos3sMESA)(GLshort x, GLshort y, GLshort z); /* 771 */
+   void (GLAPIENTRYP WindowPos3svMESA)(const GLshort * v); /* 772 */
+   void (GLAPIENTRYP WindowPos4dMESA)(GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 773 */
+   void (GLAPIENTRYP WindowPos4dvMESA)(const GLdouble * v); /* 774 */
+   void (GLAPIENTRYP WindowPos4fMESA)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 775 */
+   void (GLAPIENTRYP WindowPos4fvMESA)(const GLfloat * v); /* 776 */
+   void (GLAPIENTRYP WindowPos4iMESA)(GLint x, GLint y, GLint z, GLint w); /* 777 */
+   void (GLAPIENTRYP WindowPos4ivMESA)(const GLint * v); /* 778 */
+   void (GLAPIENTRYP WindowPos4sMESA)(GLshort x, GLshort y, GLshort z, GLshort w); /* 779 */
+   void (GLAPIENTRYP WindowPos4svMESA)(const GLshort * v); /* 780 */
+   void (GLAPIENTRYP MultiModeDrawArraysIBM)(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride); /* 781 */
+   void (GLAPIENTRYP MultiModeDrawElementsIBM)(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride); /* 782 */
+   GLboolean (GLAPIENTRYP AreProgramsResidentNV)(GLsizei n, const GLuint * ids, GLboolean * residences); /* 783 */
+   void (GLAPIENTRYP BindProgramNV)(GLenum target, GLuint program); /* 784 */
+   void (GLAPIENTRYP DeleteProgramsNV)(GLsizei n, const GLuint * programs); /* 785 */
+   void (GLAPIENTRYP ExecuteProgramNV)(GLenum target, GLuint id, const GLfloat * params); /* 786 */
+   void (GLAPIENTRYP GenProgramsNV)(GLsizei n, GLuint * programs); /* 787 */
+   void (GLAPIENTRYP GetProgramParameterdvNV)(GLenum target, GLuint index, GLenum pname, GLdouble * params); /* 788 */
+   void (GLAPIENTRYP GetProgramParameterfvNV)(GLenum target, GLuint index, GLenum pname, GLfloat * params); /* 789 */
+   void (GLAPIENTRYP GetProgramStringNV)(GLuint id, GLenum pname, GLubyte * program); /* 790 */
+   void (GLAPIENTRYP GetProgramivNV)(GLuint id, GLenum pname, GLint * params); /* 791 */
+   void (GLAPIENTRYP GetTrackMatrixivNV)(GLenum target, GLuint address, GLenum pname, GLint * params); /* 792 */
+   void (GLAPIENTRYP GetVertexAttribPointervNV)(GLuint index, GLenum pname, GLvoid ** pointer); /* 793 */
+   void (GLAPIENTRYP GetVertexAttribdvNV)(GLuint index, GLenum pname, GLdouble * params); /* 794 */
+   void (GLAPIENTRYP GetVertexAttribfvNV)(GLuint index, GLenum pname, GLfloat * params); /* 795 */
+   void (GLAPIENTRYP GetVertexAttribivNV)(GLuint index, GLenum pname, GLint * params); /* 796 */
+   GLboolean (GLAPIENTRYP IsProgramNV)(GLuint program); /* 797 */
+   void (GLAPIENTRYP LoadProgramNV)(GLenum target, GLuint id, GLsizei len, const GLubyte * program); /* 798 */
+   void (GLAPIENTRYP ProgramParameters4dvNV)(GLenum target, GLuint index, GLsizei num, const GLdouble * params); /* 799 */
+   void (GLAPIENTRYP ProgramParameters4fvNV)(GLenum target, GLuint index, GLsizei num, const GLfloat * params); /* 800 */
+   void (GLAPIENTRYP RequestResidentProgramsNV)(GLsizei n, const GLuint * ids); /* 801 */
+   void (GLAPIENTRYP TrackMatrixNV)(GLenum target, GLuint address, GLenum matrix, GLenum transform); /* 802 */
+   void (GLAPIENTRYP VertexAttrib1dNV)(GLuint index, GLdouble x); /* 803 */
+   void (GLAPIENTRYP VertexAttrib1dvNV)(GLuint index, const GLdouble * v); /* 804 */
+   void (GLAPIENTRYP VertexAttrib1fNV)(GLuint index, GLfloat x); /* 805 */
+   void (GLAPIENTRYP VertexAttrib1fvNV)(GLuint index, const GLfloat * v); /* 806 */
+   void (GLAPIENTRYP VertexAttrib1sNV)(GLuint index, GLshort x); /* 807 */
+   void (GLAPIENTRYP VertexAttrib1svNV)(GLuint index, const GLshort * v); /* 808 */
+   void (GLAPIENTRYP VertexAttrib2dNV)(GLuint index, GLdouble x, GLdouble y); /* 809 */
+   void (GLAPIENTRYP VertexAttrib2dvNV)(GLuint index, const GLdouble * v); /* 810 */
+   void (GLAPIENTRYP VertexAttrib2fNV)(GLuint index, GLfloat x, GLfloat y); /* 811 */
+   void (GLAPIENTRYP VertexAttrib2fvNV)(GLuint index, const GLfloat * v); /* 812 */
+   void (GLAPIENTRYP VertexAttrib2sNV)(GLuint index, GLshort x, GLshort y); /* 813 */
+   void (GLAPIENTRYP VertexAttrib2svNV)(GLuint index, const GLshort * v); /* 814 */
+   void (GLAPIENTRYP VertexAttrib3dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z); /* 815 */
+   void (GLAPIENTRYP VertexAttrib3dvNV)(GLuint index, const GLdouble * v); /* 816 */
+   void (GLAPIENTRYP VertexAttrib3fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z); /* 817 */
+   void (GLAPIENTRYP VertexAttrib3fvNV)(GLuint index, const GLfloat * v); /* 818 */
+   void (GLAPIENTRYP VertexAttrib3sNV)(GLuint index, GLshort x, GLshort y, GLshort z); /* 819 */
+   void (GLAPIENTRYP VertexAttrib3svNV)(GLuint index, const GLshort * v); /* 820 */
+   void (GLAPIENTRYP VertexAttrib4dNV)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 821 */
+   void (GLAPIENTRYP VertexAttrib4dvNV)(GLuint index, const GLdouble * v); /* 822 */
+   void (GLAPIENTRYP VertexAttrib4fNV)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 823 */
+   void (GLAPIENTRYP VertexAttrib4fvNV)(GLuint index, const GLfloat * v); /* 824 */
+   void (GLAPIENTRYP VertexAttrib4sNV)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); /* 825 */
+   void (GLAPIENTRYP VertexAttrib4svNV)(GLuint index, const GLshort * v); /* 826 */
+   void (GLAPIENTRYP VertexAttrib4ubNV)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); /* 827 */
+   void (GLAPIENTRYP VertexAttrib4ubvNV)(GLuint index, const GLubyte * v); /* 828 */
+   void (GLAPIENTRYP VertexAttribPointerNV)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 829 */
+   void (GLAPIENTRYP VertexAttribs1dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 830 */
+   void (GLAPIENTRYP VertexAttribs1fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 831 */
+   void (GLAPIENTRYP VertexAttribs1svNV)(GLuint index, GLsizei n, const GLshort * v); /* 832 */
+   void (GLAPIENTRYP VertexAttribs2dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 833 */
+   void (GLAPIENTRYP VertexAttribs2fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 834 */
+   void (GLAPIENTRYP VertexAttribs2svNV)(GLuint index, GLsizei n, const GLshort * v); /* 835 */
+   void (GLAPIENTRYP VertexAttribs3dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 836 */
+   void (GLAPIENTRYP VertexAttribs3fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 837 */
+   void (GLAPIENTRYP VertexAttribs3svNV)(GLuint index, GLsizei n, const GLshort * v); /* 838 */
+   void (GLAPIENTRYP VertexAttribs4dvNV)(GLuint index, GLsizei n, const GLdouble * v); /* 839 */
+   void (GLAPIENTRYP VertexAttribs4fvNV)(GLuint index, GLsizei n, const GLfloat * v); /* 840 */
+   void (GLAPIENTRYP VertexAttribs4svNV)(GLuint index, GLsizei n, const GLshort * v); /* 841 */
+   void (GLAPIENTRYP VertexAttribs4ubvNV)(GLuint index, GLsizei n, const GLubyte * v); /* 842 */
+   void (GLAPIENTRYP GetTexBumpParameterfvATI)(GLenum pname, GLfloat * param); /* 843 */
+   void (GLAPIENTRYP GetTexBumpParameterivATI)(GLenum pname, GLint * param); /* 844 */
+   void (GLAPIENTRYP TexBumpParameterfvATI)(GLenum pname, const GLfloat * param); /* 845 */
+   void (GLAPIENTRYP TexBumpParameterivATI)(GLenum pname, const GLint * param); /* 846 */
+   void (GLAPIENTRYP AlphaFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 847 */
+   void (GLAPIENTRYP AlphaFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 848 */
+   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); /* 849 */
+   void (GLAPIENTRYP BeginFragmentShaderATI)(void); /* 850 */
+   void (GLAPIENTRYP BindFragmentShaderATI)(GLuint id); /* 851 */
+   void (GLAPIENTRYP ColorFragmentOp1ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); /* 852 */
+   void (GLAPIENTRYP ColorFragmentOp2ATI)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); /* 853 */
+   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); /* 854 */
+   void (GLAPIENTRYP DeleteFragmentShaderATI)(GLuint id); /* 855 */
+   void (GLAPIENTRYP EndFragmentShaderATI)(void); /* 856 */
+   GLuint (GLAPIENTRYP GenFragmentShadersATI)(GLuint range); /* 857 */
+   void (GLAPIENTRYP PassTexCoordATI)(GLuint dst, GLuint coord, GLenum swizzle); /* 858 */
+   void (GLAPIENTRYP SampleMapATI)(GLuint dst, GLuint interp, GLenum swizzle); /* 859 */
+   void (GLAPIENTRYP SetFragmentShaderConstantATI)(GLuint dst, const GLfloat * value); /* 860 */
+   void (GLAPIENTRYP PointParameteriNV)(GLenum pname, GLint param); /* 861 */
+   void (GLAPIENTRYP PointParameterivNV)(GLenum pname, const GLint * params); /* 862 */
+   void (GLAPIENTRYP ActiveStencilFaceEXT)(GLenum face); /* 863 */
+   void (GLAPIENTRYP BindVertexArrayAPPLE)(GLuint array); /* 864 */
+   void (GLAPIENTRYP DeleteVertexArraysAPPLE)(GLsizei n, const GLuint * arrays); /* 865 */
+   void (GLAPIENTRYP GenVertexArraysAPPLE)(GLsizei n, GLuint * arrays); /* 866 */
+   GLboolean (GLAPIENTRYP IsVertexArrayAPPLE)(GLuint array); /* 867 */
+   void (GLAPIENTRYP GetProgramNamedParameterdvNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble * params); /* 868 */
+   void (GLAPIENTRYP GetProgramNamedParameterfvNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat * params); /* 869 */
+   void (GLAPIENTRYP ProgramNamedParameter4dNV)(GLuint id, GLsizei len, const GLubyte * name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); /* 870 */
+   void (GLAPIENTRYP ProgramNamedParameter4dvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLdouble * v); /* 871 */
+   void (GLAPIENTRYP ProgramNamedParameter4fNV)(GLuint id, GLsizei len, const GLubyte * name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); /* 872 */
+   void (GLAPIENTRYP ProgramNamedParameter4fvNV)(GLuint id, GLsizei len, const GLubyte * name, const GLfloat * v); /* 873 */
+   void (GLAPIENTRYP PrimitiveRestartIndexNV)(GLuint index); /* 874 */
+   void (GLAPIENTRYP PrimitiveRestartNV)(void); /* 875 */
+   void (GLAPIENTRYP DepthBoundsEXT)(GLclampd zmin, GLclampd zmax); /* 876 */
+   void (GLAPIENTRYP BlendEquationSeparateEXT)(GLenum modeRGB, GLenum modeA); /* 877 */
+   void (GLAPIENTRYP BindFramebufferEXT)(GLenum target, GLuint framebuffer); /* 878 */
+   void (GLAPIENTRYP BindRenderbufferEXT)(GLenum target, GLuint renderbuffer); /* 879 */
+   GLenum (GLAPIENTRYP CheckFramebufferStatusEXT)(GLenum target); /* 880 */
+   void (GLAPIENTRYP DeleteFramebuffersEXT)(GLsizei n, const GLuint * framebuffers); /* 881 */
+   void (GLAPIENTRYP DeleteRenderbuffersEXT)(GLsizei n, const GLuint * renderbuffers); /* 882 */
+   void (GLAPIENTRYP FramebufferRenderbufferEXT)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); /* 883 */
+   void (GLAPIENTRYP FramebufferTexture1DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 884 */
+   void (GLAPIENTRYP FramebufferTexture2DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); /* 885 */
+   void (GLAPIENTRYP FramebufferTexture3DEXT)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); /* 886 */
+   void (GLAPIENTRYP GenFramebuffersEXT)(GLsizei n, GLuint * framebuffers); /* 887 */
+   void (GLAPIENTRYP GenRenderbuffersEXT)(GLsizei n, GLuint * renderbuffers); /* 888 */
+   void (GLAPIENTRYP GenerateMipmapEXT)(GLenum target); /* 889 */
+   void (GLAPIENTRYP GetFramebufferAttachmentParameterivEXT)(GLenum target, GLenum attachment, GLenum pname, GLint * params); /* 890 */
+   void (GLAPIENTRYP GetRenderbufferParameterivEXT)(GLenum target, GLenum pname, GLint * params); /* 891 */
+   GLboolean (GLAPIENTRYP IsFramebufferEXT)(GLuint framebuffer); /* 892 */
+   GLboolean (GLAPIENTRYP IsRenderbufferEXT)(GLuint renderbuffer); /* 893 */
+   void (GLAPIENTRYP RenderbufferStorageEXT)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height); /* 894 */
+   void (GLAPIENTRYP BlitFramebufferEXT)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); /* 895 */
+   void (GLAPIENTRYP BufferParameteriAPPLE)(GLenum target, GLenum pname, GLint param); /* 896 */
+   void (GLAPIENTRYP FlushMappedBufferRangeAPPLE)(GLenum target, GLintptr offset, GLsizeiptr size); /* 897 */
+   void (GLAPIENTRYP BindFragDataLocationEXT)(GLuint program, GLuint colorNumber, const GLchar * name); /* 898 */
+   GLint (GLAPIENTRYP GetFragDataLocationEXT)(GLuint program, const GLchar * name); /* 899 */
+   void (GLAPIENTRYP GetUniformuivEXT)(GLuint program, GLint location, GLuint * params); /* 900 */
+   void (GLAPIENTRYP GetVertexAttribIivEXT)(GLuint index, GLenum pname, GLint * params); /* 901 */
+   void (GLAPIENTRYP GetVertexAttribIuivEXT)(GLuint index, GLenum pname, GLuint * params); /* 902 */
+   void (GLAPIENTRYP Uniform1uiEXT)(GLint location, GLuint x); /* 903 */
+   void (GLAPIENTRYP Uniform1uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 904 */
+   void (GLAPIENTRYP Uniform2uiEXT)(GLint location, GLuint x, GLuint y); /* 905 */
+   void (GLAPIENTRYP Uniform2uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 906 */
+   void (GLAPIENTRYP Uniform3uiEXT)(GLint location, GLuint x, GLuint y, GLuint z); /* 907 */
+   void (GLAPIENTRYP Uniform3uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 908 */
+   void (GLAPIENTRYP Uniform4uiEXT)(GLint location, GLuint x, GLuint y, GLuint z, GLuint w); /* 909 */
+   void (GLAPIENTRYP Uniform4uivEXT)(GLint location, GLsizei count, const GLuint * value); /* 910 */
+   void (GLAPIENTRYP VertexAttribI1iEXT)(GLuint index, GLint x); /* 911 */
+   void (GLAPIENTRYP VertexAttribI1ivEXT)(GLuint index, const GLint * v); /* 912 */
+   void (GLAPIENTRYP VertexAttribI1uiEXT)(GLuint index, GLuint x); /* 913 */
+   void (GLAPIENTRYP VertexAttribI1uivEXT)(GLuint index, const GLuint * v); /* 914 */
+   void (GLAPIENTRYP VertexAttribI2iEXT)(GLuint index, GLint x, GLint y); /* 915 */
+   void (GLAPIENTRYP VertexAttribI2ivEXT)(GLuint index, const GLint * v); /* 916 */
+   void (GLAPIENTRYP VertexAttribI2uiEXT)(GLuint index, GLuint x, GLuint y); /* 917 */
+   void (GLAPIENTRYP VertexAttribI2uivEXT)(GLuint index, const GLuint * v); /* 918 */
+   void (GLAPIENTRYP VertexAttribI3iEXT)(GLuint index, GLint x, GLint y, GLint z); /* 919 */
+   void (GLAPIENTRYP VertexAttribI3ivEXT)(GLuint index, const GLint * v); /* 920 */
+   void (GLAPIENTRYP VertexAttribI3uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z); /* 921 */
+   void (GLAPIENTRYP VertexAttribI3uivEXT)(GLuint index, const GLuint * v); /* 922 */
+   void (GLAPIENTRYP VertexAttribI4bvEXT)(GLuint index, const GLbyte * v); /* 923 */
+   void (GLAPIENTRYP VertexAttribI4iEXT)(GLuint index, GLint x, GLint y, GLint z, GLint w); /* 924 */
+   void (GLAPIENTRYP VertexAttribI4ivEXT)(GLuint index, const GLint * v); /* 925 */
+   void (GLAPIENTRYP VertexAttribI4svEXT)(GLuint index, const GLshort * v); /* 926 */
+   void (GLAPIENTRYP VertexAttribI4ubvEXT)(GLuint index, const GLubyte * v); /* 927 */
+   void (GLAPIENTRYP VertexAttribI4uiEXT)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); /* 928 */
+   void (GLAPIENTRYP VertexAttribI4uivEXT)(GLuint index, const GLuint * v); /* 929 */
+   void (GLAPIENTRYP VertexAttribI4usvEXT)(GLuint index, const GLushort * v); /* 930 */
+   void (GLAPIENTRYP VertexAttribIPointerEXT)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid * pointer); /* 931 */
+   void (GLAPIENTRYP FramebufferTextureLayerEXT)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); /* 932 */
+   void (GLAPIENTRYP ColorMaskIndexedEXT)(GLuint buf, GLboolean r, GLboolean g, GLboolean b, GLboolean a); /* 933 */
+   void (GLAPIENTRYP DisableIndexedEXT)(GLenum target, GLuint index); /* 934 */
+   void (GLAPIENTRYP EnableIndexedEXT)(GLenum target, GLuint index); /* 935 */
+   void (GLAPIENTRYP GetBooleanIndexedvEXT)(GLenum value, GLuint index, GLboolean * data); /* 936 */
+   void (GLAPIENTRYP GetIntegerIndexedvEXT)(GLenum value, GLuint index, GLint * data); /* 937 */
+   GLboolean (GLAPIENTRYP IsEnabledIndexedEXT)(GLenum target, GLuint index); /* 938 */
+   void (GLAPIENTRYP ClearColorIiEXT)(GLint r, GLint g, GLint b, GLint a); /* 939 */
+   void (GLAPIENTRYP ClearColorIuiEXT)(GLuint r, GLuint g, GLuint b, GLuint a); /* 940 */
+   void (GLAPIENTRYP GetTexParameterIivEXT)(GLenum target, GLenum pname, GLint * params); /* 941 */
+   void (GLAPIENTRYP GetTexParameterIuivEXT)(GLenum target, GLenum pname, GLuint * params); /* 942 */
+   void (GLAPIENTRYP TexParameterIivEXT)(GLenum target, GLenum pname, const GLint * params); /* 943 */
+   void (GLAPIENTRYP TexParameterIuivEXT)(GLenum target, GLenum pname, const GLuint * params); /* 944 */
+   void (GLAPIENTRYP BeginConditionalRenderNV)(GLuint query, GLenum mode); /* 945 */
+   void (GLAPIENTRYP EndConditionalRenderNV)(void); /* 946 */
+   void (GLAPIENTRYP BeginTransformFeedbackEXT)(GLenum mode); /* 947 */
+   void (GLAPIENTRYP BindBufferBaseEXT)(GLenum target, GLuint index, GLuint buffer); /* 948 */
+   void (GLAPIENTRYP BindBufferOffsetEXT)(GLenum target, GLuint index, GLuint buffer, GLintptr offset); /* 949 */
+   void (GLAPIENTRYP BindBufferRangeEXT)(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); /* 950 */
+   void (GLAPIENTRYP EndTransformFeedbackEXT)(void); /* 951 */
+   void (GLAPIENTRYP GetTransformFeedbackVaryingEXT)(GLuint program, GLuint index, GLsizei bufSize, GLsizei * length, GLsizei * size, GLenum * type, GLchar * name); /* 952 */
+   void (GLAPIENTRYP TransformFeedbackVaryingsEXT)(GLuint program, GLsizei count, const char ** varyings, GLenum bufferMode); /* 953 */
+   void (GLAPIENTRYP ProvokingVertexEXT)(GLenum mode); /* 954 */
+   void (GLAPIENTRYP GetObjectParameterivAPPLE)(GLenum objectType, GLuint name, GLenum pname, GLint * value); /* 955 */
+   GLenum (GLAPIENTRYP ObjectPurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 956 */
+   GLenum (GLAPIENTRYP ObjectUnpurgeableAPPLE)(GLenum objectType, GLuint name, GLenum option); /* 957 */
+   void (GLAPIENTRYP ActiveProgramEXT)(GLuint program); /* 958 */
+   GLuint (GLAPIENTRYP CreateShaderProgramEXT)(GLenum type, const GLchar * string); /* 959 */
+   void (GLAPIENTRYP UseShaderProgramEXT)(GLenum type, GLuint program); /* 960 */
+   void (GLAPIENTRYP TextureBarrierNV)(void); /* 961 */
+   void (GLAPIENTRYP StencilFuncSeparateATI)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); /* 962 */
+   void (GLAPIENTRYP ProgramEnvParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 963 */
+   void (GLAPIENTRYP ProgramLocalParameters4fvEXT)(GLenum target, GLuint index, GLsizei count, const GLfloat * params); /* 964 */
+   void (GLAPIENTRYP GetQueryObjecti64vEXT)(GLuint id, GLenum pname, GLint64EXT * params); /* 965 */
+   void (GLAPIENTRYP GetQueryObjectui64vEXT)(GLuint id, GLenum pname, GLuint64EXT * params); /* 966 */
+   void (GLAPIENTRYP EGLImageTargetRenderbufferStorageOES)(GLenum target, GLvoid * writeOffset); /* 967 */
+   void (GLAPIENTRYP EGLImageTargetTexture2DOES)(GLenum target, GLvoid * writeOffset); /* 968 */
 #endif /* !defined HAVE_SHARED_GLAPI */
 };
 
diff --git a/xorg-server/glx/glprocs.h b/xorg-server/glx/glprocs.h
index a448a4a37..33f5b1282 100644
--- a/xorg-server/glx/glprocs.h
+++ b/xorg-server/glx/glprocs.h
@@ -482,7 +482,6 @@ static const char gl_string_table[] =
     "glUniformMatrix3x4fv\0"
     "glUniformMatrix4x2fv\0"
     "glUniformMatrix4x3fv\0"
-    "glClampColor\0"
     "glClearBufferfi\0"
     "glClearBufferfv\0"
     "glClearBufferiv\0"
@@ -491,7 +490,6 @@ static const char gl_string_table[] =
     "glFramebufferTexture\0"
     "glGetBufferParameteri64v\0"
     "glGetInteger64i_v\0"
-    "glVertexAttribDivisor\0"
     "glLoadTransposeMatrixdARB\0"
     "glLoadTransposeMatrixfARB\0"
     "glMultTransposeMatrixdARB\0"
@@ -627,9 +625,7 @@ static const char gl_string_table[] =
     "glDrawArraysInstancedARB\0"
     "glDrawElementsInstancedARB\0"
     "glRenderbufferStorageMultisample\0"
-    "glFramebufferTextureARB\0"
     "glFramebufferTextureFaceARB\0"
-    "glProgramParameteriARB\0"
     "glVertexAttribDivisorARB\0"
     "glFlushMappedBufferRange\0"
     "glMapBufferRange\0"
@@ -730,6 +726,9 @@ static const char gl_string_table[] =
     "glGetShaderPrecisionFormat\0"
     "glReleaseShaderCompiler\0"
     "glShaderBinary\0"
+    "glGetProgramBinary\0"
+    "glProgramBinary\0"
+    "glProgramParameteri\0"
     "glDebugMessageCallbackARB\0"
     "glDebugMessageControlARB\0"
     "glDebugMessageInsertARB\0"
@@ -1114,6 +1113,7 @@ static const char gl_string_table[] =
     "glMultiTexCoord4s\0"
     "glMultiTexCoord4sv\0"
     "glStencilOpSeparateATI\0"
+    "glFramebufferTextureARB\0"
     "glLoadTransposeMatrixd\0"
     "glLoadTransposeMatrixf\0"
     "glMultTransposeMatrixd\0"
@@ -1225,16 +1225,19 @@ static const char gl_string_table[] =
     "glGetAttribLocation\0"
     "glDrawBuffers\0"
     "glDrawBuffersATI\0"
+    "glClampColor\0"
     "glDrawArraysInstancedEXT\0"
     "glDrawArraysInstanced\0"
     "glDrawElementsInstancedEXT\0"
     "glDrawElementsInstanced\0"
     "glRenderbufferStorageMultisampleEXT\0"
+    "glVertexAttribDivisor\0"
     "glTexBuffer\0"
     "glBlendEquationSeparateIndexedAMD\0"
     "glBlendEquationIndexedAMD\0"
     "glBlendFuncSeparateIndexedAMD\0"
     "glBlendFuncIndexedAMD\0"
+    "glProgramParameteriARB\0"
     "glSampleMaskEXT\0"
     "glSamplePatternEXT\0"
     "glPointParameterf\0"
@@ -1406,26 +1409,29 @@ 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_623 mgl_dispatch_stub_623
+#define gl_dispatch_stub_619 mgl_dispatch_stub_619
+#define gl_dispatch_stub_674 mgl_dispatch_stub_674
+#define gl_dispatch_stub_675 mgl_dispatch_stub_675
+#define gl_dispatch_stub_676 mgl_dispatch_stub_676
+#define gl_dispatch_stub_719 mgl_dispatch_stub_719
 #define gl_dispatch_stub_720 mgl_dispatch_stub_720
-#define gl_dispatch_stub_721 mgl_dispatch_stub_721
+#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_863 mgl_dispatch_stub_863
 #define gl_dispatch_stub_864 mgl_dispatch_stub_864
 #define gl_dispatch_stub_865 mgl_dispatch_stub_865
 #define gl_dispatch_stub_866 mgl_dispatch_stub_866
 #define gl_dispatch_stub_867 mgl_dispatch_stub_867
-#define gl_dispatch_stub_868 mgl_dispatch_stub_868
+#define gl_dispatch_stub_876 mgl_dispatch_stub_876
 #define gl_dispatch_stub_877 mgl_dispatch_stub_877
-#define gl_dispatch_stub_878 mgl_dispatch_stub_878
+#define gl_dispatch_stub_895 mgl_dispatch_stub_895
 #define gl_dispatch_stub_896 mgl_dispatch_stub_896
 #define gl_dispatch_stub_897 mgl_dispatch_stub_897
-#define gl_dispatch_stub_898 mgl_dispatch_stub_898
+#define gl_dispatch_stub_962 mgl_dispatch_stub_962
 #define gl_dispatch_stub_963 mgl_dispatch_stub_963
 #define gl_dispatch_stub_964 mgl_dispatch_stub_964
 #define gl_dispatch_stub_965 mgl_dispatch_stub_965
 #define gl_dispatch_stub_966 mgl_dispatch_stub_966
-#define gl_dispatch_stub_967 mgl_dispatch_stub_967
 #endif /* USE_MGL_NAMESPACE */
 
 
@@ -1443,26 +1449,29 @@ 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_623(GLuint id, GLenum target);
-void GLAPIENTRY gl_dispatch_stub_720(GLclampf value, GLboolean invert);
-void GLAPIENTRY gl_dispatch_stub_721(GLenum pattern);
-void GLAPIENTRY gl_dispatch_stub_782(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
-void GLAPIENTRY gl_dispatch_stub_783(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
-void GLAPIENTRY gl_dispatch_stub_864(GLenum face);
-void GLAPIENTRY gl_dispatch_stub_865(GLuint array);
-void GLAPIENTRY gl_dispatch_stub_866(GLsizei n, const GLuint * arrays);
-void GLAPIENTRY gl_dispatch_stub_867(GLsizei n, GLuint * arrays);
-GLboolean GLAPIENTRY gl_dispatch_stub_868(GLuint array);
-void GLAPIENTRY gl_dispatch_stub_877(GLclampd zmin, GLclampd zmax);
-void GLAPIENTRY gl_dispatch_stub_878(GLenum modeRGB, GLenum modeA);
-void GLAPIENTRY gl_dispatch_stub_896(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_897(GLenum target, GLenum pname, GLint param);
-void GLAPIENTRY gl_dispatch_stub_898(GLenum target, GLintptr offset, GLsizeiptr size);
-void GLAPIENTRY gl_dispatch_stub_963(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+void GLAPIENTRY gl_dispatch_stub_619(GLuint id, GLenum target);
+void GLAPIENTRY gl_dispatch_stub_674(GLuint program, GLsizei bufSize, GLsizei * length, GLenum * binaryFormat, GLvoid * binary);
+void GLAPIENTRY gl_dispatch_stub_675(GLuint program, GLenum binaryFormat, const GLvoid * binary, GLsizei length);
+void GLAPIENTRY gl_dispatch_stub_676(GLuint program, GLenum pname, GLint value);
+void GLAPIENTRY gl_dispatch_stub_719(GLclampf value, GLboolean invert);
+void GLAPIENTRY gl_dispatch_stub_720(GLenum pattern);
+void GLAPIENTRY gl_dispatch_stub_781(const GLenum * mode, const GLint * first, const GLsizei * count, GLsizei primcount, GLint modestride);
+void GLAPIENTRY gl_dispatch_stub_782(const GLenum * mode, const GLsizei * count, GLenum type, const GLvoid * const * indices, GLsizei primcount, GLint modestride);
+void GLAPIENTRY gl_dispatch_stub_863(GLenum face);
+void GLAPIENTRY gl_dispatch_stub_864(GLuint array);
+void GLAPIENTRY gl_dispatch_stub_865(GLsizei n, const GLuint * arrays);
+void GLAPIENTRY gl_dispatch_stub_866(GLsizei n, GLuint * arrays);
+GLboolean GLAPIENTRY gl_dispatch_stub_867(GLuint array);
+void GLAPIENTRY gl_dispatch_stub_876(GLclampd zmin, GLclampd zmax);
+void GLAPIENTRY gl_dispatch_stub_877(GLenum modeRGB, GLenum modeA);
+void GLAPIENTRY gl_dispatch_stub_895(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_896(GLenum target, GLenum pname, GLint param);
+void GLAPIENTRY gl_dispatch_stub_897(GLenum target, GLintptr offset, GLsizeiptr size);
+void GLAPIENTRY gl_dispatch_stub_962(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask);
+void GLAPIENTRY gl_dispatch_stub_963(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
 void GLAPIENTRY gl_dispatch_stub_964(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_965(GLenum target, GLuint index, GLsizei count, const GLfloat * params);
-void GLAPIENTRY gl_dispatch_stub_966(GLuint id, GLenum pname, GLint64EXT * params);
-void GLAPIENTRY gl_dispatch_stub_967(GLuint id, GLenum pname, GLuint64EXT * params);
+void GLAPIENTRY gl_dispatch_stub_965(GLuint id, GLenum pname, GLint64EXT * params);
+void GLAPIENTRY gl_dispatch_stub_966(GLuint id, GLenum pname, GLuint64EXT * params);
 #endif /* defined(NEED_FUNCTION_POINTER) || defined(GLX_INDIRECT_RENDERING) */
 
 static const glprocs_table_t static_functions[] = {
@@ -1896,913 +1905,916 @@ static const glprocs_table_t static_functions[] = {
     NAME_FUNC_OFFSET( 6100, glUniformMatrix3x4fv, glUniformMatrix3x4fv, NULL, 427),
     NAME_FUNC_OFFSET( 6121, glUniformMatrix4x2fv, glUniformMatrix4x2fv, NULL, 428),
     NAME_FUNC_OFFSET( 6142, glUniformMatrix4x3fv, glUniformMatrix4x3fv, NULL, 429),
-    NAME_FUNC_OFFSET( 6163, glClampColor, glClampColor, NULL, 430),
-    NAME_FUNC_OFFSET( 6176, glClearBufferfi, glClearBufferfi, NULL, 431),
-    NAME_FUNC_OFFSET( 6192, glClearBufferfv, glClearBufferfv, NULL, 432),
-    NAME_FUNC_OFFSET( 6208, glClearBufferiv, glClearBufferiv, NULL, 433),
-    NAME_FUNC_OFFSET( 6224, glClearBufferuiv, glClearBufferuiv, NULL, 434),
-    NAME_FUNC_OFFSET( 6241, glGetStringi, glGetStringi, NULL, 435),
-    NAME_FUNC_OFFSET( 6254, glFramebufferTexture, glFramebufferTexture, NULL, 436),
-    NAME_FUNC_OFFSET( 6275, glGetBufferParameteri64v, glGetBufferParameteri64v, NULL, 437),
-    NAME_FUNC_OFFSET( 6300, glGetInteger64i_v, glGetInteger64i_v, NULL, 438),
-    NAME_FUNC_OFFSET( 6318, glVertexAttribDivisor, glVertexAttribDivisor, NULL, 439),
-    NAME_FUNC_OFFSET( 6340, glLoadTransposeMatrixdARB, glLoadTransposeMatrixdARB, NULL, 440),
-    NAME_FUNC_OFFSET( 6366, glLoadTransposeMatrixfARB, glLoadTransposeMatrixfARB, NULL, 441),
-    NAME_FUNC_OFFSET( 6392, glMultTransposeMatrixdARB, glMultTransposeMatrixdARB, NULL, 442),
-    NAME_FUNC_OFFSET( 6418, glMultTransposeMatrixfARB, glMultTransposeMatrixfARB, NULL, 443),
-    NAME_FUNC_OFFSET( 6444, glSampleCoverageARB, glSampleCoverageARB, NULL, 444),
-    NAME_FUNC_OFFSET( 6464, glCompressedTexImage1DARB, glCompressedTexImage1DARB, NULL, 445),
-    NAME_FUNC_OFFSET( 6490, glCompressedTexImage2DARB, glCompressedTexImage2DARB, NULL, 446),
-    NAME_FUNC_OFFSET( 6516, glCompressedTexImage3DARB, glCompressedTexImage3DARB, NULL, 447),
-    NAME_FUNC_OFFSET( 6542, glCompressedTexSubImage1DARB, glCompressedTexSubImage1DARB, NULL, 448),
-    NAME_FUNC_OFFSET( 6571, glCompressedTexSubImage2DARB, glCompressedTexSubImage2DARB, NULL, 449),
-    NAME_FUNC_OFFSET( 6600, glCompressedTexSubImage3DARB, glCompressedTexSubImage3DARB, NULL, 450),
-    NAME_FUNC_OFFSET( 6629, glGetCompressedTexImageARB, glGetCompressedTexImageARB, NULL, 451),
-    NAME_FUNC_OFFSET( 6656, glDisableVertexAttribArrayARB, glDisableVertexAttribArrayARB, NULL, 452),
-    NAME_FUNC_OFFSET( 6686, glEnableVertexAttribArrayARB, glEnableVertexAttribArrayARB, NULL, 453),
-    NAME_FUNC_OFFSET( 6715, glGetProgramEnvParameterdvARB, glGetProgramEnvParameterdvARB, NULL, 454),
-    NAME_FUNC_OFFSET( 6745, glGetProgramEnvParameterfvARB, glGetProgramEnvParameterfvARB, NULL, 455),
-    NAME_FUNC_OFFSET( 6775, glGetProgramLocalParameterdvARB, glGetProgramLocalParameterdvARB, NULL, 456),
-    NAME_FUNC_OFFSET( 6807, glGetProgramLocalParameterfvARB, glGetProgramLocalParameterfvARB, NULL, 457),
-    NAME_FUNC_OFFSET( 6839, glGetProgramStringARB, glGetProgramStringARB, NULL, 458),
-    NAME_FUNC_OFFSET( 6861, glGetProgramivARB, glGetProgramivARB, NULL, 459),
-    NAME_FUNC_OFFSET( 6879, glGetVertexAttribdvARB, glGetVertexAttribdvARB, NULL, 460),
-    NAME_FUNC_OFFSET( 6902, glGetVertexAttribfvARB, glGetVertexAttribfvARB, NULL, 461),
-    NAME_FUNC_OFFSET( 6925, glGetVertexAttribivARB, glGetVertexAttribivARB, NULL, 462),
-    NAME_FUNC_OFFSET( 6948, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, 463),
-    NAME_FUNC_OFFSET( 6975, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, 464),
-    NAME_FUNC_OFFSET( 7003, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, 465),
-    NAME_FUNC_OFFSET( 7030, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, 466),
-    NAME_FUNC_OFFSET( 7058, glProgramLocalParameter4dARB, glProgramLocalParameter4dARB, NULL, 467),
-    NAME_FUNC_OFFSET( 7087, glProgramLocalParameter4dvARB, glProgramLocalParameter4dvARB, NULL, 468),
-    NAME_FUNC_OFFSET( 7117, glProgramLocalParameter4fARB, glProgramLocalParameter4fARB, NULL, 469),
-    NAME_FUNC_OFFSET( 7146, glProgramLocalParameter4fvARB, glProgramLocalParameter4fvARB, NULL, 470),
-    NAME_FUNC_OFFSET( 7176, glProgramStringARB, glProgramStringARB, NULL, 471),
-    NAME_FUNC_OFFSET( 7195, glVertexAttrib1dARB, glVertexAttrib1dARB, NULL, 472),
-    NAME_FUNC_OFFSET( 7215, glVertexAttrib1dvARB, glVertexAttrib1dvARB, NULL, 473),
-    NAME_FUNC_OFFSET( 7236, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, 474),
-    NAME_FUNC_OFFSET( 7256, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, 475),
-    NAME_FUNC_OFFSET( 7277, glVertexAttrib1sARB, glVertexAttrib1sARB, NULL, 476),
-    NAME_FUNC_OFFSET( 7297, glVertexAttrib1svARB, glVertexAttrib1svARB, NULL, 477),
-    NAME_FUNC_OFFSET( 7318, glVertexAttrib2dARB, glVertexAttrib2dARB, NULL, 478),
-    NAME_FUNC_OFFSET( 7338, glVertexAttrib2dvARB, glVertexAttrib2dvARB, NULL, 479),
-    NAME_FUNC_OFFSET( 7359, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, 480),
-    NAME_FUNC_OFFSET( 7379, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, 481),
-    NAME_FUNC_OFFSET( 7400, glVertexAttrib2sARB, glVertexAttrib2sARB, NULL, 482),
-    NAME_FUNC_OFFSET( 7420, glVertexAttrib2svARB, glVertexAttrib2svARB, NULL, 483),
-    NAME_FUNC_OFFSET( 7441, glVertexAttrib3dARB, glVertexAttrib3dARB, NULL, 484),
-    NAME_FUNC_OFFSET( 7461, glVertexAttrib3dvARB, glVertexAttrib3dvARB, NULL, 485),
-    NAME_FUNC_OFFSET( 7482, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, 486),
-    NAME_FUNC_OFFSET( 7502, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, 487),
-    NAME_FUNC_OFFSET( 7523, glVertexAttrib3sARB, glVertexAttrib3sARB, NULL, 488),
-    NAME_FUNC_OFFSET( 7543, glVertexAttrib3svARB, glVertexAttrib3svARB, NULL, 489),
-    NAME_FUNC_OFFSET( 7564, glVertexAttrib4NbvARB, glVertexAttrib4NbvARB, NULL, 490),
-    NAME_FUNC_OFFSET( 7586, glVertexAttrib4NivARB, glVertexAttrib4NivARB, NULL, 491),
-    NAME_FUNC_OFFSET( 7608, glVertexAttrib4NsvARB, glVertexAttrib4NsvARB, NULL, 492),
-    NAME_FUNC_OFFSET( 7630, glVertexAttrib4NubARB, glVertexAttrib4NubARB, NULL, 493),
-    NAME_FUNC_OFFSET( 7652, glVertexAttrib4NubvARB, glVertexAttrib4NubvARB, NULL, 494),
-    NAME_FUNC_OFFSET( 7675, glVertexAttrib4NuivARB, glVertexAttrib4NuivARB, NULL, 495),
-    NAME_FUNC_OFFSET( 7698, glVertexAttrib4NusvARB, glVertexAttrib4NusvARB, NULL, 496),
-    NAME_FUNC_OFFSET( 7721, glVertexAttrib4bvARB, glVertexAttrib4bvARB, NULL, 497),
-    NAME_FUNC_OFFSET( 7742, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL, 498),
-    NAME_FUNC_OFFSET( 7762, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL, 499),
-    NAME_FUNC_OFFSET( 7783, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, 500),
-    NAME_FUNC_OFFSET( 7803, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, 501),
-    NAME_FUNC_OFFSET( 7824, glVertexAttrib4ivARB, glVertexAttrib4ivARB, NULL, 502),
-    NAME_FUNC_OFFSET( 7845, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL, 503),
-    NAME_FUNC_OFFSET( 7865, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL, 504),
-    NAME_FUNC_OFFSET( 7886, glVertexAttrib4ubvARB, glVertexAttrib4ubvARB, NULL, 505),
-    NAME_FUNC_OFFSET( 7908, glVertexAttrib4uivARB, glVertexAttrib4uivARB, NULL, 506),
-    NAME_FUNC_OFFSET( 7930, glVertexAttrib4usvARB, glVertexAttrib4usvARB, NULL, 507),
-    NAME_FUNC_OFFSET( 7952, glVertexAttribPointerARB, glVertexAttribPointerARB, NULL, 508),
-    NAME_FUNC_OFFSET( 7977, glBindBufferARB, glBindBufferARB, NULL, 509),
-    NAME_FUNC_OFFSET( 7993, glBufferDataARB, glBufferDataARB, NULL, 510),
-    NAME_FUNC_OFFSET( 8009, glBufferSubDataARB, glBufferSubDataARB, NULL, 511),
-    NAME_FUNC_OFFSET( 8028, glDeleteBuffersARB, glDeleteBuffersARB, NULL, 512),
-    NAME_FUNC_OFFSET( 8047, glGenBuffersARB, glGenBuffersARB, NULL, 513),
-    NAME_FUNC_OFFSET( 8063, glGetBufferParameterivARB, glGetBufferParameterivARB, NULL, 514),
-    NAME_FUNC_OFFSET( 8089, glGetBufferPointervARB, glGetBufferPointervARB, NULL, 515),
-    NAME_FUNC_OFFSET( 8112, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL, 516),
-    NAME_FUNC_OFFSET( 8134, glIsBufferARB, glIsBufferARB, NULL, 517),
-    NAME_FUNC_OFFSET( 8148, glMapBufferARB, glMapBufferARB, NULL, 518),
-    NAME_FUNC_OFFSET( 8163, glUnmapBufferARB, glUnmapBufferARB, NULL, 519),
-    NAME_FUNC_OFFSET( 8180, glBeginQueryARB, glBeginQueryARB, NULL, 520),
-    NAME_FUNC_OFFSET( 8196, glDeleteQueriesARB, glDeleteQueriesARB, NULL, 521),
-    NAME_FUNC_OFFSET( 8215, glEndQueryARB, glEndQueryARB, NULL, 522),
-    NAME_FUNC_OFFSET( 8229, glGenQueriesARB, glGenQueriesARB, NULL, 523),
-    NAME_FUNC_OFFSET( 8245, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL, 524),
-    NAME_FUNC_OFFSET( 8267, glGetQueryObjectuivARB, glGetQueryObjectuivARB, NULL, 525),
-    NAME_FUNC_OFFSET( 8290, glGetQueryivARB, glGetQueryivARB, NULL, 526),
-    NAME_FUNC_OFFSET( 8306, glIsQueryARB, glIsQueryARB, NULL, 527),
-    NAME_FUNC_OFFSET( 8319, glAttachObjectARB, glAttachObjectARB, NULL, 528),
-    NAME_FUNC_OFFSET( 8337, glCompileShaderARB, glCompileShaderARB, NULL, 529),
-    NAME_FUNC_OFFSET( 8356, glCreateProgramObjectARB, glCreateProgramObjectARB, NULL, 530),
-    NAME_FUNC_OFFSET( 8381, glCreateShaderObjectARB, glCreateShaderObjectARB, NULL, 531),
-    NAME_FUNC_OFFSET( 8405, glDeleteObjectARB, glDeleteObjectARB, NULL, 532),
-    NAME_FUNC_OFFSET( 8423, glDetachObjectARB, glDetachObjectARB, NULL, 533),
-    NAME_FUNC_OFFSET( 8441, glGetActiveUniformARB, glGetActiveUniformARB, NULL, 534),
-    NAME_FUNC_OFFSET( 8463, glGetAttachedObjectsARB, glGetAttachedObjectsARB, NULL, 535),
-    NAME_FUNC_OFFSET( 8487, glGetHandleARB, glGetHandleARB, NULL, 536),
-    NAME_FUNC_OFFSET( 8502, glGetInfoLogARB, glGetInfoLogARB, NULL, 537),
-    NAME_FUNC_OFFSET( 8518, glGetObjectParameterfvARB, glGetObjectParameterfvARB, NULL, 538),
-    NAME_FUNC_OFFSET( 8544, glGetObjectParameterivARB, glGetObjectParameterivARB, NULL, 539),
-    NAME_FUNC_OFFSET( 8570, glGetShaderSourceARB, glGetShaderSourceARB, NULL, 540),
-    NAME_FUNC_OFFSET( 8591, glGetUniformLocationARB, glGetUniformLocationARB, NULL, 541),
-    NAME_FUNC_OFFSET( 8615, glGetUniformfvARB, glGetUniformfvARB, NULL, 542),
-    NAME_FUNC_OFFSET( 8633, glGetUniformivARB, glGetUniformivARB, NULL, 543),
-    NAME_FUNC_OFFSET( 8651, glLinkProgramARB, glLinkProgramARB, NULL, 544),
-    NAME_FUNC_OFFSET( 8668, glShaderSourceARB, glShaderSourceARB, NULL, 545),
-    NAME_FUNC_OFFSET( 8686, glUniform1fARB, glUniform1fARB, NULL, 546),
-    NAME_FUNC_OFFSET( 8701, glUniform1fvARB, glUniform1fvARB, NULL, 547),
-    NAME_FUNC_OFFSET( 8717, glUniform1iARB, glUniform1iARB, NULL, 548),
-    NAME_FUNC_OFFSET( 8732, glUniform1ivARB, glUniform1ivARB, NULL, 549),
-    NAME_FUNC_OFFSET( 8748, glUniform2fARB, glUniform2fARB, NULL, 550),
-    NAME_FUNC_OFFSET( 8763, glUniform2fvARB, glUniform2fvARB, NULL, 551),
-    NAME_FUNC_OFFSET( 8779, glUniform2iARB, glUniform2iARB, NULL, 552),
-    NAME_FUNC_OFFSET( 8794, glUniform2ivARB, glUniform2ivARB, NULL, 553),
-    NAME_FUNC_OFFSET( 8810, glUniform3fARB, glUniform3fARB, NULL, 554),
-    NAME_FUNC_OFFSET( 8825, glUniform3fvARB, glUniform3fvARB, NULL, 555),
-    NAME_FUNC_OFFSET( 8841, glUniform3iARB, glUniform3iARB, NULL, 556),
-    NAME_FUNC_OFFSET( 8856, glUniform3ivARB, glUniform3ivARB, NULL, 557),
-    NAME_FUNC_OFFSET( 8872, glUniform4fARB, glUniform4fARB, NULL, 558),
-    NAME_FUNC_OFFSET( 8887, glUniform4fvARB, glUniform4fvARB, NULL, 559),
-    NAME_FUNC_OFFSET( 8903, glUniform4iARB, glUniform4iARB, NULL, 560),
-    NAME_FUNC_OFFSET( 8918, glUniform4ivARB, glUniform4ivARB, NULL, 561),
-    NAME_FUNC_OFFSET( 8934, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL, 562),
-    NAME_FUNC_OFFSET( 8956, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL, 563),
-    NAME_FUNC_OFFSET( 8978, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL, 564),
-    NAME_FUNC_OFFSET( 9000, glUseProgramObjectARB, glUseProgramObjectARB, NULL, 565),
-    NAME_FUNC_OFFSET( 9022, glValidateProgramARB, glValidateProgramARB, NULL, 566),
-    NAME_FUNC_OFFSET( 9043, glBindAttribLocationARB, glBindAttribLocationARB, NULL, 567),
-    NAME_FUNC_OFFSET( 9067, glGetActiveAttribARB, glGetActiveAttribARB, NULL, 568),
-    NAME_FUNC_OFFSET( 9088, glGetAttribLocationARB, glGetAttribLocationARB, NULL, 569),
-    NAME_FUNC_OFFSET( 9111, glDrawBuffersARB, glDrawBuffersARB, NULL, 570),
-    NAME_FUNC_OFFSET( 9128, glClampColorARB, glClampColorARB, NULL, 571),
-    NAME_FUNC_OFFSET( 9144, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 572),
-    NAME_FUNC_OFFSET( 9169, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 573),
-    NAME_FUNC_OFFSET( 9196, glRenderbufferStorageMultisample, glRenderbufferStorageMultisample, NULL, 574),
-    NAME_FUNC_OFFSET( 9229, glFramebufferTextureARB, glFramebufferTextureARB, NULL, 575),
-    NAME_FUNC_OFFSET( 9253, glFramebufferTextureFaceARB, glFramebufferTextureFaceARB, NULL, 576),
-    NAME_FUNC_OFFSET( 9281, glProgramParameteriARB, glProgramParameteriARB, NULL, 577),
-    NAME_FUNC_OFFSET( 9304, glVertexAttribDivisorARB, glVertexAttribDivisorARB, NULL, 578),
-    NAME_FUNC_OFFSET( 9329, glFlushMappedBufferRange, glFlushMappedBufferRange, NULL, 579),
-    NAME_FUNC_OFFSET( 9354, glMapBufferRange, glMapBufferRange, NULL, 580),
-    NAME_FUNC_OFFSET( 9371, glTexBufferARB, glTexBufferARB, NULL, 581),
-    NAME_FUNC_OFFSET( 9386, glBindVertexArray, glBindVertexArray, NULL, 582),
-    NAME_FUNC_OFFSET( 9404, glGenVertexArrays, glGenVertexArrays, NULL, 583),
-    NAME_FUNC_OFFSET( 9422, glGetActiveUniformBlockName, glGetActiveUniformBlockName, NULL, 584),
-    NAME_FUNC_OFFSET( 9450, glGetActiveUniformBlockiv, glGetActiveUniformBlockiv, NULL, 585),
-    NAME_FUNC_OFFSET( 9476, glGetActiveUniformName, glGetActiveUniformName, NULL, 586),
-    NAME_FUNC_OFFSET( 9499, glGetActiveUniformsiv, glGetActiveUniformsiv, NULL, 587),
-    NAME_FUNC_OFFSET( 9521, glGetUniformBlockIndex, glGetUniformBlockIndex, NULL, 588),
-    NAME_FUNC_OFFSET( 9544, glGetUniformIndices, glGetUniformIndices, NULL, 589),
-    NAME_FUNC_OFFSET( 9564, glUniformBlockBinding, glUniformBlockBinding, NULL, 590),
-    NAME_FUNC_OFFSET( 9586, glCopyBufferSubData, glCopyBufferSubData, NULL, 591),
-    NAME_FUNC_OFFSET( 9606, glClientWaitSync, glClientWaitSync, NULL, 592),
-    NAME_FUNC_OFFSET( 9623, glDeleteSync, glDeleteSync, NULL, 593),
-    NAME_FUNC_OFFSET( 9636, glFenceSync, glFenceSync, NULL, 594),
-    NAME_FUNC_OFFSET( 9648, glGetInteger64v, glGetInteger64v, NULL, 595),
-    NAME_FUNC_OFFSET( 9664, glGetSynciv, glGetSynciv, NULL, 596),
-    NAME_FUNC_OFFSET( 9676, glIsSync, glIsSync, NULL, 597),
-    NAME_FUNC_OFFSET( 9685, glWaitSync, glWaitSync, NULL, 598),
-    NAME_FUNC_OFFSET( 9696, glDrawElementsBaseVertex, glDrawElementsBaseVertex, NULL, 599),
-    NAME_FUNC_OFFSET( 9721, glDrawElementsInstancedBaseVertex, glDrawElementsInstancedBaseVertex, NULL, 600),
-    NAME_FUNC_OFFSET( 9755, glDrawRangeElementsBaseVertex, glDrawRangeElementsBaseVertex, NULL, 601),
-    NAME_FUNC_OFFSET( 9785, glMultiDrawElementsBaseVertex, glMultiDrawElementsBaseVertex, NULL, 602),
-    NAME_FUNC_OFFSET( 9815, glBlendEquationSeparateiARB, glBlendEquationSeparateiARB, NULL, 603),
-    NAME_FUNC_OFFSET( 9843, glBlendEquationiARB, glBlendEquationiARB, NULL, 604),
-    NAME_FUNC_OFFSET( 9863, glBlendFuncSeparateiARB, glBlendFuncSeparateiARB, NULL, 605),
-    NAME_FUNC_OFFSET( 9887, glBlendFunciARB, glBlendFunciARB, NULL, 606),
-    NAME_FUNC_OFFSET( 9903, glBindFragDataLocationIndexed, glBindFragDataLocationIndexed, NULL, 607),
-    NAME_FUNC_OFFSET( 9933, glGetFragDataIndex, glGetFragDataIndex, NULL, 608),
-    NAME_FUNC_OFFSET( 9952, glBindSampler, glBindSampler, NULL, 609),
-    NAME_FUNC_OFFSET( 9966, glDeleteSamplers, glDeleteSamplers, NULL, 610),
-    NAME_FUNC_OFFSET( 9983, glGenSamplers, glGenSamplers, NULL, 611),
-    NAME_FUNC_OFFSET( 9997, glGetSamplerParameterIiv, glGetSamplerParameterIiv, NULL, 612),
-    NAME_FUNC_OFFSET(10022, glGetSamplerParameterIuiv, glGetSamplerParameterIuiv, NULL, 613),
-    NAME_FUNC_OFFSET(10048, glGetSamplerParameterfv, glGetSamplerParameterfv, NULL, 614),
-    NAME_FUNC_OFFSET(10072, glGetSamplerParameteriv, glGetSamplerParameteriv, NULL, 615),
-    NAME_FUNC_OFFSET(10096, glIsSampler, glIsSampler, NULL, 616),
-    NAME_FUNC_OFFSET(10108, glSamplerParameterIiv, glSamplerParameterIiv, NULL, 617),
-    NAME_FUNC_OFFSET(10130, glSamplerParameterIuiv, glSamplerParameterIuiv, NULL, 618),
-    NAME_FUNC_OFFSET(10153, glSamplerParameterf, glSamplerParameterf, NULL, 619),
-    NAME_FUNC_OFFSET(10173, glSamplerParameterfv, glSamplerParameterfv, NULL, 620),
-    NAME_FUNC_OFFSET(10194, glSamplerParameteri, glSamplerParameteri, NULL, 621),
-    NAME_FUNC_OFFSET(10214, glSamplerParameteriv, glSamplerParameteriv, NULL, 622),
-    NAME_FUNC_OFFSET(10235, gl_dispatch_stub_623, gl_dispatch_stub_623, NULL, 623),
-    NAME_FUNC_OFFSET(10250, glColorP3ui, glColorP3ui, NULL, 624),
-    NAME_FUNC_OFFSET(10262, glColorP3uiv, glColorP3uiv, NULL, 625),
-    NAME_FUNC_OFFSET(10275, glColorP4ui, glColorP4ui, NULL, 626),
-    NAME_FUNC_OFFSET(10287, glColorP4uiv, glColorP4uiv, NULL, 627),
-    NAME_FUNC_OFFSET(10300, glMultiTexCoordP1ui, glMultiTexCoordP1ui, NULL, 628),
-    NAME_FUNC_OFFSET(10320, glMultiTexCoordP1uiv, glMultiTexCoordP1uiv, NULL, 629),
-    NAME_FUNC_OFFSET(10341, glMultiTexCoordP2ui, glMultiTexCoordP2ui, NULL, 630),
-    NAME_FUNC_OFFSET(10361, glMultiTexCoordP2uiv, glMultiTexCoordP2uiv, NULL, 631),
-    NAME_FUNC_OFFSET(10382, glMultiTexCoordP3ui, glMultiTexCoordP3ui, NULL, 632),
-    NAME_FUNC_OFFSET(10402, glMultiTexCoordP3uiv, glMultiTexCoordP3uiv, NULL, 633),
-    NAME_FUNC_OFFSET(10423, glMultiTexCoordP4ui, glMultiTexCoordP4ui, NULL, 634),
-    NAME_FUNC_OFFSET(10443, glMultiTexCoordP4uiv, glMultiTexCoordP4uiv, NULL, 635),
-    NAME_FUNC_OFFSET(10464, glNormalP3ui, glNormalP3ui, NULL, 636),
-    NAME_FUNC_OFFSET(10477, glNormalP3uiv, glNormalP3uiv, NULL, 637),
-    NAME_FUNC_OFFSET(10491, glSecondaryColorP3ui, glSecondaryColorP3ui, NULL, 638),
-    NAME_FUNC_OFFSET(10512, glSecondaryColorP3uiv, glSecondaryColorP3uiv, NULL, 639),
-    NAME_FUNC_OFFSET(10534, glTexCoordP1ui, glTexCoordP1ui, NULL, 640),
-    NAME_FUNC_OFFSET(10549, glTexCoordP1uiv, glTexCoordP1uiv, NULL, 641),
-    NAME_FUNC_OFFSET(10565, glTexCoordP2ui, glTexCoordP2ui, NULL, 642),
-    NAME_FUNC_OFFSET(10580, glTexCoordP2uiv, glTexCoordP2uiv, NULL, 643),
-    NAME_FUNC_OFFSET(10596, glTexCoordP3ui, glTexCoordP3ui, NULL, 644),
-    NAME_FUNC_OFFSET(10611, glTexCoordP3uiv, glTexCoordP3uiv, NULL, 645),
-    NAME_FUNC_OFFSET(10627, glTexCoordP4ui, glTexCoordP4ui, NULL, 646),
-    NAME_FUNC_OFFSET(10642, glTexCoordP4uiv, glTexCoordP4uiv, NULL, 647),
-    NAME_FUNC_OFFSET(10658, glVertexAttribP1ui, glVertexAttribP1ui, NULL, 648),
-    NAME_FUNC_OFFSET(10677, glVertexAttribP1uiv, glVertexAttribP1uiv, NULL, 649),
-    NAME_FUNC_OFFSET(10697, glVertexAttribP2ui, glVertexAttribP2ui, NULL, 650),
-    NAME_FUNC_OFFSET(10716, glVertexAttribP2uiv, glVertexAttribP2uiv, NULL, 651),
-    NAME_FUNC_OFFSET(10736, glVertexAttribP3ui, glVertexAttribP3ui, NULL, 652),
-    NAME_FUNC_OFFSET(10755, glVertexAttribP3uiv, glVertexAttribP3uiv, NULL, 653),
-    NAME_FUNC_OFFSET(10775, glVertexAttribP4ui, glVertexAttribP4ui, NULL, 654),
-    NAME_FUNC_OFFSET(10794, glVertexAttribP4uiv, glVertexAttribP4uiv, NULL, 655),
-    NAME_FUNC_OFFSET(10814, glVertexP2ui, glVertexP2ui, NULL, 656),
-    NAME_FUNC_OFFSET(10827, glVertexP2uiv, glVertexP2uiv, NULL, 657),
-    NAME_FUNC_OFFSET(10841, glVertexP3ui, glVertexP3ui, NULL, 658),
-    NAME_FUNC_OFFSET(10854, glVertexP3uiv, glVertexP3uiv, NULL, 659),
-    NAME_FUNC_OFFSET(10868, glVertexP4ui, glVertexP4ui, NULL, 660),
-    NAME_FUNC_OFFSET(10881, glVertexP4uiv, glVertexP4uiv, NULL, 661),
-    NAME_FUNC_OFFSET(10895, glBindTransformFeedback, glBindTransformFeedback, NULL, 662),
-    NAME_FUNC_OFFSET(10919, glDeleteTransformFeedbacks, glDeleteTransformFeedbacks, NULL, 663),
-    NAME_FUNC_OFFSET(10946, glDrawTransformFeedback, glDrawTransformFeedback, NULL, 664),
-    NAME_FUNC_OFFSET(10970, glGenTransformFeedbacks, glGenTransformFeedbacks, NULL, 665),
-    NAME_FUNC_OFFSET(10994, glIsTransformFeedback, glIsTransformFeedback, NULL, 666),
-    NAME_FUNC_OFFSET(11016, glPauseTransformFeedback, glPauseTransformFeedback, NULL, 667),
-    NAME_FUNC_OFFSET(11041, glResumeTransformFeedback, glResumeTransformFeedback, NULL, 668),
-    NAME_FUNC_OFFSET(11067, glBeginQueryIndexed, glBeginQueryIndexed, NULL, 669),
-    NAME_FUNC_OFFSET(11087, glDrawTransformFeedbackStream, glDrawTransformFeedbackStream, NULL, 670),
-    NAME_FUNC_OFFSET(11117, glEndQueryIndexed, glEndQueryIndexed, NULL, 671),
-    NAME_FUNC_OFFSET(11135, glGetQueryIndexediv, glGetQueryIndexediv, NULL, 672),
-    NAME_FUNC_OFFSET(11155, glClearDepthf, glClearDepthf, NULL, 673),
-    NAME_FUNC_OFFSET(11169, glDepthRangef, glDepthRangef, NULL, 674),
-    NAME_FUNC_OFFSET(11183, glGetShaderPrecisionFormat, glGetShaderPrecisionFormat, NULL, 675),
-    NAME_FUNC_OFFSET(11210, glReleaseShaderCompiler, glReleaseShaderCompiler, NULL, 676),
-    NAME_FUNC_OFFSET(11234, glShaderBinary, glShaderBinary, NULL, 677),
-    NAME_FUNC_OFFSET(11249, glDebugMessageCallbackARB, glDebugMessageCallbackARB, NULL, 678),
-    NAME_FUNC_OFFSET(11275, glDebugMessageControlARB, glDebugMessageControlARB, NULL, 679),
-    NAME_FUNC_OFFSET(11300, glDebugMessageInsertARB, glDebugMessageInsertARB, NULL, 680),
-    NAME_FUNC_OFFSET(11324, glGetDebugMessageLogARB, glGetDebugMessageLogARB, NULL, 681),
-    NAME_FUNC_OFFSET(11348, glGetGraphicsResetStatusARB, glGetGraphicsResetStatusARB, NULL, 682),
-    NAME_FUNC_OFFSET(11376, glGetnColorTableARB, glGetnColorTableARB, NULL, 683),
-    NAME_FUNC_OFFSET(11396, glGetnCompressedTexImageARB, glGetnCompressedTexImageARB, NULL, 684),
-    NAME_FUNC_OFFSET(11424, glGetnConvolutionFilterARB, glGetnConvolutionFilterARB, NULL, 685),
-    NAME_FUNC_OFFSET(11451, glGetnHistogramARB, glGetnHistogramARB, NULL, 686),
-    NAME_FUNC_OFFSET(11470, glGetnMapdvARB, glGetnMapdvARB, NULL, 687),
-    NAME_FUNC_OFFSET(11485, glGetnMapfvARB, glGetnMapfvARB, NULL, 688),
-    NAME_FUNC_OFFSET(11500, glGetnMapivARB, glGetnMapivARB, NULL, 689),
-    NAME_FUNC_OFFSET(11515, glGetnMinmaxARB, glGetnMinmaxARB, NULL, 690),
-    NAME_FUNC_OFFSET(11531, glGetnPixelMapfvARB, glGetnPixelMapfvARB, NULL, 691),
-    NAME_FUNC_OFFSET(11551, glGetnPixelMapuivARB, glGetnPixelMapuivARB, NULL, 692),
-    NAME_FUNC_OFFSET(11572, glGetnPixelMapusvARB, glGetnPixelMapusvARB, NULL, 693),
-    NAME_FUNC_OFFSET(11593, glGetnPolygonStippleARB, glGetnPolygonStippleARB, NULL, 694),
-    NAME_FUNC_OFFSET(11617, glGetnSeparableFilterARB, glGetnSeparableFilterARB, NULL, 695),
-    NAME_FUNC_OFFSET(11642, glGetnTexImageARB, glGetnTexImageARB, NULL, 696),
-    NAME_FUNC_OFFSET(11660, glGetnUniformdvARB, glGetnUniformdvARB, NULL, 697),
-    NAME_FUNC_OFFSET(11679, glGetnUniformfvARB, glGetnUniformfvARB, NULL, 698),
-    NAME_FUNC_OFFSET(11698, glGetnUniformivARB, glGetnUniformivARB, NULL, 699),
-    NAME_FUNC_OFFSET(11717, glGetnUniformuivARB, glGetnUniformuivARB, NULL, 700),
-    NAME_FUNC_OFFSET(11737, glReadnPixelsARB, glReadnPixelsARB, NULL, 701),
-    NAME_FUNC_OFFSET(11754, glDrawArraysInstancedBaseInstance, glDrawArraysInstancedBaseInstance, NULL, 702),
-    NAME_FUNC_OFFSET(11788, glDrawElementsInstancedBaseInstance, glDrawElementsInstancedBaseInstance, NULL, 703),
-    NAME_FUNC_OFFSET(11824, glDrawElementsInstancedBaseVertexBaseInstance, glDrawElementsInstancedBaseVertexBaseInstance, NULL, 704),
-    NAME_FUNC_OFFSET(11870, glDrawTransformFeedbackInstanced, glDrawTransformFeedbackInstanced, NULL, 705),
-    NAME_FUNC_OFFSET(11903, glDrawTransformFeedbackStreamInstanced, glDrawTransformFeedbackStreamInstanced, NULL, 706),
-    NAME_FUNC_OFFSET(11942, glTexStorage1D, glTexStorage1D, NULL, 707),
-    NAME_FUNC_OFFSET(11957, glTexStorage2D, glTexStorage2D, NULL, 708),
-    NAME_FUNC_OFFSET(11972, glTexStorage3D, glTexStorage3D, NULL, 709),
-    NAME_FUNC_OFFSET(11987, glTextureStorage1DEXT, glTextureStorage1DEXT, NULL, 710),
-    NAME_FUNC_OFFSET(12009, glTextureStorage2DEXT, glTextureStorage2DEXT, NULL, 711),
-    NAME_FUNC_OFFSET(12031, glTextureStorage3DEXT, glTextureStorage3DEXT, NULL, 712),
-    NAME_FUNC_OFFSET(12053, glInvalidateBufferData, glInvalidateBufferData, NULL, 713),
-    NAME_FUNC_OFFSET(12076, glInvalidateBufferSubData, glInvalidateBufferSubData, NULL, 714),
-    NAME_FUNC_OFFSET(12102, glInvalidateFramebuffer, glInvalidateFramebuffer, NULL, 715),
-    NAME_FUNC_OFFSET(12126, glInvalidateSubFramebuffer, glInvalidateSubFramebuffer, NULL, 716),
-    NAME_FUNC_OFFSET(12153, glInvalidateTexImage, glInvalidateTexImage, NULL, 717),
-    NAME_FUNC_OFFSET(12174, glInvalidateTexSubImage, glInvalidateTexSubImage, NULL, 718),
-    NAME_FUNC_OFFSET(12198, glPolygonOffsetEXT, glPolygonOffsetEXT, NULL, 719),
-    NAME_FUNC_OFFSET(12217, gl_dispatch_stub_720, gl_dispatch_stub_720, NULL, 720),
-    NAME_FUNC_OFFSET(12234, gl_dispatch_stub_721, gl_dispatch_stub_721, NULL, 721),
-    NAME_FUNC_OFFSET(12254, glColorPointerEXT, glColorPointerEXT, NULL, 722),
-    NAME_FUNC_OFFSET(12272, glEdgeFlagPointerEXT, glEdgeFlagPointerEXT, NULL, 723),
-    NAME_FUNC_OFFSET(12293, glIndexPointerEXT, glIndexPointerEXT, NULL, 724),
-    NAME_FUNC_OFFSET(12311, glNormalPointerEXT, glNormalPointerEXT, NULL, 725),
-    NAME_FUNC_OFFSET(12330, glTexCoordPointerEXT, glTexCoordPointerEXT, NULL, 726),
-    NAME_FUNC_OFFSET(12351, glVertexPointerEXT, glVertexPointerEXT, NULL, 727),
-    NAME_FUNC_OFFSET(12370, glPointParameterfEXT, glPointParameterfEXT, NULL, 728),
-    NAME_FUNC_OFFSET(12391, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 729),
-    NAME_FUNC_OFFSET(12413, glLockArraysEXT, glLockArraysEXT, NULL, 730),
-    NAME_FUNC_OFFSET(12429, glUnlockArraysEXT, glUnlockArraysEXT, NULL, 731),
-    NAME_FUNC_OFFSET(12447, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, 732),
-    NAME_FUNC_OFFSET(12469, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, 733),
-    NAME_FUNC_OFFSET(12492, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, 734),
-    NAME_FUNC_OFFSET(12514, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, 735),
-    NAME_FUNC_OFFSET(12537, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, 736),
-    NAME_FUNC_OFFSET(12559, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, 737),
-    NAME_FUNC_OFFSET(12582, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, 738),
-    NAME_FUNC_OFFSET(12604, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, 739),
-    NAME_FUNC_OFFSET(12627, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, 740),
-    NAME_FUNC_OFFSET(12649, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, 741),
-    NAME_FUNC_OFFSET(12672, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, 742),
-    NAME_FUNC_OFFSET(12695, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, 743),
-    NAME_FUNC_OFFSET(12719, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, 744),
-    NAME_FUNC_OFFSET(12742, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, 745),
-    NAME_FUNC_OFFSET(12766, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, 746),
-    NAME_FUNC_OFFSET(12789, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, 747),
-    NAME_FUNC_OFFSET(12813, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, 748),
-    NAME_FUNC_OFFSET(12840, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, 749),
-    NAME_FUNC_OFFSET(12861, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, 750),
-    NAME_FUNC_OFFSET(12884, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, 751),
-    NAME_FUNC_OFFSET(12905, glFogCoorddEXT, glFogCoorddEXT, NULL, 752),
-    NAME_FUNC_OFFSET(12920, glFogCoorddvEXT, glFogCoorddvEXT, NULL, 753),
-    NAME_FUNC_OFFSET(12936, glFogCoordfEXT, glFogCoordfEXT, NULL, 754),
-    NAME_FUNC_OFFSET(12951, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 755),
-    NAME_FUNC_OFFSET(12967, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, 756),
-    NAME_FUNC_OFFSET(12990, glResizeBuffersMESA, glResizeBuffersMESA, NULL, 757),
-    NAME_FUNC_OFFSET(13010, glWindowPos2dMESA, glWindowPos2dMESA, NULL, 758),
-    NAME_FUNC_OFFSET(13028, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, 759),
-    NAME_FUNC_OFFSET(13047, glWindowPos2fMESA, glWindowPos2fMESA, NULL, 760),
-    NAME_FUNC_OFFSET(13065, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, 761),
-    NAME_FUNC_OFFSET(13084, glWindowPos2iMESA, glWindowPos2iMESA, NULL, 762),
-    NAME_FUNC_OFFSET(13102, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, 763),
-    NAME_FUNC_OFFSET(13121, glWindowPos2sMESA, glWindowPos2sMESA, NULL, 764),
-    NAME_FUNC_OFFSET(13139, glWindowPos2svMESA, glWindowPos2svMESA, NULL, 765),
-    NAME_FUNC_OFFSET(13158, glWindowPos3dMESA, glWindowPos3dMESA, NULL, 766),
-    NAME_FUNC_OFFSET(13176, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, 767),
-    NAME_FUNC_OFFSET(13195, glWindowPos3fMESA, glWindowPos3fMESA, NULL, 768),
-    NAME_FUNC_OFFSET(13213, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, 769),
-    NAME_FUNC_OFFSET(13232, glWindowPos3iMESA, glWindowPos3iMESA, NULL, 770),
-    NAME_FUNC_OFFSET(13250, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, 771),
-    NAME_FUNC_OFFSET(13269, glWindowPos3sMESA, glWindowPos3sMESA, NULL, 772),
-    NAME_FUNC_OFFSET(13287, glWindowPos3svMESA, glWindowPos3svMESA, NULL, 773),
-    NAME_FUNC_OFFSET(13306, glWindowPos4dMESA, glWindowPos4dMESA, NULL, 774),
-    NAME_FUNC_OFFSET(13324, glWindowPos4dvMESA, glWindowPos4dvMESA, NULL, 775),
-    NAME_FUNC_OFFSET(13343, glWindowPos4fMESA, glWindowPos4fMESA, NULL, 776),
-    NAME_FUNC_OFFSET(13361, glWindowPos4fvMESA, glWindowPos4fvMESA, NULL, 777),
-    NAME_FUNC_OFFSET(13380, glWindowPos4iMESA, glWindowPos4iMESA, NULL, 778),
-    NAME_FUNC_OFFSET(13398, glWindowPos4ivMESA, glWindowPos4ivMESA, NULL, 779),
-    NAME_FUNC_OFFSET(13417, glWindowPos4sMESA, glWindowPos4sMESA, NULL, 780),
-    NAME_FUNC_OFFSET(13435, glWindowPos4svMESA, glWindowPos4svMESA, NULL, 781),
-    NAME_FUNC_OFFSET(13454, gl_dispatch_stub_782, gl_dispatch_stub_782, NULL, 782),
-    NAME_FUNC_OFFSET(13479, gl_dispatch_stub_783, gl_dispatch_stub_783, NULL, 783),
-    NAME_FUNC_OFFSET(13506, glAreProgramsResidentNV, glAreProgramsResidentNV, NULL, 784),
-    NAME_FUNC_OFFSET(13530, glBindProgramNV, glBindProgramNV, NULL, 785),
-    NAME_FUNC_OFFSET(13546, glDeleteProgramsNV, glDeleteProgramsNV, NULL, 786),
-    NAME_FUNC_OFFSET(13565, glExecuteProgramNV, glExecuteProgramNV, NULL, 787),
-    NAME_FUNC_OFFSET(13584, glGenProgramsNV, glGenProgramsNV, NULL, 788),
-    NAME_FUNC_OFFSET(13600, glGetProgramParameterdvNV, glGetProgramParameterdvNV, NULL, 789),
-    NAME_FUNC_OFFSET(13626, glGetProgramParameterfvNV, glGetProgramParameterfvNV, NULL, 790),
-    NAME_FUNC_OFFSET(13652, glGetProgramStringNV, glGetProgramStringNV, NULL, 791),
-    NAME_FUNC_OFFSET(13673, glGetProgramivNV, glGetProgramivNV, NULL, 792),
-    NAME_FUNC_OFFSET(13690, glGetTrackMatrixivNV, glGetTrackMatrixivNV, NULL, 793),
-    NAME_FUNC_OFFSET(13711, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, 794),
-    NAME_FUNC_OFFSET(13739, glGetVertexAttribdvNV, glGetVertexAttribdvNV, NULL, 795),
-    NAME_FUNC_OFFSET(13761, glGetVertexAttribfvNV, glGetVertexAttribfvNV, NULL, 796),
-    NAME_FUNC_OFFSET(13783, glGetVertexAttribivNV, glGetVertexAttribivNV, NULL, 797),
-    NAME_FUNC_OFFSET(13805, glIsProgramNV, glIsProgramNV, NULL, 798),
-    NAME_FUNC_OFFSET(13819, glLoadProgramNV, glLoadProgramNV, NULL, 799),
-    NAME_FUNC_OFFSET(13835, glProgramParameters4dvNV, glProgramParameters4dvNV, NULL, 800),
-    NAME_FUNC_OFFSET(13860, glProgramParameters4fvNV, glProgramParameters4fvNV, NULL, 801),
-    NAME_FUNC_OFFSET(13885, glRequestResidentProgramsNV, glRequestResidentProgramsNV, NULL, 802),
-    NAME_FUNC_OFFSET(13913, glTrackMatrixNV, glTrackMatrixNV, NULL, 803),
-    NAME_FUNC_OFFSET(13929, glVertexAttrib1dNV, glVertexAttrib1dNV, NULL, 804),
-    NAME_FUNC_OFFSET(13948, glVertexAttrib1dvNV, glVertexAttrib1dvNV, NULL, 805),
-    NAME_FUNC_OFFSET(13968, glVertexAttrib1fNV, glVertexAttrib1fNV, NULL, 806),
-    NAME_FUNC_OFFSET(13987, glVertexAttrib1fvNV, glVertexAttrib1fvNV, NULL, 807),
-    NAME_FUNC_OFFSET(14007, glVertexAttrib1sNV, glVertexAttrib1sNV, NULL, 808),
-    NAME_FUNC_OFFSET(14026, glVertexAttrib1svNV, glVertexAttrib1svNV, NULL, 809),
-    NAME_FUNC_OFFSET(14046, glVertexAttrib2dNV, glVertexAttrib2dNV, NULL, 810),
-    NAME_FUNC_OFFSET(14065, glVertexAttrib2dvNV, glVertexAttrib2dvNV, NULL, 811),
-    NAME_FUNC_OFFSET(14085, glVertexAttrib2fNV, glVertexAttrib2fNV, NULL, 812),
-    NAME_FUNC_OFFSET(14104, glVertexAttrib2fvNV, glVertexAttrib2fvNV, NULL, 813),
-    NAME_FUNC_OFFSET(14124, glVertexAttrib2sNV, glVertexAttrib2sNV, NULL, 814),
-    NAME_FUNC_OFFSET(14143, glVertexAttrib2svNV, glVertexAttrib2svNV, NULL, 815),
-    NAME_FUNC_OFFSET(14163, glVertexAttrib3dNV, glVertexAttrib3dNV, NULL, 816),
-    NAME_FUNC_OFFSET(14182, glVertexAttrib3dvNV, glVertexAttrib3dvNV, NULL, 817),
-    NAME_FUNC_OFFSET(14202, glVertexAttrib3fNV, glVertexAttrib3fNV, NULL, 818),
-    NAME_FUNC_OFFSET(14221, glVertexAttrib3fvNV, glVertexAttrib3fvNV, NULL, 819),
-    NAME_FUNC_OFFSET(14241, glVertexAttrib3sNV, glVertexAttrib3sNV, NULL, 820),
-    NAME_FUNC_OFFSET(14260, glVertexAttrib3svNV, glVertexAttrib3svNV, NULL, 821),
-    NAME_FUNC_OFFSET(14280, glVertexAttrib4dNV, glVertexAttrib4dNV, NULL, 822),
-    NAME_FUNC_OFFSET(14299, glVertexAttrib4dvNV, glVertexAttrib4dvNV, NULL, 823),
-    NAME_FUNC_OFFSET(14319, glVertexAttrib4fNV, glVertexAttrib4fNV, NULL, 824),
-    NAME_FUNC_OFFSET(14338, glVertexAttrib4fvNV, glVertexAttrib4fvNV, NULL, 825),
-    NAME_FUNC_OFFSET(14358, glVertexAttrib4sNV, glVertexAttrib4sNV, NULL, 826),
-    NAME_FUNC_OFFSET(14377, glVertexAttrib4svNV, glVertexAttrib4svNV, NULL, 827),
-    NAME_FUNC_OFFSET(14397, glVertexAttrib4ubNV, glVertexAttrib4ubNV, NULL, 828),
-    NAME_FUNC_OFFSET(14417, glVertexAttrib4ubvNV, glVertexAttrib4ubvNV, NULL, 829),
-    NAME_FUNC_OFFSET(14438, glVertexAttribPointerNV, glVertexAttribPointerNV, NULL, 830),
-    NAME_FUNC_OFFSET(14462, glVertexAttribs1dvNV, glVertexAttribs1dvNV, NULL, 831),
-    NAME_FUNC_OFFSET(14483, glVertexAttribs1fvNV, glVertexAttribs1fvNV, NULL, 832),
-    NAME_FUNC_OFFSET(14504, glVertexAttribs1svNV, glVertexAttribs1svNV, NULL, 833),
-    NAME_FUNC_OFFSET(14525, glVertexAttribs2dvNV, glVertexAttribs2dvNV, NULL, 834),
-    NAME_FUNC_OFFSET(14546, glVertexAttribs2fvNV, glVertexAttribs2fvNV, NULL, 835),
-    NAME_FUNC_OFFSET(14567, glVertexAttribs2svNV, glVertexAttribs2svNV, NULL, 836),
-    NAME_FUNC_OFFSET(14588, glVertexAttribs3dvNV, glVertexAttribs3dvNV, NULL, 837),
-    NAME_FUNC_OFFSET(14609, glVertexAttribs3fvNV, glVertexAttribs3fvNV, NULL, 838),
-    NAME_FUNC_OFFSET(14630, glVertexAttribs3svNV, glVertexAttribs3svNV, NULL, 839),
-    NAME_FUNC_OFFSET(14651, glVertexAttribs4dvNV, glVertexAttribs4dvNV, NULL, 840),
-    NAME_FUNC_OFFSET(14672, glVertexAttribs4fvNV, glVertexAttribs4fvNV, NULL, 841),
-    NAME_FUNC_OFFSET(14693, glVertexAttribs4svNV, glVertexAttribs4svNV, NULL, 842),
-    NAME_FUNC_OFFSET(14714, glVertexAttribs4ubvNV, glVertexAttribs4ubvNV, NULL, 843),
-    NAME_FUNC_OFFSET(14736, glGetTexBumpParameterfvATI, glGetTexBumpParameterfvATI, NULL, 844),
-    NAME_FUNC_OFFSET(14763, glGetTexBumpParameterivATI, glGetTexBumpParameterivATI, NULL, 845),
-    NAME_FUNC_OFFSET(14790, glTexBumpParameterfvATI, glTexBumpParameterfvATI, NULL, 846),
-    NAME_FUNC_OFFSET(14814, glTexBumpParameterivATI, glTexBumpParameterivATI, NULL, 847),
-    NAME_FUNC_OFFSET(14838, glAlphaFragmentOp1ATI, glAlphaFragmentOp1ATI, NULL, 848),
-    NAME_FUNC_OFFSET(14860, glAlphaFragmentOp2ATI, glAlphaFragmentOp2ATI, NULL, 849),
-    NAME_FUNC_OFFSET(14882, glAlphaFragmentOp3ATI, glAlphaFragmentOp3ATI, NULL, 850),
-    NAME_FUNC_OFFSET(14904, glBeginFragmentShaderATI, glBeginFragmentShaderATI, NULL, 851),
-    NAME_FUNC_OFFSET(14929, glBindFragmentShaderATI, glBindFragmentShaderATI, NULL, 852),
-    NAME_FUNC_OFFSET(14953, glColorFragmentOp1ATI, glColorFragmentOp1ATI, NULL, 853),
-    NAME_FUNC_OFFSET(14975, glColorFragmentOp2ATI, glColorFragmentOp2ATI, NULL, 854),
-    NAME_FUNC_OFFSET(14997, glColorFragmentOp3ATI, glColorFragmentOp3ATI, NULL, 855),
-    NAME_FUNC_OFFSET(15019, glDeleteFragmentShaderATI, glDeleteFragmentShaderATI, NULL, 856),
-    NAME_FUNC_OFFSET(15045, glEndFragmentShaderATI, glEndFragmentShaderATI, NULL, 857),
-    NAME_FUNC_OFFSET(15068, glGenFragmentShadersATI, glGenFragmentShadersATI, NULL, 858),
-    NAME_FUNC_OFFSET(15092, glPassTexCoordATI, glPassTexCoordATI, NULL, 859),
-    NAME_FUNC_OFFSET(15110, glSampleMapATI, glSampleMapATI, NULL, 860),
-    NAME_FUNC_OFFSET(15125, glSetFragmentShaderConstantATI, glSetFragmentShaderConstantATI, NULL, 861),
-    NAME_FUNC_OFFSET(15156, glPointParameteriNV, glPointParameteriNV, NULL, 862),
-    NAME_FUNC_OFFSET(15176, glPointParameterivNV, glPointParameterivNV, NULL, 863),
-    NAME_FUNC_OFFSET(15197, gl_dispatch_stub_864, gl_dispatch_stub_864, NULL, 864),
-    NAME_FUNC_OFFSET(15220, gl_dispatch_stub_865, gl_dispatch_stub_865, NULL, 865),
-    NAME_FUNC_OFFSET(15243, gl_dispatch_stub_866, gl_dispatch_stub_866, NULL, 866),
-    NAME_FUNC_OFFSET(15269, gl_dispatch_stub_867, gl_dispatch_stub_867, NULL, 867),
-    NAME_FUNC_OFFSET(15292, gl_dispatch_stub_868, gl_dispatch_stub_868, NULL, 868),
-    NAME_FUNC_OFFSET(15313, glGetProgramNamedParameterdvNV, glGetProgramNamedParameterdvNV, NULL, 869),
-    NAME_FUNC_OFFSET(15344, glGetProgramNamedParameterfvNV, glGetProgramNamedParameterfvNV, NULL, 870),
-    NAME_FUNC_OFFSET(15375, glProgramNamedParameter4dNV, glProgramNamedParameter4dNV, NULL, 871),
-    NAME_FUNC_OFFSET(15403, glProgramNamedParameter4dvNV, glProgramNamedParameter4dvNV, NULL, 872),
-    NAME_FUNC_OFFSET(15432, glProgramNamedParameter4fNV, glProgramNamedParameter4fNV, NULL, 873),
-    NAME_FUNC_OFFSET(15460, glProgramNamedParameter4fvNV, glProgramNamedParameter4fvNV, NULL, 874),
-    NAME_FUNC_OFFSET(15489, glPrimitiveRestartIndexNV, glPrimitiveRestartIndexNV, NULL, 875),
-    NAME_FUNC_OFFSET(15515, glPrimitiveRestartNV, glPrimitiveRestartNV, NULL, 876),
-    NAME_FUNC_OFFSET(15536, gl_dispatch_stub_877, gl_dispatch_stub_877, NULL, 877),
-    NAME_FUNC_OFFSET(15553, gl_dispatch_stub_878, gl_dispatch_stub_878, NULL, 878),
-    NAME_FUNC_OFFSET(15580, glBindFramebufferEXT, glBindFramebufferEXT, NULL, 879),
-    NAME_FUNC_OFFSET(15601, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, 880),
-    NAME_FUNC_OFFSET(15623, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, 881),
-    NAME_FUNC_OFFSET(15651, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, 882),
-    NAME_FUNC_OFFSET(15675, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, 883),
-    NAME_FUNC_OFFSET(15700, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, 884),
-    NAME_FUNC_OFFSET(15729, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, 885),
-    NAME_FUNC_OFFSET(15755, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, 886),
-    NAME_FUNC_OFFSET(15781, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, 887),
-    NAME_FUNC_OFFSET(15807, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, 888),
-    NAME_FUNC_OFFSET(15828, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, 889),
-    NAME_FUNC_OFFSET(15850, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, 890),
-    NAME_FUNC_OFFSET(15870, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, 891),
-    NAME_FUNC_OFFSET(15911, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, 892),
-    NAME_FUNC_OFFSET(15943, glIsFramebufferEXT, glIsFramebufferEXT, NULL, 893),
-    NAME_FUNC_OFFSET(15962, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, 894),
-    NAME_FUNC_OFFSET(15982, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, 895),
-    NAME_FUNC_OFFSET(16007, gl_dispatch_stub_896, gl_dispatch_stub_896, NULL, 896),
-    NAME_FUNC_OFFSET(16028, gl_dispatch_stub_897, gl_dispatch_stub_897, NULL, 897),
-    NAME_FUNC_OFFSET(16052, gl_dispatch_stub_898, gl_dispatch_stub_898, NULL, 898),
-    NAME_FUNC_OFFSET(16082, glBindFragDataLocationEXT, glBindFragDataLocationEXT, NULL, 899),
-    NAME_FUNC_OFFSET(16108, glGetFragDataLocationEXT, glGetFragDataLocationEXT, NULL, 900),
-    NAME_FUNC_OFFSET(16133, glGetUniformuivEXT, glGetUniformuivEXT, NULL, 901),
-    NAME_FUNC_OFFSET(16152, glGetVertexAttribIivEXT, glGetVertexAttribIivEXT, NULL, 902),
-    NAME_FUNC_OFFSET(16176, glGetVertexAttribIuivEXT, glGetVertexAttribIuivEXT, NULL, 903),
-    NAME_FUNC_OFFSET(16201, glUniform1uiEXT, glUniform1uiEXT, NULL, 904),
-    NAME_FUNC_OFFSET(16217, glUniform1uivEXT, glUniform1uivEXT, NULL, 905),
-    NAME_FUNC_OFFSET(16234, glUniform2uiEXT, glUniform2uiEXT, NULL, 906),
-    NAME_FUNC_OFFSET(16250, glUniform2uivEXT, glUniform2uivEXT, NULL, 907),
-    NAME_FUNC_OFFSET(16267, glUniform3uiEXT, glUniform3uiEXT, NULL, 908),
-    NAME_FUNC_OFFSET(16283, glUniform3uivEXT, glUniform3uivEXT, NULL, 909),
-    NAME_FUNC_OFFSET(16300, glUniform4uiEXT, glUniform4uiEXT, NULL, 910),
-    NAME_FUNC_OFFSET(16316, glUniform4uivEXT, glUniform4uivEXT, NULL, 911),
-    NAME_FUNC_OFFSET(16333, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL, 912),
-    NAME_FUNC_OFFSET(16354, glVertexAttribI1ivEXT, glVertexAttribI1ivEXT, NULL, 913),
-    NAME_FUNC_OFFSET(16376, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL, 914),
-    NAME_FUNC_OFFSET(16398, glVertexAttribI1uivEXT, glVertexAttribI1uivEXT, NULL, 915),
-    NAME_FUNC_OFFSET(16421, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL, 916),
-    NAME_FUNC_OFFSET(16442, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL, 917),
-    NAME_FUNC_OFFSET(16464, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL, 918),
-    NAME_FUNC_OFFSET(16486, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT, NULL, 919),
-    NAME_FUNC_OFFSET(16509, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL, 920),
-    NAME_FUNC_OFFSET(16530, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL, 921),
-    NAME_FUNC_OFFSET(16552, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL, 922),
-    NAME_FUNC_OFFSET(16574, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT, NULL, 923),
-    NAME_FUNC_OFFSET(16597, glVertexAttribI4bvEXT, glVertexAttribI4bvEXT, NULL, 924),
-    NAME_FUNC_OFFSET(16619, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL, 925),
-    NAME_FUNC_OFFSET(16640, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL, 926),
-    NAME_FUNC_OFFSET(16662, glVertexAttribI4svEXT, glVertexAttribI4svEXT, NULL, 927),
-    NAME_FUNC_OFFSET(16684, glVertexAttribI4ubvEXT, glVertexAttribI4ubvEXT, NULL, 928),
-    NAME_FUNC_OFFSET(16707, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL, 929),
-    NAME_FUNC_OFFSET(16729, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT, NULL, 930),
-    NAME_FUNC_OFFSET(16752, glVertexAttribI4usvEXT, glVertexAttribI4usvEXT, NULL, 931),
-    NAME_FUNC_OFFSET(16775, glVertexAttribIPointerEXT, glVertexAttribIPointerEXT, NULL, 932),
-    NAME_FUNC_OFFSET(16801, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, 933),
-    NAME_FUNC_OFFSET(16830, glColorMaskIndexedEXT, glColorMaskIndexedEXT, NULL, 934),
-    NAME_FUNC_OFFSET(16852, glDisableIndexedEXT, glDisableIndexedEXT, NULL, 935),
-    NAME_FUNC_OFFSET(16872, glEnableIndexedEXT, glEnableIndexedEXT, NULL, 936),
-    NAME_FUNC_OFFSET(16891, glGetBooleanIndexedvEXT, glGetBooleanIndexedvEXT, NULL, 937),
-    NAME_FUNC_OFFSET(16915, glGetIntegerIndexedvEXT, glGetIntegerIndexedvEXT, NULL, 938),
-    NAME_FUNC_OFFSET(16939, glIsEnabledIndexedEXT, glIsEnabledIndexedEXT, NULL, 939),
-    NAME_FUNC_OFFSET(16961, glClearColorIiEXT, glClearColorIiEXT, NULL, 940),
-    NAME_FUNC_OFFSET(16979, glClearColorIuiEXT, glClearColorIuiEXT, NULL, 941),
-    NAME_FUNC_OFFSET(16998, glGetTexParameterIivEXT, glGetTexParameterIivEXT, NULL, 942),
-    NAME_FUNC_OFFSET(17022, glGetTexParameterIuivEXT, glGetTexParameterIuivEXT, NULL, 943),
-    NAME_FUNC_OFFSET(17047, glTexParameterIivEXT, glTexParameterIivEXT, NULL, 944),
-    NAME_FUNC_OFFSET(17068, glTexParameterIuivEXT, glTexParameterIuivEXT, NULL, 945),
-    NAME_FUNC_OFFSET(17090, glBeginConditionalRenderNV, glBeginConditionalRenderNV, NULL, 946),
-    NAME_FUNC_OFFSET(17117, glEndConditionalRenderNV, glEndConditionalRenderNV, NULL, 947),
-    NAME_FUNC_OFFSET(17142, glBeginTransformFeedbackEXT, glBeginTransformFeedbackEXT, NULL, 948),
-    NAME_FUNC_OFFSET(17170, glBindBufferBaseEXT, glBindBufferBaseEXT, NULL, 949),
-    NAME_FUNC_OFFSET(17190, glBindBufferOffsetEXT, glBindBufferOffsetEXT, NULL, 950),
-    NAME_FUNC_OFFSET(17212, glBindBufferRangeEXT, glBindBufferRangeEXT, NULL, 951),
-    NAME_FUNC_OFFSET(17233, glEndTransformFeedbackEXT, glEndTransformFeedbackEXT, NULL, 952),
-    NAME_FUNC_OFFSET(17259, glGetTransformFeedbackVaryingEXT, glGetTransformFeedbackVaryingEXT, NULL, 953),
-    NAME_FUNC_OFFSET(17292, glTransformFeedbackVaryingsEXT, glTransformFeedbackVaryingsEXT, NULL, 954),
-    NAME_FUNC_OFFSET(17323, glProvokingVertexEXT, glProvokingVertexEXT, NULL, 955),
-    NAME_FUNC_OFFSET(17344, glGetObjectParameterivAPPLE, glGetObjectParameterivAPPLE, NULL, 956),
-    NAME_FUNC_OFFSET(17372, glObjectPurgeableAPPLE, glObjectPurgeableAPPLE, NULL, 957),
-    NAME_FUNC_OFFSET(17395, glObjectUnpurgeableAPPLE, glObjectUnpurgeableAPPLE, NULL, 958),
-    NAME_FUNC_OFFSET(17420, glActiveProgramEXT, glActiveProgramEXT, NULL, 959),
-    NAME_FUNC_OFFSET(17439, glCreateShaderProgramEXT, glCreateShaderProgramEXT, NULL, 960),
-    NAME_FUNC_OFFSET(17464, glUseShaderProgramEXT, glUseShaderProgramEXT, NULL, 961),
-    NAME_FUNC_OFFSET(17486, glTextureBarrierNV, glTextureBarrierNV, NULL, 962),
-    NAME_FUNC_OFFSET(17505, gl_dispatch_stub_963, gl_dispatch_stub_963, NULL, 963),
-    NAME_FUNC_OFFSET(17530, gl_dispatch_stub_964, gl_dispatch_stub_964, NULL, 964),
-    NAME_FUNC_OFFSET(17559, gl_dispatch_stub_965, gl_dispatch_stub_965, NULL, 965),
-    NAME_FUNC_OFFSET(17590, gl_dispatch_stub_966, gl_dispatch_stub_966, NULL, 966),
-    NAME_FUNC_OFFSET(17614, gl_dispatch_stub_967, gl_dispatch_stub_967, NULL, 967),
-    NAME_FUNC_OFFSET(17639, glEGLImageTargetRenderbufferStorageOES, glEGLImageTargetRenderbufferStorageOES, NULL, 968),
-    NAME_FUNC_OFFSET(17678, glEGLImageTargetTexture2DOES, glEGLImageTargetTexture2DOES, NULL, 969),
-    NAME_FUNC_OFFSET(17707, glArrayElement, glArrayElement, NULL, 306),
-    NAME_FUNC_OFFSET(17725, glBindTexture, glBindTexture, NULL, 307),
-    NAME_FUNC_OFFSET(17742, glDrawArrays, glDrawArrays, NULL, 310),
-    NAME_FUNC_OFFSET(17758, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, 322),
-    NAME_FUNC_OFFSET(17783, glCopyTexImage1D, glCopyTexImage1D, NULL, 323),
-    NAME_FUNC_OFFSET(17803, glCopyTexImage2D, glCopyTexImage2D, NULL, 324),
-    NAME_FUNC_OFFSET(17823, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, 325),
-    NAME_FUNC_OFFSET(17846, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, 326),
-    NAME_FUNC_OFFSET(17869, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, 327),
-    NAME_FUNC_OFFSET(17889, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, 328),
-    NAME_FUNC_OFFSET(17906, glGetPointerv, glGetPointerv, NULL, 329),
-    NAME_FUNC_OFFSET(17923, glIsTexture, glIsTextureEXT, glIsTextureEXT, 330),
-    NAME_FUNC_OFFSET(17938, glPrioritizeTextures, glPrioritizeTextures, NULL, 331),
-    NAME_FUNC_OFFSET(17962, glTexSubImage1D, glTexSubImage1D, NULL, 332),
-    NAME_FUNC_OFFSET(17981, glTexSubImage2D, glTexSubImage2D, NULL, 333),
-    NAME_FUNC_OFFSET(18000, glBlendColor, glBlendColor, NULL, 336),
-    NAME_FUNC_OFFSET(18016, glBlendEquation, glBlendEquation, NULL, 337),
-    NAME_FUNC_OFFSET(18035, glDrawRangeElements, glDrawRangeElements, NULL, 338),
-    NAME_FUNC_OFFSET(18058, glColorTable, glColorTable, NULL, 339),
-    NAME_FUNC_OFFSET(18074, glColorTable, glColorTable, NULL, 339),
-    NAME_FUNC_OFFSET(18090, glColorTableParameterfv, glColorTableParameterfv, NULL, 340),
-    NAME_FUNC_OFFSET(18117, glColorTableParameteriv, glColorTableParameteriv, NULL, 341),
-    NAME_FUNC_OFFSET(18144, glCopyColorTable, glCopyColorTable, NULL, 342),
-    NAME_FUNC_OFFSET(18164, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, 343),
-    NAME_FUNC_OFFSET(18183, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, 343),
-    NAME_FUNC_OFFSET(18202, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, 344),
-    NAME_FUNC_OFFSET(18232, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, 344),
-    NAME_FUNC_OFFSET(18262, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, 345),
-    NAME_FUNC_OFFSET(18292, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, 345),
-    NAME_FUNC_OFFSET(18322, glColorSubTable, glColorSubTable, NULL, 346),
-    NAME_FUNC_OFFSET(18341, glCopyColorSubTable, glCopyColorSubTable, NULL, 347),
-    NAME_FUNC_OFFSET(18364, glConvolutionFilter1D, glConvolutionFilter1D, NULL, 348),
-    NAME_FUNC_OFFSET(18389, glConvolutionFilter2D, glConvolutionFilter2D, NULL, 349),
-    NAME_FUNC_OFFSET(18414, glConvolutionParameterf, glConvolutionParameterf, NULL, 350),
-    NAME_FUNC_OFFSET(18441, glConvolutionParameterfv, glConvolutionParameterfv, NULL, 351),
-    NAME_FUNC_OFFSET(18469, glConvolutionParameteri, glConvolutionParameteri, NULL, 352),
-    NAME_FUNC_OFFSET(18496, glConvolutionParameteriv, glConvolutionParameteriv, NULL, 353),
-    NAME_FUNC_OFFSET(18524, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, 354),
-    NAME_FUNC_OFFSET(18553, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, 355),
-    NAME_FUNC_OFFSET(18582, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, 356),
-    NAME_FUNC_OFFSET(18608, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, 357),
-    NAME_FUNC_OFFSET(18639, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, 358),
-    NAME_FUNC_OFFSET(18670, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, 359),
-    NAME_FUNC_OFFSET(18694, glSeparableFilter2D, glSeparableFilter2D, NULL, 360),
-    NAME_FUNC_OFFSET(18717, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, 361),
-    NAME_FUNC_OFFSET(18735, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, 362),
-    NAME_FUNC_OFFSET(18764, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, 363),
-    NAME_FUNC_OFFSET(18793, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, 364),
-    NAME_FUNC_OFFSET(18808, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, 365),
-    NAME_FUNC_OFFSET(18834, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, 366),
-    NAME_FUNC_OFFSET(18860, glHistogram, glHistogram, NULL, 367),
-    NAME_FUNC_OFFSET(18875, glMinmax, glMinmax, NULL, 368),
-    NAME_FUNC_OFFSET(18887, glResetHistogram, glResetHistogram, NULL, 369),
-    NAME_FUNC_OFFSET(18907, glResetMinmax, glResetMinmax, NULL, 370),
-    NAME_FUNC_OFFSET(18924, glTexImage3D, glTexImage3D, NULL, 371),
-    NAME_FUNC_OFFSET(18940, glTexSubImage3D, glTexSubImage3D, NULL, 372),
-    NAME_FUNC_OFFSET(18959, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, 373),
-    NAME_FUNC_OFFSET(18982, glActiveTextureARB, glActiveTextureARB, NULL, 374),
-    NAME_FUNC_OFFSET(18998, glClientActiveTextureARB, glClientActiveTextureARB, NULL, 375),
-    NAME_FUNC_OFFSET(19020, glMultiTexCoord1dARB, glMultiTexCoord1dARB, NULL, 376),
-    NAME_FUNC_OFFSET(19038, glMultiTexCoord1dvARB, glMultiTexCoord1dvARB, NULL, 377),
-    NAME_FUNC_OFFSET(19057, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, 378),
-    NAME_FUNC_OFFSET(19075, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, 379),
-    NAME_FUNC_OFFSET(19094, glMultiTexCoord1iARB, glMultiTexCoord1iARB, NULL, 380),
-    NAME_FUNC_OFFSET(19112, glMultiTexCoord1ivARB, glMultiTexCoord1ivARB, NULL, 381),
-    NAME_FUNC_OFFSET(19131, glMultiTexCoord1sARB, glMultiTexCoord1sARB, NULL, 382),
-    NAME_FUNC_OFFSET(19149, glMultiTexCoord1svARB, glMultiTexCoord1svARB, NULL, 383),
-    NAME_FUNC_OFFSET(19168, glMultiTexCoord2dARB, glMultiTexCoord2dARB, NULL, 384),
-    NAME_FUNC_OFFSET(19186, glMultiTexCoord2dvARB, glMultiTexCoord2dvARB, NULL, 385),
-    NAME_FUNC_OFFSET(19205, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, 386),
-    NAME_FUNC_OFFSET(19223, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, 387),
-    NAME_FUNC_OFFSET(19242, glMultiTexCoord2iARB, glMultiTexCoord2iARB, NULL, 388),
-    NAME_FUNC_OFFSET(19260, glMultiTexCoord2ivARB, glMultiTexCoord2ivARB, NULL, 389),
-    NAME_FUNC_OFFSET(19279, glMultiTexCoord2sARB, glMultiTexCoord2sARB, NULL, 390),
-    NAME_FUNC_OFFSET(19297, glMultiTexCoord2svARB, glMultiTexCoord2svARB, NULL, 391),
-    NAME_FUNC_OFFSET(19316, glMultiTexCoord3dARB, glMultiTexCoord3dARB, NULL, 392),
-    NAME_FUNC_OFFSET(19334, glMultiTexCoord3dvARB, glMultiTexCoord3dvARB, NULL, 393),
-    NAME_FUNC_OFFSET(19353, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, 394),
-    NAME_FUNC_OFFSET(19371, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, 395),
-    NAME_FUNC_OFFSET(19390, glMultiTexCoord3iARB, glMultiTexCoord3iARB, NULL, 396),
-    NAME_FUNC_OFFSET(19408, glMultiTexCoord3ivARB, glMultiTexCoord3ivARB, NULL, 397),
-    NAME_FUNC_OFFSET(19427, glMultiTexCoord3sARB, glMultiTexCoord3sARB, NULL, 398),
-    NAME_FUNC_OFFSET(19445, glMultiTexCoord3svARB, glMultiTexCoord3svARB, NULL, 399),
-    NAME_FUNC_OFFSET(19464, glMultiTexCoord4dARB, glMultiTexCoord4dARB, NULL, 400),
-    NAME_FUNC_OFFSET(19482, glMultiTexCoord4dvARB, glMultiTexCoord4dvARB, NULL, 401),
-    NAME_FUNC_OFFSET(19501, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, 402),
-    NAME_FUNC_OFFSET(19519, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, 403),
-    NAME_FUNC_OFFSET(19538, glMultiTexCoord4iARB, glMultiTexCoord4iARB, NULL, 404),
-    NAME_FUNC_OFFSET(19556, glMultiTexCoord4ivARB, glMultiTexCoord4ivARB, NULL, 405),
-    NAME_FUNC_OFFSET(19575, glMultiTexCoord4sARB, glMultiTexCoord4sARB, NULL, 406),
-    NAME_FUNC_OFFSET(19593, glMultiTexCoord4svARB, glMultiTexCoord4svARB, NULL, 407),
-    NAME_FUNC_OFFSET(19612, glStencilOpSeparate, glStencilOpSeparate, NULL, 423),
-    NAME_FUNC_OFFSET(19635, glLoadTransposeMatrixdARB, glLoadTransposeMatrixdARB, NULL, 440),
-    NAME_FUNC_OFFSET(19658, glLoadTransposeMatrixfARB, glLoadTransposeMatrixfARB, NULL, 441),
-    NAME_FUNC_OFFSET(19681, glMultTransposeMatrixdARB, glMultTransposeMatrixdARB, NULL, 442),
-    NAME_FUNC_OFFSET(19704, glMultTransposeMatrixfARB, glMultTransposeMatrixfARB, NULL, 443),
-    NAME_FUNC_OFFSET(19727, glSampleCoverageARB, glSampleCoverageARB, NULL, 444),
-    NAME_FUNC_OFFSET(19744, glCompressedTexImage1DARB, glCompressedTexImage1DARB, NULL, 445),
-    NAME_FUNC_OFFSET(19767, glCompressedTexImage2DARB, glCompressedTexImage2DARB, NULL, 446),
-    NAME_FUNC_OFFSET(19790, glCompressedTexImage3DARB, glCompressedTexImage3DARB, NULL, 447),
-    NAME_FUNC_OFFSET(19813, glCompressedTexSubImage1DARB, glCompressedTexSubImage1DARB, NULL, 448),
-    NAME_FUNC_OFFSET(19839, glCompressedTexSubImage2DARB, glCompressedTexSubImage2DARB, NULL, 449),
-    NAME_FUNC_OFFSET(19865, glCompressedTexSubImage3DARB, glCompressedTexSubImage3DARB, NULL, 450),
-    NAME_FUNC_OFFSET(19891, glGetCompressedTexImageARB, glGetCompressedTexImageARB, NULL, 451),
-    NAME_FUNC_OFFSET(19915, glDisableVertexAttribArrayARB, glDisableVertexAttribArrayARB, NULL, 452),
-    NAME_FUNC_OFFSET(19942, glEnableVertexAttribArrayARB, glEnableVertexAttribArrayARB, NULL, 453),
-    NAME_FUNC_OFFSET(19968, glGetVertexAttribdvARB, glGetVertexAttribdvARB, NULL, 460),
-    NAME_FUNC_OFFSET(19988, glGetVertexAttribfvARB, glGetVertexAttribfvARB, NULL, 461),
-    NAME_FUNC_OFFSET(20008, glGetVertexAttribivARB, glGetVertexAttribivARB, NULL, 462),
-    NAME_FUNC_OFFSET(20028, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, 463),
-    NAME_FUNC_OFFSET(20051, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, 464),
-    NAME_FUNC_OFFSET(20075, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, 465),
-    NAME_FUNC_OFFSET(20098, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, 466),
-    NAME_FUNC_OFFSET(20122, glVertexAttrib1dARB, glVertexAttrib1dARB, NULL, 472),
-    NAME_FUNC_OFFSET(20139, glVertexAttrib1dvARB, glVertexAttrib1dvARB, NULL, 473),
-    NAME_FUNC_OFFSET(20157, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, 474),
-    NAME_FUNC_OFFSET(20174, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, 475),
-    NAME_FUNC_OFFSET(20192, glVertexAttrib1sARB, glVertexAttrib1sARB, NULL, 476),
-    NAME_FUNC_OFFSET(20209, glVertexAttrib1svARB, glVertexAttrib1svARB, NULL, 477),
-    NAME_FUNC_OFFSET(20227, glVertexAttrib2dARB, glVertexAttrib2dARB, NULL, 478),
-    NAME_FUNC_OFFSET(20244, glVertexAttrib2dvARB, glVertexAttrib2dvARB, NULL, 479),
-    NAME_FUNC_OFFSET(20262, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, 480),
-    NAME_FUNC_OFFSET(20279, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, 481),
-    NAME_FUNC_OFFSET(20297, glVertexAttrib2sARB, glVertexAttrib2sARB, NULL, 482),
-    NAME_FUNC_OFFSET(20314, glVertexAttrib2svARB, glVertexAttrib2svARB, NULL, 483),
-    NAME_FUNC_OFFSET(20332, glVertexAttrib3dARB, glVertexAttrib3dARB, NULL, 484),
-    NAME_FUNC_OFFSET(20349, glVertexAttrib3dvARB, glVertexAttrib3dvARB, NULL, 485),
-    NAME_FUNC_OFFSET(20367, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, 486),
-    NAME_FUNC_OFFSET(20384, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, 487),
-    NAME_FUNC_OFFSET(20402, glVertexAttrib3sARB, glVertexAttrib3sARB, NULL, 488),
-    NAME_FUNC_OFFSET(20419, glVertexAttrib3svARB, glVertexAttrib3svARB, NULL, 489),
-    NAME_FUNC_OFFSET(20437, glVertexAttrib4NbvARB, glVertexAttrib4NbvARB, NULL, 490),
-    NAME_FUNC_OFFSET(20456, glVertexAttrib4NivARB, glVertexAttrib4NivARB, NULL, 491),
-    NAME_FUNC_OFFSET(20475, glVertexAttrib4NsvARB, glVertexAttrib4NsvARB, NULL, 492),
-    NAME_FUNC_OFFSET(20494, glVertexAttrib4NubARB, glVertexAttrib4NubARB, NULL, 493),
-    NAME_FUNC_OFFSET(20513, glVertexAttrib4NubvARB, glVertexAttrib4NubvARB, NULL, 494),
-    NAME_FUNC_OFFSET(20533, glVertexAttrib4NuivARB, glVertexAttrib4NuivARB, NULL, 495),
-    NAME_FUNC_OFFSET(20553, glVertexAttrib4NusvARB, glVertexAttrib4NusvARB, NULL, 496),
-    NAME_FUNC_OFFSET(20573, glVertexAttrib4bvARB, glVertexAttrib4bvARB, NULL, 497),
-    NAME_FUNC_OFFSET(20591, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL, 498),
-    NAME_FUNC_OFFSET(20608, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL, 499),
-    NAME_FUNC_OFFSET(20626, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, 500),
-    NAME_FUNC_OFFSET(20643, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, 501),
-    NAME_FUNC_OFFSET(20661, glVertexAttrib4ivARB, glVertexAttrib4ivARB, NULL, 502),
-    NAME_FUNC_OFFSET(20679, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL, 503),
-    NAME_FUNC_OFFSET(20696, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL, 504),
-    NAME_FUNC_OFFSET(20714, glVertexAttrib4ubvARB, glVertexAttrib4ubvARB, NULL, 505),
-    NAME_FUNC_OFFSET(20733, glVertexAttrib4uivARB, glVertexAttrib4uivARB, NULL, 506),
-    NAME_FUNC_OFFSET(20752, glVertexAttrib4usvARB, glVertexAttrib4usvARB, NULL, 507),
-    NAME_FUNC_OFFSET(20771, glVertexAttribPointerARB, glVertexAttribPointerARB, NULL, 508),
-    NAME_FUNC_OFFSET(20793, glBindBufferARB, glBindBufferARB, NULL, 509),
-    NAME_FUNC_OFFSET(20806, glBufferDataARB, glBufferDataARB, NULL, 510),
-    NAME_FUNC_OFFSET(20819, glBufferSubDataARB, glBufferSubDataARB, NULL, 511),
-    NAME_FUNC_OFFSET(20835, glDeleteBuffersARB, glDeleteBuffersARB, NULL, 512),
-    NAME_FUNC_OFFSET(20851, glGenBuffersARB, glGenBuffersARB, NULL, 513),
-    NAME_FUNC_OFFSET(20864, glGetBufferParameterivARB, glGetBufferParameterivARB, NULL, 514),
-    NAME_FUNC_OFFSET(20887, glGetBufferPointervARB, glGetBufferPointervARB, NULL, 515),
-    NAME_FUNC_OFFSET(20907, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL, 516),
-    NAME_FUNC_OFFSET(20926, glIsBufferARB, glIsBufferARB, NULL, 517),
-    NAME_FUNC_OFFSET(20937, glMapBufferARB, glMapBufferARB, NULL, 518),
-    NAME_FUNC_OFFSET(20949, glUnmapBufferARB, glUnmapBufferARB, NULL, 519),
-    NAME_FUNC_OFFSET(20963, glBeginQueryARB, glBeginQueryARB, NULL, 520),
-    NAME_FUNC_OFFSET(20976, glDeleteQueriesARB, glDeleteQueriesARB, NULL, 521),
-    NAME_FUNC_OFFSET(20992, glEndQueryARB, glEndQueryARB, NULL, 522),
-    NAME_FUNC_OFFSET(21003, glGenQueriesARB, glGenQueriesARB, NULL, 523),
-    NAME_FUNC_OFFSET(21016, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL, 524),
-    NAME_FUNC_OFFSET(21035, glGetQueryObjectuivARB, glGetQueryObjectuivARB, NULL, 525),
-    NAME_FUNC_OFFSET(21055, glGetQueryivARB, glGetQueryivARB, NULL, 526),
-    NAME_FUNC_OFFSET(21068, glIsQueryARB, glIsQueryARB, NULL, 527),
-    NAME_FUNC_OFFSET(21078, glCompileShaderARB, glCompileShaderARB, NULL, 529),
-    NAME_FUNC_OFFSET(21094, glGetActiveUniformARB, glGetActiveUniformARB, NULL, 534),
-    NAME_FUNC_OFFSET(21113, glGetShaderSourceARB, glGetShaderSourceARB, NULL, 540),
-    NAME_FUNC_OFFSET(21131, glGetUniformLocationARB, glGetUniformLocationARB, NULL, 541),
-    NAME_FUNC_OFFSET(21152, glGetUniformfvARB, glGetUniformfvARB, NULL, 542),
-    NAME_FUNC_OFFSET(21167, glGetUniformivARB, glGetUniformivARB, NULL, 543),
-    NAME_FUNC_OFFSET(21182, glLinkProgramARB, glLinkProgramARB, NULL, 544),
-    NAME_FUNC_OFFSET(21196, glShaderSourceARB, glShaderSourceARB, NULL, 545),
-    NAME_FUNC_OFFSET(21211, glUniform1fARB, glUniform1fARB, NULL, 546),
-    NAME_FUNC_OFFSET(21223, glUniform1fvARB, glUniform1fvARB, NULL, 547),
-    NAME_FUNC_OFFSET(21236, glUniform1iARB, glUniform1iARB, NULL, 548),
-    NAME_FUNC_OFFSET(21248, glUniform1ivARB, glUniform1ivARB, NULL, 549),
-    NAME_FUNC_OFFSET(21261, glUniform2fARB, glUniform2fARB, NULL, 550),
-    NAME_FUNC_OFFSET(21273, glUniform2fvARB, glUniform2fvARB, NULL, 551),
-    NAME_FUNC_OFFSET(21286, glUniform2iARB, glUniform2iARB, NULL, 552),
-    NAME_FUNC_OFFSET(21298, glUniform2ivARB, glUniform2ivARB, NULL, 553),
-    NAME_FUNC_OFFSET(21311, glUniform3fARB, glUniform3fARB, NULL, 554),
-    NAME_FUNC_OFFSET(21323, glUniform3fvARB, glUniform3fvARB, NULL, 555),
-    NAME_FUNC_OFFSET(21336, glUniform3iARB, glUniform3iARB, NULL, 556),
-    NAME_FUNC_OFFSET(21348, glUniform3ivARB, glUniform3ivARB, NULL, 557),
-    NAME_FUNC_OFFSET(21361, glUniform4fARB, glUniform4fARB, NULL, 558),
-    NAME_FUNC_OFFSET(21373, glUniform4fvARB, glUniform4fvARB, NULL, 559),
-    NAME_FUNC_OFFSET(21386, glUniform4iARB, glUniform4iARB, NULL, 560),
-    NAME_FUNC_OFFSET(21398, glUniform4ivARB, glUniform4ivARB, NULL, 561),
-    NAME_FUNC_OFFSET(21411, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL, 562),
-    NAME_FUNC_OFFSET(21430, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL, 563),
-    NAME_FUNC_OFFSET(21449, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL, 564),
-    NAME_FUNC_OFFSET(21468, glUseProgramObjectARB, glUseProgramObjectARB, NULL, 565),
-    NAME_FUNC_OFFSET(21481, glValidateProgramARB, glValidateProgramARB, NULL, 566),
-    NAME_FUNC_OFFSET(21499, glBindAttribLocationARB, glBindAttribLocationARB, NULL, 567),
-    NAME_FUNC_OFFSET(21520, glGetActiveAttribARB, glGetActiveAttribARB, NULL, 568),
-    NAME_FUNC_OFFSET(21538, glGetAttribLocationARB, glGetAttribLocationARB, NULL, 569),
-    NAME_FUNC_OFFSET(21558, glDrawBuffersARB, glDrawBuffersARB, NULL, 570),
-    NAME_FUNC_OFFSET(21572, glDrawBuffersARB, glDrawBuffersARB, NULL, 570),
-    NAME_FUNC_OFFSET(21589, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 572),
-    NAME_FUNC_OFFSET(21614, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 572),
-    NAME_FUNC_OFFSET(21636, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 573),
-    NAME_FUNC_OFFSET(21663, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 573),
-    NAME_FUNC_OFFSET(21687, glRenderbufferStorageMultisample, glRenderbufferStorageMultisample, NULL, 574),
-    NAME_FUNC_OFFSET(21723, glTexBufferARB, glTexBufferARB, NULL, 581),
-    NAME_FUNC_OFFSET(21735, glBlendEquationSeparateiARB, glBlendEquationSeparateiARB, NULL, 603),
-    NAME_FUNC_OFFSET(21769, glBlendEquationiARB, glBlendEquationiARB, NULL, 604),
-    NAME_FUNC_OFFSET(21795, glBlendFuncSeparateiARB, glBlendFuncSeparateiARB, NULL, 605),
-    NAME_FUNC_OFFSET(21825, glBlendFunciARB, glBlendFunciARB, NULL, 606),
-    NAME_FUNC_OFFSET(21847, gl_dispatch_stub_720, gl_dispatch_stub_720, NULL, 720),
-    NAME_FUNC_OFFSET(21863, gl_dispatch_stub_721, gl_dispatch_stub_721, NULL, 721),
-    NAME_FUNC_OFFSET(21882, glPointParameterfEXT, glPointParameterfEXT, NULL, 728),
-    NAME_FUNC_OFFSET(21900, glPointParameterfEXT, glPointParameterfEXT, NULL, 728),
-    NAME_FUNC_OFFSET(21921, glPointParameterfEXT, glPointParameterfEXT, NULL, 728),
-    NAME_FUNC_OFFSET(21943, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 729),
-    NAME_FUNC_OFFSET(21962, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 729),
-    NAME_FUNC_OFFSET(21984, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 729),
-    NAME_FUNC_OFFSET(22007, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, 732),
-    NAME_FUNC_OFFSET(22026, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, 733),
-    NAME_FUNC_OFFSET(22046, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, 734),
-    NAME_FUNC_OFFSET(22065, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, 735),
-    NAME_FUNC_OFFSET(22085, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, 736),
-    NAME_FUNC_OFFSET(22104, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, 737),
-    NAME_FUNC_OFFSET(22124, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, 738),
-    NAME_FUNC_OFFSET(22143, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, 739),
-    NAME_FUNC_OFFSET(22163, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, 740),
-    NAME_FUNC_OFFSET(22182, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, 741),
-    NAME_FUNC_OFFSET(22202, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, 742),
-    NAME_FUNC_OFFSET(22222, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, 743),
-    NAME_FUNC_OFFSET(22243, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, 744),
-    NAME_FUNC_OFFSET(22263, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, 745),
-    NAME_FUNC_OFFSET(22284, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, 746),
-    NAME_FUNC_OFFSET(22304, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, 747),
-    NAME_FUNC_OFFSET(22325, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, 748),
-    NAME_FUNC_OFFSET(22349, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, 749),
-    NAME_FUNC_OFFSET(22367, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, 750),
-    NAME_FUNC_OFFSET(22387, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, 751),
-    NAME_FUNC_OFFSET(22405, glFogCoorddEXT, glFogCoorddEXT, NULL, 752),
-    NAME_FUNC_OFFSET(22417, glFogCoorddvEXT, glFogCoorddvEXT, NULL, 753),
-    NAME_FUNC_OFFSET(22430, glFogCoordfEXT, glFogCoordfEXT, NULL, 754),
-    NAME_FUNC_OFFSET(22442, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 755),
-    NAME_FUNC_OFFSET(22455, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, 756),
-    NAME_FUNC_OFFSET(22475, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, 756),
-    NAME_FUNC_OFFSET(22499, glWindowPos2dMESA, glWindowPos2dMESA, NULL, 758),
-    NAME_FUNC_OFFSET(22513, glWindowPos2dMESA, glWindowPos2dMESA, NULL, 758),
-    NAME_FUNC_OFFSET(22530, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, 759),
-    NAME_FUNC_OFFSET(22545, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, 759),
-    NAME_FUNC_OFFSET(22563, glWindowPos2fMESA, glWindowPos2fMESA, NULL, 760),
-    NAME_FUNC_OFFSET(22577, glWindowPos2fMESA, glWindowPos2fMESA, NULL, 760),
-    NAME_FUNC_OFFSET(22594, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, 761),
-    NAME_FUNC_OFFSET(22609, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, 761),
-    NAME_FUNC_OFFSET(22627, glWindowPos2iMESA, glWindowPos2iMESA, NULL, 762),
-    NAME_FUNC_OFFSET(22641, glWindowPos2iMESA, glWindowPos2iMESA, NULL, 762),
-    NAME_FUNC_OFFSET(22658, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, 763),
-    NAME_FUNC_OFFSET(22673, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, 763),
-    NAME_FUNC_OFFSET(22691, glWindowPos2sMESA, glWindowPos2sMESA, NULL, 764),
-    NAME_FUNC_OFFSET(22705, glWindowPos2sMESA, glWindowPos2sMESA, NULL, 764),
-    NAME_FUNC_OFFSET(22722, glWindowPos2svMESA, glWindowPos2svMESA, NULL, 765),
-    NAME_FUNC_OFFSET(22737, glWindowPos2svMESA, glWindowPos2svMESA, NULL, 765),
-    NAME_FUNC_OFFSET(22755, glWindowPos3dMESA, glWindowPos3dMESA, NULL, 766),
-    NAME_FUNC_OFFSET(22769, glWindowPos3dMESA, glWindowPos3dMESA, NULL, 766),
-    NAME_FUNC_OFFSET(22786, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, 767),
-    NAME_FUNC_OFFSET(22801, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, 767),
-    NAME_FUNC_OFFSET(22819, glWindowPos3fMESA, glWindowPos3fMESA, NULL, 768),
-    NAME_FUNC_OFFSET(22833, glWindowPos3fMESA, glWindowPos3fMESA, NULL, 768),
-    NAME_FUNC_OFFSET(22850, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, 769),
-    NAME_FUNC_OFFSET(22865, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, 769),
-    NAME_FUNC_OFFSET(22883, glWindowPos3iMESA, glWindowPos3iMESA, NULL, 770),
-    NAME_FUNC_OFFSET(22897, glWindowPos3iMESA, glWindowPos3iMESA, NULL, 770),
-    NAME_FUNC_OFFSET(22914, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, 771),
-    NAME_FUNC_OFFSET(22929, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, 771),
-    NAME_FUNC_OFFSET(22947, glWindowPos3sMESA, glWindowPos3sMESA, NULL, 772),
-    NAME_FUNC_OFFSET(22961, glWindowPos3sMESA, glWindowPos3sMESA, NULL, 772),
-    NAME_FUNC_OFFSET(22978, glWindowPos3svMESA, glWindowPos3svMESA, NULL, 773),
-    NAME_FUNC_OFFSET(22993, glWindowPos3svMESA, glWindowPos3svMESA, NULL, 773),
-    NAME_FUNC_OFFSET(23011, glBindProgramNV, glBindProgramNV, NULL, 785),
-    NAME_FUNC_OFFSET(23028, glDeleteProgramsNV, glDeleteProgramsNV, NULL, 786),
-    NAME_FUNC_OFFSET(23048, glGenProgramsNV, glGenProgramsNV, NULL, 788),
-    NAME_FUNC_OFFSET(23065, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, 794),
-    NAME_FUNC_OFFSET(23091, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, 794),
-    NAME_FUNC_OFFSET(23120, glIsProgramNV, glIsProgramNV, NULL, 798),
-    NAME_FUNC_OFFSET(23135, glPointParameteriNV, glPointParameteriNV, NULL, 862),
-    NAME_FUNC_OFFSET(23153, glPointParameterivNV, glPointParameterivNV, NULL, 863),
-    NAME_FUNC_OFFSET(23172, gl_dispatch_stub_866, gl_dispatch_stub_866, NULL, 866),
-    NAME_FUNC_OFFSET(23193, gl_dispatch_stub_868, gl_dispatch_stub_868, NULL, 868),
-    NAME_FUNC_OFFSET(23209, glPrimitiveRestartIndexNV, glPrimitiveRestartIndexNV, NULL, 875),
-    NAME_FUNC_OFFSET(23233, gl_dispatch_stub_878, gl_dispatch_stub_878, NULL, 878),
-    NAME_FUNC_OFFSET(23257, gl_dispatch_stub_878, gl_dispatch_stub_878, NULL, 878),
-    NAME_FUNC_OFFSET(23284, glBindFramebufferEXT, glBindFramebufferEXT, NULL, 879),
-    NAME_FUNC_OFFSET(23302, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, 880),
-    NAME_FUNC_OFFSET(23321, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, 881),
-    NAME_FUNC_OFFSET(23346, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, 882),
-    NAME_FUNC_OFFSET(23367, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, 883),
-    NAME_FUNC_OFFSET(23389, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, 884),
-    NAME_FUNC_OFFSET(23415, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, 885),
-    NAME_FUNC_OFFSET(23438, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, 886),
-    NAME_FUNC_OFFSET(23461, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, 887),
-    NAME_FUNC_OFFSET(23484, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, 888),
-    NAME_FUNC_OFFSET(23502, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, 889),
-    NAME_FUNC_OFFSET(23521, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, 890),
-    NAME_FUNC_OFFSET(23538, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, 891),
-    NAME_FUNC_OFFSET(23576, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, 892),
-    NAME_FUNC_OFFSET(23605, glIsFramebufferEXT, glIsFramebufferEXT, NULL, 893),
-    NAME_FUNC_OFFSET(23621, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, 894),
-    NAME_FUNC_OFFSET(23638, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, 895),
-    NAME_FUNC_OFFSET(23660, gl_dispatch_stub_896, gl_dispatch_stub_896, NULL, 896),
-    NAME_FUNC_OFFSET(23678, glBindFragDataLocationEXT, glBindFragDataLocationEXT, NULL, 899),
-    NAME_FUNC_OFFSET(23701, glGetFragDataLocationEXT, glGetFragDataLocationEXT, NULL, 900),
-    NAME_FUNC_OFFSET(23723, glGetUniformuivEXT, glGetUniformuivEXT, NULL, 901),
-    NAME_FUNC_OFFSET(23739, glGetVertexAttribIivEXT, glGetVertexAttribIivEXT, NULL, 902),
-    NAME_FUNC_OFFSET(23760, glGetVertexAttribIuivEXT, glGetVertexAttribIuivEXT, NULL, 903),
-    NAME_FUNC_OFFSET(23782, glUniform1uiEXT, glUniform1uiEXT, NULL, 904),
-    NAME_FUNC_OFFSET(23795, glUniform1uivEXT, glUniform1uivEXT, NULL, 905),
-    NAME_FUNC_OFFSET(23809, glUniform2uiEXT, glUniform2uiEXT, NULL, 906),
-    NAME_FUNC_OFFSET(23822, glUniform2uivEXT, glUniform2uivEXT, NULL, 907),
-    NAME_FUNC_OFFSET(23836, glUniform3uiEXT, glUniform3uiEXT, NULL, 908),
-    NAME_FUNC_OFFSET(23849, glUniform3uivEXT, glUniform3uivEXT, NULL, 909),
-    NAME_FUNC_OFFSET(23863, glUniform4uiEXT, glUniform4uiEXT, NULL, 910),
-    NAME_FUNC_OFFSET(23876, glUniform4uivEXT, glUniform4uivEXT, NULL, 911),
-    NAME_FUNC_OFFSET(23890, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL, 912),
-    NAME_FUNC_OFFSET(23908, glVertexAttribI1ivEXT, glVertexAttribI1ivEXT, NULL, 913),
-    NAME_FUNC_OFFSET(23927, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL, 914),
-    NAME_FUNC_OFFSET(23946, glVertexAttribI1uivEXT, glVertexAttribI1uivEXT, NULL, 915),
-    NAME_FUNC_OFFSET(23966, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL, 916),
-    NAME_FUNC_OFFSET(23984, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL, 917),
-    NAME_FUNC_OFFSET(24003, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL, 918),
-    NAME_FUNC_OFFSET(24022, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT, NULL, 919),
-    NAME_FUNC_OFFSET(24042, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL, 920),
-    NAME_FUNC_OFFSET(24060, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL, 921),
-    NAME_FUNC_OFFSET(24079, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL, 922),
-    NAME_FUNC_OFFSET(24098, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT, NULL, 923),
-    NAME_FUNC_OFFSET(24118, glVertexAttribI4bvEXT, glVertexAttribI4bvEXT, NULL, 924),
-    NAME_FUNC_OFFSET(24137, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL, 925),
-    NAME_FUNC_OFFSET(24155, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL, 926),
-    NAME_FUNC_OFFSET(24174, glVertexAttribI4svEXT, glVertexAttribI4svEXT, NULL, 927),
-    NAME_FUNC_OFFSET(24193, glVertexAttribI4ubvEXT, glVertexAttribI4ubvEXT, NULL, 928),
-    NAME_FUNC_OFFSET(24213, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL, 929),
-    NAME_FUNC_OFFSET(24232, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT, NULL, 930),
-    NAME_FUNC_OFFSET(24252, glVertexAttribI4usvEXT, glVertexAttribI4usvEXT, NULL, 931),
-    NAME_FUNC_OFFSET(24272, glVertexAttribIPointerEXT, glVertexAttribIPointerEXT, NULL, 932),
-    NAME_FUNC_OFFSET(24295, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, 933),
-    NAME_FUNC_OFFSET(24321, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, 933),
-    NAME_FUNC_OFFSET(24350, glColorMaskIndexedEXT, glColorMaskIndexedEXT, NULL, 934),
-    NAME_FUNC_OFFSET(24363, glDisableIndexedEXT, glDisableIndexedEXT, NULL, 935),
-    NAME_FUNC_OFFSET(24374, glEnableIndexedEXT, glEnableIndexedEXT, NULL, 936),
-    NAME_FUNC_OFFSET(24384, glGetBooleanIndexedvEXT, glGetBooleanIndexedvEXT, NULL, 937),
-    NAME_FUNC_OFFSET(24400, glGetIntegerIndexedvEXT, glGetIntegerIndexedvEXT, NULL, 938),
-    NAME_FUNC_OFFSET(24416, glIsEnabledIndexedEXT, glIsEnabledIndexedEXT, NULL, 939),
-    NAME_FUNC_OFFSET(24429, glGetTexParameterIivEXT, glGetTexParameterIivEXT, NULL, 942),
-    NAME_FUNC_OFFSET(24450, glGetTexParameterIuivEXT, glGetTexParameterIuivEXT, NULL, 943),
-    NAME_FUNC_OFFSET(24472, glTexParameterIivEXT, glTexParameterIivEXT, NULL, 944),
-    NAME_FUNC_OFFSET(24490, glTexParameterIuivEXT, glTexParameterIuivEXT, NULL, 945),
-    NAME_FUNC_OFFSET(24509, glBeginConditionalRenderNV, glBeginConditionalRenderNV, NULL, 946),
-    NAME_FUNC_OFFSET(24534, glEndConditionalRenderNV, glEndConditionalRenderNV, NULL, 947),
-    NAME_FUNC_OFFSET(24557, glBeginTransformFeedbackEXT, glBeginTransformFeedbackEXT, NULL, 948),
-    NAME_FUNC_OFFSET(24582, glBindBufferBaseEXT, glBindBufferBaseEXT, NULL, 949),
-    NAME_FUNC_OFFSET(24599, glBindBufferRangeEXT, glBindBufferRangeEXT, NULL, 951),
-    NAME_FUNC_OFFSET(24617, glEndTransformFeedbackEXT, glEndTransformFeedbackEXT, NULL, 952),
-    NAME_FUNC_OFFSET(24640, glGetTransformFeedbackVaryingEXT, glGetTransformFeedbackVaryingEXT, NULL, 953),
-    NAME_FUNC_OFFSET(24670, glTransformFeedbackVaryingsEXT, glTransformFeedbackVaryingsEXT, NULL, 954),
-    NAME_FUNC_OFFSET(24698, glProvokingVertexEXT, glProvokingVertexEXT, NULL, 955),
-    NAME_FUNC_OFFSET(24716, gl_dispatch_stub_966, gl_dispatch_stub_966, NULL, 966),
-    NAME_FUNC_OFFSET(24737, gl_dispatch_stub_967, gl_dispatch_stub_967, NULL, 967),
+    NAME_FUNC_OFFSET( 6163, glClearBufferfi, glClearBufferfi, NULL, 430),
+    NAME_FUNC_OFFSET( 6179, glClearBufferfv, glClearBufferfv, NULL, 431),
+    NAME_FUNC_OFFSET( 6195, glClearBufferiv, glClearBufferiv, NULL, 432),
+    NAME_FUNC_OFFSET( 6211, glClearBufferuiv, glClearBufferuiv, NULL, 433),
+    NAME_FUNC_OFFSET( 6228, glGetStringi, glGetStringi, NULL, 434),
+    NAME_FUNC_OFFSET( 6241, glFramebufferTexture, glFramebufferTexture, NULL, 435),
+    NAME_FUNC_OFFSET( 6262, glGetBufferParameteri64v, glGetBufferParameteri64v, NULL, 436),
+    NAME_FUNC_OFFSET( 6287, glGetInteger64i_v, glGetInteger64i_v, NULL, 437),
+    NAME_FUNC_OFFSET( 6305, glLoadTransposeMatrixdARB, glLoadTransposeMatrixdARB, NULL, 438),
+    NAME_FUNC_OFFSET( 6331, glLoadTransposeMatrixfARB, glLoadTransposeMatrixfARB, NULL, 439),
+    NAME_FUNC_OFFSET( 6357, glMultTransposeMatrixdARB, glMultTransposeMatrixdARB, NULL, 440),
+    NAME_FUNC_OFFSET( 6383, glMultTransposeMatrixfARB, glMultTransposeMatrixfARB, NULL, 441),
+    NAME_FUNC_OFFSET( 6409, glSampleCoverageARB, glSampleCoverageARB, NULL, 442),
+    NAME_FUNC_OFFSET( 6429, glCompressedTexImage1DARB, glCompressedTexImage1DARB, NULL, 443),
+    NAME_FUNC_OFFSET( 6455, glCompressedTexImage2DARB, glCompressedTexImage2DARB, NULL, 444),
+    NAME_FUNC_OFFSET( 6481, glCompressedTexImage3DARB, glCompressedTexImage3DARB, NULL, 445),
+    NAME_FUNC_OFFSET( 6507, glCompressedTexSubImage1DARB, glCompressedTexSubImage1DARB, NULL, 446),
+    NAME_FUNC_OFFSET( 6536, glCompressedTexSubImage2DARB, glCompressedTexSubImage2DARB, NULL, 447),
+    NAME_FUNC_OFFSET( 6565, glCompressedTexSubImage3DARB, glCompressedTexSubImage3DARB, NULL, 448),
+    NAME_FUNC_OFFSET( 6594, glGetCompressedTexImageARB, glGetCompressedTexImageARB, NULL, 449),
+    NAME_FUNC_OFFSET( 6621, glDisableVertexAttribArrayARB, glDisableVertexAttribArrayARB, NULL, 450),
+    NAME_FUNC_OFFSET( 6651, glEnableVertexAttribArrayARB, glEnableVertexAttribArrayARB, NULL, 451),
+    NAME_FUNC_OFFSET( 6680, glGetProgramEnvParameterdvARB, glGetProgramEnvParameterdvARB, NULL, 452),
+    NAME_FUNC_OFFSET( 6710, glGetProgramEnvParameterfvARB, glGetProgramEnvParameterfvARB, NULL, 453),
+    NAME_FUNC_OFFSET( 6740, glGetProgramLocalParameterdvARB, glGetProgramLocalParameterdvARB, NULL, 454),
+    NAME_FUNC_OFFSET( 6772, glGetProgramLocalParameterfvARB, glGetProgramLocalParameterfvARB, NULL, 455),
+    NAME_FUNC_OFFSET( 6804, glGetProgramStringARB, glGetProgramStringARB, NULL, 456),
+    NAME_FUNC_OFFSET( 6826, glGetProgramivARB, glGetProgramivARB, NULL, 457),
+    NAME_FUNC_OFFSET( 6844, glGetVertexAttribdvARB, glGetVertexAttribdvARB, NULL, 458),
+    NAME_FUNC_OFFSET( 6867, glGetVertexAttribfvARB, glGetVertexAttribfvARB, NULL, 459),
+    NAME_FUNC_OFFSET( 6890, glGetVertexAttribivARB, glGetVertexAttribivARB, NULL, 460),
+    NAME_FUNC_OFFSET( 6913, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, 461),
+    NAME_FUNC_OFFSET( 6940, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, 462),
+    NAME_FUNC_OFFSET( 6968, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, 463),
+    NAME_FUNC_OFFSET( 6995, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, 464),
+    NAME_FUNC_OFFSET( 7023, glProgramLocalParameter4dARB, glProgramLocalParameter4dARB, NULL, 465),
+    NAME_FUNC_OFFSET( 7052, glProgramLocalParameter4dvARB, glProgramLocalParameter4dvARB, NULL, 466),
+    NAME_FUNC_OFFSET( 7082, glProgramLocalParameter4fARB, glProgramLocalParameter4fARB, NULL, 467),
+    NAME_FUNC_OFFSET( 7111, glProgramLocalParameter4fvARB, glProgramLocalParameter4fvARB, NULL, 468),
+    NAME_FUNC_OFFSET( 7141, glProgramStringARB, glProgramStringARB, NULL, 469),
+    NAME_FUNC_OFFSET( 7160, glVertexAttrib1dARB, glVertexAttrib1dARB, NULL, 470),
+    NAME_FUNC_OFFSET( 7180, glVertexAttrib1dvARB, glVertexAttrib1dvARB, NULL, 471),
+    NAME_FUNC_OFFSET( 7201, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, 472),
+    NAME_FUNC_OFFSET( 7221, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, 473),
+    NAME_FUNC_OFFSET( 7242, glVertexAttrib1sARB, glVertexAttrib1sARB, NULL, 474),
+    NAME_FUNC_OFFSET( 7262, glVertexAttrib1svARB, glVertexAttrib1svARB, NULL, 475),
+    NAME_FUNC_OFFSET( 7283, glVertexAttrib2dARB, glVertexAttrib2dARB, NULL, 476),
+    NAME_FUNC_OFFSET( 7303, glVertexAttrib2dvARB, glVertexAttrib2dvARB, NULL, 477),
+    NAME_FUNC_OFFSET( 7324, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, 478),
+    NAME_FUNC_OFFSET( 7344, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, 479),
+    NAME_FUNC_OFFSET( 7365, glVertexAttrib2sARB, glVertexAttrib2sARB, NULL, 480),
+    NAME_FUNC_OFFSET( 7385, glVertexAttrib2svARB, glVertexAttrib2svARB, NULL, 481),
+    NAME_FUNC_OFFSET( 7406, glVertexAttrib3dARB, glVertexAttrib3dARB, NULL, 482),
+    NAME_FUNC_OFFSET( 7426, glVertexAttrib3dvARB, glVertexAttrib3dvARB, NULL, 483),
+    NAME_FUNC_OFFSET( 7447, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, 484),
+    NAME_FUNC_OFFSET( 7467, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, 485),
+    NAME_FUNC_OFFSET( 7488, glVertexAttrib3sARB, glVertexAttrib3sARB, NULL, 486),
+    NAME_FUNC_OFFSET( 7508, glVertexAttrib3svARB, glVertexAttrib3svARB, NULL, 487),
+    NAME_FUNC_OFFSET( 7529, glVertexAttrib4NbvARB, glVertexAttrib4NbvARB, NULL, 488),
+    NAME_FUNC_OFFSET( 7551, glVertexAttrib4NivARB, glVertexAttrib4NivARB, NULL, 489),
+    NAME_FUNC_OFFSET( 7573, glVertexAttrib4NsvARB, glVertexAttrib4NsvARB, NULL, 490),
+    NAME_FUNC_OFFSET( 7595, glVertexAttrib4NubARB, glVertexAttrib4NubARB, NULL, 491),
+    NAME_FUNC_OFFSET( 7617, glVertexAttrib4NubvARB, glVertexAttrib4NubvARB, NULL, 492),
+    NAME_FUNC_OFFSET( 7640, glVertexAttrib4NuivARB, glVertexAttrib4NuivARB, NULL, 493),
+    NAME_FUNC_OFFSET( 7663, glVertexAttrib4NusvARB, glVertexAttrib4NusvARB, NULL, 494),
+    NAME_FUNC_OFFSET( 7686, glVertexAttrib4bvARB, glVertexAttrib4bvARB, NULL, 495),
+    NAME_FUNC_OFFSET( 7707, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL, 496),
+    NAME_FUNC_OFFSET( 7727, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL, 497),
+    NAME_FUNC_OFFSET( 7748, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, 498),
+    NAME_FUNC_OFFSET( 7768, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, 499),
+    NAME_FUNC_OFFSET( 7789, glVertexAttrib4ivARB, glVertexAttrib4ivARB, NULL, 500),
+    NAME_FUNC_OFFSET( 7810, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL, 501),
+    NAME_FUNC_OFFSET( 7830, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL, 502),
+    NAME_FUNC_OFFSET( 7851, glVertexAttrib4ubvARB, glVertexAttrib4ubvARB, NULL, 503),
+    NAME_FUNC_OFFSET( 7873, glVertexAttrib4uivARB, glVertexAttrib4uivARB, NULL, 504),
+    NAME_FUNC_OFFSET( 7895, glVertexAttrib4usvARB, glVertexAttrib4usvARB, NULL, 505),
+    NAME_FUNC_OFFSET( 7917, glVertexAttribPointerARB, glVertexAttribPointerARB, NULL, 506),
+    NAME_FUNC_OFFSET( 7942, glBindBufferARB, glBindBufferARB, NULL, 507),
+    NAME_FUNC_OFFSET( 7958, glBufferDataARB, glBufferDataARB, NULL, 508),
+    NAME_FUNC_OFFSET( 7974, glBufferSubDataARB, glBufferSubDataARB, NULL, 509),
+    NAME_FUNC_OFFSET( 7993, glDeleteBuffersARB, glDeleteBuffersARB, NULL, 510),
+    NAME_FUNC_OFFSET( 8012, glGenBuffersARB, glGenBuffersARB, NULL, 511),
+    NAME_FUNC_OFFSET( 8028, glGetBufferParameterivARB, glGetBufferParameterivARB, NULL, 512),
+    NAME_FUNC_OFFSET( 8054, glGetBufferPointervARB, glGetBufferPointervARB, NULL, 513),
+    NAME_FUNC_OFFSET( 8077, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL, 514),
+    NAME_FUNC_OFFSET( 8099, glIsBufferARB, glIsBufferARB, NULL, 515),
+    NAME_FUNC_OFFSET( 8113, glMapBufferARB, glMapBufferARB, NULL, 516),
+    NAME_FUNC_OFFSET( 8128, glUnmapBufferARB, glUnmapBufferARB, NULL, 517),
+    NAME_FUNC_OFFSET( 8145, glBeginQueryARB, glBeginQueryARB, NULL, 518),
+    NAME_FUNC_OFFSET( 8161, glDeleteQueriesARB, glDeleteQueriesARB, NULL, 519),
+    NAME_FUNC_OFFSET( 8180, glEndQueryARB, glEndQueryARB, NULL, 520),
+    NAME_FUNC_OFFSET( 8194, glGenQueriesARB, glGenQueriesARB, NULL, 521),
+    NAME_FUNC_OFFSET( 8210, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL, 522),
+    NAME_FUNC_OFFSET( 8232, glGetQueryObjectuivARB, glGetQueryObjectuivARB, NULL, 523),
+    NAME_FUNC_OFFSET( 8255, glGetQueryivARB, glGetQueryivARB, NULL, 524),
+    NAME_FUNC_OFFSET( 8271, glIsQueryARB, glIsQueryARB, NULL, 525),
+    NAME_FUNC_OFFSET( 8284, glAttachObjectARB, glAttachObjectARB, NULL, 526),
+    NAME_FUNC_OFFSET( 8302, glCompileShaderARB, glCompileShaderARB, NULL, 527),
+    NAME_FUNC_OFFSET( 8321, glCreateProgramObjectARB, glCreateProgramObjectARB, NULL, 528),
+    NAME_FUNC_OFFSET( 8346, glCreateShaderObjectARB, glCreateShaderObjectARB, NULL, 529),
+    NAME_FUNC_OFFSET( 8370, glDeleteObjectARB, glDeleteObjectARB, NULL, 530),
+    NAME_FUNC_OFFSET( 8388, glDetachObjectARB, glDetachObjectARB, NULL, 531),
+    NAME_FUNC_OFFSET( 8406, glGetActiveUniformARB, glGetActiveUniformARB, NULL, 532),
+    NAME_FUNC_OFFSET( 8428, glGetAttachedObjectsARB, glGetAttachedObjectsARB, NULL, 533),
+    NAME_FUNC_OFFSET( 8452, glGetHandleARB, glGetHandleARB, NULL, 534),
+    NAME_FUNC_OFFSET( 8467, glGetInfoLogARB, glGetInfoLogARB, NULL, 535),
+    NAME_FUNC_OFFSET( 8483, glGetObjectParameterfvARB, glGetObjectParameterfvARB, NULL, 536),
+    NAME_FUNC_OFFSET( 8509, glGetObjectParameterivARB, glGetObjectParameterivARB, NULL, 537),
+    NAME_FUNC_OFFSET( 8535, glGetShaderSourceARB, glGetShaderSourceARB, NULL, 538),
+    NAME_FUNC_OFFSET( 8556, glGetUniformLocationARB, glGetUniformLocationARB, NULL, 539),
+    NAME_FUNC_OFFSET( 8580, glGetUniformfvARB, glGetUniformfvARB, NULL, 540),
+    NAME_FUNC_OFFSET( 8598, glGetUniformivARB, glGetUniformivARB, NULL, 541),
+    NAME_FUNC_OFFSET( 8616, glLinkProgramARB, glLinkProgramARB, NULL, 542),
+    NAME_FUNC_OFFSET( 8633, glShaderSourceARB, glShaderSourceARB, NULL, 543),
+    NAME_FUNC_OFFSET( 8651, glUniform1fARB, glUniform1fARB, NULL, 544),
+    NAME_FUNC_OFFSET( 8666, glUniform1fvARB, glUniform1fvARB, NULL, 545),
+    NAME_FUNC_OFFSET( 8682, glUniform1iARB, glUniform1iARB, NULL, 546),
+    NAME_FUNC_OFFSET( 8697, glUniform1ivARB, glUniform1ivARB, NULL, 547),
+    NAME_FUNC_OFFSET( 8713, glUniform2fARB, glUniform2fARB, NULL, 548),
+    NAME_FUNC_OFFSET( 8728, glUniform2fvARB, glUniform2fvARB, NULL, 549),
+    NAME_FUNC_OFFSET( 8744, glUniform2iARB, glUniform2iARB, NULL, 550),
+    NAME_FUNC_OFFSET( 8759, glUniform2ivARB, glUniform2ivARB, NULL, 551),
+    NAME_FUNC_OFFSET( 8775, glUniform3fARB, glUniform3fARB, NULL, 552),
+    NAME_FUNC_OFFSET( 8790, glUniform3fvARB, glUniform3fvARB, NULL, 553),
+    NAME_FUNC_OFFSET( 8806, glUniform3iARB, glUniform3iARB, NULL, 554),
+    NAME_FUNC_OFFSET( 8821, glUniform3ivARB, glUniform3ivARB, NULL, 555),
+    NAME_FUNC_OFFSET( 8837, glUniform4fARB, glUniform4fARB, NULL, 556),
+    NAME_FUNC_OFFSET( 8852, glUniform4fvARB, glUniform4fvARB, NULL, 557),
+    NAME_FUNC_OFFSET( 8868, glUniform4iARB, glUniform4iARB, NULL, 558),
+    NAME_FUNC_OFFSET( 8883, glUniform4ivARB, glUniform4ivARB, NULL, 559),
+    NAME_FUNC_OFFSET( 8899, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL, 560),
+    NAME_FUNC_OFFSET( 8921, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL, 561),
+    NAME_FUNC_OFFSET( 8943, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL, 562),
+    NAME_FUNC_OFFSET( 8965, glUseProgramObjectARB, glUseProgramObjectARB, NULL, 563),
+    NAME_FUNC_OFFSET( 8987, glValidateProgramARB, glValidateProgramARB, NULL, 564),
+    NAME_FUNC_OFFSET( 9008, glBindAttribLocationARB, glBindAttribLocationARB, NULL, 565),
+    NAME_FUNC_OFFSET( 9032, glGetActiveAttribARB, glGetActiveAttribARB, NULL, 566),
+    NAME_FUNC_OFFSET( 9053, glGetAttribLocationARB, glGetAttribLocationARB, NULL, 567),
+    NAME_FUNC_OFFSET( 9076, glDrawBuffersARB, glDrawBuffersARB, NULL, 568),
+    NAME_FUNC_OFFSET( 9093, glClampColorARB, glClampColorARB, NULL, 569),
+    NAME_FUNC_OFFSET( 9109, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 570),
+    NAME_FUNC_OFFSET( 9134, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 571),
+    NAME_FUNC_OFFSET( 9161, glRenderbufferStorageMultisample, glRenderbufferStorageMultisample, NULL, 572),
+    NAME_FUNC_OFFSET( 9194, glFramebufferTextureFaceARB, glFramebufferTextureFaceARB, NULL, 573),
+    NAME_FUNC_OFFSET( 9222, glVertexAttribDivisorARB, glVertexAttribDivisorARB, NULL, 574),
+    NAME_FUNC_OFFSET( 9247, glFlushMappedBufferRange, glFlushMappedBufferRange, NULL, 575),
+    NAME_FUNC_OFFSET( 9272, glMapBufferRange, glMapBufferRange, NULL, 576),
+    NAME_FUNC_OFFSET( 9289, glTexBufferARB, glTexBufferARB, NULL, 577),
+    NAME_FUNC_OFFSET( 9304, glBindVertexArray, glBindVertexArray, NULL, 578),
+    NAME_FUNC_OFFSET( 9322, glGenVertexArrays, glGenVertexArrays, NULL, 579),
+    NAME_FUNC_OFFSET( 9340, glGetActiveUniformBlockName, glGetActiveUniformBlockName, NULL, 580),
+    NAME_FUNC_OFFSET( 9368, glGetActiveUniformBlockiv, glGetActiveUniformBlockiv, NULL, 581),
+    NAME_FUNC_OFFSET( 9394, glGetActiveUniformName, glGetActiveUniformName, NULL, 582),
+    NAME_FUNC_OFFSET( 9417, glGetActiveUniformsiv, glGetActiveUniformsiv, NULL, 583),
+    NAME_FUNC_OFFSET( 9439, glGetUniformBlockIndex, glGetUniformBlockIndex, NULL, 584),
+    NAME_FUNC_OFFSET( 9462, glGetUniformIndices, glGetUniformIndices, NULL, 585),
+    NAME_FUNC_OFFSET( 9482, glUniformBlockBinding, glUniformBlockBinding, NULL, 586),
+    NAME_FUNC_OFFSET( 9504, glCopyBufferSubData, glCopyBufferSubData, NULL, 587),
+    NAME_FUNC_OFFSET( 9524, glClientWaitSync, glClientWaitSync, NULL, 588),
+    NAME_FUNC_OFFSET( 9541, glDeleteSync, glDeleteSync, NULL, 589),
+    NAME_FUNC_OFFSET( 9554, glFenceSync, glFenceSync, NULL, 590),
+    NAME_FUNC_OFFSET( 9566, glGetInteger64v, glGetInteger64v, NULL, 591),
+    NAME_FUNC_OFFSET( 9582, glGetSynciv, glGetSynciv, NULL, 592),
+    NAME_FUNC_OFFSET( 9594, glIsSync, glIsSync, NULL, 593),
+    NAME_FUNC_OFFSET( 9603, glWaitSync, glWaitSync, NULL, 594),
+    NAME_FUNC_OFFSET( 9614, glDrawElementsBaseVertex, glDrawElementsBaseVertex, NULL, 595),
+    NAME_FUNC_OFFSET( 9639, glDrawElementsInstancedBaseVertex, glDrawElementsInstancedBaseVertex, NULL, 596),
+    NAME_FUNC_OFFSET( 9673, glDrawRangeElementsBaseVertex, glDrawRangeElementsBaseVertex, NULL, 597),
+    NAME_FUNC_OFFSET( 9703, glMultiDrawElementsBaseVertex, glMultiDrawElementsBaseVertex, NULL, 598),
+    NAME_FUNC_OFFSET( 9733, glBlendEquationSeparateiARB, glBlendEquationSeparateiARB, NULL, 599),
+    NAME_FUNC_OFFSET( 9761, glBlendEquationiARB, glBlendEquationiARB, NULL, 600),
+    NAME_FUNC_OFFSET( 9781, glBlendFuncSeparateiARB, glBlendFuncSeparateiARB, NULL, 601),
+    NAME_FUNC_OFFSET( 9805, glBlendFunciARB, glBlendFunciARB, NULL, 602),
+    NAME_FUNC_OFFSET( 9821, glBindFragDataLocationIndexed, glBindFragDataLocationIndexed, NULL, 603),
+    NAME_FUNC_OFFSET( 9851, glGetFragDataIndex, glGetFragDataIndex, NULL, 604),
+    NAME_FUNC_OFFSET( 9870, glBindSampler, glBindSampler, NULL, 605),
+    NAME_FUNC_OFFSET( 9884, glDeleteSamplers, glDeleteSamplers, NULL, 606),
+    NAME_FUNC_OFFSET( 9901, glGenSamplers, glGenSamplers, NULL, 607),
+    NAME_FUNC_OFFSET( 9915, glGetSamplerParameterIiv, glGetSamplerParameterIiv, NULL, 608),
+    NAME_FUNC_OFFSET( 9940, glGetSamplerParameterIuiv, glGetSamplerParameterIuiv, NULL, 609),
+    NAME_FUNC_OFFSET( 9966, glGetSamplerParameterfv, glGetSamplerParameterfv, NULL, 610),
+    NAME_FUNC_OFFSET( 9990, glGetSamplerParameteriv, glGetSamplerParameteriv, NULL, 611),
+    NAME_FUNC_OFFSET(10014, glIsSampler, glIsSampler, NULL, 612),
+    NAME_FUNC_OFFSET(10026, glSamplerParameterIiv, glSamplerParameterIiv, NULL, 613),
+    NAME_FUNC_OFFSET(10048, glSamplerParameterIuiv, glSamplerParameterIuiv, NULL, 614),
+    NAME_FUNC_OFFSET(10071, glSamplerParameterf, glSamplerParameterf, NULL, 615),
+    NAME_FUNC_OFFSET(10091, glSamplerParameterfv, glSamplerParameterfv, NULL, 616),
+    NAME_FUNC_OFFSET(10112, glSamplerParameteri, glSamplerParameteri, NULL, 617),
+    NAME_FUNC_OFFSET(10132, glSamplerParameteriv, glSamplerParameteriv, NULL, 618),
+    NAME_FUNC_OFFSET(10153, gl_dispatch_stub_619, gl_dispatch_stub_619, NULL, 619),
+    NAME_FUNC_OFFSET(10168, glColorP3ui, glColorP3ui, NULL, 620),
+    NAME_FUNC_OFFSET(10180, glColorP3uiv, glColorP3uiv, NULL, 621),
+    NAME_FUNC_OFFSET(10193, glColorP4ui, glColorP4ui, NULL, 622),
+    NAME_FUNC_OFFSET(10205, glColorP4uiv, glColorP4uiv, NULL, 623),
+    NAME_FUNC_OFFSET(10218, glMultiTexCoordP1ui, glMultiTexCoordP1ui, NULL, 624),
+    NAME_FUNC_OFFSET(10238, glMultiTexCoordP1uiv, glMultiTexCoordP1uiv, NULL, 625),
+    NAME_FUNC_OFFSET(10259, glMultiTexCoordP2ui, glMultiTexCoordP2ui, NULL, 626),
+    NAME_FUNC_OFFSET(10279, glMultiTexCoordP2uiv, glMultiTexCoordP2uiv, NULL, 627),
+    NAME_FUNC_OFFSET(10300, glMultiTexCoordP3ui, glMultiTexCoordP3ui, NULL, 628),
+    NAME_FUNC_OFFSET(10320, glMultiTexCoordP3uiv, glMultiTexCoordP3uiv, NULL, 629),
+    NAME_FUNC_OFFSET(10341, glMultiTexCoordP4ui, glMultiTexCoordP4ui, NULL, 630),
+    NAME_FUNC_OFFSET(10361, glMultiTexCoordP4uiv, glMultiTexCoordP4uiv, NULL, 631),
+    NAME_FUNC_OFFSET(10382, glNormalP3ui, glNormalP3ui, NULL, 632),
+    NAME_FUNC_OFFSET(10395, glNormalP3uiv, glNormalP3uiv, NULL, 633),
+    NAME_FUNC_OFFSET(10409, glSecondaryColorP3ui, glSecondaryColorP3ui, NULL, 634),
+    NAME_FUNC_OFFSET(10430, glSecondaryColorP3uiv, glSecondaryColorP3uiv, NULL, 635),
+    NAME_FUNC_OFFSET(10452, glTexCoordP1ui, glTexCoordP1ui, NULL, 636),
+    NAME_FUNC_OFFSET(10467, glTexCoordP1uiv, glTexCoordP1uiv, NULL, 637),
+    NAME_FUNC_OFFSET(10483, glTexCoordP2ui, glTexCoordP2ui, NULL, 638),
+    NAME_FUNC_OFFSET(10498, glTexCoordP2uiv, glTexCoordP2uiv, NULL, 639),
+    NAME_FUNC_OFFSET(10514, glTexCoordP3ui, glTexCoordP3ui, NULL, 640),
+    NAME_FUNC_OFFSET(10529, glTexCoordP3uiv, glTexCoordP3uiv, NULL, 641),
+    NAME_FUNC_OFFSET(10545, glTexCoordP4ui, glTexCoordP4ui, NULL, 642),
+    NAME_FUNC_OFFSET(10560, glTexCoordP4uiv, glTexCoordP4uiv, NULL, 643),
+    NAME_FUNC_OFFSET(10576, glVertexAttribP1ui, glVertexAttribP1ui, NULL, 644),
+    NAME_FUNC_OFFSET(10595, glVertexAttribP1uiv, glVertexAttribP1uiv, NULL, 645),
+    NAME_FUNC_OFFSET(10615, glVertexAttribP2ui, glVertexAttribP2ui, NULL, 646),
+    NAME_FUNC_OFFSET(10634, glVertexAttribP2uiv, glVertexAttribP2uiv, NULL, 647),
+    NAME_FUNC_OFFSET(10654, glVertexAttribP3ui, glVertexAttribP3ui, NULL, 648),
+    NAME_FUNC_OFFSET(10673, glVertexAttribP3uiv, glVertexAttribP3uiv, NULL, 649),
+    NAME_FUNC_OFFSET(10693, glVertexAttribP4ui, glVertexAttribP4ui, NULL, 650),
+    NAME_FUNC_OFFSET(10712, glVertexAttribP4uiv, glVertexAttribP4uiv, NULL, 651),
+    NAME_FUNC_OFFSET(10732, glVertexP2ui, glVertexP2ui, NULL, 652),
+    NAME_FUNC_OFFSET(10745, glVertexP2uiv, glVertexP2uiv, NULL, 653),
+    NAME_FUNC_OFFSET(10759, glVertexP3ui, glVertexP3ui, NULL, 654),
+    NAME_FUNC_OFFSET(10772, glVertexP3uiv, glVertexP3uiv, NULL, 655),
+    NAME_FUNC_OFFSET(10786, glVertexP4ui, glVertexP4ui, NULL, 656),
+    NAME_FUNC_OFFSET(10799, glVertexP4uiv, glVertexP4uiv, NULL, 657),
+    NAME_FUNC_OFFSET(10813, glBindTransformFeedback, glBindTransformFeedback, NULL, 658),
+    NAME_FUNC_OFFSET(10837, glDeleteTransformFeedbacks, glDeleteTransformFeedbacks, NULL, 659),
+    NAME_FUNC_OFFSET(10864, glDrawTransformFeedback, glDrawTransformFeedback, NULL, 660),
+    NAME_FUNC_OFFSET(10888, glGenTransformFeedbacks, glGenTransformFeedbacks, NULL, 661),
+    NAME_FUNC_OFFSET(10912, glIsTransformFeedback, glIsTransformFeedback, NULL, 662),
+    NAME_FUNC_OFFSET(10934, glPauseTransformFeedback, glPauseTransformFeedback, NULL, 663),
+    NAME_FUNC_OFFSET(10959, glResumeTransformFeedback, glResumeTransformFeedback, NULL, 664),
+    NAME_FUNC_OFFSET(10985, glBeginQueryIndexed, glBeginQueryIndexed, NULL, 665),
+    NAME_FUNC_OFFSET(11005, glDrawTransformFeedbackStream, glDrawTransformFeedbackStream, NULL, 666),
+    NAME_FUNC_OFFSET(11035, glEndQueryIndexed, glEndQueryIndexed, NULL, 667),
+    NAME_FUNC_OFFSET(11053, glGetQueryIndexediv, glGetQueryIndexediv, NULL, 668),
+    NAME_FUNC_OFFSET(11073, glClearDepthf, glClearDepthf, NULL, 669),
+    NAME_FUNC_OFFSET(11087, glDepthRangef, glDepthRangef, NULL, 670),
+    NAME_FUNC_OFFSET(11101, glGetShaderPrecisionFormat, glGetShaderPrecisionFormat, NULL, 671),
+    NAME_FUNC_OFFSET(11128, glReleaseShaderCompiler, glReleaseShaderCompiler, NULL, 672),
+    NAME_FUNC_OFFSET(11152, glShaderBinary, glShaderBinary, NULL, 673),
+    NAME_FUNC_OFFSET(11167, gl_dispatch_stub_674, gl_dispatch_stub_674, NULL, 674),
+    NAME_FUNC_OFFSET(11186, gl_dispatch_stub_675, gl_dispatch_stub_675, NULL, 675),
+    NAME_FUNC_OFFSET(11202, gl_dispatch_stub_676, gl_dispatch_stub_676, NULL, 676),
+    NAME_FUNC_OFFSET(11222, glDebugMessageCallbackARB, glDebugMessageCallbackARB, NULL, 677),
+    NAME_FUNC_OFFSET(11248, glDebugMessageControlARB, glDebugMessageControlARB, NULL, 678),
+    NAME_FUNC_OFFSET(11273, glDebugMessageInsertARB, glDebugMessageInsertARB, NULL, 679),
+    NAME_FUNC_OFFSET(11297, glGetDebugMessageLogARB, glGetDebugMessageLogARB, NULL, 680),
+    NAME_FUNC_OFFSET(11321, glGetGraphicsResetStatusARB, glGetGraphicsResetStatusARB, NULL, 681),
+    NAME_FUNC_OFFSET(11349, glGetnColorTableARB, glGetnColorTableARB, NULL, 682),
+    NAME_FUNC_OFFSET(11369, glGetnCompressedTexImageARB, glGetnCompressedTexImageARB, NULL, 683),
+    NAME_FUNC_OFFSET(11397, glGetnConvolutionFilterARB, glGetnConvolutionFilterARB, NULL, 684),
+    NAME_FUNC_OFFSET(11424, glGetnHistogramARB, glGetnHistogramARB, NULL, 685),
+    NAME_FUNC_OFFSET(11443, glGetnMapdvARB, glGetnMapdvARB, NULL, 686),
+    NAME_FUNC_OFFSET(11458, glGetnMapfvARB, glGetnMapfvARB, NULL, 687),
+    NAME_FUNC_OFFSET(11473, glGetnMapivARB, glGetnMapivARB, NULL, 688),
+    NAME_FUNC_OFFSET(11488, glGetnMinmaxARB, glGetnMinmaxARB, NULL, 689),
+    NAME_FUNC_OFFSET(11504, glGetnPixelMapfvARB, glGetnPixelMapfvARB, NULL, 690),
+    NAME_FUNC_OFFSET(11524, glGetnPixelMapuivARB, glGetnPixelMapuivARB, NULL, 691),
+    NAME_FUNC_OFFSET(11545, glGetnPixelMapusvARB, glGetnPixelMapusvARB, NULL, 692),
+    NAME_FUNC_OFFSET(11566, glGetnPolygonStippleARB, glGetnPolygonStippleARB, NULL, 693),
+    NAME_FUNC_OFFSET(11590, glGetnSeparableFilterARB, glGetnSeparableFilterARB, NULL, 694),
+    NAME_FUNC_OFFSET(11615, glGetnTexImageARB, glGetnTexImageARB, NULL, 695),
+    NAME_FUNC_OFFSET(11633, glGetnUniformdvARB, glGetnUniformdvARB, NULL, 696),
+    NAME_FUNC_OFFSET(11652, glGetnUniformfvARB, glGetnUniformfvARB, NULL, 697),
+    NAME_FUNC_OFFSET(11671, glGetnUniformivARB, glGetnUniformivARB, NULL, 698),
+    NAME_FUNC_OFFSET(11690, glGetnUniformuivARB, glGetnUniformuivARB, NULL, 699),
+    NAME_FUNC_OFFSET(11710, glReadnPixelsARB, glReadnPixelsARB, NULL, 700),
+    NAME_FUNC_OFFSET(11727, glDrawArraysInstancedBaseInstance, glDrawArraysInstancedBaseInstance, NULL, 701),
+    NAME_FUNC_OFFSET(11761, glDrawElementsInstancedBaseInstance, glDrawElementsInstancedBaseInstance, NULL, 702),
+    NAME_FUNC_OFFSET(11797, glDrawElementsInstancedBaseVertexBaseInstance, glDrawElementsInstancedBaseVertexBaseInstance, NULL, 703),
+    NAME_FUNC_OFFSET(11843, glDrawTransformFeedbackInstanced, glDrawTransformFeedbackInstanced, NULL, 704),
+    NAME_FUNC_OFFSET(11876, glDrawTransformFeedbackStreamInstanced, glDrawTransformFeedbackStreamInstanced, NULL, 705),
+    NAME_FUNC_OFFSET(11915, glTexStorage1D, glTexStorage1D, NULL, 706),
+    NAME_FUNC_OFFSET(11930, glTexStorage2D, glTexStorage2D, NULL, 707),
+    NAME_FUNC_OFFSET(11945, glTexStorage3D, glTexStorage3D, NULL, 708),
+    NAME_FUNC_OFFSET(11960, glTextureStorage1DEXT, glTextureStorage1DEXT, NULL, 709),
+    NAME_FUNC_OFFSET(11982, glTextureStorage2DEXT, glTextureStorage2DEXT, NULL, 710),
+    NAME_FUNC_OFFSET(12004, glTextureStorage3DEXT, glTextureStorage3DEXT, NULL, 711),
+    NAME_FUNC_OFFSET(12026, glInvalidateBufferData, glInvalidateBufferData, NULL, 712),
+    NAME_FUNC_OFFSET(12049, glInvalidateBufferSubData, glInvalidateBufferSubData, NULL, 713),
+    NAME_FUNC_OFFSET(12075, glInvalidateFramebuffer, glInvalidateFramebuffer, NULL, 714),
+    NAME_FUNC_OFFSET(12099, glInvalidateSubFramebuffer, glInvalidateSubFramebuffer, NULL, 715),
+    NAME_FUNC_OFFSET(12126, glInvalidateTexImage, glInvalidateTexImage, NULL, 716),
+    NAME_FUNC_OFFSET(12147, glInvalidateTexSubImage, glInvalidateTexSubImage, NULL, 717),
+    NAME_FUNC_OFFSET(12171, glPolygonOffsetEXT, glPolygonOffsetEXT, NULL, 718),
+    NAME_FUNC_OFFSET(12190, gl_dispatch_stub_719, gl_dispatch_stub_719, NULL, 719),
+    NAME_FUNC_OFFSET(12207, gl_dispatch_stub_720, gl_dispatch_stub_720, NULL, 720),
+    NAME_FUNC_OFFSET(12227, glColorPointerEXT, glColorPointerEXT, NULL, 721),
+    NAME_FUNC_OFFSET(12245, glEdgeFlagPointerEXT, glEdgeFlagPointerEXT, NULL, 722),
+    NAME_FUNC_OFFSET(12266, glIndexPointerEXT, glIndexPointerEXT, NULL, 723),
+    NAME_FUNC_OFFSET(12284, glNormalPointerEXT, glNormalPointerEXT, NULL, 724),
+    NAME_FUNC_OFFSET(12303, glTexCoordPointerEXT, glTexCoordPointerEXT, NULL, 725),
+    NAME_FUNC_OFFSET(12324, glVertexPointerEXT, glVertexPointerEXT, NULL, 726),
+    NAME_FUNC_OFFSET(12343, glPointParameterfEXT, glPointParameterfEXT, NULL, 727),
+    NAME_FUNC_OFFSET(12364, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 728),
+    NAME_FUNC_OFFSET(12386, glLockArraysEXT, glLockArraysEXT, NULL, 729),
+    NAME_FUNC_OFFSET(12402, glUnlockArraysEXT, glUnlockArraysEXT, NULL, 730),
+    NAME_FUNC_OFFSET(12420, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, 731),
+    NAME_FUNC_OFFSET(12442, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, 732),
+    NAME_FUNC_OFFSET(12465, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, 733),
+    NAME_FUNC_OFFSET(12487, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, 734),
+    NAME_FUNC_OFFSET(12510, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, 735),
+    NAME_FUNC_OFFSET(12532, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, 736),
+    NAME_FUNC_OFFSET(12555, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, 737),
+    NAME_FUNC_OFFSET(12577, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, 738),
+    NAME_FUNC_OFFSET(12600, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, 739),
+    NAME_FUNC_OFFSET(12622, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, 740),
+    NAME_FUNC_OFFSET(12645, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, 741),
+    NAME_FUNC_OFFSET(12668, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, 742),
+    NAME_FUNC_OFFSET(12692, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, 743),
+    NAME_FUNC_OFFSET(12715, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, 744),
+    NAME_FUNC_OFFSET(12739, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, 745),
+    NAME_FUNC_OFFSET(12762, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, 746),
+    NAME_FUNC_OFFSET(12786, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, 747),
+    NAME_FUNC_OFFSET(12813, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, 748),
+    NAME_FUNC_OFFSET(12834, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, 749),
+    NAME_FUNC_OFFSET(12857, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, 750),
+    NAME_FUNC_OFFSET(12878, glFogCoorddEXT, glFogCoorddEXT, NULL, 751),
+    NAME_FUNC_OFFSET(12893, glFogCoorddvEXT, glFogCoorddvEXT, NULL, 752),
+    NAME_FUNC_OFFSET(12909, glFogCoordfEXT, glFogCoordfEXT, NULL, 753),
+    NAME_FUNC_OFFSET(12924, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 754),
+    NAME_FUNC_OFFSET(12940, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, 755),
+    NAME_FUNC_OFFSET(12963, glResizeBuffersMESA, glResizeBuffersMESA, NULL, 756),
+    NAME_FUNC_OFFSET(12983, glWindowPos2dMESA, glWindowPos2dMESA, NULL, 757),
+    NAME_FUNC_OFFSET(13001, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, 758),
+    NAME_FUNC_OFFSET(13020, glWindowPos2fMESA, glWindowPos2fMESA, NULL, 759),
+    NAME_FUNC_OFFSET(13038, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, 760),
+    NAME_FUNC_OFFSET(13057, glWindowPos2iMESA, glWindowPos2iMESA, NULL, 761),
+    NAME_FUNC_OFFSET(13075, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, 762),
+    NAME_FUNC_OFFSET(13094, glWindowPos2sMESA, glWindowPos2sMESA, NULL, 763),
+    NAME_FUNC_OFFSET(13112, glWindowPos2svMESA, glWindowPos2svMESA, NULL, 764),
+    NAME_FUNC_OFFSET(13131, glWindowPos3dMESA, glWindowPos3dMESA, NULL, 765),
+    NAME_FUNC_OFFSET(13149, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, 766),
+    NAME_FUNC_OFFSET(13168, glWindowPos3fMESA, glWindowPos3fMESA, NULL, 767),
+    NAME_FUNC_OFFSET(13186, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, 768),
+    NAME_FUNC_OFFSET(13205, glWindowPos3iMESA, glWindowPos3iMESA, NULL, 769),
+    NAME_FUNC_OFFSET(13223, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, 770),
+    NAME_FUNC_OFFSET(13242, glWindowPos3sMESA, glWindowPos3sMESA, NULL, 771),
+    NAME_FUNC_OFFSET(13260, glWindowPos3svMESA, glWindowPos3svMESA, NULL, 772),
+    NAME_FUNC_OFFSET(13279, glWindowPos4dMESA, glWindowPos4dMESA, NULL, 773),
+    NAME_FUNC_OFFSET(13297, glWindowPos4dvMESA, glWindowPos4dvMESA, NULL, 774),
+    NAME_FUNC_OFFSET(13316, glWindowPos4fMESA, glWindowPos4fMESA, NULL, 775),
+    NAME_FUNC_OFFSET(13334, glWindowPos4fvMESA, glWindowPos4fvMESA, NULL, 776),
+    NAME_FUNC_OFFSET(13353, glWindowPos4iMESA, glWindowPos4iMESA, NULL, 777),
+    NAME_FUNC_OFFSET(13371, glWindowPos4ivMESA, glWindowPos4ivMESA, NULL, 778),
+    NAME_FUNC_OFFSET(13390, glWindowPos4sMESA, glWindowPos4sMESA, NULL, 779),
+    NAME_FUNC_OFFSET(13408, glWindowPos4svMESA, glWindowPos4svMESA, NULL, 780),
+    NAME_FUNC_OFFSET(13427, gl_dispatch_stub_781, gl_dispatch_stub_781, NULL, 781),
+    NAME_FUNC_OFFSET(13452, gl_dispatch_stub_782, gl_dispatch_stub_782, NULL, 782),
+    NAME_FUNC_OFFSET(13479, glAreProgramsResidentNV, glAreProgramsResidentNV, NULL, 783),
+    NAME_FUNC_OFFSET(13503, glBindProgramNV, glBindProgramNV, NULL, 784),
+    NAME_FUNC_OFFSET(13519, glDeleteProgramsNV, glDeleteProgramsNV, NULL, 785),
+    NAME_FUNC_OFFSET(13538, glExecuteProgramNV, glExecuteProgramNV, NULL, 786),
+    NAME_FUNC_OFFSET(13557, glGenProgramsNV, glGenProgramsNV, NULL, 787),
+    NAME_FUNC_OFFSET(13573, glGetProgramParameterdvNV, glGetProgramParameterdvNV, NULL, 788),
+    NAME_FUNC_OFFSET(13599, glGetProgramParameterfvNV, glGetProgramParameterfvNV, NULL, 789),
+    NAME_FUNC_OFFSET(13625, glGetProgramStringNV, glGetProgramStringNV, NULL, 790),
+    NAME_FUNC_OFFSET(13646, glGetProgramivNV, glGetProgramivNV, NULL, 791),
+    NAME_FUNC_OFFSET(13663, glGetTrackMatrixivNV, glGetTrackMatrixivNV, NULL, 792),
+    NAME_FUNC_OFFSET(13684, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, 793),
+    NAME_FUNC_OFFSET(13712, glGetVertexAttribdvNV, glGetVertexAttribdvNV, NULL, 794),
+    NAME_FUNC_OFFSET(13734, glGetVertexAttribfvNV, glGetVertexAttribfvNV, NULL, 795),
+    NAME_FUNC_OFFSET(13756, glGetVertexAttribivNV, glGetVertexAttribivNV, NULL, 796),
+    NAME_FUNC_OFFSET(13778, glIsProgramNV, glIsProgramNV, NULL, 797),
+    NAME_FUNC_OFFSET(13792, glLoadProgramNV, glLoadProgramNV, NULL, 798),
+    NAME_FUNC_OFFSET(13808, glProgramParameters4dvNV, glProgramParameters4dvNV, NULL, 799),
+    NAME_FUNC_OFFSET(13833, glProgramParameters4fvNV, glProgramParameters4fvNV, NULL, 800),
+    NAME_FUNC_OFFSET(13858, glRequestResidentProgramsNV, glRequestResidentProgramsNV, NULL, 801),
+    NAME_FUNC_OFFSET(13886, glTrackMatrixNV, glTrackMatrixNV, NULL, 802),
+    NAME_FUNC_OFFSET(13902, glVertexAttrib1dNV, glVertexAttrib1dNV, NULL, 803),
+    NAME_FUNC_OFFSET(13921, glVertexAttrib1dvNV, glVertexAttrib1dvNV, NULL, 804),
+    NAME_FUNC_OFFSET(13941, glVertexAttrib1fNV, glVertexAttrib1fNV, NULL, 805),
+    NAME_FUNC_OFFSET(13960, glVertexAttrib1fvNV, glVertexAttrib1fvNV, NULL, 806),
+    NAME_FUNC_OFFSET(13980, glVertexAttrib1sNV, glVertexAttrib1sNV, NULL, 807),
+    NAME_FUNC_OFFSET(13999, glVertexAttrib1svNV, glVertexAttrib1svNV, NULL, 808),
+    NAME_FUNC_OFFSET(14019, glVertexAttrib2dNV, glVertexAttrib2dNV, NULL, 809),
+    NAME_FUNC_OFFSET(14038, glVertexAttrib2dvNV, glVertexAttrib2dvNV, NULL, 810),
+    NAME_FUNC_OFFSET(14058, glVertexAttrib2fNV, glVertexAttrib2fNV, NULL, 811),
+    NAME_FUNC_OFFSET(14077, glVertexAttrib2fvNV, glVertexAttrib2fvNV, NULL, 812),
+    NAME_FUNC_OFFSET(14097, glVertexAttrib2sNV, glVertexAttrib2sNV, NULL, 813),
+    NAME_FUNC_OFFSET(14116, glVertexAttrib2svNV, glVertexAttrib2svNV, NULL, 814),
+    NAME_FUNC_OFFSET(14136, glVertexAttrib3dNV, glVertexAttrib3dNV, NULL, 815),
+    NAME_FUNC_OFFSET(14155, glVertexAttrib3dvNV, glVertexAttrib3dvNV, NULL, 816),
+    NAME_FUNC_OFFSET(14175, glVertexAttrib3fNV, glVertexAttrib3fNV, NULL, 817),
+    NAME_FUNC_OFFSET(14194, glVertexAttrib3fvNV, glVertexAttrib3fvNV, NULL, 818),
+    NAME_FUNC_OFFSET(14214, glVertexAttrib3sNV, glVertexAttrib3sNV, NULL, 819),
+    NAME_FUNC_OFFSET(14233, glVertexAttrib3svNV, glVertexAttrib3svNV, NULL, 820),
+    NAME_FUNC_OFFSET(14253, glVertexAttrib4dNV, glVertexAttrib4dNV, NULL, 821),
+    NAME_FUNC_OFFSET(14272, glVertexAttrib4dvNV, glVertexAttrib4dvNV, NULL, 822),
+    NAME_FUNC_OFFSET(14292, glVertexAttrib4fNV, glVertexAttrib4fNV, NULL, 823),
+    NAME_FUNC_OFFSET(14311, glVertexAttrib4fvNV, glVertexAttrib4fvNV, NULL, 824),
+    NAME_FUNC_OFFSET(14331, glVertexAttrib4sNV, glVertexAttrib4sNV, NULL, 825),
+    NAME_FUNC_OFFSET(14350, glVertexAttrib4svNV, glVertexAttrib4svNV, NULL, 826),
+    NAME_FUNC_OFFSET(14370, glVertexAttrib4ubNV, glVertexAttrib4ubNV, NULL, 827),
+    NAME_FUNC_OFFSET(14390, glVertexAttrib4ubvNV, glVertexAttrib4ubvNV, NULL, 828),
+    NAME_FUNC_OFFSET(14411, glVertexAttribPointerNV, glVertexAttribPointerNV, NULL, 829),
+    NAME_FUNC_OFFSET(14435, glVertexAttribs1dvNV, glVertexAttribs1dvNV, NULL, 830),
+    NAME_FUNC_OFFSET(14456, glVertexAttribs1fvNV, glVertexAttribs1fvNV, NULL, 831),
+    NAME_FUNC_OFFSET(14477, glVertexAttribs1svNV, glVertexAttribs1svNV, NULL, 832),
+    NAME_FUNC_OFFSET(14498, glVertexAttribs2dvNV, glVertexAttribs2dvNV, NULL, 833),
+    NAME_FUNC_OFFSET(14519, glVertexAttribs2fvNV, glVertexAttribs2fvNV, NULL, 834),
+    NAME_FUNC_OFFSET(14540, glVertexAttribs2svNV, glVertexAttribs2svNV, NULL, 835),
+    NAME_FUNC_OFFSET(14561, glVertexAttribs3dvNV, glVertexAttribs3dvNV, NULL, 836),
+    NAME_FUNC_OFFSET(14582, glVertexAttribs3fvNV, glVertexAttribs3fvNV, NULL, 837),
+    NAME_FUNC_OFFSET(14603, glVertexAttribs3svNV, glVertexAttribs3svNV, NULL, 838),
+    NAME_FUNC_OFFSET(14624, glVertexAttribs4dvNV, glVertexAttribs4dvNV, NULL, 839),
+    NAME_FUNC_OFFSET(14645, glVertexAttribs4fvNV, glVertexAttribs4fvNV, NULL, 840),
+    NAME_FUNC_OFFSET(14666, glVertexAttribs4svNV, glVertexAttribs4svNV, NULL, 841),
+    NAME_FUNC_OFFSET(14687, glVertexAttribs4ubvNV, glVertexAttribs4ubvNV, NULL, 842),
+    NAME_FUNC_OFFSET(14709, glGetTexBumpParameterfvATI, glGetTexBumpParameterfvATI, NULL, 843),
+    NAME_FUNC_OFFSET(14736, glGetTexBumpParameterivATI, glGetTexBumpParameterivATI, NULL, 844),
+    NAME_FUNC_OFFSET(14763, glTexBumpParameterfvATI, glTexBumpParameterfvATI, NULL, 845),
+    NAME_FUNC_OFFSET(14787, glTexBumpParameterivATI, glTexBumpParameterivATI, NULL, 846),
+    NAME_FUNC_OFFSET(14811, glAlphaFragmentOp1ATI, glAlphaFragmentOp1ATI, NULL, 847),
+    NAME_FUNC_OFFSET(14833, glAlphaFragmentOp2ATI, glAlphaFragmentOp2ATI, NULL, 848),
+    NAME_FUNC_OFFSET(14855, glAlphaFragmentOp3ATI, glAlphaFragmentOp3ATI, NULL, 849),
+    NAME_FUNC_OFFSET(14877, glBeginFragmentShaderATI, glBeginFragmentShaderATI, NULL, 850),
+    NAME_FUNC_OFFSET(14902, glBindFragmentShaderATI, glBindFragmentShaderATI, NULL, 851),
+    NAME_FUNC_OFFSET(14926, glColorFragmentOp1ATI, glColorFragmentOp1ATI, NULL, 852),
+    NAME_FUNC_OFFSET(14948, glColorFragmentOp2ATI, glColorFragmentOp2ATI, NULL, 853),
+    NAME_FUNC_OFFSET(14970, glColorFragmentOp3ATI, glColorFragmentOp3ATI, NULL, 854),
+    NAME_FUNC_OFFSET(14992, glDeleteFragmentShaderATI, glDeleteFragmentShaderATI, NULL, 855),
+    NAME_FUNC_OFFSET(15018, glEndFragmentShaderATI, glEndFragmentShaderATI, NULL, 856),
+    NAME_FUNC_OFFSET(15041, glGenFragmentShadersATI, glGenFragmentShadersATI, NULL, 857),
+    NAME_FUNC_OFFSET(15065, glPassTexCoordATI, glPassTexCoordATI, NULL, 858),
+    NAME_FUNC_OFFSET(15083, glSampleMapATI, glSampleMapATI, NULL, 859),
+    NAME_FUNC_OFFSET(15098, glSetFragmentShaderConstantATI, glSetFragmentShaderConstantATI, NULL, 860),
+    NAME_FUNC_OFFSET(15129, glPointParameteriNV, glPointParameteriNV, NULL, 861),
+    NAME_FUNC_OFFSET(15149, glPointParameterivNV, glPointParameterivNV, NULL, 862),
+    NAME_FUNC_OFFSET(15170, gl_dispatch_stub_863, gl_dispatch_stub_863, NULL, 863),
+    NAME_FUNC_OFFSET(15193, gl_dispatch_stub_864, gl_dispatch_stub_864, NULL, 864),
+    NAME_FUNC_OFFSET(15216, gl_dispatch_stub_865, gl_dispatch_stub_865, NULL, 865),
+    NAME_FUNC_OFFSET(15242, gl_dispatch_stub_866, gl_dispatch_stub_866, NULL, 866),
+    NAME_FUNC_OFFSET(15265, gl_dispatch_stub_867, gl_dispatch_stub_867, NULL, 867),
+    NAME_FUNC_OFFSET(15286, glGetProgramNamedParameterdvNV, glGetProgramNamedParameterdvNV, NULL, 868),
+    NAME_FUNC_OFFSET(15317, glGetProgramNamedParameterfvNV, glGetProgramNamedParameterfvNV, NULL, 869),
+    NAME_FUNC_OFFSET(15348, glProgramNamedParameter4dNV, glProgramNamedParameter4dNV, NULL, 870),
+    NAME_FUNC_OFFSET(15376, glProgramNamedParameter4dvNV, glProgramNamedParameter4dvNV, NULL, 871),
+    NAME_FUNC_OFFSET(15405, glProgramNamedParameter4fNV, glProgramNamedParameter4fNV, NULL, 872),
+    NAME_FUNC_OFFSET(15433, glProgramNamedParameter4fvNV, glProgramNamedParameter4fvNV, NULL, 873),
+    NAME_FUNC_OFFSET(15462, glPrimitiveRestartIndexNV, glPrimitiveRestartIndexNV, NULL, 874),
+    NAME_FUNC_OFFSET(15488, glPrimitiveRestartNV, glPrimitiveRestartNV, NULL, 875),
+    NAME_FUNC_OFFSET(15509, gl_dispatch_stub_876, gl_dispatch_stub_876, NULL, 876),
+    NAME_FUNC_OFFSET(15526, gl_dispatch_stub_877, gl_dispatch_stub_877, NULL, 877),
+    NAME_FUNC_OFFSET(15553, glBindFramebufferEXT, glBindFramebufferEXT, NULL, 878),
+    NAME_FUNC_OFFSET(15574, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, 879),
+    NAME_FUNC_OFFSET(15596, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, 880),
+    NAME_FUNC_OFFSET(15624, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, 881),
+    NAME_FUNC_OFFSET(15648, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, 882),
+    NAME_FUNC_OFFSET(15673, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, 883),
+    NAME_FUNC_OFFSET(15702, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, 884),
+    NAME_FUNC_OFFSET(15728, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, 885),
+    NAME_FUNC_OFFSET(15754, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, 886),
+    NAME_FUNC_OFFSET(15780, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, 887),
+    NAME_FUNC_OFFSET(15801, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, 888),
+    NAME_FUNC_OFFSET(15823, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, 889),
+    NAME_FUNC_OFFSET(15843, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, 890),
+    NAME_FUNC_OFFSET(15884, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, 891),
+    NAME_FUNC_OFFSET(15916, glIsFramebufferEXT, glIsFramebufferEXT, NULL, 892),
+    NAME_FUNC_OFFSET(15935, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, 893),
+    NAME_FUNC_OFFSET(15955, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, 894),
+    NAME_FUNC_OFFSET(15980, gl_dispatch_stub_895, gl_dispatch_stub_895, NULL, 895),
+    NAME_FUNC_OFFSET(16001, gl_dispatch_stub_896, gl_dispatch_stub_896, NULL, 896),
+    NAME_FUNC_OFFSET(16025, gl_dispatch_stub_897, gl_dispatch_stub_897, NULL, 897),
+    NAME_FUNC_OFFSET(16055, glBindFragDataLocationEXT, glBindFragDataLocationEXT, NULL, 898),
+    NAME_FUNC_OFFSET(16081, glGetFragDataLocationEXT, glGetFragDataLocationEXT, NULL, 899),
+    NAME_FUNC_OFFSET(16106, glGetUniformuivEXT, glGetUniformuivEXT, NULL, 900),
+    NAME_FUNC_OFFSET(16125, glGetVertexAttribIivEXT, glGetVertexAttribIivEXT, NULL, 901),
+    NAME_FUNC_OFFSET(16149, glGetVertexAttribIuivEXT, glGetVertexAttribIuivEXT, NULL, 902),
+    NAME_FUNC_OFFSET(16174, glUniform1uiEXT, glUniform1uiEXT, NULL, 903),
+    NAME_FUNC_OFFSET(16190, glUniform1uivEXT, glUniform1uivEXT, NULL, 904),
+    NAME_FUNC_OFFSET(16207, glUniform2uiEXT, glUniform2uiEXT, NULL, 905),
+    NAME_FUNC_OFFSET(16223, glUniform2uivEXT, glUniform2uivEXT, NULL, 906),
+    NAME_FUNC_OFFSET(16240, glUniform3uiEXT, glUniform3uiEXT, NULL, 907),
+    NAME_FUNC_OFFSET(16256, glUniform3uivEXT, glUniform3uivEXT, NULL, 908),
+    NAME_FUNC_OFFSET(16273, glUniform4uiEXT, glUniform4uiEXT, NULL, 909),
+    NAME_FUNC_OFFSET(16289, glUniform4uivEXT, glUniform4uivEXT, NULL, 910),
+    NAME_FUNC_OFFSET(16306, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL, 911),
+    NAME_FUNC_OFFSET(16327, glVertexAttribI1ivEXT, glVertexAttribI1ivEXT, NULL, 912),
+    NAME_FUNC_OFFSET(16349, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL, 913),
+    NAME_FUNC_OFFSET(16371, glVertexAttribI1uivEXT, glVertexAttribI1uivEXT, NULL, 914),
+    NAME_FUNC_OFFSET(16394, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL, 915),
+    NAME_FUNC_OFFSET(16415, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL, 916),
+    NAME_FUNC_OFFSET(16437, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL, 917),
+    NAME_FUNC_OFFSET(16459, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT, NULL, 918),
+    NAME_FUNC_OFFSET(16482, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL, 919),
+    NAME_FUNC_OFFSET(16503, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL, 920),
+    NAME_FUNC_OFFSET(16525, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL, 921),
+    NAME_FUNC_OFFSET(16547, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT, NULL, 922),
+    NAME_FUNC_OFFSET(16570, glVertexAttribI4bvEXT, glVertexAttribI4bvEXT, NULL, 923),
+    NAME_FUNC_OFFSET(16592, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL, 924),
+    NAME_FUNC_OFFSET(16613, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL, 925),
+    NAME_FUNC_OFFSET(16635, glVertexAttribI4svEXT, glVertexAttribI4svEXT, NULL, 926),
+    NAME_FUNC_OFFSET(16657, glVertexAttribI4ubvEXT, glVertexAttribI4ubvEXT, NULL, 927),
+    NAME_FUNC_OFFSET(16680, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL, 928),
+    NAME_FUNC_OFFSET(16702, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT, NULL, 929),
+    NAME_FUNC_OFFSET(16725, glVertexAttribI4usvEXT, glVertexAttribI4usvEXT, NULL, 930),
+    NAME_FUNC_OFFSET(16748, glVertexAttribIPointerEXT, glVertexAttribIPointerEXT, NULL, 931),
+    NAME_FUNC_OFFSET(16774, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, 932),
+    NAME_FUNC_OFFSET(16803, glColorMaskIndexedEXT, glColorMaskIndexedEXT, NULL, 933),
+    NAME_FUNC_OFFSET(16825, glDisableIndexedEXT, glDisableIndexedEXT, NULL, 934),
+    NAME_FUNC_OFFSET(16845, glEnableIndexedEXT, glEnableIndexedEXT, NULL, 935),
+    NAME_FUNC_OFFSET(16864, glGetBooleanIndexedvEXT, glGetBooleanIndexedvEXT, NULL, 936),
+    NAME_FUNC_OFFSET(16888, glGetIntegerIndexedvEXT, glGetIntegerIndexedvEXT, NULL, 937),
+    NAME_FUNC_OFFSET(16912, glIsEnabledIndexedEXT, glIsEnabledIndexedEXT, NULL, 938),
+    NAME_FUNC_OFFSET(16934, glClearColorIiEXT, glClearColorIiEXT, NULL, 939),
+    NAME_FUNC_OFFSET(16952, glClearColorIuiEXT, glClearColorIuiEXT, NULL, 940),
+    NAME_FUNC_OFFSET(16971, glGetTexParameterIivEXT, glGetTexParameterIivEXT, NULL, 941),
+    NAME_FUNC_OFFSET(16995, glGetTexParameterIuivEXT, glGetTexParameterIuivEXT, NULL, 942),
+    NAME_FUNC_OFFSET(17020, glTexParameterIivEXT, glTexParameterIivEXT, NULL, 943),
+    NAME_FUNC_OFFSET(17041, glTexParameterIuivEXT, glTexParameterIuivEXT, NULL, 944),
+    NAME_FUNC_OFFSET(17063, glBeginConditionalRenderNV, glBeginConditionalRenderNV, NULL, 945),
+    NAME_FUNC_OFFSET(17090, glEndConditionalRenderNV, glEndConditionalRenderNV, NULL, 946),
+    NAME_FUNC_OFFSET(17115, glBeginTransformFeedbackEXT, glBeginTransformFeedbackEXT, NULL, 947),
+    NAME_FUNC_OFFSET(17143, glBindBufferBaseEXT, glBindBufferBaseEXT, NULL, 948),
+    NAME_FUNC_OFFSET(17163, glBindBufferOffsetEXT, glBindBufferOffsetEXT, NULL, 949),
+    NAME_FUNC_OFFSET(17185, glBindBufferRangeEXT, glBindBufferRangeEXT, NULL, 950),
+    NAME_FUNC_OFFSET(17206, glEndTransformFeedbackEXT, glEndTransformFeedbackEXT, NULL, 951),
+    NAME_FUNC_OFFSET(17232, glGetTransformFeedbackVaryingEXT, glGetTransformFeedbackVaryingEXT, NULL, 952),
+    NAME_FUNC_OFFSET(17265, glTransformFeedbackVaryingsEXT, glTransformFeedbackVaryingsEXT, NULL, 953),
+    NAME_FUNC_OFFSET(17296, glProvokingVertexEXT, glProvokingVertexEXT, NULL, 954),
+    NAME_FUNC_OFFSET(17317, glGetObjectParameterivAPPLE, glGetObjectParameterivAPPLE, NULL, 955),
+    NAME_FUNC_OFFSET(17345, glObjectPurgeableAPPLE, glObjectPurgeableAPPLE, NULL, 956),
+    NAME_FUNC_OFFSET(17368, glObjectUnpurgeableAPPLE, glObjectUnpurgeableAPPLE, NULL, 957),
+    NAME_FUNC_OFFSET(17393, glActiveProgramEXT, glActiveProgramEXT, NULL, 958),
+    NAME_FUNC_OFFSET(17412, glCreateShaderProgramEXT, glCreateShaderProgramEXT, NULL, 959),
+    NAME_FUNC_OFFSET(17437, glUseShaderProgramEXT, glUseShaderProgramEXT, NULL, 960),
+    NAME_FUNC_OFFSET(17459, glTextureBarrierNV, glTextureBarrierNV, NULL, 961),
+    NAME_FUNC_OFFSET(17478, gl_dispatch_stub_962, gl_dispatch_stub_962, NULL, 962),
+    NAME_FUNC_OFFSET(17503, gl_dispatch_stub_963, gl_dispatch_stub_963, NULL, 963),
+    NAME_FUNC_OFFSET(17532, gl_dispatch_stub_964, gl_dispatch_stub_964, NULL, 964),
+    NAME_FUNC_OFFSET(17563, gl_dispatch_stub_965, gl_dispatch_stub_965, NULL, 965),
+    NAME_FUNC_OFFSET(17587, gl_dispatch_stub_966, gl_dispatch_stub_966, NULL, 966),
+    NAME_FUNC_OFFSET(17612, glEGLImageTargetRenderbufferStorageOES, glEGLImageTargetRenderbufferStorageOES, NULL, 967),
+    NAME_FUNC_OFFSET(17651, glEGLImageTargetTexture2DOES, glEGLImageTargetTexture2DOES, NULL, 968),
+    NAME_FUNC_OFFSET(17680, glArrayElement, glArrayElement, NULL, 306),
+    NAME_FUNC_OFFSET(17698, glBindTexture, glBindTexture, NULL, 307),
+    NAME_FUNC_OFFSET(17715, glDrawArrays, glDrawArrays, NULL, 310),
+    NAME_FUNC_OFFSET(17731, glAreTexturesResident, glAreTexturesResidentEXT, glAreTexturesResidentEXT, 322),
+    NAME_FUNC_OFFSET(17756, glCopyTexImage1D, glCopyTexImage1D, NULL, 323),
+    NAME_FUNC_OFFSET(17776, glCopyTexImage2D, glCopyTexImage2D, NULL, 324),
+    NAME_FUNC_OFFSET(17796, glCopyTexSubImage1D, glCopyTexSubImage1D, NULL, 325),
+    NAME_FUNC_OFFSET(17819, glCopyTexSubImage2D, glCopyTexSubImage2D, NULL, 326),
+    NAME_FUNC_OFFSET(17842, glDeleteTextures, glDeleteTexturesEXT, glDeleteTexturesEXT, 327),
+    NAME_FUNC_OFFSET(17862, glGenTextures, glGenTexturesEXT, glGenTexturesEXT, 328),
+    NAME_FUNC_OFFSET(17879, glGetPointerv, glGetPointerv, NULL, 329),
+    NAME_FUNC_OFFSET(17896, glIsTexture, glIsTextureEXT, glIsTextureEXT, 330),
+    NAME_FUNC_OFFSET(17911, glPrioritizeTextures, glPrioritizeTextures, NULL, 331),
+    NAME_FUNC_OFFSET(17935, glTexSubImage1D, glTexSubImage1D, NULL, 332),
+    NAME_FUNC_OFFSET(17954, glTexSubImage2D, glTexSubImage2D, NULL, 333),
+    NAME_FUNC_OFFSET(17973, glBlendColor, glBlendColor, NULL, 336),
+    NAME_FUNC_OFFSET(17989, glBlendEquation, glBlendEquation, NULL, 337),
+    NAME_FUNC_OFFSET(18008, glDrawRangeElements, glDrawRangeElements, NULL, 338),
+    NAME_FUNC_OFFSET(18031, glColorTable, glColorTable, NULL, 339),
+    NAME_FUNC_OFFSET(18047, glColorTable, glColorTable, NULL, 339),
+    NAME_FUNC_OFFSET(18063, glColorTableParameterfv, glColorTableParameterfv, NULL, 340),
+    NAME_FUNC_OFFSET(18090, glColorTableParameteriv, glColorTableParameteriv, NULL, 341),
+    NAME_FUNC_OFFSET(18117, glCopyColorTable, glCopyColorTable, NULL, 342),
+    NAME_FUNC_OFFSET(18137, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, 343),
+    NAME_FUNC_OFFSET(18156, glGetColorTable, glGetColorTableEXT, glGetColorTableEXT, 343),
+    NAME_FUNC_OFFSET(18175, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, 344),
+    NAME_FUNC_OFFSET(18205, glGetColorTableParameterfv, glGetColorTableParameterfvEXT, glGetColorTableParameterfvEXT, 344),
+    NAME_FUNC_OFFSET(18235, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, 345),
+    NAME_FUNC_OFFSET(18265, glGetColorTableParameteriv, glGetColorTableParameterivEXT, glGetColorTableParameterivEXT, 345),
+    NAME_FUNC_OFFSET(18295, glColorSubTable, glColorSubTable, NULL, 346),
+    NAME_FUNC_OFFSET(18314, glCopyColorSubTable, glCopyColorSubTable, NULL, 347),
+    NAME_FUNC_OFFSET(18337, glConvolutionFilter1D, glConvolutionFilter1D, NULL, 348),
+    NAME_FUNC_OFFSET(18362, glConvolutionFilter2D, glConvolutionFilter2D, NULL, 349),
+    NAME_FUNC_OFFSET(18387, glConvolutionParameterf, glConvolutionParameterf, NULL, 350),
+    NAME_FUNC_OFFSET(18414, glConvolutionParameterfv, glConvolutionParameterfv, NULL, 351),
+    NAME_FUNC_OFFSET(18442, glConvolutionParameteri, glConvolutionParameteri, NULL, 352),
+    NAME_FUNC_OFFSET(18469, glConvolutionParameteriv, glConvolutionParameteriv, NULL, 353),
+    NAME_FUNC_OFFSET(18497, glCopyConvolutionFilter1D, glCopyConvolutionFilter1D, NULL, 354),
+    NAME_FUNC_OFFSET(18526, glCopyConvolutionFilter2D, glCopyConvolutionFilter2D, NULL, 355),
+    NAME_FUNC_OFFSET(18555, glGetConvolutionFilter, gl_dispatch_stub_356, gl_dispatch_stub_356, 356),
+    NAME_FUNC_OFFSET(18581, glGetConvolutionParameterfv, gl_dispatch_stub_357, gl_dispatch_stub_357, 357),
+    NAME_FUNC_OFFSET(18612, glGetConvolutionParameteriv, gl_dispatch_stub_358, gl_dispatch_stub_358, 358),
+    NAME_FUNC_OFFSET(18643, glGetSeparableFilter, gl_dispatch_stub_359, gl_dispatch_stub_359, 359),
+    NAME_FUNC_OFFSET(18667, glSeparableFilter2D, glSeparableFilter2D, NULL, 360),
+    NAME_FUNC_OFFSET(18690, glGetHistogram, gl_dispatch_stub_361, gl_dispatch_stub_361, 361),
+    NAME_FUNC_OFFSET(18708, glGetHistogramParameterfv, gl_dispatch_stub_362, gl_dispatch_stub_362, 362),
+    NAME_FUNC_OFFSET(18737, glGetHistogramParameteriv, gl_dispatch_stub_363, gl_dispatch_stub_363, 363),
+    NAME_FUNC_OFFSET(18766, glGetMinmax, gl_dispatch_stub_364, gl_dispatch_stub_364, 364),
+    NAME_FUNC_OFFSET(18781, glGetMinmaxParameterfv, gl_dispatch_stub_365, gl_dispatch_stub_365, 365),
+    NAME_FUNC_OFFSET(18807, glGetMinmaxParameteriv, gl_dispatch_stub_366, gl_dispatch_stub_366, 366),
+    NAME_FUNC_OFFSET(18833, glHistogram, glHistogram, NULL, 367),
+    NAME_FUNC_OFFSET(18848, glMinmax, glMinmax, NULL, 368),
+    NAME_FUNC_OFFSET(18860, glResetHistogram, glResetHistogram, NULL, 369),
+    NAME_FUNC_OFFSET(18880, glResetMinmax, glResetMinmax, NULL, 370),
+    NAME_FUNC_OFFSET(18897, glTexImage3D, glTexImage3D, NULL, 371),
+    NAME_FUNC_OFFSET(18913, glTexSubImage3D, glTexSubImage3D, NULL, 372),
+    NAME_FUNC_OFFSET(18932, glCopyTexSubImage3D, glCopyTexSubImage3D, NULL, 373),
+    NAME_FUNC_OFFSET(18955, glActiveTextureARB, glActiveTextureARB, NULL, 374),
+    NAME_FUNC_OFFSET(18971, glClientActiveTextureARB, glClientActiveTextureARB, NULL, 375),
+    NAME_FUNC_OFFSET(18993, glMultiTexCoord1dARB, glMultiTexCoord1dARB, NULL, 376),
+    NAME_FUNC_OFFSET(19011, glMultiTexCoord1dvARB, glMultiTexCoord1dvARB, NULL, 377),
+    NAME_FUNC_OFFSET(19030, glMultiTexCoord1fARB, glMultiTexCoord1fARB, NULL, 378),
+    NAME_FUNC_OFFSET(19048, glMultiTexCoord1fvARB, glMultiTexCoord1fvARB, NULL, 379),
+    NAME_FUNC_OFFSET(19067, glMultiTexCoord1iARB, glMultiTexCoord1iARB, NULL, 380),
+    NAME_FUNC_OFFSET(19085, glMultiTexCoord1ivARB, glMultiTexCoord1ivARB, NULL, 381),
+    NAME_FUNC_OFFSET(19104, glMultiTexCoord1sARB, glMultiTexCoord1sARB, NULL, 382),
+    NAME_FUNC_OFFSET(19122, glMultiTexCoord1svARB, glMultiTexCoord1svARB, NULL, 383),
+    NAME_FUNC_OFFSET(19141, glMultiTexCoord2dARB, glMultiTexCoord2dARB, NULL, 384),
+    NAME_FUNC_OFFSET(19159, glMultiTexCoord2dvARB, glMultiTexCoord2dvARB, NULL, 385),
+    NAME_FUNC_OFFSET(19178, glMultiTexCoord2fARB, glMultiTexCoord2fARB, NULL, 386),
+    NAME_FUNC_OFFSET(19196, glMultiTexCoord2fvARB, glMultiTexCoord2fvARB, NULL, 387),
+    NAME_FUNC_OFFSET(19215, glMultiTexCoord2iARB, glMultiTexCoord2iARB, NULL, 388),
+    NAME_FUNC_OFFSET(19233, glMultiTexCoord2ivARB, glMultiTexCoord2ivARB, NULL, 389),
+    NAME_FUNC_OFFSET(19252, glMultiTexCoord2sARB, glMultiTexCoord2sARB, NULL, 390),
+    NAME_FUNC_OFFSET(19270, glMultiTexCoord2svARB, glMultiTexCoord2svARB, NULL, 391),
+    NAME_FUNC_OFFSET(19289, glMultiTexCoord3dARB, glMultiTexCoord3dARB, NULL, 392),
+    NAME_FUNC_OFFSET(19307, glMultiTexCoord3dvARB, glMultiTexCoord3dvARB, NULL, 393),
+    NAME_FUNC_OFFSET(19326, glMultiTexCoord3fARB, glMultiTexCoord3fARB, NULL, 394),
+    NAME_FUNC_OFFSET(19344, glMultiTexCoord3fvARB, glMultiTexCoord3fvARB, NULL, 395),
+    NAME_FUNC_OFFSET(19363, glMultiTexCoord3iARB, glMultiTexCoord3iARB, NULL, 396),
+    NAME_FUNC_OFFSET(19381, glMultiTexCoord3ivARB, glMultiTexCoord3ivARB, NULL, 397),
+    NAME_FUNC_OFFSET(19400, glMultiTexCoord3sARB, glMultiTexCoord3sARB, NULL, 398),
+    NAME_FUNC_OFFSET(19418, glMultiTexCoord3svARB, glMultiTexCoord3svARB, NULL, 399),
+    NAME_FUNC_OFFSET(19437, glMultiTexCoord4dARB, glMultiTexCoord4dARB, NULL, 400),
+    NAME_FUNC_OFFSET(19455, glMultiTexCoord4dvARB, glMultiTexCoord4dvARB, NULL, 401),
+    NAME_FUNC_OFFSET(19474, glMultiTexCoord4fARB, glMultiTexCoord4fARB, NULL, 402),
+    NAME_FUNC_OFFSET(19492, glMultiTexCoord4fvARB, glMultiTexCoord4fvARB, NULL, 403),
+    NAME_FUNC_OFFSET(19511, glMultiTexCoord4iARB, glMultiTexCoord4iARB, NULL, 404),
+    NAME_FUNC_OFFSET(19529, glMultiTexCoord4ivARB, glMultiTexCoord4ivARB, NULL, 405),
+    NAME_FUNC_OFFSET(19548, glMultiTexCoord4sARB, glMultiTexCoord4sARB, NULL, 406),
+    NAME_FUNC_OFFSET(19566, glMultiTexCoord4svARB, glMultiTexCoord4svARB, NULL, 407),
+    NAME_FUNC_OFFSET(19585, glStencilOpSeparate, glStencilOpSeparate, NULL, 423),
+    NAME_FUNC_OFFSET(19608, glFramebufferTexture, glFramebufferTexture, NULL, 435),
+    NAME_FUNC_OFFSET(19632, glLoadTransposeMatrixdARB, glLoadTransposeMatrixdARB, NULL, 438),
+    NAME_FUNC_OFFSET(19655, glLoadTransposeMatrixfARB, glLoadTransposeMatrixfARB, NULL, 439),
+    NAME_FUNC_OFFSET(19678, glMultTransposeMatrixdARB, glMultTransposeMatrixdARB, NULL, 440),
+    NAME_FUNC_OFFSET(19701, glMultTransposeMatrixfARB, glMultTransposeMatrixfARB, NULL, 441),
+    NAME_FUNC_OFFSET(19724, glSampleCoverageARB, glSampleCoverageARB, NULL, 442),
+    NAME_FUNC_OFFSET(19741, glCompressedTexImage1DARB, glCompressedTexImage1DARB, NULL, 443),
+    NAME_FUNC_OFFSET(19764, glCompressedTexImage2DARB, glCompressedTexImage2DARB, NULL, 444),
+    NAME_FUNC_OFFSET(19787, glCompressedTexImage3DARB, glCompressedTexImage3DARB, NULL, 445),
+    NAME_FUNC_OFFSET(19810, glCompressedTexSubImage1DARB, glCompressedTexSubImage1DARB, NULL, 446),
+    NAME_FUNC_OFFSET(19836, glCompressedTexSubImage2DARB, glCompressedTexSubImage2DARB, NULL, 447),
+    NAME_FUNC_OFFSET(19862, glCompressedTexSubImage3DARB, glCompressedTexSubImage3DARB, NULL, 448),
+    NAME_FUNC_OFFSET(19888, glGetCompressedTexImageARB, glGetCompressedTexImageARB, NULL, 449),
+    NAME_FUNC_OFFSET(19912, glDisableVertexAttribArrayARB, glDisableVertexAttribArrayARB, NULL, 450),
+    NAME_FUNC_OFFSET(19939, glEnableVertexAttribArrayARB, glEnableVertexAttribArrayARB, NULL, 451),
+    NAME_FUNC_OFFSET(19965, glGetVertexAttribdvARB, glGetVertexAttribdvARB, NULL, 458),
+    NAME_FUNC_OFFSET(19985, glGetVertexAttribfvARB, glGetVertexAttribfvARB, NULL, 459),
+    NAME_FUNC_OFFSET(20005, glGetVertexAttribivARB, glGetVertexAttribivARB, NULL, 460),
+    NAME_FUNC_OFFSET(20025, glProgramEnvParameter4dARB, glProgramEnvParameter4dARB, NULL, 461),
+    NAME_FUNC_OFFSET(20048, glProgramEnvParameter4dvARB, glProgramEnvParameter4dvARB, NULL, 462),
+    NAME_FUNC_OFFSET(20072, glProgramEnvParameter4fARB, glProgramEnvParameter4fARB, NULL, 463),
+    NAME_FUNC_OFFSET(20095, glProgramEnvParameter4fvARB, glProgramEnvParameter4fvARB, NULL, 464),
+    NAME_FUNC_OFFSET(20119, glVertexAttrib1dARB, glVertexAttrib1dARB, NULL, 470),
+    NAME_FUNC_OFFSET(20136, glVertexAttrib1dvARB, glVertexAttrib1dvARB, NULL, 471),
+    NAME_FUNC_OFFSET(20154, glVertexAttrib1fARB, glVertexAttrib1fARB, NULL, 472),
+    NAME_FUNC_OFFSET(20171, glVertexAttrib1fvARB, glVertexAttrib1fvARB, NULL, 473),
+    NAME_FUNC_OFFSET(20189, glVertexAttrib1sARB, glVertexAttrib1sARB, NULL, 474),
+    NAME_FUNC_OFFSET(20206, glVertexAttrib1svARB, glVertexAttrib1svARB, NULL, 475),
+    NAME_FUNC_OFFSET(20224, glVertexAttrib2dARB, glVertexAttrib2dARB, NULL, 476),
+    NAME_FUNC_OFFSET(20241, glVertexAttrib2dvARB, glVertexAttrib2dvARB, NULL, 477),
+    NAME_FUNC_OFFSET(20259, glVertexAttrib2fARB, glVertexAttrib2fARB, NULL, 478),
+    NAME_FUNC_OFFSET(20276, glVertexAttrib2fvARB, glVertexAttrib2fvARB, NULL, 479),
+    NAME_FUNC_OFFSET(20294, glVertexAttrib2sARB, glVertexAttrib2sARB, NULL, 480),
+    NAME_FUNC_OFFSET(20311, glVertexAttrib2svARB, glVertexAttrib2svARB, NULL, 481),
+    NAME_FUNC_OFFSET(20329, glVertexAttrib3dARB, glVertexAttrib3dARB, NULL, 482),
+    NAME_FUNC_OFFSET(20346, glVertexAttrib3dvARB, glVertexAttrib3dvARB, NULL, 483),
+    NAME_FUNC_OFFSET(20364, glVertexAttrib3fARB, glVertexAttrib3fARB, NULL, 484),
+    NAME_FUNC_OFFSET(20381, glVertexAttrib3fvARB, glVertexAttrib3fvARB, NULL, 485),
+    NAME_FUNC_OFFSET(20399, glVertexAttrib3sARB, glVertexAttrib3sARB, NULL, 486),
+    NAME_FUNC_OFFSET(20416, glVertexAttrib3svARB, glVertexAttrib3svARB, NULL, 487),
+    NAME_FUNC_OFFSET(20434, glVertexAttrib4NbvARB, glVertexAttrib4NbvARB, NULL, 488),
+    NAME_FUNC_OFFSET(20453, glVertexAttrib4NivARB, glVertexAttrib4NivARB, NULL, 489),
+    NAME_FUNC_OFFSET(20472, glVertexAttrib4NsvARB, glVertexAttrib4NsvARB, NULL, 490),
+    NAME_FUNC_OFFSET(20491, glVertexAttrib4NubARB, glVertexAttrib4NubARB, NULL, 491),
+    NAME_FUNC_OFFSET(20510, glVertexAttrib4NubvARB, glVertexAttrib4NubvARB, NULL, 492),
+    NAME_FUNC_OFFSET(20530, glVertexAttrib4NuivARB, glVertexAttrib4NuivARB, NULL, 493),
+    NAME_FUNC_OFFSET(20550, glVertexAttrib4NusvARB, glVertexAttrib4NusvARB, NULL, 494),
+    NAME_FUNC_OFFSET(20570, glVertexAttrib4bvARB, glVertexAttrib4bvARB, NULL, 495),
+    NAME_FUNC_OFFSET(20588, glVertexAttrib4dARB, glVertexAttrib4dARB, NULL, 496),
+    NAME_FUNC_OFFSET(20605, glVertexAttrib4dvARB, glVertexAttrib4dvARB, NULL, 497),
+    NAME_FUNC_OFFSET(20623, glVertexAttrib4fARB, glVertexAttrib4fARB, NULL, 498),
+    NAME_FUNC_OFFSET(20640, glVertexAttrib4fvARB, glVertexAttrib4fvARB, NULL, 499),
+    NAME_FUNC_OFFSET(20658, glVertexAttrib4ivARB, glVertexAttrib4ivARB, NULL, 500),
+    NAME_FUNC_OFFSET(20676, glVertexAttrib4sARB, glVertexAttrib4sARB, NULL, 501),
+    NAME_FUNC_OFFSET(20693, glVertexAttrib4svARB, glVertexAttrib4svARB, NULL, 502),
+    NAME_FUNC_OFFSET(20711, glVertexAttrib4ubvARB, glVertexAttrib4ubvARB, NULL, 503),
+    NAME_FUNC_OFFSET(20730, glVertexAttrib4uivARB, glVertexAttrib4uivARB, NULL, 504),
+    NAME_FUNC_OFFSET(20749, glVertexAttrib4usvARB, glVertexAttrib4usvARB, NULL, 505),
+    NAME_FUNC_OFFSET(20768, glVertexAttribPointerARB, glVertexAttribPointerARB, NULL, 506),
+    NAME_FUNC_OFFSET(20790, glBindBufferARB, glBindBufferARB, NULL, 507),
+    NAME_FUNC_OFFSET(20803, glBufferDataARB, glBufferDataARB, NULL, 508),
+    NAME_FUNC_OFFSET(20816, glBufferSubDataARB, glBufferSubDataARB, NULL, 509),
+    NAME_FUNC_OFFSET(20832, glDeleteBuffersARB, glDeleteBuffersARB, NULL, 510),
+    NAME_FUNC_OFFSET(20848, glGenBuffersARB, glGenBuffersARB, NULL, 511),
+    NAME_FUNC_OFFSET(20861, glGetBufferParameterivARB, glGetBufferParameterivARB, NULL, 512),
+    NAME_FUNC_OFFSET(20884, glGetBufferPointervARB, glGetBufferPointervARB, NULL, 513),
+    NAME_FUNC_OFFSET(20904, glGetBufferSubDataARB, glGetBufferSubDataARB, NULL, 514),
+    NAME_FUNC_OFFSET(20923, glIsBufferARB, glIsBufferARB, NULL, 515),
+    NAME_FUNC_OFFSET(20934, glMapBufferARB, glMapBufferARB, NULL, 516),
+    NAME_FUNC_OFFSET(20946, glUnmapBufferARB, glUnmapBufferARB, NULL, 517),
+    NAME_FUNC_OFFSET(20960, glBeginQueryARB, glBeginQueryARB, NULL, 518),
+    NAME_FUNC_OFFSET(20973, glDeleteQueriesARB, glDeleteQueriesARB, NULL, 519),
+    NAME_FUNC_OFFSET(20989, glEndQueryARB, glEndQueryARB, NULL, 520),
+    NAME_FUNC_OFFSET(21000, glGenQueriesARB, glGenQueriesARB, NULL, 521),
+    NAME_FUNC_OFFSET(21013, glGetQueryObjectivARB, glGetQueryObjectivARB, NULL, 522),
+    NAME_FUNC_OFFSET(21032, glGetQueryObjectuivARB, glGetQueryObjectuivARB, NULL, 523),
+    NAME_FUNC_OFFSET(21052, glGetQueryivARB, glGetQueryivARB, NULL, 524),
+    NAME_FUNC_OFFSET(21065, glIsQueryARB, glIsQueryARB, NULL, 525),
+    NAME_FUNC_OFFSET(21075, glCompileShaderARB, glCompileShaderARB, NULL, 527),
+    NAME_FUNC_OFFSET(21091, glGetActiveUniformARB, glGetActiveUniformARB, NULL, 532),
+    NAME_FUNC_OFFSET(21110, glGetShaderSourceARB, glGetShaderSourceARB, NULL, 538),
+    NAME_FUNC_OFFSET(21128, glGetUniformLocationARB, glGetUniformLocationARB, NULL, 539),
+    NAME_FUNC_OFFSET(21149, glGetUniformfvARB, glGetUniformfvARB, NULL, 540),
+    NAME_FUNC_OFFSET(21164, glGetUniformivARB, glGetUniformivARB, NULL, 541),
+    NAME_FUNC_OFFSET(21179, glLinkProgramARB, glLinkProgramARB, NULL, 542),
+    NAME_FUNC_OFFSET(21193, glShaderSourceARB, glShaderSourceARB, NULL, 543),
+    NAME_FUNC_OFFSET(21208, glUniform1fARB, glUniform1fARB, NULL, 544),
+    NAME_FUNC_OFFSET(21220, glUniform1fvARB, glUniform1fvARB, NULL, 545),
+    NAME_FUNC_OFFSET(21233, glUniform1iARB, glUniform1iARB, NULL, 546),
+    NAME_FUNC_OFFSET(21245, glUniform1ivARB, glUniform1ivARB, NULL, 547),
+    NAME_FUNC_OFFSET(21258, glUniform2fARB, glUniform2fARB, NULL, 548),
+    NAME_FUNC_OFFSET(21270, glUniform2fvARB, glUniform2fvARB, NULL, 549),
+    NAME_FUNC_OFFSET(21283, glUniform2iARB, glUniform2iARB, NULL, 550),
+    NAME_FUNC_OFFSET(21295, glUniform2ivARB, glUniform2ivARB, NULL, 551),
+    NAME_FUNC_OFFSET(21308, glUniform3fARB, glUniform3fARB, NULL, 552),
+    NAME_FUNC_OFFSET(21320, glUniform3fvARB, glUniform3fvARB, NULL, 553),
+    NAME_FUNC_OFFSET(21333, glUniform3iARB, glUniform3iARB, NULL, 554),
+    NAME_FUNC_OFFSET(21345, glUniform3ivARB, glUniform3ivARB, NULL, 555),
+    NAME_FUNC_OFFSET(21358, glUniform4fARB, glUniform4fARB, NULL, 556),
+    NAME_FUNC_OFFSET(21370, glUniform4fvARB, glUniform4fvARB, NULL, 557),
+    NAME_FUNC_OFFSET(21383, glUniform4iARB, glUniform4iARB, NULL, 558),
+    NAME_FUNC_OFFSET(21395, glUniform4ivARB, glUniform4ivARB, NULL, 559),
+    NAME_FUNC_OFFSET(21408, glUniformMatrix2fvARB, glUniformMatrix2fvARB, NULL, 560),
+    NAME_FUNC_OFFSET(21427, glUniformMatrix3fvARB, glUniformMatrix3fvARB, NULL, 561),
+    NAME_FUNC_OFFSET(21446, glUniformMatrix4fvARB, glUniformMatrix4fvARB, NULL, 562),
+    NAME_FUNC_OFFSET(21465, glUseProgramObjectARB, glUseProgramObjectARB, NULL, 563),
+    NAME_FUNC_OFFSET(21478, glValidateProgramARB, glValidateProgramARB, NULL, 564),
+    NAME_FUNC_OFFSET(21496, glBindAttribLocationARB, glBindAttribLocationARB, NULL, 565),
+    NAME_FUNC_OFFSET(21517, glGetActiveAttribARB, glGetActiveAttribARB, NULL, 566),
+    NAME_FUNC_OFFSET(21535, glGetAttribLocationARB, glGetAttribLocationARB, NULL, 567),
+    NAME_FUNC_OFFSET(21555, glDrawBuffersARB, glDrawBuffersARB, NULL, 568),
+    NAME_FUNC_OFFSET(21569, glDrawBuffersARB, glDrawBuffersARB, NULL, 568),
+    NAME_FUNC_OFFSET(21586, glClampColorARB, glClampColorARB, NULL, 569),
+    NAME_FUNC_OFFSET(21599, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 570),
+    NAME_FUNC_OFFSET(21624, glDrawArraysInstancedARB, glDrawArraysInstancedARB, NULL, 570),
+    NAME_FUNC_OFFSET(21646, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 571),
+    NAME_FUNC_OFFSET(21673, glDrawElementsInstancedARB, glDrawElementsInstancedARB, NULL, 571),
+    NAME_FUNC_OFFSET(21697, glRenderbufferStorageMultisample, glRenderbufferStorageMultisample, NULL, 572),
+    NAME_FUNC_OFFSET(21733, glVertexAttribDivisorARB, glVertexAttribDivisorARB, NULL, 574),
+    NAME_FUNC_OFFSET(21755, glTexBufferARB, glTexBufferARB, NULL, 577),
+    NAME_FUNC_OFFSET(21767, glBlendEquationSeparateiARB, glBlendEquationSeparateiARB, NULL, 599),
+    NAME_FUNC_OFFSET(21801, glBlendEquationiARB, glBlendEquationiARB, NULL, 600),
+    NAME_FUNC_OFFSET(21827, glBlendFuncSeparateiARB, glBlendFuncSeparateiARB, NULL, 601),
+    NAME_FUNC_OFFSET(21857, glBlendFunciARB, glBlendFunciARB, NULL, 602),
+    NAME_FUNC_OFFSET(21879, gl_dispatch_stub_676, gl_dispatch_stub_676, NULL, 676),
+    NAME_FUNC_OFFSET(21902, gl_dispatch_stub_719, gl_dispatch_stub_719, NULL, 719),
+    NAME_FUNC_OFFSET(21918, gl_dispatch_stub_720, gl_dispatch_stub_720, NULL, 720),
+    NAME_FUNC_OFFSET(21937, glPointParameterfEXT, glPointParameterfEXT, NULL, 727),
+    NAME_FUNC_OFFSET(21955, glPointParameterfEXT, glPointParameterfEXT, NULL, 727),
+    NAME_FUNC_OFFSET(21976, glPointParameterfEXT, glPointParameterfEXT, NULL, 727),
+    NAME_FUNC_OFFSET(21998, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 728),
+    NAME_FUNC_OFFSET(22017, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 728),
+    NAME_FUNC_OFFSET(22039, glPointParameterfvEXT, glPointParameterfvEXT, NULL, 728),
+    NAME_FUNC_OFFSET(22062, glSecondaryColor3bEXT, glSecondaryColor3bEXT, NULL, 731),
+    NAME_FUNC_OFFSET(22081, glSecondaryColor3bvEXT, glSecondaryColor3bvEXT, NULL, 732),
+    NAME_FUNC_OFFSET(22101, glSecondaryColor3dEXT, glSecondaryColor3dEXT, NULL, 733),
+    NAME_FUNC_OFFSET(22120, glSecondaryColor3dvEXT, glSecondaryColor3dvEXT, NULL, 734),
+    NAME_FUNC_OFFSET(22140, glSecondaryColor3fEXT, glSecondaryColor3fEXT, NULL, 735),
+    NAME_FUNC_OFFSET(22159, glSecondaryColor3fvEXT, glSecondaryColor3fvEXT, NULL, 736),
+    NAME_FUNC_OFFSET(22179, glSecondaryColor3iEXT, glSecondaryColor3iEXT, NULL, 737),
+    NAME_FUNC_OFFSET(22198, glSecondaryColor3ivEXT, glSecondaryColor3ivEXT, NULL, 738),
+    NAME_FUNC_OFFSET(22218, glSecondaryColor3sEXT, glSecondaryColor3sEXT, NULL, 739),
+    NAME_FUNC_OFFSET(22237, glSecondaryColor3svEXT, glSecondaryColor3svEXT, NULL, 740),
+    NAME_FUNC_OFFSET(22257, glSecondaryColor3ubEXT, glSecondaryColor3ubEXT, NULL, 741),
+    NAME_FUNC_OFFSET(22277, glSecondaryColor3ubvEXT, glSecondaryColor3ubvEXT, NULL, 742),
+    NAME_FUNC_OFFSET(22298, glSecondaryColor3uiEXT, glSecondaryColor3uiEXT, NULL, 743),
+    NAME_FUNC_OFFSET(22318, glSecondaryColor3uivEXT, glSecondaryColor3uivEXT, NULL, 744),
+    NAME_FUNC_OFFSET(22339, glSecondaryColor3usEXT, glSecondaryColor3usEXT, NULL, 745),
+    NAME_FUNC_OFFSET(22359, glSecondaryColor3usvEXT, glSecondaryColor3usvEXT, NULL, 746),
+    NAME_FUNC_OFFSET(22380, glSecondaryColorPointerEXT, glSecondaryColorPointerEXT, NULL, 747),
+    NAME_FUNC_OFFSET(22404, glMultiDrawArraysEXT, glMultiDrawArraysEXT, NULL, 748),
+    NAME_FUNC_OFFSET(22422, glMultiDrawElementsEXT, glMultiDrawElementsEXT, NULL, 749),
+    NAME_FUNC_OFFSET(22442, glFogCoordPointerEXT, glFogCoordPointerEXT, NULL, 750),
+    NAME_FUNC_OFFSET(22460, glFogCoorddEXT, glFogCoorddEXT, NULL, 751),
+    NAME_FUNC_OFFSET(22472, glFogCoorddvEXT, glFogCoorddvEXT, NULL, 752),
+    NAME_FUNC_OFFSET(22485, glFogCoordfEXT, glFogCoordfEXT, NULL, 753),
+    NAME_FUNC_OFFSET(22497, glFogCoordfvEXT, glFogCoordfvEXT, NULL, 754),
+    NAME_FUNC_OFFSET(22510, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, 755),
+    NAME_FUNC_OFFSET(22530, glBlendFuncSeparateEXT, glBlendFuncSeparateEXT, NULL, 755),
+    NAME_FUNC_OFFSET(22554, glWindowPos2dMESA, glWindowPos2dMESA, NULL, 757),
+    NAME_FUNC_OFFSET(22568, glWindowPos2dMESA, glWindowPos2dMESA, NULL, 757),
+    NAME_FUNC_OFFSET(22585, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, 758),
+    NAME_FUNC_OFFSET(22600, glWindowPos2dvMESA, glWindowPos2dvMESA, NULL, 758),
+    NAME_FUNC_OFFSET(22618, glWindowPos2fMESA, glWindowPos2fMESA, NULL, 759),
+    NAME_FUNC_OFFSET(22632, glWindowPos2fMESA, glWindowPos2fMESA, NULL, 759),
+    NAME_FUNC_OFFSET(22649, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, 760),
+    NAME_FUNC_OFFSET(22664, glWindowPos2fvMESA, glWindowPos2fvMESA, NULL, 760),
+    NAME_FUNC_OFFSET(22682, glWindowPos2iMESA, glWindowPos2iMESA, NULL, 761),
+    NAME_FUNC_OFFSET(22696, glWindowPos2iMESA, glWindowPos2iMESA, NULL, 761),
+    NAME_FUNC_OFFSET(22713, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, 762),
+    NAME_FUNC_OFFSET(22728, glWindowPos2ivMESA, glWindowPos2ivMESA, NULL, 762),
+    NAME_FUNC_OFFSET(22746, glWindowPos2sMESA, glWindowPos2sMESA, NULL, 763),
+    NAME_FUNC_OFFSET(22760, glWindowPos2sMESA, glWindowPos2sMESA, NULL, 763),
+    NAME_FUNC_OFFSET(22777, glWindowPos2svMESA, glWindowPos2svMESA, NULL, 764),
+    NAME_FUNC_OFFSET(22792, glWindowPos2svMESA, glWindowPos2svMESA, NULL, 764),
+    NAME_FUNC_OFFSET(22810, glWindowPos3dMESA, glWindowPos3dMESA, NULL, 765),
+    NAME_FUNC_OFFSET(22824, glWindowPos3dMESA, glWindowPos3dMESA, NULL, 765),
+    NAME_FUNC_OFFSET(22841, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, 766),
+    NAME_FUNC_OFFSET(22856, glWindowPos3dvMESA, glWindowPos3dvMESA, NULL, 766),
+    NAME_FUNC_OFFSET(22874, glWindowPos3fMESA, glWindowPos3fMESA, NULL, 767),
+    NAME_FUNC_OFFSET(22888, glWindowPos3fMESA, glWindowPos3fMESA, NULL, 767),
+    NAME_FUNC_OFFSET(22905, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, 768),
+    NAME_FUNC_OFFSET(22920, glWindowPos3fvMESA, glWindowPos3fvMESA, NULL, 768),
+    NAME_FUNC_OFFSET(22938, glWindowPos3iMESA, glWindowPos3iMESA, NULL, 769),
+    NAME_FUNC_OFFSET(22952, glWindowPos3iMESA, glWindowPos3iMESA, NULL, 769),
+    NAME_FUNC_OFFSET(22969, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, 770),
+    NAME_FUNC_OFFSET(22984, glWindowPos3ivMESA, glWindowPos3ivMESA, NULL, 770),
+    NAME_FUNC_OFFSET(23002, glWindowPos3sMESA, glWindowPos3sMESA, NULL, 771),
+    NAME_FUNC_OFFSET(23016, glWindowPos3sMESA, glWindowPos3sMESA, NULL, 771),
+    NAME_FUNC_OFFSET(23033, glWindowPos3svMESA, glWindowPos3svMESA, NULL, 772),
+    NAME_FUNC_OFFSET(23048, glWindowPos3svMESA, glWindowPos3svMESA, NULL, 772),
+    NAME_FUNC_OFFSET(23066, glBindProgramNV, glBindProgramNV, NULL, 784),
+    NAME_FUNC_OFFSET(23083, glDeleteProgramsNV, glDeleteProgramsNV, NULL, 785),
+    NAME_FUNC_OFFSET(23103, glGenProgramsNV, glGenProgramsNV, NULL, 787),
+    NAME_FUNC_OFFSET(23120, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, 793),
+    NAME_FUNC_OFFSET(23146, glGetVertexAttribPointervNV, glGetVertexAttribPointervNV, NULL, 793),
+    NAME_FUNC_OFFSET(23175, glIsProgramNV, glIsProgramNV, NULL, 797),
+    NAME_FUNC_OFFSET(23190, glPointParameteriNV, glPointParameteriNV, NULL, 861),
+    NAME_FUNC_OFFSET(23208, glPointParameterivNV, glPointParameterivNV, NULL, 862),
+    NAME_FUNC_OFFSET(23227, gl_dispatch_stub_865, gl_dispatch_stub_865, NULL, 865),
+    NAME_FUNC_OFFSET(23248, gl_dispatch_stub_867, gl_dispatch_stub_867, NULL, 867),
+    NAME_FUNC_OFFSET(23264, glPrimitiveRestartIndexNV, glPrimitiveRestartIndexNV, NULL, 874),
+    NAME_FUNC_OFFSET(23288, gl_dispatch_stub_877, gl_dispatch_stub_877, NULL, 877),
+    NAME_FUNC_OFFSET(23312, gl_dispatch_stub_877, gl_dispatch_stub_877, NULL, 877),
+    NAME_FUNC_OFFSET(23339, glBindFramebufferEXT, glBindFramebufferEXT, NULL, 878),
+    NAME_FUNC_OFFSET(23357, glBindRenderbufferEXT, glBindRenderbufferEXT, NULL, 879),
+    NAME_FUNC_OFFSET(23376, glCheckFramebufferStatusEXT, glCheckFramebufferStatusEXT, NULL, 880),
+    NAME_FUNC_OFFSET(23401, glDeleteFramebuffersEXT, glDeleteFramebuffersEXT, NULL, 881),
+    NAME_FUNC_OFFSET(23422, glDeleteRenderbuffersEXT, glDeleteRenderbuffersEXT, NULL, 882),
+    NAME_FUNC_OFFSET(23444, glFramebufferRenderbufferEXT, glFramebufferRenderbufferEXT, NULL, 883),
+    NAME_FUNC_OFFSET(23470, glFramebufferTexture1DEXT, glFramebufferTexture1DEXT, NULL, 884),
+    NAME_FUNC_OFFSET(23493, glFramebufferTexture2DEXT, glFramebufferTexture2DEXT, NULL, 885),
+    NAME_FUNC_OFFSET(23516, glFramebufferTexture3DEXT, glFramebufferTexture3DEXT, NULL, 886),
+    NAME_FUNC_OFFSET(23539, glGenFramebuffersEXT, glGenFramebuffersEXT, NULL, 887),
+    NAME_FUNC_OFFSET(23557, glGenRenderbuffersEXT, glGenRenderbuffersEXT, NULL, 888),
+    NAME_FUNC_OFFSET(23576, glGenerateMipmapEXT, glGenerateMipmapEXT, NULL, 889),
+    NAME_FUNC_OFFSET(23593, glGetFramebufferAttachmentParameterivEXT, glGetFramebufferAttachmentParameterivEXT, NULL, 890),
+    NAME_FUNC_OFFSET(23631, glGetRenderbufferParameterivEXT, glGetRenderbufferParameterivEXT, NULL, 891),
+    NAME_FUNC_OFFSET(23660, glIsFramebufferEXT, glIsFramebufferEXT, NULL, 892),
+    NAME_FUNC_OFFSET(23676, glIsRenderbufferEXT, glIsRenderbufferEXT, NULL, 893),
+    NAME_FUNC_OFFSET(23693, glRenderbufferStorageEXT, glRenderbufferStorageEXT, NULL, 894),
+    NAME_FUNC_OFFSET(23715, gl_dispatch_stub_895, gl_dispatch_stub_895, NULL, 895),
+    NAME_FUNC_OFFSET(23733, glBindFragDataLocationEXT, glBindFragDataLocationEXT, NULL, 898),
+    NAME_FUNC_OFFSET(23756, glGetFragDataLocationEXT, glGetFragDataLocationEXT, NULL, 899),
+    NAME_FUNC_OFFSET(23778, glGetUniformuivEXT, glGetUniformuivEXT, NULL, 900),
+    NAME_FUNC_OFFSET(23794, glGetVertexAttribIivEXT, glGetVertexAttribIivEXT, NULL, 901),
+    NAME_FUNC_OFFSET(23815, glGetVertexAttribIuivEXT, glGetVertexAttribIuivEXT, NULL, 902),
+    NAME_FUNC_OFFSET(23837, glUniform1uiEXT, glUniform1uiEXT, NULL, 903),
+    NAME_FUNC_OFFSET(23850, glUniform1uivEXT, glUniform1uivEXT, NULL, 904),
+    NAME_FUNC_OFFSET(23864, glUniform2uiEXT, glUniform2uiEXT, NULL, 905),
+    NAME_FUNC_OFFSET(23877, glUniform2uivEXT, glUniform2uivEXT, NULL, 906),
+    NAME_FUNC_OFFSET(23891, glUniform3uiEXT, glUniform3uiEXT, NULL, 907),
+    NAME_FUNC_OFFSET(23904, glUniform3uivEXT, glUniform3uivEXT, NULL, 908),
+    NAME_FUNC_OFFSET(23918, glUniform4uiEXT, glUniform4uiEXT, NULL, 909),
+    NAME_FUNC_OFFSET(23931, glUniform4uivEXT, glUniform4uivEXT, NULL, 910),
+    NAME_FUNC_OFFSET(23945, glVertexAttribI1iEXT, glVertexAttribI1iEXT, NULL, 911),
+    NAME_FUNC_OFFSET(23963, glVertexAttribI1ivEXT, glVertexAttribI1ivEXT, NULL, 912),
+    NAME_FUNC_OFFSET(23982, glVertexAttribI1uiEXT, glVertexAttribI1uiEXT, NULL, 913),
+    NAME_FUNC_OFFSET(24001, glVertexAttribI1uivEXT, glVertexAttribI1uivEXT, NULL, 914),
+    NAME_FUNC_OFFSET(24021, glVertexAttribI2iEXT, glVertexAttribI2iEXT, NULL, 915),
+    NAME_FUNC_OFFSET(24039, glVertexAttribI2ivEXT, glVertexAttribI2ivEXT, NULL, 916),
+    NAME_FUNC_OFFSET(24058, glVertexAttribI2uiEXT, glVertexAttribI2uiEXT, NULL, 917),
+    NAME_FUNC_OFFSET(24077, glVertexAttribI2uivEXT, glVertexAttribI2uivEXT, NULL, 918),
+    NAME_FUNC_OFFSET(24097, glVertexAttribI3iEXT, glVertexAttribI3iEXT, NULL, 919),
+    NAME_FUNC_OFFSET(24115, glVertexAttribI3ivEXT, glVertexAttribI3ivEXT, NULL, 920),
+    NAME_FUNC_OFFSET(24134, glVertexAttribI3uiEXT, glVertexAttribI3uiEXT, NULL, 921),
+    NAME_FUNC_OFFSET(24153, glVertexAttribI3uivEXT, glVertexAttribI3uivEXT, NULL, 922),
+    NAME_FUNC_OFFSET(24173, glVertexAttribI4bvEXT, glVertexAttribI4bvEXT, NULL, 923),
+    NAME_FUNC_OFFSET(24192, glVertexAttribI4iEXT, glVertexAttribI4iEXT, NULL, 924),
+    NAME_FUNC_OFFSET(24210, glVertexAttribI4ivEXT, glVertexAttribI4ivEXT, NULL, 925),
+    NAME_FUNC_OFFSET(24229, glVertexAttribI4svEXT, glVertexAttribI4svEXT, NULL, 926),
+    NAME_FUNC_OFFSET(24248, glVertexAttribI4ubvEXT, glVertexAttribI4ubvEXT, NULL, 927),
+    NAME_FUNC_OFFSET(24268, glVertexAttribI4uiEXT, glVertexAttribI4uiEXT, NULL, 928),
+    NAME_FUNC_OFFSET(24287, glVertexAttribI4uivEXT, glVertexAttribI4uivEXT, NULL, 929),
+    NAME_FUNC_OFFSET(24307, glVertexAttribI4usvEXT, glVertexAttribI4usvEXT, NULL, 930),
+    NAME_FUNC_OFFSET(24327, glVertexAttribIPointerEXT, glVertexAttribIPointerEXT, NULL, 931),
+    NAME_FUNC_OFFSET(24350, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, 932),
+    NAME_FUNC_OFFSET(24376, glFramebufferTextureLayerEXT, glFramebufferTextureLayerEXT, NULL, 932),
+    NAME_FUNC_OFFSET(24405, glColorMaskIndexedEXT, glColorMaskIndexedEXT, NULL, 933),
+    NAME_FUNC_OFFSET(24418, glDisableIndexedEXT, glDisableIndexedEXT, NULL, 934),
+    NAME_FUNC_OFFSET(24429, glEnableIndexedEXT, glEnableIndexedEXT, NULL, 935),
+    NAME_FUNC_OFFSET(24439, glGetBooleanIndexedvEXT, glGetBooleanIndexedvEXT, NULL, 936),
+    NAME_FUNC_OFFSET(24455, glGetIntegerIndexedvEXT, glGetIntegerIndexedvEXT, NULL, 937),
+    NAME_FUNC_OFFSET(24471, glIsEnabledIndexedEXT, glIsEnabledIndexedEXT, NULL, 938),
+    NAME_FUNC_OFFSET(24484, glGetTexParameterIivEXT, glGetTexParameterIivEXT, NULL, 941),
+    NAME_FUNC_OFFSET(24505, glGetTexParameterIuivEXT, glGetTexParameterIuivEXT, NULL, 942),
+    NAME_FUNC_OFFSET(24527, glTexParameterIivEXT, glTexParameterIivEXT, NULL, 943),
+    NAME_FUNC_OFFSET(24545, glTexParameterIuivEXT, glTexParameterIuivEXT, NULL, 944),
+    NAME_FUNC_OFFSET(24564, glBeginConditionalRenderNV, glBeginConditionalRenderNV, NULL, 945),
+    NAME_FUNC_OFFSET(24589, glEndConditionalRenderNV, glEndConditionalRenderNV, NULL, 946),
+    NAME_FUNC_OFFSET(24612, glBeginTransformFeedbackEXT, glBeginTransformFeedbackEXT, NULL, 947),
+    NAME_FUNC_OFFSET(24637, glBindBufferBaseEXT, glBindBufferBaseEXT, NULL, 948),
+    NAME_FUNC_OFFSET(24654, glBindBufferRangeEXT, glBindBufferRangeEXT, NULL, 950),
+    NAME_FUNC_OFFSET(24672, glEndTransformFeedbackEXT, glEndTransformFeedbackEXT, NULL, 951),
+    NAME_FUNC_OFFSET(24695, glGetTransformFeedbackVaryingEXT, glGetTransformFeedbackVaryingEXT, NULL, 952),
+    NAME_FUNC_OFFSET(24725, glTransformFeedbackVaryingsEXT, glTransformFeedbackVaryingsEXT, NULL, 953),
+    NAME_FUNC_OFFSET(24753, glProvokingVertexEXT, glProvokingVertexEXT, NULL, 954),
+    NAME_FUNC_OFFSET(24771, gl_dispatch_stub_965, gl_dispatch_stub_965, NULL, 965),
+    NAME_FUNC_OFFSET(24792, gl_dispatch_stub_966, gl_dispatch_stub_966, NULL, 966),
     NAME_FUNC_OFFSET(-1, NULL, NULL, NULL, 0)
 };
 
diff --git a/xorg-server/hw/xfree86/common/xf86Events.c b/xorg-server/hw/xfree86/common/xf86Events.c
index 3ad34b543..9dabf103f 100644
--- a/xorg-server/hw/xfree86/common/xf86Events.c
+++ b/xorg-server/hw/xfree86/common/xf86Events.c
@@ -376,7 +376,7 @@ static void
 xf86ReleaseKeys(DeviceIntPtr pDev)
 {
     KeyClassPtr keyc;
-    int i, sigstate;
+    int i;
 
     if (!pDev || !pDev->key)
         return;
diff --git a/xorg-server/hw/xwin/glx/gl.spec b/xorg-server/hw/xwin/glx/gl.spec
index 890a38338..55e2d3b4c 100644
--- a/xorg-server/hw/xwin/glx/gl.spec
+++ b/xorg-server/hw/xwin/glx/gl.spec
@@ -7,7 +7,7 @@
 # This document is licensed under the SGI Free Software B License Version
 # 2.0. For details, see http://oss.sgi.com/projects/FreeB/ .
 #
-# $Revision: 18818 $ on $Date: 2012-08-06 02:01:57 -0700 (Mon, 06 Aug 2012) $
+# $Revision: 19329 $ on $Date: 2012-09-28 12:26:05 -0700 (Fri, 28 Sep 2012) $
 
 required-props:
 # Description of a parameter
@@ -22,12 +22,12 @@ vectorequiv:	*
 # early GL 1.0 functions, later functions just have a core version
 # (e.g. VERSION_major_minor) or extension name for the category.
 category: display-list drawing drawing-control feedback framebuf misc modeling pixel-op pixel-rw state-req xform
-category: VERSION_1_0 VERSION_1_0_DEPRECATED VERSION_1_1 VERSION_1_1_DEPRECATED VERSION_1_2 VERSION_1_2_DEPRECATED VERSION_1_3 VERSION_1_3_DEPRECATED VERSION_1_4 VERSION_1_4_DEPRECATED VERSION_1_5 VERSION_2_0 VERSION_2_1 VERSION_3_0 VERSION_3_0_DEPRECATED VERSION_3_1 VERSION_3_2 VERSION_3_3 VERSION_4_0 VERSION_4_1 VERSION_4_1_DEPRECATED VERSION_4_2 VERSION_4_3
+category: VERSION_1_0 VERSION_1_1 VERSION_1_2 VERSION_1_3 VERSION_1_4 VERSION_1_5 VERSION_2_0 VERSION_2_1 VERSION_3_0 VERSION_3_1 VERSION_3_2 VERSION_3_3 VERSION_4_0 VERSION_4_1 VERSION_4_2 VERSION_4_3
 category: 3DFX_tbuffer
-category: AMD_conservative_depth AMD_debug_output AMD_draw_buffers_blend AMD_multi_draw_indirect AMD_name_gen_delete AMD_performance_monitor AMD_sample_positions AMD_stencil_operation_extended AMD_vertex_shader_tesselator
+category: AMD_conservative_depth AMD_debug_output AMD_draw_buffers_blend AMD_multi_draw_indirect AMD_name_gen_delete AMD_performance_monitor AMD_sample_positions AMD_sparse_texture AMD_stencil_operation_extended AMD_vertex_shader_tesselator
 category: APPLE_aux_depth_stencil APPLE_element_array APPLE_fence APPLE_float_pixels APPLE_flush_buffer_range APPLE_object_purgeable APPLE_row_bytes APPLE_texture_range APPLE_vertex_array_object APPLE_vertex_array_range APPLE_vertex_program_evaluators
 category: ARB_ES2_compatibility ARB_base_instance ARB_blend_func_extended ARB_cl_event ARB_color_buffer_float ARB_copy_buffer ARB_debug_output ARB_depth_buffer_float ARB_draw_buffers ARB_draw_buffers_blend ARB_draw_elements_base_vertex ARB_draw_indirect ARB_draw_instanced ARB_fragment_program ARB_fragment_shader ARB_framebuffer_object ARB_framebuffer_sRGB ARB_geometry_shader4 ARB_get_program_binary ARB_gpu_shader_fp64 ARB_half_float_vertex ARB_instanced_arrays ARB_internalformat_query ARB_map_buffer_range ARB_matrix_palette ARB_multisample ARB_multitexture ARB_occlusion_query ARB_point_parameters ARB_provoking_vertex ARB_robustness ARB_sample_shading ARB_sampler_objects ARB_separate_shader_objects ARB_shader_atomic_counters ARB_shader_image_load_store ARB_shader_objects ARB_shader_subroutine ARB_shading_language_include ARB_sync ARB_tessellation_shader ARB_texture_buffer_object ARB_texture_compression ARB_texture_compression_rgtc ARB_texture_multisample ARB_texture_rectangle ARB_texture_rg ARB_texture_storage ARB_timer_query ARB_transform_feedback2 ARB_transform_feedback3 ARB_transform_feedback_instanced ARB_transpose_matrix ARB_uniform_buffer_object ARB_vertex_array_object ARB_vertex_attrib_64bit ARB_vertex_blend ARB_vertex_buffer_object ARB_vertex_program ARB_vertex_shader ARB_vertex_type_2_10_10_10_rev ARB_viewport_array ARB_window_pos
-category: ARB_clear_buffer_object ARB_compute_shader ARB_copy_image ARB_debug_group ARB_debug_label ARB_debug_output ARB_framebuffer_no_attachments ARB_internalformat_query2 ARB_invalidate_subdata ARB_multi_draw_indirect ARB_program_interface_query ARB_shader_storage_buffer_object ARB_texture_buffer_range ARB_texture_storage_multisample ARB_texture_view ARB_vertex_attrib_binding
+category: ARB_clear_buffer_object ARB_compute_shader ARB_copy_image ARB_framebuffer_no_attachments ARB_internalformat_query2 ARB_invalidate_subdata ARB_multi_draw_indirect ARB_program_interface_query ARB_shader_storage_buffer_object ARB_texture_buffer_range ARB_texture_storage_multisample ARB_texture_view ARB_vertex_attrib_binding
 category: ATI_draw_buffers ATI_draw_buffers ATI_element_array ATI_envmap_bumpmap ATI_fragment_shader ATI_map_object_buffer ATI_meminfo ATI_pn_triangles ATI_separate_stencil ATI_texture_env_combine3 ATI_texture_float ATI_vertex_array_object ATI_vertex_attrib_array_object ATI_vertex_streams
 category: EXT_bindable_uniform EXT_blend_color EXT_blend_equation_separate EXT_blend_func_separate EXT_blend_minmax EXT_color_subtable EXT_compiled_vertex_array EXT_convolution EXT_coordinate_frame EXT_copy_texture EXT_cull_vertex EXT_depth_bounds_test EXT_direct_state_access EXT_draw_buffers2 EXT_draw_instanced EXT_draw_range_elements EXT_fog_coord EXT_framebuffer_blit EXT_framebuffer_multisample EXT_framebuffer_object EXT_geometry_shader4 EXT_gpu_program_parameters EXT_gpu_shader4 EXT_histogram EXT_index_func EXT_index_material EXT_light_texture EXT_multi_draw_arrays EXT_multisample EXT_paletted_texture EXT_pixel_transform EXT_point_parameters EXT_polygon_offset EXT_provoking_vertex EXT_secondary_color EXT_separate_shader_objects EXT_shader_image_load_store EXT_stencil_clear_tag EXT_stencil_two_side EXT_subtexture EXT_texture3D EXT_texture_buffer_object EXT_texture_integer EXT_texture_object EXT_texture_perturb_normal EXT_texture_snorm EXT_texture_swizzle EXT_timer_query EXT_transform_feedback EXT_vertex_array EXT_vertex_array_bgra EXT_vertex_attrib_64bit EXT_vertex_shader EXT_vertex_weighting EXT_x11_sync_object
 category: GREMEDY_frame_terminator GREMEDY_string_marker
@@ -67,6 +67,9 @@ category: SUNX_constant_data SUN_global_alpha SUN_mesh_array SUN_triangle_list S
 version:	1.0 1.1 1.2 1.3 1.4 1.5 2.0 2.1 3.0 3.1 3.2 3.3 4.0 4.1 4.2 4.3
 # Core version in which a function was removed
 deprecated:	3.1
+# API profile - should only be compatibility since there are no core-only
+# functions for now.
+profile:	compatibility
 # GLX Single, Rendering, or Vendor Private opcode
 glxsingle:	*
 glxropcode:	*
@@ -794,7 +797,8 @@ NewList(list, mode)
 	param		list		List in value
 	param		mode		ListMode in value
 	dlflags		notlistable
-	category	VERSION_1_0_DEPRECATED	   # old: display-list
+	category	VERSION_1_0		   # old: display-list
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxsingle	101
@@ -804,7 +808,8 @@ NewList(list, mode)
 EndList()
 	return		void
 	dlflags		notlistable
-	category	VERSION_1_0_DEPRECATED	   # old: display-list
+	category	VERSION_1_0		   # old: display-list
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxsingle	102
@@ -814,7 +819,8 @@ EndList()
 CallList(list)
 	return		void
 	param		list		List in value
-	category	VERSION_1_0_DEPRECATED	   # old: display-list
+	category	VERSION_1_0		   # old: display-list
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	1
@@ -825,8 +831,9 @@ CallLists(n, type, lists)
 	param		n		SizeI in value
 	param		type		ListNameType in value
 	param		lists		Void in array [COMPSIZE(n/type)]
-	category	VERSION_1_0_DEPRECATED	   # old: display-list
+	category	VERSION_1_0		   # old: display-list
 	glxflags	client-handcode server-handcode
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	2
@@ -837,7 +844,8 @@ DeleteLists(list, range)
 	param		list		List in value
 	param		range		SizeI in value
 	dlflags		notlistable
-	category	VERSION_1_0_DEPRECATED	   # old: display-list
+	category	VERSION_1_0		   # old: display-list
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxsingle	103
@@ -848,7 +856,8 @@ GenLists(range)
 	return		List
 	param		range		SizeI in value
 	dlflags		notlistable
-	category	VERSION_1_0_DEPRECATED	   # old: display-list
+	category	VERSION_1_0		   # old: display-list
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxsingle	104
@@ -857,7 +866,8 @@ GenLists(range)
 ListBase(base)
 	return		void
 	param		base		List in value
-	category	VERSION_1_0_DEPRECATED	   # old: display-list
+	category	VERSION_1_0		   # old: display-list
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	3
@@ -868,7 +878,8 @@ ListBase(base)
 Begin(mode)
 	return		void
 	param		mode		BeginMode in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	4
@@ -883,9 +894,10 @@ Bitmap(width, height, xorig, yorig, xmove, ymove, bitmap)
 	param		xmove		CoordF in value
 	param		ymove		CoordF in value
 	param		bitmap		UInt8 in array [COMPSIZE(width/height)]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	dlflags		handcode
 	glxflags	client-handcode server-handcode
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	5
@@ -897,8 +909,9 @@ Color3b(red, green, blue)
 	param		red		ColorB in value
 	param		green		ColorB in value
 	param		blue		ColorB in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Color3bv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		9
@@ -906,7 +919,8 @@ Color3b(red, green, blue)
 Color3bv(v)
 	return		void
 	param		v		ColorB in array [3]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	6
@@ -917,8 +931,9 @@ Color3d(red, green, blue)
 	param		red		ColorD in value
 	param		green		ColorD in value
 	param		blue		ColorD in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Color3dv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		11
@@ -926,7 +941,8 @@ Color3d(red, green, blue)
 Color3dv(v)
 	return		void
 	param		v		ColorD in array [3]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	7
@@ -937,8 +953,9 @@ Color3f(red, green, blue)
 	param		red		ColorF in value
 	param		green		ColorF in value
 	param		blue		ColorF in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Color3fv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		13
@@ -946,7 +963,8 @@ Color3f(red, green, blue)
 Color3fv(v)
 	return		void
 	param		v		ColorF in array [3]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	8
@@ -957,8 +975,9 @@ Color3i(red, green, blue)
 	param		red		ColorI in value
 	param		green		ColorI in value
 	param		blue		ColorI in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Color3iv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		15
@@ -966,7 +985,8 @@ Color3i(red, green, blue)
 Color3iv(v)
 	return		void
 	param		v		ColorI in array [3]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	9
@@ -977,8 +997,9 @@ Color3s(red, green, blue)
 	param		red		ColorS in value
 	param		green		ColorS in value
 	param		blue		ColorS in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Color3sv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		17
@@ -986,7 +1007,8 @@ Color3s(red, green, blue)
 Color3sv(v)
 	return		void
 	param		v		ColorS in array [3]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	10
@@ -997,8 +1019,9 @@ Color3ub(red, green, blue)
 	param		red		ColorUB in value
 	param		green		ColorUB in value
 	param		blue		ColorUB in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Color3ubv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		19
@@ -1006,7 +1029,8 @@ Color3ub(red, green, blue)
 Color3ubv(v)
 	return		void
 	param		v		ColorUB in array [3]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	11
@@ -1017,8 +1041,9 @@ Color3ui(red, green, blue)
 	param		red		ColorUI in value
 	param		green		ColorUI in value
 	param		blue		ColorUI in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Color3uiv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		21
@@ -1026,7 +1051,8 @@ Color3ui(red, green, blue)
 Color3uiv(v)
 	return		void
 	param		v		ColorUI in array [3]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	12
@@ -1037,8 +1063,9 @@ Color3us(red, green, blue)
 	param		red		ColorUS in value
 	param		green		ColorUS in value
 	param		blue		ColorUS in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Color3usv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		23
@@ -1046,7 +1073,8 @@ Color3us(red, green, blue)
 Color3usv(v)
 	return		void
 	param		v		ColorUS in array [3]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	13
@@ -1058,8 +1086,9 @@ Color4b(red, green, blue, alpha)
 	param		green		ColorB in value
 	param		blue		ColorB in value
 	param		alpha		ColorB in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Color4bv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		25
@@ -1067,7 +1096,8 @@ Color4b(red, green, blue, alpha)
 Color4bv(v)
 	return		void
 	param		v		ColorB in array [4]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	14
@@ -1079,8 +1109,9 @@ Color4d(red, green, blue, alpha)
 	param		green		ColorD in value
 	param		blue		ColorD in value
 	param		alpha		ColorD in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Color4dv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		27
@@ -1088,7 +1119,8 @@ Color4d(red, green, blue, alpha)
 Color4dv(v)
 	return		void
 	param		v		ColorD in array [4]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	15
@@ -1100,8 +1132,9 @@ Color4f(red, green, blue, alpha)
 	param		green		ColorF in value
 	param		blue		ColorF in value
 	param		alpha		ColorF in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Color4fv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		29
@@ -1109,7 +1142,8 @@ Color4f(red, green, blue, alpha)
 Color4fv(v)
 	return		void
 	param		v		ColorF in array [4]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	16
@@ -1121,8 +1155,9 @@ Color4i(red, green, blue, alpha)
 	param		green		ColorI in value
 	param		blue		ColorI in value
 	param		alpha		ColorI in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Color4iv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		31
@@ -1130,7 +1165,8 @@ Color4i(red, green, blue, alpha)
 Color4iv(v)
 	return		void
 	param		v		ColorI in array [4]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	17
@@ -1142,8 +1178,9 @@ Color4s(red, green, blue, alpha)
 	param		green		ColorS in value
 	param		blue		ColorS in value
 	param		alpha		ColorS in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Color4sv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		33
@@ -1151,7 +1188,8 @@ Color4s(red, green, blue, alpha)
 Color4sv(v)
 	return		void
 	param		v		ColorS in array [4]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	18
@@ -1163,8 +1201,9 @@ Color4ub(red, green, blue, alpha)
 	param		green		ColorUB in value
 	param		blue		ColorUB in value
 	param		alpha		ColorUB in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Color4ubv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		35
@@ -1172,7 +1211,8 @@ Color4ub(red, green, blue, alpha)
 Color4ubv(v)
 	return		void
 	param		v		ColorUB in array [4]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	19
@@ -1184,8 +1224,9 @@ Color4ui(red, green, blue, alpha)
 	param		green		ColorUI in value
 	param		blue		ColorUI in value
 	param		alpha		ColorUI in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Color4uiv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		37
@@ -1193,7 +1234,8 @@ Color4ui(red, green, blue, alpha)
 Color4uiv(v)
 	return		void
 	param		v		ColorUI in array [4]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	20
@@ -1205,8 +1247,9 @@ Color4us(red, green, blue, alpha)
 	param		green		ColorUS in value
 	param		blue		ColorUS in value
 	param		alpha		ColorUS in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Color4usv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		39
@@ -1214,7 +1257,8 @@ Color4us(red, green, blue, alpha)
 Color4usv(v)
 	return		void
 	param		v		ColorUS in array [4]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	21
@@ -1223,8 +1267,9 @@ Color4usv(v)
 EdgeFlag(flag)
 	return		void
 	param		flag		Boolean in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	EdgeFlagv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		41
@@ -1232,7 +1277,8 @@ EdgeFlag(flag)
 EdgeFlagv(flag)
 	return		void
 	param		flag		Boolean in reference
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	22
@@ -1240,7 +1286,8 @@ EdgeFlagv(flag)
 
 End()
 	return		void
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	23
@@ -1249,8 +1296,9 @@ End()
 Indexd(c)
 	return		void
 	param		c		ColorIndexValueD in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Indexdv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		44
@@ -1258,7 +1306,8 @@ Indexd(c)
 Indexdv(c)
 	return		void
 	param		c		ColorIndexValueD in array [1]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	24
@@ -1267,8 +1316,9 @@ Indexdv(c)
 Indexf(c)
 	return		void
 	param		c		ColorIndexValueF in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Indexfv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		46
@@ -1276,7 +1326,8 @@ Indexf(c)
 Indexfv(c)
 	return		void
 	param		c		ColorIndexValueF in array [1]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	25
@@ -1285,8 +1336,9 @@ Indexfv(c)
 Indexi(c)
 	return		void
 	param		c		ColorIndexValueI in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Indexiv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		48
@@ -1294,7 +1346,8 @@ Indexi(c)
 Indexiv(c)
 	return		void
 	param		c		ColorIndexValueI in array [1]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	26
@@ -1303,8 +1356,9 @@ Indexiv(c)
 Indexs(c)
 	return		void
 	param		c		ColorIndexValueS in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Indexsv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		50
@@ -1312,7 +1366,8 @@ Indexs(c)
 Indexsv(c)
 	return		void
 	param		c		ColorIndexValueS in array [1]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	27
@@ -1323,8 +1378,9 @@ Normal3b(nx, ny, nz)
 	param		nx		Int8 in value
 	param		ny		Int8 in value
 	param		nz		Int8 in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Normal3bv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		52
@@ -1332,7 +1388,8 @@ Normal3b(nx, ny, nz)
 Normal3bv(v)
 	return		void
 	param		v		Int8 in array [3]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	28
@@ -1343,8 +1400,9 @@ Normal3d(nx, ny, nz)
 	param		nx		CoordD in value
 	param		ny		CoordD in value
 	param		nz		CoordD in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Normal3dv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		54
@@ -1352,7 +1410,8 @@ Normal3d(nx, ny, nz)
 Normal3dv(v)
 	return		void
 	param		v		CoordD in array [3]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	29
@@ -1363,8 +1422,9 @@ Normal3f(nx, ny, nz)
 	param		nx		CoordF in value
 	param		ny		CoordF in value
 	param		nz		CoordF in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Normal3fv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		56
@@ -1372,7 +1432,8 @@ Normal3f(nx, ny, nz)
 Normal3fv(v)
 	return		void
 	param		v		CoordF in array [3]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	30
@@ -1383,8 +1444,9 @@ Normal3i(nx, ny, nz)
 	param		nx		Int32 in value
 	param		ny		Int32 in value
 	param		nz		Int32 in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Normal3iv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		58
@@ -1392,7 +1454,8 @@ Normal3i(nx, ny, nz)
 Normal3iv(v)
 	return		void
 	param		v		Int32 in array [3]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	31
@@ -1403,8 +1466,9 @@ Normal3s(nx, ny, nz)
 	param		nx		Int16 in value
 	param		ny		Int16 in value
 	param		nz		Int16 in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Normal3sv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		60
@@ -1412,7 +1476,8 @@ Normal3s(nx, ny, nz)
 Normal3sv(v)
 	return		void
 	param		v		Int16 in array [3]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	32
@@ -1422,8 +1487,9 @@ RasterPos2d(x, y)
 	return		void
 	param		x		CoordD in value
 	param		y		CoordD in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	RasterPos2dv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		62
@@ -1431,7 +1497,8 @@ RasterPos2d(x, y)
 RasterPos2dv(v)
 	return		void
 	param		v		CoordD in array [2]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	33
@@ -1441,8 +1508,9 @@ RasterPos2f(x, y)
 	return		void
 	param		x		CoordF in value
 	param		y		CoordF in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	RasterPos2fv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		64
@@ -1450,7 +1518,8 @@ RasterPos2f(x, y)
 RasterPos2fv(v)
 	return		void
 	param		v		CoordF in array [2]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	34
@@ -1460,8 +1529,9 @@ RasterPos2i(x, y)
 	return		void
 	param		x		CoordI in value
 	param		y		CoordI in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	RasterPos2iv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		66
@@ -1469,7 +1539,8 @@ RasterPos2i(x, y)
 RasterPos2iv(v)
 	return		void
 	param		v		CoordI in array [2]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	35
@@ -1479,8 +1550,9 @@ RasterPos2s(x, y)
 	return		void
 	param		x		CoordS in value
 	param		y		CoordS in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	RasterPos2sv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		68
@@ -1488,7 +1560,8 @@ RasterPos2s(x, y)
 RasterPos2sv(v)
 	return		void
 	param		v		CoordS in array [2]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	36
@@ -1500,7 +1573,8 @@ RasterPos3d(x, y, z)
 	param		y		CoordD in value
 	param		z		CoordD in value
 	vectorequiv	RasterPos3dv
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		70
@@ -1508,7 +1582,8 @@ RasterPos3d(x, y, z)
 RasterPos3dv(v)
 	return		void
 	param		v		CoordD in array [3]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	37
@@ -1519,8 +1594,9 @@ RasterPos3f(x, y, z)
 	param		x		CoordF in value
 	param		y		CoordF in value
 	param		z		CoordF in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	RasterPos3fv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		72
@@ -1528,7 +1604,8 @@ RasterPos3f(x, y, z)
 RasterPos3fv(v)
 	return		void
 	param		v		CoordF in array [3]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	38
@@ -1539,8 +1616,9 @@ RasterPos3i(x, y, z)
 	param		x		CoordI in value
 	param		y		CoordI in value
 	param		z		CoordI in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	RasterPos3iv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		74
@@ -1548,7 +1626,8 @@ RasterPos3i(x, y, z)
 RasterPos3iv(v)
 	return		void
 	param		v		CoordI in array [3]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	39
@@ -1559,8 +1638,9 @@ RasterPos3s(x, y, z)
 	param		x		CoordS in value
 	param		y		CoordS in value
 	param		z		CoordS in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	RasterPos3sv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		76
@@ -1568,7 +1648,8 @@ RasterPos3s(x, y, z)
 RasterPos3sv(v)
 	return		void
 	param		v		CoordS in array [3]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	40
@@ -1581,7 +1662,8 @@ RasterPos4d(x, y, z, w)
 	param		z		CoordD in value
 	param		w		CoordD in value
 	vectorequiv	RasterPos4dv
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		78
@@ -1589,7 +1671,8 @@ RasterPos4d(x, y, z, w)
 RasterPos4dv(v)
 	return		void
 	param		v		CoordD in array [4]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	41
@@ -1601,8 +1684,9 @@ RasterPos4f(x, y, z, w)
 	param		y		CoordF in value
 	param		z		CoordF in value
 	param		w		CoordF in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	RasterPos4fv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		80
@@ -1610,7 +1694,8 @@ RasterPos4f(x, y, z, w)
 RasterPos4fv(v)
 	return		void
 	param		v		CoordF in array [4]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	42
@@ -1622,8 +1707,9 @@ RasterPos4i(x, y, z, w)
 	param		y		CoordI in value
 	param		z		CoordI in value
 	param		w		CoordI in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	RasterPos4iv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		82
@@ -1631,7 +1717,8 @@ RasterPos4i(x, y, z, w)
 RasterPos4iv(v)
 	return		void
 	param		v		CoordI in array [4]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	43
@@ -1643,8 +1730,9 @@ RasterPos4s(x, y, z, w)
 	param		y		CoordS in value
 	param		z		CoordS in value
 	param		w		CoordS in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	RasterPos4sv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		84
@@ -1652,7 +1740,8 @@ RasterPos4s(x, y, z, w)
 RasterPos4sv(v)
 	return		void
 	param		v		CoordS in array [4]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	44
@@ -1664,8 +1753,9 @@ Rectd(x1, y1, x2, y2)
 	param		y1		CoordD in value
 	param		x2		CoordD in value
 	param		y2		CoordD in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Rectdv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		86
@@ -1674,7 +1764,8 @@ Rectdv(v1, v2)
 	return		void
 	param		v1		CoordD in array [2]
 	param		v2		CoordD in array [2]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	45
@@ -1686,8 +1777,9 @@ Rectf(x1, y1, x2, y2)
 	param		y1		CoordF in value
 	param		x2		CoordF in value
 	param		y2		CoordF in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Rectfv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		88
@@ -1696,7 +1788,8 @@ Rectfv(v1, v2)
 	return		void
 	param		v1		CoordF in array [2]
 	param		v2		CoordF in array [2]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	46
@@ -1708,8 +1801,9 @@ Recti(x1, y1, x2, y2)
 	param		y1		CoordI in value
 	param		x2		CoordI in value
 	param		y2		CoordI in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Rectiv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		90
@@ -1718,7 +1812,8 @@ Rectiv(v1, v2)
 	return		void
 	param		v1		CoordI in array [2]
 	param		v2		CoordI in array [2]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	47
@@ -1730,8 +1825,9 @@ Rects(x1, y1, x2, y2)
 	param		y1		CoordS in value
 	param		x2		CoordS in value
 	param		y2		CoordS in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Rectsv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		92
@@ -1740,7 +1836,8 @@ Rectsv(v1, v2)
 	return		void
 	param		v1		CoordS in array [2]
 	param		v2		CoordS in array [2]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	48
@@ -1749,8 +1846,9 @@ Rectsv(v1, v2)
 TexCoord1d(s)
 	return		void
 	param		s		CoordD in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	TexCoord1dv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		94
@@ -1758,7 +1856,8 @@ TexCoord1d(s)
 TexCoord1dv(v)
 	return		void
 	param		v		CoordD in array [1]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	49
@@ -1767,8 +1866,9 @@ TexCoord1dv(v)
 TexCoord1f(s)
 	return		void
 	param		s		CoordF in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	TexCoord1fv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		96
@@ -1776,7 +1876,8 @@ TexCoord1f(s)
 TexCoord1fv(v)
 	return		void
 	param		v		CoordF in array [1]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	50
@@ -1785,8 +1886,9 @@ TexCoord1fv(v)
 TexCoord1i(s)
 	return		void
 	param		s		CoordI in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	TexCoord1iv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		98
@@ -1794,7 +1896,8 @@ TexCoord1i(s)
 TexCoord1iv(v)
 	return		void
 	param		v		CoordI in array [1]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	51
@@ -1803,8 +1906,9 @@ TexCoord1iv(v)
 TexCoord1s(s)
 	return		void
 	param		s		CoordS in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	TexCoord1sv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		100
@@ -1812,7 +1916,8 @@ TexCoord1s(s)
 TexCoord1sv(v)
 	return		void
 	param		v		CoordS in array [1]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	52
@@ -1822,8 +1927,9 @@ TexCoord2d(s, t)
 	return		void
 	param		s		CoordD in value
 	param		t		CoordD in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	TexCoord2dv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		102
@@ -1831,7 +1937,8 @@ TexCoord2d(s, t)
 TexCoord2dv(v)
 	return		void
 	param		v		CoordD in array [2]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	53
@@ -1841,8 +1948,9 @@ TexCoord2f(s, t)
 	return		void
 	param		s		CoordF in value
 	param		t		CoordF in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	TexCoord2fv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		104
@@ -1850,7 +1958,8 @@ TexCoord2f(s, t)
 TexCoord2fv(v)
 	return		void
 	param		v		CoordF in array [2]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	54
@@ -1860,8 +1969,9 @@ TexCoord2i(s, t)
 	return		void
 	param		s		CoordI in value
 	param		t		CoordI in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	TexCoord2iv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		106
@@ -1869,7 +1979,8 @@ TexCoord2i(s, t)
 TexCoord2iv(v)
 	return		void
 	param		v		CoordI in array [2]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	55
@@ -1879,8 +1990,9 @@ TexCoord2s(s, t)
 	return		void
 	param		s		CoordS in value
 	param		t		CoordS in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	TexCoord2sv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		108
@@ -1888,7 +2000,8 @@ TexCoord2s(s, t)
 TexCoord2sv(v)
 	return		void
 	param		v		CoordS in array [2]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	56
@@ -1899,8 +2012,9 @@ TexCoord3d(s, t, r)
 	param		s		CoordD in value
 	param		t		CoordD in value
 	param		r		CoordD in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	TexCoord3dv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		110
@@ -1908,7 +2022,8 @@ TexCoord3d(s, t, r)
 TexCoord3dv(v)
 	return		void
 	param		v		CoordD in array [3]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	57
@@ -1919,8 +2034,9 @@ TexCoord3f(s, t, r)
 	param		s		CoordF in value
 	param		t		CoordF in value
 	param		r		CoordF in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	TexCoord3fv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		112
@@ -1928,7 +2044,8 @@ TexCoord3f(s, t, r)
 TexCoord3fv(v)
 	return		void
 	param		v		CoordF in array [3]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	58
@@ -1939,8 +2056,9 @@ TexCoord3i(s, t, r)
 	param		s		CoordI in value
 	param		t		CoordI in value
 	param		r		CoordI in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	TexCoord3iv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		114
@@ -1948,7 +2066,8 @@ TexCoord3i(s, t, r)
 TexCoord3iv(v)
 	return		void
 	param		v		CoordI in array [3]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	59
@@ -1959,8 +2078,9 @@ TexCoord3s(s, t, r)
 	param		s		CoordS in value
 	param		t		CoordS in value
 	param		r		CoordS in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	TexCoord3sv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		116
@@ -1968,7 +2088,8 @@ TexCoord3s(s, t, r)
 TexCoord3sv(v)
 	return		void
 	param		v		CoordS in array [3]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	60
@@ -1980,8 +2101,9 @@ TexCoord4d(s, t, r, q)
 	param		t		CoordD in value
 	param		r		CoordD in value
 	param		q		CoordD in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	TexCoord4dv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		118
@@ -1989,7 +2111,8 @@ TexCoord4d(s, t, r, q)
 TexCoord4dv(v)
 	return		void
 	param		v		CoordD in array [4]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	61
@@ -2001,8 +2124,9 @@ TexCoord4f(s, t, r, q)
 	param		t		CoordF in value
 	param		r		CoordF in value
 	param		q		CoordF in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	TexCoord4fv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		120
@@ -2010,7 +2134,8 @@ TexCoord4f(s, t, r, q)
 TexCoord4fv(v)
 	return		void
 	param		v		CoordF in array [4]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	62
@@ -2022,8 +2147,9 @@ TexCoord4i(s, t, r, q)
 	param		t		CoordI in value
 	param		r		CoordI in value
 	param		q		CoordI in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	TexCoord4iv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		122
@@ -2031,7 +2157,8 @@ TexCoord4i(s, t, r, q)
 TexCoord4iv(v)
 	return		void
 	param		v		CoordI in array [4]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	63
@@ -2043,8 +2170,9 @@ TexCoord4s(s, t, r, q)
 	param		t		CoordS in value
 	param		r		CoordS in value
 	param		q		CoordS in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	TexCoord4sv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		124
@@ -2052,7 +2180,8 @@ TexCoord4s(s, t, r, q)
 TexCoord4sv(v)
 	return		void
 	param		v		CoordS in array [4]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	64
@@ -2062,8 +2191,9 @@ Vertex2d(x, y)
 	return		void
 	param		x		CoordD in value
 	param		y		CoordD in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Vertex2dv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		126
@@ -2071,7 +2201,8 @@ Vertex2d(x, y)
 Vertex2dv(v)
 	return		void
 	param		v		CoordD in array [2]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	65
@@ -2081,8 +2212,9 @@ Vertex2f(x, y)
 	return		void
 	param		x		CoordF in value
 	param		y		CoordF in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Vertex2fv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		128
@@ -2090,7 +2222,8 @@ Vertex2f(x, y)
 Vertex2fv(v)
 	return		void
 	param		v		CoordF in array [2]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	66
@@ -2100,8 +2233,9 @@ Vertex2i(x, y)
 	return		void
 	param		x		CoordI in value
 	param		y		CoordI in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Vertex2iv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		130
@@ -2109,7 +2243,8 @@ Vertex2i(x, y)
 Vertex2iv(v)
 	return		void
 	param		v		CoordI in array [2]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	67
@@ -2119,8 +2254,9 @@ Vertex2s(x, y)
 	return		void
 	param		x		CoordS in value
 	param		y		CoordS in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Vertex2sv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		132
@@ -2128,7 +2264,8 @@ Vertex2s(x, y)
 Vertex2sv(v)
 	return		void
 	param		v		CoordS in array [2]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	68
@@ -2139,8 +2276,9 @@ Vertex3d(x, y, z)
 	param		x		CoordD in value
 	param		y		CoordD in value
 	param		z		CoordD in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Vertex3dv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		134
@@ -2148,7 +2286,8 @@ Vertex3d(x, y, z)
 Vertex3dv(v)
 	return		void
 	param		v		CoordD in array [3]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	69
@@ -2159,8 +2298,9 @@ Vertex3f(x, y, z)
 	param		x		CoordF in value
 	param		y		CoordF in value
 	param		z		CoordF in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Vertex3fv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		136
@@ -2168,7 +2308,8 @@ Vertex3f(x, y, z)
 Vertex3fv(v)
 	return		void
 	param		v		CoordF in array [3]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	70
@@ -2179,8 +2320,9 @@ Vertex3i(x, y, z)
 	param		x		CoordI in value
 	param		y		CoordI in value
 	param		z		CoordI in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Vertex3iv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		138
@@ -2188,7 +2330,8 @@ Vertex3i(x, y, z)
 Vertex3iv(v)
 	return		void
 	param		v		CoordI in array [3]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	71
@@ -2199,8 +2342,9 @@ Vertex3s(x, y, z)
 	param		x		CoordS in value
 	param		y		CoordS in value
 	param		z		CoordS in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Vertex3sv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		140
@@ -2208,7 +2352,8 @@ Vertex3s(x, y, z)
 Vertex3sv(v)
 	return		void
 	param		v		CoordS in array [3]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	72
@@ -2220,8 +2365,9 @@ Vertex4d(x, y, z, w)
 	param		y		CoordD in value
 	param		z		CoordD in value
 	param		w		CoordD in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Vertex4dv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		142
@@ -2229,7 +2375,8 @@ Vertex4d(x, y, z, w)
 Vertex4dv(v)
 	return		void
 	param		v		CoordD in array [4]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	73
@@ -2241,8 +2388,9 @@ Vertex4f(x, y, z, w)
 	param		y		CoordF in value
 	param		z		CoordF in value
 	param		w		CoordF in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Vertex4fv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		144
@@ -2250,7 +2398,8 @@ Vertex4f(x, y, z, w)
 Vertex4fv(v)
 	return		void
 	param		v		CoordF in array [4]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	74
@@ -2262,8 +2411,9 @@ Vertex4i(x, y, z, w)
 	param		y		CoordI in value
 	param		z		CoordI in value
 	param		w		CoordI in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Vertex4iv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		146
@@ -2271,7 +2421,8 @@ Vertex4i(x, y, z, w)
 Vertex4iv(v)
 	return		void
 	param		v		CoordI in array [4]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	75
@@ -2283,8 +2434,9 @@ Vertex4s(x, y, z, w)
 	param		y		CoordS in value
 	param		z		CoordS in value
 	param		w		CoordS in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Vertex4sv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		148
@@ -2292,7 +2444,8 @@ Vertex4s(x, y, z, w)
 Vertex4sv(v)
 	return		void
 	param		v		CoordS in array [4]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	76
@@ -2302,7 +2455,8 @@ ClipPlane(plane, equation)
 	return		void
 	param		plane		ClipPlaneName in value
 	param		equation	Float64 in array [4]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	77
@@ -2312,7 +2466,8 @@ ColorMaterial(face, mode)
 	return		void
 	param		face		MaterialFace in value
 	param		mode		ColorMaterialParameter in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	78
@@ -2322,7 +2477,8 @@ Fogf(pname, param)
 	return		void
 	param		pname		FogParameter in value
 	param		param		CheckedFloat32 in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	80
@@ -2333,7 +2489,8 @@ Fogfv(pname, params)
 	return		void
 	param		pname		FogParameter in value
 	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	81
@@ -2344,7 +2501,8 @@ Fogi(pname, param)
 	return		void
 	param		pname		FogParameter in value
 	param		param		CheckedInt32 in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	82
@@ -2355,7 +2513,8 @@ Fogiv(pname, params)
 	return		void
 	param		pname		FogParameter in value
 	param		params		CheckedInt32 in array [COMPSIZE(pname)]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	83
@@ -2367,7 +2526,8 @@ Lightf(light, pname, param)
 	param		light		LightName in value
 	param		pname		LightParameter in value
 	param		param		CheckedFloat32 in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	86
@@ -2379,7 +2539,8 @@ Lightfv(light, pname, params)
 	param		light		LightName in value
 	param		pname		LightParameter in value
 	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	87
@@ -2391,7 +2552,8 @@ Lighti(light, pname, param)
 	param		light		LightName in value
 	param		pname		LightParameter in value
 	param		param		CheckedInt32 in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	88
@@ -2403,7 +2565,8 @@ Lightiv(light, pname, params)
 	param		light		LightName in value
 	param		pname		LightParameter in value
 	param		params		CheckedInt32 in array [COMPSIZE(pname)]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	89
@@ -2414,7 +2577,8 @@ LightModelf(pname, param)
 	return		void
 	param		pname		LightModelParameter in value
 	param		param		Float32 in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	90
@@ -2425,7 +2589,8 @@ LightModelfv(pname, params)
 	return		void
 	param		pname		LightModelParameter in value
 	param		params		Float32 in array [COMPSIZE(pname)]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	91
@@ -2436,7 +2601,8 @@ LightModeli(pname, param)
 	return		void
 	param		pname		LightModelParameter in value
 	param		param		Int32 in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	92
@@ -2447,7 +2613,8 @@ LightModeliv(pname, params)
 	return		void
 	param		pname		LightModelParameter in value
 	param		params		Int32 in array [COMPSIZE(pname)]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	93
@@ -2458,7 +2625,8 @@ LineStipple(factor, pattern)
 	return		void
 	param		factor		CheckedInt32 in value
 	param		pattern		LineStipple in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	94
@@ -2469,7 +2637,8 @@ Materialf(face, pname, param)
 	param		face		MaterialFace in value
 	param		pname		MaterialParameter in value
 	param		param		CheckedFloat32 in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	96
@@ -2481,7 +2650,8 @@ Materialfv(face, pname, params)
 	param		face		MaterialFace in value
 	param		pname		MaterialParameter in value
 	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	97
@@ -2493,7 +2663,8 @@ Materiali(face, pname, param)
 	param		face		MaterialFace in value
 	param		pname		MaterialParameter in value
 	param		param		CheckedInt32 in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	98
@@ -2505,7 +2676,8 @@ Materialiv(face, pname, params)
 	param		face		MaterialFace in value
 	param		pname		MaterialParameter in value
 	param		params		CheckedInt32 in array [COMPSIZE(pname)]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	99
@@ -2515,9 +2687,10 @@ Materialiv(face, pname, params)
 PolygonStipple(mask)
 	return		void
 	param		mask		UInt8 in array [COMPSIZE()]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
 	dlflags		handcode
 	glxflags	client-handcode server-handcode
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	102
@@ -2527,7 +2700,8 @@ PolygonStipple(mask)
 ShadeModel(mode)
 	return		void
 	param		mode		ShadingModel in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	104
@@ -2538,7 +2712,8 @@ TexEnvf(target, pname, param)
 	param		target		TextureEnvTarget in value
 	param		pname		TextureEnvParameter in value
 	param		param		CheckedFloat32 in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	111
@@ -2550,7 +2725,8 @@ TexEnvfv(target, pname, params)
 	param		target		TextureEnvTarget in value
 	param		pname		TextureEnvParameter in value
 	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	112
@@ -2562,7 +2738,8 @@ TexEnvi(target, pname, param)
 	param		target		TextureEnvTarget in value
 	param		pname		TextureEnvParameter in value
 	param		param		CheckedInt32 in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	113
@@ -2574,7 +2751,8 @@ TexEnviv(target, pname, params)
 	param		target		TextureEnvTarget in value
 	param		pname		TextureEnvParameter in value
 	param		params		CheckedInt32 in array [COMPSIZE(pname)]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	114
@@ -2586,7 +2764,8 @@ TexGend(coord, pname, param)
 	param		coord		TextureCoordName in value
 	param		pname		TextureGenParameter in value
 	param		param		Float64 in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	115
@@ -2598,7 +2777,8 @@ TexGendv(coord, pname, params)
 	param		coord		TextureCoordName in value
 	param		pname		TextureGenParameter in value
 	param		params		Float64 in array [COMPSIZE(pname)]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	116
@@ -2610,7 +2790,8 @@ TexGenf(coord, pname, param)
 	param		coord		TextureCoordName in value
 	param		pname		TextureGenParameter in value
 	param		param		CheckedFloat32 in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	117
@@ -2622,7 +2803,8 @@ TexGenfv(coord, pname, params)
 	param		coord		TextureCoordName in value
 	param		pname		TextureGenParameter in value
 	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	118
@@ -2634,7 +2816,8 @@ TexGeni(coord, pname, param)
 	param		coord		TextureCoordName in value
 	param		pname		TextureGenParameter in value
 	param		param		CheckedInt32 in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	119
@@ -2646,7 +2829,8 @@ TexGeniv(coord, pname, params)
 	param		coord		TextureCoordName in value
 	param		pname		TextureGenParameter in value
 	param		params		CheckedInt32 in array [COMPSIZE(pname)]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	120
@@ -2662,7 +2846,8 @@ FeedbackBuffer(size, type, buffer)
 	param		buffer		FeedbackElement out array [size] retained
 	dlflags		notlistable
 	glxflags	client-handcode server-handcode
-	category	VERSION_1_0_DEPRECATED	   # old: feedback
+	category	VERSION_1_0		   # old: feedback
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxsingle	105
@@ -2675,7 +2860,8 @@ SelectBuffer(size, buffer)
 	param		buffer		SelectName out array [size] retained
 	dlflags		notlistable
 	glxflags	client-handcode server-handcode
-	category	VERSION_1_0_DEPRECATED	   # old: feedback
+	category	VERSION_1_0		   # old: feedback
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxsingle	106
@@ -2685,9 +2871,10 @@ SelectBuffer(size, buffer)
 RenderMode(mode)
 	return		Int32
 	param		mode		RenderingMode in value
-	category	VERSION_1_0_DEPRECATED	   # old: feedback
+	category	VERSION_1_0		   # old: feedback
 	dlflags		notlistable
 	glxflags	client-handcode server-handcode
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxsingle	107
@@ -2696,7 +2883,8 @@ RenderMode(mode)
 
 InitNames()
 	return		void
-	category	VERSION_1_0_DEPRECATED	   # old: feedback
+	category	VERSION_1_0		   # old: feedback
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	121
@@ -2705,7 +2893,8 @@ InitNames()
 LoadName(name)
 	return		void
 	param		name		SelectName in value
-	category	VERSION_1_0_DEPRECATED	   # old: feedback
+	category	VERSION_1_0		   # old: feedback
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	122
@@ -2714,7 +2903,8 @@ LoadName(name)
 PassThrough(token)
 	return		void
 	param		token		FeedbackElement in value
-	category	VERSION_1_0_DEPRECATED	   # old: feedback
+	category	VERSION_1_0		   # old: feedback
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	123
@@ -2722,7 +2912,8 @@ PassThrough(token)
 
 PopName()
 	return		void
-	category	VERSION_1_0_DEPRECATED	   # old: feedback
+	category	VERSION_1_0		   # old: feedback
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	124
@@ -2731,7 +2922,8 @@ PopName()
 PushName(name)
 	return		void
 	param		name		SelectName in value
-	category	VERSION_1_0_DEPRECATED	   # old: feedback
+	category	VERSION_1_0		   # old: feedback
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	125
@@ -2743,7 +2935,8 @@ ClearAccum(red, green, blue, alpha)
 	param		green		Float32 in value
 	param		blue		Float32 in value
 	param		alpha		Float32 in value
-	category	VERSION_1_0_DEPRECATED	   # old: framebuf
+	category	VERSION_1_0		   # old: framebuf
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	128
@@ -2752,7 +2945,8 @@ ClearAccum(red, green, blue, alpha)
 ClearIndex(c)
 	return		void
 	param		c		MaskedColorIndexValueF in value
-	category	VERSION_1_0_DEPRECATED	   # old: framebuf
+	category	VERSION_1_0		   # old: framebuf
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	129
@@ -2761,7 +2955,8 @@ ClearIndex(c)
 IndexMask(mask)
 	return		void
 	param		mask		MaskedColorIndexValueI in value
-	category	VERSION_1_0_DEPRECATED	   # old: framebuf
+	category	VERSION_1_0		   # old: framebuf
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	136
@@ -2771,7 +2966,8 @@ Accum(op, value)
 	return		void
 	param		op		AccumOp in value
 	param		value		CoordF in value
-	category	VERSION_1_0_DEPRECATED	   # old: misc
+	category	VERSION_1_0		   # old: misc
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	137
@@ -2779,7 +2975,8 @@ Accum(op, value)
 
 PopAttrib()
 	return		void
-	category	VERSION_1_0_DEPRECATED	   # old: misc
+	category	VERSION_1_0		   # old: misc
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	141
@@ -2788,7 +2985,8 @@ PopAttrib()
 PushAttrib(mask)
 	return		void
 	param		mask		AttribMask in value
-	category	VERSION_1_0_DEPRECATED	   # old: misc
+	category	VERSION_1_0		   # old: misc
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	142
@@ -2804,9 +3002,10 @@ Map1d(target, u1, u2, stride, order, points)
 	param		stride		Int32 in value
 	param		order		CheckedInt32 in value
 	param		points		CoordD in array [COMPSIZE(target/stride/order)]
-	category	VERSION_1_0_DEPRECATED	   # old: modeling
+	category	VERSION_1_0		   # old: modeling
 	dlflags		handcode
 	glxflags	client-handcode server-handcode
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	143
@@ -2821,9 +3020,10 @@ Map1f(target, u1, u2, stride, order, points)
 	param		stride		Int32 in value
 	param		order		CheckedInt32 in value
 	param		points		CoordF in array [COMPSIZE(target/stride/order)]
-	category	VERSION_1_0_DEPRECATED	   # old: modeling
+	category	VERSION_1_0		   # old: modeling
 	dlflags		handcode
 	glxflags	client-handcode server-handcode
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	144
@@ -2842,9 +3042,10 @@ Map2d(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points)
 	param		vstride		Int32 in value
 	param		vorder		CheckedInt32 in value
 	param		points		CoordD in array [COMPSIZE(target/ustride/uorder/vstride/vorder)]
-	category	VERSION_1_0_DEPRECATED	   # old: modeling
+	category	VERSION_1_0		   # old: modeling
 	dlflags		handcode
 	glxflags	client-handcode server-handcode
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	145
@@ -2863,9 +3064,10 @@ Map2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points)
 	param		vstride		Int32 in value
 	param		vorder		CheckedInt32 in value
 	param		points		CoordF in array [COMPSIZE(target/ustride/uorder/vstride/vorder)]
-	category	VERSION_1_0_DEPRECATED	   # old: modeling
+	category	VERSION_1_0		   # old: modeling
 	dlflags		handcode
 	glxflags	client-handcode server-handcode
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	146
@@ -2877,7 +3079,8 @@ MapGrid1d(un, u1, u2)
 	param		un		Int32 in value
 	param		u1		CoordD in value
 	param		u2		CoordD in value
-	category	VERSION_1_0_DEPRECATED	   # old: modeling
+	category	VERSION_1_0		   # old: modeling
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	147
@@ -2888,7 +3091,8 @@ MapGrid1f(un, u1, u2)
 	param		un		Int32 in value
 	param		u1		CoordF in value
 	param		u2		CoordF in value
-	category	VERSION_1_0_DEPRECATED	   # old: modeling
+	category	VERSION_1_0		   # old: modeling
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	148
@@ -2902,7 +3106,8 @@ MapGrid2d(un, u1, u2, vn, v1, v2)
 	param		vn		Int32 in value
 	param		v1		CoordD in value
 	param		v2		CoordD in value
-	category	VERSION_1_0_DEPRECATED	   # old: modeling
+	category	VERSION_1_0		   # old: modeling
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	149
@@ -2916,7 +3121,8 @@ MapGrid2f(un, u1, u2, vn, v1, v2)
 	param		vn		Int32 in value
 	param		v1		CoordF in value
 	param		v2		CoordF in value
-	category	VERSION_1_0_DEPRECATED	   # old: modeling
+	category	VERSION_1_0		   # old: modeling
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	150
@@ -2925,8 +3131,9 @@ MapGrid2f(un, u1, u2, vn, v1, v2)
 EvalCoord1d(u)
 	return		void
 	param		u		CoordD in value
-	category	VERSION_1_0_DEPRECATED	   # old: modeling
+	category	VERSION_1_0		   # old: modeling
 	vectorequiv	EvalCoord1dv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		228
@@ -2934,7 +3141,8 @@ EvalCoord1d(u)
 EvalCoord1dv(u)
 	return		void
 	param		u		CoordD in array [1]
-	category	VERSION_1_0_DEPRECATED	   # old: modeling
+	category	VERSION_1_0		   # old: modeling
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	151
@@ -2943,8 +3151,9 @@ EvalCoord1dv(u)
 EvalCoord1f(u)
 	return		void
 	param		u		CoordF in value
-	category	VERSION_1_0_DEPRECATED	   # old: modeling
+	category	VERSION_1_0		   # old: modeling
 	vectorequiv	EvalCoord1fv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		230
@@ -2952,7 +3161,8 @@ EvalCoord1f(u)
 EvalCoord1fv(u)
 	return		void
 	param		u		CoordF in array [1]
-	category	VERSION_1_0_DEPRECATED	   # old: modeling
+	category	VERSION_1_0		   # old: modeling
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	152
@@ -2962,8 +3172,9 @@ EvalCoord2d(u, v)
 	return		void
 	param		u		CoordD in value
 	param		v		CoordD in value
-	category	VERSION_1_0_DEPRECATED	   # old: modeling
+	category	VERSION_1_0		   # old: modeling
 	vectorequiv	EvalCoord2dv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		232
@@ -2971,7 +3182,8 @@ EvalCoord2d(u, v)
 EvalCoord2dv(u)
 	return		void
 	param		u		CoordD in array [2]
-	category	VERSION_1_0_DEPRECATED	   # old: modeling
+	category	VERSION_1_0		   # old: modeling
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	153
@@ -2981,8 +3193,9 @@ EvalCoord2f(u, v)
 	return		void
 	param		u		CoordF in value
 	param		v		CoordF in value
-	category	VERSION_1_0_DEPRECATED	   # old: modeling
+	category	VERSION_1_0		   # old: modeling
 	vectorequiv	EvalCoord2fv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		234
@@ -2990,7 +3203,8 @@ EvalCoord2f(u, v)
 EvalCoord2fv(u)
 	return		void
 	param		u		CoordF in array [2]
-	category	VERSION_1_0_DEPRECATED	   # old: modeling
+	category	VERSION_1_0		   # old: modeling
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	154
@@ -3001,7 +3215,8 @@ EvalMesh1(mode, i1, i2)
 	param		mode		MeshMode1 in value
 	param		i1		CheckedInt32 in value
 	param		i2		CheckedInt32 in value
-	category	VERSION_1_0_DEPRECATED	   # old: modeling
+	category	VERSION_1_0		   # old: modeling
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	155
@@ -3010,7 +3225,8 @@ EvalMesh1(mode, i1, i2)
 EvalPoint1(i)
 	return		void
 	param		i		Int32 in value
-	category	VERSION_1_0_DEPRECATED	   # old: modeling
+	category	VERSION_1_0		   # old: modeling
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	156
@@ -3023,7 +3239,8 @@ EvalMesh2(mode, i1, i2, j1, j2)
 	param		i2		CheckedInt32 in value
 	param		j1		CheckedInt32 in value
 	param		j2		CheckedInt32 in value
-	category	VERSION_1_0_DEPRECATED	   # old: modeling
+	category	VERSION_1_0		   # old: modeling
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	157
@@ -3033,7 +3250,8 @@ EvalPoint2(i, j)
 	return		void
 	param		i		CheckedInt32 in value
 	param		j		CheckedInt32 in value
-	category	VERSION_1_0_DEPRECATED	   # old: modeling
+	category	VERSION_1_0		   # old: modeling
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	158
@@ -3043,7 +3261,8 @@ AlphaFunc(func, ref)
 	return		void
 	param		func		AlphaFunction in value
 	param		ref		Float32 in value
-	category	VERSION_1_0_DEPRECATED	   # old: pixel-op
+	category	VERSION_1_0		   # old: pixel-op
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	159
@@ -3053,7 +3272,8 @@ PixelZoom(xfactor, yfactor)
 	return		void
 	param		xfactor		Float32 in value
 	param		yfactor		Float32 in value
-	category	VERSION_1_0_DEPRECATED	   # old: pixel-rw
+	category	VERSION_1_0		   # old: pixel-rw
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	165
@@ -3063,7 +3283,8 @@ PixelTransferf(pname, param)
 	return		void
 	param		pname		PixelTransferParameter in value
 	param		param		CheckedFloat32 in value
-	category	VERSION_1_0_DEPRECATED	   # old: pixel-rw
+	category	VERSION_1_0		   # old: pixel-rw
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	166
@@ -3073,7 +3294,8 @@ PixelTransferi(pname, param)
 	return		void
 	param		pname		PixelTransferParameter in value
 	param		param		CheckedInt32 in value
-	category	VERSION_1_0_DEPRECATED	   # old: pixel-rw
+	category	VERSION_1_0		   # old: pixel-rw
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	167
@@ -3084,8 +3306,9 @@ PixelMapfv(map, mapsize, values)
 	param		map		PixelMap in value
 	param		mapsize		CheckedInt32 in value
 	param		values		Float32 in array [mapsize]
-	category	VERSION_1_0_DEPRECATED	   # old: pixel-rw
+	category	VERSION_1_0		   # old: pixel-rw
 	glxflags	client-handcode
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	168
@@ -3096,8 +3319,9 @@ PixelMapuiv(map, mapsize, values)
 	param		map		PixelMap in value
 	param		mapsize		CheckedInt32 in value
 	param		values		UInt32 in array [mapsize]
-	category	VERSION_1_0_DEPRECATED	   # old: pixel-rw
+	category	VERSION_1_0		   # old: pixel-rw
 	glxflags	client-handcode
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	169
@@ -3108,8 +3332,9 @@ PixelMapusv(map, mapsize, values)
 	param		map		PixelMap in value
 	param		mapsize		CheckedInt32 in value
 	param		values		UInt16 in array [mapsize]
-	category	VERSION_1_0_DEPRECATED	   # old: pixel-rw
+	category	VERSION_1_0		   # old: pixel-rw
 	glxflags	client-handcode
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	170
@@ -3122,7 +3347,8 @@ CopyPixels(x, y, width, height, type)
 	param		width		SizeI in value
 	param		height		SizeI in value
 	param		type		PixelCopyType in value
-	category	VERSION_1_0_DEPRECATED	   # old: pixel-rw
+	category	VERSION_1_0		   # old: pixel-rw
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	172
@@ -3135,9 +3361,10 @@ DrawPixels(width, height, format, type, pixels)
 	param		format		PixelFormat in value
 	param		type		PixelType in value
 	param		pixels		Void in array [COMPSIZE(format/type/width/height)]
-	category	VERSION_1_0_DEPRECATED	   # old: pixel-rw
+	category	VERSION_1_0		   # old: pixel-rw
 	dlflags		handcode
 	glxflags	client-handcode server-handcode
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	173
@@ -3148,8 +3375,9 @@ GetClipPlane(plane, equation)
 	return		void
 	param		plane		ClipPlaneName in value
 	param		equation	Float64 out array [4]
-	category	VERSION_1_0_DEPRECATED	   # old: state-req
+	category	VERSION_1_0		   # old: state-req
 	dlflags		notlistable
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxsingle	113
@@ -3161,8 +3389,9 @@ GetLightfv(light, pname, params)
 	param		light		LightName in value
 	param		pname		LightParameter in value
 	param		params		Float32 out array [COMPSIZE(pname)]
-	category	VERSION_1_0_DEPRECATED	   # old: state-req
+	category	VERSION_1_0		   # old: state-req
 	dlflags		notlistable
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxsingle	118
@@ -3174,8 +3403,9 @@ GetLightiv(light, pname, params)
 	param		light		LightName in value
 	param		pname		LightParameter in value
 	param		params		Int32 out array [COMPSIZE(pname)]
-	category	VERSION_1_0_DEPRECATED	   # old: state-req
+	category	VERSION_1_0		   # old: state-req
 	dlflags		notlistable
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxsingle	119
@@ -3187,8 +3417,9 @@ GetMapdv(target, query, v)
 	param		target		MapTarget in value
 	param		query		GetMapQuery in value
 	param		v		Float64 out array [COMPSIZE(target/query)]
-	category	VERSION_1_0_DEPRECATED	   # old: state-req
+	category	VERSION_1_0		   # old: state-req
 	dlflags		notlistable
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxsingle	120
@@ -3199,8 +3430,9 @@ GetMapfv(target, query, v)
 	param		target		MapTarget in value
 	param		query		GetMapQuery in value
 	param		v		Float32 out array [COMPSIZE(target/query)]
-	category	VERSION_1_0_DEPRECATED	   # old: state-req
+	category	VERSION_1_0		   # old: state-req
 	dlflags		notlistable
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxsingle	121
@@ -3211,8 +3443,9 @@ GetMapiv(target, query, v)
 	param		target		MapTarget in value
 	param		query		GetMapQuery in value
 	param		v		Int32 out array [COMPSIZE(target/query)]
-	category	VERSION_1_0_DEPRECATED	   # old: state-req
+	category	VERSION_1_0		   # old: state-req
 	dlflags		notlistable
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxsingle	122
@@ -3223,8 +3456,9 @@ GetMaterialfv(face, pname, params)
 	param		face		MaterialFace in value
 	param		pname		MaterialParameter in value
 	param		params		Float32 out array [COMPSIZE(pname)]
-	category	VERSION_1_0_DEPRECATED	   # old: state-req
+	category	VERSION_1_0		   # old: state-req
 	dlflags		notlistable
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxsingle	123
@@ -3236,8 +3470,9 @@ GetMaterialiv(face, pname, params)
 	param		face		MaterialFace in value
 	param		pname		MaterialParameter in value
 	param		params		Int32 out array [COMPSIZE(pname)]
-	category	VERSION_1_0_DEPRECATED	   # old: state-req
+	category	VERSION_1_0		   # old: state-req
 	dlflags		notlistable
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxsingle	124
@@ -3248,8 +3483,9 @@ GetPixelMapfv(map, values)
 	return		void
 	param		map		PixelMap in value
 	param		values		Float32 out array [COMPSIZE(map)]
-	category	VERSION_1_0_DEPRECATED	   # old: state-req
+	category	VERSION_1_0		   # old: state-req
 	dlflags		notlistable
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxsingle	125
@@ -3259,8 +3495,9 @@ GetPixelMapuiv(map, values)
 	return		void
 	param		map		PixelMap in value
 	param		values		UInt32 out array [COMPSIZE(map)]
-	category	VERSION_1_0_DEPRECATED	   # old: state-req
+	category	VERSION_1_0		   # old: state-req
 	dlflags		notlistable
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxsingle	126
@@ -3270,8 +3507,9 @@ GetPixelMapusv(map, values)
 	return		void
 	param		map		PixelMap in value
 	param		values		UInt16 out array [COMPSIZE(map)]
-	category	VERSION_1_0_DEPRECATED	   # old: state-req
+	category	VERSION_1_0		   # old: state-req
 	dlflags		notlistable
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxsingle	127
@@ -3280,9 +3518,10 @@ GetPixelMapusv(map, values)
 GetPolygonStipple(mask)
 	return		void
 	param		mask		UInt8 out array [COMPSIZE()]
-	category	VERSION_1_0_DEPRECATED	   # old: state-req
+	category	VERSION_1_0		   # old: state-req
 	dlflags		notlistable
 	glxflags	client-handcode server-handcode
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxsingle	128
@@ -3294,8 +3533,9 @@ GetTexEnvfv(target, pname, params)
 	param		target		TextureEnvTarget in value
 	param		pname		TextureEnvParameter in value
 	param		params		Float32 out array [COMPSIZE(pname)]
-	category	VERSION_1_0_DEPRECATED	   # old: state-req
+	category	VERSION_1_0		   # old: state-req
 	dlflags		notlistable
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxsingle	130
@@ -3307,8 +3547,9 @@ GetTexEnviv(target, pname, params)
 	param		target		TextureEnvTarget in value
 	param		pname		TextureEnvParameter in value
 	param		params		Int32 out array [COMPSIZE(pname)]
-	category	VERSION_1_0_DEPRECATED	   # old: state-req
+	category	VERSION_1_0		   # old: state-req
 	dlflags		notlistable
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxsingle	131
@@ -3320,8 +3561,9 @@ GetTexGendv(coord, pname, params)
 	param		coord		TextureCoordName in value
 	param		pname		TextureGenParameter in value
 	param		params		Float64 out array [COMPSIZE(pname)]
-	category	VERSION_1_0_DEPRECATED	   # old: state-req
+	category	VERSION_1_0		   # old: state-req
 	dlflags		notlistable
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxsingle	132
@@ -3333,8 +3575,9 @@ GetTexGenfv(coord, pname, params)
 	param		coord		TextureCoordName in value
 	param		pname		TextureGenParameter in value
 	param		params		Float32 out array [COMPSIZE(pname)]
-	category	VERSION_1_0_DEPRECATED	   # old: state-req
+	category	VERSION_1_0		   # old: state-req
 	dlflags		notlistable
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxsingle	133
@@ -3346,8 +3589,9 @@ GetTexGeniv(coord, pname, params)
 	param		coord		TextureCoordName in value
 	param		pname		TextureGenParameter in value
 	param		params		Int32 out array [COMPSIZE(pname)]
-	category	VERSION_1_0_DEPRECATED	   # old: state-req
+	category	VERSION_1_0		   # old: state-req
 	dlflags		notlistable
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxsingle	134
@@ -3357,8 +3601,9 @@ GetTexGeniv(coord, pname, params)
 IsList(list)
 	return		Boolean
 	param		list		List in value
-	category	VERSION_1_0_DEPRECATED	   # old: state-req
+	category	VERSION_1_0		   # old: state-req
 	dlflags		notlistable
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxsingle	141
@@ -3372,7 +3617,8 @@ Frustum(left, right, bottom, top, zNear, zFar)
 	param		top		Float64 in value
 	param		zNear		Float64 in value
 	param		zFar		Float64 in value
-	category	VERSION_1_0_DEPRECATED	   # old: xform
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	175
@@ -3380,7 +3626,8 @@ Frustum(left, right, bottom, top, zNear, zFar)
 
 LoadIdentity()
 	return		void
-	category	VERSION_1_0_DEPRECATED	   # old: xform
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	176
@@ -3389,7 +3636,8 @@ LoadIdentity()
 LoadMatrixf(m)
 	return		void
 	param		m		Float32 in array [16]
-	category	VERSION_1_0_DEPRECATED	   # old: xform
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	177
@@ -3398,7 +3646,8 @@ LoadMatrixf(m)
 LoadMatrixd(m)
 	return		void
 	param		m		Float64 in array [16]
-	category	VERSION_1_0_DEPRECATED	   # old: xform
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	178
@@ -3407,7 +3656,8 @@ LoadMatrixd(m)
 MatrixMode(mode)
 	return		void
 	param		mode		MatrixMode in value
-	category	VERSION_1_0_DEPRECATED	   # old: xform
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	179
@@ -3416,7 +3666,8 @@ MatrixMode(mode)
 MultMatrixf(m)
 	return		void
 	param		m		Float32 in array [16]
-	category	VERSION_1_0_DEPRECATED	   # old: xform
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	180
@@ -3425,7 +3676,8 @@ MultMatrixf(m)
 MultMatrixd(m)
 	return		void
 	param		m		Float64 in array [16]
-	category	VERSION_1_0_DEPRECATED	   # old: xform
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	181
@@ -3439,7 +3691,8 @@ Ortho(left, right, bottom, top, zNear, zFar)
 	param		top		Float64 in value
 	param		zNear		Float64 in value
 	param		zFar		Float64 in value
-	category	VERSION_1_0_DEPRECATED	   # old: xform
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	182
@@ -3447,7 +3700,8 @@ Ortho(left, right, bottom, top, zNear, zFar)
 
 PopMatrix()
 	return		void
-	category	VERSION_1_0_DEPRECATED	   # old: xform
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	183
@@ -3455,7 +3709,8 @@ PopMatrix()
 
 PushMatrix()
 	return		void
-	category	VERSION_1_0_DEPRECATED	   # old: xform
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	184
@@ -3467,7 +3722,8 @@ Rotated(angle, x, y, z)
 	param		x		Float64 in value
 	param		y		Float64 in value
 	param		z		Float64 in value
-	category	VERSION_1_0_DEPRECATED	   # old: xform
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	185
@@ -3479,7 +3735,8 @@ Rotatef(angle, x, y, z)
 	param		x		Float32 in value
 	param		y		Float32 in value
 	param		z		Float32 in value
-	category	VERSION_1_0_DEPRECATED	   # old: xform
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	186
@@ -3490,7 +3747,8 @@ Scaled(x, y, z)
 	param		x		Float64 in value
 	param		y		Float64 in value
 	param		z		Float64 in value
-	category	VERSION_1_0_DEPRECATED	   # old: xform
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	187
@@ -3501,7 +3759,8 @@ Scalef(x, y, z)
 	param		x		Float32 in value
 	param		y		Float32 in value
 	param		z		Float32 in value
-	category	VERSION_1_0_DEPRECATED	   # old: xform
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	188
@@ -3512,7 +3771,8 @@ Translated(x, y, z)
 	param		x		Float64 in value
 	param		y		Float64 in value
 	param		z		Float64 in value
-	category	VERSION_1_0_DEPRECATED	   # old: xform
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	189
@@ -3523,7 +3783,8 @@ Translatef(x, y, z)
 	param		x		Float32 in value
 	param		y		Float32 in value
 	param		z		Float32 in value
-	category	VERSION_1_0_DEPRECATED	   # old: xform
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	190
@@ -3727,7 +3988,8 @@ IsTexture(texture)
 ArrayElement(i)
 	return		void
 	param		i		Int32 in value
-	category	VERSION_1_1_DEPRECATED
+	category	VERSION_1_1
+	profile		compatibility
 	dlflags		handcode
 	glxflags	client-handcode client-intercept server-handcode
 	version		1.1
@@ -3740,7 +4002,8 @@ ColorPointer(size, type, stride, pointer)
 	param		type		ColorPointerType in value
 	param		stride		SizeI in value
 	param		pointer		Void in array [COMPSIZE(size/type/stride)] retained
-	category	VERSION_1_1_DEPRECATED
+	category	VERSION_1_1
+	profile		compatibility
 	dlflags		notlistable
 	glxflags	client-handcode client-intercept server-handcode
 	version		1.1
@@ -3750,7 +4013,8 @@ ColorPointer(size, type, stride, pointer)
 DisableClientState(array)
 	return		void
 	param		array		EnableCap in value
-	category	VERSION_1_1_DEPRECATED
+	category	VERSION_1_1
+	profile		compatibility
 	version		1.1
 	deprecated	3.1
 	dlflags		notlistable
@@ -3761,7 +4025,8 @@ EdgeFlagPointer(stride, pointer)
 	return		void
 	param		stride		SizeI in value
 	param		pointer		Void in array [COMPSIZE(stride)] retained
-	category	VERSION_1_1_DEPRECATED
+	category	VERSION_1_1
+	profile		compatibility
 	dlflags		notlistable
 	glxflags	client-handcode client-intercept server-handcode
 	version		1.1
@@ -3771,7 +4036,8 @@ EdgeFlagPointer(stride, pointer)
 EnableClientState(array)
 	return		void
 	param		array		EnableCap in value
-	category	VERSION_1_1_DEPRECATED
+	category	VERSION_1_1
+	profile		compatibility
 	dlflags		notlistable
 	glxflags	client-handcode client-intercept server-handcode
 	version		1.1
@@ -3783,7 +4049,8 @@ IndexPointer(type, stride, pointer)
 	param		type		IndexPointerType in value
 	param		stride		SizeI in value
 	param		pointer		Void in array [COMPSIZE(type/stride)] retained
-	category	VERSION_1_1_DEPRECATED
+	category	VERSION_1_1
+	profile		compatibility
 	dlflags		notlistable
 	glxflags	client-handcode client-intercept server-handcode
 	version		1.1
@@ -3795,7 +4062,8 @@ InterleavedArrays(format, stride, pointer)
 	param		format		InterleavedArrayFormat in value
 	param		stride		SizeI in value
 	param		pointer		Void in array [COMPSIZE(format/stride)] retained
-	category	VERSION_1_1_DEPRECATED
+	category	VERSION_1_1
+	profile		compatibility
 	dlflags		notlistable
 	glxflags	client-handcode client-intercept server-handcode
 	version		1.1
@@ -3807,7 +4075,8 @@ NormalPointer(type, stride, pointer)
 	param		type		NormalPointerType in value
 	param		stride		SizeI in value
 	param		pointer		Void in array [COMPSIZE(type/stride)] retained
-	category	VERSION_1_1_DEPRECATED
+	category	VERSION_1_1
+	profile		compatibility
 	dlflags		notlistable
 	glxflags	client-handcode client-intercept server-handcode
 	version		1.1
@@ -3820,7 +4089,8 @@ TexCoordPointer(size, type, stride, pointer)
 	param		type		TexCoordPointerType in value
 	param		stride		SizeI in value
 	param		pointer		Void in array [COMPSIZE(size/type/stride)] retained
-	category	VERSION_1_1_DEPRECATED
+	category	VERSION_1_1
+	profile		compatibility
 	dlflags		notlistable
 	glxflags	client-handcode client-intercept server-handcode
 	version		1.1
@@ -3833,7 +4103,8 @@ VertexPointer(size, type, stride, pointer)
 	param		type		VertexPointerType in value
 	param		stride		SizeI in value
 	param		pointer		Void in array [COMPSIZE(size/type/stride)] retained
-	category	VERSION_1_1_DEPRECATED
+	category	VERSION_1_1
+	profile		compatibility
 	dlflags		notlistable
 	glxflags	client-handcode client-intercept server-handcode
 	version		1.1
@@ -3845,7 +4116,8 @@ AreTexturesResident(n, textures, residences)
 	param		n		SizeI in value
 	param		textures	Texture in array [n]
 	param		residences	Boolean out array [n]
-	category	VERSION_1_1_DEPRECATED
+	category	VERSION_1_1
+	profile		compatibility
 	glxsingle	143
 	dlflags		notlistable
 	version		1.1
@@ -3857,7 +4129,8 @@ PrioritizeTextures(n, textures, priorities)
 	param		n		SizeI in value
 	param		textures	Texture in array [n]
 	param		priorities	Float32 in array [n]
-	category	VERSION_1_1_DEPRECATED
+	category	VERSION_1_1
+	profile		compatibility
 	version		1.1
 	deprecated	3.1
 	glxropcode	4118
@@ -3867,7 +4140,8 @@ PrioritizeTextures(n, textures, priorities)
 Indexub(c)
 	return		void
 	param		c		ColorIndexValueUB in value
-	category	VERSION_1_1_DEPRECATED
+	category	VERSION_1_1
+	profile		compatibility
 	vectorequiv	Indexubv
 	version		1.1
 	offset		315
@@ -3875,14 +4149,16 @@ Indexub(c)
 Indexubv(c)
 	return		void
 	param		c		ColorIndexValueUB in array [1]
-	category	VERSION_1_1_DEPRECATED
+	category	VERSION_1_1
+	profile		compatibility
 	version		1.1
 	glxropcode	194
 	offset		316
 
 PopClientAttrib()
 	return		void
-	category	VERSION_1_1_DEPRECATED
+	category	VERSION_1_1
+	profile		compatibility
 	version		1.1
 	deprecated	3.1
 	dlflags		notlistable
@@ -3892,7 +4168,8 @@ PopClientAttrib()
 PushClientAttrib(mask)
 	return		void
 	param		mask		ClientAttribMask in value
-	category	VERSION_1_1_DEPRECATED
+	category	VERSION_1_1
+	profile		compatibility
 	version		1.1
 	deprecated	3.1
 	dlflags		notlistable
@@ -4022,7 +4299,8 @@ ColorTable(target, internalformat, width, format, type, table)
 	param		format		PixelFormat in value
 	param		type		PixelType in value
 	param		table		Void in array [COMPSIZE(format/type/width)]
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	dlflags		handcode
 	glxflags	client-handcode server-handcode EXT
 	version		1.2
@@ -4035,7 +4313,8 @@ ColorTableParameterfv(target, pname, params)
 	param		target		ColorTableTarget in value
 	param		pname		ColorTableParameterPName in value
 	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	glxflags	EXT
 	version		1.2
 	deprecated	3.1
@@ -4047,7 +4326,8 @@ ColorTableParameteriv(target, pname, params)
 	param		target		ColorTableTarget in value
 	param		pname		ColorTableParameterPName in value
 	param		params		CheckedInt32 in array [COMPSIZE(pname)]
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	glxflags	EXT
 	version		1.2
 	deprecated	3.1
@@ -4061,7 +4341,8 @@ CopyColorTable(target, internalformat, x, y, width)
 	param		x		WinCoord in value
 	param		y		WinCoord in value
 	param		width		SizeI in value
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	glxflags	EXT
 	version		1.2
 	deprecated	3.1
@@ -4074,7 +4355,8 @@ GetColorTable(target, format, type, table)
 	param		format		PixelFormat in value
 	param		type		PixelType in value
 	param		table		Void out array [COMPSIZE(target/format/type)]
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	dlflags		notlistable
 	glxflags	client-handcode server-handcode
 	version		1.2
@@ -4087,7 +4369,8 @@ GetColorTableParameterfv(target, pname, params)
 	param		target		ColorTableTarget in value
 	param		pname		GetColorTableParameterPName in value
 	param		params		Float32 out array [COMPSIZE(pname)]
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	dlflags		notlistable
 	version		1.2
 	deprecated	3.1
@@ -4099,7 +4382,8 @@ GetColorTableParameteriv(target, pname, params)
 	param		target		ColorTableTarget in value
 	param		pname		GetColorTableParameterPName in value
 	param		params		Int32 out array [COMPSIZE(pname)]
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	dlflags		notlistable
 	version		1.2
 	deprecated	3.1
@@ -4116,7 +4400,8 @@ ColorSubTable(target, start, count, format, type, data)
 	param		format		PixelFormat in value
 	param		type		PixelType in value
 	param		data		Void in array [COMPSIZE(format/type/count)]
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	dlflags		handcode
 	glxflags	client-handcode server-handcode
 	version		1.2
@@ -4131,7 +4416,8 @@ CopyColorSubTable(target, start, x, y, width)
 	param		x		WinCoord in value
 	param		y		WinCoord in value
 	param		width		SizeI in value
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	version		1.2
 	deprecated	3.1
 	glxropcode	196
@@ -4147,7 +4433,8 @@ ConvolutionFilter1D(target, internalformat, width, format, type, image)
 	param		format		PixelFormat in value
 	param		type		PixelType in value
 	param		image		Void in array [COMPSIZE(format/type/width)]
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	dlflags		handcode
 	glxflags	client-handcode server-handcode EXT
 	version		1.2
@@ -4164,7 +4451,8 @@ ConvolutionFilter2D(target, internalformat, width, height, format, type, image)
 	param		format		PixelFormat in value
 	param		type		PixelType in value
 	param		image		Void in array [COMPSIZE(format/type/width/height)]
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	dlflags		handcode
 	glxflags	client-handcode server-handcode EXT
 	version		1.2
@@ -4177,7 +4465,8 @@ ConvolutionParameterf(target, pname, params)
 	param		target		ConvolutionTarget in value
 	param		pname		ConvolutionParameter in value
 	param		params		CheckedFloat32 in value
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	glxflags	EXT
 	version		1.2
 	deprecated	3.1
@@ -4189,7 +4478,8 @@ ConvolutionParameterfv(target, pname, params)
 	param		target		ConvolutionTarget in value
 	param		pname		ConvolutionParameter in value
 	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	glxflags	EXT
 	version		1.2
 	deprecated	3.1
@@ -4201,7 +4491,8 @@ ConvolutionParameteri(target, pname, params)
 	param		target		ConvolutionTarget in value
 	param		pname		ConvolutionParameter in value
 	param		params		CheckedInt32 in value
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	glxflags	EXT
 	version		1.2
 	deprecated	3.1
@@ -4213,7 +4504,8 @@ ConvolutionParameteriv(target, pname, params)
 	param		target		ConvolutionTarget in value
 	param		pname		ConvolutionParameter in value
 	param		params		CheckedInt32 in array [COMPSIZE(pname)]
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	glxflags	EXT
 	version		1.2
 	deprecated	3.1
@@ -4227,7 +4519,8 @@ CopyConvolutionFilter1D(target, internalformat, x, y, width)
 	param		x		WinCoord in value
 	param		y		WinCoord in value
 	param		width		SizeI in value
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	glxflags	EXT
 	version		1.2
 	deprecated	3.1
@@ -4242,7 +4535,8 @@ CopyConvolutionFilter2D(target, internalformat, x, y, width, height)
 	param		y		WinCoord in value
 	param		width		SizeI in value
 	param		height		SizeI in value
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	glxflags	EXT
 	version		1.2
 	deprecated	3.1
@@ -4255,7 +4549,8 @@ GetConvolutionFilter(target, format, type, image)
 	param		format		PixelFormat in value
 	param		type		PixelType in value
 	param		image		Void out array [COMPSIZE(target/format/type)]
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	dlflags		notlistable
 	glxflags	client-handcode server-handcode
 	version		1.2
@@ -4268,7 +4563,8 @@ GetConvolutionParameterfv(target, pname, params)
 	param		target		ConvolutionTarget in value
 	param		pname		GetConvolutionParameterPName in value
 	param		params		Float32 out array [COMPSIZE(pname)]
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	dlflags		notlistable
 	version		1.2
 	deprecated	3.1
@@ -4280,7 +4576,8 @@ GetConvolutionParameteriv(target, pname, params)
 	param		target		ConvolutionTarget in value
 	param		pname		GetConvolutionParameterPName in value
 	param		params		Int32 out array [COMPSIZE(pname)]
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	dlflags		notlistable
 	version		1.2
 	deprecated	3.1
@@ -4295,7 +4592,8 @@ GetSeparableFilter(target, format, type, row, column, span)
 	param		row		Void out array [COMPSIZE(target/format/type)]
 	param		column		Void out array [COMPSIZE(target/format/type)]
 	param		span		Void out array [COMPSIZE(target/format/type)]
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	dlflags		notlistable
 	glxflags	client-handcode server-handcode
 	version		1.2
@@ -4313,7 +4611,8 @@ SeparableFilter2D(target, internalformat, width, height, format, type, row, colu
 	param		type		PixelType in value
 	param		row		Void in array [COMPSIZE(target/format/type/width)]
 	param		column		Void in array [COMPSIZE(target/format/type/height)]
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	dlflags		handcode
 	glxflags	client-handcode server-handcode EXT
 	version		1.2
@@ -4330,7 +4629,8 @@ GetHistogram(target, reset, format, type, values)
 	param		format		PixelFormat in value
 	param		type		PixelType in value
 	param		values		Void out array [COMPSIZE(target/format/type)]
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	dlflags		notlistable
 	glxflags	client-handcode server-handcode
 	version		1.2
@@ -4343,7 +4643,8 @@ GetHistogramParameterfv(target, pname, params)
 	param		target		HistogramTarget in value
 	param		pname		GetHistogramParameterPName in value
 	param		params		Float32 out array [COMPSIZE(pname)]
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	dlflags		notlistable
 	version		1.2
 	deprecated	3.1
@@ -4355,7 +4656,8 @@ GetHistogramParameteriv(target, pname, params)
 	param		target		HistogramTarget in value
 	param		pname		GetHistogramParameterPName in value
 	param		params		Int32 out array [COMPSIZE(pname)]
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	dlflags		notlistable
 	version		1.2
 	deprecated	3.1
@@ -4369,7 +4671,8 @@ GetMinmax(target, reset, format, type, values)
 	param		format		PixelFormat in value
 	param		type		PixelType in value
 	param		values		Void out array [COMPSIZE(target/format/type)]
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	dlflags		notlistable
 	glxflags	client-handcode server-handcode
 	version		1.2
@@ -4382,7 +4685,8 @@ GetMinmaxParameterfv(target, pname, params)
 	param		target		MinmaxTarget in value
 	param		pname		GetMinmaxParameterPName in value
 	param		params		Float32 out array [COMPSIZE(pname)]
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	dlflags		notlistable
 	version		1.2
 	deprecated	3.1
@@ -4394,7 +4698,8 @@ GetMinmaxParameteriv(target, pname, params)
 	param		target		MinmaxTarget in value
 	param		pname		GetMinmaxParameterPName in value
 	param		params		Int32 out array [COMPSIZE(pname)]
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	dlflags		notlistable
 	version		1.2
 	deprecated	3.1
@@ -4407,7 +4712,8 @@ Histogram(target, width, internalformat, sink)
 	param		width		SizeI in value
 	param		internalformat	PixelInternalFormat in value
 	param		sink		Boolean in value
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	dlflags		handcode
 	glxflags	EXT
 	version		1.2
@@ -4420,7 +4726,8 @@ Minmax(target, internalformat, sink)
 	param		target		MinmaxTarget in value
 	param		internalformat	PixelInternalFormat in value
 	param		sink		Boolean in value
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	glxflags	EXT
 	version		1.2
 	deprecated	3.1
@@ -4430,7 +4737,8 @@ Minmax(target, internalformat, sink)
 ResetHistogram(target)
 	return		void
 	param		target		HistogramTarget in value
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	glxflags	EXT
 	version		1.2
 	deprecated	3.1
@@ -4440,7 +4748,8 @@ ResetHistogram(target)
 ResetMinmax(target)
 	return		void
 	param		target		MinmaxTarget in value
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	glxflags	EXT
 	version		1.2
 	deprecated	3.1
@@ -4618,7 +4927,8 @@ GetCompressedTexImage(target, level, img)
 ClientActiveTexture(texture)
 	return		void
 	param		texture		TextureUnit in value
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	dlflags		notlistable
 	glxflags	ARB client-handcode client-intercept server-handcode
 	version		1.3
@@ -4629,7 +4939,8 @@ MultiTexCoord1d(target, s)
 	return		void
 	param		target		TextureUnit in value
 	param		s		CoordD in value
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4640,7 +4951,8 @@ MultiTexCoord1dv(target, v)
 	return		void
 	param		target		TextureUnit in value
 	param		v		CoordD in array [1]
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4651,7 +4963,8 @@ MultiTexCoord1f(target, s)
 	return		void
 	param		target		TextureUnit in value
 	param		s		CoordF in value
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4662,7 +4975,8 @@ MultiTexCoord1fv(target, v)
 	return		void
 	param		target		TextureUnit in value
 	param		v		CoordF in array [1]
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4673,7 +4987,8 @@ MultiTexCoord1i(target, s)
 	return		void
 	param		target		TextureUnit in value
 	param		s		CoordI in value
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4684,7 +4999,8 @@ MultiTexCoord1iv(target, v)
 	return		void
 	param		target		TextureUnit in value
 	param		v		CoordI in array [1]
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4695,7 +5011,8 @@ MultiTexCoord1s(target, s)
 	return		void
 	param		target		TextureUnit in value
 	param		s		CoordS in value
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4706,7 +5023,8 @@ MultiTexCoord1sv(target, v)
 	return		void
 	param		target		TextureUnit in value
 	param		v		CoordS in array [1]
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4718,7 +5036,8 @@ MultiTexCoord2d(target, s, t)
 	param		target		TextureUnit in value
 	param		s		CoordD in value
 	param		t		CoordD in value
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4729,7 +5048,8 @@ MultiTexCoord2dv(target, v)
 	return		void
 	param		target		TextureUnit in value
 	param		v		CoordD in array [2]
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4741,7 +5061,8 @@ MultiTexCoord2f(target, s, t)
 	param		target		TextureUnit in value
 	param		s		CoordF in value
 	param		t		CoordF in value
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4752,7 +5073,8 @@ MultiTexCoord2fv(target, v)
 	return		void
 	param		target		TextureUnit in value
 	param		v		CoordF in array [2]
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4764,7 +5086,8 @@ MultiTexCoord2i(target, s, t)
 	param		target		TextureUnit in value
 	param		s		CoordI in value
 	param		t		CoordI in value
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4775,7 +5098,8 @@ MultiTexCoord2iv(target, v)
 	return		void
 	param		target		TextureUnit in value
 	param		v		CoordI in array [2]
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4787,7 +5111,8 @@ MultiTexCoord2s(target, s, t)
 	param		target		TextureUnit in value
 	param		s		CoordS in value
 	param		t		CoordS in value
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4798,7 +5123,8 @@ MultiTexCoord2sv(target, v)
 	return		void
 	param		target		TextureUnit in value
 	param		v		CoordS in array [2]
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4811,7 +5137,8 @@ MultiTexCoord3d(target, s, t, r)
 	param		s		CoordD in value
 	param		t		CoordD in value
 	param		r		CoordD in value
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4822,7 +5149,8 @@ MultiTexCoord3dv(target, v)
 	return		void
 	param		target		TextureUnit in value
 	param		v		CoordD in array [3]
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4835,7 +5163,8 @@ MultiTexCoord3f(target, s, t, r)
 	param		s		CoordF in value
 	param		t		CoordF in value
 	param		r		CoordF in value
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4846,7 +5175,8 @@ MultiTexCoord3fv(target, v)
 	return		void
 	param		target		TextureUnit in value
 	param		v		CoordF in array [3]
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4859,7 +5189,8 @@ MultiTexCoord3i(target, s, t, r)
 	param		s		CoordI in value
 	param		t		CoordI in value
 	param		r		CoordI in value
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4870,7 +5201,8 @@ MultiTexCoord3iv(target, v)
 	return		void
 	param		target		TextureUnit in value
 	param		v		CoordI in array [3]
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4883,7 +5215,8 @@ MultiTexCoord3s(target, s, t, r)
 	param		s		CoordS in value
 	param		t		CoordS in value
 	param		r		CoordS in value
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4894,7 +5227,8 @@ MultiTexCoord3sv(target, v)
 	return		void
 	param		target		TextureUnit in value
 	param		v		CoordS in array [3]
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	version		1.3
 	deprecated	3.1
 	glxflags	ARB
@@ -4908,7 +5242,8 @@ MultiTexCoord4d(target, s, t, r, q)
 	param		t		CoordD in value
 	param		r		CoordD in value
 	param		q		CoordD in value
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4919,7 +5254,8 @@ MultiTexCoord4dv(target, v)
 	return		void
 	param		target		TextureUnit in value
 	param		v		CoordD in array [4]
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4933,7 +5269,8 @@ MultiTexCoord4f(target, s, t, r, q)
 	param		t		CoordF in value
 	param		r		CoordF in value
 	param		q		CoordF in value
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4944,7 +5281,8 @@ MultiTexCoord4fv(target, v)
 	return		void
 	param		target		TextureUnit in value
 	param		v		CoordF in array [4]
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4958,7 +5296,8 @@ MultiTexCoord4i(target, s, t, r, q)
 	param		t		CoordI in value
 	param		r		CoordI in value
 	param		q		CoordI in value
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4969,7 +5308,8 @@ MultiTexCoord4iv(target, v)
 	return		void
 	param		target		TextureUnit in value
 	param		v		CoordI in array [4]
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4983,7 +5323,8 @@ MultiTexCoord4s(target, s, t, r, q)
 	param		t		CoordS in value
 	param		r		CoordS in value
 	param		q		CoordS in value
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4994,7 +5335,8 @@ MultiTexCoord4sv(target, v)
 	return		void
 	param		target		TextureUnit in value
 	param		v		CoordS in array [4]
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -5006,7 +5348,8 @@ MultiTexCoord4sv(target, v)
 LoadTransposeMatrixf(m)
 	return		void
 	param		m		Float32 in array [16]
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB client-handcode client-intercept server-handcode
 	version		1.3
 	deprecated	3.1
@@ -5015,7 +5358,8 @@ LoadTransposeMatrixf(m)
 LoadTransposeMatrixd(m)
 	return		void
 	param		m		Float64 in array [16]
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB client-handcode client-intercept server-handcode
 	version		1.3
 	deprecated	3.1
@@ -5024,7 +5368,8 @@ LoadTransposeMatrixd(m)
 MultTransposeMatrixf(m)
 	return		void
 	param		m		Float32 in array [16]
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB client-handcode client-intercept server-handcode
 	version		1.3
 	deprecated	3.1
@@ -5033,7 +5378,8 @@ MultTransposeMatrixf(m)
 MultTransposeMatrixd(m)
 	return		void
 	param		m		Float64 in array [16]
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB client-handcode client-intercept server-handcode
 	version		1.3
 	deprecated	3.1
@@ -5142,7 +5488,8 @@ PointParameteriv(pname, params)
 FogCoordf(coord)
 	return		void
 	param		coord		CoordF in value
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	vectorequiv	FogCoordfv
 	version		1.4
 	deprecated	3.1
@@ -5151,7 +5498,8 @@ FogCoordf(coord)
 FogCoordfv(coord)
 	return		void
 	param		coord		CoordF in array [1]
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	version		1.4
 	deprecated	3.1
 	glxropcode	4124
@@ -5160,7 +5508,8 @@ FogCoordfv(coord)
 FogCoordd(coord)
 	return		void
 	param		coord		CoordD in value
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	vectorequiv	FogCoorddv
 	version		1.4
 	deprecated	3.1
@@ -5169,7 +5518,8 @@ FogCoordd(coord)
 FogCoorddv(coord)
 	return		void
 	param		coord		CoordD in array [1]
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	version		1.4
 	deprecated	3.1
 	glxropcode	4125
@@ -5180,7 +5530,8 @@ FogCoordPointer(type, stride, pointer)
 	param		type		FogPointerTypeEXT in value
 	param		stride		SizeI in value
 	param		pointer		Void in array [COMPSIZE(type/stride)] retained
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	dlflags		notlistable
 	version		1.4
 	deprecated	3.1
@@ -5194,7 +5545,8 @@ SecondaryColor3b(red, green, blue)
 	param		red		ColorB in value
 	param		green		ColorB in value
 	param		blue		ColorB in value
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	vectorequiv	SecondaryColor3bv
 	version		1.4
 	deprecated	3.1
@@ -5203,7 +5555,8 @@ SecondaryColor3b(red, green, blue)
 SecondaryColor3bv(v)
 	return		void
 	param		v		ColorB in array [3]
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	version		1.4
 	deprecated	3.1
 	glxropcode	4126
@@ -5214,7 +5567,8 @@ SecondaryColor3d(red, green, blue)
 	param		red		ColorD in value
 	param		green		ColorD in value
 	param		blue		ColorD in value
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	vectorequiv	SecondaryColor3dv
 	version		1.4
 	deprecated	3.1
@@ -5223,7 +5577,8 @@ SecondaryColor3d(red, green, blue)
 SecondaryColor3dv(v)
 	return		void
 	param		v		ColorD in array [3]
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	version		1.4
 	deprecated	3.1
 	glxropcode	4130
@@ -5234,7 +5589,8 @@ SecondaryColor3f(red, green, blue)
 	param		red		ColorF in value
 	param		green		ColorF in value
 	param		blue		ColorF in value
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	vectorequiv	SecondaryColor3fv
 	version		1.4
 	deprecated	3.1
@@ -5243,7 +5599,8 @@ SecondaryColor3f(red, green, blue)
 SecondaryColor3fv(v)
 	return		void
 	param		v		ColorF in array [3]
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	version		1.4
 	deprecated	3.1
 	glxropcode	4129
@@ -5254,7 +5611,8 @@ SecondaryColor3i(red, green, blue)
 	param		red		ColorI in value
 	param		green		ColorI in value
 	param		blue		ColorI in value
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	vectorequiv	SecondaryColor3iv
 	version		1.4
 	deprecated	3.1
@@ -5263,7 +5621,8 @@ SecondaryColor3i(red, green, blue)
 SecondaryColor3iv(v)
 	return		void
 	param		v		ColorI in array [3]
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	version		1.4
 	deprecated	3.1
 	glxropcode	4128
@@ -5274,7 +5633,8 @@ SecondaryColor3s(red, green, blue)
 	param		red		ColorS in value
 	param		green		ColorS in value
 	param		blue		ColorS in value
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	vectorequiv	SecondaryColor3sv
 	version		1.4
 	deprecated	3.1
@@ -5283,7 +5643,8 @@ SecondaryColor3s(red, green, blue)
 SecondaryColor3sv(v)
 	return		void
 	param		v		ColorS in array [3]
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	version		1.4
 	deprecated	3.1
 	glxropcode	4127
@@ -5294,7 +5655,8 @@ SecondaryColor3ub(red, green, blue)
 	param		red		ColorUB in value
 	param		green		ColorUB in value
 	param		blue		ColorUB in value
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	vectorequiv	SecondaryColor3ubv
 	version		1.4
 	deprecated	3.1
@@ -5303,7 +5665,8 @@ SecondaryColor3ub(red, green, blue)
 SecondaryColor3ubv(v)
 	return		void
 	param		v		ColorUB in array [3]
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	version		1.4
 	deprecated	3.1
 	glxropcode	4131
@@ -5314,7 +5677,8 @@ SecondaryColor3ui(red, green, blue)
 	param		red		ColorUI in value
 	param		green		ColorUI in value
 	param		blue		ColorUI in value
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	vectorequiv	SecondaryColor3uiv
 	version		1.4
 	deprecated	3.1
@@ -5323,7 +5687,8 @@ SecondaryColor3ui(red, green, blue)
 SecondaryColor3uiv(v)
 	return		void
 	param		v		ColorUI in array [3]
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	version		1.4
 	deprecated	3.1
 	glxropcode	4133
@@ -5334,7 +5699,8 @@ SecondaryColor3us(red, green, blue)
 	param		red		ColorUS in value
 	param		green		ColorUS in value
 	param		blue		ColorUS in value
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	vectorequiv	SecondaryColor3usv
 	version		1.4
 	deprecated	3.1
@@ -5343,7 +5709,8 @@ SecondaryColor3us(red, green, blue)
 SecondaryColor3usv(v)
 	return		void
 	param		v		ColorUS in array [3]
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	version		1.4
 	deprecated	3.1
 	glxropcode	4132
@@ -5355,7 +5722,8 @@ SecondaryColorPointer(size, type, stride, pointer)
 	param		type		ColorPointerType in value
 	param		stride		SizeI in value
 	param		pointer		Void in array [COMPSIZE(size/type/stride)] retained
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	dlflags		notlistable
 	glxflags	client-handcode server-handcode
 	version		1.4
@@ -5370,7 +5738,8 @@ WindowPos2d(x, y)
 	return		void
 	param		x		CoordD in value
 	param		y		CoordD in value
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	vectorequiv	WindowPos2dv
 	version		1.4
 	deprecated	3.1
@@ -5379,7 +5748,8 @@ WindowPos2d(x, y)
 WindowPos2dv(v)
 	return		void
 	param		v		CoordD in array [2]
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	version		1.4
 	deprecated	3.1
 	glxropcode	230
@@ -5390,7 +5760,8 @@ WindowPos2f(x, y)
 	return		void
 	param		x		CoordF in value
 	param		y		CoordF in value
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	vectorequiv	WindowPos2fv
 	version		1.4
 	deprecated	3.1
@@ -5399,7 +5770,8 @@ WindowPos2f(x, y)
 WindowPos2fv(v)
 	return		void
 	param		v		CoordF in array [2]
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	version		1.4
 	deprecated	3.1
 	glxropcode	230
@@ -5410,7 +5782,8 @@ WindowPos2i(x, y)
 	return		void
 	param		x		CoordI in value
 	param		y		CoordI in value
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	vectorequiv	WindowPos2iv
 	version		1.4
 	deprecated	3.1
@@ -5419,7 +5792,8 @@ WindowPos2i(x, y)
 WindowPos2iv(v)
 	return		void
 	param		v		CoordI in array [2]
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	version		1.4
 	deprecated	3.1
 	glxropcode	230
@@ -5430,7 +5804,8 @@ WindowPos2s(x, y)
 	return		void
 	param		x		CoordS in value
 	param		y		CoordS in value
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	vectorequiv	WindowPos2sv
 	version		1.4
 	deprecated	3.1
@@ -5439,7 +5814,8 @@ WindowPos2s(x, y)
 WindowPos2sv(v)
 	return		void
 	param		v		CoordS in array [2]
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	version		1.4
 	deprecated	3.1
 	glxropcode	230
@@ -5452,7 +5828,8 @@ WindowPos3d(x, y, z)
 	param		y		CoordD in value
 	param		z		CoordD in value
 	vectorequiv	WindowPos3dv
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	version		1.4
 	deprecated	3.1
 	offset		521
@@ -5460,7 +5837,8 @@ WindowPos3d(x, y, z)
 WindowPos3dv(v)
 	return		void
 	param		v		CoordD in array [3]
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	version		1.4
 	deprecated	3.1
 	glxropcode	230
@@ -5472,7 +5850,8 @@ WindowPos3f(x, y, z)
 	param		x		CoordF in value
 	param		y		CoordF in value
 	param		z		CoordF in value
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	vectorequiv	WindowPos3fv
 	version		1.4
 	deprecated	3.1
@@ -5481,7 +5860,8 @@ WindowPos3f(x, y, z)
 WindowPos3fv(v)
 	return		void
 	param		v		CoordF in array [3]
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	version		1.4
 	deprecated	3.1
 	glxropcode	230
@@ -5493,7 +5873,8 @@ WindowPos3i(x, y, z)
 	param		x		CoordI in value
 	param		y		CoordI in value
 	param		z		CoordI in value
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	vectorequiv	WindowPos3iv
 	version		1.4
 	deprecated	3.1
@@ -5502,7 +5883,8 @@ WindowPos3i(x, y, z)
 WindowPos3iv(v)
 	return		void
 	param		v		CoordI in array [3]
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	version		1.4
 	deprecated	3.1
 	glxropcode	230
@@ -5514,7 +5896,8 @@ WindowPos3s(x, y, z)
 	param		x		CoordS in value
 	param		y		CoordS in value
 	param		z		CoordS in value
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	vectorequiv	WindowPos3sv
 	version		1.4
 	deprecated	3.1
@@ -5523,7 +5906,8 @@ WindowPos3s(x, y, z)
 WindowPos3sv(v)
 	return		void
 	param		v		CoordS in array [3]
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	version		1.4
 	deprecated	3.1
 	glxropcode	230
@@ -8055,10 +8439,7 @@ passthru: /* ARB_ES3_compatibility (no entry points) */
 passthru: /* ARB_clear_buffer_object */
 passthru: /* ARB_compute_shader */
 passthru: /* ARB_copy_image */
-passthru: /* ARB_debug_group */
-passthru: /* ARB_debug_label */
-passthru: /* KHR_debug (ARB_debug_output promoted to KHR without suffixes) */
-passthru: /* ARB_debug_output2 (no entry points) */
+passthru: /* KHR_debug (includes ARB_debug_output commands promoted to KHR without suffixes) */
 passthru: /* ARB_explicit_uniform_location (no entry points) */
 passthru: /* ARB_framebuffer_no_attachments */
 passthru: /* ARB_internalformat_query2 */
@@ -14448,6 +14829,7 @@ GetnMapdvARB(target, query, bufSize, v)
 	param		bufSize		SizeI in value
 	param		v		Float64 out array [bufSize]
 	category	ARB_robustness
+	profile		compatibility
 	dlflags		notlistable
 	version		4.1
 	extension
@@ -14462,6 +14844,7 @@ GetnMapfvARB(target, query, bufSize, v)
 	param		bufSize		SizeI in value
 	param		v		Float32 out array [bufSize]
 	category	ARB_robustness
+	profile		compatibility
 	dlflags		notlistable
 	version		4.1
 	extension
@@ -14476,6 +14859,7 @@ GetnMapivARB(target, query, bufSize, v)
 	param		bufSize		SizeI in value
 	param		v		Int32 out array [bufSize]
 	category	ARB_robustness
+	profile		compatibility
 	dlflags		notlistable
 	version		4.1
 	extension
@@ -14489,6 +14873,7 @@ GetnPixelMapfvARB(map, bufSize, values)
 	param		bufSize		SizeI in value
 	param		values		Float32 out array [bufSize]
 	category	ARB_robustness
+	profile		compatibility
 	dlflags		notlistable
 	version		4.1
 	extension
@@ -14502,6 +14887,7 @@ GetnPixelMapuivARB(map, bufSize, values)
 	param		bufSize		SizeI in value
 	param		values		UInt32 out array [bufSize]
 	category	ARB_robustness
+	profile		compatibility
 	dlflags		notlistable
 	version		4.1
 	extension
@@ -14515,6 +14901,7 @@ GetnPixelMapusvARB(map, bufSize, values)
 	param		bufSize		SizeI in value
 	param		values		UInt16 out array [bufSize]
 	category	ARB_robustness
+	profile		compatibility
 	dlflags		notlistable
 	version		4.1
 	extension
@@ -14527,6 +14914,7 @@ GetnPolygonStippleARB(bufSize, pattern)
 	param		bufSize		SizeI in value
 	param		pattern		UInt8 out array [bufSize]
 	category	ARB_robustness
+	profile		compatibility
 	dlflags		notlistable
 	version		4.1
 	extension
@@ -14542,6 +14930,7 @@ GetnColorTableARB(target, format, type, bufSize, table)
 	param		bufSize		SizeI in value
 	param		table		Void out array [bufSize]
 	category	ARB_robustness
+	profile		compatibility
 	dlflags		notlistable
 	version		4.1
 	extension
@@ -14557,6 +14946,7 @@ GetnConvolutionFilterARB(target, format, type, bufSize, image)
 	param		bufSize		SizeI in value
 	param		image		Void out array [bufSize]
 	category	ARB_robustness
+	profile		compatibility
 	dlflags		notlistable
 	version		4.1
 	extension
@@ -14575,6 +14965,7 @@ GetnSeparableFilterARB(target, format, type, rowBufSize, row, columnBufSize, col
 	param		column		Void out array [columnBufSize]
 	param		span		Void out array [0]
 	category	ARB_robustness
+	profile		compatibility
 	dlflags		notlistable
 	version		4.1
 	extension
@@ -14591,6 +14982,7 @@ GetnHistogramARB(target, reset, format, type, bufSize, values)
 	param		bufSize		SizeI in value
 	param		values		Void out array [bufSize]
 	category	ARB_robustness
+	profile		compatibility
 	dlflags		notlistable
 	version		4.1
 	extension
@@ -14607,6 +14999,7 @@ GetnMinmaxARB(target, reset, format, type, bufSize, values)
 	param		bufSize		SizeI in value
 	param		values		Void out array [bufSize]
 	category	ARB_robustness
+	profile		compatibility
 	dlflags		notlistable
 	version		4.1
 	extension
@@ -15109,7 +15502,6 @@ GetDebugMessageLog(count, bufsize, sources, types, ids, severities, lengths, mes
 	glxflags	ignore
 	offset		?
 
-# Shared with ARB_debug_group
 PushDebugGroup(source, id, length, message)
 	return		void
 	param		source		GLenum in value
@@ -15132,7 +15524,6 @@ PopDebugGroup()
 	glxflags	ignore
 	offset		?
 
-# Shared with ARB_debug_label
 ObjectLabel(identifier, name, length, label)
 	return		void
 	param		identifier	GLenum in value
@@ -15187,7 +15578,7 @@ GetObjectPtrLabel(ptr, bufSize, length, label)
 	glxflags	ignore
 	offset		?
 
-passthru: /* KHR_debug also reuses entry points from ARB_debug_group and ARB_debug_label */
+# Also includes GetPointerv (only for OpenGL ES 2, however)
 
 ###############################################################################
 #
@@ -15330,35 +15721,200 @@ CopyImageSubData(srcName, srcTarget, srcLevel, srcX, srcY, srcZ, dstName, dstTar
 
 ###############################################################################
 #
-# Extension #ARB124
-# ARB_debug_group commands
+# Extension #ARB124 (renumbered from 142)
+# ARB_texture_view commands
 #
 ###############################################################################
 
-# (none)
-newcategory: ARB_debug_group
-passthru: /* ARB_debug_group reuses entry points from KHR_debug */
+TextureView(texture, target, origtexture, internalformat, minlevel, numlevels, minlayer, numlayers)
+	return		void
+	param		texture		UInt32 in value
+	param		target		GLenum in value
+	param		origtexture	UInt32 in value
+	param		internalformat	GLenum in value
+	param		minlevel	UInt32 in value
+	param		numlevels	UInt32 in value
+	param		minlayer	UInt32 in value
+	param		numlayers	UInt32 in value
+	category	ARB_texture_view
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
 
 ###############################################################################
 #
-# Extension #ARB125
-# ARB_debug_label commands
+# Extension #ARB125 (renumbered from 143)
+# ARB_vertex_attrib_binding commands
 #
 ###############################################################################
 
-# (none)
-newcategory: ARB_debug_label
-passthru: /* ARB_debug_label reuses entry points from KHR_debug */
+BindVertexBuffer(bindingindex, buffer, offset, stride)
+	return		void
+	param		bindingindex	UInt32 in value
+	param		buffer		UInt32 in value
+	param		offset		BufferOffset in value
+	param		stride		SizeI in value
+	category	ARB_vertex_attrib_binding
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribFormat(attribindex, size, type, normalized, relativeoffset)
+	return		void
+	param		attribindex	UInt32 in value
+	param		size		Int32 in value
+	param		type		GLenum in value
+	param		normalized	Boolean in value
+	param		relativeoffset	UInt32 in value
+	category	ARB_vertex_attrib_binding
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribIFormat(attribindex, size, type, relativeoffset)
+	return		void
+	param		attribindex	UInt32 in value
+	param		size		Int32 in value
+	param		type		GLenum in value
+	param		relativeoffset	UInt32 in value
+	category	ARB_vertex_attrib_binding
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribLFormat(attribindex, size, type, relativeoffset)
+	return		void
+	param		attribindex	UInt32 in value
+	param		size		Int32 in value
+	param		type		GLenum in value
+	param		relativeoffset	UInt32 in value
+	category	ARB_vertex_attrib_binding
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribBinding(attribindex, bindingindex)
+	return		void
+	param		attribindex	UInt32 in value
+	param		bindingindex	UInt32 in value
+	category	ARB_vertex_attrib_binding
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexBindingDivisor(bindingindex, divisor)
+	return		void
+	param		bindingindex	UInt32 in value
+	param		divisor		UInt32 in value
+	category	ARB_vertex_attrib_binding
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexArrayBindVertexBufferEXT(vaobj, bindingindex, buffer, offset, stride)
+	return		void
+	param		vaobj		UInt32 in value
+	param		bindingindex	UInt32 in value
+	param		buffer		UInt32 in value
+	param		offset		BufferOffset in value
+	param		stride		SizeI in value
+	category	ARB_vertex_attrib_binding
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexArrayVertexAttribFormatEXT(vaobj, attribindex, size, type, normalized, relativeoffset)
+	return		void
+	param		vaobj		UInt32 in value
+	param		attribindex	UInt32 in value
+	param		size		Int32 in value
+	param		type		GLenum in value
+	param		normalized	Boolean in value
+	param		relativeoffset	UInt32 in value
+	category	ARB_vertex_attrib_binding
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexArrayVertexAttribIFormatEXT(vaobj, attribindex, size, type, relativeoffset)
+	return		void
+	param		vaobj		UInt32 in value
+	param		attribindex	UInt32 in value
+	param		size		Int32 in value
+	param		type		GLenum in value
+	param		relativeoffset	UInt32 in value
+	category	ARB_vertex_attrib_binding
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexArrayVertexAttribLFormatEXT(vaobj, attribindex, size, type, relativeoffset)
+	return		void
+	param		vaobj		UInt32 in value
+	param		attribindex	UInt32 in value
+	param		size		Int32 in value
+	param		type		GLenum in value
+	param		relativeoffset	UInt32 in value
+	category	ARB_vertex_attrib_binding
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexArrayVertexAttribBindingEXT(vaobj, attribindex, bindingindex)
+	return		void
+	param		vaobj		UInt32 in value
+	param		attribindex	UInt32 in value
+	param		bindingindex	UInt32 in value
+	category	ARB_vertex_attrib_binding
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexArrayVertexBindingDivisorEXT(vaobj, bindingindex, divisor)
+	return		void
+	param		vaobj		UInt32 in value
+	param		bindingindex	UInt32 in value
+	param		divisor		UInt32 in value
+	category	ARB_vertex_attrib_binding
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
 
 ###############################################################################
 #
-# Extension #ARB126
-# ARB_debug_output2 commands
+# Extension #ARB126 (renumbered from 144)
+# ARB_robustness_isolation commands
 #
 ###############################################################################
 
 # (none)
-newcategory: ARB_debug_output2
+newcategory: ARB_robustness_isolation
 
 ###############################################################################
 #
@@ -15848,203 +16404,6 @@ TextureStorage3DMultisampleEXT(texture, target, samples, internalformat, width,
 	glxflags	ignore
 	offset		?
 
-###############################################################################
-#
-# Extension #ARB142
-# ARB_texture_view commands
-#
-###############################################################################
-
-TextureView(texture, target, origtexture, internalformat, minlevel, numlevels, minlayer, numlayers)
-	return		void
-	param		texture		UInt32 in value
-	param		target		GLenum in value
-	param		origtexture	UInt32 in value
-	param		internalformat	GLenum in value
-	param		minlevel	UInt32 in value
-	param		numlevels	UInt32 in value
-	param		minlayer	UInt32 in value
-	param		numlayers	UInt32 in value
-	category	ARB_texture_view
-	version		4.3
-	extension
-	glxropcode	?
-	glxflags	ignore
-	offset		?
-
-###############################################################################
-#
-# Extension #ARB143
-# ARB_vertex_attrib_binding commands
-#
-###############################################################################
-
-BindVertexBuffer(bindingindex, buffer, offset, stride)
-	return		void
-	param		bindingindex	UInt32 in value
-	param		buffer		UInt32 in value
-	param		offset		BufferOffset in value
-	param		stride		SizeI in value
-	category	ARB_vertex_attrib_binding
-	version		4.3
-	extension
-	glxropcode	?
-	glxflags	ignore
-	offset		?
-
-VertexAttribFormat(attribindex, size, type, normalized, relativeoffset)
-	return		void
-	param		attribindex	UInt32 in value
-	param		size		Int32 in value
-	param		type		GLenum in value
-	param		normalized	Boolean in value
-	param		relativeoffset	UInt32 in value
-	category	ARB_vertex_attrib_binding
-	version		4.3
-	extension
-	glxropcode	?
-	glxflags	ignore
-	offset		?
-
-VertexAttribIFormat(attribindex, size, type, relativeoffset)
-	return		void
-	param		attribindex	UInt32 in value
-	param		size		Int32 in value
-	param		type		GLenum in value
-	param		relativeoffset	UInt32 in value
-	category	ARB_vertex_attrib_binding
-	version		4.3
-	extension
-	glxropcode	?
-	glxflags	ignore
-	offset		?
-
-VertexAttribLFormat(attribindex, size, type, relativeoffset)
-	return		void
-	param		attribindex	UInt32 in value
-	param		size		Int32 in value
-	param		type		GLenum in value
-	param		relativeoffset	UInt32 in value
-	category	ARB_vertex_attrib_binding
-	version		4.3
-	extension
-	glxropcode	?
-	glxflags	ignore
-	offset		?
-
-VertexAttribBinding(attribindex, bindingindex)
-	return		void
-	param		attribindex	UInt32 in value
-	param		bindingindex	UInt32 in value
-	category	ARB_vertex_attrib_binding
-	version		4.3
-	extension
-	glxropcode	?
-	glxflags	ignore
-	offset		?
-
-VertexBindingDivisor(bindingindex, divisor)
-	return		void
-	param		bindingindex	UInt32 in value
-	param		divisor		UInt32 in value
-	category	ARB_vertex_attrib_binding
-	version		4.3
-	extension
-	glxropcode	?
-	glxflags	ignore
-	offset		?
-
-VertexArrayBindVertexBufferEXT(vaobj, bindingindex, buffer, offset, stride)
-	return		void
-	param		vaobj		UInt32 in value
-	param		bindingindex	UInt32 in value
-	param		buffer		UInt32 in value
-	param		offset		BufferOffset in value
-	param		stride		SizeI in value
-	category	ARB_vertex_attrib_binding
-	version		4.3
-	extension
-	glxropcode	?
-	glxflags	ignore
-	offset		?
-
-VertexArrayVertexAttribFormatEXT(vaobj, attribindex, size, type, normalized, relativeoffset)
-	return		void
-	param		vaobj		UInt32 in value
-	param		attribindex	UInt32 in value
-	param		size		Int32 in value
-	param		type		GLenum in value
-	param		normalized	Boolean in value
-	param		relativeoffset	UInt32 in value
-	category	ARB_vertex_attrib_binding
-	version		4.3
-	extension
-	glxropcode	?
-	glxflags	ignore
-	offset		?
-
-VertexArrayVertexAttribIFormatEXT(vaobj, attribindex, size, type, relativeoffset)
-	return		void
-	param		vaobj		UInt32 in value
-	param		attribindex	UInt32 in value
-	param		size		Int32 in value
-	param		type		GLenum in value
-	param		relativeoffset	UInt32 in value
-	category	ARB_vertex_attrib_binding
-	version		4.3
-	extension
-	glxropcode	?
-	glxflags	ignore
-	offset		?
-
-VertexArrayVertexAttribLFormatEXT(vaobj, attribindex, size, type, relativeoffset)
-	return		void
-	param		vaobj		UInt32 in value
-	param		attribindex	UInt32 in value
-	param		size		Int32 in value
-	param		type		GLenum in value
-	param		relativeoffset	UInt32 in value
-	category	ARB_vertex_attrib_binding
-	version		4.3
-	extension
-	glxropcode	?
-	glxflags	ignore
-	offset		?
-
-VertexArrayVertexAttribBindingEXT(vaobj, attribindex, bindingindex)
-	return		void
-	param		vaobj		UInt32 in value
-	param		attribindex	UInt32 in value
-	param		bindingindex	UInt32 in value
-	category	ARB_vertex_attrib_binding
-	version		4.3
-	extension
-	glxropcode	?
-	glxflags	ignore
-	offset		?
-
-VertexArrayVertexBindingDivisorEXT(vaobj, bindingindex, divisor)
-	return		void
-	param		vaobj		UInt32 in value
-	param		bindingindex	UInt32 in value
-	param		divisor		UInt32 in value
-	category	ARB_vertex_attrib_binding
-	version		4.3
-	extension
-	glxropcode	?
-	glxflags	ignore
-	offset		?
-
-###############################################################################
-#
-# Extension #ARB144
-# ARB_robustness_isolation commands
-#
-###############################################################################
-
-# (none)
-newcategory: ARB_robustness_isolation
-
 
 ###############################################################################
 ###############################################################################
@@ -18845,7 +19204,7 @@ PixelTransformParameteriEXT(target, pname, param)
 	param		param		Int32 in value
 	category	EXT_pixel_transform
 	version		1.1
-	glxropcode	?
+	glxropcode	16386
 	offset		?
 
 PixelTransformParameterfEXT(target, pname, param)
@@ -18855,7 +19214,7 @@ PixelTransformParameterfEXT(target, pname, param)
 	param		param		Float32 in value
 	category	EXT_pixel_transform
 	version		1.1
-	glxropcode	?
+	glxropcode	16385
 	offset		?
 
 PixelTransformParameterivEXT(target, pname, params)
@@ -18878,6 +19237,32 @@ PixelTransformParameterfvEXT(target, pname, params)
 	glxropcode	?
 	offset		?
 
+GetPixelTransformParameterivEXT(target, pname, params)
+	return		void
+	param		target		GLenum in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	EXT_pixel_transform
+	dlflags		notlistable
+	version		1.1
+	extension
+	glxvendorpriv	2052
+	glxflags	ignore
+	offset		?
+
+GetPixelTransformParameterfvEXT(target, pname, params)
+	return		void
+	param		target		GLenum in value
+	param		pname		GLenum in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	EXT_pixel_transform
+	dlflags		notlistable
+	version		1.1
+	extension
+	glxvendorpriv	2051
+	glxflags	ignore
+	offset		?
+
 ###############################################################################
 #
 # Extension #139
@@ -20326,7 +20711,7 @@ VertexWeightfvEXT(weight)
 
 VertexWeightPointerEXT(size, type, stride, pointer)
 	return		void
-	param		size		SizeI in value
+	param		size		Int32 in value
 	param		type		VertexWeightPointerTypeEXT in value
 	param		stride		SizeI in value
 	param		pointer		Void in array [COMPSIZE(type/stride)] retained
@@ -32720,7 +33105,7 @@ VDPAUFiniNV()
 
 VDPAURegisterVideoSurfaceNV(vdpSurface, target, numTextureNames, textureNames)
 	return		vdpauSurfaceNV
-	param		vdpSurface	Void out reference
+	param		vdpSurface	Void in reference
 	param		target		GLenum in value
 	param		numTextureNames SizeI in value
 	param		textureNames	UInt32 in array [numTextureNames]
@@ -33810,7 +34195,7 @@ IsImageHandleResidentNV(handle)
 # (none)
 newcategory: NV_shader_atomic_float
 
-###############################################################################
+[###############################################################################
 #
 # Extension #420
 # AMD_query_buffer_object commands
@@ -33819,3 +34204,44 @@ newcategory: NV_shader_atomic_float
 
 # (none)
 newcategory: AMD_query_buffer_object
+
+###############################################################################
+#
+# Extension #421
+# AMD_sparse_texture commands
+#
+###############################################################################
+
+TexStorageSparseAMD(target, internalFormat, width, height, depth, layers, flags)
+	return		void
+	param		target		GLenum in value
+	param		internalFormat	GLenum in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		layers		SizeI in value
+	param		flags		GLbitfield in value
+	category	AMD_sparse_texture
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TextureStorageSparseAMD(texture, target, internalFormat, width, height, depth, layers, flags)
+	return		void
+	param		texture		UInt32 in value
+	param		target		GLenum in value
+	param		internalFormat	GLenum in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		layers		SizeI in value
+	param		flags		GLbitfield in value
+	category	AMD_sparse_texture
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
diff --git a/xorg-server/hw/xwin/swrastwgl_dri/gl.spec b/xorg-server/hw/xwin/swrastwgl_dri/gl.spec
index 890a38338..55e2d3b4c 100644
--- a/xorg-server/hw/xwin/swrastwgl_dri/gl.spec
+++ b/xorg-server/hw/xwin/swrastwgl_dri/gl.spec
@@ -7,7 +7,7 @@
 # This document is licensed under the SGI Free Software B License Version
 # 2.0. For details, see http://oss.sgi.com/projects/FreeB/ .
 #
-# $Revision: 18818 $ on $Date: 2012-08-06 02:01:57 -0700 (Mon, 06 Aug 2012) $
+# $Revision: 19329 $ on $Date: 2012-09-28 12:26:05 -0700 (Fri, 28 Sep 2012) $
 
 required-props:
 # Description of a parameter
@@ -22,12 +22,12 @@ vectorequiv:	*
 # early GL 1.0 functions, later functions just have a core version
 # (e.g. VERSION_major_minor) or extension name for the category.
 category: display-list drawing drawing-control feedback framebuf misc modeling pixel-op pixel-rw state-req xform
-category: VERSION_1_0 VERSION_1_0_DEPRECATED VERSION_1_1 VERSION_1_1_DEPRECATED VERSION_1_2 VERSION_1_2_DEPRECATED VERSION_1_3 VERSION_1_3_DEPRECATED VERSION_1_4 VERSION_1_4_DEPRECATED VERSION_1_5 VERSION_2_0 VERSION_2_1 VERSION_3_0 VERSION_3_0_DEPRECATED VERSION_3_1 VERSION_3_2 VERSION_3_3 VERSION_4_0 VERSION_4_1 VERSION_4_1_DEPRECATED VERSION_4_2 VERSION_4_3
+category: VERSION_1_0 VERSION_1_1 VERSION_1_2 VERSION_1_3 VERSION_1_4 VERSION_1_5 VERSION_2_0 VERSION_2_1 VERSION_3_0 VERSION_3_1 VERSION_3_2 VERSION_3_3 VERSION_4_0 VERSION_4_1 VERSION_4_2 VERSION_4_3
 category: 3DFX_tbuffer
-category: AMD_conservative_depth AMD_debug_output AMD_draw_buffers_blend AMD_multi_draw_indirect AMD_name_gen_delete AMD_performance_monitor AMD_sample_positions AMD_stencil_operation_extended AMD_vertex_shader_tesselator
+category: AMD_conservative_depth AMD_debug_output AMD_draw_buffers_blend AMD_multi_draw_indirect AMD_name_gen_delete AMD_performance_monitor AMD_sample_positions AMD_sparse_texture AMD_stencil_operation_extended AMD_vertex_shader_tesselator
 category: APPLE_aux_depth_stencil APPLE_element_array APPLE_fence APPLE_float_pixels APPLE_flush_buffer_range APPLE_object_purgeable APPLE_row_bytes APPLE_texture_range APPLE_vertex_array_object APPLE_vertex_array_range APPLE_vertex_program_evaluators
 category: ARB_ES2_compatibility ARB_base_instance ARB_blend_func_extended ARB_cl_event ARB_color_buffer_float ARB_copy_buffer ARB_debug_output ARB_depth_buffer_float ARB_draw_buffers ARB_draw_buffers_blend ARB_draw_elements_base_vertex ARB_draw_indirect ARB_draw_instanced ARB_fragment_program ARB_fragment_shader ARB_framebuffer_object ARB_framebuffer_sRGB ARB_geometry_shader4 ARB_get_program_binary ARB_gpu_shader_fp64 ARB_half_float_vertex ARB_instanced_arrays ARB_internalformat_query ARB_map_buffer_range ARB_matrix_palette ARB_multisample ARB_multitexture ARB_occlusion_query ARB_point_parameters ARB_provoking_vertex ARB_robustness ARB_sample_shading ARB_sampler_objects ARB_separate_shader_objects ARB_shader_atomic_counters ARB_shader_image_load_store ARB_shader_objects ARB_shader_subroutine ARB_shading_language_include ARB_sync ARB_tessellation_shader ARB_texture_buffer_object ARB_texture_compression ARB_texture_compression_rgtc ARB_texture_multisample ARB_texture_rectangle ARB_texture_rg ARB_texture_storage ARB_timer_query ARB_transform_feedback2 ARB_transform_feedback3 ARB_transform_feedback_instanced ARB_transpose_matrix ARB_uniform_buffer_object ARB_vertex_array_object ARB_vertex_attrib_64bit ARB_vertex_blend ARB_vertex_buffer_object ARB_vertex_program ARB_vertex_shader ARB_vertex_type_2_10_10_10_rev ARB_viewport_array ARB_window_pos
-category: ARB_clear_buffer_object ARB_compute_shader ARB_copy_image ARB_debug_group ARB_debug_label ARB_debug_output ARB_framebuffer_no_attachments ARB_internalformat_query2 ARB_invalidate_subdata ARB_multi_draw_indirect ARB_program_interface_query ARB_shader_storage_buffer_object ARB_texture_buffer_range ARB_texture_storage_multisample ARB_texture_view ARB_vertex_attrib_binding
+category: ARB_clear_buffer_object ARB_compute_shader ARB_copy_image ARB_framebuffer_no_attachments ARB_internalformat_query2 ARB_invalidate_subdata ARB_multi_draw_indirect ARB_program_interface_query ARB_shader_storage_buffer_object ARB_texture_buffer_range ARB_texture_storage_multisample ARB_texture_view ARB_vertex_attrib_binding
 category: ATI_draw_buffers ATI_draw_buffers ATI_element_array ATI_envmap_bumpmap ATI_fragment_shader ATI_map_object_buffer ATI_meminfo ATI_pn_triangles ATI_separate_stencil ATI_texture_env_combine3 ATI_texture_float ATI_vertex_array_object ATI_vertex_attrib_array_object ATI_vertex_streams
 category: EXT_bindable_uniform EXT_blend_color EXT_blend_equation_separate EXT_blend_func_separate EXT_blend_minmax EXT_color_subtable EXT_compiled_vertex_array EXT_convolution EXT_coordinate_frame EXT_copy_texture EXT_cull_vertex EXT_depth_bounds_test EXT_direct_state_access EXT_draw_buffers2 EXT_draw_instanced EXT_draw_range_elements EXT_fog_coord EXT_framebuffer_blit EXT_framebuffer_multisample EXT_framebuffer_object EXT_geometry_shader4 EXT_gpu_program_parameters EXT_gpu_shader4 EXT_histogram EXT_index_func EXT_index_material EXT_light_texture EXT_multi_draw_arrays EXT_multisample EXT_paletted_texture EXT_pixel_transform EXT_point_parameters EXT_polygon_offset EXT_provoking_vertex EXT_secondary_color EXT_separate_shader_objects EXT_shader_image_load_store EXT_stencil_clear_tag EXT_stencil_two_side EXT_subtexture EXT_texture3D EXT_texture_buffer_object EXT_texture_integer EXT_texture_object EXT_texture_perturb_normal EXT_texture_snorm EXT_texture_swizzle EXT_timer_query EXT_transform_feedback EXT_vertex_array EXT_vertex_array_bgra EXT_vertex_attrib_64bit EXT_vertex_shader EXT_vertex_weighting EXT_x11_sync_object
 category: GREMEDY_frame_terminator GREMEDY_string_marker
@@ -67,6 +67,9 @@ category: SUNX_constant_data SUN_global_alpha SUN_mesh_array SUN_triangle_list S
 version:	1.0 1.1 1.2 1.3 1.4 1.5 2.0 2.1 3.0 3.1 3.2 3.3 4.0 4.1 4.2 4.3
 # Core version in which a function was removed
 deprecated:	3.1
+# API profile - should only be compatibility since there are no core-only
+# functions for now.
+profile:	compatibility
 # GLX Single, Rendering, or Vendor Private opcode
 glxsingle:	*
 glxropcode:	*
@@ -794,7 +797,8 @@ NewList(list, mode)
 	param		list		List in value
 	param		mode		ListMode in value
 	dlflags		notlistable
-	category	VERSION_1_0_DEPRECATED	   # old: display-list
+	category	VERSION_1_0		   # old: display-list
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxsingle	101
@@ -804,7 +808,8 @@ NewList(list, mode)
 EndList()
 	return		void
 	dlflags		notlistable
-	category	VERSION_1_0_DEPRECATED	   # old: display-list
+	category	VERSION_1_0		   # old: display-list
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxsingle	102
@@ -814,7 +819,8 @@ EndList()
 CallList(list)
 	return		void
 	param		list		List in value
-	category	VERSION_1_0_DEPRECATED	   # old: display-list
+	category	VERSION_1_0		   # old: display-list
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	1
@@ -825,8 +831,9 @@ CallLists(n, type, lists)
 	param		n		SizeI in value
 	param		type		ListNameType in value
 	param		lists		Void in array [COMPSIZE(n/type)]
-	category	VERSION_1_0_DEPRECATED	   # old: display-list
+	category	VERSION_1_0		   # old: display-list
 	glxflags	client-handcode server-handcode
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	2
@@ -837,7 +844,8 @@ DeleteLists(list, range)
 	param		list		List in value
 	param		range		SizeI in value
 	dlflags		notlistable
-	category	VERSION_1_0_DEPRECATED	   # old: display-list
+	category	VERSION_1_0		   # old: display-list
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxsingle	103
@@ -848,7 +856,8 @@ GenLists(range)
 	return		List
 	param		range		SizeI in value
 	dlflags		notlistable
-	category	VERSION_1_0_DEPRECATED	   # old: display-list
+	category	VERSION_1_0		   # old: display-list
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxsingle	104
@@ -857,7 +866,8 @@ GenLists(range)
 ListBase(base)
 	return		void
 	param		base		List in value
-	category	VERSION_1_0_DEPRECATED	   # old: display-list
+	category	VERSION_1_0		   # old: display-list
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	3
@@ -868,7 +878,8 @@ ListBase(base)
 Begin(mode)
 	return		void
 	param		mode		BeginMode in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	4
@@ -883,9 +894,10 @@ Bitmap(width, height, xorig, yorig, xmove, ymove, bitmap)
 	param		xmove		CoordF in value
 	param		ymove		CoordF in value
 	param		bitmap		UInt8 in array [COMPSIZE(width/height)]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	dlflags		handcode
 	glxflags	client-handcode server-handcode
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	5
@@ -897,8 +909,9 @@ Color3b(red, green, blue)
 	param		red		ColorB in value
 	param		green		ColorB in value
 	param		blue		ColorB in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Color3bv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		9
@@ -906,7 +919,8 @@ Color3b(red, green, blue)
 Color3bv(v)
 	return		void
 	param		v		ColorB in array [3]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	6
@@ -917,8 +931,9 @@ Color3d(red, green, blue)
 	param		red		ColorD in value
 	param		green		ColorD in value
 	param		blue		ColorD in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Color3dv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		11
@@ -926,7 +941,8 @@ Color3d(red, green, blue)
 Color3dv(v)
 	return		void
 	param		v		ColorD in array [3]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	7
@@ -937,8 +953,9 @@ Color3f(red, green, blue)
 	param		red		ColorF in value
 	param		green		ColorF in value
 	param		blue		ColorF in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Color3fv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		13
@@ -946,7 +963,8 @@ Color3f(red, green, blue)
 Color3fv(v)
 	return		void
 	param		v		ColorF in array [3]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	8
@@ -957,8 +975,9 @@ Color3i(red, green, blue)
 	param		red		ColorI in value
 	param		green		ColorI in value
 	param		blue		ColorI in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Color3iv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		15
@@ -966,7 +985,8 @@ Color3i(red, green, blue)
 Color3iv(v)
 	return		void
 	param		v		ColorI in array [3]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	9
@@ -977,8 +997,9 @@ Color3s(red, green, blue)
 	param		red		ColorS in value
 	param		green		ColorS in value
 	param		blue		ColorS in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Color3sv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		17
@@ -986,7 +1007,8 @@ Color3s(red, green, blue)
 Color3sv(v)
 	return		void
 	param		v		ColorS in array [3]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	10
@@ -997,8 +1019,9 @@ Color3ub(red, green, blue)
 	param		red		ColorUB in value
 	param		green		ColorUB in value
 	param		blue		ColorUB in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Color3ubv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		19
@@ -1006,7 +1029,8 @@ Color3ub(red, green, blue)
 Color3ubv(v)
 	return		void
 	param		v		ColorUB in array [3]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	11
@@ -1017,8 +1041,9 @@ Color3ui(red, green, blue)
 	param		red		ColorUI in value
 	param		green		ColorUI in value
 	param		blue		ColorUI in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Color3uiv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		21
@@ -1026,7 +1051,8 @@ Color3ui(red, green, blue)
 Color3uiv(v)
 	return		void
 	param		v		ColorUI in array [3]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	12
@@ -1037,8 +1063,9 @@ Color3us(red, green, blue)
 	param		red		ColorUS in value
 	param		green		ColorUS in value
 	param		blue		ColorUS in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Color3usv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		23
@@ -1046,7 +1073,8 @@ Color3us(red, green, blue)
 Color3usv(v)
 	return		void
 	param		v		ColorUS in array [3]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	13
@@ -1058,8 +1086,9 @@ Color4b(red, green, blue, alpha)
 	param		green		ColorB in value
 	param		blue		ColorB in value
 	param		alpha		ColorB in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Color4bv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		25
@@ -1067,7 +1096,8 @@ Color4b(red, green, blue, alpha)
 Color4bv(v)
 	return		void
 	param		v		ColorB in array [4]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	14
@@ -1079,8 +1109,9 @@ Color4d(red, green, blue, alpha)
 	param		green		ColorD in value
 	param		blue		ColorD in value
 	param		alpha		ColorD in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Color4dv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		27
@@ -1088,7 +1119,8 @@ Color4d(red, green, blue, alpha)
 Color4dv(v)
 	return		void
 	param		v		ColorD in array [4]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	15
@@ -1100,8 +1132,9 @@ Color4f(red, green, blue, alpha)
 	param		green		ColorF in value
 	param		blue		ColorF in value
 	param		alpha		ColorF in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Color4fv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		29
@@ -1109,7 +1142,8 @@ Color4f(red, green, blue, alpha)
 Color4fv(v)
 	return		void
 	param		v		ColorF in array [4]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	16
@@ -1121,8 +1155,9 @@ Color4i(red, green, blue, alpha)
 	param		green		ColorI in value
 	param		blue		ColorI in value
 	param		alpha		ColorI in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Color4iv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		31
@@ -1130,7 +1165,8 @@ Color4i(red, green, blue, alpha)
 Color4iv(v)
 	return		void
 	param		v		ColorI in array [4]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	17
@@ -1142,8 +1178,9 @@ Color4s(red, green, blue, alpha)
 	param		green		ColorS in value
 	param		blue		ColorS in value
 	param		alpha		ColorS in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Color4sv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		33
@@ -1151,7 +1188,8 @@ Color4s(red, green, blue, alpha)
 Color4sv(v)
 	return		void
 	param		v		ColorS in array [4]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	18
@@ -1163,8 +1201,9 @@ Color4ub(red, green, blue, alpha)
 	param		green		ColorUB in value
 	param		blue		ColorUB in value
 	param		alpha		ColorUB in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Color4ubv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		35
@@ -1172,7 +1211,8 @@ Color4ub(red, green, blue, alpha)
 Color4ubv(v)
 	return		void
 	param		v		ColorUB in array [4]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	19
@@ -1184,8 +1224,9 @@ Color4ui(red, green, blue, alpha)
 	param		green		ColorUI in value
 	param		blue		ColorUI in value
 	param		alpha		ColorUI in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Color4uiv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		37
@@ -1193,7 +1234,8 @@ Color4ui(red, green, blue, alpha)
 Color4uiv(v)
 	return		void
 	param		v		ColorUI in array [4]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	20
@@ -1205,8 +1247,9 @@ Color4us(red, green, blue, alpha)
 	param		green		ColorUS in value
 	param		blue		ColorUS in value
 	param		alpha		ColorUS in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Color4usv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		39
@@ -1214,7 +1257,8 @@ Color4us(red, green, blue, alpha)
 Color4usv(v)
 	return		void
 	param		v		ColorUS in array [4]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	21
@@ -1223,8 +1267,9 @@ Color4usv(v)
 EdgeFlag(flag)
 	return		void
 	param		flag		Boolean in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	EdgeFlagv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		41
@@ -1232,7 +1277,8 @@ EdgeFlag(flag)
 EdgeFlagv(flag)
 	return		void
 	param		flag		Boolean in reference
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	22
@@ -1240,7 +1286,8 @@ EdgeFlagv(flag)
 
 End()
 	return		void
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	23
@@ -1249,8 +1296,9 @@ End()
 Indexd(c)
 	return		void
 	param		c		ColorIndexValueD in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Indexdv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		44
@@ -1258,7 +1306,8 @@ Indexd(c)
 Indexdv(c)
 	return		void
 	param		c		ColorIndexValueD in array [1]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	24
@@ -1267,8 +1316,9 @@ Indexdv(c)
 Indexf(c)
 	return		void
 	param		c		ColorIndexValueF in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Indexfv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		46
@@ -1276,7 +1326,8 @@ Indexf(c)
 Indexfv(c)
 	return		void
 	param		c		ColorIndexValueF in array [1]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	25
@@ -1285,8 +1336,9 @@ Indexfv(c)
 Indexi(c)
 	return		void
 	param		c		ColorIndexValueI in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Indexiv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		48
@@ -1294,7 +1346,8 @@ Indexi(c)
 Indexiv(c)
 	return		void
 	param		c		ColorIndexValueI in array [1]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	26
@@ -1303,8 +1356,9 @@ Indexiv(c)
 Indexs(c)
 	return		void
 	param		c		ColorIndexValueS in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Indexsv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		50
@@ -1312,7 +1366,8 @@ Indexs(c)
 Indexsv(c)
 	return		void
 	param		c		ColorIndexValueS in array [1]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	27
@@ -1323,8 +1378,9 @@ Normal3b(nx, ny, nz)
 	param		nx		Int8 in value
 	param		ny		Int8 in value
 	param		nz		Int8 in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Normal3bv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		52
@@ -1332,7 +1388,8 @@ Normal3b(nx, ny, nz)
 Normal3bv(v)
 	return		void
 	param		v		Int8 in array [3]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	28
@@ -1343,8 +1400,9 @@ Normal3d(nx, ny, nz)
 	param		nx		CoordD in value
 	param		ny		CoordD in value
 	param		nz		CoordD in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Normal3dv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		54
@@ -1352,7 +1410,8 @@ Normal3d(nx, ny, nz)
 Normal3dv(v)
 	return		void
 	param		v		CoordD in array [3]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	29
@@ -1363,8 +1422,9 @@ Normal3f(nx, ny, nz)
 	param		nx		CoordF in value
 	param		ny		CoordF in value
 	param		nz		CoordF in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Normal3fv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		56
@@ -1372,7 +1432,8 @@ Normal3f(nx, ny, nz)
 Normal3fv(v)
 	return		void
 	param		v		CoordF in array [3]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	30
@@ -1383,8 +1444,9 @@ Normal3i(nx, ny, nz)
 	param		nx		Int32 in value
 	param		ny		Int32 in value
 	param		nz		Int32 in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Normal3iv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		58
@@ -1392,7 +1454,8 @@ Normal3i(nx, ny, nz)
 Normal3iv(v)
 	return		void
 	param		v		Int32 in array [3]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	31
@@ -1403,8 +1466,9 @@ Normal3s(nx, ny, nz)
 	param		nx		Int16 in value
 	param		ny		Int16 in value
 	param		nz		Int16 in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Normal3sv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		60
@@ -1412,7 +1476,8 @@ Normal3s(nx, ny, nz)
 Normal3sv(v)
 	return		void
 	param		v		Int16 in array [3]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	32
@@ -1422,8 +1487,9 @@ RasterPos2d(x, y)
 	return		void
 	param		x		CoordD in value
 	param		y		CoordD in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	RasterPos2dv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		62
@@ -1431,7 +1497,8 @@ RasterPos2d(x, y)
 RasterPos2dv(v)
 	return		void
 	param		v		CoordD in array [2]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	33
@@ -1441,8 +1508,9 @@ RasterPos2f(x, y)
 	return		void
 	param		x		CoordF in value
 	param		y		CoordF in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	RasterPos2fv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		64
@@ -1450,7 +1518,8 @@ RasterPos2f(x, y)
 RasterPos2fv(v)
 	return		void
 	param		v		CoordF in array [2]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	34
@@ -1460,8 +1529,9 @@ RasterPos2i(x, y)
 	return		void
 	param		x		CoordI in value
 	param		y		CoordI in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	RasterPos2iv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		66
@@ -1469,7 +1539,8 @@ RasterPos2i(x, y)
 RasterPos2iv(v)
 	return		void
 	param		v		CoordI in array [2]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	35
@@ -1479,8 +1550,9 @@ RasterPos2s(x, y)
 	return		void
 	param		x		CoordS in value
 	param		y		CoordS in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	RasterPos2sv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		68
@@ -1488,7 +1560,8 @@ RasterPos2s(x, y)
 RasterPos2sv(v)
 	return		void
 	param		v		CoordS in array [2]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	36
@@ -1500,7 +1573,8 @@ RasterPos3d(x, y, z)
 	param		y		CoordD in value
 	param		z		CoordD in value
 	vectorequiv	RasterPos3dv
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		70
@@ -1508,7 +1582,8 @@ RasterPos3d(x, y, z)
 RasterPos3dv(v)
 	return		void
 	param		v		CoordD in array [3]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	37
@@ -1519,8 +1594,9 @@ RasterPos3f(x, y, z)
 	param		x		CoordF in value
 	param		y		CoordF in value
 	param		z		CoordF in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	RasterPos3fv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		72
@@ -1528,7 +1604,8 @@ RasterPos3f(x, y, z)
 RasterPos3fv(v)
 	return		void
 	param		v		CoordF in array [3]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	38
@@ -1539,8 +1616,9 @@ RasterPos3i(x, y, z)
 	param		x		CoordI in value
 	param		y		CoordI in value
 	param		z		CoordI in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	RasterPos3iv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		74
@@ -1548,7 +1626,8 @@ RasterPos3i(x, y, z)
 RasterPos3iv(v)
 	return		void
 	param		v		CoordI in array [3]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	39
@@ -1559,8 +1638,9 @@ RasterPos3s(x, y, z)
 	param		x		CoordS in value
 	param		y		CoordS in value
 	param		z		CoordS in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	RasterPos3sv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		76
@@ -1568,7 +1648,8 @@ RasterPos3s(x, y, z)
 RasterPos3sv(v)
 	return		void
 	param		v		CoordS in array [3]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	40
@@ -1581,7 +1662,8 @@ RasterPos4d(x, y, z, w)
 	param		z		CoordD in value
 	param		w		CoordD in value
 	vectorequiv	RasterPos4dv
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		78
@@ -1589,7 +1671,8 @@ RasterPos4d(x, y, z, w)
 RasterPos4dv(v)
 	return		void
 	param		v		CoordD in array [4]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	41
@@ -1601,8 +1684,9 @@ RasterPos4f(x, y, z, w)
 	param		y		CoordF in value
 	param		z		CoordF in value
 	param		w		CoordF in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	RasterPos4fv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		80
@@ -1610,7 +1694,8 @@ RasterPos4f(x, y, z, w)
 RasterPos4fv(v)
 	return		void
 	param		v		CoordF in array [4]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	42
@@ -1622,8 +1707,9 @@ RasterPos4i(x, y, z, w)
 	param		y		CoordI in value
 	param		z		CoordI in value
 	param		w		CoordI in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	RasterPos4iv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		82
@@ -1631,7 +1717,8 @@ RasterPos4i(x, y, z, w)
 RasterPos4iv(v)
 	return		void
 	param		v		CoordI in array [4]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	43
@@ -1643,8 +1730,9 @@ RasterPos4s(x, y, z, w)
 	param		y		CoordS in value
 	param		z		CoordS in value
 	param		w		CoordS in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	RasterPos4sv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		84
@@ -1652,7 +1740,8 @@ RasterPos4s(x, y, z, w)
 RasterPos4sv(v)
 	return		void
 	param		v		CoordS in array [4]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	44
@@ -1664,8 +1753,9 @@ Rectd(x1, y1, x2, y2)
 	param		y1		CoordD in value
 	param		x2		CoordD in value
 	param		y2		CoordD in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Rectdv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		86
@@ -1674,7 +1764,8 @@ Rectdv(v1, v2)
 	return		void
 	param		v1		CoordD in array [2]
 	param		v2		CoordD in array [2]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	45
@@ -1686,8 +1777,9 @@ Rectf(x1, y1, x2, y2)
 	param		y1		CoordF in value
 	param		x2		CoordF in value
 	param		y2		CoordF in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Rectfv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		88
@@ -1696,7 +1788,8 @@ Rectfv(v1, v2)
 	return		void
 	param		v1		CoordF in array [2]
 	param		v2		CoordF in array [2]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	46
@@ -1708,8 +1801,9 @@ Recti(x1, y1, x2, y2)
 	param		y1		CoordI in value
 	param		x2		CoordI in value
 	param		y2		CoordI in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Rectiv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		90
@@ -1718,7 +1812,8 @@ Rectiv(v1, v2)
 	return		void
 	param		v1		CoordI in array [2]
 	param		v2		CoordI in array [2]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	47
@@ -1730,8 +1825,9 @@ Rects(x1, y1, x2, y2)
 	param		y1		CoordS in value
 	param		x2		CoordS in value
 	param		y2		CoordS in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Rectsv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		92
@@ -1740,7 +1836,8 @@ Rectsv(v1, v2)
 	return		void
 	param		v1		CoordS in array [2]
 	param		v2		CoordS in array [2]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	48
@@ -1749,8 +1846,9 @@ Rectsv(v1, v2)
 TexCoord1d(s)
 	return		void
 	param		s		CoordD in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	TexCoord1dv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		94
@@ -1758,7 +1856,8 @@ TexCoord1d(s)
 TexCoord1dv(v)
 	return		void
 	param		v		CoordD in array [1]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	49
@@ -1767,8 +1866,9 @@ TexCoord1dv(v)
 TexCoord1f(s)
 	return		void
 	param		s		CoordF in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	TexCoord1fv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		96
@@ -1776,7 +1876,8 @@ TexCoord1f(s)
 TexCoord1fv(v)
 	return		void
 	param		v		CoordF in array [1]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	50
@@ -1785,8 +1886,9 @@ TexCoord1fv(v)
 TexCoord1i(s)
 	return		void
 	param		s		CoordI in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	TexCoord1iv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		98
@@ -1794,7 +1896,8 @@ TexCoord1i(s)
 TexCoord1iv(v)
 	return		void
 	param		v		CoordI in array [1]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	51
@@ -1803,8 +1906,9 @@ TexCoord1iv(v)
 TexCoord1s(s)
 	return		void
 	param		s		CoordS in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	TexCoord1sv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		100
@@ -1812,7 +1916,8 @@ TexCoord1s(s)
 TexCoord1sv(v)
 	return		void
 	param		v		CoordS in array [1]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	52
@@ -1822,8 +1927,9 @@ TexCoord2d(s, t)
 	return		void
 	param		s		CoordD in value
 	param		t		CoordD in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	TexCoord2dv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		102
@@ -1831,7 +1937,8 @@ TexCoord2d(s, t)
 TexCoord2dv(v)
 	return		void
 	param		v		CoordD in array [2]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	53
@@ -1841,8 +1948,9 @@ TexCoord2f(s, t)
 	return		void
 	param		s		CoordF in value
 	param		t		CoordF in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	TexCoord2fv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		104
@@ -1850,7 +1958,8 @@ TexCoord2f(s, t)
 TexCoord2fv(v)
 	return		void
 	param		v		CoordF in array [2]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	54
@@ -1860,8 +1969,9 @@ TexCoord2i(s, t)
 	return		void
 	param		s		CoordI in value
 	param		t		CoordI in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	TexCoord2iv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		106
@@ -1869,7 +1979,8 @@ TexCoord2i(s, t)
 TexCoord2iv(v)
 	return		void
 	param		v		CoordI in array [2]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	55
@@ -1879,8 +1990,9 @@ TexCoord2s(s, t)
 	return		void
 	param		s		CoordS in value
 	param		t		CoordS in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	TexCoord2sv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		108
@@ -1888,7 +2000,8 @@ TexCoord2s(s, t)
 TexCoord2sv(v)
 	return		void
 	param		v		CoordS in array [2]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	56
@@ -1899,8 +2012,9 @@ TexCoord3d(s, t, r)
 	param		s		CoordD in value
 	param		t		CoordD in value
 	param		r		CoordD in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	TexCoord3dv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		110
@@ -1908,7 +2022,8 @@ TexCoord3d(s, t, r)
 TexCoord3dv(v)
 	return		void
 	param		v		CoordD in array [3]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	57
@@ -1919,8 +2034,9 @@ TexCoord3f(s, t, r)
 	param		s		CoordF in value
 	param		t		CoordF in value
 	param		r		CoordF in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	TexCoord3fv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		112
@@ -1928,7 +2044,8 @@ TexCoord3f(s, t, r)
 TexCoord3fv(v)
 	return		void
 	param		v		CoordF in array [3]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	58
@@ -1939,8 +2056,9 @@ TexCoord3i(s, t, r)
 	param		s		CoordI in value
 	param		t		CoordI in value
 	param		r		CoordI in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	TexCoord3iv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		114
@@ -1948,7 +2066,8 @@ TexCoord3i(s, t, r)
 TexCoord3iv(v)
 	return		void
 	param		v		CoordI in array [3]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	59
@@ -1959,8 +2078,9 @@ TexCoord3s(s, t, r)
 	param		s		CoordS in value
 	param		t		CoordS in value
 	param		r		CoordS in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	TexCoord3sv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		116
@@ -1968,7 +2088,8 @@ TexCoord3s(s, t, r)
 TexCoord3sv(v)
 	return		void
 	param		v		CoordS in array [3]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	60
@@ -1980,8 +2101,9 @@ TexCoord4d(s, t, r, q)
 	param		t		CoordD in value
 	param		r		CoordD in value
 	param		q		CoordD in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	TexCoord4dv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		118
@@ -1989,7 +2111,8 @@ TexCoord4d(s, t, r, q)
 TexCoord4dv(v)
 	return		void
 	param		v		CoordD in array [4]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	61
@@ -2001,8 +2124,9 @@ TexCoord4f(s, t, r, q)
 	param		t		CoordF in value
 	param		r		CoordF in value
 	param		q		CoordF in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	TexCoord4fv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		120
@@ -2010,7 +2134,8 @@ TexCoord4f(s, t, r, q)
 TexCoord4fv(v)
 	return		void
 	param		v		CoordF in array [4]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	62
@@ -2022,8 +2147,9 @@ TexCoord4i(s, t, r, q)
 	param		t		CoordI in value
 	param		r		CoordI in value
 	param		q		CoordI in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	TexCoord4iv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		122
@@ -2031,7 +2157,8 @@ TexCoord4i(s, t, r, q)
 TexCoord4iv(v)
 	return		void
 	param		v		CoordI in array [4]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	63
@@ -2043,8 +2170,9 @@ TexCoord4s(s, t, r, q)
 	param		t		CoordS in value
 	param		r		CoordS in value
 	param		q		CoordS in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	TexCoord4sv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		124
@@ -2052,7 +2180,8 @@ TexCoord4s(s, t, r, q)
 TexCoord4sv(v)
 	return		void
 	param		v		CoordS in array [4]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	64
@@ -2062,8 +2191,9 @@ Vertex2d(x, y)
 	return		void
 	param		x		CoordD in value
 	param		y		CoordD in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Vertex2dv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		126
@@ -2071,7 +2201,8 @@ Vertex2d(x, y)
 Vertex2dv(v)
 	return		void
 	param		v		CoordD in array [2]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	65
@@ -2081,8 +2212,9 @@ Vertex2f(x, y)
 	return		void
 	param		x		CoordF in value
 	param		y		CoordF in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Vertex2fv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		128
@@ -2090,7 +2222,8 @@ Vertex2f(x, y)
 Vertex2fv(v)
 	return		void
 	param		v		CoordF in array [2]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	66
@@ -2100,8 +2233,9 @@ Vertex2i(x, y)
 	return		void
 	param		x		CoordI in value
 	param		y		CoordI in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Vertex2iv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		130
@@ -2109,7 +2243,8 @@ Vertex2i(x, y)
 Vertex2iv(v)
 	return		void
 	param		v		CoordI in array [2]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	67
@@ -2119,8 +2254,9 @@ Vertex2s(x, y)
 	return		void
 	param		x		CoordS in value
 	param		y		CoordS in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Vertex2sv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		132
@@ -2128,7 +2264,8 @@ Vertex2s(x, y)
 Vertex2sv(v)
 	return		void
 	param		v		CoordS in array [2]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	68
@@ -2139,8 +2276,9 @@ Vertex3d(x, y, z)
 	param		x		CoordD in value
 	param		y		CoordD in value
 	param		z		CoordD in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Vertex3dv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		134
@@ -2148,7 +2286,8 @@ Vertex3d(x, y, z)
 Vertex3dv(v)
 	return		void
 	param		v		CoordD in array [3]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	69
@@ -2159,8 +2298,9 @@ Vertex3f(x, y, z)
 	param		x		CoordF in value
 	param		y		CoordF in value
 	param		z		CoordF in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Vertex3fv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		136
@@ -2168,7 +2308,8 @@ Vertex3f(x, y, z)
 Vertex3fv(v)
 	return		void
 	param		v		CoordF in array [3]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	70
@@ -2179,8 +2320,9 @@ Vertex3i(x, y, z)
 	param		x		CoordI in value
 	param		y		CoordI in value
 	param		z		CoordI in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Vertex3iv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		138
@@ -2188,7 +2330,8 @@ Vertex3i(x, y, z)
 Vertex3iv(v)
 	return		void
 	param		v		CoordI in array [3]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	71
@@ -2199,8 +2342,9 @@ Vertex3s(x, y, z)
 	param		x		CoordS in value
 	param		y		CoordS in value
 	param		z		CoordS in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Vertex3sv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		140
@@ -2208,7 +2352,8 @@ Vertex3s(x, y, z)
 Vertex3sv(v)
 	return		void
 	param		v		CoordS in array [3]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	72
@@ -2220,8 +2365,9 @@ Vertex4d(x, y, z, w)
 	param		y		CoordD in value
 	param		z		CoordD in value
 	param		w		CoordD in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Vertex4dv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		142
@@ -2229,7 +2375,8 @@ Vertex4d(x, y, z, w)
 Vertex4dv(v)
 	return		void
 	param		v		CoordD in array [4]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	73
@@ -2241,8 +2388,9 @@ Vertex4f(x, y, z, w)
 	param		y		CoordF in value
 	param		z		CoordF in value
 	param		w		CoordF in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Vertex4fv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		144
@@ -2250,7 +2398,8 @@ Vertex4f(x, y, z, w)
 Vertex4fv(v)
 	return		void
 	param		v		CoordF in array [4]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	74
@@ -2262,8 +2411,9 @@ Vertex4i(x, y, z, w)
 	param		y		CoordI in value
 	param		z		CoordI in value
 	param		w		CoordI in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Vertex4iv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		146
@@ -2271,7 +2421,8 @@ Vertex4i(x, y, z, w)
 Vertex4iv(v)
 	return		void
 	param		v		CoordI in array [4]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	75
@@ -2283,8 +2434,9 @@ Vertex4s(x, y, z, w)
 	param		y		CoordS in value
 	param		z		CoordS in value
 	param		w		CoordS in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
 	vectorequiv	Vertex4sv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		148
@@ -2292,7 +2444,8 @@ Vertex4s(x, y, z, w)
 Vertex4sv(v)
 	return		void
 	param		v		CoordS in array [4]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing
+	category	VERSION_1_0		   # old: drawing
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	76
@@ -2302,7 +2455,8 @@ ClipPlane(plane, equation)
 	return		void
 	param		plane		ClipPlaneName in value
 	param		equation	Float64 in array [4]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	77
@@ -2312,7 +2466,8 @@ ColorMaterial(face, mode)
 	return		void
 	param		face		MaterialFace in value
 	param		mode		ColorMaterialParameter in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	78
@@ -2322,7 +2477,8 @@ Fogf(pname, param)
 	return		void
 	param		pname		FogParameter in value
 	param		param		CheckedFloat32 in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	80
@@ -2333,7 +2489,8 @@ Fogfv(pname, params)
 	return		void
 	param		pname		FogParameter in value
 	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	81
@@ -2344,7 +2501,8 @@ Fogi(pname, param)
 	return		void
 	param		pname		FogParameter in value
 	param		param		CheckedInt32 in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	82
@@ -2355,7 +2513,8 @@ Fogiv(pname, params)
 	return		void
 	param		pname		FogParameter in value
 	param		params		CheckedInt32 in array [COMPSIZE(pname)]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	83
@@ -2367,7 +2526,8 @@ Lightf(light, pname, param)
 	param		light		LightName in value
 	param		pname		LightParameter in value
 	param		param		CheckedFloat32 in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	86
@@ -2379,7 +2539,8 @@ Lightfv(light, pname, params)
 	param		light		LightName in value
 	param		pname		LightParameter in value
 	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	87
@@ -2391,7 +2552,8 @@ Lighti(light, pname, param)
 	param		light		LightName in value
 	param		pname		LightParameter in value
 	param		param		CheckedInt32 in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	88
@@ -2403,7 +2565,8 @@ Lightiv(light, pname, params)
 	param		light		LightName in value
 	param		pname		LightParameter in value
 	param		params		CheckedInt32 in array [COMPSIZE(pname)]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	89
@@ -2414,7 +2577,8 @@ LightModelf(pname, param)
 	return		void
 	param		pname		LightModelParameter in value
 	param		param		Float32 in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	90
@@ -2425,7 +2589,8 @@ LightModelfv(pname, params)
 	return		void
 	param		pname		LightModelParameter in value
 	param		params		Float32 in array [COMPSIZE(pname)]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	91
@@ -2436,7 +2601,8 @@ LightModeli(pname, param)
 	return		void
 	param		pname		LightModelParameter in value
 	param		param		Int32 in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	92
@@ -2447,7 +2613,8 @@ LightModeliv(pname, params)
 	return		void
 	param		pname		LightModelParameter in value
 	param		params		Int32 in array [COMPSIZE(pname)]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	93
@@ -2458,7 +2625,8 @@ LineStipple(factor, pattern)
 	return		void
 	param		factor		CheckedInt32 in value
 	param		pattern		LineStipple in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	94
@@ -2469,7 +2637,8 @@ Materialf(face, pname, param)
 	param		face		MaterialFace in value
 	param		pname		MaterialParameter in value
 	param		param		CheckedFloat32 in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	96
@@ -2481,7 +2650,8 @@ Materialfv(face, pname, params)
 	param		face		MaterialFace in value
 	param		pname		MaterialParameter in value
 	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	97
@@ -2493,7 +2663,8 @@ Materiali(face, pname, param)
 	param		face		MaterialFace in value
 	param		pname		MaterialParameter in value
 	param		param		CheckedInt32 in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	98
@@ -2505,7 +2676,8 @@ Materialiv(face, pname, params)
 	param		face		MaterialFace in value
 	param		pname		MaterialParameter in value
 	param		params		CheckedInt32 in array [COMPSIZE(pname)]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	99
@@ -2515,9 +2687,10 @@ Materialiv(face, pname, params)
 PolygonStipple(mask)
 	return		void
 	param		mask		UInt8 in array [COMPSIZE()]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
 	dlflags		handcode
 	glxflags	client-handcode server-handcode
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	102
@@ -2527,7 +2700,8 @@ PolygonStipple(mask)
 ShadeModel(mode)
 	return		void
 	param		mode		ShadingModel in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	104
@@ -2538,7 +2712,8 @@ TexEnvf(target, pname, param)
 	param		target		TextureEnvTarget in value
 	param		pname		TextureEnvParameter in value
 	param		param		CheckedFloat32 in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	111
@@ -2550,7 +2725,8 @@ TexEnvfv(target, pname, params)
 	param		target		TextureEnvTarget in value
 	param		pname		TextureEnvParameter in value
 	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	112
@@ -2562,7 +2738,8 @@ TexEnvi(target, pname, param)
 	param		target		TextureEnvTarget in value
 	param		pname		TextureEnvParameter in value
 	param		param		CheckedInt32 in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	113
@@ -2574,7 +2751,8 @@ TexEnviv(target, pname, params)
 	param		target		TextureEnvTarget in value
 	param		pname		TextureEnvParameter in value
 	param		params		CheckedInt32 in array [COMPSIZE(pname)]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	114
@@ -2586,7 +2764,8 @@ TexGend(coord, pname, param)
 	param		coord		TextureCoordName in value
 	param		pname		TextureGenParameter in value
 	param		param		Float64 in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	115
@@ -2598,7 +2777,8 @@ TexGendv(coord, pname, params)
 	param		coord		TextureCoordName in value
 	param		pname		TextureGenParameter in value
 	param		params		Float64 in array [COMPSIZE(pname)]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	116
@@ -2610,7 +2790,8 @@ TexGenf(coord, pname, param)
 	param		coord		TextureCoordName in value
 	param		pname		TextureGenParameter in value
 	param		param		CheckedFloat32 in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	117
@@ -2622,7 +2803,8 @@ TexGenfv(coord, pname, params)
 	param		coord		TextureCoordName in value
 	param		pname		TextureGenParameter in value
 	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	118
@@ -2634,7 +2816,8 @@ TexGeni(coord, pname, param)
 	param		coord		TextureCoordName in value
 	param		pname		TextureGenParameter in value
 	param		param		CheckedInt32 in value
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	119
@@ -2646,7 +2829,8 @@ TexGeniv(coord, pname, params)
 	param		coord		TextureCoordName in value
 	param		pname		TextureGenParameter in value
 	param		params		CheckedInt32 in array [COMPSIZE(pname)]
-	category	VERSION_1_0_DEPRECATED	   # old: drawing-control
+	category	VERSION_1_0		   # old: drawing-control
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	120
@@ -2662,7 +2846,8 @@ FeedbackBuffer(size, type, buffer)
 	param		buffer		FeedbackElement out array [size] retained
 	dlflags		notlistable
 	glxflags	client-handcode server-handcode
-	category	VERSION_1_0_DEPRECATED	   # old: feedback
+	category	VERSION_1_0		   # old: feedback
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxsingle	105
@@ -2675,7 +2860,8 @@ SelectBuffer(size, buffer)
 	param		buffer		SelectName out array [size] retained
 	dlflags		notlistable
 	glxflags	client-handcode server-handcode
-	category	VERSION_1_0_DEPRECATED	   # old: feedback
+	category	VERSION_1_0		   # old: feedback
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxsingle	106
@@ -2685,9 +2871,10 @@ SelectBuffer(size, buffer)
 RenderMode(mode)
 	return		Int32
 	param		mode		RenderingMode in value
-	category	VERSION_1_0_DEPRECATED	   # old: feedback
+	category	VERSION_1_0		   # old: feedback
 	dlflags		notlistable
 	glxflags	client-handcode server-handcode
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxsingle	107
@@ -2696,7 +2883,8 @@ RenderMode(mode)
 
 InitNames()
 	return		void
-	category	VERSION_1_0_DEPRECATED	   # old: feedback
+	category	VERSION_1_0		   # old: feedback
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	121
@@ -2705,7 +2893,8 @@ InitNames()
 LoadName(name)
 	return		void
 	param		name		SelectName in value
-	category	VERSION_1_0_DEPRECATED	   # old: feedback
+	category	VERSION_1_0		   # old: feedback
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	122
@@ -2714,7 +2903,8 @@ LoadName(name)
 PassThrough(token)
 	return		void
 	param		token		FeedbackElement in value
-	category	VERSION_1_0_DEPRECATED	   # old: feedback
+	category	VERSION_1_0		   # old: feedback
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	123
@@ -2722,7 +2912,8 @@ PassThrough(token)
 
 PopName()
 	return		void
-	category	VERSION_1_0_DEPRECATED	   # old: feedback
+	category	VERSION_1_0		   # old: feedback
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	124
@@ -2731,7 +2922,8 @@ PopName()
 PushName(name)
 	return		void
 	param		name		SelectName in value
-	category	VERSION_1_0_DEPRECATED	   # old: feedback
+	category	VERSION_1_0		   # old: feedback
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	125
@@ -2743,7 +2935,8 @@ ClearAccum(red, green, blue, alpha)
 	param		green		Float32 in value
 	param		blue		Float32 in value
 	param		alpha		Float32 in value
-	category	VERSION_1_0_DEPRECATED	   # old: framebuf
+	category	VERSION_1_0		   # old: framebuf
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	128
@@ -2752,7 +2945,8 @@ ClearAccum(red, green, blue, alpha)
 ClearIndex(c)
 	return		void
 	param		c		MaskedColorIndexValueF in value
-	category	VERSION_1_0_DEPRECATED	   # old: framebuf
+	category	VERSION_1_0		   # old: framebuf
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	129
@@ -2761,7 +2955,8 @@ ClearIndex(c)
 IndexMask(mask)
 	return		void
 	param		mask		MaskedColorIndexValueI in value
-	category	VERSION_1_0_DEPRECATED	   # old: framebuf
+	category	VERSION_1_0		   # old: framebuf
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	136
@@ -2771,7 +2966,8 @@ Accum(op, value)
 	return		void
 	param		op		AccumOp in value
 	param		value		CoordF in value
-	category	VERSION_1_0_DEPRECATED	   # old: misc
+	category	VERSION_1_0		   # old: misc
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	137
@@ -2779,7 +2975,8 @@ Accum(op, value)
 
 PopAttrib()
 	return		void
-	category	VERSION_1_0_DEPRECATED	   # old: misc
+	category	VERSION_1_0		   # old: misc
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	141
@@ -2788,7 +2985,8 @@ PopAttrib()
 PushAttrib(mask)
 	return		void
 	param		mask		AttribMask in value
-	category	VERSION_1_0_DEPRECATED	   # old: misc
+	category	VERSION_1_0		   # old: misc
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	142
@@ -2804,9 +3002,10 @@ Map1d(target, u1, u2, stride, order, points)
 	param		stride		Int32 in value
 	param		order		CheckedInt32 in value
 	param		points		CoordD in array [COMPSIZE(target/stride/order)]
-	category	VERSION_1_0_DEPRECATED	   # old: modeling
+	category	VERSION_1_0		   # old: modeling
 	dlflags		handcode
 	glxflags	client-handcode server-handcode
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	143
@@ -2821,9 +3020,10 @@ Map1f(target, u1, u2, stride, order, points)
 	param		stride		Int32 in value
 	param		order		CheckedInt32 in value
 	param		points		CoordF in array [COMPSIZE(target/stride/order)]
-	category	VERSION_1_0_DEPRECATED	   # old: modeling
+	category	VERSION_1_0		   # old: modeling
 	dlflags		handcode
 	glxflags	client-handcode server-handcode
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	144
@@ -2842,9 +3042,10 @@ Map2d(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points)
 	param		vstride		Int32 in value
 	param		vorder		CheckedInt32 in value
 	param		points		CoordD in array [COMPSIZE(target/ustride/uorder/vstride/vorder)]
-	category	VERSION_1_0_DEPRECATED	   # old: modeling
+	category	VERSION_1_0		   # old: modeling
 	dlflags		handcode
 	glxflags	client-handcode server-handcode
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	145
@@ -2863,9 +3064,10 @@ Map2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points)
 	param		vstride		Int32 in value
 	param		vorder		CheckedInt32 in value
 	param		points		CoordF in array [COMPSIZE(target/ustride/uorder/vstride/vorder)]
-	category	VERSION_1_0_DEPRECATED	   # old: modeling
+	category	VERSION_1_0		   # old: modeling
 	dlflags		handcode
 	glxflags	client-handcode server-handcode
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	146
@@ -2877,7 +3079,8 @@ MapGrid1d(un, u1, u2)
 	param		un		Int32 in value
 	param		u1		CoordD in value
 	param		u2		CoordD in value
-	category	VERSION_1_0_DEPRECATED	   # old: modeling
+	category	VERSION_1_0		   # old: modeling
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	147
@@ -2888,7 +3091,8 @@ MapGrid1f(un, u1, u2)
 	param		un		Int32 in value
 	param		u1		CoordF in value
 	param		u2		CoordF in value
-	category	VERSION_1_0_DEPRECATED	   # old: modeling
+	category	VERSION_1_0		   # old: modeling
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	148
@@ -2902,7 +3106,8 @@ MapGrid2d(un, u1, u2, vn, v1, v2)
 	param		vn		Int32 in value
 	param		v1		CoordD in value
 	param		v2		CoordD in value
-	category	VERSION_1_0_DEPRECATED	   # old: modeling
+	category	VERSION_1_0		   # old: modeling
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	149
@@ -2916,7 +3121,8 @@ MapGrid2f(un, u1, u2, vn, v1, v2)
 	param		vn		Int32 in value
 	param		v1		CoordF in value
 	param		v2		CoordF in value
-	category	VERSION_1_0_DEPRECATED	   # old: modeling
+	category	VERSION_1_0		   # old: modeling
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	150
@@ -2925,8 +3131,9 @@ MapGrid2f(un, u1, u2, vn, v1, v2)
 EvalCoord1d(u)
 	return		void
 	param		u		CoordD in value
-	category	VERSION_1_0_DEPRECATED	   # old: modeling
+	category	VERSION_1_0		   # old: modeling
 	vectorequiv	EvalCoord1dv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		228
@@ -2934,7 +3141,8 @@ EvalCoord1d(u)
 EvalCoord1dv(u)
 	return		void
 	param		u		CoordD in array [1]
-	category	VERSION_1_0_DEPRECATED	   # old: modeling
+	category	VERSION_1_0		   # old: modeling
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	151
@@ -2943,8 +3151,9 @@ EvalCoord1dv(u)
 EvalCoord1f(u)
 	return		void
 	param		u		CoordF in value
-	category	VERSION_1_0_DEPRECATED	   # old: modeling
+	category	VERSION_1_0		   # old: modeling
 	vectorequiv	EvalCoord1fv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		230
@@ -2952,7 +3161,8 @@ EvalCoord1f(u)
 EvalCoord1fv(u)
 	return		void
 	param		u		CoordF in array [1]
-	category	VERSION_1_0_DEPRECATED	   # old: modeling
+	category	VERSION_1_0		   # old: modeling
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	152
@@ -2962,8 +3172,9 @@ EvalCoord2d(u, v)
 	return		void
 	param		u		CoordD in value
 	param		v		CoordD in value
-	category	VERSION_1_0_DEPRECATED	   # old: modeling
+	category	VERSION_1_0		   # old: modeling
 	vectorequiv	EvalCoord2dv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		232
@@ -2971,7 +3182,8 @@ EvalCoord2d(u, v)
 EvalCoord2dv(u)
 	return		void
 	param		u		CoordD in array [2]
-	category	VERSION_1_0_DEPRECATED	   # old: modeling
+	category	VERSION_1_0		   # old: modeling
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	153
@@ -2981,8 +3193,9 @@ EvalCoord2f(u, v)
 	return		void
 	param		u		CoordF in value
 	param		v		CoordF in value
-	category	VERSION_1_0_DEPRECATED	   # old: modeling
+	category	VERSION_1_0		   # old: modeling
 	vectorequiv	EvalCoord2fv
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	offset		234
@@ -2990,7 +3203,8 @@ EvalCoord2f(u, v)
 EvalCoord2fv(u)
 	return		void
 	param		u		CoordF in array [2]
-	category	VERSION_1_0_DEPRECATED	   # old: modeling
+	category	VERSION_1_0		   # old: modeling
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	154
@@ -3001,7 +3215,8 @@ EvalMesh1(mode, i1, i2)
 	param		mode		MeshMode1 in value
 	param		i1		CheckedInt32 in value
 	param		i2		CheckedInt32 in value
-	category	VERSION_1_0_DEPRECATED	   # old: modeling
+	category	VERSION_1_0		   # old: modeling
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	155
@@ -3010,7 +3225,8 @@ EvalMesh1(mode, i1, i2)
 EvalPoint1(i)
 	return		void
 	param		i		Int32 in value
-	category	VERSION_1_0_DEPRECATED	   # old: modeling
+	category	VERSION_1_0		   # old: modeling
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	156
@@ -3023,7 +3239,8 @@ EvalMesh2(mode, i1, i2, j1, j2)
 	param		i2		CheckedInt32 in value
 	param		j1		CheckedInt32 in value
 	param		j2		CheckedInt32 in value
-	category	VERSION_1_0_DEPRECATED	   # old: modeling
+	category	VERSION_1_0		   # old: modeling
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	157
@@ -3033,7 +3250,8 @@ EvalPoint2(i, j)
 	return		void
 	param		i		CheckedInt32 in value
 	param		j		CheckedInt32 in value
-	category	VERSION_1_0_DEPRECATED	   # old: modeling
+	category	VERSION_1_0		   # old: modeling
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	158
@@ -3043,7 +3261,8 @@ AlphaFunc(func, ref)
 	return		void
 	param		func		AlphaFunction in value
 	param		ref		Float32 in value
-	category	VERSION_1_0_DEPRECATED	   # old: pixel-op
+	category	VERSION_1_0		   # old: pixel-op
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	159
@@ -3053,7 +3272,8 @@ PixelZoom(xfactor, yfactor)
 	return		void
 	param		xfactor		Float32 in value
 	param		yfactor		Float32 in value
-	category	VERSION_1_0_DEPRECATED	   # old: pixel-rw
+	category	VERSION_1_0		   # old: pixel-rw
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	165
@@ -3063,7 +3283,8 @@ PixelTransferf(pname, param)
 	return		void
 	param		pname		PixelTransferParameter in value
 	param		param		CheckedFloat32 in value
-	category	VERSION_1_0_DEPRECATED	   # old: pixel-rw
+	category	VERSION_1_0		   # old: pixel-rw
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	166
@@ -3073,7 +3294,8 @@ PixelTransferi(pname, param)
 	return		void
 	param		pname		PixelTransferParameter in value
 	param		param		CheckedInt32 in value
-	category	VERSION_1_0_DEPRECATED	   # old: pixel-rw
+	category	VERSION_1_0		   # old: pixel-rw
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	167
@@ -3084,8 +3306,9 @@ PixelMapfv(map, mapsize, values)
 	param		map		PixelMap in value
 	param		mapsize		CheckedInt32 in value
 	param		values		Float32 in array [mapsize]
-	category	VERSION_1_0_DEPRECATED	   # old: pixel-rw
+	category	VERSION_1_0		   # old: pixel-rw
 	glxflags	client-handcode
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	168
@@ -3096,8 +3319,9 @@ PixelMapuiv(map, mapsize, values)
 	param		map		PixelMap in value
 	param		mapsize		CheckedInt32 in value
 	param		values		UInt32 in array [mapsize]
-	category	VERSION_1_0_DEPRECATED	   # old: pixel-rw
+	category	VERSION_1_0		   # old: pixel-rw
 	glxflags	client-handcode
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	169
@@ -3108,8 +3332,9 @@ PixelMapusv(map, mapsize, values)
 	param		map		PixelMap in value
 	param		mapsize		CheckedInt32 in value
 	param		values		UInt16 in array [mapsize]
-	category	VERSION_1_0_DEPRECATED	   # old: pixel-rw
+	category	VERSION_1_0		   # old: pixel-rw
 	glxflags	client-handcode
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	170
@@ -3122,7 +3347,8 @@ CopyPixels(x, y, width, height, type)
 	param		width		SizeI in value
 	param		height		SizeI in value
 	param		type		PixelCopyType in value
-	category	VERSION_1_0_DEPRECATED	   # old: pixel-rw
+	category	VERSION_1_0		   # old: pixel-rw
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	172
@@ -3135,9 +3361,10 @@ DrawPixels(width, height, format, type, pixels)
 	param		format		PixelFormat in value
 	param		type		PixelType in value
 	param		pixels		Void in array [COMPSIZE(format/type/width/height)]
-	category	VERSION_1_0_DEPRECATED	   # old: pixel-rw
+	category	VERSION_1_0		   # old: pixel-rw
 	dlflags		handcode
 	glxflags	client-handcode server-handcode
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	173
@@ -3148,8 +3375,9 @@ GetClipPlane(plane, equation)
 	return		void
 	param		plane		ClipPlaneName in value
 	param		equation	Float64 out array [4]
-	category	VERSION_1_0_DEPRECATED	   # old: state-req
+	category	VERSION_1_0		   # old: state-req
 	dlflags		notlistable
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxsingle	113
@@ -3161,8 +3389,9 @@ GetLightfv(light, pname, params)
 	param		light		LightName in value
 	param		pname		LightParameter in value
 	param		params		Float32 out array [COMPSIZE(pname)]
-	category	VERSION_1_0_DEPRECATED	   # old: state-req
+	category	VERSION_1_0		   # old: state-req
 	dlflags		notlistable
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxsingle	118
@@ -3174,8 +3403,9 @@ GetLightiv(light, pname, params)
 	param		light		LightName in value
 	param		pname		LightParameter in value
 	param		params		Int32 out array [COMPSIZE(pname)]
-	category	VERSION_1_0_DEPRECATED	   # old: state-req
+	category	VERSION_1_0		   # old: state-req
 	dlflags		notlistable
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxsingle	119
@@ -3187,8 +3417,9 @@ GetMapdv(target, query, v)
 	param		target		MapTarget in value
 	param		query		GetMapQuery in value
 	param		v		Float64 out array [COMPSIZE(target/query)]
-	category	VERSION_1_0_DEPRECATED	   # old: state-req
+	category	VERSION_1_0		   # old: state-req
 	dlflags		notlistable
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxsingle	120
@@ -3199,8 +3430,9 @@ GetMapfv(target, query, v)
 	param		target		MapTarget in value
 	param		query		GetMapQuery in value
 	param		v		Float32 out array [COMPSIZE(target/query)]
-	category	VERSION_1_0_DEPRECATED	   # old: state-req
+	category	VERSION_1_0		   # old: state-req
 	dlflags		notlistable
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxsingle	121
@@ -3211,8 +3443,9 @@ GetMapiv(target, query, v)
 	param		target		MapTarget in value
 	param		query		GetMapQuery in value
 	param		v		Int32 out array [COMPSIZE(target/query)]
-	category	VERSION_1_0_DEPRECATED	   # old: state-req
+	category	VERSION_1_0		   # old: state-req
 	dlflags		notlistable
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxsingle	122
@@ -3223,8 +3456,9 @@ GetMaterialfv(face, pname, params)
 	param		face		MaterialFace in value
 	param		pname		MaterialParameter in value
 	param		params		Float32 out array [COMPSIZE(pname)]
-	category	VERSION_1_0_DEPRECATED	   # old: state-req
+	category	VERSION_1_0		   # old: state-req
 	dlflags		notlistable
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxsingle	123
@@ -3236,8 +3470,9 @@ GetMaterialiv(face, pname, params)
 	param		face		MaterialFace in value
 	param		pname		MaterialParameter in value
 	param		params		Int32 out array [COMPSIZE(pname)]
-	category	VERSION_1_0_DEPRECATED	   # old: state-req
+	category	VERSION_1_0		   # old: state-req
 	dlflags		notlistable
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxsingle	124
@@ -3248,8 +3483,9 @@ GetPixelMapfv(map, values)
 	return		void
 	param		map		PixelMap in value
 	param		values		Float32 out array [COMPSIZE(map)]
-	category	VERSION_1_0_DEPRECATED	   # old: state-req
+	category	VERSION_1_0		   # old: state-req
 	dlflags		notlistable
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxsingle	125
@@ -3259,8 +3495,9 @@ GetPixelMapuiv(map, values)
 	return		void
 	param		map		PixelMap in value
 	param		values		UInt32 out array [COMPSIZE(map)]
-	category	VERSION_1_0_DEPRECATED	   # old: state-req
+	category	VERSION_1_0		   # old: state-req
 	dlflags		notlistable
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxsingle	126
@@ -3270,8 +3507,9 @@ GetPixelMapusv(map, values)
 	return		void
 	param		map		PixelMap in value
 	param		values		UInt16 out array [COMPSIZE(map)]
-	category	VERSION_1_0_DEPRECATED	   # old: state-req
+	category	VERSION_1_0		   # old: state-req
 	dlflags		notlistable
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxsingle	127
@@ -3280,9 +3518,10 @@ GetPixelMapusv(map, values)
 GetPolygonStipple(mask)
 	return		void
 	param		mask		UInt8 out array [COMPSIZE()]
-	category	VERSION_1_0_DEPRECATED	   # old: state-req
+	category	VERSION_1_0		   # old: state-req
 	dlflags		notlistable
 	glxflags	client-handcode server-handcode
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxsingle	128
@@ -3294,8 +3533,9 @@ GetTexEnvfv(target, pname, params)
 	param		target		TextureEnvTarget in value
 	param		pname		TextureEnvParameter in value
 	param		params		Float32 out array [COMPSIZE(pname)]
-	category	VERSION_1_0_DEPRECATED	   # old: state-req
+	category	VERSION_1_0		   # old: state-req
 	dlflags		notlistable
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxsingle	130
@@ -3307,8 +3547,9 @@ GetTexEnviv(target, pname, params)
 	param		target		TextureEnvTarget in value
 	param		pname		TextureEnvParameter in value
 	param		params		Int32 out array [COMPSIZE(pname)]
-	category	VERSION_1_0_DEPRECATED	   # old: state-req
+	category	VERSION_1_0		   # old: state-req
 	dlflags		notlistable
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxsingle	131
@@ -3320,8 +3561,9 @@ GetTexGendv(coord, pname, params)
 	param		coord		TextureCoordName in value
 	param		pname		TextureGenParameter in value
 	param		params		Float64 out array [COMPSIZE(pname)]
-	category	VERSION_1_0_DEPRECATED	   # old: state-req
+	category	VERSION_1_0		   # old: state-req
 	dlflags		notlistable
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxsingle	132
@@ -3333,8 +3575,9 @@ GetTexGenfv(coord, pname, params)
 	param		coord		TextureCoordName in value
 	param		pname		TextureGenParameter in value
 	param		params		Float32 out array [COMPSIZE(pname)]
-	category	VERSION_1_0_DEPRECATED	   # old: state-req
+	category	VERSION_1_0		   # old: state-req
 	dlflags		notlistable
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxsingle	133
@@ -3346,8 +3589,9 @@ GetTexGeniv(coord, pname, params)
 	param		coord		TextureCoordName in value
 	param		pname		TextureGenParameter in value
 	param		params		Int32 out array [COMPSIZE(pname)]
-	category	VERSION_1_0_DEPRECATED	   # old: state-req
+	category	VERSION_1_0		   # old: state-req
 	dlflags		notlistable
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxsingle	134
@@ -3357,8 +3601,9 @@ GetTexGeniv(coord, pname, params)
 IsList(list)
 	return		Boolean
 	param		list		List in value
-	category	VERSION_1_0_DEPRECATED	   # old: state-req
+	category	VERSION_1_0		   # old: state-req
 	dlflags		notlistable
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxsingle	141
@@ -3372,7 +3617,8 @@ Frustum(left, right, bottom, top, zNear, zFar)
 	param		top		Float64 in value
 	param		zNear		Float64 in value
 	param		zFar		Float64 in value
-	category	VERSION_1_0_DEPRECATED	   # old: xform
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	175
@@ -3380,7 +3626,8 @@ Frustum(left, right, bottom, top, zNear, zFar)
 
 LoadIdentity()
 	return		void
-	category	VERSION_1_0_DEPRECATED	   # old: xform
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	176
@@ -3389,7 +3636,8 @@ LoadIdentity()
 LoadMatrixf(m)
 	return		void
 	param		m		Float32 in array [16]
-	category	VERSION_1_0_DEPRECATED	   # old: xform
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	177
@@ -3398,7 +3646,8 @@ LoadMatrixf(m)
 LoadMatrixd(m)
 	return		void
 	param		m		Float64 in array [16]
-	category	VERSION_1_0_DEPRECATED	   # old: xform
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	178
@@ -3407,7 +3656,8 @@ LoadMatrixd(m)
 MatrixMode(mode)
 	return		void
 	param		mode		MatrixMode in value
-	category	VERSION_1_0_DEPRECATED	   # old: xform
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	179
@@ -3416,7 +3666,8 @@ MatrixMode(mode)
 MultMatrixf(m)
 	return		void
 	param		m		Float32 in array [16]
-	category	VERSION_1_0_DEPRECATED	   # old: xform
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	180
@@ -3425,7 +3676,8 @@ MultMatrixf(m)
 MultMatrixd(m)
 	return		void
 	param		m		Float64 in array [16]
-	category	VERSION_1_0_DEPRECATED	   # old: xform
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	181
@@ -3439,7 +3691,8 @@ Ortho(left, right, bottom, top, zNear, zFar)
 	param		top		Float64 in value
 	param		zNear		Float64 in value
 	param		zFar		Float64 in value
-	category	VERSION_1_0_DEPRECATED	   # old: xform
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	182
@@ -3447,7 +3700,8 @@ Ortho(left, right, bottom, top, zNear, zFar)
 
 PopMatrix()
 	return		void
-	category	VERSION_1_0_DEPRECATED	   # old: xform
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	183
@@ -3455,7 +3709,8 @@ PopMatrix()
 
 PushMatrix()
 	return		void
-	category	VERSION_1_0_DEPRECATED	   # old: xform
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	184
@@ -3467,7 +3722,8 @@ Rotated(angle, x, y, z)
 	param		x		Float64 in value
 	param		y		Float64 in value
 	param		z		Float64 in value
-	category	VERSION_1_0_DEPRECATED	   # old: xform
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	185
@@ -3479,7 +3735,8 @@ Rotatef(angle, x, y, z)
 	param		x		Float32 in value
 	param		y		Float32 in value
 	param		z		Float32 in value
-	category	VERSION_1_0_DEPRECATED	   # old: xform
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	186
@@ -3490,7 +3747,8 @@ Scaled(x, y, z)
 	param		x		Float64 in value
 	param		y		Float64 in value
 	param		z		Float64 in value
-	category	VERSION_1_0_DEPRECATED	   # old: xform
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	187
@@ -3501,7 +3759,8 @@ Scalef(x, y, z)
 	param		x		Float32 in value
 	param		y		Float32 in value
 	param		z		Float32 in value
-	category	VERSION_1_0_DEPRECATED	   # old: xform
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	188
@@ -3512,7 +3771,8 @@ Translated(x, y, z)
 	param		x		Float64 in value
 	param		y		Float64 in value
 	param		z		Float64 in value
-	category	VERSION_1_0_DEPRECATED	   # old: xform
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	189
@@ -3523,7 +3783,8 @@ Translatef(x, y, z)
 	param		x		Float32 in value
 	param		y		Float32 in value
 	param		z		Float32 in value
-	category	VERSION_1_0_DEPRECATED	   # old: xform
+	category	VERSION_1_0		   # old: xform
+	profile		compatibility
 	version		1.0
 	deprecated	3.1
 	glxropcode	190
@@ -3727,7 +3988,8 @@ IsTexture(texture)
 ArrayElement(i)
 	return		void
 	param		i		Int32 in value
-	category	VERSION_1_1_DEPRECATED
+	category	VERSION_1_1
+	profile		compatibility
 	dlflags		handcode
 	glxflags	client-handcode client-intercept server-handcode
 	version		1.1
@@ -3740,7 +4002,8 @@ ColorPointer(size, type, stride, pointer)
 	param		type		ColorPointerType in value
 	param		stride		SizeI in value
 	param		pointer		Void in array [COMPSIZE(size/type/stride)] retained
-	category	VERSION_1_1_DEPRECATED
+	category	VERSION_1_1
+	profile		compatibility
 	dlflags		notlistable
 	glxflags	client-handcode client-intercept server-handcode
 	version		1.1
@@ -3750,7 +4013,8 @@ ColorPointer(size, type, stride, pointer)
 DisableClientState(array)
 	return		void
 	param		array		EnableCap in value
-	category	VERSION_1_1_DEPRECATED
+	category	VERSION_1_1
+	profile		compatibility
 	version		1.1
 	deprecated	3.1
 	dlflags		notlistable
@@ -3761,7 +4025,8 @@ EdgeFlagPointer(stride, pointer)
 	return		void
 	param		stride		SizeI in value
 	param		pointer		Void in array [COMPSIZE(stride)] retained
-	category	VERSION_1_1_DEPRECATED
+	category	VERSION_1_1
+	profile		compatibility
 	dlflags		notlistable
 	glxflags	client-handcode client-intercept server-handcode
 	version		1.1
@@ -3771,7 +4036,8 @@ EdgeFlagPointer(stride, pointer)
 EnableClientState(array)
 	return		void
 	param		array		EnableCap in value
-	category	VERSION_1_1_DEPRECATED
+	category	VERSION_1_1
+	profile		compatibility
 	dlflags		notlistable
 	glxflags	client-handcode client-intercept server-handcode
 	version		1.1
@@ -3783,7 +4049,8 @@ IndexPointer(type, stride, pointer)
 	param		type		IndexPointerType in value
 	param		stride		SizeI in value
 	param		pointer		Void in array [COMPSIZE(type/stride)] retained
-	category	VERSION_1_1_DEPRECATED
+	category	VERSION_1_1
+	profile		compatibility
 	dlflags		notlistable
 	glxflags	client-handcode client-intercept server-handcode
 	version		1.1
@@ -3795,7 +4062,8 @@ InterleavedArrays(format, stride, pointer)
 	param		format		InterleavedArrayFormat in value
 	param		stride		SizeI in value
 	param		pointer		Void in array [COMPSIZE(format/stride)] retained
-	category	VERSION_1_1_DEPRECATED
+	category	VERSION_1_1
+	profile		compatibility
 	dlflags		notlistable
 	glxflags	client-handcode client-intercept server-handcode
 	version		1.1
@@ -3807,7 +4075,8 @@ NormalPointer(type, stride, pointer)
 	param		type		NormalPointerType in value
 	param		stride		SizeI in value
 	param		pointer		Void in array [COMPSIZE(type/stride)] retained
-	category	VERSION_1_1_DEPRECATED
+	category	VERSION_1_1
+	profile		compatibility
 	dlflags		notlistable
 	glxflags	client-handcode client-intercept server-handcode
 	version		1.1
@@ -3820,7 +4089,8 @@ TexCoordPointer(size, type, stride, pointer)
 	param		type		TexCoordPointerType in value
 	param		stride		SizeI in value
 	param		pointer		Void in array [COMPSIZE(size/type/stride)] retained
-	category	VERSION_1_1_DEPRECATED
+	category	VERSION_1_1
+	profile		compatibility
 	dlflags		notlistable
 	glxflags	client-handcode client-intercept server-handcode
 	version		1.1
@@ -3833,7 +4103,8 @@ VertexPointer(size, type, stride, pointer)
 	param		type		VertexPointerType in value
 	param		stride		SizeI in value
 	param		pointer		Void in array [COMPSIZE(size/type/stride)] retained
-	category	VERSION_1_1_DEPRECATED
+	category	VERSION_1_1
+	profile		compatibility
 	dlflags		notlistable
 	glxflags	client-handcode client-intercept server-handcode
 	version		1.1
@@ -3845,7 +4116,8 @@ AreTexturesResident(n, textures, residences)
 	param		n		SizeI in value
 	param		textures	Texture in array [n]
 	param		residences	Boolean out array [n]
-	category	VERSION_1_1_DEPRECATED
+	category	VERSION_1_1
+	profile		compatibility
 	glxsingle	143
 	dlflags		notlistable
 	version		1.1
@@ -3857,7 +4129,8 @@ PrioritizeTextures(n, textures, priorities)
 	param		n		SizeI in value
 	param		textures	Texture in array [n]
 	param		priorities	Float32 in array [n]
-	category	VERSION_1_1_DEPRECATED
+	category	VERSION_1_1
+	profile		compatibility
 	version		1.1
 	deprecated	3.1
 	glxropcode	4118
@@ -3867,7 +4140,8 @@ PrioritizeTextures(n, textures, priorities)
 Indexub(c)
 	return		void
 	param		c		ColorIndexValueUB in value
-	category	VERSION_1_1_DEPRECATED
+	category	VERSION_1_1
+	profile		compatibility
 	vectorequiv	Indexubv
 	version		1.1
 	offset		315
@@ -3875,14 +4149,16 @@ Indexub(c)
 Indexubv(c)
 	return		void
 	param		c		ColorIndexValueUB in array [1]
-	category	VERSION_1_1_DEPRECATED
+	category	VERSION_1_1
+	profile		compatibility
 	version		1.1
 	glxropcode	194
 	offset		316
 
 PopClientAttrib()
 	return		void
-	category	VERSION_1_1_DEPRECATED
+	category	VERSION_1_1
+	profile		compatibility
 	version		1.1
 	deprecated	3.1
 	dlflags		notlistable
@@ -3892,7 +4168,8 @@ PopClientAttrib()
 PushClientAttrib(mask)
 	return		void
 	param		mask		ClientAttribMask in value
-	category	VERSION_1_1_DEPRECATED
+	category	VERSION_1_1
+	profile		compatibility
 	version		1.1
 	deprecated	3.1
 	dlflags		notlistable
@@ -4022,7 +4299,8 @@ ColorTable(target, internalformat, width, format, type, table)
 	param		format		PixelFormat in value
 	param		type		PixelType in value
 	param		table		Void in array [COMPSIZE(format/type/width)]
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	dlflags		handcode
 	glxflags	client-handcode server-handcode EXT
 	version		1.2
@@ -4035,7 +4313,8 @@ ColorTableParameterfv(target, pname, params)
 	param		target		ColorTableTarget in value
 	param		pname		ColorTableParameterPName in value
 	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	glxflags	EXT
 	version		1.2
 	deprecated	3.1
@@ -4047,7 +4326,8 @@ ColorTableParameteriv(target, pname, params)
 	param		target		ColorTableTarget in value
 	param		pname		ColorTableParameterPName in value
 	param		params		CheckedInt32 in array [COMPSIZE(pname)]
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	glxflags	EXT
 	version		1.2
 	deprecated	3.1
@@ -4061,7 +4341,8 @@ CopyColorTable(target, internalformat, x, y, width)
 	param		x		WinCoord in value
 	param		y		WinCoord in value
 	param		width		SizeI in value
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	glxflags	EXT
 	version		1.2
 	deprecated	3.1
@@ -4074,7 +4355,8 @@ GetColorTable(target, format, type, table)
 	param		format		PixelFormat in value
 	param		type		PixelType in value
 	param		table		Void out array [COMPSIZE(target/format/type)]
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	dlflags		notlistable
 	glxflags	client-handcode server-handcode
 	version		1.2
@@ -4087,7 +4369,8 @@ GetColorTableParameterfv(target, pname, params)
 	param		target		ColorTableTarget in value
 	param		pname		GetColorTableParameterPName in value
 	param		params		Float32 out array [COMPSIZE(pname)]
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	dlflags		notlistable
 	version		1.2
 	deprecated	3.1
@@ -4099,7 +4382,8 @@ GetColorTableParameteriv(target, pname, params)
 	param		target		ColorTableTarget in value
 	param		pname		GetColorTableParameterPName in value
 	param		params		Int32 out array [COMPSIZE(pname)]
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	dlflags		notlistable
 	version		1.2
 	deprecated	3.1
@@ -4116,7 +4400,8 @@ ColorSubTable(target, start, count, format, type, data)
 	param		format		PixelFormat in value
 	param		type		PixelType in value
 	param		data		Void in array [COMPSIZE(format/type/count)]
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	dlflags		handcode
 	glxflags	client-handcode server-handcode
 	version		1.2
@@ -4131,7 +4416,8 @@ CopyColorSubTable(target, start, x, y, width)
 	param		x		WinCoord in value
 	param		y		WinCoord in value
 	param		width		SizeI in value
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	version		1.2
 	deprecated	3.1
 	glxropcode	196
@@ -4147,7 +4433,8 @@ ConvolutionFilter1D(target, internalformat, width, format, type, image)
 	param		format		PixelFormat in value
 	param		type		PixelType in value
 	param		image		Void in array [COMPSIZE(format/type/width)]
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	dlflags		handcode
 	glxflags	client-handcode server-handcode EXT
 	version		1.2
@@ -4164,7 +4451,8 @@ ConvolutionFilter2D(target, internalformat, width, height, format, type, image)
 	param		format		PixelFormat in value
 	param		type		PixelType in value
 	param		image		Void in array [COMPSIZE(format/type/width/height)]
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	dlflags		handcode
 	glxflags	client-handcode server-handcode EXT
 	version		1.2
@@ -4177,7 +4465,8 @@ ConvolutionParameterf(target, pname, params)
 	param		target		ConvolutionTarget in value
 	param		pname		ConvolutionParameter in value
 	param		params		CheckedFloat32 in value
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	glxflags	EXT
 	version		1.2
 	deprecated	3.1
@@ -4189,7 +4478,8 @@ ConvolutionParameterfv(target, pname, params)
 	param		target		ConvolutionTarget in value
 	param		pname		ConvolutionParameter in value
 	param		params		CheckedFloat32 in array [COMPSIZE(pname)]
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	glxflags	EXT
 	version		1.2
 	deprecated	3.1
@@ -4201,7 +4491,8 @@ ConvolutionParameteri(target, pname, params)
 	param		target		ConvolutionTarget in value
 	param		pname		ConvolutionParameter in value
 	param		params		CheckedInt32 in value
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	glxflags	EXT
 	version		1.2
 	deprecated	3.1
@@ -4213,7 +4504,8 @@ ConvolutionParameteriv(target, pname, params)
 	param		target		ConvolutionTarget in value
 	param		pname		ConvolutionParameter in value
 	param		params		CheckedInt32 in array [COMPSIZE(pname)]
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	glxflags	EXT
 	version		1.2
 	deprecated	3.1
@@ -4227,7 +4519,8 @@ CopyConvolutionFilter1D(target, internalformat, x, y, width)
 	param		x		WinCoord in value
 	param		y		WinCoord in value
 	param		width		SizeI in value
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	glxflags	EXT
 	version		1.2
 	deprecated	3.1
@@ -4242,7 +4535,8 @@ CopyConvolutionFilter2D(target, internalformat, x, y, width, height)
 	param		y		WinCoord in value
 	param		width		SizeI in value
 	param		height		SizeI in value
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	glxflags	EXT
 	version		1.2
 	deprecated	3.1
@@ -4255,7 +4549,8 @@ GetConvolutionFilter(target, format, type, image)
 	param		format		PixelFormat in value
 	param		type		PixelType in value
 	param		image		Void out array [COMPSIZE(target/format/type)]
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	dlflags		notlistable
 	glxflags	client-handcode server-handcode
 	version		1.2
@@ -4268,7 +4563,8 @@ GetConvolutionParameterfv(target, pname, params)
 	param		target		ConvolutionTarget in value
 	param		pname		GetConvolutionParameterPName in value
 	param		params		Float32 out array [COMPSIZE(pname)]
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	dlflags		notlistable
 	version		1.2
 	deprecated	3.1
@@ -4280,7 +4576,8 @@ GetConvolutionParameteriv(target, pname, params)
 	param		target		ConvolutionTarget in value
 	param		pname		GetConvolutionParameterPName in value
 	param		params		Int32 out array [COMPSIZE(pname)]
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	dlflags		notlistable
 	version		1.2
 	deprecated	3.1
@@ -4295,7 +4592,8 @@ GetSeparableFilter(target, format, type, row, column, span)
 	param		row		Void out array [COMPSIZE(target/format/type)]
 	param		column		Void out array [COMPSIZE(target/format/type)]
 	param		span		Void out array [COMPSIZE(target/format/type)]
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	dlflags		notlistable
 	glxflags	client-handcode server-handcode
 	version		1.2
@@ -4313,7 +4611,8 @@ SeparableFilter2D(target, internalformat, width, height, format, type, row, colu
 	param		type		PixelType in value
 	param		row		Void in array [COMPSIZE(target/format/type/width)]
 	param		column		Void in array [COMPSIZE(target/format/type/height)]
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	dlflags		handcode
 	glxflags	client-handcode server-handcode EXT
 	version		1.2
@@ -4330,7 +4629,8 @@ GetHistogram(target, reset, format, type, values)
 	param		format		PixelFormat in value
 	param		type		PixelType in value
 	param		values		Void out array [COMPSIZE(target/format/type)]
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	dlflags		notlistable
 	glxflags	client-handcode server-handcode
 	version		1.2
@@ -4343,7 +4643,8 @@ GetHistogramParameterfv(target, pname, params)
 	param		target		HistogramTarget in value
 	param		pname		GetHistogramParameterPName in value
 	param		params		Float32 out array [COMPSIZE(pname)]
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	dlflags		notlistable
 	version		1.2
 	deprecated	3.1
@@ -4355,7 +4656,8 @@ GetHistogramParameteriv(target, pname, params)
 	param		target		HistogramTarget in value
 	param		pname		GetHistogramParameterPName in value
 	param		params		Int32 out array [COMPSIZE(pname)]
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	dlflags		notlistable
 	version		1.2
 	deprecated	3.1
@@ -4369,7 +4671,8 @@ GetMinmax(target, reset, format, type, values)
 	param		format		PixelFormat in value
 	param		type		PixelType in value
 	param		values		Void out array [COMPSIZE(target/format/type)]
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	dlflags		notlistable
 	glxflags	client-handcode server-handcode
 	version		1.2
@@ -4382,7 +4685,8 @@ GetMinmaxParameterfv(target, pname, params)
 	param		target		MinmaxTarget in value
 	param		pname		GetMinmaxParameterPName in value
 	param		params		Float32 out array [COMPSIZE(pname)]
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	dlflags		notlistable
 	version		1.2
 	deprecated	3.1
@@ -4394,7 +4698,8 @@ GetMinmaxParameteriv(target, pname, params)
 	param		target		MinmaxTarget in value
 	param		pname		GetMinmaxParameterPName in value
 	param		params		Int32 out array [COMPSIZE(pname)]
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	dlflags		notlistable
 	version		1.2
 	deprecated	3.1
@@ -4407,7 +4712,8 @@ Histogram(target, width, internalformat, sink)
 	param		width		SizeI in value
 	param		internalformat	PixelInternalFormat in value
 	param		sink		Boolean in value
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	dlflags		handcode
 	glxflags	EXT
 	version		1.2
@@ -4420,7 +4726,8 @@ Minmax(target, internalformat, sink)
 	param		target		MinmaxTarget in value
 	param		internalformat	PixelInternalFormat in value
 	param		sink		Boolean in value
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	glxflags	EXT
 	version		1.2
 	deprecated	3.1
@@ -4430,7 +4737,8 @@ Minmax(target, internalformat, sink)
 ResetHistogram(target)
 	return		void
 	param		target		HistogramTarget in value
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	glxflags	EXT
 	version		1.2
 	deprecated	3.1
@@ -4440,7 +4748,8 @@ ResetHistogram(target)
 ResetMinmax(target)
 	return		void
 	param		target		MinmaxTarget in value
-	category	VERSION_1_2_DEPRECATED
+	category	VERSION_1_2
+	profile		compatibility
 	glxflags	EXT
 	version		1.2
 	deprecated	3.1
@@ -4618,7 +4927,8 @@ GetCompressedTexImage(target, level, img)
 ClientActiveTexture(texture)
 	return		void
 	param		texture		TextureUnit in value
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	dlflags		notlistable
 	glxflags	ARB client-handcode client-intercept server-handcode
 	version		1.3
@@ -4629,7 +4939,8 @@ MultiTexCoord1d(target, s)
 	return		void
 	param		target		TextureUnit in value
 	param		s		CoordD in value
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4640,7 +4951,8 @@ MultiTexCoord1dv(target, v)
 	return		void
 	param		target		TextureUnit in value
 	param		v		CoordD in array [1]
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4651,7 +4963,8 @@ MultiTexCoord1f(target, s)
 	return		void
 	param		target		TextureUnit in value
 	param		s		CoordF in value
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4662,7 +4975,8 @@ MultiTexCoord1fv(target, v)
 	return		void
 	param		target		TextureUnit in value
 	param		v		CoordF in array [1]
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4673,7 +4987,8 @@ MultiTexCoord1i(target, s)
 	return		void
 	param		target		TextureUnit in value
 	param		s		CoordI in value
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4684,7 +4999,8 @@ MultiTexCoord1iv(target, v)
 	return		void
 	param		target		TextureUnit in value
 	param		v		CoordI in array [1]
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4695,7 +5011,8 @@ MultiTexCoord1s(target, s)
 	return		void
 	param		target		TextureUnit in value
 	param		s		CoordS in value
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4706,7 +5023,8 @@ MultiTexCoord1sv(target, v)
 	return		void
 	param		target		TextureUnit in value
 	param		v		CoordS in array [1]
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4718,7 +5036,8 @@ MultiTexCoord2d(target, s, t)
 	param		target		TextureUnit in value
 	param		s		CoordD in value
 	param		t		CoordD in value
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4729,7 +5048,8 @@ MultiTexCoord2dv(target, v)
 	return		void
 	param		target		TextureUnit in value
 	param		v		CoordD in array [2]
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4741,7 +5061,8 @@ MultiTexCoord2f(target, s, t)
 	param		target		TextureUnit in value
 	param		s		CoordF in value
 	param		t		CoordF in value
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4752,7 +5073,8 @@ MultiTexCoord2fv(target, v)
 	return		void
 	param		target		TextureUnit in value
 	param		v		CoordF in array [2]
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4764,7 +5086,8 @@ MultiTexCoord2i(target, s, t)
 	param		target		TextureUnit in value
 	param		s		CoordI in value
 	param		t		CoordI in value
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4775,7 +5098,8 @@ MultiTexCoord2iv(target, v)
 	return		void
 	param		target		TextureUnit in value
 	param		v		CoordI in array [2]
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4787,7 +5111,8 @@ MultiTexCoord2s(target, s, t)
 	param		target		TextureUnit in value
 	param		s		CoordS in value
 	param		t		CoordS in value
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4798,7 +5123,8 @@ MultiTexCoord2sv(target, v)
 	return		void
 	param		target		TextureUnit in value
 	param		v		CoordS in array [2]
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4811,7 +5137,8 @@ MultiTexCoord3d(target, s, t, r)
 	param		s		CoordD in value
 	param		t		CoordD in value
 	param		r		CoordD in value
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4822,7 +5149,8 @@ MultiTexCoord3dv(target, v)
 	return		void
 	param		target		TextureUnit in value
 	param		v		CoordD in array [3]
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4835,7 +5163,8 @@ MultiTexCoord3f(target, s, t, r)
 	param		s		CoordF in value
 	param		t		CoordF in value
 	param		r		CoordF in value
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4846,7 +5175,8 @@ MultiTexCoord3fv(target, v)
 	return		void
 	param		target		TextureUnit in value
 	param		v		CoordF in array [3]
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4859,7 +5189,8 @@ MultiTexCoord3i(target, s, t, r)
 	param		s		CoordI in value
 	param		t		CoordI in value
 	param		r		CoordI in value
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4870,7 +5201,8 @@ MultiTexCoord3iv(target, v)
 	return		void
 	param		target		TextureUnit in value
 	param		v		CoordI in array [3]
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4883,7 +5215,8 @@ MultiTexCoord3s(target, s, t, r)
 	param		s		CoordS in value
 	param		t		CoordS in value
 	param		r		CoordS in value
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4894,7 +5227,8 @@ MultiTexCoord3sv(target, v)
 	return		void
 	param		target		TextureUnit in value
 	param		v		CoordS in array [3]
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	version		1.3
 	deprecated	3.1
 	glxflags	ARB
@@ -4908,7 +5242,8 @@ MultiTexCoord4d(target, s, t, r, q)
 	param		t		CoordD in value
 	param		r		CoordD in value
 	param		q		CoordD in value
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4919,7 +5254,8 @@ MultiTexCoord4dv(target, v)
 	return		void
 	param		target		TextureUnit in value
 	param		v		CoordD in array [4]
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4933,7 +5269,8 @@ MultiTexCoord4f(target, s, t, r, q)
 	param		t		CoordF in value
 	param		r		CoordF in value
 	param		q		CoordF in value
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4944,7 +5281,8 @@ MultiTexCoord4fv(target, v)
 	return		void
 	param		target		TextureUnit in value
 	param		v		CoordF in array [4]
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4958,7 +5296,8 @@ MultiTexCoord4i(target, s, t, r, q)
 	param		t		CoordI in value
 	param		r		CoordI in value
 	param		q		CoordI in value
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4969,7 +5308,8 @@ MultiTexCoord4iv(target, v)
 	return		void
 	param		target		TextureUnit in value
 	param		v		CoordI in array [4]
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4983,7 +5323,8 @@ MultiTexCoord4s(target, s, t, r, q)
 	param		t		CoordS in value
 	param		r		CoordS in value
 	param		q		CoordS in value
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -4994,7 +5335,8 @@ MultiTexCoord4sv(target, v)
 	return		void
 	param		target		TextureUnit in value
 	param		v		CoordS in array [4]
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB
 	version		1.3
 	deprecated	3.1
@@ -5006,7 +5348,8 @@ MultiTexCoord4sv(target, v)
 LoadTransposeMatrixf(m)
 	return		void
 	param		m		Float32 in array [16]
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB client-handcode client-intercept server-handcode
 	version		1.3
 	deprecated	3.1
@@ -5015,7 +5358,8 @@ LoadTransposeMatrixf(m)
 LoadTransposeMatrixd(m)
 	return		void
 	param		m		Float64 in array [16]
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB client-handcode client-intercept server-handcode
 	version		1.3
 	deprecated	3.1
@@ -5024,7 +5368,8 @@ LoadTransposeMatrixd(m)
 MultTransposeMatrixf(m)
 	return		void
 	param		m		Float32 in array [16]
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB client-handcode client-intercept server-handcode
 	version		1.3
 	deprecated	3.1
@@ -5033,7 +5378,8 @@ MultTransposeMatrixf(m)
 MultTransposeMatrixd(m)
 	return		void
 	param		m		Float64 in array [16]
-	category	VERSION_1_3_DEPRECATED
+	category	VERSION_1_3
+	profile		compatibility
 	glxflags	ARB client-handcode client-intercept server-handcode
 	version		1.3
 	deprecated	3.1
@@ -5142,7 +5488,8 @@ PointParameteriv(pname, params)
 FogCoordf(coord)
 	return		void
 	param		coord		CoordF in value
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	vectorequiv	FogCoordfv
 	version		1.4
 	deprecated	3.1
@@ -5151,7 +5498,8 @@ FogCoordf(coord)
 FogCoordfv(coord)
 	return		void
 	param		coord		CoordF in array [1]
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	version		1.4
 	deprecated	3.1
 	glxropcode	4124
@@ -5160,7 +5508,8 @@ FogCoordfv(coord)
 FogCoordd(coord)
 	return		void
 	param		coord		CoordD in value
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	vectorequiv	FogCoorddv
 	version		1.4
 	deprecated	3.1
@@ -5169,7 +5518,8 @@ FogCoordd(coord)
 FogCoorddv(coord)
 	return		void
 	param		coord		CoordD in array [1]
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	version		1.4
 	deprecated	3.1
 	glxropcode	4125
@@ -5180,7 +5530,8 @@ FogCoordPointer(type, stride, pointer)
 	param		type		FogPointerTypeEXT in value
 	param		stride		SizeI in value
 	param		pointer		Void in array [COMPSIZE(type/stride)] retained
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	dlflags		notlistable
 	version		1.4
 	deprecated	3.1
@@ -5194,7 +5545,8 @@ SecondaryColor3b(red, green, blue)
 	param		red		ColorB in value
 	param		green		ColorB in value
 	param		blue		ColorB in value
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	vectorequiv	SecondaryColor3bv
 	version		1.4
 	deprecated	3.1
@@ -5203,7 +5555,8 @@ SecondaryColor3b(red, green, blue)
 SecondaryColor3bv(v)
 	return		void
 	param		v		ColorB in array [3]
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	version		1.4
 	deprecated	3.1
 	glxropcode	4126
@@ -5214,7 +5567,8 @@ SecondaryColor3d(red, green, blue)
 	param		red		ColorD in value
 	param		green		ColorD in value
 	param		blue		ColorD in value
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	vectorequiv	SecondaryColor3dv
 	version		1.4
 	deprecated	3.1
@@ -5223,7 +5577,8 @@ SecondaryColor3d(red, green, blue)
 SecondaryColor3dv(v)
 	return		void
 	param		v		ColorD in array [3]
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	version		1.4
 	deprecated	3.1
 	glxropcode	4130
@@ -5234,7 +5589,8 @@ SecondaryColor3f(red, green, blue)
 	param		red		ColorF in value
 	param		green		ColorF in value
 	param		blue		ColorF in value
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	vectorequiv	SecondaryColor3fv
 	version		1.4
 	deprecated	3.1
@@ -5243,7 +5599,8 @@ SecondaryColor3f(red, green, blue)
 SecondaryColor3fv(v)
 	return		void
 	param		v		ColorF in array [3]
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	version		1.4
 	deprecated	3.1
 	glxropcode	4129
@@ -5254,7 +5611,8 @@ SecondaryColor3i(red, green, blue)
 	param		red		ColorI in value
 	param		green		ColorI in value
 	param		blue		ColorI in value
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	vectorequiv	SecondaryColor3iv
 	version		1.4
 	deprecated	3.1
@@ -5263,7 +5621,8 @@ SecondaryColor3i(red, green, blue)
 SecondaryColor3iv(v)
 	return		void
 	param		v		ColorI in array [3]
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	version		1.4
 	deprecated	3.1
 	glxropcode	4128
@@ -5274,7 +5633,8 @@ SecondaryColor3s(red, green, blue)
 	param		red		ColorS in value
 	param		green		ColorS in value
 	param		blue		ColorS in value
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	vectorequiv	SecondaryColor3sv
 	version		1.4
 	deprecated	3.1
@@ -5283,7 +5643,8 @@ SecondaryColor3s(red, green, blue)
 SecondaryColor3sv(v)
 	return		void
 	param		v		ColorS in array [3]
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	version		1.4
 	deprecated	3.1
 	glxropcode	4127
@@ -5294,7 +5655,8 @@ SecondaryColor3ub(red, green, blue)
 	param		red		ColorUB in value
 	param		green		ColorUB in value
 	param		blue		ColorUB in value
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	vectorequiv	SecondaryColor3ubv
 	version		1.4
 	deprecated	3.1
@@ -5303,7 +5665,8 @@ SecondaryColor3ub(red, green, blue)
 SecondaryColor3ubv(v)
 	return		void
 	param		v		ColorUB in array [3]
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	version		1.4
 	deprecated	3.1
 	glxropcode	4131
@@ -5314,7 +5677,8 @@ SecondaryColor3ui(red, green, blue)
 	param		red		ColorUI in value
 	param		green		ColorUI in value
 	param		blue		ColorUI in value
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	vectorequiv	SecondaryColor3uiv
 	version		1.4
 	deprecated	3.1
@@ -5323,7 +5687,8 @@ SecondaryColor3ui(red, green, blue)
 SecondaryColor3uiv(v)
 	return		void
 	param		v		ColorUI in array [3]
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	version		1.4
 	deprecated	3.1
 	glxropcode	4133
@@ -5334,7 +5699,8 @@ SecondaryColor3us(red, green, blue)
 	param		red		ColorUS in value
 	param		green		ColorUS in value
 	param		blue		ColorUS in value
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	vectorequiv	SecondaryColor3usv
 	version		1.4
 	deprecated	3.1
@@ -5343,7 +5709,8 @@ SecondaryColor3us(red, green, blue)
 SecondaryColor3usv(v)
 	return		void
 	param		v		ColorUS in array [3]
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	version		1.4
 	deprecated	3.1
 	glxropcode	4132
@@ -5355,7 +5722,8 @@ SecondaryColorPointer(size, type, stride, pointer)
 	param		type		ColorPointerType in value
 	param		stride		SizeI in value
 	param		pointer		Void in array [COMPSIZE(size/type/stride)] retained
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	dlflags		notlistable
 	glxflags	client-handcode server-handcode
 	version		1.4
@@ -5370,7 +5738,8 @@ WindowPos2d(x, y)
 	return		void
 	param		x		CoordD in value
 	param		y		CoordD in value
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	vectorequiv	WindowPos2dv
 	version		1.4
 	deprecated	3.1
@@ -5379,7 +5748,8 @@ WindowPos2d(x, y)
 WindowPos2dv(v)
 	return		void
 	param		v		CoordD in array [2]
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	version		1.4
 	deprecated	3.1
 	glxropcode	230
@@ -5390,7 +5760,8 @@ WindowPos2f(x, y)
 	return		void
 	param		x		CoordF in value
 	param		y		CoordF in value
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	vectorequiv	WindowPos2fv
 	version		1.4
 	deprecated	3.1
@@ -5399,7 +5770,8 @@ WindowPos2f(x, y)
 WindowPos2fv(v)
 	return		void
 	param		v		CoordF in array [2]
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	version		1.4
 	deprecated	3.1
 	glxropcode	230
@@ -5410,7 +5782,8 @@ WindowPos2i(x, y)
 	return		void
 	param		x		CoordI in value
 	param		y		CoordI in value
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	vectorequiv	WindowPos2iv
 	version		1.4
 	deprecated	3.1
@@ -5419,7 +5792,8 @@ WindowPos2i(x, y)
 WindowPos2iv(v)
 	return		void
 	param		v		CoordI in array [2]
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	version		1.4
 	deprecated	3.1
 	glxropcode	230
@@ -5430,7 +5804,8 @@ WindowPos2s(x, y)
 	return		void
 	param		x		CoordS in value
 	param		y		CoordS in value
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	vectorequiv	WindowPos2sv
 	version		1.4
 	deprecated	3.1
@@ -5439,7 +5814,8 @@ WindowPos2s(x, y)
 WindowPos2sv(v)
 	return		void
 	param		v		CoordS in array [2]
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	version		1.4
 	deprecated	3.1
 	glxropcode	230
@@ -5452,7 +5828,8 @@ WindowPos3d(x, y, z)
 	param		y		CoordD in value
 	param		z		CoordD in value
 	vectorequiv	WindowPos3dv
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	version		1.4
 	deprecated	3.1
 	offset		521
@@ -5460,7 +5837,8 @@ WindowPos3d(x, y, z)
 WindowPos3dv(v)
 	return		void
 	param		v		CoordD in array [3]
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	version		1.4
 	deprecated	3.1
 	glxropcode	230
@@ -5472,7 +5850,8 @@ WindowPos3f(x, y, z)
 	param		x		CoordF in value
 	param		y		CoordF in value
 	param		z		CoordF in value
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	vectorequiv	WindowPos3fv
 	version		1.4
 	deprecated	3.1
@@ -5481,7 +5860,8 @@ WindowPos3f(x, y, z)
 WindowPos3fv(v)
 	return		void
 	param		v		CoordF in array [3]
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	version		1.4
 	deprecated	3.1
 	glxropcode	230
@@ -5493,7 +5873,8 @@ WindowPos3i(x, y, z)
 	param		x		CoordI in value
 	param		y		CoordI in value
 	param		z		CoordI in value
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	vectorequiv	WindowPos3iv
 	version		1.4
 	deprecated	3.1
@@ -5502,7 +5883,8 @@ WindowPos3i(x, y, z)
 WindowPos3iv(v)
 	return		void
 	param		v		CoordI in array [3]
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	version		1.4
 	deprecated	3.1
 	glxropcode	230
@@ -5514,7 +5896,8 @@ WindowPos3s(x, y, z)
 	param		x		CoordS in value
 	param		y		CoordS in value
 	param		z		CoordS in value
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	vectorequiv	WindowPos3sv
 	version		1.4
 	deprecated	3.1
@@ -5523,7 +5906,8 @@ WindowPos3s(x, y, z)
 WindowPos3sv(v)
 	return		void
 	param		v		CoordS in array [3]
-	category	VERSION_1_4_DEPRECATED
+	category	VERSION_1_4
+	profile		compatibility
 	version		1.4
 	deprecated	3.1
 	glxropcode	230
@@ -8055,10 +8439,7 @@ passthru: /* ARB_ES3_compatibility (no entry points) */
 passthru: /* ARB_clear_buffer_object */
 passthru: /* ARB_compute_shader */
 passthru: /* ARB_copy_image */
-passthru: /* ARB_debug_group */
-passthru: /* ARB_debug_label */
-passthru: /* KHR_debug (ARB_debug_output promoted to KHR without suffixes) */
-passthru: /* ARB_debug_output2 (no entry points) */
+passthru: /* KHR_debug (includes ARB_debug_output commands promoted to KHR without suffixes) */
 passthru: /* ARB_explicit_uniform_location (no entry points) */
 passthru: /* ARB_framebuffer_no_attachments */
 passthru: /* ARB_internalformat_query2 */
@@ -14448,6 +14829,7 @@ GetnMapdvARB(target, query, bufSize, v)
 	param		bufSize		SizeI in value
 	param		v		Float64 out array [bufSize]
 	category	ARB_robustness
+	profile		compatibility
 	dlflags		notlistable
 	version		4.1
 	extension
@@ -14462,6 +14844,7 @@ GetnMapfvARB(target, query, bufSize, v)
 	param		bufSize		SizeI in value
 	param		v		Float32 out array [bufSize]
 	category	ARB_robustness
+	profile		compatibility
 	dlflags		notlistable
 	version		4.1
 	extension
@@ -14476,6 +14859,7 @@ GetnMapivARB(target, query, bufSize, v)
 	param		bufSize		SizeI in value
 	param		v		Int32 out array [bufSize]
 	category	ARB_robustness
+	profile		compatibility
 	dlflags		notlistable
 	version		4.1
 	extension
@@ -14489,6 +14873,7 @@ GetnPixelMapfvARB(map, bufSize, values)
 	param		bufSize		SizeI in value
 	param		values		Float32 out array [bufSize]
 	category	ARB_robustness
+	profile		compatibility
 	dlflags		notlistable
 	version		4.1
 	extension
@@ -14502,6 +14887,7 @@ GetnPixelMapuivARB(map, bufSize, values)
 	param		bufSize		SizeI in value
 	param		values		UInt32 out array [bufSize]
 	category	ARB_robustness
+	profile		compatibility
 	dlflags		notlistable
 	version		4.1
 	extension
@@ -14515,6 +14901,7 @@ GetnPixelMapusvARB(map, bufSize, values)
 	param		bufSize		SizeI in value
 	param		values		UInt16 out array [bufSize]
 	category	ARB_robustness
+	profile		compatibility
 	dlflags		notlistable
 	version		4.1
 	extension
@@ -14527,6 +14914,7 @@ GetnPolygonStippleARB(bufSize, pattern)
 	param		bufSize		SizeI in value
 	param		pattern		UInt8 out array [bufSize]
 	category	ARB_robustness
+	profile		compatibility
 	dlflags		notlistable
 	version		4.1
 	extension
@@ -14542,6 +14930,7 @@ GetnColorTableARB(target, format, type, bufSize, table)
 	param		bufSize		SizeI in value
 	param		table		Void out array [bufSize]
 	category	ARB_robustness
+	profile		compatibility
 	dlflags		notlistable
 	version		4.1
 	extension
@@ -14557,6 +14946,7 @@ GetnConvolutionFilterARB(target, format, type, bufSize, image)
 	param		bufSize		SizeI in value
 	param		image		Void out array [bufSize]
 	category	ARB_robustness
+	profile		compatibility
 	dlflags		notlistable
 	version		4.1
 	extension
@@ -14575,6 +14965,7 @@ GetnSeparableFilterARB(target, format, type, rowBufSize, row, columnBufSize, col
 	param		column		Void out array [columnBufSize]
 	param		span		Void out array [0]
 	category	ARB_robustness
+	profile		compatibility
 	dlflags		notlistable
 	version		4.1
 	extension
@@ -14591,6 +14982,7 @@ GetnHistogramARB(target, reset, format, type, bufSize, values)
 	param		bufSize		SizeI in value
 	param		values		Void out array [bufSize]
 	category	ARB_robustness
+	profile		compatibility
 	dlflags		notlistable
 	version		4.1
 	extension
@@ -14607,6 +14999,7 @@ GetnMinmaxARB(target, reset, format, type, bufSize, values)
 	param		bufSize		SizeI in value
 	param		values		Void out array [bufSize]
 	category	ARB_robustness
+	profile		compatibility
 	dlflags		notlistable
 	version		4.1
 	extension
@@ -15109,7 +15502,6 @@ GetDebugMessageLog(count, bufsize, sources, types, ids, severities, lengths, mes
 	glxflags	ignore
 	offset		?
 
-# Shared with ARB_debug_group
 PushDebugGroup(source, id, length, message)
 	return		void
 	param		source		GLenum in value
@@ -15132,7 +15524,6 @@ PopDebugGroup()
 	glxflags	ignore
 	offset		?
 
-# Shared with ARB_debug_label
 ObjectLabel(identifier, name, length, label)
 	return		void
 	param		identifier	GLenum in value
@@ -15187,7 +15578,7 @@ GetObjectPtrLabel(ptr, bufSize, length, label)
 	glxflags	ignore
 	offset		?
 
-passthru: /* KHR_debug also reuses entry points from ARB_debug_group and ARB_debug_label */
+# Also includes GetPointerv (only for OpenGL ES 2, however)
 
 ###############################################################################
 #
@@ -15330,35 +15721,200 @@ CopyImageSubData(srcName, srcTarget, srcLevel, srcX, srcY, srcZ, dstName, dstTar
 
 ###############################################################################
 #
-# Extension #ARB124
-# ARB_debug_group commands
+# Extension #ARB124 (renumbered from 142)
+# ARB_texture_view commands
 #
 ###############################################################################
 
-# (none)
-newcategory: ARB_debug_group
-passthru: /* ARB_debug_group reuses entry points from KHR_debug */
+TextureView(texture, target, origtexture, internalformat, minlevel, numlevels, minlayer, numlayers)
+	return		void
+	param		texture		UInt32 in value
+	param		target		GLenum in value
+	param		origtexture	UInt32 in value
+	param		internalformat	GLenum in value
+	param		minlevel	UInt32 in value
+	param		numlevels	UInt32 in value
+	param		minlayer	UInt32 in value
+	param		numlayers	UInt32 in value
+	category	ARB_texture_view
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
 
 ###############################################################################
 #
-# Extension #ARB125
-# ARB_debug_label commands
+# Extension #ARB125 (renumbered from 143)
+# ARB_vertex_attrib_binding commands
 #
 ###############################################################################
 
-# (none)
-newcategory: ARB_debug_label
-passthru: /* ARB_debug_label reuses entry points from KHR_debug */
+BindVertexBuffer(bindingindex, buffer, offset, stride)
+	return		void
+	param		bindingindex	UInt32 in value
+	param		buffer		UInt32 in value
+	param		offset		BufferOffset in value
+	param		stride		SizeI in value
+	category	ARB_vertex_attrib_binding
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribFormat(attribindex, size, type, normalized, relativeoffset)
+	return		void
+	param		attribindex	UInt32 in value
+	param		size		Int32 in value
+	param		type		GLenum in value
+	param		normalized	Boolean in value
+	param		relativeoffset	UInt32 in value
+	category	ARB_vertex_attrib_binding
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribIFormat(attribindex, size, type, relativeoffset)
+	return		void
+	param		attribindex	UInt32 in value
+	param		size		Int32 in value
+	param		type		GLenum in value
+	param		relativeoffset	UInt32 in value
+	category	ARB_vertex_attrib_binding
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribLFormat(attribindex, size, type, relativeoffset)
+	return		void
+	param		attribindex	UInt32 in value
+	param		size		Int32 in value
+	param		type		GLenum in value
+	param		relativeoffset	UInt32 in value
+	category	ARB_vertex_attrib_binding
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexAttribBinding(attribindex, bindingindex)
+	return		void
+	param		attribindex	UInt32 in value
+	param		bindingindex	UInt32 in value
+	category	ARB_vertex_attrib_binding
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexBindingDivisor(bindingindex, divisor)
+	return		void
+	param		bindingindex	UInt32 in value
+	param		divisor		UInt32 in value
+	category	ARB_vertex_attrib_binding
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexArrayBindVertexBufferEXT(vaobj, bindingindex, buffer, offset, stride)
+	return		void
+	param		vaobj		UInt32 in value
+	param		bindingindex	UInt32 in value
+	param		buffer		UInt32 in value
+	param		offset		BufferOffset in value
+	param		stride		SizeI in value
+	category	ARB_vertex_attrib_binding
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexArrayVertexAttribFormatEXT(vaobj, attribindex, size, type, normalized, relativeoffset)
+	return		void
+	param		vaobj		UInt32 in value
+	param		attribindex	UInt32 in value
+	param		size		Int32 in value
+	param		type		GLenum in value
+	param		normalized	Boolean in value
+	param		relativeoffset	UInt32 in value
+	category	ARB_vertex_attrib_binding
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexArrayVertexAttribIFormatEXT(vaobj, attribindex, size, type, relativeoffset)
+	return		void
+	param		vaobj		UInt32 in value
+	param		attribindex	UInt32 in value
+	param		size		Int32 in value
+	param		type		GLenum in value
+	param		relativeoffset	UInt32 in value
+	category	ARB_vertex_attrib_binding
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexArrayVertexAttribLFormatEXT(vaobj, attribindex, size, type, relativeoffset)
+	return		void
+	param		vaobj		UInt32 in value
+	param		attribindex	UInt32 in value
+	param		size		Int32 in value
+	param		type		GLenum in value
+	param		relativeoffset	UInt32 in value
+	category	ARB_vertex_attrib_binding
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexArrayVertexAttribBindingEXT(vaobj, attribindex, bindingindex)
+	return		void
+	param		vaobj		UInt32 in value
+	param		attribindex	UInt32 in value
+	param		bindingindex	UInt32 in value
+	category	ARB_vertex_attrib_binding
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+VertexArrayVertexBindingDivisorEXT(vaobj, bindingindex, divisor)
+	return		void
+	param		vaobj		UInt32 in value
+	param		bindingindex	UInt32 in value
+	param		divisor		UInt32 in value
+	category	ARB_vertex_attrib_binding
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
 
 ###############################################################################
 #
-# Extension #ARB126
-# ARB_debug_output2 commands
+# Extension #ARB126 (renumbered from 144)
+# ARB_robustness_isolation commands
 #
 ###############################################################################
 
 # (none)
-newcategory: ARB_debug_output2
+newcategory: ARB_robustness_isolation
 
 ###############################################################################
 #
@@ -15848,203 +16404,6 @@ TextureStorage3DMultisampleEXT(texture, target, samples, internalformat, width,
 	glxflags	ignore
 	offset		?
 
-###############################################################################
-#
-# Extension #ARB142
-# ARB_texture_view commands
-#
-###############################################################################
-
-TextureView(texture, target, origtexture, internalformat, minlevel, numlevels, minlayer, numlayers)
-	return		void
-	param		texture		UInt32 in value
-	param		target		GLenum in value
-	param		origtexture	UInt32 in value
-	param		internalformat	GLenum in value
-	param		minlevel	UInt32 in value
-	param		numlevels	UInt32 in value
-	param		minlayer	UInt32 in value
-	param		numlayers	UInt32 in value
-	category	ARB_texture_view
-	version		4.3
-	extension
-	glxropcode	?
-	glxflags	ignore
-	offset		?
-
-###############################################################################
-#
-# Extension #ARB143
-# ARB_vertex_attrib_binding commands
-#
-###############################################################################
-
-BindVertexBuffer(bindingindex, buffer, offset, stride)
-	return		void
-	param		bindingindex	UInt32 in value
-	param		buffer		UInt32 in value
-	param		offset		BufferOffset in value
-	param		stride		SizeI in value
-	category	ARB_vertex_attrib_binding
-	version		4.3
-	extension
-	glxropcode	?
-	glxflags	ignore
-	offset		?
-
-VertexAttribFormat(attribindex, size, type, normalized, relativeoffset)
-	return		void
-	param		attribindex	UInt32 in value
-	param		size		Int32 in value
-	param		type		GLenum in value
-	param		normalized	Boolean in value
-	param		relativeoffset	UInt32 in value
-	category	ARB_vertex_attrib_binding
-	version		4.3
-	extension
-	glxropcode	?
-	glxflags	ignore
-	offset		?
-
-VertexAttribIFormat(attribindex, size, type, relativeoffset)
-	return		void
-	param		attribindex	UInt32 in value
-	param		size		Int32 in value
-	param		type		GLenum in value
-	param		relativeoffset	UInt32 in value
-	category	ARB_vertex_attrib_binding
-	version		4.3
-	extension
-	glxropcode	?
-	glxflags	ignore
-	offset		?
-
-VertexAttribLFormat(attribindex, size, type, relativeoffset)
-	return		void
-	param		attribindex	UInt32 in value
-	param		size		Int32 in value
-	param		type		GLenum in value
-	param		relativeoffset	UInt32 in value
-	category	ARB_vertex_attrib_binding
-	version		4.3
-	extension
-	glxropcode	?
-	glxflags	ignore
-	offset		?
-
-VertexAttribBinding(attribindex, bindingindex)
-	return		void
-	param		attribindex	UInt32 in value
-	param		bindingindex	UInt32 in value
-	category	ARB_vertex_attrib_binding
-	version		4.3
-	extension
-	glxropcode	?
-	glxflags	ignore
-	offset		?
-
-VertexBindingDivisor(bindingindex, divisor)
-	return		void
-	param		bindingindex	UInt32 in value
-	param		divisor		UInt32 in value
-	category	ARB_vertex_attrib_binding
-	version		4.3
-	extension
-	glxropcode	?
-	glxflags	ignore
-	offset		?
-
-VertexArrayBindVertexBufferEXT(vaobj, bindingindex, buffer, offset, stride)
-	return		void
-	param		vaobj		UInt32 in value
-	param		bindingindex	UInt32 in value
-	param		buffer		UInt32 in value
-	param		offset		BufferOffset in value
-	param		stride		SizeI in value
-	category	ARB_vertex_attrib_binding
-	version		4.3
-	extension
-	glxropcode	?
-	glxflags	ignore
-	offset		?
-
-VertexArrayVertexAttribFormatEXT(vaobj, attribindex, size, type, normalized, relativeoffset)
-	return		void
-	param		vaobj		UInt32 in value
-	param		attribindex	UInt32 in value
-	param		size		Int32 in value
-	param		type		GLenum in value
-	param		normalized	Boolean in value
-	param		relativeoffset	UInt32 in value
-	category	ARB_vertex_attrib_binding
-	version		4.3
-	extension
-	glxropcode	?
-	glxflags	ignore
-	offset		?
-
-VertexArrayVertexAttribIFormatEXT(vaobj, attribindex, size, type, relativeoffset)
-	return		void
-	param		vaobj		UInt32 in value
-	param		attribindex	UInt32 in value
-	param		size		Int32 in value
-	param		type		GLenum in value
-	param		relativeoffset	UInt32 in value
-	category	ARB_vertex_attrib_binding
-	version		4.3
-	extension
-	glxropcode	?
-	glxflags	ignore
-	offset		?
-
-VertexArrayVertexAttribLFormatEXT(vaobj, attribindex, size, type, relativeoffset)
-	return		void
-	param		vaobj		UInt32 in value
-	param		attribindex	UInt32 in value
-	param		size		Int32 in value
-	param		type		GLenum in value
-	param		relativeoffset	UInt32 in value
-	category	ARB_vertex_attrib_binding
-	version		4.3
-	extension
-	glxropcode	?
-	glxflags	ignore
-	offset		?
-
-VertexArrayVertexAttribBindingEXT(vaobj, attribindex, bindingindex)
-	return		void
-	param		vaobj		UInt32 in value
-	param		attribindex	UInt32 in value
-	param		bindingindex	UInt32 in value
-	category	ARB_vertex_attrib_binding
-	version		4.3
-	extension
-	glxropcode	?
-	glxflags	ignore
-	offset		?
-
-VertexArrayVertexBindingDivisorEXT(vaobj, bindingindex, divisor)
-	return		void
-	param		vaobj		UInt32 in value
-	param		bindingindex	UInt32 in value
-	param		divisor		UInt32 in value
-	category	ARB_vertex_attrib_binding
-	version		4.3
-	extension
-	glxropcode	?
-	glxflags	ignore
-	offset		?
-
-###############################################################################
-#
-# Extension #ARB144
-# ARB_robustness_isolation commands
-#
-###############################################################################
-
-# (none)
-newcategory: ARB_robustness_isolation
-
 
 ###############################################################################
 ###############################################################################
@@ -18845,7 +19204,7 @@ PixelTransformParameteriEXT(target, pname, param)
 	param		param		Int32 in value
 	category	EXT_pixel_transform
 	version		1.1
-	glxropcode	?
+	glxropcode	16386
 	offset		?
 
 PixelTransformParameterfEXT(target, pname, param)
@@ -18855,7 +19214,7 @@ PixelTransformParameterfEXT(target, pname, param)
 	param		param		Float32 in value
 	category	EXT_pixel_transform
 	version		1.1
-	glxropcode	?
+	glxropcode	16385
 	offset		?
 
 PixelTransformParameterivEXT(target, pname, params)
@@ -18878,6 +19237,32 @@ PixelTransformParameterfvEXT(target, pname, params)
 	glxropcode	?
 	offset		?
 
+GetPixelTransformParameterivEXT(target, pname, params)
+	return		void
+	param		target		GLenum in value
+	param		pname		GLenum in value
+	param		params		Int32 out array [COMPSIZE(pname)]
+	category	EXT_pixel_transform
+	dlflags		notlistable
+	version		1.1
+	extension
+	glxvendorpriv	2052
+	glxflags	ignore
+	offset		?
+
+GetPixelTransformParameterfvEXT(target, pname, params)
+	return		void
+	param		target		GLenum in value
+	param		pname		GLenum in value
+	param		params		Float32 out array [COMPSIZE(pname)]
+	category	EXT_pixel_transform
+	dlflags		notlistable
+	version		1.1
+	extension
+	glxvendorpriv	2051
+	glxflags	ignore
+	offset		?
+
 ###############################################################################
 #
 # Extension #139
@@ -20326,7 +20711,7 @@ VertexWeightfvEXT(weight)
 
 VertexWeightPointerEXT(size, type, stride, pointer)
 	return		void
-	param		size		SizeI in value
+	param		size		Int32 in value
 	param		type		VertexWeightPointerTypeEXT in value
 	param		stride		SizeI in value
 	param		pointer		Void in array [COMPSIZE(type/stride)] retained
@@ -32720,7 +33105,7 @@ VDPAUFiniNV()
 
 VDPAURegisterVideoSurfaceNV(vdpSurface, target, numTextureNames, textureNames)
 	return		vdpauSurfaceNV
-	param		vdpSurface	Void out reference
+	param		vdpSurface	Void in reference
 	param		target		GLenum in value
 	param		numTextureNames SizeI in value
 	param		textureNames	UInt32 in array [numTextureNames]
@@ -33810,7 +34195,7 @@ IsImageHandleResidentNV(handle)
 # (none)
 newcategory: NV_shader_atomic_float
 
-###############################################################################
+[###############################################################################
 #
 # Extension #420
 # AMD_query_buffer_object commands
@@ -33819,3 +34204,44 @@ newcategory: NV_shader_atomic_float
 
 # (none)
 newcategory: AMD_query_buffer_object
+
+###############################################################################
+#
+# Extension #421
+# AMD_sparse_texture commands
+#
+###############################################################################
+
+TexStorageSparseAMD(target, internalFormat, width, height, depth, layers, flags)
+	return		void
+	param		target		GLenum in value
+	param		internalFormat	GLenum in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		layers		SizeI in value
+	param		flags		GLbitfield in value
+	category	AMD_sparse_texture
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
+TextureStorageSparseAMD(texture, target, internalFormat, width, height, depth, layers, flags)
+	return		void
+	param		texture		UInt32 in value
+	param		target		GLenum in value
+	param		internalFormat	GLenum in value
+	param		width		SizeI in value
+	param		height		SizeI in value
+	param		depth		SizeI in value
+	param		layers		SizeI in value
+	param		flags		GLbitfield in value
+	category	AMD_sparse_texture
+	version		4.3
+	extension
+	glxropcode	?
+	glxflags	ignore
+	offset		?
+
diff --git a/xorg-server/hw/xwin/winprefs.c b/xorg-server/hw/xwin/winprefs.c
index 5becf23a0..a4d241060 100644
--- a/xorg-server/hw/xwin/winprefs.c
+++ b/xorg-server/hw/xwin/winprefs.c
@@ -647,7 +647,7 @@ winPrefsLoadPreferences(char *path)
 
     if (path)
         prefFile = fopen(path, "r");
-#ifndef _MSC_VER
+#ifdef __CYGWIN__
     else {
         char defaultPrefs[] =
             "MENU rmenu {\n"
diff --git a/xorg-server/include/xserver-properties.h b/xorg-server/include/xserver-properties.h
index 85f2ce5c4..bf48fabe5 100644
--- a/xorg-server/include/xserver-properties.h
+++ b/xorg-server/include/xserver-properties.h
@@ -118,6 +118,9 @@
 #define AXIS_LABEL_PROP_ABS_MT_BLOB_ID     "Abs MT Blob ID"
 #define AXIS_LABEL_PROP_ABS_MT_TRACKING_ID "Abs MT Tracking ID"
 #define AXIS_LABEL_PROP_ABS_MT_PRESSURE    "Abs MT Pressure"
+#define AXIS_LABEL_PROP_ABS_MT_DISTANCE    "Abs MT Distance"
+#define AXIS_LABEL_PROP_ABS_MT_TOOL_X      "Abs MT Tool X"
+#define AXIS_LABEL_PROP_ABS_MT_TOOL_Y      "Abs MT Tool Y"
 #define AXIS_LABEL_PROP_ABS_MISC        "Abs Misc"
 
 /* Button names */
diff --git a/xorg-server/os/utils.c b/xorg-server/os/utils.c
index 29ee9ab24..2945e3e1b 100644
--- a/xorg-server/os/utils.c
+++ b/xorg-server/os/utils.c
@@ -248,6 +248,19 @@ OsSignal(int sig, OsSigHandlerPtr handler)
 #define LockFile szLockFile
 #endif
 
+#if !defined(WIN32) || defined(__CYGWIN__)
+#define LOCK_SERVER
+#endif
+
+#ifndef LOCK_SERVER
+void
+LockServer(void)
+{}
+
+void
+UnlockServer(void)
+{}
+#else /* LOCK_SERVER */
 static Bool StillLocking = FALSE;
 static char LockFile[PATH_MAX];
 static Bool nolock = FALSE;
@@ -263,7 +276,7 @@ LockServer(void)
 {
 #if defined(WIN32) && !defined(__CYGWIN__)
   char MutexName[100];
-  sprintf(MutexName, "Global\\VcXsrv_Mutex_%d\n", getpid());
+  sprintf(MutexName, "Global\\VcXsrv_Mutex_%d\n", atoi(display));
   if (!CreateMutex(NULL,TRUE,MutexName) || GetLastError()== ERROR_ALREADY_EXISTS)
   {
     FatalError("Server is already active for display %d\n", atoi(display));
@@ -404,6 +417,7 @@ UnlockServer(void)
         (void) unlink(LockFile);
     }
 }
+#endif /* LOCK_SERVER */
 
 /* Force connections to close on SIGHUP from init */
 
@@ -530,7 +544,9 @@ UseMsg(void)
 #ifdef RLIMIT_STACK
     ErrorF("-ls int                limit stack space to N Kb\n");
 #endif
+#ifdef LOCK_SERVER
     ErrorF("-nolock                disable the locking mechanism\n");
+#endif
     ErrorF("-nolisten string       don't listen on protocol\n");
     ErrorF("-noreset               don't reset after last client exists\n");
     ErrorF("-background [none]     create root window with no background\n");
@@ -692,7 +708,9 @@ ProcessCommandLine(int argc, char *argv[])
             if (++i < argc) {
                 displayfd = atoi(argv[i]);
                 display = NULL;
+#ifdef LOCK_SERVER
                 nolock = TRUE;
+#endif
             }
             else
                 UseMsg();
@@ -772,6 +790,7 @@ ProcessCommandLine(int argc, char *argv[])
                 UseMsg();
         }
 #endif
+#ifdef LOCK_SERVER
         else if (strcmp(argv[i], "-nolock") == 0) {
 #if !defined(WIN32) && !defined(__CYGWIN__)
             if (getuid() != 0)
@@ -781,6 +800,7 @@ ProcessCommandLine(int argc, char *argv[])
 #endif
                 nolock = TRUE;
         }
+#endif
         else if (strcmp(argv[i], "-nolisten") == 0) {
             if (++i < argc) {
                 if (_XSERVTransNoListen(argv[i]))
diff --git a/xorg-server/xkb/xkbAccessX.c b/xorg-server/xkb/xkbAccessX.c
index 082c0db57..c1af32eb9 100644
--- a/xorg-server/xkb/xkbAccessX.c
+++ b/xorg-server/xkb/xkbAccessX.c
@@ -709,7 +709,7 @@ ProcessPointerEvent(InternalEvent *ev, DeviceIntPtr mouse)
     xkbDeviceInfoPtr xkbPrivPtr = XKBDEVICEINFO(mouse);
     DeviceEvent *event = &ev->device_event;
 
-    dev = IsFloating(mouse) ? mouse : GetMaster(mouse, MASTER_KEYBOARD);
+    dev = (IsMaster(mouse) || IsFloating(mouse)) ? mouse : GetMaster(mouse, MASTER_KEYBOARD);
 
     if (dev && dev->key) {
         xkbi = dev->key->xkbInfo;
author	marha <marha@users.sourceforge.net>	2012-11-07 08:02:14 +0100
committer	marha <marha@users.sourceforge.net>	2012-11-07 08:02:14 +0100
commit	2c345c9da4dedfafe791557ca3fcf891ce26249d (patch)
tree	18dc73394bd3921415b57b5847f03a9753374e99
parent	7c531937cfab42f2fd3233c096c409ebdd5b59af (diff)
parent	1cc98f5a48924d750fbef7ea6b05a1ba49c28589 (diff)
download	vcxsrv-2c345c9da4dedfafe791557ca3fcf891ce26249d.tar.gz vcxsrv-2c345c9da4dedfafe791557ca3fcf891ce26249d.tar.bz2 vcxsrv-2c345c9da4dedfafe791557ca3fcf891ce26249d.zip